oh-my-codex 0.19.1 → 0.20.1

package/dist/cli/__tests__/capabilities.test.js

@@ -0,0 +1,135 @@
+import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, it } from "node:test";
+const testDir = join(fileURLToPath(import.meta.url), "..");
+const repoRoot = join(testDir, "..", "..", "..");
+const omxBin = join(repoRoot, "dist", "cli", "omx.js");
+async function withTempDir(run) {
+    const dir = await mkdtemp(join(tmpdir(), "omx-capabilities-cli-"));
+    try {
+        return await run(dir);
+    }
+    finally {
+        await rm(dir, { recursive: true, force: true });
+    }
+}
+function runOmx(cwd, args) {
+    return spawnSync(process.execPath, [omxBin, ...args], { cwd, encoding: "utf8" });
+}
+async function writeObservations(dir, observations) {
+    const path = join(dir, "observations.json");
+    await writeFile(path, JSON.stringify({ version: 1, kind: "omx_capability_observations", observations }, null, 2), "utf8");
+    return path;
+}
+const SUCCESS_OBSERVATIONS = [
+    {
+        fixture_id: "project-memory-write-required-arg",
+        tool_calls: [{ name: "project_memory_write", arguments: { memory: { note: "capability preflight fixture" } } }],
+    },
+    {
+        fixture_id: "project-memory-read-known-tool",
+        tool_calls: [{ name: "project_memory_read", arguments: {} }],
+    },
+    {
+        fixture_id: "tool-restraint-no-call",
+        tool_calls: [],
+    },
+];
+function hasFailure(stdout, code) {
+    const parsed = JSON.parse(stdout);
+    return parsed.failures?.some((failure) => failure.code === code) ?? false;
+}
+describe("omx capabilities cli", () => {
+    it("routes local help", async () => {
+        await withTempDir(async (dir) => {
+            const result = runOmx(dir, ["capabilities", "--help"]);
+            assert.equal(result.status, 0);
+            assert.match(result.stdout, /omx capabilities lock/);
+            assert.doesNotMatch(result.stdout, /Launch Codex CLI/);
+        });
+    });
+    it("locks and checks with JSON output", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const lockJson = JSON.parse(lock.stdout);
+            assert.equal(lockJson.ok, true);
+            assert.match(lockJson.lockfile, /omx-capabilities\.lock\.json$/);
+            const check = runOmx(dir, ["capabilities", "check", "--json"]);
+            assert.equal(check.status, 0, check.stderr);
+            const checkJson = JSON.parse(check.stdout);
+            assert.equal(checkJson.ok, true);
+            assert.equal(checkJson.observations_checked, false);
+        });
+    });
+    it("checks successful fixture observations", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const observations = await writeObservations(dir, SUCCESS_OBSERVATIONS);
+            const check = runOmx(dir, ["capabilities", "check", "--observations", observations, "--require-observations", "--json"]);
+            assert.equal(check.status, 0, check.stderr);
+            const checkJson = JSON.parse(check.stdout);
+            assert.equal(checkJson.ok, true);
+            assert.equal(checkJson.observations_checked, true);
+        });
+    });
+    it("exits non-zero for required missing observations", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const check = runOmx(dir, ["capabilities", "check", "--require-observations", "--json"]);
+            assert.notEqual(check.status, 0);
+            const checkJson = JSON.parse(check.stdout);
+            assert.equal(checkJson.ok, false);
+            assert.ok(checkJson.failures.some((failure) => failure.code === "observations_missing"));
+        });
+    });
+    it("reports missing required tool arguments", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const observations = await writeObservations(dir, [
+                { fixture_id: "project-memory-write-required-arg", tool_calls: [{ name: "project_memory_write", arguments: {} }] },
+                SUCCESS_OBSERVATIONS[1],
+                SUCCESS_OBSERVATIONS[2],
+            ]);
+            const check = runOmx(dir, ["capabilities", "check", "--observations", observations, "--json"]);
+            assert.notEqual(check.status, 0);
+            assert.equal(hasFailure(check.stdout, "missing_required_arg"), true);
+        });
+    });
+    it("reports hallucinated tools", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const observations = await writeObservations(dir, [
+                SUCCESS_OBSERVATIONS[0],
+                { fixture_id: "project-memory-read-known-tool", tool_calls: [{ name: "imaginary_tool", arguments: {} }] },
+                SUCCESS_OBSERVATIONS[2],
+            ]);
+            const check = runOmx(dir, ["capabilities", "check", "--observations", observations, "--json"]);
+            assert.notEqual(check.status, 0);
+            assert.equal(hasFailure(check.stdout, "hallucinated_tool"), true);
+        });
+    });
+    it("reports tool-restraint violations", async () => {
+        await withTempDir(async (dir) => {
+            const lock = runOmx(dir, ["capabilities", "lock", "--json"]);
+            assert.equal(lock.status, 0, lock.stderr);
+            const observations = await writeObservations(dir, [
+                SUCCESS_OBSERVATIONS[0],
+                SUCCESS_OBSERVATIONS[1],
+                { fixture_id: "tool-restraint-no-call", tool_calls: [{ name: "project_memory_read", arguments: {} }] },
+            ]);
+            const check = runOmx(dir, ["capabilities", "check", "--observations", observations, "--json"]);
+            assert.notEqual(check.status, 0);
+            assert.equal(hasFailure(check.stdout, "unexpected_tool_call"), true);
+        });
+    });
+});
+//# sourceMappingURL=capabilities.test.js.map

package/dist/cli/__tests__/capabilities.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"capabilities.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/capabilities.test.ts"],"names":[],"mappings":"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"}

package/dist/cli/__tests__/codex-plugin-layout.test.js

@@ -148,6 +148,8 @@ async function assertPluginHookLaunchesPostCompactFromCache() {
                 OMX_ROOT: join(cacheRoot, '.omx-root'),
                 OMX_SESSION_ID: 'omx-plugin-hook-postcompact-smoke',
                 OMX_SOURCE_CWD: cacheRoot,
+                OMX_ENTRY_PATH: omxBin,
+                OMX_CODEX_LAUNCH_ID: 'omx-plugin-hook-postcompact-smoke-launch',
                 OMX_STARTUP_CWD: cacheRoot,
             },
         });
@@ -197,6 +199,8 @@ async function assertPluginHookDelegatesPostCompactToPinnedCommand() {
                 OMX_ROOT: join(cacheRoot, '.omx-root'),
                 OMX_SESSION_ID: 'omx-plugin-hook-postcompact-delegate',
                 OMX_SOURCE_CWD: cacheRoot,
+                OMX_ENTRY_PATH: omxBin,
+                OMX_CODEX_LAUNCH_ID: 'omx-plugin-hook-postcompact-delegate-launch',
                 OMX_STARTUP_CWD: cacheRoot,
             },
         });
