@ccpocket/bridge 1.68.2 → 1.69.1

package/dist/websocket.d.ts

@@ -52,6 +52,8 @@ export declare class BridgeWebSocketServer {
     private archiveStore;
     private codexProfiles;
     private defaultCodexProfile;
+    private codexAutoReviewDisabled;
+    private codexAutoReviewPolicyLoaded;
     private codexMetadataRequest;
     private lastConnectMetadataRefreshAt;
     private claudeModels;
@@ -161,12 +163,14 @@ export declare class BridgeWebSocketServer {
     private applyClaudeModels;
     private applyFallbackClaudeModels;
     private readCodexModels;
+    private readCodexAutoReviewDisabled;
     private applyCodexModels;
     private applyFallbackCodexModels;
     private loadCodexProfiles;
     private validateCodexProfile;
     private resolveCodexResumeProfile;
     private getActiveCodexProcess;
+    private withCodexAutoReviewPolicy;
     private getActiveClaudeProcess;
     private listRecentCodexThreads;
     private createStandaloneCodexProcess;
@@ -180,6 +184,7 @@ export declare class BridgeWebSocketServer {
     private sessionLabel;
     private maybeSendPushNotification;
     private broadcast;
+    private prepareServerMessageForClient;
     private shouldSendToClient;
     private hasInputConflictSince;
     private sendCodexQueueState;

package/dist/websocket.js

@@ -7,7 +7,7 @@ import { promisify } from "node:util";
 import { WebSocketServer, WebSocket } from "ws";
 import { SessionManager, MAX_HISTORY_PER_SESSION, } from "./session.js";
 import { SdkProcess, listAvailableClaudeModels, } from "./sdk-process.js";
-import { CodexProcess, } from "./codex-process.js";
+import { codexErrorMessage, CodexRpcError, CodexProcess, } from "./codex-process.js";
 import { stopManagedCodexAppServers } from "./codex-transport.js";
 import { parseClientMessage, } from "./parser.js";
 import { getAllRecentSessions, getCodexSessionHistory, getSessionHistory, codexUserTurnUuid, codexThreadToSessionHistory, findSessionsByClaudeIds, extractMessageImages, getClaudeSessionName, getCodexSessionIndexMetadata, loadCodexSessionNames, renameClaudeSession, renameCodexSession, saveCodexSessionProfile, } from "./sessions-index.js";
@@ -90,8 +90,12 @@ const CODEX_USER_TURN_UUID_RE = /^codex:user-turn:(\d+)$/;
 const OPT_IN_SERVER_MESSAGES = new Set([
     "conversation_queue",
     "goal_state",
+    "guardian_approval",
     "prompt_history_status",
 ]);
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function parseCodexUserTurnOrdinal(uuid) {
     if (!uuid)
         return null;
@@ -239,6 +243,9 @@ function normalizeCodexApprovalPolicy(value) {
             return "on-request";
     }
 }
+function isCodexAutoReviewApprovalsReviewer(value) {
+    return value === "auto_review" || value === "guardian_subagent";
+}
 function sanitizeCodexModel(model) {
     if (typeof model !== "string")
         return undefined;
@@ -453,6 +460,8 @@ export class BridgeWebSocketServer {
     archiveStore;
     codexProfiles = [];
     defaultCodexProfile;
+    codexAutoReviewDisabled = false;
+    codexAutoReviewPolicyLoaded = false;
     codexMetadataRequest = null;
     lastConnectMetadataRefreshAt = null;
     claudeModels = FALLBACK_CLAUDE_MODELS;
@@ -805,10 +814,10 @@ export class BridgeWebSocketServer {
             fallback: buildCodexHistoryPrefix(session, targetOrdinal - 1),
         });
         this.destroySession(sessionId);
-        const newSessionId = this.sessionManager.create(projectPath, undefined, pastMessages, worktreeOpts, "codex", {
+        const newSessionId = this.sessionManager.create(projectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
             ...(codexSettings ?? {}),
             threadId,
-        });
+        }));
         const newSession = this.sessionManager.get(newSessionId);
         this.send(ws, {
             type: "rewind_result",
@@ -820,8 +829,8 @@ export class BridgeWebSocketServer {
             provider: "codex",
             projectPath,
             session: newSession,
-            approvalsReviewer: codexSettings?.approvalsReviewer,
-            sandboxMode: codexSettings?.sandboxMode,
+            approvalsReviewer: newSession?.codexSettings?.approvalsReviewer,
+            sandboxMode: newSession?.codexSettings?.sandboxMode,
             sourceSessionId: sessionId,
         }));
         this.sendSessionList(ws);
@@ -892,18 +901,18 @@ export class BridgeWebSocketServer {
             expectedUserTurns: targetOrdinal,
             fallback: buildCodexHistoryPrefix(session, targetOrdinal),
         });
-        const newSessionId = this.sessionManager.create(projectPath, undefined, pastMessages, worktreeOpts, "codex", {
+        const newSessionId = this.sessionManager.create(projectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
             ...(codexSettings ?? {}),
             threadId: forkedThreadId,
-        });
+        }));
         const newSession = this.sessionManager.get(newSessionId);
         this.send(ws, this.buildSessionCreatedMessage({
             sessionId: newSessionId,
             provider: "codex",
             projectPath,
             session: newSession,
-            approvalsReviewer: codexSettings?.approvalsReviewer,
-            sandboxMode: codexSettings?.sandboxMode,
+            approvalsReviewer: newSession?.codexSettings?.approvalsReviewer,
+            sandboxMode: newSession?.codexSettings?.sandboxMode,
             sourceSessionId: sessionId,
         }));
         this.sendSessionList(ws);
