@agent-native/core 0.141.7 → 0.144.0

package/dist/cli/app-skill.js

@@ -11,6 +11,7 @@ import { createHash } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { AGENT_PLUGIN_MCP_SCHEMA, AGENT_PLUGIN_SCHEMA, } from "./agent-plugin.js";
 import { resolveClients, supportsRemoteMcpOAuth, writeConfigs, } from "./connect.js";
 import { buildHttpMcpEntry, removeSameUrlDuplicatesForClient, } from "./mcp-config-writers.js";
 const HELP = `agent-native app-skill
@@ -23,7 +24,7 @@ Usage:
 Commands:
   ensure   Register the app skill MCP connector for your local agent clients.
   launch   Open the hosted app, or materialize and start a local editable app.
-  pack     Create marketplace-ready skill, MCP, Codex/Claude plugin, and Vercel skills adapters.
+  pack     Create a standard Agent Plugin plus marketplace-ready skill, MCP, and host adapters.
 
 Hosted is the default. Use --local when you want editable source, offline work,
 or a privacy-sensitive local app instance.`;
@@ -449,6 +450,39 @@ function mcpServerConfig(manifest, serverName) {
         mcpServers: Object.fromEntries(mcpServerNames(manifest, serverName).map((name) => [name, entry])),
     };
 }
+function standardAgentPluginManifest(manifest, version) {
+    return {
+        $schema: AGENT_PLUGIN_SCHEMA,
+        name: pluginName(manifest),
+        version,
+        description: manifest.description,
+        author: {
+            name: "Agent-Native",
+            url: "https://agent-native.com",
+        },
+        homepage: manifest.hosted.url,
+        repository: "https://github.com/BuilderIO/agent-native",
+        license: "MIT",
+        keywords: [
+            "agent-native",
+            manifest.id,
+            "mcp",
+            "skills",
+            "app-backed-skill",
+        ],
+    };
+}
+function standardAgentPluginMcpConfig(manifest) {
+    return {
+        $schema: AGENT_PLUGIN_MCP_SCHEMA,
+        mcpServers: {
+            [manifest.mcp.serverName]: {
+                type: "streamable-http",
+                url: manifest.hosted.mcpUrl,
+            },
+        },
+    };
+}
 function pluginName(manifest) {
     return `agent-native-${manifest.id}`;
 }
@@ -691,6 +725,8 @@ export function buildAppSkillPack(loaded, outDir) {
         }
         : manifest;
     writeJson(path.join(target, "agent-native.app-skill.json"), packedManifest);
+    writeJson(path.join(target, "plugin.json"), standardAgentPluginManifest(manifest, pluginVersion));
+    writeJson(path.join(target, "mcp.json"), standardAgentPluginMcpConfig(manifest));
     if (appSource) {
         copyDirFiltered(appSource, path.join(target, "app"));
     }