@@ -254,10 +258,25 @@ async function withPluginCacheCopy(run) {
 }
 function pluginHookEnv(overrides = {}) {
     const env = { ...process.env };
-    for (const key of ['OMX_TEAM_STATE_ROOT', 'OMX_ROOT', 'OMX_STATE_ROOT', 'OMX_SESSION_ID', 'CODEX_SESSION_ID']) {
+    for (const key of [
+        'OMX_TEAM_STATE_ROOT',
+        'OMX_ROOT',
+        'OMX_STATE_ROOT',
+        'OMX_SESSION_ID',
+        'CODEX_SESSION_ID',
+        'OMX_ENTRY_PATH',
+        'OMX_CODEX_LAUNCH_ID',
+        'OMX_STARTUP_CWD',
+    ]) {
         delete env[key];
     }
-    return { ...env, ...overrides };
+    return {
+        ...env,
+        OMX_ENTRY_PATH: omxBin,
+        OMX_CODEX_LAUNCH_ID: 'omx-plugin-layout-launch',
+        OMX_STARTUP_CWD: root,
+        ...overrides,
+    };
 }
 function runPluginNativeHook(cachePluginRoot, input, env = {}) {
     return spawnSync(process.execPath, [join(cachePluginRoot, 'hooks', 'codex-native-hook.mjs')], {
@@ -336,6 +355,97 @@ describe('official Codex plugin layout', () => {
         assert.match(launcher, /return \{ \.\.\.options, shell: true, windowsHide: true \};/);
         assert.doesNotMatch(launcher, /shell:\s*process\.platform === 'win32'/);
     });
+    it('no-ops plugin hooks when Codex was not launched through omx', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const calledPath = join(cacheRoot, 'called.txt');
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'record-called.cmd' : 'record-called.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, `@echo off\r\necho called > "${calledPath}"\r\necho {}\r\n`, 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh\necho called > "${calledPath}"\nprintf '{}\\n'\n`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const userPrompt = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'UserPromptSubmit', prompt: '$ralplan smoke' }), {
+                OMX_ENTRY_PATH: '',
+                OMX_CODEX_LAUNCH_ID: '',
+                OMX_NATIVE_HOOK_COMMAND: commandPath,
+            });
+            assert.equal(userPrompt.status, 0, userPrompt.stderr || userPrompt.stdout);
+            assert.equal(userPrompt.stdout, '');
+            await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
+            const stop = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'plain-codex-stop' }), {
+                OMX_ENTRY_PATH: '',
+                OMX_CODEX_LAUNCH_ID: '',
+                OMX_NATIVE_HOOK_COMMAND: commandPath,
+            });
+            assert.equal(stop.status, 0, stop.stderr || stop.stdout);
+            assert.deepEqual(parseSingleJsonStdout(stop.stdout), {});
+            await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
+            const oversizedUserPrompt = runPluginNativeHook(cachePluginRoot, JSON.stringify({
+                hook_event_name: 'UserPromptSubmit',
+                prompt: 'x'.repeat(2 * 1024 * 1024),
+            }), {
+                OMX_ENTRY_PATH: '',
+                OMX_CODEX_LAUNCH_ID: '',
+                OMX_NATIVE_HOOK_COMMAND: commandPath,
+            });
+            assert.equal(oversizedUserPrompt.error, undefined, oversizedUserPrompt.error?.message ?? '');
+            assert.equal(oversizedUserPrompt.status, 0, oversizedUserPrompt.stderr || oversizedUserPrompt.stdout);
+            assert.equal(oversizedUserPrompt.stdout, '');
+            await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
+            const oversizedStop = runPluginNativeHook(cachePluginRoot, JSON.stringify({
+                hook_event_name: 'Stop',
+                session_id: 'plain-codex-oversized-stop',
+                padding: 'x'.repeat(2 * 1024 * 1024),
+            }), {
+                OMX_ENTRY_PATH: '',
+                OMX_CODEX_LAUNCH_ID: '',
+                OMX_NATIVE_HOOK_COMMAND: commandPath,
+            });
+            assert.equal(oversizedStop.error, undefined, oversizedStop.error?.message ?? '');
+            assert.equal(oversizedStop.status, 0, oversizedStop.stderr || oversizedStop.stdout);
+            assert.deepEqual(parseSingleJsonStdout(oversizedStop.stdout), {});
+            await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
+        });
+    });
+    it('no-ops plugin hooks for nested plain Codex sessions that inherit omx launch env', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const calledPath = join(cacheRoot, 'called.txt');
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'record-inherited-called.cmd' : 'record-inherited-called.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, `@echo off\r\necho %* > "${calledPath}"\r\necho {}\r\n`, 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh\necho "$@" > "${calledPath}"\nprintf '{}\\n'\n`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const inheritedEnv = {
+                OMX_ROOT: join(cacheRoot, '.omx-root'),
+                OMX_ENTRY_PATH: omxBin,
+                OMX_CODEX_LAUNCH_ID: 'inherited-launch-token',
+                OMX_NATIVE_HOOK_COMMAND: commandPath,
+            };
+            const owner = runPluginNativeHook(cachePluginRoot, JSON.stringify({
+                hook_event_name: 'UserPromptSubmit',
+                session_id: 'owner-codex-session',
+                session_pid: 111,
+                prompt: '$ralplan smoke',
+            }), inheritedEnv);
+            assert.equal(owner.status, 0, owner.stderr || owner.stdout);
+            assert.equal((await readFile(calledPath, 'utf-8')).trim(), 'codex-native-hook');
+            await rm(calledPath, { force: true });
+            const nestedPlainCodex = runPluginNativeHook(cachePluginRoot, JSON.stringify({
+                hook_event_name: 'UserPromptSubmit',
+                session_id: 'nested-plain-codex-session',
+                session_pid: 222,
+                prompt: '$ralplan nested',
+            }), inheritedEnv);
+            assert.equal(nestedPlainCodex.status, 0, nestedPlainCodex.stderr || nestedPlainCodex.stdout);
+            assert.equal(nestedPlainCodex.stdout, '');
+            await assert.rejects(readFile(calledPath, 'utf-8'), { code: 'ENOENT' });
+        });
+    });
     it('emits Stop JSON when the plugin hook pinned launcher is invalid', async () => {
         await withPluginCacheCopy(async (cachePluginRoot) => {
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
@@ -428,6 +538,152 @@ exit 7
             assert.doesNotMatch(result.stdout, /plugin_stop_hook_launcher/);
         });
     });
