nterminal 1.3.5 → 1.3.6

package/dist/server/hooks/codexAppServer.js

@@ -0,0 +1,170 @@
+import { spawn } from 'node:child_process';
+import { constants } from 'node:fs';
+import { access, stat } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { HookControlError } from './hookFiles.js';
+const DEFAULT_MAX_OUTPUT = 8 * 1024 * 1024;
+const EXIT_GRACE_MS = 1_000;
+// Only daemon-internal or test-only variables that could attach this process to
+// daemon lifecycle files or redirect its user config. The user's own settings
+// (PATH, HOME, proxies, CODEX_* overrides) are otherwise inherited unchanged,
+// exactly like a `codex` started from the NTerminal runtime.
+const SCRUBBED_ENV = ['CODEX_DAEMON_SHUTDOWN_SOCKET', 'CODEX_DAEMON_SHUTDOWN_FILE', 'CODEX_DAEMON_TELEMETRY_HANDOFF',
+    'CODEX_APP_SERVER_TEST_USER_CONFIG_FILE', 'CODEX_THREAD_ID'];
+export async function withCodexAppServer(options, run) {
+    const env = { ...(options.env ?? process.env) };
+    for (const key of SCRUBBED_ENV)
+        delete env[key];
+    env.CODEX_HOME = options.codexHome;
+    env.CODEX_INTERNAL_APP_SERVER_REMOTE_CONTROL_DISABLED = '1';
+    const remaining = () => options.deadline - Date.now();
+    if (remaining() <= 0)
+        throw new HookControlError('codex_timeout');
+    // Own process group: the npm launcher forwards SIGTERM but not SIGKILL, and
+    // Codex may start helpers (plugin sync, sandbox probe). Cleanup kills the group.
+    const group = process.platform !== 'win32';
+    const child = spawn(options.executable, ['app-server', '--listen', 'stdio://'], {
+        cwd: options.cwd, env, stdio: ['pipe', 'pipe', 'pipe'], detached: group, windowsHide: true
+    });
+    let exited = false;
+    const exitPromise = new Promise((resolve) => {
+        child.once('exit', () => { exited = true; resolve(); });
+        child.once('error', () => { exited = true; resolve(); });
+    });
+    const kill = () => {
+        if (group && typeof child.pid === 'number') {
+            try {
+                process.kill(-child.pid, 'SIGKILL');
+                return;
+            }
+            catch { /* group already gone */ }
+        }
+        try {
+            child.kill('SIGKILL');
+        }
+        catch { /* already exited */ }
+    };
+    const pending = new Map();
+    let failure = null;
+    const fail = (code) => {
+        if (failure)
+            return;
+        failure = new HookControlError(code);
+        for (const entry of pending.values())
+            entry.reject(failure);
+        pending.clear();
+    };
+    const write = (message) => {
+        if (failure || !child.stdin || child.stdin.destroyed)
+            return;
+        child.stdin.write(JSON.stringify(message) + '\n');
+    };
+    child.once('error', (error) => fail(['ENOENT', 'EACCES', 'ENOEXEC'].includes(error.code ?? '') ? 'codex_unavailable' : 'codex_rpc_failed'));
+    child.once('exit', () => fail('codex_rpc_failed'));
+    child.stdin?.on('error', () => fail('codex_rpc_failed'));
+    // stderr carries Codex's logs; drain it without retaining or forwarding content.
+    child.stderr?.resume();
+    let received = 0;
+    let buffer = '';
+    child.stdout?.setEncoding('utf8');
+    child.stdout?.on('data', (chunk) => {
+        received += Buffer.byteLength(chunk);
+        if (received > (options.maxOutputBytes ?? DEFAULT_MAX_OUTPUT)) {
+            fail('codex_rpc_failed');
+            kill();
+            return;
+        }
+        buffer += chunk;
+        for (let index = buffer.indexOf('\n'); index >= 0; index = buffer.indexOf('\n')) {
+            const line = buffer.slice(0, index).trim();
+            buffer = buffer.slice(index + 1);
+            if (line)
+                handle(line);
+        }
+    });
+    const handle = (line) => {
+        let message;
+        try {
+            message = JSON.parse(line);
+        }
+        catch {
+            fail('codex_rpc_failed');
+            return;
+        }
+        if (!message || typeof message !== 'object' || Array.isArray(message))
+            return;
+        const value = message;
+        if (value.id !== undefined && typeof value.method === 'string') {
+            // A server-initiated request: this client offers no capabilities.
+            write({ id: value.id, error: { code: -32601, message: 'unsupported by this client' } });
+            return;
+        }
+        if (typeof value.id !== 'number')
+            return; // notification
+        const entry = pending.get(value.id);
+        if (!entry)
+            return;
+        pending.delete(value.id);
+        if (value.error !== undefined)
+            entry.reject(new HookControlError('codex_rpc_failed'));
+        else
+            entry.resolve(value.result);
+    };
+    let nextId = 0;
+    const request = (method, params) => {
+        if (failure)
+            return Promise.reject(failure);
+        const id = ++nextId;
+        return new Promise((resolve, reject) => {
+            pending.set(id, { resolve, reject });
+            write(params === undefined ? { id, method } : { id, method, params });
+        });
+    };
+    let timer;
+    const timeout = new Promise((_resolve, reject) => {
+        timer = setTimeout(() => { fail('codex_timeout'); kill(); reject(failure); }, Math.max(0, remaining()));
+    });
+    try {
+        // hooks/list and config/batchWrite are stable methods: no experimentalApi opt-in.
+        await Promise.race([request('initialize', { clientInfo: { name: 'nterminal', title: 'NTerminal', version: '1' } }), timeout]);
+        write({ method: 'initialized' });
+        return await Promise.race([run(request), timeout]);
+    }
+    finally {
+        clearTimeout(timer);
+        fail('codex_rpc_failed'); // reject stragglers; no-op when a failure is already recorded
+        try {
+            child.stdin?.end();
+        }
+        catch { /* already closed */ }
+        // A clean exit flushes Codex's own state; never wait past the grace period.
+        if (!exited)
+            await Promise.race([exitPromise, new Promise((resolve) => setTimeout(resolve, EXIT_GRACE_MS).unref())]);
+        kill(); // always: also removes helpers left in the group
+        child.stdout?.destroy();
+        child.stderr?.destroy();
+    }
+}
+/**
+ * The `codex` a user's shell would run: the first executable `codex` on PATH,
+ * then common per-user install locations a service PATH may lack.
+ */
+export async function resolveCodexExecutable(env = process.env, home = os.homedir()) {
+    const directories = (env.PATH ?? '').split(path.delimiter).filter((entry) => path.isAbsolute(entry));
+    directories.push(path.join(home, '.npm-global', 'bin'), path.join(home, '.local', 'bin'), '/usr/local/bin', '/opt/homebrew/bin');
+    const names = process.platform === 'win32' ? ['codex.cmd', 'codex.exe', 'codex'] : ['codex'];
+    for (const directory of new Set(directories))
+        for (const name of names) {
+            const candidate = path.join(directory, name);
+            try {
+                if (!(await stat(candidate)).isFile())
+                    continue;
+                await access(candidate, constants.X_OK);
+                return candidate;
+            }
+            catch { /* next candidate */ }
+        }
+    return null;
+}
+//# sourceMappingURL=codexAppServer.js.map

