oh-my-codex 0.22.4 → 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/crates/omx-api/src/lib.rs +7 -2
- package/crates/omx-api/tests/cli.rs +58 -0
- package/dist/cli/__tests__/cleanup.test.js +58 -73
- package/dist/cli/__tests__/cleanup.test.js.map +1 -1
- 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__/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 +8 -4
- package/dist/cli/index.js.map +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/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/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/__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/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/subagents/tracker.d.ts.map +1 -1
- package/dist/subagents/tracker.js +12 -2
- package/dist/subagents/tracker.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/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
- package/src/scripts/notify-hook/team-dispatch.ts +133 -125
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-lock.d.ts","sourceRoot":"","sources":["../../../src/team/state/dispatch-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dispatch-lock.d.ts","sourceRoot":"","sources":["../../../src/team/state/dispatch-lock.ts"],"names":[],"mappings":"AAaA,wBAAgB,4BAA4B,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAMzF;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,EAClD,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,EAC1D,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAsDZ"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync } from 'fs';
|
|
2
|
-
import { mkdir, readFile, rm,
|
|
2
|
+
import { mkdir, readFile, rm, writeFile } from 'fs/promises';
|
|
3
3
|
import { dirname, join } from 'path';
|
|
4
|
+
import { assertTeamLockNotStale } from './locks.js';
|
|
4
5
|
const OMX_DISPATCH_LOCK_TIMEOUT_ENV = 'OMX_DISPATCH_LOCK_TIMEOUT_MS';
|
|
5
6
|
const DEFAULT_DISPATCH_LOCK_TIMEOUT_MS = 15_000;
|
|
6
7
|
const MIN_DISPATCH_LOCK_TIMEOUT_MS = 1_000;
|
|
@@ -44,16 +45,7 @@ export async function withDispatchLock(teamName, cwd, teamDir, dispatchLockDir,
|
|
|
44
45
|
const err = error;
|
|
45
46
|
if (err.code !== 'EEXIST')
|
|
46
47
|
throw error;
|
|
47
|
-
|
|
48
|
-
const info = await stat(lockDir);
|
|
49
|
-
if (Date.now() - info.mtimeMs > LOCK_STALE_MS) {
|
|
50
|
-
await rm(lockDir, { recursive: true, force: true });
|
|
51
|
-
continue;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
catch {
|
|
55
|
-
// best effort
|
|
56
|
-
}
|
|
48
|
+
await assertTeamLockNotStale(lockDir, LOCK_STALE_MS);
|
|
57
49
|
if (Date.now() > deadline) {
|
|
58
50
|
throw new Error(`Timed out acquiring dispatch lock for ${teamName} after ${timeoutMs}ms. ` +
|
|
59
51
|
`Set ${OMX_DISPATCH_LOCK_TIMEOUT_ENV} to increase (current: ${timeoutMs}ms, max: ${MAX_DISPATCH_LOCK_TIMEOUT_MS}ms).`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-lock.js","sourceRoot":"","sources":["../../../src/team/state/dispatch-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"dispatch-lock.js","sourceRoot":"","sources":["../../../src/team/state/dispatch-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ interface TeamPathDeps {
|
|
|
3
3
|
taskClaimLockDir: (teamName: string, taskId: string, cwd: string) => string;
|
|
4
4
|
mailboxLockDir: (teamName: string, workerName: string, cwd: string) => string;
|
|
5
5
|
}
|
|
6
|
+
export declare function assertTeamLockNotStale(lockDir: string, lockStaleMs: number): Promise<void>;
|
|
6
7
|
export declare function withScalingLock<T>(teamName: string, cwd: string, lockStaleMs: number, deps: TeamPathDeps, fn: () => Promise<T>): Promise<T>;
|
|
7
8
|
export declare function withTeamLock<T>(teamName: string, cwd: string, lockStaleMs: number, deps: TeamPathDeps, fn: () => Promise<T>): Promise<T>;
|
|
8
9
|
export declare function withTaskClaimLock<T>(teamName: string, taskId: string, cwd: string, lockStaleMs: number, deps: TeamPathDeps, fn: () => Promise<T>): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../../../src/team/state/locks.ts"],"names":[],"mappings":"AAIA,UAAU,YAAY;IACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5E,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/E;
|
|
1
|
+
{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../../../src/team/state/locks.ts"],"names":[],"mappings":"AAIA,UAAU,YAAY;IACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5E,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/E;AAkDD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAehG;AAMD,wBAAsB,eAAe,CAAC,CAAC,EACrC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CA0CZ;AAED,wBAAsB,YAAY,CAAC,CAAC,EAClC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CA0CZ;AAED,wBAAsB,iBAAiB,CAAC,CAAC,EACvC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC,CAmCjD;AAED,wBAAsB,eAAe,CAAC,CAAC,EACrC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CA0CZ"}
|
package/dist/team/state/locks.js
CHANGED
|
@@ -51,11 +51,31 @@ function startLockLeaseHeartbeat(lockDir, ownerPath, ownerToken, lockStaleMs) {
|
|
|
51
51
|
function lockOwnerToken() {
|
|
52
52
|
return `${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}`;
|
|
53
53
|
}
|
|
54
|
-
async function
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
54
|
+
export async function assertTeamLockNotStale(lockDir, lockStaleMs) {
|
|
55
|
+
const info = await stat(lockDir).catch(() => null);
|
|
56
|
+
if (!info)
|
|
57
|
+
return;
|
|
58
|
+
const ownerPath = join(lockDir, 'owner');
|
|
59
|
+
const token = await readFile(ownerPath, 'utf8').catch(() => '');
|
|
60
|
+
const pid = Number(/^(\d+)\./.exec(token.trim())?.[1]);
|
|
61
|
+
if (Number.isSafeInteger(pid) && pid > 0) {
|
|
62
|
+
try {
|
|
63
|
+
process.kill(pid, 0);
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
if (error.code !== 'ESRCH')
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
else if (!await isStaleLock(lockDir, lockStaleMs))
|
|
72
|
+
return;
|
|
73
|
+
const currentToken = await readFile(ownerPath, 'utf8').catch(() => '');
|
|
74
|
+
const currentInfo = await stat(lockDir).catch(() => null);
|
|
75
|
+
if (currentToken !== token || currentInfo?.dev !== info.dev || currentInfo?.ino !== info.ino)
|
|
76
|
+
return;
|
|
77
|
+
// shortcut: crashed/unknown owners require manual recovery; auto-reclaim needs an OS lock or owner-fenced compare-and-delete.
|
|
78
|
+
throw new Error(`team_lock_recovery_required:${lockDir}: stale lock requires manual recovery. Confirm no operation is using it before removing the directory.`);
|
|
59
79
|
}
|
|
60
80
|
async function sleep(ms) {
|
|
61
81
|
await new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -84,8 +104,7 @@ export async function withScalingLock(teamName, cwd, lockStaleMs, deps, fn) {
|
|
|
84
104
|
const err = error;
|
|
85
105
|
if (err.code !== 'EEXIST')
|
|
86
106
|
throw error;
|
|
87
|
-
|
|
88
|
-
continue;
|
|
107
|
+
await assertTeamLockNotStale(lockDir, lockStaleMs);
|
|
89
108
|
if (Date.now() > deadline) {
|
|
90
109
|
throw new Error(`Timed out acquiring scaling lock for team ${teamName}`);
|
|
91
110
|
}
|
|
@@ -132,8 +151,7 @@ export async function withTeamLock(teamName, cwd, lockStaleMs, deps, fn) {
|
|
|
132
151
|
const err = error;
|
|
133
152
|
if (err.code !== 'EEXIST')
|
|
134
153
|
throw error;
|
|
135
|
-
|
|
136
|
-
continue;
|
|
154
|
+
await assertTeamLockNotStale(lockDir, lockStaleMs);
|
|
137
155
|
if (Date.now() > deadline) {
|
|
138
156
|
throw new Error(`Timed out acquiring team task lock for ${teamName}`);
|
|
139
157
|
}
|
|
@@ -170,8 +188,7 @@ export async function withTaskClaimLock(teamName, taskId, cwd, lockStaleMs, deps
|
|
|
170
188
|
const err = error;
|
|
171
189
|
if (err.code !== 'EEXIST')
|
|
172
190
|
throw error;
|
|
173
|
-
|
|
174
|
-
continue;
|
|
191
|
+
await assertTeamLockNotStale(lockDir, lockStaleMs);
|
|
175
192
|
if (Date.now() > deadline)
|
|
176
193
|
return { ok: false };
|
|
177
194
|
await sleep(LOCK_OWNER_RETRY_MS);
|
|
@@ -224,8 +241,7 @@ export async function withMailboxLock(teamName, workerName, cwd, lockStaleMs, de
|
|
|
224
241
|
const err = error;
|
|
225
242
|
if (err.code !== 'EEXIST')
|
|
226
243
|
throw error;
|
|
227
|
-
|
|
228
|
-
continue;
|
|
244
|
+
await assertTeamLockNotStale(lockDir, lockStaleMs);
|
|
229
245
|
if (Date.now() > deadline) {
|
|
230
246
|
throw new Error(`Timed out acquiring mailbox lock for ${teamName}/${workerName}`);
|
|
231
247
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locks.js","sourceRoot":"","sources":["../../../src/team/state/locks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQrC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,KAAK,UAAU,WAAW,CAAC,OAAe,EAAE,WAAmB;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACjD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,KAA8B,CAAC;QAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAe,EAAE,SAAiB,EAAE,UAAkB,EAAE,WAAmB;IAC1G,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;QACxC,IAAI,UAAU;YAAE,OAAO;QACvB,UAAU,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,UAAU;gBAAE,OAAO;YACxC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;gBAAS,CAAC;YACT,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAClE,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,cAAc;IACrB,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"locks.js","sourceRoot":"","sources":["../../../src/team/state/locks.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,6 +92,7 @@ describe('VSCode direct session API', () => {
|
|
|
92
92
|
assert.equal(handle.pid, 12345);
|
|
93
93
|
assert.equal(handle.stop(), true);
|
|
94
94
|
child.emit('exit', 0, null);
|
|
95
|
+
child.emit('close', 0, null);
|
|
95
96
|
await log.waitForCompletion();
|
|
96
97
|
});
|
|
97
98
|
});
|
|
@@ -130,6 +131,7 @@ describe('VSCode direct session API', () => {
|
|
|
130
131
|
assert.equal(capturedOptions?.windowsVerbatimArguments, true);
|
|
131
132
|
assert.equal(handle.command, capturedCommand);
|
|
132
133
|
child.emit('exit', 0, null);
|
|
134
|
+
child.emit('close', 0, null);
|
|
133
135
|
await log.waitForCompletion();
|
|
134
136
|
});
|
|
135
137
|
});
|
|
@@ -151,6 +153,7 @@ describe('VSCode direct session API', () => {
|
|
|
151
153
|
child.stdout?.emit('data', 'Authorization: Bearer sk-live-token\n');
|
|
152
154
|
child.stderr?.emit('data', 'access_token=plain-secret\n');
|
|
153
155
|
child.emit('exit', 0, null);
|
|
156
|
+
child.emit('close', 0, null);
|
|
154
157
|
const contents = await log.read(logPath);
|
|
155
158
|
assert.doesNotMatch(contents, /sk-live-token/);
|
|
156
159
|
assert.doesNotMatch(contents, /plain-secret/);
|
|
@@ -158,6 +161,23 @@ describe('VSCode direct session API', () => {
|
|
|
158
161
|
assert.match(contents, /exited code=0 signal=null/);
|
|
159
162
|
});
|
|
160
163
|
});
|
|
164
|
+
it('redacts credentials split across independent stdout and stderr chunks and flushes final records', async () => {
|
|
165
|
+
await withTempDir(async (cwd) => {
|
|
166
|
+
const child = fakeChildProcess();
|
|
167
|
+
const log = captureSessionLog();
|
|
168
|
+
const handle = launchDirectSession({ cwd }, { spawn: () => child, createWriteStream: log.createWriteStream });
|
|
169
|
+
child.stdout?.emit('data', Buffer.from('{"access_'));
|
|
170
|
+
child.stderr?.emit('data', Buffer.from('refresh_'));
|
|
171
|
+
child.stdout?.emit('data', Buffer.from('token":"split-access-secret"}\nnormal output\n'));
|
|
172
|
+
child.emit('exit', 0, null);
|
|
173
|
+
child.stderr?.emit('data', Buffer.from('token=split-refresh-secret'));
|
|
174
|
+
child.emit('close', 0, null);
|
|
175
|
+
const contents = await log.read(handle.log_path);
|
|
176
|
+
assert.doesNotMatch(contents, /split-access-secret|split-refresh-secret/);
|
|
177
|
+
assert.match(contents, /normal output/);
|
|
178
|
+
assert.match(contents, /REDACTED/);
|
|
179
|
+
});
|
|
180
|
+
});
|
|
161
181
|
it('waits for delayed log writes before reading redacted session output', { timeout: 5_000 }, async () => {
|
|
162
182
|
await withTempDir(async (cwd) => {
|
|
163
183
|
const child = fakeChildProcess();
|
|
@@ -187,6 +207,7 @@ describe('VSCode direct session API', () => {
|
|
|
187
207
|
child.stdout?.emit('data', 'Authorization: Bearer sk-delayed-token\n');
|
|
188
208
|
child.stderr?.emit('data', 'access_token=delayed-secret\n');
|
|
189
209
|
child.emit('exit', 0, null);
|
|
210
|
+
child.emit('close', 0, null);
|
|
190
211
|
let readCompleted = false;
|
|
191
212
|
const pendingRead = log.read(logPath).then((contents) => {
|
|
192
213
|
readCompleted = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/vscode/__tests__/index.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/vscode/__tests__/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"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"}
|
package/dist/vscode/index.js
CHANGED
|
@@ -3,7 +3,7 @@ import { randomBytes } from 'node:crypto';
|
|
|
3
3
|
import { createWriteStream, mkdirSync } from 'node:fs';
|
|
4
4
|
import { homedir } from 'node:os';
|
|
5
5
|
import { delimiter, dirname, isAbsolute, join, resolve } from 'node:path';
|
|
6
|
-
import { redactAuthSecrets } from '../auth/redact.js';
|
|
6
|
+
import { createAuthStderrRedactor, redactAuthSecrets } from '../auth/redact.js';
|
|
7
7
|
import { CODEX_BYPASS_FLAG, MADMAX_FLAG, MADMAX_SPARK_FLAG } from '../cli/constants.js';
|
|
8
8
|
import { resolveCommandPathForPlatform, spawnPlatformCommand, spawnPlatformCommandSync, } from '../utils/platform-command.js';
|
|
9
9
|
export const DIRECT_SESSION_SCHEMA_VERSION = 'omx.vscode/direct-session/v1';
|
|
@@ -152,12 +152,16 @@ export function launchDirectSession(options, deps = {}) {
|
|
|
152
152
|
const child = launched.child;
|
|
153
153
|
const startedAt = now.toISOString();
|
|
154
154
|
writeLog(logStream, `[${startedAt}] $ ${launched.spec.command} ${launched.spec.args.join(' ')}\n`);
|
|
155
|
-
|
|
156
|
-
|
|
155
|
+
const stdoutRedactor = createAuthStderrRedactor((text) => writeLog(logStream, text));
|
|
156
|
+
const stderrRedactor = createAuthStderrRedactor((text) => writeLog(logStream, text));
|
|
157
|
+
child.stdout?.on('data', (chunk) => stdoutRedactor.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
|
|
158
|
+
child.stderr?.on('data', (chunk) => stderrRedactor.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
|
|
157
159
|
child.on('error', (error) => {
|
|
158
160
|
writeLog(logStream, `\n[${new Date().toISOString()}] launch error: ${redactOmxLogLine(error)}\n`);
|
|
159
161
|
});
|
|
160
|
-
child.on('
|
|
162
|
+
child.on('close', (code, signal) => {
|
|
163
|
+
stdoutRedactor.end();
|
|
164
|
+
stderrRedactor.end();
|
|
161
165
|
writeLog(logStream, `\n[${new Date().toISOString()}] exited code=${code ?? 'null'} signal=${signal ?? 'null'}\n`);
|
|
162
166
|
logStream.end();
|
|
163
167
|
});
|
package/dist/vscode/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,77 @@
|
|
|
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
|
+
|
|
11
|
+
async function withWorker(check: (cwd: string, tasks: string) => Promise<void>): Promise<void> {
|
|
12
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-worker-stop-read-'));
|
|
13
|
+
const keys = ['OMX_TEAM_INTERNAL_WORKER', 'OMX_TEAM_WORKER', 'OMX_TEAM_STATE_ROOT'] as const;
|
|
14
|
+
const previous = keys.map((key) => process.env[key]);
|
|
15
|
+
try {
|
|
16
|
+
process.env.OMX_TEAM_STATE_ROOT = join(cwd, '.omx/state');
|
|
17
|
+
await initTeamState('audit', 'audit', 'executor', 1, cwd);
|
|
18
|
+
process.env.OMX_TEAM_INTERNAL_WORKER = 'audit/worker-1';
|
|
19
|
+
process.env.OMX_TEAM_WORKER = 'audit/worker-1';
|
|
20
|
+
const root = join(cwd, '.omx/state/team/audit');
|
|
21
|
+
await writeFile(join(root, 'workers/worker-1/identity.json'), JSON.stringify({ name: 'worker-1', assigned_tasks: ['1'] }));
|
|
22
|
+
await writeFile(join(root, 'workers/worker-1/status.json'), JSON.stringify({ state: 'idle', current_task_id: '1' }));
|
|
23
|
+
await writeFile(join(root, 'tasks/task-1.json'), JSON.stringify({ id: '1', owner: 'worker-1', status: 'completed' }));
|
|
24
|
+
await check(cwd, join(root, 'tasks'));
|
|
25
|
+
} finally {
|
|
26
|
+
keys.forEach((key, index) => {
|
|
27
|
+
if (previous[index] === undefined) delete process.env[key];
|
|
28
|
+
else process.env[key] = previous[index];
|
|
29
|
+
});
|
|
30
|
+
await rm(cwd, { recursive: true, force: true });
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
async function stop(cwd: string) {
|
|
35
|
+
return (await dispatchCodexNativeHook({ hook_event_name: 'Stop', cwd, session_id: 'worker-stop-audit' }, { cwd })).outputJson;
|
|
36
|
+
}
|
|
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
|
+
|
|
51
|
+
it('fails closed when task enumeration fails despite a readable completed assignment', {
|
|
52
|
+
skip: process.platform === 'win32' || process.getuid?.() === 0,
|
|
53
|
+
}, async () => {
|
|
54
|
+
await withWorker(async (cwd, tasks) => {
|
|
55
|
+
await chmod(tasks, 0o111);
|
|
56
|
+
try {
|
|
57
|
+
assert.equal((await stop(cwd))?.decision, 'block');
|
|
58
|
+
} finally {
|
|
59
|
+
await chmod(tasks, 0o700);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
it('still allows Stop when all recorded worker tasks are readable and completed', async () => {
|
|
65
|
+
await withWorker(async (cwd) => assert.equal(await stop(cwd), null));
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('returns a blocking decision through the real native hook CLI for corrupt task JSON', async () => {
|
|
69
|
+
await withWorker(async (cwd, tasks) => {
|
|
70
|
+
await writeFile(join(tasks, 'task-2.json'), '{invalid');
|
|
71
|
+
const output = execFileSync(process.execPath, [fileURLToPath(new URL('../codex-native-hook.js', import.meta.url))], {
|
|
72
|
+
cwd, input: JSON.stringify({ hook_event_name: 'Stop', cwd, session_id: 'worker-stop-cli-audit' }),
|
|
73
|
+
encoding: 'utf8', timeout: 10_000,
|
|
74
|
+
});
|
|
75
|
+
assert.equal(JSON.parse(output).decision, 'block');
|
|
76
|
+
});
|
|
77
|
+
});
|
|
@@ -87,6 +87,7 @@ import {
|
|
|
87
87
|
writeTeamLeaderAttention,
|
|
88
88
|
writeTeamPhase,
|
|
89
89
|
} from "../team/state.js";
|
|
90
|
+
import { TEAM_TASK_STATUSES } from "../team/contracts.js";
|
|
90
91
|
import { parseTeamNoticeLedgerPrompt, reconcileTeamNoticeLedger } from "../team/notice-ledger.js";
|
|
91
92
|
import {
|
|
92
93
|
canonicalizeComparablePath,
|
|
@@ -3011,17 +3012,30 @@ async function resolveTeamWorkerStopDecision(
|
|
|
3011
3012
|
}
|
|
3012
3013
|
|
|
3013
3014
|
const tasksDir = join(stateDir, "team", workerContext.teamName, "tasks");
|
|
3014
|
-
|
|
3015
|
-
|
|
3016
|
-
|
|
3017
|
-
|
|
3018
|
-
|
|
3019
|
-
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
|
|
3023
|
-
|
|
3024
|
-
|
|
3015
|
+
let taskFiles: string[];
|
|
3016
|
+
try {
|
|
3017
|
+
const info = await lstat(tasksDir);
|
|
3018
|
+
if (!info.isDirectory() || info.isSymbolicLink()) throw new Error("not_regular_directory");
|
|
3019
|
+
taskFiles = await readdir(tasksDir);
|
|
3020
|
+
} catch (error) {
|
|
3021
|
+
if ((error as NodeJS.ErrnoException).code === 'ENOENT' && candidateTaskIds.size === 0) {
|
|
3022
|
+
return blockWorkerStop("missing_task_assignment", "no current_task_id or assigned_tasks are recorded", stateDir);
|
|
3023
|
+
}
|
|
3024
|
+
return blockWorkerStop("unreadable_tasks", "task directory cannot be enumerated safely", stateDir);
|
|
3025
|
+
}
|
|
3026
|
+
for (const entry of taskFiles) {
|
|
3027
|
+
const idFromFile = /^task-(\d+)\.json$/.exec(entry)?.[1];
|
|
3028
|
+
if (!idFromFile) continue;
|
|
3029
|
+
const taskPath = join(tasksDir, entry);
|
|
3030
|
+
const info = await lstat(taskPath).catch(() => null);
|
|
3031
|
+
const task = info?.isFile() && !info.isSymbolicLink() ? await readJsonIfExists(taskPath) : null;
|
|
3032
|
+
if (!task || Array.isArray(task) || safeString(task.id) !== idFromFile || !(TEAM_TASK_STATUSES as readonly unknown[]).includes(task.status)) {
|
|
3033
|
+
return blockWorkerStop(`unreadable_task_${idFromFile}`, `task ${idFromFile} has no trustworthy task state`, stateDir);
|
|
3034
|
+
}
|
|
3035
|
+
const taskOwner = safeString(task.owner).trim();
|
|
3036
|
+
const taskClaimOwner = safeString(safeObject(task.claim).owner).trim();
|
|
3037
|
+
if (taskOwner === workerContext.workerName || taskClaimOwner === workerContext.workerName) {
|
|
3038
|
+
candidateTaskIds.add(idFromFile);
|
|
3025
3039
|
}
|
|
3026
3040
|
}
|
|
3027
3041
|
|