@agent-native/core 0.148.1 → 0.149.1

package/dist/cli/code-agent-executor.js

@@ -14,6 +14,7 @@ import { readAgentsBundleFromFs, generateDevelopmentSkillsPromptBlock, } from ".
 import { getAmbientOrgId, getAmbientUserEmail, runWithRequestContext, } from "../server/request-context.js";
 import { isReasoningEffort, } from "../shared/reasoning-effort.js";
 import { createAgentNativeConfigContext, loadResolvedAgentNativeConfig, } from "../vite/agent-native-config-loader.js";
+import { runClaudeCodeParticipant, } from "./claude-code-participant.js";
 import { codexMcpConfigArgs, mergeCodeAgentMcpConfig, restrictCodeAgentMcpConfig, } from "./code-agent-mcp-config.js";
 import { createCodeAgentOutputSmoother } from "./code-agent-output-smoother.js";
 import { addCodeAgentCommandToAllowlist, appendCodeAgentTranscriptEvent, dequeueCodeAgentFollowUp, getCodeAgentRunRecord, isCodeAgentCommandAllowed, listCodeAgentTranscriptEvents, updateCodeAgentRunRecord, } from "./code-agent-runs.js";
@@ -21,6 +22,8 @@ const DEFAULT_COMMAND_TIMEOUT_MS = 120_000;
 const MAX_TOOL_OUTPUT_CHARS = 50_000;
 const MAX_FILE_READ_CHARS = 120_000;
 const CODEX_CLI_ENGINE_NAME = "codex-cli";
