@agent-native/core 0.149.1 → 0.149.3

package/dist/client/chat/message-components.js

@@ -14,12 +14,12 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel,
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "../components/ui/tooltip.js";
 import { ThumbsFeedback } from "../observability/ThumbsFeedback.js";
 import { McpConnectionSuggestion } from "../resources/McpConnectionSuggestion.js";
-import { humanizeToolName, isCallAgentToolCallShadowed, shadowedCallAgentToolCallIds, } from "../tool-display.js";
+import { isCallAgentToolCallShadowed, shadowedCallAgentToolCallIds, } from "../tool-display.js";
 import { cn } from "../utils.js";
 import { MarkdownText, renderMarkdownToClipboardHtml, SmoothMarkdownText, } from "./markdown-renderer.js";
 import { getAssistantRunDurationMs } from "./repo-helpers.js";
 import { getRunErrorMetadata, runErrorHeadline, runErrorKey, } from "./run-recovery.js";
-import { ToolCallFallback, ToolActivityPresentation, ToolCallStackMotion, FilesChangedSummary, ASSISTANT_VISIBLE_TOOL_CALL_LIMIT, ChatRunningContext, ChatRunDurationContext, formatWorkedDuration, RanToolsSummary, ReasoningCell, WorkedForSummary, toolCallHasPendingApproval, } from "./tool-call-display.js";
+import { ToolCallFallback, ToolActivityPresentation, ToolCallStackMotion, FilesChangedSummary, ASSISTANT_VISIBLE_TOOL_CALL_LIMIT, ChatRunningContext, ChatRunningRunIdContext, ChatRunningTurnIdContext, ChatRunDurationContext, formatWorkedDuration, RanToolsSummary, ReasoningCell, WorkedForSummary, toolCallHasPendingApproval, } from "./tool-call-display.js";
 export { toolCallHasPendingApproval };
 // ─── Pending selection context key ───────────────────────────────────────────
 // Mirrored from AssistantChat to avoid a cross-import on a private constant.
@@ -172,6 +172,19 @@ export function assistantMessageRunId(message) {
             ? metadata.runId
             : undefined;
 }
+/** Stable logical-turn identity shared by chained continuation run IDs. */
+export function assistantMessageTurnId(message) {
+    const metadata = message?.metadata;
+    return typeof metadata?.custom?.turnId === "string"
+        ? metadata.custom.turnId
+        : typeof metadata?.turnId === "string"
+            ? metadata.turnId
+            : undefined;
+}
+export function resolveAssistantRequestId(message, activeRun, threadId) {
+    return (assistantMessageRunId(message) ||
+        (activeRun?.threadId === threadId ? activeRun.runId : undefined));
+}
 // ─── MessageBranchPicker ──────────────────────────────────────────────────────
 export function MessageBranchPicker() {
     return (_jsxs(BranchPickerPrimitive.Root, { hideWhenSingleBranch: true, className: "flex items-center gap-0.5 text-[11px] text-muted-foreground", children: [_jsx(BranchPickerPrimitive.Previous, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Previous branch", 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 disabled:cursor-not-allowed disabled:opacity-40", children: _jsx(IconChevronLeft, { className: "h-3.5 w-3.5" }) }) }), _jsxs("span", { className: "tabular-nums select-none", children: [_jsx(BranchPickerPrimitive.Number, {}), "/", _jsx(BranchPickerPrimitive.Count, {})] }), _jsx(BranchPickerPrimitive.Next, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Next branch", 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 disabled:cursor-not-allowed disabled:opacity-40", children: _jsx(IconChevronRight, { className: "h-3.5 w-3.5" }) }) })] }));
@@ -284,7 +297,7 @@ function UserMessageEditComposer() {
     return (_jsxs(ComposerPrimitive.Root, { className: "flex flex-col gap-2 rounded-lg border border-border bg-background px-3 py-2 shadow-sm", children: [_jsx(ComposerPrimitive.Input, { className: "w-full resize-none bg-transparent text-sm leading-relaxed text-foreground placeholder:text-muted-foreground focus:outline-none", rows: 1, submitMode: "enter" }), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(ComposerPrimitive.Cancel, { asChild: true, children: _jsx("button", { type: "button", className: "cursor-pointer rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: "Cancel" }) }), _jsx(ComposerPrimitive.Send, { asChild: true, children: _jsx("button", { type: "submit", className: "cursor-pointer rounded-md bg-foreground px-2 py-1 text-xs font-medium text-background hover:opacity-90 disabled:opacity-50", children: "Save" }) })] })] }));
 }
 // ─── MessageActionsMenu ────────────────────────────────────────────────────────
-export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
+export function MessageActionsMenu({ showRevert, onRevert, threadId = "", } = {}) {
     const [open, setOpen] = useState(false);
     const [copied, setCopied] = useState(null);
     const messageRuntime = useMessageRuntime();
@@ -311,24 +324,23 @@ export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
     }, [messageRuntime]);
     const handleCopyRequestId = useCallback(() => {
         const m = messageRuntime.getState();
-        // If the message carries no run id (e.g. the run is still in flight and
-        // this is the first message), fall back to the active-run state so a hung /
-        // mid-stream chat still surfaces a usable trace ID. Last resort is the
-        // assistant-ui local message id.
-        const runId = assistantMessageRunId(m) ||
-            (typeof window !== "undefined" ? getActiveRun()?.runId : null) ||
-            m.id ||
-            "";
+        const runId = resolveAssistantRequestId(m, getActiveRun(), threadId);
+        if (!runId) {
+            setCopied("id-unavailable");
+            return;
+        }
         void writeClipboardText(runId).then((ok) => {
-            if (!ok)
+            if (!ok) {
+                setCopied("id-failed");
                 return;
+            }
             setCopied("id");
             setTimeout(() => {
                 setCopied(null);
                 setOpen(false);
             }, 1000);
         });
-    }, [messageRuntime]);
+    }, [messageRuntime, threadId]);
     const handleForkChat = useCallback(() => {
         setOpen(false);
         actionsCtx?.onForkChat?.();
@@ -343,7 +355,13 @@ export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
                         }, children: [copied === "message" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconCopy, { className: "h-3.5 w-3.5" })), copied === "message" ? "Copied!" : "Copy Message"] }), _jsxs(DropdownMenuItem, { onSelect: (e) => {
                             e.preventDefault();
                             handleCopyRequestId();
-                        }, children: [copied === "id" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconId, { className: "h-3.5 w-3.5" })), copied === "id" ? "Copied!" : "Copy Request ID"] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), "Revert to here"] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: ["Sent ", timestamp.short] })] }))] })] }));
+                        }, children: [copied === "id" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconId, { className: "h-3.5 w-3.5" })), copied === "id"
+                                ? "Copied!"
+                                : copied === "id-unavailable"
+                                    ? "Request ID unavailable"
+                                    : copied === "id-failed"
+                                        ? "Copy failed"
+                                        : "Copy Request ID"] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), "Revert to here"] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: ["Sent ", timestamp.short] })] }))] })] }));
 }
 // ─── UserMessage ──────────────────────────────────────────────────────────────
 export function UserMessage() {
@@ -481,29 +499,6 @@ function missingFinalResponseWarningText(content) {
     }
     return null;
 }
