@agent-native/core 0.70.0 → 0.70.1

package/corpus/core/src/client/client-surface.ts

@@ -0,0 +1,41 @@
+/**
+ * The runtime shell the web UI is rendering inside. Used as pass-through
+ * feedback metadata so form owners can tell whether a submission came from the
+ * Agent Native desktop app (Electron), a Tauri desktop shell (e.g. Clips), or a
+ * plain browser — without surfacing it as a visible form field.
+ */
+export type ClientSurface = "web" | "electron" | "tauri";
+
+interface SurfaceGlobals {
+  // Tauri v2 always injects this into the webview; `__TAURI__` only exists when
+  // the app opts into `withGlobalTauri`, so check both.
+  __TAURI_INTERNALS__?: unknown;
+  __TAURI__?: unknown;
+  // Exposed by the Agent Native desktop (Electron) preload bridges.
+  agentNativeDesktop?: unknown;
+  electronAPI?: unknown;
+}
+
+/**
+ * Best-effort, side-effect-free detection of the current client surface.
+ * Returns "web" during SSR and in any plain browser.
+ *
+ * Electron detection keys off the `AgentNativeDesktop` User-Agent token that the
+ * desktop shell appends app-wide (see `app.userAgentFallback`), plus the preload
+ * globals, so it stays specific to our app rather than every Electron webview.
+ */
+export function getClientSurface(): ClientSurface {
+  if (typeof window === "undefined") return "web";
+  const w = window as unknown as SurfaceGlobals;
+  if (w.__TAURI_INTERNALS__ || w.__TAURI__) return "tauri";
+  const ua = typeof navigator !== "undefined" ? navigator.userAgent || "" : "";
+  if (
+    /AgentNativeDesktop/i.test(ua) ||
+    /\bElectron\b/i.test(ua) ||
+    w.agentNativeDesktop ||
+    w.electronAPI
+  ) {
+    return "electron";
+  }
+  return "web";
+}

package/corpus/core/src/client/composer/TiptapComposer.tsx

@@ -417,6 +417,11 @@ export interface TiptapComposerProps {
    * Used by the Electron desktop app to route through the native IPC handler.
    */
   onConnectProvider?: () => void;
+  /**
+   * Optional secondary model menu (e.g. an image-generation model) rendered as
+   * an extra section inside the model picker. Opt-in; omit for chat-only apps.
+   */
+  imageModelMenu?: ComposerImageModelMenu;
   /** Stable scope for persisted drafts, usually the active thread or tab id. */
   draftScope?: string;
   /** Keyed context nuggets staged for the next submitted prompt. */
@@ -669,6 +674,24 @@ function latestModelsOnly(models: string[]): string[] {
   });
 }
 
