@agent-native/core 0.154.4 → 0.155.0

package/corpus/templates/plan/app/pages/PlansPage.tsx

@@ -12,6 +12,10 @@ import { emailToColor, emailToName } from "@agent-native/core/client/collab";
 import { PromptComposer } from "@agent-native/core/client/composer";
 import { useActionQuery, useSession } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
+import {
+  InlineMarkdown,
+  type InlineMarkdownProtectedSpan,
+} from "@agent-native/core/client/markdown";
 import {
   useAcceptInvitation,
   useJoinByDomain,
@@ -976,30 +980,35 @@ function safeDecodeURIComponent(value: string): string {
 }
 
 function renderCommentMessage(message: string) {
-  const parts: ReactNode[] = [];
-  let lastIndex = 0;
+  const protectedSpans: InlineMarkdownProtectedSpan[] = [];
   const pattern = /@\[([^\]]+)\]\(mailto:([^)]+)\)/g;
   let match: RegExpExecArray | null;
   while ((match = pattern.exec(message)) !== null) {
-    if (match.index > lastIndex) {
-      parts.push(message.slice(lastIndex, match.index));
-    }
     const label = match[1] ?? "";
     const email = safeDecodeURIComponent(match[2] ?? "");
-    parts.push(
-      <span
-        key={`${email}-${match.index}`}
-        className="mx-0.5 inline-flex max-w-[14rem] translate-y-[2px] items-center gap-1 rounded-full border border-primary/20 bg-primary/10 px-1.5 py-0.5 text-xs font-medium text-primary"
-        title={email}
-      >
-        <IconAt className="size-3" />
-        <span className="truncate">{label || email}</span>
-      </span>,
-    );
-    lastIndex = pattern.lastIndex;
+    protectedSpans.push({
+      source: match[0],
+      label: label || email,
+      title: email,
+    });
   }
