Skip to content

fix: keep managed worktrees inside the selected repository - #730

Merged
Meta-Develop merged 6 commits into
mainfrom
codex/project-local-worktree-root-20261001
Sep 30, 2026
Merged

Meta-Develop merged 6 commits into
mainfrom
codex/project-local-worktree-root-20261001

Conversation

@Meta-Develop

@Meta-Develop Meta-Develop commented Sep 30, 2026 •

Copy link
Copy Markdown
Owner

Managed worktrees defaulted beside their repository, leaving generated lanes and Cargo configuration in the parent workspace. New implicit lanes use <repo>/.maco/worktrees/<sanitized-repo-name>/<agent-id>. Register only the exact managed group in authenticated primary Git info/exclude so raw candidate capture and Git index operations preserve a clean primary. Preserve operator contents, modes and negations, reject unadmitted config indirection, and fence repository/config/ignore generations. Explicit roots receive no automatic exclusion.

Discover exact new and legacy grouped sweep roots within the workspace and its direct repository children, preserving stored bindings and primary/common-directory authentication. GC and reconciliation recognize registered lanes by validated actual basenames. Anchor native Git ignore checks to the bound repository, and keep embedded-child status caches outside the primary. Primary/candidate integrity production predicates remain unchanged; manual .worktrees content receives no new exemption.

Validation at 2c45e411: independent full eleven-file logic/privacy review PASS; all GitHub checks PASS, including the required Rust CI gate, Linux formatting/all-target check/strict Clippy, every integration test, Windows/macOS all-target check and test compilation. Linux library partitions passed 3,102 rest, 973 supervise and 57 autopilot tests, with 16 existing ignored tests. The real renamed-manual destructive GC/reconciliation regression and new managed-creation/primary-integrity regressions passed. Eight focused portable tests, offline native library checking, full formatting and whitespace checks also passed.

@Meta-Develop Meta-Develop changed the title Keep default worktrees inside the repository fix: keep managed worktrees inside the selected repository Sep 30, 2026
@Meta-Develop
Meta-Develop marked this pull request as ready for review September 30, 2026 21:20
@Meta-Develop
Meta-Develop merged commit 09d0a9b into main Sep 30, 2026
21 checks passed
@Meta-Develop
Meta-Develop deleted the codex/project-local-worktree-root-20261001 branch September 30, 2026 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant