@getpaseo/server 0.1.71 → 0.1.73

package/dist/server/server/agent/providers/codex-app-server-agent.js

@@ -4,17 +4,16 @@ import * as fsSync from "node:fs";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import readline from "node:readline";
 import { z } from "zod";
 import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
 import { curateAgentActivity } from "../activity-curator.js";
 import { mapCodexRolloutToolCall, mapCodexToolCallFromThreadItem, } from "./codex/tool-call-mapper.js";
 import { createProviderEnv, createProviderEnvSpec, resolveProviderCommandPrefix, } from "../provider-launch-config.js";
 import { findExecutable, isCommandAvailable } from "../../../utils/executable.js";
-import { terminateWithTreeKill } from "../../../utils/tree-kill.js";
 import { spawnProcess } from "../../../utils/spawn.js";
 import { extractCodexTerminalSessionId, nonEmptyString } from "./tool-call-mapper-utils.js";
 import { buildCodexFeatures, codexModelSupportsFastMode } from "./codex-feature-definitions.js";
+import { CodexAppServerClient } from "./codex/app-server-transport.js";
 import { renderProviderImageOutputAsAssistantMarkdown, } from "./provider-image-output.js";
 import { formatDiagnosticStatus, formatProviderDiagnostic, formatProviderDiagnosticError, resolveBinaryVersion, toDiagnosticErrorMessage, } from "./diagnostic-utils.js";
 import { runProviderTurn } from "./provider-runner.js";
@@ -26,11 +25,8 @@ function assertChildWithPipes(child) {
 function isRecord(value) {
     return value != null && typeof value === "object" && !Array.isArray(value);
 }
-const DEFAULT_TIMEOUT_MS = 14 * 24 * 60 * 60 * 1000;
 const TURN_START_TIMEOUT_MS = 90 * 1000;
 const INTERRUPT_TIMEOUT_MS = 2000;
-const APP_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT_MS = 2000;
-const APP_SERVER_FORCE_SHUTDOWN_TIMEOUT_MS = 1000;
 const CODEX_PROVIDER = "codex";
 const CODEX_IMAGE_ATTACHMENT_DIR = "paseo-attachments";
 const ASSISTANT_MESSAGE_BOUNDARY_MARKDOWN = "\n\n---\n\n";
@@ -458,23 +454,6 @@ function toCodexMcpConfig(config) {
         }
     }
 }
-function isJsonRpcResponse(msg) {
-    if (!isRecord(msg))
-        return false;
-    if (typeof msg.id !== "number")
-        return false;
-    return msg.result !== undefined || !!msg.error;
-}
-function isJsonRpcRequest(msg) {
-    if (!isRecord(msg))
-        return false;
-    return typeof msg.id === "number" && typeof msg.method === "string";
-}
-function isJsonRpcNotification(msg) {
-    if (!isRecord(msg))
-        return false;
-    return typeof msg.method === "string" && typeof msg.id !== "number";
-}
 function toObjectRecord(value) {
     return isRecord(value) ? value : undefined;
 }
@@ -506,154 +485,6 @@ function filterCodexThreadsByCwd(threads, cwd) {
     // with no cwd would falsely match the daemon's own cwd.
     return threads.filter((thread) => typeof thread.cwd === "string" && thread.cwd === cwd);
 }
