@agent-native/core 0.0.0-beta-20260820224008 → 0.0.0-beta-20260820233158

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 8490
+- template files: 8491

package/corpus/templates/brain/actions/list-sources.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 import { getDb, schema } from "../server/db/index.js";
 import { nextBrainSourceSyncAt } from "../server/jobs/sync-sources.js";
 import { listAccessibleAudienceIds } from "../server/lib/audiences.js";
+import { sourceHealthState } from "../server/lib/brain-health.js";
 import { parseJson, serializeSource } from "../server/lib/brain.js";
 import { sourceProviderSchema } from "./_schemas.js";
 
@@ -71,14 +72,23 @@ export default defineAction({
       .from(schema.brainSources)
       .where(and(...clauses))
       .orderBy(desc(schema.brainSources.updatedAt));
+    const nowMs = Date.now();
     const sources = await Promise.all(
-      rows.map(async (row) => ({
-        ...serializeSource(row),
-        recordCount: await sourceRecordCount(row.id),
-        latestRun: await latestRun(row.id),
-        nextSyncAt: nextBrainSourceSyncAt(row),
-      })),
+      rows.map(async (row) => {
+        const latest = await latestRun(row.id);
+        const nextSyncAt = nextBrainSourceSyncAt(row);
+        return {
+          ...serializeSource(row),
+          recordCount: await sourceRecordCount(row.id),
+          latestRun: latest,
+          nextSyncAt,
+          health: sourceHealthState(row, latest, nextSyncAt, nowMs),
+        };
+      }),
     );
-    return { count: rows.length, sources };
+    return {
+      count: rows.length,
+      sources,
+    };
   },
 });

package/corpus/templates/brain/app/components/brain/Surface.tsx

