forge-workflow 0.0.9 → 0.1.0-beta.2

package/scripts/forge-team/tests/sync-github.test.sh

@@ -3,16 +3,17 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
-# ── Setup temp dir for test isolation ────────────────────────────────────
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP" "$mock_dir"' EXIT
 
-# ── Create mock dir and log file ─────────────────────────────────────────
-mock_dir="$(mktemp -d /c/tmp/forge-sync-test.XXXXXX)"
+mock_dir="$(mktemp -d)"
+portable_bin="$(mktemp -d)"
 log_file="$mock_dir/calls.log"
 touch "$log_file"
+REAL_GREP="$(command -v grep)"
+ORIGINAL_PATH="$PATH"
+export REAL_GREP
 
-# ── Mock gh ──────────────────────────────────────────────────────────────
 cat > "$mock_dir/gh" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
@@ -23,45 +24,57 @@ case "$1 $2" in
   "issue comment") echo ""; exit 0 ;;
   "api user") echo "testuser"; exit 0 ;;
 esac
-echo "unknown gh command: $*" >&2; exit 1
+echo "unknown gh command: $*" >&2
+exit 1
 MOCK
 chmod +x "$mock_dir/gh"
 
-# ── Mock bd ──────────────────────────────────────────────────────────────
-cat > "$mock_dir/bd" << 'MOCK'
+# Mock forge: `issue show --json` carries the github_issue:<n> association as a
+# label; `issue update --label` records it. Args are logged for assertions.
+cat > "$mock_dir/forge" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
-case "$1" in
-  show)
-    echo "○ $2 · Test Issue [github_issue:42]"
-    echo "Title: Test Issue"
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-001","title":"Test Issue","labels":["github_issue:42"]}}}\n'
     ;;
-  set-state) echo "State set" ;;
+  "issue update") echo "Updated" ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd"
+chmod +x "$mock_dir/forge"
 
-# ── Mock bd that returns NO github_issue ─────────────────────────────────
-cat > "$mock_dir/bd-no-gh" << 'MOCK'
+cat > "$mock_dir/forge-no-gh" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
-case "$1" in
-  show)
-    echo "○ $2 · Test Issue"
-    echo "Title: Test Issue"
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-999","title":"Test Issue","labels":[]}}}\n'
     ;;
-  set-state) echo "State set" ;;
+  "issue update") echo "Updated" ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd-no-gh"
+chmod +x "$mock_dir/forge-no-gh"
+
+cat > "$portable_bin/grep" << 'MOCK'
+#!/usr/bin/env bash
+for arg in "$@"; do
+  case "$arg" in
+    -P|--perl-regexp|-*P*)
+      echo "grep: PCRE support disabled for test" >&2
+      exit 2
+      ;;
+  esac
+done
+exec "$REAL_GREP" "$@"
+MOCK
+chmod +x "$portable_bin/grep"
 
-# Export env for mocks
 export LOG_FILE="$log_file"
 export GH_CMD="$mock_dir/gh"
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 export TEAM_MAP_ROOT="$TEST_TMP"
+mapping_file="$TEAM_MAP_ROOT/.github/beads-mapping.json"
 
-# Source the library under test
 source "$SCRIPT_DIR/lib/sync-github.sh"
 
 PASS=0
@@ -70,140 +83,231 @@ FAIL=0
 assert_eq() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" == "$expected" ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected '$expected', got '$actual')"
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected '$expected', got '$actual')"
   fi
 }
 
 assert_contains() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" == *"$expected"* ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected to contain '$expected', got '$actual')"
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected to contain '$expected', got '$actual')"
+  fi
+}
+
+assert_not_contains() {
+  local label="$1" unexpected="$2" actual="$3"
+  if [[ "$actual" == *"$unexpected"* ]]; then
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (did not expect '$unexpected', got '$actual')"
+  else
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   fi
 }
 
 assert_exit() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" -eq "$expected" ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected exit $expected, got $actual)"
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected exit $expected, got $actual)"
   fi
 }
 
-# ── Test 1: sync_issue_create — creates GitHub issue, calls bd set-state ─
-echo "── Test 1: sync_issue_create ──"
-> "$log_file"  # clear log
+echo "== Test 1: sync_issue_create =="
+> "$log_file"
 rc=0
 sync_issue_create "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