+const CLAUDE_CLI_ENGINE_NAME = "claude-cli";
+const CLAUDE_CLI_DEFAULT_MODEL = "claude-sonnet-5";
 const RECAP_SOURCE_TOOL_PROFILE = "recap-source";
 const RECAP_SOURCE_OUTPUT_FILE = "recap-source.json";
 /**
@@ -110,6 +113,18 @@ export async function executeCodeAgentRun(options) {
             signal: options.signal,
         });
     }
+    if (requestedEngine === CLAUDE_CLI_ENGINE_NAME) {
+        return executeClaudeCliRun({
+            run: existing,
+            prompt: executionPrompt,
+            model: options.model ?? metadataString(existing, "model"),
+            reasoningEffort: options.reasoningEffort ?? metadataReasoningEffort(existing),
+            permissionMode: existing.permissionMode ?? "full-auto",
+            stdout: options.stdout,
+            streamToolOutputToStdout,
+            signal: options.signal,
+        });
+    }
     const engine = options.engine ?? (await resolveExecutorEngine(requestedEngine));
     if (!engine) {
         const message = "No LLM provider key was found. Set ANTHROPIC_API_KEY, OPENAI_API_KEY, GOOGLE_GENERATIVE_AI_API_KEY, another supported provider key, or run `codex login` to use Codex CLI.";
@@ -437,6 +452,214 @@ export function codeAgentMcpInvocationPolicy(permissionMode) {
         mode: permissionMode === "read-only" ? "read-only" : "allow-all",
     };
 }
+async function executeClaudeCliRun(options) {
+    const cwd = options.run.cwd || process.cwd();
+    const model = normalizeClaudeCliModel(options.model);
+    const reasoningEffort = normalizeClaudeCliEffort(options.reasoningEffort);
+    const streamToolOutputToStdout = options.streamToolOutputToStdout ??
+        process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
+    const assistantText = [];
+    appendCodeAgentTranscriptEvent({
+        runId: options.run.id,
+        kind: "status",
+        message: "Starting Claude Code with local Claude authentication.",
+        metadata: {
+            status: "running",
+            phase: "executing",
+            engine: CLAUDE_CLI_ENGINE_NAME,
+        },
+    });
+    try {
+        const result = await runClaudeCodeParticipant({
+            role: options.permissionMode === "full-auto" ? "driver" : "watchdog",
+            prompt: buildClaudeCliPrompt(options.run, options.prompt),
+            cwd,
+            model,
+            effort: reasoningEffort,
+            signal: options.signal,
+            onEvent: (event) => {
+                const text = readClaudeParticipantAssistantText(event);
+                if (!text)
+                    return;
+                assistantText.push(text);
+                if (streamToolOutputToStdout)
+                    options.stdout?.write(text);
+            },
+        });
+        const finalMessage = readClaudeParticipantResultText(result.events) ??
+            (assistantText.join("\n\n").trim() || "Claude Code run completed.");
+        appendCodeAgentTranscriptEvent({
+            runId: options.run.id,
+            kind: "system",
+            message: finalMessage,
+            metadata: {
+                role: "assistant",
+                engine: CLAUDE_CLI_ENGINE_NAME,
+                model,
+                ...(reasoningEffort ? { reasoningEffort } : {}),
+            },
+        });
+        const pendingFollowUp = dequeueCodeAgentFollowUp(options.run.id);
+        if (pendingFollowUp) {
+            const message = pendingFollowUp.mode === "queued"
+                ? "Claude Code run completed; running queued follow-up."
+                : "Claude Code run completed; applying steering follow-up.";
+            appendCodeAgentTranscriptEvent({
+                runId: options.run.id,
+                kind: "status",
+                message,
+                metadata: {
+                    status: "running",
+                    phase: "follow-up",
+                    followUpId: pendingFollowUp.id,
+                    followUpMode: pendingFollowUp.mode,
+                    engine: CLAUDE_CLI_ENGINE_NAME,
+                },
+            });
+            if (pendingFollowUp.permissionMode) {
+                updateCodeAgentRunRecord(options.run.id, {
+                    permissionMode: pendingFollowUp.permissionMode,
+                });
+            }
+            return executeCodeAgentRun({
+                runId: options.run.id,
+                prompt: pendingFollowUp.prompt,
+                attachments: pendingFollowUp.attachments ??
+                    userPromptAttachmentsForEvent(options.run.id, pendingFollowUp.eventId),
+                appendUserEvent: false,
+                stdout: options.stdout,
+                streamToolOutputToStdout: options.streamToolOutputToStdout,
+                signal: options.signal,
+            });
+        }
+        appendCodeAgentTranscriptEvent({
+            runId: options.run.id,
+            kind: "status",
+            message: "Claude Code run completed.",
+            metadata: {
+                status: "completed",
+                phase: "complete",
+                engine: CLAUDE_CLI_ENGINE_NAME,
+            },
+        });
+        return updateCodeAgentRunRecord(options.run.id, {
+            status: "completed",
+            phase: "complete",
+            needsApproval: false,
+            progress: {
+                label: "Complete",
+                completed: 1,
+                total: 1,
+                percent: 100,
+            },
+            metadata: {
+                executionCompletedAt: new Date().toISOString(),
+                engine: CLAUDE_CLI_ENGINE_NAME,
+                model,
+                ...(reasoningEffort ? { reasoningEffort } : {}),
+                permissionMode: options.permissionMode,
+            },
+        });
+    }
+    catch (error) {
+        const interrupted = options.signal?.aborted === true;
+        const message = error instanceof Error ? error.message : String(error);
+        const summary = interrupted
+            ? "Claude Code run paused."
+            : `Claude Code run failed: ${message}`;
+        if (streamToolOutputToStdout)
+            options.stdout?.write(`\n${summary}\n`);
+        appendCodeAgentTranscriptEvent({
+            runId: options.run.id,
+            kind: "status",
+            message: summary,
+            metadata: {
+                status: interrupted ? "paused" : "errored",
+                phase: interrupted ? "paused" : "error",
+                engine: CLAUDE_CLI_ENGINE_NAME,
+            },
+        });
+        return updateCodeAgentRunRecord(options.run.id, {
+            status: interrupted ? "paused" : "errored",
+            phase: interrupted ? "paused" : "error",
+            progress: {
+                label: interrupted ? "Paused" : "Error",
+                completed: 0,
+                total: 1,
+                failed: interrupted ? 0 : 1,
+                percent: 0,
+            },
+            metadata: {
+                ...(interrupted
+                    ? { executionPausedAt: new Date().toISOString() }
+                    : {
+                        executionError: message,
+                        executionErroredAt: new Date().toISOString(),
+                    }),
+                engine: CLAUDE_CLI_ENGINE_NAME,
+                model,
+            },
+        });
+    }
+}
+function buildClaudeCliPrompt(run, prompt) {
+    const permissionMode = run.permissionMode ?? "full-auto";
+    const mode = permissionMode === "full-auto" ? "Auto" : "Plan";
+    const modeInstruction = mode === "Plan"
+        ? "Inspect and explain only. Do not edit files or run mutating commands."
+        : "Edit and verify as needed. Do not create, switch, reset, rebase, or stash git branches.";
+    const additionalSkillsRoot = process.env.AGENT_NATIVE_CODE_AGENT_SKILLS_ROOT?.trim();
+    return [
+        `You are running from Agent-Native Code in ${run.cwd || process.cwd()}.`,
+        "Follow the repository AGENTS.md and any relevant skill instructions.",
+        ...(additionalSkillsRoot
+            ? [
+                `Additional installed Agent Plugin skills are available under ${additionalSkillsRoot}. Read any relevant SKILL.md files before acting.`,
+            ]
+            : []),
+        `Run mode: ${mode} (${permissionMode}). ${modeInstruction}`,
+        "",
+        "# User request",
+        prompt,
+    ].join("\n");
+}
+function normalizeClaudeCliModel(model) {
+    const trimmed = model?.trim();
+    return !trimmed || trimmed === "auto" || trimmed === CLAUDE_CLI_ENGINE_NAME
+        ? CLAUDE_CLI_DEFAULT_MODEL
+        : trimmed;
+}
+function normalizeClaudeCliEffort(effort) {
+    return effort && effort !== "auto" ? effort : undefined;
+}
+function readClaudeParticipantAssistantText(event) {
+    if (event.type !== "assistant")
+        return null;
+    const message = asRecordValue(event.message);
+    const content = message?.content;
+    if (!Array.isArray(content))
+        return null;
+    const text = content
+        .filter((part) => isRecordValue(part))
+        .map((part) => (typeof part.text === "string" ? part.text : ""))
+        .filter(Boolean)
+        .join("");
+    return text.trim() || null;
+}
+function readClaudeParticipantResultText(events) {
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+        const result = events[index]?.result;
+        if (typeof result === "string" && result.trim())
+            return result.trim();
+    }
+    return null;
+}
+function isRecordValue(value) {
+    return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function asRecordValue(value) {
+    return isRecordValue(value) ? value : null;
+}
 async function executeCodexCliRun(options) {
     const cwd = options.run.cwd || process.cwd();
     const outputDir = fs.mkdtempSync(path.join(os.tmpdir(), "agent-native-code-codex-"));

package/dist/cli/create-workspace.js

@@ -1,8 +1,8 @@
 /**
  * @deprecated `create-workspace` is now an alias for `create`. In current
- * versions, `agent-native create <name>` defaults to scaffolding a workspace
- * with a multi-select template picker. Use `--standalone` for a single-app
- * standalone scaffold.
+ * versions, `agent-native create <name>` asks for a starting shape and its
+ * Chat/first-party template paths scaffold a workspace. Use `--standalone`
+ * for a single-app standalone scaffold.
  *
  * This module is kept for backwards compatibility with older docs and
  * scripts that still invoke `agent-native create-workspace`.

package/dist/cli/create.d.ts

@@ -32,8 +32,9 @@ export interface CreateAppOptions {
 /**
  * Main entry for `agent-native create [name]`.
  *
- * Default behavior: scaffold a workspace at <name>/ with a multi-select
- * template picker. Use --standalone for the single-app standalone flow.
+ * Default behavior: ask for a starting shape, with Chat and first-party
+ * templates creating a workspace at <name>/. Use --standalone for the
+ * single-app standalone flow.
  *
  * If run *inside* an existing workspace, falls through to the add-app
  * flow that scaffolds one new app under apps/<name>/.

package/dist/cli/create.js

@@ -93,8 +93,9 @@ const COMMUNITY_OPTION = {
 /**
  * Main entry for `agent-native create [name]`.
  *
- * Default behavior: scaffold a workspace at <name>/ with a multi-select
- * template picker. Use --standalone for the single-app standalone flow.
+ * Default behavior: ask for a starting shape, with Chat and first-party
+ * templates creating a workspace at <name>/. Use --standalone for the
+ * single-app standalone flow.
  *
  * If run *inside* an existing workspace, falls through to the add-app
  * flow that scaffolds one new app under apps/<name>/.
@@ -126,8 +127,8 @@ export async function createApp(name, opts) {
     }
     // When exactly one template is specified explicitly, treat it as a
     // standalone scaffold (script-friendly, matches historic behavior).
-    // Use `--template a,b` or pass no --template to opt into the workspace
-    // flow with the multi-select picker.
+    // Use `--template a,b` to opt into the workspace flow with the multi-select
+    // picker. Bare `create` asks for the starting shape first.
     const parsed = parseTemplateList(opts?.template);
     // Headless can't live in a workspace, so reject it when more than one
     // template is requested or when workspace semantics are forced.
@@ -146,9 +147,8 @@ export async function createApp(name, opts) {
     // No template specified: ask what shape to start from before diving into
     // "which templates?". The on-ramp choice implies the project structure, so
     // we don't ask a separate "workspace or standalone?" question — Chat and
-    // Headless scaffold a single standalone app (the lightest starts; headless
-    // cannot live in a workspace), while Template continues into the workspace
-    // multi-select.
+    // Template creates a workspace, while Community and Headless scaffold a
+    // single standalone app.
     if (parsed.length === 0) {
         // The deprecated `create-workspace` alias forces workspace semantics, so
         // it must skip the start-shape prompt and scaffold a workspace directly.
@@ -157,10 +157,17 @@ export async function createApp(name, opts) {
             return;
         }
         const shape = await promptStartShape(clack);
-        if (shape === "headless" || shape === "chat") {
+        if (shape === "headless") {
             await createStandaloneApp(name, { ...opts, template: shape }, clack);
             return;
         }
+        if (shape === "chat") {
+            // Chat is the default workspace on-ramp. Keep the minimal chat app in
+            // the same workspace shape as every other first-party app so the next
+            // documented step, `add-app`, works immediately.
+            await createWorkspaceInteractive(name, { ...opts, template: shape }, clack);
+            return;
+        }
         if (shape === "community") {
             const template = await promptCommunityTemplate(clack);
             await createStandaloneApp(name, { ...opts, template }, clack);
@@ -178,12 +185,11 @@ export async function createApp(name, opts) {
  * choice made here implies the project structure, so we deliberately avoid a
  * separate "workspace or standalone?" question:
  *   - "template" → full app(s) in a workspace (the multi-select picker)
+ *   - "chat"     → a minimal Chat app in a workspace with Dispatch
  *   - "community" → a single standalone app from a public GitHub repository
- *   - "chat"     → a single standalone chat UI app
  *   - "headless" → a single standalone action-first app with no UI shell
- * Chat and headless are standalone on purpose: a monorepo is unnecessary
- * ceremony for the lightest on-ramps, and headless cannot be a workspace
- * member. Either can grow into a workspace later via `add-app`.
+ * Headless cannot be a workspace member. Use `--standalone --template chat`
+ * when a standalone Chat app is the intended shape.
  */
 async function promptStartShape(clack) {
     const choice = await clack.select(startShapePromptOptions());
@@ -201,7 +207,7 @@ function startShapePromptOptions() {
             {
                 value: "chat",
                 label: "Chat",
-                hint: "A single app with a minimal chat UI and the browser shell wired up",
+                hint: "A minimal chat app in a workspace with the browser shell wired up",
             },
             {
                 value: "template",
@@ -1420,20 +1426,9 @@ function postProcessStandalone(name, targetDir, templateName, resolution) {
                     }
                 }
             }
-            // Ensure pnpm.onlyBuiltDependencies is set so native packages
-            // (better-sqlite3, esbuild, node-pty) compile their postinstall scripts
-            // under pnpm 10+ without prompting for `pnpm approve-builds`.
             pkg.dependencies = pkg.dependencies ?? {};
             pkg.dependencies.postgres ??= POSTGRES_DEPENDENCY_VERSION;
             ensureReactRouterBuildDependencies(pkg);
-            const requiredBuilt = ["better-sqlite3", "esbuild", "node-pty"];
-            if (!pkg.pnpm || typeof pkg.pnpm !== "object") {
-                pkg.pnpm = {};
-            }
-            const existing = Array.isArray(pkg.pnpm.onlyBuiltDependencies)
-                ? pkg.pnpm.onlyBuiltDependencies
-                : [];
-            pkg.pnpm.onlyBuiltDependencies = Array.from(new Set([...existing, ...requiredBuilt]));
             fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
         }
         catch { }
