oh-my-codex 0.16.0 → 0.16.1

package/dist/runtime/process-tree.js

@@ -0,0 +1,230 @@
+import { spawn } from 'node:child_process';
+import { readdirSync, readFileSync } from 'node:fs';
+import { buildPlatformCommandSpec } from '../utils/platform-command.js';
+const DEFAULT_SIGTERM_GRACE_MS = 1_000;
+const DEFAULT_PROCESS_LIMIT_POLL_MS = 100;
+function parsePositiveTimeout(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isFinite(value) || value <= 0)
+        return undefined;
+    return Math.floor(value);
+}
+function killProcessTree(child, platform, signal) {
+    if (child.pid === undefined)
+        return;
+    try {
+        if (platform === 'win32') {
+            child.kill(signal);
+            return;
+        }
+        // Children are launched as a detached process group on POSIX so a negative
+        // PID targets the whole tree instead of only the direct wrapper process.
+        process.kill(-child.pid, signal);
+    }
+    catch (err) {
+        if (err.code === 'ESRCH')
+            return;
+        try {
+            child.kill(signal);
+        }
+        catch (fallbackErr) {
+            if (fallbackErr.code !== 'ESRCH')
+                throw fallbackErr;
+        }
+    }
+}
+function parsePositiveInteger(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isFinite(value) || value <= 0)
+        return undefined;
+    return Math.floor(value);
+}
+function readLinuxProcessTable() {
+    try {
+        const entries = readdirSync('/proc', { withFileTypes: true });
+        const table = new Map();
+        for (const entry of entries) {
+            if (!entry.isDirectory() || !/^\d+$/.test(entry.name))
+                continue;
+            const pid = Number.parseInt(entry.name, 10);
+            let stat;
+            try {
+                stat = readFileSync(`/proc/${entry.name}/stat`, 'utf-8');
+            }
+            catch {
+                continue;
+            }
+            const closeParen = stat.lastIndexOf(')');
+            if (closeParen < 0)
+                continue;
+            const fields = stat.slice(closeParen + 2).split(' ');
+            const ppid = Number.parseInt(fields[1] ?? '', 10);
+            if (Number.isFinite(ppid))
+                table.set(pid, ppid);
+        }
+        return table;
+    }
+    catch {
+        return undefined;
+    }
+}
+function countDescendantsLinux(rootPid) {
+    const table = readLinuxProcessTable();
+    if (!table)
+        return undefined;
+    const children = new Map();
+    for (const [pid, ppid] of table) {
+        const list = children.get(ppid) ?? [];
+        list.push(pid);
+        children.set(ppid, list);
+    }
+    let count = 0;
+    const stack = [...(children.get(rootPid) ?? [])];
+    while (stack.length > 0) {
+        const pid = stack.pop();
+        if (pid === undefined)
+            continue;
+        count += 1;
+        stack.push(...(children.get(pid) ?? []));
+    }
+    return count;
+}
+export function runProcessTreeWithTimeout(command, args, options = {}) {
+    const platform = options.platform ?? process.platform;
+    const env = options.env ?? process.env;
+    const spec = buildPlatformCommandSpec(command, args, platform, env, options.existsImpl);
+    const spawnImpl = options.spawnImpl ?? spawn;
+    const timeoutMs = parsePositiveTimeout(options.timeoutMs);
+    const killSignal = options.killSignal ?? 'SIGTERM';
+    const sigkillGraceMs = options.sigkillGraceMs ?? DEFAULT_SIGTERM_GRACE_MS;
+    const encoding = options.encoding ?? 'utf-8';
+    const maxOutputBytes = parsePositiveInteger(options.maxOutputBytes);
+    const maxProcessCount = parsePositiveInteger(options.maxProcessCount);
+    const processLimitPollMs = parsePositiveInteger(options.processLimitPollMs) ?? DEFAULT_PROCESS_LIMIT_POLL_MS;
+    return new Promise((resolve) => {
+        let stdout = '';
+        let stderr = '';
+        let timedOut = false;
+        let processLimitExceeded = false;
+        let outputLimitExceeded = false;
+        let settled = false;
+        let timeoutTimer;
+        let sigkillTimer;
+        let processLimitTimer;
+        const cleanupSignals = ['SIGINT', 'SIGTERM', 'SIGHUP'];
+        const child = spawnImpl(spec.command, spec.args, {
+            cwd: options.cwd,
+            env,
+            detached: platform !== 'win32',
+            stdio: ['ignore', 'pipe', 'pipe'],
+            windowsHide: true,
+        });
+        const terminate = (signal = killSignal) => {
+            killProcessTree(child, platform, signal);
+            if (signal !== 'SIGKILL') {
+                sigkillTimer ??= setTimeout(() => {
+                    if (!settled)
+                        killProcessTree(child, platform, 'SIGKILL');
+                }, sigkillGraceMs);
+            }
+        };
+        const parentCleanupHandler = (signal) => {
+            terminate(typeof signal === 'string' ? signal : killSignal);
+        };
+        if (options.cleanupOnParentExit) {
+            for (const signal of cleanupSignals)
+                process.once(signal, parentCleanupHandler);
+            process.once('beforeExit', parentCleanupHandler);
+            process.once('exit', parentCleanupHandler);
+        }
+        const removeParentCleanupHandlers = () => {
+            if (!options.cleanupOnParentExit)
+                return;
+            for (const signal of cleanupSignals)
+                process.off(signal, parentCleanupHandler);
+            process.off('beforeExit', parentCleanupHandler);
+            process.off('exit', parentCleanupHandler);
+        };
+        const finish = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timeoutTimer)
+                clearTimeout(timeoutTimer);
+            if (sigkillTimer)
+                clearTimeout(sigkillTimer);
+            if (processLimitTimer)
+                clearInterval(processLimitTimer);
+            removeParentCleanupHandlers();
+            resolve({ ...result, stdout, stderr, timedOut, processLimitExceeded, outputLimitExceeded });
+        };
+        const appendBoundedOutput = (current, chunk) => {
+            if (outputLimitExceeded)
+                return current;
+            if (maxOutputBytes === undefined)
+                return current + chunk;
+            const currentBytes = Buffer.byteLength(current, encoding);
+            const chunkBytes = Buffer.byteLength(chunk, encoding);
+            if (currentBytes + chunkBytes <= maxOutputBytes)
+                return current + chunk;
+            outputLimitExceeded = true;
+            terminate();
+            const remaining = Math.max(0, maxOutputBytes - currentBytes);
+            return current + Buffer.from(chunk, encoding).subarray(0, remaining).toString(encoding);
+        };
+        child.stdout.setEncoding(encoding);
+        child.stderr.setEncoding(encoding);
+        child.stdout.on('data', (chunk) => {
+            stdout = appendBoundedOutput(stdout, chunk);
+        });
+        child.stderr.on('data', (chunk) => {
+            stderr = appendBoundedOutput(stderr, chunk);
+        });
+        const sweepProcessGroupAfterParentExit = () => {
+            if (platform === 'win32')
+                return;
+            killProcessTree(child, platform, killSignal);
+            const residualSigkillTimer = setTimeout(() => {
+                killProcessTree(child, platform, 'SIGKILL');
+            }, sigkillGraceMs);
+            residualSigkillTimer.unref?.();
+        };
+        child.on('error', (error) => {
+            finish({ status: null, signal: null, error });
+        });
+        child.on('exit', () => {
+            // `close` waits for stdio EOF, so a direct wrapper that exits while a
+            // grandchild keeps inherited stdout/stderr open can otherwise sit until
+            // timeout. Sweep as soon as the direct parent exits, then let `close`
+            // report the parent's status and captured output.
+            sweepProcessGroupAfterParentExit();
+        });
+        child.on('close', (status, signal) => {
+            finish({ status, signal });
+        });
+        if (timeoutMs !== undefined) {
+            timeoutTimer = setTimeout(() => {
+                if (settled)
+                    return;
+                timedOut = true;
+                terminate();
+            }, timeoutMs);
+        }
+        if (platform === 'linux' && maxProcessCount !== undefined) {
+            processLimitTimer = setInterval(() => {
+                if (settled || child.pid === undefined)
+                    return;
+                const descendants = countDescendantsLinux(child.pid);
+                if (descendants === undefined)
+                    return;
+                if (descendants + 1 > maxProcessCount) {
+                    processLimitExceeded = true;
+                    terminate();
+                }
+            }, processLimitPollMs);
+        }
+    });
+}
+//# sourceMappingURL=process-tree.js.map

