oh-my-codex 0.22.5 → 0.22.6
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/Cargo.lock +6 -6
- package/Cargo.toml +1 -1
- package/dist/cli/__tests__/cleanup.test.js +58 -73
- package/dist/cli/__tests__/cleanup.test.js.map +1 -1
- package/dist/cli/__tests__/question.test.js +193 -2
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/cleanup.d.ts +0 -16
- package/dist/cli/cleanup.d.ts.map +1 -1
- package/dist/cli/cleanup.js +2 -71
- package/dist/cli/cleanup.js.map +1 -1
- package/dist/cli/index.d.ts +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +1 -1
- package/dist/cli/question.d.ts.map +1 -1
- package/dist/cli/question.js +38 -20
- package/dist/cli/question.js.map +1 -1
- package/dist/question/__tests__/renderer.test.js +84 -50
- package/dist/question/__tests__/renderer.test.js.map +1 -1
- package/dist/question/__tests__/state.test.js +192 -2
- package/dist/question/__tests__/state.test.js.map +1 -1
- package/dist/question/__tests__/ui.test.js +82 -1
- package/dist/question/__tests__/ui.test.js.map +1 -1
- package/dist/question/renderer.d.ts +2 -2
- package/dist/question/renderer.d.ts.map +1 -1
- package/dist/question/renderer.js +14 -22
- package/dist/question/renderer.js.map +1 -1
- package/dist/question/state.d.ts +4 -0
- package/dist/question/state.d.ts.map +1 -1
- package/dist/question/state.js +76 -23
- package/dist/question/state.js.map +1 -1
- package/dist/question/ui.d.ts.map +1 -1
- package/dist/question/ui.js +8 -2
- package/dist/question/ui.js.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.js +137 -128
- package/dist/scripts/notify-hook/team-dispatch.js.map +1 -1
- package/dist/team/__tests__/lock-recovery.test.d.ts +2 -0
- package/dist/team/__tests__/lock-recovery.test.d.ts.map +1 -0
- package/dist/team/__tests__/lock-recovery.test.js +304 -0
- package/dist/team/__tests__/lock-recovery.test.js.map +1 -0
- package/dist/team/__tests__/state.test.js +8 -6
- package/dist/team/__tests__/state.test.js.map +1 -1
- package/dist/team/state/dispatch-lock.d.ts.map +1 -1
- package/dist/team/state/dispatch-lock.js +3 -11
- package/dist/team/state/dispatch-lock.js.map +1 -1
- package/dist/team/state/locks.d.ts +1 -0
- package/dist/team/state/locks.d.ts.map +1 -1
- package/dist/team/state/locks.js +29 -13
- package/dist/team/state/locks.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/src/scripts/notify-hook/team-dispatch.ts +133 -125
|
@@ -0,0 +1,304 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { spawn } from 'node:child_process';
|
|
3
|
+
import { once } from 'node:events';
|
|
4
|
+
import { mkdtemp, mkdir, readFile, readdir, rm, utimes, writeFile } from 'node:fs/promises';
|
|
5
|
+
import { tmpdir } from 'node:os';
|
|
6
|
+
import { join } from 'node:path';
|
|
7
|
+
import { afterEach, describe, it } from 'node:test';
|
|
8
|
+
import { createTask, enqueueDispatchRequest, initTeamState, listTasks } from '../state.js';
|
|
9
|
+
import { assertTeamLockNotStale, withMailboxLock, withScalingLock, withTaskClaimLock, withTeamLock } from '../state/locks.js';
|
|
10
|
+
import { drainPendingTeamDispatch } from '../../scripts/notify-hook/team-dispatch.js';
|
|
11
|
+
const roots = [];
|
|
12
|
+
afterEach(async () => {
|
|
13
|
+
await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
|
|
14
|
+
});
|
|
15
|
+
async function workspace() {
|
|
16
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-team-lock-recovery-'));
|
|
17
|
+
roots.push(cwd);
|
|
18
|
+
return cwd;
|
|
19
|
+
}
|
|
20
|
+
async function staleLock(lockDir, token) {
|
|
21
|
+
await mkdir(lockDir, { recursive: true });
|
|
22
|
+
if (token !== undefined)
|
|
23
|
+
await writeFile(join(lockDir, 'owner'), token);
|
|
24
|
+
await writeFile(join(lockDir, 'lease'), 'abandoned');
|
|
25
|
+
const old = new Date(Date.now() - 10 * 60_000);
|
|
26
|
+
await utimes(join(lockDir, 'lease'), old, old);
|
|
27
|
+
await utimes(lockDir, old, old);
|
|
28
|
+
}
|
|
29
|
+
describe('team lock recovery safety', () => {
|
|
30
|
+
it('rejects concurrent recovery without changing the lock, tasks, or config', async () => {
|
|
31
|
+
const cwd = await workspace();
|
|
32
|
+
const team = 'audit';
|
|
33
|
+
await initTeamState(team, 'lock regression', 'executor', 1, cwd);
|
|
34
|
+
const teamDir = join(cwd, '.omx/state/team', team);
|
|
35
|
+
const config = await readFile(join(teamDir, 'config.json'), 'utf8');
|
|
36
|
+
const lockDir = join(cwd, '.omx/state/.team-locks', `${team}.membership`);
|
|
37
|
+
await staleLock(lockDir, '99999999.0.dead');
|
|
38
|
+
const results = await Promise.allSettled(Array.from({ length: 12 }, (_, index) => createTask(team, { subject: `task-${index}`, description: 'independent submission', status: 'pending' }, cwd)));
|
|
39
|
+
for (const result of results) {
|
|
40
|
+
assert.equal(result.status, 'rejected');
|
|
41
|
+
if (result.status === 'rejected')
|
|
42
|
+
assert.match(String(result.reason), /team_lock_recovery_required:/);
|
|
43
|
+
}
|
|
44
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), '99999999.0.dead');
|
|
45
|
+
assert.equal(await readFile(join(lockDir, 'lease'), 'utf8'), 'abandoned');
|
|
46
|
+
assert.equal(await readFile(join(teamDir, 'config.json'), 'utf8'), config);
|
|
47
|
+
// The operator removes only the isolated fixture after all failed callers have exited.
|
|
48
|
+
await rm(lockDir, { recursive: true });
|
|
49
|
+
assert.deepEqual(await listTasks(team, cwd), []);
|
|
50
|
+
for (let round = 0; round < 20; round++) {
|
|
51
|
+
const tasks = await Promise.all(Array.from({ length: 12 }, (_, index) => createTask(team, { subject: `${round}-${index}`, description: 'normal concurrent submission', status: 'pending' }, cwd)));
|
|
52
|
+
assert.equal(new Set(tasks.map((task) => task.id)).size, 12);
|
|
53
|
+
}
|
|
54
|
+
const persisted = await listTasks(team, cwd);
|
|
55
|
+
assert.equal(persisted.length, 240);
|
|
56
|
+
assert.equal(new Set(persisted.map((task) => task.subject)).size, 240);
|
|
57
|
+
});
|
|
58
|
+
it('never treats an old lease or an unknown owner as deletion authority', async () => {
|
|
59
|
+
const cwd = await workspace();
|
|
60
|
+
for (const [name, token] of [['live', `${process.pid}.0.live`], ['unknown', 'unrecognized-owner'], ['empty', undefined]]) {
|
|
61
|
+
const lockDir = join(cwd, name);
|
|
62
|
+
await staleLock(lockDir, token);
|
|
63
|
+
if (name === 'live')
|
|
64
|
+
await assertTeamLockNotStale(lockDir, 1);
|
|
65
|
+
else
|
|
66
|
+
await assert.rejects(() => assertTeamLockNotStale(lockDir, 1), /team_lock_recovery_required:/);
|
|
67
|
+
assert.equal(await readFile(join(lockDir, 'lease'), 'utf8'), 'abandoned');
|
|
68
|
+
if (token !== undefined)
|
|
69
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), token);
|
|
70
|
+
}
|
|
71
|
+
const initializer = join(cwd, 'empty-initializer');
|
|
72
|
+
await mkdir(initializer);
|
|
73
|
+
await assertTeamLockNotStale(initializer, 60_000);
|
|
74
|
+
assert.deepEqual(await readdir(initializer), []);
|
|
75
|
+
const old = new Date(Date.now() - 10 * 60_000);
|
|
76
|
+
await utimes(initializer, old, old);
|
|
77
|
+
await assert.rejects(() => assertTeamLockNotStale(initializer, 1), /team_lock_recovery_required:/);
|
|
78
|
+
assert.deepEqual(await readdir(initializer), []);
|
|
79
|
+
});
|
|
80
|
+
it('protects every shared team lock wrapper against stale deletion', async () => {
|
|
81
|
+
const cwd = await workspace();
|
|
82
|
+
const root = join(cwd, '.omx/state/team/audit');
|
|
83
|
+
const deps = {
|
|
84
|
+
teamDir: () => root,
|
|
85
|
+
taskClaimLockDir: () => join(root, 'claims/task-1.lock'),
|
|
86
|
+
mailboxLockDir: () => join(root, 'mailbox/.lock-worker-1'),
|
|
87
|
+
};
|
|
88
|
+
for (const [lockDir, acquire] of [
|
|
89
|
+
[join(cwd, '.omx/state/.team-locks/audit.scaling'), (fn) => withScalingLock('audit', cwd, 1, deps, fn)],
|
|
90
|
+
[join(cwd, '.omx/state/.team-locks/audit.membership'), (fn) => withTeamLock('audit', cwd, 1, deps, fn)],
|
|
91
|
+
[deps.taskClaimLockDir(), (fn) => withTaskClaimLock('audit', '1', cwd, 1, deps, fn)],
|
|
92
|
+
[deps.mailboxLockDir(), (fn) => withMailboxLock('audit', 'worker-1', cwd, 1, deps, fn)],
|
|
93
|
+
]) {
|
|
94
|
+
await staleLock(lockDir, '99999999.0.dead');
|
|
95
|
+
await assert.rejects(() => acquire(async () => { assert.fail('stale lock must not enter'); }), /team_lock_recovery_required:/);
|
|
96
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), '99999999.0.dead');
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
it('retries when an owner releases and exits after its token was read', async () => {
|
|
100
|
+
const cwd = await workspace();
|
|
101
|
+
const lockModule = new URL('../state/locks.js', import.meta.url).href;
|
|
102
|
+
const owner = spawn(process.execPath, ['--input-type=module', '-e', `
|
|
103
|
+
import { withTeamLock } from ${JSON.stringify(lockModule)};
|
|
104
|
+
import { once } from 'node:events';
|
|
105
|
+
await withTeamLock('audit', ${JSON.stringify(cwd)}, 60_000,
|
|
106
|
+
{ teamDir: () => ${JSON.stringify(join(cwd, '.omx/state/team/audit'))} }, async () => {
|
|
107
|
+
process.send('locked');
|
|
108
|
+
await once(process, 'message');
|
|
109
|
+
});
|
|
110
|
+
process.disconnect();
|
|
111
|
+
`], { stdio: ['ignore', 'ignore', 'pipe', 'ipc'] });
|
|
112
|
+
let contender;
|
|
113
|
+
const signal = AbortSignal.timeout(10_000);
|
|
114
|
+
try {
|
|
115
|
+
await once(owner, 'message', { signal });
|
|
116
|
+
contender = spawn(process.execPath, ['--input-type=module', '-e', `
|
|
117
|
+
import fs from 'node:fs/promises';
|
|
118
|
+
import { syncBuiltinESMExports } from 'node:module';
|
|
119
|
+
import { once } from 'node:events';
|
|
120
|
+
const readFile = fs.readFile;
|
|
121
|
+
let delayed = false;
|
|
122
|
+
fs.readFile = async (...args) => {
|
|
123
|
+
const token = await readFile(...args);
|
|
124
|
+
if (!delayed && String(args[0]) === ${JSON.stringify(join(cwd, '.omx/state/.team-locks/audit.membership/owner'))}) {
|
|
125
|
+
delayed = true;
|
|
126
|
+
process.send('owner-read');
|
|
127
|
+
await once(process, 'message');
|
|
128
|
+
}
|
|
129
|
+
return token;
|
|
130
|
+
};
|
|
131
|
+
syncBuiltinESMExports();
|
|
132
|
+
const { withTeamLock } = await import(${JSON.stringify(lockModule)});
|
|
133
|
+
await withTeamLock('audit', ${JSON.stringify(cwd)}, 60_000,
|
|
134
|
+
{ teamDir: () => ${JSON.stringify(join(cwd, '.omx/state/team/audit'))} }, async () => {});
|
|
135
|
+
process.disconnect();
|
|
136
|
+
`], { stdio: ['ignore', 'ignore', 'pipe', 'ipc'] });
|
|
137
|
+
let stderr = '';
|
|
138
|
+
contender.stderr?.on('data', (data) => { stderr += String(data); });
|
|
139
|
+
const contenderExit = once(contender, 'exit', { signal });
|
|
140
|
+
await once(contender, 'message', { signal });
|
|
141
|
+
const ownerExit = once(owner, 'exit', { signal });
|
|
142
|
+
owner.send('release');
|
|
143
|
+
assert.deepEqual(await ownerExit, [0, null]);
|
|
144
|
+
contender.send('continue');
|
|
145
|
+
assert.deepEqual(await contenderExit, [0, null], stderr);
|
|
146
|
+
}
|
|
147
|
+
finally {
|
|
148
|
+
for (const child of [owner, contender]) {
|
|
149
|
+
if (child && child.exitCode === null && child.signalCode === null)
|
|
150
|
+
child.kill('SIGKILL');
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
it('rechecks owner initialization and directory replacement before requiring recovery', async () => {
|
|
155
|
+
const cwd = await workspace();
|
|
156
|
+
const lockModule = new URL('../state/locks.js', import.meta.url).href;
|
|
157
|
+
const child = spawn(process.execPath, ['--input-type=module', '-e', `
|
|
158
|
+
import assert from 'node:assert/strict';
|
|
159
|
+
import fs from 'node:fs/promises';
|
|
160
|
+
import { join } from 'node:path';
|
|
161
|
+
import { syncBuiltinESMExports } from 'node:module';
|
|
162
|
+
const stat = fs.stat;
|
|
163
|
+
const lockDir = ${JSON.stringify(join(cwd, 'lock'))};
|
|
164
|
+
const { assertTeamLockNotStale } = await import(${JSON.stringify(lockModule)});
|
|
165
|
+
for (const mode of ['initialize', 'replace']) {
|
|
166
|
+
await fs.mkdir(lockDir);
|
|
167
|
+
if (mode === 'replace') await fs.writeFile(join(lockDir, 'owner'), 'unrecognized-owner');
|
|
168
|
+
await fs.writeFile(join(lockDir, 'lease'), 'old');
|
|
169
|
+
const old = new Date(Date.now() - 600_000);
|
|
170
|
+
await fs.utimes(join(lockDir, 'lease'), old, old);
|
|
171
|
+
let changed = false;
|
|
172
|
+
fs.stat = async (...args) => {
|
|
173
|
+
const info = await stat(...args);
|
|
174
|
+
if (!changed && String(args[0]) === join(lockDir, 'lease')) {
|
|
175
|
+
changed = true;
|
|
176
|
+
if (mode === 'replace') {
|
|
177
|
+
await fs.rename(lockDir, lockDir + '.old');
|
|
178
|
+
await fs.mkdir(lockDir);
|
|
179
|
+
await fs.writeFile(join(lockDir, 'owner'), 'unrecognized-owner');
|
|
180
|
+
} else {
|
|
181
|
+
await fs.writeFile(join(lockDir, 'owner'), process.pid + '.0.initialized');
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return info;
|
|
185
|
+
};
|
|
186
|
+
syncBuiltinESMExports();
|
|
187
|
+
await assertTeamLockNotStale(lockDir, 1);
|
|
188
|
+
assert.equal(changed, true);
|
|
189
|
+
assert.equal(await fs.readFile(join(lockDir, 'owner'), 'utf8'),
|
|
190
|
+
mode === 'replace' ? 'unrecognized-owner' : process.pid + '.0.initialized');
|
|
191
|
+
fs.stat = stat;
|
|
192
|
+
syncBuiltinESMExports();
|
|
193
|
+
await fs.rm(lockDir, { recursive: true });
|
|
194
|
+
}
|
|
195
|
+
`], { stdio: ['ignore', 'ignore', 'pipe'] });
|
|
196
|
+
let stderr = '';
|
|
197
|
+
child.stderr?.on('data', (data) => { stderr += String(data); });
|
|
198
|
+
try {
|
|
199
|
+
assert.deepEqual(await once(child, 'exit', { signal: AbortSignal.timeout(10_000) }), [0, null], stderr);
|
|
200
|
+
}
|
|
201
|
+
finally {
|
|
202
|
+
if (child.exitCode === null && child.signalCode === null)
|
|
203
|
+
child.kill('SIGKILL');
|
|
204
|
+
}
|
|
205
|
+
});
|
|
206
|
+
it('preserves a SIGKILLed owner lock and gives a recovery diagnostic', async () => {
|
|
207
|
+
const cwd = await workspace();
|
|
208
|
+
const lockModule = new URL('../state/locks.js', import.meta.url).href;
|
|
209
|
+
const entered = join(cwd, 'entered');
|
|
210
|
+
const code = `import { withTeamLock } from ${JSON.stringify(lockModule)};
|
|
211
|
+
import {writeFile} from 'node:fs/promises';
|
|
212
|
+
const root=${JSON.stringify(cwd)};
|
|
213
|
+
await withTeamLock('audit',root,1,{teamDir:()=>root+'/.omx/state/team/audit'},async()=>{
|
|
214
|
+
await writeFile(${JSON.stringify(entered)},'entered');setInterval(()=>{},1000);await new Promise(()=>{});
|
|
215
|
+
});`;
|
|
216
|
+
const child = spawn(process.execPath, ['--input-type=module', '-e', code], { stdio: 'ignore' });
|
|
217
|
+
try {
|
|
218
|
+
for (let attempt = 0;; attempt++) {
|
|
219
|
+
if (await readFile(entered, 'utf8').catch(() => '') === 'entered')
|
|
220
|
+
break;
|
|
221
|
+
assert.ok(attempt < 200, 'child must acquire the real lock');
|
|
222
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
223
|
+
}
|
|
224
|
+
const exited = once(child, 'exit');
|
|
225
|
+
child.kill('SIGKILL');
|
|
226
|
+
await exited;
|
|
227
|
+
const lockDir = join(cwd, '.omx/state/.team-locks/audit.membership');
|
|
228
|
+
const owner = await readFile(join(lockDir, 'owner'), 'utf8');
|
|
229
|
+
await assert.rejects(() => assertTeamLockNotStale(lockDir, 1), /team_lock_recovery_required:/);
|
|
230
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), owner);
|
|
231
|
+
}
|
|
232
|
+
finally {
|
|
233
|
+
if (child.exitCode === null && child.signalCode === null)
|
|
234
|
+
child.kill('SIGKILL');
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
it('preserves the same stale dispatch lock from both the API and the hook', async () => {
|
|
238
|
+
const cwd = await workspace();
|
|
239
|
+
await initTeamState('audit', 'shared dispatch lock', 'executor', 1, cwd);
|
|
240
|
+
const stateDir = join(cwd, '.omx/state');
|
|
241
|
+
const dispatchDir = join(stateDir, 'team/audit/dispatch');
|
|
242
|
+
const before = await readFile(join(dispatchDir, 'requests.json'), 'utf8');
|
|
243
|
+
const lockDir = join(dispatchDir, '.lock');
|
|
244
|
+
await staleLock(lockDir, '99999999.0.dead');
|
|
245
|
+
await assert.rejects(() => enqueueDispatchRequest('audit', { kind: 'inbox', to_worker: 'worker-1', trigger_message: 'ping' }, cwd), /team_lock_recovery_required:/);
|
|
246
|
+
const logsDir = join(cwd, '.omx/logs');
|
|
247
|
+
const drained = await drainPendingTeamDispatch({ cwd, stateDir, logsDir, injector: async () => { assert.fail('stale dispatch lock must not inject'); } });
|
|
248
|
+
assert.deepEqual(drained, { processed: 0, skipped: 0, failed: 1 });
|
|
249
|
+
const log = (await readdir(logsDir)).find((name) => name.startsWith('team-dispatch-'));
|
|
250
|
+
assert.ok(log, 'the hook reports the abandoned lock');
|
|
251
|
+
assert.match(await readFile(join(logsDir, log), 'utf8'), /"type":"dispatch_lock_recovery_required","team":"audit","reason":"team_lock_recovery_required:/);
|
|
252
|
+
assert.equal(await readFile(join(dispatchDir, 'requests.json'), 'utf8'), before);
|
|
253
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), '99999999.0.dead');
|
|
254
|
+
});
|
|
255
|
+
it('keeps draining other teams when one team needs dispatch lock recovery', async () => {
|
|
256
|
+
const cwd = await workspace();
|
|
257
|
+
await initTeamState('audit', 'abandoned dispatch lock', 'executor', 1, cwd);
|
|
258
|
+
await initTeamState('zeta', 'healthy team', 'executor', 1, cwd);
|
|
259
|
+
const stateDir = join(cwd, '.omx/state');
|
|
260
|
+
const healthy = await enqueueDispatchRequest('zeta', { kind: 'inbox', to_worker: 'worker-1', trigger_message: 'ping' }, cwd);
|
|
261
|
+
const lockDir = join(stateDir, 'team/audit/dispatch/.lock');
|
|
262
|
+
await staleLock(lockDir, '99999999.0.dead');
|
|
263
|
+
const injected = [];
|
|
264
|
+
const drained = await drainPendingTeamDispatch({
|
|
265
|
+
cwd,
|
|
266
|
+
stateDir,
|
|
267
|
+
logsDir: join(cwd, '.omx/logs'),
|
|
268
|
+
injector: async (request) => {
|
|
269
|
+
injected.push(String(request.request_id));
|
|
270
|
+
return { ok: true, reason: 'injected_for_test' };
|
|
271
|
+
},
|
|
272
|
+
});
|
|
273
|
+
assert.deepEqual(injected, [healthy.request.request_id]);
|
|
274
|
+
assert.equal(drained.processed, 1);
|
|
275
|
+
assert.equal(drained.failed, 1);
|
|
276
|
+
assert.equal(await readFile(join(lockDir, 'owner'), 'utf8'), '99999999.0.dead');
|
|
277
|
+
});
|
|
278
|
+
it('serializes independent processes creating tasks through the public API', async () => {
|
|
279
|
+
const cwd = await workspace();
|
|
280
|
+
await initTeamState('audit', 'cross-process lock regression', 'executor', 1, cwd);
|
|
281
|
+
const stateModule = new URL('../state.js', import.meta.url).href;
|
|
282
|
+
const children = Array.from({ length: 12 }, (_, index) => spawn(process.execPath, ['--input-type=module', '-e',
|
|
283
|
+
`import{createTask}from ${JSON.stringify(stateModule)};await createTask('audit',{subject:'process-${index}',description:'independent process',status:'pending'},${JSON.stringify(cwd)});`], { stdio: ['ignore', 'ignore', 'pipe'] }));
|
|
284
|
+
try {
|
|
285
|
+
await Promise.all(children.map(async (child) => {
|
|
286
|
+
let stderr = '';
|
|
287
|
+
child.stderr?.on('data', (data) => { stderr += String(data); });
|
|
288
|
+
const [code, signal] = await once(child, 'exit');
|
|
289
|
+
assert.equal(code, 0, stderr);
|
|
290
|
+
assert.equal(signal, null);
|
|
291
|
+
}));
|
|
292
|
+
const tasks = await listTasks('audit', cwd);
|
|
293
|
+
assert.equal(tasks.length, 12);
|
|
294
|
+
assert.equal(new Set(tasks.map((task) => task.id)).size, 12);
|
|
295
|
+
assert.equal(new Set(tasks.map((task) => task.subject)).size, 12);
|
|
296
|
+
}
|
|
297
|
+
finally {
|
|
298
|
+
for (const child of children)
|
|
299
|
+
if (child.exitCode === null && child.signalCode === null)
|
|
300
|
+
child.kill('SIGKILL');
|
|
301
|
+
}
|
|
302
|
+
});
|
|
303
|
+
});
|
|
304
|
+
//# sourceMappingURL=lock-recovery.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lock-recovery.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/lock-recovery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1355,7 +1355,7 @@ exit 1
|
|
|
1355
1355
|
await rm(cwd, { recursive: true, force: true });
|
|
1356
1356
|
}
|
|
1357
1357
|
});
|
|
1358
|
-
it('claimTask
|
|
1358
|
+
it('claimTask preserves a stale task claim lock and requires manual recovery', async () => {
|
|
1359
1359
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-team-claim-stale-lock-'));
|
|
1360
1360
|
try {
|
|
1361
1361
|
await initTeamState('team-stale-lock', 't', 'executor', 1, cwd);
|
|
@@ -1365,8 +1365,9 @@ exit 1
|
|
|
1365
1365
|
await writeFile(join(staleLockDir, 'owner'), 'stale-owner');
|
|
1366
1366
|
const staleTs = new Date(Date.now() - 10 * 60_000);
|
|
1367
1367
|
await utimes(staleLockDir, staleTs, staleTs);
|
|
1368
|
-
|
|
1369
|
-
assert.equal(
|
|
1368
|
+
await assert.rejects(() => claimTask('team-stale-lock', t.id, 'worker-1', t.version ?? 1, cwd), /team_lock_recovery_required:/);
|
|
1369
|
+
assert.equal(await readFile(join(staleLockDir, 'owner'), 'utf8'), 'stale-owner');
|
|
1370
|
+
assert.equal((await readTask('team-stale-lock', t.id, cwd))?.status, 'pending');
|
|
1370
1371
|
}
|
|
1371
1372
|
finally {
|
|
1372
1373
|
await rm(cwd, { recursive: true, force: true });
|
|
@@ -5005,7 +5006,7 @@ exit 1
|
|
|
5005
5006
|
await rm(cwd, { recursive: true, force: true });
|
|
5006
5007
|
}
|
|
5007
5008
|
});
|
|
5008
|
-
it('heartbeats live scaling and membership leases while
|
|
5009
|
+
it('heartbeats live scaling and membership leases while preserving stale unknown locks', async () => {
|
|
5009
5010
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-team-lock-lease-'));
|
|
5010
5011
|
const teamName = 'team-lock-lease';
|
|
5011
5012
|
const staleMs = 90;
|
|
@@ -5050,8 +5051,9 @@ exit 1
|
|
|
5050
5051
|
await utimes(lock.lockDir, staleTime, staleTime);
|
|
5051
5052
|
await utimes(join(lock.lockDir, 'lease'), staleTime, staleTime);
|
|
5052
5053
|
let reclaimed = false;
|
|
5053
|
-
await lock.acquire(async () => { reclaimed = true; });
|
|
5054
|
-
assert.equal(reclaimed,
|
|
5054
|
+
await assert.rejects(() => lock.acquire(async () => { reclaimed = true; }), /team_lock_recovery_required:/);
|
|
5055
|
+
assert.equal(reclaimed, false, `stale ${lock.label} lock requires confirmed manual recovery`);
|
|
5056
|
+
assert.equal(await readFile(join(lock.lockDir, 'owner'), 'utf8'), 'crashed-owner');
|
|
5055
5057
|
}
|
|
5056
5058
|
}
|
|
5057
5059
|
finally {
|