oh-my-codex 0.22.3 → 0.22.5
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/crates/omx-api/src/lib.rs +7 -2
- package/crates/omx-api/tests/cli.rs +58 -0
- package/dist/cli/__tests__/launch-fallback.test.js +41 -0
- package/dist/cli/__tests__/launch-fallback.test.js.map +1 -1
- package/dist/cli/__tests__/resume-hint.test.d.ts +2 -0
- package/dist/cli/__tests__/resume-hint.test.d.ts.map +1 -0
- package/dist/cli/__tests__/resume-hint.test.js +305 -0
- package/dist/cli/__tests__/resume-hint.test.js.map +1 -0
- package/dist/cli/__tests__/resume.test.js +51 -0
- package/dist/cli/__tests__/resume.test.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +72 -4
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/resume-hint.d.ts +32 -0
- package/dist/cli/resume-hint.d.ts.map +1 -0
- package/dist/cli/resume-hint.js +97 -0
- package/dist/cli/resume-hint.js.map +1 -0
- package/dist/mcp/__tests__/memory-server-concurrency.test.d.ts +2 -0
- package/dist/mcp/__tests__/memory-server-concurrency.test.d.ts.map +1 -0
- package/dist/mcp/__tests__/memory-server-concurrency.test.js +128 -0
- package/dist/mcp/__tests__/memory-server-concurrency.test.js.map +1 -0
- package/dist/mcp/memory-server.d.ts.map +1 -1
- package/dist/mcp/memory-server.js +40 -49
- package/dist/mcp/memory-server.js.map +1 -1
- package/dist/notifications/__tests__/reply-routing-realtmux.test.d.ts +2 -0
- package/dist/notifications/__tests__/reply-routing-realtmux.test.d.ts.map +1 -0
- package/dist/notifications/__tests__/reply-routing-realtmux.test.js +133 -0
- package/dist/notifications/__tests__/reply-routing-realtmux.test.js.map +1 -0
- package/dist/notifications/index.d.ts.map +1 -1
- package/dist/notifications/index.js +5 -1
- package/dist/notifications/index.js.map +1 -1
- package/dist/notifications/reply-listener.d.ts +2 -1
- package/dist/notifications/reply-listener.d.ts.map +1 -1
- package/dist/notifications/reply-listener.js +13 -5
- package/dist/notifications/reply-listener.js.map +1 -1
- package/dist/notifications/session-registry.d.ts +2 -0
- package/dist/notifications/session-registry.d.ts.map +1 -1
- package/dist/notifications/session-registry.js.map +1 -1
- package/dist/notifications/tmux-detector.d.ts +12 -0
- package/dist/notifications/tmux-detector.d.ts.map +1 -1
- package/dist/notifications/tmux-detector.js +46 -2
- package/dist/notifications/tmux-detector.js.map +1 -1
- package/dist/scripts/__tests__/worker-stop-task-read.test.d.ts +2 -0
- package/dist/scripts/__tests__/worker-stop-task-read.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/worker-stop-task-read.test.js +76 -0
- package/dist/scripts/__tests__/worker-stop-task-read.test.js.map +1 -0
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +28 -14
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/session-history/search.d.ts +16 -0
- package/dist/session-history/search.d.ts.map +1 -1
- package/dist/session-history/search.js +48 -0
- package/dist/session-history/search.js.map +1 -1
- package/dist/subagents/tracker.d.ts.map +1 -1
- package/dist/subagents/tracker.js +12 -2
- package/dist/subagents/tracker.js.map +1 -1
- package/dist/vscode/__tests__/index.test.js +21 -0
- package/dist/vscode/__tests__/index.test.js.map +1 -1
- package/dist/vscode/index.d.ts.map +1 -1
- package/dist/vscode/index.js +8 -4
- package/dist/vscode/index.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/src/scripts/__tests__/worker-stop-task-read.test.ts +77 -0
- package/src/scripts/codex-native-hook.ts +25 -11
|
@@ -8,6 +8,32 @@ import { execFileSync, spawnSync } from 'child_process';
|
|
|
8
8
|
import { sleepSync } from '../utils/sleep.js';
|
|
9
9
|
import { resolveCommandPathForPlatform, resolveTmuxBinaryForPlatform } from '../utils/platform-command.js';
|
|
10
10
|
import { buildCapturePaneArgv as sharedBuildCapturePaneArgv } from '../scripts/tmux-hook-engine.js';
|
|
11
|
+
import { readExactPaneProofSync } from '../team/exact-pane.js';
|
|
12
|
+
import { shellEscapeSingle } from '../hud/tmux.js';
|
|
13
|
+
export function readReplyPaneIdentity(paneId, sessionId) {
|
|
14
|
+
const proof = readExactPaneProofSync(paneId);
|
|
15
|
+
if (proof.status !== 'live')
|
|
16
|
+
return null;
|
|
17
|
+
try {
|
|
18
|
+
const snapshot = execFileSync(resolveTmuxBinaryForPlatform() || 'tmux', [
|
|
19
|
+
'display-message', '-p', '-t', paneId,
|
|
20
|
+
'#{pane_id}\t#{pane_pid}\t#{session_id}\t#{session_created}\t#{session_name}\t#{@omx_instance_id}\t#{@omx_team_pane_owner_id}\t#{@omx_pane_instance_id}\tEND',
|
|
21
|
+
], { encoding: 'utf-8', timeout: 3000, stdio: ['ignore', 'pipe', 'pipe'] }).trim();
|
|
22
|
+
const fields = snapshot.split('\t');
|
|
23
|
+
if (fields.length !== 9 || fields[8] !== 'END' || fields[0] !== paneId
|
|
24
|
+
|| Number(fields[1]) !== proof.pid || !/^\$\d+$/.test(fields[2]) || !/^\d+$/.test(fields[3])
|
|
25
|
+
|| !fields[4] || !/^[A-Za-z0-9_.:/-]*$/.test(fields[5]) || !/^[A-Za-z0-9_.:/-]*$/.test(fields[6])
|
|
26
|
+
|| !/^[A-Za-z0-9_.:/-]*$/.test(fields[7]))
|
|
27
|
+
return null;
|
|
28
|
+
// Match managed-tmux's pane-first ownership rule; a live pane alone cannot authorize an old session's reply.
|
|
29
|
+
if (!sessionId || (fields[7] || fields[5]) !== sessionId)
|
|
30
|
+
return null;
|
|
31
|
+
return { panePid: proof.pid, sessionId: fields[2], sessionCreated: fields[3], sessionName: fields[4], sessionOwner: fields[5], paneOwner: fields[6], paneInstanceId: fields[7] };
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
11
37
|
export function isTmuxAvailable() {
|
|
12
38
|
return resolveCommandPathForPlatform('tmux') !== null;
|
|
13
39
|
}
|
|
@@ -107,14 +133,32 @@ export function sendToPane(paneId, text, pressEnter = true, deps = {}) {
|
|
|
107
133
|
const sleepImpl = deps.sleepImpl ?? sleepSync;
|
|
108
134
|
const argvs = buildSendPaneArgvs(paneId, text, pressEnter);
|
|
109
135
|
const tmuxCommand = resolveTmuxBinaryForPlatform() || 'tmux';
|
|
136
|
+
const expected = deps.expectedIdentity;
|
|
137
|
+
if (expected && (!/^%\d+$/.test(paneId) || !Number.isSafeInteger(expected.panePid) || expected.panePid <= 0
|
|
138
|
+
|| !/^\$\d+$/.test(expected.sessionId) || !/^\d+$/.test(expected.sessionCreated)
|
|
139
|
+
|| !/^[A-Za-z0-9_.:/-]*$/.test(expected.sessionOwner) || !/^[A-Za-z0-9_.:/-]*$/.test(expected.paneOwner)
|
|
140
|
+
|| !/^[A-Za-z0-9_.:/-]*$/.test(expected.paneInstanceId)))
|
|
141
|
+
return false;
|
|
142
|
+
const predicate = expected ? [
|
|
143
|
+
`#{==:#{pane_id},${paneId}}`, '#{==:#{pane_dead},0}',
|
|
144
|
+
`#{==:#{pane_pid},${expected.panePid}}`, `#{==:#{session_id},${expected.sessionId}}`,
|
|
145
|
+
`#{==:#{session_created},${expected.sessionCreated}}`,
|
|
146
|
+
...(expected.paneInstanceId ? [] : [`#{==:#{@omx_instance_id},${expected.sessionOwner}}`]),
|
|
147
|
+
`#{==:#{@omx_team_pane_owner_id},${expected.paneOwner}}`,
|
|
148
|
+
`#{==:#{@omx_pane_instance_id},${expected.paneInstanceId}}`,
|
|
149
|
+
].reduce((left, right) => `#{&&:${left},${right}}`) : '';
|
|
110
150
|
for (const [index, argv] of argvs.entries()) {
|
|
111
|
-
const
|
|
151
|
+
const guardedArgv = expected ? [
|
|
152
|
+
'if-shell', '-F', '-t', paneId, predicate,
|
|
153
|
+
`${argv.map(shellEscapeSingle).join(' ')} ; display-message -p __omx_reply_sent__`, '',
|
|
154
|
+
] : argv;
|
|
155
|
+
const result = spawnSyncImpl(tmuxCommand, guardedArgv, {
|
|
112
156
|
timeout: 3000,
|
|
113
157
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
114
158
|
encoding: 'utf-8',
|
|
115
159
|
windowsHide: process.platform === 'win32',
|
|
116
160
|
});
|
|
117
|
-
if (result.error || result.status !== 0)
|
|
161
|
+
if (result.error || result.status !== 0 || (expected && String(result.stdout).trim() !== '__omx_reply_sent__'))
|
|
118
162
|
return false;
|
|
119
163
|
const hasNextArgv = index < argvs.length - 1;
|
|
120
164
|
if (!hasNextArgv)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmux-detector.js","sourceRoot":"","sources":["../../src/notifications/tmux-detector.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC3G,OAAO,EAAE,oBAAoB,IAAI,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"tmux-detector.js","sourceRoot":"","sources":["../../src/notifications/tmux-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-stop-task-read.test.d.ts","sourceRoot":"","sources":["../../../src/scripts/__tests__/worker-stop-task-read.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { execFileSync } from 'node:child_process';
|
|
3
|
+
import { chmod, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
import { it } from 'node:test';
|
|
7
|
+
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import { initTeamState } from '../../team/state.js';
|
|
9
|
+
import { dispatchCodexNativeHook } from '../codex-native-hook.js';
|
|
10
|
+
async function withWorker(check) {
|
|
11
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-worker-stop-read-'));
|
|
12
|
+
const keys = ['OMX_TEAM_INTERNAL_WORKER', 'OMX_TEAM_WORKER', 'OMX_TEAM_STATE_ROOT'];
|
|
13
|
+
const previous = keys.map((key) => process.env[key]);
|
|
14
|
+
try {
|
|
15
|
+
process.env.OMX_TEAM_STATE_ROOT = join(cwd, '.omx/state');
|
|
16
|
+
await initTeamState('audit', 'audit', 'executor', 1, cwd);
|
|
17
|
+
process.env.OMX_TEAM_INTERNAL_WORKER = 'audit/worker-1';
|
|
18
|
+
process.env.OMX_TEAM_WORKER = 'audit/worker-1';
|
|
19
|
+
const root = join(cwd, '.omx/state/team/audit');
|
|
20
|
+
await writeFile(join(root, 'workers/worker-1/identity.json'), JSON.stringify({ name: 'worker-1', assigned_tasks: ['1'] }));
|
|
21
|
+
await writeFile(join(root, 'workers/worker-1/status.json'), JSON.stringify({ state: 'idle', current_task_id: '1' }));
|
|
22
|
+
await writeFile(join(root, 'tasks/task-1.json'), JSON.stringify({ id: '1', owner: 'worker-1', status: 'completed' }));
|
|
23
|
+
await check(cwd, join(root, 'tasks'));
|
|
24
|
+
}
|
|
25
|
+
finally {
|
|
26
|
+
keys.forEach((key, index) => {
|
|
27
|
+
if (previous[index] === undefined)
|
|
28
|
+
delete process.env[key];
|
|
29
|
+
else
|
|
30
|
+
process.env[key] = previous[index];
|
|
31
|
+
});
|
|
32
|
+
await rm(cwd, { recursive: true, force: true });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
async function stop(cwd) {
|
|
36
|
+
return (await dispatchCodexNativeHook({ hook_event_name: 'Stop', cwd, session_id: 'worker-stop-audit' }, { cwd })).outputJson;
|
|
37
|
+
}
|
|
38
|
+
it('does not let an unreadable unlisted task turn a blocked Stop into an allowed Stop', async () => {
|
|
39
|
+
await withWorker(async (cwd, tasks) => {
|
|
40
|
+
const task = join(tasks, 'task-2.json');
|
|
41
|
+
await writeFile(task, JSON.stringify({ id: '2', owner: 'worker-1', status: 'in_progress' }));
|
|
42
|
+
assert.equal((await stop(cwd))?.decision, 'block');
|
|
43
|
+
for (const invalid of ['{invalid', 'null', '[]', '42', '{"id":"2"}', '{"id":"2","status":"unknown"}', '{"id":"1","status":"completed"}']) {
|
|
44
|
+
await writeFile(task, invalid);
|
|
45
|
+
assert.equal((await stop(cwd))?.decision, 'block', invalid);
|
|
46
|
+
assert.equal(await readFile(task, 'utf8'), invalid);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
it('fails closed when task enumeration fails despite a readable completed assignment', {
|
|
51
|
+
skip: process.platform === 'win32' || process.getuid?.() === 0,
|
|
52
|
+
}, async () => {
|
|
53
|
+
await withWorker(async (cwd, tasks) => {
|
|
54
|
+
await chmod(tasks, 0o111);
|
|
55
|
+
try {
|
|
56
|
+
assert.equal((await stop(cwd))?.decision, 'block');
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
await chmod(tasks, 0o700);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
it('still allows Stop when all recorded worker tasks are readable and completed', async () => {
|
|
64
|
+
await withWorker(async (cwd) => assert.equal(await stop(cwd), null));
|
|
65
|
+
});
|
|
66
|
+
it('returns a blocking decision through the real native hook CLI for corrupt task JSON', async () => {
|
|
67
|
+
await withWorker(async (cwd, tasks) => {
|
|
68
|
+
await writeFile(join(tasks, 'task-2.json'), '{invalid');
|
|
69
|
+
const output = execFileSync(process.execPath, [fileURLToPath(new URL('../codex-native-hook.js', import.meta.url))], {
|
|
70
|
+
cwd, input: JSON.stringify({ hook_event_name: 'Stop', cwd, session_id: 'worker-stop-cli-audit' }),
|
|
71
|
+
encoding: 'utf8', timeout: 10_000,
|
|
72
|
+
});
|
|
73
|
+
assert.equal(JSON.parse(output).decision, 'block');
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
//# sourceMappingURL=worker-stop-task-read.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-stop-task-read.test.js","sourceRoot":"","sources":["../../../src/scripts/__tests__/worker-stop-task-read.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,KAAK,UAAU,UAAU,CAAC,KAAoD;IAC5E,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,CAAC,0BAA0B,EAAE,iBAAiB,EAAE,qBAAqB,CAAU,CAAC;IAC7F,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC1D,MAAM,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,gBAAgB,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,gBAAgB,CAAC;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;QAChD,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,gCAAgC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3H,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,8BAA8B,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACrH,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACtH,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC1B,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;;gBACtD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,GAAW;IAC7B,OAAO,CAAC,MAAM,uBAAuB,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;AAChI,CAAC;AAED,EAAE,CAAC,mFAAmF,EAAE,KAAK,IAAI,EAAE;IACjG,MAAM,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxC,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,MAAM,OAAO,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,+BAA+B,EAAE,iCAAiC,CAAC,EAAE,CAAC;YACzI,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,kFAAkF,EAAE;IACrF,IAAI,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC;CAC/D,EAAE,KAAK,IAAI,EAAE;IACZ,MAAM,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;gBAAS,CAAC;YACT,MAAM,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;IAC3F,MAAM,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;IAClG,MAAM,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,UAAU,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,yBAAyB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAClH,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,uBAAuB,EAAE,CAAC;YACjG,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;SAClC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AAqCA,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAehC,OAAO,EAcL,KAAK,mBAAmB,EAExB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AAqCA,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAehC,OAAO,EAcL,KAAK,mBAAmB,EAExB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AAkC7B,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAuCtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AA0DlE,KAAK,kBAAkB,GACnB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,aAAa,GACb,cAAc,GACd,MAAM,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,UAAU,yBAAyB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,iBAAiB,CAAC,CAAC;IAChF,6BAA6B,CAAC,EAAE,OAAO,2BAA2B,CAAC;IACnE,mFAAmF;IACnF,0BAA0B,CAAC,EAAE,OAAO,wBAAwB,CAAC;CAE9D;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAufD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAqBf;AAmxBD,UAAU,mBAAmB;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAgHD,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IACP,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,mBAAmB,EAAE,GAAG,IAAI,CAAC;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CACvB,GACL,MAAM,GAAG,IAAI,CA+Bf;AAiPD,wBAAgB,qCAAqC,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAOnG;AAyOD,KAAK,uBAAuB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,UAAU,CAAA;CAAE,CAAC;AAEhE,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,GAAG,uBAAuB,CAgBlH;AAWD,MAAM,MAAM,gCAAgC,GACxC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,yBAAyB,GAAG,6BAA6B,GAAG,sBAAsB,GAAG,4BAA4B,GAAG,oBAAoB,GAAG,sBAAsB,GAAG,wBAAwB,GAAG,uBAAuB,GAAG,sBAAsB,CAAA;CAAE,CAAC;AAE1T,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,MAAM,EACX,0BAA0B,EAAE,MAAM,EAClC,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,KAAK,EAAE,YAAY,GAAG,IAAI,GACzB,gCAAgC,CAelC;AA8/BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AAygBD,MAAM,MAAM,kCAAkC,GAC1C,gBAAgB,GAChB,WAAW,GACX,mBAAmB,GACnB,kBAAkB,GAClB,gBAAgB,GAChB,gBAAgB,GAChB,cAAc,GACd,iBAAiB,GACjB,qBAAqB,GACrB,gBAAgB,CAAC;AAErB,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,kCAAkC,CAAC;CAC7C;AA8QD,wBAAsB,sCAAsC,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,kCAAkC,GAAG,IAAI,CAAC,CAGxK;AAED,KAAK,uBAAuB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA8F7G,wBAAsB,6CAA6C,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAExI;AAED,wBAAsB,6CAA6C,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAExI;AA4/JD,MAAM,MAAM,gCAAgC,GACxC,oBAAoB,GACpB,qBAAqB,GACrB,wBAAwB,GACxB,2BAA2B,GAC3B,4BAA4B,GAC5B,iBAAiB,GACjB,0BAA0B,GAC1B,6BAA6B,GAC7B,kBAAkB,CAAC;AAEvB,eAAO,MAAM,qCAAqC,EAAE,MAAM,CAAC,gCAAgC,EAAE,MAAM,CAUlG,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAsFF,wBAAgB,0CAA0C,CACxD,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,GAC7B,qCAAqC,CAuCvC;AAowBD,MAAM,MAAM,6BAA6B,GACrC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qCAAqC,CAAA;CAAE,GAClF;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAsBrC,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,6BAA6B,CAAC,CA+BvH;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC,EAClE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GACtC,MAAM,GAAG,IAAI,CAwCf;AA43TD,wBAAsB,wCAAwC,CAC5D,QAAQ,EAAE,gBAAgB,EAC1B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,UAAU,SAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAGzC;AA6+CD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA68BnC;AA6BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AA4OD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyE3D"}
|
|
@@ -20,6 +20,7 @@ import { syncRegularFile } from "../utils/file-durability.js";
|
|
|
20
20
|
import { appendPromptSessionProvenanceRejection, appendToLog, isSessionPointerLaunchAbort, isSessionStateUsable, isSessionStateAuthoritativeForCwd, normalizeSessionId, readNativeSessionOwner, readSessionPointer, readSessionState, readUsableSessionState, reconcileNativeSessionStart, resolveSessionPointerContext, sessionOwnerFileIdentityMatches, writeNativeSessionOwner } from "../hooks/session.js";
|
|
21
21
|
import { evaluateResolvedPromptTurn, extractSelectedTargetOwnerEvidence, preflightSelectedTargetOwner, } from "../hooks/prompt-session-provenance.js";
|
|
22
22
|
import { appendTeamEvent, readTeamLeaderAttention, readTeamManifestV2, readTeamPhase, writeTeamLeaderAttention, writeTeamPhase, } from "../team/state.js";
|
|
23
|
+
import { TEAM_TASK_STATUSES } from "../team/contracts.js";
|
|
23
24
|
import { parseTeamNoticeLedgerPrompt, reconcileTeamNoticeLedger } from "../team/notice-ledger.js";
|
|
24
25
|
import { canonicalizeComparablePath, omxLogsDir, omxNotepadPath, resolveProjectMemoryPath, sameFilePath, } from "../utils/paths.js";
|
|
25
26
|
import { findGitLayout } from "../utils/git-layout.js";
|
|
@@ -2399,20 +2400,33 @@ async function resolveTeamWorkerStopDecision(cwd) {
|
|
|
2399
2400
|
candidateTaskIds.add(normalized);
|
|
2400
2401
|
}
|
|
2401
2402
|
const tasksDir = join(stateDir, "team", workerContext.teamName, "tasks");
|
|
2402
|
-
|
|
2403
|
-
|
|
2404
|
-
|
|
2405
|
-
|
|
2406
|
-
|
|
2407
|
-
|
|
2408
|
-
|
|
2409
|
-
|
|
2410
|
-
|
|
2411
|
-
|
|
2412
|
-
|
|
2413
|
-
|
|
2414
|
-
|
|
2415
|
-
|
|
2403
|
+
let taskFiles;
|
|
2404
|
+
try {
|
|
2405
|
+
const info = await lstat(tasksDir);
|
|
2406
|
+
if (!info.isDirectory() || info.isSymbolicLink())
|
|
2407
|
+
throw new Error("not_regular_directory");
|
|
2408
|
+
taskFiles = await readdir(tasksDir);
|
|
2409
|
+
}
|
|
2410
|
+
catch (error) {
|
|
2411
|
+
if (error.code === 'ENOENT' && candidateTaskIds.size === 0) {
|
|
2412
|
+
return blockWorkerStop("missing_task_assignment", "no current_task_id or assigned_tasks are recorded", stateDir);
|
|
2413
|
+
}
|
|
2414
|
+
return blockWorkerStop("unreadable_tasks", "task directory cannot be enumerated safely", stateDir);
|
|
2415
|
+
}
|
|
2416
|
+
for (const entry of taskFiles) {
|
|
2417
|
+
const idFromFile = /^task-(\d+)\.json$/.exec(entry)?.[1];
|
|
2418
|
+
if (!idFromFile)
|
|
2419
|
+
continue;
|
|
2420
|
+
const taskPath = join(tasksDir, entry);
|
|
2421
|
+
const info = await lstat(taskPath).catch(() => null);
|
|
2422
|
+
const task = info?.isFile() && !info.isSymbolicLink() ? await readJsonIfExists(taskPath) : null;
|
|
2423
|
+
if (!task || Array.isArray(task) || safeString(task.id) !== idFromFile || !TEAM_TASK_STATUSES.includes(task.status)) {
|
|
2424
|
+
return blockWorkerStop(`unreadable_task_${idFromFile}`, `task ${idFromFile} has no trustworthy task state`, stateDir);
|
|
2425
|
+
}
|
|
2426
|
+
const taskOwner = safeString(task.owner).trim();
|
|
2427
|
+
const taskClaimOwner = safeString(safeObject(task.claim).owner).trim();
|
|
2428
|
+
if (taskOwner === workerContext.workerName || taskClaimOwner === workerContext.workerName) {
|
|
2429
|
+
candidateTaskIds.add(idFromFile);
|
|
2416
2430
|
}
|
|
2417
2431
|
}
|
|
2418
2432
|
if (candidateTaskIds.size === 0) {
|