claude-code-rust 0.14.2 → 0.14.4

package/agent-sdk/dist/bridge/error_classification.js

@@ -1,8 +1,12 @@
 import { looksLikeAuthRequired } from "./auth.js";
 import { writeEvent } from "./events.js";
 import { emitSessionUpdate } from "./events.js";
-import { parseFastModeDisabledReason, parseFastModeState } from "./state_parsing.js";
+import { parseFastModeDisabledReason, parseFastModeState, } from "./state_parsing.js";
 export function emitAuthRequired(session, detail) {
+    if (session.deferConnect) {
+        session.deferredAuthRequired = detail ? { detail } : {};
+        return;
+    }
     if (session.authHintSent) {
         return;
     }

package/agent-sdk/dist/bridge/events.js

@@ -1,9 +1,9 @@
-import { listSessions } from "@anthropic-ai/claude-agent-sdk";
+import { listSessions, } from "@anthropic-ai/claude-agent-sdk";
 import { writeSync } from "node:fs";
 import { buildModeState } from "./commands.js";
 import { mapSdkSessions } from "./history.js";
 import { bridgeLogger, LOG_TARGETS, logBridgeEventSent } from "./logger.js";
-import { detachSessionForClose, resolveCurrentModel, trackSessionCloseTask, } from "./session_lifecycle.js";
+import { detachSessionForClose, resolveCurrentModel, sessionById, trackSessionCloseTask, } from "./session_lifecycle.js";
 const SESSION_LIST_LIMIT = 50;
 let sessionListingDir;
 function writeProtocolEventToStdout(line) {
@@ -37,6 +37,20 @@ export function currentSessionListOptions() {
     return buildSessionListOptions(sessionListingDir);
 }
 export function writeEvent(event, requestId) {
+    if ("session_id" in event &&
+        event.event !== "connected" &&
+        event.event !== "session_replaced") {
+        const session = sessionById(event.session_id);
+        if (session?.deferConnect) {
+            const events = session.deferredBridgeEvents ?? [];
+            events.push({ event, ...(requestId ? { requestId } : {}) });
+            session.deferredBridgeEvents = events;
+            return;
+        }
+    }
+    writeEventNow(event, requestId);
+}
+function writeEventNow(event, requestId) {
     const envelope = {
         ...(requestId ? { request_id: requestId } : {}),
         ...event,
@@ -51,6 +65,13 @@ export function failConnection(message, requestId) {
 export function slashError(sessionId, message, requestId) {
     writeEvent({ event: "slash_error", session_id: sessionId, message }, requestId);
 }
+export function emitSessionResumeFailed(sessionId, operationId, message) {
+    writeEventNow({
+        event: "session_resume_failed",
+        session_id: sessionId,
+        message,
+    }, operationId);
+}
 export function emitRuntimeReloadCompleted(sessionId, requestId) {
     writeEvent({ event: "runtime_reload_completed", session_id: sessionId }, requestId);
 }
@@ -146,8 +167,12 @@ export function buildConnectBridgeEvent(session, eventName) {
             ...(session.fastModeDisabledReason
                 ? { fast_mode_disabled_reason: session.fastModeDisabledReason }
                 : {}),
-            ...(historyUpdates && historyUpdates.length > 0 ? { history_updates: historyUpdates } : {}),
-            ...(session.restoredInput !== undefined ? { restored_input: session.restoredInput } : {}),
+            ...(historyUpdates && historyUpdates.length > 0
+                ? { history_updates: historyUpdates }
+                : {}),
+            ...(session.restoredInput !== undefined
+                ? { restored_input: session.restoredInput }
+                : {}),
         }
         : {
             event: "connected",
@@ -160,14 +185,20 @@ export function buildConnectBridgeEvent(session, eventName) {
             ...(session.fastModeDisabledReason
                 ? { fast_mode_disabled_reason: session.fastModeDisabledReason }
                 : {}),
-            ...(historyUpdates && historyUpdates.length > 0 ? { history_updates: historyUpdates } : {}),
+            ...(historyUpdates && historyUpdates.length > 0
+                ? { history_updates: historyUpdates }
+                : {}),
         };
 }
 function logConnectEventEmission(session, eventName, requestId) {
     bridgeLogger.info({
         target: LOG_TARGETS.APP_SESSION,
-        eventName: eventName === "session_replaced" ? "session_replaced_emitted" : "session_connected_emitted",
-        message: eventName === "session_replaced" ? "session replaced event emitted" : "session connected event emitted",
+        eventName: eventName === "session_replaced"
+            ? "session_replaced_emitted"
+            : "session_connected_emitted",
+        message: eventName === "session_replaced"
+            ? "session replaced event emitted"
+            : "session connected event emitted",
         outcome: "success",
         ...(requestId ? { requestId } : {}),
         sessionId: session.sessionId,
@@ -198,6 +229,13 @@ export function emitConnectEvent(session) {
     session.connectRequestId = undefined;
     session.connected = true;
     session.authHintSent = false;
+    const deferredBridgeEvents = session.deferredBridgeEvents;
+    session.deferredBridgeEvents = undefined;
+    if (deferredBridgeEvents) {
+        for (const deferred of deferredBridgeEvents) {
+            writeEventNow({ ...deferred.event, session_id: session.sessionId }, deferred.requestId);
+        }
+    }
     session.resumeUpdates = undefined;
     session.restoredInput = undefined;
     session.sessionsToCloseAfterConnect = undefined;

package/agent-sdk/dist/bridge/history.js

@@ -124,7 +124,9 @@ function pushResumeTaskSystemUpdate(updates, tasksById, taskToolUseIds, msg) {
     const patch = asRecordOrNull(msg.patch) ?? undefined;
     const status = normalizeLifecycleTaskStatus(msg.status) ??
         normalizeLifecycleTaskStatus(patch?.status) ??
-        (subtype === "task_started" || subtype === "task_progress" ? "in_progress" : undefined);
+        (subtype === "task_started" || subtype === "task_progress"
+            ? "in_progress"
+            : undefined);
     const description = nonEmptyTrimmed(patch?.description) ??
         nonEmptyTrimmed(msg.description) ??
         nonEmptyTrimmed(msg.summary);
@@ -141,14 +143,24 @@ function pushResumeTaskSystemUpdate(updates, tasksById, taskToolUseIds, msg) {
     const task = {
         task_id: taskId,
         subject,
-        ...(description !== undefined ? { description } : existing?.description !== undefined ? { description: existing.description } : {}),
-        ...(activeForm !== undefined ? { active_form: activeForm } : existing?.active_form !== undefined ? { active_form: existing.active_form } : {}),
+        ...(description !== undefined
+            ? { description }
+            : existing?.description !== undefined
+                ? { description: existing.description }
+                : {}),
+        ...(activeForm !== undefined
+            ? { active_form: activeForm }
+            : existing?.active_form !== undefined
+                ? { active_form: existing.active_form }
+                : {}),
         status: status ?? existing?.status ?? "pending",
         ...(existing?.owner !== undefined ? { owner: existing.owner } : {}),
         blocks: existing ? [...existing.blocks] : [],
         blocked_by: existing ? [...existing.blocked_by] : [],
         ...(metadata !== undefined ? { metadata } : {}),
-        ...(sourceToolCallId !== undefined ? { source_tool_call_id: sourceToolCallId } : {}),
+        ...(sourceToolCallId !== undefined
+            ? { source_tool_call_id: sourceToolCallId }
+            : {}),
     };
     tasksById.set(taskId, task);
     updates.push({
@@ -203,7 +215,8 @@ function pushResumeToolResult(updates, toolCalls, hiddenToolUseIds, block, nonEx
         return;
     }
     const blockType = typeof block.type === "string" ? block.type : "";
-    if (isToolSearchToolResultType(blockType) || hiddenToolUseIds.has(toolUseId)) {
+    if (isToolSearchToolResultType(blockType) ||
+        hiddenToolUseIds.has(toolUseId)) {
         hiddenToolUseIds.add(toolUseId);
         return;
     }
@@ -246,9 +259,15 @@ export function mapSdkSessionInfo(info) {
         last_modified_ms: info.lastModified,
         file_size_bytes: info.fileSize ?? 0,
         ...(nonEmptyTrimmed(info.cwd) ? { cwd: info.cwd?.trim() } : {}),
-        ...(nonEmptyTrimmed(info.gitBranch) ? { git_branch: info.gitBranch?.trim() } : {}),
-        ...(nonEmptyTrimmed(info.customTitle) ? { custom_title: info.customTitle?.trim() } : {}),
-        ...(nonEmptyTrimmed(info.firstPrompt) ? { first_prompt: info.firstPrompt?.trim() } : {}),
+        ...(nonEmptyTrimmed(info.gitBranch)
+            ? { git_branch: info.gitBranch?.trim() }
+            : {}),
+        ...(nonEmptyTrimmed(info.customTitle)
+            ? { custom_title: info.customTitle?.trim() }
+            : {}),
+        ...(nonEmptyTrimmed(info.firstPrompt)
+            ? { first_prompt: info.firstPrompt?.trim() }
+            : {}),
     };
 }
 export function mapSdkSessions(infos, limit = 50) {
@@ -286,9 +305,13 @@ export function mapSessionMessagesToUpdates(messages) {
             continue;
         }
         for (const message of candidates) {
-            const sourceMessageUuid = typeof message.uuid === "string" ? message.uuid : entrySourceMessageUuid;
+            const sourceMessageUuid = typeof message.uuid === "string"
+                ? message.uuid
+                : entrySourceMessageUuid;
             const roleCandidate = message.role;
-            const role = roleCandidate === "assistant" || roleCandidate === "user" ? roleCandidate : fallbackRole;
+            const role = roleCandidate === "assistant" || roleCandidate === "user"
+                ? roleCandidate
+                : fallbackRole;
             const parentToolUseId = typeof entry.parent_tool_use_id === "string"
                 ? entry.parent_tool_use_id
                 : typeof message.parent_tool_use_id === "string"

package/agent-sdk/dist/bridge/logger.js

@@ -45,7 +45,9 @@ function writeDiagnostic(level, event) {
         ...(event.terminalId ? { terminal_id: event.terminalId } : {}),
         ...(event.errorKind ? { error_kind: event.errorKind } : {}),
         ...(event.errorCode ? { error_code: event.errorCode } : {}),
-        ...(event.durationMs !== undefined ? { duration_ms: event.durationMs } : {}),
+        ...(event.durationMs !== undefined
+            ? { duration_ms: event.durationMs }
+            : {}),
         ...(event.count !== undefined ? { count: event.count } : {}),
         ...(event.sizeBytes !== undefined ? { size_bytes: event.sizeBytes } : {}),
     };
@@ -61,6 +63,7 @@ function previewText(value, limit) {
 function commandSessionId(command) {
     switch (command.command) {
         case "resume_session":
+        case "resume_session_at":
         case "prompt":
         case "cancel_turn":
         case "set_model":
@@ -73,6 +76,7 @@ function commandSessionId(command) {
         case "elicitation_response":
         case "get_status_snapshot":
         case "get_context_usage":
+        case "get_usage":
         case "get_rewind_targets":
         case "rewind":
         case "reload_plugins":
@@ -100,6 +104,7 @@ function commandToolCallId(command) {
         case "initialize":
         case "create_session":
         case "resume_session":
+        case "resume_session_at":
         case "prompt":
         case "cancel_turn":
         case "set_model":
@@ -111,6 +116,7 @@ function commandToolCallId(command) {
         case "elicitation_response":
         case "get_status_snapshot":
         case "get_context_usage":
+        case "get_usage":
         case "get_rewind_targets":
         case "rewind":
         case "reload_plugins":
@@ -134,6 +140,7 @@ function eventToolCallId(event) {
         case "auth_required":
         case "connection_failed":
         case "session_update":
+        case "user_dialog_request":
         case "elicitation_request":
         case "elicitation_complete":
         case "mcp_auth_redirect":
@@ -142,6 +149,7 @@ function eventToolCallId(event) {
         case "turn_complete":
         case "turn_error":
         case "slash_error":
+        case "session_resume_failed":
         case "runtime_reload_completed":
         case "runtime_reload_failed":
         case "session_replaced":
@@ -149,6 +157,7 @@ function eventToolCallId(event) {
         case "sessions_listed":
         case "status_snapshot":
         case "context_usage":
+        case "usage_snapshot":
         case "rewind_targets":
         case "rewind_result":
         case "mcp_snapshot":
@@ -160,6 +169,7 @@ function protocolCommandLevel(command) {
         case "initialize":
         case "create_session":
         case "resume_session":
+        case "resume_session_at":
         case "new_session":
         case "shutdown":
             return "info";
@@ -179,6 +189,7 @@ function protocolEventLevel(event) {
         case "mcp_operation_error":
         case "turn_error":
         case "slash_error":
+        case "session_resume_failed":
         case "runtime_reload_failed":
             return "warn";
         case "session_update":
@@ -193,6 +204,7 @@ function protocolEventLevel(event) {
         case "sessions_listed":
         case "status_snapshot":
         case "context_usage":
+        case "usage_snapshot":
         case "rewind_targets":
         case "rewind_result":
         case "runtime_reload_completed":
@@ -248,8 +260,12 @@ export function logBridgeCommandReceived(command, requestId) {
         message: "bridge command received",
         outcome: "success",
         ...(requestId ? { requestId } : {}),
-        ...(commandSessionId(command) ? { sessionId: commandSessionId(command) } : {}),
-        ...(commandToolCallId(command) ? { toolCallId: commandToolCallId(command) } : {}),
+        ...(commandSessionId(command)
+            ? { sessionId: commandSessionId(command) }
+            : {}),
+        ...(commandToolCallId(command)
+            ? { toolCallId: commandToolCallId(command) }
+            : {}),
         fields: { bridge_command: command.command },
     });
 }

package/agent-sdk/dist/bridge/mcp.js

@@ -40,7 +40,9 @@ function mapMcpSetServersResult(result) {
     const removed = Array.isArray(record.removed)
         ? record.removed.filter((value) => typeof value === "string")
         : [];
-    const errors = record.errors && typeof record.errors === "object" && !Array.isArray(record.errors)
+    const errors = record.errors &&
+        typeof record.errors === "object" &&
+        !Array.isArray(record.errors)
         ? Object.fromEntries(Object.entries(record.errors).filter((entry) => typeof entry[1] === "string"))
         : {};
     return { added, removed, errors };
@@ -293,7 +295,10 @@ export async function handleMcpAuthenticateCommand(session, command, requestId)
     try {
         const redirect = await authenticateMcpServer(session.query, command.server_name);
         if (redirect) {
-            logMcpSuccess("mcp_auth_redirect_emitted", "MCP auth redirect emitted", command.session_id, requestId, { server_name: command.server_name, requires_user_action: redirect.requires_user_action });
+            logMcpSuccess("mcp_auth_redirect_emitted", "MCP auth redirect emitted", command.session_id, requestId, {
+                server_name: command.server_name,
+                requires_user_action: redirect.requires_user_action,
+            });
             writeEvent({
                 event: "mcp_auth_redirect",
                 session_id: command.session_id,

package/agent-sdk/dist/bridge/mcp_auth_adapter.js

@@ -25,7 +25,8 @@ export function detectMcpAuthCapabilities(query) {
     return {
         authenticate: runtimeMethod(query, MCP_AUTH_METHODS.authenticate) !== undefined,
         clear_auth: runtimeMethod(query, MCP_AUTH_METHODS.clear_auth) !== undefined,
-        submit_oauth_callback_url: runtimeMethod(query, MCP_AUTH_METHODS.submit_oauth_callback_url) !== undefined,
+        submit_oauth_callback_url: runtimeMethod(query, MCP_AUTH_METHODS.submit_oauth_callback_url) !==
+            undefined,
     };
 }
 function parseMcpAuthRedirect(serverName, value) {
@@ -43,7 +44,8 @@ function parseMcpAuthRedirect(serverName, value) {
         throw new Error("installed SDK returned an invalid mcpAuthenticate authUrl");
     }
     const requiresUserAction = Reflect.get(value, "requiresUserAction");
-    if (requiresUserAction !== undefined && typeof requiresUserAction !== "boolean") {
+    if (requiresUserAction !== undefined &&
+        typeof requiresUserAction !== "boolean") {
         throw new Error("installed SDK returned an invalid mcpAuthenticate requiresUserAction");
     }
     return {

package/agent-sdk/dist/bridge/mcp_metadata.js

@@ -20,7 +20,8 @@ function optionalStringArray(record, key, context) {
     if (value === undefined) {
         return undefined;
     }
-    if (!Array.isArray(value) || !value.every((entry) => typeof entry === "string")) {
+    if (!Array.isArray(value) ||
+        !value.every((entry) => typeof entry === "string")) {
         throw new Error(`${context}.${key} must be an array of strings`);
     }
     return value;
@@ -43,7 +44,10 @@ function optionalTimeout(record, context) {
     if (value === undefined) {
         return undefined;
     }
-    if (typeof value !== "number" || !Number.isFinite(value) || !Number.isInteger(value) || value < 1000) {
+    if (typeof value !== "number" ||
+        !Number.isFinite(value) ||
+        !Number.isInteger(value) ||
+        value < 1000) {
         throw new Error(`${context}.timeout must be an integer >= 1000`);
     }
     return value;
@@ -53,7 +57,10 @@ function optionalRequestTimeoutMs(record, context) {
     if (value === undefined) {
         return undefined;
     }
-    if (typeof value !== "number" || !Number.isFinite(value) || !Number.isInteger(value) || value < 1000) {
+    if (typeof value !== "number" ||
+        !Number.isFinite(value) ||
+        !Number.isInteger(value) ||
+        value < 1000) {
         throw new Error(`${context}.request_timeout_ms must be an integer >= 1000`);
     }
     return value;
@@ -85,14 +92,17 @@ function optionalToolPolicies(record, context) {
         const policy = { name };
         const permissionPolicy = item.permission_policy;
         if (permissionPolicy !== undefined) {
-            if (typeof permissionPolicy !== "string" || !TOOL_PERMISSION_POLICIES.has(permissionPolicy)) {
+            if (typeof permissionPolicy !== "string" ||
+                !TOOL_PERMISSION_POLICIES.has(permissionPolicy)) {
                 throw new Error(`${context}.tools[${index}].permission_policy must be one of always_allow, always_ask, always_deny`);
             }
-            policy.permission_policy = permissionPolicy;
+            policy.permission_policy =
+                permissionPolicy;
         }
         const orgMaxPermission = item.org_max_permission;
         if (orgMaxPermission !== undefined) {
-            if (typeof orgMaxPermission !== "string" || !ORG_MAX_PERMISSIONS.has(orgMaxPermission)) {
+            if (typeof orgMaxPermission !== "string" ||
+                !ORG_MAX_PERMISSIONS.has(orgMaxPermission)) {
                 throw new Error(`${context}.tools[${index}].org_max_permission must be one of allow, ask, blocked`);
             }
             policy.org_max_permission = orgMaxPermission;
@@ -122,10 +132,16 @@ export function parseMcpServerConfig(value, context) {
             return {
                 type,
                 command,
-                ...(optionalStringArray(record, "args", context) ? { args: optionalStringArray(record, "args", context) } : {}),
-                ...(optionalStringMap(record, "env", context) ? { env: optionalStringMap(record, "env", context) } : {}),
+                ...(optionalStringArray(record, "args", context)
+                    ? { args: optionalStringArray(record, "args", context) }
+                    : {}),
+                ...(optionalStringMap(record, "env", context)
+                    ? { env: optionalStringMap(record, "env", context) }
+                    : {}),
                 ...(timeout === undefined ? {} : { timeout }),
-                ...(requestTimeoutMs === undefined ? {} : { request_timeout_ms: requestTimeoutMs }),
+                ...(requestTimeoutMs === undefined
+                    ? {}
+                    : { request_timeout_ms: requestTimeoutMs }),
                 ...(alwaysLoad === undefined ? {} : { always_load: alwaysLoad }),
             };
         }
@@ -139,10 +155,14 @@ export function parseMcpServerConfig(value, context) {
             return {
                 type,
                 url,
-                ...(optionalStringMap(record, "headers", context) ? { headers: optionalStringMap(record, "headers", context) } : {}),
+                ...(optionalStringMap(record, "headers", context)
+                    ? { headers: optionalStringMap(record, "headers", context) }
+                    : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(timeout === undefined ? {} : { timeout }),
-                ...(requestTimeoutMs === undefined ? {} : { request_timeout_ms: requestTimeoutMs }),
+                ...(requestTimeoutMs === undefined
+                    ? {}
+                    : { request_timeout_ms: requestTimeoutMs }),
                 ...(alwaysLoad === undefined ? {} : { always_load: alwaysLoad }),
             };
         }
@@ -152,17 +172,26 @@ export function parseMcpServerConfig(value, context) {
 }
 export function parseMcpServersRecord(value, context) {
     const record = asRecord(value, context);
-    return Object.fromEntries(Object.entries(record).map(([key, entry]) => [key, parseMcpServerConfig(entry, `${context}.${key}`)]));
+    return Object.fromEntries(Object.entries(record).map(([key, entry]) => [
+        key,
+        parseMcpServerConfig(entry, `${context}.${key}`),
+    ]));
 }
 function toSdkToolPolicies(tools) {
     return tools?.map((tool) => ({
         name: tool.name,
-        ...(tool.permission_policy === undefined ? {} : { permission_policy: tool.permission_policy }),
-        ...(tool.org_max_permission === undefined ? {} : { org_max_permission: tool.org_max_permission }),
+        ...(tool.permission_policy === undefined
+            ? {}
+            : { permission_policy: tool.permission_policy }),
+        ...(tool.org_max_permission === undefined
+            ? {}
+            : { org_max_permission: tool.org_max_permission }),
     }));
 }
 function sdkRequestTimeoutConfig(config) {
-    return config.request_timeout_ms === undefined ? {} : { requestTimeoutMs: config.request_timeout_ms };
+    return config.request_timeout_ms === undefined
+        ? {}
+        : { requestTimeoutMs: config.request_timeout_ms };
 }
 export function bridgeMcpConfigToSdk(config) {
     switch (config.type) {
@@ -174,7 +203,9 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.env ? { env: config.env } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
                 ...sdkRequestTimeoutConfig(config),
-                ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
+                ...(config.always_load === undefined
+                    ? {}
+                    : { alwaysLoad: config.always_load }),
             };
         case "sse":
             return {
@@ -184,7 +215,9 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.tools ? { tools: toSdkToolPolicies(config.tools) } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
                 ...sdkRequestTimeoutConfig(config),
-                ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
+                ...(config.always_load === undefined
+                    ? {}
+                    : { alwaysLoad: config.always_load }),
             };
         case "http":
             return {
@@ -194,12 +227,17 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.tools ? { tools: toSdkToolPolicies(config.tools) } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
                 ...sdkRequestTimeoutConfig(config),
-                ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
+                ...(config.always_load === undefined
+                    ? {}
+                    : { alwaysLoad: config.always_load }),
             };
     }
 }
 export function bridgeMcpServersToSdk(servers) {
-    return Object.fromEntries(Object.entries(servers).map(([name, config]) => [name, bridgeMcpConfigToSdk(config)]));
+    return Object.fromEntries(Object.entries(servers).map(([name, config]) => [
+        name,
+        bridgeMcpConfigToSdk(config),
+    ]));
 }
 function mapSdkToolPolicies(tools) {
     if (!Array.isArray(tools)) {
@@ -216,16 +254,20 @@ function mapSdkToolPolicies(tools) {
         }
         const policy = { name: raw.name };
         if (raw.permission_policy !== undefined) {
-            if (typeof raw.permission_policy !== "string" || !TOOL_PERMISSION_POLICIES.has(raw.permission_policy)) {
+            if (typeof raw.permission_policy !== "string" ||
+                !TOOL_PERMISSION_POLICIES.has(raw.permission_policy)) {
                 return null;
             }
-            policy.permission_policy = raw.permission_policy;
+            policy.permission_policy =
+                raw.permission_policy;
         }
         if (raw.org_max_permission !== undefined) {
-            if (typeof raw.org_max_permission !== "string" || !ORG_MAX_PERMISSIONS.has(raw.org_max_permission)) {
+            if (typeof raw.org_max_permission !== "string" ||
+                !ORG_MAX_PERMISSIONS.has(raw.org_max_permission)) {
                 return null;
             }
-            policy.org_max_permission = raw.org_max_permission;
+            policy.org_max_permission =
+                raw.org_max_permission;
         }
         return policy;
     })
@@ -244,7 +286,9 @@ export function mapMcpServerStatus(status) {
             }
             : {}),
         ...(status.error ? { error: status.error } : {}),
-        ...(status.config ? { config: mapMcpServerStatusConfig(status.config) } : {}),
+        ...(status.config
+            ? { config: mapMcpServerStatusConfig(status.config) }
+            : {}),
         ...(status.scope ? { scope: status.scope } : {}),
         tools: Array.isArray(status.tools)
             ? status.tools.map((tool) => ({
@@ -275,7 +319,9 @@ function sdkRequestTimeoutMs(config) {
     }
     const raw = config;
     const value = raw.requestTimeoutMs ?? raw.request_timeout_ms;
-    return typeof value === "number" && Number.isFinite(value) && Number.isInteger(value)
+    return typeof value === "number" &&
+        Number.isFinite(value) &&
+        Number.isInteger(value)
         ? value
         : undefined;
 }
@@ -285,11 +331,17 @@ export function mapMcpServerStatusConfig(config) {
             return {
                 type: "stdio",
                 command: config.command,
-                ...(Array.isArray(config.args) && config.args.length > 0 ? { args: config.args } : {}),
+                ...(Array.isArray(config.args) && config.args.length > 0
+                    ? { args: config.args }
+                    : {}),
                 ...(config.env ? { env: config.env } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
-                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
-                ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
+                ...(sdkRequestTimeoutMs(config) === undefined
+                    ? {}
+                    : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
+                ...(config.alwaysLoad === undefined
+                    ? {}
+                    : { always_load: config.alwaysLoad }),
             };
         case "sse": {
             const tools = mapSdkToolPolicies(config.tools);
@@ -299,8 +351,12 @@ export function mapMcpServerStatusConfig(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
-                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
-                ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
+                ...(sdkRequestTimeoutMs(config) === undefined
+                    ? {}
+                    : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
+                ...(config.alwaysLoad === undefined
+                    ? {}
+                    : { always_load: config.alwaysLoad }),
             };
         }
         case "http": {
@@ -311,8 +367,12 @@ export function mapMcpServerStatusConfig(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
-                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
-                ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
+                ...(sdkRequestTimeoutMs(config) === undefined
+                    ? {}
+                    : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
+                ...(config.alwaysLoad === undefined
+                    ? {}
+                    : { always_load: config.alwaysLoad }),
             };
         }
         case "sdk":
@@ -353,8 +413,12 @@ function mcpStatusConfigDiagnostics(config) {
             return {
                 config_type: "stdio",
                 ...(config.timeout === undefined ? {} : { timeout_ms: config.timeout }),
-                ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
-                ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
+                ...(config.request_timeout_ms === undefined
+                    ? {}
+                    : { request_timeout_ms: config.request_timeout_ms }),
+                ...(config.always_load === undefined
+                    ? {}
+                    : { always_load: config.always_load }),
                 configured_tool_policy_count: 0,
             };
         case "sse":
@@ -362,8 +426,12 @@ function mcpStatusConfigDiagnostics(config) {
             return {
                 config_type: config.type,
                 ...(config.timeout === undefined ? {} : { timeout_ms: config.timeout }),
-                ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
-                ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
+                ...(config.request_timeout_ms === undefined
+                    ? {}
+                    : { request_timeout_ms: config.request_timeout_ms }),
+                ...(config.always_load === undefined
+                    ? {}
+                    : { always_load: config.always_load }),
                 configured_tool_policy_count: config.tools?.length ?? 0,
             };
         case "sdk":
@@ -392,9 +460,15 @@ export function summarizeMcpServersForDiagnostics(servers) {
             status: server.status,
             config_type: config.config_type,
             ...(server.scope ? { scope: server.scope } : {}),
-            ...(config.timeout_ms === undefined ? {} : { timeout_ms: config.timeout_ms }),
-            ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
-            ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
+            ...(config.timeout_ms === undefined
+                ? {}
+                : { timeout_ms: config.timeout_ms }),
+            ...(config.request_timeout_ms === undefined
+                ? {}
+                : { request_timeout_ms: config.request_timeout_ms }),
+            ...(config.always_load === undefined
+                ? {}
+                : { always_load: config.always_load }),
             tool_count: server.tools.length,
             configured_tool_policy_count: config.configured_tool_policy_count,
             has_error: typeof server.error === "string" && server.error.length > 0,

package/agent-sdk/dist/bridge/mcp_monitor.js

@@ -21,7 +21,12 @@ export async function runMcpAuthMonitor({ signal, poll, maxAttempts = DEFAULT_MA
             }
             lastError = errorMessage(error);
             if (attempt === maxAttempts) {
-                return { outcome: "exhausted", attempts: attempt, reason: "error", lastError };
+                return {
+                    outcome: "exhausted",
+                    attempts: attempt,
+                    reason: "error",
+                    lastError,
+                };
             }
             nextDelayMs = Math.min(nextDelayMs * 2, maxDelayMs);
             continue;