forge-workflow 0.0.8 → 0.0.10

package/.github/prompts/ship.prompt.md

@@ -168,10 +168,10 @@ After PR is created, sync issue state to GitHub and verify 1:1 mapping:
 
 ```bash
 # Sync issue state to GitHub
-bash scripts/forge-team/index.sh sync 2>&1 || true
+forge team sync 2>&1 || true
 
 # Verify 1:1 mapping
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 ## Example Output
@@ -186,9 +186,10 @@ bash scripts/forge-team/index.sh verify 2>&1 || true
   - Beads linked: forge-xyz
   - Implementation details in collapsible section
 
-⏸️  PR created, awaiting automated checks (Greptile, SonarCloud, GitHub Actions)
+⏸️  PR created, checks started (Greptile, SonarCloud, GitHub Actions)
+   Poll for up to 60 seconds. If checks are still pending, stop here.
 
-Next: /review <pr-number> (after automated checks complete)
+Next: /review <pr-number> (when automated checks complete or new feedback appears)
 ```
 
 ## Integration with Workflow
@@ -210,5 +211,5 @@ Stage 7: /verify     → Post-merge CI check on main
 - **Fill every section**: Even if "N/A" — empty/missing sections cause review friction
 - **Include "Closes beads-xxx"**: Required for auto-close in /verify
 - **Concrete data only**: Test counts, file paths, commit SHAs — not placeholder text
-- **Wait for checks**: Let GitHub Actions, Greptile, SonarCloud run
+- **Poll briefly, then stop**: Check PR status for up to 60 seconds, then hand off if checks are still pending
 - **NO auto-merge**: Always wait for /review phase

package/.github/prompts/status.prompt.md

@@ -22,7 +22,7 @@ This command helps you understand the current state of the project before starti
 
 ```bash
 # Sync team state before showing status
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 ```
 
 ### Step 1: Smart Status (ranked issues with conflict detection)
@@ -30,7 +30,7 @@ bash scripts/sync-utils.sh auto-sync
 ```bash
 bash scripts/smart-status.sh
 ```
-This script dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed — the script handles everything.
+This command dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed.
 
 For full context on any issue: `bd show <id>`
 
@@ -79,10 +79,10 @@ Show current developer's active work and team overview:
 
 ```bash
 # Show my active issues
-bash scripts/forge-team/index.sh workload --me 2>&1 || true
+forge team workload --me 2>&1 || true
 
 # One-line team summary
-bash scripts/forge-team/index.sh dashboard 2>&1 | head -5 || true
+forge team dashboard 2>&1 | head -5 || true
 ```
 
 ## Next Steps

package/.github/workflows/beads-to-github.yml

@@ -5,6 +5,7 @@ on:
     branches: [master]
     paths:
       - '.beads/**'
+      - '.github/beads-snapshots/issues.jsonl'
 
 # Serialize with forward-sync to prevent race conditions
 concurrency:
@@ -30,27 +31,59 @@ jobs:
 
       - name: Checkout current
         if: env.SKIP != 'true'
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
         with:
           fetch-depth: 0
 
+      - name: Install Beads CLI (pinned to v1.0.0)
+        if: env.SKIP != 'true'
+        run: |
+          BD_VERSION="1.0.0"
+          BD_URL="https://github.com/steveyegge/beads/releases/download/v${BD_VERSION}/beads_${BD_VERSION}_linux_amd64.tar.gz"
+          mkdir -p "$HOME/.local/bin"
+          curl -fsSL "$BD_URL" | tar -xz -C "$HOME/.local/bin" bd
+          chmod +x "$HOME/.local/bin/bd"
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
       - name: Detect and close
         if: env.SKIP != 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BEFORE_SHA: ${{ github.event.before }}
         run: |