package/dist/server/hooks/codexAppServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codexAppServer.js","sourceRoot":"","sources":["../../../src/server/hooks/codexAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA4BlD,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAC3C,MAAM,aAAa,GAAG,KAAK,CAAC;AAC5B,gFAAgF;AAChF,8EAA8E;AAC9E,8EAA8E;AAC9E,6DAA6D;AAC7D,MAAM,YAAY,GAAG,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,gCAAgC;IAClH,wCAAwC,EAAE,iBAAiB,CAAC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAI,OAA8B,EAAE,GAA0C;IACpH,MAAM,GAAG,GAAsB,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;IACnE,KAAK,MAAM,GAAG,IAAI,YAAY;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IAChD,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IACnC,GAAG,CAAC,iDAAiD,GAAG,GAAG,CAAC;IAC5D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACtD,IAAI,SAAS,EAAE,IAAI,CAAC;QAAE,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAElE,4EAA4E;IAC5E,iFAAiF;IACjF,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE;QAC9E,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI;KAC3F,CAAC,CAAC;IACH,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAChD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC3C,IAAI,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAAC,OAAO;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACzF,CAAC;QACD,IAAI,CAAC;YAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmF,CAAC;IAC3G,IAAI,OAAO,GAA4B,IAAI,CAAC;IAC5C,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE;QAC5B,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;YAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5D,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAE,EAAE;QACjC,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS;YAAE,OAAO;QAC7D,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnK,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnD,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzD,iFAAiF;IACjF,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACzC,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,QAAQ,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,kBAAkB,CAAC,EAAE,CAAC;YAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAAC,IAAI,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC5G,MAAM,IAAI,KAAK,CAAC;QAChB,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACjC,IAAI,IAAI;gBAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;QAC9B,IAAI,OAAgB,CAAC;QACrB,IAAI,CAAC;YAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QAC/E,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,OAAO;QAC9E,MAAM,KAAK,GAAG,OAAgF,CAAC;QAC/F,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/D,kEAAkE;YAClE,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,EAAE,CAAC,CAAC;YACxF,OAAO;QACT,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ;YAAE,OAAO,CAAC,eAAe;QACzD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;;YACjF,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,OAAO,GAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;QAC/C,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACrC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,KAAiC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACtD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC1G,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,kFAAkF;QAClF,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9H,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QACjC,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,8DAA8D;QACxF,IAAI,CAAC;YAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAC1D,4EAA4E;QAC5E,IAAI,CAAC,MAAM;YAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QACrH,IAAI,EAAE,CAAC,CAAC,iDAAiD;QACzD,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAAyB,OAAO,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE;IACpG,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACrG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IACjI,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7F,KAAK,MAAM,SAAS,IAAI,IAAI,GAAG,CAAC,WAAW,CAAC;QAAE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC;gBACH,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE;oBAAE,SAAS;gBAChD,MAAM,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBACxC,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAClC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/server/hooks/codexTrust.d.ts