+/**
+ * Optional secondary model menu for apps that drive a separate generation model
+ * alongside the chat LLM (e.g. the Assets app's image-generation model). When
+ * provided, the model picker renders an extra collapsible section so the user
+ * can see and pick both "what reasons about my request" (the chat model) and
+ * "what produces the output" (this model). Opt-in — omit it and nothing changes.
+ */
+export interface ComposerImageModelMenu {
+  /** Currently-selected model id for this secondary menu. */
+  value: string;
+  /** Selectable options (stable id + human label). */
+  options: Array<{ value: string; label: string }>;
+  /** Invoked when the user picks a different option. */
+  onChange: (value: string) => void;
+  /** Section header. Defaults to "Image model". */
+  label?: string;
+}
+
 function ModelSelector({
   model,
   effort = "auto",
@@ -677,6 +700,7 @@ function ModelSelector({
   onEffortChange,
   providerConnectStatusEnabled = true,
   onConnectProvider,
+  imageModel,
 }: {
   model: string;
   effort?: ReasoningEffort;
@@ -690,6 +714,7 @@ function ModelSelector({
   onEffortChange?: (effort: ReasoningEffort) => void;
   providerConnectStatusEnabled?: boolean;
   onConnectProvider?: () => void;
+  imageModel?: ComposerImageModelMenu;
 }) {
   const [open, setOpen] = useState(false);
   const autoModelGroup = engines.find((group) => group.models.includes("auto"));
@@ -744,6 +769,24 @@ function ModelSelector({
     });
   }, []);
 
+  // The reasoning effort list is collapsed by default — it's a secondary
+  // control most users don't touch, so it stays tucked behind a header that
+  // reveals the current effort at a glance. Reset to collapsed on each open.
+  const [reasoningExpanded, setReasoningExpanded] = useState(false);
+  useEffect(() => {
+    if (open) setReasoningExpanded(false);
+  }, [open]);
+
+  // The optional image-model section follows the same collapsed-by-default
+  // pattern; the current selection shows next to the header.
+  const [imageExpanded, setImageExpanded] = useState(false);
+  useEffect(() => {
+    if (open) setImageExpanded(false);
+  }, [open]);
+  const imageModelLabel =
+    imageModel?.options.find((option) => option.value === imageModel.value)
+      ?.label ?? imageModel?.value;
+
   // When Builder.io isn't connected, surface a one-click connect path —
   // it unlocks every model family (Claude, OpenAI, Gemini) without the
   // user having to paste individual API keys.
@@ -835,6 +878,52 @@ function ModelSelector({
             <div className="my-1 border-t border-border" />
           </>
         )}
+        {imageModel && imageModel.options.length > 0 && (
+          <>
+            <div className="flex items-center hover:bg-accent/30">
+              <button
+                type="button"
+                aria-expanded={imageExpanded}
+                onClick={() => setImageExpanded((prev) => !prev)}
+                className="flex flex-1 min-w-0 items-center gap-1.5 px-2 py-1.5 cursor-pointer text-left"
+              >
+                {imageExpanded ? (
+                  <IconChevronDown className="h-3 w-3 shrink-0 text-muted-foreground" />
+                ) : (
+                  <IconChevronRight className="h-3 w-3 shrink-0 text-muted-foreground" />
+                )}
+                <span className="text-[11px] font-medium text-muted-foreground uppercase tracking-wide shrink-0">
+                  {imageModel.label ?? "Image model"}
+                </span>
+                {!imageExpanded && imageModelLabel && (
+                  <span className="text-[11px] text-muted-foreground/80 truncate">
+                    {imageModelLabel}
+                  </span>
+                )}
+              </button>
+            </div>
+            {imageExpanded &&
+              imageModel.options.map((option) => (
+                <button
+                  key={option.value}
+                  type="button"
+                  onClick={() => {
+                    imageModel.onChange(option.value);
+                    setImageExpanded(false);
+                  }}
+                  className="flex w-full items-center gap-3 pl-7 pr-3 py-1.5 text-left hover:bg-accent/50"
+                >
+                  <span className="flex-1 min-w-0 text-[13px] text-foreground truncate">
+                    {option.label}
+                  </span>
+                  {option.value === imageModel.value && (
+                    <IconCheck className="h-3.5 w-3.5 shrink-0 text-blue-500" />
+                  )}
+                </button>
+              ))}
+            <div className="my-1 border-t border-border" />
+          </>
+        )}
         {autoModelGroup && (
           <button
             type="button"
@@ -930,24 +1019,44 @@ function ModelSelector({
         {effortOptions.length > 0 && (
           <>
             <div className="my-1 border-t border-border" />
-            <div className="px-3 py-1.5 text-[11px] font-medium text-muted-foreground uppercase tracking-wide">
-              Reasoning
-            </div>
-            {effortOptions.map((option) => (
+            <div className="flex items-center hover:bg-accent/30">
               <button
-                key={option}
                 type="button"
-                onClick={() => onEffortChange?.(option)}
-                className="flex w-full items-center gap-3 px-3 py-1.5 text-left hover:bg-accent/50"
+                aria-expanded={reasoningExpanded}
+                onClick={() => setReasoningExpanded((prev) => !prev)}
+                className="flex flex-1 min-w-0 items-center gap-1.5 px-2 py-1.5 cursor-pointer text-left"
               >
-                <span className="flex-1 min-w-0 text-[13px] text-foreground truncate">
-                  {reasoningEffortLabel(option)}
+                {reasoningExpanded ? (
+                  <IconChevronDown className="h-3 w-3 shrink-0 text-muted-foreground" />
+                ) : (
+                  <IconChevronRight className="h-3 w-3 shrink-0 text-muted-foreground" />
+                )}
+                <span className="text-[11px] font-medium text-muted-foreground uppercase tracking-wide shrink-0">
+                  Reasoning
                 </span>
-                {option === effort && (
-                  <IconCheck className="h-3.5 w-3.5 shrink-0 text-blue-500" />
+                {!reasoningExpanded && (
+                  <span className="text-[11px] text-muted-foreground/80 truncate">
+                    {reasoningEffortLabel(effort)}
+                  </span>
                 )}
               </button>
-            ))}
+            </div>
+            {reasoningExpanded &&
+              effortOptions.map((option) => (
+                <button
+                  key={option}
+                  type="button"
+                  onClick={() => onEffortChange?.(option)}
+                  className="flex w-full items-center gap-3 pl-7 pr-3 py-1.5 text-left hover:bg-accent/50"
+                >
+                  <span className="flex-1 min-w-0 text-[13px] text-foreground truncate">
+                    {reasoningEffortLabel(option)}
+                  </span>
+                  {option === effort && (
+                    <IconCheck className="h-3.5 w-3.5 shrink-0 text-blue-500" />
+                  )}
+                </button>
+              ))}
           </>
         )}
       </PopoverContent>
@@ -994,6 +1103,7 @@ export function TiptapComposer({
   onEffortChange,
   providerConnectStatusEnabled,
   onConnectProvider,
+  imageModelMenu,
   draftScope,
   contextItems = [],
   onRemoveContextItem,
@@ -2091,6 +2201,7 @@ export function TiptapComposer({
             onEffortChange={onEffortChange}
             providerConnectStatusEnabled={providerConnectStatusEnabled}
             onConnectProvider={onConnectProvider}
+            imageModel={imageModelMenu}
           />
         )}
         {execMode && onExecModeChange && (

package/corpus/core/src/client/feedback-context.ts

@@ -1,10 +1,13 @@
 import { getActiveRun } from "./active-run-state.js";
+import { getClientSurface, type ClientSurface } from "./client-surface.js";
 import { scrubUrl } from "./url-scrub.js";
 
 export interface FeedbackClientContext {
   chatSessionIds: string[];
   activeRunId?: string;
   pageUrl?: string;
+  /** Runtime shell the feedback was sent from: web, electron, or tauri. */
+  clientSurface?: ClientSurface;
 }
 
 export interface FeedbackClientContextOptions {
@@ -81,6 +84,7 @@ export function getFeedbackClientContext(
   if (activeRun?.runId) context.activeRunId = activeRun.runId;
   if (typeof window !== "undefined") {
     context.pageUrl = scrubUrl(window.location.href);
+    context.clientSurface = getClientSurface();
   }
   return context;
 }

package/corpus/core/src/client/index.ts

@@ -609,6 +609,7 @@ export {
   type StarfieldBackgroundProps,
 } from "./StarfieldBackground.js";
 export { FeedbackButton, type FeedbackButtonProps } from "./FeedbackButton.js";
+export { getClientSurface, type ClientSurface } from "./client-surface.js";
 export {
   DevDatabaseLink,
   type DevDatabaseLinkProps,

package/corpus/core/src/client/sse-event-processor.ts

@@ -233,7 +233,13 @@ function isAutoRecoverableError(ev: SSEEvent, errMsg: string): boolean {
     // same wall. This used to send the chat into a 32-continuation runaway
     // (each turn cleared+regenerated visible content) for users hitting a
     // misbehaving Builder route. Surface the error instead.
-    code === "builder_gateway_error"
+    code === "builder_gateway_error" ||
+    // The hosted run exhausted its in-invocation continuation budget without
+    // finishing (run-loop-with-resume.ts). It's flagged `recoverable: true` so
+    // the recovery banner reads "stopped before finishing", but it must NOT
+    // auto-continue: another POST would hit the same ~40s wall and churn. The
+    // user retries deliberately (ideally as a single bulk action).
+    code === "run_budget_exhausted"
   ) {
     return false;
   }

package/corpus/core/src/mcp/build-server.ts

@@ -184,6 +184,46 @@ export interface MCPRequestMeta {
    * `config.actions`. Set by `mountMCP` from `verifyAuth`.
    */
   fullSurface?: boolean;
+  /**
+   * Whether this request may receive inline MCP App embeds (the `ui://`
+   * resource reference hosts render in an iframe). Resolved once per request by
+   * `createMCPServerForRequest` from `isMcpAppsInlineEnabled(identity)` — the
+   * deploy-toggleable kill switch. When `false`, no MCP App resource is
+   * advertised or referenced and tool results fall back to their deep-link
+   * text. Defaults to disabled when unset.
+   */
+  inlineMcpApps?: boolean;
+}
+
+/**
+ * Deploy-toggleable kill switch for inline MCP App embeds — the `ui://`
+ * resource reference hosts like Codex / Cursor / ChatGPT render in a sandboxed
+ * iframe. **Off by default**, so a not-yet-verified inline embed never reaches
+ * normal users; flip it on per environment with `AGENT_NATIVE_MCP_APPS_INLINE=1`
+ * and a redeploy. While the global switch is off, accounts listed in
+ * `AGENT_NATIVE_MCP_APPS_INLINE_ALLOW_EMAILS` (comma/space separated) still get
+ * inline embeds, so you can keep verifying a fix in production before enabling
+ * it for everyone. Requires no skills/instructions change — when disabled, tool
+ * results simply fall back to their deep-link text.
+ */
+export function isMcpAppsInlineEnabled(
+  identity: MCPCallerIdentity | undefined,
+): boolean {
+  const flag = process.env.AGENT_NATIVE_MCP_APPS_INLINE?.trim().toLowerCase();
+  if (flag === "1" || flag === "true" || flag === "yes" || flag === "on") {
+    return true;
+  }
+  const email = identity?.userEmail?.trim().toLowerCase();
+  if (email) {
+    const allowed = (
+      process.env.AGENT_NATIVE_MCP_APPS_INLINE_ALLOW_EMAILS ?? ""
+    )
+      .split(/[\s,]+/)
+      .map((value) => value.trim().toLowerCase())
+      .filter(Boolean);
+    if (allowed.includes(email)) return true;
+  }
+  return false;
 }
 
 type McpOAuthScope = (typeof MCP_OAUTH_SCOPES)[number];
@@ -708,7 +748,7 @@ function safeUiSegment(value: string | undefined, fallback: string): string {
 
 // ChatGPT and Claude cache MCP App resource HTML by `ui://` URI. Bump this
 // when the shared shell changes in a way that must invalidate host caches.
-const MCP_APP_RESOURCE_SHELL_VERSION = "shell-v45";
+const MCP_APP_RESOURCE_SHELL_VERSION = "shell-v46";
 
 function legacyDefaultMcpAppUri(config: MCPConfig, actionName: string): string {
   const app = safeUiSegment(config.appId ?? config.name, "agent-native");
@@ -912,6 +952,12 @@ async function resolveMcpAppResource(
 ): Promise<ResolvedMcpAppResource | null> {
   const resource = entry.mcpApp?.resource;
   if (!resource) return null;
+  // Inline MCP App embeds are gated behind the deploy-toggleable kill switch
+  // (default off). When disabled, advertise no resource and attach no embed
+  // reference so hosts fall back to the tool's deep-link text instead of an
+  // iframe. This is the single chokepoint for every embed surface: tools/list
+  // descriptor meta, tools/call result meta, resources/list, resources/read.
+  if (!requestMeta?.inlineMcpApps) return null;
   const resolvedUri = getMcpAppResourceUri(config, actionName, entry);
   if (!resolvedUri) return null;
   const description = resource.description ?? entry.tool.description;
@@ -1192,6 +1238,16 @@ export async function createMCPServerForRequest(
       ? { userEmail: ownerFromEnv, orgDomain: undefined }
       : undefined);
 
+  // Resolve the inline-MCP-App kill switch once per request from the effective
+  // identity + environment, then thread it through `requestMeta` so every
+  // resource/tool handler below honors the same decision. An explicit value on
+  // the incoming meta (tests / embedded callers) wins.
+  requestMeta = {
+    ...(requestMeta ?? {}),
+    inlineMcpApps:
+      requestMeta?.inlineMcpApps ?? isMcpAppsInlineEnabled(effectiveIdentity),
+  };
+
   // The action set the request handlers operate on = base actions + generic
   // cross-app builtins (template wins on name collision). An authenticated
   // real caller (connect-minted token / `mcp install` owner / production —

package/corpus/core/src/mcp/embed-app.ts

@@ -67,6 +67,8 @@ export function embedApp(
     .title { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; font-weight: 700; color: color-mix(in srgb, CanvasText 72%, Canvas); }
     .actions { display: flex; align-items: center; gap: 6px; }
     button { min-height: 28px; border: 1px solid color-mix(in srgb, CanvasText 14%, Canvas); border-radius: 7px; background: Canvas; color: CanvasText; cursor: pointer; font: inherit; font-size: 12px; font-weight: 700; padding: 0 9px; }
+    button.primary { min-height: 32px; padding: 0 14px; background: CanvasText; color: Canvas; border-color: CanvasText; }
+    button.primary:hover:not(:disabled) { background: color-mix(in srgb, CanvasText 86%, Canvas); }
     button:disabled { opacity: .55; cursor: default; }
     .stage { position: relative; min-height: var(--agent-native-viewport-height); }
     iframe { display: block; width: 100%; height: var(--agent-native-viewport-height); border: 0; background: Canvas; }
@@ -895,9 +897,21 @@ export function embedApp(
       });
       if (!response.ok) {
         if (response.status === 401 && isEmbedStartUrl(src)) {
+          reportEmbedError(
+            "transplant-auth",
+            "Embedded app session expired (HTTP 401).",
+            "Opaque-origin sandbox could not authenticate the embed.",
+            401
+          );
           refreshExpiredEmbedSession();
           return;
         }
+        reportEmbedError(
+          "transplant-http",
+          "Embedded app returned HTTP " + response.status + ".",
+          undefined,
+          response.status
+        );
         throw new Error("Embedded app returned HTTP " + response.status + ".");
       }
       const html = await response.text();
@@ -998,6 +1012,52 @@ export function embedApp(
       }, frameReadyTimeoutMs);
     }
 
+    // Best-effort telemetry sink so inline-embed failures are visible in
+    // Sentry (handshake timeout, transplant fetch status/CORS, auth, CSP).
+    // The shell is a sandboxed opaque-origin iframe, so it POSTs to the app
+    // origin's CORS-open /_agent-native/mcp/embed-error route, derived from the
+    // known app URLs. Deduped per stage+message so a retry loop can't spam.
+    const reportedEmbedErrorKeys = new Set();
+    let embedErrorReportCount = 0;
+    function embedReportOrigin() {
+      for (const value of [openStartUrl, openUrl, lastFrameSrc]) {
+        if (typeof value === "string" && value) {
+          try { return new URL(value, window.location.href).origin; } catch {}
+        }
+      }
+      return "";
+    }
+    function reportEmbedError(stage, message, detail, status) {
+      try {
+        const key = String(stage) + "|" + String(message || "");
+        if (reportedEmbedErrorKeys.has(key) || embedErrorReportCount >= 8) return;
+        reportedEmbedErrorKeys.add(key);
+        embedErrorReportCount += 1;
+        const origin = embedReportOrigin();
+        if (!origin) return;
+        let renderMode = "";
+        try { renderMode = renderModeSource().mode || ""; } catch {}
+        const body = JSON.stringify({
+          stage: String(stage || ""),
+          message: String(message || "").slice(0, 500),
+          detail: detail ? String(detail).slice(0, 1200) : undefined,
+          url: openStartUrl || openUrl || lastFrameSrc || "",
+          status: typeof status === "number" ? status : undefined,
+          host: window.location.hostname || "",
+          renderMode: renderMode,
+          bridge: openAiBridge ? "openai" : app ? "native" : "none",
+          userAgent: navigator.userAgent || ""
+        });
+        fetch(origin + "/_agent-native/mcp/embed-error", {
+          method: "POST",
+          credentials: "omit",
+          keepalive: true,
+          headers: { "Content-Type": "application/json" },
+          body: body
+        }).catch(() => {});
+      } catch {}
+    }
+
     function renderFrameFallback() {
       clearFrameReadyTimer();
       clearFrameLoadTimer();
@@ -1005,12 +1065,13 @@ export function embedApp(
       const fallbackCopy = openUrl
         ? "This chat host did not allow the embedded app frame to load inline. You can still open the same app route through the host or use the URL below."
         : "This chat host did not allow the embedded app frame to load inline.";
+      reportEmbedError("frame-fallback", fallbackCopy);
       stage.innerHTML =
         '<div class="fallback">' +
           '<div class="fallback-title">Open this app in its own tab</div>' +
           '<div class="fallback-copy">' + esc(fallbackCopy) + '</div>' +
           '<div class="fallback-actions">' +
-            '<button type="button" data-fallback-open>Open app</button>' +
+            '<button type="button" class="primary" data-fallback-open>Open in new tab</button>' +
             '<button type="button" data-fallback-retry>Try inline again</button>' +
           '</div>' +
           (openUrl ? '<a class="fallback-url" href="' + esc(openUrl) + '" target="_blank" rel="noreferrer">' + esc(openUrl) + '</a>' : '') +
@@ -1038,6 +1099,7 @@ export function embedApp(
       const fallbackCopy = openUrl
         ? "The inline MCP app could not load in this chat host. You can open the same app route in a new tab or retry the inline load."
         : "The inline MCP app could not load in this chat host.";
+      reportEmbedError("app-launch-error", message || fallbackCopy, message);
       const copyHtml = message
         ? '<div>' + esc(message) + '</div><div>' + esc(fallbackCopy) + '</div>'
         : esc(fallbackCopy);
@@ -1046,7 +1108,7 @@ export function embedApp(
           '<div class="fallback-title">App did not load</div>' +
           '<div class="fallback-copy">' + copyHtml + '</div>' +
           '<div class="fallback-actions">' +
-            '<button type="button" data-fallback-open>Open in new tab</button>' +
+            '<button type="button" class="primary" data-fallback-open>Open in new tab</button>' +
             '<button type="button" data-fallback-retry>Retry</button>' +
           '</div>' +
           (openUrl ? '<a class="fallback-url" href="' + esc(openUrl) + '" target="_blank" rel="noreferrer">' + esc(openUrl) + '</a>' : '') +
@@ -1801,8 +1863,30 @@ export function embedApp(
       }
     } catch (err) {
       console.error("[agent-native] MCP app shell failed", err);
+      reportEmbedError(
+        "bridge-init",
+        err && err.message ? err.message : "Could not initialize app.",
+        err && err.stack ? String(err.stack) : undefined
+      );
       setMessage(err && err.message ? err.message : "Could not initialize app.");
     }
+
+    window.addEventListener("error", (event) => {
+      const err = event && event.error;
+      reportEmbedError(
+        "window-error",
+        (err && err.message) || (event && event.message) || "Uncaught error in MCP app embed.",
+        err && err.stack ? String(err.stack) : undefined
+      );
+    });
+    window.addEventListener("unhandledrejection", (event) => {
+      const reason = event && event.reason;
+      reportEmbedError(
+        "unhandled-rejection",
+        (reason && reason.message) || String(reason || "Unhandled promise rejection in MCP app embed."),
+        reason && reason.stack ? String(reason.stack) : undefined
+      );
+    });
     })();
   </script>
 </body>