forge-workflow 0.0.5 → 0.0.6

package/scripts/smart-status.sh

@@ -112,6 +112,28 @@ 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).
+_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 +180,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 +198,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 +717,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 +761,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-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,9 @@ function detectPackageManager() {
 const pkgManager = detectPackageManager();
 console.log(`🧪 Running test suite (${pkgManager} test)...`);
 
-const result = spawnSync(pkgManager, ['test'], { stdio: 'inherit', shell: isWindows });
+// 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 });
 
 if (result.error) {
   console.error('');