@@ -1641,9 +1650,13 @@ export class BridgeWebSocketServer {
                 }
                 try {
                     const provider = msg.provider ?? "claude";
-                    const requestedCodexPermissionsMode = provider === "codex"
+                    const normalizedCodexPermissionsMode = provider === "codex"
                         ? normalizeCodexPermissionsMode(msg.codexPermissionsMode)
                         : undefined;
+                    const requestedCodexPermissionsMode = this.codexAutoReviewDisabled &&
+                        normalizedCodexPermissionsMode === "autoReview"
+                        ? "default"
+                        : normalizedCodexPermissionsMode;
                     const codexPermissionSettings = requestedCodexPermissionsMode
                         ? codexSettingsFromPermissionsMode(requestedCodexPermissionsMode)
                         : undefined;
@@ -1719,7 +1732,7 @@ export class BridgeWebSocketServer {
                                 useWorktree: msg.useWorktree,
                                 worktreeBranch: msg.worktreeBranch,
                                 existingWorktreePath: msg.existingWorktreePath,
-                            }, provider, {
+                            }, provider, this.withCodexAutoReviewPolicy({
                                 profile: msg.profile,
                                 approvalPolicy: codexPermissionSettings
                                     ? codexPermissionSettings.approvalPolicy
@@ -1727,9 +1740,8 @@ export class BridgeWebSocketServer {
                                         normalizeCodexApprovalPolicy(executionMode === "fullAccess"
                                             ? "never"
                                             : "on-request")),
-                                approvalsReviewer: codexPermissionSettings
-                                    ? codexPermissionSettings.approvalsReviewer
-                                    : msg.approvalsReviewer,
+                                approvalsReviewer: codexPermissionSettings?.approvalsReviewer ??
+                                    msg.approvalsReviewer,
                                 codexPermissionsMode: codexPermissionSettings?.codexPermissionsMode,
                                 sandboxMode: codexPermissionSettings
                                     ? codexPermissionSettings.sandboxMode
@@ -1746,7 +1758,7 @@ export class BridgeWebSocketServer {
                                 collaborationMode: planMode
                                     ? "plan"
                                     : "default",
-                            }),
+                            })),
                             permissionMode: claudePermissionMode,
                             executionMode,
                             planMode,
