@agent-native/core 0.117.2 → 0.118.1

package/corpus/core/src/client/chat/message-components.tsx

@@ -64,6 +64,10 @@ import {
 import { ThumbsFeedback } from "../observability/ThumbsFeedback.js";
 import { McpConnectionSuggestion } from "../resources/McpConnectionSuggestion.js";
 import type { ContentPart } from "../sse-event-processor.js";
+import {
+  isCallAgentToolCallShadowed,
+  shadowedCallAgentToolCallIds,
+} from "../tool-display.js";
 import { cn } from "../utils.js";
 import {
   MarkdownText,
@@ -118,6 +122,9 @@ interface FormattedMessageTimestamp {
   full: string;
 }
 
+const messageFooterFadeClassName =
+  "opacity-0 transition-[color,opacity] duration-150 group-hover:opacity-100 group-focus-within:opacity-100";
+
 function coerceMessageDate(value: unknown): Date | null {
   if (value instanceof Date) {
     return Number.isNaN(value.getTime()) ? null : value;
@@ -789,7 +796,7 @@ export function UserMessage() {
           {timestamp && (
             <MessageTimestamp
               timestamp={timestamp}
-              className="opacity-0 transition-opacity duration-150 group-hover:opacity-100 group-focus-within:opacity-100"
+              className={messageFooterFadeClassName}
             />
           )}
         </div>
@@ -841,12 +848,33 @@ export function messageTextFromContent(content: unknown): string {
     .join("\n");
 }
 
-function latestUserMessageText(messages: readonly unknown[]): string {
+export function latestUserMessageText(messages: readonly unknown[]): string {
   for (let index = messages.length - 1; index >= 0; index -= 1) {
     const message = messages[index];
     if (!message || typeof message !== "object") continue;
     const record = message as { role?: unknown; content?: unknown };
-    if (record.role === "user") return messageTextFromContent(record.content);
+    if (record.role !== "user" || isHiddenUserMessage(message)) continue;
+    return displayableUserMessageText(messageTextFromContent(record.content));
+  }
+  return "";
+}
+
+export function userMessageTextBeforeAssistant(
+  messages: readonly unknown[],
+  assistantMessageId: string,
+): string {
+  const assistantIndex = messages.findIndex((message) => {
+    if (!message || typeof message !== "object") return false;
+    return (message as { id?: unknown }).id === assistantMessageId;
+  });
+  if (assistantIndex < 1) return "";
+
+  for (let index = assistantIndex - 1; index >= 0; index -= 1) {
+    const message = messages[index];
+    if (!message || typeof message !== "object") continue;
+    const record = message as { role?: unknown; content?: unknown };
+    if (record.role !== "user" || isHiddenUserMessage(message)) continue;
+    return displayableUserMessageText(messageTextFromContent(record.content));
   }
   return "";
 }
@@ -860,6 +888,65 @@ export function assistantMessageHasUnresolvedTool(content: unknown): boolean {
   });
 }
 
+export function assistantMessageHasCompletedCustomUi(
+  content: unknown,
+): boolean {
+  if (!Array.isArray(content)) return false;
+  let lastTextIndex = -1;
+  for (let index = 0; index < content.length; index++) {
+    const part = content[index];
+    if (
+      part &&
+      typeof part === "object" &&
+      (part as { type?: unknown }).type === "text"
+    ) {
+      lastTextIndex = index;
+    }
+  }
+  let hasCompletedTool = false;
+  let lastCompletedToolIsCustomUi = false;
+  for (let index = lastTextIndex + 1; index < content.length; index++) {
+    const part = content[index];
+    if (!part || typeof part !== "object") continue;
+    const record = part as {
+      type?: unknown;
+      result?: unknown;
+      isError?: unknown;
+      activity?: unknown;
+      chatUI?: unknown;
+      mcpApp?: unknown;
+    };
+    if (
+      record.type !== "tool-call" ||
+      record.activity === true ||
+      record.result === undefined ||
+      record.isError === true
+    ) {
+      continue;
+    }
+    hasCompletedTool = true;
+    lastCompletedToolIsCustomUi =
+      record.chatUI !== undefined || record.mcpApp !== undefined;
+  }
+  return hasCompletedTool && lastCompletedToolIsCustomUi;
+}
+
+export function assistantMessageHasCustomUi(content: unknown): boolean {
+  if (!Array.isArray(content)) return false;
+  return content.some((part) => {
+    if (!part || typeof part !== "object") return false;
+    const record = part as {
+      type?: unknown;
+      chatUI?: unknown;
+      mcpApp?: unknown;
+    };
+    return (
+      record.type === "tool-call" &&
+      (record.chatUI !== undefined || record.mcpApp !== undefined)
+    );
+  });
+}
+
 // Only the last assistant message may shimmer as "the currently running
 // tool" — an older message's dangling unresolved tool-call must never
 // shimmer once a later run is active.
@@ -870,8 +957,10 @@ export function computeActiveTailToolCallId(
   if (!isLast) return null;
   return (
     content?.reduce(
-      (latestToolCallId, part) =>
-        part.type === "tool-call" && (chatRunning || part.activity === true)
+      (latestToolCallId, part, index) =>
+        part.type === "tool-call" &&
+        !isCallAgentToolCallShadowed(content, index) &&
+        (chatRunning || part.activity === true)
           ? part.toolCallId
           : latestToolCallId,
       null as string | null,
@@ -903,12 +992,19 @@ export function shouldShowMissingFinalResponse({
   statusIsTerminal,
   hasAssistantText,
   hasUnresolvedTool,
+  hasCompletedCustomUi,
 }: {
   statusIsTerminal: boolean;
   hasAssistantText: boolean;
   hasUnresolvedTool: boolean;
+  hasCompletedCustomUi?: boolean;
 }): boolean {
-  return statusIsTerminal && !hasAssistantText && !hasUnresolvedTool;
+  return (
+    statusIsTerminal &&
+    !hasAssistantText &&
+    !hasUnresolvedTool &&
+    !hasCompletedCustomUi
+  );
 }
 
 export function shouldShowAssistantWorkSummary({
@@ -977,19 +1073,34 @@ const ALWAYS_VISIBLE_ASSISTANT_TOOLS = new Set(["connect-builder"]);
 export function isCollapsibleAssistantWorkPart(part: {
   type?: string;
   toolName?: string;
+  chatUI?: unknown;
+  mcpApp?: unknown;
 }): boolean {
   if (part.type === "reasoning") return true;
   return (
     part.type === "tool-call" &&
-    !ALWAYS_VISIBLE_ASSISTANT_TOOLS.has(part.toolName ?? "")
+    !ALWAYS_VISIBLE_ASSISTANT_TOOLS.has(part.toolName ?? "") &&
+    part.chatUI === undefined &&
+    part.mcpApp === undefined
   );
 }
 
 export function getAssistantToolSummaryInfo(
-  parts: readonly { type?: string; toolName?: string }[],
+  parts: readonly {
+    type?: string;
+    toolCallId?: string;
+    toolName?: string;
+    args?: Record<string, unknown>;
+    chatUI?: unknown;
+    mcpApp?: unknown;
+  }[],
 ): { startIndex: number; hiddenToolCount: number } {
   const toolCallIndices = parts.reduce<number[]>((indices, part, index) => {
-    if (part.type === "tool-call" && isCollapsibleAssistantWorkPart(part)) {
+    if (
+      part.type === "tool-call" &&
+      !isCallAgentToolCallShadowed(parts, index) &&
+      isCollapsibleAssistantWorkPart(part)
+    ) {
       indices.push(index);
     }
     return indices;
@@ -1012,11 +1123,23 @@ export function getAssistantToolSummaryInfo(
 function groupAssistantWorkParts(
   part: {
     type?: string;
+    toolCallId?: string;
     toolName?: string;
+    args?: Record<string, unknown>;
+    chatUI?: unknown;
+    mcpApp?: unknown;
   },
   index: number,
-  parts: readonly { type?: string; toolName?: string }[],
+  parts: readonly {
+    type?: string;
+    toolCallId?: string;
+    toolName?: string;
+    args?: Record<string, unknown>;
+    chatUI?: unknown;
+    mcpApp?: unknown;
+  }[],
 ): ["group-work"] | ["group-work", "group-ran-tools"] | null {
+  if (isCallAgentToolCallShadowed(parts, index)) return null;
   if (isCollapsibleAssistantWorkPart(part)) {
     const { startIndex } = getAssistantToolSummaryInfo(parts);
     if (isAssistantToolSummaryPart(parts, index, startIndex)) {
@@ -1028,16 +1151,29 @@ function groupAssistantWorkParts(
 }
 
 function isAssistantToolSummaryPart(
-  parts: readonly { type?: string; toolName?: string }[],
+  parts: readonly {
+    type?: string;
+    toolCallId?: string;
+    toolName?: string;
+    args?: Record<string, unknown>;
+    chatUI?: unknown;
+    mcpApp?: unknown;
+  }[],
   index: number,
   startIndex: number,
 ): boolean {
   if (startIndex < 0 || index >= startIndex) return false;
-  if (!isCollapsibleAssistantWorkPart(parts[index]!)) return false;
+  if (
+    isCallAgentToolCallShadowed(parts, index) ||
+    !isCollapsibleAssistantWorkPart(parts[index]!)
+  ) {
+    return false;
+  }
 
   let segmentStart = index;
   while (
     segmentStart > 0 &&
+    !isCallAgentToolCallShadowed(parts, segmentStart - 1) &&
     isCollapsibleAssistantWorkPart(parts[segmentStart - 1]!)
   ) {
     segmentStart--;
@@ -1046,6 +1182,7 @@ function isAssistantToolSummaryPart(
   let segmentEnd = index + 1;
   while (
     segmentEnd < startIndex &&
+    !isCallAgentToolCallShadowed(parts, segmentEnd) &&
     isCollapsibleAssistantWorkPart(parts[segmentEnd]!)
   ) {
     segmentEnd++;
@@ -1073,12 +1210,20 @@ export function AssistantMessage() {
   const hasUnresolvedTool = assistantMessageHasUnresolvedTool(msg.content);
   const responseConnectionText = messageTextFromContent(msg.content);
   const statusIsTerminal = assistantMessageStatusIsTerminal(msg);
+  const hasCompletedCustomUi = assistantMessageHasCompletedCustomUi(
+    msg.content,
+  );
+  const hasCustomUi = assistantMessageHasCustomUi(msg.content);
   const showMissingFinalResponse = shouldShowMissingFinalResponse({
     statusIsTerminal,
     hasAssistantText: responseConnectionText.trim().length > 0,
     hasUnresolvedTool,
+    hasCompletedCustomUi,
   });
-  const responseConnectionContext = latestUserMessageText(thread.messages);
+  const responseConnectionContext = userMessageTextBeforeAssistant(
+    thread.messages,
+    msg.id,
+  );
   const isComplete = shouldShowAssistantMessageFooter({
     isLast,
     chatRunning,
@@ -1191,10 +1336,14 @@ export function AssistantMessage() {
   const hasCollapsibleWork =
     Array.isArray(msgContent) &&
     msgContent.some(
-      (p) =>
+      (p, index) =>
+        !isCallAgentToolCallShadowed(msgContent, index) &&
         (p.type !== "tool-call" || p.activity !== true) &&
         isCollapsibleAssistantWorkPart(p),
     );
+  const shadowedToolCallIds = Array.isArray(msgContent)
+    ? shadowedCallAgentToolCallIds(msgContent)
+    : new Set<string>();
   const activeTailToolCallId = computeActiveTailToolCallId(msgContent, {
     chatRunning,
     isLast,
@@ -1222,7 +1371,8 @@ export function AssistantMessage() {
                 return (
                   <WorkedForSummary
                     durationMs={capturedDurationMs}
-                    autoCollapse={animateCollapse}
+                    defaultOpen={hasCustomUi}
+                    autoCollapse={animateCollapse && !hasCustomUi}
                   >
                     {children}
                   </WorkedForSummary>
@@ -1243,6 +1393,7 @@ export function AssistantMessage() {
               case "reasoning":
                 return <ReasoningMessagePart />;
               case "tool-call":
+                if (shadowedToolCallIds.has(part.toolCallId)) return null;
                 return part.toolUI ? (
                   <ToolActivityPresentation
                     toolName={part.toolName}
@@ -1271,7 +1422,7 @@ export function AssistantMessage() {
         {isComplete && hasCodeAgentTools && msgContent && (
           <FilesChangedSummary parts={msgContent} />
         )}
-        {isComplete && isLast && (
+        {isComplete && (
           <McpConnectionSuggestion
             text={responseConnectionText}
             contextText={responseConnectionContext}
@@ -1298,7 +1449,7 @@ export function AssistantMessage() {
                       <button
                         type="button"
                         aria-label="Regenerate response"
-                        className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 disabled:cursor-not-allowed disabled:opacity-40"
+                        className={`flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`}
                       >
                         <IconRefresh className="h-3.5 w-3.5" />
                       </button>
@@ -1314,7 +1465,7 @@ export function AssistantMessage() {
             {timestamp && (
               <MessageTimestamp
                 timestamp={timestamp}
-                className="opacity-0 transition-opacity duration-150 group-hover:opacity-100 group-focus-within:opacity-100"
+                className={messageFooterFadeClassName}
               />
             )}
           </div>

package/corpus/core/src/client/chat/tool-call-display.tsx

@@ -43,8 +43,12 @@ import {
   WriteCell,
   FilesChangedSummary,
 } from "../tool-cells/index.js";
-import { humanizeToolName } from "../tool-display.js";
+import {
+  humanizeToolName,
+  isCallAgentToolCallShadowed,
+} from "../tool-display.js";
 import { cn } from "../utils.js";
+import { ActionChatUiSurface } from "./action-chat-ui-surface.js";
 import {
   SmoothMarkdownText,
   HighlightedCodeBlock,
@@ -130,11 +134,10 @@ export function ToolActivityPresentation({
         animateEntry && "agent-tool-call--entering",
       )}
       data-running={isRunning ? "true" : undefined}
-      data-active-tail={isActiveTail ? "true" : undefined}
     >
       {children}
       {isRunning && showLongRunningHint && (
-        <div className="mt-0.5 px-2.5 text-[11px] leading-snug text-muted-foreground/80">
+        <div className="mt-0.5 px-2.5 pb-2 text-[11px] leading-snug text-muted-foreground/80">
           Still working. Large updates can take a minute or two.
         </div>
       )}
@@ -756,7 +759,16 @@ function ToolCallDisplayGeneric({
       (skipRegistryRenderer ? null : resolveToolRenderer(nativeToolContext)) ??
       resolveBuiltinFallbackToolRenderer(nativeToolContext));
   if (NativeToolRenderer) {
-    return <NativeToolRenderer context={nativeToolContext} />;
+    return (
+      <ActionChatUiSurface
+        context={nativeToolContext}
+        isBuiltinDataWidget={isBuiltinDataWidgetActionRenderer(
+          nativeToolContext,
+        )}
+      >
+        <NativeToolRenderer context={nativeToolContext} />
+      </ActionChatUiSurface>
+    );
   }
 
   const inputPayload = hasArgs ? toolInputPayload(toolName, args) : null;
@@ -951,13 +963,16 @@ export function ReconnectStreamMessage({
     content.at(-1)?.type === "reasoning" ? content.length - 1 : -1;
   const latestActiveToolIndex = content.reduce(
     (latestIndex, part, index) =>
-      part.type === "tool-call" && (chatRunning || part.activity === true)
+      part.type === "tool-call" &&
+      !isCallAgentToolCallShadowed(content, index) &&
+      (chatRunning || part.activity === true)
         ? index
         : latestIndex,
     -1,
   );
 
   const renderPart = (part: ContentPart, i: number) => {
+    if (isCallAgentToolCallShadowed(content, i)) return null;
     if (part.type === "text") {
       const partStreaming = chatRunning && i === streamingTextPartIndex;
       return (
@@ -1023,6 +1038,7 @@ export function ReconnectStreamMessage({
 
   for (let i = 0; i < content.length; i++) {
     const part = content[i]!;
+    if (isCallAgentToolCallShadowed(content, i)) continue;
     const isOlderToolWork =
       toolSummary.startIndex >= 0 &&
       i < toolSummary.startIndex &&
@@ -1048,7 +1064,11 @@ export function ReconnectStreamMessage({
 
 function getReconnectToolSummaryInfo(content: readonly ContentPart[]) {
   const toolCallIndices = content.reduce<number[]>((indices, part, index) => {
-    if (part.type === "tool-call" && isReconnectSummarizablePart(part)) {
+    if (
+      part.type === "tool-call" &&
+      !isCallAgentToolCallShadowed(content, index) &&
+      isReconnectSummarizablePart(part)
+    ) {
       indices.push(index);
     }
     return indices;
@@ -1067,7 +1087,10 @@ function getReconnectToolSummaryInfo(content: readonly ContentPart[]) {
 function isReconnectSummarizablePart(part: ContentPart): boolean {
   return (
     part.type === "reasoning" ||
-    (part.type === "tool-call" && part.toolName !== "connect-builder")
+    (part.type === "tool-call" &&
+      part.toolName !== "connect-builder" &&
+      part.chatUI === undefined &&
+      part.mcpApp === undefined)
   );
 }
 
@@ -1077,11 +1100,17 @@ function isReconnectToolSummaryPart(
   startIndex: number,
 ): boolean {
   if (startIndex < 0 || index >= startIndex) return false;
-  if (!isReconnectSummarizablePart(content[index]!)) return false;
+  if (
+    isCallAgentToolCallShadowed(content, index) ||
+    !isReconnectSummarizablePart(content[index]!)
+  ) {
+    return false;
+  }
 
   let segmentStart = index;
   while (
     segmentStart > 0 &&
+    !isCallAgentToolCallShadowed(content, segmentStart - 1) &&
     isReconnectSummarizablePart(content[segmentStart - 1]!)
   ) {
     segmentStart--;
@@ -1090,6 +1119,7 @@ function isReconnectToolSummaryPart(
   let segmentEnd = index + 1;
   while (
     segmentEnd < startIndex &&
+    !isCallAgentToolCallShadowed(content, segmentEnd) &&
     isReconnectSummarizablePart(content[segmentEnd]!)
   ) {
     segmentEnd++;
@@ -1231,22 +1261,28 @@ export function formatWorkedDuration(ms: number): string {
 
 export function WorkedForSummary({
   durationMs,
+  defaultOpen = false,
   autoCollapse = false,
   children,
 }: {
   durationMs?: number | null;
+  /** Keep completed work visible when the turn contains interactive UI. */
+  defaultOpen?: boolean;
   /** When true, close the summary after a run has completed. */
   autoCollapse?: boolean;
   children: React.ReactNode;
 }) {
-  // Start closed so a remounted completed message never flashes its work
-  // details open while auto-collapse settles. If the summary was already
-  // open when autoCollapse changes, AnimatedCollapse still animates it shut.
-  const [open, setOpen] = useState(false);
+  // Ordinary completed work starts closed so a remount never flashes details
+  // while auto-collapse settles. Interactive UI opts into an open summary.
+  const [open, setOpen] = useState(defaultOpen);
 
   useEffect(() => {
-    if (autoCollapse) setOpen(false);
-  }, [autoCollapse]);
+    if (defaultOpen) {
+      setOpen(true);
+    } else if (autoCollapse) {
+      setOpen(false);
+    }
+  }, [autoCollapse, defaultOpen]);
 
   const label =
     durationMs != null && durationMs >= 1000

package/corpus/core/src/client/chat/widgets/InlineExtensionWidget.tsx

@@ -1,6 +1,3 @@
-import { IconExternalLink, IconSparkles } from "@tabler/icons-react";
-
-import { appPath } from "../../api-path.js";
 import { InlineExtensionFrame } from "../../extensions/InlineExtensionFrame.js";
 import type { ToolRendererContext } from "../tool-render-registry.js";
 import { normalizeInlineExtensionToolResult } from "./inline-extension-result.js";
@@ -18,43 +15,19 @@ export function InlineExtensionWidget({
   const result = normalizeInlineExtensionToolResult(context);
   if (!result) return null;
 
-  const href = result.path ? appPath(result.path) : undefined;
-
   return (
-    <div className="my-1.5 overflow-hidden rounded-lg border border-border bg-background text-foreground shadow-sm">
-      <div className="flex items-center gap-2 border-b border-border px-3 py-2">
-        <IconSparkles className="h-4 w-4 shrink-0 text-muted-foreground" />
-        <div className="min-w-0 flex-1">
-          <div className="truncate text-sm font-medium">{result.name}</div>
-          {result.description ? (
-            <div className="truncate text-[11px] text-muted-foreground">
-              {result.description}
-            </div>
-          ) : null}
-        </div>
-        {href ? (
-          <a
-            href={href}
-            className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-            aria-label="Open extension"
-          >
-            <IconExternalLink className="h-4 w-4" />
-          </a>
-        ) : null}
-      </div>
-      <InlineExtensionFrame
-        extensionId={result.mode === "persisted" ? result.id : undefined}
-        extension={{
-          id: result.id,
-          name: result.name,
-          description: result.description,
-          content: result.mode === "transient" ? result.content : undefined,
-          updatedAt: result.updatedAt,
-          mode: result.mode,
-        }}
-        context={result.context}
-        initialHeight={result.initialHeight ?? 260}
-      />
-    </div>
+    <InlineExtensionFrame
+      extensionId={result.mode === "persisted" ? result.id : undefined}
+      extension={{
+        id: result.id,
+        name: result.name,
+        description: result.description,
+        content: result.mode === "transient" ? result.content : undefined,
+        updatedAt: result.updatedAt,
+        mode: result.mode,
+      }}
+      context={result.context}
+      initialHeight={result.initialHeight ?? 260}
+    />
   );
 }

package/corpus/core/src/client/chat/widgets/builtin-tool-renderers.tsx

@@ -126,11 +126,15 @@ function renderDataWidget(context: ToolRendererContext) {
   return null;
 }
 
-function BuiltinToolRendererSkeleton() {
+function BuiltinToolRendererSkeleton({ framed = true }: { framed?: boolean }) {
   return (
     <div
       aria-label="Loading tool result"
-      className="my-1.5 h-24 animate-pulse rounded-lg border border-border bg-muted/30"
+      className={
+        framed
+          ? "my-1.5 h-24 animate-pulse rounded-lg border border-border bg-muted/30"
+          : "h-24 animate-pulse bg-muted/30"
+      }
     />
   );
 }
@@ -140,7 +144,7 @@ const BuiltinDataWidgetRenderer: ToolRendererComponent = ({ context }) =>
 
 const BuiltinInlineExtensionRenderer: ToolRendererComponent = ({ context }) =>
   normalizeInlineExtensionToolResult(context) ? (
-    <Suspense fallback={<BuiltinToolRendererSkeleton />}>
+    <Suspense fallback={<BuiltinToolRendererSkeleton framed={false} />}>
       <LazyInlineExtensionWidget context={context} />
     </Suspense>
   ) : null;

package/corpus/core/src/client/components/ui/message-scroller.tsx

@@ -48,8 +48,11 @@ function MessageScroller({ className, ...props }: MessageScrollerRootProps) {
 
 function MessageScrollerViewport({
   className,
+  children,
   ...props
 }: MessageScrollerViewportProps) {
+  const { start: hasContentAbove } = useMessageScrollerScrollable();
+
   return (
     <ShadcnMessageScroller.Viewport
       className={cn(
@@ -57,7 +60,18 @@ function MessageScrollerViewport({
         className,
       )}
       {...props}
-    />
+    >
+      {hasContentAbove && (
+        <div
+          aria-hidden="true"
+          className="pointer-events-none sticky top-0 z-10 h-0"
+          data-message-scroller-top-fade
+        >
+          <div className="absolute inset-x-0 top-0 h-12 bg-gradient-to-b from-background via-background/90 to-transparent" />
+        </div>
+      )}
+      {children}
+    </ShadcnMessageScroller.Viewport>
   );
 }
 

package/corpus/core/src/client/conversation/AgentConversation.tsx

@@ -13,10 +13,12 @@ import React from "react";
 import ReactMarkdown, { defaultUrlTransform } from "react-markdown";
 import remarkGfm from "remark-gfm";
 
+import { ActionChatUiSurface } from "../chat/action-chat-ui-surface.js";
 import { resolveToolRenderer } from "../chat/tool-render-registry.js";
 import {
   resolveBuiltinActionChatRenderer,
   resolveBuiltinFallbackToolRenderer,
+  isBuiltinDataWidgetActionRenderer,
 } from "../chat/widgets/builtin-tool-renderers.js";
 import {
   MessageScroller,
@@ -414,7 +416,16 @@ function ConversationToolCall({ tool }: { tool: AgentConversationToolCall }) {
     resolveToolRenderer(nativeToolContext) ??
     resolveBuiltinFallbackToolRenderer(nativeToolContext);
   if (NativeToolRenderer) {
-    return <NativeToolRenderer context={nativeToolContext} />;
+    return (
+      <ActionChatUiSurface
+        context={nativeToolContext}
+        isBuiltinDataWidget={isBuiltinDataWidgetActionRenderer(
+          nativeToolContext,
+        )}
+      >
+        <NativeToolRenderer context={nativeToolContext} />
+      </ActionChatUiSurface>
+    );
   }
 
   const hasDetails = Boolean(tool.input || tool.result || tool.mcpApp);

package/corpus/core/src/client/error-capture.ts

@@ -21,6 +21,7 @@
  * the server normalizes + groups it. That keeps one tested source of truth for
  * grouping instead of duplicating parser logic across the wire.
  */
+import { isDynamicImportFailureMessage } from "./route-chunk-recovery.js";
 import { scrubUrl } from "./url-scrub.js";
 
 export type ExceptionLevel = "fatal" | "error" | "warning" | "info" | "debug";
@@ -358,12 +359,7 @@ function shouldIgnoreAutoCapturedError(normalized: {
   // Route-chunk recovery reloads the current page after stale lazy chunks or
   // module scripts fail. Browser-level failures have no useful stack, so do
   // not retain the transient loader noise as an application issue.
-  if (
-    !stack &&
-    /^(?:Importing a module script failed\.?|(?:Failed to fetch|error loading) dynamically imported module(?::.*)?)$/i.test(
-      message,
-    )
-  ) {
+  if (!stack && isDynamicImportFailureMessage(message)) {
     return true;
   }