oh-my-codex 0.21.13 → 0.21.15
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/README.md +17 -0
- package/dist/adapt/herdr/__tests__/wiring.test.js +21 -0
- package/dist/adapt/herdr/__tests__/wiring.test.js.map +1 -1
- package/dist/adapt/herdr/wiring.d.ts.map +1 -1
- package/dist/adapt/herdr/wiring.js +5 -0
- package/dist/adapt/herdr/wiring.js.map +1 -1
- package/dist/auth/__tests__/hotswap.test.js +28 -0
- package/dist/auth/__tests__/hotswap.test.js.map +1 -1
- package/dist/auth/hotswap.d.ts +1 -0
- package/dist/auth/hotswap.d.ts.map +1 -1
- package/dist/auth/hotswap.js +4 -1
- package/dist/auth/hotswap.js.map +1 -1
- package/dist/cli/__tests__/codex-plugin-layout.test.js +196 -0
- package/dist/cli/__tests__/codex-plugin-layout.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js +2 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +14 -1
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/session-timeline.test.d.ts +2 -0
- package/dist/cli/__tests__/session-timeline.test.d.ts.map +1 -0
- package/dist/cli/__tests__/session-timeline.test.js +155 -0
- package/dist/cli/__tests__/session-timeline.test.js.map +1 -0
- package/dist/cli/__tests__/setup-hooks-shared-ownership.test.js +1 -0
- package/dist/cli/__tests__/setup-hooks-shared-ownership.test.js.map +1 -1
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +1 -0
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/index.d.ts +1 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +11 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/session-search.d.ts.map +1 -1
- package/dist/cli/session-search.js +7 -0
- package/dist/cli/session-search.js.map +1 -1
- package/dist/cli/session-timeline.d.ts +9 -0
- package/dist/cli/session-timeline.d.ts.map +1 -0
- package/dist/cli/session-timeline.js +174 -0
- package/dist/cli/session-timeline.js.map +1 -0
- package/dist/config/__tests__/codex-hooks.test.js +3 -1
- package/dist/config/__tests__/codex-hooks.test.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +1 -0
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/codex-hooks.d.ts +1 -1
- package/dist/config/codex-hooks.d.ts.map +1 -1
- package/dist/config/codex-hooks.js +5 -0
- package/dist/config/codex-hooks.js.map +1 -1
- package/dist/evals/astra-defaults/__tests__/collector.test.js +51 -23
- package/dist/evals/astra-defaults/__tests__/collector.test.js.map +1 -1
- package/dist/evals/astra-defaults/collector.d.ts +2 -0
- package/dist/evals/astra-defaults/collector.d.ts.map +1 -1
- package/dist/evals/astra-defaults/collector.js +19 -8
- package/dist/evals/astra-defaults/collector.js.map +1 -1
- package/dist/hooks/extensibility/__tests__/dispatcher.test.js +143 -0
- package/dist/hooks/extensibility/__tests__/dispatcher.test.js.map +1 -1
- package/dist/hooks/extensibility/dispatcher.d.ts.map +1 -1
- package/dist/hooks/extensibility/dispatcher.js +120 -28
- package/dist/hooks/extensibility/dispatcher.js.map +1 -1
- package/dist/hooks/extensibility/runtime.d.ts.map +1 -1
- package/dist/hooks/extensibility/runtime.js +1 -0
- package/dist/hooks/extensibility/runtime.js.map +1 -1
- package/dist/hooks/extensibility/types.d.ts +2 -0
- package/dist/hooks/extensibility/types.d.ts.map +1 -1
- package/dist/hooks/native/types.d.ts +1 -1
- package/dist/hooks/native/types.d.ts.map +1 -1
- package/dist/hooks/native/types.js.map +1 -1
- package/dist/notifications/__tests__/lifecycle-dedupe.test.js +200 -2
- package/dist/notifications/__tests__/lifecycle-dedupe.test.js.map +1 -1
- package/dist/notifications/lifecycle-dedupe.d.ts +10 -0
- package/dist/notifications/lifecycle-dedupe.d.ts.map +1 -1
- package/dist/notifications/lifecycle-dedupe.js +175 -19
- package/dist/notifications/lifecycle-dedupe.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +278 -6
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/native-hook-protocol.test.d.ts +2 -0
- package/dist/scripts/__tests__/native-hook-protocol.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/native-hook-protocol.test.js +329 -0
- package/dist/scripts/__tests__/native-hook-protocol.test.js.map +1 -0
- package/dist/scripts/__tests__/smoke-packed-install.test.js +7 -6
- package/dist/scripts/__tests__/smoke-packed-install.test.js.map +1 -1
- package/dist/scripts/codex-execution-surface.d.ts +1 -1
- package/dist/scripts/codex-execution-surface.d.ts.map +1 -1
- package/dist/scripts/codex-execution-surface.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts +1 -1
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +124 -13
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/hook-payload-guard.d.ts +1 -1
- package/dist/scripts/hook-payload-guard.d.ts.map +1 -1
- package/dist/scripts/hook-payload-guard.js +1 -0
- package/dist/scripts/hook-payload-guard.js.map +1 -1
- package/dist/scripts/smoke-packed-install.d.ts +2 -2
- package/dist/scripts/smoke-packed-install.d.ts.map +1 -1
- package/dist/scripts/smoke-packed-install.js +12 -1
- package/dist/scripts/smoke-packed-install.js.map +1 -1
- package/dist/session-history/__tests__/timeline.test.d.ts +2 -0
- package/dist/session-history/__tests__/timeline.test.d.ts.map +1 -0
- package/dist/session-history/__tests__/timeline.test.js +459 -0
- package/dist/session-history/__tests__/timeline.test.js.map +1 -0
- package/dist/session-history/export.d.ts +2 -3
- package/dist/session-history/export.d.ts.map +1 -1
- package/dist/session-history/export.js +5 -66
- package/dist/session-history/export.js.map +1 -1
- package/dist/session-history/timeline.d.ts +97 -0
- package/dist/session-history/timeline.d.ts.map +1 -0
- package/dist/session-history/timeline.js +325 -0
- package/dist/session-history/timeline.js.map +1 -0
- package/dist/session-history/transcript.d.ts +16 -0
- package/dist/session-history/transcript.d.ts.map +1 -0
- package/dist/session-history/transcript.js +111 -0
- package/dist/session-history/transcript.js.map +1 -0
- package/dist/subagents/tracker.d.ts +6 -0
- package/dist/subagents/tracker.d.ts.map +1 -1
- package/dist/subagents/tracker.js +32 -0
- package/dist/subagents/tracker.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +12 -3
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/scaling.test.js +25 -0
- package/dist/team/__tests__/scaling.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +30 -0
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +9 -1
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/wiki/__tests__/session-hooks.test.js +26 -0
- package/dist/wiki/__tests__/session-hooks.test.js.map +1 -1
- package/dist/wiki/lifecycle.d.ts.map +1 -1
- package/dist/wiki/lifecycle.js +6 -1
- package/dist/wiki/lifecycle.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +85 -18
- package/plugins/oh-my-codex/hooks/hooks.json +10 -0
- package/src/scripts/__tests__/codex-native-hook.test.ts +273 -5
- package/src/scripts/__tests__/native-hook-protocol.test.ts +362 -0
- package/src/scripts/__tests__/smoke-packed-install.test.ts +7 -6
- package/src/scripts/codex-execution-surface.ts +1 -0
- package/src/scripts/codex-native-hook.ts +130 -11
- package/src/scripts/hook-payload-guard.ts +1 -0
- package/src/scripts/smoke-packed-install.ts +12 -1
package/Cargo.lock
CHANGED
|
@@ -32,7 +32,7 @@ checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
|
|
|
32
32
|
|
|
33
33
|
[[package]]
|
|
34
34
|
name = "omx-api"
|
|
35
|
-
version = "0.21.
|
|
35
|
+
version = "0.21.15"
|
|
36
36
|
dependencies = [
|
|
37
37
|
"serde",
|
|
38
38
|
"serde_json",
|
|
@@ -40,14 +40,14 @@ dependencies = [
|
|
|
40
40
|
|
|
41
41
|
[[package]]
|
|
42
42
|
name = "omx-explore-harness"
|
|
43
|
-
version = "0.21.
|
|
43
|
+
version = "0.21.15"
|
|
44
44
|
dependencies = [
|
|
45
45
|
"libc",
|
|
46
46
|
]
|
|
47
47
|
|
|
48
48
|
[[package]]
|
|
49
49
|
name = "omx-mux"
|
|
50
|
-
version = "0.21.
|
|
50
|
+
version = "0.21.15"
|
|
51
51
|
dependencies = [
|
|
52
52
|
"serde",
|
|
53
53
|
"serde_json",
|
|
@@ -55,7 +55,7 @@ dependencies = [
|
|
|
55
55
|
|
|
56
56
|
[[package]]
|
|
57
57
|
name = "omx-runtime"
|
|
58
|
-
version = "0.21.
|
|
58
|
+
version = "0.21.15"
|
|
59
59
|
dependencies = [
|
|
60
60
|
"fs2",
|
|
61
61
|
"libc",
|
|
@@ -67,7 +67,7 @@ dependencies = [
|
|
|
67
67
|
|
|
68
68
|
[[package]]
|
|
69
69
|
name = "omx-runtime-core"
|
|
70
|
-
version = "0.21.
|
|
70
|
+
version = "0.21.15"
|
|
71
71
|
dependencies = [
|
|
72
72
|
"fs2",
|
|
73
73
|
"serde",
|
|
@@ -76,7 +76,7 @@ dependencies = [
|
|
|
76
76
|
|
|
77
77
|
[[package]]
|
|
78
78
|
name = "omx-sparkshell"
|
|
79
|
-
version = "0.21.
|
|
79
|
+
version = "0.21.15"
|
|
80
80
|
dependencies = [
|
|
81
81
|
"omx-mux",
|
|
82
82
|
]
|
package/Cargo.toml
CHANGED
package/README.md
CHANGED
|
@@ -377,6 +377,23 @@ include earlier work, so this is not a period consumption or billing report.
|
|
|
377
377
|
Cached input and reasoning output are subsets of input and output. See
|
|
378
378
|
[session usage](./docs/session-usage.md) for snapshot and coverage semantics.
|
|
379
379
|
|
|
380
|
+
### Diagnose a session's execution timeline
|
|
381
|
+
|
|
382
|
+
Run `omx session timeline <session-id>` to inspect tool calls, turn boundaries,
|
|
383
|
+
and context compactions without exporting conversation text. Calls are paired
|
|
384
|
+
with their results by call ID, including parallel calls, and the report shows
|
|
385
|
+
explicit failures, unmatched calls, observed durations, and namespace-aware
|
|
386
|
+
per-tool totals.
|
|
387
|
+
Use `--kind tools --sort duration --limit 10` to find slow calls, `--status failed`
|
|
388
|
+
to inspect failures, or `--tool <name>` to focus on one tool. Filters and pagination
|
|
389
|
+
affect the event list; summary counts always cover the whole session.
|
|
390
|
+
|
|
391
|
+
The command supports exact IDs or unique prefixes, active and archived sessions,
|
|
392
|
+
`--codex-home <path>`, and JSON reports with `--json --output timeline.json`.
|
|
393
|
+
Unknown durations remain unknown, and a recorded result without an explicit error
|
|
394
|
+
does not prove success. See [session timeline](./docs/session-timeline.md) for
|
|
395
|
+
supported records, status meanings, and examples.
|
|
396
|
+
|
|
380
397
|
### Team runtime
|
|
381
398
|
|
|
382
399
|
Use the team runtime when you specifically need durable tmux/worktree coordination, not as the default way to begin using OMX. In Codex App or plain outside-tmux sessions, treat `omx team` as a tmux-runtime shell surface rather than a directly available in-app workflow; launch OMX CLI from shell first if you actually want team execution.
|
|
@@ -47,6 +47,27 @@ describe("reportHerdrLifecycleEvent", () => {
|
|
|
47
47
|
assert.equal(result.reason, "herdr-not-detected");
|
|
48
48
|
assert.equal(transport.calls.length, 0);
|
|
49
49
|
});
|
|
50
|
+
it("does not report child completion as a pane lifecycle transition", async () => {
|
|
51
|
+
const transport = new RecordingTransport();
|
|
52
|
+
for (const event of [
|
|
53
|
+
buildNativeHookEvent("subagent-stop"),
|
|
54
|
+
buildNativeHookEvent("stop", { is_subagent_stop: true }),
|
|
55
|
+
]) {
|
|
56
|
+
const result = await reportHerdrLifecycleEvent({
|
|
57
|
+
cwd: baseDir,
|
|
58
|
+
event,
|
|
59
|
+
bridgeOptions: {
|
|
60
|
+
env: enabledEnv,
|
|
61
|
+
transport,
|
|
62
|
+
seqFn: () => ++seq,
|
|
63
|
+
stateBaseDir: baseDir,
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
assert.equal(result.wired, false);
|
|
67
|
+
assert.equal(result.reason, "child-lifecycle-event");
|
|
68
|
+
}
|
|
69
|
+
assert.equal(transport.calls.length, 0);
|
|
70
|
+
});
|
|
50
71
|
it("reports a working transition for a working event", async () => {
|
|
51
72
|
const transport = new RecordingTransport();
|
|
52
73
|
const result = await reportHerdrLifecycleEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wiring.test.js","sourceRoot":"","sources":["../../../../src/adapt/herdr/__tests__/wiring.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wiring.test.js","sourceRoot":"","sources":["../../../../src/adapt/herdr/__tests__/wiring.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wiring.d.ts","sourceRoot":"","sources":["../../../src/adapt/herdr/wiring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGnE,MAAM,WAAW,gBAAgB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,iBAAiB,CAAC;IACzB,8DAA8D;IAC9D,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IACjC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"wiring.d.ts","sourceRoot":"","sources":["../../../src/adapt/herdr/wiring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGnE,MAAM,WAAW,gBAAgB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,iBAAiB,CAAC;IACzB,8DAA8D;IAC9D,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IACjC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,iBAAiB,CAAC,CAgD5B"}
|
|
@@ -9,6 +9,11 @@ import { detectHerdrEnv } from "./transport.js";
|
|
|
9
9
|
* is a complete no-op outside a Herdr pane.
|
|
10
10
|
*/
|
|
11
11
|
export async function reportHerdrLifecycleEvent(input) {
|
|
12
|
+
if (input.event.event === "subagent-stop"
|
|
13
|
+
|| (input.event.event === "stop" && input.event.context.is_subagent_stop === true)) {
|
|
14
|
+
// Herdr owns pane/session lifecycle, not child-agent completion state.
|
|
15
|
+
return { wired: false, reason: "child-lifecycle-event" };
|
|
16
|
+
}
|
|
12
17
|
const env = input.bridgeOptions?.env ?? detectHerdrEnv();
|
|
13
18
|
if (!env.enabled) {
|
|
14
19
|
return { wired: false, reason: "herdr-not-detected" };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wiring.js","sourceRoot":"","sources":["../../../src/adapt/herdr/wiring.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,EAA2B,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiBhD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC9C,KAAuB;IAEvB,MAAM,GAAG,GAAG,KAAK,CAAC,aAAa,EAAE,GAAG,IAAI,cAAc,EAAE,CAAC;IACzD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,CAAC;QACJ,qEAAqE;QACrE,gDAAgD;QAChD,IAAI,UAA+B,CAAC;QACpC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;YAC3C,UAAU,GAAG,uBAAuB,EAAE,CAAC;QACxC,CAAC;QAED,MAAM,SAAS,GACd,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ;YACzC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU;YACxB,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC;YAC9B,GAAG;YACH,SAAS;YACT,GAAG,KAAK,CAAC,aAAa;SACtB,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE;YACzD,QAAQ,EAAE,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC;SAC3C,CAAC,CAAC;QACH,OAAO;YACN,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,wBAAwB,EAAE,UAAU;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC1B,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,4CAA4C;QAC5C,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,uBAAuB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SACvF,CAAC;IACH,CAAC;AACF,CAAC;AAED,yFAAyF;AACzF,SAAS,oBAAoB,CAC5B,KAAwB;IAExB,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;IAC9B,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC"}
|
|
1
|
+
{"version":3,"file":"wiring.js","sourceRoot":"","sources":["../../../src/adapt/herdr/wiring.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ function lifecycle(overrides = {}) {
|
|
|
23
23
|
cleanupRuntimeCodexHome: async () => { },
|
|
24
24
|
normalizeCodexLaunchArgs: (args) => args,
|
|
25
25
|
injectModelInstructionsBypassArgs: (_cwd, args) => args,
|
|
26
|
+
buildStartupModelInstructionsEnv: () => ({ OMX_STARTUP_MODEL_INSTRUCTIONS_FILE: "" }),
|
|
26
27
|
sessionModelInstructionsPath: (cwd, sessionId) => join(cwd, `${sessionId}.md`),
|
|
27
28
|
resolveOmxRootForLaunch: () => undefined,
|
|
28
29
|
resolveNotifyTempContract: (args) => ({
|
|
@@ -45,6 +46,33 @@ async function writeAuthSlot(home, slot = "first") {
|
|
|
45
46
|
return slotPath;
|
|
46
47
|
}
|
|
47
48
|
describe("auth hotswap pointer abort lifecycle", () => {
|
|
49
|
+
it("passes the selected startup instructions hint to the Codex child", { skip: process.platform === "win32" }, async () => {
|
|
50
|
+
const home = await mkdtemp(join(tmpdir(), "omx-hotswap-startup-context-"));
|
|
51
|
+
let selected = "";
|
|
52
|
+
try {
|
|
53
|
+
await writeAuthSlot(home);
|
|
54
|
+
const bin = join(home, "bin");
|
|
55
|
+
const output = join(home, "startup-context.txt");
|
|
56
|
+
await mkdir(bin);
|
|
57
|
+
await writeFile(join(bin, "codex"), `#!${process.execPath}\nrequire('node:fs').writeFileSync(${JSON.stringify(output)}, process.env.OMX_STARTUP_MODEL_INSTRUCTIONS_FILE ?? '');\n`);
|
|
58
|
+
await chmod(join(bin, "codex"), 0o755);
|
|
59
|
+
const status = await runAuthHotswap({
|
|
60
|
+
cwd: home, home, env: { PATH: bin }, argv: [],
|
|
61
|
+
lifecycle: lifecycle({
|
|
62
|
+
buildStartupModelInstructionsEnv: (cwd, _args, sessionId) => {
|
|
63
|
+
selected = join(cwd, `${sessionId}.md`);
|
|
64
|
+
return { OMX_STARTUP_MODEL_INSTRUCTIONS_FILE: selected };
|
|
65
|
+
},
|
|
66
|
+
}),
|
|
67
|
+
});
|
|
68
|
+
assert.equal(status, 0);
|
|
69
|
+
assert.ok(selected);
|
|
70
|
+
assert.equal(await readFile(output, "utf8"), selected);
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
await rm(home, { recursive: true, force: true });
|
|
74
|
+
}
|
|
75
|
+
});
|
|
48
76
|
it("redacts OAuth fields split across child stderr chunks", { skip: process.platform === "win32" }, async (t) => {
|
|
49
77
|
const home = await mkdtemp(join(tmpdir(), "omx-hotswap-stderr-"));
|
|
50
78
|
let output = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hotswap.test.js","sourceRoot":"","sources":["../../../src/auth/__tests__/hotswap.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hotswap.test.js","sourceRoot":"","sources":["../../../src/auth/__tests__/hotswap.test.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/hotswap.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export interface HotswapLifecycle {
|
|
|
25
25
|
cleanupRuntimeCodexHome: (runtimeCodexHome?: string, projectCodexHome?: string) => Promise<void>;
|
|
26
26
|
normalizeCodexLaunchArgs: (args: string[]) => string[];
|
|
27
27
|
injectModelInstructionsBypassArgs: (cwd: string, args: string[], env: NodeJS.ProcessEnv, defaultFilePath?: string) => string[];
|
|
28
|
+
buildStartupModelInstructionsEnv: (cwd: string, args: string[], sessionId: string, env: NodeJS.ProcessEnv) => Record<string, string>;
|
|
28
29
|
sessionModelInstructionsPath: (cwd: string, sessionId: string) => string;
|
|
29
30
|
resolveOmxRootForLaunch: (cwd: string, env: NodeJS.ProcessEnv) => string | undefined;
|
|
30
31
|
resolveNotifyTempContract: (args: string[], env: NodeJS.ProcessEnv) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hotswap.d.ts","sourceRoot":"","sources":["../../src/auth/hotswap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hotswap.d.ts","sourceRoot":"","sources":["../../src/auth/hotswap.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/hotswap.js
CHANGED
|
@@ -203,7 +203,10 @@ export async function runAuthHotswap(options) {
|
|
|
203
203
|
for (let attempt = 0; attempt < plan.order.length; attempt++) {
|
|
204
204
|
const attemptArgs = lifecycle.injectModelInstructionsBypassArgs(cwd, resumeArgs ?? normalizedArgs, baseEnv, lifecycle.sessionModelInstructionsPath(cwd, sessionId));
|
|
205
205
|
process.stderr.write(`[omx auth] using slot ${currentSlot}\n`);
|
|
206
|
-
const result = await runCodexDirect(cwd, attemptArgs,
|
|
206
|
+
const result = await runCodexDirect(cwd, attemptArgs, {
|
|
207
|
+
...baseEnv,
|
|
208
|
+
...lifecycle.buildStartupModelInstructionsEnv(cwd, resumeArgs ?? normalizedArgs, sessionId, baseEnv),
|
|
209
|
+
});
|
|
207
210
|
if (result.status === 0)
|
|
208
211
|
return 0;
|
|
209
212
|
const authInvalid = isAuthInvalidationError(result.stderr);
|
package/dist/auth/hotswap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hotswap.js","sourceRoot":"","sources":["../../src/auth/hotswap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AA0DlE,MAAM,UAAU,eAAe,CAAC,IAAc;IAC5C,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC7E,OAAO;QACL,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC;QAC/C,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAc;IACjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC7E,OAAO;QACL,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,QAAQ,CAAC;QAClE,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,MAA0B;IACzD,OAAO,wFAAwF,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;AACrH,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,GAAW,EACX,IAAc,EACd,GAAsB;IAEtB,MAAM,IAAI,GAAG,wBAAwB,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC5E,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE;YAC3C,GAAG;YACH,GAAG;YACH,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC;YACrC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/D,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,CAAC,IAAI,EAAE,EAAE;YACjD,MAAM,IAAI,IAAI,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA4B,EAAE,EAAE;YACjD,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC,CAAC;YAC5E,CAAC;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,KAAK,CAAC,IAAI,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;YAClG,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YACnC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACf,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAID,MAAM,CAAC,MAAM,qCAAqC,GAAG,IAAI,GAAG,CAAsC;IAChG,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,oBAAoB,EAAE,QAAQ,CAAC;IAChC,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtB,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAClB,CAAC,IAAI,EAAE,UAAU,CAAC;IAClB,CAAC,SAAS,EAAE,UAAU,CAAC;IACvB,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,SAAS,EAAE,QAAQ,CAAC;IACrB,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,WAAW,EAAE,QAAQ,CAAC;IACvB,CAAC,IAAI,EAAE,QAAQ,CAAC;IAChB,CAAC,WAAW,EAAE,QAAQ,CAAC;IACvB,CAAC,WAAW,EAAE,QAAQ,CAAC;IACvB,CAAC,WAAW,EAAE,QAAQ,CAAC;IACvB,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtB,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IAC9B,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtB,CAAC,yBAAyB,EAAE,QAAQ,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,UAAU,6BAA6B,CAC3C,GAAW;IAEX,MAAM,UAAU,GAAG,qCAAqC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClE,IAAI,UAAU;QAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAEnE,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,qCAAqC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;YACzF,IAAI,WAAW;gBAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACtE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,qCAAqC,EAAE,CAAC;QACzE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9F,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,iCAAiC,GAAG,IAAI,GAAG,CAAC;IAChD,QAAQ;IACR,OAAO;IACP,2BAA2B;CAC5B,CAAC,CAAC;AAEH,MAAM,UAAU,iCAAiC,CAAC,YAAsB,EAAE,SAAiB;IACzF,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAClG,MAAM,MAAM,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrF,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,iCAAiC,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACzD,MAAM,WAAW,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,IAAI,WAAW,CAAC,QAAQ;gBAAE,SAAS;YACnC,IAAI,WAAW,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBAC1C,OAAO,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACxE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,CAAC;oBACnC,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;gBACrC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,CAAC;gBACnC,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAuB;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACzC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACpC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,SAAS,CAAC,yBAAyB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3E,MAAM,cAAc,GAAG,SAAS,CAAC,wBAAwB,CACvD,2BAA2B,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAC9D,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;QAC3F,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IAChF,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,GAAG,IAAI,SAAS,CAAC;IACnH,MAAM,YAAY,GAAG,GAAG,cAAc,YAAY,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpE,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;QAC3F,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,IAAI,UAAU,GAAoB,IAAI,CAAC;IACvC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,MAA0F,CAAC;IAC/F,IAAI,CAAC;QACH,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACvH,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS;gBAAE,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;YAC1E,iBAAiB,GAAG,IAAI,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,2BAA2B,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,cAAc,GAAG,IAAI,CAAC;gBACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAsB;YACjC,GAAG,GAAG;YACN,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3F,CAAC;QACF,MAAM,OAAO,GAAG,SAAS,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,IAAI,OAAO;YAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YAC7D,MAAM,WAAW,GAAG,SAAS,CAAC,iCAAiC,CAC7D,GAAG,EACH,UAAU,IAAI,cAAc,EAC5B,OAAO,EACP,SAAS,CAAC,4BAA4B,CAAC,GAAG,EAAE,SAAS,CAAC,CACvD,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,WAAW,IAAI,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC/D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;YAClC,MAAM,WAAW,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;YAC5G,IAAI,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC3B,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;YAC5B,CAAC;YAED,IAAI,KAAK;gBAAE,MAAM,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAClD,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,cAAc,MAAM,aAAa,WAAW,oEAAoE,WAAW,qBAAqB,CACjJ,CAAC;gBACF,OAAO,CAAC,CAAC;YACX,CAAC;YAED,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAC/D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClG,OAAO,CAAC,CAAC;YACX,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,yCAAyC,WAAW,sBAAsB,IAAI,0CAA0C,WAAW,qBAAqB,CACzJ,CAAC;gBACF,WAAW,GAAG,IAAI,CAAC;gBACnB,MAAM,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;gBAC/C,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,qBAAqB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;YACzF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;gBACtG,OAAO,CAAC,CAAC;YACX,CAAC;YACD,WAAW,GAAG,IAAI,CAAC;YACnB,MAAM,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;YAC/C,UAAU,GAAG,iCAAiC,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,WAAW,iBAAiB,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACjH,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,IAAI,iBAAiB,IAAI,CAAC,cAAc,IAAI,MAAM,EAAE,CAAC;YACnD,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,QAAQ,CAAC,+BAA+B,CAAC,CAAC;YACzI,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,uBAAuB,CAAC,QAAQ,CAAC,0BAA0B,EAAE,QAAQ,CAAC,+BAA+B,CAAC,CAAC;QACzH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,qBAAqB;YAAE,OAAO,CAAC,CAAC;IACtC,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"hotswap.js","sourceRoot":"","sources":["../../src/auth/hotswap.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ import { tmpdir } from 'node:os';
|
|
|
6
6
|
import { delimiter, dirname, join, relative, sep } from 'node:path';
|
|
7
7
|
import { buildMergedConfig } from '../../config/generator.js';
|
|
8
8
|
import { getSetupInstallableSkillNames } from '../../catalog/installable.js';
|
|
9
|
+
import { writeSessionStart } from '../../hooks/session.js';
|
|
10
|
+
import { readSubagentTrackingState, recordSubagentTurnForSession } from '../../subagents/tracker.js';
|
|
9
11
|
import { buildOmxPluginMcpManifest, OMX_FIRST_PARTY_MCP_ENTRYPOINTS, OMX_FIRST_PARTY_MCP_PLUGIN_TARGETS, OMX_FIRST_PARTY_MCP_SERVER_NAMES, OMX_PLUGIN_MCP_COMMAND, OMX_PLUGIN_MCP_SERVE_SUBCOMMAND, } from '../../config/omx-first-party-mcp.js';
|
|
10
12
|
const root = process.cwd();
|
|
11
13
|
const pluginName = 'oh-my-codex';
|
|
@@ -403,6 +405,19 @@ describe('official Codex plugin layout', () => {
|
|
|
403
405
|
assert.equal(stop.status, 0, stop.stderr || stop.stdout);
|
|
404
406
|
assert.deepEqual(parseSingleJsonStdout(stop.stdout), {});
|
|
405
407
|
await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
|
|
408
|
+
const subagentStop = runPluginNativeHook(cachePluginRoot, JSON.stringify({
|
|
409
|
+
hook_event_name: 'SubagentStop',
|
|
410
|
+
session_id: 'plain-codex-parent',
|
|
411
|
+
agent_id: 'plain-codex-child',
|
|
412
|
+
turn_id: 'plain-codex-child-turn',
|
|
413
|
+
}), {
|
|
414
|
+
OMX_ENTRY_PATH: '',
|
|
415
|
+
OMX_CODEX_LAUNCH_ID: '',
|
|
416
|
+
OMX_NATIVE_HOOK_COMMAND: commandPath,
|
|
417
|
+
});
|
|
418
|
+
assert.equal(subagentStop.status, 0, subagentStop.stderr || subagentStop.stdout);
|
|
419
|
+
assert.deepEqual(parseSingleJsonStdout(subagentStop.stdout), {});
|
|
420
|
+
await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
|
|
406
421
|
const oversizedUserPrompt = runPluginNativeHook(cachePluginRoot, JSON.stringify({
|
|
407
422
|
hook_event_name: 'UserPromptSubmit',
|
|
408
423
|
prompt: 'x'.repeat(2 * 1024 * 1024),
|
|
@@ -436,6 +451,69 @@ describe('official Codex plugin layout', () => {
|
|
|
436
451
|
await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
|
|
437
452
|
});
|
|
438
453
|
});
|
|
454
|
+
it('emits a JSON no-op for oversized plugin SubagentStop input', async () => {
|
|
455
|
+
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
456
|
+
const cwd = join(cacheRoot, 'project');
|
|
457
|
+
const launchId = 'oversized-subagent-stop';
|
|
458
|
+
await mkdir(cwd);
|
|
459
|
+
await writeJson(join(cwd, 'state/plugin-hook-routing', `${launchId}.json`), {
|
|
460
|
+
routing: 'omx-plugin-hook-routing-only:v1',
|
|
461
|
+
ownerSessionId: 'native-root',
|
|
462
|
+
});
|
|
463
|
+
const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({
|
|
464
|
+
hook_event_name: 'SubagentStop',
|
|
465
|
+
cwd,
|
|
466
|
+
session_id: 'native-root',
|
|
467
|
+
agent_id: 'native-child',
|
|
468
|
+
padding: 'x'.repeat(2 * 1024 * 1024),
|
|
469
|
+
}), {
|
|
470
|
+
OMX_ROOT: cwd,
|
|
471
|
+
OMX_ENTRY_PATH: omxBin,
|
|
472
|
+
OMX_CODEX_LAUNCH_ID: launchId,
|
|
473
|
+
});
|
|
474
|
+
assert.equal(result.error, undefined, result.error?.message ?? '');
|
|
475
|
+
assert.equal(result.status, 0, result.stderr || result.stdout);
|
|
476
|
+
assert.deepEqual(parseSingleJsonStdout(result.stdout), {});
|
|
477
|
+
});
|
|
478
|
+
});
|
|
479
|
+
it('emits a JSON no-op when a plugin SubagentStop launcher fails', async () => {
|
|
480
|
+
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
481
|
+
const cwd = join(cacheRoot, 'project');
|
|
482
|
+
const launchId = 'failing-subagent-stop';
|
|
483
|
+
await mkdir(cwd);
|
|
484
|
+
await writeJson(join(cwd, 'state/plugin-hook-routing', `${launchId}.json`), {
|
|
485
|
+
routing: 'omx-plugin-hook-routing-only:v1',
|
|
486
|
+
ownerSessionId: 'native-root',
|
|
487
|
+
});
|
|
488
|
+
const payload = JSON.stringify({
|
|
489
|
+
hook_event_name: 'SubagentStop',
|
|
490
|
+
cwd,
|
|
491
|
+
session_id: 'native-root',
|
|
492
|
+
agent_id: 'native-child',
|
|
493
|
+
turn_id: 'native-child-turn',
|
|
494
|
+
});
|
|
495
|
+
const hookEnv = {
|
|
496
|
+
OMX_ROOT: cwd,
|
|
497
|
+
OMX_ENTRY_PATH: omxBin,
|
|
498
|
+
OMX_CODEX_LAUNCH_ID: launchId,
|
|
499
|
+
};
|
|
500
|
+
for (const command of [join(cacheRoot, 'missing-omx'), process.execPath]) {
|
|
501
|
+
const result = runPluginNativeHook(cachePluginRoot, payload, {
|
|
502
|
+
...hookEnv,
|
|
503
|
+
OMX_NATIVE_HOOK_COMMAND: command,
|
|
504
|
+
});
|
|
505
|
+
assert.equal(result.status, 0, result.stderr || result.stdout);
|
|
506
|
+
assert.deepEqual(parseSingleJsonStdout(result.stdout), {});
|
|
507
|
+
}
|
|
508
|
+
await writeFile(join(cachePluginRoot, 'hooks/omx-command.json'), '{invalid json', 'utf-8');
|
|
509
|
+
const malformedLauncher = runPluginNativeHook(cachePluginRoot, payload, {
|
|
510
|
+
...hookEnv,
|
|
511
|
+
OMX_NATIVE_HOOK_COMMAND: '',
|
|
512
|
+
});
|
|
513
|
+
assert.equal(malformedLauncher.status, 0, malformedLauncher.stderr || malformedLauncher.stdout);
|
|
514
|
+
assert.deepEqual(parseSingleJsonStdout(malformedLauncher.stdout), {});
|
|
515
|
+
});
|
|
516
|
+
});
|
|
439
517
|
it('no-ops plugin hooks for nested plain Codex sessions that inherit omx launch env', async () => {
|
|
440
518
|
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
441
519
|
const calledPath = join(cacheRoot, 'called.txt');
|
|
@@ -503,6 +581,124 @@ describe('official Codex plugin layout', () => {
|
|
|
503
581
|
}
|
|
504
582
|
});
|
|
505
583
|
});
|
|
584
|
+
it('routes nested SubagentStop only for a tracked parent of the launch owner', async () => {
|
|
585
|
+
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
586
|
+
const cwd = join(cacheRoot, 'project');
|
|
587
|
+
await mkdir(cwd);
|
|
588
|
+
await writeSessionStart(cwd, 'omx-root', { nativeSessionId: 'native-root', pid: process.pid });
|
|
589
|
+
await recordSubagentTurnForSession(cwd, { sessionId: 'omx-root', threadId: 'native-parent', kind: 'subagent' });
|
|
590
|
+
const pointerPath = join(cwd, '.omx/state/session.json');
|
|
591
|
+
const pointer = await readFile(pointerPath, 'utf8');
|
|
592
|
+
const routingPath = join(cwd, 'state/plugin-hook-routing/nested-stop.json');
|
|
593
|
+
await writeJson(routingPath, { routing: 'omx-plugin-hook-routing-only:v1', ownerSessionId: 'native-root' });
|
|
594
|
+
await writeJson(join(cachePluginRoot, 'hooks/omx-command.json'), { command: process.execPath, argsPrefix: [omxBin] });
|
|
595
|
+
const hookEnv = { OMX_ROOT: cwd, OMX_CODEX_LAUNCH_ID: 'nested-stop', CODEX_HOME: join(cacheRoot, 'codex-home') };
|
|
596
|
+
const payload = {
|
|
597
|
+
hook_event_name: 'SubagentStop', cwd, session_id: 'native-parent', agent_id: 'native-grandchild',
|
|
598
|
+
turn_id: 'grandchild-turn', transcript_path: null, agent_transcript_path: null,
|
|
599
|
+
};
|
|
600
|
+
const before = await readSubagentTrackingState(cwd);
|
|
601
|
+
for (const overrides of [
|
|
602
|
+
{ session_id: 'untracked-parent' },
|
|
603
|
+
{ session_id: 'foreign-parent' },
|
|
604
|
+
]) {
|
|
605
|
+
const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ ...payload, ...overrides }), hookEnv);
|
|
606
|
+
assert.equal(result.status, 0, result.stderr || result.stdout);
|
|
607
|
+
assert.deepEqual(await readSubagentTrackingState(cwd), before);
|
|
608
|
+
}
|
|
609
|
+
await writeJson(routingPath, { routing: 'omx-plugin-hook-routing-only:v1', ownerSessionId: 'foreign-root' });
|
|
610
|
+
const foreign = runPluginNativeHook(cachePluginRoot, JSON.stringify(payload), hookEnv);
|
|
611
|
+
assert.equal(foreign.status, 0, foreign.stderr || foreign.stdout);
|
|
612
|
+
assert.deepEqual(await readSubagentTrackingState(cwd), before);
|
|
613
|
+
await writeJson(routingPath, { routing: 'omx-plugin-hook-routing-only:v1', ownerSessionId: 'native-root' });
|
|
614
|
+
const nested = runPluginNativeHook(cachePluginRoot, JSON.stringify(payload), hookEnv);
|
|
615
|
+
assert.equal(nested.status, 0, nested.stderr || nested.stdout);
|
|
616
|
+
const state = await readSubagentTrackingState(cwd);
|
|
617
|
+
const child = state.sessions['omx-root'].threads['native-grandchild'];
|
|
618
|
+
assert.ok(child?.completed_at);
|
|
619
|
+
assert.equal(child.kind, 'subagent');
|
|
620
|
+
assert.equal(child.last_completed_turn_id, 'grandchild-turn');
|
|
621
|
+
assert.equal(child.direct_child_root_id, undefined);
|
|
622
|
+
assert.equal(state.sessions['native-parent'], undefined);
|
|
623
|
+
assert.equal(await readFile(pointerPath, 'utf8'), pointer);
|
|
624
|
+
});
|
|
625
|
+
});
|
|
626
|
+
it('routes nested SubagentStop from a Team worker launch through that worker tracker partition', async () => {
|
|
627
|
+
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
628
|
+
const cwd = join(cacheRoot, 'project');
|
|
629
|
+
const workerSessionId = 'team-worker-session';
|
|
630
|
+
const trackedParentId = 'worker-native-child';
|
|
631
|
+
const calledPath = join(cacheRoot, 'called.txt');
|
|
632
|
+
const delegatePath = join(cacheRoot, 'record-delegate.mjs');
|
|
633
|
+
await mkdir(cwd);
|
|
634
|
+
await writeSessionStart(cwd, 'team-leader-session', { nativeSessionId: 'native-leader', pid: process.pid });
|
|
635
|
+
await recordSubagentTurnForSession(cwd, {
|
|
636
|
+
sessionId: workerSessionId,
|
|
637
|
+
threadId: trackedParentId,
|
|
638
|
+
kind: 'subagent',
|
|
639
|
+
});
|
|
640
|
+
await writeFile(delegatePath, "import { writeFileSync } from 'node:fs';\nwriteFileSync(process.env.OMX_PLUGIN_SENTINEL, 'delegated');\n", 'utf-8');
|
|
641
|
+
await writeJson(join(cachePluginRoot, 'hooks/omx-command.json'), {
|
|
642
|
+
command: process.execPath,
|
|
643
|
+
argsPrefix: [delegatePath],
|
|
644
|
+
});
|
|
645
|
+
const routingPath = join(cwd, 'state/plugin-hook-routing/team-worker-launch.json');
|
|
646
|
+
await writeJson(routingPath, {
|
|
647
|
+
routing: 'omx-plugin-hook-routing-only:v1',
|
|
648
|
+
ownerSessionId: workerSessionId,
|
|
649
|
+
});
|
|
650
|
+
const hookEnv = {
|
|
651
|
+
OMX_ROOT: cwd,
|
|
652
|
+
OMX_CODEX_LAUNCH_ID: 'team-worker-launch',
|
|
653
|
+
OMX_PLUGIN_SENTINEL: calledPath,
|
|
654
|
+
};
|
|
655
|
+
const payload = {
|
|
656
|
+
hook_event_name: 'SubagentStop',
|
|
657
|
+
cwd,
|
|
658
|
+
session_id: trackedParentId,
|
|
659
|
+
agent_id: 'nested-worker-child',
|
|
660
|
+
turn_id: 'nested-worker-turn',
|
|
661
|
+
};
|
|
662
|
+
const tracked = runPluginNativeHook(cachePluginRoot, JSON.stringify(payload), hookEnv);
|
|
663
|
+
assert.equal(tracked.status, 0, tracked.stderr || tracked.stdout);
|
|
664
|
+
assert.equal((await readFile(calledPath, 'utf-8')).trim(), 'delegated');
|
|
665
|
+
await rm(calledPath, { force: true });
|
|
666
|
+
const deeperParentId = 'nested-worker-grandchild';
|
|
667
|
+
const transcriptPath = join(cacheRoot, 'nested-worker-grandchild.jsonl');
|
|
668
|
+
await writeFile(transcriptPath, `${JSON.stringify({
|
|
669
|
+
type: 'session_meta',
|
|
670
|
+
payload: {
|
|
671
|
+
id: deeperParentId,
|
|
672
|
+
source: { subagent: { thread_spawn: { parent_thread_id: trackedParentId } } },
|
|
673
|
+
},
|
|
674
|
+
})}\n`, 'utf-8');
|
|
675
|
+
const nestedStart = runPluginNativeHook(cachePluginRoot, JSON.stringify({
|
|
676
|
+
hook_event_name: 'SessionStart',
|
|
677
|
+
cwd,
|
|
678
|
+
session_id: deeperParentId,
|
|
679
|
+
transcript_path: transcriptPath,
|
|
680
|
+
}), hookEnv);
|
|
681
|
+
assert.equal(nestedStart.status, 0, nestedStart.stderr || nestedStart.stdout);
|
|
682
|
+
assert.equal((await readFile(calledPath, 'utf-8')).trim(), 'delegated');
|
|
683
|
+
await rm(calledPath, { force: true });
|
|
684
|
+
const untracked = runPluginNativeHook(cachePluginRoot, JSON.stringify({ ...payload, session_id: 'untracked-worker-child' }), hookEnv);
|
|
685
|
+
assert.equal(untracked.status, 0, untracked.stderr || untracked.stdout);
|
|
686
|
+
await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
|
|
687
|
+
await recordSubagentTurnForSession(cwd, {
|
|
688
|
+
sessionId: trackedParentId,
|
|
689
|
+
threadId: deeperParentId,
|
|
690
|
+
kind: 'subagent',
|
|
691
|
+
});
|
|
692
|
+
const deeper = runPluginNativeHook(cachePluginRoot, JSON.stringify({
|
|
693
|
+
...payload,
|
|
694
|
+
session_id: deeperParentId,
|
|
695
|
+
agent_id: 'nested-worker-great-grandchild',
|
|
696
|
+
turn_id: 'nested-worker-deeper-turn',
|
|
697
|
+
}), hookEnv);
|
|
698
|
+
assert.equal(deeper.status, 0, deeper.stderr || deeper.stdout);
|
|
699
|
+
assert.equal((await readFile(calledPath, 'utf-8')).trim(), 'delegated');
|
|
700
|
+
});
|
|
701
|
+
});
|
|
506
702
|
it('rejects unsafe plugin routing records without delegating and keeps Stop schema-safe', async () => {
|
|
507
703
|
await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
|
|
508
704
|
const calledPath = join(cacheRoot, 'called.txt');
|