@ccpocket/bridge 1.91.3 → 1.92.0

package/dist/websocket.js

@@ -984,6 +984,7 @@ export class BridgeWebSocketServer {
                 }
                 : {}),
             ...(sourceSessionId ? { sourceSessionId } : {}),
+            ...(params.forked ? { forked: true } : {}),
             ...(resumeRequestId ? { resumeRequestId } : {}),
             ...(requestId ? { requestId } : {}),
         };
@@ -1060,7 +1061,7 @@ export class BridgeWebSocketServer {
             });
             return;
         }
-        if (session.codexQueuedInput) {
+        if (session.queuedInput) {
             this.send(ws, {
                 type: "rewind_result",
                 sessionId,
@@ -1145,6 +1146,79 @@ export class BridgeWebSocketServer {
         }));
         this.sendSessionList(ws);
     }
+    /**
+     * Branch a Claude conversation into a new session that ends at the given
+     * assistant message. The source session keeps running unchanged.
+     */
+    async forkClaudeSession(ws, sessionId, targetUuid) {
+        const fail = (message) => {
+            this.send(ws, {
+                type: "error",
+                sessionId,
+                message,
+                errorCode: "fork_failed",
+            });
+        };
+        const session = this.sessionManager.get(sessionId);
+        if (!session || session.provider !== "claude") {
+            fail(`Session ${sessionId} not found`);
+            return;
+        }
+        const claudeSessionId = session.claudeSessionId;
+        if (!claudeSessionId) {
+            fail("Session has no Claude session ID yet");
+            return;
+        }
+        const sdkProcess = session.process;
+        if (session.status !== "idle" || (sdkProcess.status ?? "idle") !== "idle") {
+            fail("Cannot fork while Claude is running");
+            return;
+        }
+        if (session.queuedInput) {
+            fail("Cannot fork while Claude has queued input");
+            return;
+        }
+        const history = await getSessionHistory(claudeSessionId);
+        const targetIndex = history.findIndex((message) => message.role === "assistant" && message.uuid === targetUuid);
+        if (targetIndex < 0) {
+            fail("Fork target not found in the Claude transcript");
+            return;
+        }
+        const pastMessages = history.slice(0, targetIndex + 1);
+        const workspace = this.workspaceForRuntimeSession(session);
+        const worktreeOpts = session.worktreePath
+            ? {
+                existingWorktreePath: session.worktreePath,
+                worktreeBranch: session.worktreeBranch,
+            }
+            : undefined;
+        const settings = sdkProcess.settings ?? {};
+        const permissionMode = sdkProcess.permissionMode;
+        const newSessionId = this.sessionManager.create(session.projectPath, {
+            sessionId: claudeSessionId,
+            forkSession: true,
+            resumeSessionAt: targetUuid,
+            ...(permissionMode ? { permissionMode } : {}),
+            ...(settings.model ? { model: settings.model } : {}),
+            ...(settings.effort ? { effort: settings.effort } : {}),
+            ...(settings.fastMode ? { fastMode: true } : {}),
+            ...(session.sandboxEnabled !== undefined
+                ? { sandboxEnabled: session.sandboxEnabled }
+                : {}),
+        }, pastMessages, worktreeOpts, "claude");
+        this.attachWorkspaceToRuntimeSession(newSessionId, workspace);
+        const newSession = this.sessionManager.get(newSessionId);
+        this.send(ws, this.buildSessionCreatedMessage({
+            sessionId: newSessionId,
+            provider: "claude",
+            projectPath: session.projectPath,
+            session: newSession,
+            permissionMode,
+            sourceSessionId: sessionId,
+            forked: true,
+        }));
+        this.sendSessionList(ws);
+    }
     async forkCodexSession(ws, sessionId, targetUuid) {
         const session = this.sessionManager.get(sessionId);
         if (!session) {
@@ -1173,7 +1247,7 @@ export class BridgeWebSocketServer {
             });
             return;
         }
-        if (session.codexQueuedInput) {
+        if (session.queuedInput) {
             this.send(ws, {
                 type: "error",
                 message: "Cannot fork while Codex has queued input",
@@ -1222,6 +1296,7 @@ export class BridgeWebSocketServer {
             approvalsReviewer: newSession?.codexSettings?.approvalsReviewer,
             sandboxMode: newSession?.codexSettings?.sandboxMode,
             sourceSessionId: sessionId,
+            forked: true,
         }));
         this.sendSessionList(ws);
     }
@@ -1509,6 +1584,26 @@ export class BridgeWebSocketServer {
             return String(value);
         }
     }
+    claudeSettingsMessage(sessionId, session) {
+        const settings = session.provider === "claude"
+            ? (session.process
+                .settings ?? {})
+            : {};
+        return {
+            type: "system",
+            subtype: "claude_settings",
+            sessionId,
+            provider: "claude",
+            ...(settings.model ? { model: settings.model } : {}),
+            ...(settings.effort ? { effort: settings.effort } : {}),
+            fastMode: settings.fastMode === true,
+        };
+    }
+    sendClaudeCurrentSettings(ws, sessionId, session) {
+        if (session.provider !== "claude")
+            return;
+        this.send(ws, this.claudeSettingsMessage(sessionId, session));
+    }
     sendCodexCurrentSettings(ws, sessionId, session) {
         const process = session.process instanceof CodexProcess
             ? session.process
@@ -1545,7 +1640,7 @@ export class BridgeWebSocketServer {
                 reason: "reset",
             });
             this.sendCodexCurrentSettings(ws, sessionId, session);
-            this.sendCodexQueueState(ws, sessionId, session);
+            this.sendQueueState(ws, sessionId, session);
             this.sendCodexGoalState(ws, sessionId, session);
             if (options.includeCachedCommands) {
                 this.sendCachedCommands(ws, sessionId, session);
@@ -1576,7 +1671,7 @@ export class BridgeWebSocketServer {
                 status: session.status,
                 sessionId,
             });
-            this.sendCodexQueueState(ws, sessionId, session);
+            this.sendQueueState(ws, sessionId, session);
             this.sendCodexGoalState(ws, sessionId, session);
             this.sendCachedCommands(ws, sessionId, session);
             return true;
@@ -2103,6 +2198,7 @@ export class BridgeWebSocketServer {
                                 permissionMode: claudePermissionMode,
                                 model: msg.model,
                                 effort: msg.effort,
+                                fastMode: msg.claudeFastMode,
                                 maxTurns: msg.maxTurns,
                                 maxBudgetUsd: msg.maxBudgetUsd,
                                 fallbackModel: msg.fallbackModel,
@@ -2321,29 +2417,47 @@ export class BridgeWebSocketServer {
                     });
                     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;
-                    }
-                    const queued = this.sessionManager.queueCodexInput(session.id, {
+                const delivery = msg.delivery;
+                const sdkTurnActive = session.provider === "claude"
+                    ? session.process
+                        .isTurnActive
+                    : undefined;
+                const turnActive = session.provider === "codex"
+                    ? !session.process.isWaitingForInput
+                    : typeof sdkTurnActive === "boolean"
+                        ? sdkTurnActive
+                        : isAgentBusySnapshot;
+                // Older clients omit `delivery`: Codex queues and Claude keeps the
+                // legacy interrupt-and-send path below.
+                const holdForDelivery = turnActive &&
+                    (delivery !== undefined || session.provider === "codex");
+                if (holdForDelivery) {
+                    const pendingInput = {
                         itemId: randomUUID(),
                         ...(clientMessageId ? { clientMessageId } : {}),
                         text,
                         createdAt: new Date().toISOString(),
-                        userMessageUuid: nextCodexUserTurnUuid(session),
+                        ...(session.provider === "codex"
+                            ? { userMessageUuid: nextCodexUserTurnUuid(session) }
+                            : {}),
                         ...(images.length > 0 ? { imageCount: images.length, images } : {}),
                         ...(imageRefs ? { imageRefs } : {}),
                         ...(codexSkills.length > 0 ? { skills: codexSkills } : {}),
                         ...(codexMentions.length > 0 ? { mentions: codexMentions } : {}),
-                    });
-                    if (!queued) {
+                    };
+                    let outcome;
+                    if (delivery === "steer") {
+                        outcome = await this.sessionManager.steerInput(session.id, pendingInput);
+                    }
+                    else if (session.queuedInput) {
+                        outcome = "rejected";
+                    }
+                    else {
+                        outcome = this.sessionManager.queueInput(session.id, pendingInput)
+                            ? "queued"
+                            : "rejected";
+                    }
+                    if (outcome === "rejected") {
                         this.send(ws, {
                             type: "input_rejected",
                             sessionId: session.id,
@@ -2366,7 +2480,7 @@ export class BridgeWebSocketServer {
                         sessionId: session.id,
                         ...(clientMessageId ? { clientMessageId } : {}),
                         acceptedSeq: session.historyRevision,
-                        queued: true,
+                        queued: outcome === "queued",
                     });
                     this.broadcastSessionList();
                     break;
@@ -2580,11 +2694,11 @@ export class BridgeWebSocketServer {
             }
             case "update_queued_input": {
                 const session = this.resolveSession(msg.sessionId);
-                if (!session || session.provider !== "codex") {
+                if (!session) {
                     this.send(ws, {
                         type: "error",
                         sessionId: msg.sessionId,
-                        message: "No active Codex session.",
+                        message: "No active session.",
                     });
                     return;
                 }
@@ -2596,7 +2710,7 @@ export class BridgeWebSocketServer {
                     });
                     return;
                 }
-                const success = this.sessionManager.updateCodexQueuedInput(session.id, msg.itemId, msg.text, { skills: msg.skills ?? [], mentions: msg.mentions ?? [] });
+                const success = this.sessionManager.updateQueuedInput(session.id, msg.itemId, msg.text, { skills: msg.skills ?? [], mentions: msg.mentions ?? [] });
                 if (!success) {
                     this.send(ws, {
                         type: "error",
@@ -2611,15 +2725,15 @@ export class BridgeWebSocketServer {
             }
             case "cancel_queued_input": {
                 const session = this.resolveSession(msg.sessionId);
-                if (!session || session.provider !== "codex") {
+                if (!session) {
                     this.send(ws, {
                         type: "error",
                         sessionId: msg.sessionId,
-                        message: "No active Codex session.",
+                        message: "No active session.",
                     });
                     return;
                 }
-                const success = this.sessionManager.cancelCodexQueuedInput(session.id, msg.itemId);
+                const success = this.sessionManager.cancelQueuedInput(session.id, msg.itemId);
                 if (!success) {
                     this.send(ws, {
                         type: "error",
@@ -2634,15 +2748,15 @@ export class BridgeWebSocketServer {
             }
             case "steer_queued_input": {
                 const session = this.resolveSession(msg.sessionId);
-                if (!session || session.provider !== "codex") {
+                if (!session) {
                     this.send(ws, {
                         type: "error",
                         sessionId: msg.sessionId,
-                        message: "No active Codex session.",
+                        message: "No active session.",
                     });
                     return;
                 }
-                const result = await this.sessionManager.steerCodexQueuedInput(session.id, msg.itemId);
+                const result = await this.sessionManager.steerQueuedInput(session.id, msg.itemId);
                 if (!result.ok) {
                     this.send(ws, {
                         type: "error",
@@ -3139,6 +3253,43 @@ export class BridgeWebSocketServer {
                 console.log(`[ws] set_codex_speed(codex): serviceTier=${serviceTier}`);
                 break;
             }
+            case "set_claude_settings": {
+                const session = this.resolveSession(msg.sessionId);
+                if (!session || session.provider !== "claude") {
+                    this.send(ws, {
+                        type: "error",
+                        sessionId: msg.sessionId,
+                        message: "No active Claude session.",
+                        errorCode: "set_claude_settings_unsupported",
+                    });
+                    break;
+                }
+                const claudeProcess = session.process;
+                try {
+                    await claudeProcess.updateSettings({
+                        ...(msg.model !== undefined ? { model: msg.model.trim() } : {}),
+                        ...(msg.effort !== undefined ? { effort: msg.effort } : {}),
+                        ...(msg.fastMode !== undefined ? { fastMode: msg.fastMode } : {}),
+                    });
+                }
+                catch (err) {
+                    this.send(ws, {
+                        type: "error",
+                        sessionId: msg.sessionId,
+                        message: `Failed to change Claude settings: ${err instanceof Error ? err.message : String(err)}`,
+                        errorCode: "set_claude_settings_rejected",
+                    });
+                    // Re-sync the requester with the settings still in effect.
+                    this.sendClaudeCurrentSettings(ws, session.id, session);
+                    break;
+                }
+                session.lastActivityAt = new Date();
+                this.broadcastSessionMessage(session.id, this.claudeSettingsMessage(session.id, session));
+                this.broadcastSessionList();
+                const settings = claudeProcess.settings;
+                console.log(`[ws] set_claude_settings: model=${settings.model ?? "default"} effort=${settings.effort ?? ""} fast=${settings.fastMode === true}`);
+                break;
+            }
             case "set_codex_recovery":
             case "cancel_codex_recovery": {
                 const session = this.resolveSession(msg.sessionId);
@@ -3677,13 +3828,16 @@ export class BridgeWebSocketServer {
                     if (session.provider === "codex") {
                         this.sendCodexCurrentSettings(ws, msg.sessionId, session);
                     }
+                    else {
+                        this.sendClaudeCurrentSettings(ws, msg.sessionId, session);
+                    }
                     this.send(ws, {
                         type: "status",
                         status: session.status,
                         sessionId: msg.sessionId,
                     });
+                    this.sendQueueState(ws, msg.sessionId, session);
                     if (session.provider === "codex") {
-                        this.sendCodexQueueState(ws, msg.sessionId, session);
                         this.sendCodexGoalState(ws, msg.sessionId, session);
                     }
                     this.sendCachedCommands(ws, msg.sessionId, session);
@@ -3790,7 +3944,7 @@ export class BridgeWebSocketServer {
                         ...(result.kind === "snapshot" ? { reason: result.reason } : {}),
                     });
                     this.sendCodexCurrentSettings(ws, msg.sessionId, session);
-                    this.sendCodexQueueState(ws, msg.sessionId, session);
+                    this.sendQueueState(ws, msg.sessionId, session);
                     this.sendCodexGoalState(ws, msg.sessionId, session);
                     break;
                 }
@@ -3826,6 +3980,8 @@ export class BridgeWebSocketServer {
                         status: session.status,
                         ...(result.kind === "snapshot" ? { reason: result.reason } : {}),
                     });
+                    this.sendClaudeCurrentSettings(ws, msg.sessionId, session);
+                    this.sendQueueState(ws, msg.sessionId, session);
                 }
                 else {
                     this.send(ws, {
@@ -4374,6 +4530,7 @@ export class BridgeWebSocketServer {
                             permissionMode: claudePermissionMode,
                             model: msg.model,
                             effort: msg.effort,
+                            fastMode: msg.claudeFastMode,
                             maxTurns: msg.maxTurns,
                             maxBudgetUsd: msg.maxBudgetUsd,
                             fallbackModel: msg.fallbackModel,
@@ -4578,7 +4735,7 @@ export class BridgeWebSocketServer {
                     if (msg.type === "trust_project") {
                         if (msg.sessionId) {
                             const session = this.sessionManager.get(msg.sessionId);
-                            if (!session || session.provider !== "codex" || session.codexQueuedInput ||
+                            if (!session || session.provider !== "codex" || session.queuedInput ||
                                 await realpath(session.worktreePath ?? session.projectPath) !== projectPath) {
                                 throw new Error("Session is unavailable or has queued input");
                             }
@@ -5988,7 +6145,11 @@ export class BridgeWebSocketServer {
                 break;
             }
             case "fork": {
-                this.forkCodexSession(ws, msg.sessionId, msg.targetUuid).catch((err) => {
+                const forkSource = this.sessionManager.get(msg.sessionId);
+                const fork = forkSource?.provider === "claude"
+                    ? this.forkClaudeSession(ws, msg.sessionId, msg.targetUuid)
+                    : this.forkCodexSession(ws, msg.sessionId, msg.targetUuid);
+                fork.catch((err) => {
                     const errMsg = err instanceof Error ? err.message : String(err);
                     this.send(ws, {
                         type: "error",
@@ -6346,6 +6507,7 @@ export class BridgeWebSocketServer {
             sandboxMode: msg.sandboxMode,
             model: msg.model,
             effort: msg.effort,
+            fastMode: msg.claudeFastMode,
             maxTurns: msg.maxTurns,
             maxBudgetUsd: msg.maxBudgetUsd,
             fallbackModel: msg.fallbackModel,
@@ -6655,6 +6817,9 @@ export class BridgeWebSocketServer {
                 "performance_mode_v1",
                 "project_request_correlation_v1",
                 "session_context_v1",
+                "input_delivery_v1",
+                "claude_session_settings_v1",
+                "claude_fork_v1",
             ],
         });
     }
@@ -6696,6 +6861,9 @@ export class BridgeWebSocketServer {
                 "performance_mode_v1",
                 "project_request_correlation_v1",
                 "session_context_v1",
+                "input_delivery_v1",
+                "claude_session_settings_v1",
+                "claude_fork_v1",
             ],
         });
     }
@@ -7304,6 +7472,7 @@ export class BridgeWebSocketServer {
             value: model.model,
             ...(model.displayName ? { displayName: model.displayName } : {}),
             ...(model.description ? { description: model.description } : {}),
+            ...(model.supportsFastMode ? { supportsFastMode: true } : {}),
         }));
         this.claudeModelEfforts = Object.fromEntries(models.map((model) => [model.model, model.effortLevels]));
     }
@@ -7828,8 +7997,8 @@ export class BridgeWebSocketServer {
             return false;
         });
     }
-    sendCodexQueueState(ws, sessionId, session) {
-        const item = session.codexQueuedInput;
+    sendQueueState(ws, sessionId, session) {
+        const item = session.queuedInput;
         this.sendConversationQueue(ws, {
             type: "conversation_queue",
             sessionId,