worktree command, docs/agents moved to docs/coding-agents#2316
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Greptile SummaryThis PR adds
Confidence Score: 4/5Safe to merge with one fix recommended in flake.nix's pre-commit hook check. The hooks-dir check in flake.nix can produce a relative path in the main worktree, making pre-commit install run every time nix develop is entered from a project subdirectory — the exact failure mode the change was trying to prevent. Everything else (worktree script logic, docs rename, nixpkgs package name migration) looks correct. flake.nix — the HOOKS_DIR relative-path issue on lines 249-250 Important Files Changed
Flowchart%%{init: {'theme': 'neutral'}}%%
flowchart TD
A["bin/worktree new branch [base-ref]"] --> B{Branch exists locally?}
B -- yes --> C["git worktree add DIR BRANCH"]
B -- no --> D{Branch exists on origin?}
D -- yes --> E["git worktree add --track -b BRANCH DIR origin/BRANCH"]
D -- no --> F["git worktree add -b BRANCH DIR BASE-REF"]
C --> G["cd DIR"]
E --> G
F --> G
G --> H{.envrc exists?}
H -- no --> I["ln -s .envrc.nix OR .envrc.venv"]
H -- yes --> J["skip symlink"]
I --> K{envrc == .envrc.nix?}
J --> K
K -- yes --> L["nix develop --command bash -c uv venv + uv sync"]
K -- no --> M["uv venv + uv sync"]
L --> N["direnv allow ."]
M --> N
N --> O["ready: DIR"]
Reviews (7): Last reviewed commit: "fix(worktree): finish docs/agents rename..." | Re-trigger Greptile |
- AGENTS.md: docs/agents/ -> docs/coding-agents/ (dir was renamed) - bin/worktree: fall back when realpath lacks GNU -m (BSD/macOS)
ea5961f to
b31d0dd
Compare
- `bin/worktree ls` lists worktrees as a BRANCH/DIRECTORY table; the branch column is the value to pass to `rm`, main is tagged (main). - Creation now requires `new` (aka create/add); a bare unknown word errors instead of silently creating a worktree (typo safety).
b31d0dd to
624e534
Compare
- run-doc-codeblocks: point stale docs/agents/ comment+usage paths at docs/coding-agents/ to complete the rename - bin/worktree: guard -d|--dir against a missing value so it prints usage instead of a raw set -u error - coding-agents/index.md: add the renamed style.md to the index tree
Integrate origin/main (PR #2242 loop_closure rewrite, #2278 aruco Detection3D, #2316 docs/coding-agents rename, mem2 time windowing, etc.). Took origin's marker-free PGO/PoseGraph rewrite for loop_closure (eval, pgo, test_pgo, markers_rrd), marker_transformer, and the map CLI; kept branch map_rrd. Stripped remaining # ---- section markers from map_rrd.
| @@ -0,0 +1,165 @@ | |||
| #!/usr/bin/env bash | |||
| # Manage ready-to-work git worktrees for parallel/agent development. | |||
There was a problem hiding this comment.
Don't you just do claude --worktree?
There was a problem hiding this comment.
We still need to move and replace this file. This entire file will end up in the context for most coding agents.
adds a
./bin/worktreecmd (totally vibed) that quickly creates a dimos worktree and installs dimos in it (pytest/mypy passes)renames docs/agents to docs/coding-agents (there was some confusion here, these are docs for coding agents working on dimos, not docs ABOUT agents in dimos)