@memnexus-ai/mx-agent-cli 0.1.296-next.1 → 0.1.296-next.3

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.
Files changed (58) hide show
  1. package/dist/__tests__/coordination-brief-pin.test.js +6 -2
  2. package/dist/__tests__/coordination-brief-pin.test.js.map +1 -1
  3. package/dist/__tests__/coordination-credential-endpoint.test.js +9 -7
  4. package/dist/__tests__/coordination-credential-endpoint.test.js.map +1 -1
  5. package/dist/__tests__/coordination-expected-team.test.d.ts +19 -0
  6. package/dist/__tests__/coordination-expected-team.test.d.ts.map +1 -0
  7. package/dist/__tests__/coordination-expected-team.test.js +423 -0
  8. package/dist/__tests__/coordination-expected-team.test.js.map +1 -0
  9. package/dist/__tests__/coordination-plain-shell-commands.test.js +494 -26
  10. package/dist/__tests__/coordination-plain-shell-commands.test.js.map +1 -1
  11. package/dist/__tests__/memory-log-result.test.js +36 -0
  12. package/dist/__tests__/memory-log-result.test.js.map +1 -1
  13. package/dist/__tests__/runtime-codex-adapter.test.js +33 -1
  14. package/dist/__tests__/runtime-codex-adapter.test.js.map +1 -1
  15. package/dist/__tests__/start-runtime-wiring.test.js +150 -2
  16. package/dist/__tests__/start-runtime-wiring.test.js.map +1 -1
  17. package/dist/__tests__/team-name-propagation.test.js +63 -0
  18. package/dist/__tests__/team-name-propagation.test.js.map +1 -1
  19. package/dist/__tests__/tracked-instruction-files.test.d.ts +21 -0
  20. package/dist/__tests__/tracked-instruction-files.test.d.ts.map +1 -0
  21. package/dist/__tests__/tracked-instruction-files.test.js +489 -0
  22. package/dist/__tests__/tracked-instruction-files.test.js.map +1 -0
  23. package/dist/__tests__/verify-hooks-check-all.test.js +12 -2
  24. package/dist/__tests__/verify-hooks-check-all.test.js.map +1 -1
  25. package/dist/agent-config/hooks/coordination-brief.sh +30 -6
  26. package/dist/commands/coordination.d.ts +36 -1
  27. package/dist/commands/coordination.d.ts.map +1 -1
  28. package/dist/commands/coordination.js +183 -10
  29. package/dist/commands/coordination.js.map +1 -1
  30. package/dist/commands/create.d.ts.map +1 -1
  31. package/dist/commands/create.js +3 -1
  32. package/dist/commands/create.js.map +1 -1
  33. package/dist/commands/start.d.ts +28 -0
  34. package/dist/commands/start.d.ts.map +1 -1
  35. package/dist/commands/start.js +68 -4
  36. package/dist/commands/start.js.map +1 -1
  37. package/dist/lib/agent-session.d.ts.map +1 -1
  38. package/dist/lib/agent-session.js +4 -0
  39. package/dist/lib/agent-session.js.map +1 -1
  40. package/dist/lib/claude.d.ts +25 -1
  41. package/dist/lib/claude.d.ts.map +1 -1
  42. package/dist/lib/claude.js +120 -25
  43. package/dist/lib/claude.js.map +1 -1
  44. package/dist/lib/coordination-worktree.d.ts +0 -26
  45. package/dist/lib/coordination-worktree.d.ts.map +1 -1
  46. package/dist/lib/coordination-worktree.js +61 -5
  47. package/dist/lib/coordination-worktree.js.map +1 -1
  48. package/dist/lib/instruction-files.d.ts +30 -0
  49. package/dist/lib/instruction-files.d.ts.map +1 -0
  50. package/dist/lib/instruction-files.js +45 -0
  51. package/dist/lib/instruction-files.js.map +1 -0
  52. package/dist/lib/memory.d.ts.map +1 -1
  53. package/dist/lib/memory.js +15 -3
  54. package/dist/lib/memory.js.map +1 -1
  55. package/dist/lib/runtime/codex-adapter.d.ts.map +1 -1
  56. package/dist/lib/runtime/codex-adapter.js +4 -0
  57. package/dist/lib/runtime/codex-adapter.js.map +1 -1
  58. package/package.json +1 -1
