forge-workflow 0.0.10 → 0.1.0-beta.2

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

@@ -10,7 +10,7 @@ TEST_TMP=""
 setup() {
   mkdir -p /c/tmp/forge-team-integ
   TEST_TMP="$(mktemp -d /c/tmp/forge-team-integ/run.XXXXXX)"
-  mkdir -p "$TEST_TMP/.beads" "$TEST_TMP/mock"
+  mkdir -p "$TEST_TMP/.forge" "$TEST_TMP/mock"
   export TEAM_MAP_ROOT="$TEST_TMP"
 }
 
@@ -18,7 +18,7 @@ teardown() {
   rm -rf "$TEST_TMP"
   unset TEAM_MAP_ROOT || true
   unset GH_CMD || true
-  unset BD_CMD || true
+  unset FORGE_CMD || true
 }
 
 assert_exit_code() {
@@ -64,32 +64,25 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"list --status=open,in_progress"*)
-    echo "◐ forge-t1 · Test Task 1"
-    echo "○ forge-t2 · Test Task 2" ;;
-  *"show forge-t1"*)
-    echo "◐ forge-t1 · Test Task 1 [● P2 · IN_PROGRESS]"
-    echo "Owner: testdev"
-    echo "Updated: 2026-03-27T10:00:00Z" ;;
-  *"show forge-t2"*)
-    echo "○ forge-t2 · Test Task 2 [● P3 · OPEN]"
-    echo "Owner: testdev"
-    echo "Updated: 2026-03-27T09:00:00Z" ;;
+  *"issue list"*"--status=in_progress"*)
+    printf '{"data":{"issues":[{"id":"forge-t1","title":"Test Task 1","status":"in_progress","assignee":"testdev","updated_at":"2026-03-27T10:00:00Z","dependencies":[]}]}}\n' ;;
+  *"issue list"*"--status=open"*)
+    printf '{"data":{"issues":[{"id":"forge-t2","title":"Test Task 2","status":"open","assignee":"testdev","updated_at":"2026-03-27T09:00:00Z","dependencies":[]}]}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   # Run identity auto-detect in subshell to avoid readonly clashes
   local id_rc
   bash -c '
     set -euo pipefail
-    export GH_CMD="'"$TEST_TMP"'/mock/gh" BD_CMD="'"$TEST_TMP"'/mock/bd" TEAM_MAP_ROOT="'"$TEST_TMP"'"
+    export GH_CMD="'"$TEST_TMP"'/mock/gh" FORGE_CMD="'"$TEST_TMP"'/mock/forge" TEAM_MAP_ROOT="'"$TEST_TMP"'"
     source "'"$SCRIPT_DIR"'/lib/identity.sh"
     _GITHUB_USER_CACHE=""
     auto_detect_identity
@@ -98,7 +91,7 @@ MOCK
 
   # Check team map has entry
   local map_content
-  map_content="$(cat "$TEST_TMP/.beads/team-map.jsonl" 2>/dev/null || echo "")"
+  map_content="$(cat "$TEST_TMP/.forge/team-map.jsonl" 2>/dev/null || echo "")"
   assert_contains "team map has testdev" "testdev" "$map_content"
 
   # Workload shows issues
@@ -125,26 +118,19 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"list --status=open,in_progress"*)
-    echo "◐ forge-aa · Task A"
-    echo "○ forge-bb · Task B" ;;
-  *"show forge-aa"*)
-    echo "◐ forge-aa · Task A [● P2 · IN_PROGRESS]"
-    echo "Owner: dev-a"
-    echo "Updated: 2026-03-27T10:00:00Z" ;;
-  *"show forge-bb"*)
-    echo "○ forge-bb · Task B [● P3 · OPEN]"
-    echo "Owner: dev-b"
-    echo "Updated: 2026-03-27T09:00:00Z" ;;
+  *"issue list"*"--status=in_progress"*)
+    printf '{"data":{"issues":[{"id":"forge-aa","title":"Task A","status":"in_progress","assignee":"dev-a","updated_at":"2026-03-27T10:00:00Z","dependencies":[]}]}}\n' ;;
+  *"issue list"*"--status=open"*)
+    printf '{"data":{"issues":[{"id":"forge-bb","title":"Task B","status":"open","assignee":"dev-b","updated_at":"2026-03-27T09:00:00Z","dependencies":[]}]}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   local output rc
   output="$(bash "$FORGE_TEAM" workload 2>&1)" && rc=$? || rc=$?
@@ -173,23 +159,24 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"show forge-claimed"*) echo "○ forge-claimed · Claimed [● P2 · OPEN] [github_issue:42]" ;;
+  *"issue show forge-claimed"*)
+    printf '{"data":{"issue":{"id":"forge-claimed","title":"Claimed","status":"open","labels":["github_issue:42"]}}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   # Run in subshell to avoid readonly clashes from re-sourcing
   local output rc
   output="$(
     bash -c '
       set -euo pipefail
