@jingyi0605/codingns 0.3.0 → 0.3.6

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

@@ -7,6 +7,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { appendJsonLine, createRawRef, ensureDirectory, extractTextBlocks, messageIdFromRawRef, nextTimestamp, normalizeWorkspacePath, readJsonLines } from "../providers/utils.js";
+import { buildApplyPatchFromFileChangeList, extractApplyPatchTargetPathsFromToolOutput, normalizeApplyPatchText } from "../patch-builder.js";
 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() ?? "");
@@ -80,7 +81,7 @@ export class CodexRuntimeAdapter {
             })();
         const providerSessionId = startedSession.providerSessionId;
         const syntheticRawStoreRef = buildRuntimeRawStoreRef(resolveRuntimeStoreKey(providerSessionId, request.sessionId));
-        const rawStoreRef = pickAvailableCodexRawStoreRef(resumedSyntheticSession
+        const rawStoreRef = pickAvailableCodexRawStoreRef(providerSessionId, resumedSyntheticSession
             ? [resumedSyntheticSession.rawStoreRef]
             : [startedSession.rawStoreRef, request.rawStoreRef], syntheticRawStoreRef);
         logCodexRuntimeStep("start_session.raw_store_ref_ready", launchPerfStartedAtMs, {
@@ -108,8 +109,8 @@ export class CodexRuntimeAdapter {
             if (translated.turnId) {
                 eventQueue.setTurnId(translated.turnId);
             }
-            if (translated.event) {
-                eventQueue.push(translated.event);
+            for (const event of translated.events) {
+                eventQueue.push(event);
             }
             if (translated.terminal) {
                 eventQueue.close();
@@ -136,7 +137,20 @@ export class CodexRuntimeAdapter {
             eventQueue.close();
         });
         const startTurnStartedAtMs = performance.now();
-        await transport.startTurn(request, providerSessionId);
+        const startTurnResult = await transport.startTurn(request, providerSessionId);
+        const startTurnNotification = startTurnResult?.notification ?? null;
+        if (startTurnNotification) {
+            const translated = translateCodexAppServerNotification(startTurnNotification);
+            if (translated.turnId) {
+                eventQueue.setTurnId(translated.turnId);
+            }
+            for (const event of translated.events) {
+                eventQueue.push(event);
+            }
+            if (translated.terminal) {
+                eventQueue.close();
+            }
+        }
         logCodexRuntimeStep("start_session.turn_start", startTurnStartedAtMs, {
             sessionId: request.sessionId,
             providerSessionId
@@ -203,7 +217,7 @@ export class CodexRuntimeAdapter {
             sessionId: request.sessionId,
             providerSessionId: resolvedSessionId
         });
-        const rawStoreRef = pickAvailableCodexRawStoreRef([request.rawStoreRef, resumed.rawStoreRef], syntheticRawStoreRef);
+        const rawStoreRef = pickAvailableCodexRawStoreRef(resolvedSessionId, [request.rawStoreRef, resumed.rawStoreRef], syntheticRawStoreRef);
         const abortController = new AbortController();
         const eventQueue = createAsyncEventQueue();
         logCodexRuntimeStep("continue_session.raw_store_ref_ready", runtimeStartedAtMs, {
@@ -232,8 +246,8 @@ export class CodexRuntimeAdapter {
             if (translated.turnId) {
                 eventQueue.setTurnId(translated.turnId);
             }
-            if (translated.event) {
-                eventQueue.push(translated.event);
+            for (const event of translated.events) {
+                eventQueue.push(event);
             }
             if (translated.terminal) {
                 eventQueue.close();
@@ -260,7 +274,20 @@ export class CodexRuntimeAdapter {
             eventQueue.close();
         });
         const startTurnStartedAtMs = performance.now();
-        await transport.startTurn(request, resolvedSessionId);
+        const startTurnResult = await transport.startTurn(request, resolvedSessionId);
+        const startTurnNotification = startTurnResult?.notification ?? null;
+        if (startTurnNotification) {
+            const translated = translateCodexAppServerNotification(startTurnNotification);
+            if (translated.turnId) {
+                eventQueue.setTurnId(translated.turnId);
+            }
+            for (const event of translated.events) {
+                eventQueue.push(event);
+            }
+            if (translated.terminal) {
+                eventQueue.close();
+            }
+        }
         logCodexRuntimeStep("continue_session.turn_start", startTurnStartedAtMs, {
             sessionId: request.sessionId,
             providerSessionId: resolvedSessionId
@@ -332,6 +359,7 @@ export class CodexRuntimeAdapter {
                 await sink.emit({
                     type: "interrupted",
                     status: "interrupted",
+                    interruptSource: "user",
                     providerSessionId: context.providerSessionId,
                     rawStoreRef: context.rawStoreRef,
                     detail: "codex turn interrupted",
@@ -391,6 +419,7 @@ export class CodexRuntimeAdapter {
             await context.sink.emit({
                 type: "interrupted",
                 status: "interrupted",
+                interruptSource: interrupted ? "user" : "runtime",
                 providerSessionId: context.providerSessionId,
                 rawStoreRef: context.rawStoreRef,
                 detail: "codex turn interrupted",
@@ -443,7 +472,7 @@ export class CodexRuntimeAdapter {
         const callId = pickFirstNonEmpty(ensureText(readProp(item, "id")).trim(), ensureText(readProp(item, "call_id")).trim(), `${itemType}-${randomUUID()}`);
         const name = pickFirstNonEmpty(ensureText(readProp(item, "name")).trim(), ensureText(readProp(item, "tool")).trim(), itemType);
         if (eventType === "item.started") {
-            const input = pickFirstNonEmpty(extractTextBlocks(readProp(item, "arguments")).trim(), extractTextBlocks(readProp(item, "input")).trim(), extractTextBlocks(readProp(item, "command")).trim());
+            const input = resolveCodexToolInput(name, item);
             const toolCall = {
                 callId,
                 name,
@@ -464,11 +493,12 @@ export class CodexRuntimeAdapter {
             return;
         }
         if (eventType === "item.updated") {
+            const knownName = context.toolNameByCallId.get(callId) ?? name;
+            const input = resolveCodexToolInput(knownName, item);
             const output = pickFirstNonEmpty(extractTextBlocks(readProp(item, "result")).trim(), extractTextBlocks(readProp(item, "output")).trim(), extractTextBlocks(readProp(item, "aggregated_output")).trim(), extractTextBlocks(readProp(item, "error")).trim());
             if (output.length === 0) {
                 return;
             }
-            const knownName = context.toolNameByCallId.get(callId) ?? name;
             context.toolNameByCallId.set(callId, knownName);
             await this.emitStableMessage(context, {
                 identity: `tool:result:${callId}`,
@@ -479,7 +509,7 @@ export class CodexRuntimeAdapter {
                 toolCall: {
                     callId,
                     name: knownName,
-                    input: "",
+                    input,
                     output,
                     error: null,
                     status: "running"
@@ -488,13 +518,14 @@ export class CodexRuntimeAdapter {
             return;
         }
         if (eventType === "item.completed") {
+            const knownName = context.toolNameByCallId.get(callId) ?? name;
+            const input = resolveCodexToolInput(knownName, item);
             const output = pickFirstNonEmpty(extractTextBlocks(readProp(item, "result")).trim(), extractTextBlocks(readProp(item, "output")).trim(), extractTextBlocks(readProp(item, "aggregated_output")).trim(), extractTextBlocks(readProp(item, "error")).trim());
             const success = inferToolSuccess(item, output);
-            const knownName = context.toolNameByCallId.get(callId) ?? name;
             const toolCall = {
                 callId,
                 name: knownName,
-                input: "",
+                input,
                 output: success ? output : null,
                 error: success ? null : output,
                 status: success ? "completed" : "failed"
@@ -938,12 +969,16 @@ function createCodexAppServerTransport(options) {
                 method: "turn/start",
                 params: createTurnStartParams(request, providerSessionId)
             });
-            activeTurnId = ensureText(readProp(readProp(result, "turn"), "id")).trim() || activeTurnId;
+            const turn = toRecord(result.turn);
+            activeTurnId = ensureText(readProp(turn, "id")).trim() || activeTurnId;
             logCodexRuntimeStep("transport.turn_start", startedAtMs, {
                 sessionId: request.sessionId,
                 providerSessionId,
                 turnId: activeTurnId
             });
+            return {
+                notification: buildCodexTurnCompletionNotification(turn, providerSessionId)
+            };
         },
         async interruptTurn() {
             if (!activeThreadId || !activeTurnId) {
@@ -983,6 +1018,19 @@ function createCodexAppServerTransport(options) {
         }
     };
 }
+function buildCodexTurnCompletionNotification(turn, threadId) {
+    const status = ensureText(readProp(turn, "status")).trim();
+    if (status !== "completed" && status !== "failed" && status !== "interrupted") {
+        return null;
+    }
+    return {
+        method: "turn/completed",
+        params: {
+            threadId,
+            turn
+        }
+    };
+}
 function createAsyncEventQueue() {
     const values = [];
     const waiters = [];
@@ -1047,7 +1095,7 @@ function translateCodexAppServerNotification(notification) {
     const params = toRecord(notification.params) ?? {};
     if (method === "turn/started") {
         return {
-            event: null,
+            events: [],
             terminal: false,
             turnId: ensureText(readProp(readProp(params, "turn"), "id")).trim() || null
         };
@@ -1055,32 +1103,42 @@ function translateCodexAppServerNotification(notification) {
     if (method === "turn/completed") {
         const turn = toRecord(params.turn);
         const status = ensureText(turn?.status).trim();
+        const itemEvents = translateCodexAppServerTurnItems(turn, "item.completed");
         if (status === "failed") {
             return {
-                event: {
-                    type: "turn.failed",
-                    timestamp: nextTimestamp(),
-                    error: ensureText(readProp(turn?.error, "message")).trim() || "codex turn failed"
-                },
+                events: [
+                    ...itemEvents,
+                    {
+                        type: "turn.failed",
+                        timestamp: nextTimestamp(),
+                        error: ensureText(readProp(turn?.error, "message")).trim() || "codex turn failed"
+                    }
+                ],
                 terminal: true,
                 turnId: ensureText(turn?.id).trim() || null
             };
         }
         if (status === "interrupted") {
             return {
-                event: {
-                    type: "turn.interrupted",
-                    timestamp: nextTimestamp()
-                },
+                events: [
+                    ...itemEvents,
+                    {
+                        type: "turn.interrupted",
+                        timestamp: nextTimestamp()
+                    }
+                ],
                 terminal: true,
                 turnId: ensureText(turn?.id).trim() || null
             };
         }
         return {
-            event: {
-                type: "turn.completed",
-                timestamp: nextTimestamp()
-            },
+            events: [
+                ...itemEvents,
+                {
+                    type: "turn.completed",
+                    timestamp: nextTimestamp()
+                }
+            ],
             terminal: true,
             turnId: ensureText(turn?.id).trim() || null
         };
@@ -1090,17 +1148,19 @@ function translateCodexAppServerNotification(notification) {
         const detail = buildCodexAppServerErrorDetail(error);
         if (params.willRetry === true) {
             return {
-                event: null,
+                events: [],
                 terminal: false,
                 turnId: ensureText(params.turnId).trim() || null
             };
         }
         return {
-            event: {
-                type: "turn.failed",
-                timestamp: nextTimestamp(),
-                error: detail
-            },
+            events: [
+                {
+                    type: "turn.failed",
+                    timestamp: nextTimestamp(),
+                    error: detail
+                }
+            ],
             terminal: true,
             turnId: ensureText(params.turnId).trim() || null
         };
@@ -1109,31 +1169,78 @@ function translateCodexAppServerNotification(notification) {
         const item = translateCodexAppServerItem(toRecord(params.item));
         if (!item) {
             return {
-                event: null,
+                events: [],
                 terminal: false,
                 turnId: null
             };
         }
         return {
-            event: {
-                type: method === "item/started"
-                    ? "item.started"
-                    : method === "item/updated"
-                        ? "item.updated"
-                        : "item.completed",
-                item,
-                timestamp: nextTimestamp()
-            },
+            events: [
+                {
+                    type: method === "item/started"
+                        ? "item.started"
+                        : method === "item/updated"
+                            ? "item.updated"
+                            : "item.completed",
+                    item,
+                    timestamp: nextTimestamp()
+                }
+            ],
             terminal: false,
             turnId: null
         };
     }
     return {
-        event: null,
+        events: [],
         terminal: false,
         turnId: null
     };
 }
+function translateCodexAppServerTurnItems(turn, eventType) {
+    const rawItems = Array.isArray(turn?.items) ? turn.items : [];
+    const translatedItems = rawItems
+        .map((item) => translateCodexAppServerItem(toRecord(item)))
+        .filter((item) => item !== null)
+        .map((item) => ({
+        type: eventType,
+        item,
+        timestamp: nextTimestamp()
+    }));
+    if (translatedItems.length > 0) {
+        return translatedItems;
+    }
+    const lastAgentMessage = normalizeCodexTurnLastAgentMessage(turn);
+    if (!lastAgentMessage) {
+        return [];
+    }
+    return [
+        {
+            type: eventType,
+            item: {
+                type: "agent_message",
+                id: ensureText(turn?.id).trim() || "turn-final-message",
+                text: lastAgentMessage
+            },
+            timestamp: nextTimestamp()
+        }
+    ];
+}
+function normalizeCodexTurnLastAgentMessage(turn) {
+    const candidate = readProp(turn, "lastAgentMessage")
+        ?? readProp(turn, "last_agent_message")
+        ?? readProp(turn, "lastMessage")
+        ?? readProp(turn, "last_message");
+    if (typeof candidate === "string") {
+        const normalized = candidate.trim();
+        return normalized.length > 0 ? normalized : null;
+    }
+    const record = toRecord(candidate);
+    if (!record) {
+        return null;
+    }
+    const content = pickFirstNonEmpty(ensureText(record.text).trim(), extractTextBlocks(readProp(record, "content")).trim(), ensureText(readProp(record, "message")).trim());
+    return content.length > 0 ? content : null;
+}
 function buildCodexAppServerErrorDetail(error) {
     const message = ensureText(error?.message).trim();
     const additionalDetails = ensureText(error?.additionalDetails).trim();
@@ -1348,6 +1455,9 @@ function createCodexInput(request) {
         });
     }
     request.options.attachments.forEach((attachment) => {
+        if (attachment.kind !== "image") {
+            return;
+        }
         input.push({
             type: "local_image",
             path: attachment.filePath
@@ -1365,6 +1475,9 @@ function createCodexAppServerInput(request) {
         });
     }
     for (const attachment of request.options.attachments) {
+        if (attachment.kind !== "image") {
+            continue;
+        }
         input.push({
             type: "localImage",
             path: attachment.filePath
@@ -1415,18 +1528,51 @@ function resolveNodeModulesCandidate(currentDirectory, relativeSegments) {
 function buildRuntimeRawStoreRef(providerSessionId) {
     return resolve(process.cwd(), "runtime", "codex", `${providerSessionId}.stream`);
 }
-function pickAvailableCodexRawStoreRef(candidates, fallbackRawStoreRef) {
+function pickAvailableCodexRawStoreRef(providerSessionId, candidates, fallbackRawStoreRef) {
+    const normalizedProviderSessionId = providerSessionId.trim();
+    const normalizedCandidates = [];
+    const seen = new Set();
     for (const candidate of candidates) {
         const normalized = candidate?.trim();
-        if (!normalized) {
+        if (!normalized || seen.has(normalized) || !existsSync(normalized)) {
             continue;
         }
-        if (existsSync(normalized)) {
-            return normalized;
+        seen.add(normalized);
+        normalizedCandidates.push(normalized);
+    }
+    if (!normalizedProviderSessionId) {
+        return normalizedCandidates[0] ?? fallbackRawStoreRef;
+    }
+    for (const candidate of normalizedCandidates) {
+        if (readSessionMeta(candidate)?.threadId === normalizedProviderSessionId) {
+            return candidate;
+        }
+    }
+    for (const candidate of normalizedCandidates) {
+        if (doesRawStorePathLookLikeThread(candidate, normalizedProviderSessionId)) {
+            return candidate;
+        }
+    }
+    for (const candidate of normalizedCandidates) {
+        if (isSyntheticRawStoreRef(candidate)) {
+            return candidate;
+        }
+    }
+    for (const candidate of normalizedCandidates) {
+        if (!readSessionMeta(candidate)) {
+            return candidate;
         }
     }
     return fallbackRawStoreRef;
 }
+function doesRawStorePathLookLikeThread(rawStoreRef, providerSessionId) {
+    const fileName = basename(rawStoreRef, ".jsonl").trim().toLowerCase();
+    const normalizedProviderSessionId = providerSessionId.trim().toLowerCase();
+    if (!fileName || !normalizedProviderSessionId) {
+        return false;
+    }
+    return fileName === normalizedProviderSessionId || fileName.includes(normalizedProviderSessionId);
+}
 function resolveRuntimeStoreKey(providerSessionId, sessionId) {
     return providerSessionId.trim() || sessionId;
 }
@@ -1506,13 +1652,13 @@ function readJsonRpcResult(parsed) {
 }
 function resolveResumeThreadId(providerSessionId, rawStoreRef) {
     const normalizedProviderSessionId = ensureText(providerSessionId).trim();
+    if (normalizedProviderSessionId.length > 0) {
+        return normalizedProviderSessionId;
+    }
     const fromRawStore = readThreadIdFromRawStore(rawStoreRef);
     if (fromRawStore) {
         return fromRawStore;
     }
-    if (normalizedProviderSessionId.length > 0) {
-        return normalizedProviderSessionId;
-    }
     return null;
 }
 function buildSyntheticResumeHistory(rawStoreRef) {
@@ -1919,7 +2065,7 @@ function toSyntheticRuntimeRecord(event, providerSessionId) {
     const callId = pickFirstNonEmpty(ensureText(readProp(item, "id")).trim(), ensureText(readProp(item, "call_id")).trim(), `${itemType}-${providerSessionId}`);
     const name = pickFirstNonEmpty(ensureText(readProp(item, "name")).trim(), ensureText(readProp(item, "tool")).trim(), itemType);
     if (eventType === "item.started") {
-        const input = pickFirstNonEmpty(extractTextBlocks(readProp(item, "arguments")).trim(), extractTextBlocks(readProp(item, "input")).trim(), extractTextBlocks(readProp(item, "command")).trim());
+        const input = resolveCodexToolInput(name, item);
         return {
             timestamp,
             record: {
@@ -1977,6 +2123,16 @@ function buildCodexFileChangeOutput(value) {
     if (!Array.isArray(value)) {
         return "";
     }
+    const structuredPatch = buildApplyPatchFromFileChangeList(value.map((change) => {
+        const record = toRecord(change);
+        return {
+            path: ensureText(record?.path).trim() || null,
+            kind: ensureText(record?.kind).trim() || null
+        };
+    }));
+    if (structuredPatch) {
+        return structuredPatch;
+    }
     return value
         .map((change) => {
         const record = toRecord(change);
@@ -1993,4 +2149,33 @@ function buildCodexFileChangeOutput(value) {
         .filter((entry) => entry.length > 0)
         .join("\n\n");
 }
+function resolveCodexToolInput(name, item) {
+    const rawInput = pickFirstNonEmpty(extractTextBlocks(readProp(item, "arguments")).trim(), extractTextBlocks(readProp(item, "input")).trim(), extractTextBlocks(readProp(item, "command")).trim());
+    if (name.trim().toLowerCase() !== "apply_patch") {
+        return rawInput;
+    }
+    return (normalizeApplyPatchText(rawInput, {
+        fallbackPaths: collectCodexApplyPatchFallbackPaths(item)
+    }) ?? rawInput);
+}
+function collectCodexApplyPatchFallbackPaths(item) {
+    const directPaths = [
+        ensureText(readProp(item, "path")).trim(),
+        ensureText(readProp(item, "filePath")).trim(),
+        ensureText(readProp(item, "file_path")).trim()
+    ].filter((value) => value.length > 0);
+    const rawChanges = readProp(item, "changes");
+    const changes = Array.isArray(rawChanges) ? rawChanges : [];
+    const changePaths = changes
+        .map((change) => ensureText(readProp(change, "path")).trim())
+        .filter((value) => value.length > 0);
+    const outputText = pickFirstNonEmpty(extractTextBlocks(readProp(item, "result")).trim(), extractTextBlocks(readProp(item, "output")).trim(), extractTextBlocks(readProp(item, "aggregated_output")).trim(), extractTextBlocks(readProp(item, "error")).trim());
+    return [
+        ...new Set([
+            ...directPaths,
+            ...changePaths,
+            ...extractApplyPatchTargetPathsFromToolOutput(outputText)
+        ])
+    ];
+}
 //# sourceMappingURL=codex-runtime.js.map