forge-workflow 0.0.9 → 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/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

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/.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/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

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

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

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

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:
@@ -34,23 +35,55 @@ jobs:
         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

@@ -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/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

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