claude-code-rust 0.14.2 → 0.14.4

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

@@ -1,16 +1,16 @@
 import { asRecordOrNull } from "./shared.js";
-import { toPermissionMode, buildModeState, refreshSupportedModesForSession } from "./commands.js";
+import { toPermissionMode, buildModeState, refreshSupportedModesForSession, } from "./commands.js";
 import { writeEvent, emitSessionUpdate, emitConnectEvent, emitSessionReplacedEvent, } from "./events.js";
 import { TOOL_RESULT_TYPES, isToolSearchToolName, isToolSearchToolResultType, unwrapToolUseResult, parseToolNonExecutionMetadata, } from "./tooling.js";
 import { emitToolCall, emitToolCallUpdate, emitToolResultUpdate, finalizeOpenToolCalls, emitToolProgressUpdate, emitToolSummaryUpdate, ensureToolCallVisible, resolveTaskToolUseId, defersTaskNotificationCompletion, toolAcceptsTaskLifecycle, taskProgressText, taskUpdatedFields, } from "./tool_calls.js";
-import { applyBackgroundTasksChanged, applyTaskLifecycleState } from "./tasks.js";
+import { applyBackgroundTasksChanged, applyTaskLifecycleState, } from "./tasks.js";
 import { linkTaskToolUse, unlinkTaskToolUse } from "./task_links.js";
 import { emitAuthRequired, classifyTurnErrorKind, emitFastModeUpdate, emitFastModeUpdateIfChanged, setFastModeSnapshotIfChanged, } from "./error_classification.js";
-import { mapAvailableAgentsFromNames, emitAvailableAgentsIfChanged, refreshAvailableAgents } from "./agents.js";
+import { mapAvailableAgentsFromNames, emitAvailableAgentsIfChanged, refreshAvailableAgents, } from "./agents.js";
 import { mapInitSlashCommands, mapSdkSlashCommands, updateAvailableCommands, } from "./available_commands.js";
-import { buildApiRetryUpdate, buildRateLimitUpdate, buildSubagentRetryUpdate, normalizeSettingsParseErrors, numberField, parseApiRetryError, parseRuntimeSessionState, } from "./state_parsing.js";
+import { buildApiRetryUpdate, buildRateLimitUpdate, buildSubagentRetryUpdate, normalizeSettingsParseErrors, nonNegativeIntegerField, numberField, parseApiRetryError, parseRuntimeSessionState, } from "./state_parsing.js";
 import { looksLikeAuthRequired } from "./auth.js";
