@codingame/monaco-vscode-api 37.6.0 → 38.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter.js

@@ -1,33 +1,41 @@
 
+import { readMessageSystemInitiatedLabel, isMessageRequestHiddenFromTranscript, isMessageHiddenFromTranscript, readAgentMessageRoundTripMetadata } from '../../../../../../platform/agentHost/common/meta/agentMessageMeta.js';
+import { readUsageInfoMeta } from '../../../../../../platform/agentHost/common/meta/agentUsageMeta.js';
 import { decodeBase64 } from '../../../../../../base/common/buffer.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
-import { MarkdownString, escapeMarkdownLinkLabel } from '../../../../../../base/common/htmlContent.js';
+import { escapeMarkdownLinkLabel, MarkdownString, escapeMarkdownSyntaxTokens } from '../../../../../../base/common/htmlContent.js';
 import { escapeIcons } from '../../../../../../base/common/iconLabels.js';
 import { rewriteMarkdownLinks as rewriteMarkdownLinks$1 } from '../../../../../../base/common/markdownLinks.js';
+import { readSlashCommandResource } from '../../../../../../platform/agentHost/common/meta/vscode/agentSlashCommandOutputMeta.js';
 import { Mimes } from '../../../../../../base/common/mime.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { win32, posix } from '../../../../../../base/common/path.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
-import { getInlineToolInput, buildSubagentChatUri, getToolSubagentContent, readUsageInfoMeta, hasReportedUsage, readMessageSystemInitiatedLabel, isMessageRequestHiddenFromTranscript, isMessageHiddenFromTranscript, getTurnError, parseChatUri, getToolOutputText, getToolFileEdits, FileEditKind } from '../../../../../../platform/agentHost/common/state/sessionState.js';
-import { getToolKind } from '../../../../../../platform/agentHost/common/state/sessionReducers.js';
-import { readToolCallMeta } from '../../../../../../platform/agentHost/common/meta/agentToolCallMeta.js';
+import { buildSubagentChatUri, getToolOutputText, getToolSubagentContent, getToolFileEdits, hasReportedUsage, getTurnError, FileEditKind } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { getToolKind as getToolKind$1 } from '../../../../../../platform/agentHost/common/state/sessionReducers.js';
+import { readToolCallPresentation, readToolCallMeta } from '../../../../../../platform/agentHost/common/meta/agentToolCallMeta.js';
+import { readImageGenerationToolMetadata } from '../../../../../../platform/agentHost/common/meta/vscode/agentImageGenerationMeta.js';
+import { readAttachmentDetail } from '../../../../../../platform/agentHost/common/meta/attachmentMeta.js';
+import { COPILOT_HYDRA_FUSION_MODEL_ID } from '../../../../../../platform/agentHost/common/copilotCliConfig.js';
 import { getChatErrorDetailsFromMeta } from '../../../common/chatErrorMessages.js';
+import { AICustomizationManagementSection, AICustomizationManagementCommands } from '../../../common/aiCustomizationWorkspaceService.js';
 import { createAgentHostResourceUriMapper, toAgentHostUri, toAgentHostContentUri, AGENT_HOST_SCHEME } from '../../../../../../platform/agentHost/common/agentHostUri.js';
-import { getElementAttachmentCorrelationId, AgentHostElementAttachmentDisplayKind } from '../../../../../../platform/agentHost/common/meta/agentElementAttachments.js';
+import { getElementAttachmentCorrelationId, AgentHostElementAttachmentDisplayKind } from '../../../../../../platform/agentHost/common/meta/vscode/agentElementAttachments.js';
 import { AgentHostAutoReplyAnswer } from '../../../../../../platform/agentHost/common/agentHostSchema.js';
 import { SessionServerToolName } from '../../../../../../platform/agentHost/common/serverToolNames.js';
-import { isAgentFeedbackAnnotationsAttachment, isAgentFeedbackAttachment, getAgentFeedbackAttachmentMetadata } from '../../../../../../platform/agentHost/common/meta/agentFeedbackAttachments.js';
-import { isBrowserViewAttachment, getBrowserViewAttachmentMetadata } from '../../../../../../platform/agentHost/common/meta/browserViewAttachments.js';
-import { readAgentMessageDelegationMeta } from '../../../../../../platform/agentHost/common/meta/agentMessageDelegationMeta.js';
-import { isAgentMergeMessage } from '../../../../../../platform/agentHost/common/meta/agentMergeMessageMeta.js';
-import { readAgentSystemNotificationMeta, AgentSystemNotificationKind, AgentSystemNotificationWorkspaceKind, AgentSystemNotificationSeverity } from '../../../../../../platform/agentHost/common/meta/agentSystemNotificationMeta.js';
-import { isAddCommentTool, isViewUnreviewedCommentsTool } from '../../../../../../platform/agentHost/common/meta/agentFeedbackAnnotations.js';
+import { isAgentFeedbackAnnotationsAttachment, isAgentFeedbackAttachment, getAgentFeedbackAttachmentMetadata } from '../../../../../../platform/agentHost/common/meta/vscode/agentFeedbackAttachments.js';
+import { isBrowserViewAttachment, getBrowserViewAttachmentMetadata } from '../../../../../../platform/agentHost/common/meta/vscode/browserViewAttachments.js';
+import { readAgentMessageDelegationMeta } from '../../../../../../platform/agentHost/common/meta/vscode/agentMessageDelegationMeta.js';
+import { isAgentMergeMessage } from '../../../../../../platform/agentHost/common/meta/vscode/agentMergeMessageMeta.js';
+import { readAgentSystemNotificationMeta, AgentSystemNotificationKind, AgentSystemNotificationWorkspaceKind, AgentSystemNotificationSeverity } from '../../../../../../platform/agentHost/common/meta/vscode/agentSystemNotificationMeta.js';
+import { isAddCommentTool, isViewUnreviewedCommentsTool } from '../../../../../../platform/agentHost/common/meta/vscode/agentFeedbackAnnotations.js';
 import { buildOpenSessionLinkUri, isSendMessageTool, isCreateSessionTool, isCreateChatTool, parseOpenSessionLinkUri, parseOpenSessionLinkChatId, AGENT_HOST_SESSION_LINK_SCHEME } from '../../../../../../platform/agentHost/common/openSessionLink.js';
-import { parsePartialToolInputForDisplay } from '../../../../../../platform/agentHost/common/partialToolInput.js';
+import { getAgentHostChatId } from '../../../../../../platform/agentHost/common/agentHostChatIdentity.js';
+import { getInlineToolInput, parsePartialToolInputForDisplay } from '../../../../../../platform/agentHost/common/partialToolInput.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-root/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-session/state.js';
-import { ToolCallStatus, ToolCallCancellationReason, ChatInputAnswerState, ChatInputAnswerValueKind, ChatInputResponseKind, ChatInputQuestionKind, ToolCallContributorKind, MessageKind, ResponsePartKind, MessageAttachmentKind, ToolResultContentType, ToolCallRiskAssessmentStatus } from '../../../../../../platform/agentHost/common/state/protocol/channels-chat/state.js';
+import { ToolCallStatus, ToolCallCancellationReason, ChatInputAnswerState, ChatInputAnswerValueKind, ChatInputResponseKind, ChatInputQuestionKind, ToolCallContributorKind, ResponsePartKind, MessageKind, MessageAttachmentKind, ToolResultContentType, ToolCallRiskAssessmentStatus } from '../../../../../../platform/agentHost/common/state/protocol/channels-chat/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-terminal/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-changeset/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-resource-watch/state.js';
@@ -37,7 +45,7 @@ import { normalizeFileEdit } from '../../../../../../platform/agentHost/common/f
 import '../../../../../../platform/agentHost/common/agentService.js';
 import product from '../../../../../../platform/product/common/product.js';
 import { ConfigureAutomationToolReferenceName } from '../../../common/automations/automationService.js';
-import { ElicitationState, formatCopilotCreditsLabel, ToolConfirmKind, AgentFeedbackReviewCommandId } from '../../../common/chatService/chatService.js';
+import { ElicitationState, getSubagentIsActive, formatCopilotCreditsLabel, ToolConfirmKind, AgentFeedbackReviewCommandId } from '../../../common/chatService/chatService.js';
 import { isTerminalCommandPrompt } from '../../../common/chatSessionsService.js';
 import { ChatToolInvocation } from '../../../common/model/chatProgressTypes/chatToolInvocation.js';
 import { ChatPlanReviewData } from '../../../common/model/chatProgressTypes/chatPlanReviewData.js';
@@ -45,17 +53,22 @@ import { ChatQuestionCarouselData } from '../../../common/model/chatProgressType
 import { ChatRequestOriginKind } from '../../../common/chatRequestOrigin.js';
 import { toAgentHostCompletionVariableEntryFromMetadata, restoreChatTranscriptContextVariableEntry, restorePasteVariableEntryFromAttachment, AgentHostCompletionReferenceKind } from '../../../common/attachments/chatVariableEntries.js';
 import { ToolInvocationPresentation, ToolDataSource } from '../../../common/tools/languageModelToolsService.js';
+import { getToolInvocationSummaryFromInput } from '../../../common/tools/toolInvocationSummary.js';
 import { isEqual, basename } from '../../../../../../base/common/resources.js';
 import { hasKey } from '../../../../../../base/common/types.js';
 import { localize } from '../../../../../../nls.js';
 import { isSessionReferenceTrajectoryAttachment, restoreSessionReferenceVariableEntryFromAttachment } from './agentHostSessionReferenceAttachment.js';
 import { restoreChatReferenceVariableEntryFromAttachment } from './agentHostChatReferenceAttachment.js';
 import { AgentSession } from '../../../../../../platform/agentHost/common/agent.js';