+    it('forwards the complete valid Stop child decision unchanged', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const childOutput = {
+                decision: 'block',
+                reason: 'Autopilot workflow is still active.',
+                stopReason: 'autopilot_ultragoal',
+                systemMessage: 'Autopilot diagnostic: complete the active workflow before stopping.',
+            };
+            const childJson = JSON.stringify(childOutput);
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'complete-valid-json.cmd' : 'complete-valid-json.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, `@echo off\r\necho ${childJson}\r\nexit /b 0\r\n`, 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf '${childJson}\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'sess-plugin-complete-valid-json-stop' }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.equal(result.stderr, '');
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.deepEqual(Object.keys(output).sort(), ['decision', 'reason', 'stopReason', 'systemMessage']);
+            assert.deepEqual(output, childOutput);
+        });
+    });
+    it('preserves valid pretty-printed Stop child JSON', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'pretty-valid-json.cmd' : 'pretty-valid-json.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, '@echo off\r\necho {\r\necho   "decision": "block",\r\necho   "stopReason": "pretty_child_json"\r\necho }\r\nexit /b 0\r\n', 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf '{\n'
+printf '  "decision": "block",\n'
+printf '  "stopReason": "pretty_child_json"\n'
+printf '}\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'sess-plugin-pretty-valid-json-stop' }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.decision, 'block');
+            assert.equal(output.stopReason, 'pretty_child_json');
+            assert.doesNotMatch(result.stdout, /plugin_stop_hook_launcher_invalid_stdout/);
+        });
+    });
+    it('preserves valid Stop child JSON when stdout includes prior launcher noise', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'noisy-valid-json.cmd' : 'noisy-valid-json.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, '@echo off\r\necho runtime notice before json\r\necho {"decision":"block","stopReason":"autopilot_ultragoal"}\r\nexit /b 0\r\n', 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf 'runtime notice before json\n'
+printf '{"decision":"block","stopReason":"autopilot_ultragoal"}\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({
+                hook_event_name: 'Stop',
+                session_id: 'omx-1783508412223-c32f1l',
+                cwd: cacheRoot,
+            }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.doesNotMatch(result.stdout, /runtime notice before json/);
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.decision, 'block');
+            assert.equal(output.stopReason, 'autopilot_ultragoal');
+            assert.doesNotMatch(result.stdout, /plugin_stop_hook_launcher_invalid_stdout/);
+        });
+    });
+    it('rejects Stop child JSON when later stdout noise follows it', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'valid-json-trailing-noise.cmd' : 'valid-json-trailing-noise.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, '@echo off\r\necho {"decision":"block","stopReason":"child_valid_json"}\r\necho trailing runtime noise\r\nexit /b 0\r\n', 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf '{"decision":"block","stopReason":"child_valid_json"}\n'
+printf 'trailing runtime noise\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'sess-plugin-trailing-noise-stop' }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.doesNotMatch(result.stdout, /trailing runtime noise/);
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.decision, 'block');
+            assert.equal(output.stopReason, 'plugin_stop_hook_launcher_invalid_stdout');
+        });
+    });
+    it('rejects Stop child JSON when an earlier JSON decision is followed by noise and final JSON', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'json-noise-json.cmd' : 'json-noise-json.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, '@echo off\r\necho {"decision":"block","stopReason":"first_json"}\r\necho trailing runtime noise\r\necho {"decision":"block","stopReason":"second_json"}\r\nexit /b 0\r\n', 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf '{"decision":"block","stopReason":"first_json"}\n'
+printf 'trailing runtime noise\n'
+printf '{"decision":"block","stopReason":"second_json"}\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'sess-plugin-json-noise-json-stop' }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.doesNotMatch(result.stdout, /first_json/);
+            assert.doesNotMatch(result.stdout, /second_json/);
+            assert.doesNotMatch(result.stdout, /trailing runtime noise/);
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.decision, 'block');
+            assert.equal(output.stopReason, 'plugin_stop_hook_launcher_invalid_stdout');
+        });
+    });
+    it('rejects pretty Stop child JSON followed by final JSON log noise', async () => {
+        await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
+            const commandPath = join(cacheRoot, process.platform === 'win32' ? 'pretty-json-final-log.cmd' : 'pretty-json-final-log.sh');
+            if (process.platform === 'win32') {
+                await writeFile(commandPath, '@echo off\r\necho {\r\necho   "decision": "block",\r\necho   "stopReason": "real_block"\r\necho }\r\necho {"level":"info"}\r\nexit /b 0\r\n', 'utf-8');
+            }
+            else {
+                await writeFile(commandPath, `#!/bin/sh
+printf '{\n'
+printf '  "decision": "block",\n'
+printf '  "stopReason": "real_block"\n'
+printf '}\n'
+printf '{"level":"info"}\n'
+`, 'utf-8');
+                await chmod(commandPath, 0o755);
+            }
+            const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({ hook_event_name: 'Stop', session_id: 'sess-plugin-pretty-json-final-log-stop' }), { OMX_NATIVE_HOOK_COMMAND: commandPath });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.doesNotMatch(result.stdout, /real_block/);
+            assert.doesNotMatch(result.stdout, /level/);
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.decision, 'block');
+            assert.equal(output.stopReason, 'plugin_stop_hook_launcher_invalid_stdout');
+        });
+    });
     it('replaces oversized Stop child stdout with fallback Stop JSON', async () => {
         await withPluginCacheCopy(async (cachePluginRoot, cacheRoot) => {
             const commandPath = join(cacheRoot, process.platform === 'win32' ? 'oversized-stop-stdout.cmd' : 'oversized-stop-stdout.sh');
@@ -451,7 +707,7 @@ head -c 1100000 /dev/zero | tr '\0' x
     it('emits Stop JSON for malformed Stop-looking stdin before invalid launcher failure', async () => {
         await withPluginCacheCopy(async (cachePluginRoot) => {
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
-            const result = runPluginNativeHook(cachePluginRoot, '{"hook_event_name":"Stop",');
+            const result = runPluginNativeHook(cachePluginRoot, '{"hook_event_name":"Stop","session_id":"sess-plugin-malformed-stop",');
             assert.equal(result.status, 0, result.stderr || result.stdout);
             const output = parseSingleJsonStdout(result.stdout);
             assert.equal(output.decision, 'block');
@@ -461,7 +717,7 @@ head -c 1100000 /dev/zero | tr '\0' x
     it('emits Stop JSON for the core-supported name alias before invalid launcher failure', async () => {
         await withPluginCacheCopy(async (cachePluginRoot) => {
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
-            const result = runPluginNativeHook(cachePluginRoot, '{"name":"Stop",');
+            const result = runPluginNativeHook(cachePluginRoot, '{"name":"Stop","session_id":"sess-plugin-malformed-name-stop",');
             assert.equal(result.status, 0, result.stderr || result.stdout);
             const output = parseSingleJsonStdout(result.stdout);
             assert.equal(output.decision, 'block');
@@ -494,6 +750,7 @@ head -c 1100000 /dev/zero | tr '\0' x
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
             const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({
                 hook_event_name: 'UserPromptSubmit',
+                session_id: 'sess-plugin-invalid-launcher-user-prompt',
                 prompt: 'hello',
             }));
             assert.equal(result.status, 1);
@@ -531,6 +788,7 @@ head -c 1100000 /dev/zero | tr '\0' x
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
             const result = runPluginNativeHook(cachePluginRoot, JSON.stringify({
                 hook_event_name: 'PreToolUse',
+                session_id: 'sess-plugin-nested-stop-text',
                 tool_input: { name: 'Stop' },
             }));
             assert.equal(result.status, 1);
@@ -541,7 +799,7 @@ head -c 1100000 /dev/zero | tr '\0' x
     it('does not classify malformed non-Stop plugin JSON with nested Stop text as Stop', async () => {
         await withPluginCacheCopy(async (cachePluginRoot) => {
             await writeFile(join(cachePluginRoot, 'hooks', 'omx-command.json'), '{"command":', 'utf-8');
-            const result = runPluginNativeHook(cachePluginRoot, '{"hook_event_name":"PreToolUse","tool_input":{"name":"Stop"},');
+            const result = runPluginNativeHook(cachePluginRoot, '{"hook_event_name":"PreToolUse","session_id":"sess-plugin-malformed-non-stop","tool_input":{"name":"Stop"},');
             assert.equal(result.status, 1);
             assert.equal(result.stdout, '');
             assert.match(result.stderr, /invalid plugin hook launcher/);
@@ -681,7 +939,7 @@ head -c 1100000 /dev/zero | tr '\0' x
     });
     it('fails oversized non-Stop plugin stdin without Stop JSON', async () => {
         await withPluginCacheCopy(async (cachePluginRoot) => {
-            const result = runPluginNativeHook(cachePluginRoot, 'x'.repeat(1024 * 1024 + 1));
+            const result = runPluginNativeHook(cachePluginRoot, `{"hook_event_name":"UserPromptSubmit","session_id":"sess-plugin-oversized-non-stop","padding":"${'x'.repeat(1024 * 1024 + 1)}`);
             assert.equal(result.status, 1);
             assert.equal(result.stdout, '');
             assert.match(result.stderr, /plugin hook stdin exceeded/);