Skip to content

Commit f465294

Browse files
Make root checkout the only supported main path
Co-authored-by: Andrew <andrewxhill@gmail.com>
1 parent 242009d commit f465294

14 files changed

Lines changed: 44 additions & 46 deletions

File tree

.agents/skills/worktree/SKILL.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ Submission expectations:
192192
Use `mq` instead of manual merge:
193193

194194
```bash
195-
mq run-once --repo ~/Projects/_wt/recallnet/mainline/protected-main
195+
mq run-once --repo ~/Projects/recallnet/mainline
196196
```
197197

198198
When publish behavior is part of the dogfood target:
199199

200200
```bash
201-
mq publish --repo ~/Projects/_wt/recallnet/mainline/protected-main
201+
mq publish --repo ~/Projects/recallnet/mainline
202202
```
203203

204204
For machine-wide steady state, prefer one global daemon instead of one daemon
@@ -211,9 +211,9 @@ mainlined --all --json
211211
Recommended verification loop:
212212

213213
```bash
214-
mq status --repo ~/Projects/_wt/recallnet/mainline/protected-main --json
215-
mq repo audit --repo ~/Projects/_wt/recallnet/mainline/protected-main --json
216-
mq events --repo ~/Projects/_wt/recallnet/mainline/protected-main --follow --json --lifecycle
214+
mq status --repo ~/Projects/recallnet/mainline --json
215+
mq repo audit --repo ~/Projects/recallnet/mainline --json
216+
mq events --repo ~/Projects/recallnet/mainline --follow --json --lifecycle
217217
```
218218

219219
Expected:

AGENTS.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ instructions.
77

88
- Treat `/Users/devrel/Projects/recallnet/mainline` as the canonical protected
99
`main` checkout for this repo.
10-
- Treat `/Users/devrel/Projects/_wt/recallnet/mainline/protected-main` as a
11-
protected mirror, not as the human-facing source of truth.
1210
- The root checkout must stay clean and on branch `main`. Humans inspect it,
1311
wrappers build from it, and docs refer to it.
1412
- Do not use native mutating `git` commands from that worktree while on branch
@@ -28,7 +26,7 @@ instructions.
2826
- capture `submission_id` from JSON when a wrapper needs durable tracking
2927
- `mq wait --submission <id> --for landed --json --timeout 30m` when the
3028
wrapper needs integrate-plus-publish confirmation by id
31-
- `mq repo audit --repo /Users/devrel/Projects/_wt/recallnet/mainline/protected-main --json`
29+
- `mq repo audit --repo /Users/devrel/Projects/recallnet/mainline --json`
3230
- Controllers and factory-style daemons should prefer:
3331
- `mq land --json --timeout 30m`
3432
- or one machine-global `mainlined --all --json`
@@ -50,7 +48,7 @@ instructions.
5048
documented contracts in
5149
[docs/JSON_CONTRACTS.md](/Users/devrel/Projects/recallnet/mainline/docs/JSON_CONTRACTS.md).
5250
- If a branch is claimed to be landed, verify it with
53-
`mq repo audit --repo /Users/devrel/Projects/_wt/recallnet/mainline/protected-main --json`.
51+
`mq repo audit --repo /Users/devrel/Projects/recallnet/mainline --json`.
5452
An empty `unmerged` list is the source of truth.
5553

5654
## Intent

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The daemon path should feel like this:
9494

9595
```bash
9696
mainlined --all --interval 2s --json
97-
mq events --repo /path/to/protected-main --follow --json --lifecycle
97+
mq events --repo /path/to/repo-root --follow --json --lifecycle
9898
```
9999

100100
That is the product: one machine, one protected branch, many worktrees, one
@@ -197,7 +197,7 @@ Homebrew and Nix details are in
197197
Recommended first-time repo setup after install:
198198

