feat: add has_metadata_key to bd query DSL

.agent/workflows/resolve-beads-conflict.md

@@ -1,59 +1,51 @@
 ---
-description: How to resolve merge conflicts in .beads/issues.jsonl
+description: How to resolve merge conflicts in the beads Dolt database
 ---
 
-# Resolving `issues.jsonl` Merge Conflicts
+# Resolving Beads Merge Conflicts
 
-If you encounter a merge conflict in `.beads/issues.jsonl` that doesn't have standard git conflict markers (or if `bd merge` failed automatically), follow this procedure.
+Beads uses Dolt as its storage backend. Dolt handles merges natively using its built-in three-way merge, similar to git.
 
-## 1. Identify the Conflict
-Check if `issues.jsonl` is in conflict:
-```powershell
-git status
-```
+## 1. Check for Conflicts
 
-## 2. Extract the 3 Versions
-Git stores three versions of conflicted files in its index:
-1. Base (common ancestor)
-2. Ours (current branch)
-3. Theirs (incoming branch)
-
-Extract them to temporary files:
-```powershell
-git show :1:.beads/issues.jsonl > beads.base.jsonl
-git show :2:.beads/issues.jsonl > beads.ours.jsonl
-git show :3:.beads/issues.jsonl > beads.theirs.jsonl
+```bash
+bd doctor
+bd sync
 ```
 
-## 3. Run `bd merge` Manually
-Run the `bd merge` tool manually with the `--debug` flag to see what's happening.
-Syntax: `bd merge <output> <base> <ours> <theirs>`
+If `bd sync` reports merge conflicts, Dolt will list the conflicting tables and rows.
+
+## 2. Resolve Conflicts
+
+Dolt provides SQL-based conflict resolution:
+
+```bash
+# View conflicts
+bd sql "SELECT * FROM dolt_conflicts"
 
-```powershell
-bd merge beads.merged.jsonl beads.base.jsonl beads.ours.jsonl beads.theirs.jsonl --debug
+# Resolve by accepting ours or theirs
+bd sql "CALL dolt_conflicts_resolve('--ours')"
+# OR
+bd sql "CALL dolt_conflicts_resolve('--theirs')"
 ```
 
-## 4. Verify the Result
-Check the output of the command.
-- **Exit Code 0**: Success. `beads.merged.jsonl` contains the clean merge.
-- **Exit Code 1**: Conflicts remain. `beads.merged.jsonl` will contain conflict markers. You must edit it manually to resolve them.
+## 3. Verify and Complete
 
-Optionally, verify the content (e.g., check for missing IDs if you suspect data loss).
+```bash
+# Verify the resolution
+bd list --json | head
 
-## 5. Apply the Merge
-Overwrite the conflicted file with the resolved version:
-```powershell
-cp beads.merged.jsonl .beads/issues.jsonl
+# Complete the sync
+bd sync
 ```
 
-## 6. Cleanup and Continue
-Stage the resolved file and continue the merge:
-```powershell
+## Legacy: JSONL Merge Conflicts
+
+If you encounter merge conflicts in `.beads/issues.jsonl` from a legacy setup, import the resolved file:
+
+```bash
+# Resolve the git conflict in the JSONL file manually, then:
+bd import -i .beads/issues.jsonl
 git add .beads/issues.jsonl
 git merge --continue
 ```
-
-## 7. Cleanup Temporary Files
-```powershell
-rm beads.base.jsonl beads.ours.jsonl beads.theirs.jsonl beads.merged.jsonl
-```

.beads/.gitignore

@@ -30,25 +30,13 @@ bd.db
 # Must not be committed as paths would be wrong in other clones
 redirect
 
-# Merge artifacts (temporary files from 3-way merge)
-beads.base.jsonl
-beads.base.meta.json
-beads.left.jsonl
-beads.left.meta.json
-beads.right.jsonl
-beads.right.meta.json
-
 # Sync state (local-only, per-machine)
 # These files are machine-specific and should not be shared across clones
 .sync.lock
-sync_base.jsonl
 export-state/
 
 # Process semaphore slot files (runtime concurrency limiting)
 sem/
 
-# NOTE: Do NOT add negation patterns (e.g., !issues.jsonl) here.
-# They would override fork protection in .git/info/exclude, allowing
-# contributors to accidentally commit upstream issue databases.
-# The JSONL files (issues.jsonl, interactions.jsonl) and config files
-# are tracked by git by default since no pattern above ignores them.
+# NOTE: Config files (metadata.json, config.yaml) are tracked by git
+# by default since no pattern above ignores them.

.beads/BD_GUIDE.md

@@ -18,7 +18,7 @@ It is auto-generated and version-stamped to track bd upgrades.
 ### Why bd?
 
 - Dependency-aware: Track blockers and relationships between issues
-- Git-friendly: Auto-syncs to JSONL for version control
+- Git-friendly: Dolt provides version control with branching and merging
 - Agent-optimized: JSON output, ready work detection, discovered-from links
 - Prevents duplicate tracking systems and confusion
 