-class CodexAppServerClient {
-    constructor(child, logger) {
-        this.child = child;
-        this.logger = logger;
-        this.pending = new Map();
-        this.requestHandlers = new Map();
-        this.notificationHandler = null;
-        this.nextId = 1;
-        this.disposed = false;
-        this.stderrBuffer = "";
-        this.rl = readline.createInterface({ input: child.stdout });
-        this.rl.on("line", (line) => this.handleLine(line));
-        child.stderr.on("data", (chunk) => {
-            this.stderrBuffer += chunk.toString();
-            if (this.stderrBuffer.length > 8192) {
-                this.stderrBuffer = this.stderrBuffer.slice(-8192);
-            }
-        });
-        child.on("error", (err) => {
-            this.logger.error({ err }, "Codex app-server child process error");
-            for (const pending of this.pending.values()) {
-                clearTimeout(pending.timer);
-                pending.reject(err);
-            }
-            this.pending.clear();
-            this.disposed = true;
-        });
-        child.on("exit", (code, signal) => {
-            const message = code === 0 && !signal
-                ? "Codex app-server exited"
-                : `Codex app-server exited with code ${code ?? "null"} and signal ${signal ?? "null"}`;
-            const error = new Error(`${message}\n${this.stderrBuffer}`.trim());
-            for (const pending of this.pending.values()) {
-                clearTimeout(pending.timer);
-                pending.reject(error);
-            }
-            this.pending.clear();
-            this.disposed = true;
-        });
-    }
-    setNotificationHandler(handler) {
-        this.notificationHandler = handler;
-    }
-    setRequestHandler(method, handler) {
-        this.requestHandlers.set(method, handler);
-    }
-    request(method, params, timeoutMs = DEFAULT_TIMEOUT_MS) {
-        if (this.disposed) {
-            return Promise.reject(new Error("Codex app-server client is closed"));
-        }
-        const id = this.nextId++;
-        const payload = { id, method, params };
-        const serialized = JSON.stringify(payload);
-        this.child.stdin.write(`${serialized}\n`);
-        return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => {
-                this.pending.delete(id);
-                reject(new Error(`Codex app-server request timed out for ${method}`));
-            }, timeoutMs);
-            this.pending.set(id, { resolve, reject, timer });
-        });
-    }
-    notify(method, params) {
-        if (this.disposed) {
-            return;
-        }
-        const payload = { method, params };
-        this.child.stdin.write(`${JSON.stringify(payload)}\n`);
-    }
-    writeJsonRpcResponse(response) {
-        if (this.disposed || this.child.stdin.destroyed || !this.child.stdin.writable) {
-            return;
-        }
-        try {
-            this.child.stdin.write(`${JSON.stringify(response)}\n`);
-        }
-        catch (error) {
-            this.logger.debug({ error }, "Failed to write Codex app-server JSON-RPC response");
-        }
-    }
-    async dispose() {
-        if (this.disposed)
-            return;
-        this.disposed = true;
-        this.rl.close();
-        try {
-            this.child.stdin.end();
-        }
-        catch {
-            // ignore
-        }
-        const result = await terminateWithTreeKill(this.child, {
-            gracefulTimeoutMs: APP_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT_MS,
-            forceTimeoutMs: APP_SERVER_FORCE_SHUTDOWN_TIMEOUT_MS,
-            onForceSignal: () => {
-                this.logger.warn({ timeoutMs: APP_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT_MS }, "Codex app-server did not exit after SIGTERM; sending SIGKILL");
-            },
-        });
-        if (result === "kill-timeout") {
-            this.logger.warn({ timeoutMs: APP_SERVER_FORCE_SHUTDOWN_TIMEOUT_MS }, "Codex app-server did not report exit after SIGKILL");
-        }
-    }
-    async handleLine(line) {
-        if (!line.trim())
-            return;
-        const raw = JSON.parse(line);
-        if (!isRecord(raw)) {
-            this.logger.warn({ line }, "Parsed JSON is not an object");
-            return;
-        }
-        if (isJsonRpcResponse(raw)) {
-            const id = raw.id;
-            if (raw.result !== undefined || raw.error) {
-                const pending = this.pending.get(id);
-                if (!pending)
-                    return;
-                clearTimeout(pending.timer);
-                this.pending.delete(id);
-                if (raw.error) {
-                    pending.reject(new Error(raw.error.message ?? "Unknown error"));
-                }
-                else {
-                    pending.resolve(raw.result);
-                }
-                return;
-            }
-            // Server-initiated request
-            if (isJsonRpcRequest(raw)) {
-                const request = raw;
-                const handler = this.requestHandlers.get(request.method);
-                try {
-                    const result = handler ? await handler(request.params) : {};
-                    this.writeJsonRpcResponse({ id: request.id, result });
-                }
-                catch (error) {
-                    this.writeJsonRpcResponse({
-                        id: request.id,
-                        error: { message: error instanceof Error ? error.message : String(error) },
-                    });
-                }
-                return;
-            }
-        }
-        if (isJsonRpcNotification(raw)) {
-            this.notificationHandler?.(raw.method, raw.params);
-        }
-    }
-}
 function toAgentUsage(tokenUsage) {
     const usage = toObjectRecord(tokenUsage);
     if (!usage)
@@ -3148,7 +2979,7 @@ class CodexAppServerAgentSession {
             this.pendingCommandOutputDeltas.delete(itemId);
             this.pendingFileChangeOutputDeltas.delete(itemId);
         }
-        this.emitSubAgentActivityUpdate(callId, timelineItem.type === "tool_call" && timelineItem.status === "failed" ? "failed" : "running");
+        this.emitSubAgentActivityUpdate(callId, "running");
     }
     shouldSkipCompletedThreadItem(timelineItem, normalizedItemType, itemId) {
         // For commandExecution items, codex/event/exec_command_* is authoritative.