From 1c5423637d2bfa8ce9ec25ce40e69d304a7973ac Mon Sep 17 00:00:00 2001 From: matt wilkie Date: Fri, 13 Mar 2026 11:01:06 -0700 Subject: [PATCH] docs: replace bd sync with bd dolt push/pull in agent instructions (GH#2563) bd sync has been a deprecated no-op since v0.51. Two agent instruction files still actively directed agents to use it: - .agent/workflows/resolve-beads-conflict.md - .github/copilot-instructions.md Remaining references in CHANGELOG, DISCOVERY.md, audit docs, and claude-plugin deprecation notices are intentionally preserved as historical/redirect documentation. Amp-Thread-ID: https://ampcode.com/threads/T-019ce85a-0496-70fd-afdc-7e066f2f5826 Co-authored-by: Amp --- .agent/workflows/resolve-beads-conflict.md | 8 ++++---- .github/copilot-instructions.md | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.agent/workflows/resolve-beads-conflict.md b/.agent/workflows/resolve-beads-conflict.md index 0fbbb47f0..6ba016add 100644 --- a/.agent/workflows/resolve-beads-conflict.md +++ b/.agent/workflows/resolve-beads-conflict.md @@ -10,10 +10,10 @@ Beads uses Dolt as its storage backend. Dolt handles merges natively using its b ```bash bd doctor -bd sync +bd dolt pull ``` -If `bd sync` reports merge conflicts, Dolt will list the conflicting tables and rows. +If `bd dolt pull` reports merge conflicts, Dolt will list the conflicting tables and rows. ## 2. Resolve Conflicts @@ -35,8 +35,8 @@ bd sql "CALL dolt_conflicts_resolve('--theirs')" # Verify the resolution bd list --json | head -# Complete the sync -bd sync +# Push the resolved state +bd dolt push ``` ## Legacy: JSONL Merge Conflicts diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 03491ffcc..004596f7d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -36,7 +36,7 @@ ### Git Workflow - Install git hooks: `bd hooks install` -- Use `bd sync` for remote sync (Dolt-native replication) +- Use `bd dolt push` / `bd dolt pull` for remote sync ## Issue Tracking with bd @@ -59,7 +59,8 @@ bd list --status open --priority 1 --json bd show --json # Sync (if remote configured) -bd sync # Sync with Dolt remote +bd dolt push # Push to Dolt remote +bd dolt pull # Pull from Dolt remote ``` ### Workflow @@ -69,7 +70,7 @@ bd sync # Sync with Dolt remote 3. **Work on it**: Implement, test, document 4. **Discover new work?** `bd create "Found bug" --description="What was found and why" -p 1 --deps discovered-from: --json` 5. **Complete**: `bd close --reason "Done" --json` -6. **Sync**: `bd sync` (sync with Dolt remote if configured) +6. **Sync**: `bd dolt push` (push to Dolt remote if configured) **IMPORTANT**: Always include `--description` when creating issues. Issues without descriptions lack context for future work. @@ -121,7 +122,7 @@ Use the beads MCP server for native function calls instead of shell commands: - ✅ Use bd for ALL task tracking - ✅ Always use `--json` flag for programmatic use -- ✅ Use `bd sync` for remote sync +- ✅ Use `bd dolt push` / `bd dolt pull` for remote sync - ✅ Test with `t.TempDir() in Go tests` - ❌ Do NOT create markdown TODO lists - ❌ Do NOT create test issues in production DB