-# Check gh was called with issue create
 log_contents="$(cat "$log_file")"
 assert_contains "gh issue create called" "issue create" "$log_contents"
 assert_contains "title includes Test Issue" "Test Issue" "$log_contents"
 assert_contains "body includes beads-001" "beads-001" "$log_contents"
-# Check bd set-state was called with github_issue=42
-assert_contains "bd set-state called" "set-state" "$log_contents"
-assert_contains "github_issue=42 set" "github_issue=42" "$log_contents"
+assert_contains "sync create writes github_issue label" "github_issue:42" "$log_contents"
+assert_contains "sync create calls issue update for the label" "issue update" "$log_contents"
+assert_contains "sync create persists mapping entry" '"42": "beads-001"' "$(cat "$mapping_file")"
 
-# ── Test 2: sync_issue_claim — updates GitHub assignee ───────────────────
-echo ""
-echo "── Test 2: sync_issue_claim ──"
+echo
+echo "== Test 2: sync_issue_claim =="
 > "$log_file"
 unset _GITHUB_USER_CACHE
 rc=0
 sync_issue_claim "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue edit called" "issue edit" "$log_contents"
 assert_contains "add-assignee used" "--add-assignee" "$log_contents"
 assert_contains "assignee is testuser" "testuser" "$log_contents"
 
-# ── Test 3: sync_issue_status — removes old labels, adds new one ─────────
-echo ""
-echo "── Test 3: sync_issue_status ──"
+echo
+echo "== Test 3: sync_issue_status =="
 > "$log_file"
 rc=0
 sync_issue_status "beads-001" "in_progress" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue edit called" "issue edit" "$log_contents"
 assert_contains "removes status/open" "--remove-label status/open" "$log_contents"
 assert_contains "adds status/in-progress" "--add-label status/in-progress" "$log_contents"
 
-# ── Test 4: sync_issue_close — closes GitHub issue ───────────────────────
-echo ""
-echo "── Test 4: sync_issue_close ──"
+echo
+echo "== Test 4: sync_issue_close =="
 > "$log_file"
 rc=0
 sync_issue_close "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue close called" "issue close" "$log_contents"
 assert_contains "closes issue 42" " 42" "$log_contents"
 
-# ── Test 5: sync_issue_deps — adds comment on GitHub issue ───────────────
-echo ""
-echo "── Test 5: sync_issue_deps ──"
+echo
+echo "== Test 5: sync_issue_deps =="
 > "$log_file"
 rc=0
 sync_issue_deps "beads-001" "beads-002" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue comment called" "issue comment" "$log_contents"
 assert_contains "Blocked by referenced" "Blocked by #42" "$log_contents"
 
-# ── Test 6: _get_github_issue_number — extracts number from bd show ──────
-echo ""
-echo "── Test 6: _get_github_issue_number ──"
+echo
+echo "== Test 6: _get_github_issue_number =="
 result="$(_get_github_issue_number "beads-001")"
 assert_eq "extracts issue number 42" "42" "$result"
+log_contents="$(cat "$log_file")"
+assert_contains "_get_github_issue_number uses JSON" "--json" "$log_contents"
+
+echo
+echo "== Test 7: Mapping fallback when canonical GitHub number missing =="
+mkdir -p "$(dirname "$mapping_file")"
+cat > "$mapping_file" << 'JSON'
+{
+  "77": "beads-999"
+}
+JSON
+export FORGE_CMD="$mock_dir/forge-no-gh"
+result="$(_get_github_issue_number "beads-999")"
+assert_eq "mapping fallback returns issue number 77" "77" "$result"
+export FORGE_CMD="$mock_dir/forge"
+
+echo
+echo "== Test 8: Mapping fallback returns newest issue number =="
+cat > "$mapping_file" << 'JSON'
+{
+  "77": "beads-999",
+  "91": "beads-999",
+  "88": "beads-other"
+}
+JSON
+export FORGE_CMD="$mock_dir/forge-no-gh"
+result="$(_get_github_issue_number "beads-999")"
+assert_eq "mapping fallback returns newest matching issue number" "91" "$result"
+export FORGE_CMD="$mock_dir/forge"
 