package/dist/runtime/process-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-tree.js","sourceRoot":"","sources":["../../src/runtime/process-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,wBAAwB,GAAG,KAAK,CAAC;AACvC,MAAM,6BAA6B,GAAG,GAAG,CAAC;AA6B1C,SAAS,oBAAoB,CAAC,KAAyB;IACrD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,eAAe,CAAC,KAAmB,EAAE,QAAyB,EAAE,MAAsB;IAC7F,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;QAAE,OAAO;IACpC,IAAI,CAAC;QACH,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnB,OAAO;QACT,CAAC;QACD,2EAA2E;QAC3E,yEAAyE;QACzE,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAC5D,IAAI,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,WAAW,EAAE,CAAC;YACrB,IAAK,WAAqC,CAAC,IAAI,KAAK,OAAO;gBAAE,MAAM,WAAW,CAAC;QACjF,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAyB;IACrD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,qBAAqB;IAC5B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,SAAS;YAChE,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,IAAY,CAAC;YACjB,IAAI,CAAC;gBACH,IAAI,GAAG,YAAY,CAAC,SAAS,KAAK,CAAC,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,UAAU,GAAG,CAAC;gBAAE,SAAS;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,MAAM,KAAK,GAAG,qBAAqB,EAAE,CAAC;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,GAAG,KAAK,SAAS;YAAE,SAAS;QAChC,KAAK,IAAI,CAAC,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,IAAc,EACd,UAAiC,EAAE;IAEnC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,IAAI,GAAG,wBAAwB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACxF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;IACnD,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,wBAAwB,CAAC;IAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;IAC7C,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,6BAA6B,CAAC;IAE7G,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,YAAwC,CAAC;QAC7C,IAAI,YAAwC,CAAC;QAC7C,IAAI,iBAA6C,CAAC;QAClD,MAAM,cAAc,GAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEzE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE;YAC/C,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG;YACH,QAAQ,EAAE,QAAQ,KAAK,OAAO;YAC9B,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,CAAC,SAAyB,UAAU,EAAQ,EAAE;YAC9D,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,YAAY,KAAK,UAAU,CAAC,GAAG,EAAE;oBAC/B,IAAI,CAAC,OAAO;wBAAE,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC5D,CAAC,EAAE,cAAc,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,oBAAoB,GAAG,CAAC,MAAgC,EAAQ,EAAE;YACtE,SAAS,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;YAChC,KAAK,MAAM,MAAM,IAAI,cAAc;gBAAE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;YAChF,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,2BAA2B,GAAG,GAAS,EAAE;YAC7C,IAAI,CAAC,OAAO,CAAC,mBAAmB;gBAAE,OAAO;YACzC,KAAK,MAAM,MAAM,IAAI,cAAc;gBAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;YAC/E,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,CAAC,MAAqH,EAAQ,EAAE;YAC7I,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,YAAY;gBAAE,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,YAAY;gBAAE,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,iBAAiB;gBAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACxD,2BAA2B,EAAE,CAAC;YAC9B,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC9F,CAAC,CAAC;QAEF,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,KAAa,EAAU,EAAE;YACrE,IAAI,mBAAmB;gBAAE,OAAO,OAAO,CAAC;YACxC,IAAI,cAAc,KAAK,SAAS;gBAAE,OAAO,OAAO,GAAG,KAAK,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,IAAI,YAAY,GAAG,UAAU,IAAI,cAAc;gBAAE,OAAO,OAAO,GAAG,KAAK,CAAC;YACxE,mBAAmB,GAAG,IAAI,CAAC;YAC3B,SAAS,EAAE,CAAC;YACZ,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,YAAY,CAAC,CAAC;YAC7D,OAAO,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1F,CAAC,CAAC;QAEF,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,gCAAgC,GAAG,GAAS,EAAE;YAClD,IAAI,QAAQ,KAAK,OAAO;gBAAE,OAAO;YACjC,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC7C,MAAM,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC3C,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC9C,CAAC,EAAE,cAAc,CAAC,CAAC;YACnB,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC;QACjC,CAAC,CAAC;QAEF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA4B,EAAE,EAAE;YACjD,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACpB,sEAAsE;YACtE,wEAAwE;YACxE,sEAAsE;YACtE,kDAAkD;YAClD,gCAAgC,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,MAAqB,EAAE,MAA6B,EAAE,EAAE;YACzE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC7B,IAAI,OAAO;oBAAE,OAAO;gBACpB,QAAQ,GAAG,IAAI,CAAC;gBAChB,SAAS,EAAE,CAAC;YACd,CAAC,EAAE,SAAS,CAAC,CAAC;QAChB,CAAC;QACD,IAAI,QAAQ,KAAK,OAAO,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAC1D,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,OAAO,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;oBAAE,OAAO;gBAC/C,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrD,IAAI,WAAW,KAAK,SAAS;oBAAE,OAAO;gBACtC,IAAI,WAAW,GAAG,CAAC,GAAG,eAAe,EAAE,CAAC;oBACtC,oBAAoB,GAAG,IAAI,CAAC;oBAC5B,SAAS,EAAE,CAAC;gBACd,CAAC;YACH,CAAC,EAAE,kBAAkB,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/scripts/__tests__/codex-native-hook.test.js

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { chmod, mkdir, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -141,6 +141,8 @@ const TEAM_ENV_KEYS = [
     "OMX_TEAM_STATE_ROOT",
     "OMX_TEAM_LEADER_CWD",
     "OMX_SESSION_ID",
+    "OMX_ROOT",
+    "OMX_STATE_ROOT",
     "SESSION_ID",
     "OMX_QUESTION_RETURN_PANE",
     "OMX_LEADER_PANE_ID",
@@ -322,6 +324,69 @@ describe("codex native hook dispatch", () => {
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("logs Stop dispatch failures without foreground stderr noise", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-cli-stop-dispatch-silent-"));
+        try {
+            const result = spawnSync(process.execPath, [nativeHookScriptPath()], {
+                cwd,
+                input: JSON.stringify({
+                    hook_event_name: "Stop",
+                    cwd,
+                    session_id: "sess-cli-stop-dispatch-silent",
+                    thread_id: "thread-cli-stop-dispatch-silent",
+                    turn_id: "turn-cli-stop-dispatch-silent",
+                }),
+                encoding: "utf-8",
+                stdio: ["pipe", "pipe", "pipe"],
+                env: {
+                    ...process.env,
+                    NODE_ENV: "test",
+                    OMX_NATIVE_HOOK_TEST_THROW_STOP_DISPATCH: "1",
+                },
+            });
+            assert.equal(result.status, 0, result.stderr || result.stdout);
+            assert.equal(result.stderr, "");
+            const output = parseSingleJsonStdout(result.stdout);
+            assert.equal(output.stopReason, "native_stop_dispatch_failure");
+            const logFiles = await readdir(join(cwd, ".omx", "logs"));
+            assert.equal(logFiles.some((name) => /^native-hook-\d{4}-\d{2}-\d{2}\.jsonl$/.test(name)), true);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("keeps non-Stop dispatch failures fail-closed without foreground stderr noise", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-cli-pretool-dispatch-silent-"));
+        try {
+            const result = spawnSync(process.execPath, [nativeHookScriptPath()], {
+                cwd,
+                input: JSON.stringify({
+                    hook_event_name: "PreToolUse",
+                    cwd,
+                    session_id: "sess-cli-pretool-dispatch-silent",
+                    thread_id: "thread-cli-pretool-dispatch-silent",
+                    turn_id: "turn-cli-pretool-dispatch-silent",
+                    tool_name: "Bash",
+                    tool_input: { command: "pwd" },
+                }),
+                encoding: "utf-8",
+                stdio: ["pipe", "pipe", "pipe"],
+                env: {
+                    ...process.env,
+                    NODE_ENV: "test",
+                    OMX_NATIVE_HOOK_TEST_THROW_DISPATCH: "1",
+                },
+            });
+            assert.equal(result.status, 1);
+            assert.equal(result.stdout, "");
+            assert.equal(result.stderr, "");
+            const logFiles = await readdir(join(cwd, ".omx", "logs"));
+            assert.equal(logFiles.some((name) => /^native-hook-\d{4}-\d{2}-\d{2}\.jsonl$/.test(name)), true);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("maps Codex events onto OMX logical surfaces", () => {
         assert.equal(mapCodexHookEventToOmxEvent("SessionStart"), "session-start");
         assert.equal(mapCodexHookEventToOmxEvent("UserPromptSubmit"), "keyword-detector");
@@ -6885,6 +6950,145 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("clears stale root skill-active state when current session ralplan is terminal", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-root-skill-terminal-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-terminal-ralplan";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "completed",
+                lifecycle_outcome: "finished",
+                run_outcome: "finish",
+                final_artifact: "proposed_plan",
+            });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: true,
+                skill: "ultrawork",
+                phase: "planning",
+                source: "keyword-detector",
+                active_skills: [
+                    { skill: "ultrawork", phase: "planning", active: true },
+                ],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-stop-terminal-ralplan",
+                turn_id: "turn-stop-terminal-ralplan-1",
+                last_assistant_message: "Done.",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+            const rootSkillState = JSON.parse(await readFile(join(stateDir, "skill-active-state.json"), "utf-8"));
+            assert.equal(rootSkillState.active, false);
+            assert.deepEqual(rootSkillState.active_skills, []);
+            assert.equal(rootSkillState.reconciliation_reason, "stop_hook_session_state_terminal");
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("preserves legitimate session-scoped ultrawork blocking while reconciling root skill-active state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-active-root-skill-session-mode-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-active-ultrawork";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "sessions", sessionId, "ultrawork-state.json"), {
+                active: true,
+                mode: "ultrawork",
+                current_phase: "executing",
+                session_id: sessionId,
+            });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: true,
+                skill: "ultrawork",
+                phase: "planning",
+                source: "keyword-detector",
+                active_skills: [
+                    { skill: "ultrawork", phase: "planning", active: true, session_id: sessionId },
+                ],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-stop-active-ultrawork",
+                turn_id: "turn-stop-active-ultrawork-1",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.deepEqual(result.outputJson, {
+                decision: "block",
+                reason: "OMX ultrawork is still active (phase: executing); continue the task and gather fresh verification evidence before stopping.",
+                stopReason: "ultrawork_executing",
+                systemMessage: "OMX ultrawork is still active (phase: executing).",
+            });
+            const rootSkillState = JSON.parse(await readFile(join(stateDir, "skill-active-state.json"), "utf-8"));
+            assert.equal(rootSkillState.active, true);
+            assert.deepEqual(rootSkillState.active_skills?.map((entry) => entry.skill), ["ultrawork"]);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("reconciles stale root skill-active state under OMX_ROOT boxed state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-boxed-source-"));
+        const omxRoot = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-boxed-root-"));
+        const previousOmxRoot = process.env.OMX_ROOT;
+        try {
+            process.env.OMX_ROOT = omxRoot;
+            const stateDir = join(omxRoot, ".omx", "state");
+            const sourceStateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-boxed-ralplan";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "completed",
+                lifecycle_outcome: "finished",
+                run_outcome: "finish",
+            });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: true,
+                skill: "ultrawork",
+                phase: "planning",
+                source: "keyword-detector",
+                active_skills: [
+                    { skill: "ultrawork", phase: "planning", active: true },
+                ],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-stop-boxed-ralplan",
+                turn_id: "turn-stop-boxed-ralplan-1",
+                last_assistant_message: "Done.",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+            const boxedRootSkillState = JSON.parse(await readFile(join(stateDir, "skill-active-state.json"), "utf-8"));
+            assert.equal(boxedRootSkillState.active, false);
+            assert.deepEqual(boxedRootSkillState.active_skills, []);
+            assert.equal(boxedRootSkillState.reconciliation_reason, "stop_hook_session_state_terminal");
+            assert.equal(existsSync(join(sourceStateDir, "skill-active-state.json")), false);
+        }
+        finally {
+            if (previousOmxRoot === undefined)
+                delete process.env.OMX_ROOT;
+            else
+                process.env.OMX_ROOT = previousOmxRoot;
+            await rm(cwd, { recursive: true, force: true });
+            await rm(omxRoot, { recursive: true, force: true });
+        }
+    });
     it("auto-continues native Stop for permission-seeking prompts even outside OMX runtime", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-auto-nudge-plain-session-"));
         try {