@ccpocket/bridge 1.52.2 → 1.53.1

package/dist/sessions-index.js

@@ -3,6 +3,8 @@ import { createReadStream } from "node:fs";
 import { createInterface } from "node:readline";
 import { basename, join } from "node:path";
 import { homedir } from "node:os";
+import { isAutoRenamePromptText } from "./auto-rename.js";
+import { CODEX_ASSIST_MODEL } from "./codex-assist.js";
 function createRecentSessionsPerfStats() {
     return {
         claudeProjectDirs: 0,
@@ -119,6 +121,9 @@ const RE_SYSTEM_INJECTED = /^<(?:local-command-caveat|local-command-std(?:err|ou
 function isSystemInjectedText(text) {
     return RE_SYSTEM_INJECTED.test(text) || text.startsWith("Base directory for this skill:");
 }
+function isCodexAutoRenameSession(firstPrompt, model) {
+    return model === CODEX_ASSIST_MODEL && isAutoRenamePromptText(firstPrompt);
+}
 /** Extract user prompt text from a parsed JSONL entry. */
 function extractUserPromptText(entry) {
     const message = entry.message;
@@ -147,6 +152,7 @@ function parseFromChunks(sessionId, head, tail) {
     let headFoundFirstPrompt = false;
     let headFoundProjectPath = false;
     let headFoundGitBranch = false;
+    let isInternalAutoRename = false;
     // --- Scan head lines ---
     const headLines = head.split("\n");
     for (const line of headLines) {
@@ -200,6 +206,10 @@ function parseFromChunks(sessionId, head, tail) {
                 const entry = JSON.parse(line);
                 const text = extractUserPromptText(entry);
                 if (text && !isSystemInjectedText(text)) {
+                    if (isAutoRenamePromptText(text)) {
+                        isInternalAutoRename = true;
+                        break;
+                    }
                     firstPrompt = text;
                     headFoundFirstPrompt = true;
                 }
@@ -207,6 +217,14 @@ function parseFromChunks(sessionId, head, tail) {
             catch { /* skip */ }
         }
     }
+    if (isInternalAutoRename) {
+        return {
+            entry: null,
+            headFoundFirstPrompt,
+            headFoundProjectPath,
+            headFoundGitBranch,
+        };
+    }
     // --- Scan tail lines (if separate from head) ---
     if (tail) {
         const tailLines = tail.split("\n");
@@ -288,6 +306,14 @@ function parseFromChunks(sessionId, head, tail) {
             headFoundGitBranch,
         };
     }
+    if (isAutoRenamePromptText(firstPrompt)) {
+        return {
+            entry: null,
+            headFoundFirstPrompt,
+            headFoundProjectPath,
+            headFoundGitBranch,
+        };
+    }
     return {
         entry: {
             sessionId,
@@ -361,6 +387,9 @@ async function parseClaudeJsonlFileFast(sessionId, filePath) {
         if (!result.firstPrompt && missing.firstPrompt) {
             result.firstPrompt = missing.firstPrompt;
         }
+        if (isAutoRenamePromptText(result.firstPrompt)) {
+            return null;
+        }
         if (missing.projectPath) {
             result.projectPath = missing.projectPath;
             if (missing.rawCwd && missing.rawCwd !== missing.projectPath) {
@@ -377,6 +406,8 @@ async function parseClaudeJsonlFileFast(sessionId, filePath) {
     return result;
 }
 async function hydrateClaudeIndexedEntry(dirPath, entry) {
+    if (isAutoRenamePromptText(entry.firstPrompt ?? ""))
+        return null;
     const rawProjectPath = entry.projectPath ?? "";
     const normalizedPath = normalizeWorktreePath(rawProjectPath);
     const base = {
@@ -404,6 +435,8 @@ async function hydrateClaudeIndexedEntry(dirPath, entry) {
     const parsed = await parseClaudeJsonlFileFast(entry.sessionId, fallbackPath);
     if (!parsed)
         return base;
+    if (isAutoRenamePromptText(parsed.firstPrompt))
+        return null;
     return {
         ...base,
         firstPrompt: base.firstPrompt || parsed.firstPrompt,
@@ -677,8 +710,11 @@ export async function getAllRecentSessions(options = {}) {
                         continue;
                     }
                     indexedIds.add(entry.sessionId);
-                    result.entries.push(await hydrateClaudeIndexedEntry(dirPath, entry));
-                    result.indexEntries += 1;
+                    const hydrated = await hydrateClaudeIndexedEntry(dirPath, entry);
+                    if (hydrated) {
+                        result.entries.push(hydrated);
+                        result.indexEntries += 1;
+                    }
                 }
                 if (!includeOnlyNamedClaude) {
                     const scanned = await scanJsonlDir(dirPath, {
@@ -981,6 +1017,8 @@ function parseCodexSessionJsonl(raw, fallbackSessionId) {
     }
     if (model === "codex-auto-review")
         return null;
+    if (isCodexAutoRenameSession(firstPrompt, model))
+        return null;
     if (!projectPath || !hasMessages)
         return null;
     summary = lastAssistantText || summary;
@@ -1348,6 +1386,216 @@ async function getAllRecentCodexSessions(options = {}) {
 export function codexUserTurnUuid(ordinal) {
     return `codex:user-turn:${ordinal}`;
 }
+function numberToIsoTimestamp(value) {
+    return typeof value === "number" && Number.isFinite(value)
+        ? new Date(value * 1000).toISOString()
+        : undefined;
+}
+function stringValue(value) {
+    return typeof value === "string" ? value : undefined;
+}
+function arrayValue(value) {
+    return Array.isArray(value) ? value : [];
+}
+function codexToolResultContent(value) {
+    if (value == null)
+        return "";
+    if (typeof value === "string")
+        return value;
+    try {
+        return JSON.stringify(value, null, 2);
+    }
+    catch {
+        return String(value);
+    }
+}
+function codexUserInputTextAndImages(content) {
+    const textParts = [];
+    let imageCount = 0;
+    for (const entry of arrayValue(content)) {
+        const item = asObject(entry);
+        if (!item)
+            continue;
+        if (item.type === "text" && typeof item.text === "string") {
+            textParts.push(item.text);
+        }
+        else if (item.type === "image" || item.type === "localImage") {
+            imageCount += 1;
+        }
+    }
+    return { text: textParts.join("\n"), imageCount };
+}
+function appendCodexThinkingMessage(messages, text, timestamp) {
+    const normalized = text.trim();
+    if (!normalized)
+        return;
+    messages.push({
+        role: "assistant",
+        content: [{ type: "thinking", thinking: normalized }],
+        ...(timestamp ? { timestamp } : {}),
+    });
+}
+function appendCodexOfficialToolResult(messages, id, name, content, timestamp) {
+    appendToolResultMessage(messages, id, name, content, {
+        ...(timestamp ? { timestamp } : {}),
+    });
+}
+export function codexThreadToSessionHistory(thread) {
+    const messages = [];
+    const turns = arrayValue(asObject(thread)?.turns);
+    let userTurnOrdinal = 0;
+    for (const rawTurn of turns) {
+        const turn = asObject(rawTurn);
+        if (!turn)
+            continue;
+        const turnStartedAt = numberToIsoTimestamp(turn.startedAt);
+        const turnCompletedAt = numberToIsoTimestamp(turn.completedAt);
+        for (const rawItem of arrayValue(turn.items)) {
+            const item = asObject(rawItem);
+            if (!item || typeof item.type !== "string")
+                continue;
+            const itemId = stringValue(item.id) ?? `codex-item-${messages.length}`;
+            const itemTimestamp = turnCompletedAt ?? turnStartedAt;
+            switch (item.type) {
+                case "userMessage": {
+                    const { text, imageCount } = codexUserInputTextAndImages(item.content);
+                    const displayText = text.trim().length > 0
+                        ? text
+                        : imageCount > 0
+                            ? `[Image attached${imageCount > 1 ? ` x${imageCount}` : ""}]`
+                            : "";
+                    if (displayText.trim().length === 0)
+                        break;
+                    userTurnOrdinal += 1;
+                    messages.push({
+                        role: "user",
+                        uuid: codexUserTurnUuid(userTurnOrdinal),
+                        content: [{ type: "text", text: displayText }],
+                        ...(imageCount > 0 ? { imageCount } : {}),
+                        ...(turnStartedAt ? { timestamp: turnStartedAt } : {}),
+                    });
+                    break;
+                }
+                case "agentMessage": {
+                    appendTextMessage(messages, "assistant", stringValue(item.text) ?? "", itemTimestamp);
+                    break;
+                }
+                case "plan": {
+                    appendTextMessage(messages, "assistant", stringValue(item.text) ?? "", itemTimestamp);
+                    break;
+                }
+                case "reasoning": {
+                    const summary = arrayValue(item.summary)
+                        .filter((value) => typeof value === "string");
+                    const content = arrayValue(item.content)
+                        .filter((value) => typeof value === "string");
+                    appendCodexThinkingMessage(messages, [...summary, ...content].join("\n"), itemTimestamp);
+                    break;
+                }
+                case "commandExecution": {
+                    const command = stringValue(item.command) ?? "";
+                    appendToolUseMessage(messages, itemId, "Bash", {
+                        command,
+                        ...(typeof item.cwd === "string" ? { cwd: item.cwd } : {}),
+                    });
+                    const outputParts = [];
+                    if (typeof item.status === "string") {
+                        outputParts.push(`status: ${item.status}`);
+                    }
+                    if (typeof item.exitCode === "number") {
+                        outputParts.push(`exitCode: ${item.exitCode}`);
+                    }
+                    if (typeof item.aggregatedOutput === "string") {
+                        outputParts.push(item.aggregatedOutput);
+                    }
+                    appendCodexOfficialToolResult(messages, itemId, "Bash", outputParts.join("\n").trim(), itemTimestamp);
+                    break;
+                }
+                case "fileChange": {
+                    appendToolUseMessage(messages, itemId, "FileChange", {
+                        changes: Array.isArray(item.changes) ? item.changes : [],
+                        ...(typeof item.status === "string" ? { status: item.status } : {}),
+                    });
+                    break;
+                }
+                case "mcpToolCall": {
+                    const server = stringValue(item.server) ?? "mcp";
+                    const tool = stringValue(item.tool) ?? "tool";
+                    appendToolUseMessage(messages, itemId, `mcp:${server}/${tool}`, {
+                        arguments: item.arguments ?? {},
+                        ...(typeof item.status === "string" ? { status: item.status } : {}),
+                    });
+                    if (item.result != null || item.error != null) {
+                        const normalized = normalizeCodexMcpResult(item.result ?? item.error);
+                        appendToolResultMessage(messages, itemId, `mcp:${server}/${tool}`, normalized.content, {
+                            imageBase64: normalized.imageBase64,
+                            ...(itemTimestamp ? { timestamp: itemTimestamp } : {}),
+                        });
+                    }
+                    break;
+                }
+                case "dynamicToolCall": {
+                    const tool = stringValue(item.tool) ?? "tool";
+                    appendToolUseMessage(messages, itemId, tool, {
+                        arguments: item.arguments ?? {},
+                        ...(typeof item.status === "string" ? { status: item.status } : {}),
+                    });
+                    const contentItems = arrayValue(item.contentItems);
+                    const resultText = contentItems
+                        .map((entry) => {
+                        const contentItem = asObject(entry);
+                        if (!contentItem)
+                            return "";
+                        if (contentItem.type === "inputText" &&
+                            typeof contentItem.text === "string") {
+                            return contentItem.text;
+                        }
+                        if (contentItem.type === "inputImage" &&
+                            typeof contentItem.imageUrl === "string") {
+                            return contentItem.imageUrl;
+                        }
+                        return codexToolResultContent(contentItem);
+                    })
+                        .filter(Boolean)
+                        .join("\n");
+                    appendCodexOfficialToolResult(messages, itemId, tool, resultText, itemTimestamp);
+                    break;
+                }
+                case "webSearch": {
+                    appendToolUseMessage(messages, itemId, "WebSearch", {
+                        query: stringValue(item.query) ?? "",
+                        ...(item.action != null ? { action: item.action } : {}),
+                    });
+                    break;
+                }
+                case "imageGeneration": {
+                    appendToolUseMessage(messages, itemId, "ImageGeneration", {
+                        ...(typeof item.status === "string" ? { status: item.status } : {}),
+                        ...(typeof item.revisedPrompt === "string"
+                            ? { revisedPrompt: item.revisedPrompt }
+                            : {}),
+                    });
+                    appendImageGenerationResult(messages, {
+                        id: itemId,
+                        status: item.status,
+                        revisedPrompt: item.revisedPrompt,
+                        savedPath: item.savedPath,
+                        result: item.result,
+                    }, itemId, itemTimestamp);
+                    break;
+                }
+                case "enteredReviewMode":
+                case "exitedReviewMode": {
+                    appendTextMessage(messages, "assistant", stringValue(item.review) ?? "", itemTimestamp);
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+    return messages;
+}
 function asObject(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return null;