-import { emitCurrentModelUpdate, refreshCurrentModel, updateSessionId } from "./session_lifecycle.js";
+import { emitCurrentModelUpdate, refreshCurrentModel, updateSessionId, } from "./session_lifecycle.js";
 import { bridgeLogger, LOG_TARGETS } from "./logger.js";
 import { emitMcpSnapshotFromStatuses } from "./mcp.js";
 export function textFromPrompt(command) {
@@ -38,23 +38,41 @@ function sdkCorrelationMetadata(msg) {
     return {
         requestId: typeof msg.request_id === "string" ? msg.request_id : undefined,
         subagentType: typeof msg.subagent_type === "string" ? msg.subagent_type : undefined,
-        taskDescription: typeof msg.task_description === "string" ? msg.task_description : undefined,
+        taskDescription: typeof msg.task_description === "string"
+            ? msg.task_description
+            : undefined,
         parentAgentId: typeof msg.parent_agent_id === "string" ? msg.parent_agent_id : undefined,
     };
 }
 function sdkTaskMetadata(msg) {
     const metadata = sdkCorrelationMetadata(msg);
-    const taskType = typeof msg.task_type === "string" && msg.task_type.length > 0 ? msg.task_type : undefined;
-    const workflowName = typeof msg.workflow_name === "string" && msg.workflow_name.length > 0 ? msg.workflow_name : undefined;
-    const prompt = typeof msg.prompt === "string" && msg.prompt.length > 0 ? msg.prompt : undefined;
-    const outputFile = typeof msg.output_file === "string" && msg.output_file.length > 0 ? msg.output_file : undefined;
-    const status = typeof msg.status === "string" && msg.status.length > 0 ? msg.status : undefined;
-    const summary = status && typeof msg.summary === "string" && msg.summary.length > 0 ? msg.summary : undefined;
+    const taskType = typeof msg.task_type === "string" && msg.task_type.length > 0
+        ? msg.task_type
+        : undefined;
+    const workflowName = typeof msg.workflow_name === "string" && msg.workflow_name.length > 0
+        ? msg.workflow_name
+        : undefined;
+    const prompt = typeof msg.prompt === "string" && msg.prompt.length > 0
+        ? msg.prompt
+        : undefined;
+    const outputFile = typeof msg.output_file === "string" && msg.output_file.length > 0
+        ? msg.output_file
+        : undefined;
+    const status = typeof msg.status === "string" && msg.status.length > 0
+        ? msg.status
+        : undefined;
+    const summary = status && typeof msg.summary === "string" && msg.summary.length > 0
+        ? msg.summary
+        : undefined;
     const taskMetadata = {
         ...(metadata.requestId ? { request_id: metadata.requestId } : {}),
         ...(metadata.subagentType ? { subagent_type: metadata.subagentType } : {}),
-        ...(metadata.taskDescription ? { task_description: metadata.taskDescription } : {}),
-        ...(metadata.parentAgentId ? { parent_agent_id: metadata.parentAgentId } : {}),
+        ...(metadata.taskDescription
+            ? { task_description: metadata.taskDescription }
+            : {}),
+        ...(metadata.parentAgentId
+            ? { parent_agent_id: metadata.parentAgentId }
+            : {}),
         ...(taskType ? { task_type: taskType } : {}),
         ...(workflowName ? { workflow_name: workflowName } : {}),
         ...(prompt ? { prompt } : {}),
@@ -66,10 +84,67 @@ function sdkTaskMetadata(msg) {
     return Object.keys(taskMetadata).length > 0 ? taskMetadata : undefined;
 }
 function sdkMessageOriginKind(msg) {
-    const origin = msg.origin && typeof msg.origin === "object" ? msg.origin : null;
+    const origin = msg.origin && typeof msg.origin === "object"
+        ? msg.origin
+        : null;
     return typeof origin?.kind === "string" ? origin.kind : undefined;
 }
+function externalMessageUpdateFromSdkUser(msg) {
+    const origin = asRecordOrNull(msg.origin);
+    if (!origin) {
+        return undefined;
+    }
+    const kind = typeof origin?.kind === "string" ? origin.kind : undefined;
+    if (kind !== "peer" && kind !== "task-notification") {
+        return undefined;
+    }
+    const payload = asRecordOrNull(msg.message);
+    const content = payload?.content;
+    const contentText = typeof content === "string"
+        ? content
+        : Array.isArray(content)
+            ? content
+                .flatMap((block) => {
+                const record = asRecordOrNull(block);
+                return record?.type === "text" && typeof record.text === "string"
+                    ? [record.text]
+                    : [];
+            })
+                .join("\n")
+            : "";
+    const text = typeof origin.body === "string" ? origin.body : contentText;
+    if (!text.trim()) {
+        return undefined;
+    }
+    return {
+        type: "external_message_update",
+        content: text,
+        ...(sourceMessageUuid(msg)
+            ? { source_message_uuid: sourceMessageUuid(msg) }
+            : {}),
+        origin: {
+            kind,
+            ...(typeof origin.subkind === "string"
+                ? { subkind: origin.subkind }
+                : {}),
+            ...(typeof origin.from === "string" ? { from: origin.from } : {}),
+            ...(typeof origin.name === "string" ? { name: origin.name } : {}),
+            ...(typeof origin.fromSession === "string"
+                ? { from_session: origin.fromSession }
+                : {}),
+            ...(typeof origin.senderTaskId === "string"
+                ? { sender_task_id: origin.senderTaskId }
+                : {}),
+            ...(typeof origin.verifiedPeerPid === "number" &&
+                Number.isSafeInteger(origin.verifiedPeerPid) &&
+                origin.verifiedPeerPid >= 0
+                ? { verified_peer_pid: origin.verifiedPeerPid }
+                : {}),
+        },
+    };
+}
 function logSdkMessageOrigin(session, msg) {
+    const origin = asRecordOrNull(msg.origin);
     const originKind = sdkMessageOriginKind(msg);
     if (!originKind) {
         return;
@@ -83,6 +158,16 @@ function logSdkMessageOrigin(session, msg) {
         fields: {
             message_type: typeof msg.type === "string" ? msg.type : undefined,
             origin_kind: originKind,
+            origin_subkind: typeof origin?.subkind === "string" ? origin.subkind : undefined,
+            origin_from_session: typeof origin?.fromSession === "string"
+                ? origin.fromSession
+                : undefined,
+            origin_sender_task_id: typeof origin?.senderTaskId === "string"
+                ? origin.senderTaskId
+                : undefined,
+            origin_verified_peer_pid: typeof origin?.verifiedPeerPid === "number"
+                ? origin.verifiedPeerPid
+                : undefined,
         },
     });
 }
@@ -91,7 +176,11 @@ function emitSystemNoticeUpdate(session, severity, message) {
     if (!trimmed) {
         return;
     }
-    emitSessionUpdate(session.sessionId, { type: "system_notice_update", severity, message: trimmed });
+    emitSessionUpdate(session.sessionId, {
+        type: "system_notice_update",
+        severity,
+        message: trimmed,
+    });
 }
 const MAX_INFORMATIONAL_DEDUP_KEYS = 256;
 function shouldEmitInformationalMessage(session, level, content, toolUseId) {
@@ -203,7 +292,9 @@ function handleModelRefusalNoFallbackMessage(session, msg) {
 }
 function workerShutdownMessage(reason) {
     const trimmed = reason.trim();
-    return trimmed ? `Claude worker is shutting down: ${trimmed}` : "Claude worker is shutting down.";
+    return trimmed
+        ? `Claude worker is shutting down: ${trimmed}`
+        : "Claude worker is shutting down.";
 }
 function handleWorkerShuttingDownSystemMessage(session, msg) {
     const reason = typeof msg.reason === "string" ? msg.reason.trim() : "";
@@ -280,7 +371,9 @@ export function contentFromPrompt(command) {
             }
         }
         else if (chunk.kind === "image") {
-            const val = chunk.value && typeof chunk.value === "object" ? chunk.value : null;
+            const val = chunk.value && typeof chunk.value === "object"
+                ? chunk.value
+                : null;
             if (!val)
                 continue;
             const data = typeof val.data === "string" ? val.data : "";
@@ -400,7 +493,9 @@ export function handleTaskSystemMessage(session, subtype, msg) {
         const fields = {
             status: "in_progress",
             raw_output: description,
-            content: [{ type: "content", content: { type: "text", text: description } }],
+            content: [
+                { type: "content", content: { type: "text", text: description } },
+            ],
             ...(messageTaskMetadata ? { task_metadata: messageTaskMetadata } : {}),
         };
         emitToolCallUpdate(session, toolUseId, fields, "task_started");
@@ -423,7 +518,10 @@ export function handleTaskSystemMessage(session, subtype, msg) {
     if (subtype === "task_updated") {
         const fields = taskUpdatedFields(msg);
         if (messageTaskMetadata) {
-            fields.task_metadata = { ...(fields.task_metadata ?? {}), ...messageTaskMetadata };
+            fields.task_metadata = {
+                ...(fields.task_metadata ?? {}),
+                ...messageTaskMetadata,
+            };
         }
         if (Object.keys(fields).length === 0) {
             return true;
@@ -451,15 +549,23 @@ export function handleTaskSystemMessage(session, subtype, msg) {
     }
     const status = typeof msg.status === "string" ? msg.status : "";
     const summary = typeof msg.summary === "string" ? msg.summary : "";
-    const finalStatus = status === "completed" ? "completed" : status === "stopped" ? "killed" : "failed";
+    const finalStatus = status === "completed"
+        ? "completed"
+        : status === "stopped"
+            ? "killed"
+            : "failed";
     const deferCompletion = finalStatus === "completed" && defersTaskNotificationCompletion(toolCall);
-    const fields = deferCompletion ? {} : { status: finalStatus };
+    const fields = deferCompletion
+        ? {}
+        : { status: finalStatus };
     if (messageTaskMetadata) {
         fields.task_metadata = messageTaskMetadata;
     }
     if (summary) {
         fields.raw_output = summary;
-        fields.content = [{ type: "content", content: { type: "text", text: summary } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: summary } },
+        ];
     }
     if (Object.keys(fields).length > 0) {
         emitToolCallUpdate(session, toolUseId, fields, "task_notification");
@@ -510,10 +616,19 @@ function emitTranscriptRetraction(session, messageUuids, reason, metadata = {})
         ...(metadata.requestId ? { request_id: metadata.requestId } : {}),
         ...(metadata.trigger ? { trigger: metadata.trigger } : {}),
         ...(metadata.direction ? { direction: metadata.direction } : {}),
-        ...(metadata.originalModel ? { original_model: metadata.originalModel } : {}),
-        ...(metadata.fallbackModel ? { fallback_model: metadata.fallbackModel } : {}),
-        ...(metadata.apiRefusalCategory ? { api_refusal_category: metadata.apiRefusalCategory } : {}),
-        ...(metadata.apiRefusalExplanation ? { api_refusal_explanation: metadata.apiRefusalExplanation } : {}),
+        ...(metadata.originalModel
+            ? { original_model: metadata.originalModel }
+            : {}),
+        ...(metadata.fallbackModel
+            ? { fallback_model: metadata.fallbackModel }
+            : {}),
+        ...(metadata.scope ? { scope: metadata.scope } : {}),
+        ...(metadata.apiRefusalCategory
+            ? { api_refusal_category: metadata.apiRefusalCategory }
+            : {}),
+        ...(metadata.apiRefusalExplanation
+            ? { api_refusal_explanation: metadata.apiRefusalExplanation }
+            : {}),
         ...(metadata.content ? { content: metadata.content } : {}),
     });
     return true;
@@ -530,6 +645,7 @@ function handleFallbackRetractionMessage(session, subtype, msg) {
         direction: stringField(msg, "direction"),
         originalModel: stringField(msg, "original_model"),
         fallbackModel: stringField(msg, "fallback_model"),
+        scope: stringField(msg, "scope") ?? "session",
         apiRefusalCategory: nullableStringField(msg, "api_refusal_category"),
         apiRefusalExplanation: nullableStringField(msg, "api_refusal_explanation"),
         content: stringField(msg, "content"),
@@ -549,6 +665,7 @@ function handleFallbackRetractionMessage(session, subtype, msg) {
             direction: metadata.direction,
             original_model: metadata.originalModel,
             fallback_model: metadata.fallbackModel,
+            scope: metadata.scope,
             api_refusal_category: metadata.apiRefusalCategory,
             has_api_refusal_explanation: metadata.apiRefusalExplanation !== undefined,
             has_content: metadata.content !== undefined,
@@ -576,6 +693,18 @@ function logContentBlockLinkage(session, blockType, toolUseId, toolName, linkage
         },
     });
 }
+function resolveToolProgressTarget(session, taskToolUseId, toolUseId, parentToolUseId) {
+    if (taskToolUseId && session.toolCalls.has(taskToolUseId)) {
+        return { toolUseId: taskToolUseId, source: "task" };
+    }
+    if (toolUseId && session.toolCalls.has(toolUseId)) {
+        return { toolUseId, source: "tool" };
+    }
+    if (parentToolUseId && session.toolCalls.has(parentToolUseId)) {
+        return { toolUseId: parentToolUseId, source: "parent" };
+    }
+    return null;
+}
 function hideToolUse(session, toolUseId) {
     if (toolUseId) {
         session.hiddenToolUseIds.add(toolUseId);
@@ -609,7 +738,9 @@ export function handleContentBlock(session, block, linkage) {
             emitSessionUpdate(session.sessionId, {
                 type: "agent_message_chunk",
                 content: { type: "text", text },
-                ...(linkage?.sourceMessageUuid ? { source_message_uuid: linkage.sourceMessageUuid } : {}),
+                ...(linkage?.sourceMessageUuid
+                    ? { source_message_uuid: linkage.sourceMessageUuid }
+                    : {}),
             });
         }
         return;
@@ -620,15 +751,21 @@ export function handleContentBlock(session, block, linkage) {
             emitSessionUpdate(session.sessionId, {
                 type: "agent_thought_chunk",
                 content: { type: "text", text },
-                ...(linkage?.sourceMessageUuid ? { source_message_uuid: linkage.sourceMessageUuid } : {}),
+                ...(linkage?.sourceMessageUuid
+                    ? { source_message_uuid: linkage.sourceMessageUuid }
+                    : {}),
             });
         }
         return;
     }
-    if (blockType === "tool_use" || blockType === "server_tool_use" || blockType === "mcp_tool_use") {
+    if (blockType === "tool_use" ||
+        blockType === "server_tool_use" ||
+        blockType === "mcp_tool_use") {
         const toolUseId = typeof block.id === "string" ? block.id : "";
         const name = typeof block.name === "string" ? block.name : "Tool";
-        const input = block.input && typeof block.input === "object" ? block.input : {};
+        const input = block.input && typeof block.input === "object"
+            ? block.input
+            : {};
         if (!toolUseId) {
             return;
         }
@@ -676,7 +813,9 @@ export function handleStreamEvent(session, event, parentToolUseId, sourceMessage
                 emitSessionUpdate(session.sessionId, {
                     type: "agent_message_chunk",
                     content: { type: "text", text },
-                    ...(sourceMessageUuid ? { source_message_uuid: sourceMessageUuid } : {}),
+                    ...(sourceMessageUuid
+                        ? { source_message_uuid: sourceMessageUuid }
+                        : {}),
                 });
             }
         }
@@ -686,7 +825,9 @@ export function handleStreamEvent(session, event, parentToolUseId, sourceMessage
                 emitSessionUpdate(session.sessionId, {
                     type: "agent_thought_chunk",
                     content: { type: "text", text },
-                    ...(sourceMessageUuid ? { source_message_uuid: sourceMessageUuid } : {}),
+                    ...(sourceMessageUuid
+                        ? { source_message_uuid: sourceMessageUuid }
+                        : {}),
                 });
             }
         }
@@ -706,7 +847,9 @@ export function handleAssistantMessage(session, message) {
     if (!messageObject) {
         return;
     }
-    const content = Array.isArray(messageObject.content) ? messageObject.content : [];
+    const content = Array.isArray(messageObject.content)
+        ? messageObject.content
+        : [];
     for (const block of content) {
         if (!block || typeof block !== "object") {
             continue;
@@ -717,7 +860,9 @@ export function handleAssistantMessage(session, message) {
             blockType === "server_tool_use" ||
             blockType === "mcp_tool_use" ||
             TOOL_RESULT_TYPES.has(blockType)) {
-            const parentToolUseId = typeof message.parent_tool_use_id === "string" ? message.parent_tool_use_id : undefined;
+            const parentToolUseId = typeof message.parent_tool_use_id === "string"
+                ? message.parent_tool_use_id
+                : undefined;
             handleContentBlock(session, blockRecord, {
                 source: "assistant",
                 parentToolUseId,
@@ -743,7 +888,9 @@ export function handleUserToolResultBlocks(session, message) {
     if (!messageObject) {
         return false;
     }
-    const content = Array.isArray(messageObject.content) ? messageObject.content : [];
+    const content = Array.isArray(messageObject.content)
+        ? messageObject.content
+        : [];
     const nonExecutionByToolUseId = parseToolNonExecutionMetadata(message.tool_result_meta);
     let handled = false;
     for (const block of content) {
@@ -753,8 +900,12 @@ export function handleUserToolResultBlocks(session, message) {
         const blockRecord = block;
         const blockType = typeof blockRecord.type === "string" ? blockRecord.type : "";
         if (TOOL_RESULT_TYPES.has(blockType)) {
-            const parentToolUseId = typeof message.parent_tool_use_id === "string" ? message.parent_tool_use_id : undefined;
-            const toolUseId = typeof blockRecord.tool_use_id === "string" ? blockRecord.tool_use_id : "";
+            const parentToolUseId = typeof message.parent_tool_use_id === "string"
+                ? message.parent_tool_use_id
+                : undefined;
+            const toolUseId = typeof blockRecord.tool_use_id === "string"
+                ? blockRecord.tool_use_id
+                : "";
             if (!toolUseId) {
                 continue;
             }
@@ -786,9 +937,30 @@ export function handleResultMessage(session, message) {
         });
         return;
     }
-    const errors = Array.isArray(message.errors) && message.errors.every((entry) => typeof entry === "string")
+    const errors = Array.isArray(message.errors) &&
+        message.errors.every((entry) => typeof entry === "string")
         ? message.errors
         : [];
+    const resumeDropsTurnRefusal = errors.find((entry) => entry.startsWith("Resume rejected by --resume-drops-turn:"));
+    if (session.deferConnect &&
+        session.resumeDropsTurn &&
+        resumeDropsTurnRefusal) {
+        session.initializationReady = false;
+        session.initializationError = resumeDropsTurnRefusal;
+        bridgeLogger.warn({
+            target: LOG_TARGETS.APP_SESSION,
+            eventName: "session_resume_drops_turn_rejected",
+            message: "guarded resume candidate rejected because the source session changed",
+            outcome: "failure",
+            sessionId: session.sessionId,
+            fields: {
+                drop_turn_id: session.resumeDropsTurn,
+                validation_fence_complete: session.resumeGuardFenceComplete === true,
+                error_message: resumeDropsTurnRefusal,
+            },
+        });
+        return;
+    }
     const assistantError = session.lastAssistantError;
     const authHint = errors.find((entry) => looksLikeAuthRequired(entry));
     if (authHint) {
@@ -808,7 +980,9 @@ export function handleResultMessage(session, message) {
         error_kind: errorKind,
         ...(subtype ? { sdk_result_subtype: subtype } : {}),
         ...(assistantError ? { assistant_error: assistantError } : {}),
-        ...(apiErrorStatus !== undefined ? { api_error_status: apiErrorStatus } : {}),
+        ...(apiErrorStatus !== undefined
+            ? { api_error_status: apiErrorStatus }
+            : {}),
         ...(terminalReason ? { terminal_reason: terminalReason } : {}),
     });
     session.lastAssistantError = undefined;
@@ -928,8 +1102,12 @@ export function handleSdkMessage(session, message) {
                 fields: {
                     tool_name: typeof msg.tool_name === "string" ? msg.tool_name : undefined,
                     agent_id: typeof msg.agent_id === "string" ? msg.agent_id : undefined,
-                    decision_reason_type: typeof msg.decision_reason_type === "string" ? msg.decision_reason_type : undefined,
-                    decision_reason: typeof msg.decision_reason === "string" ? msg.decision_reason : undefined,
+                    decision_reason_type: typeof msg.decision_reason_type === "string"
+                        ? msg.decision_reason_type
+                        : undefined,
+                    decision_reason: typeof msg.decision_reason === "string"
+                        ? msg.decision_reason
+                        : undefined,
                     denial_message: typeof msg.message === "string" ? msg.message : undefined,
                 },
             });
@@ -944,9 +1122,15 @@ export function handleSdkMessage(session, message) {
                 sessionId: session.sessionId,
                 fields: {
                     sdk_subtype: subtype,
-                    memory_count: Array.isArray(msg.memories) ? msg.memories.length : undefined,
-                    estimated_tokens: typeof msg.estimated_tokens === "number" ? msg.estimated_tokens : undefined,
-                    estimated_tokens_delta: typeof msg.estimated_tokens_delta === "number" ? msg.estimated_tokens_delta : undefined,
+                    memory_count: Array.isArray(msg.memories)
+                        ? msg.memories.length
+                        : undefined,
+                    estimated_tokens: typeof msg.estimated_tokens === "number"
+                        ? msg.estimated_tokens
+                        : undefined,
+                    estimated_tokens_delta: typeof msg.estimated_tokens_delta === "number"
+                        ? msg.estimated_tokens_delta
+                        : undefined,
                 },
             });
             return;
@@ -975,7 +1159,9 @@ export function handleSdkMessage(session, message) {
             const modelName = typeof msg.model === "string" ? msg.model : session.model;
             session.model = modelName;
             const currentModelChanged = refreshCurrentModel(session, false);
-            const incomingMode = typeof msg.permissionMode === "string" ? toPermissionMode(msg.permissionMode) : null;
+            const incomingMode = typeof msg.permissionMode === "string"
+                ? toPermissionMode(msg.permissionMode)
+                : null;
             if (incomingMode) {
                 session.mode = incomingMode;
             }
@@ -1007,7 +1193,8 @@ export function handleSdkMessage(session, message) {
             if (Array.isArray(msg.mcp_servers)) {
                 emitMcpSnapshotFromStatuses(session, msg.mcp_servers, "init");
             }
-            if (session.lastAvailableAgentsSignature === undefined && Array.isArray(msg.agents)) {
+            if (session.lastAvailableAgentsSignature === undefined &&
+                Array.isArray(msg.agents)) {
                 emitAvailableAgentsIfChanged(session, mapAvailableAgentsFromNames(msg.agents));
             }
             void session.query
@@ -1029,20 +1216,54 @@ export function handleSdkMessage(session, message) {
             return;
         }
         if (subtype === "status") {
-            const mode = typeof msg.permissionMode === "string" ? toPermissionMode(msg.permissionMode) : null;
+            const mode = typeof msg.permissionMode === "string"
+                ? toPermissionMode(msg.permissionMode)
+                : null;
             if (mode) {
                 session.mode = mode;
                 refreshSupportedModesForSession(session);
-                emitSessionUpdate(session.sessionId, { type: "current_mode_update", current_mode_id: mode });
+                emitSessionUpdate(session.sessionId, {
+                    type: "current_mode_update",
+                    current_mode_id: mode,
+                });
             }
             if (msg.status === "compacting") {
-                emitSessionUpdate(session.sessionId, { type: "session_status_update", status: "compacting" });
+                emitSessionUpdate(session.sessionId, {
+                    type: "compaction_update",
+                    phase: "started",
+                });
             }
             else if (msg.status === "requesting") {
-                emitSessionUpdate(session.sessionId, { type: "session_status_update", status: "requesting" });
+                emitSessionUpdate(session.sessionId, {
+                    type: "session_status_update",
+                    status: "requesting",
+                });
             }
             else if (msg.status === null) {
-                emitSessionUpdate(session.sessionId, { type: "session_status_update", status: "idle" });
+                if (msg.compact_result === "success") {
+                    emitSessionUpdate(session.sessionId, {
+                        type: "compaction_update",
+                        phase: "finished",
+                        result: "success",
+                    });
+                }
+                else if (msg.compact_result === "failed") {
+                    const compactError = typeof msg.compact_error === "string" &&
+                        msg.compact_error.trim().length > 0
+                        ? msg.compact_error.trim()
+                        : undefined;
+                    emitSessionUpdate(session.sessionId, {
+                        type: "compaction_update",
+                        phase: "finished",
+                        result: "failed",
+                        error_code: compactError === "too_few_groups" ? "too_few_groups" : "unknown",
+                        ...(compactError ? { error: compactError } : {}),
+                    });
+                }
+                emitSessionUpdate(session.sessionId, {
+                    type: "session_status_update",
+                    status: "idle",
+                });
             }
             emitFastModeUpdateIfChanged(session, msg.fast_mode_state, msg.fast_mode_disabled_reason);
             return;
@@ -1053,12 +1274,18 @@ export function handleSdkMessage(session, message) {
                 return;
             }
             const trigger = compactMetadata.trigger;
-            const preTokens = numberField(compactMetadata, "pre_tokens", "preTokens");
-            if ((trigger === "manual" || trigger === "auto") && preTokens !== undefined) {
+            const preTokens = nonNegativeIntegerField(compactMetadata, "pre_tokens", "preTokens");
+            const postTokens = nonNegativeIntegerField(compactMetadata, "post_tokens", "postTokens");
+            const durationMs = nonNegativeIntegerField(compactMetadata, "duration_ms", "durationMs");
+            if ((trigger === "manual" || trigger === "auto") &&
+                preTokens !== undefined) {
                 emitSessionUpdate(session.sessionId, {
-                    type: "compaction_boundary",
+                    type: "compaction_update",
+                    phase: "boundary",
                     trigger,
                     pre_tokens: preTokens,
+                    ...(postTokens !== undefined ? { post_tokens: postTokens } : {}),
+                    ...(durationMs !== undefined ? { duration_ms: durationMs } : {}),
                 });
             }
             return;
@@ -1069,7 +1296,9 @@ export function handleSdkMessage(session, message) {
                 emitSessionUpdate(session.sessionId, {
                     type: "agent_message_chunk",
                     content: { type: "text", text: content },
-                    ...(sourceMessageUuid(msg) ? { source_message_uuid: sourceMessageUuid(msg) } : {}),
+                    ...(sourceMessageUuid(msg)
+                        ? { source_message_uuid: sourceMessageUuid(msg) }
+                        : {}),
                 });
             }
             return;
@@ -1084,7 +1313,9 @@ export function handleSdkMessage(session, message) {
                 session_id: session.sessionId,
                 completion: {
                     elicitation_id: elicitationId,
-                    ...(typeof msg.mcp_server_name === "string" ? { server_name: msg.mcp_server_name } : {}),
+                    ...(typeof msg.mcp_server_name === "string"
+                        ? { server_name: msg.mcp_server_name }
+                        : {}),
                 },
             });
             return;
@@ -1107,7 +1338,10 @@ export function handleSdkMessage(session, message) {
     if (type === "prompt_suggestion") {
         const suggestion = typeof msg.suggestion === "string" ? msg.suggestion.trim() : "";
         if (suggestion) {
-            emitSessionUpdate(session.sessionId, { type: "prompt_suggestion_update", suggestion });
+            emitSessionUpdate(session.sessionId, {
+                type: "prompt_suggestion_update",
+                suggestion,
+            });
         }
         return;
     }
@@ -1122,10 +1356,14 @@ export function handleSdkMessage(session, message) {
     }
     if (type === "auth_status") {
         const output = Array.isArray(msg.output)
-            ? msg.output.filter((entry) => typeof entry === "string").join("\n")
+            ? msg.output
+                .filter((entry) => typeof entry === "string")
+                .join("\n")
             : "";
         const errorText = typeof msg.error === "string" ? msg.error : "";
-        const combined = [errorText, output].filter((entry) => entry.length > 0).join("\n");
+        const combined = [errorText, output]
+            .filter((entry) => entry.length > 0)
+            .join("\n");
         if (combined && looksLikeAuthRequired(combined)) {
             emitAuthRequired(session, combined);
         }
@@ -1133,7 +1371,9 @@ export function handleSdkMessage(session, message) {
     }
     if (type === "stream_event") {
         if (msg.event && typeof msg.event === "object") {
-            const parentToolUseId = typeof msg.parent_tool_use_id === "string" ? msg.parent_tool_use_id : undefined;
+            const parentToolUseId = typeof msg.parent_tool_use_id === "string"
+                ? msg.parent_tool_use_id
+                : undefined;
             handleStreamEvent(session, msg.event, parentToolUseId, sourceMessageUuid(msg));
         }
         return;
@@ -1141,30 +1381,38 @@ export function handleSdkMessage(session, message) {
     if (type === "tool_progress") {
         const toolUseId = typeof msg.tool_use_id === "string" ? msg.tool_use_id : "";
         const toolName = typeof msg.tool_name === "string" ? msg.tool_name : "Tool";
+        const parentToolUseId = typeof msg.parent_tool_use_id === "string" ? msg.parent_tool_use_id : "";
         const taskId = typeof msg.task_id === "string" ? msg.task_id : "";
-        const taskToolUseId = taskId ? session.taskToolUseIds.get(taskId) ?? "" : "";
-        const resolvedToolUseId = taskToolUseId || toolUseId;
-        if (isHiddenToolUse(session, resolvedToolUseId, toolName)) {
+        const taskToolUseId = taskId
+            ? (session.taskToolUseIds.get(taskId) ?? "")
+            : "";
+        if (isHiddenToolUse(session, toolUseId, toolName)) {
             return;
         }
+        const progressTarget = resolveToolProgressTarget(session, taskToolUseId, toolUseId, parentToolUseId);
+        const resolvedToolUseId = progressTarget?.toolUseId ?? "";
         bridgeLogger.debug({
             target: LOG_TARGETS.APP_TOOL,
             eventName: "sdk_tool_progress_linkage_observed",
             message: "SDK tool progress linkage observed",
-            outcome: typeof msg.parent_tool_use_id === "string" ? "child" : "root_or_unknown",
+            outcome: progressTarget?.source ?? "orphaned",
             sessionId: session.sessionId,
-            toolCallId: resolvedToolUseId || undefined,
+            toolCallId: resolvedToolUseId || toolUseId || undefined,
             fields: {
                 tool_name: toolName,
                 tool_use_id: toolUseId || undefined,
-                parent_tool_use_id: typeof msg.parent_tool_use_id === "string" ? msg.parent_tool_use_id : undefined,
+                parent_tool_use_id: parentToolUseId || undefined,
                 task_id: taskId || undefined,
                 task_resolved_tool_use_id: taskToolUseId || undefined,
+                resolved_tool_use_id: resolvedToolUseId || undefined,
+                correlation_source: progressTarget?.source,
             },
         });
         if (resolvedToolUseId) {
             const hasSubagentRetry = Object.hasOwn(msg, "subagent_retry");
-            const subagentRetry = hasSubagentRetry ? buildSubagentRetryUpdate(msg) : null;
+            const subagentRetry = hasSubagentRetry
+                ? buildSubagentRetryUpdate(msg)
+                : null;
             if (hasSubagentRetry && !subagentRetry) {
                 bridgeLogger.warn({
                     target: LOG_TARGETS.APP_TOOL,
@@ -1178,7 +1426,7 @@ export function handleSdkMessage(session, message) {
             const subagentType = typeof msg.subagent_type === "string" && msg.subagent_type.trim()
                 ? msg.subagent_type.trim()
                 : undefined;
-            emitToolProgressUpdate(session, resolvedToolUseId, toolName, {
+            emitToolProgressUpdate(session, resolvedToolUseId, {
                 ...(subagentRetry
                     ? { subagentRetry }
                     : hasSubagentRetry
@@ -1207,8 +1455,12 @@ export function handleSdkMessage(session, message) {
     if (type === "rate_limit_event") {
         const rateLimitInfo = asRecordOrNull(msg.rate_limit_info);
         const update = buildRateLimitUpdate(msg.rate_limit_info);
-        const rawIsUsingOverage = typeof rateLimitInfo?.isUsingOverage === "boolean" ? rateLimitInfo.isUsingOverage : undefined;
-        const rawOverageInUse = typeof rateLimitInfo?.overageInUse === "boolean" ? rateLimitInfo.overageInUse : undefined;
+        const rawIsUsingOverage = typeof rateLimitInfo?.isUsingOverage === "boolean"
+            ? rateLimitInfo.isUsingOverage
+            : undefined;
+        const rawOverageInUse = typeof rateLimitInfo?.overageInUse === "boolean"
+            ? rateLimitInfo.overageInUse
+            : undefined;
         if (rawIsUsingOverage !== undefined &&
             rawOverageInUse !== undefined &&
             rawIsUsingOverage !== rawOverageInUse) {
@@ -1231,11 +1483,17 @@ export function handleSdkMessage(session, message) {
             outcome: update ? "success" : "dropped",
             sessionId: session.sessionId,
             fields: {
-                raw_status: typeof rateLimitInfo?.status === "string" ? rateLimitInfo.status : undefined,
-                raw_rate_limit_type: typeof rateLimitInfo?.rateLimitType === "string" ? rateLimitInfo.rateLimitType : undefined,
+                raw_status: typeof rateLimitInfo?.status === "string"
+                    ? rateLimitInfo.status
+                    : undefined,
+                raw_rate_limit_type: typeof rateLimitInfo?.rateLimitType === "string"
+                    ? rateLimitInfo.rateLimitType
+                    : undefined,
                 raw_utilization: numberField(rateLimitInfo ?? {}, "utilization"),
                 raw_resets_at: numberField(rateLimitInfo ?? {}, "resetsAt"),
-                raw_overage_status: typeof rateLimitInfo?.overageStatus === "string" ? rateLimitInfo.overageStatus : undefined,
+                raw_overage_status: typeof rateLimitInfo?.overageStatus === "string"
+                    ? rateLimitInfo.overageStatus
+                    : undefined,
                 raw_overage_resets_at: numberField(rateLimitInfo ?? {}, "overageResetsAt"),
                 raw_is_using_overage: rawIsUsingOverage,
                 raw_overage_in_use: rawOverageInUse,
@@ -1266,6 +1524,10 @@ export function handleSdkMessage(session, message) {
         return;
     }
     if (type === "user") {
+        const externalMessageUpdate = externalMessageUpdateFromSdkUser(msg);
+        if (externalMessageUpdate) {
+            emitSessionUpdate(session.sessionId, externalMessageUpdate);
+        }
         const handledBlocks = handleUserToolResultBlocks(session, msg);
         const toolUseId = typeof msg.parent_tool_use_id === "string" ? msg.parent_tool_use_id : "";
         const rawToolUseResult = messageToolUseResult(msg);