@@ -699,6 +735,8 @@ export function buildAppSkillPack(loaded, outDir) {
         copySkill(loaded.dir, skill, path.join(target, "skills"));
     const files = [
         path.join(target, "agent-native.app-skill.json"),
+        path.join(target, "plugin.json"),
+        path.join(target, "mcp.json"),
         ...(appSource ? [path.join(target, "app")] : []),
         ...exportedSkillNames.map((name) => path.join(target, "skills", name, "SKILL.md")),
     ];

package/dist/cli/code-agent-executor.d.ts

@@ -13,10 +13,13 @@ export interface ExecuteCodeAgentRunOptions {
     reasoningEffort?: ReasoningEffort;
     attachments?: AgentPromptAttachment[];
     stdout?: NodeJS.WritableStream;
+    /** Keep tool output in transcript events when the caller has a structured UI. */
+    streamToolOutputToStdout?: boolean;
     signal?: AbortSignal;
 }
 interface CodeAgentApprovalExecutionOptions {
     stdout?: NodeJS.WritableStream;
+    streamToolOutputToStdout?: boolean;
     signal?: AbortSignal;
 }
 export declare function executeCodeAgentRun(options: ExecuteCodeAgentRunOptions): Promise<CodeAgentRunRecord | null>;

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

@@ -37,6 +37,8 @@ export async function executeCodeAgentRun(options) {
     const existing = getCodeAgentRunRecord(options.runId);
     if (!existing)
         return null;
+    const streamToolOutputToStdout = options.streamToolOutputToStdout ??
+        process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
     const prompt = options.prompt ?? latestUserPrompt(existing.id);
     const rawAttachments = options.attachments ?? latestUserPromptAttachments(existing.id, prompt);
     // Split attachments: images (dataUrl) go as engine image parts; text/file
@@ -102,13 +104,16 @@ export async function executeCodeAgentRun(options) {
             model: options.model ?? metadataString(existing, "model"),
             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.";
-        options.stdout?.write(`${message}\n`);
+        if (streamToolOutputToStdout) {
+            options.stdout?.write(`${message}\n`);
+        }
         appendCodeAgentTranscriptEvent({
             runId: existing.id,
             kind: "status",
@@ -145,8 +150,11 @@ export async function executeCodeAgentRun(options) {
         // Both "start" and "done" phases update the map; done has richer data.
         pendingToolMeta.set(toolName, meta);
     }, (chunk) => {
-        // Stream incremental bash output to stdout for the terminal smoother
-        options.stdout?.write(chunk);
+        // Structured desktop transcripts render tool output separately from
+        // assistant text. Keep the legacy terminal stream opt-in for them.
+        if (streamToolOutputToStdout) {
+            options.stdout?.write(chunk);
+        }
     }, toolProfile);
     const mcpManager = toolProfile
         ? null
@@ -285,7 +293,9 @@ export async function executeCodeAgentRun(options) {
         }
         await outputSmoother.flush();
         if (assistantText.trim()) {
-            options.stdout?.write("\n");
+            if (streamToolOutputToStdout) {
+                options.stdout?.write("\n");
+            }
             appendCodeAgentTranscriptEvent({
                 runId: existing.id,
                 kind: "system",
@@ -301,7 +311,9 @@ export async function executeCodeAgentRun(options) {
         const approvalPending = getPendingApproval(existing.id);
         if (approvalPending) {
             const message = `Agent-Native Code run paused for approval: ${approvalPending.reason}`;
-            options.stdout?.write(`\n${message}\n`);
+            if (streamToolOutputToStdout) {
+                options.stdout?.write(`\n${message}\n`);
+            }
             appendCodeAgentTranscriptEvent({
                 runId: existing.id,
                 kind: "status",
@@ -382,7 +394,9 @@ export async function executeCodeAgentRun(options) {
     catch (err) {
         await outputSmoother.flush().catch(() => undefined);
         const message = err instanceof Error ? err.message : String(err);
-        options.stdout?.write(`\nAgent-Native Code run failed: ${message}\n`);
+        if (streamToolOutputToStdout) {
+            options.stdout?.write(`\nAgent-Native Code run failed: ${message}\n`);
+        }
         appendCodeAgentTranscriptEvent({
             runId: existing.id,
             kind: "status",
@@ -426,6 +440,8 @@ async function executeCodexCliRun(options) {
     const outputDir = fs.mkdtempSync(path.join(os.tmpdir(), "agent-native-code-codex-"));
     const outputPath = path.join(outputDir, "last-message.txt");
     const model = normalizeCodexCliModel(options.model);
+    const streamToolOutputToStdout = options.streamToolOutputToStdout ??
+        process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
     const args = [
         "--ask-for-approval",
         "never",
@@ -459,6 +475,7 @@ async function executeCodexCliRun(options) {
             cwd,
             prompt: buildCodexCliPrompt(options.run, options.prompt),
             stdout: options.stdout,
+            streamToolOutputToStdout,
             signal: options.signal,
         });
         if (result.exitCode !== 0) {
@@ -469,7 +486,9 @@ async function executeCodexCliRun(options) {
             const summary = interrupted
                 ? "Codex CLI run paused."
                 : `Codex CLI run failed: ${message}`;
-            options.stdout?.write(`\n${summary}\n`);
+            if (streamToolOutputToStdout) {
+                options.stdout?.write(`\n${summary}\n`);
+            }
             appendCodeAgentTranscriptEvent({
                 runId: options.run.id,
                 kind: "status",
@@ -546,6 +565,7 @@ async function executeCodexCliRun(options) {
                     userPromptAttachmentsForEvent(options.run.id, pendingFollowUp.eventId),
                 appendUserEvent: false,
                 stdout: options.stdout,
+                streamToolOutputToStdout: options.streamToolOutputToStdout,
                 signal: options.signal,
             });
         }
@@ -610,7 +630,9 @@ function runCodexCliProcess(options) {
         child.stdout?.on("data", (chunk) => {
             const text = chunk.toString();
             stdout += text;
-            options.stdout?.write(text);
+            if (options.streamToolOutputToStdout ?? true) {
+                options.stdout?.write(text);
+            }
         });
         child.stderr?.on("data", (chunk) => {
             stderr += chunk.toString();
@@ -702,14 +724,20 @@ export async function executePendingCodeAgentApproval(runId, options = {}) {
     if (!record)
         return null;
     const approval = getPendingApproval(runId);
+    const streamToolOutputToStdout = options.streamToolOutputToStdout ??
+        process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
     if (!approval) {
-        options.stdout?.write("No pending approval was found for this run.\n");
+        if (streamToolOutputToStdout) {
+            options.stdout?.write("No pending approval was found for this run.\n");
+        }
         return record;
     }
     const permission = classifyCodeAgentCommandPermission(approval.command);
     if (permission.kind === "forbidden") {
         const message = `Approval cannot run forbidden command: ${permission.reason}`;
-        options.stdout?.write(`${message}\n`);
+        if (streamToolOutputToStdout) {
+            options.stdout?.write(`${message}\n`);
+        }
         appendCodeAgentTranscriptEvent({
             runId,
             kind: "status",
@@ -746,7 +774,9 @@ export async function executePendingCodeAgentApproval(runId, options = {}) {
     ]
         .filter(Boolean)
         .join("\n\n"), MAX_TOOL_OUTPUT_CHARS);
-    options.stdout?.write(`${summary}\n`);
+    if (streamToolOutputToStdout) {
+        options.stdout?.write(`${summary}\n`);
+    }
     appendCodeAgentTranscriptEvent({
         runId,
         kind: "status",
@@ -782,6 +812,7 @@ export async function executePendingCodeAgentApproval(runId, options = {}) {
     });
     return executeExistingCodeAgentRun(runId, {
         stdout: options.stdout,
+        streamToolOutputToStdout,
         signal: options.signal,
     });
 }
@@ -795,12 +826,18 @@ export async function executeDenyCodeAgentApproval(runId, options = {}) {
     if (!record)
         return null;
     const approval = getPendingApproval(runId);
+    const streamToolOutputToStdout = options.streamToolOutputToStdout ??
+        process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
     if (!approval) {
-        options.stdout?.write("No pending approval was found for this run.\n");
+        if (streamToolOutputToStdout) {
+            options.stdout?.write("No pending approval was found for this run.\n");
+        }
         return record;
     }
     const message = `User denied command: ${approval.command} (${approval.reason})`;
-    options.stdout?.write(`${message}\n`);
+    if (streamToolOutputToStdout) {
+        options.stdout?.write(`${message}\n`);
+    }
     appendCodeAgentTranscriptEvent({
         runId,
         kind: "status",
@@ -833,6 +870,7 @@ export async function executeDenyCodeAgentApproval(runId, options = {}) {
     });
     return executeExistingCodeAgentRun(runId, {
         stdout: options.stdout,
+        streamToolOutputToStdout,
         signal: options.signal,
     });
 }

package/dist/cli/index.js

@@ -882,6 +882,17 @@ switch (command) {
         });
         break;
     }
+    case "plugin": {
+        // Import a standard Agent Plugin's Skills and remote MCP entries into the
+        // current Agent-Native workspace.
+        import("./agent-plugin.js")
+            .then((m) => m.runAgentPlugin(args))
+            .catch((err) => {
+            console.error(err?.message ?? err);
+            process.exit(1);
+        });
+        break;
+    }
     case "skills": {
         // Friendly skill install surface. Wraps open skills installation plus MCP.
         import("./skills.js")
@@ -1118,6 +1129,8 @@ Usage:
                                 reinstalling app skills/connectors.
   agent-native app-skill <cmd>  Install, launch, or package app-backed skills.
                                 cmds: ensure | launch | pack
+  agent-native plugin import <path> [--into <workspace>] [--yes] [--force]
+                                Import standard Agent Plugin Skills and remote MCP servers.
   agent-native skills add assets|content|design-exploration|visual-edit|visual-plan|visual-recap|context-xray
                                 Install the skill instructions, register the MCP
                                 connector, AND authenticate it in one step.

package/dist/cli/templates-meta.js

@@ -69,7 +69,7 @@ export const TEMPLATES = [
     {
         name: "analytics",
         label: "Analytics",
-        hint: "Agent-native Amplitude/Mixpanel — connect data sources, prompt for charts",
+        hint: "Agent-native provider analytics - connect data sources, prompt for charts and deep dives",
         icon: "BarChart2",
         color: "#F59E0B",
         colorRgb: "245 158 11",

package/dist/client/AgentPanel.d.ts

@@ -186,12 +186,14 @@ export interface AgentSidebarProps {
     threadUrlSync?: MultiTabAssistantChatProps["threadUrlSync"];
     /** Optional link shown in Resources and Settings modes for the full Agent page. */
     agentPageHref?: string;
+    /** Suppress first-run onboarding while a deep-linked resource is open. */
+    suppressFirstRunOnboarding?: boolean;
 }
 /**
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openOnChatRunning, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, }: AgentSidebarProps): React.JSX.Element;
+export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openOnChatRunning, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding, }: AgentSidebarProps): React.JSX.Element;
 /**
  * Focus the agent chat composer input.
  * Opens the sidebar if closed, then focuses the text input.

package/dist/client/AgentPanel.js

@@ -879,6 +879,12 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                         `[data-agent-fullscreen='true'] .agent-composer-area,` +
                         `[data-agent-fullscreen='true'] .agent-plan-mode-callout{` +
                         `max-width:${FULLSCREEN_CHAT_COLUMN_MAX_PX}px;` +
+                        `margin-left:auto;margin-right:auto;width:100%;}` +
+                        `[data-agent-fullscreen='true'] .agent-composer-area:not(.agent-composer-area--compact){` +
+                        `padding-left:0;padding-right:0;}` +
+                        `[data-agent-fullscreen='true'] .agent-mcp-connection-suggestion--composer,` +
+                        `[data-agent-fullscreen='true'] .agent-mcp-connection-suggestion-error--composer{` +
+                        `max-width:${FULLSCREEN_CHAT_COLUMN_MAX_PX}px;` +
                         `margin-left:auto;margin-right:auto;width:100%;}`,
                 } }), SHOW_ONBOARDING && mounted && (_jsx(Suspense, { fallback: null, children: _jsx(OnboardingPanel, {}) })), showFirstRunOnboarding && mounted && !insideAgentSidebar && (_jsx(Suspense, { fallback: null, children: _jsx(FirstRunOnboarding, {}) })), _jsx("div", { className: cn("flex flex-col min-h-0", mode === "chat" ? "flex-1" : "shrink-0"), children: mounted && (_jsx(Suspense, { fallback: _jsx(ChatLoadingSkeleton, { renderHeader: showHeader ? renderChatHeader : undefined, centerComposerWhenEmpty: assistantChatProps.centerComposerWhenEmpty, composerSlot: assistantChatProps.composerSlot, composerAreaClassName: assistantChatProps.composerAreaClassName, composerLayoutVariant: assistantChatProps.composerLayoutVariant }), children: _jsx(MultiTabAssistantChatLazy, { ...assistantChatProps, agentChatSurface: effectiveAgentChatSurface, apiUrl: apiUrl, showHeader: false, renderHeader: showHeader ? renderChatHeader : undefined, showTabBar: showTabBar, renderOverlay: showPageNewChatButton && !showHeader
                             ? renderPageChatOverlay
@@ -1319,9 +1325,10 @@ export function AgentChatSurface({ mode = "panel", className, defaultMode = "cha
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openOnChatRunning = false, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, }) {
+export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openOnChatRunning = false, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding = false, }) {
     const onboardingPreviewMode = useOnboardingPreviewMode();
-    const showFirstRunOnboarding = SHOW_FIRST_RUN_ONBOARDING || onboardingPreviewMode;
+    const showFirstRunOnboarding = !suppressFirstRunOnboarding &&
+        (SHOW_FIRST_RUN_ONBOARDING || onboardingPreviewMode);
     const initialWidth = defaultSidebarWidth ?? sidebarWidth ?? 380;
     const [open, setOpen] = useState(() => openOnChatRunning || getInitialAgentSidebarOpen(defaultOpen, storageKey));
     const [presentationMode, setPresentationMode] = useState(false);

package/dist/client/AssistantChat.d.ts

@@ -14,6 +14,14 @@ import { type ContentPart } from "./sse-event-processor.js";
 import type { ChatThreadScope, ChatThreadSnapshot } from "./use-chat-threads.js";
 export { AssistantMessageListErrorBoundary, AssistantUiStaleIndexErrorBoundary, assistantUiRecoverableRenderErrorKind, isAssistantUiRecoverableRenderError, isAssistantUiStaleIndexError, } from "./assistant-ui-recovery.js";
 export { displayableUserMessageText } from "./chat/message-components.js";
+type AssistantUiMessageResourceShape = {
+    id: string;
+    content: readonly unknown[];
+    attachments?: readonly {
+        id: string;
+    }[];
+};
+export declare function assistantUiMessageListStructureKey(messages: readonly AssistantUiMessageResourceShape[]): string;
 export type AgentRequestMode = "act" | "plan";
 export type AgentRecoveryAction = "continue" | "retry";
 export interface AssistantChatSendOptions {

package/dist/client/AssistantChat.js

@@ -29,7 +29,6 @@ import { MessageScroller, MessageScrollerContent, MessageScrollerItem, MessageSc
 import { Popover, PopoverContent, PopoverTrigger, } from "./components/ui/popover.js";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "./components/ui/tooltip.js";
 import { AgentComposerFrame, TiptapComposer, } from "./composer/index.js";
-import { ContextMeter } from "./context-xray/ContextMeter.js";
 import { useNearBottomAutoscroll } from "./conversation/index.js";
 import { useAgentDynamicSuggestionsResult, } from "./dynamic-suggestions.js";
 import { GuidedQuestionFlow, useGuidedQuestionFlow, } from "./guided-questions.js";
@@ -44,6 +43,21 @@ import { cn } from "./utils.js";
 export { AssistantMessageListErrorBoundary, AssistantUiStaleIndexErrorBoundary, assistantUiRecoverableRenderErrorKind, isAssistantUiRecoverableRenderError, isAssistantUiStaleIndexError, } from "./assistant-ui-recovery.js";
 export { displayableUserMessageText } from "./chat/message-components.js";
 const useBrowserLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
+export function assistantUiMessageListStructureKey(messages) {
+    return JSON.stringify(messages.map((message) => [
+        message.id,
+        message.content.map((part, index) => {
+            const partObject = typeof part === "object" && part !== null ? part : null;
+            const toolCallId = partObject && "toolCallId" in partObject
+                ? partObject.toolCallId
+                : undefined;
+            return typeof toolCallId === "string"
+                ? `toolCallId-${toolCallId}`
+                : `index-${index}`;
+        }),
+        (message.attachments ?? []).map((attachment) => attachment.id),
+    ]));
+}
 export function createUserMessageRunConfig(references, requestMode, recoveryAction, trackInRunsTray, approvedToolCalls, queuedMessageId, hideUserMessage, modelSnapshot) {
     const custom = {};
     if (modelSnapshot?.model)
@@ -1354,7 +1368,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         scope: contextScope,
         enabled: messages.length === 0,
     });
-    const messageListResetKey = useMemo(() => messages.map((message) => message.id).join("|"), [messages]);
+    const messageListResetKey = assistantUiMessageListStructureKey(messages);
     // Chat-wide drag-and-drop: users expect to drop a file anywhere on the agent
     // sidebar (thread, header, composer) and have it attach — same as ChatGPT,
     // Claude.ai, Linear, Slack, etc. Tiptap's own `handleDrop` only fires inside
@@ -3845,8 +3859,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         !isComposerDisabled &&
         !showRunningInUI;
     const canImplementPlan = showPlanModeCallout && latestAssistantWasPlan;
-    const contextXRayEnabled = Boolean(threadId &&
-        (messages.length > 0 || isReconnecting || reconnectContent.length > 0));
     const handleImplementPlan = useCallback(() => {
         onExecModeChange?.("build");
         void addToQueue("Implement the plan.", undefined, undefined, undefined, "act");
@@ -3997,10 +4009,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                 return;
                                                                             }
                                                                             void addToQueue(suggestion);
-                                                                        }, className: "w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [_jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(ThreadPrimitive.Messages, { components: {
+                                                                        }, className: "w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [_jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(ThreadPrimitive.Messages
+                                                                    // assistant-ui indexes message parts through tap resources.
+                                                                    // Keep this key tied to that shape so clear/add transitions remount stale
+                                                                    // lookups without remounting on every streamed text update.
+                                                                    , { components: {
                                                                             UserMessage: AssistantChatUserMessageItem,
                                                                             AssistantMessage: AssistantChatAssistantMessageItem,
-                                                                        } }) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
+                                                                        } }, messageListResetKey) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
                                                                             setShowContinue(false);
                                                                             setLoopLimitInfo(null);
                                                                             addToQueue("Continue from where you left off.", undefined, undefined, undefined, undefined, "queued", "continue");
@@ -4063,8 +4079,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                 isRunning,
                                                                                 requestedIntent: options?.intent,
                                                                             }), undefined, true)
-                                                                            : undefined, willQueue: engineSetupRequired || isRunning, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, modelListLoading: modelListLoading, onModelChange: onModelChange, onEffortChange: onEffortChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, toolbarSlot: composerToolbarSlot, contextItems: composerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, voiceEnabled: true, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: contextXRayEnabled ||
-                                                                            composerExtraActionButton ? (_jsxs(_Fragment, { children: [contextXRayEnabled && (_jsx(ContextMeter, { threadId: threadId })), composerExtraActionButton] })) : undefined, stopButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => stopActiveRun(), "aria-label": "Stop response", "data-agent-composer-slot": "stop-button", className: "shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: _jsx(IconPlayerStopFilled, { className: "h-3 w-3" }) }) }), _jsx(TooltipContent, { children: "Stop response" })] })) : undefined })] })) }), showMissingKeySetup && !showInlineMissingKeySetup ? (_jsx(PopoverContent, { side: missingApiKeySetupLayout === "sidebar"
+                                                                            : undefined, willQueue: engineSetupRequired || isRunning, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, modelListLoading: modelListLoading, onModelChange: onModelChange, onEffortChange: onEffortChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, toolbarSlot: composerToolbarSlot, contextItems: composerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, voiceEnabled: true, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: composerExtraActionButton, stopButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => stopActiveRun(), "aria-label": "Stop response", "data-agent-composer-slot": "stop-button", className: "shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: _jsx(IconPlayerStopFilled, { className: "h-3 w-3" }) }) }), _jsx(TooltipContent, { children: "Stop response" })] })) : undefined })] })) }), showMissingKeySetup && !showInlineMissingKeySetup ? (_jsx(PopoverContent, { side: missingApiKeySetupLayout === "sidebar"
                                                                 ? "top"
                                                                 : "bottom", align: "center", sideOffset: 8, collisionPadding: 12, "data-agent-native-composer-popover": "true", className: "z-[260] box-border w-[min(calc(100vw-2rem),var(--radix-popover-content-available-width,26rem),26rem)] rounded-lg border-border p-3 shadow-lg", children: _jsx(BuilderSetupContent, { onConnected: handleBuilderConnected, layout: missingApiKeySetupLayout }) })) : null] })] })] }) }) }) }) }) }) }) }));
 });

package/dist/client/NewWorkspaceAppFlow.js

@@ -75,6 +75,7 @@ function buildNewWorkspaceAppPrompt(input) {
         `Generate a concise one-sentence app description from the user prompt before coding; save it in apps/${input.appId}/package.json "description" so Dispatch and A2A can describe the app.`,
         `If the user mentions a product or company such as Granola, Loom, Superhuman, Linear, or Notion, treat it as product inspiration unless they explicitly ask to connect to that service. Do not invent or require third-party API keys like GRANOLA_API_KEY just because a product is named.`,
         grantRequest,
+        `Workspace credential rule: use the Dispatch workspace vault and the app's scoped secret or workspace-connection resolver for provider credentials. Framework apps should use resolveSecret from @agent-native/core/server; existing builder-workspace apps should use their resolveConnectorSecret helper. Do not ask a non-admin builder to add keys to local project settings or .env, and do not copy vault values into app code. If a needed key is not available, request it through Dispatch's vault workflow or surface the provider connection setup path.`,
         `Requested Dispatch workspace resources for this app:\n${resourceList}`,
         `Dispatch workspace resources with scope=all are inherited workspace context. Do not copy or sync them into the new app; every workspace app reads them at runtime and may override with app shared or personal resources.`,
         ``,

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

@@ -980,6 +980,65 @@ class AgentStartupTimeoutError extends Error {
         this.timeoutMs = timeoutMs;
     }
 }
+/**
+ * Keep the server's error contract intact across the fetch boundary. In
+ * particular, a POST response with `retryable: false` must not be fed into the
+ * generic reconnect/continuation path: replaying a mutation after the server
+ * has started processing it can duplicate work. The previous code discarded
+ * this metadata and exposed the raw JSON body to the user instead.
+ */
+class AgentChatHttpError extends Error {
+    errorCode;
+    details;
+    retryable;
+    upgradeUrl;
+    constructor(error) {
+        super(error.message);
+        this.name = "AgentChatHttpError";
+        this.errorCode = error.errorCode;
+        this.details = error.details;
+        this.retryable = error.retryable;
+        this.upgradeUrl = error.upgradeUrl;
+    }
+}
+function parseStructuredAgentChatError(body) {
+    if (!body.trim())
+        return null;
+    try {
+        const parsed = JSON.parse(body);
+        if (!parsed || typeof parsed !== "object")
+            return null;
+        const message = typeof parsed.error === "string"
+            ? parsed.error
+            : typeof parsed.message === "string"
+                ? parsed.message
+                : "";
+        if (!message)
+            return null;
+        return {
+            message,
+            ...(typeof parsed.code === "string"
+                ? { errorCode: parsed.code }
+                : typeof parsed.errorCode === "string"
+                    ? { errorCode: parsed.errorCode }
+                    : {}),
+            ...(typeof parsed.details === "string"
+                ? { details: parsed.details }
+                : {}),
+            ...(typeof parsed.retryable === "boolean"
+                ? { retryable: parsed.retryable }
+                : {}),
+            ...(typeof parsed.upgradeUrl === "string"
+                ? { upgradeUrl: parsed.upgradeUrl }
+                : {}),
+        };
+    }
+    catch (error) {
+        if (error instanceof SyntaxError)
+            return null;
+        throw error;
+    }
+}
 async function fetchWithStartupTimeout(input, init, timeoutMs, abortSignal) {
     if (abortSignal.aborted) {
         throw new DOMException("The operation was aborted.", "AbortError");
@@ -2743,7 +2802,7 @@ export function createAgentChatAdapter(options) {
                                 const body = await res.text();
                                 const parsed = JSON.parse(body);
                                 if (parsed.error) {
-                                    throw new Error(parsed.error);
+                                    throw new Error(String(parsed.error));
                                 }
                             }
                             catch (e) {
@@ -2877,6 +2936,7 @@ export function createAgentChatAdapter(options) {
                             let errorText = `Server error: ${res.status}`;
                             try {
                                 const body = await res.text();
+                                const structuredError = parseStructuredAgentChatError(body);
                                 if (isAuthErrorMessage(body)) {
                                     if (await tryRecoverAuthOnce()) {
                                         continue;
@@ -2920,11 +2980,25 @@ export function createAgentChatAdapter(options) {
                                         "Agent chat endpoint not found. Make sure the agent-chat plugin is loaded in server/plugins/.";
                                 }
                                 else if (body) {
-                                    errorText =
-                                        body.length > 200 ? body.slice(0, 200) + "..." : body;
+                                    // A non-retryable structured response is a terminal server
+                                    // outcome. Preserve its code and stop before the generic
+                                    // connection recovery below can POST the same turn again.
+                                    if (structuredError &&
+                                        (structuredError.retryable === false ||
+                                            structuredError.errorCode === "database_unavailable")) {
+                                        throw new AgentChatHttpError(structuredError);
+                                    }
+                                    errorText = structuredError
+                                        ? structuredError.message
+                                        : body.length > 200
+                                            ? body.slice(0, 200) + "..."
+                                            : body;
                                 }
                             }
-                            catch { }
+                            catch (error) {
+                                if (error instanceof AgentChatHttpError)
+                                    throw error;
+                            }
                             throw new Error(errorText);
                         }
                         if (!res.body) {
@@ -3095,6 +3169,51 @@ export function createAgentChatAdapter(options) {
                                 return;
                             continue;
                         }
+                        if (err instanceof AgentChatHttpError) {
+                            const normalized = normalizeChatError(err.message, err.errorCode);
+                            const details = [err.details, normalized.details]
+                                .filter(Boolean)
+                                .join("\n\n");
+                            const runError = {
+                                message: normalized.message,
+                                ...(details ? { details } : {}),
+                                ...(err.errorCode ? { errorCode: err.errorCode } : {}),
+                                recoverable: err.retryable === true,
+                                ...(runId ? { runId } : {}),
+                            };
+                            captureChatClientError(err, "server-error", {
+                                ...(err.errorCode ? { errorCode: err.errorCode } : {}),
+                                retryable: err.retryable ?? false,
+                            });
+                            if (typeof window !== "undefined") {
+                                window.dispatchEvent(new CustomEvent("agent-chat:run-error", {
+                                    detail: {
+                                        ...runError,
+                                        ...(err.upgradeUrl ? { upgradeUrl: err.upgradeUrl } : {}),
+                                        tabId,
+                                    },
+                                }));
+                            }
+                            settleInterruptedToolCalls(content, undefined, {
+                                includeActivity: true,
+                            });
+                            content.push({
+                                type: "text",
+                                text: `Something went wrong: ${normalized.message}`,
+                            });
+                            yield {
+                                content: [...content],
+                                status: {
+                                    type: "incomplete",
+                                    reason: "error",
+                                },
+                                metadata: {
+                                    custom: { ...(runId ? { runId } : {}), runError },
+                                },
+                            };
+                            clearActiveRun();
+                            return;
+                        }
                         const errMsg = err instanceof Error ? err.message : "Something went wrong.";
                         const isAuthError = isAuthErrorMessage(errMsg);
                         // Don't try to reconnect for auth/client errors — show error directly