@memnexus-ai/mx-agent-cli 0.1.305 → 0.1.307
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-config/.mx-config-generation.json +2 -2
- package/dist/agent-config/AGENTS.md.template +1 -1
- package/dist/agent-config/agents/git-expert.md +23 -2
- package/dist/agent-config/claude-md/CLAUDE.core.md +1 -1
- package/dist/agent-config/skills/mx-post-merge-sync/SKILL.md +8 -3
- package/dist/lib/coordination-worktree.d.ts +26 -0
- package/dist/lib/coordination-worktree.d.ts.map +1 -1
- package/dist/lib/coordination-worktree.js +3 -1
- package/dist/lib/coordination-worktree.js.map +1 -1
- package/dist/lib/team-restore.d.ts +56 -1
- package/dist/lib/team-restore.d.ts.map +1 -1
- package/dist/lib/team-restore.js +289 -4
- package/dist/lib/team-restore.js.map +1 -1
- package/dist/lib/worktree-sync.d.ts +119 -17
- package/dist/lib/worktree-sync.d.ts.map +1 -1
- package/dist/lib/worktree-sync.js +270 -40
- package/dist/lib/worktree-sync.js.map +1 -1
- package/dist/standards/decision-request.md +3 -7
- package/dist/standards/report-format.md +0 -3
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
{
|
|
2
|
-
"generation":
|
|
3
|
-
"description": "Monotonic agent-config generation. Bump when shipping agent-config changes that external projects should pull via `mx-agent config-sync`. The CLI stamps this into a project's config on init/config-sync and warns on `mx-agent start` when a project's generation is older than the CLI's bundled generation. Platform v2.35 Phase 3 (#4017). Generation 4: auto-capture-precompact.sh and auto-capture-session-end.sh read `.mx-code-context.json` and pass its four scope tags as `--code-context`, so an auto-captured memory is labelled with the product, service, team and role of the worktree that produced it (#62). auto-checkpoint.sh is unchanged: it writes a named memory, and scope must not reach that path until memnexus#5470 is resolved. Generation 5: every post-merge sync instruction (the mx-post-merge-sync skill, git-expert.md, and the worktree-guard merge-block message) names `mx-agent worktree sync --assert-no-teammates-active` with an outcome table, replacing the stash plus `reset --hard origin/main` flow and the plain-rebase advice (#1131). Generation 6: the always-loaded post-merge gate in CLAUDE.core.md and AGENTS.md.template falls back to `mx-agent worktree sync --assert-no-teammates-active` and the skill's outcome table instead of a plain rebase, and the mx-post-merge-sync skill explains the verify-hooks --heal message and when to use a worktree build of the CLI (#1141)."
|
|
2
|
+
"generation": 7,
|
|
3
|
+
"description": "Monotonic agent-config generation. Bump when shipping agent-config changes that external projects should pull via `mx-agent config-sync`. The CLI stamps this into a project's config on init/config-sync and warns on `mx-agent start` when a project's generation is older than the CLI's bundled generation. Platform v2.35 Phase 3 (#4017). Generation 4: auto-capture-precompact.sh and auto-capture-session-end.sh read `.mx-code-context.json` and pass its four scope tags as `--code-context`, so an auto-captured memory is labelled with the product, service, team and role of the worktree that produced it (#62). auto-checkpoint.sh is unchanged: it writes a named memory, and scope must not reach that path until memnexus#5470 is resolved. Generation 5: every post-merge sync instruction (the mx-post-merge-sync skill, git-expert.md, and the worktree-guard merge-block message) names `mx-agent worktree sync --assert-no-teammates-active` with an outcome table, replacing the stash plus `reset --hard origin/main` flow and the plain-rebase advice (#1131). Generation 6: the always-loaded post-merge gate in CLAUDE.core.md and AGENTS.md.template falls back to `mx-agent worktree sync --assert-no-teammates-active` and the skill's outcome table instead of a plain rebase, and the mx-post-merge-sync skill explains the verify-hooks --heal message and when to use a worktree build of the CLI (#1141). Generation 7: step 1 of the always-loaded post-merge gate in CLAUDE.core.md and AGENTS.md.template treats an `ok` sync as done only when the audit line's `dropped` field lists no merge commit, and otherwise reports it to the PO with `backupRef`; its stop-and-ask list names the current outcomes from the mx-post-merge-sync table and drops `refused-unaccounted-commits` (#1159)."
|
|
4
4
|
}
|
|
@@ -95,7 +95,7 @@ The no-echo rule — never read, print, echo, or store a credential value or its
|
|
|
95
95
|
|
|
96
96
|
A PR is not done when it merges. It is done when it deploys and the deploy is verified.
|
|
97
97
|
|
|
98
|
-
1. Sync branch with main. Run `/mx-post-merge-sync`. If `/mx-post-merge-sync` is unavailable, run `mx-agent worktree sync --assert-no-teammates-active` from the leader session. Pass the flag only after confirming no teammate is writing in this worktree. Exit code 0 with audit outcome `ok` means done. For any other result, follow the outcome table in `mx-agent-system/agent-config/skills/mx-post-merge-sync/SKILL.md`. If you cannot read that table, or the result is `conflict`, `refused-
|
|
98
|
+
1. Sync branch with main. Run `/mx-post-merge-sync`. If `/mx-post-merge-sync` is unavailable, run `mx-agent worktree sync --assert-no-teammates-active` from the leader session. Pass the flag only after confirming no teammate is writing in this worktree. Exit code 0 with audit outcome `ok` means done, only if the audit line's `dropped` field lists no merge commit. If it lists one, report it to the PO with the `backupRef` value. For any other result, follow the outcome table in `mx-agent-system/agent-config/skills/mx-post-merge-sync/SKILL.md`. If you cannot read that table, or the result is `conflict`, `refused-replay-conflict`, `refused-unverified-commits`, `refused-squash-point-not-ancestor`, `rebase-failed`, `restore-conflict`, `restore-failed`, `in-progress`, `error`, or any other outcome the table sends to the PO, stop and ask the PO. Never run a plain rebase or `reset --hard`. Verify: `git rev-list --count HEAD..origin/main` returns 0.
|
|
99
99
|
2. Verify deployment succeeded. Get the merge SHA (`gh pr view <N> --json mergeCommit`), poll the pipeline (`gh run list --commit <sha>`), confirm the artifact is live (npm publish for CLI; deploy workflow `success` for services). If a merge's own CI run was cancelled by a later push to the same ref, the gate is satisfied by a green run at any descendant commit, verified with `git merge-base --is-ancestor <cancelled-sha> <later-sha>`. A cancelled run with no green descendant run is not verified. Both workflows set `concurrency` with `cancel-in-progress: true` keyed on the ref (`.github/workflows/mx-agent-cli.yml:113-115`, `.github/workflows/coordination-service.yml:83-85`), so a cancelled run is an ordinary result of two merges close together, not a failure.
|
|
100
100
|
3. Save a checkpoint memory. Include PR number, what shipped, deploy status, next step.
|
|
101
101
|
|
|
@@ -65,6 +65,7 @@ same session, and `gh` authenticated with read access to the repository.
|
|
|
65
65
|
```bash
|
|
66
66
|
# Step 1: Precheck. See which commits the sync will replay. After a clean squash
|
|
67
67
|
# merge every commit listed belongs to the merged PR, and the sync replays none.
|
|
68
|
+
# A commit in no merged PR is carried forward on top of main (#1159).
|
|
68
69
|
git fetch origin main
|
|
69
70
|
git status --short
|
|
70
71
|
git log origin/main..HEAD --oneline
|
|
@@ -88,6 +89,24 @@ echo "audit line: $LINE"
|
|
|
88
89
|
git rev-list --count HEAD..origin/main # Must be 0
|
|
89
90
|
```
|
|
90
91
|
|
|
92
|
+
Local commits that are in no merged pull request are carried forward (#1159). The sync
|
|
93
|
+
prints a `backup:` ref holding HEAD before it replays them onto `origin/main`. It drops a
|
|
94
|
+
non-merge commit only when the commit becomes empty on replay, because main already holds its
|
|
95
|
+
content. The audit line names the ref in `backupRef`. Its `dropped` field lists the pre-sync
|
|
96
|
+
commits that have no patch-id equivalent after the sync; a commit whose patch main already holds
|
|
97
|
+
is not listed. Every pre-sync commit stays reachable from `backupRef`. It never replays a merge
|
|
98
|
+
commit, so `dropped` always lists every merge commit, and the run still ends `ok`. Content that
|
|
99
|
+
existed only in a merge commit is then on neither HEAD nor main: it is recoverable from
|
|
100
|
+
`backupRef`, not from main. After the run, check `dropped` for a merge commit. If it lists one,
|
|
101
|
+
report it to the PO with the `backupRef` value before anything else. The sync refuses instead, with
|
|
102
|
+
`refused-unverified-commits` and nothing changed, when more than 20 first-parent commits are on
|
|
103
|
+
HEAD and not on main, or a local commit is also on another remote branch. So a merge from a
|
|
104
|
+
branch other than the worktree branch needs no reset afterwards when the pull request lookup
|
|
105
|
+
finds the PR. If the lookup misses the PR and a local commit is also on another remote branch,
|
|
106
|
+
the sync refuses with `refused-unverified-commits`. If a replayed commit conflicts instead of
|
|
107
|
+
becoming empty, the sync refuses with `refused-replay-conflict` and leaves HEAD and the working
|
|
108
|
+
tree as they were.
|
|
109
|
+
|
|
91
110
|
Act on the outcome with the table below. It is a copy of the table in the `mx-post-merge-sync`
|
|
92
111
|
skill (`agent-config/skills/mx-post-merge-sync/SKILL.md`), and a test requires the two copies
|
|
93
112
|
to be identical (`cli/src/__tests__/agent-config-sync-instructions.test.ts`).
|
|
@@ -96,7 +115,7 @@ to be identical (`cli/src/__tests__/agent-config-sync-instructions.test.ts`).
|
|
|
96
115
|
| Outcome | What the agent does |
|
|
97
116
|
|---|---|
|
|
98
117
|
| No matching audit line, or the exit code disagrees with the line | Stop. Quote what you have: the exit code, the console output including any `Checkpoint:` line, and the audit line if there is one. Ask the PO. |
|
|
99
|
-
| `ok` | Done, only if the exit code is 0.
|
|
118
|
+
| `ok` | Done, only if the exit code is 0 and the audit line's `dropped` field lists no merge commit. If it lists one, report it to the PO with the `backupRef` value. Then go to the verify line. |
|
|
100
119
|
| `refused-no-quiescence-assertion` | Re-run with `--assert-no-teammates-active` after confirming no teammate is writing in this worktree. |
|
|
101
120
|
| `refused-no-leader-lock` | Run it from the leader session. A teammate the leader spawned in that session qualifies. A teammate in a separate session asks the leader to run it. |
|
|
102
121
|
| `refused-not-quiescent` | Something is writing in the worktree. Find and stop the writer (a teammate or an editor), re-run once, then tell the leader. Never re-run while the writer is still active. |
|
|
@@ -104,7 +123,9 @@ to be identical (`cli/src/__tests__/agent-config-sync-instructions.test.ts`).
|
|
|
104
123
|
| `refused-fetch-failed` | Re-run, up to 3 times: GitHub has returned transient 404s. Then tell the leader. |
|
|
105
124
|
| `refused-gh-unavailable`, `refused-pr-lookup-failed` | The leader checks `gh auth status`. If `gh` is authenticated, ask the PO. |
|
|
106
125
|
| `refused-rebase-in-progress`, `refused-detached-head`, `refused-no-origin-remote`, `refused-base-ref-missing`, `refused-status-unreadable`, `refused-invalid-checkpoint-ref` | Stop and tell the leader. The worktree is in an unexpected state. |
|
|
107
|
-
| `refused-
|
|
126
|
+
| `refused-replay-conflict` | A local commit in no merged pull request conflicts with main. The sync aborted: HEAD and the working tree are as they were, and the printed `backup:` ref holds HEAD. Stop. Quote the backup ref, the commits listed, and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
127
|
+
| `refused-unverified-commits` | The sync would not carry the local commits forward: more than 20 first-parent commits are on HEAD and not on main, or one is also on another remote branch, so it may belong to a merged pull request the lookup did not find. Nothing was changed. Stop. Quote the commits and remote branches listed, and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
128
|
+
| `refused-squash-point-not-ancestor`, `conflict`, `restore-conflict`, `rebase-failed`, `restore-failed`, `in-progress`, `error` | Stop. Quote the printed checkpoint ref and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
108
129
|
<!-- sync-outcome-table:end -->
|
|
109
130
|
|
|
110
131
|
**Fallback, with product owner approval only.** If the command refuses or reports a conflict,
|
|
@@ -91,7 +91,7 @@ Sync URL is pre-configured in the StopHook.
|
|
|
91
91
|
|
|
92
92
|
A PR is not done when it merges. It is done when it deploys and the deploy is verified.
|
|
93
93
|
|
|
94
|
-
1. Sync branch with main. Run `/mx-post-merge-sync`. If `/mx-post-merge-sync` is unavailable, run `mx-agent worktree sync --assert-no-teammates-active` from the leader session. Pass the flag only after confirming no teammate is writing in this worktree. Exit code 0 with audit outcome `ok` means done. For any other result, follow the outcome table in `mx-agent-system/agent-config/skills/mx-post-merge-sync/SKILL.md`. If you cannot read that table, or the result is `conflict`, `refused-
|
|
94
|
+
1. Sync branch with main. Run `/mx-post-merge-sync`. If `/mx-post-merge-sync` is unavailable, run `mx-agent worktree sync --assert-no-teammates-active` from the leader session. Pass the flag only after confirming no teammate is writing in this worktree. Exit code 0 with audit outcome `ok` means done, only if the audit line's `dropped` field lists no merge commit. If it lists one, report it to the PO with the `backupRef` value. For any other result, follow the outcome table in `mx-agent-system/agent-config/skills/mx-post-merge-sync/SKILL.md`. If you cannot read that table, or the result is `conflict`, `refused-replay-conflict`, `refused-unverified-commits`, `refused-squash-point-not-ancestor`, `rebase-failed`, `restore-conflict`, `restore-failed`, `in-progress`, `error`, or any other outcome the table sends to the PO, stop and ask the PO. Never run a plain rebase or `reset --hard`. Verify: `git rev-list --count HEAD..origin/main` returns 0.
|
|
95
95
|
2. Verify deployment succeeded. Get the merge SHA (`gh pr view <N> --json mergeCommit`), poll the pipeline (`gh run list --commit <sha>`), confirm the artifact is live (npm publish for CLI; deploy workflow `success` for services). If a merge's own CI run was cancelled by a later push to the same ref, the gate is satisfied by a green run at any descendant commit, verified with `git merge-base --is-ancestor <cancelled-sha> <later-sha>`. A cancelled run with no green descendant run is not verified. Both workflows set `concurrency` with `cancel-in-progress: true` keyed on the ref (`.github/workflows/mx-agent-cli.yml:113-115`, `.github/workflows/coordination-service.yml:83-85`), so a cancelled run is an ordinary result of two merges close together, not a failure.
|
|
96
96
|
3. Save a checkpoint memory. Include PR number, what shipped, deploy status, next step.
|
|
97
97
|
|
|
@@ -3,7 +3,7 @@ name: mx-post-merge-sync
|
|
|
3
3
|
description: Sync worktree branch after a PR is squash-merged to main. Use immediately after every PR merge — do not start new work before running this.
|
|
4
4
|
---
|
|
5
5
|
|
|
6
|
-
After a squash merge, main holds the branch's work as one new commit, and the branch's own commits are redundant. Sync with one command: `mx-agent worktree sync --assert-no-teammates-active`. It finds the merged pull request's last commit and rebases only the commits made after it (`rebase --onto`). It checkpoints a dirty working tree to a ref first and restores it afterwards, so do not stash. It runs git in-process, so `git-mutation-guard` does not block it and no `GIT_EXPERT=1` override is needed (`agent-config/hooks/git-mutation-guard.sh`, the #172 exception).
|
|
6
|
+
After a squash merge, main holds the branch's work as one new commit, and the branch's own commits are redundant. Sync with one command: `mx-agent worktree sync --assert-no-teammates-active`. It finds the merged pull request's last commit and rebases only the commits made after it (`rebase --onto`). When no merged pull request holds any local commit, it backs HEAD up to a ref and carries those commits forward onto main instead (#1159). It checkpoints a dirty working tree to a ref first and restores it afterwards, so do not stash. It runs git in-process, so `git-mutation-guard` does not block it and no `GIT_EXPERT=1` override is needed (`agent-config/hooks/git-mutation-guard.sh`, the #172 exception).
|
|
7
7
|
|
|
8
8
|
The command needs two things:
|
|
9
9
|
|
|
@@ -15,6 +15,7 @@ The command needs two things:
|
|
|
15
15
|
```bash
|
|
16
16
|
# Precheck: see which commits the sync will replay. After a clean squash merge
|
|
17
17
|
# every commit listed here belongs to the merged PR, and the sync replays none.
|
|
18
|
+
# A commit in no merged PR is carried forward on top of main (#1159).
|
|
18
19
|
git fetch origin main
|
|
19
20
|
git status --short
|
|
20
21
|
git log --oneline origin/main..HEAD
|
|
@@ -64,6 +65,8 @@ git rev-list --count HEAD..origin/main
|
|
|
64
65
|
|
|
65
66
|
A dirty tree prints its checkpoint before the sync, in the form `Checkpoint: refs/mx/checkpoint/<worktree>/<epoch-ms>-<rand6>`, followed by the `git show` and `git checkout` lines that recover from it. The last line printed is `Audit: <path>`, normally `~/.mx-agent/logs/worktree-sync.jsonl`. That file holds one JSON line per run, from every worktree under this home directory, so Step 1 reads only the line whose `worktree` is this one and whose `headBefore` is the HEAD recorded just before the run.
|
|
66
67
|
|
|
68
|
+
Local commits that are in no merged pull request, such as a drafts commit that never goes into a PR, are carried forward (#1159). The sync first prints `backup: refs/mx/checkpoint/<worktree>/<epoch-ms>-<rand6>-head`, a ref holding HEAD as it was, then replays those commits on top of `origin/main`. It drops a non-merge commit only when the commit becomes empty on replay, because main already holds its content. The audit line records the ref as `backupRef`. Its `dropped` field lists the pre-sync commits that have no patch-id equivalent after the sync; a commit whose patch main already holds is not listed. Every pre-sync commit stays reachable from `backupRef`. It never replays a merge commit, so `dropped` always lists every merge commit, and the run still ends `ok`. Content that existed only in a merge commit is then on neither HEAD nor main: it is recoverable from `backupRef`, not from main. After the run, check `dropped` for a merge commit. If it lists one, report it to the PO with the `backupRef` value before anything else. The sync refuses instead, with `refused-unverified-commits` and nothing changed, when more than 20 first-parent commits are on HEAD and not on main, or a local commit is also on another remote branch. So a merge from a branch other than the worktree branch needs no reset afterwards when the pull request lookup finds the PR. If the lookup misses the PR and a local commit is also on another remote branch, the sync refuses with `refused-unverified-commits`. If a replayed commit conflicts instead of becoming empty, the sync refuses with `refused-replay-conflict` and leaves HEAD and the working tree as they were.
|
|
69
|
+
|
|
67
70
|
The exit code decides. Exit 0 means `ok`. Any other exit code means the sync did not succeed, whatever the audit line says. The line's `outcome` field tells you which row of this table applies.
|
|
68
71
|
|
|
69
72
|
The `verify-hooks --heal` step prints its own lines after the sync. A line such as `Hook freshness: healed 1 stale hook from origin/main: worktree-guard.sh` means a hook changed on main and was re-copied from `origin/main` into this worktree's `.claude/`. That is expected after a merge that changed a hook, and it does not change the sync result. A line starting with `✗` means the heal failed: tell the leader.
|
|
@@ -72,7 +75,7 @@ The `verify-hooks --heal` step prints its own lines after the sync. A line such
|
|
|
72
75
|
| Outcome | What the agent does |
|
|
73
76
|
|---|---|
|
|
74
77
|
| No matching audit line, or the exit code disagrees with the line | Stop. Quote what you have: the exit code, the console output including any `Checkpoint:` line, and the audit line if there is one. Ask the PO. |
|
|
75
|
-
| `ok` | Done, only if the exit code is 0.
|
|
78
|
+
| `ok` | Done, only if the exit code is 0 and the audit line's `dropped` field lists no merge commit. If it lists one, report it to the PO with the `backupRef` value. Then go to the verify line. |
|
|
76
79
|
| `refused-no-quiescence-assertion` | Re-run with `--assert-no-teammates-active` after confirming no teammate is writing in this worktree. |
|
|
77
80
|
| `refused-no-leader-lock` | Run it from the leader session. A teammate the leader spawned in that session qualifies. A teammate in a separate session asks the leader to run it. |
|
|
78
81
|
| `refused-not-quiescent` | Something is writing in the worktree. Find and stop the writer (a teammate or an editor), re-run once, then tell the leader. Never re-run while the writer is still active. |
|
|
@@ -80,7 +83,9 @@ The `verify-hooks --heal` step prints its own lines after the sync. A line such
|
|
|
80
83
|
| `refused-fetch-failed` | Re-run, up to 3 times: GitHub has returned transient 404s. Then tell the leader. |
|
|
81
84
|
| `refused-gh-unavailable`, `refused-pr-lookup-failed` | The leader checks `gh auth status`. If `gh` is authenticated, ask the PO. |
|
|
82
85
|
| `refused-rebase-in-progress`, `refused-detached-head`, `refused-no-origin-remote`, `refused-base-ref-missing`, `refused-status-unreadable`, `refused-invalid-checkpoint-ref` | Stop and tell the leader. The worktree is in an unexpected state. |
|
|
83
|
-
| `refused-
|
|
86
|
+
| `refused-replay-conflict` | A local commit in no merged pull request conflicts with main. The sync aborted: HEAD and the working tree are as they were, and the printed `backup:` ref holds HEAD. Stop. Quote the backup ref, the commits listed, and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
87
|
+
| `refused-unverified-commits` | The sync would not carry the local commits forward: more than 20 first-parent commits are on HEAD and not on main, or one is also on another remote branch, so it may belong to a merged pull request the lookup did not find. Nothing was changed. Stop. Quote the commits and remote branches listed, and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
88
|
+
| `refused-squash-point-not-ancestor`, `conflict`, `restore-conflict`, `rebase-failed`, `restore-failed`, `in-progress`, `error` | Stop. Quote the printed checkpoint ref and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
84
89
|
<!-- sync-outcome-table:end -->
|
|
85
90
|
|
|
86
91
|
If the command refuses (any `refused-*` outcome) or reports `conflict`, do not work around it. A plain `git rebase origin/main` after a squash merge replays commits main already holds and conflicts (#552). `git reset --hard origin/main` discards any commit that is not on main. Either one runs only with the product owner's approval, given for that run.
|
|
@@ -147,6 +147,32 @@ export interface LocateWorktreeOptions {
|
|
|
147
147
|
*/
|
|
148
148
|
trackedFiles?: (root: string) => string[] | undefined;
|
|
149
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* Rule 2c for one worktree top-level: why it may not be used, or undefined when
|
|
152
|
+
* it may. One function, so the locator and the worktree listing cannot disagree
|
|
153
|
+
* about which directories are usable. The path is passed through
|
|
154
|
+
* `sanitizeField` because the sentence is printed.
|
|
155
|
+
*
|
|
156
|
+
* Each sentence ends with a remedy that works:
|
|
157
|
+
* - mode: `chmod go-w`.
|
|
158
|
+
* - owner: CLAUDE_WORKTREE_PATH. That variable is the operator naming the team
|
|
159
|
+
* worktree, and a directory named that way is used with no owner check
|
|
160
|
+
* (rule 1), for every coordination command. A bind-mounted worktree can
|
|
161
|
+
* report another uid, and the operator is the one who knows it is theirs.
|
|
162
|
+
*
|
|
163
|
+
* THE PATH IS NEVER PRINTED AS PART OF A COMMAND (security review at 082c7d8,
|
|
164
|
+
* CWE-77). The owner refusal fires when another uid owns the directory, so that
|
|
165
|
+
* uid chose its name, and `sanitizeField` removes control bytes but keeps shell
|
|
166
|
+
* characters. The directory is named once, in prose, and the suggested command
|
|
167
|
+
* names no path.
|
|
168
|
+
*
|
|
169
|
+
* A symbolic link is reported as a link. Its lstat mode is 777, and `chmod`
|
|
170
|
+
* advice for it would be wrong. The locator never passes one: it resolves the
|
|
171
|
+
* top-level first. The worktree listing can, for an entry under `.worktrees/`.
|
|
172
|
+
*
|
|
173
|
+
* Exported for `lib/team-restore.ts` (`classifyTeamWorktreeCandidates`, #1193).
|
|
174
|
+
*/
|
|
175
|
+
export declare function topLevelRefusal(top: string, opts: LocateWorktreeOptions): string | undefined;
|
|
150
176
|
export declare function locateCoordinationWorktree(env: NodeJS.ProcessEnv, opts?: LocateWorktreeOptions): WorktreeLocation;
|
|
151
177
|
export type WorktreeFileRead = {
|
|
152
178
|
kind: 'ok';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordination-worktree.d.ts","sourceRoot":"","sources":["../../src/lib/coordination-worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAcH,sEAAsE;AACtE,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAEhE,sEAAsE;AACtE,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AAEpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,sBAAsB,GAAG,cAAc,CAAA;CAAE,GAC3E;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,eAAe,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzE,yFAAyF;AACzF,MAAM,MAAM,eAAe,GACvB,oBAAoB,GACpB,eAAe,GACf,iBAAiB,GACjB,eAAe,GACf,WAAW,CAAC;AAEhB,6EAA6E;AAC7E,eAAO,MAAM,wBAAwB,yHACmF,CAAC;AAEzH,+DAA+D;AAC/D,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAAqE,CAAC;AAEnH,iDAAiD;AACjD,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAE7C,oGAAoG;AACpG,MAAM,MAAM,OAAO,GAAG,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,KACtH,MAAM,CAAC;AAEZ;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAE7C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAAmC,CAAC;AAoBtF;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAA4C,GAAG,MAAM,EAAE,GAAG,SAAS,CAGtI;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,OAA4C,GAAG,MAAM,EAAE,GAAG,SAAS,CAgBxH;AA0BD,MAAM,WAAW,qBAAqB;IACpC,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qFAAqF;IACrF,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EAAE,GAAG,SAAS,CAAC;IACpD,+DAA+D;IAC/D,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;IAC3B,mFAAmF;IACnF,GAAG,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC/B,2EAA2E;IAC3E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACtE;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,GAAG,SAAS,CAAC;CACvD;
|
|
1
|
+
{"version":3,"file":"coordination-worktree.d.ts","sourceRoot":"","sources":["../../src/lib/coordination-worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -166,8 +166,10 @@ function defaultStatTop(path) {
|
|
|
166
166
|
* A symbolic link is reported as a link. Its lstat mode is 777, and `chmod`
|
|
167
167
|
* advice for it would be wrong. The locator never passes one: it resolves the
|
|
168
168
|
* top-level first. The worktree listing can, for an entry under `.worktrees/`.
|
|
169
|
+
*
|
|
170
|
+
* Exported for `lib/team-restore.ts` (`classifyTeamWorktreeCandidates`, #1193).
|
|
169
171
|
*/
|
|
170
|
-
function topLevelRefusal(top, opts) {
|
|
172
|
+
export function topLevelRefusal(top, opts) {
|
|
171
173
|
const uid = (opts.uid ?? currentUid)();
|
|
172
174
|
if (uid === undefined)
|
|
173
175
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordination-worktree.js","sourceRoot":"","sources":["../../src/lib/coordination-worktree.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"coordination-worktree.js","sourceRoot":"","sources":["../../src/lib/coordination-worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,11 @@
|
|
|
17
17
|
* reads `active` can be restored (M6a, M6b). For such a team the worktree
|
|
18
18
|
* lookup is `findTeamWorktree`, which accepts `<slug>` and
|
|
19
19
|
* `<slug>-YYYYMMDD` only (M1, M9), so `start team` never resolves to a
|
|
20
|
-
* `team-builder-*` worktree.
|
|
20
|
+
* `team-builder-*` worktree. When that lookup finds nothing,
|
|
21
|
+
* `classifyTeamWorktreeCandidates` reads the identity of every other
|
|
22
|
+
* `<slug>-*` git worktree before a restore is chosen (#1193), so a folder
|
|
23
|
+
* named before the dated naming, such as `mcp-improvements`, is used rather
|
|
24
|
+
* than duplicated. Every other slug keeps the prefix lookup
|
|
21
25
|
* `findWorktreePath`, which is how same-machine starts have always worked.
|
|
22
26
|
* 2. `restoreTeamWorktree` fetches `origin/<base>` and the team's
|
|
23
27
|
* `worktree/<slug>-*` branches (M10, M13b). By default it creates today's
|
|
@@ -56,6 +60,7 @@
|
|
|
56
60
|
* so a test can read them without capturing a terminal.
|
|
57
61
|
*/
|
|
58
62
|
import { type TeamEntry } from './catalog.js';
|
|
63
|
+
import { type LocateWorktreeOptions } from './coordination-worktree.js';
|
|
59
64
|
/** The `start` flag that lets a restore reuse a branch that already exists. */
|
|
60
65
|
export declare const RESUME_BRANCH_FLAG = "--resume-branch";
|
|
61
66
|
/** The command a refusal names for a team that is not in the catalog. */
|
|
@@ -109,6 +114,56 @@ export declare function restorableStatus(entry: Pick<TeamEntry, 'statusValues'>)
|
|
|
109
114
|
* and `mx-agent status` print the same pair (#1155 red-team finding 7).
|
|
110
115
|
*/
|
|
111
116
|
export declare function catalogPointerLines(projectRoot: string, teamsDir: string): string[];
|
|
117
|
+
/** What `classifyTeamWorktreeCandidates` decided. `none` leaves the choice to the caller. */
|
|
118
|
+
export type TeamWorktreeCandidates =
|
|
119
|
+
/** Exactly one other-named worktree names this team. */
|
|
120
|
+
{
|
|
121
|
+
kind: 'existing';
|
|
122
|
+
path: string;
|
|
123
|
+
}
|
|
124
|
+
/** A worktree might be this team's and start cannot tell. Nothing was written. */
|
|
125
|
+
| {
|
|
126
|
+
kind: 'refused';
|
|
127
|
+
lines: string[];
|
|
128
|
+
}
|
|
129
|
+
/** No `<slug>-*` git worktree here names this team or might. */
|
|
130
|
+
| {
|
|
131
|
+
kind: 'none';
|
|
132
|
+
};
|
|
133
|
+
/**
|
|
134
|
+
* The worktrees of `slug` whose folder `findTeamWorktree` does not accept, read
|
|
135
|
+
* by identity (#1193; plan comment 7044215366 and amendment 1, comment
|
|
136
|
+
* 7044277415, which governs where they differ).
|
|
137
|
+
*
|
|
138
|
+
* WHY. `findTeamWorktree` accepts `<slug>` and `<slug>-YYYYMMDD` only, so a team
|
|
139
|
+
* whose folder predates the dated naming (`mcp-improvements`) was restored
|
|
140
|
+
* beside its own worktree, and the second session could drain its inbox.
|
|
141
|
+
*
|
|
142
|
+
* CANDIDATES. Entries under `<projectRoot>/<worktreeDir>/` that start with
|
|
143
|
+
* `<slug>-`, except:
|
|
144
|
+
* - A1: a folder another catalog team claims by name. Every catalog slug
|
|
145
|
+
* claims the folder it equals and every `<slug>-*` folder, whatever its
|
|
146
|
+
* Status (red-team R2 on PR #1217). The longest claimant owns the folder,
|
|
147
|
+
* this slug included (R1), so `team-builder-20260101` is never a candidate
|
|
148
|
+
* of `team`, and `team-builder-improvements` is still one of
|
|
149
|
+
* `team-builder`.
|
|
150
|
+
* - A2: anything `lstat` shows is not a directory, a symbolic link included,
|
|
151
|
+
* and a directory whose `.git` is not a regular file, so a nested clone is
|
|
152
|
+
* skipped (R4). Owner and mode go through `topLevelRefusal`, as
|
|
153
|
+
* `scanTeamWorktrees` does.
|
|
154
|
+
*
|
|
155
|
+
* DECISION. A refusal from the marker reader refuses. Then exactly one
|
|
156
|
+
* candidate naming this slug is `existing`; two or more refuse; none and at
|
|
157
|
+
* least one with no readable identity refuses; otherwise `none`. A candidate
|
|
158
|
+
* naming another slug is dropped. Every refusal is returned before anything is
|
|
159
|
+
* written, and the lines name the folders and the remedy.
|
|
160
|
+
*
|
|
161
|
+
* STATED LIMIT. A folder that does not start with `<slug>-` is never a
|
|
162
|
+
* candidate.
|
|
163
|
+
*
|
|
164
|
+
* `seams` are the owner-check and git test seams of `LocateWorktreeOptions`.
|
|
165
|
+
*/
|
|
166
|
+
export declare function classifyTeamWorktreeCandidates(opts: StartWorktreeOptions, seams?: LocateWorktreeOptions): TeamWorktreeCandidates;
|
|
112
167
|
/**
|
|
113
168
|
* Where `start <slug>` runs, or that it must restore, or that it must refuse.
|
|
114
169
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team-restore.d.ts","sourceRoot":"","sources":["../../src/lib/team-restore.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"team-restore.d.ts","sourceRoot":"","sources":["../../src/lib/team-restore.ts"],"names":[],"mappings":"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"}
|