oh-my-codex 0.21.47 → 0.22.0

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 (176) hide show
  1. package/Cargo.lock +6 -6
  2. package/Cargo.toml +1 -1
  3. package/README.md +15 -0
  4. package/crates/omx-mux/src/herdr.rs +481 -0
  5. package/crates/omx-mux/src/lib.rs +5 -0
  6. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js +707 -47
  7. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js.map +1 -1
  8. package/dist/cli/__tests__/session-compare.test.d.ts +2 -0
  9. package/dist/cli/__tests__/session-compare.test.d.ts.map +1 -0
  10. package/dist/cli/__tests__/session-compare.test.js +183 -0
  11. package/dist/cli/__tests__/session-compare.test.js.map +1 -0
  12. package/dist/cli/__tests__/setup-install-mode.test.js +7 -1
  13. package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
  14. package/dist/cli/__tests__/team.test.js +8 -0
  15. package/dist/cli/__tests__/team.test.js.map +1 -1
  16. package/dist/cli/plugin-marketplace.d.ts.map +1 -1
  17. package/dist/cli/plugin-marketplace.js +328 -142
  18. package/dist/cli/plugin-marketplace.js.map +1 -1
  19. package/dist/cli/session-compare.d.ts +11 -0
  20. package/dist/cli/session-compare.d.ts.map +1 -0
  21. package/dist/cli/session-compare.js +172 -0
  22. package/dist/cli/session-compare.js.map +1 -0
  23. package/dist/cli/session-search.d.ts.map +1 -1
  24. package/dist/cli/session-search.js +7 -0
  25. package/dist/cli/session-search.js.map +1 -1
  26. package/dist/cli/team.d.ts.map +1 -1
  27. package/dist/cli/team.js +2 -0
  28. package/dist/cli/team.js.map +1 -1
  29. package/dist/config/__tests__/multiplexer.test.d.ts +2 -0
  30. package/dist/config/__tests__/multiplexer.test.d.ts.map +1 -0
  31. package/dist/config/__tests__/multiplexer.test.js +118 -0
  32. package/dist/config/__tests__/multiplexer.test.js.map +1 -0
  33. package/dist/config/multiplexer.d.ts +29 -0
  34. package/dist/config/multiplexer.d.ts.map +1 -0
  35. package/dist/config/multiplexer.js +91 -0
  36. package/dist/config/multiplexer.js.map +1 -0
  37. package/dist/hooks/__tests__/sunset-routing-contract.test.js +4 -2
  38. package/dist/hooks/__tests__/sunset-routing-contract.test.js.map +1 -1
  39. package/dist/scripts/__tests__/codex-native-hook.test.js +281 -1
  40. package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
  41. package/dist/scripts/__tests__/generate-release-body.test.js +142 -5
  42. package/dist/scripts/__tests__/generate-release-body.test.js.map +1 -1
  43. package/dist/scripts/codex-native-hook.d.ts.map +1 -1
  44. package/dist/scripts/codex-native-hook.js +8 -2
  45. package/dist/scripts/codex-native-hook.js.map +1 -1
  46. package/dist/scripts/generate-release-body.d.ts.map +1 -1
  47. package/dist/scripts/generate-release-body.js +14 -0
  48. package/dist/scripts/generate-release-body.js.map +1 -1
  49. package/dist/scripts/notify-hook/team-worker-lease.d.ts +15 -0
  50. package/dist/scripts/notify-hook/team-worker-lease.d.ts.map +1 -0
  51. package/dist/scripts/notify-hook/team-worker-lease.js +63 -0
  52. package/dist/scripts/notify-hook/team-worker-lease.js.map +1 -0
  53. package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts +1 -0
  54. package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts.map +1 -1
  55. package/dist/scripts/notify-hook/team-worker-posttooluse.js +16 -5
  56. package/dist/scripts/notify-hook/team-worker-posttooluse.js.map +1 -1
  57. package/dist/scripts/notify-hook/team-worker.d.ts +12 -1
  58. package/dist/scripts/notify-hook/team-worker.d.ts.map +1 -1
  59. package/dist/scripts/notify-hook/team-worker.js +16 -4
  60. package/dist/scripts/notify-hook/team-worker.js.map +1 -1
  61. package/dist/session-history/__tests__/compare.test.d.ts +2 -0
  62. package/dist/session-history/__tests__/compare.test.d.ts.map +1 -0
  63. package/dist/session-history/__tests__/compare.test.js +257 -0
  64. package/dist/session-history/__tests__/compare.test.js.map +1 -0
  65. package/dist/session-history/compare.d.ts +74 -0
  66. package/dist/session-history/compare.d.ts.map +1 -0
  67. package/dist/session-history/compare.js +165 -0
  68. package/dist/session-history/compare.js.map +1 -0
  69. package/dist/team/__tests__/api-interop.test.js +3 -3
  70. package/dist/team/__tests__/cross-rebase-smoke.test.js +263 -31
  71. package/dist/team/__tests__/cross-rebase-smoke.test.js.map +1 -1
  72. package/dist/team/__tests__/herdr-session-realherdr.test.d.ts +2 -0
  73. package/dist/team/__tests__/herdr-session-realherdr.test.d.ts.map +1 -0
  74. package/dist/team/__tests__/herdr-session-realherdr.test.js +68 -0
  75. package/dist/team/__tests__/herdr-session-realherdr.test.js.map +1 -0
  76. package/dist/team/__tests__/herdr-session.test.d.ts +2 -0
  77. package/dist/team/__tests__/herdr-session.test.d.ts.map +1 -0
  78. package/dist/team/__tests__/herdr-session.test.js +228 -0
  79. package/dist/team/__tests__/herdr-session.test.js.map +1 -0
  80. package/dist/team/__tests__/idle-nudge.test.js +84 -0
  81. package/dist/team/__tests__/idle-nudge.test.js.map +1 -1
  82. package/dist/team/__tests__/rebalance-policy.test.js +27 -9
  83. package/dist/team/__tests__/rebalance-policy.test.js.map +1 -1
  84. package/dist/team/__tests__/runtime-delivery.test.d.ts +2 -0
  85. package/dist/team/__tests__/runtime-delivery.test.d.ts.map +1 -0
  86. package/dist/team/__tests__/runtime-delivery.test.js +570 -0
  87. package/dist/team/__tests__/runtime-delivery.test.js.map +1 -0
  88. package/dist/team/__tests__/runtime.test.js +332 -18
  89. package/dist/team/__tests__/runtime.test.js.map +1 -1
  90. package/dist/team/__tests__/scaling.test.js +293 -0
  91. package/dist/team/__tests__/scaling.test.js.map +1 -1
  92. package/dist/team/__tests__/state-renewal.test.d.ts +2 -0
  93. package/dist/team/__tests__/state-renewal.test.d.ts.map +1 -0
  94. package/dist/team/__tests__/state-renewal.test.js +555 -0
  95. package/dist/team/__tests__/state-renewal.test.js.map +1 -0
  96. package/dist/team/__tests__/task-lease.test.d.ts +2 -0
  97. package/dist/team/__tests__/task-lease.test.d.ts.map +1 -0
  98. package/dist/team/__tests__/task-lease.test.js +179 -0
  99. package/dist/team/__tests__/task-lease.test.js.map +1 -0
  100. package/dist/team/__tests__/team-ops-contract.test.js +1 -0
  101. package/dist/team/__tests__/team-ops-contract.test.js.map +1 -1
  102. package/dist/team/__tests__/worker-bootstrap.test.js +2 -0
  103. package/dist/team/__tests__/worker-bootstrap.test.js.map +1 -1
  104. package/dist/team/api-interop.d.ts +1 -1
  105. package/dist/team/api-interop.d.ts.map +1 -1
  106. package/dist/team/api-interop.js +13 -1
  107. package/dist/team/api-interop.js.map +1 -1
  108. package/dist/team/goal-workflow.js +1 -1
  109. package/dist/team/herdr-session.d.ts +234 -0
  110. package/dist/team/herdr-session.d.ts.map +1 -0
  111. package/dist/team/herdr-session.js +489 -0
  112. package/dist/team/herdr-session.js.map +1 -0
  113. package/dist/team/idle-nudge.d.ts +16 -4
  114. package/dist/team/idle-nudge.d.ts.map +1 -1
  115. package/dist/team/idle-nudge.js +51 -19
  116. package/dist/team/idle-nudge.js.map +1 -1
  117. package/dist/team/mcp-comm.d.ts +1 -1
  118. package/dist/team/mcp-comm.d.ts.map +1 -1
  119. package/dist/team/rebalance-policy.d.ts.map +1 -1
  120. package/dist/team/rebalance-policy.js +5 -2
  121. package/dist/team/rebalance-policy.js.map +1 -1
  122. package/dist/team/runtime.d.ts.map +1 -1
  123. package/dist/team/runtime.js +356 -81
  124. package/dist/team/runtime.js.map +1 -1
  125. package/dist/team/scaling.d.ts.map +1 -1
  126. package/dist/team/scaling.js +332 -143
  127. package/dist/team/scaling.js.map +1 -1
  128. package/dist/team/state/monitor.d.ts +3 -0
  129. package/dist/team/state/monitor.d.ts.map +1 -1
  130. package/dist/team/state/monitor.js +3 -0
  131. package/dist/team/state/monitor.js.map +1 -1
  132. package/dist/team/state/tasks.d.ts +2 -1
  133. package/dist/team/state/tasks.d.ts.map +1 -1
  134. package/dist/team/state/tasks.js +28 -0
  135. package/dist/team/state/tasks.js.map +1 -1
  136. package/dist/team/state/types.d.ts +8 -0
  137. package/dist/team/state/types.d.ts.map +1 -1
  138. package/dist/team/state/types.js.map +1 -1
  139. package/dist/team/state.d.ts +14 -2
  140. package/dist/team/state.d.ts.map +1 -1
  141. package/dist/team/state.js +29 -5
  142. package/dist/team/state.js.map +1 -1
  143. package/dist/team/task-lease.d.ts +4 -0
  144. package/dist/team/task-lease.d.ts.map +1 -0
  145. package/dist/team/task-lease.js +74 -0
  146. package/dist/team/task-lease.js.map +1 -0
  147. package/dist/team/team-ops.d.ts +2 -1
  148. package/dist/team/team-ops.d.ts.map +1 -1
  149. package/dist/team/team-ops.js +1 -0
  150. package/dist/team/team-ops.js.map +1 -1
  151. package/dist/team/tmux-session.d.ts +1 -1
  152. package/dist/team/tmux-session.d.ts.map +1 -1
  153. package/dist/team/tmux-session.js +10 -2
  154. package/dist/team/tmux-session.js.map +1 -1
  155. package/dist/team/worker-bootstrap.d.ts.map +1 -1
  156. package/dist/team/worker-bootstrap.js +14 -1
  157. package/dist/team/worker-bootstrap.js.map +1 -1
  158. package/package.json +1 -1
  159. package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
  160. package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +208 -25
  161. package/plugins/oh-my-codex/skills/worker/SKILL.md +7 -1
  162. package/prompts/build-fixer.md +2 -1
  163. package/prompts/debugger.md +2 -1
  164. package/prompts/git-master.md +2 -1
  165. package/prompts/style-reviewer.md +2 -1
  166. package/prompts/team-executor.md +3 -2
  167. package/prompts/vision.md +2 -1
  168. package/prompts/writer.md +2 -1
  169. package/skills/worker/SKILL.md +7 -1
  170. package/src/scripts/__tests__/codex-native-hook.test.ts +279 -0
  171. package/src/scripts/__tests__/generate-release-body.test.ts +151 -5
  172. package/src/scripts/codex-native-hook.ts +8 -2
  173. package/src/scripts/generate-release-body.ts +16 -0
  174. package/src/scripts/notify-hook/team-worker-lease.ts +69 -0
  175. package/src/scripts/notify-hook/team-worker-posttooluse.ts +16 -4
  176. package/src/scripts/notify-hook/team-worker.ts +15 -4
