* fix(exec): match Windows environment key identity (#5618) Centralize os/exec-compatible environment-key comparison and use it for credential, metrics, Git-hook, trace, and repro subprocess filters. Preserve exact Unix semantics and Unicode near-collisions. Agent-Signature: codex-gpt-5-unknown-reasoning on behalf of Ewen Cuthiell Signed-off-by: Ewen Cuthiell <ewencuthiell@gmail.com> * fix(worktree): scrub inherited Git routing state Establish CWD as the worktree repository boundary before discovery can consume inherited Git routing. Fence the startup config probe, clear routing in-process before root pre-run discovery, and retain command-owned subprocess scrubbing as defense in depth without changing PID or signal semantics. Fixes #5531 Agent-Signature: codex-gpt-5-unknown-reasoning on behalf of Ewen Cuthiell * refactor(worktree): explain owned filtering and remove an unused shim Document why filtering the fresh routing slice in place is safe and call the shared routing-key classifier directly from tests. Retain the two forwarders used by production worktree subprocess/removal paths. Review: https://github.com/gastownhall/beads/pull/5623#pullrequestreview-5098421671 Bead: saa-cgh.23 Agent-Signature: unknown-model/unknown-reasoning * fix(config): isolate identity and tracked-file Git probes from routing Reuse the worktree routing owner for GetIdentity and isGitTracked so explicit cwd/path selection is not displaced by inherited repository, index or injected config state. Preserve identity precedence and the tracked-secret refusal contract, with real target/decoy regressions. Follow-up: https://github.com/gastownhall/beads/issues/6222 Dependency: https://github.com/gastownhall/beads/pull/5623 Reported-by: bee-ghosttrack Bead: saa-cgh.93 Agent-Signature: unknown-model/unknown-reasoning * test(execenv): exercise every environment operation under both host rules Thread the host choice through narrow private helpers behind the existing exported functions. Keep one normalization owner and retain native wrapper tests; the additional table covers both host branches for equality, prefix matching, last-wins lookup, filtering and input preservation. Review: https://github.com/gastownhall/beads/pull/5672#pullrequestreview-5096948965 Bead: saa-cgh.78 Agent-Signature: unknown-model/unknown-reasoning * docs(worktree): explain startup Git environment scope (saa-cgh.23) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * test(execenv): exercise exported host policy wiring (saa-cgh.78) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(config): share subprocess key identity for Git routing (saa-cgh.93) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): isolate tracked-file guard from Git routing (saa-cgh.98) Follow-up to bee-ghosttrack's review of gastownhall/beads#6322; refs #6356. Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(config): isolate role commands from Git routing (saa-cgh.99) Follow-up to bee-ghosttrack's review of gastownhall/beads#6322; refs #6357. Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * test(env): exercise shared key helpers on native Windows (saa-cgh.78) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * refactor(gitenv): share key parsing and normalize routing membership once (saa-cgh.93) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * docs(config): explain role command routing policy (saa-cgh.99) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): retain legitimate inherited tracking context (saa-cgh.98) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * test(hooks): isolate trusted global configuration fixture (saa-cgh.98) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): isolate role cleanup in the selected repository (saa-cgh.109.4) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): reset only common local role configuration (saa-cgh.109.10) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): scope hooks-path cleanup to selected common config (saa-cgh.109.11) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * test(hooks): make worktree role preservation independent (saa-cgh.120) Agent-Signature: Codex-unknown-model-unknown-reasoning on behalf of Ewen Cuthiell * Report selected config read failures during hook reset (saa-cgh.120) Agent-Signature: Codex-unknown-model-unknown-reasoning on behalf of Ewen Cuthiell * fix(hooks): keep successful config stdout separate from diagnostics (saa-cgh.120) Agent-Signature: Codex-unknown-model-unknown-reasoning on behalf of Ewen Cuthiell * fix(config): pin role writes to fresh common context (GH#6384) (saa-cgh.120.3) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(config): retain Git diagnostics from role writes (saa-cgh.120.3) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * test(config): assert the actual Git lock diagnostic (saa-cgh.120.3) Agent-Signature: unknown-model/unknown-reasoning on behalf of Ewen Cuthiell * fix(config,hooks): restore the inherited-tracking fallback in the secret guard Maintainer review fixes for PR #6454 (adopt-pr iteration 1). The scorecard approved at 913/1000 with no blocker or major surviving synthesis; these are the non-gating findings that were cheap to close while the fixup was open. Finding 1 (minor, security) is the only in-range regression in the report. The range switched internal/config.isGitTracked from the inherited environment to gitenv.ScrubRouting only, so a config.yaml tracked solely through legitimate routing -- a bare repository whose work tree is named by GIT_DIR/GIT_WORK_TREE -- reported untracked, and a secret-key write that upstream-base refused was silently allowed. Restores the scrubbed-then-inherited union the same stack already gave cmd/bd.isGitTrackedFile. Finding 4 (nit) composes with it rather than conflicting, so both land as one change: the inherited probe now runs only when the scrubbed probe failed for a configuration reason. git's exit codes discriminate exactly -- 0 tracked, 1 repository reached but path untracked (final), 128 no reachable repository -- so the ordinary untracked-hook miss no longer spawns a second `git ls-files` while the bare-work-tree fallback is preserved. Finding 2 (minor). scrubWorktreeRemovalGitEnvForOS keyed its stricter no-optional-locks policy on strings.ToUpper while the rest of the PR uses execenv key identity. The two disagree in both directions on Windows: GIT_OPTIONAL_LOCKS with a dotted capital I (U+0130) survived the scrub although Git honors it, and GIT_OPTIONAL_LOCK with a long s (U+017F) was dropped although os/exec keeps it distinct. normalizeWorktreeGitEnvKey is deleted in favour of execenv.KeyEqualForOS. Base applied ToUpper on all platforms, so this is a consistency fix in newly rewritten code, not a regression. Finding 5 (nit). The comment above resetHooksPathIfBeadsManaged's probe asserted that repoRoot and commonDir share the cached Git context. Probed false: with cwd A and GIT_DIR=B/.git, `git rev-parse --git-common-dir --show-toplevel` prints B/.git and A. Restated as intent. Finding 3 (scrubGitHookEnv is a fifth, strictly weaker routing scrubber) is deliberately not taken here: cmd/bd/export_auto.go is untouched by this range, so the hazard is byte-identical at base, and the synthesis scoped it to a follow-up bead rather than growing this stack. Each fix is mutation-proved. Reverting isGitTracked reds only the new TestSecretGitTrackingHonorsInheritedBareWorkTree -- including "refusal = <nil>", the actual security consequence -- while the incumbent decoy test stays green, so the pin adds coverage rather than duplicating it. Restoring ToUpper reds only the new Windows row, showing both directions at once. TestGuardHookWritePathHonorsInheritedRepository gains a fixture guard asserting its scrubbed probe fails for a configuration reason rather than exit 1, so a future fixture change cannot silently make the fallback unreachable. scrubWorktreeRemovalGitEnvForOS had no test at all before this. Green locally: ./internal/config, ./internal/execenv, ./internal/gitenv, ./internal/githooksenv, ./internal/gittraceenv, ./internal/metrics, ./scripts, ./internal/beads (the GIT_CONFIG_GLOBAL blast radius neither reviewer ran), and a blast-radius cmd/bd run over the hooks, worktree, role and uninstall suites. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Signed-off-by: Ewen Cuthiell <ewencuthiell@gmail.com> Co-authored-by: Bee <bee@ghosttrack.com> Co-authored-by: Gas City Adopt-PR <adopt-pr@gascity.local> Co-authored-by: Julian Knutsen <julianknutsen@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
139 lines
3.7 KiB
Markdown
139 lines
3.7 KiB
Markdown
---
|
|
title: Git Worktrees Guide
|
|
description: Using beads from Git worktrees, which share one .beads workspace, plus external BEADS_DIR setups and legacy sync-branch cleanup.
|
|
---
|
|
|
|
Beads works from normal Git worktrees without a separate sync branch. Current
|
|
beads stores issue data in Dolt under `refs/dolt/data`, so issue sync is
|
|
separate from Git branch commits.
|
|
|
|
## Current Model
|
|
|
|
All worktrees in the same repository use the same beads workspace unless you
|
|
override discovery with `BEADS_DIR`.
|
|
|
|
Startup Git discovery probes for every `bd` command scrub inherited Git routing
|
|
variables such as `GIT_DIR` and `GIT_WORK_TREE` from their subprocess environment.
|
|
Clearing those variables from the `bd` process environment applies only to
|
|
`bd worktree` commands.
|
|
|
|
```
|
|
project/
|
|
├── .git/ # Shared Git directory
|
|
├── .beads/ # Shared beads config and local Dolt data
|
|
├── main-worktree/
|
|
└── feature-worktree/
|
|
```
|
|
|
|
Key points:
|
|
|
|
- `bd` discovers the repository's `.beads` directory from linked worktrees.
|
|
- Issue changes are stored in Dolt, not committed to the current Git branch.
|
|
- Cross-clone sync uses `bd dolt pull` and `bd dolt push`.
|
|
- No `sync.branch` or beads-managed Git worktree is required.
|
|
|
|
## Basic Usage
|
|
|
|
Initialize beads once in the repository:
|
|
|
|
```bash
|
|
cd project
|
|
bd init
|
|
```
|
|
|
|
Create linked worktrees normally:
|
|
|
|
```bash
|
|
git worktree add ../project-feature feature-branch
|
|
cd ../project-feature
|
|
bd ready
|
|
bd create "Implement feature X" -t feature -p 1
|
|
```
|
|
|
|
Sync issue data through the configured Dolt remote:
|
|
|
|
```bash
|
|
bd dolt pull
|
|
bd dolt push
|
|
```
|
|
|
|
## External Beads Workspace
|
|
|
|
If you want a separate issue-tracker repository shared by many code worktrees,
|
|
point `BEADS_DIR` at that workspace:
|
|
|
|
```bash
|
|
export BEADS_DIR=~/project-beads/.beads
|
|
|
|
cd ~/project/main && bd list
|
|
cd ~/project/feature-1 && bd list
|
|
cd ~/project/feature-2 && bd list
|
|
```
|
|
|
|
With an external `BEADS_DIR`, `bd dolt push` and `bd dolt pull` target the
|
|
external beads workspace, not the code repository.
|
|
|
|
## Hooks
|
|
|
|
Git hooks installed by beads are worktree-aware. If hooks are stale or mention
|
|
removed legacy sync commands, refresh them:
|
|
|
|
```bash
|
|
bd hooks install
|
|
```
|
|
|
|
## Legacy Cleanup
|
|
|
|
Older beads versions had an experimental `sync.branch` workflow that created
|
|
hidden worktrees such as `.git/beads-worktrees/<branch>/`. That workflow has
|
|
been removed.
|
|
|
|
If a legacy checkout cannot switch branches because a beads-created worktree
|
|
still holds the branch, remove the stale worktree records:
|
|
|
|
```bash
|
|
rm -rf .git/beads-worktrees
|
|
rm -rf .git/worktrees/beads-*
|
|
git worktree prune
|
|
```
|
|
|
|
If old config still contains a sync branch, clear it:
|
|
|
|
```bash
|
|
bd config set sync.branch ""
|
|
```
|
|
|
|
## Troubleshooting
|
|
|
|
### Database Not Found In A Worktree
|
|
|
|
Check that the main repository has a `.beads` directory and that the worktree
|
|
belongs to that repository:
|
|
|
|
```bash
|
|
git worktree list
|
|
cd /path/to/main/repo
|
|
ls -la .beads
|
|
```
|
|
|
|
If the repository has no beads workspace yet, run `bd init` from the main
|
|
repository.
|
|
|
|
### Multiple `.beads` Directories
|
|
|
|
If a worktree has its own accidental `.beads` directory, remove or archive the
|
|
extra copy after confirming it does not contain unique issue data. By default,
|
|
worktrees should share the repository workspace.
|
|
|
|
### Concurrent Writers
|
|
|
|
For ordinary single-user worktree use, run commands directly. For true
|
|
multi-writer workflows across machines or agents, sync frequently with
|
|
`bd dolt pull` and `bd dolt push`, and coordinate through the tracker to avoid
|
|
working the same issue concurrently.
|
|
|
|
## See Also
|
|
|
|
- [Protected Branches](/reference/protected-branches) - protected branch behavior
|
|
- [Git Integration](/reference/git-integration) - general Git integration guide
|
|
- [Multi-Repo Migration Guide](/multi-agent/multi-repo-migration) - multi-workspace patterns
|