-          # Get old and new versions of .beads/issues.jsonl
-          # Use github.event.before (pre-push SHA) to catch multi-commit pushes
+          OLD_SNAPSHOT_PATH="$RUNNER_TEMP/old-issues.jsonl"
+          NEW_SNAPSHOT_PATH="$RUNNER_TEMP/new-issues.jsonl"
+          BEFORE_WORKTREE="$RUNNER_TEMP/beads-before"
+
+          generate_snapshot() {
+            local repo_root="$1"
+            local output_path="$2"
+
+            BEADS_DIR="$repo_root/.beads" bd init 2>/dev/null || true
+            if BEADS_DIR="$repo_root/.beads" bd backup --force 2>/dev/null; then
+              cp "$repo_root/.beads/backup/issues.jsonl" "$output_path"
+            else
+              : > "$output_path"
+            fi
+          }
+
+          # Rebuild the current snapshot from the pushed Beads state so local bd close
+          # transitions are reflected even when the tracked snapshot file was not updated.
+          generate_snapshot "$GITHUB_WORKSPACE" "$NEW_SNAPSHOT_PATH"
+
+          # Use github.event.before (pre-push SHA) to catch multi-commit pushes.
+          # Rebuild the previous snapshot from that tree's Beads state when possible.
           if [ "$BEFORE_SHA" = "0000000000000000000000000000000000000000" ] || [ -z "$BEFORE_SHA" ]; then
-            OLD_CONTENT=""
+            : > "$OLD_SNAPSHOT_PATH"
+          elif git cat-file -e "$BEFORE_SHA:.beads" 2>/dev/null; then
+            rm -rf "$BEFORE_WORKTREE"
+            mkdir -p "$BEFORE_WORKTREE"
+            git archive "$BEFORE_SHA" .beads | tar -x -C "$BEFORE_WORKTREE"
+            generate_snapshot "$BEFORE_WORKTREE" "$OLD_SNAPSHOT_PATH"
           else
-            OLD_CONTENT=$(git show "$BEFORE_SHA":.beads/issues.jsonl 2>/dev/null || echo "")
+            # Fallback for historical commits that predate tracked .beads state.
+            OLD_CONTENT=$(git show "$BEFORE_SHA":.github/beads-snapshots/issues.jsonl 2>/dev/null || echo "")
+            printf '%s' "$OLD_CONTENT" > "$OLD_SNAPSHOT_PATH"
           fi
-          NEW_CONTENT=$(cat .beads/issues.jsonl 2>/dev/null || echo "")
-
-          # Export via temp files to avoid shell injection
-          printf '%s' "$OLD_CONTENT" > /tmp/old-issues.jsonl
-          printf '%s' "$NEW_CONTENT" > /tmp/new-issues.jsonl
 
-          node scripts/github-beads-sync/reverse-sync-cli.mjs /tmp/old-issues.jsonl /tmp/new-issues.jsonl
+          node scripts/github-beads-sync/reverse-sync-cli.mjs "$OLD_SNAPSHOT_PATH" "$NEW_SNAPSHOT_PATH"

package/.github/workflows/github-to-beads.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.actor != 'github-actions[bot]'
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
         with:
           # Need full history for push
           fetch-depth: 0
@@ -30,9 +30,9 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
 
-      - name: Install Beads CLI (pinned to v0.49.1)
+      - name: Install Beads CLI (pinned to v1.0.0)
         run: |
-          BD_VERSION="0.49.1"
+          BD_VERSION="1.0.0"
           BD_URL="https://github.com/steveyegge/beads/releases/download/v${BD_VERSION}/beads_${BD_VERSION}_linux_amd64.tar.gz"
           mkdir -p "$HOME/.local/bin"
           curl -fsSL "$BD_URL" | tar -xz -C "$HOME/.local/bin" bd
@@ -43,7 +43,7 @@ jobs:
           BEADS_DIR: ${{ github.workspace }}/.beads
         run: |
           bd --version