199199
```bash
200-
cd /path/to/protected-main
200+
cd /path/to/repo-root
201201
mq repo init --repo . --main-worktree .
202202
git add mainline.toml
203203
git commit -m "Initialize mainline repo policy"
@@ -222,11 +222,11 @@ checkout is already clean and on the protected branch.
222222
Setup:
223223

224224
```bash
225-
mq repo init --repo /path/to/protected-main --main-worktree /path/to/protected-main
226-
mq repo root --repo /path/to/protected-main --json
227-
mq repo audit --repo /path/to/protected-main --json
228-
mq config edit --repo /path/to/protected-main
229-
mq doctor --repo /path/to/protected-main --fix --json
225+
mq repo init --repo /path/to/repo-root --main-worktree /path/to/repo-root
226+
mq repo root --repo /path/to/repo-root --json
227+
mq repo audit --repo /path/to/repo-root --json
228+
mq config edit --repo /path/to/repo-root
229+
mq doctor --repo /path/to/repo-root --fix --json
230230
```
231231

232232
Submit and land:
@@ -244,13 +244,13 @@ mq land --json --timeout 30m
244244
Operate and observe:
245245

246246
```bash
247-
mq status --repo /path/to/protected-main --json
248-
mq repo audit --repo /path/to/protected-main --json
249-
mq watch --repo /path/to/protected-main
250-
mq events --repo /path/to/protected-main --follow --json --lifecycle
247+
mq status --repo /path/to/repo-root --json
248+
mq repo audit --repo /path/to/repo-root --json
249+
mq watch --repo /path/to/repo-root
250+
mq events --repo /path/to/repo-root --follow --json --lifecycle
251251
mainlined --all --json
252-
mq retry --repo /path/to/protected-main --submission 17
253-
mq cancel --repo /path/to/protected-main --publish 4
252+
mq retry --repo /path/to/repo-root --submission 17
253+
mq cancel --repo /path/to/repo-root --publish 4
254254
```
255255

256256
## Repository Layouts

docs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mainlined --version
5555
Recommended first-time repo setup after install:
5656

5757
```bash
58-
cd /path/to/protected-main
58+
cd /path/to/repo-root
5959
mq repo init --repo . --main-worktree .
6060
git add mainline.toml
6161
git commit -m "Initialize mainline repo policy"
@@ -166,7 +166,7 @@ of one idle daemon per repo.
166166
Register each repo once:
167167

168168
```bash
169-
cd /path/to/protected-main
169+
cd /path/to/repo-root
170170
mq repo init --repo . --main-worktree .
171171
```
172172

internal/app/cli.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ Turbo paths:
123123
Controller or factory daemon:
124124
%s land --json --timeout 30m
125125
%s wait --submission 42 --for landed --json --timeout 30m
126-
%s events --follow --json --lifecycle --repo /path/to/protected-main
126+
%s events --follow --json --lifecycle --repo /path/to/repo-root
127127
mainlined --all --json --interval 2s
128128
129129
Operator:
130-
%s status --repo /path/to/protected-main --json
131-
%s doctor --fix --repo /path/to/protected-main --json
130+
%s status --repo /path/to/repo-root --json
131+
%s doctor --fix --repo /path/to/repo-root --json
132132
133133
Initialize once per repo:
134-
%s repo init --repo /path/to/protected-main --main-worktree /path/to/protected-main
135-
%s repo root --repo /path/to/protected-main --json
134+
%s repo init --repo /path/to/repo-root --main-worktree /path/to/repo-root
135+
%s repo root --repo /path/to/repo-root --json
136136
git add mainline.toml && git commit -m "Initialize mainline repo policy"
137137
./scripts/install-hooks.sh
138138

internal/app/confidence.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Summarize live repo health, evidence files, and promotion gates for the current
8686
build.
8787
8888
Examples:
89-
mq confidence --repo /path/to/protected-main --json
89+
mq confidence --repo /path/to/repo-root --json
9090
mq confidence --soak-summary artifacts/soak/latest/summary.json --json
9191
9292
Flags:

internal/app/config_edit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func runConfigEdit(args []string, stdout io.Writer, stderr io.Writer) error {
2323
Open the shared repo config, even when invoked from a linked worktree.
2424
2525
Examples:
26-
mq config edit --repo /path/to/protected-main
26+
mq config edit --repo /path/to/repo-root
2727
mq config edit --print-path
2828
2929
Flags:

internal/app/controls.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func runControlAction(action string, args []string, stdout io.Writer, stderr io.
2727
Operate on exactly one queue item.
2828
2929
Examples:
30-
mq %s --repo /path/to/protected-main --submission 17
31-
mq %s --repo /path/to/protected-main --publish 4 --json
30+
mq %s --repo /path/to/repo-root --submission 17
31+
mq %s --repo /path/to/repo-root --publish 4 --json
3232
3333
Flags:
3434
`, currentCLIProgramName(), action, action, action))

internal/app/events.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Replay or follow durable queue events. Add --lifecycle for stable branch-level
6464
records that long-lived agents and daemons can consume directly.
6565
6666
Examples:
67-
mq events --repo /path/to/protected-main --follow --json --lifecycle
68-
mq logs --repo /path/to/protected-main --limit 50
67+
mq events --repo /path/to/repo-root --follow --json --lifecycle
68+
mq logs --repo /path/to/repo-root --limit 50
6969
7070
Flags:
7171
`, commandName))

internal/app/publish.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func runPublish(args []string, stdout io.Writer, stderr io.Writer) error {
3131
Queue publish of the current protected-branch tip.
3232
3333
Examples:
34-
mq publish --repo /path/to/protected-main
35-
mq publish --repo /path/to/protected-main --json
34+
mq publish --repo /path/to/repo-root
35+
mq publish --repo /path/to/repo-root --json
3636
3737
Flags:
3838
`, currentCLIProgramName()))

0 commit comments

Comments
 (0)