-# ── Test 7: Missing GitHub issue number → returns error ──────────────────
-echo ""
-echo "── Test 7: Missing GitHub issue number ──"
-export BD_CMD="$mock_dir/bd-no-gh"
+echo
+echo "== Test 9: Missing canonical GitHub number =="
+rm -f "$mapping_file"
+export FORGE_CMD="$mock_dir/forge-no-gh"
 rc=0
 result="$(_get_github_issue_number "beads-999" 2>/dev/null)" || rc=$?
-assert_exit "returns error when no github_issue" 1 "$rc"
-# Restore normal bd mock
-export BD_CMD="$mock_dir/bd"
-
-# ── Test 8: Injection in issue title → sanitized before gh call ──────────
-echo ""
-echo "── Test 8: Injection in title sanitized ──"
-# Create a bd mock that returns injection-laden title
-cat > "$mock_dir/bd-inject" << 'MOCK'
+assert_exit "returns error when no canonical github number" 1 "$rc"
+export FORGE_CMD="$mock_dir/forge"
+
+echo
+echo "== Test 10: github_issue label lookup =="
+cat > "$mock_dir/forge-legacy" << 'MOCK'
+#!/usr/bin/env bash
+echo "$*" >> "$LOG_FILE"
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-legacy","title":"Legacy Issue","labels":["github_issue:43"]}}}\n'
+    ;;
+  "issue update") echo "Updated" ;;
+esac
+MOCK
+chmod +x "$mock_dir/forge-legacy"
+export FORGE_CMD="$mock_dir/forge-legacy"
+rc=0
+result="$(_get_github_issue_number "beads-legacy" 2>/dev/null)" || rc=$?
+assert_exit "legacy github_issue exits successfully" 0 "$rc"
+assert_eq "legacy github_issue returns number" "43" "$result"
+export FORGE_CMD="$mock_dir/forge"
+
+echo
+echo "== Test 11: Injection in title sanitized =="
+cat > "$mock_dir/forge-inject" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
-case "$1" in
-  show)
-    echo '○ beads-inject · Evil $(rm -rf /) Issue [github_issue:99]'
-    echo 'Title: Evil $(rm -rf /) Issue'
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-inject","title":"Evil $(rm -rf /) Issue","labels":["github_issue:99"]}}}\n'
     ;;
-  set-state) echo "State set" ;;
+  "issue update") echo "Updated" ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd-inject"
-export BD_CMD="$mock_dir/bd-inject"
+chmod +x "$mock_dir/forge-inject"
+export FORGE_CMD="$mock_dir/forge-inject"
 > "$log_file"
 rc=0
 sync_issue_create "beads-inject" || rc=$?
 assert_exit "exit code 0 with injection" 0 "$rc"
 log_contents="$(cat "$log_file")"
-# The $(...) pattern must NOT appear in the gh call
 if [[ "$log_contents" == *'$(rm'* ]]; then
-  FAIL=$((FAIL + 1)); echo "  FAIL: injection NOT sanitized — \$(rm found in gh call"
+  FAIL=$((FAIL + 1))
+  echo "  FAIL: injection NOT sanitized - \$\(rm found in gh call"
 else
-  PASS=$((PASS + 1)); echo "  PASS: injection sanitized — no \$(rm in gh call"
+  PASS=$((PASS + 1))
+  echo "  PASS: injection sanitized - no \$\(rm in gh call"
 fi
-# Restore normal bd mock
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
+
+echo
+echo "== Test 11: sync_issue_create without grep -P =="
+export PATH="$portable_bin:$ORIGINAL_PATH"
+> "$log_file"
+rc=0
+sync_issue_create "beads-001" || rc=$?
+assert_exit "sync_issue_create works when grep -P is unavailable" 0 "$rc"
+log_contents="$(cat "$log_file")"
+assert_contains "gh issue create called without PCRE grep" "issue create" "$log_contents"
+export PATH="$ORIGINAL_PATH"
+
+echo
+echo "== Test 12: sync_issue_create reads title from issue show JSON =="
+cat > "$mock_dir/forge-summary-only" << 'MOCK'
+#!/usr/bin/env bash
+echo "$*" >> "$LOG_FILE"
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-summary","title":"Summary Only Title","labels":["github_issue:77"]}}}\n'
+    ;;
+  "issue update") echo "Updated" ;;
+esac
+MOCK
+chmod +x "$mock_dir/forge-summary-only"
+export FORGE_CMD="$mock_dir/forge-summary-only"
+> "$log_file"
+rc=0
+sync_issue_create "beads-summary" || rc=$?
+assert_exit "sync_issue_create works with title from issue show JSON" 0 "$rc"
+log_contents="$(cat "$log_file")"
+assert_contains "summary-only title is passed to gh issue create" "Summary Only Title" "$log_contents"
+export FORGE_CMD="$mock_dir/forge"
 