@@ -0,0 +1,72 @@
+/**
+ * Native Codex trust for NTerminal's own hooks, performed exactly like Codex's
+ * `/hooks` screen (codex-rs/tui/src/hooks_rpc.rs): `hooks/list` reports each
+ * hook's key, `currentHash`, and `trustStatus`; `config/batchWrite` upserts
+ * `hooks.state."<key>".trusted_hash = <currentHash>` into the user config.toml.
+ * NTerminal never computes a hash or edits a trust entry itself.
+ */
+export interface CodexHookTrust {
+    /** NTerminal hook definitions recorded in the installation manifest. */
+    total: number;
+    /** Hooks this operation marked as trusted. */
+    trusted: number;
+    alreadyTrusted: number;
+    /** NTerminal hooks still untrusted or modified after the operation. */
+    pending: number;
+    /** Other hooks Codex listed (including the same hooks.json); never changed. */
+    skipped: number;
+    /** Events whose NTerminal hook was missing, ambiguous, managed, or failed verification. */
+    mismatches?: string[];
+    reason?: string;
+    checkedAt: string;
+}
+export interface ExpectedCodexHook {
+    /** hooks.json event name, e.g. `PreToolUse`. */
+    event: string;
+    command: string;
+    async: boolean;
+    timeoutSec: number;
+    matcher: string | null;
+}
+interface ListedHook {
+    key: string;
+    eventName: string;
+    handlerType: string;
+    command: string | null;
+    async: boolean;
+    matcher: string | null;
+    timeoutSec: number;
+    sourcePath: string;
+    source: string;
+    isManaged: boolean;
+    currentHash: string;
+    trustStatus: string;
+}
+export interface CodexTrustRun {
+    executable: string;
+    codexHome: string;
+    /** Symlink-resolved hooks.json NTerminal installed into. */
+    configPath: string;
+    expected: ExpectedCodexHook[];
+    write: boolean;
+    deadline: number;
+    env?: NodeJS.ProcessEnv | undefined;
+}
+export declare function runCodexTrust(run: CodexTrustRun): Promise<CodexHookTrust>;
+export declare function parseHooksList(result: unknown): ListedHook[];
+/**
+ * NTerminal's hooks are exactly: listed from NTerminal's hooks.json (realpath
+ * comparison), a user-layer command hook that is not managed, for an event
+ * NTerminal installed, whose command, async flag, timeout, and matcher equal
+ * the recorded definition, occurring exactly once. Everything else is skipped.
+ */
+export declare function selectOwnedHooks(listed: ListedHook[], expected: ExpectedCodexHook[], configPath: string): Promise<{
+    owned: ListedHook[];
+    mismatches: string[];
+    skipped: number;
+}>;
+export declare function expectedCodexHooks(entries: Array<{
+    event: string;
+    group: Record<string, unknown>;
+}>): ExpectedCodexHook[];
+export {};

