@agent-native/core 0.154.5 → 0.155.0

package/dist/cli/workspacify.d.ts

@@ -17,6 +17,11 @@ export interface WorkspacifyOptions {
     toolkitDependencyVersion?: string;
 }
 export declare function workspacifyApp(opts: WorkspacifyOptions): void;
+export declare function removeCopiedFrameworkSkills(appDir: string, options?: {
+    workspaceRoot?: string;
+    allowUnverified?: boolean;
+}): string[];
+export declare function linkDefaultWorkspaceSkills(appDir: string, workspaceRoot: string): string[];
 /**
  * Parse a workspace core package name into its npm scope.
  *   "@my-company/shared" → "my-company"

package/dist/cli/workspacify.js

@@ -144,27 +144,83 @@ export function workspacifyApp(opts) {
     }
 }
 function linkInheritedWorkspaceSkills(opts) {
-    const appSkillsDir = path.join(opts.appDir, ".agents", "skills");
     const workspaceSkillsDir = path.join(opts.workspaceRoot, ".agents", "skills");
     if (!fs.existsSync(workspaceSkillsDir))
         return;
-    fs.mkdirSync(appSkillsDir, { recursive: true });
+    removeCopiedFrameworkSkills(opts.appDir, { allowUnverified: true });
+    linkDefaultWorkspaceSkills(opts.appDir, opts.workspaceRoot);
+}
+function skillDirContentsMatch(sourceDir, targetDir) {
+    const sourceStat = fs.lstatSync(sourceDir, { throwIfNoEntry: false });
+    const targetStat = fs.lstatSync(targetDir, { throwIfNoEntry: false });
+    if (!sourceStat?.isDirectory() || !targetStat?.isDirectory())
+        return false;
+    const sourceEntries = fs.readdirSync(sourceDir, { withFileTypes: true });
+    const targetEntries = fs.readdirSync(targetDir, { withFileTypes: true });
+    if (sourceEntries.length !== targetEntries.length)
+        return false;
+    return sourceEntries.every((sourceEntry) => {
+        const sourcePath = path.join(sourceDir, sourceEntry.name);
+        const targetPath = path.join(targetDir, sourceEntry.name);
+        const targetEntry = targetEntries.find((entry) => entry.name === sourceEntry.name);
+        if (!targetEntry)
+            return false;
+        if (sourceEntry.isSymbolicLink()) {
+            return (targetEntry.isSymbolicLink() &&
+                fs.readlinkSync(sourcePath) === fs.readlinkSync(targetPath));
+        }
+        if (sourceEntry.isDirectory()) {
+            return (targetEntry.isDirectory() &&
+                skillDirContentsMatch(sourcePath, targetPath));
+        }
+        return (sourceEntry.isFile() &&
+            targetEntry.isFile() &&
+            fs.readFileSync(sourcePath).equals(fs.readFileSync(targetPath)));
+    });
+}
+export function removeCopiedFrameworkSkills(appDir, options = {}) {
+    const appSkillsDir = path.join(appDir, ".agents", "skills");
+    const workspaceSkillsDir = options.workspaceRoot
+        ? path.join(options.workspaceRoot, ".agents", "skills")
+        : undefined;
+    const preserved = [];
     for (const skill of FRAMEWORK_TEMPLATE_SHARED_SKILLS) {
         const localPath = path.join(appSkillsDir, skill);
-        if (fs.existsSync(localPath) ||
-            fs.lstatSync(localPath, { throwIfNoEntry: false })) {
-            fs.rmSync(localPath, { recursive: true, force: true });
+        const stat = fs.lstatSync(localPath, { throwIfNoEntry: false });
+        if (!stat || stat.isSymbolicLink())
+            continue;
+        const workspacePath = workspaceSkillsDir
+            ? path.join(workspaceSkillsDir, skill)
+            : undefined;
+        if (!options.allowUnverified &&
+            (!workspacePath || !skillDirContentsMatch(workspacePath, localPath))) {
+            preserved.push(skill);
+            continue;
         }
+        fs.rmSync(localPath, { recursive: true, force: true });
     }
+    return preserved;
+}
+export function linkDefaultWorkspaceSkills(appDir, workspaceRoot) {
+    const appSkillsDir = path.join(appDir, ".agents", "skills");
+    const workspaceSkillsDir = path.join(workspaceRoot, ".agents", "skills");
+    if (!fs.existsSync(workspaceSkillsDir))
+        return [];
+    fs.mkdirSync(appSkillsDir, { recursive: true });
+    const preserved = [];
     for (const skill of DEFAULT_WORKSPACE_SKILLS) {
         const inheritedPath = path.join(workspaceSkillsDir, skill);
         if (!fs.existsSync(inheritedPath))
             continue;
         const linkPath = path.join(appSkillsDir, skill);
-        if (fs.existsSync(linkPath) ||
-            fs.lstatSync(linkPath, { throwIfNoEntry: false })) {
-            fs.rmSync(linkPath, { recursive: true, force: true });
+        const existing = fs.lstatSync(linkPath, { throwIfNoEntry: false });
+        if (existing &&
+            !existing.isSymbolicLink() &&
+            !skillDirContentsMatch(inheritedPath, linkPath)) {
+            preserved.push(skill);
+            continue;
         }
+        fs.rmSync(linkPath, { recursive: true, force: true });
         try {
             fs.symlinkSync(path.relative(appSkillsDir, inheritedPath), linkPath, "dir");
         }
@@ -172,6 +228,7 @@ function linkInheritedWorkspaceSkills(opts) {
             throw new Error(`Could not link inherited workspace skill ${skill} into ${appSkillsDir}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
         }
     }
+    return preserved;
 }
 /**
  * The version an existing workspace already pins for a framework package.

package/dist/client/AgentPanel.d.ts

@@ -29,6 +29,11 @@ export declare function normalizeAgentPanelModeForSurface(mode: PanelMode, allow
 export declare function deferAgentPanelOverlayOpen(event: {
     preventDefault: () => void;
 }, closeMenu: () => void, openOverlay: () => void): void;
+export declare function consumeAgentPanelOverlayFocusRestore(pendingOverlayRef: {
+    current: boolean;
+}, event: {
+    preventDefault: () => void;
+}): void;
 export declare function getAgentPanelChatTabGroups(tabs: MultiTabAssistantChatHeaderProps["tabs"], activeTabId: string): {
     activeTab: import("./MultiTabAssistantChat.js").ChatTab | undefined;
     childTabs: import("./MultiTabAssistantChat.js").ChatTab[];

package/dist/client/AgentPanel.js

@@ -157,6 +157,12 @@ export function deferAgentPanelOverlayOpen(event, closeMenu, openOverlay) {
         setTimeout(openOverlay, 0);
     }
 }
+export function consumeAgentPanelOverlayFocusRestore(pendingOverlayRef, event) {
+    if (!pendingOverlayRef.current)
+        return;
+    pendingOverlayRef.current = false;
+    event.preventDefault();
+}
 function useAvailableClis() {
     const [clis, setClis] = useState([]);
     useEffect(() => {
@@ -667,6 +673,11 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
     const [headerMenuOpen, setHeaderMenuOpen] = useState(false);
     const [feedbackOpen, setFeedbackOpen] = useState(false);
     const [shareFromMenuOpen, setShareFromMenuOpen] = useState(false);
+    const preventHeaderMenuFocusRestoreRef = useRef(false);
+    const closeHeaderMenuForOverlay = useCallback(() => {
+        preventHeaderMenuFocusRestoreRef.current = true;
+        setHeaderMenuOpen(false);
+    }, []);
     const getChatThreadShareUrl = useCallback((threadId) => {
         if (typeof window === "undefined")
             return undefined;
@@ -712,7 +723,11 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                     }
                     return (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || "Chat", shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-7 w-7", defaultOpen: onCollapse && shareFromMenuOpen, onOpenChange: onCollapse ? setShareFromMenuOpen : undefined }));
                 })(), feedbackEnabled ? (_jsx(FeedbackButton, { variant: "icon", side: "bottom", align: "end", chatSessionId: activeChatSessionId, chatStorageKey: storageKey, open: feedbackOpen, onOpenChange: setFeedbackOpen, trigger: _jsx("button", { type: "button", tabIndex: -1, "aria-hidden": "true", className: "pointer-events-none absolute end-0 top-full h-px w-px opacity-0" }) })) : null, mode === "chat" && (_jsx(IconTooltip, { content: t("agentPanel.newChat"), children: _jsx("button", { onClick: addTab, "aria-label": t("agentPanel.newChat"), className: "flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", children: _jsx(IconPlus, { size: 14 }) }) })), !onCollapse && mode === "cli" && canUseCodeTools && (_jsx(IconTooltip, { content: t("agentPanel.newTerminal"), children: _jsx("button", { onClick: addCliTab, "aria-label": t("agentPanel.newTerminal"), className: "flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", children: _jsx(IconPlus, { size: 14 }) }) })), _jsxs(DropdownMenu, { open: headerMenuOpen, onOpenChange: setHeaderMenuOpen, children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx("button", { className: cn("flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", (headerMenuOpen || mode === "settings") &&
-                                "bg-accent text-foreground"), "aria-label": t("agentPanel.panelOptions"), children: _jsx(IconDotsVertical, { size: 14 }) }) }), _jsxs(DropdownMenuContent, { align: "end", sideOffset: 6, className: "w-48", children: [onCollapse && (_jsxs(_Fragment, { children: [_jsxs(DropdownMenuItem, { onSelect: onCollapse, children: [_jsx(IconLayoutSidebarRightCollapse, { size: 14, className: "shrink-0" }), t("agentPanel.collapseSidebar"), _jsx(DropdownMenuShortcut, { children: toggleSidebarHint })] }), _jsx(DropdownMenuSeparator, {})] })), onCollapse && mode === "chat" && wideDrawerAction ? (_jsxs(DropdownMenuItem, { onSelect: wideDrawerAction, children: [_jsx(IconArrowsHorizontal, { size: 14, className: "shrink-0" }), wideDrawerLabel, _jsx(DropdownMenuShortcut, { children: widenChatHint })] })) : null, fullViewAction?.kind === "callback" && onFullViewRequest ? (_jsxs(DropdownMenuItem, { onSelect: onFullViewRequest, "aria-label": t("agentPanel.openFullView"), children: [_jsx(IconArrowsMaximize, { size: 14, className: "shrink-0" }), t("agentPanel.openFullView")] })) : fullViewAction?.kind === "link" ? (_jsx(DropdownMenuItem, { asChild: true, children: _jsxs(Link, { to: fullViewAction.href, "aria-label": t("agentPanel.openFullView"), children: [_jsx(IconArrowsMaximize, { size: 14, className: "shrink-0" }), t("agentPanel.openFullView")] }) })) : null, (onCollapse && mode === "chat" && wideDrawerAction) ||
+                                "bg-accent text-foreground"), "aria-label": t("agentPanel.panelOptions"), children: _jsx(IconDotsVertical, { size: 14 }) }) }), _jsxs(DropdownMenuContent, { align: "end", sideOffset: 6, className: "w-48", onCloseAutoFocus: (event) => {
+                            // A sibling overlay owns focus next; restoring it to the menu
+                            // trigger would dismiss that overlay as an outside interaction.
+                            consumeAgentPanelOverlayFocusRestore(preventHeaderMenuFocusRestoreRef, event);
+                        }, children: [onCollapse && (_jsxs(_Fragment, { children: [_jsxs(DropdownMenuItem, { onSelect: onCollapse, children: [_jsx(IconLayoutSidebarRightCollapse, { size: 14, className: "shrink-0" }), t("agentPanel.collapseSidebar"), _jsx(DropdownMenuShortcut, { children: toggleSidebarHint })] }), _jsx(DropdownMenuSeparator, {})] })), onCollapse && mode === "chat" && wideDrawerAction ? (_jsxs(DropdownMenuItem, { onSelect: wideDrawerAction, children: [_jsx(IconArrowsHorizontal, { size: 14, className: "shrink-0" }), wideDrawerLabel, _jsx(DropdownMenuShortcut, { children: widenChatHint })] })) : null, fullViewAction?.kind === "callback" && onFullViewRequest ? (_jsxs(DropdownMenuItem, { onSelect: onFullViewRequest, "aria-label": t("agentPanel.openFullView"), children: [_jsx(IconArrowsMaximize, { size: 14, className: "shrink-0" }), t("agentPanel.openFullView")] })) : fullViewAction?.kind === "link" ? (_jsx(DropdownMenuItem, { asChild: true, children: _jsxs(Link, { to: fullViewAction.href, "aria-label": t("agentPanel.openFullView"), children: [_jsx(IconArrowsMaximize, { size: 14, className: "shrink-0" }), t("agentPanel.openFullView")] }) })) : null, (onCollapse && mode === "chat" && wideDrawerAction) ||
                                 fullViewAction ? (_jsx(DropdownMenuSeparator, {})) : null, onCollapse && mode === "chat" && (_jsxs(_Fragment, { children: [_jsxs(DropdownMenuItem, { onSelect: addTab, children: [_jsx(IconPlus, { size: 14, className: "shrink-0" }), t("agentPanel.newChat")] }), (() => {
                                         const activeTab = activeChatSessionId
                                             ? tabs.find((tab) => tab.id === activeChatSessionId)
@@ -721,18 +736,19 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                             (activeTabMessageCount <= 0 && activeTab.status === "idle")) {
                                             return null;
                                         }
-                                        return (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, () => setHeaderMenuOpen(false), () => setShareFromMenuOpen(true)), children: [_jsx(IconShare3, { size: 14, className: "shrink-0" }), "Share"] }));
-                                    })()] })), mode === "chat" && toggleHistory && (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, () => setHeaderMenuOpen(false), toggleHistory), children: [_jsx(IconHistory, { size: 14, className: "shrink-0" }), showHistory
+                                        return (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, closeHeaderMenuForOverlay, () => setShareFromMenuOpen(true)), children: [_jsx(IconShare3, { size: 14, className: "shrink-0" }), "Share"] }));
+                                    })()] })), mode === "chat" && toggleHistory && (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, closeHeaderMenuForOverlay, toggleHistory), children: [_jsx(IconHistory, { size: 14, className: "shrink-0" }), showHistory
                                         ? t("agentPanel.hideChats")
                                         : t("agentPanel.allChats")] })), mode === "chat" && (_jsx(RunsTrayMenuItem, { pollMs: 0, limit: 12, showRecent: true, onOpenThread: openRunThread })), mode === "chat" && _jsx(DropdownMenuSeparator, {}), mode === "cli" && availableClis.length > 0 && (_jsxs(_Fragment, { children: [availableClis.map((cli) => (_jsxs(DropdownMenuItem, { onSelect: () => selectCli(cli.command), className: cn(cli.command === selectedCli
                                             ? "font-medium"
-                                            : "text-muted-foreground"), children: [cli.command === selectedCli ? (_jsx(IconCheck, { size: 12, className: "shrink-0" })) : (_jsx("span", { className: "w-3" })), cli.label] }, cli.command))), _jsx(DropdownMenuSeparator, {})] })), allowSettingsMode && (_jsxs(DropdownMenuItem, { onSelect: () => switchMode("settings"), className: cn(mode === "settings" ? "font-medium" : "text-muted-foreground"), children: [_jsx(IconSettings, { size: 14, className: "shrink-0" }), t("agentPanel.settings")] })), feedbackEnabled ? (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, () => setHeaderMenuOpen(false), () => setFeedbackOpen(true)), children: [_jsx(IconMessageDots, { size: 14, className: "shrink-0" }), t("agentPanel.feedback")] })) : null, ((mode === "chat" && activeTabId) ||
+                                            : "text-muted-foreground"), children: [cli.command === selectedCli ? (_jsx(IconCheck, { size: 12, className: "shrink-0" })) : (_jsx("span", { className: "w-3" })), cli.label] }, cli.command))), _jsx(DropdownMenuSeparator, {})] })), allowSettingsMode && (_jsxs(DropdownMenuItem, { onSelect: () => switchMode("settings"), className: cn(mode === "settings" ? "font-medium" : "text-muted-foreground"), children: [_jsx(IconSettings, { size: 14, className: "shrink-0" }), t("agentPanel.settings")] })), feedbackEnabled ? (_jsxs(DropdownMenuItem, { onSelect: (event) => deferAgentPanelOverlayOpen(event, closeHeaderMenuForOverlay, () => setFeedbackOpen(true)), children: [_jsx(IconMessageDots, { size: 14, className: "shrink-0" }), t("agentPanel.feedback")] })) : null, ((mode === "chat" && activeTabId) ||
                                 (mode === "cli" && canUseCodeTools && activeCliTab)) && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), mode === "chat" ? (shouldShowAgentPanelChatTabBar(tabs, activeTabId) ? (_jsxs(_Fragment, { children: [_jsxs(DropdownMenuItem, { onSelect: () => closeTab(activeTabId), children: [_jsx(IconX, { size: 14, className: "shrink-0" }), t("agentPanel.closeTab"), _jsx(DropdownMenuShortcut, { children: closeTabHint })] }), _jsx(DropdownMenuItem, { onSelect: () => closeOtherTabs(activeTabId), children: t("agentPanel.closeOtherTabs") }), _jsxs(DropdownMenuItem, { onSelect: () => closeAllTabs(), children: [t("agentPanel.closeAllTabs"), _jsx(DropdownMenuShortcut, { children: closeAllTabsHint })] })] })) : (_jsxs(DropdownMenuItem, { onSelect: clearActiveTab, children: [_jsx(IconX, { size: 14, className: "shrink-0" }), t("agentPanel.clearChat")] }))) : (_jsxs(_Fragment, { children: [_jsxs(DropdownMenuItem, { onSelect: () => closeCliTab(activeCliTab), children: [_jsx(IconX, { size: 14, className: "shrink-0" }), t("agentPanel.closeTab"), _jsx(DropdownMenuShortcut, { children: closeTabHint })] }), _jsx(DropdownMenuItem, { onSelect: () => closeOtherCliTabs(activeCliTab), children: t("agentPanel.closeOtherTabs") }), _jsxs(DropdownMenuItem, { onSelect: () => closeAllCliTabs(), children: [t("agentPanel.closeAllTabs"), _jsx(DropdownMenuShortcut, { children: closeAllTabsHint })] })] }))] }))] })] }), onCollapse && (_jsx(IconTooltip, { content: t("agentPanel.collapseSidebar"), children: _jsx("button", { type: "button", onClick: onCollapse, "aria-label": t("agentPanel.collapseSidebar"), className: "flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", children: _jsx(IconX, { size: 14 }) }) }))] })), [
         activeCliTab,
         addCliTab,
         allowSettingsMode,
         availableClis,
         canUseCodeTools,
+        closeHeaderMenuForOverlay,
         closeAllCliTabs,
         closeAllTabsHint,
         closeCliTab,

package/dist/client/AssistantChat.d.ts

@@ -90,6 +90,27 @@ export declare function settleInterruptedAssistantToolCallsInRepo<T extends {
 };
 export declare function waitForThreadRunToClear(apiUrl: string, threadId?: string): Promise<boolean>;
 export declare function reconnectActivityFallbackContent(toolName: string | null | undefined): ContentPart[];
+/**
+ * Whether the reconnect overlay — a SECOND fold of a run, rendered as a sibling
+ * of the message list — may appear.
+ *
+ * The adapter runtime and the reconnect reader both fold the same SSE events
+ * into their own accumulator. Whenever both are on screen the user sees the
+ * turn twice: duplicate tool cards (one spinning, one static) and the final
+ * message streaming in two places. Content-similarity dedupe cannot reliably
+ * hide the second copy, because the two readers disagree on tool-call identity
+ * (id-less activity cards get reader-local ids) and on how a turn is split
+ * across assistant messages.
+ *
+ * So ownership decides visibility, not similarity: if a runtime owns the turn,
+ * the overlay does not render. Keep this a pure function — it is the invariant
+ * the duplicate-render bug kept violating, and it must stay falsifiable.
+ */
+export declare function shouldShowReconnectOverlay(state: {
+    isRuntimeRunning: boolean;
+    isReconnecting: boolean;
+    reconnectFrozen: boolean;
+}): boolean;
 export declare function dedupeReconnectContentAgainstMessages(content: ContentPart[], messages: readonly unknown[], options?: {
     suppressToolRepeats?: boolean;
     trimTailTextOverlap?: boolean;

package/dist/client/AssistantChat.js

@@ -35,6 +35,7 @@ import { GuidedQuestionFlow, useGuidedQuestionFlow, } from "./guided-questions.j
 import { buildSignInReturnHref } from "./require-session.js";
 import { addMcpConnectionCompleteListener, consumeMcpConnectionResume, } from "./resources/mcp-connection-resume.js";
 import { McpConnectionSuggestion } from "./resources/McpConnectionSuggestion.js";
+import { claimRunStream, createRunStreamToken, ownsRunStream, releaseRunStream, } from "./run-stream-ownership.js";
 import { AgentAutoContinueSignal, readSSEStreamRaw, settleInterruptedToolCalls, } from "./sse-event-processor.js";
 import { useAgentEngineConfigured } from "./use-agent-engine-configured.js";
 import { useDevMode } from "./use-dev-mode.js";
@@ -786,6 +787,27 @@ function trimReconnectTextAlreadyRendered(content, renderedAssistantText, option
     }
     return changed ? next : content;
 }
+/**
+ * Whether the reconnect overlay — a SECOND fold of a run, rendered as a sibling
+ * of the message list — may appear.
+ *
+ * The adapter runtime and the reconnect reader both fold the same SSE events
+ * into their own accumulator. Whenever both are on screen the user sees the
+ * turn twice: duplicate tool cards (one spinning, one static) and the final
+ * message streaming in two places. Content-similarity dedupe cannot reliably
+ * hide the second copy, because the two readers disagree on tool-call identity
+ * (id-less activity cards get reader-local ids) and on how a turn is split
+ * across assistant messages.
+ *
+ * So ownership decides visibility, not similarity: if a runtime owns the turn,
+ * the overlay does not render. Keep this a pure function — it is the invariant
+ * the duplicate-render bug kept violating, and it must stay falsifiable.
+ */
+export function shouldShowReconnectOverlay(state) {
+    if (state.isRuntimeRunning)
+        return false;
+    return state.isReconnecting || state.reconnectFrozen;
+}
 export function dedupeReconnectContentAgainstMessages(content, messages, options) {
     if (content.length === 0)
         return content;
@@ -1605,7 +1627,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const [reconnectFrozen, setReconnectFrozen] = useState(false);
     // Adapter took over while reconnect still had visible tool cards — keep the
     // overlay until the adapter message catches up so we don't flash an empty gap.
-    const [adapterHandoffPending, setAdapterHandoffPending] = useState(false);
     const reconnectRunIdRef = useRef(null);
     const reconnectTurnIdRef = useRef(null);
     const reconnectTailOnlyRef = useRef(false);
@@ -1624,7 +1645,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         setIsReconnecting(false);
         setReconnectFrozen(false);
         setReconnectContent([]);
-        setAdapterHandoffPending(false);
         setPendingReconnectRecovery(null);
         resetRunningActivity();
     }, [resetRunningActivity]);