-      export GH_CMD="'"$TEST_TMP"'/mock/gh" BD_CMD="'"$TEST_TMP"'/mock/bd" TEAM_MAP_ROOT="'"$TEST_TMP"'"
+      export GH_CMD="'"$TEST_TMP"'/mock/gh" FORGE_CMD="'"$TEST_TMP"'/mock/forge" TEAM_MAP_ROOT="'"$TEST_TMP"'"
       source "'"$SCRIPT_DIR"'/lib/claim.sh"
       _GITHUB_USER_CACHE=""
       pre_claim_check "forge-claimed" 2>&1
@@ -217,24 +204,22 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"list --status=open,in_progress"*)
-    echo "○ forge-orphan · Orphan Task" ;;
-  *"show forge-orphan"*)
-    echo "○ forge-orphan · Orphan Task [● P3 · OPEN]"
-    echo "Owner: testdev"
-    echo "Updated: 2026-03-27T10:00:00Z" ;;
+  *"issue list"*"--status=open"*)
+    printf '{"data":{"issues":[{"id":"forge-orphan","title":"Orphan Task","status":"open","assignee":"testdev","updated_at":"2026-03-27T10:00:00Z","labels":[],"dependencies":[]}]}}\n' ;;
+  *"issue list"*"--status=in_progress"*)
+    printf '{"data":{"issues":[]}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   # Seed team map so identity check passes
-  echo '{"github":"testdev","display_name":"testdev","updated_at":"2026-03-27T10:00:00Z","is_bot":false}' > "$TEST_TMP/.beads/team-map.jsonl"
+  echo '{"github":"testdev","display_name":"testdev","updated_at":"2026-03-27T10:00:00Z","is_bot":false}' > "$TEST_TMP/.forge/team-map.jsonl"
 
   local output rc
   output="$(bash "$FORGE_TEAM" verify 2>&1)" && rc=$? || rc=$?
@@ -261,19 +246,19 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"list"*) echo "" ;;
+  *"issue list"*) printf '{"data":{"issues":[]}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   # Seed team map so identity check passes
-  echo '{"github":"testdev","display_name":"testdev","updated_at":"2026-03-27T10:00:00Z","is_bot":false}' > "$TEST_TMP/.beads/team-map.jsonl"
+  echo '{"github":"testdev","display_name":"testdev","updated_at":"2026-03-27T10:00:00Z","is_bot":false}' > "$TEST_TMP/.forge/team-map.jsonl"
 
   # No mapping file — all GitHub issues should be orphans
   local output rc
@@ -299,26 +284,19 @@ esac
 MOCK
   chmod +x "$TEST_TMP/mock/gh"
 
-  cat > "$TEST_TMP/mock/bd" << 'MOCK'
+  cat > "$TEST_TMP/mock/forge" << 'MOCK'
 #!/usr/bin/env bash
 case "$*" in
-  *"list --status=open,in_progress"*)
-    echo "○ forge-bot1 · Bot Task"
-    echo "◐ forge-real · Real Task" ;;
-  *"show forge-bot1"*)
-    echo "○ forge-bot1 · Bot Task [● P4 · OPEN]"
-    echo "Owner: dependabot[bot]"
-    echo "Updated: 2026-03-27T10:00:00Z" ;;
-  *"show forge-real"*)
-    echo "◐ forge-real · Real Task [● P2 · IN_PROGRESS]"
-    echo "Owner: testdev"
-    echo "Updated: 2026-03-27T10:00:00Z" ;;
+  *"issue list"*"--status=in_progress"*)
+    printf '{"data":{"issues":[{"id":"forge-real","title":"Real Task","status":"in_progress","assignee":"testdev","updated_at":"2026-03-27T10:00:00Z","dependencies":[]}]}}\n' ;;
+  *"issue list"*"--status=open"*)
+    printf '{"data":{"issues":[{"id":"forge-bot1","title":"Bot Task","status":"open","assignee":"dependabot[bot]","updated_at":"2026-03-27T10:00:00Z","dependencies":[]}]}}\n' ;;
   *) exit 0 ;;
 esac
 MOCK
-  chmod +x "$TEST_TMP/mock/bd"
+  chmod +x "$TEST_TMP/mock/forge"
 
-  export GH_CMD="$TEST_TMP/mock/gh" BD_CMD="$TEST_TMP/mock/bd"
+  export GH_CMD="$TEST_TMP/mock/gh" FORGE_CMD="$TEST_TMP/mock/forge"
 
   local output rc
   output="$(bash "$FORGE_TEAM" workload 2>&1)" && rc=$? || rc=$?

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