-export function completedAssistantToolNamesAfterLastText(content) {
-    let lastTextIndex = -1;
-    for (let index = content.length - 1; index >= 0; index -= 1) {
-        if (content[index]?.type === "text") {
-            lastTextIndex = index;
-            break;
-        }
-    }
-    const names = new Set();
-    for (let index = lastTextIndex + 1; index < content.length; index += 1) {
-        const part = content[index];
-        if (part?.type !== "tool-call" ||
-            part.activity === true ||
-            part.result === undefined ||
-            part.isError === true ||
-            part.outcome === "unknown" ||
-            isCallAgentToolCallShadowed(content, index)) {
-            continue;
-        }
-        names.add(humanizeToolName(part.toolName));
-    }
-    return [...names];
-}
 export function latestUserMessageText(messages) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];
@@ -606,13 +601,24 @@ export function computeActiveTailToolCallId(content, { chatRunning, isLast }) {
         ? part.toolCallId
         : latestToolCallId, null) ?? null);
 }
-export function shouldShowAssistantMessageFooter({ isLast, chatRunning, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }) {
+export function shouldShowAssistantMessageFooter({ isLast, chatRunning, activeRunId, messageRunId, activeTurnId, messageTurnId, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }) {
     if (!hasRenderableContent)
         return false;
+    const ownsActiveTurn = activeTurnId != null &&
+        (messageTurnId == null || activeTurnId === messageTurnId);
+    // Keep the run-id comparison only for legacy messages that predate the
+    // turn-id metadata. Once either side has a logical-turn identity, absent
+    // turn evidence must not be treated as proof of a different run.
+    const ownsLegacyRun = activeTurnId == null &&
+        messageTurnId == null &&
+        activeRunId != null &&
+        messageRunId != null &&
+        activeRunId === messageRunId;
+    const ownsActiveRun = isLast || ownsActiveTurn || ownsLegacyRun;
+    if (chatRunning && ownsActiveRun)
+        return false;
     if (!isLast)
         return true;
-    if (chatRunning)
-        return false;
     if (hasUnresolvedTool)
         return false;
     return statusIsTerminal;
@@ -781,11 +787,6 @@ export function InlineRunErrorNotice({ info, durationMs, onRetry, }) {
         : headline;
     return (_jsxs("div", { className: "my-1 w-full", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), "aria-expanded": open, className: "flex cursor-pointer items-center gap-1.5 py-0.5 text-[13px] text-muted-foreground transition-colors hover:text-foreground", children: [_jsx(IconAlertTriangle, { className: "size-3.5 shrink-0 text-amber-500" }), _jsx("span", { className: "truncate", children: label }), _jsx(IconChevronRight, { className: cn("size-3.5 shrink-0 transition-transform", open && "rotate-90") })] }), open && (_jsxs("div", { className: "mt-1 rounded-md border border-border/60 bg-background/70 p-2 text-[11px] leading-relaxed text-muted-foreground", children: [_jsx("p", { className: "whitespace-pre-wrap break-words", children: info.message }), info.errorCode && (_jsxs("div", { className: "mt-1 font-mono", children: ["code: ", info.errorCode] })), info.runId && _jsxs("div", { className: "font-mono", children: ["run: ", info.runId] }), info.details && (_jsx("pre", { className: "mt-1 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details })), onRetry && (_jsxs("button", { type: "button", onClick: onRetry, className: "mt-2 inline-flex h-7 cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-[11px] font-medium text-foreground hover:bg-accent", children: [_jsx(IconRefresh, { className: "size-3" }), "Retry"] }))] }))] }));
 }
-function AssistantCompletionProgress({ messageId, toolNames, }) {
-    if (toolNames.length === 0)
-        return null;
-    return (_jsx("div", { className: "my-1 w-full text-[13px] text-muted-foreground", role: "status", "aria-live": "polite", "data-testid": "assistant-completion-progress", children: _jsx(SmoothMarkdownText, { text: `The agent completed these actions: ${toolNames.join(", ")}`, streaming: true, resetKey: `assistant-completion-progress:${messageId}`, statusType: "running" }) }));
-}
 function MissingFinalResponseNotice({ messageId, text, animate, onRevealComplete, }) {
     return (_jsx("div", { className: "my-1 w-full text-muted-foreground", role: "status", "aria-live": "polite", "data-testid": "missing-final-response", children: _jsx(SmoothMarkdownText, { text: text, streaming: animate, resetKey: `missing-final-response:${messageId}`, statusType: animate ? "running" : "complete", onRevealComplete: animate ? onRevealComplete : undefined }) }));
 }
@@ -795,6 +796,8 @@ export function AssistantMessage() {
     const messageRuntime = useMessageRuntime();
     const thread = useThread();
     const chatRunning = React.useContext(ChatRunningContext);
+    const activeRunId = React.useContext(ChatRunningRunIdContext);
+    const activeTurnId = React.useContext(ChatRunningTurnIdContext);
     const lastRunDurationMs = React.useContext(ChatRunDurationContext);
     const msg = messageRuntime.getState();
     const persistedDurationMs = getAssistantRunDurationMs(msg);
@@ -809,6 +812,8 @@ export function AssistantMessage() {
     const statusIsTerminal = assistantMessageStatusIsTerminal(msg);
     const hasCompletedCustomUi = assistantMessageHasCompletedCustomUi(msg.content);
     const hasCustomUi = assistantMessageHasCustomUi(msg.content);
+    const messageRunId = assistantMessageRunId(msg);
+    const messageTurnId = assistantMessageTurnId(msg);
     const serverRunActive = React.useContext(ServerRunActiveContext);
     const messageRunError = getRunErrorMetadata(msg);
     const messageActions = React.useContext(MessageActionsContext);
@@ -849,9 +854,6 @@ export function AssistantMessage() {
             return;
         setRevealedMissingFinalResponseKey(missingFinalResponseAnimationKey);
     }, [missingFinalResponseAnimationKey]);
-    const completedToolNames = isLast && chatRunning && !hasCompletedCustomUi && Array.isArray(msg.content)
-        ? completedAssistantToolNamesAfterLastText(msg.content)
-        : [];
     const shouldHoldCompletionFooter = isLast &&
         ((missingFinalResponseCandidate && !showMissingFinalResponse) ||
             (animateMissingFinalResponse && !missingFinalResponseRevealed));
@@ -860,6 +862,10 @@ export function AssistantMessage() {
         shouldShowAssistantMessageFooter({
             isLast,
             chatRunning,
+            activeRunId,
+            messageRunId,
+            activeTurnId,
+            messageTurnId,
             hasRenderableContent,
             statusIsTerminal,
             hasUnresolvedTool,
@@ -903,7 +909,6 @@ export function AssistantMessage() {
         }
         wasRunningRef.current = chatRunning && isLast;
     }, [chatRunning, isComplete, isLast]);
-    const messageRunId = assistantMessageRunId(msg);
     const handleRestore = useCallback(async () => {
         if (restoreState === "idle" || restoreState === "error") {
             setRestoreError(null);
@@ -1004,15 +1009,15 @@ export function AssistantMessage() {
                                     case "tool-call":
                                         if (shadowedToolCallIds.has(part.toolCallId))
                                             return null;
-                                        return part.toolUI ? (_jsx(ToolActivityPresentation, { toolName: part.toolName, isRunning: part.status?.type === "running", isActiveTail: part.toolCallId === activeTailToolCallId, toolCallId: part.toolCallId, children: part.toolUI })) : (_jsx(ToolCallFallback, { ...part, isActiveTail: part.toolCallId === activeTailToolCallId }));
+                                        return part.toolUI ? (_jsx(ToolActivityPresentation, { toolName: part.toolName, isRunning: part.status?.type === "running", toolCallId: part.toolCallId, children: part.toolUI })) : (_jsx(ToolCallFallback, { ...part, isActiveTail: part.toolCallId === activeTailToolCallId }));
                                     default:
                                         return null;
                                 }
-                            } }) }), completedToolNames.length > 0 && !showInlineRunError && (_jsx(AssistantCompletionProgress, { messageId: msg.id, toolNames: completedToolNames })), showInlineRunError && messageRunError && (_jsx(InlineRunErrorNotice, { info: messageRunError, durationMs: capturedDurationMs ?? persistedDurationMs, onRetry: isLast && messageRunError.recoverable
+                            } }) }), showInlineRunError && messageRunError && (_jsx(InlineRunErrorNotice, { info: messageRunError, durationMs: capturedDurationMs ?? persistedDurationMs, onRetry: isLast && messageRunError.recoverable
                             ? messageActions?.onRetryRunError
                             : undefined })), missingWarningText == null &&
                         missingFinalResponseNoticeText != null &&
-                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent })), isComplete && (_jsx(McpConnectionSuggestion, { text: responseConnectionText, contextText: responseConnectionContext, variant: "response" }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [_jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("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 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: "Regenerate response" })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: "Restore to here?" }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Cancel" })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), "Restoring..."] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Dismiss" })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: thread.messages.findIndex((m) => m.id === msg.id) }))] }))] }));
+                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent })), isComplete && (_jsx(McpConnectionSuggestion, { text: responseConnectionText, contextText: responseConnectionContext, variant: "response" }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [_jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore, threadId: cpCtx?.threadId ?? "" }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("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 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: "Regenerate response" })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: "Restore to here?" }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Cancel" })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), "Restoring..."] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Dismiss" })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: thread.messages.findIndex((m) => m.id === msg.id) }))] }))] }));
 }
 // ─── RunningActivityStatus / ThinkingIndicator ────────────────────────────────
 export function RunningActivityStatus({ label }) {

package/dist/client/chat/run-recovery.d.ts

@@ -6,6 +6,7 @@ export type RunErrorInfo = {
     details?: string;
     errorCode?: string;
     runId?: string;
+    turnId?: string;
     recoverable?: boolean;
 };
 export declare function getLoopLimitMetadata(message: unknown): LoopLimitInfo | null;

package/dist/client/chat/run-recovery.js

@@ -39,6 +39,13 @@ export function getRunErrorMetadata(message) {
             : typeof meta?.runId === "string"
                 ? meta.runId
                 : undefined;
+    const turnId = typeof runError.turnId === "string"
+        ? runError.turnId
+        : typeof meta?.custom?.turnId === "string"
+            ? meta.custom.turnId
+            : typeof meta?.turnId === "string"
+                ? meta.turnId
+                : undefined;
     return {
         message: messageText,
         ...(typeof runError.details === "string"
@@ -48,6 +55,7 @@ export function getRunErrorMetadata(message) {
             ? { errorCode: runError.errorCode }
             : {}),
         ...(runId ? { runId } : {}),
+        ...(turnId ? { turnId } : {}),
         ...(runError.recoverable ? { recoverable: true } : {}),
     };
 }

package/dist/client/chat/tool-call-display.d.ts

@@ -5,12 +5,13 @@ import type { AgentMcpAppPayload } from "../../mcp-client/app-result.js";
 import type { ContentPart } from "../sse-event-processor.js";
 import { FilesChangedSummary } from "../tool-cells/index.js";
 export declare const ChatRunningContext: React.Context<boolean>;
+export declare const ChatRunningRunIdContext: React.Context<string | null>;
+export declare const ChatRunningTurnIdContext: React.Context<string | null>;
 export declare const ChatRunDurationContext: React.Context<number | null>;
 export declare const ASSISTANT_VISIBLE_TOOL_CALL_LIMIT = 3;
 /**
- * Keeps the visible tool stack spatially continuous as streaming calls change
- * which rows belong to the collapsed history bucket. The rendered data stays
- * untouched; this only animates the DOM's before/after positions.
+ * Keeps the tool-call stack layout-transparent. Tool-entry motion is disabled
+ * until it can stay stable while streaming calls are added and summarized.
  */
 export declare function ToolCallStackMotion({ children, className, }: {
     children: React.ReactNode;
@@ -55,10 +56,9 @@ export declare function toolCallHasPendingApproval(part: {
     } | null;
 }): boolean;
 export declare const TOOL_LONG_RUNNING_HINT_DELAY_MS = 45000;
-export declare function ToolActivityPresentation({ toolName, isRunning, isActiveTail, toolCallId, suppressLongRunningHint, children, }: {
+export declare function ToolActivityPresentation({ toolName, isRunning, toolCallId, suppressLongRunningHint, children, }: {
     toolName: string;
     isRunning: boolean;
-    isActiveTail: boolean;
     toolCallId?: string;
     suppressLongRunningHint?: boolean;
     children: React.ReactNode;

package/dist/client/chat/tool-call-display.js

@@ -18,209 +18,16 @@ import { resolveToolRenderer } from "./tool-render-registry.js";
 import { isBuiltinDataWidgetActionRenderer, resolveBuiltinActionChatRenderer, resolveBuiltinFallbackToolRenderer, } from "./widgets/builtin-tool-renderers.js";
 // Exported so AssistantChatInner can provide a context value.
 export const ChatRunningContext = React.createContext(false);
+export const ChatRunningRunIdContext = React.createContext(null);
+export const ChatRunningTurnIdContext = React.createContext(null);
 export const ChatRunDurationContext = React.createContext(null);
 export const ASSISTANT_VISIBLE_TOOL_CALL_LIMIT = 3;
-const TOOL_CALL_ENTRY_DURATION_MS = 220;
-const TOOL_CALL_STACK_MOTION_DURATION_MS = 220;
-const TOOL_CALL_STACK_EASING = "cubic-bezier(0.23, 1, 0.32, 1)";
-function toolStackMotionKey(element, index) {
-    const toolCallId = element.dataset.agentToolCallId;
-    if (toolCallId)
-        return `tool:${toolCallId}`;
-    const summaryId = element.dataset.agentToolSummary;
-    if (summaryId)
-        return `summary:${summaryId}`;
-    return `anonymous:${index}`;
-}
-function prefersReducedMotionForToolStack() {
-    return (typeof window !== "undefined" &&
-        typeof window.matchMedia === "function" &&
-        window.matchMedia("(prefers-reduced-motion: reduce)").matches);
-}
-function startToolStackAnimation(element, keyframes) {
-    if (typeof element.animate !== "function")
-        return null;
-    return element.animate(keyframes, {
-        duration: TOOL_CALL_STACK_MOTION_DURATION_MS,
-        easing: TOOL_CALL_STACK_EASING,
-        fill: "both",
-    });
-}
-function prepareToolStackExitClone(clone, snapshot) {
-    clone.classList.remove("agent-tool-call--entering", "agent-tool-call--stack-entering");
-    clone
-        .querySelectorAll(".agent-tool-call--entering, .agent-tool-call--stack-entering")
-        .forEach((element) => {
-        element.classList.remove("agent-tool-call--entering", "agent-tool-call--stack-entering");
-    });
-    clone.classList.add("agent-tool-call-stack__exit");
-    clone.setAttribute("aria-hidden", "true");
-    clone.removeAttribute("data-agent-tool-call-id");
-    clone.removeAttribute("data-agent-tool-summary");
-    clone.removeAttribute("data-agent-tool-motion-token");
-    clone.style.left = `${snapshot.left}px`;
-    clone.style.top = `${snapshot.top}px`;
-    clone.style.width = `${snapshot.width}px`;
-    clone.style.height = `${snapshot.height}px`;
-    clone.style.transform = "translate3d(0, 0, 0)";
-    clone.style.transition = "none";
-    clone.style.animation = "none";
-    clone.style.opacity = "1";
-}
 /**
- * Keeps the visible tool stack spatially continuous as streaming calls change
- * which rows belong to the collapsed history bucket. The rendered data stays
- * untouched; this only animates the DOM's before/after positions.
+ * Keeps the tool-call stack layout-transparent. Tool-entry motion is disabled
+ * until it can stay stable while streaming calls are added and summarized.
  */
 export function ToolCallStackMotion({ children, className, }) {
-    const stackRef = useRef(null);
-    const previousRef = useRef(new Map());
-    const previousStructureRef = useRef([]);
-    const activeMotionsRef = useRef(new Map());
-    const exitAnimationsRef = useRef(new Map());
-    useLayoutEffect(() => {
-        const stack = stackRef.current;
-        if (!stack)
-            return;
-        const previous = previousRef.current;
-        const visualPrevious = new Map(previous);
-        for (const [key, activeMotion] of activeMotionsRef.current) {
-            if (stack.contains(activeMotion.element)) {
-                const previousSnapshot = previous.get(key);
-                if (previousSnapshot) {
-                    const rect = activeMotion.element.getBoundingClientRect();
-                    visualPrevious.set(key, {
-                        ...previousSnapshot,
-                        top: rect.top,
-                        left: rect.left,
-                    });
-                }
-            }
-            activeMotion.animation.cancel();
-        }
-        activeMotionsRef.current.clear();
-        for (const [ghost, animation] of exitAnimationsRef.current) {
-            animation.cancel();
-            ghost.remove();
-        }
-        exitAnimationsRef.current.clear();
-        const elements = Array.from(stack.querySelectorAll("[data-agent-tool-call-id], [data-agent-tool-summary]"));
-        const structure = elements.map((element, index) => toolStackMotionKey(element, index));
-        const previousStructure = previousStructureRef.current;
-        const structureChanged = structure.length !== previousStructure.length ||
-            structure.some((key, index) => key !== previousStructure[index]);
-        previousStructureRef.current = structure;
-        const current = new Map();
-        for (const [index, element] of elements.entries()) {
-            const rect = element.getBoundingClientRect();
-            current.set(toolStackMotionKey(element, index), {
-                top: rect.top,
-                left: rect.left,
-                width: rect.width,
-                height: rect.height,
-                clone: element.cloneNode(true),
-            });
-        }
-        previousRef.current = current;
-        // Entry motion changes the measured transform without changing the stack
-        // structure. Do not turn that animation's cleanup into a second FLIP pass.
-        if (previous.size === 0 ||
-            !structureChanged ||
-            prefersReducedMotionForToolStack())
-            return;
-        const summary = elements.find((element) => element.dataset.agentToolSummary !== undefined);
-        const summaryRect = summary?.getBoundingClientRect();
-        const elementsByKey = new Map(elements.map((element, index) => [
-            toolStackMotionKey(element, index),
-            element,
-        ]));
-        for (const [key, after] of current.entries()) {
-            const before = visualPrevious.get(key);
-            if (!before) {
-                const node = elementsByKey.get(key);
-                if (!node)
-                    continue;
-                if (node.dataset.agentToolSummary !== undefined)
-                    continue;
-                if (node.dataset.agentToolCallId !== undefined &&
-                    !node.classList.contains("agent-tool-call--entering")) {
-                    node.classList.add("agent-tool-call--stack-entering");
-                    window.setTimeout(() => {
-                        node.classList.remove("agent-tool-call--stack-entering");
-                    }, TOOL_CALL_ENTRY_DURATION_MS);
-                }
-                continue;
-            }
-            const dx = before.left - after.left;
-            const dy = before.top - after.top;
-            if (Math.abs(dx) < 0.5 && Math.abs(dy) < 0.5)
-                continue;
-            const node = elementsByKey.get(key);
-            if (!node)
-                continue;
-            if (node.dataset.agentToolSummary !== undefined)
-                continue;
-            const animation = startToolStackAnimation(node, [
-                { transform: `translate3d(${dx}px, ${dy}px, 0)` },
-                { transform: "translate3d(0, 0, 0)" },
-            ]);
-            if (!animation)
-                continue;
-            activeMotionsRef.current.set(key, { element: node, animation });
-            const clearMotion = () => {
-                if (activeMotionsRef.current.get(key)?.animation === animation) {
-                    activeMotionsRef.current.delete(key);
-                }
-            };
-            animation.onfinish = clearMotion;
-            animation.oncancel = clearMotion;
-        }
-        for (const [key, before] of visualPrevious.entries()) {
-            if (current.has(key) || !key.startsWith("tool:"))
-                continue;
-            const ghost = before.clone;
-            prepareToolStackExitClone(ghost, before);
-            document.body?.appendChild(ghost);
-            if (!ghost.isConnected)
-                continue;
-            const targetTop = summaryRect?.top ?? before.top - 8;
-            const targetLeft = summaryRect?.left ?? before.left;
-            const animation = startToolStackAnimation(ghost, [
-                { transform: "translate3d(0, 0, 0)", opacity: 1 },
-                {
-                    transform: `translate3d(${targetLeft - before.left}px, ${targetTop - before.top}px, 0)`,
-                    opacity: 0,
-                },
-            ]);
-            if (!animation) {
-                ghost.remove();
-                continue;
-            }
-            exitAnimationsRef.current.set(ghost, animation);
-            const clearExit = () => {
-                if (exitAnimationsRef.current.get(ghost) === animation) {
-                    exitAnimationsRef.current.delete(ghost);
-                }
-                ghost.remove();
-            };
-            animation.onfinish = clearExit;
-            animation.oncancel = clearExit;
-        }
-    });
-    useEffect(() => {
-        return () => {
-            for (const { animation } of activeMotionsRef.current.values()) {
-                animation.cancel();
-            }
-            activeMotionsRef.current.clear();
-            for (const [ghost, animation] of exitAnimationsRef.current) {
-                animation.cancel();
-                ghost.remove();
-            }
-            exitAnimationsRef.current.clear();
-        };
-    }, []);
-    return (_jsx("div", { ref: stackRef, className: cn("agent-tool-call-stack", className), children: children }));
+    return (_jsx("div", { className: cn("agent-tool-call-stack", className), children: children }));
 }
 export const ApprovalContext = React.createContext(null);
 /** Pending human-in-the-loop gate still waiting for Approve/Deny. */
@@ -231,18 +38,8 @@ export function toolCallHasPendingApproval(part) {
         approval.dismissed !== true);
 }
 export const TOOL_LONG_RUNNING_HINT_DELAY_MS = 45_000;
-export function ToolActivityPresentation({ toolName, isRunning, isActiveTail, toolCallId, suppressLongRunningHint = false, children, }) {
+export function ToolActivityPresentation({ toolName, isRunning, toolCallId, suppressLongRunningHint = false, children, }) {
     const [showLongRunningHint, setShowLongRunningHint] = useState(false);
-    // A batched update can first reveal a tool with its result already attached.
-    // Presentation follows the active chat tail rather than execution state so
-    // that newly revealed completed tools still get their entrance motion.
-    const [animateEntry, setAnimateEntry] = useState(isActiveTail);
-    useEffect(() => {
-        if (!animateEntry)
-            return;
-        const timeout = window.setTimeout(() => setAnimateEntry(false), TOOL_CALL_ENTRY_DURATION_MS);
-        return () => window.clearTimeout(timeout);
-    }, [animateEntry]);
     useEffect(() => {
         if (!isRunning || suppressLongRunningHint) {
             setShowLongRunningHint(false);
@@ -254,7 +51,7 @@ export function ToolActivityPresentation({ toolName, isRunning, isActiveTail, to
         }, TOOL_LONG_RUNNING_HINT_DELAY_MS);
         return () => window.clearTimeout(timeout);
     }, [isRunning, suppressLongRunningHint, toolName]);
-    return (_jsx("div", { className: cn("agent-tool-call", animateEntry && "agent-tool-call--entering"), "data-agent-tool-call-id": toolCallId, "data-running": isRunning ? "true" : undefined, children: _jsxs("div", { className: "agent-tool-call__content", children: [children, isRunning && showLongRunningHint && (_jsx("div", { className: "mt-0.5 px-2.5 pb-2 text-[11px] leading-snug text-muted-foreground/80", children: "Still working. Large updates can take a minute or two." }))] }) }));
+    return (_jsx("div", { className: "agent-tool-call", "data-agent-tool-call-id": toolCallId, "data-running": isRunning ? "true" : undefined, children: _jsxs("div", { className: "agent-tool-call__content", children: [children, isRunning && showLongRunningHint && (_jsx("div", { className: "mt-0.5 px-2.5 pb-2 text-[11px] leading-snug text-muted-foreground/80", children: "Still working. Large updates can take a minute or two." }))] }) }));
 }
 function stringifyToolValue(value, pretty = false) {
     if (typeof value === "string")
@@ -480,7 +277,7 @@ export function ToolCallDisplay({ toolName, toolCallId, argsText, args, result,
     // These must be separate components so hook order in ToolCallDisplayGeneric
     // is always stable (no conditional hook calls).
     const toolKind = structuredMeta?.toolKind;
-    const wrapToolDisplay = (children) => (_jsx(ToolActivityPresentation, { toolName: toolName, isRunning: isRunning, isActiveTail: showActiveTail, toolCallId: toolCallId, suppressLongRunningHint: toolName === "call-agent" || toolName.startsWith("agent:"), children: children }));
+    const wrapToolDisplay = (children) => (_jsx(ToolActivityPresentation, { toolName: toolName, isRunning: isRunning, toolCallId: toolCallId, suppressLongRunningHint: toolName === "call-agent" || toolName.startsWith("agent:"), children: children }));
     if (toolKind === "bash") {
         return wrapToolDisplay(_jsx(BashCell, { meta: structuredMeta, output: result, isRunning: isRunning }));
     }
@@ -642,7 +439,7 @@ function AgentCallCell({ agentName, activity, progress, responseText, isRunning,
 function AgentActivityToolCallRow({ tool, isActiveTail, }) {
     const isRunning = tool.status === "running";
     const ToolIcon = resolveToolIcon(tool.name);
-    return (_jsx(ToolActivityPresentation, { toolName: tool.name, isRunning: isRunning, isActiveTail: isActiveTail, toolCallId: tool.id, suppressLongRunningHint: true, children: _jsxs("div", { className: "my-0.5 flex w-full items-center gap-1.5 rounded-md py-0.5 text-left text-[13px] text-muted-foreground", children: [_jsx("span", { className: "flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin" })) : (_jsx(ToolIcon, { className: "size-3.5" })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: humanizeToolName(tool.name) })] }) }));
+    return (_jsx(ToolActivityPresentation, { toolName: tool.name, isRunning: isRunning, toolCallId: tool.id, suppressLongRunningHint: true, children: _jsxs("div", { className: "my-0.5 flex w-full items-center gap-1.5 rounded-md py-0.5 text-left text-[13px] text-muted-foreground", children: [_jsx("span", { className: "flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin" })) : (_jsx(ToolIcon, { className: "size-3.5" })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: humanizeToolName(tool.name) })] }) }));
 }
 // ─── ToolCallFallback ──────────────────────────────────────────────────────────
 export function ToolCallFallback({ toolName, toolCallId, args, argsText, result, ...rest }) {

package/dist/client/chat-first/apps-rail.js

@@ -15,12 +15,12 @@ function AppRows({ apps, activeAppId, layout, onDragStart, onDrop, onDragEnd, on
             const active = activeAppId === app.id;
             const pinned = layout.pinnedIds.includes(app.id);
             const index = orderedApps.indexOf(app);
-            return (_jsxs(ContextMenu, { children: [_jsx(ContextMenuTrigger, { asChild: true, children: _jsxs("li", { draggable: true, "data-chat-first-app": true, "data-app-id": app.id, className: cn("group flex h-8 w-full min-w-0 items-center gap-1 rounded-md px-1 text-sm", active
+            return (_jsxs(ContextMenu, { children: [_jsx(ContextMenuTrigger, { asChild: true, children: _jsxs("li", { draggable: true, "data-chat-first-app": true, "data-app-id": app.id, className: cn("group flex h-8 w-full min-w-0 items-center gap-1 rounded-md px-0 text-sm", active
                                 ? "bg-sidebar-accent font-medium text-sidebar-accent-foreground"
                                 : "text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"), onDragStart: (event) => {
                                 event.dataTransfer.effectAllowed = "move";
                                 onDragStart(app.id);
-                            }, onDragOver: (event) => event.preventDefault(), onDrop: () => onDrop(app.id), onDragEnd: onDragEnd, children: [_jsxs("button", { type: "button", className: "flex h-full min-w-0 flex-1 items-center gap-2 px-1 text-start", onClick: () => onOpenApp(app), onKeyDown: (event) => {
+                            }, onDragOver: (event) => event.preventDefault(), onDrop: () => onDrop(app.id), onDragEnd: onDragEnd, children: [_jsxs("button", { type: "button", className: "flex h-full min-w-0 flex-1 items-center gap-2 px-2 text-start", onClick: () => onOpenApp(app), onKeyDown: (event) => {
                                         if (!event.altKey)
                                             return;
                                         if (event.key === "ArrowUp") {
@@ -99,5 +99,5 @@ export const ChatFirstAppsRail = memo(function ChatFirstAppsRail({ apps, activeA
                             ? "bg-sidebar-accent text-sidebar-accent-foreground"
                             : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"), onClick: () => onOpenApp(app), "aria-label": copy("openApp", { name: app.name }), title: app.name, children: renderIcon(app) }, app.id))), onOpenAllApps ? (_jsx("button", { type: "button", "data-chat-first-all-apps": true, className: "flex size-9 items-center justify-center rounded-md text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground", onClick: onOpenAllApps, "aria-label": copy("allApps"), title: copy("allApps"), children: _jsx(IconApps, { size: 16, "aria-hidden": "true" }) })) : null, error ? (_jsx("span", { className: "size-1.5 rounded-full bg-destructive", title: error, "aria-label": error })) : null] }));
     }
-    return (_jsxs("section", { "data-chat-first-apps-rail": true, className: "mt-3 px-2 pb-2 pt-2", "aria-label": copy("workspaceApps"), children: [_jsxs("div", { className: "mb-1 flex items-center gap-1.5 px-1 text-[11px] font-medium text-sidebar-foreground/50", children: [_jsx("span", { children: copy("workspaceApps") }), _jsx("span", { className: "ml-auto", children: createTrigger })] }), loading && apps.length === 0 ? (_jsx("div", { className: "space-y-0.5 px-1", children: [0, 1, 2].map((index) => (_jsx(Skeleton, { className: "h-8 w-full rounded-md" }, index))) })) : apps.length === 0 ? (_jsxs("div", { className: "px-1", children: [_jsx("p", { className: "text-xs text-sidebar-foreground/55", children: copy("noWorkspaceApps") }), createAppTrigger ? (createTrigger) : onCreateApp ? (_jsxs("button", { type: "button", className: "mt-1 inline-flex h-6 items-center gap-1.5 rounded-md border border-sidebar-border px-2 text-xs text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onCreateApp, children: [_jsx(IconPlus, { size: 13, "aria-hidden": "true" }), copy("createApp")] })) : (createTrigger)] })) : (_jsx(AppRows, { apps: visibleApps, activeAppId: activeAppId, layout: layout, onDragStart: setDraggedAppId, onDrop: reorderApps, onDragEnd: () => setDraggedAppId(null), onOpenApp: onOpenApp, onTogglePinned: togglePinned, onMove: moveApp, renderIcon: renderIcon, copy: copy })), hasMoreApps || showAllApps ? (_jsxs("button", { type: "button", className: "mt-0.5 flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/50 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: () => setShowAllApps((value) => !value), children: [showAllApps ? (_jsx(IconChevronUp, { size: 14, "aria-hidden": "true" })) : (_jsx(IconChevronDown, { size: 14, "aria-hidden": "true" })), showAllApps ? copy("showLess") : copy("showMore")] })) : null, onOpenAllApps ? (_jsx("div", { className: "mt-1 border-t border-sidebar-border/60 pt-1", children: _jsxs("button", { type: "button", "data-chat-first-all-apps": true, className: "flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/55 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onOpenAllApps, children: [_jsx(IconApps, { size: 14, "aria-hidden": "true" }), _jsx("span", { children: copy("allApps") })] }) })) : null, error ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("button", { type: "button", className: "mt-1 flex items-center gap-1 px-1 text-[10px] text-destructive/80", onClick: onRetry, "aria-label": error, children: [_jsx("span", { className: "size-1.5 rounded-full bg-destructive" }), onRetry ? copy("retry") : copy("appsLoadError")] }) }), _jsx(TooltipContent, { side: "right", children: error })] })) : null] }));
+    return (_jsxs("section", { "data-chat-first-apps-rail": true, className: "mt-3 px-2 pb-2 pt-2", "aria-label": copy("workspaceApps"), children: [_jsxs("div", { className: "mb-1 flex items-center gap-1.5 px-2 text-[11px] font-medium text-sidebar-foreground/50", children: [_jsx("span", { children: copy("workspaceApps") }), _jsx("span", { className: "ml-auto", children: createTrigger })] }), loading && apps.length === 0 ? (_jsx("div", { className: "space-y-0.5 px-2", children: [0, 1, 2].map((index) => (_jsx(Skeleton, { className: "h-8 w-full rounded-md" }, index))) })) : apps.length === 0 ? (_jsxs("div", { className: "px-2", children: [_jsx("p", { className: "text-xs text-sidebar-foreground/55", children: copy("noWorkspaceApps") }), createAppTrigger ? (createTrigger) : onCreateApp ? (_jsxs("button", { type: "button", className: "mt-1 inline-flex h-6 items-center gap-1.5 rounded-md border border-sidebar-border px-2 text-xs text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onCreateApp, children: [_jsx(IconPlus, { size: 13, "aria-hidden": "true" }), copy("createApp")] })) : (createTrigger)] })) : (_jsx(AppRows, { apps: visibleApps, activeAppId: activeAppId, layout: layout, onDragStart: setDraggedAppId, onDrop: reorderApps, onDragEnd: () => setDraggedAppId(null), onOpenApp: onOpenApp, onTogglePinned: togglePinned, onMove: moveApp, renderIcon: renderIcon, copy: copy })), hasMoreApps || showAllApps ? (_jsxs("button", { type: "button", className: "mt-0.5 flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/50 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: () => setShowAllApps((value) => !value), children: [showAllApps ? (_jsx(IconChevronUp, { size: 14, "aria-hidden": "true" })) : (_jsx(IconChevronDown, { size: 14, "aria-hidden": "true" })), showAllApps ? copy("showLess") : copy("showMore")] })) : null, onOpenAllApps ? (_jsx("div", { className: "mt-1 border-t border-sidebar-border/60 pt-1", children: _jsxs("button", { type: "button", "data-chat-first-all-apps": true, className: "flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/55 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onOpenAllApps, children: [_jsx(IconApps, { size: 14, "aria-hidden": "true" }), _jsx("span", { children: copy("allApps") })] }) })) : null, error ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("button", { type: "button", className: "mt-1 flex items-center gap-1 px-2 text-[10px] text-destructive/80", onClick: onRetry, "aria-label": error, children: [_jsx("span", { className: "size-1.5 rounded-full bg-destructive" }), onRetry ? copy("retry") : copy("appsLoadError")] }) }), _jsx(TooltipContent, { side: "right", children: error })] })) : null] }));
 });

package/dist/client/chat-first/browser-pane.js

@@ -17,6 +17,9 @@ export function ChatFirstBrowserPane({ url, title, status, statusMessage, onClos
         setHistoryIndex(0);
         setNavigationError(null);
     }, [url]);
+    const currentTarget = resolveChatFirstBrowserTarget({ url: currentUrl });
+    const isExternalOnly = currentTarget.status === "ready" &&
+        currentTarget.target.openExternally === true;
     function navigate(event) {
         event.preventDefault();
         const target = resolveChatFirstBrowserTarget({ url: draftUrl });
@@ -56,7 +59,7 @@ export function ChatFirstBrowserPane({ url, title, status, statusMessage, onClos
     }
     return (_jsxs("section", { "data-chat-first-browser-pane": true, className: "flex h-full min-h-0 w-full flex-col overflow-hidden bg-background", "aria-label": copy("surface.browser.label"), children: [_jsxs("header", { className: "flex h-12 shrink-0 items-center gap-1.5 border-b border-border bg-card px-2", children: [_jsxs("div", { className: "flex shrink-0 items-center gap-0.5", children: [_jsx("button", { type: "button", disabled: historyIndex <= 0, onClick: goBack, "aria-label": copy("browserBack"), title: copy("browserBack"), className: "flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground disabled:opacity-35", children: _jsx(IconArrowLeft, { size: 15 }) }), _jsx("button", { type: "button", disabled: historyIndex >= history.length - 1, onClick: goForward, "aria-label": copy("browserForward"), title: copy("browserForward"), className: "flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground disabled:opacity-35", children: _jsx(IconArrowRight, { size: 15 }) }), _jsx("button", { type: "button", onClick: () => setReloadKey((key) => key + 1), "aria-label": copy("browserReload"), title: copy("browserReload"), className: "flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconRefresh, { size: 15 }) })] }), _jsxs("form", { className: "flex min-w-0 flex-1 items-center gap-1.5 rounded-md border border-input bg-background px-2", onSubmit: navigate, children: [_jsx(IconWorld, { size: 13, className: "shrink-0 text-muted-foreground", "aria-hidden": "true" }), _jsx("input", { value: draftUrl, onChange: (event) => setDraftUrl(event.target.value), "aria-label": copy("browserAddress"), spellCheck: false, className: "h-7 min-w-0 flex-1 bg-transparent text-xs text-foreground outline-none placeholder:text-muted-foreground" })] }), _jsxs("div", { className: "flex shrink-0 items-center gap-0.5", children: [title ? (_jsx("span", { className: "hidden max-w-28 truncate px-1 text-xs text-muted-foreground xl:block", title: title, children: title })) : null, _jsx("button", { type: "button", onClick: () => window.open(currentUrl, "_blank", "noopener,noreferrer"), "aria-label": copy("browserOpenExternal"), title: copy("browserOpenExternal"), className: "flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconExternalLink, { size: 15 }) }), _jsx("button", { type: "button", onClick: onClose, "aria-label": copy("browserClose"), title: copy("browserClose"), className: "flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { size: 15 }) })] })] }), navigationError ? (_jsx("p", { className: "border-b border-destructive/30 bg-destructive/10 px-3 py-1.5 text-xs text-destructive", role: "alert", children: navigationError })) : null, _jsx("div", { className: "relative min-h-0 flex-1 overflow-hidden", children: status === "starting" || status === "error" ? (_jsx("div", { className: "flex h-full items-center justify-center px-6 text-center", role: status === "error" ? "alert" : "status", "aria-live": "polite", children: _jsxs("div", { className: "max-w-xs space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-foreground", children: status === "starting"
                                     ? copy("browserPreviewStarting")
-                                    : copy("browserPreviewError") }), statusMessage ? (_jsx("p", { className: "text-xs text-muted-foreground", children: statusMessage })) : null] }) })) : (renderEmbed({
+                                    : copy("browserPreviewError") }), statusMessage ? (_jsx("p", { className: "text-xs text-muted-foreground", children: statusMessage })) : null] }) })) : isExternalOnly ? (_jsx("div", { className: "flex h-full items-center justify-center p-6 text-center", children: _jsxs("div", { className: "max-w-sm space-y-3", children: [_jsx("p", { className: "text-sm text-muted-foreground", children: copy("browserPreviewError") }), _jsxs("a", { href: currentUrl, target: "_blank", rel: "noopener noreferrer", className: "inline-flex items-center gap-1.5 rounded-md border border-border px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent", children: [_jsx(IconExternalLink, { size: 14, "aria-hidden": "true" }), copy("browserOpenExternal")] })] }) })) : (renderEmbed({
                     url: currentUrl,
                     title: title || copy("browserPage"),
                     key: `${currentUrl}:${reloadKey}`,