@@ -1702,14 +1722,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isReconnecting,
         hasReconnectContent: reconnectContent.length > 0,
     });
-    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen || adapterHandoffPending
+    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen
         ? reconnectActivityFallbackContent(runningActivityTool)
-        : [], [
-        adapterHandoffPending,
-        isReconnecting,
-        reconnectFrozen,
-        runningActivityTool,
-    ]);
+        : [], [isReconnecting, reconnectFrozen, runningActivityTool]);
     const lastBroadcastRunningRef = useRef(isRunning);
     const tiptapRef = useRef(null);
     const focusComposerAfterConnectRef = useRef(false);
@@ -2010,6 +2025,13 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
             return false;
         }
+        // The refs above lag a render and are per-component-instance, while
+        // MultiTabAssistantChat mounts several instances against one run. The
+        // claim is the actual mutual exclusion: module-scoped, synchronous, and
+        // re-checked on every state write below.
+        const ownershipToken = createRunStreamToken(`reconnect:${runId}`);
+        if (!claimRunStream(threadId, runId, ownershipToken))
+            return false;
         // SUPERSEDE THE PREVIOUS RECONNECT GENERATION. A turn that keeps failing
         // (e.g. repeated stale_run at "Contacting model") produces a new runId
         // every few seconds; each call here used to OVERWRITE the single-slot