+import { copilotCliToolInputContract } from '../../../../../../platform/agentHost/common/meta/vscode/agentToolCallMeta.js';
 
 const BOOLEAN_TRUE_OPTION_ID = "true";
 const BOOLEAN_FALSE_OPTION_ID = "false";
+function getToolKind(call) {
+    return getToolKind$1(call) ?? readToolCallPresentation(call).toolKind;
+}
 const agentHostAskUserToolNames = ( new Set(["ask_user", "AskUserQuestion", "request_user_input"]));
-const imageGenerationToolName = "image_gen.imagegen";
+const imageGenerationToolNames = ( new Set(["image_gen.imagegen", "image_generation"]));
 function isAgentHostAskUserTool(toolName) {
     return ( agentHostAskUserToolNames.has(toolName));
 }
@@ -187,16 +200,39 @@ function convertProtocolPlanReviewResult(planReview, response, answers) {
         } : {})
     };
 }
+function getInputQuestionText(question) {
+    if (question.title) {
+        return {
+            title: question.title,
+            message: question.message
+        };
+    }
+    const endOfLine = question.message.indexOf("\n");
+    return endOfLine === -1 ? {
+        title: question.message,
+        message: ""
+    } : {
+        title: question.message.substring(0, endOfLine).trim(),
+        message: question.message.substring(endOfLine + 1).trim()
+    };
+}
+function rewriteQuestionMarkdownLinks(markdown, connectionAuthority) {
+    return rewriteMarkdownLinks$1(markdown, {
+        rewriteLink: token => {
+            const href = rewriteAgentHostLinkTarget(token.href, connectionAuthority);
+            if (href === token.href) {
+                return undefined;
+            }
+            const prefix = token.type === "image" ? "![" : "[";
+            return `${prefix}${escapeMarkdownLinkLabel(token.text ?? "")}](${href})`;
+        }
+    });
+}
 function createInputRequestCarousel(inputReq, connectionAuthority) {
     const questions = (inputReq.questions ?? []).map(question => {
-        let title = question.title;
-        let message = question.message;
-        if (!title) {
-            const endOfLine = question.message.indexOf("\n");
-            title = endOfLine === -1 ? question.message : question.message.substring(0, endOfLine).trim();
-            message = endOfLine === -1 ? "" : question.message.substring(endOfLine + 1).trim();
-        }
-        const detailedMessage = ( new MarkdownString(message, {
+        const questionText = getInputQuestionText(question);
+        const title = rewriteQuestionMarkdownLinks(questionText.title, connectionAuthority);
+        const detailedMessage = ( new MarkdownString(rewriteQuestionMarkdownLinks(questionText.message, connectionAuthority), {
             isTrusted: false
         }));
         switch (question.kind) {
@@ -239,11 +275,11 @@ function createInputRequestCarousel(inputReq, connectionAuthority) {
                 defaultValue: question.defaultValue === undefined ? undefined : String(question.defaultValue),
                 options: [{
                     id: BOOLEAN_TRUE_OPTION_ID,
-                    label: ( localize(8225, "True")),
+                    label: ( localize(9853, "True")),
                     value: BOOLEAN_TRUE_OPTION_ID
                 }, {
                     id: BOOLEAN_FALSE_OPTION_ID,
-                    label: ( localize(8226, "False")),
+                    label: ( localize(9854, "False")),
                     value: BOOLEAN_FALSE_OPTION_ID
                 }]
             };
@@ -270,18 +306,14 @@ function createInputRequestCarousel(inputReq, connectionAuthority) {
         questions.push({
             id: "answer",
             type: "text",
-            title: inputReq.message ?? "",
+            title: rewriteQuestionMarkdownLinks(inputReq.message ?? "", connectionAuthority),
             required: true
         });
     }
-    const carousel = ( new ChatQuestionCarouselData(
-        questions,
-        true,
-        inputReq.id,
-        undefined,
-        undefined,
-        inputReq.message ? rawMarkdownToString(inputReq.message, connectionAuthority) : undefined
-    ));
+    const message = inputReq.message;
+    const firstQuestion = inputReq.questions?.[0];
+    const carouselMessage = message && firstQuestion && message.trim() !== getInputQuestionText(firstQuestion).title.trim() && message.trim() !== firstQuestion.message.trim() ? rawMarkdownToString(message, connectionAuthority) : undefined;
+    const carousel = ( new ChatQuestionCarouselData(questions, true, inputReq.id, undefined, undefined, carouselMessage));
     carousel.answerPresentation = "conversation";
     return carousel;
 }
@@ -310,7 +342,7 @@ function getUrlInputRequestPresentation(inputReq, url) {
         message.appendText(inputReq.message);
         message.appendMarkdown("\n\n");
     }
-    message.appendMarkdown(( localize(8227, "Open this URL?")));
+    message.appendMarkdown(( localize(9855, "Open this URL?")));
     message.appendCodeblock("", url);
     return {
         authority,
@@ -334,7 +366,7 @@ function inputRequestResponsePartToProgress(
         const presentation = getUrlInputRequestPresentation(inputReq, inputReq.url);
         return {
             kind: "elicitationSerialized",
-            title: ( localize(8228, "Authorization Required")),
+            title: ( localize(9856, "Authorization Required")),
             message: presentation.message,
             subtitle: "",
             source: undefined,
@@ -359,7 +391,11 @@ function getSubagentAgentName(tc) {
     return v && v.length > 0 ? v : undefined;
 }
 function applyToolCallProgress(invocation, tc) {
-    const progressMessage = tc.status === ToolCallStatus.Running ? readToolCallMeta(tc).progressMessage : undefined;
+    if (tc.status !== ToolCallStatus.Running) {
+        return;
+    }
+    const imageModel = readImageGenerationToolMetadata(tc)?.requestedModel;
+    const progressMessage = imageModel ? ( localize(9857, "Generating image with {0}", imageModel.name ?? imageModel.id)) : readToolCallMeta(tc).progressMessage;
     if (progressMessage !== undefined) {
         invocation.acceptProgress({
             message: progressMessage
@@ -369,7 +405,40 @@ function applyToolCallProgress(invocation, tc) {
 function getSubagentChatResource(tc, subagentContent, sessionResource) {
     return readToolCallMeta(tc).subagentChatUri ?? subagentContent?.resource ?? buildSubagentChatUri(( sessionResource.toString()), tc.toolCallId);
 }
+function updateFusionPhaseToolSpecificData(invocation, tc, sessionResource) {
+    const previous = invocation.toolSpecificData?.kind === "subagent" ? invocation.toolSpecificData : undefined;
+    const data = getSubagentToolSpecificData(tc, sessionResource);
+    invocation.toolSpecificData = data && previous?.chatResource ? {
+        ...data,
+        chatResource: previous.chatResource,
+        isChatAvailable: previous.isChatAvailable
+    } : data;
+    invocation.notifyToolSpecificDataChanged();
+}
 function getSubagentToolSpecificData(tc, sessionResource) {
+    const phase = readToolCallMeta(tc).fusionPhase;
+    if (getToolKind(tc) === "fusionPhase" && phase) {
+        const phaseStatus = tc.status === ToolCallStatus.Cancelled ? "cancelled" : phase.status;
+        const isActive = getSubagentIsActive({
+            presentation: "phase",
+            phaseStatus
+        });
+        return {
+            kind: "subagent",
+            presentation: "phase",
+            phaseStatus,
+            activityDescription: isActive ? readToolCallMeta(tc).progressMessage : undefined,
+            hasStarted: true,
+            isActive,
+            description: getSubagentTaskDescription(tc) ?? tc.displayName,
+            modelId: phase.model,
+            modelName: phase.model,
+            startedAt: phase.startedAt,
+            duration: phase.duration,
+            result: tc.status === ToolCallStatus.Completed ? getToolOutputText(tc) : undefined,
+            isChatAvailable: false
+        };
+    }
     const subagentContent = (tc.status === ToolCallStatus.Running || tc.status === ToolCallStatus.Completed) ? getToolSubagentContent(tc) : undefined;
     if (!isSubagentTool(tc) && !subagentContent) {
         return undefined;
@@ -417,6 +486,49 @@ function getToolRawInput(tc) {
         };
     }
 }
+function getToolSummary(tc, resourceUris) {
+    if (tc.status === ToolCallStatus.Cancelled) {
+        return {
+            kind: tc.reason === ToolCallCancellationReason.Skipped ? "skipped" : "denied"
+        };
+    }
+    if (tc.status !== ToolCallStatus.Completed) {
+        return {
+            kind: "incomplete"
+        };
+    }
+    if (!tc.success) {
+        return {
+            kind: "failed"
+        };
+    }
+    const edits = getToolFileEdits(tc).map(normalizeFileEdit);
+    if (edits.length > 0) {
+        return edits.every(edit => edit !== undefined) ? {
+            kind: "edit",
+            resources: edits.map(edit => ({
+                uri: resourceUris.fromAgentHost(edit.resource)
+            }))
+        } : {
+            kind: "unknown"
+        };
+    }
+    const meta = readToolCallMeta(tc);
+    if (getTerminalContent(tc.content) || !tc.contributor && meta.toolKind === "terminal") {
+        const exitCode = getTerminalCommandResult(tc)?.exitCode;
+        return {
+            kind: exitCode !== undefined && exitCode !== 0 ? "failed" : "command"
+        };
+    }
+    if (tc.contributor || meta["vscode.toolInputContract"] !== copilotCliToolInputContract) {
+        return {
+            kind: "unknown"
+        };
+    }
+    return getToolInvocationSummaryFromInput(tc.toolName, getToolRawInput(tc), uri => resourceUris.fromAgentHost(uri)) ?? {
+        kind: "unknown"
+    };
+}
 function buildMcpAppToolInputData(tc, connectionAuthority, existingRawInput) {
     const mcpAppData = getMcpAppData(tc, connectionAuthority);
     if (!mcpAppData) {
@@ -445,15 +557,63 @@ function isSubagentToolName(toolName) {
     return ( SUBAGENT_TOOL_NAMES.has(toolName));
 }
 function systemNotificationToChatPart(content, connectionAuthority, _meta) {
+    const meta = readAgentSystemNotificationMeta({
+        _meta
+    });
+    if (meta.kind === AgentSystemNotificationKind.ResponseRoundEnded) {
+        return {
+            kind: "thinking",
+            value: ""
+        };
+    }
     if (!content) {
         return undefined;
     }
+    if (readSlashCommandResource({
+        _meta
+    }) && typeof content !== "string") {
+        return {
+            kind: "markdownContent",
+            content: ( new MarkdownString(rewriteMarkdownLinks$1(content.markdown, {
+                rewriteLink: token => token.type === "link" ? ( new MarkdownString()).appendLink(rewriteAgentHostLinkTarget(token.href, connectionAuthority), token.text).value : undefined
+            })))
+        };
+    }
     const value = stringOrMarkdownToString(content, connectionAuthority);
     const markdown = typeof value === "string" ? ( new MarkdownString(value)) : value;
-    const meta = readAgentSystemNotificationMeta({
-        _meta
-    });
     switch (meta.kind) {
+    case AgentSystemNotificationKind.FusionProgress:
+        {
+            if (meta.fusionStatus === "selected") {
+                const description = meta.fusionDescription === undefined ? markdown.value : escapeMarkdownSyntaxTokens(meta.fusionDescription);
+                return description ? {
+                    kind: "systemNotification",
+                    content: {
+                        ...markdown,
+                        value: description
+                    },
+                    presentation: "workflowDescription"
+                } : undefined;
+            }
+            return {
+                kind: "systemNotification",
+                content: markdown,
+                collapsible: true,
+                icon: meta.fusionStatus === "failed" ? Codicon.error : meta.fusionStatus === "cancelled" ? Codicon.circleSlash : meta.fusionStatus === "degraded" ? Codicon.warning : Codicon.check
+            };
+        }
+    case AgentSystemNotificationKind.ByokToolLimitExceeded:
+        return {
+            kind: "warning",
+            content: withConfigureToolsLink(markdown.value),
+            keepVisibleWhenCollapsed: true
+        };
+    case AgentSystemNotificationKind.ManagedPluginPreparationFailure:
+        return {
+            kind: "warning",
+            content: ( new MarkdownString(escapeHostText(markdown.value))),
+            keepVisibleWhenCollapsed: true
+        };
     case AgentSystemNotificationKind.WorktreeCreationFailure:
         return meta.severity === AgentSystemNotificationSeverity.Warning ? {
             kind: "warning",
@@ -476,11 +636,11 @@ function systemNotificationToChatPart(content, connectionAuthority, _meta) {
             presentation: "workspaceTransition",
             workspaceName: meta.workspaceName,
             accessibilityLabel: meta.workspaceKind === AgentSystemNotificationWorkspaceKind.Worktree ? ( localize(
-                8229,
+                9858,
                 "Workspace changed. This session is now working in {0} using an isolated worktree.",
                 meta.workspaceName
             )) : ( localize(
-                8230,
+                9859,
                 "Workspace changed. This session is now working directly in {0}.",
                 meta.workspaceName
             ))
@@ -542,9 +702,36 @@ function systemNotificationToChatPart(content, connectionAuthority, _meta) {
         };
     }
 }
+function withConfigureToolsLink(hostText) {
+    const commandArgs = encodeURIComponent(JSON.stringify([AICustomizationManagementSection.Tools]));
+    const link = `command:${AICustomizationManagementCommands.OpenEditor}?${commandArgs}`;
+    const label = escapeMarkdownLinkLabel(( localize(9860, "Configure Tools")));
+    const escapedHostText = escapeHostText(hostText);
+    return ( new MarkdownString(`${escapedHostText} [${label}](${link})`, {
+        isTrusted: {
+            enabledCommands: [AICustomizationManagementCommands.OpenEditor]
+        }
+    }));
+}
+function escapeHostText(hostText) {
+    return escapeMarkdownSyntaxTokens(
+        hostText.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+    ).replace(/:(?=\/\/)|(?<=www)\.|@/gi, "\\$&");
+}
+function getAgentHostActivityProgressId(parts) {
+    if (parts.length === 0) {
+        return "agentHost.chatActivity";
+    }
+    return parts.every(
+        part => part.kind === ResponsePartKind.SystemNotification && readAgentSystemNotificationMeta(part).kind === AgentSystemNotificationKind.FusionProgress
+    ) ? `agentHost.chatActivity:fusion:${parts.length}` : undefined;
+}
 function isSubagentTool(tc) {
     return getToolKind(tc) === "subagent" || isSubagentToolName(tc.toolName);
 }
+function canOwnSubagentChat(tc) {
+    return isSubagentTool(tc) || getToolKind(tc) === "fusionPhase" || ((tc.status === ToolCallStatus.Running || tc.status === ToolCallStatus.Completed) && getToolSubagentContent(tc) !== undefined);
+}
 function shouldObserveSubagentChat(tc, hasCatalogChild = false) {
     if (hasCatalogChild) {
         return true;
@@ -561,6 +748,25 @@ function getTerminalContentUri(content) {
 function getTerminalContent(content) {
     return content?.find(isToolResultTerminalContent);
 }
+function turnToResponseDetails(turn, lookup) {
+    const isFusionModel = modelId => lookup?.isFusionModel?.(modelId) ?? false;
+    const selectedModelId = turn?.message.model?.id;
+    let isFusion = isFusionModel(selectedModelId);
+    let reportedModelId;
+    for (const part of turn?.responseParts ?? []) {
+        if (part.kind === ResponsePartKind.ToolCall && getToolKind(part.toolCall) === "fusionPhase") {
+            isFusion = true;
+        } else if (part.kind === ResponsePartKind.SystemNotification) {
+            const meta = readAgentSystemNotificationMeta(part);
+            if (meta.kind === AgentSystemNotificationKind.FusionProgress) {
+                isFusion = true;
+                reportedModelId ??= isFusionModel(meta.fusionModel) ? meta.fusionModel : undefined;
+            }
+        }
+    }
+    const fusionModelId = reportedModelId ?? (isFusionModel(selectedModelId) ? selectedModelId : COPILOT_HYDRA_FUSION_MODEL_ID);
+    return lookup?.toResponseDetails(turn?.usage?.model, turn?.usage, isFusion ? fusionModelId : undefined);
+}
 function formatTurnResponseDetails(model, billedModelId, usage) {
     if (!model) {
         return undefined;
@@ -581,21 +787,25 @@ function usageInfoToAutoModeResolution(usage, resolvedModelName) {
         kind: "autoModeResolution",
         resolved: {
             id: resolution.chosenModel,
-            name: resolvedModelName ?? resolution.chosenModel
+            name: resolvedModelName ?? resolution.chosenModel,
+            ...(resolution.selectionReason ? {
+                reason: resolution.selectionReason
+            } : {})
         }
     };
 }
 function formatTurnModelName(model, billedModelId) {
     if (billedModelId) {
-        return localize(8231, "{0} ({1})", model.name, billedModelId);
+        return localize(9861, "{0} ({1})", model.name, billedModelId);
     }
     return model.name;
 }
-function usageInfoToChatUsage(usage, modelDisplayNameResolver) {
-    if (!hasReportedUsage(usage)) {
+function usageInfoToChatUsage(usage, modelDisplayNameResolver, contextUsage) {
+    if (!hasReportedUsage(usage) && !contextUsage) {
         return undefined;
     }
-    const turnTokenTotals = readUsageInfoMeta(usage).turnTokenTotals;
+    const metadata = readUsageInfoMeta(usage);
+    const turnTokenTotals = metadata.turnTokenTotals;
     return {
         kind: "usage",
         promptTokens: usage?.inputTokens ?? 0,
@@ -606,7 +816,16 @@ function usageInfoToChatUsage(usage, modelDisplayNameResolver) {
         modelTotals: turnTokenTotals?.map(total => ({
             ...total,
             model: modelDisplayNameResolver?.(total.model) ?? total.model
-        }))
+        })),
+        ...(metadata.latestModelCall ? {
+            latestModelCall: metadata.latestModelCall
+        } : {}),
+        ...(contextUsage ? {
+            contextUsage: {
+                currentTokens: contextUsage.currentTokens,
+                tokenLimit: contextUsage.tokenLimit
+            }
+        } : {})
     };
 }
 function getSessionCopilotCredits(usage) {
@@ -626,31 +845,31 @@ function kindToCategory(kind) {
     switch (kind) {
     case "system":
     case "toolDefinition":
-        return localize(8232, "System");
+        return localize(9862, "System");
     case "tool":
     case "skill":
     case "subagent":
     case "mcpServer":
     case "plugin":
-        return localize(8233, "User Context");
+        return localize(9863, "User Context");
     default:
-        return localize(8233, "User Context");
+        return localize(9863, "User Context");
     }
 }
 function kindToAggregateLabel(kind) {
     switch (kind) {
     case "tool":
-        return localize(8234, "Tool Results");
+        return localize(9864, "Tool Results");
     case "toolDefinition":
-        return localize(8235, "Tool Definitions");
+        return localize(9865, "Tool Definitions");
     case "skill":
-        return localize(8236, "Skills");
+        return localize(9866, "Skills");
     case "subagent":
-        return localize(8237, "Sub-agents");
+        return localize(9867, "Sub-agents");
     case "mcpServer":
-        return localize(8238, "MCP Tools");
+        return localize(9868, "MCP Tools");
     case "plugin":
-        return localize(8239, "Plugins");
+        return localize(9869, "Plugins");
     default:
         return kind;
     }
@@ -707,8 +926,8 @@ function contextAttributionToPromptTokenDetails(usage) {
         const percentageOfPrompt = Math.round((messageTokens / attribution.totalTokens) * 100);
         if (percentageOfPrompt > 0) {
             details.push({
-                category: ( localize(8233, "User Context")),
-                label: ( localize(8240, "Messages")),
+                category: ( localize(9863, "User Context")),
+                label: ( localize(9870, "Messages")),
                 percentageOfPrompt
             });
         }
@@ -808,16 +1027,16 @@ function turnsToHistory(
     errorContext,
     terminalCommandPrefix,
     resourceUris = createAgentHostResourceUriMapper(connectionAuthority),
-    logicalSessionScheme = backendSession.scheme,
-    errorDetailsProvider
+    errorDetailsProvider,
+    contextUsage
 ) {
     const history = [];
     for (const turn of turns) {
         const rawModelId = turn.usage?.model;
-        const modelId = lookup?.toLanguageModelId(rawModelId);
-        const details = lookup?.toResponseDetails(rawModelId, turn.usage);
+        const modelId = lookup?.toLanguageModelId(turn.message.model?.id ?? rawModelId);
+        const details = turnToResponseDetails(turn, lookup);
         const variableData = messageToVariableData(turn.message, connectionAuthority);
-        const origin = messageToRequestOrigin(backendSession, turn.message, participantId, logicalSessionScheme);
+        const origin = messageToRequestOrigin(backendSession, turn.message, participantId, connectionAuthority);
         const isSystemInitiated = turn.message.origin.kind === MessageKind.SystemNotification;
         const requestSource = messageToRequestSource(turn.message);
         const isTerminalRequest = isTerminalCommandPrompt(turn.message.text, terminalCommandPrefix);
@@ -825,8 +1044,14 @@ function turnsToHistory(
             id: turn.id,
             type: "request",
             prompt: turn.message.text,
+            ...(readAgentMessageRoundTripMetadata(turn.message) ? {
+                metadata: readAgentMessageRoundTripMetadata(turn.message)
+            } : {}),
             participant: participantId,
             modelId,
+            ...(turn.message.model?.config ? {
+                modelConfiguration: turn.message.model.config
+            } : {}),
             ...(turn.startedAt !== undefined && Number.isFinite(Date.parse(turn.startedAt)) ? {
                 timestamp: Date.parse(turn.startedAt)
             } : {}),
@@ -856,8 +1081,16 @@ function turnsToHistory(
         if (autoModeResolution?.resolved) {
             parts.push(autoModeResolution);
         }
-        const usage = usageInfoToChatUsage(turn.usage, lookup?.toModelDisplayName);
+        const usage = usageInfoToChatUsage(
+            turn.usage,
+            lookup?.toModelDisplayName,
+            turn === turns.at(-1) ? contextUsage : undefined
+        );
         if (usage) {
+            const actualModelId = lookup?.toActualModelId(rawModelId);
+            if (actualModelId) {
+                usage.actualModelId = actualModelId;
+            }
             parts.push(usage);
         }
         for (const rp of turn.responseParts) {
@@ -937,12 +1170,7 @@ function messageToRequestSource(message) {
     }
     return undefined;
 }
-function messageToRequestOrigin(
-    backendSession,
-    message,
-    participantId,
-    logicalSessionScheme = backendSession.scheme
-) {
+function messageToRequestOrigin(backendSession, message, participantId, connectionAuthority) {
     const delegation = readAgentMessageDelegationMeta(message);
     if (!delegation) {
         return undefined;
@@ -951,15 +1179,13 @@ function messageToRequestOrigin(
         sourceSession: true
     })) {
         const sourceSession = ( URI.parse(delegation.sourceSession));
-        const logicalSourceSession = sourceSession.scheme === backendSession.scheme ? sourceSession.with({
-            scheme: logicalSessionScheme
-        }) : sourceSession;
         return {
             kind: ChatRequestOriginKind.Delegation,
             sourceSessionResource: ( URI.parse(buildOpenSessionLinkUri(
-                logicalSourceSession,
-                delegation.sourceChat ? parseChatUri(delegation.sourceChat)?.chatId : undefined,
-                delegation.sourceTurnId
+                sourceSession,
+                delegation.sourceChat ? getAgentHostChatId(delegation.sourceChat) : undefined,
+                delegation.sourceTurnId,
+                connectionAuthority
             ))),
             delegationScope: isEqual(sourceSession, backendSession) ? "chat" : "session"
         };
@@ -1063,7 +1289,7 @@ function aggregateAgentFeedbackAttachments(attachments, connectionAuthority) {
     return {
         kind: "agentFeedback",
         id: generateUuid(),
-        name: feedbackItems.size === 1 ? ( localize(8241, "1 comment")) : ( localize(8242, "{0} comments", feedbackItems.size)),
+        name: feedbackItems.size === 1 ? ( localize(9871, "1 comment")) : ( localize(9872, "{0} comments", feedbackItems.size)),
         value: firstAttachment.type === MessageAttachmentKind.Simple ? firstAttachment.modelRepresentation || firstAttachment.label : firstAttachment.label,
         sessionResource: ( URI.parse(sessionResource)),
         annotationsResource: annotationsResource ? ( URI.parse(annotationsResource)) : undefined,
@@ -1123,6 +1349,7 @@ function messageAttachmentToVariableEntry(attachment, connectionAuthority, messa
             };
         }
         if (attachment.selection) {
+            const detail = readAttachmentDetail(attachment);
             return {
                 kind: "file",
                 id,
@@ -1131,7 +1358,10 @@ function messageAttachmentToVariableEntry(attachment, connectionAuthority, messa
                     uri,
                     range: textRangeToIRange(attachment.selection.range)
                 },
-                _meta
+                _meta,
+                ...(detail?.text !== undefined ? {
+                    modelDescription: detail.text
+                } : {})
             };
         }
         return {
@@ -1213,12 +1443,17 @@ function messageAttachmentToVariableEntry(attachment, connectionAuthority, messa
     if (pasteEntry) {
         return pasteEntry;
     }
+    const detail = readAttachmentDetail(attachment);
+    const reference = detail?.url && URL.canParse(detail.url) && ["http:", "https:"].includes(( new URL(detail.url)).protocol) ? ( URI.parse(detail.url)) : undefined;
     return {
         kind: "generic",
         id: generateUuid(),
         name: attachment.label,
-        value: modelRepresentation || attachment.label,
-        _meta: attachment._meta
+        value: reference ?? (modelRepresentation || attachment.label),
+        _meta: attachment._meta,
+        ...(detail?.text !== undefined ? {
+            modelDescription: detail.text
+        } : {})
     };
 }
 function restoreElementVariableEntry(attachment, modelRepresentation) {
@@ -1361,7 +1596,14 @@ function getTerminalOutput(tc) {
     const terminalContent = getTerminalContent(tc.content);
     const terminalResult = getTerminalCommandResult(tc);
     const fallbackText = tc.content?.find(isToolResultTextContent)?.text;
-    let text = terminalResult?.truncated === true && fallbackText !== undefined ? stripLegacyTerminalExitMarkers(fallbackText) : terminalResult?.preview;
+    const retainedOutputCandidate = tc.status === ToolCallStatus.Completed && terminalContent?.isPty === false && terminalResult?.truncated === true;
+    const completionText = fallbackText === undefined ? undefined : stripLegacyTerminalExitMarkers(fallbackText);
+    let text = terminalResult?.preview;
+    if (retainedOutputCandidate) {
+        text = completionText ?? terminalResult.preview ?? "";
+    } else if (terminalResult?.truncated === true && fallbackText !== undefined) {
+        text = stripLegacyTerminalExitMarkers(fallbackText);
+    }
     const hasRetainedNonPtySnapshot = terminalContent?.isPty === false && text !== undefined;
     if (text === undefined && terminalContent?.isPty !== false) {
         text = fallbackText === undefined ? undefined : stripLegacyTerminalExitMarkers(fallbackText);
@@ -1373,9 +1615,45 @@ function getTerminalOutput(tc) {
         text: text.replace(/\r?\n/g, "\r\n"),
         ...(terminalResult?.truncated !== undefined ? {
             truncated: terminalResult.truncated
+        } : {}),
+        ...(retainedOutputCandidate && terminalResult.preview !== undefined ? {
+            fullOutputPreview: terminalResult.preview.replace(/\r?\n/g, "\r\n")
         } : {})
     };
 }
+function terminalOutputsEqual(a, b) {
+    return a?.text === b?.text && a?.truncated === b?.truncated && a?.fullOutputPreview === b?.fullOutputPreview;
+}
+function appendToolOutput(invocation, call, chunk) {
+    const terminal = invocation.toolSpecificData?.kind === "terminal" ? invocation.toolSpecificData : undefined;
+    if (chunk.isPty || terminal) {
+        invocation.toolSpecificData = {
+            ...terminal,
+            kind: "terminal",
+            commandLine: terminal?.commandLine ?? {
+                original: ""
+            },
+            language: terminal?.language ?? "shellscript",
+            editable: false,
+            isPty: terminal?.isPty ?? false,
+            terminalCommandOutput: {
+                text: (terminal?.terminalCommandOutput?.text ?? "") + chunk.output
+            }
+        };
+    } else {
+        const details = invocation.toolSpecificData?.kind === "simpleToolInvocation" ? invocation.toolSpecificData : undefined;
+        const input = invocation.toolSpecificData?.kind === "input" ? invocation.toolSpecificData : undefined;
+        if (invocation.toolSpecificData && !details && (!input || input.mcpAppData)) {
+            return;
+        }
+        invocation.toolSpecificData = {
+            kind: "simpleToolInvocation",
+            input: details?.input ?? (call.status === ToolCallStatus.Streaming ? "" : getInlineToolInput(call.toolInput) ?? ""),
+            output: (details?.output ?? "") + chunk.output
+        };
+    }
+    invocation.notifyToolSpecificDataChanged();
+}
 function stripLegacyTerminalExitMarkers(text) {
     return text.replace(/<shellId:[^>\r\n]*completed with exit code -?\d+>\s*$/i, "");
 }
@@ -1450,9 +1728,7 @@ function buildTerminalToolSpecificData(tc, sessionResource, existing) {
 }
 function getToolInputOutputDetails(tc, isError, errorString, includeMcpOutput, connectionAuthority) {
     const toolInput = tc.status === ToolCallStatus.Streaming ? undefined : getInlineToolInput(tc.toolInput);
-    if (!toolInput) {
-        return undefined;
-    }
+    const isImageGeneration = isImageGenerationTool(tc);
     const output = [];
     if (tc.status === ToolCallStatus.Completed || tc.status === ToolCallStatus.Running) {
         for (const block of tc.content ?? []) {
@@ -1482,7 +1758,7 @@ function getToolInputOutputDetails(tc, isError, errorString, includeMcpOutput, c
             }
         }
     }
-    if (output.length === 0 && errorString) {
+    if (output.length === 0 && errorString && (toolInput || isImageGeneration)) {
         output.push({
             type: "embed",
             value: errorString,
@@ -1490,8 +1766,11 @@ function getToolInputOutputDetails(tc, isError, errorString, includeMcpOutput, c
             mimeType: "text/plain"
         });
     }
+    if (!toolInput && !includeMcpOutput && (!isImageGeneration || output.length === 0)) {
+        return undefined;
+    }
     return {
-        input: toolInput,
+        input: toolInput ?? "",
         inputLanguage: "json",
         output,
         isError,
@@ -1509,11 +1788,15 @@ function toMcpCallToolResult(tc, isError, connectionAuthority) {
             content.push(mcpBlock);
         }
     }
-    if (content.length === 0 && !isError) {
+    const structuredContent = tc.status === ToolCallStatus.Completed ? tc.structuredContent : undefined;
+    if (content.length === 0 && structuredContent === undefined && !isError) {
         return undefined;
     }
     return {
         content,
+        ...(structuredContent !== undefined ? {
+            structuredContent
+        } : {}),
         isError: isError || undefined
     };
 }
@@ -1564,7 +1847,7 @@ function toMcpContentBlock(block, connectionAuthority) {
     }
 }
 function wrapResourceUri(uri, connectionAuthority) {
-    return toAgentHostUri(( URI.parse(uri)), connectionAuthority);
+    return toAgentHostContentUri(( URI.parse(uri)), connectionAuthority);
 }
 function getToolErrorString(tc) {
     if (tc.status === ToolCallStatus.Completed) {
@@ -1603,17 +1886,36 @@ function buildSessionCreatedToolData(tc) {
         } : {})
     };
 }
+function isImageGenerationTool(tc) {
+    return ( imageGenerationToolNames.has(tc.toolName)) || readImageGenerationToolMetadata(tc) !== undefined;
+}
 function buildGeneratedImageToolData(tc) {
-    if (tc.status !== ToolCallStatus.Completed || !tc.success || tc.toolName !== imageGenerationToolName) {
+    if (tc.status !== ToolCallStatus.Completed || !tc.success || !isImageGenerationTool(tc)) {
         return undefined;
     }
     const hasImage = tc.content?.some(
-        block => block.type === ToolResultContentType.EmbeddedResource && block.contentType.startsWith("image/") && block.data.length > 0
+        block => block.type === ToolResultContentType.EmbeddedResource ? block.contentType.startsWith("image/") && block.data.length > 0 : block.type === ToolResultContentType.Resource && block.contentType?.startsWith("image/") && block.uri.length > 0
     );
+    const durationMs = readToolCallMeta(tc)["vscode.toolCallDurationMs"];
     return hasImage ? {
-        kind: "generatedImage"
+        kind: "generatedImage",
+        ...(durationMs !== undefined ? {
+            durationMs
+        } : {})
     } : undefined;
 }
+function buildImageGenerationInputData(tc) {
+    const imageGeneration = readImageGenerationToolMetadata(tc);
+    if (!isImageGenerationTool(tc)) {
+        return undefined;
+    }
+    return {
+        kind: "input",
+        rawInput: tc.status === ToolCallStatus.Streaming ? tc.partialInput : getInlineToolInput(tc.toolInput),
+        editable: false,
+        imageGeneration: imageGeneration ?? {}
+    };
+}
 function buildAutomationConfiguredToolData(tc) {
     if (tc.status !== ToolCallStatus.Completed || !tc.success || tc.toolName !== ConfigureAutomationToolReferenceName) {
         return undefined;
@@ -1657,6 +1959,10 @@ function createSessionTitleFromArgs(toolInput) {
         return undefined;
     }
 }
+function toolCallOriginMessage(tc) {
+    const serverName = readToolCallMeta(tc).mcpServerName?.trim();
+    return serverName ? ( localize(9873, "{0} (MCP Server)", serverName)) : undefined;
+}
 function completedToolCallConfirmedReason(tc) {
     if (tc.status === ToolCallStatus.Completed) {
         return {
@@ -1667,6 +1973,22 @@ function completedToolCallConfirmedReason(tc) {
         type: tc.reason === ToolCallCancellationReason.Skipped ? ToolConfirmKind.Skipped : ToolConfirmKind.Denied
     };
 }
+function getImageGenerationTerminalMessage(tc) {
+    const imageModel = readImageGenerationToolMetadata(tc)?.requestedModel;
+    if (!isImageGenerationTool(tc)) {
+        return undefined;
+    }
+    if (tc.status === ToolCallStatus.Cancelled) {
+        return localize(9874, "Image generation cancelled");
+    }
+    if (tc.status === ToolCallStatus.Completed && !tc.success) {
+        return localize(9875, "Generated image failed");
+    }
+    if (tc.status === ToolCallStatus.Completed && imageModel) {
+        return localize(9876, "Generated image with {0}", imageModel.name ?? imageModel.id);
+    }
+    return undefined;
+}
 function completedToolCallToSerialized(
     tc,
     subAgentInvocationId,
@@ -1676,25 +1998,29 @@ function completedToolCallToSerialized(
 ) {
     const isTerminal = isTerminalToolCall(tc);
     const isSuccess = tc.status === ToolCallStatus.Completed && tc.success;
-    let invocationMsg = stringOrMarkdownToString(tc.invocationMessage, connectionAuthority) ?? tc.displayName;
+    const imageTerminalMessage = getImageGenerationTerminalMessage(tc);
+    const presentation = readToolCallPresentation(tc);
+    let invocationMsg = imageTerminalMessage ?? stringOrMarkdownToString(presentation.invocationMessage, connectionAuthority) ?? tc.displayName;
     const subagentContent = tc.status === ToolCallStatus.Completed ? getToolSubagentContent(tc) : undefined;
-    const isSubagent = subagentContent || isSubagentTool(tc);
-    if (isSubagent && tc.status === ToolCallStatus.Completed) {
-        const resultText = getToolOutputText(tc);
-        const pastTenseMsg = isSuccess ? stringOrMarkdownToString(tc.pastTenseMessage, connectionAuthority) ?? invocationMsg : invocationMsg;
+    const fusionPhaseData = getToolKind(tc) === "fusionPhase" ? getSubagentToolSpecificData(tc, sessionResource) : undefined;
+    const isSubagent = subagentContent || isSubagentTool(tc) || fusionPhaseData;
+    if (isSubagent && (tc.status === ToolCallStatus.Completed || fusionPhaseData)) {
+        const resultText = tc.status === ToolCallStatus.Completed ? getToolOutputText(tc) : undefined;
+        const pastTenseMsg = isSuccess ? stringOrMarkdownToString(presentation.pastTenseMessage, connectionAuthority) ?? invocationMsg : invocationMsg;
         return {
             kind: "toolInvocationSerialized",
             toolCallId: tc.toolCallId,
             toolId: tc.toolName,
             source: ToolDataSource.Internal,
             invocationMessage: invocationMsg,
-            originMessage: undefined,
+            originMessage: toolCallOriginMessage(tc),
             pastTenseMessage: pastTenseMsg,
+            resultError: tc.status === ToolCallStatus.Completed && !tc.success ? getToolErrorString(tc) || true : undefined,
             isConfirmed: completedToolCallConfirmedReason(tc),
             isComplete: true,
             presentation: undefined,
             subAgentInvocationId: subAgentInvocationId,
-            toolSpecificData: {
+            toolSpecificData: fusionPhaseData ?? {
                 kind: "subagent",
                 hasStarted: false,
                 description: getSubagentTaskDescription(tc) ?? tc.displayName,
@@ -1719,12 +2045,12 @@ function completedToolCallToSerialized(
             kind: "search"
         };
     } else {
-        toolSpecificData = buildSessionCreatedToolData(tc) ?? buildGeneratedImageToolData(tc) ?? buildAutomationConfiguredToolData(tc);
+        toolSpecificData = buildSessionCreatedToolData(tc) ?? buildGeneratedImageToolData(tc) ?? buildAutomationConfiguredToolData(tc) ?? buildImageGenerationInputData(tc);
         if (!toolSpecificData) {
             toolSpecificData = buildMcpAppToolInputData(tc, connectionAuthority);
         }
     }
-    let pastTenseMsg = isSuccess ? stringOrMarkdownToString(tc.pastTenseMessage, connectionAuthority) ?? invocationMsg : invocationMsg;
+    let pastTenseMsg = imageTerminalMessage ?? (isSuccess ? stringOrMarkdownToString(presentation.pastTenseMessage, connectionAuthority) ?? invocationMsg : invocationMsg);
     if (isAddCommentTool(tc.toolName)) {
         const ref = addCommentReference(tc, resourceUris);
         if (ref) {
@@ -1732,30 +2058,33 @@ function completedToolCallToSerialized(
             pastTenseMsg = ref;
         }
     }
-    const resultDetails = (!toolSpecificData || toolSpecificData.kind === "generatedImage" || toolSpecificData.kind === "input" && toolSpecificData.mcpAppData) && (tc.status !== ToolCallStatus.Completed || getToolFileEdits(tc).length === 0) ? getToolInputOutputDetails(
+    const resultDetails = (!toolSpecificData || toolSpecificData.kind === "generatedImage" || toolSpecificData.kind === "input" && (toolSpecificData.mcpAppData || toolSpecificData.imageGeneration)) && (tc.status !== ToolCallStatus.Completed || getToolFileEdits(tc).length === 0) ? getToolInputOutputDetails(
         tc,
         !isSuccess,
         getToolErrorString(tc),
         !!(toolSpecificData?.kind === "input" && toolSpecificData.mcpAppData),
         connectionAuthority
     ) : undefined;
+    const summary = getToolSummary(tc, resourceUris);
     return {
         kind: "toolInvocationSerialized",
         toolCallId: tc.toolCallId,
         toolId: tc.toolName,
         source: ToolDataSource.Internal,
         invocationMessage: invocationMsg,
-        originMessage: undefined,
+        originMessage: toolCallOriginMessage(tc),
         pastTenseMessage: isTerminal ? undefined : pastTenseMsg,
         isConfirmed: completedToolCallConfirmedReason(tc),
         isComplete: true,
         presentation: shouldHideAutomaticTitleRename(tc) ? ToolInvocationPresentation.Hidden : shouldHideCompletedAgentHostAskUserTool(tc) ? ToolInvocationPresentation.HiddenAfterComplete : undefined,
         subAgentInvocationId: subAgentInvocationId,
+        summary,
         toolSpecificData,
-        resultDetails
+        resultDetails,
+        resultError: tc.status === ToolCallStatus.Completed && !tc.success ? getToolErrorString(tc) || true : undefined
     };
 }
-function completedToolCallToEditParts(tc, connectionAuthority) {
+function completedToolCallToEditParts(tc, connectionAuthority, subAgentInvocationId) {
     if (tc.status !== ToolCallStatus.Completed) {
         return [];
     }
@@ -1767,6 +2096,9 @@ function completedToolCallToEditParts(tc, connectionAuthority) {
     for (const edit of fileEdits) {
         const part = fileEditToExternalEdit(edit, tc.toolCallId, connectionAuthority);
         if (part) {
+            if (subAgentInvocationId !== undefined) {
+                part.subAgentInvocationId = subAgentInvocationId;
+            }
             parts.push(part);
         }
     }
@@ -1786,8 +2118,8 @@ function fileEditToExternalEdit(edit, undoStopId, connectionAuthority) {
         uri: toAgentHostUri(normalized.resource, connectionAuthority),
         editKind: normalized.kind,
         originalUri: normalized.kind === FileEditKind.Rename && normalized.beforeUri ? toAgentHostUri(normalized.beforeUri, connectionAuthority) : undefined,
-        beforeContentUri: normalized.beforeContentUri ? toAgentHostContentUri(normalized.beforeContentUri, connectionAuthority) : undefined,
-        afterContentUri: normalized.afterContentUri ? toAgentHostContentUri(normalized.afterContentUri, connectionAuthority) : undefined,
+        beforeContentUri: normalized.beforeContentUri ? toAgentHostContentUri(normalized.beforeContentUri, connectionAuthority, normalized.beforeUri) : undefined,
+        afterContentUri: normalized.afterContentUri ? toAgentHostContentUri(normalized.afterContentUri, connectionAuthority, normalized.afterUri) : undefined,
         diff,
         undoStopId
     };
@@ -1939,6 +2271,14 @@ function rewriteAgentHostLinkTarget(
             return href;
         }
     }
+    const linkParams = ( new URLSearchParams(parsed.query));
+    const linkType = linkParams.get("vscodeLinkType");
+    if (linkType) {
+        linkParams.delete("vscodeLinkType");
+        parsed = parsed.with({
+            query: ( linkParams.toString())
+        });
+    }
     let agentHostUri;
     try {
         agentHostUri = resourceUris.fromAgentHost(parsed);
@@ -1948,7 +2288,13 @@ function rewriteAgentHostLinkTarget(
     } catch {
         return href;
     }
-    if (isSkillFileUri(parsed) && !agentHostUri.query.includes("vscodeLinkType=")) {
+    if (linkType) {
+        const params = ( new URLSearchParams(agentHostUri.query));
+        params.set("vscodeLinkType", linkType);
+        agentHostUri = agentHostUri.with({
+            query: ( params.toString())
+        });
+    } else if (isSkillFileUri(parsed) && !agentHostUri.query.includes("vscodeLinkType=")) {
         const existing = agentHostUri.query;
         agentHostUri = agentHostUri.with({
             query: existing ? `${existing}&vscodeLinkType=skill` : "vscodeLinkType=skill"
@@ -2012,7 +2358,8 @@ function toolCallStateToInvocation(
     connectionAuthority,
     mcpServerAuthority = sessionResource.authority,
     options,
-    resourceUris = createAgentHostResourceUriMapper(connectionAuthority)
+    resourceUris = createAgentHostResourceUriMapper(connectionAuthority),
+    mcpServerName
 ) {
     const toolData = {
         id: tc.toolName,
@@ -2023,7 +2370,7 @@ function toolCallStateToInvocation(
     const subagentData = getSubagentToolSpecificData(tc, sessionResource);
     if (tc.contributor?.kind === ToolCallContributorKind.Client && options && tc.contributor.clientId !== options.currentClientId) {
         const invocation = ( new ChatToolInvocation(undefined, toolData, tc.toolCallId, subAgentInvocationId, undefined));
-        invocation.invocationMessage = ( localize(8243, "Running {0} on another client...", tc.displayName));
+        invocation.invocationMessage = ( localize(9877, "Running {0} on another client...", tc.displayName));
         invocation.toolSpecificData = subagentData;
         invocation.otherClientToolCall = {
             cancel: () => options.cancelOtherClientToolCall(tc)
@@ -2037,11 +2384,11 @@ function toolCallStateToInvocation(
         if (isViewUnreviewedCommentsTool(tc.toolName)) {
             toolSpecificData = {
                 kind: "agentFeedbackReviewConfirmation",
-                options: [( localize(8244, "Reveal Selected"))]
+                options: [( localize(9878, "Reveal Selected"))]
             };
         } else if (pendingEdits?.length) {
             const wrap = uri => connectionAuthority ? toAgentHostUri(uri, connectionAuthority) : uri;
-            const wrapContent = uri => connectionAuthority ? toAgentHostContentUri(uri, connectionAuthority) : uri;
+            const wrapContent = (uri, fileUri) => connectionAuthority ? toAgentHostContentUri(uri, connectionAuthority, fileUri) : uri;
             const mapped = mapFileEdits(pendingEdits, tc.toolCallId);
             toolSpecificData = {
                 kind: "modifiedFilesConfirmation",
@@ -2049,8 +2396,8 @@ function toolCallStateToInvocation(
                 modifiedFiles: mapped.map(edit => {
                     const resource = wrap(edit.resource);
                     const originalResource = edit.originalResource ? wrap(edit.originalResource) : undefined;
-                    const modifiedContent = edit.afterContentUri ? wrapContent(edit.afterContentUri) : undefined;
-                    const originalContent = edit.beforeContentUri ? wrapContent(edit.beforeContentUri) : undefined;
+                    const modifiedContent = edit.afterContentUri ? wrapContent(edit.afterContentUri, edit.resource) : undefined;
+                    const originalContent = edit.beforeContentUri ? wrapContent(edit.beforeContentUri, edit.originalResource ?? edit.resource) : undefined;
                     return {
                         uri: resource,
                         editKind: edit.kind,
@@ -2085,22 +2432,26 @@ function toolCallStateToInvocation(
             }
         }
         return ( new ChatToolInvocation({
-            invocationMessage: stringOrMarkdownToString(tc.invocationMessage, connectionAuthority),
+            invocationMessage: stringOrMarkdownToString(readToolCallPresentation(tc).invocationMessage, connectionAuthority),
+            originMessage: toolCallOriginMessage(tc),
             confirmationMessages,
             presentation: ToolInvocationPresentation.HiddenAfterComplete,
             toolSpecificData
         }, toolData, tc.toolCallId, subAgentInvocationId, undefined));
     }
-    const invocation = ( new ChatToolInvocation(undefined, toolData, tc.toolCallId, subAgentInvocationId, undefined));
-    invocation.invocationMessage = stringOrMarkdownToString(tc.invocationMessage, connectionAuthority) ?? tc.displayName;
+    const invocation = ( new ChatToolInvocation({
+        originMessage: toolCallOriginMessage(tc)
+    }, toolData, tc.toolCallId, subAgentInvocationId, undefined));
+    invocation.summary = getToolSummary(tc, resourceUris);
+    invocation.invocationMessage = stringOrMarkdownToString(readToolCallPresentation(tc).invocationMessage, connectionAuthority) ?? tc.displayName;
     if (isAgentHostAskUserTool(tc.toolName)) {
-        invocation.invocationMessage = ( localize(8245, "Waiting for answer..."));
+        invocation.invocationMessage = ( localize(9879, "Waiting for answer..."));
         invocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
     } else if (shouldHideAutomaticTitleRename(tc)) {
         invocation.presentation = ToolInvocationPresentation.Hidden;
     }
     if (tc.status === ToolCallStatus.AuthRequired) {
-        invocation.setAuthenticationRequired(toolCallAuthenticationServer(tc, mcpServerAuthority));
+        invocation.setAuthenticationRequired(toolCallAuthenticationServer(tc, mcpServerAuthority, mcpServerName));
     }
     applyToolCallProgress(invocation, tc);
     if (isAddCommentTool(tc.toolName)) {
@@ -2115,11 +2466,12 @@ function toolCallStateToInvocation(
             kind: "search"
         };
     } else if (tc.status !== ToolCallStatus.Streaming) {
-        invocation.toolSpecificData = buildMcpAppToolInputData(tc, connectionAuthority);
+        invocation.toolSpecificData = buildImageGenerationInputData(tc) ?? buildMcpAppToolInputData(tc, connectionAuthority);
     }
     return invocation;
 }
 function toolCallConfirmationMessages(tc, connectionAuthority) {
+    const presentation = readToolCallPresentation(tc);
     const riskAssessment = tc.riskAssessment;
     let approvalReason;
     if (riskAssessment?.status === ToolCallRiskAssessmentStatus.Loading) {
@@ -2134,22 +2486,25 @@ function toolCallConfirmationMessages(tc, connectionAuthority) {
         };
     }
     return {
-        title: isViewUnreviewedCommentsTool(tc.toolName) ? ( localize(8246, "Reveal unreviewed comments?")) : stringOrMarkdownToString(tc.confirmationTitle, connectionAuthority) ?? tc.displayName,
+        title: isViewUnreviewedCommentsTool(tc.toolName) ? ( localize(9880, "Reveal unreviewed comments?")) : stringOrMarkdownToString(
+            presentation.confirmationTitle ?? tc.confirmationTitle,
+            connectionAuthority
+        ) ?? tc.displayName,
         message: isViewUnreviewedCommentsTool(tc.toolName) ? ( localize(
-            8247,
+            9881,
             "Choose which comments to reveal to the agent. Unchecked comments stay hidden."
-        )) : stringOrMarkdownToString(tc.invocationMessage, connectionAuthority),
+        )) : stringOrMarkdownToString(presentation.invocationMessage, connectionAuthority),
         approvalReason,
         ...(tc.options ? {
             customOptions: tc.options
         } : {})
     };
 }
-function toolCallAuthenticationServer(tc, sessionAuthority) {
+function toolCallAuthenticationServer(tc, sessionAuthority, name) {
     const metadata = readToolCallMeta(tc);
     return {
         id: `${sessionAuthority}/${tc.contributor.customizationId}`,
-        name: tc.auth.resource.resource_name ?? metadata.mcpServerName ?? tc.displayName,
+        name: name ?? tc.auth.resource.resource_name ?? metadata.mcpServerName ?? tc.displayName,
         resource: tc.auth.resource.resource,
         oauthClient: tc.auth.oauthClient,
         authorizationServers: tc.auth.resource.authorization_servers,
@@ -2178,7 +2533,7 @@ function toolCallStateToStreamingInvocation(
     });
     updateStreamingToolInvocation(invocation, tc, connectionAuthority ?? "");
     if (isAgentHostAskUserTool(tc.toolName)) {
-        invocation.invocationMessage = ( localize(8248, "Asking a question..."));
+        invocation.invocationMessage = ( localize(9882, "Asking a question..."));
         invocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
     } else if (isRenameChatTool(tc)) {
         invocation.presentation = ToolInvocationPresentation.Hidden;
@@ -2208,16 +2563,17 @@ function updateStreamingToolInvocation(existing, tc, connectionAuthority) {
     if (tc.status !== ToolCallStatus.Streaming) {
         return undefined;
     }
+    existing.originMessage = toolCallOriginMessage(tc) ?? existing.originMessage;
     if (getToolKind(tc) === "read") {
         existing.updatePartialInput(undefined);
-        existing.updateStreamingMessage(( localize(8249, "Reading file")));
+        existing.updateStreamingMessage(( localize(9883, "Reading file")));
         return undefined;
     }
     const partialInput = getStreamingToolInputForDisplay(tc);
     if (partialInput !== undefined) {
         existing.updatePartialInput(partialInput);
     }
-    const invocationMessage = stringOrMarkdownToString(tc.invocationMessage, connectionAuthority);
+    const invocationMessage = stringOrMarkdownToString(readToolCallPresentation(tc).invocationMessage, connectionAuthority);
     if (invocationMessage) {
         existing.updateStreamingMessage(invocationMessage);
     }
@@ -2242,6 +2598,7 @@ function toolCallStateToPreparedInvocation(
     );
     return {
         invocationMessage: built.invocationMessage,
+        originMessage: built.originMessage,
         pastTenseMessage: built.pastTenseMessage,
         confirmationMessages: built.confirmationMessages,
         presentation: built.presentation,
@@ -2258,15 +2615,29 @@ function updateRunningToolSpecificData(
     if (tc.status !== ToolCallStatus.Running) {
         return;
     }
-    existing.invocationMessage = stringOrMarkdownToString(tc.invocationMessage, connectionAuthority) ?? existing.invocationMessage;
+    existing.invocationMessage = stringOrMarkdownToString(readToolCallPresentation(tc).invocationMessage, connectionAuthority) ?? existing.invocationMessage;
+    existing.originMessage = toolCallOriginMessage(tc) ?? existing.originMessage;
     if (isAgentHostAskUserTool(tc.toolName)) {
-        existing.invocationMessage = ( localize(8245, "Waiting for answer..."));
+        existing.invocationMessage = ( localize(9879, "Waiting for answer..."));
         existing.presentation = ToolInvocationPresentation.HiddenAfterComplete;
     }
     if (isAddCommentTool(tc.toolName)) {
         existing.invocationMessage = addCommentReference(tc, resourceUris) ?? existing.invocationMessage;
     }
     applyToolCallProgress(existing, tc);
+    const imageInput = buildImageGenerationInputData(tc);
+    if (imageInput) {
+        const previous = existing.toolSpecificData?.kind === "input" ? existing.toolSpecificData : undefined;
+        if (previous?.rawInput !== imageInput.rawInput || previous?.imageGeneration?.requestedModel?.id !== imageInput.imageGeneration?.requestedModel?.id || previous?.imageGeneration?.requestedModel?.name !== imageInput.imageGeneration?.requestedModel?.name || !previous?.imageGeneration) {
+            existing.toolSpecificData = imageInput;
+            existing.notifyToolSpecificDataChanged();
+        }
+        return;
+    }
+    if (getToolKind(tc) === "fusionPhase") {
+        updateFusionPhaseToolSpecificData(existing, tc, sessionResource);
+        return;
+    }
     const subagentContent = getToolSubagentContent(tc);
     if (subagentContent) {
         existing.toolSpecificData = {
@@ -2278,7 +2649,16 @@ function updateRunningToolSpecificData(
             agentDisplayName: subagentContent.title,
             agentName: subagentContent.agentName,
             credits: existing.toolSpecificData?.kind === "subagent" ? existing.toolSpecificData.credits : undefined,
+            ...(existing.toolSpecificData?.kind === "subagent" && existing.toolSpecificData.modelId ? {
+                modelId: existing.toolSpecificData.modelId
+            } : {}),
             modelName: existing.toolSpecificData?.kind === "subagent" ? existing.toolSpecificData.modelName : undefined,
+            ...(existing.toolSpecificData?.kind === "subagent" && existing.toolSpecificData.modelConfiguration ? {
+                modelConfiguration: existing.toolSpecificData.modelConfiguration
+            } : {}),
+            ...(existing.toolSpecificData?.kind === "subagent" && existing.toolSpecificData.runtimeModelConfiguration ? {
+                runtimeModelConfiguration: existing.toolSpecificData.runtimeModelConfiguration
+            } : {}),
             startedAt: existing.toolSpecificData?.kind === "subagent" ? existing.toolSpecificData.startedAt : undefined,
             duration: existing.toolSpecificData?.kind === "subagent" ? existing.toolSpecificData.duration : undefined,
             chatResource: subagentContent.resource
@@ -2311,12 +2691,20 @@ function updateRunningToolSpecificData(
     const existingTerminal = existing.toolSpecificData?.kind === "terminal" ? existing.toolSpecificData : undefined;
     if (isTerminalToolCall(tc, existing.toolSpecificData?.kind)) {
         const next = buildTerminalToolSpecificData(tc, sessionResource, existingTerminal);
-        const outputChanged = next.terminalCommandOutput?.text !== existingTerminal?.terminalCommandOutput?.text;
+        const outputChanged = !terminalOutputsEqual(next.terminalCommandOutput, existingTerminal?.terminalCommandOutput);
         const commandChanged = next.commandLine.original !== existingTerminal?.commandLine.original;
         if (!existingTerminal || outputChanged || commandChanged) {
             existing.toolSpecificData = next;
             existing.notifyToolSpecificDataChanged();
         }
+    } else if (getToolKind(tc) === "search" && existing.toolSpecificData?.kind !== "search") {
+        existing.toolSpecificData = {
+            kind: "search"
+        };
+        existing.notifyToolSpecificDataChanged();
+    } else if (getToolKind(tc) !== "search" && existing.toolSpecificData?.kind === "search") {
+        existing.toolSpecificData = undefined;
+        existing.notifyToolSpecificDataChanged();
     }
 }
 function finalizeToolInvocation(
@@ -2329,10 +2717,15 @@ function finalizeToolInvocation(
     const isCompleted = tc.status === ToolCallStatus.Completed;
     const isCancelled = tc.status === ToolCallStatus.Cancelled;
     const isTerminal = isTerminalToolCall(tc, invocation.toolSpecificData?.kind);
+    invocation.summary = getToolSummary(tc, resourceUris);
+    if (!isTerminal && invocation.toolSpecificData?.kind === "search" && getToolKind(tc) !== "search") {
+        invocation.toolSpecificData = buildMcpAppToolInputData(tc, connectionAuthority);
+    }
     if ((isCompleted || isCancelled) && hasKey(tc, {
         invocationMessage: true
     })) {
-        invocation.invocationMessage = stringOrMarkdownToString(tc.invocationMessage, connectionAuthority) ?? invocation.invocationMessage;
+        invocation.invocationMessage = stringOrMarkdownToString(readToolCallPresentation(tc).invocationMessage, connectionAuthority) ?? invocation.invocationMessage;
+        invocation.originMessage = toolCallOriginMessage(tc) ?? invocation.originMessage;
     }
     if (isAddCommentTool(tc.toolName)) {
         invocation.invocationMessage = addCommentReference(tc, resourceUris) ?? invocation.invocationMessage;
@@ -2340,7 +2733,9 @@ function finalizeToolInvocation(
     if (isAgentHostAskUserTool(tc.toolName)) {
         invocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
     }
-    if (isCompleted) {
+    if (getToolKind(tc) === "fusionPhase") {
+        updateFusionPhaseToolSpecificData(invocation, tc, backendSession);
+    } else if (isCompleted) {
         const subagentContent = getToolSubagentContent(tc);
         if (subagentContent) {
             const resultText = getToolOutputText(tc);
@@ -2354,7 +2749,16 @@ function finalizeToolInvocation(
                 agentName: subagentContent.agentName,
                 result: resultText,
                 credits: invocation.toolSpecificData?.kind === "subagent" ? invocation.toolSpecificData.credits : undefined,
+                ...(invocation.toolSpecificData?.kind === "subagent" && invocation.toolSpecificData.modelId ? {
+                    modelId: invocation.toolSpecificData.modelId
+                } : {}),
                 modelName: invocation.toolSpecificData?.kind === "subagent" ? invocation.toolSpecificData.modelName : undefined,
+                ...(invocation.toolSpecificData?.kind === "subagent" && invocation.toolSpecificData.modelConfiguration ? {
+                    modelConfiguration: invocation.toolSpecificData.modelConfiguration
+                } : {}),
+                ...(invocation.toolSpecificData?.kind === "subagent" && invocation.toolSpecificData.runtimeModelConfiguration ? {
+                    runtimeModelConfiguration: invocation.toolSpecificData.runtimeModelConfiguration
+                } : {}),
                 startedAt: invocation.toolSpecificData?.kind === "subagent" ? invocation.toolSpecificData.startedAt : undefined,
                 duration: invocation.toolSpecificData?.kind === "subagent" ? invocation.toolSpecificData.duration : undefined,
                 chatResource: getSubagentChatResource(tc, subagentContent, backendSession)
@@ -2372,7 +2776,16 @@ function finalizeToolInvocation(
                 agentName: getSubagentAgentName(tc) ?? invocation.toolSpecificData.agentName,
                 result: getToolOutputText(tc),
                 credits: invocation.toolSpecificData.credits,
+                ...(invocation.toolSpecificData.modelId ? {
+                    modelId: invocation.toolSpecificData.modelId
+                } : {}),
                 modelName: invocation.toolSpecificData.modelName,
+                ...(invocation.toolSpecificData.modelConfiguration ? {
+                    modelConfiguration: invocation.toolSpecificData.modelConfiguration
+                } : {}),
+                ...(invocation.toolSpecificData.runtimeModelConfiguration ? {
+                    runtimeModelConfiguration: invocation.toolSpecificData.runtimeModelConfiguration
+                } : {}),
                 startedAt: invocation.toolSpecificData.startedAt,
                 duration: invocation.toolSpecificData.duration,
                 chatResource: invocation.toolSpecificData.chatResource ?? getSubagentChatResource(tc, undefined, backendSession)
@@ -2386,14 +2799,20 @@ function finalizeToolInvocation(
             ...buildTerminalToolSpecificData(tc, backendSession, existing),
             terminalCommandState: getTerminalCommandState(tc, isCompleted && tc.success)
         };
-    } else if (isCompleted && tc.pastTenseMessage) {
-        invocation.pastTenseMessage = stringOrMarkdownToString(tc.pastTenseMessage, connectionAuthority);
+    }
+    if (isCompleted && !isTerminal) {
+        invocation.pastTenseMessage = stringOrMarkdownToString(readToolCallPresentation(tc).pastTenseMessage, connectionAuthority);
+    }
+    const imageTerminalMessage = getImageGenerationTerminalMessage(tc);
+    if (imageTerminalMessage) {
+        invocation.invocationMessage = imageTerminalMessage;
+        invocation.pastTenseMessage = imageTerminalMessage;
     }
     if (isCompleted && isAddCommentTool(tc.toolName)) {
         invocation.pastTenseMessage = addCommentReference(tc, resourceUris) ?? invocation.pastTenseMessage;
     }
-    if (isCompleted) {
-        const resultToolSpecificData = buildSessionCreatedToolData(tc) ?? buildGeneratedImageToolData(tc) ?? buildAutomationConfiguredToolData(tc);
+    if (isCompleted || isCancelled) {
+        const resultToolSpecificData = buildSessionCreatedToolData(tc) ?? buildGeneratedImageToolData(tc) ?? buildAutomationConfiguredToolData(tc) ?? buildImageGenerationInputData(tc);
         if (resultToolSpecificData) {
             invocation.presentation = undefined;
             invocation.toolSpecificData = resultToolSpecificData;
@@ -2430,18 +2849,23 @@ function finalizeToolInvocation(
     const resultDetails = !isTerminal && invocation.toolSpecificData?.kind !== "subagent" && invocation.toolSpecificData?.kind !== "sessionCreated" && getToolKind(tc) !== "search" && fileEdits.length === 0 ? getToolInputOutputDetails(tc, isFailure, errorString, hasMcpAppData, connectionAuthority) : undefined;
     const result = isFailure || resultDetails ? {
         content: [],
-        toolResultError: isFailure ? errorString : undefined,
+        toolResultError: isFailure ? errorString || (isCompleted ? true : undefined) : undefined,
         toolResultDetails: resultDetails
     } : undefined;
     invocation.acceptProgress({
         message: undefined
     });
-    const cancelledFromStreaming = isCancelled && invocation.cancelFromStreaming(
-        tc.reason === ToolCallCancellationReason.Skipped ? ToolConfirmKind.Skipped : ToolConfirmKind.Denied,
-        tc.reasonMessage ? stringOrMarkdownToString(tc.reasonMessage, connectionAuthority) : undefined
-    );
-    if (!cancelledFromStreaming) {
-        invocation.didExecuteTool(result);
+    if (isCancelled && isImageGenerationTool(tc)) {
+        invocation.didCancelTool({
+            type: tc.reason === ToolCallCancellationReason.Skipped ? ToolConfirmKind.Skipped : ToolConfirmKind.Denied
+        }, tc.reasonMessage ? stringOrMarkdownToString(tc.reasonMessage, connectionAuthority) : undefined, resultDetails);
+    } else {
+        const cancelledFromStreaming = isCancelled && invocation.cancelFromStreaming({
+            type: tc.reason === ToolCallCancellationReason.Skipped ? ToolConfirmKind.Skipped : ToolConfirmKind.Denied
+        }, tc.reasonMessage ? stringOrMarkdownToString(tc.reasonMessage, connectionAuthority) : undefined);
+        if (!cancelledFromStreaming) {
+            invocation.didExecuteTool(result);
+        }
     }
     return fileEdits;
 }
@@ -2475,4 +2899,4 @@ function mapFileEdits(items, undoStopId) {
     return result;
 }
 
-export { BOOLEAN_FALSE_OPTION_ID, BOOLEAN_TRUE_OPTION_ID, activeTurnToProgress, completedToolCallToEditParts, completedToolCallToSerialized, containsAutomaticReplyAnswer, convertProtocolAnswers, convertProtocolPlanReviewResult, createInputRequestCarousel, createInputRequestPlanReview, fileEditsToExternalEdits, finalizeToolInvocation, formatTurnResponseDetails, getTerminalContent, getUrlInputRequestPresentation, inputRequestResponsePartToProgress, isSubagentTool, isSubagentToolName, makeAhpTerminalToolSessionId, messageAttachmentsToVariableData, messageToRequestOrigin, messageToRequestSource, messageToVariableData, parseAhpTerminalToolSessionId, rawMarkdownToString, rewriteAgentHostLinkTarget, rewriteMarkdownLinks, shouldObserveSubagentChat, stringOrMarkdownToString, systemNotificationToChatPart, toolCallAuthenticationServer, toolCallConfirmationMessages, toolCallStateToInvocation, toolCallStateToPreparedInvocation, toolCallStateToStreamingInvocation, turnsToHistory, updateRunningToolSpecificData, updateStreamingToolInvocation, usageInfoToAutoModeResolution, usageInfoToChatUsage, usageInfoToQuotas };
+export { BOOLEAN_FALSE_OPTION_ID, BOOLEAN_TRUE_OPTION_ID, activeTurnToProgress, appendToolOutput, canOwnSubagentChat, completedToolCallToEditParts, completedToolCallToSerialized, containsAutomaticReplyAnswer, convertProtocolAnswers, convertProtocolPlanReviewResult, createInputRequestCarousel, createInputRequestPlanReview, fileEditsToExternalEdits, finalizeToolInvocation, formatTurnResponseDetails, getAgentHostActivityProgressId, getTerminalContent, getUrlInputRequestPresentation, inputRequestResponsePartToProgress, isSubagentTool, isSubagentToolName, makeAhpTerminalToolSessionId, messageAttachmentsToVariableData, messageToRequestOrigin, messageToRequestSource, messageToVariableData, parseAhpTerminalToolSessionId, rawMarkdownToString, rewriteAgentHostLinkTarget, rewriteMarkdownLinks, shouldObserveSubagentChat, stringOrMarkdownToString, systemNotificationToChatPart, toolCallAuthenticationServer, toolCallConfirmationMessages, toolCallStateToInvocation, toolCallStateToPreparedInvocation, toolCallStateToStreamingInvocation, turnToResponseDetails, turnsToHistory, updateRunningToolSpecificData, updateStreamingToolInvocation, usageInfoToAutoModeResolution, usageInfoToChatUsage, usageInfoToQuotas };