-          # Initialize SQLite DB from JSONL on fresh checkout
+          # Initialize the current Dolt-backed layout on fresh checkout
           bd init 2>/dev/null || true
 
       - name: Run sync
@@ -57,10 +57,13 @@ jobs:
         run: |
           node scripts/github-beads-sync/index.mjs "$SYNC_ACTION"
 
-      - name: Export database to JSONL
+      - name: Export backup snapshot
         env:
           BEADS_DIR: ${{ github.workspace }}/.beads
-        run: bd sync
+        run: |
+          bd backup --force
+          mkdir -p .github/beads-snapshots
+          cp .beads/backup/issues.jsonl .github/beads-snapshots/issues.jsonl
 
       - name: Commit and push changes
         env:
@@ -69,8 +72,8 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-          # Stage beads and mapping changes
-          git add .beads/ .github/beads-mapping.json || true
+          # Stage beads state, mapping changes, and the tracked issue snapshot
+          git add .beads/ .github/beads-mapping.json .github/beads-snapshots/issues.jsonl || true
 
           # Only commit if there are changes
           if git diff --cached --quiet; then

package/.kilocode/workflows/dev.md

@@ -70,8 +70,8 @@ Do NOT write any code until ALL confirmed:
 Before starting the per-task loop, check for cross-developer conflicts:
 
 ```bash
-# Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+# Auto-sync to get latest team state (non-blocking)
+forge sync || true
 
 # Check for conflicts with the current beads issue
 bash scripts/conflict-detect.sh --issue <beads-id>

package/.kilocode/workflows/plan.md

@@ -58,7 +58,7 @@ Before proceeding to Phase 1, check for cross-developer conflicts:
 
 ```bash
 # Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 
 # Check for conflicts with this issue's planned work area
 bash scripts/conflict-detect.sh --issue <beads-id>
@@ -108,7 +108,7 @@ If merge conflicts or unmet dependencies are found:
 Before starting planning, verify team identity is mapped:
 
 ```bash
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 If verify reports issues, address them before proceeding (the output will include `FORGE_AGENT_7f3a:PROMPT:` directives with exact commands to run).

package/.kilocode/workflows/premerge.md

@@ -95,7 +95,7 @@ git commit -m "docs: update documentation for <feature-name>
 git push
 ```
 
-⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Wait for checks to pass. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
+⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Poll for up to 60 seconds. If checks are still pending after that, stop and ask the user to return to `/premerge <pr-number>` later. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
 
 ### Step 4: Sync Beads
 
@@ -154,7 +154,7 @@ Do NOT suggest merging.
   - README.md: Features list updated
   - CLAUDE.md: USER section updated with new pattern
   - Committed: docs: update documentation for auth-refresh
-✓ CI re-triggered after doc push — all checks still passing
+✓ CI re-triggered after doc push — checks passed within the 60 second poll window
 ✓ Beads synced
 
 ✅ PR #89 is ready to merge

package/.kilocode/workflows/review.md

@@ -299,10 +299,13 @@ git push
 ### Step 9: Verify ALL Checks Pass
 
 ```bash
-# Wait for checks to complete
+# Check status immediately, then poll for at most 60 seconds
 gh pr checks <pr-number>
 
-# Ensure all status checks are green:
+# If checks are still pending after 60 seconds: STOP and tell the user to return
+# when CI finishes or new review feedback appears.
+#
+# Ensure all completed status checks are green:
 # ✓ GitHub Actions workflows
 # ✓ Greptile review (no unresolved critical comments)
 # ✓ SonarCloud quality gate

package/.kilocode/workflows/ship.md

@@ -167,10 +167,10 @@ After PR is created, sync issue state to GitHub and verify 1:1 mapping:
 
 ```bash
 # Sync issue state to GitHub
-bash scripts/forge-team/index.sh sync 2>&1 || true
+forge team sync 2>&1 || true
 
 # Verify 1:1 mapping
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 ## Example Output
@@ -185,9 +185,10 @@ bash scripts/forge-team/index.sh verify 2>&1 || true
   - Beads linked: forge-xyz
   - Implementation details in collapsible section
 
