@jingyi0605/codingns 0.9.6 → 0.9.8

package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { closeSync, existsSync, openSync, readFileSync, readSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { performance } from "node:perf_hooks";
 import { basename, dirname, join, resolve } from "node:path";
@@ -13,6 +13,9 @@ import { loadDatabaseSync } from "../sqlite/node-sqlite.js";
 import { createCodexThreadPermissionOptions } from "./codex-permissions.js";
 const CODEX_RUNTIME_DEBUG_ENABLED = /^(1|true|yes)$/i.test(process.env.CODINGNS_PERF_DEBUG?.trim() ?? "");
 const CODEX_APP_SERVER_REQUEST_TIMEOUT_MS = 20_000;
+const CODEX_APP_SERVER_SPAWN_AGENT_GRACE_MS = normalizePositiveInteger(process.env.CODINGNS_CODEX_SPAWN_AGENT_GRACE_MS, 6 * 60 * 60 * 1000);
+const CODEX_SPAWN_AGENT_RAW_SCAN_BYTES = 2 * 1024 * 1024;
+const CODEX_SPAWN_AGENT_POLL_INTERVAL_MS = normalizePositiveInteger(process.env.CODINGNS_CODEX_SPAWN_AGENT_POLL_INTERVAL_MS, 2_000);
 function logCodexRuntimeStep(scope, startedAtMs, detail = {}) {
     if (!CODEX_RUNTIME_DEBUG_ENABLED) {
         return;
@@ -21,6 +24,222 @@ function logCodexRuntimeStep(scope, startedAtMs, detail = {}) {
     const suffix = formatCodexRuntimeDebugDetail(detail);
     console.info(`[perf][codex-runtime] ${scope} ${durationMs}ms${suffix ? ` ${suffix}` : ""}`);
 }
+function normalizePositiveInteger(value, fallback) {
+    const parsed = Number(value);
+    return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
+}
+function closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef) {
+    if (!shouldKeepCodexTransportAliveAfterTurn(lifecycle, rawStoreRef)) {
+        transport.close();
+        return;
+    }
+    // 子 Agent 依附在 Codex app-server 进程上。父 turn 完成后立即 close
+    // 会把刚 spawn 出来的子 Agent 一起 SIGTERM 掉。这里给一个足够长的
+    // 宽限期，让子 Agent 自己跑完；宽限期到了再兜底回收，避免进程永久泄漏。
+    const timer = setTimeout(() => {
+        transport.close();
+    }, CODEX_APP_SERVER_SPAWN_AGENT_GRACE_MS);
+    if (typeof timer.unref === "function") {
+        timer.unref();
+    }
+}
+function shouldKeepCodexTransportAliveAfterTurn(lifecycle, rawStoreRef) {
+    if (lifecycle.parentTurnStopped) {
+        return false;
+    }
+    if (lifecycle.spawnedAgentsSettledAfterTurn) {
+        return false;
+    }
+    if (lifecycle.spawnedAgentIds.size > 0) {
+        return lifecycle.closedSpawnedAgentIds.size < lifecycle.spawnedAgentIds.size;
+    }
+    return lifecycle.keepTransportAliveAfterTurn || codexRawStoreContainsSpawnAgentCall(rawStoreRef);
+}
+function codexRawStoreContainsSpawnAgentCall(rawStoreRef) {
+    const text = readCodexRawStoreTail(rawStoreRef);
+    if (!text || !text.includes("spawn_agent")) {
+        return false;
+    }
+    for (const line of text.split("\n")) {
+        if (!line.includes("spawn_agent")) {
+            continue;
+        }
+        try {
+            const record = toRecord(JSON.parse(line));
+            const payload = toRecord(readProp(record, "payload"));
+            if (isCodexSpawnAgentItem(record)
+                || isCodexSpawnAgentItem(payload)
+                || isCodexSpawnAgentItem(toRecord(readProp(record, "item")))
+                || isCodexSpawnAgentItem(toRecord(readProp(payload, "item")))) {
+                return true;
+            }
+        }
+        catch {
+            // 单行坏掉不影响判断，继续看下一行。
+        }
+    }
+    return false;
+}
+function extractCodexSpawnedAgentIdsFromRawStore(rawStoreRef) {
+    const text = readCodexRawStoreTail(rawStoreRef);
+    if (!text || !text.includes("spawn_agent")) {
+        return [];
+    }
+    const spawnCallIds = new Set();
+    const agentIds = new Set();
+    for (const line of text.split("\n")) {
+        if (!line.trim()) {
+            continue;
+        }
+        try {
+            const record = toRecord(JSON.parse(line));
+            const payload = toRecord(readProp(record, "payload"));
+            if (!payload) {
+                continue;
+            }
+            if (isCodexSpawnAgentItem(payload)) {
+                const callId = ensureText(readProp(payload, "call_id")).trim();
+                const agentId = extractCodexAgentIdFromToolOutput(readProp(payload, "output"));
+                if (callId) {
+                    spawnCallIds.add(callId);
+                }
+                if (agentId) {
+                    agentIds.add(agentId);
+                }
+                continue;
+            }
+            if (ensureText(readProp(payload, "type")).trim() !== "function_call_output") {
+                continue;
+            }
+            const callId = ensureText(readProp(payload, "call_id")).trim();
+            const outputBelongsToSpawnAgent = ensureText(readProp(payload, "name")).trim() === "spawn_agent"
+                || ensureText(readProp(payload, "tool")).trim() === "spawn_agent";
+            if ((!callId || !spawnCallIds.has(callId)) && !outputBelongsToSpawnAgent) {
+                continue;
+            }
+            const agentId = extractCodexAgentIdFromToolOutput(readProp(payload, "output"));
+            if (agentId) {
+                agentIds.add(agentId);
+            }
+        }
+        catch {
+            // 单行坏掉不影响判断，继续看下一行。
+        }
+    }
+    return [...agentIds];
+}
+function extractCodexSpawnedAgentIdsFromEvents(events) {
+    const agentIds = new Set();
+    for (const event of events) {
+        const item = toRecord(readProp(event, "item")) ?? event;
+        if (!isCodexSpawnAgentItem(item)) {
+            continue;
+        }
+        const agentId = extractCodexAgentIdFromToolOutput(readProp(item, "output"));
+        if (agentId) {
+            agentIds.add(agentId);
+        }
+    }
+    return [...agentIds];
+}
+function extractCodexAgentIdFromToolOutput(output) {
+    const parsedOutput = typeof output === "string"
+        ? parseStructuredJson(output)
+        : toRecord(output);
+    const agentId = ensureText(readProp(parsedOutput, "agent_id")).trim()
+        || ensureText(readProp(parsedOutput, "agentId")).trim();
+    return looksLikeCodexThreadId(agentId) ? agentId : null;
+}
+function isCodexRawStoreTerminal(rawStoreRef) {
+    const text = readCodexRawStoreTail(rawStoreRef);
+    if (!text) {
+        return false;
+    }
+    for (const line of text.split("\n")) {
+        if (!line.includes("task_complete")
+            && !line.includes("turn_aborted")
+            && !line.includes("turn_failed")) {
+            continue;
+        }
+        try {
+            const record = toRecord(JSON.parse(line));
+            const payload = toRecord(readProp(record, "payload"));
+            const recordType = ensureText(readProp(record, "type")).trim();
+            const payloadType = ensureText(readProp(payload, "type")).trim();
+            if ((recordType === "event_msg" && payloadType === "task_complete")
+                || (recordType === "event_msg" && payloadType === "turn_aborted")
+                || (recordType === "event_msg" && payloadType === "turn_failed")) {
+                return true;
+            }
+        }
+        catch {
+            // 单行坏掉不影响判断，继续看下一行。
+        }
+    }
+    return false;
+}
+function readCodexRawStoreTail(rawStoreRef) {
+    try {
+        if (!rawStoreRef.trim() || !existsSync(rawStoreRef)) {
+            return "";
+        }
+        const stat = statSync(rawStoreRef);
+        if (!stat.isFile()) {
+            return "";
+        }
+        if (stat.size <= CODEX_SPAWN_AGENT_RAW_SCAN_BYTES) {
+            return readFileSync(rawStoreRef, "utf8");
+        }
+        const fd = openSync(rawStoreRef, "r");
+        try {
+            const length = CODEX_SPAWN_AGENT_RAW_SCAN_BYTES;
+            const buffer = Buffer.allocUnsafe(length);
+            const bytesRead = readSync(fd, buffer, 0, length, stat.size - length);
+            return buffer.subarray(0, bytesRead).toString("utf8");
+        }
+        finally {
+            closeSync(fd);
+        }
+    }
+    catch {
+        return "";
+    }
+}
+function isCodexSpawnAgentEvent(event) {
+    const eventRecord = toRecord(event);
+    if (!eventRecord) {
+        return false;
+    }
+    // app-server 通常发的是 { type: "item.completed", item: {...} }。
+    // 但真实 3002 路径里，父 turn 的 transcript 也会出现已经展开的
+    // { type: "function_call", name: "spawn_agent" } 记录。两种都必须识别，
+    // 否则父 turn 完成后会 close app-server，把子 Agent 一起中断。
+    return isCodexSpawnAgentItem(toRecord(readProp(eventRecord, "item")) ?? eventRecord);
+}
+function markCodexSpawnAgentLifecycleFromEvents(lifecycle, events) {
+    for (const agentId of extractCodexSpawnedAgentIdsFromEvents(events)) {
+        lifecycle.spawnedAgentIds.add(agentId);
+    }
+    if (!lifecycle.keepTransportAliveAfterTurn && events.some((event) => isCodexSpawnAgentEvent(event))) {
+        lifecycle.keepTransportAliveAfterTurn = true;
+    }
+}
+function isCodexSpawnAgentItem(item) {
+    if (!item) {
+        return false;
+    }
+    const itemType = ensureText(readProp(item, "type")).trim();
+    if (itemType === "function_call"
+        || itemType === "functionCall"
+        || itemType === "custom_tool_call") {
+        return (ensureText(readProp(item, "name")).trim() === "spawn_agent"
+            || ensureText(readProp(item, "tool")).trim() === "spawn_agent");
+    }
+    if (itemType === "dynamicToolCall" || itemType === "mcpToolCall") {
+        return ensureText(readProp(item, "tool")).trim() === "spawn_agent";
+    }
+    return false;
+}
 function formatCodexRuntimeDebugDetail(detail) {
     const entries = Object.entries(detail).filter(([, value]) => value !== undefined);
     if (entries.length === 0) {
@@ -75,6 +294,14 @@ export class CodexRuntimeAdapter {
             });
             const abortController = new AbortController();
             const eventQueue = createAsyncEventQueue();
+            const lifecycle = {
+                keepTransportAliveAfterTurn: false,
+                spawnedAgentsSettledAfterTurn: false,
+                parentTurnStopped: false,
+                spawnedAgentIds: new Set(),
+                pendingComplete: null,
+                closedSpawnedAgentIds: new Set()
+            };
             const translateNotification = createCodexAppServerNotificationTranslator();
             const forwardTranslatedNotification = createCodexTranslatedNotificationForwarder(eventQueue);
             const resumedSyntheticSession = await this.resumeSyntheticThreadFromHistory(transport, request);
@@ -115,6 +342,7 @@ export class CodexRuntimeAdapter {
                     });
                 }
                 const translated = translateNotification(notification);
+                markCodexSpawnAgentLifecycleFromEvents(lifecycle, translated.events);
                 forwardTranslatedNotification(translated);
             });
             transport.setServerRequestHandler(async (serverRequest) => {
@@ -129,6 +357,7 @@ export class CodexRuntimeAdapter {
             });
             transport.setOnClose((error) => {
                 if (error) {
+                    lifecycle.parentTurnStopped = true;
                     eventQueue.push({
                         type: "turn.failed",
                         timestamp: nextTimestamp(),
@@ -142,6 +371,7 @@ export class CodexRuntimeAdapter {
             const startTurnNotification = startTurnResult?.notification ?? null;
             if (startTurnNotification) {
                 const translated = translateNotification(startTurnNotification);
+                markCodexSpawnAgentLifecycleFromEvents(lifecycle, translated.events);
                 forwardTranslatedNotification(translated);
             }
             logCodexRuntimeStep("start_session.turn_start", startTurnStartedAtMs, {
@@ -166,8 +396,8 @@ export class CodexRuntimeAdapter {
                     transport.close();
                 },
                 isAlive: () => transport.isClosed() === false,
-                completed: this.runTurn(null, request, sink, providerSessionId, rawStoreRef, abortController, eventQueue.iterator, [], launchedAtMs, launchPerfStartedAtMs).finally(() => {
-                    transport.close();
+                completed: this.runTurn(null, request, sink, providerSessionId, rawStoreRef, abortController, eventQueue.iterator, [], launchedAtMs, launchPerfStartedAtMs, lifecycle, transport).finally(() => {
+                    closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef);
                 })
             };
         }
@@ -261,6 +491,14 @@ export class CodexRuntimeAdapter {
                 : pickedRawStoreRef;
             const abortController = new AbortController();
             const eventQueue = createAsyncEventQueue();
+            const lifecycle = {
+                keepTransportAliveAfterTurn: false,
+                spawnedAgentsSettledAfterTurn: false,
+                parentTurnStopped: false,
+                spawnedAgentIds: new Set(),
+                pendingComplete: null,
+                closedSpawnedAgentIds: new Set()
+            };
             const translateNotification = createCodexAppServerNotificationTranslator();
             const forwardTranslatedNotification = createCodexTranslatedNotificationForwarder(eventQueue);
             logCodexRuntimeStep("continue_session.raw_store_ref_ready", runtimeStartedAtMs, {
@@ -286,6 +524,7 @@ export class CodexRuntimeAdapter {
                     });
                 }
                 const translated = translateNotification(notification);
+                markCodexSpawnAgentLifecycleFromEvents(lifecycle, translated.events);
                 forwardTranslatedNotification(translated);
             });
             transport.setServerRequestHandler(async (serverRequest) => {
@@ -300,6 +539,7 @@ export class CodexRuntimeAdapter {
             });
             transport.setOnClose((error) => {
                 if (error) {
+                    lifecycle.parentTurnStopped = true;
                     eventQueue.push({
                         type: "turn.failed",
                         timestamp: nextTimestamp(),
@@ -313,6 +553,7 @@ export class CodexRuntimeAdapter {
             const startTurnNotification = startTurnResult?.notification ?? null;
             if (startTurnNotification) {
                 const translated = translateNotification(startTurnNotification);
+                markCodexSpawnAgentLifecycleFromEvents(lifecycle, translated.events);
                 forwardTranslatedNotification(translated);
             }
             logCodexRuntimeStep("continue_session.turn_start", startTurnStartedAtMs, {
@@ -337,8 +578,8 @@ export class CodexRuntimeAdapter {
                     transport.close();
                 },
                 isAlive: () => transport.isClosed() === false,
-                completed: this.runTurn(null, request, sink, resolvedSessionId, rawStoreRef, abortController, eventQueue.iterator, [], Date.now()).finally(() => {
-                    transport.close();
+                completed: this.runTurn(null, request, sink, resolvedSessionId, rawStoreRef, abortController, eventQueue.iterator, [], Date.now(), performance.now(), lifecycle, transport).finally(() => {
+                    closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef);
                 })
             };
         }
@@ -382,13 +623,22 @@ export class CodexRuntimeAdapter {
         }
         return fallbackMatch;
     }
-    async runTurn(thread, request, sink, providerSessionId, rawStoreRef, abortController, preparedEvents, bufferedEvents = [], launchedAtMs = Date.now(), launchPerfStartedAtMs = performance.now()) {
+    async runTurn(thread, request, sink, providerSessionId, rawStoreRef, abortController, preparedEvents, bufferedEvents = [], launchedAtMs = Date.now(), launchPerfStartedAtMs = performance.now(), lifecycle = {
+        keepTransportAliveAfterTurn: false,
+        spawnedAgentsSettledAfterTurn: false,
+        parentTurnStopped: false,
+        spawnedAgentIds: new Set(),
+        pendingComplete: null,
+        closedSpawnedAgentIds: new Set()
+    }, transport = null) {
         const context = {
             providerSessionId,
             rawStoreRef,
             // 运行时消息必须接在历史消息后面，不能每轮都从 1 重新编号，
             // 否则前端会把新 assistant/tool 消息排到旧消息前面，表现成用户消息一直挂在底部。
             sequence: Math.max(0, request.sequenceBase ?? 0),
+            lifecycle,
+            transport,
             toolNameByCallId: new Map(),
             stableMessageRefByIdentity: new Map(),
             lastSignatureByIdentity: new Map(),
@@ -409,7 +659,7 @@ export class CodexRuntimeAdapter {
             for (const event of bufferedEvents) {
                 await this.refreshSessionBindingIfNeeded(context);
                 persistSyntheticEventIfNeeded(context.rawStoreRef, context.providerSessionId, event);
-                await this.handleEvent(event, request, context, abortController.signal.aborted);
+                await this.handleEvent(event, request, context, abortController.signal);
             }
             const events = preparedEvents ??
                 (await thread.runStreamed(createCodexInput(request), {
@@ -418,11 +668,16 @@ export class CodexRuntimeAdapter {
             while (true) {
                 const next = await events.next();
                 if (next.done) {
+                    if (context.lifecycle.parentTurnStopped) {
+                        return;
+                    }
+                    await this.waitForSpawnedCodexAgentsIfNeeded(context, abortController.signal);
+                    await this.emitPendingCompleteIfReady(context);
                     return;
                 }
                 await this.refreshSessionBindingIfNeeded(context);
                 persistSyntheticEventIfNeeded(context.rawStoreRef, context.providerSessionId, next.value);
-                await this.handleEvent(next.value, request, context, abortController.signal.aborted);
+                await this.handleEvent(next.value, request, context, abortController.signal);
             }
         }
         catch (error) {
@@ -450,11 +705,82 @@ export class CodexRuntimeAdapter {
             });
         }
     }
-    async handleEvent(event, request, context, interrupted) {
+    async emitPendingCompleteIfReady(context) {
+        const pendingComplete = context.lifecycle.pendingComplete;
+        if (!pendingComplete || context.lifecycle.parentTurnStopped) {
+            return;
+        }
+        context.lifecycle.pendingComplete = null;
+        await context.sink.emit({
+            type: "complete",
+            status: "completed",
+            providerSessionId: context.providerSessionId,
+            rawStoreRef: context.rawStoreRef,
+            detail: pendingComplete.detail,
+            timestamp: pendingComplete.timestamp
+        });
+    }
+    async waitForSpawnedCodexAgentsIfNeeded(context, signal) {
+        if (!shouldKeepCodexTransportAliveAfterTurn(context.lifecycle, context.rawStoreRef)) {
+            return;
+        }
+        const agentIds = Array.from(new Set([
+            ...context.lifecycle.spawnedAgentIds,
+            ...extractCodexSpawnedAgentIdsFromRawStore(context.rawStoreRef)
+        ]));
+        if (agentIds.length === 0) {
+            return;
+        }
+        const deadline = Date.now() + CODEX_APP_SERVER_SPAWN_AGENT_GRACE_MS;
+        const remainingAgentIds = new Set(agentIds);
+        while (remainingAgentIds.size > 0
+            && Date.now() < deadline
+            && !signal.aborted
+            && !context.lifecycle.parentTurnStopped) {
+            for (const agentId of [...remainingAgentIds]) {
+                const rawStoreRef = this.findRawStoreRefOnce(agentId, context.workspacePath, context.homeDir);
+                if (rawStoreRef && isCodexRawStoreTerminal(rawStoreRef)) {
+                    await this.closeSpawnedCodexAgentIfNeeded(context, agentId);
+                    remainingAgentIds.delete(agentId);
+                }
+            }
+            if (remainingAgentIds.size === 0
+                || Date.now() >= deadline
+                || signal.aborted
+                || context.lifecycle.parentTurnStopped) {
+                break;
+            }
+            await sleep(CODEX_SPAWN_AGENT_POLL_INTERVAL_MS);
+        }
+        if (remainingAgentIds.size === 0) {
+            context.lifecycle.spawnedAgentsSettledAfterTurn = true;
+        }
+    }
+    async closeSpawnedCodexAgentIfNeeded(context, agentId) {
+        if (context.lifecycle.closedSpawnedAgentIds.has(agentId)) {
+            return;
+        }
+        context.lifecycle.closedSpawnedAgentIds.add(agentId);
+        try {
+            await context.transport?.closeSpawnedAgent?.(agentId);
+        }
+        catch (error) {
+            logCodexRuntimeStep("turn.close_spawned_agent_failed", context.launchPerfStartedAtMs, {
+                providerSessionId: context.providerSessionId,
+                agentId,
+                error: error instanceof Error ? error.message : String(error)
+            });
+        }
+    }
+    async handleEvent(event, request, context, signal) {
         const eventType = ensureText(readProp(event, "type")).trim();
+        const interrupted = signal.aborted;
         if (eventType.length === 0) {
             return;
         }
+        if (isCodexSpawnAgentEvent(event)) {
+            context.lifecycle.keepTransportAliveAfterTurn = true;
+        }
         if (context.lastSignatureByIdentity.size === 0 && eventType.startsWith("item.")) {
             logCodexRuntimeStep("turn.first_item_event", context.launchPerfStartedAtMs, {
                 sessionId: request.sessionId,
@@ -463,17 +789,14 @@ export class CodexRuntimeAdapter {
             });
         }
         if (eventType === "turn.completed") {
-            await context.sink.emit({
-                type: "complete",
-                status: "completed",
-                providerSessionId: context.providerSessionId,
-                rawStoreRef: context.rawStoreRef,
+            context.lifecycle.pendingComplete = {
                 detail: "codex turn completed",
                 timestamp: pickTimestamp(event)
-            });
+            };
             return;
         }
         if (eventType === "turn.failed") {
+            context.lifecycle.parentTurnStopped = true;
             const detail = extractTextBlocks(readProp(event, "error")).trim() || "codex turn failed";
             await context.sink.emit({
                 type: "error",
@@ -487,6 +810,7 @@ export class CodexRuntimeAdapter {
             return;
         }
         if (eventType === "turn.interrupted") {
+            context.lifecycle.parentTurnStopped = true;
             await context.sink.emit({
                 type: "interrupted",
                 status: "interrupted",
@@ -1095,6 +1419,18 @@ function createCodexAppServerTransport(options) {
                 }
             });
         },
+        async closeSpawnedAgent(agentId) {
+            const normalizedAgentId = agentId.trim();
+            if (!normalizedAgentId) {
+                return;
+            }
+            await sendJsonRpcRequest(child, pendingResponses, () => nextJsonRpcId("thread-unsubscribe", () => ++requestSequence), {
+                method: "thread/unsubscribe",
+                params: {
+                    threadId: normalizedAgentId
+                }
+            });
+        },
         setNotificationHandler(handler) {
             notificationHandler = handler;
         },
@@ -1686,6 +2022,17 @@ function translateCodexAppServerItem(item) {
             status: normalizeCodexItemStatus(item.status)
         };
     }
+    if (itemType === "functionCall" || itemType === "function_call") {
+        return {
+            type: "function_call",
+            id: item.id,
+            name: item.name,
+            arguments: readProp(item, "arguments") ?? readProp(item, "input"),
+            output: item.output,
+            error: item.error,
+            status: normalizeCodexItemStatus(item.status)
+        };
+    }
     if (itemType === "dynamicToolCall") {
         const toolName = ensureText(item.tool).trim();
         const patchText = isCodexExecCommandToolName(toolName)
@@ -2118,6 +2465,19 @@ function normalizeText(value) {
     const normalized = ensureText(value).trim();
     return normalized.length > 0 ? normalized : null;
 }
+function parseStructuredJson(value) {
+    const normalized = value.trim();
+    if (!normalized) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(normalized);
+        return toRecord(parsed);
+    }
+    catch {
+        return null;
+    }
+}
 function readThreadIdFromRawStore(rawStoreRef) {
     const filePath = ensureText(rawStoreRef).trim();
     if (!filePath || !existsSync(filePath)) {