package/dist/server/hooks/codexTrust.js

@@ -0,0 +1,116 @@
+import { realpath } from 'node:fs/promises';
+import path from 'node:path';
+import { HookControlError } from './hookFiles.js';
+import { withCodexAppServer } from './codexAppServer.js';
+export async function runCodexTrust(run) {
+    // Any cwd sees the user layer; CODEX_HOME always exists (it holds hooks.json)
+    // and is not a project root, so no project hooks are mixed in.
+    const cwd = run.codexHome;
+    return withCodexAppServer({ executable: run.executable, codexHome: run.codexHome, cwd, deadline: run.deadline, env: run.env }, async (request) => {
+        const list = async () => parseHooksList(await request('hooks/list', { cwds: [cwd] }));
+        const selection = await selectOwnedHooks(await list(), run.expected, run.configPath);
+        const base = { total: run.expected.length, skipped: selection.skipped, checkedAt: new Date().toISOString() };
+        if (selection.mismatches.length) {
+            return { ...base, trusted: 0, alreadyTrusted: countStatus(selection.owned, 'trusted'),
+                pending: run.expected.length - countStatus(selection.owned, 'trusted'), mismatches: selection.mismatches, reason: 'hooks_not_listed' };
+        }
+        const needed = selection.owned.filter((hook) => hook.trustStatus === 'untrusted' || hook.trustStatus === 'modified');
+        const alreadyTrusted = countStatus(selection.owned, 'trusted');
+        if (!run.write || needed.length === 0) {
+            return { ...base, trusted: 0, alreadyTrusted, pending: needed.length };
+        }
+        await writeTrust(request, needed);
+        const after = await list();
+        const mismatches = needed.filter((hook) => {
+            const current = after.find((entry) => entry.key === hook.key);
+            return !current || current.trustStatus !== 'trusted' || current.currentHash !== hook.currentHash;
+        }).map((hook) => eventFromKey(hook));
+        const trusted = needed.length - mismatches.length;
+        return { ...base, trusted, alreadyTrusted, pending: mismatches.length,
+            ...(mismatches.length ? { mismatches, reason: 'verification_failed' } : {}) };
+    });
+}
+/** Exactly the TUI's payload: one upsert of `hooks.state` into the user config.toml. */
+async function writeTrust(request, hooks) {
+    const value = Object.fromEntries(hooks.map((hook) => [hook.key, { trusted_hash: hook.currentHash }]));
+    await request('config/batchWrite', {
+        edits: [{ keyPath: 'hooks.state', value, mergeStrategy: 'upsert' }],
+        filePath: null, expectedVersion: null, reloadUserConfig: true
+    });
+}
+export function parseHooksList(result) {
+    const invalid = () => new HookControlError('codex_rpc_failed');
+    if (!record(result) || !Array.isArray(result.data))
+        throw invalid();
+    const hooks = [];
+    for (const entry of result.data) {
+        if (!record(entry) || !Array.isArray(entry.hooks))
+            throw invalid();
+        for (const hook of entry.hooks) {
+            if (!record(hook) || typeof hook.key !== 'string' || typeof hook.eventName !== 'string'
+                || typeof hook.sourcePath !== 'string' || typeof hook.currentHash !== 'string' || typeof hook.trustStatus !== 'string')
+                throw invalid();
+            hooks.push({
+                key: hook.key, eventName: hook.eventName, handlerType: typeof hook.handlerType === 'string' ? hook.handlerType : '',
+                command: typeof hook.command === 'string' ? hook.command : null, async: hook.async === true,
+                matcher: typeof hook.matcher === 'string' ? hook.matcher : null,
+                timeoutSec: typeof hook.timeoutSec === 'number' ? hook.timeoutSec : -1,
+                sourcePath: hook.sourcePath, source: typeof hook.source === 'string' ? hook.source : '',
+                isManaged: hook.isManaged !== false, currentHash: hook.currentHash, trustStatus: hook.trustStatus
+            });
+        }
+    }
+    // hooks/list returns one entry per requested cwd; the same hook may repeat.
+    return hooks.filter((hook, index) => hooks.findIndex((other) => other.key === hook.key) === index);
+}
+/**
+ * NTerminal's hooks are exactly: listed from NTerminal's hooks.json (realpath
+ * comparison), a user-layer command hook that is not managed, for an event
+ * NTerminal installed, whose command, async flag, timeout, and matcher equal
+ * the recorded definition, occurring exactly once. Everything else is skipped.
+ */
+export async function selectOwnedHooks(listed, expected, configPath) {
+    const target = await resolve(configPath);
+    const inFile = [];
+    for (const hook of listed)
+        if (path.isAbsolute(hook.sourcePath) && await resolve(hook.sourcePath) === target)
+            inFile.push(hook);
+    const owned = [];
+    const mismatches = [];
+    for (const definition of expected) {
+        const candidates = inFile.filter((hook) => hook.eventName === camelEvent(definition.event)
+            && hook.handlerType === 'command' && hook.command === definition.command);
+        const exact = candidates.filter((hook) => hook.async === definition.async && hook.timeoutSec === definition.timeoutSec
+            && hook.matcher === definition.matcher && hook.source === 'user' && !hook.isManaged && hook.trustStatus !== 'managed'
+            && hook.key.startsWith(`${hook.sourcePath}:`) && hook.currentHash.length > 0);
+        if (candidates.length !== 1 || exact.length !== 1 || owned.includes(exact[0]))
+            mismatches.push(definition.event);
+        else
+            owned.push(exact[0]);
+    }
+    return { owned, mismatches, skipped: listed.length - owned.length };
+}
+/** `SessionStart` -> `sessionStart`, the app-server's camelCase HookEventName. */
+function camelEvent(event) { return event.charAt(0).toLowerCase() + event.slice(1); }
+function eventFromKey(hook) { return hook.eventName.charAt(0).toUpperCase() + hook.eventName.slice(1); }
+function countStatus(hooks, status) { return hooks.filter((hook) => hook.trustStatus === status).length; }
+function record(value) { return value !== null && typeof value === 'object' && !Array.isArray(value); }
+async function resolve(file) {
+    try {
+        return await realpath(file);
+    }
+    catch {
+        return path.resolve(file);
+    }
+}
+export function expectedCodexHooks(entries) {
+    return entries.flatMap(({ event, group }) => {
+        const matcher = typeof group.matcher === 'string' && group.matcher !== '' ? group.matcher : null;
+        const handlers = Array.isArray(group.hooks) ? group.hooks : [];
+        return handlers.filter((hook) => hook.type === 'command' && typeof hook.command === 'string').map((hook) => ({
+            event, command: hook.command, async: hook.async === true,
+            timeoutSec: typeof hook.timeout === 'number' ? hook.timeout : 600, matcher
+        }));
+    });
+}
+//# sourceMappingURL=codexTrust.js.map