-# ── Results ──────────────────────────────────────────────────────────────
-echo ""
+echo
 echo "Results: $PASS passed, $FAIL failed"
 [[ $FAIL -eq 0 ]] && exit 0 || exit 1

package/scripts/forge-team/tests/verify.test.sh

@@ -7,7 +7,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP"' EXIT
 
-# Override TEAM_MAP_ROOT so tests don't touch real .beads/
+# Override TEAM_MAP_ROOT so tests don't touch real .forge/
 export TEAM_MAP_ROOT="$TEST_TMP"
 
 # ── Create mock directories ────────────────────────────────────────────
@@ -66,47 +66,34 @@ exit 1
 MOCK
 chmod +x "$mock_dir/gh-noauth"
 
-# ── Mock bd ────────────────────────────────────────────────────────────
-cat > "$mock_dir/bd" << 'MOCK'
+# ── Mock forge (emits Kernel-shaped issue list JSON) ───────────────────
+# The GitHub association lives in each issue's labels as github_issue:<n>.
+# Tests drive which issues appear via FORGE_MOCK_OPEN / FORGE_MOCK_INPROGRESS
+# (JSON arrays, each defaulting to []).
+cat > "$mock_dir/forge" << 'MOCK'
 #!/usr/bin/env bash
-case "$1" in
-  list)
-    if [[ -n "${BD_MOCK_OUTPUT:-}" ]]; then
-      echo "$BD_MOCK_OUTPUT"
-    fi
-    exit 0
-    ;;
-  show)
-    case "${2:-}" in
-      forge-aaa)
-        echo "◐ forge-aaa · Feature A [● P2 · IN_PROGRESS]"
-        echo "Owner: devone"
-        if [[ -z "${BD_MOCK_NO_GITHUB_AAA:-}" ]]; then
-          echo "State: github_issue:10"
-        fi
-        ;;
-      forge-bbb)
-        echo "○ forge-bbb · Feature B [● P2 · OPEN]"
-        echo "Owner: devtwo"
-        if [[ -z "${BD_MOCK_NO_GITHUB_BBB:-}" ]]; then
-          echo "State: github_issue:20"
-        fi
-        ;;
-      forge-ccc)
-        echo "◐ forge-ccc · Feature C [● P1 · IN_PROGRESS]"
-        echo "Owner: devone"
-        # forge-ccc never has github_issue (for orphan tests)
-        ;;
-    esac
-    exit 0
-    ;;
-esac
+args="$*"
+if [[ "$args" == *"issue list"* ]]; then
+  if [[ "$args" == *"--status=open"* ]]; then
+    printf '{"data":{"issues":%s}}\n' "${FORGE_MOCK_OPEN:-[]}"
+  elif [[ "$args" == *"--status=in_progress"* ]]; then
+    printf '{"data":{"issues":%s}}\n' "${FORGE_MOCK_INPROGRESS:-[]}"
+  else
+    printf '{"data":{"issues":[]}}\n'
+  fi
+  exit 0
+fi
 exit 0
 MOCK
-chmod +x "$mock_dir/bd"
+chmod +x "$mock_dir/forge"
+
+# Reusable issue fixtures (synced issues carry a github_issue:<n> label)
+ccc_orphan='{"id":"forge-ccc","title":"Feature C","status":"in_progress","assignee":"devone","labels":[],"dependencies":[]}'
+aaa_synced='{"id":"forge-aaa","title":"Feature A","status":"in_progress","assignee":"devone","labels":["github_issue:10"],"dependencies":[]}'
+bbb_synced='{"id":"forge-bbb","title":"Feature B","status":"open","assignee":"devtwo","labels":["github_issue:20"],"dependencies":[]}'
 
 export GH_CMD="$mock_dir/gh"
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 # Source the library under test
 source "$SCRIPT_DIR/lib/agent-prompt.sh"
@@ -158,11 +145,12 @@ echo "── Test 1: All clean → exit 0 ──"
 # Setup: identity exists in team map
 unset _GITHUB_USER_CACHE
 export GH_CMD="$mock_dir/gh"
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 team_map_add "testuser" "Test User"
 
-# No beads issues, no github issues
-export BD_MOCK_OUTPUT=""
+# No tracked issues, no github issues
+export FORGE_MOCK_OPEN="[]"
+export FORGE_MOCK_INPROGRESS="[]"
 export GH_MOCK_ISSUES="[]"
 
 # Create empty mapping file
@@ -194,10 +182,11 @@ echo "── Test 3: Orphan Beads issue detected ──"
 
 unset _GITHUB_USER_CACHE
 export GH_CMD="$mock_dir/gh"
-export BD_MOCK_OUTPUT="◐ forge-ccc · Feature C"
+export FORGE_MOCK_OPEN="[]"
+export FORGE_MOCK_INPROGRESS="[$ccc_orphan]"
 export GH_MOCK_ISSUES="[]"
 
-# forge-ccc has no github_issue state (see mock bd above)
+# forge-ccc carries no github_issue label (see fixtures above)
 rc=0
 output="$(cmd_verify 2>&1)" || rc=$?
 assert_exit "orphan beads exits 1" 1 "$rc"
@@ -210,7 +199,8 @@ echo "── Test 4: Orphan GitHub issue detected ──"
 
 unset _GITHUB_USER_CACHE
 export GH_CMD="$mock_dir/gh"
-export BD_MOCK_OUTPUT=""
+export FORGE_MOCK_OPEN="[]"
+export FORGE_MOCK_INPROGRESS="[]"
 export GH_MOCK_ISSUES='[{"number":42,"title":"Some feature"},{"number":45,"title":"Another feature"}]'
 
 # Mapping file has neither #42 nor #45
@@ -231,8 +221,8 @@ unset _GITHUB_USER_CACHE
 export GH_CMD="$mock_dir/gh"
 
 # Setup: forge-aaa has github_issue:10, forge-bbb has github_issue:20
-export BD_MOCK_OUTPUT="◐ forge-aaa · Feature A
-○ forge-bbb · Feature B"
+export FORGE_MOCK_OPEN="[$bbb_synced]"
+export FORGE_MOCK_INPROGRESS="[$aaa_synced]"
 
 # Create mapping with both issues
 cat > "$TEST_TMP/.github/beads-mapping.json" << 'EOF'
@@ -300,7 +290,8 @@ echo "── Test 6: No issues at all → exit 0 ──"
 
 unset _GITHUB_USER_CACHE
 export GH_CMD="$mock_dir/gh"
-export BD_MOCK_OUTPUT=""
+export FORGE_MOCK_OPEN="[]"
+export FORGE_MOCK_INPROGRESS="[]"
 export GH_MOCK_ISSUES="[]"
 echo '{}' > "$TEST_TMP/.github/beads-mapping.json"
 

package/scripts/forge-team/tests/workflow-integration.test.sh

@@ -31,11 +31,11 @@ assert_contains_file "ship calls sync" "forge-team.*sync" "$SHIP"
 assert_contains_file "ship calls verify" "forge-team.*verify" "$SHIP"
 
 echo ""
-echo "── Sync check ──"
-if node "$SCRIPT_DIR/scripts/sync-commands.js" --check 2>&1 | grep -qi 'error\|drift\|mismatch'; then
-  FAIL=$((FAIL + 1)); echo "  FAIL: sync drift detected"
+echo "── Skill sync check ──"
+if (cd "$SCRIPT_DIR" && node -e "const r=require('./lib/skills-sync').checkSkillsSync({repoRoot:process.cwd()}); process.exit(r.inSync?0:1)"); then
+  PASS=$((PASS + 1)); echo "  PASS: all agent skill dirs in sync"
 else
-  PASS=$((PASS + 1)); echo "  PASS: all agent dirs in sync"
+  FAIL=$((FAIL + 1)); echo "  FAIL: skill drift detected"
 fi
 
 echo ""