@ccpocket/bridge 1.46.1 → 1.47.0

package/dist/websocket.js

@@ -395,7 +395,9 @@ export class BridgeWebSocketServer {
             tipCode,
             sessionId,
         };
-        session?.history.push(tipMsg);
+        if (session) {
+            this.sessionManager.appendHistory(session.id, tipMsg);
+        }
         this.send(ws, tipMsg);
     }
     async splitPastHistoryMessages(session) {
@@ -738,6 +740,8 @@ export class BridgeWebSocketServer {
                     return;
                 }
                 const text = msg.text;
+                const clientMessageId = msg.clientMessageId;
+                const baseSeq = msg.baseSeq;
                 const codexSkills = msg.skills ?? (msg.skill ? [msg.skill] : []);
                 const codexMentions = msg.mentions ?? [];
                 // Snapshot busy state before dispatch. We prefer the actual enqueue
@@ -772,12 +776,24 @@ export class BridgeWebSocketServer {
                     if (imageRefs.length === 0)
                         imageRefs = undefined;
                 }
+                if (clientMessageId &&
+                    baseSeq !== undefined &&
+                    this.hasInputConflictSince(session.id, baseSeq)) {
+                    this.send(ws, {
+                        type: "input_rejected",
+                        sessionId: session.id,
+                        clientMessageId,
+                        reason: "conflict",
+                    });
+                    break;
+                }
                 if (session.provider === "codex" &&
                     !session.process.isWaitingForInput) {
                     if (session.codexQueuedInput) {
                         this.send(ws, {
                             type: "input_rejected",
                             sessionId: session.id,
+                            ...(clientMessageId ? { clientMessageId } : {}),
                             reason: "Queue is full",
                         });
                         break;
@@ -795,6 +811,7 @@ export class BridgeWebSocketServer {
                         this.send(ws, {
                             type: "input_rejected",
                             sessionId: session.id,
+                            ...(clientMessageId ? { clientMessageId } : {}),
                             reason: "Queue is full",
                         });
                         break;
@@ -811,18 +828,22 @@ export class BridgeWebSocketServer {
                     this.send(ws, {
                         type: "input_ack",
                         sessionId: session.id,
+                        ...(clientMessageId ? { clientMessageId } : {}),
+                        acceptedSeq: session.historyRevision,
                         queued: true,
                     });
                     this.broadcastSessionList();
                     break;
                 }
-                session.history.push({
+                const userEntry = this.sessionManager.appendHistory(session.id, {
                     type: "user_input",
                     text,
+                    ...(clientMessageId ? { clientMessageId } : {}),
                     timestamp: new Date().toISOString(),
                     ...(images.length > 0 ? { imageCount: images.length } : {}),
                     ...(imageRefs ? { images: imageRefs } : {}),
                 });
+                const acceptedSeq = userEntry?.seq ?? session.historyRevision;
                 // Persist images to Gallery Store asynchronously (fire-and-forget)
                 if (images.length > 0 && this.galleryStore && session.projectPath) {
                     for (const img of images) {
@@ -838,6 +859,8 @@ export class BridgeWebSocketServer {
                     this.send(ws, {
                         type: "input_ack",
                         sessionId: session.id,
+                        ...(clientMessageId ? { clientMessageId } : {}),
+                        acceptedSeq,
                         queued: false,
                     });
                     const codexProc = session.process;
@@ -900,6 +923,8 @@ export class BridgeWebSocketServer {
                     this.send(ws, {
                         type: "input_ack",
                         sessionId: session.id,
+                        ...(clientMessageId ? { clientMessageId } : {}),
+                        acceptedSeq,
                         queued: isAgentBusySnapshot,
                     });
                     this.galleryStore
@@ -947,6 +972,8 @@ export class BridgeWebSocketServer {
                 this.send(ws, {
                     type: "input_ack",
                     sessionId: session.id,
+                    ...(clientMessageId ? { clientMessageId } : {}),
+                    acceptedSeq,
                     queued: wasQueued,
                 });
                 if (wasQueued) {
@@ -1623,7 +1650,7 @@ export class BridgeWebSocketServer {
                     });
                     this.debugEvents.delete(msg.sessionId);
                     this.notifiedPermissionToolUses.delete(msg.sessionId);
-                    this.sendSessionList(ws);
+                    this.broadcastSessionList();
                 }
                 else {
                     this.send(ws, {
@@ -1718,6 +1745,66 @@ export class BridgeWebSocketServer {
                 }
                 break;
             }
+            case "get_history_delta": {
+                const session = this.sessionManager.get(msg.sessionId);
+                const result = this.sessionManager.getHistorySince(msg.sessionId, msg.sinceSeq);
+                if (session && result) {
+                    if (session.pastMessages && session.pastMessages.length > 0) {
+                        const splitPastHistory = await this.splitPastHistoryMessages(session);
+                        if (splitPastHistory.pastMessages.length > 0) {
+                            this.send(ws, {
+                                type: "past_history",
+                                claudeSessionId: session.claudeSessionId ?? msg.sessionId,
+                                sessionId: msg.sessionId,
+                                messages: splitPastHistory.pastMessages,
+                            });
+                        }
+                    }
+                    this.send(ws, {
+                        type: result.kind === "snapshot"
+                            ? "history_snapshot"
+                            : "history_delta",
+                        sessionId: msg.sessionId,
+                        fromSeq: result.fromSeq,
+                        toSeq: result.toSeq,
+                        messages: result.entries,
+                        status: session.status,
+                        ...(result.kind === "snapshot" ? { reason: result.reason } : {}),
+                    });
+                    if (session.provider === "codex") {
+                        const item = session.codexQueuedInput;
+                        this.sendConversationQueue(ws, {
+                            type: "conversation_queue",
+                            sessionId: msg.sessionId,
+                            limit: 1,
+                            items: item
+                                ? [
+                                    {
+                                        itemId: item.itemId,
+                                        text: item.text,
+                                        createdAt: item.createdAt,
+                                        ...(item.updatedAt ? { updatedAt: item.updatedAt } : {}),
+                                        ...(item.imageCount
+                                            ? { imageCount: item.imageCount }
+                                            : {}),
+                                        ...(item.skills?.length ? { skills: item.skills } : {}),
+                                        ...(item.mentions?.length
+                                            ? { mentions: item.mentions }
+                                            : {}),
+                                    },
+                                ]
+                                : [],
+                        });
+                    }
+                }
+                else {
+                    this.send(ws, {
+                        type: "error",
+                        message: `Session ${msg.sessionId} not found`,
+                    });
+                }
+                break;
+            }
             case "refresh_branch": {
                 const session = this.sessionManager.get(msg.sessionId);
                 if (session) {
@@ -3600,6 +3687,26 @@ export class BridgeWebSocketServer {
             .get(ws)
             ?.has("conversation_queue") ?? false);
     }
+    hasInputConflictSince(sessionId, baseSeq) {
+        const delta = this.sessionManager.getHistorySince(sessionId, baseSeq);
+        if (!delta)
+            return true;
+        if (delta.kind === "snapshot")
+            return true;
+        return delta.entries.some((entry) => {
+            const msg = entry.message;
+            if (msg.type === "user_input" || msg.type === "result")
+                return true;
+            if (msg.type === "system") {
+                const subtype = msg.subtype;
+                return (subtype === "session_switched" ||
+                    subtype === "session_rewound" ||
+                    subtype === "sandbox_restarted" ||
+                    subtype === "session_stopped");
+            }
+            return false;
+        });
+    }
     sendConversationQueue(ws, msg) {
         if (!this.shouldSendToClient(ws, msg))
             return;