@@ -29,43 +29,31 @@ exit 1
 MOCK
 chmod +x "$mock_dir/gh"
 
-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)
-    if [[ "${3:-}" == "--json" ]]; then
-      cat <<'JSON'
-{"id":"beads-001","github":{"number":42,"nodeId":"I_kwDOForge42","url":"https://github.com/test/repo/issues/42"},"shared":{"title":"Test Issue"}}
-JSON
-    else
-      echo "o $2 - Test Issue"
-      echo "Title: Test Issue"
-    fi
+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"
 
-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)
-    if [[ "${3:-}" == "--json" ]]; then
-      cat <<'JSON'
-{"id":"beads-999","shared":{"title":"Test Issue"}}
-JSON
-    else
-      echo "o $2 - Test Issue"
-      echo "Title: Test Issue"
-    fi
+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
@@ -83,7 +71,7 @@ chmod +x "$portable_bin/grep"
 
 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"
 
@@ -145,8 +133,8 @@ 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"
-assert_contains "sync create writes legacy github_issue state" "github_issue=42" "$log_contents"
-assert_contains "sync create calls set-state for hook compatibility" "set-state" "$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")"
 
 echo
@@ -211,10 +199,10 @@ cat > "$mapping_file" << 'JSON'
   "77": "beads-999"
 }
 JSON
-export BD_CMD="$mock_dir/bd-no-gh"
+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 BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
 echo "== Test 8: Mapping fallback returns newest issue number =="
@@ -225,69 +213,54 @@ cat > "$mapping_file" << 'JSON'
   "88": "beads-other"
 }
 JSON
-export BD_CMD="$mock_dir/bd-no-gh"
+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 BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
 echo "== Test 9: Missing canonical GitHub number =="
 rm -f "$mapping_file"
-export BD_CMD="$mock_dir/bd-no-gh"
+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 canonical github number" 1 "$rc"
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
-echo "== Test 10: Legacy github_issue state fallback =="
-cat > "$mock_dir/bd-legacy" << 'MOCK'
+echo "== Test 10: github_issue label lookup =="
+cat > "$mock_dir/forge-legacy" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
-case "$1" in
-  show)
-    if [[ "${3:-}" == "--json" ]]; then
-      cat <<'JSON'
-{"id":"beads-legacy","github_issue":43,"shared":{"title":"Legacy Issue"}}
-JSON
-    else
-      echo "o $2 - Legacy Issue"
-      echo "github_issue:43"
-      echo "Title: Legacy Issue"
-    fi
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-legacy","title":"Legacy Issue","labels":["github_issue:43"]}}}\n'
     ;;
-  set-state) echo "State set" ;;
+  "issue update") echo "Updated" ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd-legacy"
-export BD_CMD="$mock_dir/bd-legacy"
+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 BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
 echo "== Test 11: Injection in title sanitized =="
-cat > "$mock_dir/bd-inject" << 'MOCK'
+cat > "$mock_dir/forge-inject" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
-case "$1" in
-  show)
-    if [[ "${3:-}" == "--json" ]]; then
-      cat <<'JSON'
-{"id":"beads-inject","github":{"number":99,"url":"https://github.com/test/repo/issues/99"},"shared":{"title":"Evil $(rm -rf /) Issue"}}
-JSON
-    else
-      echo 'o beads-inject - Evil $(rm -rf /) Issue'
-      echo 'Title: Evil $(rm -rf /) Issue'
-    fi
+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=$?
@@ -300,7 +273,7 @@ else
   PASS=$((PASS + 1))
   echo "  PASS: injection sanitized - no \$\(rm in gh call"
 fi
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
 echo "== Test 11: sync_issue_create without grep -P =="
@@ -314,32 +287,26 @@ assert_contains "gh issue create called without PCRE grep" "issue create" "$log_
 export PATH="$ORIGINAL_PATH"
 
 echo
-echo "== Test 12: sync_issue_create with summary-only bd show =="
-cat > "$mock_dir/bd-summary-only" << 'MOCK'
+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" in
-  show)
-    if [[ "${3:-}" == "--json" ]]; then
-      cat <<'JSON'
-{"id":"beads-summary","github":{"number":77,"url":"https://github.com/test/repo/issues/77"},"shared":{"title":"Summary Only Title"}}
-JSON
-    else
-      echo "o $2 - Summary Only Title"
-    fi
+case "$1 $2" in
+  "issue show")
+    printf '{"data":{"issue":{"id":"beads-summary","title":"Summary Only Title","labels":["github_issue:77"]}}}\n'
     ;;
-  set-state) echo "State set" ;;
+  "issue update") echo "Updated" ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd-summary-only"
-export BD_CMD="$mock_dir/bd-summary-only"
+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 summary-only bd show" 0 "$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 BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 echo
 echo "Results: $PASS passed, $FAIL failed"

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 ""