@@ -1,11 +1,12 @@
1
1
  import { describe, it } from 'node:test';
2
2
  import assert from 'node:assert/strict';
3
+ import { createHash } from 'node:crypto';
3
4
  import { execFileSync } from 'node:child_process';
4
- import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
5
+ import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
5
6
  import { existsSync } from 'node:fs';
6
7
  import { join } from 'node:path';
7
8
  import { tmpdir } from 'node:os';
8
- import { initTeamState, listMailboxMessages, readMonitorSnapshot, readTeamConfig, saveTeamConfig, writeWorkerStatus, } from '../state.js';
9
+ import { initTeamState, createTask, claimTask, transitionTaskStatus, listMailboxMessages, readMonitorSnapshot, readTask, readTeamConfig, saveTeamConfig, writeWorkerStatus, } from '../state.js';
9
10
  import { monitorTeam } from '../runtime.js';
10
11
  import { readTeamEvents } from '../state/events.js';
11
12
  async function initRepo() {
@@ -13,6 +14,7 @@ async function initRepo() {
13
14
  execFileSync('git', ['init'], { cwd, stdio: 'ignore' });
14
15
  execFileSync('git', ['config', 'user.email', 'test@example.com'], { cwd, stdio: 'ignore' });
15
16
  execFileSync('git', ['config', 'user.name', 'Test User'], { cwd, stdio: 'ignore' });
17
+ await writeFile(join(cwd, '.git/info/exclude'), '.omx/\n');
16
18
  await writeFile(join(cwd, 'README.md'), 'hello\n', 'utf-8');
17
19
  execFileSync('git', ['add', 'README.md'], { cwd, stdio: 'ignore' });
18
20
  execFileSync('git', ['commit', '-m', 'init'], { cwd, stdio: 'ignore' });
@@ -42,6 +44,31 @@ async function configureWorkers(teamName, repo, workers) {
42
44
  };
43
45
  });
