@ccpocket/bridge 1.45.1 → 1.45.3

package/dist/websocket.js

@@ -13,7 +13,7 @@ import { getAllRecentSessions, getCodexSessionHistory, getSessionHistory, findSe
 import { ArchiveStore } from "./archive-store.js";
 import { WorktreeStore } from "./worktree-store.js";
 import { listWorktrees, removeWorktree, worktreeExists, getMainBranch, } from "./worktree.js";
-import { stageFiles, stageHunks, unstageFiles, unstageHunks, gitCommit, gitPush, listBranches, createBranch, checkoutBranch, revertFiles, revertHunks, gitFetch, gitPull, gitRemoteStatus, } from "./git-operations.js";
+import { stageFiles, stageHunks, unstageFiles, unstageHunks, gitCommit, gitPush, listGitFiles, listBranches, createBranch, checkoutBranch, revertFiles, revertHunks, gitFetch, gitPull, gitRemoteStatus, } from "./git-operations.js";
 import { generateCommitMessage } from "./git-assist.js";
 import { listWindows, takeScreenshot } from "./screenshot.js";
 import { DebugTraceStore } from "./debug-trace-store.js";
@@ -392,6 +392,61 @@ export class BridgeWebSocketServer {
         session?.history.push(tipMsg);
         this.send(ws, tipMsg);
     }
+    async splitPastHistoryMessages(session) {
+        const messages = session.pastMessages ?? [];
+        const pastMessages = [];
+        const historyMessages = [];
+        for (const raw of messages) {
+            const msg = raw;
+            if (msg.role !== "tool_result") {
+                pastMessages.push(raw);
+                continue;
+            }
+            const paths = new Set();
+            if (Array.isArray(msg.imagePaths)) {
+                for (const path of msg.imagePaths) {
+                    if (typeof path === "string" && path.length > 0)
+                        paths.add(path);
+                }
+            }
+            const content = typeof msg.content === "string" ? msg.content : "";
+            if (this.imageStore && content) {
+                for (const path of this.imageStore.extractImagePaths(content)) {
+                    paths.add(path);
+                }
+            }
+            const images = this.imageStore && paths.size > 0
+                ? await this.imageStore.registerImages([...paths], session.projectPath)
+                : [];
+            if (this.imageStore && Array.isArray(msg.imageBase64)) {
+                for (const image of msg.imageBase64) {
+                    const rawImage = image;
+                    if (typeof rawImage.data !== "string"
+                        || typeof rawImage.mimeType !== "string") {
+                        continue;
+                    }
+                    const ref = this.imageStore.registerFromBase64(rawImage.data, rawImage.mimeType);
+                    if (ref)
+                        images.push(ref);
+                }
+            }
+            const existingImages = Array.isArray(msg.images)
+                ? msg.images
+                : [];
+            historyMessages.push({
+                type: "tool_result",
+                toolUseId: typeof msg.toolUseId === "string"
+                    ? msg.toolUseId
+                    : `past-tool-result-${historyMessages.length}`,
+                content,
+                ...(typeof msg.toolName === "string" ? { toolName: msg.toolName } : {}),
+                ...(existingImages.length > 0 || images.length > 0
+                    ? { images: [...existingImages, ...images] }
+                    : {}),
+            });
+        }
+        return { pastMessages, historyMessages };
+    }
     createClaudeSessionWithFallback(params) {
         const initialMode = params.options?.permissionMode ?? "default";
         try {
@@ -1571,18 +1626,21 @@ export class BridgeWebSocketServer {
             case "get_history": {
                 const session = this.sessionManager.get(msg.sessionId);
                 if (session) {
+                    const splitPastHistory = session.pastMessages && session.pastMessages.length > 0
+                        ? await this.splitPastHistoryMessages(session)
+                        : { pastMessages: [], historyMessages: [] };
                     // Send past conversation from disk (resume) before in-memory history
-                    if (session.pastMessages && session.pastMessages.length > 0) {
+                    if (splitPastHistory.pastMessages.length > 0) {
                         this.send(ws, {
                             type: "past_history",
                             claudeSessionId: session.claudeSessionId ?? msg.sessionId,
                             sessionId: msg.sessionId,
-                            messages: session.pastMessages,
+                            messages: splitPastHistory.pastMessages,
                         });
                     }
                     this.send(ws, {
                         type: "history",
-                        messages: session.history,
+                        messages: [...splitPastHistory.historyMessages, ...session.history],
                         sessionId: msg.sessionId,
                     });
                     this.send(ws, {
@@ -2202,23 +2260,23 @@ export class BridgeWebSocketServer {
                     this.send(ws, this.buildPathNotAllowedError(msg.projectPath));
                     break;
                 }
-                execFile("git", ["ls-files", "--cached", "--others", "--exclude-standard"], { cwd: msg.projectPath, maxBuffer: 10 * 1024 * 1024 }, (err, stdout) => {
-                    if (err) {
-                        if (/not a git repository/i.test(err.message)) {
-                            // Non-git project: silently return empty list (file listing is auxiliary)
-                            this.send(ws, { type: "file_list", files: [] });
-                        }
-                        else {
-                            this.send(ws, {
-                                type: "error",
-                                message: `Failed to list files: ${err.message}`,
-                            });
-                        }
-                        return;
-                    }
-                    const files = stdout.trim().split("\n").filter(Boolean);
+                try {
+                    const files = listGitFiles(msg.projectPath);
                     this.send(ws, { type: "file_list", files });
-                });
+                }
+                catch (err) {
+                    const message = err instanceof Error ? err.message : String(err);
+                    if (/not a git repository/i.test(message)) {
+                        // Non-git project: silently return empty list (file listing is auxiliary)
+                        this.send(ws, { type: "file_list", files: [] });
+                    }
+                    else {
+                        this.send(ws, {
+                            type: "error",
+                            message: `Failed to list files: ${message}`,
+                        });
+                    }
+                }
                 break;
             }
             case "list_recordings": {