@@ -117,7 +117,8 @@ export function StatusBadge({ status }: { status: string }) {
       ? IconCircleCheck
       : normalized.includes("review") ||
           normalized.includes("degraded") ||
-          normalized.includes("stale")
+          normalized.includes("stale") ||
+          normalized.includes("needs")
         ? IconClock
         : normalized.includes("error")
           ? IconAlertTriangle
@@ -132,7 +133,8 @@ export function StatusBadge({ status }: { status: string }) {
           "border-border bg-secondary text-secondary-foreground",
         (normalized.includes("review") ||
           normalized.includes("degraded") ||
-          normalized.includes("stale")) &&
+          normalized.includes("stale") ||
+          normalized.includes("needs")) &&
           "border-amber-500/35 bg-amber-500/10 text-amber-700 dark:text-amber-300",
         normalized.includes("error") &&
           "border-destructive/35 bg-destructive/10 text-destructive",

package/corpus/templates/brain/app/lib/brain.ts

@@ -20,7 +20,14 @@ export type BrainView =
   | "settings";
 
 export type KnowledgeStatus = "approved" | "needs_review" | "draft" | "stale";
-export type SourceHealth = "healthy" | "degraded" | "paused" | "error";
+export type SourceHealth =
+  | "healthy"
+  | "needs_setup"
+  | "needs_sync"
+  | "stale"
+  | "degraded"
+  | "paused"
+  | "error";
 export type ReviewPriority = "high" | "medium" | "low";
 
 export interface Citation {
@@ -1144,8 +1151,11 @@ export function sourceDescription(source: BrainSource) {
 export function sourceHealth(source: BrainSource): SourceHealth {
   if (source.health) return source.health;
   if (sourceRetryAfter(source)) return "degraded";
-  if (source.status === "active")
-    return source.lastError ? "degraded" : "healthy";
+  if (source.status === "active") {
+    if (source.lastError) return "degraded";
+    if (sourceAutoSync(source) && !source.lastSyncedAt) return "needs_sync";
+    return "healthy";
+  }
   if (source.status === "error") return "error";
   if (source.status === "paused" || source.status === "archived")
     return "paused";

package/corpus/templates/brain/server/lib/brain-health.ts

@@ -189,9 +189,9 @@ function latestIso(values: Array<string | null | undefined>) {
   return latest;
 }
 
-function sourceHealthState(
+export function sourceHealthState(
   source: SourceRow,
-  latestRun: SyncRunRow | null,
+  latestRun: Pick<SyncRunRow, "status"> | null,
   nextSyncAt: string | null,
   nowMs: number,
 ): BrainSourceHealthState {
@@ -530,12 +530,9 @@ export async function readBrainHealth() {
     };
   });
 
-  const sourceHealthCounts = countStatuses<
-    BrainSourceHealthState | "active" | "paused" | "error"
-  >([
-    ...sourceSummaries.map((source) => ({ status: source.health })),
-    ...sourceRows.map((source) => ({ status: source.status })),
-  ]);
+  const sourceHealthCounts = countStatuses<BrainSourceHealthState>(
+    sourceSummaries.map((source) => ({ status: source.health })),
+  );
   const captureCounts = countStatuses(captureRows);
   const captureDispositionCounts = countStatuses(
     captureRows.map((capture) => ({

package/corpus/templates/brain/server/lib/brain.ts

@@ -755,6 +755,7 @@ export async function createCapture(values: {
       title: source.title,
       provider: source.provider as BrainSourceProvider,
       ownerEmail: source.ownerEmail,
+      orgId: source.orgId,
     },
     sourceConfig: parseJson<Record<string, unknown>>(source.configJson, {}),
     settings,

package/corpus/templates/brain/server/lib/capture-sanitization.ts

@@ -71,6 +71,7 @@ export interface CaptureSanitizationInput {
     title: string;
     provider: BrainSourceProvider;
     ownerEmail: string;
+    orgId?: string | null;
   };
   sourceConfig?: Record<string, unknown>;
   settings: BrainSettings;
@@ -440,6 +441,10 @@ async function classifyWithApprovedModel(
     apiKeyEnvVar: userApiKey.apiKeyEnvVar,
     appId: "brain",
     engineOption: engineName,
+    credentialIdentity: {
+      userEmail: input.source.ownerEmail,
+      orgId: input.source.orgId ?? undefined,
+    },
   });
 
   const maxChars = Math.min(

package/corpus/templates/brain/server/routes/api/brain/queue/run.post.ts

@@ -10,7 +10,8 @@ declare global {
   var __AGENT_NATIVE_BRAIN_SCHEDULED_RUNTIME__: boolean | undefined;
 }
 
-export const BRAIN_QUEUE_SWEEP_LIMIT = 10;
+export const BRAIN_QUEUE_SWEEP_LIMIT = 25;
+export const BRAIN_MAX_DISTILLATIONS_PER_SWEEP = 2;
 
 function productionLike() {
   return (
@@ -53,7 +54,7 @@ export default defineEventHandler(async (event) => {
     processBrainIngestQueueOnce({
       limit: BRAIN_QUEUE_SWEEP_LIMIT,
       runDistillation: true,
-      maxDistillations: 1,
+      maxDistillations: BRAIN_MAX_DISTILLATIONS_PER_SWEEP,
     }),
     expireSensitivityQuarantines(),
   ]);

package/corpus/templates/clips/desktop/src/app.tsx

@@ -67,6 +67,7 @@ import {
   startBubbleWebrtc,
   type BubbleWebrtcHandle,
 } from "./lib/bubble-webrtc";
+import { openBoundOAuthWindow } from "./lib/desktop-oauth-window";
 import {
   getCameraStreamWithFallback,
   isMediaConstraintFailure,
@@ -2126,15 +2127,17 @@ export function App() {
     void tick();
   }
 
-  // Google verification stays in the bound Tauri WebView so the callback sees
-  // the same browser-binding cookie. Magic-link verification still completes
-  // in the system browser through its own exchange flow.
+  // Google verification stays in a child of the bound Tauri WebView so the
+  // callback sees the same browser-binding cookie. Magic-link verification
+  // still completes in the system browser through its own exchange flow.
   async function signInExternal() {
     if (signInInflightRef.current) return;
     signInInflightRef.current = true;
+    let oauthWindow: ReturnType<typeof openBoundOAuthWindow> | null = null;
 
     try {
       setSignInError(null);
+      oauthWindow = openBoundOAuthWindow();
       const flowId = crypto.randomUUID?.() ?? null;
       const verifier = (() => {
         const randomUuid = crypto.randomUUID;
@@ -2163,7 +2166,6 @@ export function App() {
       const authParams = new URLSearchParams({
         desktop: "1",
         flow_id: flowId,
-        webview: "1",
       });
       const authResponse = await fetch(
         `${base}/_agent-native/google/auth-url?${authParams.toString()}`,
@@ -2194,13 +2196,12 @@ export function App() {
               : "Could not start Google sign-in.";
         throw new Error(message);
       }
+      oauthWindow.location.href = authPayload.url;
       setSignInPending("google");
-      // Stay in this exact WebView: the auth bootstrap set the HttpOnly
-      // browser-binding cookie here, and the callback returns this page with
-      // the staged session cookie after Google completes.
-      window.location.href = authPayload.url;
+      startDesktopAuthExchange(flowId, "google", verifier);
     } catch (err) {
       console.error("[clips-tray] signInExternal failed:", err);
+      oauthWindow?.close();
       signInInflightRef.current = false;
       setSignInPending(null);
       setSignInError(
@@ -3962,8 +3963,8 @@ export function App() {
   // (not a separate Tauri window). This avoids Tauri 2's separate-WebKit-
   // data-store-per-WebviewWindow cookie-jar issue — the cookie is set in
   // the same webview that reads it on the next /auth/session poll.
-  // Google verification uses the bound WebView, while magic-link verification
-  // uses the system browser and password stays inline here.
+  // Google verification uses a popup in the bound WebView, while magic-link
+  // verification uses the system browser and password stays inline here.
   if (authStatus === "anon") {
     return (
       <div className="app" ref={appRef}>

package/corpus/templates/clips/desktop/src/lib/desktop-oauth-window.ts

@@ -0,0 +1,23 @@
+type OAuthWindow = Pick<Window, "close"> & {
+  location: Pick<Location, "href">;
+};
+
+type OpenOAuthWindow = (url: string, target: string) => OAuthWindow | null;
+
+/**
+ * Open a same-WebView OAuth child before awaiting the auth URL.
+ *
+ * The parent keeps polling the exchange while the child completes Google
+ * OAuth. Using window.open keeps both pages in the Tauri WebView cookie
+ * partition; the system-browser shell opener would lose the binding cookie.
+ */
+export function openBoundOAuthWindow(
+  openWindow: OpenOAuthWindow = (url, target) =>
+    window.open(url, target) as OAuthWindow | null,
+): OAuthWindow {
+  const oauthWindow = openWindow("about:blank", "_blank");
+  if (!oauthWindow) {
+    throw new Error("Could not open the Google sign-in window.");
+  }
+  return oauthWindow;
+}

package/dist/client/AboutAgentNativeDialog.d.ts

@@ -0,0 +1,5 @@
+export interface AboutAgentNativeDialogProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+}
+export declare function AboutAgentNativeDialog({ open, onOpenChange, }: AboutAgentNativeDialogProps): import("react").JSX.Element;

package/dist/client/AboutAgentNativeDialog.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button } from "@agent-native/toolkit/ui/button";
+import { IconCheck, IconCode, IconCopy, IconX } from "@tabler/icons-react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { formatAgentNativeDiagnostics, getAgentNativeDiagnostics, getAgentNativePackageVersions, } from "./agent-native-version.js";
+import { writeClipboardText } from "./clipboard.js";
+import { Dialog, DialogContent, DialogTitle } from "./components/ui/dialog.js";
+import { useT } from "./i18n.js";
+export function AboutAgentNativeDialog({ open, onOpenChange, }) {
+    const t = useT();
+    const [copyState, setCopyState] = useState("idle");
+    const copyResetTimer = useRef(null);
+    const packageVersions = getAgentNativePackageVersions();
+    const diagnostics = useMemo(() => formatAgentNativeDiagnostics(), []);
+    const { buildId, environment } = getAgentNativeDiagnostics();
+    useEffect(() => {
+        if (!open) {
+            setCopyState("idle");
+        }
+    }, [open]);
+    useEffect(() => () => {
+        if (copyResetTimer.current !== null) {
+            window.clearTimeout(copyResetTimer.current);
+        }
+    }, []);
+    const handleCopy = async () => {
+        const didCopy = await writeClipboardText(diagnostics);
+        setCopyState(didCopy ? "copied" : "failed");
+        if (copyResetTimer.current !== null) {
+            window.clearTimeout(copyResetTimer.current);
+        }
+        copyResetTimer.current = window.setTimeout(() => {
+            setCopyState("idle");
+            copyResetTimer.current = null;
+        }, 1600);
+    };
+    return (_jsx(Dialog, { open: open, onOpenChange: onOpenChange, children: _jsxs(DialogContent, { "aria-describedby": undefined, className: "max-w-md gap-5", children: [_jsxs(DialogTitle, { className: "flex items-center gap-2 text-base", children: [_jsx(IconCode, { className: "size-4 text-muted-foreground" }), t("agentChat.aboutAgentNative.title", {
+                            defaultValue: "About Agent Native",
+                        })] }), _jsx("div", { className: "overflow-hidden rounded-md border border-border", children: packageVersions.length > 0 ? (packageVersions.map(({ name, version }) => (_jsxs("div", { className: "flex items-center justify-between gap-4 border-b border-border px-3 py-2 last:border-b-0", children: [_jsx("span", { className: "min-w-0 truncate font-mono text-xs text-foreground", children: name }), _jsxs("span", { className: "shrink-0 font-mono text-xs text-muted-foreground", children: [_jsx("span", { className: "sr-only", children: t("agentChat.aboutAgentNative.version", {
+                                            defaultValue: "Version",
+                                        }) }), version] })] }, name)))) : (_jsxs("div", { className: "px-3 py-2 font-mono text-xs text-muted-foreground", children: ["@agent-native/core -", " ", t("agentChat.aboutAgentNative.unknown", {
+                                defaultValue: "Unknown",
+                            })] })) }), _jsxs("dl", { className: "grid gap-2 text-xs", children: [_jsxs("div", { className: "flex items-center justify-between gap-4", children: [_jsx("dt", { className: "text-muted-foreground", children: t("agentChat.aboutAgentNative.environment", {
+                                        defaultValue: "Environment",
+                                    }) }), _jsx("dd", { className: "font-mono text-foreground", children: environment })] }), _jsxs("div", { className: "flex items-center justify-between gap-4", children: [_jsx("dt", { className: "text-muted-foreground", children: t("agentChat.aboutAgentNative.build", {
+                                        defaultValue: "Build",
+                                    }) }), _jsx("dd", { className: "max-w-[16rem] truncate font-mono text-foreground", children: buildId })] })] }), _jsxs(Button, { className: "w-full", onClick: () => void handleCopy(), type: "button", variant: "outline", children: [copyState === "copied" ? (_jsx(IconCheck, {})) : copyState === "failed" ? (_jsx(IconX, {})) : (_jsx(IconCopy, {})), copyState === "copied"
+                            ? t("agentChat.common.copied", { defaultValue: "Copied" })
+                            : copyState === "failed"
+                                ? t("agentChat.recovery.copyFailed", {
+                                    defaultValue: "Copy failed",
+                                })
+                                : t("agentChat.aboutAgentNative.copyDiagnostics", {
+                                    defaultValue: "Copy diagnostics",
+                                })] })] }) }));
+}

package/dist/client/CommandMenu.d.ts

@@ -89,8 +89,13 @@ export interface CommandMenuProps {
      * multiple apps share an origin.
      */
     changelogKey?: string;
+    /**
+     * Whether to show the built-in "About Agent Native" entry. Defaults to true
+     * for app-shell menus that provide a changelog; set false for local menus.
+     */
+    showAbout?: boolean;
 }
-export declare function CommandMenu({ open, onOpenChange, children, renderResults, placeholder, emptyText: _emptyText, showAgentFallback, className, changelog, changelogLabel, changelogKey, }: CommandMenuProps): React.JSX.Element;
+export declare function CommandMenu({ open, onOpenChange, children, renderResults, placeholder, emptyText: _emptyText, showAgentFallback, className, changelog, changelogLabel, changelogKey, showAbout: showAboutProp, }: CommandMenuProps): React.JSX.Element;
 export declare namespace CommandMenu {
     export { CommandGroup as Group };
     export { CommandItem as Item };

package/dist/client/CommandMenu.js

@@ -16,12 +16,14 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
  *   </CommandMenu>
  */
 import { Command as CommandPrimitive, CommandGroup as CommandGroupPrimitive, CommandInput as CommandInputPrimitive, CommandItem as CommandItemPrimitive, CommandList as CommandListPrimitive, CommandSeparator as CommandSeparatorPrimitive, CommandShortcut as CommandShortcutPrimitive, } from "@agent-native/toolkit/ui/command";
-import { IconBook2, IconExternalLink, IconMessage, IconHistory, } from "@tabler/icons-react";
+import { IconBook2, IconExternalLink, IconInfoCircle, IconMessage, IconHistory, } from "@tabler/icons-react";
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from "react";
 import { parseChangelog } from "../changelog/parse.js";
+import { AboutAgentNativeDialog } from "./AboutAgentNativeDialog.js";
 import { sendToAgentChat } from "./agent-chat.js";
 import { ChangelogDialog, useChangelogSeen } from "./changelog/Changelog.js";
 import { Dialog, DialogContent, DialogTitle } from "./components/ui/dialog.js";
+import { useT } from "./i18n.js";
 import { cn } from "./utils.js";
 const CommandMenuContext = createContext(null);
 function useCommandMenuContext() {
@@ -122,15 +124,18 @@ function CommandDocsGroup({ docs, heading = "Docs" }) {
         return null;
     return (_jsx(CommandGroup, { heading: heading, children: docs.map((doc) => (_jsxs(CommandItem, { onSelect: () => openDocsHref(doc.href), keywords: [doc.title, doc.description ?? "", ...(doc.keywords ?? [])], deferSelect: false, className: "items-start py-2", children: [_jsx(IconBook2, { className: "mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" }), _jsxs("span", { className: "min-w-0 flex-1", children: [_jsx("span", { className: "block truncate font-medium", children: doc.title }), doc.description ? (_jsx("span", { className: "mt-0.5 block line-clamp-2 text-xs leading-snug text-muted-foreground", children: doc.description })) : null] }), _jsx(IconExternalLink, { className: "mt-0.5 h-3.5 w-3.5 shrink-0 text-muted-foreground" })] }, doc.href))) }));
 }
-export function CommandMenu({ open, onOpenChange, children, renderResults, placeholder = "Type a command or ask AI...", emptyText: _emptyText = "No commands found.", showAgentFallback = true, className, changelog, changelogLabel = "What's new", changelogKey, }) {
+export function CommandMenu({ open, onOpenChange, children, renderResults, placeholder = "Type a command or ask AI...", emptyText: _emptyText = "No commands found.", showAgentFallback = true, className, changelog, changelogLabel = "What's new", changelogKey, showAbout: showAboutProp, }) {
     const [search, setSearch] = useState("");
     const inputRef = useRef(null);
     const containerRef = useRef(null);
+    const t = useT();
     // Built-in "What's new" changelog surface (only active when `changelog` is
     // passed). The dialog is rendered alongside the menu so it survives the menu
     // closing; the unseen dot persists per browser via localStorage.
     const [changelogOpen, setChangelogOpen] = useState(false);
+    const [aboutOpen, setAboutOpen] = useState(false);
     const hasChangelog = typeof changelog === "string" && changelog.trim().length > 0;
+    const showAbout = showAboutProp ?? hasChangelog;
     const changelogEntries = useMemo(() => (hasChangelog ? parseChangelog(changelog) : []), [hasChangelog, changelog]);
     const latestChangelogId = changelogEntries[0]?.id;
     const { unseen: changelogUnseen, markSeen: markChangelogSeen } = useChangelogSeen(changelogKey ?? "app", latestChangelogId);
@@ -140,6 +145,11 @@ export function CommandMenu({ open, onOpenChange, children, renderResults, place
         // Let the menu close before the dialog opens (avoids overlay flicker).
         setTimeout(() => setChangelogOpen(true), 50);
     }, [onOpenChange, markChangelogSeen]);
+    const openAbout = useCallback(() => {
+        onOpenChange(false);
+        // Let the menu close before the dialog opens (avoids overlay flicker).
+        setTimeout(() => setAboutOpen(true), 50);
+    }, [onOpenChange]);
     // Focus input when opening; clear search while closed so reopen never renders
     // dynamic results for the previous query.
     useEffect(() => {
@@ -178,6 +188,36 @@ export function CommandMenu({ open, onOpenChange, children, renderResults, place
             .toLowerCase()
             .includes(search.toLowerCase());
     const showChangelogRow = hasChangelog && changelogRowMatches;
+    const aboutLabel = t("agentChat.aboutAgentNative.title", {
+        defaultValue: "About Agent Native",
+    });
+    const aboutVersionLabel = t("agentChat.aboutAgentNative.version", {
+        defaultValue: "Version",
+    });
+    const aboutEnvironmentLabel = t("agentChat.aboutAgentNative.environment", {
+        defaultValue: "Environment",
+    });
+    const aboutBuildLabel = t("agentChat.aboutAgentNative.build", {
+        defaultValue: "Build",
+    });
+    const aboutDiagnosticsLabel = t("agentChat.aboutAgentNative.copyDiagnostics", {
+        defaultValue: "Copy diagnostics",
+    });
+    const aboutRowMatches = !search ||
+        [
+            aboutLabel,
+            "agent native",
+            aboutVersionLabel,
+            "versions",
+            "package",
+            aboutEnvironmentLabel,
+            aboutBuildLabel,
+            aboutDiagnosticsLabel,
+        ]
+            .join(" ")
+            .toLowerCase()
+            .includes(search.toLowerCase());
+    const showAboutRow = showAbout && aboutRowMatches;
     // Filter children based on search
     const filterChildren = (nodes) => {
         return React.Children.map(nodes, (child) => {
@@ -242,7 +282,10 @@ export function CommandMenu({ open, onOpenChange, children, renderResults, place
                     }, className: cn("fixed left-1/2 top-[15vh] !z-50 !max-h-none -translate-x-1/2 !translate-y-0 !gap-0 w-full max-w-lg", "rounded-lg border border-border bg-popover p-0 text-popover-foreground shadow-lg", className), style: {
                         animation: "none",
                         transition: "none",
-                    }, children: [_jsx(DialogTitle, { className: "sr-only", children: placeholder }), _jsx(CommandPrimitive, { loop: true, shouldFilter: false, className: "h-auto rounded-lg", children: _jsxs(CommandMenuContext.Provider, { value: { search, onOpenChange }, children: [_jsx(CommandInputPrimitive, { ref: inputRef, value: search, onValueChange: setSearch, placeholder: placeholder }), _jsxs(CommandListPrimitive, { children: [dynamicResults, hasResults && filteredChildren, showChangelogRow && (_jsxs(_Fragment, { children: [hasResults && _jsx(CommandSeparator, {}), _jsx("div", { className: "p-1", children: _jsxs(CommandItemPrimitive, { className: "cursor-pointer gap-2 py-2", onSelect: openChangelog, children: [_jsx(IconHistory, { className: "h-4 w-4 text-muted-foreground" }), _jsx("span", { children: changelogLabel }), changelogUnseen && (_jsx("span", { className: "ms-auto h-2 w-2 rounded-full bg-primary", "aria-label": "New updates available" }))] }) })] })), showAgentFallback && (_jsxs(_Fragment, { children: [(hasResults || showChangelogRow || hasDynamicResults) && (_jsx(CommandSeparator, {})), _jsx("div", { className: "p-1", children: _jsxs(CommandItemPrimitive, { className: "cursor-pointer gap-2 py-2", onSelect: handleSubmitToAgent, children: [_jsx(IconMessage, { className: "h-4 w-4 text-muted-foreground" }), _jsx("span", { children: search.trim() ? (_jsxs(_Fragment, { children: ["Ask AI:", " ", _jsxs("span", { className: "text-muted-foreground", children: ["\"", search, "\""] })] })) : (_jsx("span", { className: "text-muted-foreground", children: "Ask AI anything..." })) }), search.trim() && (_jsx("span", { className: "ms-auto text-xs text-muted-foreground", children: "\u21B5" }))] }) })] }))] })] }) })] }) }), hasChangelog && (_jsx(ChangelogDialog, { open: changelogOpen, onOpenChange: setChangelogOpen, markdown: changelog, title: changelogLabel }))] }));
+                    }, children: [_jsx(DialogTitle, { className: "sr-only", children: placeholder }), _jsx(CommandPrimitive, { loop: true, shouldFilter: false, className: "h-auto rounded-lg", children: _jsxs(CommandMenuContext.Provider, { value: { search, onOpenChange }, children: [_jsx(CommandInputPrimitive, { ref: inputRef, value: search, onValueChange: setSearch, placeholder: placeholder }), _jsxs(CommandListPrimitive, { children: [dynamicResults, hasResults && filteredChildren, showChangelogRow && (_jsxs(_Fragment, { children: [hasResults && _jsx(CommandSeparator, {}), _jsx("div", { className: "p-1", children: _jsxs(CommandItemPrimitive, { className: "cursor-pointer gap-2 py-2", onSelect: openChangelog, children: [_jsx(IconHistory, { className: "h-4 w-4 text-muted-foreground" }), _jsx("span", { children: changelogLabel }), changelogUnseen && (_jsx("span", { className: "ms-auto h-2 w-2 rounded-full bg-primary", "aria-label": "New updates available" }))] }) })] })), showAboutRow && (_jsxs(_Fragment, { children: [(hasResults || showChangelogRow) && _jsx(CommandSeparator, {}), _jsx("div", { className: "p-1", children: _jsxs(CommandItemPrimitive, { className: "cursor-pointer gap-2 py-2", onSelect: openAbout, children: [_jsx(IconInfoCircle, { className: "h-4 w-4 text-muted-foreground" }), _jsx("span", { children: aboutLabel })] }) })] })), showAgentFallback && (_jsxs(_Fragment, { children: [(hasResults ||
+                                                        showChangelogRow ||
+                                                        showAboutRow ||
+                                                        hasDynamicResults) && _jsx(CommandSeparator, {}), _jsx("div", { className: "p-1", children: _jsxs(CommandItemPrimitive, { className: "cursor-pointer gap-2 py-2", onSelect: handleSubmitToAgent, children: [_jsx(IconMessage, { className: "h-4 w-4 text-muted-foreground" }), _jsx("span", { children: search.trim() ? (_jsxs(_Fragment, { children: ["Ask AI:", " ", _jsxs("span", { className: "text-muted-foreground", children: ["\"", search, "\""] })] })) : (_jsx("span", { className: "text-muted-foreground", children: "Ask AI anything..." })) }), search.trim() && (_jsx("span", { className: "ms-auto text-xs text-muted-foreground", children: "\u21B5" }))] }) })] }))] })] }) })] }) }), hasChangelog && (_jsx(ChangelogDialog, { open: changelogOpen, onOpenChange: setChangelogOpen, markdown: changelog, title: changelogLabel })), showAbout && (_jsx(AboutAgentNativeDialog, { open: aboutOpen, onOpenChange: setAboutOpen }))] }));
 }
 // Helper to extract text content from React children
 function getTextContent(children) {

package/dist/client/EnvironmentBadge.js

@@ -6,6 +6,7 @@ import { BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOpt
 import { trackEvent } from "./analytics.js";
 import { injectedAgentNativeConfig } from "./app-config.js";
 import { useSession } from "./use-session.js";
+import { cn } from "./utils.js";
 export { BETA_OPT_OUT_DURATION_MS, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, } from "../shared/environment-lanes.js";
 export function isBuilderIoEmployee(email) {
     return email?.trim().toLowerCase().endsWith("@builder.io") ?? false;
@@ -88,7 +89,9 @@ function EnvironmentBadgeContent({ environment, targets, }) {
     const title = environment === "beta"
         ? "You're on Agent Native Beta"
         : "You're on Agent Native Production";
-    return (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(Button, { "aria-label": `Open ${title.toLowerCase()} switcher`, className: "fixed bottom-3 right-3 z-[100] h-6 min-w-0 rounded-xl border-border/80 bg-background/95 px-2 text-[11px] font-semibold uppercase tracking-[0.5px] shadow-sm backdrop-blur-sm", size: "sm", variant: environment === "beta" ? "default" : "outline", children: label }) }), _jsxs(PopoverContent, { align: "center", className: "w-[280px] p-5", side: "top", sideOffset: 8, children: [_jsx("div", { className: "mb-1 text-sm font-semibold leading-5", children: title }), _jsx("div", { className: "mb-4 text-sm text-muted-foreground", children: "Choose where you want to continue." }), _jsx("div", { className: "grid gap-2", children: environment === "beta" ? (_jsx(EnvironmentLink, { href: productionHref, label: "Switch to production" })) : (_jsx(EnvironmentLink, { href: betaHref, label: "Go to beta" })) })] })] }));
+    return (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(Button, { "aria-label": `Open ${title.toLowerCase()} switcher`, className: cn("fixed bottom-3 right-3 z-[100] h-6 min-w-0 rounded-xl px-2 text-[11px] font-semibold uppercase tracking-[0.5px] shadow-sm backdrop-blur-sm", environment === "beta"
+                        ? "border-primary/80"
+                        : "border-border/80 bg-background/95 text-foreground"), size: "sm", variant: environment === "beta" ? "default" : "outline", children: label }) }), _jsxs(PopoverContent, { align: "center", className: "w-[280px] p-5", side: "top", sideOffset: 8, children: [_jsx("div", { className: "mb-1 text-sm font-semibold leading-5", children: title }), _jsx("div", { className: "mb-4 text-sm text-muted-foreground", children: "Choose where you want to continue." }), _jsx("div", { className: "grid gap-2", children: environment === "beta" ? (_jsx(EnvironmentLink, { href: productionHref, label: "Switch to production" })) : (_jsx(EnvironmentLink, { href: betaHref, label: "Go to beta" })) })] })] }));
 }
 function ProductionEnvironmentBadge({ targets, }) {
     const { session, status } = useSession();

package/dist/client/agent-native-version.d.ts

@@ -0,0 +1,12 @@
+export interface AgentNativePackageVersion {
+    name: string;
+    version: string;
+}
+export interface AgentNativeDiagnostics {
+    buildId: string;
+    environment: string;
+    packages: Record<string, string>;
+}
+export declare function getAgentNativePackageVersions(): AgentNativePackageVersion[];
+export declare function getAgentNativeDiagnostics(): AgentNativeDiagnostics;
+export declare function formatAgentNativeDiagnostics(): string;

package/dist/client/agent-native-version.js

@@ -0,0 +1,36 @@
+import { injectedAgentNativeConfig } from "./app-config.js";
+import { clientBuildId } from "./build-compatibility.js";
+function readPackageVersions(value) {
+    if (!value || typeof value !== "object") {
+        return {};
+    }
+    return Object.fromEntries(Object.entries(value)
+        .filter(([name, version]) => name.startsWith("@agent-native/") &&
+        typeof version === "string" &&
+        version.trim().length > 0)
+        .map(([name, version]) => [name, version.trim()]));
+}
+function injectedPackageVersions() {
+    if (typeof __AGENT_NATIVE_PACKAGE_VERSIONS__ !== "undefined") {
+        return readPackageVersions(__AGENT_NATIVE_PACKAGE_VERSIONS__);
+    }
+    return readPackageVersions(globalThis.__AGENT_NATIVE_PACKAGE_VERSIONS__);
+}
+export function getAgentNativePackageVersions() {
+    return Object.entries(injectedPackageVersions())
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([name, version]) => ({ name, version }));
+}
+export function getAgentNativeDiagnostics() {
+    return {
+        buildId: clientBuildId() || "development",
+        environment: injectedAgentNativeConfig().deployment?.environment ?? "unknown",
+        packages: Object.fromEntries(getAgentNativePackageVersions().map(({ name, version }) => [
+            name,
+            version,
+        ])),
+    };
+}
+export function formatAgentNativeDiagnostics() {
+    return JSON.stringify(getAgentNativeDiagnostics(), null, 2);
+}

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,9 +77,9 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/config.d.ts

@@ -113,7 +113,9 @@ export declare function agentNativeConfigEnvName(path: readonly string[]): strin
  */
 export declare function readAgentNativeConfigEnv(env: Record<string, string | undefined>): AgentNativeConfig;
 export declare function normalizeAgentNativeConfig(input: unknown, source?: string): AgentNativeConfig;
-export declare function mergeAgentNativeConfigs(base: AgentNativeConfig, override: AgentNativeConfig): AgentNativeConfig;
+export declare function mergeAgentNativeConfigs(base: AgentNativeConfig, override: AgentNativeConfig, options?: {
+    arrayStrategy?: "merge" | "replace";
+}): AgentNativeConfig;
 export declare function resolveAgentNativeConfig(input: AgentNativeConfigInput | undefined, context: AgentNativeConfigContext): AgentNativeConfig;
 export declare function resolveFirstRunOnboardingMode(setting: AgentNativeFirstRunOnboardingSetting, context: AgentNativeConfigContext): AgentNativeFirstRunOnboardingMode;
 export declare function isAgentNativeDeploymentEnvironment(value: unknown): value is AgentNativeDeploymentEnvironment;

package/dist/config.js

@@ -315,7 +315,8 @@ export function normalizeAgentNativeConfig(input, source = "agent-native config"
     }
     return normalized;
 }
-export function mergeAgentNativeConfigs(base, override) {
+export function mergeAgentNativeConfigs(base, override, options = {}) {
+    const arrayStrategy = options.arrayStrategy ?? "merge";
     return {
         ...(base.version === undefined && override.version === undefined
             ? {}
@@ -348,7 +349,7 @@ export function mergeAgentNativeConfigs(base, override) {
                     ? {
                         ...base.runtime?.environment,
                         ...override.runtime?.environment,
-                        required: mergeStringLists(base.runtime?.environment?.required, override.runtime?.environment?.required),
+                        required: mergeStringLists(base.runtime?.environment?.required, override.runtime?.environment?.required, arrayStrategy),
                     }
                     : undefined,
             }
@@ -390,7 +391,7 @@ export function mergeAgentNativeConfigs(base, override) {
                 ...override.changelog,
             }
             : undefined,
-        harness: mergeHarnessSettings(base.harness, override.harness),
+        harness: mergeHarnessSettings(base.harness, override.harness, arrayStrategy),
     };
 }
 export function resolveAgentNativeConfig(input, context) {
@@ -551,7 +552,7 @@ function normalizeHarnessConfig(value, source) {
             : { runtimes: [...new Set(runtimes)] }),
     };
 }
-function mergeHarnessSettings(base, override) {
+function mergeHarnessSettings(base, override, arrayStrategy = "merge") {
     if (override === undefined)
         return base;
     if (typeof override === "boolean")
@@ -563,10 +564,12 @@ function mergeHarnessSettings(base, override) {
     }
     return {
         runtimes: [
-            ...new Set([
-                ...(base.runtimes ?? []),
-                ...(override.runtimes ?? []),
-            ]),
+            ...(arrayStrategy === "replace"
+                ? (override.runtimes ?? base.runtimes ?? [])
+                : new Set([
+                    ...(base.runtimes ?? []),
+                    ...(override.runtimes ?? []),
+                ])),
         ],
     };
 }
@@ -592,9 +595,11 @@ function normalizeRequiredEnvKeys(value, source) {
     }
     return [...new Set(keys)];
 }
-function mergeStringLists(base, override) {
+function mergeStringLists(base, override, arrayStrategy = "merge") {
     if (base === undefined && override === undefined)
         return undefined;
+    if (arrayStrategy === "replace")
+        return override ?? base;
     return [...new Set([...(base ?? []), ...(override ?? [])])];
 }
 function isFirstRunMode(value) {