forge-workflow 0.0.8 → 0.0.10

package/.claude/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/.claude/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/.claude/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/.claude/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/.claude/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/.claude/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/.claude/rules/greptile-review-process.md

@@ -131,7 +131,7 @@ bash .claude/scripts/greptile-resolve.sh stats <pr-number>
 
 **Should show**: "✓ All Greptile threads resolved!"
 
-### Step 4: Push Changes & Wait for Re-review
+### Step 4: Push Changes & Poll Briefly for Re-review
 
 ```bash
 git push
@@ -188,7 +188,7 @@ $ git push
 - **Reply to EACH comment thread** using the script (not as separate PR comment)
 - **Mark EACH thread as resolved** after fixing using the script
 - **Track progress** (X of Y fixed) in your notes
-- **Wait for Greptile re-review** after pushing fixes
+- **Poll for Greptile re-review for at most 60 seconds** after pushing fixes, then stop and hand off if it is still pending
 - **Use comment ID for replies**, thread ID for resolving
 - **Commit fixes BEFORE replying** so you can reference commit SHA
 
@@ -251,7 +251,7 @@ The `/review` command should now include these steps:
    - Fix each issue
    - Reply and resolve systematically
 3. Verify all threads resolved before declaring review complete
-4. Push changes and wait for Greptile re-review
+4. Push changes and poll briefly for Greptile re-review
 
 ---
 
@@ -271,7 +271,7 @@ The `/review` command should now include these steps:
 
 ### Greptile score not updating after fixes
 **Cause**: Must push commits to trigger re-analysis
-**Solution**: `git push` and wait 2-3 minutes for Greptile re-scan
+**Solution**: `git push`, check once immediately, and poll for up to 60 seconds. If Greptile is still pending after that, stop and wait for the user to resume later.
 
 ---
 

package/.cline/workflows/dev.md

@@ -66,8 +66,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/.cline/workflows/plan.md

@@ -54,7 +54,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>
@@ -104,7 +104,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/.cline/workflows/premerge.md

@@ -91,7 +91,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
 
@@ -150,7 +150,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/.cline/workflows/review.md

@@ -295,10 +295,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/.cline/workflows/ship.md

@@ -163,10 +163,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
@@ -181,9 +181,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
@@ -205,5 +206,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/.cline/workflows/status.md

@@ -17,7 +17,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)
@@ -25,7 +25,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>`
 
@@ -74,10 +74,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/.codex/skills/dev/SKILL.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/.codex/skills/plan/SKILL.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/.codex/skills/premerge/SKILL.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/.codex/skills/review/SKILL.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/.codex/skills/ship/SKILL.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/.codex/skills/status/SKILL.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/.cursor/commands/dev.md

@@ -66,8 +66,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/.cursor/commands/plan.md

@@ -54,7 +54,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>
@@ -104,7 +104,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/.cursor/commands/premerge.md

@@ -91,7 +91,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
 
@@ -150,7 +150,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/.cursor/commands/review.md

@@ -295,10 +295,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/.cursor/commands/ship.md

@@ -163,10 +163,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
@@ -181,9 +181,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
@@ -205,5 +206,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/.cursor/commands/status.md

@@ -17,7 +17,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)
@@ -25,7 +25,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>`
 
@@ -74,10 +74,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/prompts/dev.prompt.md

@@ -71,8 +71,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/.github/prompts/plan.prompt.md

@@ -59,7 +59,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>
@@ -109,7 +109,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/.github/prompts/premerge.prompt.md

@@ -96,7 +96,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
 
@@ -155,7 +155,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/.github/prompts/review.prompt.md

@@ -300,10 +300,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