44
46
  await saveTeamConfig(cfg, repo);
47
+ for (const worker of cfg.workers) {
48
+ const taskId = await completeIntegrationTask(teamName, repo, worker.name, worker.worktree_path);
49
+ assert.deepEqual(worker.assigned_tasks, [taskId]);
50
+ }
51
+ }
52
+ async function completeIntegrationTask(teamName, repo, workerName, workerCwd, taskId) {
53
+ const task = taskId ? await readTask(teamName, taskId, repo) : await createTask(teamName, {
54
+ subject: `Verified output from ${workerName}`, description: 'Ready for integration',
55
+ status: 'pending', owner: workerName, requires_code_change: true,
56
+ }, repo);
57
+ assert.ok(task);
58
+ const claim = await claimTask(teamName, task.id, workerName, null, repo);
59
+ assert.ok(claim.ok);
60
+ await mkdir(join(workerCwd, '.omx/evidence'), { recursive: true });
61
+ await writeFile(join(workerCwd, '.omx/evidence/handoff.json'), JSON.stringify({
62
+ teamName, taskId: task.id, claimTokenSha256: createHash('sha256').update(claim.claimToken).digest('hex'),
63
+ verifiedHead: execFileSync('git', ['rev-parse', 'HEAD'], { cwd: workerCwd, encoding: 'utf8' }).trim(),
64
+ summary: 'Verified worker output', verification: [{ command: 'npm test', result: 'passed', output: 'Tests passed' }], unverified: [],
65
+ }));
66
+ const completed = await transitionTaskStatus(teamName, task.id, 'in_progress', 'completed', claim.claimToken, repo, {
67
+ result: 'Verification: PASS `npm test` for worker output.\nEVIDENCE_RECORDED: .omx/evidence/handoff.json',
68
+ }, workerCwd);
69
+ assert.ok(completed.ok, JSON.stringify(completed));
70
+ await writeWorkerStatus(teamName, workerName, { state: 'done', updated_at: new Date().toISOString() }, repo);
71
+ return task.id;
45
72
  }
