Skip to content

docs: clarify safe worktree stacking #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nedtwigg merged 2 commits into from
Sep 9, 2026
Merged

docs: clarify safe worktree stacking #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28f728
docs: clarify safe worktree stacking
nedtwigg Sep 9, 2026
608b11e
Merge origin/main into docs/worktrunk-stacking
nedtwigg Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ pnpm build # build lib, vscode extension, Pocket, and website
**Open every PR as a draft.** Chromatic bills per snapshot and skips drafts, so
marking a PR ready for review is what spends them.

## Worktrees

- **Must stack with `wt switch --create <branch> --base @`**, never `git switch -c` in an existing worktree; other sessions need its branch and path intact. Set the GitHub PR base separately.

@dormouse-bot dormouse-bot Sep 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wt needs an introduction here — it is worktrunk, and nothing else in the repo says so.

Suggested change
- **Must stack with `wt switch --create <branch> --base @`**, never `git switch -c` in an existing worktree; other sessions need its branch and path intact. Set the GitHub PR base separately.
`wt` is [worktrunk](https://github.com/max-sixty/worktrunk), installed separately.
- **Must stack with `wt switch --create <branch> --base @`**, never `git switch -c` in an existing worktree; other sessions need its branch and path intact. Set the GitHub PR base separately.

- **Never relocate or remove active worktrees.** If a path is occupied, use `wt --config-set 'worktree-path="{{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}.REAL"' switch <branch>`.
- **Must set agent commands' working directory explicitly** after switching. Run `pnpm install` in fresh worktrees.

## Architecture

- **`lib/`** — Shared React + TailwindCSS frontend library: components, tests, Storybook.
Expand Down
2 changes: 1 addition & 1 deletion scripts/spec-word-budgets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AGENTS.md": 3250,
"AGENTS.md": 3350,
"SECURITY.md": 200,
"SELF_HOST.md": 6000,
"docs/specs/alert.md": 6600,
Expand Down