@@ -70,13 +70,13 @@ bd close bd-42 --reason "Completed" --json
 4. **Discover new work?** Create linked issue:
    - `bd create "Found bug" -p 1 --deps discovered-from:<parent-id>`
 5. **Complete**: `bd close <id> --reason "Done"`
-6. **Commit together**: Always commit the `.beads/issues.jsonl` file together with the code changes so issue state stays in sync with code state
+6. **Sync**: Run `bd sync` at end of sessions to ensure changes are committed and pushed
 
 ### Auto-Sync
 
-bd automatically syncs with git:
-- Exports to `.beads/issues.jsonl` after changes (5s debounce)
-- Imports from JSONL when newer (e.g., after `git pull`)
+bd uses Dolt for storage and sync:
+- All changes are stored directly in the Dolt database
+- `bd sync` handles commit, pull, merge, and push via Dolt-native replication
 - No manual export/import needed!
 
 ### GitHub Copilot Integration
@@ -132,6 +132,60 @@ history/
 - ✅ Preserves planning history for archeological research
 - ✅ Reduces noise when browsing the project
 
+### Counter Mode (Sequential IDs)
+
+By default, beads assigns hash-based IDs (e.g., `bd-a3f2`). For projects that prefer
+human-readable sequential IDs (e.g., `bd-1`, `bd-2`), enable counter mode:
+
+```bash
+bd config set issue_id_mode counter
+```
+
+**When to use counter mode:**
+
+- Project-management workflows where stakeholders reference issue numbers in conversations
+- Multi-agent coordination where readable IDs reduce confusion (e.g., "fix bd-42")
+- Teams migrating from Jira/Linear/GitHub Issues that expect sequential numbering
+
+**When to keep hash IDs (default):**
+
+- Multi-agent or multi-branch workflows where issues may be created concurrently on different branches
+- Hash IDs are collision-free by construction; counter IDs can diverge if parallel branches both create issues
+
+**How to enable:**
+
+```bash
+# Enable for this project
+bd config set issue_id_mode counter
+
+# New issues now get sequential IDs
+bd create "Fix login bug" -p 1    # → bd-1
+bd create "Add dark mode" -p 2    # → bd-2
+```
+
+**Migration considerations:**
+
+If the repo already has hash-based IDs, those existing IDs are unchanged. New issues created
+after enabling counter mode will start from 1 (or wherever the counter currently sits). To
+avoid collisions with any existing sequential IDs (e.g., from a previous counter-mode period),
+check the highest integer ID in use before switching.
+
+**Explicit --id overrides counter mode:**
+
+Passing `--id` on `bd create` always uses the provided ID and does not increment the counter:
+
+```bash
+bd create "Backport fix" -p 1 --id bd-special
+# → bd-special (counter unchanged)
+```
+
+**Per-prefix isolation:**
+
+Each prefix has its own counter. If this project routes to multiple prefixes, each prefix
+counts independently (e.g., `bd-1`, `bd-2` and `plug-1`, `plug-2` are separate sequences).
+
+See [docs/CONFIG.md](../docs/CONFIG.md) for full `issue_id_mode` reference.
+
 ### Important Rules
 
 - ✅ Use bd for ALL task tracking
@@ -156,15 +210,15 @@ For more details, see README.md and QUICKSTART.md.
 
 **Key Features:**
 - Dependency-aware issue tracking
-- Auto-sync with Git via JSONL
+- Auto-sync via Dolt-native replication
 - AI-optimized CLI with JSON output
-- Built-in daemon for background operations
+- Dolt server mode for background operations
 - MCP server integration for Claude and other AI assistants
 
 ## Tech Stack
 
 - **Language**: Go 1.21+
-- **Storage**: SQLite (internal/storage/sqlite/)
+- **Storage**: Dolt (version-controlled SQL database)
 - **CLI Framework**: Cobra
 - **Testing**: Go standard testing + table-driven tests
 - **CI/CD**: GitHub Actions
@@ -174,7 +228,7 @@ For more details, see README.md and QUICKSTART.md.
 
 ### Testing
 - Always write tests for new features
-- Use `BEADS_DB=/tmp/test.db` to avoid polluting production database
+- Use `t.TempDir()` in Go tests to avoid polluting production database
 - Run `go test -short ./...` before committing
 - Never create test issues in production DB (use temporary DB)
 
@@ -185,9 +239,8 @@ For more details, see README.md and QUICKSTART.md.
 - Update docs when changing behavior
 
 ### Git Workflow
-- Always commit `.beads/issues.jsonl` with code changes
 - Run `bd sync` at end of work sessions
-- Install git hooks: `bd hooks install` (ensures DB ↔ JSONL consistency)
+- Install git hooks: `bd hooks install`
 
 ## Issue Tracking with bd
 
@@ -238,14 +291,13 @@ beads/
 ├── internal/
 │   ├── types/           # Core data types
 │   └── storage/         # Storage layer
-│       └── sqlite/      # SQLite implementation
+│       └── dolt/        # Dolt implementation
 ├── integrations/
 │   └── beads-mcp/       # MCP server (Python)
 ├── examples/            # Integration examples
 ├── docs/                # Documentation
 └── .beads/
-    ├── beads.db         # SQLite database (DO NOT COMMIT)
-    └── issues.jsonl     # Git-synced issue storage
+    └── dolt/            # Dolt database (source of truth)
 ```
 
 ## Available Resources
@@ -272,10 +324,10 @@ 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
 - ✅ Run `bd sync` at end of sessions
-- ✅ Test with `BEADS_DB=/tmp/test.db`
+- ✅ Test with `t.TempDir()` in Go tests
 - ❌ Do NOT create markdown TODO lists
 - ❌ Do NOT create test issues in production DB
-- ❌ Do NOT commit `.beads/beads.db` (JSONL only)
+- ❌ Do NOT manually modify `.beads/dolt/`
 
 ---
 

.beads/README.md

@@ -33,7 +33,7 @@ bd sync
 ### Working with Issues
 
 Issues in Beads are:
-- **Git-native**: Stored in `.beads/issues.jsonl` and synced like code
+- **Git-native**: Stored in Dolt database with version control and branching
 - **AI-friendly**: CLI-first design works perfectly with AI coding agents
 - **Branch-aware**: Issues can follow your branch workflow
 - **Always in sync**: Auto-syncs with your commits
@@ -53,7 +53,7 @@ Issues in Beads are:
 🔧 **Git Integration**
 - Automatic sync with git commits
 - Branch-aware issue tracking
-- Intelligent JSONL merge resolution
+- Dolt-native three-way merge resolution
 
 ## Get Started with Beads
 

.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
       "name": "beads",
       "source": "./claude-plugin",
       "description": "AI-supervised issue tracker for coding workflows",
-      "version": "0.55.4"
+      "version": "0.56.1"
     }
   ]
 }

.gitattributes

@@ -1,7 +1,4 @@
 
-# Use bd merge for beads JSONL files
-.beads/issues.jsonl merge=beads
-
 # Shell scripts must always use LF line endings (especially git hook templates)
 *.sh text eol=lf
 cmd/bd/templates/hooks/* text eol=lf

.github/copilot-instructions.md

@@ -6,15 +6,15 @@
 
 **Key Features:**
 - Dependency-aware issue tracking
-- Auto-sync with Git via JSONL
+- Auto-sync via Dolt-native replication
 - AI-optimized CLI with JSON output
-- Built-in daemon for background operations
+- Dolt server mode for background operations
 - MCP server integration for Claude and other AI assistants
 
 ## Tech Stack
 
 - **Language**: Go 1.21+
-- **Storage**: Dolt (internal/storage/dolt/)
+- **Storage**: Dolt (version-controlled SQL database)
 - **CLI Framework**: Cobra
 - **Testing**: Go standard testing + table-driven tests
 - **CI/CD**: GitHub Actions
@@ -36,7 +36,7 @@
 
 ### Git Workflow
 - Install git hooks: `bd hooks install`
-- Use `bd dolt push` / `bd dolt pull` for remote sync
+- Use `bd sync` for remote sync (Dolt-native replication)
 
 ## Issue Tracking with bd
 
@@ -59,7 +59,7 @@ bd list --status open --priority 1 --json
 bd show <id> --json
 
 # Sync (if remote configured)
-bd dolt push  # Push to Dolt remote
+bd sync  # Sync with Dolt remote
 ```
 
 ### Workflow
@@ -69,7 +69,7 @@ bd dolt push  # Push to 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:<parent-id> --json`
 5. **Complete**: `bd close <id> --reason "Done" --json`
-6. **Sync**: `bd dolt push` (push to Dolt remote if configured)
+6. **Sync**: `bd sync` (sync with Dolt remote if configured)
 
 **IMPORTANT**: Always include `--description` when creating issues. Issues without descriptions lack context for future work.
 
@@ -95,8 +95,7 @@ beads/
 ├── examples/            # Integration examples
 ├── docs/                # Documentation
 └── .beads/
-    ├── dolt/            # Dolt database (DO NOT COMMIT)
-    └── issues.jsonl     # Git-synced issue storage
+    └── dolt/            # Dolt database (source of truth)
 ```
 
 ## Available Resources
@@ -122,11 +121,11 @@ 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 dolt push` for remote sync
+- ✅ Use `bd sync` for remote sync
 - ✅ Test with `t.TempDir() in Go tests`
 - ❌ Do NOT create markdown TODO lists
 - ❌ Do NOT create test issues in production DB
-- ❌ Do NOT commit `.beads/dolt/` (JSONL only)
+- ❌ Do NOT manually modify `.beads/dolt/`
 
 ---