@@ -0,0 +1,489 @@
1
+ /**
2
+ * A project that tracks its own CLAUDE.md or AGENTS.md (#537, #527 defect 4).
3
+ *
4
+ * Before #537, `deployClaudeMd` ran `git rm --cached` on a tracked CLAUDE.md or
5
+ * AGENTS.md and then wrote the template over it. The worktree was left with a
6
+ * staged deletion (`D CLAUDE.md`), the project's own instructions were replaced
7
+ * by the 8-line shim, and every later `start` had its rebase refused with
8
+ * "Your index contains uncommitted changes".
9
+ *
10
+ * These tests use real git in temp directories: a bare `origin`, a clone, and a
11
+ * team worktree added from `origin/main`, the shape `mx-agent start` runs in.
12
+ * Each test asserts observable state: the index (`git diff --cached`), the file
13
+ * bytes against the tracked blob, the rebase exit code and REBASE_HEAD, and the
14
+ * git commands `deployClaudeMd` issued, recorded by a wrapper on PATH.
15
+ *
16
+ * Criteria pinned (numbering from #537): 1, 2, 3, 4 (four fixtures), 5, 6, 7
17
+ * (the three red-team cases) and 8. Criterion 9 is the creation-probe run, which
18
+ * these tests do not cover.
19
+ */
20
+ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
21
+ import { spawnSync } from 'child_process';
22
+ import { chmodSync, existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, rmSync, symlinkSync, writeFileSync, } from 'fs';
23
+ import { tmpdir } from 'os';
24
+ import { dirname, join } from 'path';
25
+ import { fileURLToPath } from 'url';
26
+ import { deployClaudeMd, writeClaudeLocal } from '../lib/claude.js';
27
+ import { ALWAYS_REGEN, regenThisRun, restoreOwnStash, stashExclusions } from '../commands/start.js';
28
+ const __dirname = dirname(fileURLToPath(import.meta.url));
29
+ function findRepoRoot(start) {
30
+ let dir = start;
31
+ for (let i = 0; i < 20; i++) {
32
+ if (existsSync(join(dir, 'mx-agent-system', 'agent-config')))
33
+ return dir;
34
+ const parent = dirname(dir);
35
+ if (parent === dir)
36
+ break;
37
+ dir = parent;
38
+ }
39
+ throw new Error(`tracked-instruction-files: could not locate repo root from ${start}`);
40
+ }
41
+ const REPO_ROOT = findRepoRoot(__dirname);
42
+ const CONFIG_SOURCE = 'mx-agent-system/agent-config';
43
+ const AGENTS_TEMPLATE = readFileSync(join(REPO_ROOT, CONFIG_SOURCE, 'AGENTS.md.template'), 'utf-8');
44
+ const CLAUDE_TEMPLATE = readFileSync(join(REPO_ROOT, CONFIG_SOURCE, 'CLAUDE.md.template'), 'utf-8');
45
+ /** The three strings criterion 4 requires in the session-loaded set. */
46
+ const MARKERS = [
47
+ '## MemNexus errors are P0 — stop work',
48
+ '## Never ask an agent to attest to work it did not witness',
49
+ '# Worktree Isolation Context',
50
+ ];
51
+ /** Literal, not imported: the test must fail on a tree that lacks the constant. */
52
+ const FRAMEWORK_FILE = '.mx-agents-framework.md';
53
+ const PROJECT_CLAUDE_MD = [
54
+ '# Life Planner project instructions (tracked)',
55
+ '',
56
+ 'The project wrote this file. mx-agent start must not change it.',
57
+ '',
58
+ ].join('\n');
59
+ const PROJECT_AGENTS_MD = [
60
+ '# Life Planner AGENTS.md (tracked)',
61
+ '',
62
+ 'Codex and Claude both read this. It belongs to the project.',
63
+ '',
64
+ ].join('\n');
65
+ let root;
66
+ let gitLog;
67
+ let wrapDir;
68
+ let realPath;
69
+ const GIT_ENV = {
70
+ ...process.env,
71
+ GIT_CONFIG_GLOBAL: '/dev/null',
72
+ GIT_CONFIG_SYSTEM: '/dev/null',
73
+ GIT_AUTHOR_NAME: 'Fixture',
74
+ GIT_AUTHOR_EMAIL: 'fixture@example.invalid',
75
+ GIT_COMMITTER_NAME: 'Fixture',
76
+ GIT_COMMITTER_EMAIL: 'fixture@example.invalid',
77
+ };
78
+ function git(cwd, ...args) {
79
+ const r = spawnSync('git', args, { cwd, encoding: 'utf-8', env: GIT_ENV });
80
+ return { status: r.status, stdout: r.stdout ?? '', stderr: r.stderr ?? '' };
81
+ }
82
+ function gitOk(cwd, ...args) {
83
+ const r = git(cwd, ...args);
84
+ if (r.status !== 0)
85
+ throw new Error(`git ${args.join(' ')} failed: ${r.stderr}`);
86
+ return r.stdout;
87
+ }
88
+ /**
89
+ * origin.git (bare) <- proj (clone, main) -> .worktrees/team (worktree branch).
90
+ * The templates are committed to origin, so deployClaudeMd reads them through
91
+ * `git show origin/main:...` as it does in a real project.
92
+ */
93
+ function buildFixture(opts) {
94
+ const origin = join(root, 'origin.git');
95
+ gitOk(root, 'init', '-q', '--bare', '-b', 'main', origin);
96
+ const proj = join(root, 'proj');
97
+ gitOk(root, 'clone', '-q', origin, proj);
98
+ gitOk(proj, 'checkout', '-q', '-B', 'main');
99
+ // `.mx-leader.lock` is ignored, as in this repository and the new-project
100
+ // template; start creates it before the auto-stash.
101
+ writeFileSync(join(proj, '.gitignore'), '.worktrees/\n.mx-leader.lock\n');
102
+ if (!opts.noTemplates) {
103
+ mkdirSync(join(proj, CONFIG_SOURCE), { recursive: true });
104
+ writeFileSync(join(proj, CONFIG_SOURCE, 'AGENTS.md.template'), AGENTS_TEMPLATE);
105
+ writeFileSync(join(proj, CONFIG_SOURCE, 'CLAUDE.md.template'), CLAUDE_TEMPLATE);
106
+ }
107
+ if (opts.claudeTracked)
108
+ writeFileSync(join(proj, 'CLAUDE.md'), PROJECT_CLAUDE_MD);
109
+ if (opts.agentsTracked)
110
+ writeFileSync(join(proj, 'AGENTS.md'), PROJECT_AGENTS_MD);
111
+ writeFileSync(join(proj, 'README.md'), 'readme\n');
112
+ gitOk(proj, 'add', '-A');
113
+ gitOk(proj, 'commit', '-q', '-m', 'init');
114
+ gitOk(proj, 'push', '-q', 'origin', 'main');
115
+ const wt = join(proj, '.worktrees', 'team');
116
+ gitOk(proj, 'worktree', 'add', '-q', wt, '-b', 'worktree/team', 'origin/main');
117
+ return { proj, wt };
118
+ }
119
+ /** Commit a change on origin/main from the project clone, then fetch it in the worktree. */
120
+ function advanceOrigin(fx, file, content) {
121
+ writeFileSync(join(fx.proj, file), content);
122
+ gitOk(fx.proj, 'add', file);
123
+ gitOk(fx.proj, 'commit', '-q', '-m', `upstream edits ${file}`);
124
+ gitOk(fx.proj, 'push', '-q', 'origin', 'main');
125
+ gitOk(fx.wt, 'fetch', '-q', 'origin', 'main');
126
+ }
127
+ /**
128
+ * The instruction-file steps of `mx-agent start` (start.ts step 5 and 6):
129
+ * deployClaudeMd, then writeClaudeLocal. Runs with the git wrapper first on
130
+ * PATH so every git command they issue is recorded for criterion 8.
131
+ */
132
+ function runInstructionSteps(fx) {
133
+ const prev = process.env.PATH;
134
+ process.env.PATH = `${wrapDir}:${prev ?? ''}`;
135
+ try {
136
+ const deployed = deployClaudeMd(fx.proj, fx.wt, { baseBranch: 'main', configSource: CONFIG_SOURCE });
137
+ writeClaudeLocal({
138
+ // start.ts passes deployClaudeMd's result through, so this does too.
139
+ frameworkImport: deployed?.frameworkImport ?? null,
140
+ projectRoot: fx.proj,
141
+ worktreePath: fx.wt,
142
+ worktreeName: 'team',
143
+ branch: 'worktree/team',
144
+ slot: 0,
145
+ baseBranch: 'main',
146
+ });
147
+ }
148
+ finally {
149
+ process.env.PATH = prev;
150
+ }
151
+ }
152
+ /**
153
+ * The rebase step of a second `start` (start.ts: auto-stash, then
154
+ * `git rebase origin/<base>`, then restore the stash). Uses start.ts's own
155
+ * `regenThisRun` for the stash exclusions and its own `restoreOwnStash`, so the
156
+ * rule under test is the one start applies. The stash call goes through the
157
+ * PATH wrapper, so criterion 8 sees it.
158
+ */
159
+ function runRebaseStep(fx) {
160
+ const regen = regenThisRun(fx.wt);
161
+ const porcelain = gitOk(fx.wt, 'status', '--porcelain');
162
+ const dirty = porcelain.split('\n').filter((l) => l.trim()).some((line) => {
163
+ const file = line.slice(3).trim().split(' -> ').pop() ?? '';
164
+ return !regen.has(file);
165
+ });
166
+ let stashSha = '';
167
+ if (dirty) {
168
+ const args = ['stash', 'push', '-u', '-m', 'fixture', '--', '.', ...stashExclusions(fx.wt, regen)];
169
+ const r = spawnSync(join(wrapDir, 'git'), args, { cwd: fx.wt, encoding: 'utf-8', env: GIT_ENV });
170
+ if (r.status !== 0)
171
+ throw new Error(`stash failed: ${r.stderr}`);
172
+ stashSha = gitOk(fx.wt, 'rev-parse', 'stash@{0}').trim();
173
+ }
174
+ const r = git(fx.wt, 'rebase', 'origin/main');
175
+ const head = git(fx.wt, 'rev-parse', '--verify', '-q', 'REBASE_HEAD');
176
+ if (stashSha)
177
+ restoreOwnStash(fx.wt, stashSha);
178
+ return { rebaseExit: r.status, rebaseHeadLeft: head.status === 0, stderr: r.stderr, stashed: stashSha !== '' };
179
+ }
180
+ /**
181
+ * Criterion 4's session-loaded set: CLAUDE.md and CLAUDE.local.md at the
182
+ * worktree root, plus every file either names on a line of the form `@<path>`,
183
+ * resolved relative to the worktree, one level deep.
184
+ */
185
+ function sessionLoadedSet(wt) {
186
+ const parts = [];
187
+ for (const name of ['CLAUDE.md', 'CLAUDE.local.md']) {
188
+ const p = join(wt, name);
189
+ if (!existsSync(p))
190
+ continue;
191
+ const body = readFileSync(p, 'utf-8');
192
+ parts.push(body);
193
+ for (const line of body.split('\n')) {
194
+ const m = /^@(\S+)\s*$/.exec(line.trim());
195
+ if (!m)
196
+ continue;
197
+ const target = join(wt, m[1]);
198
+ if (existsSync(target))
199
+ parts.push(readFileSync(target, 'utf-8'));
200
+ }
201
+ }
202
+ return parts.join('\n');
203
+ }
204
+ function cachedNameStatus(wt) {
205
+ return gitOk(wt, 'diff', '--cached', '--name-status').trim();
206
+ }
207
+ function trackedBlob(wt, rev, file) {
208
+ return gitOk(wt, 'show', `${rev}:${file}`);
209
+ }
210
+ /** git commands from the wrapper log that change the index for an instruction file. */
211
+ function indexChangingCalls() {
212
+ if (!existsSync(gitLog))
213
+ return [];
214
+ return readFileSync(gitLog, 'utf-8').split('\n').filter((l) => l.trim()).filter((line) => {
215
+ const argv = line.split(' ');
216
+ const sub = argv[0];
217
+ const namesFile = argv.some((a) => a === 'CLAUDE.md' || a === 'AGENTS.md');
218
+ if (/skip-worktree|assume-unchanged/.test(line))
219
+ return true;
220
+ return namesFile && ['rm', 'update-index', 'add', 'stash'].includes(sub);
221
+ });
222
+ }
223
+ beforeEach(() => {
224
+ root = mkdtempSync(join(tmpdir(), 'mx-tracked-instr-'));
225
+ gitLog = join(root, 'gitwrap.log');
226
+ wrapDir = join(root, 'bin');
227
+ mkdirSync(wrapDir);
228
+ const realGit = spawnSync('sh', ['-c', 'command -v git'], { encoding: 'utf-8' }).stdout.trim();
229
+ // Records argv, one line per call, then runs the real git.
230
+ writeFileSync(join(wrapDir, 'git'), `#!/bin/sh\nprintf '%s\\n' "$*" >> '${gitLog}'\nexec '${realGit}' "$@"\n`);
231
+ chmodSync(join(wrapDir, 'git'), 0o755);
232
+ realPath = process.env.PATH;
233
+ vi.spyOn(console, 'log').mockImplementation(() => { });
234
+ vi.spyOn(console, 'error').mockImplementation(() => { });
235
+ });
236
+ afterEach(() => {
237
+ vi.restoreAllMocks();
238
+ process.env.PATH = realPath;
239
+ rmSync(root, { recursive: true, force: true });
240
+ });
241
+ const TRACKED_VARIANTS = [
242
+ { label: 'CLAUDE.md tracked', claudeTracked: true, agentsTracked: false },
243
+ { label: 'AGENTS.md tracked', claudeTracked: false, agentsTracked: true },
244
+ { label: 'both tracked', claudeTracked: true, agentsTracked: true },
245
+ ];
246
+ describe('#537 criteria 1, 2, 4, 5, 8: start leaves a tracked instruction file and its index entry alone', () => {
247
+ for (const v of TRACKED_VARIANTS) {
248
+ it(`${v.label}: index empty, tracked bytes unchanged, framework markers in the session-loaded set, no index-changing git call`, () => {
249
+ const fx = buildFixture(v);
250
+ runInstructionSteps(fx);
251
+ // Criterion 1 (and 5): nothing staged. Before #537 this read `D CLAUDE.md`.
252
+ expect(cachedNameStatus(fx.wt)).toBe('');
253
+ // Criterion 2 (and 5): every tracked file is byte-identical to its blob.
254
+ for (const f of ['CLAUDE.md', 'AGENTS.md']) {
255
+ if (git(fx.wt, 'ls-files', '--error-unmatch', f).status !== 0)
256
+ continue;
257
+ expect(git(fx.wt, 'diff', '--quiet', '--', f).status).toBe(0);
258
+ expect(readFileSync(join(fx.wt, f), 'utf-8')).toBe(trackedBlob(fx.wt, 'HEAD', f));
259
+ }
260
+ if (v.claudeTracked)
261
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(PROJECT_CLAUDE_MD);
262
+ if (v.agentsTracked)
263
+ expect(readFileSync(join(fx.wt, 'AGENTS.md'), 'utf-8')).toBe(PROJECT_AGENTS_MD);
264
+ // Criterion 4: all three markers reach the session.
265
+ const loaded = sessionLoadedSet(fx.wt);
266
+ for (const m of MARKERS)
267
+ expect(loaded).toContain(m);
268
+ // Criterion 8: no index-changing command named either file.
269
+ expect(existsSync(gitLog)).toBe(true);
270
+ expect(indexChangingCalls()).toEqual([]);
271
+ // The fix uses no exclude-file entry for these files either.
272
+ const exclude = join(fx.proj, '.git', 'info', 'exclude');
273
+ if (existsSync(exclude))
274
+ expect(readFileSync(exclude, 'utf-8')).not.toMatch(/CLAUDE\.md|AGENTS\.md/);
275
+ });
276
+ }
277
+ it('AGENTS.md tracked: the framework body is in the untracked generated file, which CLAUDE.local.md imports', () => {
278
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
279
+ runInstructionSteps(fx);
280
+ expect(readFileSync(join(fx.wt, FRAMEWORK_FILE), 'utf-8')).toBe(AGENTS_TEMPLATE);
281
+ expect(git(fx.wt, 'ls-files', '--error-unmatch', FRAMEWORK_FILE).status).not.toBe(0);
282
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8').split('\n')).toContain(`@${FRAMEWORK_FILE}`);
283
+ // CLAUDE.md is untracked here, so it keeps today's behaviour: the shim.
284
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(CLAUDE_TEMPLATE);
285
+ });
286
+ it('CLAUDE.md tracked and no AGENTS.md template anywhere: the project CLAUDE.md is not copied in as framework content', () => {
287
+ // deployClaudeMd falls back to the root CLAUDE.md when no AGENTS.md template
288
+ // resolves. In a project that tracks CLAUDE.md that file is the project's,
289
+ // so a copy imported from CLAUDE.local.md would load it twice and call it
290
+ // the framework instructions.
291
+ const fx = buildFixture({ claudeTracked: true, agentsTracked: false, noTemplates: true });
292
+ runInstructionSteps(fx);
293
+ expect(existsSync(join(fx.wt, 'AGENTS.md'))).toBe(false);
294
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
295
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(PROJECT_CLAUDE_MD);
296
+ expect(cachedNameStatus(fx.wt)).toBe('');
297
+ });
298
+ it('SF-1: a symlink at the generated file, pointing outside the fixture, is neither written through nor imported', () => {
299
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
300
+ const outside = mkdtempSync(join(tmpdir(), 'mx-tracked-instr-outside-'));
301
+ try {
302
+ const victim = join(outside, 'victim.txt');
303
+ writeFileSync(victim, 'outside bytes\n');
304
+ symlinkSync(victim, join(fx.wt, FRAMEWORK_FILE));
305
+ runInstructionSteps(fx);
306
+ expect(readFileSync(victim, 'utf-8')).toBe('outside bytes\n');
307
+ expect(lstatSync(join(fx.wt, FRAMEWORK_FILE)).isSymbolicLink()).toBe(true);
308
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
309
+ expect(cachedNameStatus(fx.wt)).toBe('');
310
+ }
311
+ finally {
312
+ rmSync(outside, { recursive: true, force: true });
313
+ }
314
+ });
315
+ it('SF-1: a hard link at the generated file is not truncated or imported', () => {
316
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
317
+ const outside = mkdtempSync(join(tmpdir(), 'mx-tracked-instr-outside-'));
318
+ try {
319
+ const victim = join(outside, 'victim.txt');
320
+ writeFileSync(victim, 'outside bytes\n');
321
+ const ln = spawnSync('ln', [victim, join(fx.wt, FRAMEWORK_FILE)]);
322
+ if (ln.status !== 0)
323
+ return; // cross-device tmp: a hard link cannot exist here, nothing to test
324
+ runInstructionSteps(fx);
325
+ expect(readFileSync(victim, 'utf-8')).toBe('outside bytes\n');
326
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
327
+ }
328
+ finally {
329
+ rmSync(outside, { recursive: true, force: true });
330
+ }
331
+ });
332
+ it('SF-1: a tracked generated file is refused: not written, not imported, index untouched', () => {
333
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
334
+ // The project commits a file at the generated name.
335
+ const projectCopy = '# project-supplied, posing as framework instructions\n';
336
+ writeFileSync(join(fx.proj, FRAMEWORK_FILE), projectCopy);
337
+ gitOk(fx.proj, 'add', FRAMEWORK_FILE);
338
+ gitOk(fx.proj, 'commit', '-q', '-m', 'track the generated name');
339
+ gitOk(fx.proj, 'push', '-q', 'origin', 'main');
340
+ gitOk(fx.wt, 'fetch', '-q', 'origin', 'main');
341
+ gitOk(fx.wt, 'merge', '-q', '--ff-only', 'origin/main');
342
+ runInstructionSteps(fx);
343
+ expect(readFileSync(join(fx.wt, FRAMEWORK_FILE), 'utf-8')).toBe(projectCopy);
344
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
345
+ expect(cachedNameStatus(fx.wt)).toBe('');
346
+ expect(git(fx.wt, 'diff', '--quiet').status).toBe(0);
347
+ expect(indexChangingCalls()).toEqual([]);
348
+ });
349
+ it('SF-1: a failed write gives no import, even with a usable file left from an earlier run', () => {
350
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
351
+ runInstructionSteps(fx);
352
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8').split('\n')).toContain(`@${FRAMEWORK_FILE}`);
353
+ // Second run: the template no longer resolves, so nothing is written this
354
+ // run. The file from the first run is still on disk.
355
+ gitOk(fx.proj, 'rm', '-q', '-r', CONFIG_SOURCE);
356
+ gitOk(fx.proj, 'commit', '-q', '-m', 'drop templates');
357
+ gitOk(fx.proj, 'push', '-q', 'origin', 'main');
358
+ gitOk(fx.wt, 'fetch', '-q', 'origin', 'main');
359
+ gitOk(fx.wt, 'merge', '-q', '--ff-only', 'origin/main');
360
+ expect(existsSync(join(fx.wt, FRAMEWORK_FILE))).toBe(true);
361
+ runInstructionSteps(fx);
362
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
363
+ });
364
+ it('SF-1: a write that fails on a non-file path gives no import', () => {
365
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: true });
366
+ mkdirSync(join(fx.wt, FRAMEWORK_FILE));
367
+ runInstructionSteps(fx);
368
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
369
+ expect(cachedNameStatus(fx.wt)).toBe('');
370
+ });
371
+ it('the generated framework file is in ALWAYS_REGEN, so the pre-rebase auto-stash excludes it', () => {
372
+ expect(ALWAYS_REGEN.has(FRAMEWORK_FILE)).toBe(true);
373
+ });
374
+ });
375
+ describe('#537 criterion 6: a project that tracks neither file sees no change', () => {
376
+ it('writes the AGENTS.md template and the CLAUDE.md shim as before, adds no import, and the markers reach the session', () => {
377
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: false });
378
+ runInstructionSteps(fx);
379
+ expect(readFileSync(join(fx.wt, 'AGENTS.md'), 'utf-8')).toBe(AGENTS_TEMPLATE);
380
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(CLAUDE_TEMPLATE);
381
+ expect(existsSync(join(fx.wt, FRAMEWORK_FILE))).toBe(false);
382
+ expect(readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8')).not.toMatch(/^@/m);
383
+ expect(cachedNameStatus(fx.wt)).toBe('');
384
+ const loaded = sessionLoadedSet(fx.wt);
385
+ for (const m of MARKERS)
386
+ expect(loaded).toContain(m);
387
+ });
388
+ });
389
+ describe('#537 criteria 3, 5 and 7: the second start rebases, and the red-team cases hold', () => {
390
+ for (const v of TRACKED_VARIANTS) {
391
+ it(`${v.label}: start twice with an upstream commit between, the rebase exits 0 and leaves no REBASE_HEAD (criteria 3, 5, 7b)`, () => {
392
+ const fx = buildFixture(v);
393
+ runInstructionSteps(fx);
394
+ // One upstream commit between the two starts, so the rebase has work to do.
395
+ advanceOrigin(fx, 'README.md', 'readme v2\n');
396
+ const rb = runRebaseStep(fx);
397
+ expect(rb.stderr).not.toMatch(/index contains uncommitted changes/);
398
+ expect(rb.rebaseExit).toBe(0);
399
+ expect(rb.rebaseHeadLeft).toBe(false);
400
+ expect(gitOk(fx.wt, 'rev-parse', 'HEAD').trim()).toBe(gitOk(fx.wt, 'rev-parse', 'origin/main').trim());
401
+ runInstructionSteps(fx);
402
+ expect(cachedNameStatus(fx.wt)).toBe('');
403
+ if (v.claudeTracked)
404
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(PROJECT_CLAUDE_MD);
405
+ if (v.agentsTracked)
406
+ expect(readFileSync(join(fx.wt, 'AGENTS.md'), 'utf-8')).toBe(PROJECT_AGENTS_MD);
407
+ // Running twice writes one import, not two.
408
+ const local = readFileSync(join(fx.wt, 'CLAUDE.local.md'), 'utf-8');
409
+ expect(local.split('\n').filter((l) => l.startsWith('@')).length).toBe(1);
410
+ for (const m of MARKERS)
411
+ expect(sessionLoadedSet(fx.wt)).toContain(m);
412
+ expect(indexChangingCalls()).toEqual([]);
413
+ });
414
+ }
415
+ it('7a: upstream changes CLAUDE.md, then start runs: the worktree takes the upstream bytes and the index stays empty', () => {
416
+ const fx = buildFixture({ claudeTracked: true, agentsTracked: false });
417
+ runInstructionSteps(fx);
418
+ const upstream = `${PROJECT_CLAUDE_MD}\n## Added upstream\n`;
419
+ advanceOrigin(fx, 'CLAUDE.md', upstream);
420
+ const rb = runRebaseStep(fx);
421
+ expect(rb.rebaseExit).toBe(0);
422
+ expect(rb.rebaseHeadLeft).toBe(false);
423
+ runInstructionSteps(fx);
424
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(upstream);
425
+ expect(trackedBlob(fx.wt, 'origin/main', 'CLAUDE.md')).toBe(upstream);
426
+ expect(cachedNameStatus(fx.wt)).toBe('');
427
+ expect(git(fx.wt, 'diff', '--quiet', '--', 'CLAUDE.md').status).toBe(0);
428
+ });
429
+ for (const f of ['CLAUDE.md', 'AGENTS.md']) {
430
+ it(`INFO-5: a tracked ${f} with an uncommitted edit is stashed and restored; the rebase exits 0 and the edit survives`, () => {
431
+ const fx = buildFixture({ claudeTracked: f === 'CLAUDE.md', agentsTracked: f === 'AGENTS.md' });
432
+ runInstructionSteps(fx);
433
+ const original = f === 'CLAUDE.md' ? PROJECT_CLAUDE_MD : PROJECT_AGENTS_MD;
434
+ const edited = `${original}\n## Uncommitted local edit\n`;
435
+ writeFileSync(join(fx.wt, f), edited);
436
+ // Untracked agent config, as syncClaudeConfig leaves it in a project that
437
+ // does not ignore `.claude/`: settings.json is in ALWAYS_REGEN, the hook
438
+ // is not. The real-CLI run showed the stash behaves differently with them.
439
+ mkdirSync(join(fx.wt, '.claude', 'hooks'), { recursive: true });
440
+ writeFileSync(join(fx.wt, '.claude', 'settings.json'), '{}\n');
441
+ // start writes the leader lock before the stash. It is ignored, and
442
+ // naming an existing ignored path in the stash pathspec made git's
443
+ // internal `add` fail and leave the edit staged.
444
+ writeFileSync(join(fx.wt, '.mx-leader.lock'), '{}\n');
445
+ advanceOrigin(fx, 'README.md', 'readme v2\n');
446
+ expect(regenThisRun(fx.wt).has(f)).toBe(false);
447
+ const rb = runRebaseStep(fx);
448
+ expect(rb.stashed).toBe(true);
449
+ expect(rb.stderr).not.toMatch(/cannot rebase/);
450
+ expect(rb.rebaseExit).toBe(0);
451
+ expect(rb.rebaseHeadLeft).toBe(false);
452
+ expect(gitOk(fx.wt, 'rev-parse', 'HEAD').trim()).toBe(gitOk(fx.wt, 'rev-parse', 'origin/main').trim());
453
+ expect(readFileSync(join(fx.wt, f), 'utf-8')).toBe(edited);
454
+ expect(cachedNameStatus(fx.wt)).toBe('');
455
+ runInstructionSteps(fx);
456
+ expect(readFileSync(join(fx.wt, f), 'utf-8')).toBe(edited);
457
+ expect(cachedNameStatus(fx.wt)).toBe('');
458
+ // Criterion 8: the stash names the file only as `-- .`, never positively.
459
+ expect(indexChangingCalls()).toEqual([]);
460
+ const stashLines = readFileSync(gitLog, 'utf-8').split('\n').filter((l) => l.startsWith('stash '));
461
+ expect(stashLines.length).toBe(1);
462
+ expect(stashLines[0]).not.toContain(`:!${f}`);
463
+ });
464
+ }
465
+ it('INFO-5: an untracked CLAUDE.md and AGENTS.md stay excluded from the stash, as before', () => {
466
+ const fx = buildFixture({ claudeTracked: false, agentsTracked: false });
467
+ const regen = regenThisRun(fx.wt);
468
+ for (const name of ALWAYS_REGEN)
469
+ expect(regen.has(name)).toBe(true);
470
+ });
471
+ it('7c: the project edits CLAUDE.md on its branch and commits it: the commit holds only that edit to the project file', () => {
472
+ const fx = buildFixture({ claudeTracked: true, agentsTracked: false });
473
+ runInstructionSteps(fx);
474
+ // The edit appends to whatever file the worktree holds after start. Before
475
+ // #537 that was the shim, so the commit replaced the project's instructions.
476
+ const edited = `${PROJECT_CLAUDE_MD}\n## Edited on the team branch\n`;
477
+ writeFileSync(join(fx.wt, 'CLAUDE.md'), `${readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')}\n## Edited on the team branch\n`);
478
+ gitOk(fx.wt, 'add', 'CLAUDE.md');
479
+ gitOk(fx.wt, 'commit', '-q', '-m', 'edit CLAUDE.md');
480
+ expect(gitOk(fx.wt, 'show', '--name-status', '--format=', 'HEAD').trim()).toBe('M\tCLAUDE.md');
481
+ expect(trackedBlob(fx.wt, 'HEAD', 'CLAUDE.md')).toBe(edited);
482
+ expect(cachedNameStatus(fx.wt)).toBe('');
483
+ // The next start leaves the committed edit alone too.
484
+ runInstructionSteps(fx);
485
+ expect(readFileSync(join(fx.wt, 'CLAUDE.md'), 'utf-8')).toBe(edited);
486
+ expect(cachedNameStatus(fx.wt)).toBe('');
487
+ });
488
+ });
489
+ //# sourceMappingURL=tracked-instruction-files.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tracked-instruction-files.test.js","sourceRoot":"","sources":["../../src/__tests__/tracked-instruction-files.test.ts"],"names":[],"mappings":"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"}
@@ -95,6 +95,12 @@ function makeFixture(hooks, opts = {}) {
95
95
  git(['config', 'user.email', 'fixture@example.invalid'], worktree);
96
96
  git(['config', 'user.name', 'fixture'], worktree);
97
97
  git(['config', 'commit.gpgsign', 'false'], worktree);
98
+ // #545: no git process may outlive the command that started it. `git commit`
99
+ // runs `git maintenance run --auto` (and, through it, auto gc), which can
100
+ // detach and keep writing under .git/objects after `git` returns; afterEach
101
+ // then races it and rmdir fails with ENOTEMPTY. Turn both off at the source.
102
+ git(['config', 'gc.auto', '0'], worktree);
103
+ git(['config', 'maintenance.auto', 'false'], worktree);
98
104
  git(['add', '-A'], worktree);
99
105
  git(['commit', '-q', '-m', 'hooks'], worktree);
100
106
  if (!opts.noOriginRef)
@@ -124,8 +130,12 @@ function run(worktree) {
124
130
  }
125
131
  }
126
132
  afterEach(() => {
127
- while (roots.length > 0)
128
- rmSync(roots.pop(), { recursive: true, force: true });
133
+ // maxRetries/retryDelay are the second line of defence for #545: if anything
134
+ // else still writes into a fixture (the config above removes the known
135
+ // writer), rmSync retries ENOTEMPTY/EBUSY instead of failing the suite.
136
+ while (roots.length > 0) {
137
+ rmSync(roots.pop(), { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
138
+ }
129
139
  vi.restoreAllMocks();
130
140
  });
131
141
  // ── (a) every materialised hook byte-identical ───────────────────────────────