forge-workflow 0.0.5 → 0.0.7

package/scripts/smart-status.sh

@@ -20,8 +20,24 @@
 
 set -euo pipefail
 
+# ── Source cross-dev awareness scripts ────────────────────────────────
+# file-index.sh: file_index_read for reading file index entries
+# sync-utils.sh: get_session_identity for current developer identity
+
+_SMART_STATUS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+if [ -f "$_SMART_STATUS_DIR/lib/sanitize.sh" ]; then
+  source "$_SMART_STATUS_DIR/lib/sanitize.sh"
+fi
+if [ -f "$_SMART_STATUS_DIR/file-index.sh" ]; then
+  source "$_SMART_STATUS_DIR/file-index.sh"
+fi
+if [ -f "$_SMART_STATUS_DIR/sync-utils.sh" ]; then
+  source "$_SMART_STATUS_DIR/sync-utils.sh"
+fi
+
 # ── Helpers ──────────────────────────────────────────────────────────────
 
+if ! declare -F sanitize >/dev/null; then
 # Sanitize a string: strip shell-injection patterns (OWASP A03)
 # Removes: double quotes, $(...), backticks, semicolons, and newlines
 sanitize() {
@@ -38,17 +54,6 @@ sanitize() {
   val="$(printf '%s' "$val" | tr '\n' ' ')"
   printf '%s' "$val"
 }
-
-# ── Source cross-dev awareness scripts ────────────────────────────────
-# file-index.sh: file_index_read for reading file index entries
-# sync-utils.sh: get_session_identity for current developer identity
-
-_SMART_STATUS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-if [ -f "$_SMART_STATUS_DIR/file-index.sh" ]; then
-  source "$_SMART_STATUS_DIR/file-index.sh"
-fi
-if [ -f "$_SMART_STATUS_DIR/sync-utils.sh" ]; then
-  source "$_SMART_STATUS_DIR/sync-utils.sh"
 fi
 
 # ── Dependency check ────────────────────────────────────────────────────
@@ -112,6 +117,33 @@ done
 
 # ── Fetch issues ────────────────────────────────────────────────────────
 
+# Auto-recover beads database if Dolt server lost the database (e.g. branch
+# switch, fresh clone, server restart).  Checks for the specific "database
+# not found" error, runs bd init --force + bd backup restore, then retries.
+# Capture stderr into variable (2>&1 redirects stderr to stdout for capture,
+# then >/dev/null discards original stdout so only errors remain).
+if ! command -v "$BD" >/dev/null 2>&1; then
+  echo "Error: bd is required but not found." >&2
+  exit 1
+fi
+
+_bd_list_err="$("$BD" list --json --limit 0 2>&1 >/dev/null || true)"
+if printf '%s' "$_bd_list_err" | grep -qi "database.*not found"; then
+  # Derive prefix from repo root directory name (not pwd, which could be a subdirectory)
+  _repo_root="$("$GIT" rev-parse --show-toplevel 2>/dev/null || pwd)"
+  _bd_prefix="$(basename "$_repo_root" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]-' '-' | sed 's/^-//;s/-$//')"
+  echo "Beads database not found — attempting auto-recovery..." >&2
+  if "$BD" init --force --prefix "$_bd_prefix" >/dev/null 2>&1; then
+    if [ -d "$_repo_root/.beads/backup" ] && ls "$_repo_root/.beads/backup"/*.jsonl >/dev/null 2>&1; then
+      "$BD" backup restore >/dev/null 2>&1 && echo "Beads: restored from backup." >&2 || echo "Beads: backup restore failed." >&2
+    else
+      echo "Beads: initialized fresh (no backup found)." >&2
+    fi
+  else
+    echo "Beads: auto-recovery failed — run 'bd doctor' manually." >&2
+  fi
+fi
+
 ISSUES_JSON="$("$BD" list --json --limit 0 2>/dev/null || echo '[]')"
 
 # Bail early on empty
@@ -158,11 +190,15 @@ SCORED_JSON="$(printf '%s' "$ISSUES_JSON" | jq --argjson epic_stats "$EPIC_STATS
   [.[] | . as $issue |
 
     # Priority weight: P0=5, P1=4, P2=3, P3=2, P4=1, default=1
-    (if .priority == "P0" then 5
-     elif .priority == "P1" then 4
-     elif .priority == "P2" then 3
-     elif .priority == "P3" then 2
-     elif .priority == "P4" then 1
+    # Normalize priority to number (beads 0.62+ sends numbers, older sends strings)
+    ((.priority // 2) | if type == "string" then
+      (if . == "P0" then 0 elif . == "P1" then 1 elif . == "P2" then 2 elif . == "P3" then 3 elif . == "P4" then 4 else 5 end)
+    else . end) as $pri_num |
+    (if $pri_num == 0 then 5
+     elif $pri_num == 1 then 4
+     elif $pri_num == 2 then 3
+     elif $pri_num == 3 then 2
+     elif $pri_num == 4 then 1
      else 1 end) as $priority_weight |
 
     # Unblock chain: dependent_count + 1 (min 1).
@@ -172,9 +208,10 @@ SCORED_JSON="$(printf '%s' "$ISSUES_JSON" | jq --argjson epic_stats "$EPIC_STATS
     (((.dependent_count // 0) + 1) | if . < 1 then 1 else . end) as $unblock_chain |
 
     # Type weight: bug=1.2, feature=1.0, task=0.8, default=1.0
-    (if .type == "bug" then 1.2
-     elif .type == "feature" then 1.0
-     elif .type == "task" then 0.8
+    # Handle null type from beads 0.62+
+    (if (.type // "task") == "bug" then 1.2
+     elif (.type // "task") == "feature" then 1.0
+     elif (.type // "task") == "task" then 0.8
      else 1.0 end) as $type_weight |
 
     # Status boost: in_progress=1.5, open=1.0, default=1.0
@@ -690,7 +727,7 @@ else
       (if .status == "in_progress" then "RESUME"
        elif (.dependent_count // 0) >= 2 then "UNBLOCK_CHAINS"
        elif (.dependency_count // 0) > 0 and .status != "closed" then "BLOCKED"
-       elif .priority == "P4" then "BACKLOG"
+       elif (.priority == "P4" or .priority == 4) then "BACKLOG"
        else "READY_WORK"
        end) as $group |
       # Flag in_progress issues that have active blockers
@@ -734,7 +771,7 @@ else
         (if $item.blocked_resume then " !! BLOCKED by dependencies" else "" end) as $blocked_warn |
         "ENTRY:" + $item.group + ":" +
           $rank + ". [" + ($item.score | tostring) + "] " +
-          $item.id + " (" + ($item.priority // "-") + " " + ($item.type // "-") + ") -- " +
+          $item.id + " (" + (if ($item.priority | type) == "number" then "P" + ($item.priority | tostring) else ($item.priority // "-" | tostring) end) + " " + ($item.type // "-" | tostring) + ") -- " +
           ($item.title // "-") + " " + $status_tag + $stale + $blocked_warn + $unblocks
       ),
       ""

package/scripts/sync-commands.js

@@ -12,6 +12,10 @@
  */
 
 const YAML = require('yaml');
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const { listCodexSkillEntries } = require('../lib/codex-skills');
 
 /**
  * Parse YAML frontmatter from a markdown string.
@@ -293,9 +297,14 @@ function adaptForAgent(agentName, frontmatter, body, commandName) {
 
 // ---- Sync logic -----------------------------------------------------------------
 
-const fs = require('fs');
-const path = require('path');
-const crypto = require('crypto');
+function resolveCanonicalCommandsDir(repoRoot) {
+  const candidates = [
+    path.join(repoRoot, 'commands'),
+    path.join(repoRoot, '.claude', 'commands'),
+  ];
+
+  return candidates.find(candidate => fs.existsSync(candidate)) || null;
+}
 
 /**
  * Compute a content hash for change detection.
@@ -310,6 +319,25 @@ function contentHash(content) {
   return crypto.createHash('sha256').update(normalized).digest('hex');
 }
 
+/**
+ * Write the sync manifest for generated entries without rewriting command files.
+ *
+ * @param {string} repoRoot
+ * @param {SyncEntry[]} entries
+ */
+function writeSyncManifest(repoRoot, entries) {
+  const manifestDir = path.join(repoRoot, '.forge');
+  fs.mkdirSync(manifestDir, { recursive: true });
+  const manifestData = {
+    generatedAt: new Date().toISOString(),
+    files: entries.map((e) => path.relative(repoRoot, e.filePath).replace(/\\/g, '/')),
+  };
+  fs.writeFileSync(
+    path.join(manifestDir, 'sync-manifest.json'),
+    JSON.stringify(manifestData, null, 2) + '\n'
+  );
+}
+
 /**
  * @typedef {Object} SyncEntry
  * @property {string} agent - Agent slug
@@ -339,11 +367,11 @@ function contentHash(content) {
  * - `check: true` — compares generated content with existing files, reports mismatches
  * - default (both false) — writes files, creating directories as needed
  *
- * @param {{ dryRun: boolean, check: boolean, repoRoot: string }} options
+ * @param {{ dryRun: boolean, check: boolean, repoRoot: string, canonicalDir?: string | null }} options
  * @returns {SyncResult}
  */
-function syncCommands({ dryRun, check, repoRoot }) {
-  const commandsDir = path.join(repoRoot, '.claude', 'commands');
+function syncCommands({ dryRun, check, repoRoot, canonicalDir = null }) {
+  const commandsDir = canonicalDir || resolveCanonicalCommandsDir(repoRoot) || path.join(repoRoot, '.claude', 'commands');
 
   // Read all .md files from the commands directory
   /** @type {string[]} */
@@ -474,16 +502,7 @@ function syncCommands({ dryRun, check, repoRoot }) {
 
   // Write sync manifest — records every file generated so stale detection
   // can identify orphaned files without false-flagging custom files.
-  const manifestDir = path.join(repoRoot, '.forge');
-  fs.mkdirSync(manifestDir, { recursive: true });
-  const manifestData = {
-    generatedAt: new Date().toISOString(),
-    files: written.map((e) => path.relative(repoRoot, e.filePath).replace(/\\/g, '/')),
-  };
-  fs.writeFileSync(
-    path.join(manifestDir, 'sync-manifest.json'),
-    JSON.stringify(manifestData, null, 2) + '\n'
-  );
+  writeSyncManifest(repoRoot, written);
 
   return { written, overwritten };
 }
@@ -506,7 +525,7 @@ if (require.main === module) {
 
   if (dryRun) {
     if (result.planned.length === 0) {
-      console.log('No command files found in .claude/commands/');
+      console.log('No command files found in commands/ or .claude/commands/');
     } else {
       console.log('Dry run — files that would be generated:\n');
       for (const entry of result.planned) {
@@ -516,7 +535,7 @@ if (require.main === module) {
     }
   } else if (check) {
     if (result.empty) {
-      console.error('Error: no command files found in .claude/commands/ — cannot verify sync.');
+      console.error('Error: no command files found in commands/ or .claude/commands/ — cannot verify sync.');
       process.exit(1);
     }
     if (result.manifestMissing) {
@@ -561,11 +580,21 @@ if (require.main === module) {
     }
 
     if (result.written.length === 0) {
-      console.log('No command files found in .claude/commands/');
+      console.log('No command files found in commands/ or .claude/commands/');
     } else {
       console.log(`Synced ${result.written.length} file(s) across agents.`);
     }
   }
 }
 
-module.exports = { parseFrontmatter, buildFile, AGENT_ADAPTERS, adaptForAgent, syncCommands };
+module.exports = {
+  parseFrontmatter,
+  buildFile,
+  AGENT_ADAPTERS,
+  adaptForAgent,
+  listCodexSkillEntries,
+  syncCommands,
+  contentHash,
+  resolveCanonicalCommandsDir,
+  writeSyncManifest,
+};

package/scripts/sync-utils.sh

@@ -11,6 +11,10 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   set -euo pipefail
 fi
 
+# Source shared sanitize library
+_SU_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$_SU_SCRIPT_DIR/lib/sanitize.sh"
+
 # ── Session Identity ───────────────────────────────────────────────────
 
 # Validates a session identity string against the allowlist regex.
@@ -76,28 +80,6 @@ get_session_identity() {
   printf '%s' "$identity"
 }
 
-# ── Input Sanitization ─────────────────────────────────────────────────
-
-# Sanitize a config value: strip shell-injection patterns (OWASP A03).
-# Removes: backticks, $(...), semicolons, pipes, newlines.
-# Usage: sanitized="$(sanitize_config_value "$raw")"
-sanitize_config_value() {
-  local val="$1"
-  # Remove backtick command substitution
-  val="${val//\`/}"
-  # Remove $(...) command substitution patterns (loop handles nested)
-  val="$(printf '%s' "$val" | sed -e ':loop' -e 's/\$([^()]*)//g' -e 't loop')"
-  # Remove semicolons (command chaining)
-  val="${val//;/}"
-  # Remove pipes (command chaining)
-  val="${val//|/}"
-  # Collapse newlines to spaces
-  val="$(printf '%s' "$val" | tr '\n' ' ')"
-  # Trim leading/trailing whitespace
-  val="$(printf '%s' "$val" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-  printf '%s' "$val"
-}
-
 # ── Config Reading ─────────────────────────────────────────────────────
 
 # Read a key from .beads/config.json (JSON format).
@@ -277,25 +259,37 @@ _SYNC_STALENESS_THRESHOLD=900
 # On success: records Unix epoch timestamp to .beads/.last-sync
 #             and updates file index from all in-progress issues' task files.
 #
+# _run_sync — execute beads sync (pull + push).
+# If BD_SYNC_CMD is set, run it as a single command (for testing).
+# Otherwise, run the default two-step pull+push sequence.
+# shellcheck disable=SC2086
+_run_sync() {
+  if [[ -n "${BD_SYNC_CMD:-}" ]]; then
+    $BD_SYNC_CMD
+  else
+    bd dolt pull && bd dolt push
+  fi
+}
+
 # Environment overrides (for testing):
-#   BD_SYNC_CMD — command to run instead of `bd sync` (default: "bd sync")
+#   BD_SYNC_CMD — single command to run instead of default pull+push (e.g. "echo mock-sync")
 #   FILE_INDEX_ROOT — root directory for file-index.sh (default: repo_dir)
 auto_sync() {
   local repo_dir="${1:-.}"
-  local sync_cmd="${BD_SYNC_CMD:-bd sync}"
   local last_sync_file="$repo_dir/.beads/.last-sync"
 
   # Ensure .beads directory exists
   mkdir -p "$repo_dir/.beads"
 
-  # Run bd sync (or mock) — use $sync_cmd without eval to prevent injection
-  # shellcheck disable=SC2086
-  if $sync_cmd >/dev/null 2>&1; then
+  # Run sync — helper function avoids eval while supporting compound default
+  if _run_sync >/dev/null 2>&1; then
     # Success: record timestamp
     date +%s > "$last_sync_file"
 
     # Update file index from in-progress issues' task files
-    _auto_sync_update_file_index "$repo_dir"
+    _auto_sync_update_file_index "$repo_dir" || {
+      echo "Warning: file index update failed after sync" >&2
+    }
   else
     # Failure: warn but continue (non-blocking)
     local last_ts="unknown"
@@ -340,7 +334,8 @@ _auto_sync_update_file_index() {
 
   # Check jq is available
   if ! command -v jq &>/dev/null; then
-    return 0
+    echo "Warning: jq not found — file index update skipped" >&2
+    return 1
   fi
 
   # Extract in-progress issue IDs (LWW resolution: group by id, take last, filter in_progress)

package/scripts/test.js

@@ -22,7 +22,24 @@ function detectPackageManager() {
 const pkgManager = detectPackageManager();
 console.log(`🧪 Running test suite (${pkgManager} test)...`);
 
-const result = spawnSync(pkgManager, ['test'], { stdio: 'inherit', shell: isWindows });
+// Strip git hook environment variables so child processes (especially tests
+// that create temp git repos) never accidentally operate on the real worktree.
+// During pre-push hooks, git sets GIT_DIR pointing to the repo — any test that
+// runs `git init` / `git commit` in a temp dir inherits this and silently
+// commits into the worktree instead, creating rogue "initial commit" that
+// deletes the entire codebase.
+const env = { ...process.env };
+for (const key of Object.keys(env)) {
+  if (key === 'GIT_DIR' || key === 'GIT_WORK_TREE' || key === 'GIT_INDEX_FILE'
+    || key === 'GIT_OBJECT_DIRECTORY' || key === 'GIT_ALTERNATE_OBJECT_DIRECTORIES'
+    || key === 'GIT_QUARANTINE_PATH') {
+    delete env[key];
+  }
+}
+
+// Use 'run test' to invoke the package.json script (which may include --timeout flags)
+// 'bun test' is a built-in that ignores package.json scripts
+const result = spawnSync(pkgManager, ['run', 'test'], { stdio: 'inherit', shell: isWindows, env });
 
 if (result.error) {
   console.error('');