package/dist/server/hooks/codexTrust.js.map

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

package/dist/server/hooks/hookInstallation.d.ts

@@ -1,3 +1,5 @@
+import { type CodexHookTrust } from './codexTrust.js';
+export type { CodexHookTrust } from './codexTrust.js';
 export type HookProvider = 'codex' | 'claude';
 export interface ProviderHookInstallation {
     provider: HookProvider;
@@ -10,7 +12,15 @@ export interface ProviderHookInstallation {
     unsafePath?: string;
     /** Non-fatal, bounded reason codes that can explain why installed hooks may not run. */
     warnings?: string[];
+    /** Installed Codex hooks: how many NTerminal definitions exist and the helper command they run. */
+    hookCount?: number;
+    hookCommand?: string;
+    /** Codex's own trust report, from the last trust operation or check while the files are unchanged. */
+    trust?: CodexHookTrust;
 }
+export type CodexHookTrustResult = ProviderHookInstallation & {
+    trust: CodexHookTrust;
+};
 export interface HookInstallationOptions {
     stateDir: string;
     homeDir?: string;
@@ -29,6 +39,12 @@ export interface HookInstallationOptions {
     /** Read-only managed policy locations; isolated tests provide synthetic directories. */
     codexSystemDir?: string;
     claudeManagedDir?: string;
+    /** Codex CLI for trust operations; default: `codex` resolved like the user's shell PATH. */
+    codexExecutable?: string;
+    /** Environment for the short-lived Codex app-server (tests); default: process.env. */
+    codexEnv?: NodeJS.ProcessEnv;
+    /** Hard limit for one Codex app-server session, including startup. */
+    codexTimeoutMs?: number;
 }
 export interface ManagedHelperRefresh {
     updated: boolean;
@@ -45,6 +61,9 @@ export declare class HookInstallation {
     private readonly nodeExecutable;
     private readonly homes;
     private resolved;
+    /** Last successful Codex trust report, valid only while hooks.json, config.toml, and the manifest are unchanged. */
+    private codexTrustCache;
+    private codexTrustCheck;
     constructor(options: HookInstallationOptions);
     /**
      * Resolve symlinks once per operation. The receiver authenticates the helper
@@ -56,6 +75,16 @@ export declare class HookInstallation {
     status(provider: HookProvider): Promise<ProviderHookInstallation>;
     install(provider: HookProvider): Promise<ProviderHookInstallation>;
     remove(provider: HookProvider): Promise<ProviderHookInstallation>;
+    /**
+     * After explicit operator confirmation: ask Codex (a private, short-lived
+     * `codex app-server`) to trust exactly NTerminal's installed hooks, as
+     * pressing Trust in `/hooks` would. Serialized with install/remove.
+     */
+    trustCodexHooks(): Promise<CodexHookTrustResult>;
+    /** Read-only `hooks/list` report, reused while the relevant files are unchanged. */
+    checkCodexTrust(): Promise<CodexHookTrustResult>;
+    private codexTrust;
+    private codexFingerprint;
     refreshManagedHelper(): Promise<ManagedHelperRefresh>;
     private helperReferenced;
     private displayPaths;

package/dist/server/hooks/hookInstallation.js

@@ -6,6 +6,9 @@ import { fileURLToPath } from 'node:url';
 import { HookControlError as InstallationError, ensureDirectory, missing, snapshot, replace } from './hookFiles.js';
 import { acquireVerifiedLock } from './verifiedLock.js';
 import { HelperJournal } from './helperJournal.js';
+import { resolveCodexExecutable } from './codexAppServer.js';
+import { expectedCodexHooks, runCodexTrust } from './codexTrust.js';
+import { createHash } from 'node:crypto';
 // Subagent events are not registered: the runtime ignores child lifecycle events.
 const CODEX_EVENTS = ['SessionStart', 'UserPromptSubmit', 'PreToolUse', 'PostToolUse', 'PermissionRequest', 'Stop', 'Interrupt', 'SessionEnd'];
 const CLAUDE_EVENTS = ['SessionStart', 'UserPromptSubmit', 'PreToolUse', 'PostToolUse', 'PermissionRequest', 'Stop', 'StopFailure', 'PostToolUseFailure', 'Notification', 'SessionEnd'];
@@ -32,6 +35,9 @@ export class HookInstallation {
     nodeExecutable;
     homes;
     resolved = {};
+    /** Last successful Codex trust report, valid only while hooks.json, config.toml, and the manifest are unchanged. */
+    codexTrustCache = null;
+    codexTrustCheck = null;
     constructor(options) {
         this.options = options;
         const home = options.homeDir ?? os.homedir();
@@ -128,8 +134,19 @@ export class HookInstallation {
             catch {
                 return finish({ ...result, reason: 'node_unavailable' });
             }
-            return finish({ ...result, installed: true, ...(disabled ? { reason: 'hooks_disabled' }
-                    : provider === 'codex' ? { reason: 'approval_unknown' } : {}) });
+            if (provider === 'claude')
+                return finish({ ...result, installed: true, ...(disabled ? { reason: 'hooks_disabled' } : {}) });
+            const expected = expectedCodexHooks(manifest.entries);
+            const commands = [...new Set(expected.map((hook) => hook.command))];
+            const codex = { ...result, installed: true, hookCount: expected.length, ...(commands.length === 1 ? { hookCommand: commands[0] } : {}) };
+            if (disabled)
+                return finish({ ...codex, reason: 'hooks_disabled' });
+            // Cheap: reuse Codex's last report only while every input file is byte-identical.
+            const trust = this.codexTrustCache && this.codexTrustCache.fingerprint === await this.codexFingerprint(context)
+                ? this.codexTrustCache.trust : null;
+            if (!trust)
+                return finish({ ...codex, reason: 'approval_unknown' });
+            return finish({ ...codex, approvalRequired: trust.pending > 0, trust, ...(trust.pending > 0 ? { reason: 'approval_required' } : {}) });
         }
         catch (error) {
             return { ...display, ...failure(error) };
@@ -141,6 +158,85 @@ export class HookInstallation {
     async remove(provider) {
         return this.change(provider, true);
     }
+    /**
+     * After explicit operator confirmation: ask Codex (a private, short-lived
+     * `codex app-server`) to trust exactly NTerminal's installed hooks, as
+     * pressing Trust in `/hooks` would. Serialized with install/remove.
+     */
+    async trustCodexHooks() {
+        return this.codexTrust(true);
+    }
+    /** Read-only `hooks/list` report, reused while the relevant files are unchanged. */
+    async checkCodexTrust() {
+        if (this.codexTrustCheck)
+            return this.codexTrustCheck;
+        this.codexTrustCheck = this.codexTrust(false).finally(() => { this.codexTrustCheck = null; });
+        return this.codexTrustCheck;
+    }
+    async codexTrust(write) {
+        const report = (reason, total = 0) => ({ total, trusted: 0, alreadyTrusted: 0, pending: total, skipped: 0, reason, checkedAt: new Date().toISOString() });
+        if (this.options.previewMode)
+            return { ...this.result('codex'), reason: 'preview_mode', trust: report('preview_mode') };
+        const releases = [];
+        let trust;
+        try {
+            await this.prepare();
+            const context = this.context('codex');
+            if (!await snapshot(context.manifestPath))
+                return { ...await this.status('codex'), trust: report('hooks_not_installed') };
+            if (write) {
+                releases.push((await acquireVerifiedLock(path.join(this.hooksDir, '.installation.lock'), this.options.procRoot, this.options.machineIdPath)).release);
+                releases.push((await acquireVerifiedLock(path.join(path.dirname(context.configPath), '.nterminal-hooks.lock'), this.options.procRoot, this.options.machineIdPath)).release);
+            }
+            else {
+                const cached = this.codexTrustCache;
+                if (cached && cached.fingerprint === await this.codexFingerprint(context))
+                    return { ...await this.status('codex'), trust: cached.trust };
+            }
+            const status = await this.status('codex');
+            const manifest = await this.manifest(context);
+            if (!status.installed || !manifest) {
+                trust = report(status.reason && status.reason !== 'approval_unknown' ? status.reason : 'hooks_not_installed');
+            }
+            else if (status.reason === 'hooks_disabled') {
+                trust = report('hooks_disabled', status.hookCount);
+            }
+            else {
+                const expected = expectedCodexHooks(manifest.entries);
+                const env = this.options.codexEnv ?? process.env;
+                const executable = this.options.codexExecutable ?? await resolveCodexExecutable(env, this.options.homeDir ?? os.homedir());
+                if (!executable)
+                    trust = report('codex_unavailable', expected.length);
+                else {
+                    try {
+                        // The same CODEX_HOME the installer used, as configured (Codex's trust keys embed this path).
+                        trust = await runCodexTrust({ executable, codexHome: this.homes.codex, configPath: context.configPath, expected, write,
+                            deadline: Date.now() + (this.options.codexTimeoutMs ?? 10_000), env });
+                    }
+                    catch (error) {
+                        trust = report(errorCode(error), expected.length);
+                    }
+                    this.codexTrustCache = trust.reason ? null : { fingerprint: await this.codexFingerprint(context), trust };
+                }
+            }
+            return { ...await this.status('codex'), trust };
+        }
+        catch (error) {
+            return { ...await this.status('codex'), trust: report(errorCode(error)) };
+        }
+        finally {
+            for (const release of releases.reverse())
+                await release();
+        }
+    }
+    async codexFingerprint(context) {
+        const hash = createHash('sha256').update(this.homes.codex);
+        for (const file of [context.configPath, context.notifyPath, context.manifestPath]) {
+            const saved = file ? await snapshot(file) : null;
+            hash.update('\0').update(saved ? saved.text : '<missing>');
+        }
+        return hash.digest('hex');
+    }
     async refreshManagedHelper() {
         if (this.options.previewMode)
             return { updated: false, reason: 'preview_mode' };