@jingyi0605/codingns 0.9.7 → 0.9.8

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

@@ -13,9 +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 = 6 * 60 * 60 * 1000;
+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 = 2_000;
+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;
@@ -24,6 +24,10 @@ 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();
@@ -40,6 +44,15 @@ function closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef) {
     }
 }
 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) {
@@ -86,21 +99,26 @@ function extractCodexSpawnedAgentIdsFromRawStore(rawStoreRef) {
             }
             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();
-            if (!callId || !spawnCallIds.has(callId)) {
+            const outputBelongsToSpawnAgent = ensureText(readProp(payload, "name")).trim() === "spawn_agent"
+                || ensureText(readProp(payload, "tool")).trim() === "spawn_agent";
+            if ((!callId || !spawnCallIds.has(callId)) && !outputBelongsToSpawnAgent) {
                 continue;
             }
-            const parsedOutput = parseStructuredJson(ensureText(readProp(payload, "output")));
-            const agentId = ensureText(readProp(parsedOutput, "agent_id")).trim();
-            if (looksLikeCodexThreadId(agentId)) {
+            const agentId = extractCodexAgentIdFromToolOutput(readProp(payload, "output"));
+            if (agentId) {
                 agentIds.add(agentId);
             }
         }
@@ -110,6 +128,28 @@ function extractCodexSpawnedAgentIdsFromRawStore(rawStoreRef) {
     }
     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) {
@@ -177,10 +217,10 @@ function isCodexSpawnAgentEvent(event) {
     return isCodexSpawnAgentItem(toRecord(readProp(eventRecord, "item")) ?? eventRecord);
 }
 function markCodexSpawnAgentLifecycleFromEvents(lifecycle, events) {
-    if (lifecycle.keepTransportAliveAfterTurn) {
-        return;
+    for (const agentId of extractCodexSpawnedAgentIdsFromEvents(events)) {
+        lifecycle.spawnedAgentIds.add(agentId);
     }
-    if (events.some((event) => isCodexSpawnAgentEvent(event))) {
+    if (!lifecycle.keepTransportAliveAfterTurn && events.some((event) => isCodexSpawnAgentEvent(event))) {
         lifecycle.keepTransportAliveAfterTurn = true;
     }
 }
@@ -255,7 +295,12 @@ export class CodexRuntimeAdapter {
             const abortController = new AbortController();
             const eventQueue = createAsyncEventQueue();
             const lifecycle = {
-                keepTransportAliveAfterTurn: false
+                keepTransportAliveAfterTurn: false,
+                spawnedAgentsSettledAfterTurn: false,
+                parentTurnStopped: false,
+                spawnedAgentIds: new Set(),
+                pendingComplete: null,
+                closedSpawnedAgentIds: new Set()
             };
             const translateNotification = createCodexAppServerNotificationTranslator();
             const forwardTranslatedNotification = createCodexTranslatedNotificationForwarder(eventQueue);
@@ -312,6 +357,7 @@ export class CodexRuntimeAdapter {
             });
             transport.setOnClose((error) => {
                 if (error) {
+                    lifecycle.parentTurnStopped = true;
                     eventQueue.push({
                         type: "turn.failed",
                         timestamp: nextTimestamp(),
@@ -350,7 +396,7 @@ export class CodexRuntimeAdapter {
                     transport.close();
                 },
                 isAlive: () => transport.isClosed() === false,
-                completed: this.runTurn(null, request, sink, providerSessionId, rawStoreRef, abortController, eventQueue.iterator, [], launchedAtMs, launchPerfStartedAtMs, lifecycle).finally(() => {
+                completed: this.runTurn(null, request, sink, providerSessionId, rawStoreRef, abortController, eventQueue.iterator, [], launchedAtMs, launchPerfStartedAtMs, lifecycle, transport).finally(() => {
                     closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef);
                 })
             };
@@ -446,7 +492,12 @@ export class CodexRuntimeAdapter {
             const abortController = new AbortController();
             const eventQueue = createAsyncEventQueue();
             const lifecycle = {
-                keepTransportAliveAfterTurn: false
+                keepTransportAliveAfterTurn: false,
+                spawnedAgentsSettledAfterTurn: false,
+                parentTurnStopped: false,
+                spawnedAgentIds: new Set(),
+                pendingComplete: null,
+                closedSpawnedAgentIds: new Set()
             };
             const translateNotification = createCodexAppServerNotificationTranslator();
             const forwardTranslatedNotification = createCodexTranslatedNotificationForwarder(eventQueue);
@@ -488,6 +539,7 @@ export class CodexRuntimeAdapter {
             });
             transport.setOnClose((error) => {
                 if (error) {
+                    lifecycle.parentTurnStopped = true;
                     eventQueue.push({
                         type: "turn.failed",
                         timestamp: nextTimestamp(),
@@ -526,7 +578,7 @@ export class CodexRuntimeAdapter {
                     transport.close();
                 },
                 isAlive: () => transport.isClosed() === false,
-                completed: this.runTurn(null, request, sink, resolvedSessionId, rawStoreRef, abortController, eventQueue.iterator, [], Date.now(), performance.now(), lifecycle).finally(() => {
+                completed: this.runTurn(null, request, sink, resolvedSessionId, rawStoreRef, abortController, eventQueue.iterator, [], Date.now(), performance.now(), lifecycle, transport).finally(() => {
                     closeCodexTransportAfterTurn(transport, lifecycle, rawStoreRef);
                 })
             };
@@ -572,8 +624,13 @@ export class CodexRuntimeAdapter {
         return fallbackMatch;
     }
     async runTurn(thread, request, sink, providerSessionId, rawStoreRef, abortController, preparedEvents, bufferedEvents = [], launchedAtMs = Date.now(), launchPerfStartedAtMs = performance.now(), lifecycle = {
-        keepTransportAliveAfterTurn: false
-    }) {
+        keepTransportAliveAfterTurn: false,
+        spawnedAgentsSettledAfterTurn: false,
+        parentTurnStopped: false,
+        spawnedAgentIds: new Set(),
+        pendingComplete: null,
+        closedSpawnedAgentIds: new Set()
+    }, transport = null) {
         const context = {
             providerSessionId,
             rawStoreRef,
@@ -581,6 +638,7 @@ export class CodexRuntimeAdapter {
             // 否则前端会把新 assistant/tool 消息排到旧消息前面，表现成用户消息一直挂在底部。
             sequence: Math.max(0, request.sequenceBase ?? 0),
             lifecycle,
+            transport,
             toolNameByCallId: new Map(),
             stableMessageRefByIdentity: new Map(),
             lastSignatureByIdentity: new Map(),
@@ -601,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), {
@@ -610,12 +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) {
@@ -643,31 +705,76 @@ export class CodexRuntimeAdapter {
             });
         }
     }
+    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 = extractCodexSpawnedAgentIdsFromRawStore(context.rawStoreRef);
+        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) {
+        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) {
+            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, interrupted) {
+    async handleEvent(event, request, context, signal) {
         const eventType = ensureText(readProp(event, "type")).trim();
+        const interrupted = signal.aborted;
         if (eventType.length === 0) {
             return;
         }
@@ -682,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",
@@ -706,6 +810,7 @@ export class CodexRuntimeAdapter {
             return;
         }
         if (eventType === "turn.interrupted") {
+            context.lifecycle.parentTurnStopped = true;
             await context.sink.emit({
                 type: "interrupted",
                 status: "interrupted",
@@ -1314,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;
         },