46
73
  describe('cross-rebase smoke regression', () => {
47
74
  it('surfaces cross-rebase applied as an audit event without making it wakeable', async () => {
@@ -80,43 +107,118 @@ describe('cross-rebase smoke regression', () => {
80
107
  await rm(repo, { recursive: true, force: true });
81
108
  }
82
109
  });
83
- it('surfaces cross-rebase conflicts as wakeable and preserves cleanup/report evidence', async () => {
110
+ it('fails closed for two workers editing the same line and never rebases away the conflict', async () => {
84
111
  const repo = await initRepo();
112
+ const paths = [];
113
+ const heads = [];
114
+ const team = 'same-line-conflict';
115
+ try {
116
+ for (const index of [1, 2]) {
117
+ const path = await addWorktree(repo, `same-line-${index}`, `omx-same-line-${index}-`);
118
+ paths.push(path);
119
+ await writeFile(join(path, 'README.md'), `worker-${index}\n`);
120
+ execFileSync('git', ['add', 'README.md'], { cwd: path, stdio: 'ignore' });
121
+ execFileSync('git', ['commit', '-m', `worker ${index} edits same line`], { cwd: path, stdio: 'ignore' });
122
+ heads.push(execFileSync('git', ['rev-parse', 'HEAD'], { cwd: path, encoding: 'utf-8' }).trim());
123
+ }
124
+ await configureWorkers(team, repo, paths.map((path, index) => ({ path, branch: `same-line-${index + 1}` })));
125
+ await writeWorkerStatus(team, 'worker-2', { state: 'idle', updated_at: new Date().toISOString() }, repo);
126
+ await monitorTeam(team, repo);
127
+ const leaderHead = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf-8' }).trim();
128
+ // A repeated monitor must not lose the conflict or the original worker history.
129
+ await monitorTeam(team, repo);
130
+ assert.equal(execFileSync('git', ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf-8' }).trim(), leaderHead);
131
+ assert.equal(await readFile(join(repo, 'README.md'), 'utf-8'), 'worker-1\n');
132
+ for (const [index, path] of paths.entries()) {
133
+ if (index === 1) {
134
+ assert.equal(execFileSync('git', ['rev-parse', 'HEAD'], { cwd: path, encoding: 'utf-8' }).trim(), heads[index]);
135
+ }
136
+ else {
137
+ execFileSync('git', ['merge-base', '--is-ancestor', heads[index], 'HEAD'], { cwd: path, stdio: 'ignore' });
138
+ }
139
+ assert.equal(await readFile(join(path, 'README.md'), 'utf-8'), `worker-${index + 1}\n`);
140
+ assert.equal(execFileSync('git', ['show', `${heads[index]}:README.md`], { cwd: repo, encoding: 'utf-8' }), `worker-${index + 1}\n`);
141
+ }
142
+ assert.equal(execFileSync('git', ['diff', '--name-only', '--diff-filter=U'], { cwd: repo, encoding: 'utf-8' }), '');
143
+ assert.equal(existsSync(join(repo, '.git', 'CHERRY_PICK_HEAD')), false);
144
+ const snapshot = await readMonitorSnapshot(team, repo);
145
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.status, 'cherry_pick_conflict');
146
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.conflict_commit, heads[1]);
147
+ assert.deepEqual(snapshot?.integrationByWorker?.['worker-2']?.conflict_files, ['README.md']);
148
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.last_integrated_head, undefined);
149
+ const events = await readTeamEvents(team, repo, { wakeableOnly: false });
150
+ const wakeable = await readTeamEvents(team, repo, { wakeableOnly: true });
151
+ assert.equal(wakeable.some((event) => event.type === 'worker_cherry_pick_conflict' && event.worker === 'worker-2'), true);
152
+ assert.equal(events.some((event) => event.type === 'worker_cross_rebase_skipped' && event.worker === 'worker-2' && event.metadata?.reason === 'unintegrated_changes'), true);
153
+ assert.equal(events.some((event) => event.type === 'worker_cross_rebase_applied' && event.worker === 'worker-2'), false);
154
+ const mailbox = await listMailboxMessages(team, 'leader-fixed', repo);
155
+ assert.equal(mailbox.some((message) => /INTEGRATION CONFLICT:.*README.md.*Resolve the conflict/.test(message.body)), true);
156
+ const report = await readFile(join(repo, '.omx', 'state', 'team', team, 'integration-report.md'), 'utf-8');
157
+ assert.match(report, /cherry-pick.*README.md.*aborted/);
158
+ assert.doesNotMatch(report, /auto-resolved/);
159
+ }
160
+ finally {
161
+ for (const path of paths)
162
+ await rm(path, { recursive: true, force: true });
163
+ await rm(repo, { recursive: true, force: true });
164
+ }
165
+ });
166
+ it('aborts a real text-conflicting cross-rebase and preserves the pre-rebase commit', async () => {
167
+ const repo = await initRepo();
168
+ const fakeBin = await mkdtemp(join(tmpdir(), 'omx-rebase-race-bin-'));
169
+ const previousPath = process.env.PATH;
85
170
  let worker1Path = '';
86
171
  let worker2Path = '';
87
172
  try {
88
- await writeFile(join(repo, 'original.txt'), 'original content\n', 'utf-8');
89
- execFileSync('git', ['add', 'original.txt'], { cwd: repo, stdio: 'ignore' });
90
- execFileSync('git', ['commit', '-m', 'add original.txt'], { cwd: repo, stdio: 'ignore' });
91
- worker1Path = await addWorktree(repo, 'wk1-cross-conflict', 'omx-cross-conflict-w1-');
92
- worker2Path = await addWorktree(repo, 'wk2-cross-conflict', 'omx-cross-conflict-w2-');
93
- execFileSync('git', ['mv', 'original.txt', 'renamed-by-w1.txt'], { cwd: worker1Path, stdio: 'ignore' });
94
- execFileSync('git', ['commit', '-m', 'worker-1 renames original'], { cwd: worker1Path, stdio: 'ignore' });
95
- execFileSync('git', ['mv', 'original.txt', 'renamed-by-w2.txt'], { cwd: worker2Path, stdio: 'ignore' });
96
- execFileSync('git', ['commit', '-m', 'worker-2 renames original'], { cwd: worker2Path, stdio: 'ignore' });
97
- const worker2HeadBefore = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim();
98
- await configureWorkers('cross-rebase-conflict', repo, [
99
- { path: worker1Path, branch: 'wk1-cross-conflict' },
100
- { path: worker2Path, branch: 'wk2-cross-conflict' },
173
+ worker1Path = await addWorktree(repo, 'rebase-text-1', 'omx-rebase-text-1-');
174
+ worker2Path = await addWorktree(repo, 'rebase-text-2', 'omx-rebase-text-2-');
175
+ await writeFile(join(worker1Path, 'README.md'), 'worker-one\n');
176
+ execFileSync('git', ['add', 'README.md'], { cwd: worker1Path, stdio: 'ignore' });
177
+ execFileSync('git', ['commit', '-m', 'worker one'], { cwd: worker1Path, stdio: 'ignore' });
178
+ await configureWorkers('rebase-text', repo, [
179
+ { path: worker1Path, branch: 'rebase-text-1' },
180
+ { path: worker2Path, branch: 'rebase-text-2' },
101
181
  ]);
102
- await writeWorkerStatus('cross-rebase-conflict', 'worker-2', { state: 'idle', updated_at: new Date().toISOString() }, repo);
103
- await monitorTeam('cross-rebase-conflict', repo);
104
- const worker2HeadAfter = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim();
105
- const worker2StatusOutput = execFileSync('git', ['status'], { cwd: worker2Path, encoding: 'utf-8' });
106
- const events = await readTeamEvents('cross-rebase-conflict', repo, { wakeableOnly: false });
107
- const wakeable = await readTeamEvents('cross-rebase-conflict', repo, { wakeableOnly: true });
108
- const leaderMailbox = await listMailboxMessages('cross-rebase-conflict', 'leader-fixed', repo);
109
- const reportPath = join(repo, '.omx', 'state', 'team', 'cross-rebase-conflict', 'integration-report.md');
110
- const report = await readFile(reportPath, 'utf-8');
111
- assert.equal(worker2HeadAfter, worker2HeadBefore);
112
- assert.doesNotMatch(worker2StatusOutput, /rebase in progress/i);
113
- assert.equal(events.some((event) => event.type === 'worker_cross_rebase_conflict'), true);
182
+ await writeWorkerStatus('rebase-text', 'worker-2', { state: 'idle', updated_at: new Date().toISOString() }, repo);
183
+ const realGit = execFileSync('bash', ['-lc', 'command -v git'], { encoding: 'utf-8' }).trim();
184
+ const verifiedHead = execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim();
185
+ const originalHeadPath = join(fakeBin, 'original-head');
186
+ // Race after the final verified-HEAD check: inject only when Git rebase is invoked.
187
+ await writeFile(join(fakeBin, 'git'), `#!/bin/bash
188
+ set -eu
189
+ if [[ "$PWD" -ef ${JSON.stringify(worker2Path)} && "\${1:-}" == "rebase" && "\${2:-}" != "--abort" && "$#" == "2" && "$(cat ${JSON.stringify(join(repo, 'README.md'))})" == "worker-one" && ! -f ${JSON.stringify(originalHeadPath)} ]]; then
190
+ printf 'worker-two\\n' > README.md
191
+ ${JSON.stringify(realGit)} add README.md
192
+ ${JSON.stringify(realGit)} commit -m 'late worker commit' >/dev/null
193
+ ${JSON.stringify(realGit)} rev-parse HEAD > ${JSON.stringify(originalHeadPath)}
194
+ fi
195
+ exec ${JSON.stringify(realGit)} "$@"
196
+ `, { mode: 0o755 });
197
+ process.env.PATH = `${fakeBin}:${previousPath ?? ''}`;
198
+ await monitorTeam('rebase-text', repo);
199
+ const originalHead = (await readFile(originalHeadPath, 'utf-8')).trim();
200
+ assert.notEqual(originalHead, verifiedHead);
201
+ assert.equal(execFileSync(realGit, ['rev-parse', `${originalHead}^`], { cwd: worker2Path, encoding: 'utf-8' }).trim(), verifiedHead);
202
+ assert.equal(execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim(), originalHead);
203
+ assert.equal(await readFile(join(worker2Path, 'README.md'), 'utf-8'), 'worker-two\n');
204
+ assert.equal(await readFile(join(repo, 'README.md'), 'utf-8'), 'worker-one\n');
205
+ assert.doesNotMatch(execFileSync(realGit, ['status'], { cwd: worker2Path, encoding: 'utf-8' }), /rebase in progress/);
206
+ const snapshot = await readMonitorSnapshot('rebase-text', repo);
207
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.status, 'rebase_conflict');
208
+ // Diagnostic metadata records the last observed pre-call HEAD, not the later injected commit.
209
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.conflict_commit, verifiedHead);
210
+ assert.deepEqual(snapshot?.integrationByWorker?.['worker-2']?.conflict_files, ['README.md']);
211
+ const wakeable = await readTeamEvents('rebase-text', repo, { wakeableOnly: true });
114
212
  assert.equal(wakeable.some((event) => event.type === 'worker_cross_rebase_conflict'), true);
115
- assert.equal(leaderMailbox.some((message) => /rebase onto .* with -X ours failed/i.test(message.body)), true);
116
- assert.equal(existsSync(reportPath), true);
117
- assert.match(report, /rebase/i);
213
+ const mailbox = await listMailboxMessages('rebase-text', 'leader-fixed', repo);
214
+ assert.equal(mailbox.some((message) => /REBASE CONFLICT:.*aborted.*README.md/.test(message.body)), true);
118
215
  }
119
216
  finally {
217
+ if (previousPath === undefined)
218
+ delete process.env.PATH;
219
+ else
220
+ process.env.PATH = previousPath;
221
+ await rm(fakeBin, { recursive: true, force: true });
120
222
  if (worker1Path)
121
223
  await rm(worker1Path, { recursive: true, force: true });
122
224
  if (worker2Path)
@@ -124,6 +226,136 @@ describe('cross-rebase smoke regression', () => {
124
226
  await rm(repo, { recursive: true, force: true });
125
227
  }
126
228
  });
229
+ it('rebases a previously cherry-picked unchanged worker when another worker advances the next cycle', async () => {
230
+ const repo = await initRepo();
231
+ const fakeBin = await mkdtemp(join(tmpdir(), 'omx-cached-rebase-bin-'));
232
+ const previousPath = process.env.PATH;
233
+ const team = 'cached-cherry-pick';
234
+ let worker1Path = '';
235
+ let worker2Path = '';
236
+ try {
237
+ worker1Path = await addWorktree(repo, 'cached-worker-1', 'omx-cached-worker-1-');
238
+ await writeFile(join(worker1Path, 'w1.txt'), 'from worker 1\n');
239
+ execFileSync('git', ['add', 'w1.txt'], { cwd: worker1Path, stdio: 'ignore' });
240
+ execFileSync('git', ['commit', '-m', 'worker diverges'], { cwd: worker1Path, stdio: 'ignore' });
241
+ const sourceHead = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worker1Path, encoding: 'utf8' }).trim();
242
+ await writeFile(join(repo, 'leader.txt'), 'leader divergence\n');
243
+ execFileSync('git', ['add', 'leader.txt'], { cwd: repo, stdio: 'ignore' });
244
+ execFileSync('git', ['commit', '-m', 'leader diverges'], { cwd: repo, stdio: 'ignore' });
245
+ worker2Path = await addWorktree(repo, 'cached-worker-2', 'omx-cached-worker-2-');
246
+ await configureWorkers(team, repo, [
247
+ { path: worker1Path, branch: 'cached-worker-1' },
248
+ { path: worker2Path, branch: 'cached-worker-2' },
249
+ ]);
250
+ const realGit = execFileSync('bash', ['-lc', 'command -v git'], { encoding: 'utf8' }).trim();
251
+ const nextTask = await createTask(team, {
252
+ subject: 'Second cycle worker change', description: 'Publish worker 2 output next cycle',
253
+ status: 'pending', owner: 'worker-2', requires_code_change: true,
254
+ }, repo);
255
+ const statusPath = join(repo, '.omx', 'state', 'team', team, 'workers', 'worker-1', 'status.json');
256
+ // Publication starts done; a real successful pick races with the worker resuming work before Phase C.
257
+ await writeFile(join(fakeBin, 'git'), `#!/bin/bash
258
+ set -eu
259
+ if [[ "$PWD" -ef ${JSON.stringify(repo)} && "\${1:-}" == "cherry-pick" && "\${2:-}" == "--allow-empty" ]]; then
260
+ ${JSON.stringify(realGit)} "$@"
261
+ printf '%s' '${JSON.stringify({ state: 'working', updated_at: new Date().toISOString() })}' > ${JSON.stringify(statusPath)}
262
+ exit 0
263
+ fi
264
+ exec ${JSON.stringify(realGit)} "$@"
265
+ `, { mode: 0o755 });
266
+ process.env.PATH = `${fakeBin}:${previousPath ?? ''}`;
267
+ await monitorTeam(team, repo);
268
+ if (previousPath === undefined)
269
+ delete process.env.PATH;
270
+ else
271
+ process.env.PATH = previousPath;
272
+ const firstSnapshot = await readMonitorSnapshot(team, repo);
273
+ assert.equal(firstSnapshot?.integrationByWorker?.['worker-1']?.last_integrated_head, sourceHead);
274
+ assert.equal(execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: worker1Path, encoding: 'utf8' }).trim(), sourceHead);
275
+ const firstLeaderHead = execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf8' }).trim();
276
+ assert.notEqual(firstLeaderHead, sourceHead);
277
+ assert.notEqual(execFileSync(realGit, ['merge-base', sourceHead, firstLeaderHead], { cwd: repo, encoding: 'utf8' }).trim(), sourceHead);
278
+ assert.equal(await readFile(join(repo, 'w1.txt'), 'utf8'), 'from worker 1\n');
279
+ const firstEvents = await readTeamEvents(team, repo, { wakeableOnly: false });
280
+ assert.equal(firstEvents.some((event) => event.type === 'worker_cherry_pick_applied' && event.worker === 'worker-1'), true);
281
+ assert.equal(firstEvents.some((event) => event.type === 'worker_cross_rebase_skipped' && event.worker === 'worker-1' && event.metadata?.worker_state === 'working'), true);
282
+ await writeWorkerStatus(team, 'worker-1', { state: 'idle', updated_at: new Date().toISOString() }, repo);
283
+ await writeFile(join(worker2Path, 'w2.txt'), 'from worker 2\n');
284
+ execFileSync(realGit, ['add', 'w2.txt'], { cwd: worker2Path, stdio: 'ignore' });
285
+ execFileSync(realGit, ['commit', '-m', 'second cycle worker change'], { cwd: worker2Path, stdio: 'ignore' });
286
+ await completeIntegrationTask(team, repo, 'worker-2', worker2Path, nextTask.id);
287
+ await monitorTeam(team, repo);
288
+ const leaderHead = execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf8' }).trim();
289
+ assert.notEqual(leaderHead, firstLeaderHead);
290
+ assert.equal(await readFile(join(worker1Path, 'w2.txt'), 'utf8'), 'from worker 2\n');
291
+ assert.equal(await readFile(join(worker1Path, 'w1.txt'), 'utf8'), 'from worker 1\n');
292
+ execFileSync(realGit, ['merge-base', '--is-ancestor', leaderHead, 'HEAD'], { cwd: worker1Path, stdio: 'ignore' });
293
+ const snapshot = await readMonitorSnapshot(team, repo);
294
+ assert.equal(snapshot?.integrationByWorker?.['worker-1']?.last_rebased_leader_head, leaderHead);
295
+ const events = await readTeamEvents(team, repo, { wakeableOnly: false });
296
+ assert.equal(events.filter((event) => event.type === 'worker_cherry_pick_applied' && event.worker === 'worker-1').length, 1);
297
+ assert.equal(events.some((event) => event.type === 'worker_cross_rebase_applied' && event.worker === 'worker-1'), true);
298
+ }
299
+ finally {
300
+ if (previousPath === undefined)
301
+ delete process.env.PATH;
302
+ else
303
+ process.env.PATH = previousPath;
304
+ await rm(fakeBin, { recursive: true, force: true });
305
+ if (worker1Path)
306
+ await rm(worker1Path, { recursive: true, force: true });
307
+ if (worker2Path)
308
+ await rm(worker2Path, { recursive: true, force: true });
309
+ await rm(repo, { recursive: true, force: true });
310
+ }
311
+ });
312
+ it('does not treat a failed Git commit-range query as proof of integration', async () => {
313
+ const repo = await initRepo();
314
+ const fakeBin = await mkdtemp(join(tmpdir(), 'omx-range-failure-bin-'));
315
+ const previousPath = process.env.PATH;
316
+ const paths = [];
317
+ const team = 'range-query-failure';
318
+ try {
319
+ for (const index of [1, 2]) {
320
+ const path = await addWorktree(repo, `range-worker-${index}`, `omx-range-worker-${index}-`);
321
+ paths.push(path);
322
+ await writeFile(join(path, `w${index}.txt`), `worker ${index}\n`);
323
+ execFileSync('git', ['add', '.'], { cwd: path, stdio: 'ignore' });
324
+ execFileSync('git', ['commit', '-m', `worker ${index}`], { cwd: path, stdio: 'ignore' });
325
+ }
326
+ await configureWorkers(team, repo, paths.map((path, index) => ({ path, branch: `range-worker-${index + 1}` })));
327
+ const sourceHead = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: paths[1], encoding: 'utf8' }).trim();
328
+ const realGit = execFileSync('bash', ['-lc', 'command -v git'], { encoding: 'utf8' }).trim();
329
+ await writeFile(join(fakeBin, 'git'), `#!/bin/bash
330
+ if [[ "$PWD" -ef ${JSON.stringify(paths[1])} && "\${1:-}" == "rev-list" ]]; then
331
+ echo 'simulated commit-range failure' >&2
332
+ exit 1
333
+ fi
334
+ exec ${JSON.stringify(realGit)} "$@"
335
+ `, { mode: 0o755 });
336
+ process.env.PATH = `${fakeBin}:${previousPath ?? ''}`;
337
+ await monitorTeam(team, repo);
338
+ assert.equal(execFileSync(realGit, ['rev-parse', 'HEAD'], { cwd: paths[1], encoding: 'utf8' }).trim(), sourceHead);
339
+ assert.equal(existsSync(join(repo, 'w1.txt')), true);
340
+ assert.equal(existsSync(join(repo, 'w2.txt')), false);
341
+ assert.equal(existsSync(join(paths[1], 'w1.txt')), false);
342
+ const snapshot = await readMonitorSnapshot(team, repo);
343
+ assert.equal(snapshot?.integrationByWorker?.['worker-2']?.last_integrated_head, undefined);
344
+ const events = await readTeamEvents(team, repo, { wakeableOnly: false });
345
+ assert.equal(events.some((event) => event.type === 'worker_cross_rebase_skipped' && event.worker === 'worker-2' && event.metadata?.reason === 'unintegrated_changes'), true);
346
+ assert.equal(events.some((event) => event.type === 'worker_cross_rebase_applied' && event.worker === 'worker-2'), false);
347
+ }
348
+ finally {
349
+ if (previousPath === undefined)
350
+ delete process.env.PATH;
351
+ else
352
+ process.env.PATH = previousPath;
353
+ await rm(fakeBin, { recursive: true, force: true });
354
+ for (const path of paths)
355
+ await rm(path, { recursive: true, force: true });
356
+ await rm(repo, { recursive: true, force: true });
357
+ }
358
+ });
127
359
  it('keeps cross-rebase skipped as audit-only when worker state is not eligible', async () => {
128
360
  const repo = await initRepo();
129
361
  let worker1Path = '';
@@ -1 +1 @@
1
- {"version":3,"file":"cross-rebase-smoke.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/cross-rebase-smoke.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cross-rebase-smoke.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/cross-rebase-smoke.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=herdr-session-realherdr.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"herdr-session-realherdr.test.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/herdr-session-realherdr.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,68 @@
1
+ import { describe, it } from 'node:test';
2
+ import * as assert from 'node:assert';
3
+ import { mkdtempSync, rmSync } from 'node:fs';
4
+ import { join } from 'node:path';
5
+ import { tmpdir } from 'node:os';
6
+ import { captureHerdrWorkerPane, createHerdrTeam, destroyHerdrTeam, ensureHerdrServer, isHerdrBinaryCallable, isHerdrWorkerAlive, listHerdrTeams, resolveHerdrBinary, teardownHerdrWorker, } from '../herdr-session.js';
7
+ import { execFile } from 'node:child_process';
8
+ import { promisify } from 'node:util';
9
+ const execFileAsync = promisify(execFile);
10
+ /**
11
+ * Integration test against a real `herdr` binary (v0.9.x), mirroring the
12
+ * real-tmux suites: self-skipping when herdr is not installed. Starting a
13
+ * `codex` agent launches the real Codex TUI idle — no API traffic.
14
+ */
15
+ describe('herdr team session (real herdr)', () => {
16
+ it('creates a team, proves liveness, captures, and tears down', async () => {
17
+ if (!(await isHerdrBinaryCallable()))
18
+ return; // skip: herdr not installed
19
+ const dir = mkdtempSync(join(tmpdir(), 'omx-herdr-itest-'));
20
+ const serverState = await ensureHerdrServer();
21
+ let teamWorkspaceId = null;
22
+ try {
23
+ const uniqueTeam = `omxitest${Date.now().toString(36)}`;
24
+ const team = await createHerdrTeam(uniqueTeam, dir, [
25
+ { kind: 'codex', agentArgs: [], env: { OMX_HERDR_ITEST: '1' }, cwd: dir },
26
+ ]);
27
+ assert.equal(team.name, `herdr-${uniqueTeam}`);
28
+ teamWorkspaceId = team.workspaceId;
29
+ assert.equal(team.workspaceLabel, `omx-team-${uniqueTeam}`);
30
+ assert.equal(team.workers.length, 1);
31
+ const worker = team.workers[0];
32
+ assert.match(worker.paneId, /^w[0-9a-z]+:p[0-9a-z]+$/i);
33
+ assert.match(worker.agentName, /^omx-/);
34
+ assert.equal(await isHerdrWorkerAlive(worker.paneId), true);
35
+ const captured = await captureHerdrWorkerPane(worker.paneId, 40);
36
+ assert.ok(typeof captured === 'string');
37
+ const listed = await listHerdrTeams();
38
+ assert.ok(listed.some((t) => t.workspaceId === team.workspaceId));
39
+ await teardownHerdrWorker(worker.paneId);
40
+ assert.equal(await isHerdrWorkerAlive(worker.paneId), false);
41
+ await destroyHerdrTeam(team.workspaceId);
42
+ const listedAfter = await listHerdrTeams();
43
+ assert.ok(!listedAfter.some((t) => t.workspaceId === team.workspaceId));
44
+ }
45
+ finally {
46
+ if (teamWorkspaceId) {
47
+ try {
48
+ await destroyHerdrTeam(teamWorkspaceId);
49
+ }
50
+ catch { /* best-effort */ }
51
+ }
52
+ rmSync(dir, { recursive: true, force: true });
53
+ if (serverState === 'started') {
54
+ // We spawned the headless server for this test; stop it again so the
55
+ // user's machine is left as we found it. `server stop` prints no JSON,
56
+ // so this bypasses the envelope parser.
57
+ const bin = resolveHerdrBinary();
58
+ if (bin) {
59
+ try {
60
+ await execFileAsync(bin, ['server', 'stop']);
61
+ }
62
+ catch { /* best-effort */ }
63
+ }
64
+ }
65
+ }
66
+ });
67
+ });
68
+ //# sourceMappingURL=herdr-session-realherdr.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"herdr-session-realherdr.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/herdr-session-realherdr.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=herdr-session.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"herdr-session.test.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/herdr-session.test.ts"],"names":[],"mappings":""}