@@ -2050,7 +2072,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         });
         setIsReconnecting(true);
         setReconnectFrozen(false);
-        setAdapterHandoffPending(false);
         setReconnectContent([]);
         window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
             detail: { isRunning: true, tabId: tabId || threadId },
@@ -2197,7 +2218,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                         requestAnimationFrame(() => {
                             rafPending = false;
                             if (!reconnectOwnerMountedRef.current ||
-                                reconnectRunIdRef.current !== runId) {
+                                reconnectRunIdRef.current !== runId ||
+                                !ownsRunStream(threadId, runId, ownershipToken)) {
                                 return;
                             }
                             setReconnectContent(latestSnapshot);
@@ -2205,9 +2227,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     };
                     try {
                         await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate, (seq, isProgress) => {
+                            // The adapter can preempt this reader mid-stream. Advancing
+                            // the cursor after that would move a run this reader no
+                            // longer represents.
+                            if (!ownsRunStream(threadId, runId, ownershipToken))
+                                return;
                             markReconnectProgress();
                             reconnectRetryCount = 0;
-                            updateActiveRunSeq(seq, isProgress);
+                            updateActiveRunSeq(threadId, runId, seq, isProgress);
                         }, { preparingActionState });
                         if (reconnectAfterSeq === 0) {
                             setReconnectContent([...content]);
@@ -2255,6 +2282,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 threadPollEngine?.stop();
                 watchdog.stop();
                 clearInterval(idleCheck);
+                releaseRunStream(threadId, runId, ownershipToken);
             }
             // A newer reader, live adapter, stop action, or component unmount took
             // ownership while this async loop was unwinding. Do not let the stale
@@ -3192,11 +3220,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         prevIsRuntimeRunningRef.current = isRuntimeRunning;
         if (isRuntimeRunning && !wasRunning) {
             // SINGLE-READER OWNERSHIP: the adapter runtime just took over (a new run
-            // started or an adopted run resumed). Abort the reconnect reader, but keep
-            // its visible content until the adapter message has tool/text parts so the
-            // UI does not flash an empty gap between readers.
+            // started or an adopted run resumed), so it is now the only owner of this
+            // turn's rendering. The overlay used to be kept alive here for up to
+            // 2500ms so the UI would not flash a gap — but that deliberately put two
+            // independent folds of the same run on screen at once, and the only thing
+            // hiding the second was content-similarity guessing that fails whenever
+            // the two readers disagree (id-less activity cards, a turn split across
+            // several assistant messages). One owner, one surface: drop the overlay.
             if (reconnectRunIdRef.current !== null) {
-                const keepOverlay = reconnectContent.length > 0;
                 reconnectRunIdRef.current = null;
                 reconnectAbortRef.current?.abort();
                 reconnectAbortRef.current = null;
@@ -3204,56 +3235,18 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 setReconnectFrozen(false);
                 reconnectCanMaterializeRef.current = false;
                 reconnectTailOnlyRef.current = false;
-                if (keepOverlay) {
-                    setAdapterHandoffPending(true);
-                }
-                else {
-                    setReconnectContent([]);
-                    setAdapterHandoffPending(false);
-                }
+                setReconnectContent([]);
             }
             else if (reconnectFrozen) {
                 setReconnectFrozen(false);
                 setReconnectContent([]);
-                setAdapterHandoffPending(false);
                 reconnectCanMaterializeRef.current = false;
             }
             if (forceStopped) {
                 setForceStopped(false);
             }
         }
-    }, [
-        isRuntimeRunning,
-        reconnectFrozen,
-        forceStopped,
-        reconnectContent.length,
-    ]);
-    // Release the deferred reconnect overlay once thread messages have caught
-    // up enough that dedupe would hide the overlay, or after a short timeout so
-    // a stuck handoff cannot leave duplicate tool cards forever.
-    useEffect(() => {
-        if (!adapterHandoffPending)
-            return;
-        if (!isRuntimeRunning) {
-            setReconnectContent([]);
-            setAdapterHandoffPending(false);
-            return;
-        }
-        const stillNeeded = dedupeReconnectContentAgainstMessages(reconnectContent, messages, {
-            suppressToolRepeats: true,
-            trimTailTextOverlap: true,
-        }).length > 0;
-        if (!stillNeeded) {
-            setReconnectContent([]);
-            setAdapterHandoffPending(false);
-            return;
-        }
-        const timer = window.setTimeout(() => {
-            setReconnectContent([]);
-            setAdapterHandoffPending(false);
-        }, 2500);
-        return () => window.clearTimeout(timer);
-    }, [adapterHandoffPending, isRuntimeRunning, messages, reconnectContent]);
+    }, [isRuntimeRunning, reconnectFrozen, forceStopped]);
     // Same transition guard for isReconnecting: only clear forceStopped on
     // the false→true edge (a new reconnect starting on page load).
     const prevIsReconnectingRef = useRef(isReconnecting);
