@ccpocket/bridge 1.79.0 → 1.80.1

package/dist/websocket.js

@@ -10,6 +10,7 @@ import { SdkProcess, listAvailableClaudeModels, } from "./sdk-process.js";
 import { codexErrorMessage, CodexRpcError, CodexProcess, } from "./codex-process.js";
 import { stopManagedCodexAppServers } from "./codex-transport.js";
 import { parseClientMessage, } from "./parser.js";
+import { BRIDGE_PROTOCOL_MAX_VERSION, BRIDGE_PROTOCOL_MIN_VERSION, clientProtocolRange, negotiateProtocolVersion, } from "./protocol-version.js";
 import { getAllRecentSessions, getCodexSessionHistory, getSessionHistory, codexUserTurnUuid, codexThreadToSessionHistory, findSessionsByClaudeIds, extractMessageImages, getClaudeSessionName, getCodexSessionIndexMetadata, loadCodexSessionNames, renameClaudeSession, renameCodexSession, saveCodexSessionProfile, } from "./sessions-index.js";
 import { isSafeUploadFileName, UploadStoreError, } from "./upload-store.js";
 import { formatResumePerformanceLog, summarizeResumeHistory, } from "./resume-metrics.js";
@@ -564,6 +565,8 @@ export class BridgeWebSocketServer {
     deltaBatches = new Map();
     platform;
     clientSupportedServerMessages = new WeakMap();
+    clientProtocolVersions = new WeakMap();
+    rejectedProtocolClients = new WeakSet();
     pendingClaudeResumeInputs = new WeakMap();
     resumeOperations = new Map();
     constructor(options) {
@@ -1852,6 +1855,8 @@ export class BridgeWebSocketServer {
         const projects = this.projectHistory?.getProjects() ?? [];
         this.send(ws, { type: "project_history", projects });
         ws.on("message", (data) => {
+            if (this.rejectedProtocolClients.has(ws))
+                return;
             const raw = data.toString();
             const msg = parseClientMessage(raw);
             if (!msg) {
@@ -1865,6 +1870,18 @@ export class BridgeWebSocketServer {
                 catch {
                     /* ignore */
                 }
+                if (rawType === "client_capabilities") {
+                    this.rejectedProtocolClients.add(ws);
+                    this.send(ws, {
+                        type: "error",
+                        errorCode: "incompatible_protocol",
+                        message: "Client advertised a malformed protocol range.",
+                        protocolVersion: BRIDGE_PROTOCOL_MAX_VERSION,
+                        minimumProtocolVersion: BRIDGE_PROTOCOL_MIN_VERSION,
+                    });
+                    ws.close(4406, "Incompatible protocol version");
+                    return;
+                }
                 console.error("[ws] Unsupported message:", rawType ?? raw.slice(0, 200));
                 this.send(ws, {
                     type: "error",
@@ -1899,7 +1916,26 @@ export class BridgeWebSocketServer {
         void this.refreshClaudeModels();
     }
     async handleClientMessage(msg, ws) {
+        if (this.rejectedProtocolClients.has(ws))
+            return;
         if (msg.type === "client_capabilities") {
+            const clientRange = clientProtocolRange(msg);
+            const selectedProtocolVersion = negotiateProtocolVersion(clientRange);
+            if (selectedProtocolVersion === null) {
+                this.rejectedProtocolClients.add(ws);
+                this.send(ws, {
+                    type: "error",
+                    errorCode: "incompatible_protocol",
+                    protocolVersion: BRIDGE_PROTOCOL_MAX_VERSION,
+                    minimumProtocolVersion: BRIDGE_PROTOCOL_MIN_VERSION,
+                    message: `Client protocol range ${clientRange.min}-${clientRange.max} `
+                        + `does not overlap Bridge protocol range `
+                        + `${BRIDGE_PROTOCOL_MIN_VERSION}-${BRIDGE_PROTOCOL_MAX_VERSION}.`,
+                });
+                ws.close(4406, "Incompatible protocol version");
+                return;
+            }
+            this.clientProtocolVersions.set(ws, selectedProtocolVersion);
             this.clientSupportedServerMessages.set(ws, new Set(msg.supportedServerMessages ?? []));
             this.sendPromptHistoryStatus(ws);
             return;
@@ -6144,6 +6180,8 @@ export class BridgeWebSocketServer {
             defaultCodexProfile: this.defaultCodexProfile,
             codexAutoReviewDisabled: this.codexAutoReviewDisabled,
             bridgeVersion: getPackageVersion(),
+            protocolVersion: BRIDGE_PROTOCOL_MAX_VERSION,
+            minimumProtocolVersion: BRIDGE_PROTOCOL_MIN_VERSION,
             protocolCapabilities: [
                 "project_request_correlation_v1",
                 "session_context_v1",
@@ -6180,6 +6218,8 @@ export class BridgeWebSocketServer {
             defaultCodexProfile: this.defaultCodexProfile,
             codexAutoReviewDisabled: this.codexAutoReviewDisabled,
             bridgeVersion: getPackageVersion(),
+            protocolVersion: BRIDGE_PROTOCOL_MAX_VERSION,
+            minimumProtocolVersion: BRIDGE_PROTOCOL_MIN_VERSION,
             protocolCapabilities: [
                 "project_request_correlation_v1",
                 "session_context_v1",