@@ -2286,7 +2298,15 @@ export class BridgeWebSocketServer {
                     // Permission mode for Codex requires a session restart (like sandbox mode).
                     // approvalPolicy and collaborationMode are thread-level settings that
                     // only take effect reliably at thread/start or thread/resume time.
-                    const requestedCodexPermissionsMode = normalizeCodexPermissionsMode(msg.codexPermissionsMode);
+                    const normalizedCodexPermissionsMode = normalizeCodexPermissionsMode(msg.codexPermissionsMode);
+                    const requestedCodexPermissionsMode = this.codexAutoReviewDisabled &&
+                        normalizedCodexPermissionsMode === "autoReview"
+                        ? "default"
+                        : normalizedCodexPermissionsMode;
+                    const requestedApprovalsReviewer = this.codexAutoReviewDisabled &&
+                        isCodexAutoReviewApprovalsReviewer(msg.approvalsReviewer)
+                        ? "user"
+                        : msg.approvalsReviewer;
                     const codexPermissionSettings = requestedCodexPermissionsMode
                         ? codexSettingsFromPermissionsMode(requestedCodexPermissionsMode)
                         : undefined;
@@ -2324,23 +2344,28 @@ export class BridgeWebSocketServer {
                     const newSandboxMode = codexPermissionSettings
                         ? codexPermissionSettings.sandboxMode
                         : currentSandboxMode;
-                    const newPermissionsMode = codexPermissionSettings?.codexPermissionsMode ??
+                    const configuredReviewer = requestedCodexPermissionsMode === "custom"
+                        ? undefined
+                        : (codexPermissionSettings?.approvalsReviewer ??
+                            requestedApprovalsReviewer ??
+                            currentReviewer);
+                    const newReviewer = this.codexAutoReviewDisabled
+                        ? "user"
+                        : configuredReviewer;
+                    const derivedPermissionsMode = codexPermissionSettings?.codexPermissionsMode ??
                         (collaborationOnlyChange ? currentPermissionsMode : undefined) ??
                         deriveCodexPermissionsMode({
                             approvalPolicy: newApproval,
-                            approvalsReviewer: codexPermissionSettings?.approvalsReviewer ??
-                                msg.approvalsReviewer ??
-                                currentReviewer,
+                            approvalsReviewer: newReviewer,
                             sandboxMode: newSandboxMode,
                         });
+                    const newPermissionsMode = this.codexAutoReviewDisabled &&
+                        derivedPermissionsMode === "autoReview"
+                        ? "default"
+                        : derivedPermissionsMode;
                     const newCollaboration = planMode
                         ? "plan"
                         : "default";
-                    const newReviewer = requestedCodexPermissionsMode === "custom"
-                        ? undefined
-                        : (codexPermissionSettings?.approvalsReviewer ??
-                            msg.approvalsReviewer ??
-                            currentReviewer);
                     const currentCollaboration = process.collaborationMode;
                     if (newApproval === currentApproval &&
                         newReviewer === currentReviewer &&
@@ -2351,7 +2376,9 @@ export class BridgeWebSocketServer {
                     }
                     const canApplyModeInPlace = session.status === "idle" &&
                         requestedCodexPermissionsMode !== "custom" &&
-                        newSandboxMode === currentSandboxMode;
+                        newSandboxMode === currentSandboxMode &&
+                        (this.codexAutoReviewPolicyLoaded ||
+                            !isCodexAutoReviewApprovalsReviewer(newReviewer));
                     if (canApplyModeInPlace) {
                         const process = session.process;
                         if (newApproval && newApproval !== currentApproval) {
@@ -2407,7 +2434,7 @@ export class BridgeWebSocketServer {
                     if (!threadId || !hasUserMessages) {
                         const newId = this.sessionManager.create(projectPath, undefined, undefined, worktreePath
                             ? { existingWorktreePath: worktreePath, worktreeBranch }
-                            : undefined, "codex", {
+                            : undefined, "codex", this.withCodexAutoReviewPolicy({
                             approvalPolicy: newApproval,
                             approvalsReviewer: newReviewer,
                             codexPermissionsMode: newPermissionsMode,
@@ -2418,7 +2445,7 @@ export class BridgeWebSocketServer {
                             networkAccessEnabled: oldSettings.networkAccessEnabled,
                             webSearchMode: oldSettings.webSearchMode,
                             collaborationMode: newCollaboration,
-                        });
+                        }));
                         const newSession = this.sessionManager.get(newId);
                         if (newSession && sessionName)
                             newSession.name = sessionName;
@@ -2467,7 +2494,7 @@ export class BridgeWebSocketServer {
                     }
                     this.getCodexThreadHistory(threadId, effectiveProjectPath)
                         .then((pastMessages) => {
-                        const newId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", {
+                        const newId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
                             threadId,
                             approvalPolicy: newApproval,
                             approvalsReviewer: newReviewer,
@@ -2479,7 +2506,7 @@ export class BridgeWebSocketServer {
                             networkAccessEnabled: oldSettings.networkAccessEnabled,
                             webSearchMode: oldSettings.webSearchMode,
                             collaborationMode: newCollaboration,
-                        });
+                        }));
                         const newSession = this.sessionManager.get(newId);
                         if (newSession && sessionName) {
                             newSession.name = sessionName;
@@ -2818,8 +2845,10 @@ export class BridgeWebSocketServer {
                     // "no rollout found for thread id".)
                     const newId = this.sessionManager.create(projectPath, undefined, undefined, worktreePath
                         ? { existingWorktreePath: worktreePath, worktreeBranch }
-                        : undefined, "codex", {
+                        : undefined, "codex", this.withCodexAutoReviewPolicy({
                         approvalPolicy: oldSettings.approvalPolicy,
+                        approvalsReviewer: oldSettings.approvalsReviewer,
+                        codexPermissionsMode: oldSettings.codexPermissionsMode,
                         sandboxMode: newSandboxMode,
                         model: oldSettings.model,
                         modelReasoningEffort: oldSettings.modelReasoningEffort,
@@ -2827,7 +2856,7 @@ export class BridgeWebSocketServer {
                         networkAccessEnabled: oldSettings.networkAccessEnabled,
                         webSearchMode: oldSettings.webSearchMode,
                         collaborationMode,
-                    });
+                    }));
                     const newSession = this.sessionManager.get(newId);
                     if (newSession && sessionName)
                         newSession.name = sessionName;
@@ -2869,9 +2898,11 @@ export class BridgeWebSocketServer {
                 }
                 this.getCodexThreadHistory(threadId, effectiveProjectPath)
                     .then((pastMessages) => {
-                    const newId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", {
+                    const newId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
                         threadId,
                         approvalPolicy: oldSettings.approvalPolicy,
+                        approvalsReviewer: oldSettings.approvalsReviewer,
+                        codexPermissionsMode: oldSettings.codexPermissionsMode,
                         sandboxMode: newSandboxMode,
                         model: oldSettings.model,
                         modelReasoningEffort: oldSettings.modelReasoningEffort,
@@ -2879,7 +2910,7 @@ export class BridgeWebSocketServer {
                         networkAccessEnabled: oldSettings.networkAccessEnabled,
                         webSearchMode: oldSettings.webSearchMode,
                         collaborationMode,
-                    });
+                    }));
                     // Restore session name
                     const newSession = this.sessionManager.get(newId);
                     if (newSession && sessionName) {
@@ -3316,25 +3347,39 @@ export class BridgeWebSocketServer {
             }
             case "archive_session": {
                 const { sessionId, provider, projectPath } = msg;
-                this.archiveStore
-                    .archive(sessionId, provider, projectPath)
-                    .then(() => {
-                    // For Codex sessions, also call thread/archive RPC (best-effort).
-                    // Requires a running Codex app-server process; skip if none active.
+                const archiveProjectPath = resolvePlatformPath(projectPath, this.platform);
+                if (!this.isPathAllowed(archiveProjectPath)) {
+                    const pathError = this.buildPathNotAllowedError(projectPath);
+                    this.send(ws, {
+                        type: "archive_result",
+                        sessionId,
+                        success: false,
+                        error: pathError.message,
+                    });
+                    break;
+                }
+                void (async () => {
                     if (provider === "codex") {
-                        const activeSessions = this.sessionManager.list();
-                        const codexSession = activeSessions.find((s) => s.provider === "codex");
-                        if (codexSession) {
-                            const session = this.sessionManager.get(codexSession.id);
-                            if (session) {
-                                session.process
-                                    .archiveThread(sessionId)
-                                    .catch((err) => {
-                                    console.warn(`[ws] Codex thread/archive failed (non-fatal): ${err}`);
-                                });
+                        const activeProcess = this.getActiveCodexProcess();
+                        const codexProcess = activeProcess ??
+                            (await this.createStandaloneCodexProcess(archiveProjectPath));
+                        try {
+                            await codexProcess.archiveThread(sessionId);
+                        }
+                        catch (err) {
+                            if (!(err instanceof CodexRpcError && err.code === -32601)) {
+                                throw err;
                             }
+                            console.warn("[ws] thread/archive unsupported; using local archive marker");
+                        }
+                        finally {
+                            if (!activeProcess)
+                                codexProcess.stop();
                         }
                     }
+                    await this.archiveStore.archive(sessionId, provider, archiveProjectPath);
+                })()
+                    .then(() => {
                     this.send(ws, {
                         type: "archive_result",
                         sessionId,
@@ -3346,7 +3391,7 @@ export class BridgeWebSocketServer {
                         type: "archive_result",
                         sessionId,
                         success: false,
-                        error: String(err),
+                        error: codexErrorMessage(err),
                     });
                 });
                 break;
@@ -3359,9 +3404,13 @@ export class BridgeWebSocketServer {
                     break;
                 }
                 const provider = msg.provider ?? "claude";
-                const requestedCodexPermissionsMode = provider === "codex"
+                const normalizedCodexPermissionsMode = provider === "codex"
                     ? normalizeCodexPermissionsMode(msg.codexPermissionsMode)
                     : undefined;
+                const requestedCodexPermissionsMode = this.codexAutoReviewDisabled &&
+                    normalizedCodexPermissionsMode === "autoReview"
+                    ? "default"
+                    : normalizedCodexPermissionsMode;
                 const codexPermissionSettings = requestedCodexPermissionsMode
                     ? codexSettingsFromPermissionsMode(requestedCodexPermissionsMode)
                     : undefined;
@@ -3420,16 +3469,15 @@ export class BridgeWebSocketServer {
                     }
                     try {
                         const pastMessages = await this.getCodexThreadHistory(sessionRefId, effectiveProjectPath);
-                        const sessionId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", {
+                        const sessionId = this.sessionManager.create(effectiveProjectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
                             threadId: sessionRefId,
                             profile: effectiveProfile,
                             approvalPolicy: codexPermissionSettings
                                 ? codexPermissionSettings.approvalPolicy
                                 : (codexApprovalPolicy ??
                                     normalizeCodexApprovalPolicy(executionMode === "fullAccess" ? "never" : "on-request")),
-                            approvalsReviewer: codexPermissionSettings
-                                ? codexPermissionSettings.approvalsReviewer
-                                : msg.approvalsReviewer,
+                            approvalsReviewer: codexPermissionSettings?.approvalsReviewer ??
+                                msg.approvalsReviewer,
                             codexPermissionsMode: codexPermissionSettings?.codexPermissionsMode,
                             sandboxMode: codexPermissionSettings
                                 ? codexPermissionSettings.sandboxMode
@@ -3445,7 +3493,7 @@ export class BridgeWebSocketServer {
                             collaborationMode: planMode
                                 ? "plan"
                                 : "default",
-                        });
+                        }));
                         const createdSession = this.sessionManager.get(sessionId);
                         const cached = this.sessionManager.getCachedCommands("codex", createdSession?.worktreePath ?? effectiveProjectPath);
                         await this.loadAndSetSessionName(createdSession, "codex", effectiveProjectPath, sessionRefId);
@@ -5029,6 +5077,7 @@ export class BridgeWebSocketServer {
             codexModelServiceTiers: this.codexModelServiceTiers,
             codexProfiles: this.codexProfiles,
             defaultCodexProfile: this.defaultCodexProfile,
+            codexAutoReviewDisabled: this.codexAutoReviewDisabled,
             bridgeVersion: getPackageVersion(),
         });
     }
@@ -5060,6 +5109,7 @@ export class BridgeWebSocketServer {
             codexModelServiceTiers: this.codexModelServiceTiers,
             codexProfiles: this.codexProfiles,
             defaultCodexProfile: this.defaultCodexProfile,
+            codexAutoReviewDisabled: this.codexAutoReviewDisabled,
             bridgeVersion: getPackageVersion(),
         });
     }
@@ -5216,14 +5266,18 @@ export class BridgeWebSocketServer {
         }
     }
     broadcastSessionMessageNow(sessionId, msg, exclude) {
-        const data = JSON.stringify({ ...msg, sessionId });
         for (const client of this.wss.clients) {
             if (client === exclude)
                 continue;
             if (client.readyState === WebSocket.OPEN) {
-                if (!this.shouldSendToClient(client, msg))
+                const outboundMsg = {
+                    ...msg,
+                    sessionId,
+                };
+                const compatibleMsg = this.prepareServerMessageForClient(client, outboundMsg);
+                if (!compatibleMsg)
                     continue;
-                client.send(data);
+                client.send(JSON.stringify(compatibleMsg));
             }
         }
     }
@@ -5304,6 +5358,7 @@ export class BridgeWebSocketServer {
             console.warn(`[ws] Failed to load Codex metadata: ${err}`);
             this.codexProfiles = [];
             this.defaultCodexProfile = undefined;
+            this.codexAutoReviewPolicyLoaded = false;
             this.applyFallbackCodexModels();
             this.broadcastSessionList();
         })
@@ -5316,9 +5371,10 @@ export class BridgeWebSocketServer {
         const activeProcess = this.getActiveCodexProcess();
         const codexProcess = activeProcess ?? (await this.createStandaloneCodexProcess(projectPath));
         try {
-            const [profileResult, modelResult] = await Promise.allSettled([
+            const [profileResult, modelResult, requirementsResult] = await Promise.allSettled([
                 codexProcess.readProfileConfig(projectPath),
                 this.readCodexModels(codexProcess),
+                this.readCodexAutoReviewDisabled(codexProcess),
             ]);
             if (profileResult.status === "fulfilled") {
                 this.codexProfiles = profileResult.value.profiles;
@@ -5338,6 +5394,14 @@ export class BridgeWebSocketServer {
                 }
                 this.applyFallbackCodexModels();
             }
+            if (requirementsResult.status === "fulfilled") {
+                this.codexAutoReviewDisabled = requirementsResult.value;
+                this.codexAutoReviewPolicyLoaded = true;
+            }
+            else {
+                console.warn(`[ws] Failed to load Codex config requirements: ${requirementsResult.reason}`);
+                this.codexAutoReviewPolicyLoaded = false;
+            }
             this.broadcastSessionList();
         }
         finally {
@@ -5401,6 +5465,14 @@ export class BridgeWebSocketServer {
             supportedServiceTiers: fallbackCodexServiceTiers(model),
         }));
     }
+    async readCodexAutoReviewDisabled(codexProcess) {
+        const requirementsSource = codexProcess;
+        if (typeof requirementsSource.readConfigRequirements !== "function") {
+            return false;
+        }
+        return (await requirementsSource.readConfigRequirements())
+            .autoReviewDisabled;
+    }
     applyCodexModels(models) {
         this.codexModels = models.map((model) => model.model);
         this.codexModelReasoningEfforts = Object.fromEntries(models.map((model) => [
@@ -5479,6 +5551,19 @@ export class BridgeWebSocketServer {
             ? session.process
             : null;
     }
+    withCodexAutoReviewPolicy(options) {
+        const disableAutoReview = this.codexAutoReviewDisabled;
+        return {
+            ...options,
+            ...(disableAutoReview ? { approvalsReviewer: "user" } : {}),
+            ...(disableAutoReview && options.codexPermissionsMode === "autoReview"
+                ? { codexPermissionsMode: "default" }
+                : {}),
+            autoReviewDisabledByPolicy: this.codexAutoReviewPolicyLoaded
+                ? disableAutoReview
+                : null,
+        };
+    }
     getActiveClaudeProcess() {
         const summary = this.sessionManager
             .list()
@@ -5726,15 +5811,39 @@ export class BridgeWebSocketServer {
         }
     }
     broadcast(msg) {
-        const data = JSON.stringify(msg);
         for (const client of this.wss.clients) {
             if (client.readyState === WebSocket.OPEN) {
-                if (!this.shouldSendToClient(client, msg))
+                const compatibleMsg = this.prepareServerMessageForClient(client, msg);
+                if (!compatibleMsg)
                     continue;
-                client.send(data);
+                client.send(JSON.stringify(compatibleMsg));
             }
         }
     }
+    prepareServerMessageForClient(ws, msg) {
+        if (!this.shouldSendToClient(ws, msg))
+            return null;
+        if (!("messages" in msg) || !Array.isArray(msg.messages))
+            return msg;
+        const messages = msg.messages;
+        if (msg.type === "history") {
+            return {
+                ...msg,
+                messages: messages.filter((message) => isRecord(message) && this.shouldSendToClient(ws, message)),
+            };
+        }
+        if (msg.type === "history_delta" || msg.type === "history_snapshot") {
+            return {
+                ...msg,
+                messages: messages.filter((entry) => {
+                    if (!isRecord(entry) || !isRecord(entry.message))
+                        return true;
+                    return this.shouldSendToClient(ws, entry.message);
+                }),
+            };
+        }
+        return msg;
+    }
     shouldSendToClient(ws, msg) {
         const type = typeof msg.type === "string" ? msg.type : "";
         if (!OPT_IN_SERVER_MESSAGES.has(type))
@@ -5828,19 +5937,20 @@ export class BridgeWebSocketServer {
         this.send(ws, msg);
     }
     send(ws, msg) {
-        if (!this.shouldSendToClient(ws, msg))
+        const compatibleMsg = this.prepareServerMessageForClient(ws, msg);
+        if (!compatibleMsg)
             return;
-        const sessionId = this.extractSessionIdFromServerMessage(msg);
+        const sessionId = this.extractSessionIdFromServerMessage(compatibleMsg);
         if (sessionId) {
             this.recordDebugEvent(sessionId, {
                 direction: "outgoing",
                 channel: "ws",
-                type: String(msg.type ?? "unknown"),
-                detail: this.summarizeOutboundMessage(msg),
+                type: String(compatibleMsg.type ?? "unknown"),
+                detail: this.summarizeOutboundMessage(compatibleMsg),
             });
         }
         if (ws.readyState === WebSocket.OPEN) {
-            ws.send(JSON.stringify(msg));
+            ws.send(JSON.stringify(compatibleMsg));
         }
     }
     /** Broadcast a gallery_new_image message to all connected clients. */