@agent-native/core 0.70.0 → 0.70.2

package/corpus/core/src/cli/sync-builder-starter-manifest.ts

@@ -0,0 +1,275 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { _postProcessStandalone } from "./create.js";
+
+export const STARTER_APP_NAME = "builder-agent-native-starter";
+export const CHAT_TEMPLATE = "chat";
+
+type PackageJson = Record<string, unknown>;
+
+export function findAgentNativeRoot(startDir = process.cwd()): string {
+  let dir = path.resolve(startDir);
+  for (let i = 0; i < 12; i++) {
+    const chatPackageJson = path.join(
+      dir,
+      "templates",
+      CHAT_TEMPLATE,
+      "package.json",
+    );
+    if (fs.existsSync(chatPackageJson)) {
+      return dir;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  throw new Error(
+    "Could not find agent-native repo root (expected templates/chat/package.json).",
+  );
+}
+
+export function generateStandaloneChatManifest(repoRoot?: string): {
+  packageJson: PackageJson;
+  pnpmWorkspaceYaml: string | null;
+} {
+  const root = repoRoot ?? findAgentNativeRoot();
+  const chatTemplateDir = path.join(root, "templates", CHAT_TEMPLATE);
+  const tempDir = fs.mkdtempSync(
+    path.join(os.tmpdir(), "an-builder-starter-sync-"),
+  );
+
+  try {
+    fs.cpSync(chatTemplateDir, tempDir, { recursive: true });
+    _postProcessStandalone(STARTER_APP_NAME, tempDir, CHAT_TEMPLATE);
+
+    const packageJson = JSON.parse(
+      fs.readFileSync(path.join(tempDir, "package.json"), "utf-8"),
+    ) as PackageJson;
+
+    const workspacePath = path.join(tempDir, "pnpm-workspace.yaml");
+    const pnpmWorkspaceYaml = fs.existsSync(workspacePath)
+      ? fs.readFileSync(workspacePath, "utf-8")
+      : null;
+
+    return { packageJson, pnpmWorkspaceYaml };
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+export function mergeStarterManifest(
+  starterPackageJson: PackageJson,
+  canonicalPackageJson: PackageJson,
+): PackageJson {
+  const merged = structuredClone(canonicalPackageJson) as PackageJson;
+
+  merged.name = starterPackageJson.name ?? STARTER_APP_NAME;
+  if (typeof starterPackageJson.displayName === "string") {
+    merged.displayName = starterPackageJson.displayName;
+  }
+  if (typeof starterPackageJson.description === "string") {
+    merged.description = starterPackageJson.description;
+  }
+  if (starterPackageJson.private !== undefined) {
+    merged.private = starterPackageJson.private;
+  }
+
+  const starterDeps =
+    (starterPackageJson.dependencies as Record<string, string> | undefined) ??
+    {};
+  const canonicalDeps =
+    (canonicalPackageJson.dependencies as Record<string, string> | undefined) ??
+    {};
+  merged.dependencies = {
+    ...canonicalDeps,
+    ...(starterDeps["@agent-native/core"]
+      ? { "@agent-native/core": starterDeps["@agent-native/core"] }
+      : {}),
+  };
+
+  return merged;
+}
+
+export function workspaceFileSyncChanged(
+  existingWorkspace: string | null,
+  canonicalWorkspace: string | null,
+): boolean {
+  if (canonicalWorkspace === null) {
+    return existingWorkspace !== null;
+  }
+  return existingWorkspace !== canonicalWorkspace;
+}
+
+export function applyWorkspaceFileSync(
+  targetPath: string,
+  canonicalWorkspace: string | null,
+): void {
+  if (canonicalWorkspace === null) {
+    if (fs.existsSync(targetPath)) {
+      fs.unlinkSync(targetPath);
+    }
+    return;
+  }
+  fs.writeFileSync(targetPath, canonicalWorkspace);
+}
+
+function stableJson(value: unknown): string {
+  return `${JSON.stringify(value, null, 2)}\n`;
+}
+
+export type SyncStarterManifestResult = {
+  changed: boolean;
+  packageJson: PackageJson;
+  pnpmWorkspaceYaml: string | null;
+};
+
+export function syncStarterManifestFiles(options: {
+  starterPackageJsonPath: string;
+  starterPnpmWorkspacePath?: string;
+  repoRoot?: string;
+  write?: boolean;
+}): SyncStarterManifestResult {
+  const { packageJson: canonical, pnpmWorkspaceYaml } =
+    generateStandaloneChatManifest(options.repoRoot);
+
+  const starterPackageJson = JSON.parse(
+    fs.readFileSync(options.starterPackageJsonPath, "utf-8"),
+  ) as PackageJson;
+  const mergedPackageJson = mergeStarterManifest(starterPackageJson, canonical);
+
+  let workspaceChanged = false;
+  const existingWorkspace =
+    options.starterPnpmWorkspacePath &&
+    fs.existsSync(options.starterPnpmWorkspacePath)
+      ? fs.readFileSync(options.starterPnpmWorkspacePath, "utf-8")
+      : null;
+
+  workspaceChanged = workspaceFileSyncChanged(
+    existingWorkspace,
+    pnpmWorkspaceYaml,
+  );
+
+  const packageChanged =
+    stableJson(starterPackageJson) !== stableJson(mergedPackageJson);
+  const changed = packageChanged || workspaceChanged;
+
+  if (options.write && changed) {
+    if (packageChanged) {
+      fs.writeFileSync(
+        options.starterPackageJsonPath,
+        stableJson(mergedPackageJson),
+      );
+    }
+    if (workspaceChanged && options.starterPnpmWorkspacePath) {
+      applyWorkspaceFileSync(
+        options.starterPnpmWorkspacePath,
+        pnpmWorkspaceYaml,
+      );
+    }
+  }
+
+  return {
+    changed,
+    packageJson: mergedPackageJson,
+    pnpmWorkspaceYaml,
+  };
+}
+
+export function parseSyncStarterManifestArgs(argv: string[]): {
+  command: "merge" | "generate";
+  starterPackageJsonPath?: string;
+  starterPnpmWorkspacePath?: string;
+  write: boolean;
+  repoRoot?: string;
+} {
+  const [commandRaw, ...rest] = argv;
+  const command = commandRaw === "generate" ? "generate" : "merge";
+  let starterPackageJsonPath: string | undefined;
+  let starterPnpmWorkspacePath: string | undefined;
+  let write = false;
+  let repoRoot: string | undefined;
+
+  for (let i = 0; i < rest.length; i++) {
+    const arg = rest[i];
+    if (arg === "--write") {
+      write = true;
+      continue;
+    }
+    if (arg === "--starter-package-json") {
+      starterPackageJsonPath = rest[++i];
+      continue;
+    }
+    if (arg === "--starter-pnpm-workspace") {
+      starterPnpmWorkspacePath = rest[++i];
+      continue;
+    }
+    if (arg === "--repo-root") {
+      repoRoot = rest[++i];
+      continue;
+    }
+    throw new Error(`Unknown argument: ${arg}`);
+  }
+
+  if (command === "merge" && !starterPackageJsonPath) {
+    throw new Error(
+      "merge requires --starter-package-json <path> [--starter-pnpm-workspace <path>] [--write] [--repo-root <path>]",
+    );
+  }
+
+  return {
+    command,
+    starterPackageJsonPath,
+    starterPnpmWorkspacePath,
+    write,
+    repoRoot,
+  };
+}
+
+export function runSyncStarterManifestCli(argv: string[]): number {
+  const args = parseSyncStarterManifestArgs(argv);
+
+  if (args.command === "generate") {
+    const { packageJson, pnpmWorkspaceYaml } = generateStandaloneChatManifest(
+      args.repoRoot,
+    );
+    process.stdout.write(stableJson(packageJson));
+    if (pnpmWorkspaceYaml) {
+      process.stdout.write("\n--- pnpm-workspace.yaml ---\n");
+      process.stdout.write(pnpmWorkspaceYaml);
+    }
+    return 0;
+  }
+
+  const result = syncStarterManifestFiles({
+    starterPackageJsonPath: args.starterPackageJsonPath!,
+    starterPnpmWorkspacePath: args.starterPnpmWorkspacePath,
+    repoRoot: args.repoRoot,
+    write: args.write,
+  });
+
+  if (result.changed) {
+    console.log(
+      args.write
+        ? "Updated builder-agent-native-starter manifest from templates/chat."
+        : "builder-agent-native-starter manifest is out of date with templates/chat.",
+    );
+    return args.write ? 0 : 1;
+  }
+
+  console.log(
+    "builder-agent-native-starter manifest already matches templates/chat.",
+  );
+  return 0;
+}
+
+const isDirectRun =
+  process.argv[1] &&
+  path.resolve(process.argv[1]) ===
+    path.resolve(fileURLToPath(import.meta.url));
+
+if (isDirectRun) {
+  const exitCode = runSyncStarterManifestCli(process.argv.slice(2));
+  process.exit(exitCode);
+}

package/corpus/core/src/client/AgentPanel.tsx

@@ -147,9 +147,11 @@ const SetupButton = lazy(() =>
   })),
 );
 
-// Setup/onboarding widget appears above chat until required setup is complete,
-// and can be reopened from the header after dismissal.
-const SHOW_ONBOARDING = true;
+// The setup/onboarding checklist that used to appear above chat is disabled
+// for every app — setup (AI engine, image/video gen, asset storage, email,
+// GitHub, etc.) is surfaced in better places (the settings panel and the
+// per-feature setup affordances). Keep this off; do not re-enable globally.
+const SHOW_ONBOARDING = false;
 
 const CLI_STORAGE_KEY = "agent-native-cli-command";
 const CLI_DEFAULT = "claude";

package/corpus/core/src/client/AssistantChat.tsx

@@ -86,6 +86,7 @@ import { agentNativePath } from "./api-path.js";
 import {
   TiptapComposer,
   type ComposerSubmitIntent,
+  type ComposerImageModelMenu,
   type TiptapComposerHandle,
 } from "./composer/TiptapComposer.js";
 import { AgentComposerFrame } from "./composer/AgentComposerFrame.js";
@@ -712,6 +713,11 @@ export interface AssistantChatProps {
   onModelChange?: (model: string, engine: string) => void;
   /** Callback when user picks a reasoning effort from the picker */
   onEffortChange?: (effort: ReasoningEffort) => void;
+  /**
+   * Optional secondary model menu (e.g. an image-generation model) shown inside
+   * the composer's model picker. Opt-in; chat-only apps omit it.
+   */
+  imageModelMenu?: ComposerImageModelMenu;
   /** Callback when user clicks "Fork Chat" in the message actions menu */
   onForkChat?: () => void | boolean | Promise<void | boolean>;
   /** Override Builder/provider connect routing for embedded hosts. */
@@ -977,6 +983,7 @@ const AssistantChatInner = forwardRef<
     availableModels,
     onModelChange,
     onEffortChange,
+    imageModelMenu,
     onForkChat,
     onConnectProvider,
     plusMenuMode = "full",
@@ -3392,6 +3399,7 @@ const AssistantChatInner = forwardRef<
                     availableModels={availableModels}
                     onModelChange={onModelChange}
                     onEffortChange={onEffortChange}
+                    imageModelMenu={imageModelMenu}
                     onConnectProvider={onConnectProvider}
                     toolbarSlot={composerToolbarSlot}
                     contextItems={composerContextItems}

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;
   }