chore: improve collectors and pins

20-collectors/collect_backup_restore_drill.sh

@@ -4,8 +4,36 @@ set -euo pipefail
 OUT_DIR="${1:?usage: collect_backup_restore_drill.sh <out_dir>}"
 mkdir -p "$OUT_DIR"
 
-ROOT="../vm-skills"
-LATEST="$(find "$ROOT" -type f -name "*restore*drill*.json" 2>/dev/null | sort | tail -n 1 || true)"
+DEFAULT_GLOB="*restore*drill*.json"
+DEFAULT_ROOTS=(
+  "../vm-ops/60-backups"
+  "../vm-skills"
+)
+
+matches=()
+if [[ -n "${VMCC_RESTORE_DRILL_GLOB:-}" ]]; then
+  if [[ -f "$VMCC_RESTORE_DRILL_GLOB" ]]; then
+    matches+=("$VMCC_RESTORE_DRILL_GLOB")
+  elif [[ -d "$VMCC_RESTORE_DRILL_GLOB" ]]; then
+    while IFS= read -r -d '' file; do
+      matches+=("$file")
+    done < <(find "$VMCC_RESTORE_DRILL_GLOB" -type f -name "$DEFAULT_GLOB" -print0 2>/dev/null)
+  else
+    while IFS= read -r file; do
+      matches+=("$file")
+    done < <(compgen -G "$VMCC_RESTORE_DRILL_GLOB" || true)
+  fi
+fi
+
+if [[ ${#matches[@]} -eq 0 ]]; then
+  for root in "${DEFAULT_ROOTS[@]}"; do
+    if [[ -d "$root" ]]; then
+      while IFS= read -r -d '' file; do
+        matches+=("$file")
+      done < <(find "$root" -type f -name "$DEFAULT_GLOB" -print0 2>/dev/null)
+    fi
+  done
+fi
 
 file_mtime_epoch() {
   local file="$1"
@@ -20,8 +48,11 @@ file_mtime_iso() {
   local file="$1"
   local mtime
   mtime="$(file_mtime_epoch "$file")"
-  if date -u -r "$file" "+%Y-%m-%dT%H:%M:%SZ" >/dev/null 2>&1; then
-    date -u -r "$file" "+%Y-%m-%dT%H:%M:%SZ"
+
+  # BSD/macOS: date -r <epoch>
+  if date -u -r "$mtime" "+%Y-%m-%dT%H:%M:%SZ" >/dev/null 2>&1; then
+    date -u -r "$mtime" "+%Y-%m-%dT%H:%M:%SZ"
+  # GNU: date -d "@<epoch>"
   elif date -u -d "@${mtime}" "+%Y-%m-%dT%H:%M:%SZ" >/dev/null 2>&1; then
     date -u -d "@${mtime}" "+%Y-%m-%dT%H:%M:%SZ"
   else
@@ -29,13 +60,26 @@ file_mtime_iso() {
   fi
 }
 
-if [[ -n "$LATEST" && -f "$LATEST" ]]; then
+LATEST=""
+LATEST_TS=0
+for file in "${matches[@]}"; do
+  if [[ -f "$file" ]]; then
+    ts="$(file_mtime_epoch "$file")"
+    if [[ "$ts" -gt "$LATEST_TS" || ( "$ts" -eq "$LATEST_TS" && ( -z "$LATEST" || "$file" > "$LATEST" ) ) ]]; then
+      LATEST_TS="$ts"
+      LATEST="$file"
+    fi
+  fi
+done
+
+if [[ -n "$LATEST" ]]; then
   TS="$(file_mtime_iso "$LATEST")"
-  cat > "$OUT_DIR/backup_restore_drill.json" <<JSON
-{"collected": true, "path": "$LATEST", "observed_at": "$TS"}
-JSON
+  jq -n \
+    --arg path "$LATEST" \
+    --arg ts "$TS" \
+    '{collected:true, path:$path, observed_at:$ts}' \
+    > "$OUT_DIR/backup_restore_drill.json"
 else
-  cat > "$OUT_DIR/backup_restore_drill.json" <<'JSON'
-{"collected": false, "reason": "no restore drill artifacts found"}
-JSON
+  jq -n '{collected:false, reason:"no restore drill artifacts found"}' \
+    > "$OUT_DIR/backup_restore_drill.json"
 fi

20-collectors/collect_ledger_verify.sh

@@ -4,20 +4,51 @@ set -euo pipefail
 OUT_DIR="${1:?usage: collect_ledger_verify.sh <out_dir>}"
 mkdir -p "$OUT_DIR"
 
-if command -v ledger >/dev/null 2>&1; then
-  if ! ledger verify --format json > "$OUT_DIR/ledger_verify.json"; then
-    cat > "$OUT_DIR/ledger_verify.json" <<'JSON'
-{"collected": false, "reason": "ledger verify failed"}
-JSON
+CANDIDATES=(
+  "ledger"
+  "ledger-cli"
+  "../vm-ledger/target/release/ledger"
+  "../vm-ledger/target/release/ledger-cli"
+  "../vm-ledger/target/debug/ledger"
+  "../vm-ledger/target/debug/ledger-cli"
+  "../vm-ledger/bin/ledger"
+  "../vm-ledger/bin/ledger-cli"
+  "../vm-ledger/ledger"
+  "../vm-ledger/ledger-cli"
+)
+
+LEDGER_BIN=""
+for c in "${CANDIDATES[@]}"; do
+  if [[ "$c" == "ledger" || "$c" == "ledger-cli" ]]; then
+    if command -v "$c" >/dev/null 2>&1; then
+      LEDGER_BIN="$c"
+      break
     fi
-elif command -v ledger-cli >/dev/null 2>&1; then
-  if ! ledger-cli verify --format json > "$OUT_DIR/ledger_verify.json"; then
-    cat > "$OUT_DIR/ledger_verify.json" <<'JSON'
-{"collected": false, "reason": "ledger-cli verify failed"}
-JSON
+  else
+    if [[ -x "$c" ]]; then
+      LEDGER_BIN="$c"
+      break
     fi
-else
+  fi
+done
+
+LEDGER_DIR="${VMCC_LEDGER_DIR:-../vm-ledger/log}"
+if [[ ! -d "$LEDGER_DIR" ]]; then
+  cat > "$OUT_DIR/ledger_verify.json" <<JSON
+{"collected": false, "reason": "ledger dir not found: $LEDGER_DIR"}
+JSON
+  exit 0
+fi
+
+if [[ -z "$LEDGER_BIN" ]]; then
   cat > "$OUT_DIR/ledger_verify.json" <<'JSON'
 {"collected": false, "reason": "ledger CLI not found"}
+JSON
+  exit 0
+fi
+
+if ! "$LEDGER_BIN" verify --dir "$LEDGER_DIR" --format json > "$OUT_DIR/ledger_verify.json" 2> "$OUT_DIR/ledger_verify.stderr"; then
+  cat > "$OUT_DIR/ledger_verify.json" <<JSON
+{"collected": false, "reason": "$(basename "$LEDGER_BIN") verify failed"}
 JSON
 fi

config/pins.yaml

@@ -1,2 +1,2 @@
 version: "1.0.0"
-constitution_sha256: ""
+constitution_sha256: "23bd0cf58ddb19a2664ecaf093de724b71aa2fa330624906199c7acd807700ff"

config/sources.yaml

@@ -1,25 +1,24 @@
-# Define evidence sources and where collectors should look.
-# Keep paths external to code so collectors are layout-agnostic.
-
-vm_skills:
-  path: "../vm-skills"
-  evidence:
-    - "*/outputs/status_matrix.json"
-    - "*/outputs/audit_report.md"
-    - "*/outputs/PROOF.json"
-    - "*/outputs/ROOT.txt"
+version: "1.0.0"
 
 ops:
   path: "../vm-ops"
   evidence:
     - "20-identity/**"
-    - "60-backups/**"
-    - "70-audits/**"
+    - "60-backups/**/*"
+    - "70-audits/**/*"
 
 vm_ledger:
   path: "../vm-ledger"
   evidence:
     - "log/entries.cborseq"
+    - "target/release/ledger-cli"
+    - "target/debug/ledger-cli"
+
+vm_skills:
+  path: "../vm-skills"
+  evidence:
+    - "*/outputs/**/*restore*drill*.json"
+    - "*/outputs/**/*.json"
 
 vm_mcp:
   path: "../vm-mcp"

scripts/vmcc

@@ -24,30 +24,44 @@ hash_file() {
 }
 
 write_manifest() {
+  require_cmd jq
   local manifest="$EVID_DIR/manifest.json"
   local ts
   ts="$(iso_utc_now)"
-  {
-    echo "{"
-    echo "  \"version\": \"1.0.0\","
-    echo "  \"collected_at\": \"${ts}\","
-    echo "  \"run_id\": \"${RUN_ID}\","
-    echo "  \"files\": ["
-    local first=1
-    while IFS= read -r file; do
+
+  if sort -z --version >/dev/null 2>&1; then
+    find "$EVID_DIR" -type f ! -name "manifest.json" -print0 \
+      | LC_ALL=C sort -z \
+      | while IFS= read -r -d '' file; do
           local rel
           rel="${file#$ROOT/}"
           local sha
           sha="$(hash_file "$file")"
-      if [[ $first -eq 0 ]]; then
-        echo "    ,"
+          jq -n --arg path "$rel" --arg sha "$sha" '{path:$path, sha256:$sha}'
+        done \
+      | jq -s --arg ts "$ts" --arg run "$RUN_ID" '{
+          version: "1.0.0",
+          collected_at: $ts,
+          run_id: $run,
+          files: .
+        }' > "$manifest"
+  else
+    find "$EVID_DIR" -type f ! -name "manifest.json" \
+      | LC_ALL=C sort \
+      | while IFS= read -r file; do
+          local rel
+          rel="${file#$ROOT/}"
+          local sha
+          sha="$(hash_file "$file")"
+          jq -n --arg path "$rel" --arg sha "$sha" '{path:$path, sha256:$sha}'
+        done \
+      | jq -s --arg ts "$ts" --arg run "$RUN_ID" '{
+          version: "1.0.0",
+          collected_at: $ts,
+          run_id: $run,
+          files: .
+        }' > "$manifest"
   fi
-      first=0
-      echo "    {\"path\": \"${rel}\", \"sha256\": \"${sha}\"}"
-    done < <(find "$EVID_DIR" -type f ! -name "manifest.json" | sort)
-    echo "  ]"
-    echo "}"
-  } > "$manifest"
 }
 
 run_collect() {
@@ -110,9 +124,7 @@ case "$CMD" in
     run_collect
     run_evaluate
     run_report
-    require_cmd jq
-    FAILED_COUNT="$(jq -s '[.[] | select(.passed==false)] | length' "$RULE_DIR"/*.json)"
-    if [[ "$FAILED_COUNT" -ne 0 ]]; then
+    if jq -e -s 'map(select(.passed == false)) | length > 0' "$RULE_DIR"/*.json >/dev/null; then
       exit 3
     fi
     ;;