cyrus-codex-runner 0.2.73 → 0.2.74-cypack1546.0

package/dist/backend/ContainedCodexProcess.js

@@ -0,0 +1,306 @@
+import { spawn } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { AppServerClient } from "./appServerClient.js";
+// Runs inside the isolated container. The only bridge is framed stdio; its HTTP
+// server is in the container's network-none namespace, never a host listener.
+const relay = String.raw `
+const http = require('node:http'), cp = require('node:child_process'), readline = require('node:readline'), fs = require('node:fs');
+fs.mkdirSync('/work/home/.codex', {recursive:true,mode:448});
+const pending = new Map(); let sequence=0, child;
+function emit(value) { process.stdout.write(JSON.stringify(value)+'\n'); }
+const server = http.createServer(async (req,res) => {
+ if(req.method!=='POST'||req.url!=='/responses'||pending.size>=2){res.writeHead(403);res.end();return;}
+ const chunks=[];let size=0;
+ try { for await(const part of req){size+=part.length;if(size>2000000)throw Error();chunks.push(part);} }
+ catch {res.writeHead(413);res.end();return;}
+ const id='cyrus-model-'+(++sequence);
+ const timer=setTimeout(()=>{pending.delete(id);res.writeHead(504);res.end();},60000);
+ pending.set(id,{res,timer});
+ emit({id,method:'cyrus/model',params:{body:Buffer.concat(chunks).toString('utf8')}});
+});
+server.listen(0,'127.0.0.1',()=>{
+ const base='http://127.0.0.1:'+server.address().port;
+ const config={model_provider:'cyrus_contained',model_providers:{cyrus_contained:{name:'Cyrus scoped model broker',base_url:base,wire_api:'responses',requires_openai_auth:false,supports_websockets:false,request_max_retries:0,stream_max_retries:0}},web_search:'disabled',mcp_servers:{},analytics:{enabled:false},features:{shell_tool:false,unified_exec:false,multi_agent:false,goals:false,apps:false,plugins:false,hooks:false,remote_plugin:false,skill_search:false,skill_mcp_dependency_install:false,memories:false,external_agent_memory_import:false,browser_use:false,browser_use_external:false,computer_use:false,image_generation:false,code_mode_host:false,workspace_dependencies:false,sleep_tool:false},cli_auth_credentials_store:'ephemeral'};
+ const args=['app-server','--listen','stdio://'];
+ // TOML overrides for fixed supervisor settings only. Never merge user config.
+ for(const [k,v] of Object.entries(config)) {
+  if(k==='model_providers') {
+   for(const [field,value] of Object.entries(v.cyrus_contained))args.push('-c','model_providers.cyrus_contained.'+field+'='+JSON.stringify(value));
+  } else if(typeof v==='object') {
+   for(const [field,value] of Object.entries(v))args.push('-c',k+'.'+field+'='+JSON.stringify(value));
+  } else args.push('-c',k+'='+JSON.stringify(v));
+ }
+ child=cp.spawn('/usr/local/bin/codex',args,{cwd:'/work',env:{PATH:'/usr/local/bin:/usr/bin:/bin',HOME:'/work/home',CODEX_HOME:'/work/home/.codex'},stdio:['pipe','pipe','pipe']});
+ child.stdout.pipe(process.stdout); child.stderr.resume();
+ child.on('error',()=>process.exit(70));child.on('exit',()=>process.exit(0));
+ const input=readline.createInterface({input:process.stdin});let bytes=0;
+ input.on('line',line=>{
+  bytes+=Buffer.byteLength(line);if(line.length>8000000||bytes>64000000)process.exit(71);
+  let message;try{message=JSON.parse(line);}catch{process.exit(72);}
+  if(typeof message.id==='string'&&message.id.startsWith('cyrus-model-')) {
+   const p=pending.get(message.id);if(!p)return;pending.delete(message.id);clearTimeout(p.timer);
+   const r=message.result;
+   if(!r||typeof r.body!=='string'||r.body.length>8000000||!Number.isInteger(r.status)){p.res.writeHead(502);p.res.end();return;}
+   p.res.writeHead(r.status,{'content-type':r.contentType==='text/event-stream'?'text/event-stream':'application/json'});p.res.end(Buffer.from(r.body,'base64'));
+  } else child.stdin.write(line+'\n');
+ });
+ input.on('close',()=>process.exit(0));
+});
+`;
+/** Dedicated process, empty home, no mounts/network/credentials; never uses the
+ * ordinary shared app-server pool. Container data is untrusted at the bridge. */
+export class ContainedCodexProcess {
+    config;
+    name = `cyrus-codex-${randomUUID()}`;
+    client;
+    stopped = false;
+    started = false;
+    initialized = false;
+    closing;
+    requests = new Set();
+    constructor(config) {
+        this.config = config;
+        if (!/^sha256:[a-f0-9]{64}$/.test(config.image) ||
+            !config.dockerPath.startsWith("/") ||
+            !config.dockerHost.startsWith("unix:///"))
+            throw new Error("Contained Codex requires a local immutable image and Docker socket");
+    }
+    command(args, signal) {
+        return new Promise((resolve, reject) => {
+            const child = spawn(this.config.dockerPath, ["--host", this.config.dockerHost, ...args], {
+                env: { PATH: "/usr/bin:/bin", HOME: "/nonexistent" },
+                stdio: ["ignore", "pipe", "pipe"],
+                signal,
+            });
+            let output = "", size = 0;
+            const timer = setTimeout(() => child.kill("SIGKILL"), 15000);
+            child.stdout.on("data", (part) => {
+                size += part.length;
+                if (size > 1000000)
+                    child.kill("SIGKILL");
+                else
+                    output += part.toString();
+            });
+            child.stderr.resume();
+            child.on("error", () => {
+                clearTimeout(timer);
+                reject(new Error("Contained Codex Docker operation failed"));
+            });
+            child.on("close", (code) => {
+                clearTimeout(timer);
+                if (code === 0 && size <= 1000000)
+                    resolve(output);
+                else
+                    reject(new Error("Contained Codex Docker operation failed"));
+            });
+        });
+    }
+    async start(options) {
+        if (this.started || this.stopped)
+            throw new Error("Contained Codex process cannot be reused");
+        this.started = true;
+        const info = JSON.parse(await this.command(["image", "inspect", this.config.image], options.signal));
+        if (info.length !== 1 || Object.keys(info[0]?.Config?.Volumes ?? {}).length)
+            throw new Error("Contained image may not declare volumes");
+        if (this.stopped)
+            throw new Error("Contained process is closing");
+        const args = [
+            "--host",
+            this.config.dockerHost,
+            "run",
+            "--rm",
+            "--pull=never",
+            "--interactive",
+            "--name",
+            this.name,
+            "--network=none",
+            "--read-only",
+            "--no-healthcheck",
+            "--cap-drop=ALL",
+            "--security-opt=no-new-privileges",
+            "--pids-limit=128",
+            "--memory=768m",
+            "--cpus=1",
+            "--user=1000:1000",
+            "--workdir=/work",
+            "--tmpfs=/work:rw,nosuid,nodev,size=128m,uid=1000,gid=1000,mode=0700",
+            "--tmpfs=/tmp:rw,nosuid,nodev,size=64m,uid=1000,gid=1000,mode=0700",
+            "--entrypoint=/usr/bin/env",
+            this.config.image,
+            "-i",
+            "PATH=/usr/local/bin:/usr/bin:/bin",
+            "HOME=/work/home",
+            "/usr/local/bin/node",
+            "-e",
+            relay,
+        ];
+        const client = new AppServerClient({
+            binaryPath: this.config.dockerPath,
+            args,
+            env: { PATH: "/usr/bin:/bin", HOME: "/nonexistent" },
+            logger: { warn() { }, error() { } },
+            requestTimeoutMs: 20000,
+            maxOutputBytes: 32_000_000,
+        });
+        this.client = client;
+        let modelRequests = 0;
+        client.setNotificationHandler(options.notification);
+        client.setServerRequestHandler((method, params) => {
+            if (this.stopped)
+                throw new Error("Contained process is closing");
+            const work = (async () => {
+                options.signal.throwIfAborted();
+                if (method !== "cyrus/model")
+                    return options.request(method, params);
+                if (++modelRequests > 24 ||
+                    !params ||
+                    typeof params !== "object" ||
+                    Object.keys(params).join() !== "body" ||
+                    typeof params.body !== "string" ||
+                    Buffer.byteLength(params.body) > 2000000)
+                    throw new Error("Contained model request rejected");
+                return options.model(params, options.signal);
+            })();
+            this.requests.add(work);
+            const settled = () => this.requests.delete(work);
+            void work.then(settled, settled);
+            return work;
+        });
+        client.on("error", () => {
+            void this.close().catch(() => { });
+        });
+        const abort = () => {
+            void this.close().catch(() => { });
+        };
+        options.signal.addEventListener("abort", abort, { once: true });
+        client.on("exit", () => {
+            options.signal.removeEventListener("abort", abort);
+            options.exit?.();
+        });
+        try {
+            options.signal.throwIfAborted();
+            client.start();
+            const initialized = await client.request("initialize", {
+                clientInfo: { name: "cyrus-contained-codex", version: "1" },
+                capabilities: { experimentalApi: true },
+            });
+            if (initialized.codexHome !== "/work/home/.codex" ||
+                !initialized.userAgent.includes("/0.153.3 "))
+                throw new Error("Unsupported contained Codex protocol");
+            this.initialized = true;
+        }
+        catch {
+            await this.close();
+            throw new Error("Contained Codex initialization failed");
+        }
+    }
+    request(method, params) {
+        if (this.stopped || !this.client)
+            throw new Error("Contained Codex is unavailable");
+        return this.client.request(method, params);
+    }
+    /** Native rollout only; no auth/config/database files or host filesystem access. */
+    async snapshot(threadId) {
+        if (!/^[a-f0-9-]{36}$/.test(threadId))
+            throw new Error("Invalid native session ID");
+        const { thread } = await this.request("thread/read", { threadId, includeTurns: false });
+        if (thread.id !== threadId ||
+            typeof thread.path !== "string" ||
+            !thread.path.startsWith("/work/home/.codex/sessions/"))
+            throw new Error("Foreign native checkpoint");
+        const result = await this.request("command/exec", {
+            command: [
+                "/usr/local/bin/node",
+                "-e",
+                `const fs=require('node:fs');const p=process.argv[1];if(!fs.realpathSync(p).startsWith('/work/home/.codex/sessions/'))process.exit(1);const fd=fs.openSync(p,fs.constants.O_RDONLY|fs.constants.O_NOFOLLOW);const s=fs.fstatSync(fd);if(!s.isFile()||s.size>2000000)process.exit(2);process.stdout.write(fs.readFileSync(fd).toString('base64'));`,
+                thread.path,
+            ],
+            cwd: "/work",
+            sandboxPolicy: { type: "dangerFullAccess" },
+            timeoutMs: 5000,
+            outputBytesCap: 2700000,
+        });
+        if (result.exitCode !== 0)
+            throw new Error("Native checkpoint capture failed");
+        const snapshot = { threadId, rollout: result.stdout };
+        this.validateSnapshot(snapshot);
+        return snapshot;
+    }
+    validateSnapshot(snapshot) {
+        if (!/^[a-f0-9-]{36}$/.test(snapshot.threadId) ||
+            snapshot.rollout.length > 2700000 ||
+            !/^[A-Za-z0-9+/]+={0,2}$/.test(snapshot.rollout))
+            throw new Error("Invalid native checkpoint");
+        const bytes = Buffer.from(snapshot.rollout, "base64");
+        if (bytes.length > 2000000 || bytes.toString("base64") !== snapshot.rollout)
+            throw new Error("Invalid native checkpoint encoding");
+        const first = JSON.parse(bytes.toString("utf8").split("\n")[0]);
+        if (first.type !== "session_meta" ||
+            first.payload?.id !== snapshot.threadId ||
+            first.payload?.cwd !== "/work")
+            throw new Error("Native checkpoint identity mismatch");
+    }
+    async restore(snapshot) {
+        this.validateSnapshot(snapshot);
+        const path = `/work/home/.codex/sessions/cyrus-${snapshot.threadId}.jsonl`;
+        const result = await this.request("command/exec", {
+            command: [
+                "/usr/local/bin/node",
+                "-e",
+                `const fs=require('node:fs');fs.mkdirSync('/work/home/.codex/sessions',{recursive:true,mode:448});fs.writeFileSync(process.argv[1],Buffer.from(process.argv[2],'base64'),{flag:'wx',mode:384});`,
+                path,
+                snapshot.rollout,
+            ],
+            cwd: "/work",
+            sandboxPolicy: { type: "dangerFullAccess" },
+            timeoutMs: 5000,
+        });
+        if (result.exitCode !== 0)
+            throw new Error("Native checkpoint restore failed");
+        return path;
+    }
+    close() {
+        if (this.closing)
+            return this.closing;
+        this.stopped = true;
+        this.closing = (async () => {
+            const clientClosed = await Promise.allSettled([this.client?.close()]);
+            const containerClosed = await Promise.allSettled([
+                (async () => {
+                    if (this.started) {
+                        // --rm may already have removed it. A successful empty listing,
+                        // not a swallowed removal/daemon failure, proves absence.
+                        await this.command(["rm", "--force", this.name]).catch(() => { });
+                        const remaining = await this.command([
+                            "ps",
+                            "--all",
+                            "--quiet",
+                            "--no-trunc",
+                            "--filter",
+                            `name=^/${this.name}$`,
+                        ]);
+                        if (remaining.trim())
+                            throw new Error("Contained container cleanup unconfirmed");
+                    }
+                })(),
+            ]);
+            let timer;
+            try {
+                await Promise.race([
+                    Promise.allSettled([...this.requests]),
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => reject(new Error("Contained request cleanup unconfirmed")), 15000);
+                    }),
+                ]);
+            }
+            finally {
+                clearTimeout(timer);
+            }
+            if ((this.started && !this.initialized) ||
+                [...clientClosed, ...containerClosed].some((result) => result.status === "rejected"))
+                throw new Error("Contained process cleanup unconfirmed");
+        })();
+        return this.closing;
+    }
+}
+//# sourceMappingURL=ContainedCodexProcess.js.map

