@ccpocket/bridge 1.53.1 → 1.54.0

package/dist/sessions-index.js

@@ -1,7 +1,7 @@
 import { readdir, readFile, writeFile, appendFile, stat, open } from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import { createInterface } from "node:readline";
-import { basename, join } from "node:path";
+import { basename, extname, join } from "node:path";
 import { homedir } from "node:os";
 import { isAutoRenamePromptText } from "./auto-rename.js";
 import { CODEX_ASSIST_MODEL } from "./codex-assist.js";
@@ -2104,46 +2104,221 @@ async function extractCodexMessageImages(sessionId, messageUuid) {
     catch {
         return [];
     }
-    // Codex doesn't have per-message UUIDs in the same way.
-    // We scan for event_msg with user_message that has images and match by line index
-    // encoded in the UUID (format: "codex-line-{index}").
+    // Codex doesn't have per-message UUIDs in the same way. Newer app history
+    // uses a stable turn ordinal (codex:user-turn:N); older builds encoded the
+    // JSONL line index (codex-line:N).
     const lineIndex = messageUuid.startsWith("codex-line-")
         ? parseInt(messageUuid.slice("codex-line-".length), 10)
         : -1;
-    if (lineIndex < 0)
-        return [];
     const lines = raw.split("\n");
-    if (lineIndex >= lines.length)
-        return [];
-    const line = lines[lineIndex];
-    if (!line?.trim())
-        return [];
-    let entry;
-    try {
-        entry = JSON.parse(line);
+    if (lineIndex >= 0) {
+        if (lineIndex >= lines.length)
+            return [];
+        const line = lines[lineIndex];
+        if (!line?.trim())
+            return [];
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            return [];
+        }
+        if (entry.type !== "event_msg")
+            return [];
+        const payload = asObject(entry.payload);
+        if (!payload || payload.type !== "user_message")
+            return [];
+        return extractCodexUserMessagePayloadImages(payload);
     }
-    catch {
+    const turnMatch = messageUuid.match(/^codex:user-turn:(\d+)$/);
+    const targetOrdinal = turnMatch ? Number(turnMatch[1]) : -1;
+    if (!Number.isInteger(targetOrdinal) || targetOrdinal <= 0)
         return [];
+    const responseItemImagesByOrdinal = collectCodexUserResponseItemImagesByOrdinal(lines);
+    let ordinal = 0;
+    for (const line of lines) {
+        if (!line.trim())
+            continue;
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (entry.type !== "event_msg")
+            continue;
+        const payload = asObject(entry.payload);
+        if (!payload || payload.type !== "user_message")
+            continue;
+        if (!codexUserMessagePayloadHasDisplayContent(payload))
+            continue;
+        ordinal += 1;
+        if (ordinal === targetOrdinal) {
+            const images = await extractCodexUserMessagePayloadImages(payload);
+            return images.length > 0
+                ? images
+                : (responseItemImagesByOrdinal.get(targetOrdinal) ?? []);
+        }
     }
-    if (entry.type !== "event_msg")
-        return [];
-    const payload = asObject(entry.payload);
-    if (!payload || payload.type !== "user_message")
-        return [];
+    return [];
+}
+async function extractCodexUserMessagePayloadImages(payload) {
     const images = [];
-    // Parse payload.images (Data URI format: "data:image/png;base64,...")
     if (Array.isArray(payload.images)) {
         for (const img of payload.images) {
-            if (typeof img !== "string")
+            if (typeof img === "string") {
+                const match = img.match(/^data:(image\/[^;]+);base64,(.+)$/);
+                if (match) {
+                    images.push({ base64: match[2], mimeType: match[1] });
+                }
                 continue;
-            const match = img.match(/^data:(image\/[^;]+);base64,(.+)$/);
-            if (match) {
-                images.push({ base64: match[2], mimeType: match[1] });
+            }
+            const item = asObject(img);
+            if (!item)
+                continue;
+            const base64 = typeof item.base64 === "string"
+                ? item.base64
+                : typeof item.data === "string"
+                    ? item.data
+                    : undefined;
+            const mimeType = typeof item.mimeType === "string"
+                ? item.mimeType
+                : typeof item.mime_type === "string"
+                    ? item.mime_type
+                    : typeof item.media_type === "string"
+                        ? item.media_type
+                        : undefined;
+            if (base64 && mimeType) {
+                images.push({ base64, mimeType });
             }
         }
     }
+    if (Array.isArray(payload.local_images)) {
+        for (const imagePath of payload.local_images) {
+            if (typeof imagePath !== "string" || imagePath.length === 0)
+                continue;
+            const image = await readLocalImageAsBase64(imagePath);
+            if (image)
+                images.push(image);
+        }
+    }
     return images;
 }
+function collectCodexUserResponseItemImagesByOrdinal(lines) {
+    const imagesByOrdinal = new Map();
+    let ordinal = 0;
+    for (const line of lines) {
+        if (!line.trim())
+            continue;
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (entry.type !== "response_item")
+            continue;
+        const payload = asObject(entry.payload);
+        if (!payload ||
+            payload.type !== "message" ||
+            payload.role !== "user" ||
+            !codexUserResponseItemHasDisplayContent(payload)) {
+            continue;
+        }
+        ordinal += 1;
+        const images = extractCodexUserResponseItemImages(payload);
+        if (images.length > 0) {
+            imagesByOrdinal.set(ordinal, images);
+        }
+    }
+    return imagesByOrdinal;
+}
+function codexUserResponseItemHasDisplayContent(payload) {
+    const texts = [];
+    let hasImage = false;
+    for (const item of arrayValue(payload.content)) {
+        const content = asObject(item);
+        if (!content)
+            continue;
+        if (content.type === "input_image") {
+            hasImage = true;
+            continue;
+        }
+        if (content.type !== "input_text" || typeof content.text !== "string") {
+            continue;
+        }
+        texts.push(content.text);
+    }
+    const userText = texts
+        .filter((text) => !isCodexImageWrapperText(text.trim()))
+        .join("\n")
+        .trim();
+    if (userText && isCodexInjectedUserContext(userText))
+        return false;
+    return userText.length > 0 || hasImage;
+}
+function extractCodexUserResponseItemImages(payload) {
+    const images = [];
+    for (const item of arrayValue(payload.content)) {
+        const content = asObject(item);
+        if (!content || content.type !== "input_image")
+            continue;
+        const imageUrl = typeof content.image_url === "string"
+            ? content.image_url
+            : typeof content.url === "string"
+                ? content.url
+                : undefined;
+        const image = extractDataUriImage(imageUrl);
+        if (image)
+            images.push(image);
+    }
+    return images;
+}
+function extractDataUriImage(value) {
+    const match = value?.match(/^data:(image\/[^;]+);base64,(.+)$/);
+    return match ? { base64: match[2], mimeType: match[1] } : null;
+}
+function isCodexImageWrapperText(text) {
+    return /^<image(?:\s[^>]*)?>$/.test(text) || text === "</image>";
+}
+async function readLocalImageAsBase64(imagePath) {
+    const mimeType = mimeTypeForLocalImagePath(imagePath);
+    if (!mimeType)
+        return null;
+    try {
+        const buffer = await readFile(imagePath);
+        return { base64: buffer.toString("base64"), mimeType };
+    }
+    catch {
+        return null;
+    }
+}
+function mimeTypeForLocalImagePath(imagePath) {
+    switch (extname(imagePath).toLowerCase()) {
+        case ".png":
+            return "image/png";
+        case ".jpg":
+        case ".jpeg":
+            return "image/jpeg";
+        case ".gif":
+            return "image/gif";
+        case ".webp":
+            return "image/webp";
+        default:
+            return null;
+    }
+}
+function codexUserMessagePayloadHasDisplayContent(payload) {
+    const message = typeof payload.message === "string" ? payload.message : "";
+    const images = Array.isArray(payload.images) ? payload.images.length : 0;
+    const localImages = Array.isArray(payload.local_images)
+        ? payload.local_images.length
+        : 0;
+    return message.trim().length > 0 || images + localImages > 0;
+}
 export async function getCodexSessionHistory(threadId) {
     const jsonlPath = await findCodexSessionJsonlPath(threadId);
     if (!jsonlPath)
@@ -2250,6 +2425,9 @@ export async function getCodexSessionHistory(threadId) {
                     continue;
                 }
                 if (payload.role === "user") {
+                    if (content.some((item) => item.type === "input_image")) {
+                        continue;
+                    }
                     const text = content
                         .filter((item) => item.type === "input_text" && typeof item.text === "string")
                         .map((item) => item.text)