@@ -3270,7 +3263,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (!reconnectCanMaterializeRef.current) {
             setReconnectFrozen(false);
             setReconnectContent([]);
-            setAdapterHandoffPending(false);
             return;
         }
         try {
@@ -3316,7 +3308,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             threadRuntime.import(ensureMessageMetadata(repo));
             setReconnectFrozen(false);
             setReconnectContent([]);
-            setAdapterHandoffPending(false);
             reconnectCanMaterializeRef.current = false;
             reconnectTurnIdRef.current = null;
         }
@@ -3453,7 +3444,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             reconnectAbortRef.current = null;
             reconnectRunIdRef.current = null;
             setIsReconnecting(false);
-            setAdapterHandoffPending(false);
             const shouldFreezeReconnectContent = !reconnectTailOnlyRef.current &&
                 reconnectCanMaterializeRef.current &&
                 reconnectContent.length > 0;
@@ -3844,8 +3834,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         // an ahead-of-the-thread reconnect copy visible creates the familiar
         // two-card stack while the adapter catches up, so prefer one row and
         // let the live message advance in place.
-        suppressToolRepeats: adapterHandoffPending || isReconnecting || reconnectFrozen,
-        trimTailTextOverlap: adapterHandoffPending || reconnectTailOnlyRef.current,
+        suppressToolRepeats: isReconnecting || reconnectFrozen,
+        trimTailTextOverlap: reconnectTailOnlyRef.current,
+    });
+    // The reconnect overlay is a SECOND fold of the same run, rendered as a
+    // sibling of the message list. It may only appear while no adapter runtime
+    // owns the turn. Deriving it from `isRuntimeRunning` at render time — rather
+    // than relying on an effect to clear the overlay's own flags afterwards —
+    // is what makes two streaming copies structurally impossible instead of
+    // merely unlikely; the effect below runs a frame too late to prevent it.
+    const showReconnectOverlay = shouldShowReconnectOverlay({
+        isRuntimeRunning,
+        isReconnecting,
+        reconnectFrozen,
     });
     const latestMessage = messages[messages.length - 1];
     const reconnectStatusContent = visibleReconnectContent.length > 0