-⏸️  PR created, awaiting automated checks (Greptile, SonarCloud, GitHub Actions)
+⏸️  PR created, checks started (Greptile, SonarCloud, GitHub Actions)
+   Poll for up to 60 seconds. If checks are still pending, stop here.
 
-Next: /review <pr-number> (after automated checks complete)
+Next: /review <pr-number> (when automated checks complete or new feedback appears)
 ```
 
 ## Integration with Workflow
@@ -209,5 +210,5 @@ Stage 7: /verify     → Post-merge CI check on main
 - **Fill every section**: Even if "N/A" — empty/missing sections cause review friction
 - **Include "Closes beads-xxx"**: Required for auto-close in /verify
 - **Concrete data only**: Test counts, file paths, commit SHAs — not placeholder text
-- **Wait for checks**: Let GitHub Actions, Greptile, SonarCloud run
+- **Poll briefly, then stop**: Check PR status for up to 60 seconds, then hand off if checks are still pending
 - **NO auto-merge**: Always wait for /review phase

package/.kilocode/workflows/status.md

@@ -21,7 +21,7 @@ This command helps you understand the current state of the project before starti
 
 ```bash
 # Sync team state before showing status
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 ```
 
 ### Step 1: Smart Status (ranked issues with conflict detection)
@@ -29,7 +29,7 @@ bash scripts/sync-utils.sh auto-sync
 ```bash
 bash scripts/smart-status.sh
 ```
-This script dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed — the script handles everything.
+This command dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed.
 
 For full context on any issue: `bd show <id>`
 
@@ -78,10 +78,10 @@ Show current developer's active work and team overview:
 
 ```bash
 # Show my active issues
-bash scripts/forge-team/index.sh workload --me 2>&1 || true
+forge team workload --me 2>&1 || true
 
 # One-line team summary
-bash scripts/forge-team/index.sh dashboard 2>&1 | head -5 || true
+forge team dashboard 2>&1 | head -5 || true
 ```
 
 ## Next Steps

package/.opencode/commands/dev.md

@@ -69,8 +69,8 @@ Do NOT write any code until ALL confirmed:
 Before starting the per-task loop, check for cross-developer conflicts:
 
 ```bash
-# Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+# Auto-sync to get latest team state (non-blocking)
+forge sync || true
 
 # Check for conflicts with the current beads issue
 bash scripts/conflict-detect.sh --issue <beads-id>

package/.opencode/commands/plan.md

@@ -57,7 +57,7 @@ Before proceeding to Phase 1, check for cross-developer conflicts:
 
 ```bash
 # Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 
 # Check for conflicts with this issue's planned work area
 bash scripts/conflict-detect.sh --issue <beads-id>
@@ -107,7 +107,7 @@ If merge conflicts or unmet dependencies are found:
 Before starting planning, verify team identity is mapped:
 
 ```bash
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 If verify reports issues, address them before proceeding (the output will include `FORGE_AGENT_7f3a:PROMPT:` directives with exact commands to run).

package/.opencode/commands/premerge.md

@@ -94,7 +94,7 @@ git commit -m "docs: update documentation for <feature-name>
 git push
 ```
 
-⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Wait for checks to pass. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
+⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Poll for up to 60 seconds. If checks are still pending after that, stop and ask the user to return to `/premerge <pr-number>` later. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
 
 ### Step 4: Sync Beads
 
@@ -153,7 +153,7 @@ Do NOT suggest merging.
   - README.md: Features list updated
   - CLAUDE.md: USER section updated with new pattern
   - Committed: docs: update documentation for auth-refresh
-✓ CI re-triggered after doc push — all checks still passing
+✓ CI re-triggered after doc push — checks passed within the 60 second poll window
 ✓ Beads synced
 
 ✅ PR #89 is ready to merge

package/.opencode/commands/review.md

@@ -298,10 +298,13 @@ git push
 ### Step 9: Verify ALL Checks Pass
 
 ```bash