-  if (lastIndex < message.length) parts.push(message.slice(lastIndex));
-  return parts.length > 0 ? parts : message;
+  return (
+    <InlineMarkdown
+      content={message}
+      inline
+      protectedSpans={protectedSpans}
+      renderProtectedSpan={(span, children) => (
+        <span
+          key={span.source}
+          className="mx-0.5 inline-flex max-w-[14rem] translate-y-[2px] items-center gap-1 rounded-full border border-primary/20 bg-primary/10 px-1.5 py-0.5 text-xs font-medium text-primary"
+          title={span.title}
+        >
+          <IconAt className="size-3" />
+          <span className="truncate">{children}</span>
+        </span>
+      )}
+    />
+  );
 }
 
 function CommentAvatar({
@@ -9066,9 +9075,9 @@ function CommentThreadMessage({
             </p>
           )}
         </div>
-        <p className="mt-1 whitespace-pre-wrap text-sm leading-6">
+        <div className="mt-1 text-sm leading-6">
           {renderCommentMessage(comment.message)}
-        </p>
+        </div>
       </div>
       {action}
     </div>

package/corpus/templates/slides/actions/add-slide-comment.ts

@@ -17,7 +17,7 @@ function displayNameFromEmail(email: string): string {
 
 export default defineAction({
   description:
-    "Add a comment to a slide. Omit threadId to start a new thread; provide threadId to reply.",
+    "Add a comment to a slide. Inline Markdown supports emphasis, inline code, links, and line breaks; headings are flattened. Omit threadId to start a new thread; provide threadId to reply.",
   schema: z.object({
     deckId: z.string().describe("Deck ID"),
     slideId: z.string().describe("Slide ID"),

package/corpus/templates/slides/actions/update-slide-comment.ts

@@ -8,7 +8,7 @@ import { getDb, schema } from "../server/db/index.js";
 
 export default defineAction({
   description:
-    "Update a slide comment. Resolving or reopening a comment applies to the full thread.",
+    "Update a slide comment. Comment text supports inline Markdown without headings. Resolving or reopening a comment applies to the full thread.",
   schema: z.object({
     id: z.string().describe("Comment ID"),
     deckId: z.string().optional().describe("Deck ID"),

package/corpus/templates/slides/app/components/comments/SlideCommentsPanel.tsx

@@ -1,4 +1,5 @@
 import { useT } from "@agent-native/core/client/i18n";
+import { InlineMarkdown } from "@agent-native/core/client/markdown";
 import {
   IconX,
   IconCheck,
@@ -99,9 +100,10 @@ function CommentItem({
             )}
           </div>
         </div>
-        <p className="text-[12px] text-foreground/90 mt-0.5 break-words leading-relaxed">
-          {comment.content}
-        </p>
+        <InlineMarkdown
+          content={comment.content}
+          className="mt-0.5 text-[12px] text-foreground/90 leading-relaxed"
+        />
       </div>
     </div>
   );
@@ -374,9 +376,10 @@ function ThreadCard({
               )}
             </div>
           </div>
-          <p className="text-[12px] text-foreground/90 mt-0.5 break-words leading-relaxed">
-            {rootComment.content}
-          </p>
+          <InlineMarkdown
+            content={rootComment.content}
+            className="mt-0.5 text-[12px] text-foreground/90 leading-relaxed"
+          />
         </div>
       </div>
 

package/dist/action.d.ts

@@ -135,6 +135,28 @@ export interface AgentActionStopOptions {
     /** Optional short tool-result text. Defaults to the user-facing message. */
     toolResult?: string;
 }
+export interface ActionContractErrorOptions {
+    /** Stable machine-readable code safe to expose on every action transport. */
+    errorCode: string;
+    /** Safe structured context for callers. Never include secrets or raw driver errors. */
+    details?: Record<string, unknown>;
+    /** HTTP status for the action route. Contract conflicts normally use 409. */
+    statusCode?: number;
+}
+/**
+ * A deterministic, caller-correctable action contract failure.
+ *
+ * Unlike an ordinary Error, its code and explicitly safe details survive the
+ * framework HTTP transport. Internal failures remain generic 500 responses.
+ */
+export declare class ActionContractError extends Error {
+    readonly actionContractError = true;
+    readonly errorCode: string;
+    readonly details?: Record<string, unknown>;
+    readonly statusCode: number;
+    constructor(message: string, options: ActionContractErrorOptions);
+}
+export declare function isActionContractError(error: unknown): error is ActionContractError;
 /**
  * Throw from an action when the agent should stop the current turn instead of
  * feeding the failure back to the model for another retry.

package/dist/action.js

@@ -1,5 +1,32 @@
 import { normalizeActionChatUIConfig, } from "./action-ui.js";
 import { normalizeAuditConfig, resolveAuditAttach } from "./audit/config.js";
+/**
+ * A deterministic, caller-correctable action contract failure.
+ *
+ * Unlike an ordinary Error, its code and explicitly safe details survive the
+ * framework HTTP transport. Internal failures remain generic 500 responses.
+ */
+export class ActionContractError extends Error {
+    actionContractError = true;
+    errorCode;
+    details;
+    statusCode;
+    constructor(message, options) {
+        super(message);
+        this.name = "ActionContractError";
+        this.errorCode = options.errorCode;
+        this.details = options.details;
+        this.statusCode = options.statusCode ?? 409;
+    }
+}
+export function isActionContractError(error) {
+    return (error instanceof ActionContractError ||
+        (!!error &&
+            typeof error === "object" &&
+            error.actionContractError ===
+                true &&
+            typeof error.errorCode === "string"));
+}
 /**
  * Throw from an action when the agent should stop the current turn instead of
  * feeding the failure back to the model for another retry.

package/dist/agent/production-agent.js

@@ -7376,7 +7376,11 @@ export function createProductionAgentHandler(options) {
                         }
                         const profilePrompt = `${requestSystemPrompt}\n\n<custom-agent-profile name="${profile.name}" path="${profile.path}">\n` +
                             (profile.description ? `${profile.description}\n\n` : "") +
-                            `${profile.instructions}\n</custom-agent-profile>`;
+                            `${profile.instructions}` +
+                            (profile.workspace?.resources.length
+                                ? `\n\nAgent pack resources (read these with the resources tools when relevant):\n${profile.workspace.resources.map((resource) => `- ${resource.path}${resource.name ? ` (${resource.name})` : ""}`).join("\n")}`
+                                : "") +
+                            `\n</custom-agent-profile>`;
                         let responseText = "";
                         const subUsage = await runAgentLoop({
                             engine,

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/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(() => {
@@ -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;