@@ -1452,6 +1447,7 @@ function postProcessStandalone(name, targetDir, templateName, resolution) {
                 "better-sqlite3": "true",
                 esbuild: "true",
                 "node-pty": "true",
+                "tesseract.js": "true",
             },
         };
         if (templateName !== "headless") {

package/dist/client/AgentPanel.js

@@ -689,7 +689,11 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                     return (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, resourceTitle: activeTab.label || "Chat", shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-7 w-7" }));
                 })(), 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, showFullViewAction && agentPageHref ? (_jsx(DropdownMenuItem, { asChild: true, children: _jsxs(Link, { to: agentPageHref, "aria-label": t("agentPanel.openFullView"), children: [_jsx(IconArrowsMaximize, { size: 14, className: "shrink-0" }), t("agentPanel.openFullView")] }) })) : null, (onCollapse && mode === "chat" && wideDrawerAction) ||
-                                showFullViewAction ? (_jsx(DropdownMenuSeparator, {})) : null, onCollapse && mode === "chat" && (_jsxs(DropdownMenuItem, { onSelect: addTab, children: [_jsx(IconPlus, { size: 14, className: "shrink-0" }), t("agentPanel.newChat")] })), mode === "chat" && toggleHistory && (_jsxs(DropdownMenuItem, { onSelect: toggleHistory, children: [_jsx(IconHistory, { size: 14, className: "shrink-0" }), showHistory
+                                showFullViewAction ? (_jsx(DropdownMenuSeparator, {})) : null, onCollapse && mode === "chat" && (_jsxs(DropdownMenuItem, { onSelect: addTab, children: [_jsx(IconPlus, { size: 14, className: "shrink-0" }), t("agentPanel.newChat")] })), mode === "chat" && toggleHistory && (_jsxs(DropdownMenuItem, { onSelect: () => {
+                                    // Let the menu finish restoring focus before mounting the
+                                    // history popover; otherwise Radix dismisses the new overlay.
+                                    setTimeout(() => toggleHistory(), 0);
+                                }, 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"
@@ -942,7 +946,7 @@ const SIDEBAR_OVERLAY_Z_INDEX = 70;
 const SIDEBAR_DRAWER_Z_INDEX = 80;
 const SIDEBAR_DRAWER_VIEW_TRANSITION_NAME = "agent-native-sidebar-drawer";
 /** Shared max width of the centered fullscreen chat column and composer. */
-const FULLSCREEN_CHAT_COLUMN_MAX_PX = 684;
+const FULLSCREEN_CHAT_COLUMN_MAX_PX = 750;
 export function getActiveTabScrollDelta(containerRect, tabRect, margin = 24) {
     if (tabRect.left < containerRect.left + margin) {
         return tabRect.left - containerRect.left - margin;
@@ -1842,7 +1846,7 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
     }
     // Mount the live chat surface only while visible or actively needed. Keeping
     // it mounted while closed starts app-state polling on every public page view.
-    const sidebar = shouldRenderPanel ? (_jsxs(_Fragment, { children: [showResizeHandle && !isLeft && (_jsx(ResizeHandle, { position: position, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd })), _jsx("div", { className: cn("agent-sidebar-panel flex shrink-0 flex-col overflow-hidden text-[13px] leading-[1.2] antialiased", chatViewTransition && AGENT_CHAT_VIEW_TRANSITION_CLASS, mobileAnimationEnabled && "shadow-2xl"), "data-agent-sidebar-animation": wideDrawerEnabled
+    const sidebar = shouldRenderPanel ? (_jsxs(_Fragment, { children: [showResizeHandle && !isLeft && (_jsx(ResizeHandle, { position: position, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd })), _jsx("div", { className: cn("agent-sidebar-panel flex shrink-0 flex-col overflow-hidden text-[13px] leading-[1.2] antialiased", chatViewTransition && AGENT_CHAT_VIEW_TRANSITION_CLASS), "data-agent-sidebar-animation": wideDrawerEnabled
                     ? "drawer"
                     : mobileAnimationEnabled
                         ? "mobile"
@@ -1851,7 +1855,7 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
                             : undefined, "data-agent-sidebar-layout": panelLayout, "data-agent-sidebar-position": position, "data-agent-sidebar-state": panelOpen ? "open" : "closed", "data-agent-sidebar-resizing": isResizing ? "true" : undefined, "data-agent-sidebar-chat-handoff": chatViewTransitionHandoff ? "true" : undefined, style: chatViewTransition
                     ? getAgentChatViewTransitionStyle(panelStyle)
                     : panelStyle, inert: sidebarAnimationEnabled && !panelOpen ? true : undefined, "aria-hidden": sidebarAnimationEnabled && !panelOpen ? true : undefined, children: _jsx("div", { className: "agent-sidebar-panel-inner flex min-h-0 flex-1 flex-col", children: _jsx(AgentPanel, { emptyStateText: emptyStateText, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, composerToolbarSlot: composerToolbarSlot, composerSlot: composerSlot, onComposerTextChange: onComposerTextChange, imageModelMenu: imageModelMenu, threadFooterSlot: threadFooterSlot, missingApiKeySetupLayout: "sidebar", onCollapse: () => setOpenPersisted(false), onSnapTo75Percent: isMobile ? undefined : snapTo75Percent, isWideDrawer: isMobile ? false : isWideDrawer, onExitWideDrawer: isMobile ? undefined : exitWideDrawer, storageKey: storageKey, scope: scope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync, agentPageHref: agentPageHref, allowSettingsMode: false, chatOnly: true }) }) }), showResizeHandle && isLeft && (_jsx(ResizeHandle, { position: position, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd }))] })) : null;
-    const drawerPlaceholder = wideDrawerEnabled && !presentationMode && shouldRenderPanel ? (_jsx("div", { "aria-hidden": "true", className: "agent-sidebar-drawer-placeholder shrink-0", "data-agent-sidebar-placeholder": "true", style: { width: drawerPlaceholderWidth + 1 } })) : null;
+    const drawerPlaceholder = wideDrawerEnabled && !presentationMode && panelOpen ? (_jsx("div", { "aria-hidden": "true", className: "agent-sidebar-drawer-placeholder shrink-0", "data-agent-sidebar-placeholder": "true", style: { width: drawerPlaceholderWidth + 1 } })) : null;
     return (_jsx(AgentSidebarOnboardingContext.Provider, { value: true, children: _jsxs(RealtimeVoiceModeProvider, { browserTabId: browserTabId, children: [showFirstRunOnboarding && (_jsx(Suspense, { fallback: null, children: _jsx(FirstRunOnboarding, {}) })), _jsxs("div", { className: "agent-sidebar-shell flex min-w-0 flex-1 h-screen overflow-hidden", "data-agent-sidebar-position": position, "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: [isMobile &&
                             !presentationMode &&
                             (mobileAnimationEnabled ? shouldRenderPanel : open) && (_jsx("div", { className: cn("agent-sidebar-backdrop fixed inset-0 bg-foreground/40", mobileAnimationEnabled && !panelOpen && "pointer-events-none"), "data-agent-sidebar-animation": mobileAnimationEnabled ? "mobile" : undefined, "data-agent-sidebar-state": panelOpen ? "open" : "closed", style: { zIndex: SIDEBAR_OVERLAY_Z_INDEX - 1 }, onClick: () => setOpenPersisted(false) })), shouldMountPanel ? _jsx(URLSync, { browserTabId: browserTabId }) : null, isLeft && !presentationMode ? sidebar : null, isLeft && !presentationMode ? drawerPlaceholder : null, _jsx("div", { className: "agent-sidebar-main-surface flex flex-1 flex-col overflow-auto min-w-0", "data-agent-sidebar-main-position": position, "data-agent-sidebar-main-state": !isMobile && !presentationMode && panelOpen ? "open" : "closed", "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: _jsx(ScreenRefreshBoundary, { children: children }) }), !isLeft && !presentationMode ? drawerPlaceholder : null, !isLeft && !presentationMode ? sidebar : null] })] }) }));

package/dist/client/AssistantChat.js

@@ -1346,6 +1346,9 @@ export function useAutoResumeStatus(tabId, forceStopped) {
     }, [clearAutoResume, forceStopped]);
     return { isAutoResuming, clearAutoResume };
 }
+function approvalResolutionIdentity(approvalKey, toolCallId) {
+    return `${toolCallId ?? ""}\u0000${approvalKey}`;
+}
 const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, dynamicSuggestions, threadFooterSlot, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, browserTabId, threadId, contextScope, isActiveComposer = true, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, onComposerTextChange, composerAreaClassName, composerPlaceholder, missingApiKeySetupLayout = "default", composerLayoutVariant = "default", centerComposerWhenEmpty = false, emptyStateDisplay = "default", composerToolbarSlot, composerExtraActionButton, composerDisabled = false, composerDisabledPlaceholder, isNewThread, isThreadStateLoading, onSlashCommand, execMode, onExecModeChange, approvalActions, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, modelListLoading, onModelChange, onEffortChange, imageModelMenu, onForkChat, onConnectProvider, onConnectLocalRuntime, plusMenuMode = "full", providerStatusChecksEnabled = true, loadHistoryRepository, historyReloadKey, externalStreaming = false, agentChatSurface = "app", }, ref) {
     const thread = useThread();
     const threadRuntime = useThreadRuntime();
@@ -3974,11 +3977,34 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         composerContextItems.length > 0 ||
         showPlanModeCallout ||
         showInlineMissingKeySetup);
+    const approvalResolutionScope = threadId ?? tabId ?? "default";
+    const [approvalResolutionState, setApprovalResolutionState] = useState(() => ({
+        scope: approvalResolutionScope,
+        byIdentity: new Map(),
+    }));
+    const getApprovalResolution = useCallback((approvalKey, toolCallId) => {
+        if (approvalResolutionState.scope !== approvalResolutionScope) {
+            return null;
+        }
+        return (approvalResolutionState.byIdentity.get(approvalResolutionIdentity(approvalKey, toolCallId)) ?? null);
+    }, [approvalResolutionScope, approvalResolutionState]);
+    const recordApprovalResolution = useCallback((approvalKey, resolution, toolCallId) => {
+        setApprovalResolutionState((previous) => {
+            const byIdentity = previous.scope === approvalResolutionScope
+                ? previous.byIdentity
+                : new Map();
+            const next = new Map(byIdentity);
+            next.set(approvalResolutionIdentity(approvalKey, toolCallId), resolution);
+            return { scope: approvalResolutionScope, byIdentity: next };
+        });
+    }, [approvalResolutionScope]);
     // Human-in-the-loop approvals: when the user approves a paused `needsApproval`
     // tool call, re-issue the turn carrying the call's approval key so the server
     // gate lets that specific call run. Reuses the same append path as recovery /
     // queued messages (no hand-written fetch).
     const approvalCtx = useMemo(() => ({
+        getApprovalResolution,
+        onApprovalResolved: recordApprovalResolution,
         onApprove: (approvalKey) => {
             markOptimisticRunning();
             appendThreadMessage({
@@ -4000,7 +4026,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         ...(approvalActions?.onAlwaysAllow
             ? { onAlwaysAllow: approvalActions.onAlwaysAllow }
             : {}),
-    }), [appendThreadMessage, execMode, markOptimisticRunning, approvalActions]);
+    }), [
+        appendThreadMessage,
+        execMode,
+        getApprovalResolution,
+        markOptimisticRunning,
+        approvalActions,
+        recordApprovalResolution,
+    ]);
     return (_jsx(CheckpointContext.Provider, { value: checkpointCtx, children: _jsx(MessageActionsContext.Provider, { value: messageActionsCtx, children: _jsx(ApprovalContext.Provider, { value: approvalCtx, children: _jsx(ChatRunDurationContext.Provider, { value: lastChatRunDurationMs, children: _jsx(ServerRunActiveContext.Provider, { value: serverRunActive, children: _jsx(ChatRunningContext.Provider, { value: showRunningInUI, children: _jsx(TextStreamingContext.Provider, { value: textStreaming, children: _jsxs("div", { "data-agent-empty-state": centeredEmptyState
                                         ? "centered"
                                         : compactMissingKeyEmptyState

package/dist/client/agent-chat-adapter.d.ts

@@ -13,6 +13,7 @@ export type AgentChatSurfaceKind =
  | "dev-frame"
 /** Chat hosted by Desktop for a local app with explicit code access. */
  | "desktop";
+export declare const BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS = 90000;
 export declare const BACKGROUND_FOLLOW_IDLE_TIMEOUT_MS = 210000;
 export declare const MAX_FOLLOWED_BACKGROUND_RUNS = 24;
 export declare const MAX_BACKGROUND_FOLLOW_WALL_TIME_MS: number;

package/dist/client/agent-chat-adapter.js

@@ -96,6 +96,10 @@ const STARTUP_RESPONSE_TIMEOUT_MS = 45_000;
 // reports that the self-dispatch itself failed before a successor claimed the
 // run, the existing client auto-continue POST remains the fallback.
 const BACKGROUND_FOLLOW_POLL_INTERVAL_MS = 1_000;
+// This watchdog belongs to a read-only reattach, not to the server run. A
+// shorter reader window lets the follow loop re-poll `/runs/active` while a
+// completed run is still inside the server's terminal replay window.
+export const BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS = 90_000;
 // How long the follow loop tolerates seeing NO active run for this turn before
 // treating the turn as ended. The server pre-inserts the successor row before
 // the old chunk completes, so a healthy chain never shows an idle gap; allow a
@@ -1691,11 +1695,12 @@ export function createAgentChatAdapter(options) {
                 preparingActionStatesByRun.set(id, state);
                 return state;
             };
-            const currentSSEOptions = () => ({
+            const currentSSEOptions = (overrides = {}) => ({
                 durableBackgroundRun: currentRunDispatchMode?.startsWith("background") === true,
                 ...(runId
                     ? { preparingActionState: preparingActionStateForRun(runId) }
                     : {}),
+                ...overrides,
             });
             const captureChatClientError = (error, phase, extra = {}) => {
                 captureError(error, {
@@ -2102,7 +2107,10 @@ export function createAgentChatAdapter(options) {
                             rememberRunSeq(seq);
                             if (threadId)
                                 updateActiveRunSeq(seq);
-                        }, runId, currentSSEOptions())) {
+                        }, runId, currentSSEOptions({
+                            noProgressTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
+                            actionPreparationStallTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
+                        }))) {
                             yield withRequestModeMetadata(result);
                         }
                         // readSSEStream returned normally: a terminal done/error was

package/dist/client/chat/markdown-renderer.d.ts

@@ -31,6 +31,7 @@ export declare function markdownUrlTransform(value: string): string;
 export declare function extractCodeText(child: React.ReactNode): string;
 export declare const markdownComponents: {
     a(props: React.AnchorHTMLAttributes<HTMLAnchorElement>): React.JSX.Element;
+    table(props: React.TableHTMLAttributes<HTMLTableElement>): React.JSX.Element;
     pre(props: React.HTMLAttributes<HTMLPreElement>): React.JSX.Element;
 };
 export declare function renderMarkdownToClipboardHtml(markdown: string): string | null;

package/dist/client/chat/markdown-renderer.js

@@ -158,6 +158,10 @@ export const markdownComponents = {
         }
         return (_jsxs("a", { href: href, target: "_blank", rel: "noreferrer", className: cn(CTA_BUTTON_CLASSES, className), ...rest, children: [_jsx("span", { children: children }), _jsx(IconExternalLink, { size: 13, strokeWidth: 2, "aria-hidden": "true" })] }));
     },
+    table(props) {
+        const { children, ...rest } = props;
+        return (_jsx("div", { className: "agent-markdown-table-wrap", children: _jsx("table", { ...rest, children: children }) }));
+    },
     pre(props) {
         const { children, ...rest } = props;
         if (React.isValidElement(children)) {

package/dist/client/chat/message-components.d.ts

@@ -97,6 +97,7 @@ export declare function shouldShowAssistantWorkSummary({ isLast, isComplete, has
     hasUnresolvedTool: boolean;
     chatRunning: boolean;
 }): boolean;
+export declare function getAssistantWorkSummaryDurationMs(durationMs: number | null | undefined, groupStartIndex: number, firstWorkPartIndex: number): number | null | undefined;
 export declare function isAlwaysVisibleAssistantTool(part: {
     type?: unknown;
     toolName?: unknown;

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

@@ -667,6 +667,9 @@ export function shouldShowAssistantWorkSummary({ isLast, isComplete, hasCollapsi
     // disclosure state to the default-open value on every new submission.
     return isComplete || !isLast;
 }
+export function getAssistantWorkSummaryDurationMs(durationMs, groupStartIndex, firstWorkPartIndex) {
+    return groupStartIndex === firstWorkPartIndex ? durationMs : null;
+}
 function ReasoningMessagePart() {
     const part = useMessagePartReasoning();
     const partRuntime = useMessagePartRuntime();
@@ -958,6 +961,11 @@ export function AssistantMessage() {
         msgContent.some((p, index) => !isCallAgentToolCallShadowed(msgContent, index) &&
             (p.type !== "tool-call" || p.activity !== true) &&
             isCollapsibleAssistantWorkPart(p));
+    const firstWorkPartIndex = Array.isArray(msgContent)
+        ? msgContent.findIndex((p, index) => !isCallAgentToolCallShadowed(msgContent, index) &&
+            (p.type !== "tool-call" || p.activity !== true) &&
+            isCollapsibleAssistantWorkPart(p))
+        : -1;
     const shadowedToolCallIds = Array.isArray(msgContent)
         ? shadowedCallAgentToolCallIds(msgContent)
         : new Set();
@@ -979,7 +987,7 @@ export function AssistantMessage() {
                                         });
                                         if (!showSummary)
                                             return _jsx(_Fragment, { children: children });
-                                        return (_jsx(WorkedForSummary, { durationMs: capturedDurationMs ?? persistedDurationMs, defaultOpen: hasCustomUi, autoCollapse: animateCollapse && !hasCustomUi, children: children }));
+                                        return (_jsx(WorkedForSummary, { durationMs: getAssistantWorkSummaryDurationMs(capturedDurationMs ?? persistedDurationMs, part.indices[0] ?? -1, firstWorkPartIndex), defaultOpen: hasCustomUi, autoCollapse: animateCollapse && !hasCustomUi, children: children }));
                                     }
                                     case "group-ran-tools": {
                                         const toolCount = part.indices.filter((index) => msgContent?.[index]?.type === "tool-call").length;

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

@@ -24,9 +24,17 @@ export declare function ToolCallStackMotion({ children, className, }: {
  * provided, and "Always allow" only renders when `onAlwaysAllow` is provided
  * — both are additive so existing action-approval consumers are unaffected.
  */
+export type ApprovalResolution = "approved" | "denied";
 export type ApprovalContextValue = {
     /** Re-issue the turn so the server runs the approved call. */
     onApprove: (approvalKey: string) => void;
+    /**
+     * Keep the visible resolution stable while the chat repository refreshes or
+     * remounts the message containing this approval card.
+     */
+    onApprovalResolved?: (approvalKey: string, resolution: ApprovalResolution, toolCallId?: string) => void;
+    /** Read a resolution retained by the owning chat surface. */
+    getApprovalResolution?: (approvalKey: string, toolCallId?: string) => ApprovalResolution | null;
     /**
      * Optional host hook invoked in addition to the local "denied" state, e.g.
      * so a Code session can also resolve its own pending approval as denied.