-# Wait for checks to complete
+# Check status immediately, then poll for at most 60 seconds
 gh pr checks <pr-number>
 
-# Ensure all status checks are green:
+# If checks are still pending after 60 seconds: STOP and tell the user to return
+# when CI finishes or new review feedback appears.
+#
+# Ensure all completed status checks are green:
 # ✓ GitHub Actions workflows
 # ✓ Greptile review (no unresolved critical comments)
 # ✓ SonarCloud quality gate

package/.opencode/commands/ship.md

@@ -166,10 +166,10 @@ After PR is created, sync issue state to GitHub and verify 1:1 mapping:
 
 ```bash
 # Sync issue state to GitHub
-bash scripts/forge-team/index.sh sync 2>&1 || true
+forge team sync 2>&1 || true
 
 # Verify 1:1 mapping
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 ## Example Output
@@ -184,9 +184,10 @@ bash scripts/forge-team/index.sh verify 2>&1 || true
   - Beads linked: forge-xyz
   - Implementation details in collapsible section
 
-⏸️  PR created, awaiting automated checks (Greptile, SonarCloud, GitHub Actions)
+⏸️  PR created, checks started (Greptile, SonarCloud, GitHub Actions)
+   Poll for up to 60 seconds. If checks are still pending, stop here.
 
-Next: /review <pr-number> (after automated checks complete)
+Next: /review <pr-number> (when automated checks complete or new feedback appears)
 ```
 
 ## Integration with Workflow
@@ -208,5 +209,5 @@ Stage 7: /verify     → Post-merge CI check on main
 - **Fill every section**: Even if "N/A" — empty/missing sections cause review friction
 - **Include "Closes beads-xxx"**: Required for auto-close in /verify
 - **Concrete data only**: Test counts, file paths, commit SHAs — not placeholder text
-- **Wait for checks**: Let GitHub Actions, Greptile, SonarCloud run
+- **Poll briefly, then stop**: Check PR status for up to 60 seconds, then hand off if checks are still pending
 - **NO auto-merge**: Always wait for /review phase

package/.opencode/commands/status.md

@@ -20,7 +20,7 @@ This command helps you understand the current state of the project before starti
 
 ```bash
 # Sync team state before showing status
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 ```
 
 ### Step 1: Smart Status (ranked issues with conflict detection)
@@ -28,7 +28,7 @@ bash scripts/sync-utils.sh auto-sync
 ```bash
 bash scripts/smart-status.sh
 ```
-This script dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed — the script handles everything.
+This command dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed.
 
 For full context on any issue: `bd show <id>`
 
@@ -77,10 +77,10 @@ Show current developer's active work and team overview:
 
 ```bash
 # Show my active issues
-bash scripts/forge-team/index.sh workload --me 2>&1 || true
+forge team workload --me 2>&1 || true
 
 # One-line team summary
-bash scripts/forge-team/index.sh dashboard 2>&1 | head -5 || true
+forge team dashboard 2>&1 | head -5 || true
 ```
 
 ## Next Steps

package/.roo/commands/dev.md

@@ -70,8 +70,8 @@ Do NOT write any code until ALL confirmed:
 Before starting the per-task loop, check for cross-developer conflicts:
 
 ```bash
-# Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+# Auto-sync to get latest team state (non-blocking)
+forge sync || true
 
 # Check for conflicts with the current beads issue
 bash scripts/conflict-detect.sh --issue <beads-id>

package/.roo/commands/plan.md

@@ -58,7 +58,7 @@ Before proceeding to Phase 1, check for cross-developer conflicts:
 
 ```bash
 # Auto-sync to get latest team state
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 
 # Check for conflicts with this issue's planned work area
 bash scripts/conflict-detect.sh --issue <beads-id>