@@ -4039,7 +4040,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         getApprovalResolution,
         onApprovalResolved: recordApprovalResolution,
         onApprove: (approvalKey) => {
-            void addToQueue("Approved. Go ahead and run the requested action.", undefined, undefined, undefined, undefined, "queued", undefined, false, false, false, false, undefined, [approvalKey]);
+            void addToQueue("Approved. Go ahead and run the requested action.", undefined, undefined, undefined, undefined, "queued", undefined, false, false, false, true, // hideUserMessage: this is a protocol continuation, not a new prompt
+            undefined, [approvalKey]);
         },
         ...(approvalActions?.onDeny ? { onDeny: approvalActions.onDeny } : {}),
         ...(approvalActions?.onAlwaysAllow
@@ -4126,12 +4128,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                 setDismissedRunErrorKey(visibleRunErrorKey);
                                                                                             }
                                                                                             setRunErrorInfo(null);
-                                                                                        } }) })), (isReconnecting ||
-                                                                                    reconnectFrozen ||
-                                                                                    adapterHandoffPending) &&
-                                                                                    visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent, allowActivitySpinner: !reconnectFrozen }) })), (isReconnecting ||
-                                                                                    reconnectFrozen ||
-                                                                                    adapterHandoffPending) &&
+                                                                                        } }) })), showReconnectOverlay &&
+                                                                                    visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent, allowActivitySpinner: !reconnectFrozen }) })), showReconnectOverlay &&
                                                                                     visibleReconnectContent.length === 0 &&
                                                                                     reconnectContent.length === 0 &&
                                                                                     reconnectActivityContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: reconnectActivityContent, allowActivitySpinner: !reconnectFrozen }) })), showGlobalRunningStatus && (_jsx(MessageScrollerItem, { children: _jsx(RunningActivityStatus, { label: runningStatusLabel }) })), visibleQueuedMessages.length > 0 && (_jsx(MessageScrollerItem, { children: _jsxs("div", { className: "flex items-center justify-end gap-1.5 pr-0.5 text-xs text-muted-foreground", children: [_jsx(IconClock, { className: "h-3 w-3" }), _jsxs("span", { children: [visibleQueuedMessages.length, " ", "queued"] })] }) })), visibleQueuedMessages.map((msg) => {

package/dist/client/active-run-state.d.ts

@@ -17,11 +17,24 @@ export interface PendingTurnState {
 }
 export declare function setActiveRun(state: ActiveRunState): void;
 export declare function getActiveRun(): ActiveRunState | null;
-export declare function updateActiveRunSeq(seq: number, isProgress?: boolean): void;
+/**
+ * Advance one run's resume cursor. Identity is required: the previous
+ * signature took only `seq` and wrote into whichever run happened to occupy
+ * the shared slot, so a second concurrent run silently corrupted the first
+ * run's cursor. An unknown run is ignored rather than created — a cursor with
+ * no matching stream is indistinguishable from a real one at replay time.
+ */
+export declare function updateActiveRunSeq(threadId: string, runId: string, seq: number, isProgress?: boolean): void;
 /** Whether this browser has received real progress for the matching run recently. */
 export declare function hasRecentActiveRunProgress(threadId: string | null | undefined, runId: string | null | undefined, thresholdMs: number, now?: number): boolean;
 export declare function updateActiveRunActivity(toolName: string | null | undefined): void;
 export declare function getActiveRunActivityTool(threadId: string, runId: string): string | null;
+/**
+ * Drop the focused-run pointer. The run's resume cursor is intentionally kept:
+ * callers fire this from many unrelated teardown paths, and deleting the
+ * cursor here is what previously made a later reconnect replay the run from
+ * its first event.
+ */
 export declare function clearActiveRun(): void;
 export declare function clearActiveRunIfMatches(threadId: string, runId: string): void;
 export declare function setPendingTurn(state: PendingTurnState): void;