@agent-native/core 0.154.5 → 0.157.0

package/dist/agent/thread-data-builder.js

@@ -94,8 +94,24 @@ export function buildAssistantMessage(events, runId, options = {}) {
             continue;
         }
         if (event.type === "tool_start") {
+            const explicitToolCallId = event.id?.trim();
+            // A tool_start whose id is already in this turn is a REPLAY, not a new
+            // call: the tool-call journal and zombie-ledger recovery paths re-emit
+            // tool_start/tool_done for calls that already ran in an interrupted
+            // chunk. The live client coalesces those onto the original card, so a
+            // blind push here persisted a second copy of a call the user had only
+            // ever seen once — the duplicate that appears only after a reload.
+            // Matching the tool name too, so an id reused across different tools
+            // stays two cards rather than being silently merged into one.
+            if (explicitToolCallId) {
+                const replayed = content.some((part) => part.type === "tool-call" &&
+                    part.toolCallId === explicitToolCallId &&
+                    part.toolName === (event.tool ?? "unknown"));
+                if (replayed)
+                    continue;
+            }
             toolCallCounter += 1;
-            const toolCallId = event.id?.trim() ||
+            const toolCallId = explicitToolCallId ||
                 (runId ? `${runId}:tc_${toolCallCounter}` : `tc_${toolCallCounter}`);
             const args = (event.input ?? {});
             content.push({

package/dist/agent/types.d.ts

@@ -186,6 +186,15 @@ export interface AgentChatRequest {
          */
         payloadRef?: boolean;
     };
+    /**
+     * Server-resolved action authorization carried across authenticated durable
+     * background dispatches. Normal client requests must not trust this field;
+     * the foreground handler deletes and replaces it before persistence.
+     */
+    __resolvedActionSurface?: {
+        orgId: string | null;
+        allowedActionNames: string[];
+    };
     /**
      * Stable identity for the logical assistant turn this request belongs to.
      * The client sends the SAME turnId for the initial POST and every

package/dist/cli/skills-content/help.js

@@ -73,7 +73,9 @@ run "npx @agent-native/core@latest recap setup" / "npx @agent-native/core@latest
 verify GitHub Actions. Docs: ${docsUrl("pr-visual-recap")}.
 
 The status/update commands inspect copied Agent Native skill folders and refresh
-their instruction files from the current @agent-native/core package. In generated
-apps/workspaces, "skills update scaffold --project" refreshes the framework
-skills copied into the scaffold and repairs AGENTS.md / CLAUDE.md and
-.agents/skills / .claude/skills compatibility links.`;
+their instruction files from the current @agent-native/core package. In a
+standalone generated app, "skills update scaffold --project" refreshes the
+framework skill copies. In a generated workspace, it refreshes workspace-core,
+removes stale generic framework copies, repairs inherited .agents/skills links
+for every app, and repairs AGENTS.md / CLAUDE.md / .claude/skills compatibility
+links.`;

package/dist/cli/skills.js

@@ -20,6 +20,7 @@ import { PR_VISUAL_RECAP_SETUP, writePrVisualRecapWorkflow } from "./recap.js";
 import { setupAgentSymlinks } from "./setup-agents.js";
 import { ASSETS_SKILL_MD, CANVAS_REFERENCE_MD, CONNECTION_REFERENCE_MD, CONTENT_SKILL_MD, DESIGN_EXPLORATION_SKILL_MD, DESIGN_VISUAL_EDIT_SKILL_MD, DOCUMENT_QUALITY_REFERENCE_MD, EXEMPLAR_REFERENCE_MD, HELP, LOCAL_FILES_REFERENCE_MD, REWIND_SKILL_MD, VISUAL_PLANS_SKILL_MD, VISUAL_RECAP_SKILL_MD, VISUALIZE_REPO_SKILL_MD, WIREFRAME_REFERENCE_MD, } from "./skills-content/index.js";
 import { createCliTelemetry } from "./telemetry.js";
+import { linkDefaultWorkspaceSkills, removeCopiedFrameworkSkills, } from "./workspacify.js";
 export { CANVAS_REFERENCE_MD, CONNECTION_REFERENCE_MD, DOCUMENT_QUALITY_REFERENCE_MD, EXEMPLAR_REFERENCE_MD, LOCAL_FILES_REFERENCE_MD, VISUAL_PLANS_SKILL_MD, VISUAL_RECAP_SKILL_MD, VISUALIZE_REPO_SKILL_MD, WIREFRAME_REFERENCE_MD, };
 export const BUILT_IN_APP_SKILLS = {
     assets: {
@@ -1401,6 +1402,17 @@ function repairScaffoldAgentLinks(states) {
                         continue;
                     const appDir = path.join(appsDir, entry.name);
                     if (fs.existsSync(path.join(appDir, "package.json"))) {
+                        const preserved = new Set([
+                            ...removeCopiedFrameworkSkills(appDir, {
+                                workspaceRoot: state.workspaceRoot,
+                            }),
+                            ...linkDefaultWorkspaceSkills(appDir, state.workspaceRoot),
+                        ]);
+                        if (preserved.size > 0) {
+                            console.warn(`[skills] Preserved app-local framework-named skills in ${appDir}: ${[
+                                ...preserved,
+                            ].join(", ")}. Migrate them explicitly before inheriting workspace copies.`);
+                        }
                         setupAgentSymlinks(appDir);
                         refreshCopiedClaudeSkills(appDir);
                     }
@@ -3171,8 +3183,11 @@ function runSkillsStatusOrUpdate(parsed, options, update) {
     const scaffoldChanged = update
         ? updateScaffoldGuidanceStates(scaffoldBefore, parsed.dryRun)
         : [];
-    if (update && !parsed.dryRun && scaffoldChanged.length > 0) {
-        repairScaffoldAgentLinks(scaffoldChanged);
+    if (update && !parsed.dryRun) {
+        const workspaceStates = scaffoldBefore.filter((state) => state.workspaceRoot && state.sharedPackageDir);
+        if (scaffoldChanged.length > 0 || workspaceStates.length > 0) {
+            repairScaffoldAgentLinks([...scaffoldChanged, ...workspaceStates]);
+        }
     }
     const skillAfter = update && !parsed.dryRun
         ? collectSkillInstallStates(parsed, options)

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(() => {
@@ -194,6 +200,7 @@ function IconTooltip({ content, children, }) {
     return (_jsx(DesignSystemTooltip, { trigger: children, content: normalizeTooltipText(content), placement: "bottom", delayMs: 250, className: "z-[300] overflow-hidden rounded-md border border-border bg-popover px-2 py-1 text-[11px] text-foreground shadow-md" }));
 }
 function ChatLoadingSkeleton({ renderHeader, centerComposerWhenEmpty = false, composerSlot, composerAreaClassName, composerLayoutVariant = "default", }) {
+    const t = useT();
     // Provide empty no-op implementations so renderHeader can render the real
     // tab/mode buttons without needing actual chat state.
     const noop = useCallback(() => { }, []);
@@ -213,7 +220,7 @@ function ChatLoadingSkeleton({ renderHeader, centerComposerWhenEmpty = false, co
         toggleHistory: noop,
     };
     if (centerComposerWhenEmpty) {
-        return (_jsxs("div", { className: "flex flex-col flex-1 min-h-0", children: [renderHeader ? renderHeader(stubProps) : null, _jsxs("div", { "data-agent-empty-state": "centered", className: "relative flex flex-1 flex-col h-full min-h-0 text-foreground", children: [_jsx("div", { className: "agent-chat-scroll flex-1 overflow-y-auto overflow-x-hidden min-h-0", children: _jsx("div", { className: "agent-empty-state sr-only", "aria-busy": "true", children: "Loading chat..." }) }), composerSlot, _jsx("div", { className: "agent-composer-stack", children: _jsx("div", { className: cn("agent-composer-area shrink-0 px-3 py-2", composerLayoutVariant !== "default" &&
+        return (_jsxs("div", { className: "flex flex-col flex-1 min-h-0", children: [renderHeader ? renderHeader(stubProps) : null, _jsxs("div", { "data-agent-empty-state": "centered", className: "relative flex flex-1 flex-col h-full min-h-0 text-foreground", children: [_jsx("div", { className: "agent-chat-scroll flex-1 overflow-y-auto overflow-x-hidden min-h-0", children: _jsx("div", { className: "agent-empty-state sr-only", "aria-busy": "true", children: t("agentChat.empty.loadingChat") }) }), composerSlot, _jsx("div", { className: "agent-composer-stack", children: _jsx("div", { className: cn("agent-composer-area shrink-0 px-3 py-2", composerLayoutVariant !== "default" &&
                                     `agent-composer-area--${composerLayoutVariant}`, composerAreaClassName), children: _jsxs("div", { className: cn("agent-composer-root flex flex-col rounded-lg border border-input bg-muted/45 transition-colors", composerLayoutVariant !== "default" &&
                                         `agent-composer-root--${composerLayoutVariant}`), children: [_jsx("div", { className: "px-3 pt-3", children: _jsx("div", { className: "h-5 w-3/5 rounded bg-muted animate-pulse motion-reduce:animate-none" }) }), _jsxs("div", { className: "mt-auto flex items-center gap-2 px-3 py-2", children: [_jsx("div", { className: "h-5 w-5 rounded bg-muted animate-pulse motion-reduce:animate-none" }), _jsx("div", { className: "ml-auto h-4 w-28 rounded bg-muted animate-pulse motion-reduce:animate-none" }), _jsx("div", { className: "h-7 w-7 rounded-md bg-muted animate-pulse motion-reduce:animate-none" })] })] }) }) })] })] }));
     }
@@ -667,6 +674,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;
@@ -710,9 +722,13 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                         (activeTabMessageCount <= 0 && activeTab.status === "idle")) {
                         return null;
                     }
-                    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 }));
+                    return (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.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 +737,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,
@@ -769,7 +786,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
             ? tabs.find((tab) => tab.id === activeTabId)
             : undefined;
         const canShareActiveTab = activeTab && (activeTabMessageCount > 0 || activeTab.status !== "idle");
-        return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": "true", "data-agent-page-chat-fade": "", className: "pointer-events-none absolute inset-x-0 top-0 z-50 h-16 bg-gradient-to-b from-background via-background/90 to-transparent opacity-0 transition-opacity duration-150" }), _jsx("div", { className: "pointer-events-none absolute inset-x-0 top-3 z-[60] flex justify-end px-3 sm:top-4 sm:px-4", children: _jsxs("div", { className: "pointer-events-auto flex items-center gap-1", children: [canShareActiveTab ? (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || "Chat", shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-8 w-8 border border-border bg-background/95 shadow-sm backdrop-blur hover:bg-accent" })) : null, _jsxs("button", { type: "button", "data-agent-page-new-chat": "", "aria-label": t("agentPanel.newChat"), onClick: () => {
+        return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": "true", "data-agent-page-chat-fade": "", className: "pointer-events-none absolute inset-x-0 top-0 z-50 h-16 bg-gradient-to-b from-background via-background/90 to-transparent opacity-0 transition-opacity duration-150" }), _jsx("div", { className: "pointer-events-none absolute inset-x-0 top-3 z-[60] flex justify-end px-3 sm:top-4 sm:px-4", children: _jsxs("div", { className: "pointer-events-auto flex items-center gap-1", children: [canShareActiveTab ? (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.chat"), shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-8 w-8 border border-border bg-background/95 shadow-sm backdrop-blur hover:bg-accent" })) : null, _jsxs("button", { type: "button", "data-agent-page-new-chat": "", "aria-label": t("agentPanel.newChat"), onClick: () => {
                                     addTab();
                                 }, className: "inline-flex h-8 items-center gap-1.5 rounded-md border border-border bg-background/95 px-2.5 text-xs font-medium text-foreground shadow-sm backdrop-blur transition-colors hover:bg-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring", children: [_jsx(IconPlus, { size: 14 }), _jsx("span", { children: t("agentPanel.newChat") })] })] }) })] }));
     }, [getChatThreadShareUrl, t]);
@@ -813,7 +830,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                             activeTab?.parentThreadId === tab.id);
                                     return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer max-w-[150px]", isActive
                                             ? "bg-accent text-foreground"
-                                            : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": "Close tab", onClick: (e) => {
+                                            : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                     e.stopPropagation();
                                                     closeTab(tab.id);
                                                 }, className: "agent-tab-close flex items-center justify-end text-muted-foreground hover:text-foreground", style: {
@@ -856,7 +873,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                         activeTab?.parentThreadId === tab.id);
                                                 return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer max-w-[150px]", isActive
                                                         ? "bg-accent text-foreground"
-                                                        : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": "Close tab", onClick: (e) => {
+                                                        : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                                 e.stopPropagation();
                                                                 closeTab(tab.id);
                                                             }, className: "agent-tab-close flex items-center justify-end text-muted-foreground hover:text-foreground", style: {
@@ -874,7 +891,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                     ? activeTabRefCb
                                                     : undefined, onClick: () => setActiveCliTab(id), onKeyDown: activateOnKeyDown(() => setActiveCliTab(id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer", id === activeCliTab
                                                     ? "bg-accent text-foreground"
-                                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsxs("span", { children: ["Terminal ", i + 1] }), _jsx("button", { type: "button", "aria-label": "Close tab", onClick: (e) => {
+                                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsxs("span", { children: ["Terminal ", i + 1] }), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                             e.stopPropagation();
                                                             closeCliTab(id);
                                                         }, className: "agent-tab-close flex items-center justify-end text-muted-foreground hover:text-foreground", style: {
@@ -892,7 +909,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                     ? activeTabRefCb
                                                     : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[10px] font-medium cursor-pointer max-w-[140px]", tab.id === activeTabId
                                                     ? "bg-accent text-foreground"
-                                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.subAgentName || tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1 w-1 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": "Close tab", onClick: (e) => {
+                                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.subAgentName || tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1 w-1 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                             e.stopPropagation();
                                                             closeTab(tab.id);
                                                         }, className: "agent-tab-close flex items-center justify-end text-muted-foreground hover:text-foreground", style: {
@@ -921,6 +938,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
         activeTabRefCb,
         activateOnKeyDown,
         closeCliTab,
+        t,
     ]);
     return (_jsxs("div", { className: cn("agent-panel-root flex flex-1 flex-col min-h-0 h-full text-[13px] leading-[1.2] antialiased", className), style: {
             ...AGENT_PANEL_ROOT_STYLE,
@@ -956,7 +974,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                 ? mode === "cli" &&
                     cliTabs.map((id) => (_jsx("div", { className: "min-h-0 relative flex-1", style: {
                             display: id === activeCliTab ? undefined : "none",
-                        }, children: _jsx(Suspense, { fallback: _jsx("div", { className: "flex items-center justify-center h-full text-muted-foreground text-sm", children: "Loading terminal..." }), children: _jsx(AgentTerminal, { command: selectedCli, hideInFrame: false, className: "h-full", style: { background: "transparent" } }) }) }, id)))
+                        }, children: _jsx(Suspense, { fallback: _jsx("div", { className: "flex items-center justify-center h-full text-muted-foreground text-sm", children: t("agentPanel.loadingTerminal") }), children: _jsx(AgentTerminal, { command: selectedCli, hideInFrame: false, className: "h-full", style: { background: "transparent" } }) }) }, id)))
                 : mode === "cli" && (_jsx("div", { className: "flex flex-1 flex-col items-center justify-center min-h-0 px-6 gap-3", children: _jsx(CodeAccessUnavailablePanel, { title: codeAccessEnabled
                             ? t("agentPanel.cliRequiresDevMode")
                             : codeUnavailableTitle, description: codeAccessEnabled
@@ -1941,6 +1959,7 @@ export function focusAgentChat() {
  * Dispatches a custom event that AgentSidebar listens for.
  */
 export function AgentToggleButton({ className }) {
+    const t = useT();
     const [open, setOpen] = useState(false);
     useEffect(() => {
         const handler = (event) => {
@@ -1956,5 +1975,5 @@ export function AgentToggleButton({ className }) {
     // own close button.
     if (open)
         return null;
-    return (_jsx(DesignSystemTooltip, { trigger: _jsx("button", { type: "button", "aria-label": "Toggle agent", onClick: () => window.dispatchEvent(new Event("agent-panel:toggle")), className: cn("inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent/40 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring", className), children: _jsx(IconMessageDots, { size: 20, "aria-hidden": true }) }), content: "Toggle agent", delayMs: 200 }));
+    return (_jsx(DesignSystemTooltip, { trigger: _jsx("button", { type: "button", "aria-label": t("agentPanel.toggleAgent"), onClick: () => window.dispatchEvent(new Event("agent-panel:toggle")), className: cn("inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent/40 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring", className), children: _jsx(IconMessageDots, { size: 20, "aria-hidden": true }) }), content: t("agentPanel.toggleAgent"), delayMs: 200 }));
 }

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;
@@ -111,11 +132,22 @@ export declare function resolveAssistantChatRunningState({ forceStopped, isRunti
     isRunning: boolean;
     showRunningInUI: boolean;
 };
-export declare function resolveAssistantChatRunningStatusLabel({ runningActivityLabel, isAutoResuming, isReconnecting, hasReconnectContent, }: {
+export declare function resolveAssistantChatRunningStatusLabel({ runningActivityLabel, isAutoResuming, isReconnecting, hasReconnectContent, labels, }: {
     runningActivityLabel: string | null | undefined;
     isAutoResuming: boolean;
     isReconnecting: boolean;
     hasReconnectContent: boolean;
+    labels?: {
+        thinking: string;
+        resuming: string;
+        stillWorking: string;
+        working?: string;
+        contactingModel?: string;
+        starting?: (activity: string) => string;
+        preparing?: (activity: string) => string;
+        writing?: (activity: string) => string;
+        stillGenerating?: (activity: string) => string;
+    };
 }): string;
 export declare function resolveAssistantChatComposerPlaceholder(composerPlaceholder: string | null | undefined): string;
 export declare function shouldShowGlobalRunningStatus({ showRunningInUI, runningActivityLabel, runningActivityTool, latestMessage, reconnectContent, }: {
@@ -290,6 +322,8 @@ export interface AssistantChatProps {
     composerToolbarSlot?: React.ReactNode;
     /** Optional action rendered beside the voice/send controls. */
     composerExtraActionButton?: React.ReactNode;
+    /** Show the framework model picker in the shared composer. Defaults to true. */
+    showModelSelector?: boolean;
     /** Disable the composer for capability-gated surfaces while still showing history. */
     composerDisabled?: boolean;
     /** Placeholder to show while the composer is disabled by the host surface. */
@@ -389,6 +423,7 @@ export interface AssistantChatProps {
         onAlwaysAllow?: (approvalKey: string) => void;
     };
 }
+export declare function shouldShowAssistantChatModelSelector(showModelSelector: boolean | undefined): boolean;
 export declare const CHAT_STORAGE_PREFIX = "agent-chat:";
 /** Remove persisted chat for a given tabId (or "default"). */
 export declare function clearChatStorage(tabId?: string): void;