@@ -108,7 +108,7 @@ If merge conflicts or unmet dependencies are found:
 Before starting planning, verify team identity is mapped:
 
 ```bash
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 If verify reports issues, address them before proceeding (the output will include `FORGE_AGENT_7f3a:PROMPT:` directives with exact commands to run).

package/.roo/commands/premerge.md

@@ -95,7 +95,7 @@ git commit -m "docs: update documentation for <feature-name>
 git push
 ```
 
-⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Wait for checks to pass. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
+⚠️  **After pushing**: CI will re-trigger (Greptile, SonarCloud, etc.). Poll for up to 60 seconds. If checks are still pending after that, stop and ask the user to return to `/premerge <pr-number>` later. If new Greptile comments appear on the doc changes, run `/review <pr-number>` again.
 
 ### Step 4: Sync Beads
 
@@ -154,7 +154,7 @@ Do NOT suggest merging.
   - README.md: Features list updated
   - CLAUDE.md: USER section updated with new pattern
   - Committed: docs: update documentation for auth-refresh
-✓ CI re-triggered after doc push — all checks still passing
+✓ CI re-triggered after doc push — checks passed within the 60 second poll window
 ✓ Beads synced
 
 ✅ PR #89 is ready to merge

package/.roo/commands/review.md

@@ -299,10 +299,13 @@ git push
 ### Step 9: Verify ALL Checks Pass
 
 ```bash
-# Wait for checks to complete
+# Check status immediately, then poll for at most 60 seconds
 gh pr checks <pr-number>
 
-# Ensure all status checks are green:
+# If checks are still pending after 60 seconds: STOP and tell the user to return
+# when CI finishes or new review feedback appears.
+#
+# Ensure all completed status checks are green:
 # ✓ GitHub Actions workflows
 # ✓ Greptile review (no unresolved critical comments)
 # ✓ SonarCloud quality gate

package/.roo/commands/ship.md

@@ -167,10 +167,10 @@ After PR is created, sync issue state to GitHub and verify 1:1 mapping:
 
 ```bash
 # Sync issue state to GitHub
-bash scripts/forge-team/index.sh sync 2>&1 || true
+forge team sync 2>&1 || true
 
 # Verify 1:1 mapping
-bash scripts/forge-team/index.sh verify 2>&1 || true
+forge team verify 2>&1 || true
 ```
 
 ## Example Output
@@ -185,9 +185,10 @@ bash scripts/forge-team/index.sh verify 2>&1 || true
   - Beads linked: forge-xyz
   - Implementation details in collapsible section
 
-⏸️  PR created, awaiting automated checks (Greptile, SonarCloud, GitHub Actions)
+⏸️  PR created, checks started (Greptile, SonarCloud, GitHub Actions)
+   Poll for up to 60 seconds. If checks are still pending, stop here.
 
-Next: /review <pr-number> (after automated checks complete)
+Next: /review <pr-number> (when automated checks complete or new feedback appears)
 ```
 
 ## Integration with Workflow
@@ -209,5 +210,5 @@ Stage 7: /verify     → Post-merge CI check on main
 - **Fill every section**: Even if "N/A" — empty/missing sections cause review friction
 - **Include "Closes beads-xxx"**: Required for auto-close in /verify
 - **Concrete data only**: Test counts, file paths, commit SHAs — not placeholder text
-- **Wait for checks**: Let GitHub Actions, Greptile, SonarCloud run
+- **Poll briefly, then stop**: Check PR status for up to 60 seconds, then hand off if checks are still pending
 - **NO auto-merge**: Always wait for /review phase

package/.roo/commands/status.md

@@ -21,7 +21,7 @@ This command helps you understand the current state of the project before starti
 
 ```bash
 # Sync team state before showing status
-bash scripts/sync-utils.sh auto-sync
+forge sync || true
 ```
 
 ### Step 1: Smart Status (ranked issues with conflict detection)