package/dist/backend/ContainedCodexProcess.js.map

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

package/dist/backend/appServerClient.d.ts

@@ -16,6 +16,10 @@ export interface AppServerClientOptions {
      * the session forever. Defaults to 60s. Set to 0 to disable.
      */
     requestTimeoutMs?: number;
+    /** Bound untrusted contained-process output, including unterminated frames. */
+    maxOutputBytes?: number;
+    /** Dedicated fenced owners require confirmed process-group termination. */
+    awaitProcessExit?: boolean;
 }
 /**
  * The slice of {@link AppServerClient} the backend depends on. Declaring it lets
@@ -49,6 +53,7 @@ export declare class AppServerClient extends EventEmitter {
     private notificationHandler;
     private serverRequestHandler;
     private closed;
+    private closing?;
     private readonly logger;
     constructor(options: AppServerClientOptions);
     setNotificationHandler(handler: NotificationHandler): void;
@@ -59,6 +64,7 @@ export declare class AppServerClient extends EventEmitter {
     private settlePending;
     notify(method: string, params: unknown): void;
     close(): Promise<void>;
+    private terminateAndWait;
     /**
      * Terminate the child and any grandchildren. On POSIX the child was spawned
      * `detached`, so it leads its own process group; signalling the negative pid

package/dist/backend/appServerClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appServerClient.d.ts","sourceRoot":"","sources":["../../src/backend/appServerClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appServerClient.d.ts","sourceRoot":"","sources":["../../src/backend/appServerClient.ts"],"names":[],"mappings":"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"}

package/dist/backend/appServerClient.js

@@ -19,6 +19,7 @@ export class AppServerClient extends EventEmitter {
     notificationHandler = null;
     serverRequestHandler = null;
     closed = false;
+    closing;
     logger;
     constructor(options) {
         super();
@@ -57,6 +58,20 @@ export class AppServerClient extends EventEmitter {
             this.failAllPending(reason);
             this.emit("exit", code, signal);
         });
+        if (this.options.maxOutputBytes !== undefined) {
+            let bytes = 0;
+            const account = (chunk) => {
+                bytes += chunk.length;
+                if (bytes > this.options.maxOutputBytes) {
+                    this.failAllPending(new Error("App-server output limit exceeded"));
+                    this.rl?.close();
+                    void this.close();
+                    this.emit("error", new Error("App-server output limit exceeded"));
+                }
+            };
+            child.stdout.on("data", account);
+            child.stderr.on("data", account);
+        }
         child.stderr.on("data", (data) => {
             const text = data.toString().trim();
             if (text) {
@@ -113,15 +128,72 @@ export class AppServerClient extends EventEmitter {
         this.write({ jsonrpc: "2.0", method, params });
     }
     async close() {
+        if (this.closing)
+            return this.closing;
         this.closed = true;
         this.rl?.close();
         this.rl = null;
         const child = this.child;
         this.child = null;
-        if (child && !child.killed) {
-            this.terminateChild(child);
-        }
         this.failAllPending(new Error("app-server client closed"));
+        this.closing = (async () => {
+            if (!child)
+                return;
+            if (this.options.awaitProcessExit)
+                await this.terminateAndWait(child);
+            else if (!child.killed)
+                this.terminateChild(child);
+        })();
+        return this.closing;
+    }
+    async terminateAndWait(child) {
+        const pid = child.pid;
+        if (!pid)
+            return; // Spawn failed; no native process was created.
+        const exited = child.exitCode !== null || child.signalCode !== null;
+        const exit = exited
+            ? Promise.resolve()
+            : new Promise((resolve, reject) => {
+                const timer = setTimeout(() => {
+                    cleanup();
+                    reject(new Error("Dedicated app-server exit not confirmed"));
+                }, 5000);
+                const done = () => {
+                    cleanup();
+                    resolve();
+                };
+                const cleanup = () => {
+                    clearTimeout(timer);
+                    child.off("exit", done);
+                };
+                child.once("exit", done);
+            });
+        try {
+            process.kill(process.platform === "win32" ? pid : -pid, "SIGKILL");
+        }
+        catch (error) {
+            if (error.code !== "ESRCH") {
+                await exit.catch(() => undefined);
+                throw new Error("Dedicated app-server termination failed");
+            }
+        }
+        await exit;
+        if (process.platform !== "win32") {
+            const deadline = Date.now() + 5000;
+            for (;;) {
+                try {
+                    process.kill(-pid, 0);
+                }
+                catch (error) {
+                    if (error.code === "ESRCH")
+                        return;
+                    throw new Error("Dedicated app-server group exit not confirmed");
+                }
+                if (Date.now() >= deadline)
+                    throw new Error("Dedicated app-server group still running");
+                await new Promise((resolve) => setTimeout(resolve, 25));
+            }
+        }
     }
     /**
      * Terminate the child and any grandchildren. On POSIX the child was spawned

package/dist/backend/appServerClient.js.map

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

package/dist/backend/appServerEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appServerEvents.d.ts","sourceRoot":"","sources":["../../src/backend/appServerEvents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,0EAA0E;AAC1E,MAAM,MAAM,qBAAqB,GAC9B,cAAc,GACd,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,2BAA2B,GAC3B,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAyDjB;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,OAAO,GACV,mBAAmB,GAAG,IAAI,CA+D5B"}
+{"version":3,"file":"appServerEvents.d.ts","sourceRoot":"","sources":["../../src/backend/appServerEvents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,0EAA0E;AAC1E,MAAM,MAAM,qBAAqB,GAC9B,cAAc,GACd,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,2BAA2B,GAC3B,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAyDjB;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,OAAO,GACV,mBAAmB,GAAG,IAAI,CAmF5B"}

package/dist/backend/appServerEvents.js

@@ -92,6 +92,22 @@ export function translateAppServerItem(raw) {
                 status: normalizeRunStatus(item.status),
             };
         }
+        case "dynamicToolCall":
+            return {
+                type: "dynamic_tool_call",
+                id,
+                tool: str(item.tool),
+                arguments: item.arguments,
+                text: Array.isArray(item.contentItems)
+                    ? item.contentItems
+                        .filter((part) => part &&
+                        part.type === "inputText" &&
+                        typeof part.text === "string")
+                        .map((part) => part.text)
+                        .join("\n")
+                    : "",
+                status: item.success === false ? "failed" : normalizeRunStatus(item.status),
+            };
         case "webSearch":
             return {
                 type: "web_search",

package/dist/backend/appServerEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"appServerEvents.js","sourceRoot":"","sources":["../../src/backend/appServerEvents.ts"],"names":[],"mappings":"AAaA,SAAS,GAAG,CAAC,KAAc;IAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,kFAAkF;AAClF,SAAS,kBAAkB,CAC1B,MAAe;IAEf,IAAI,MAAM,KAAK,YAAY;QAAE,OAAO,aAAa,CAAC;IAClD,IAAI,MAAM,KAAK,WAAW;QAAE,OAAO,WAAW,CAAC;IAC/C,kEAAkE;IAClE,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IAC5C,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;AACxD,CAAC;AAED,SAAS,gBAAgB,CACxB,OAAgB;IAEhB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACX,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAY,CAAC;QACpC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACzB,OAAO;YACN,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YACjB,IAAI,EACH,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ;gBACvD,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,QAAQ;SACZ,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAC1B,MAAe;IAEf,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,GAAG,MAAiB,CAAC;IAC5B,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACzD,uEAAuE;QACvE,kBAAkB,EAChB,CAAqC,CAAC,iBAAiB;YACvD,CAAsC,CAAC,kBAAkB;KAC3D,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACrC,GAAY;IAEZ,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,IAAI,GAAG,GAAc,CAAC;IAC5B,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,cAAc;YAClB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5D,KAAK,WAAW;YACf,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAClC,KAAK,aAAa;YACjB,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;QACrC,KAAK,kBAAkB;YACtB,OAAO;gBACN,IAAI,EAAE,mBAAmB;gBACzB,EAAE;gBACF,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC1B,iBAAiB,EAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAC7C,GAAG,CAAC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;oBACpC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE;oBAC9B,CAAC,CAAC,EAAE,CAAC;gBACN,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;aACvC,CAAC;QACH,KAAK,YAAY;YAChB,OAAO;gBACN,IAAI,EAAE,aAAa;gBACnB,EAAE;gBACF,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC;aACzC,CAAC;QACH,KAAK,aAAa,EAAE,CAAC;YACpB,MAAM,KAAK,GACV,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;gBAC3C,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAE,IAAI,CAAC,KAAiB,CAAC,OAAO,CAAC,EAAE;gBACnD,CAAC,CAAC,SAAS,CAAC;YACd,OAAO;gBACN,IAAI,EAAE,eAAe;gBACrB,EAAE;gBACF,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;gBACxB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;oBAClC,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAC7C,CAAC,CAAC,EAAE,CAAC;gBACN,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3B,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;aACvC,CAAC;QACH,CAAC;QACD,KAAK,WAAW;YACf,OAAO;gBACN,IAAI,EAAE,YAAY;gBAClB,EAAE;gBACF,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;oBACjD,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAiC,EAAE;oBACpD,CAAC,CAAC,EAAE,CAAC;aACN,CAAC;QACH;YACC,qEAAqE;YACrE,0CAA0C;YAC1C,OAAO,IAAI,CAAC;IACd,CAAC;AACF,CAAC"}
+{"version":3,"file":"appServerEvents.js","sourceRoot":"","sources":["../../src/backend/appServerEvents.ts"],"names":[],"mappings":"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"}

package/dist/backend/types.d.ts

@@ -49,6 +49,13 @@ export type NormalizedCodexItem = {
         message: string;
     };
     status: "in_progress" | "completed" | "failed";
+} | {
+    type: "dynamic_tool_call";
+    id: string;
+    tool: string;
+    arguments: unknown;
+    text: string;
+    status: "in_progress" | "completed" | "failed";
 } | {
     type: "web_search";
     id: string;

package/dist/backend/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/backend/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/backend/types.ts"],"names":[],"mappings":"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"}

package/dist/config/CodexConfigBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodexConfigBuilder.d.ts","sourceRoot":"","sources":["../../src/config/CodexConfigBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAGX,iBAAiB,EACjB,MAAM,aAAa,CAAC;AAWrB;;;;;GAKG;AACH,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,iBAAiB,EAAI;IAEpD,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAkC1C;IAED;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;OAIG;YACW,wBAAwB;YAqCxB,oBAAoB;CAuBlC"}
+{"version":3,"file":"CodexConfigBuilder.d.ts","sourceRoot":"","sources":["../../src/config/CodexConfigBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAGX,iBAAiB,EACjB,MAAM,aAAa,CAAC;AAWrB;;;;;GAKG;AACH,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,iBAAiB,EAAI;IAEpD,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAkC1C;IAED;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAiBxB;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;OAIG;YACW,wBAAwB;YAqCxB,oBAAoB;CAuBlC"}

package/dist/config/CodexConfigBuilder.js

@@ -82,7 +82,7 @@ export class CodexConfigBuilder {
         return codexHome;
     }
     buildEnvOverride(codexHome) {
-        if (!this.config.codexHome) {
+        if (!this.config.codexHome && !this.config.additionalEnv) {
             return undefined;
         }
         const env = {};
@@ -91,7 +91,9 @@ export class CodexConfigBuilder {
                 env[key] = value;
             }
         }
-        env.CODEX_HOME = codexHome;
+        if (this.config.codexHome)
+            env.CODEX_HOME = codexHome;
+        Object.assign(env, this.config.additionalEnv ?? {});
         return env;
     }
     /**