@@ -29,7 +29,7 @@ bash scripts/sync-utils.sh auto-sync
 ```bash
 bash scripts/smart-status.sh
 ```
-This script dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed — the script handles everything.
+This command dynamically computes and displays all issues ranked by composite score (priority, dependency impact, type, staleness, epic proximity). Output includes active sessions, conflict risk annotations, and grouped categories. No manual querying needed.
 
 For full context on any issue: `bd show <id>`
 
@@ -78,10 +78,10 @@ Show current developer's active work and team overview:
 
 ```bash
 # Show my active issues
-bash scripts/forge-team/index.sh workload --me 2>&1 || true
+forge team workload --me 2>&1 || true
 
 # One-line team summary
-bash scripts/forge-team/index.sh dashboard 2>&1 | head -5 || true
+forge team dashboard 2>&1 | head -5 || true
 ```
 
 ## Next Steps

package/AGENTS.md

@@ -232,15 +232,15 @@ This project uses **bd (beads)** for issue tracking. Run `bd prime` to see full
 ### Quick Reference
 
 ```bash
-bd ready              # Find available work
-bd show <id>          # View issue details
-bd update <id> --claim  # Claim work
-bd close <id>         # Complete work
+forge ready           # Find available work
+forge show <id>       # View issue details
+forge claim <id>      # Claim work
+forge close <id>      # Complete work
 ```
 
 ### Rules
 
-- Use `bd` for ALL task tracking — do NOT use TodoWrite, TaskCreate, or markdown TODO lists. Exception: `/plan` Phase 3 generates task lists at `docs/plans/YYYY-MM-DD-<slug>-tasks.md` — these are approved artifacts consumed by `/dev`, but `bd` remains the source of truth for issue state. GitHub issues may be used for external/public tracking; CI may sync GitHub issue lifecycle to Beads (see `docs/BEADS_GITHUB_SYNC.md`).
+- Use `forge` as the routine command surface for bd-backed issue tracking and sync workflows — do NOT use TodoWrite, TaskCreate, or markdown TODO lists. Exception: `/plan` Phase 3 generates task lists at `docs/plans/YYYY-MM-DD-<slug>-tasks.md` — these are approved artifacts consumed by `/dev`, but Beads (`bd`) remains the source of truth for issue state and IDs. Use `bd` directly only for operations Forge does not wrap yet, such as `bd init`, `bd comments`, `bd dep`, and `bd dolt *`. GitHub issues may be used for external/public tracking; CI may sync GitHub issue lifecycle to Beads (see `docs/BEADS_GITHUB_SYNC.md`).
 - Run `bd prime` for detailed command reference and session close protocol
 - Use `bd remember` for persistent knowledge — do NOT use MEMORY.md files
 
@@ -255,10 +255,10 @@ bd close <id>         # Complete work
 3. **Update issue status** - Close finished work, update in-progress items
 4. **PUSH TO REMOTE** - This is MANDATORY:
    ```bash
-   git pull --rebase
-   bd dolt push   # requires Dolt-backed Beads — run 'bd init' if missing
-   git push
-   git status  # MUST show "up to date with origin"
+    git pull --rebase
+    forge sync     # wraps the supported Beads sync flow when Beads is configured
+    git push
+    git status  # MUST show "up to date with origin"
    ```
 5. **Clean up** - Clear stashes, prune remote branches
 6. **Verify** - All changes committed AND pushed
@@ -269,4 +269,5 @@ bd close <id>         # Complete work
 - NEVER stop before pushing - that leaves work stranded locally
 - NEVER say "ready to push when you are" - YOU must push
 - If push fails, resolve and retry until it succeeds
+- After fixing review feedback, always push the changes and resolve the related GitHub review threads via the GraphQL API before considering the work complete
 <!-- END BEADS INTEGRATION -->