@agent-native/core 0.164.11 → 0.164.15

package/corpus/templates/factory/app/components/factory/FactoryInspector.tsx

@@ -1,6 +1,12 @@
 import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
-import { IconArrowRight, IconPlus, IconTrash } from "@tabler/icons-react";
+import {
+  IconAlertCircle,
+  IconArrowRight,
+  IconLoader2,
+  IconPlus,
+  IconTrash,
+} from "@tabler/icons-react";
 import { useMemo, useState } from "react";
 import { useSearchParams } from "react-router";
 
@@ -22,8 +28,13 @@ interface FactoryInspectorProps {
   factoryId?: string;
   dirty: boolean;
   saving: boolean;
+  saveError: string | null;
+  saveConflictNeedsResolution: boolean;
+  refreshing: boolean;
   onGraphChange: (graph: FactoryCanvasGraph) => void;
   onSave: () => void;
+  onRefresh: () => void;
+  onDiscardLocalChanges: () => void;
   onAddNode: () => void;
   onDeleteNode: (nodeId: string) => void;
   onConnect: (sourceId: string, targetId: string) => void;
@@ -54,8 +65,13 @@ export function FactoryInspector({
   factoryId,
   dirty,
   saving,
+  saveError,
+  saveConflictNeedsResolution,
+  refreshing,
   onGraphChange,
   onSave,
+  onRefresh,
+  onDiscardLocalChanges,
   onAddNode,
   onDeleteNode,
   onConnect,
@@ -383,12 +399,56 @@ export function FactoryInspector({
         </section>
       </div>
 
+      {saveError ? (
+        <div
+          className="flex items-start gap-2 border-t border-border/60 bg-destructive/5 p-4 text-sm text-destructive"
+          role="alert"
+        >
+          <IconAlertCircle className="mt-0.5 size-4 shrink-0" />
+          <div className="min-w-0 flex-1 space-y-2">
+            <p>{saveError}</p>
+            {saveConflictNeedsResolution ? (
+              <p className="text-xs leading-5 text-destructive/80">
+                {t("factoryInspector.saveConflictHint")}
+              </p>
+            ) : null}
+            <div className="flex flex-wrap gap-2">
+              {!saveConflictNeedsResolution ? (
+                <Button
+                  type="button"
+                  variant="link"
+                  size="sm"
+                  className="h-auto p-0 text-destructive"
+                  disabled={refreshing}
+                  onClick={onRefresh}
+                >
+                  {refreshing ? (
+                    <IconLoader2 className="size-3.5 animate-spin" />
+                  ) : null}
+                  {t("triage.refresh")}
+                </Button>
+              ) : (
+                <Button
+                  type="button"
+                  variant="link"
+                  size="sm"
+                  className="h-auto p-0 text-destructive"
+                  onClick={onDiscardLocalChanges}
+                >
+                  {t("factoryInspector.discardLocalChanges")}
+                </Button>
+              )}
+            </div>
+          </div>
+        </div>
+      ) : null}
+
       {(dirty || saving) && (
         <div className="bg-muted/15 p-4">
           <Button
             type="button"
             className="w-full"
-            disabled={saving}
+            disabled={saving || refreshing}
             onClick={onSave}
           >
             {saving

package/corpus/templates/factory/app/components/ui/alert-dialog.tsx

@@ -0,0 +1 @@
+export * from "@agent-native/toolkit/ui/alert-dialog";

package/corpus/templates/factory/app/i18n/en-US.ts

@@ -204,6 +204,46 @@ const messages = {
     auditUxImpact: "UX impact",
     auditOwnerArea: "Owner area",
     auditGuardsLabel: "Guards",
+    historyTab: "History",
+    historyTitle: "Saved versions",
+    historyLoading: "Loading saved versions",
+    historyLoadError: "Could not load Factory history.",
+    historyEmpty: "No saved versions yet",
+    historyEmptyHint:
+      "Save the visual graph once and Factory will keep each version here for review and rollback.",
+    historyVersion: "Version {{version}}",
+    historyCurrent: "Current",
+    historySource: "Source",
+    historySourceManual: "Visual editor",
+    historySourceAi: "Agent proposal",
+    historySourceSeed: "Factory seed",
+    historySourceRestore: "Rollback",
+    historySourceSaved: "Saved graph",
+    historyNodes: "Nodes",
+    historyConnections: "Connections",
+    historyChangeSummary: "Change summary",
+    historyNoSummary: "No change summary was recorded.",
+    historyCurrentHint: "This is the version currently used by the Factory.",
+    historyRestore: "Restore this version",
+    historyRestoreTitle: "Restore version {{version}}?",
+    historyRestoreDescription:
+      "Factory will create a new current version from this snapshot. Existing versions stay available in history.",
+    historyRestoreUnsaved:
+      "You also have unsaved visual changes. Restoring will discard them.",
+    historyCancel: "Cancel",
+    historyRestoreConfirm: "Restore version",
+    historyRestored: "Version restored. A new current version was created.",
+    historyRestoreFailed: "Could not restore this Factory version.",
+    historyRestoreConflict:
+      "Factory changed while restoring. Review the refreshed history before trying again.",
+    historyRefreshFailed:
+      "The version was restored, but the Factory view could not refresh.",
+    historyLoadOlder: "Load older versions",
+    historySnapshotLoadError: "Could not load this version preview.",
+    historyRestoreUnverified:
+      "Restore completed, but the result could not be verified. Refresh history before trying again.",
+    saveConflictFallback:
+      "Factory changed while saving. Refresh Factory and try again.",
     automationsTitle: "Automations",
     automationsDescription: "Schedule and run Factory prompts.",
     automationsLoading: "Loading automations...",
@@ -312,6 +352,9 @@ const messages = {
     addComment: "Add comment",
     savingGraph: "Saving graph...",
     saveGraph: "Save factory changes",
+    saveConflictHint:
+      "Your unsaved edits are preserved. Discard them to load the newer Factory version.",
+    discardLocalChanges: "Discard local edits and load current version",
     savedGraph: "Factory is saved",
     saveNote: "Saves a new version. Existing runs keep their original context.",
     factoryName: "Factory name",

package/corpus/templates/factory/app/routes/factory.tsx

@@ -31,6 +31,7 @@ import {
   type FactoryCanvasGraph,
   type FactoryCanvasNode,
 } from "@/components/factory/FactoryCanvas";
+import { FactoryHistoryView } from "@/components/factory/FactoryHistoryView";
 import { FactoryInspector } from "@/components/factory/FactoryInspector";
 import { TriageStatusPill } from "@/components/triage/triage-status-pill";
 import { Button } from "@/components/ui/button";
@@ -131,6 +132,7 @@ type WorkspaceTab =
   | "automations"
   | "agents"
   | "audit"
+  | "history"
   | "settings";
 
 type FactoryAutomationRun = {
@@ -184,9 +186,14 @@ export default function FactoryRoute() {
   const [creating, setCreating] = useState(false);
   const [draftGraph, setDraftGraph] = useState<FactoryCanvasGraph | null>(null);
   const [dirty, setDirty] = useState(false);
+  const [saveError, setSaveError] = useState<string | null>(null);
+  const [saveConflictRemoteGraph, setSaveConflictRemoteGraph] =
+    useState<FactoryCanvasGraph | null>(null);
+  const [refreshingFactory, setRefreshingFactory] = useState(false);
   const [selectedNodeId, setSelectedNodeId] = useState<string | null>(null);
   const [selectedEdgeId, setSelectedEdgeId] = useState<string | null>(null);
   const [auditRefreshToken, setAuditRefreshToken] = useState(0);
+  const draftRevisionRef = useRef(0);
 
   function setActiveTab(tab: WorkspaceTab) {
     setSearchParams(
@@ -194,6 +201,10 @@ export default function FactoryRoute() {
         const next = new URLSearchParams(current);
         if (tab === "overview") next.delete("tab");
         else next.set("tab", tab);
+        if (tab === "history") {
+          next.delete("node");
+          next.delete("edge");
+        }
         return next;
       },
       { replace: true },
@@ -255,17 +266,17 @@ export default function FactoryRoute() {
   const graphData =
     rawGraphData?.factory.id === factoryId ? rawGraphData : undefined;
   const graph = draftGraph ?? graphData?.graph ?? null;
-  const graphVersion = graphData?.factory.graphVersion ?? graph?.version ?? 1;
+  const graphVersion = graph?.version ?? graphData?.factory.graphVersion ?? 1;
   const saveGraphMutation = useActionMutation("save-factory-graph");
   const factoryList = (factoryListQuery.data ?? []) as FactorySummary[];
 
   useEffect(() => {
-    if (!graphData || creating) return;
+    if (!graphData || creating || dirty) return;
     setDraftGraph(graphData.graph);
     setDirty(false);
     setSelectedNodeId(null);
     setSelectedEdgeId(null);
-  }, [creating, graphData]);
+  }, [creating, dirty, graphData]);
 
   useEffect(() => {
     setSelectedNodeId(searchParams.get("node"));
@@ -313,6 +324,9 @@ export default function FactoryRoute() {
   }
 
   function updateGraph(next: FactoryCanvasGraph) {
+    draftRevisionRef.current += 1;
+    setSaveError(null);
+    setSaveConflictRemoteGraph(null);
     setDraftGraph(next);
     setDirty(
       !graphData?.graph ||
@@ -396,20 +410,87 @@ export default function FactoryRoute() {
 
   async function saveGraph() {
     if (!graph || !selectedFactoryId) return;
-    await saveGraphMutation.mutateAsync({
-      factoryId: selectedFactoryId,
-      name: graph.name,
-      description: graph.description,
-      prompt: creating ? "" : (graphData?.factory.prompt ?? ""),
-      source: "manual",
-      changeSummary: creating
-        ? "Created from the Factory visual editor."
-        : "Updated in the Factory visual editor.",
-      graph,
-    });
+    const submittedDraftRevision = draftRevisionRef.current;
+    setSaveError(null);
+    try {
+      await saveGraphMutation.mutateAsync({
+        factoryId: selectedFactoryId,
+        name: graph.name,
+        description: graph.description,
+        prompt: creating ? "" : (graphData?.factory.prompt ?? ""),
+        source: "manual",
+        changeSummary: creating
+          ? "Created from the Factory visual editor."
+          : "Updated in the Factory visual editor.",
+        expectedGraphVersion: creating ? 0 : graph.version,
+        graph,
+      });
+      setCreating(false);
+      setDirty(draftRevisionRef.current !== submittedDraftRevision);
+      setSaveConflictRemoteGraph(null);
+      await Promise.all([graphQuery.refetch(), factoryListQuery.refetch()]);
+    } catch (error) {
+      setSaveError(
+        error instanceof Error
+          ? error.message
+          : t("factoryRoute.saveConflictFallback"),
+      );
+    }
+  }
+
+  async function refreshFactoryAfterSaveConflict() {
+    setRefreshingFactory(true);
+    try {
+      const results = await Promise.all([
+        graphQuery.refetch(),
+        factoryListQuery.refetch(),
+      ]);
+      if (results.some((result) => result.isError)) {
+        throw new Error("Factory refresh failed.");
+      }
+      const remoteGraph = (results[0].data as FactoryGraphResponse | undefined)
+        ?.graph;
+      if (dirty) {
+        if (!remoteGraph) throw new Error("Factory graph refresh failed.");
+        setSaveConflictRemoteGraph(remoteGraph);
+        setSaveError(t("factoryRoute.saveConflictFallback"));
+        return;
+      }
+      setSaveError(null);
+    } catch {
+      setSaveError(t("factoryRoute.saveConflictFallback"));
+    } finally {
+      setRefreshingFactory(false);
+    }
+  }
+
+  function discardLocalFactoryChanges() {
+    if (!saveConflictRemoteGraph) return;
+    setDraftGraph(saveConflictRemoteGraph);
+    setSaveConflictRemoteGraph(null);
+    setSaveError(null);
+    setDirty(false);
+    setCreating(false);
+    setSelectedNodeId(null);
+    setSelectedEdgeId(null);
+  }
+
+  async function handleFactoryRestored(result?: { graph: FactoryCanvasGraph }) {
     setCreating(false);
+    if (result?.graph) setDraftGraph(result.graph);
+    else setDraftGraph(null);
     setDirty(false);
-    await Promise.all([graphQuery.refetch(), factoryListQuery.refetch()]);
+    setSaveError(null);
+    setSaveConflictRemoteGraph(null);
+    setSelectedNodeId(null);
+    setSelectedEdgeId(null);
+    const results = await Promise.all([
+      graphQuery.refetch(),
+      factoryListQuery.refetch(),
+    ]);
+    if (results.some((result) => result.isError)) {
+      throw new Error("Factory view refresh failed.");
+    }
   }
 
   if (!selectedFactoryId && activeTab === "agents") {
@@ -659,6 +740,12 @@ export default function FactoryRoute() {
             >
               Activity
             </TabButton>
+            <TabButton
+              active={activeTab === "history"}
+              onClick={() => setActiveTab("history")}
+            >
+              {t("factoryRoute.historyTab")}
+            </TabButton>
             <TabButton
               active={activeTab === "settings"}
               onClick={() => setActiveTab("settings")}
@@ -727,8 +814,13 @@ export default function FactoryRoute() {
               factoryId={factoryId}
               dirty={dirty}
               saving={saveGraphMutation.isPending}
+              saveError={saveError}
+              saveConflictNeedsResolution={Boolean(saveConflictRemoteGraph)}
+              refreshing={refreshingFactory}
               onGraphChange={updateGraph}
               onSave={() => void saveGraph()}
+              onRefresh={refreshFactoryAfterSaveConflict}
+              onDiscardLocalChanges={discardLocalFactoryChanges}
               onAddNode={addNode}
               onDeleteNode={deleteNode}
               onConnect={connectNodes}
@@ -747,6 +839,13 @@ export default function FactoryRoute() {
             factoryId={factoryId}
             refreshToken={auditRefreshToken}
           />
+        ) : activeTab === "history" ? (
+          <FactoryHistoryView
+            key={factoryId}
+            factoryId={factoryId}
+            hasUnsavedChanges={dirty}
+            onRestored={handleFactoryRestored}
+          />
         ) : (
           <SettingsView t={t} />
         )}
@@ -783,6 +882,7 @@ function parseWorkspaceTab(value: string | null): WorkspaceTab {
     value === "automations" ||
     value === "agents" ||
     value === "audit" ||
+    value === "history" ||
     value === "settings"
     ? value
     : "overview";

package/corpus/templates/factory/server/plugins/agent-chat.ts

@@ -57,7 +57,9 @@ current factory graph, and executes only the explicit automation prompts that
 are stored in the organization.
 Use the Factory actions as the source of truth. When a user asks to
 create or change a factory, first inspect the current graph, then propose a complete
-versioned graph through save-factory-graph with source=ai and a concise changeSummary.
+versioned graph through save-factory-graph with source=ai, the inspected graphVersion
+as expectedGraphVersion, and a concise changeSummary. Never save a graph from a
+stale read: refresh and re-propose when the action reports a version conflict.
 Never hide a graph change in prose: the visual map and the saved graph must agree.
 The graph is currently a reviewable blueprint, not the runtime router: automation
 markdown resources are the runtime prompts, while enabled triage rules are evaluated

package/dist/app-config/auth.d.ts

@@ -0,0 +1,4 @@
+import { z } from "zod";
+export declare const authConfig: z.ZodObject<{
+    disableDesktopSsoFallbackInDevelopment: z.ZodDefault<z.ZodBoolean>;
+}, z.core.$strip>;

package/dist/app-config/auth.js

@@ -0,0 +1,7 @@
+import { z } from "zod";
+export const authConfig = z.object({
+    disableDesktopSsoFallbackInDevelopment: z.boolean().default(false).meta({
+        env: "AGENT_NATIVE_DISABLE_DESKTOP_SSO_FALLBACK",
+        doc: "Disable the loopback Desktop SSO fallback in development so isolated acceptance runs can use their configured local identity. Ignored in production.",
+    }),
+});

package/dist/app-config/schema.d.ts

@@ -32,6 +32,9 @@ export declare const appConfigSchema: z.ZodObject<{
         packageName: z.ZodOptional<z.ZodString>;
         template: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
+    auth: z.ZodPrefault<z.ZodObject<{
+        disableDesktopSsoFallbackInDevelopment: z.ZodDefault<z.ZodBoolean>;
+    }, z.core.$strip>>;
     integrations: z.ZodPrefault<z.ZodObject<{
         allowUnverifiedWebhooks: z.ZodDefault<z.ZodBoolean>;
     }, z.core.$strip>>;

package/dist/app-config/schema.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { a2aConfig } from "./a2a.js";
 import { agentConfig } from "./agent.js";
 import { appConfig } from "./app.js";
+import { authConfig } from "./auth.js";
 import { integrationsConfig } from "./integrations.js";
 import { privateBlobConfig } from "./private-blob.js";
 import { workspaceConfig } from "./workspace.js";
@@ -25,6 +26,7 @@ export const appConfigSchema = z.object({
     a2a: a2aConfig.prefault({}),
     agent: agentConfig.prefault({}),
     app: appConfig.prefault({}),
+    auth: authConfig.prefault({}),
     integrations: integrationsConfig.prefault({}),
     privateBlob: privateBlobConfig.prefault({}),
     workspace: workspaceConfig.prefault({}),

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

@@ -1226,8 +1226,13 @@ async function executeCodexCliRun(options) {
     const streamToolOutputToStdout = options.streamToolOutputToStdout ??
         process.env.AGENT_NATIVE_CODE_AGENT_STRUCTURED_STDOUT !== "1";
     const additionalSkillsRoot = process.env.AGENT_NATIVE_CODE_AGENT_SKILLS_ROOT?.trim();
+    // Desktop has already resolved and capability-scoped its MCP catalog before
+    // spawning the packaged runner. Reading persisted settings again here would
+    // both widen that boundary and require the app's native database binding in
+    // the standalone runner process.
+    const mcpConfig = process.env.MCP_SERVERS === undefined ? await buildMergedConfig() : null;
     const args = [
-        ...codexMcpConfigArgs(),
+        ...codexMcpConfigArgs(mcpConfig),
         "--ask-for-approval",
         "never",
         "--sandbox",

package/dist/cli/code-agent-mcp-config.d.ts

@@ -1,4 +1,4 @@
-import type { McpConfig } from "../mcp-client/config.js";
+import { type McpConfig } from "../mcp-client/config.js";
 /**
  * Keep a desktop coding run on the app registry's MCP servers. The normal
  * server-side manager merges persisted MCP settings for web requests, but a
@@ -18,4 +18,4 @@ export declare function mergeCodeAgentMcpConfig(config: McpConfig | null, enviro
  * coding session receives the workspace apps, not the user's global MCP
  * catalog.
  */
-export declare function codexMcpConfigArgs(environment?: NodeJS.ProcessEnv): string[];
+export declare function codexMcpConfigArgs(config?: McpConfig | null, environment?: NodeJS.ProcessEnv): string[];

package/dist/cli/code-agent-mcp-config.js

@@ -1,3 +1,4 @@
+import { resolveDesktopChildComputerMcpServer, } from "../mcp-client/config.js";
 const DESKTOP_MCP_ALLOWLIST_ENV = "AGENT_NATIVE_CODE_AGENT_MCP_SERVER_ALLOWLIST";
 function parseServerAllowlist(raw) {
     if (raw === undefined)
@@ -17,6 +18,9 @@ export function restrictCodeAgentMcpConfig(config, environment = process.env) {
     const allowlist = parseServerAllowlist(environment[DESKTOP_MCP_ALLOWLIST_ENV]);
     if (!allowlist || !config)
         return config;
+    const desktopServer = findDesktopChildComputerMcpServer(config, environment);
+    if (desktopServer)
+        allowlist.add(desktopServer.id);
     const servers = Object.fromEntries(Object.entries(config.servers).filter(([id]) => allowlist.has(id)));
     return { ...config, servers };
 }
@@ -59,6 +63,18 @@ function parseMcpServers(environment) {
         return [id, value];
     }));
 }
+function desktopChildComputerServerConfig(environment) {
+    return resolveDesktopChildComputerMcpServer({}, environment)?.config ?? null;
+}
+function findDesktopChildComputerMcpServer(config, environment) {
+    const expected = desktopChildComputerServerConfig(environment);
+    if (!expected || expected.type !== "http")
+        return null;
+    const match = Object.entries(config.servers).find(([, server]) => server.type === "http" &&
+        server.url === expected.url &&
+        server.headers?.Authorization === expected.headers?.Authorization);
+    return match ? { id: match[0], config: match[1] } : null;
+}
 /**
  * Add host-provided app/plugin servers to the normal merged config. The
  * filesystem and environment layers have different precedence rules, so the
@@ -66,14 +82,23 @@ function parseMcpServers(environment) {
  */
 export function mergeCodeAgentMcpConfig(config, environment = process.env) {
     const environmentServers = parseMcpServers(environment);
-    if (Object.keys(environmentServers).length === 0)
+    const servers = {
+        ...(config?.servers ?? {}),
+        ...environmentServers,
+    };
+    const existingDesktopServer = config
+        ? findDesktopChildComputerMcpServer(config, environment)
+        : null;
+    const desktopServer = existingDesktopServer
+        ? null
+        : resolveDesktopChildComputerMcpServer(servers, environment);
+    if (desktopServer)
+        servers[desktopServer.id] = desktopServer.config;
+    if (Object.keys(servers).length === 0)
         return config;
     return {
         ...(config ?? { servers: {} }),
-        servers: {
-            ...(config?.servers ?? {}),
-            ...environmentServers,
-        },
+        servers,
         source: config?.source
             ? `${config.source}+desktop-environment`
             : "env:MCP_SERVERS",
@@ -85,8 +110,8 @@ export function mergeCodeAgentMcpConfig(config, environment = process.env) {
  * coding session receives the workspace apps, not the user's global MCP
  * catalog.
  */
-export function codexMcpConfigArgs(environment = process.env) {
-    const servers = parseMcpServers(environment);
+export function codexMcpConfigArgs(config = null, environment = process.env) {
+    const servers = restrictCodeAgentMcpConfig(mergeCodeAgentMcpConfig(config, environment), environment)?.servers ?? {};
     if (Object.keys(servers).length === 0)
         return [];
     const args = [];
@@ -94,9 +119,9 @@ export function codexMcpConfigArgs(environment = process.env) {
         if (server.type !== "http" || !server.url)
             continue;
         const key = codexConfigKey(serverId);
-        args.push("-c", `mcp_servers.${tomlString(key)}.url=${tomlString(server.url)}`);
+        args.push("-c", `mcp_servers.${key}.url=${tomlString(server.url)}`);
         if (server.headers && Object.keys(server.headers).length > 0) {
-            args.push("-c", `mcp_servers.${tomlString(key)}.http_headers=${tomlInlineTable(server.headers)}`);
+            args.push("-c", `mcp_servers.${key}.http_headers=${tomlInlineTable(server.headers)}`);
         }
     }
     return args;

package/dist/client/org/OrgSwitcher.js

@@ -7,6 +7,7 @@ import { setBrowserDemoModeEnabled } from "../../demo/browser-state.js";
 import { shouldOfferWorkspace } from "../../org/workspace-url.js";
 import { agentNativePath } from "../api-path.js";
 import { useT } from "../i18n.js";
+import { buildSignInReturnHref } from "../require-session.js";
 import { useDemoModeStatus } from "../use-demo-mode-status.js";
 import { notifySessionInvalidated, useSession } from "../use-session.js";
 import { useOrg, useSwitchOrg, useCreateOrg, useInviteMember, useAcceptInvitation, useJoinByDomain, } from "./hooks.js";
@@ -142,16 +143,19 @@ export function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact,
             return;
         setSigningOut(true);
         try {
-            await fetch(agentNativePath("/_agent-native/auth/logout"), {
+            const response = await fetch(agentNativePath("/_agent-native/auth/logout"), {
                 method: "POST",
                 credentials: "include",
             });
+            if (!response.ok) {
+                console.warn("Logout request returned an error before sign-in", response.status);
+            }
         }
-        catch {
-            /* fall through to reload — server may already have cleared the cookie */
+        catch (error) {
+            console.warn("Unable to complete logout request before sign-in", error);
         }
         notifySessionInvalidated();
-        window.location.reload();
+        window.location.replace(buildSignInReturnHref());
     };
     if (!org) {
         return reserveSpace && isLoading ? (_jsx(OrgSwitcherLoadingPlaceholder, { className: className })) : null;

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/routes.d.ts

@@ -26,8 +26,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
  * Body: { update: string (base64), requestSource?: string }
  */
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

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/mcp-client/config.d.ts

@@ -60,12 +60,23 @@ export interface McpConfig {
     /** Where the config was loaded from (workspace root path, app path, or "env") */
     source?: string;
 }
+export interface DesktopChildComputerMcpServer {
+    id: string;
+    config: McpHttpServerConfig;
+}
 /**
  * Load MCP configuration.
  *
  * @param startDir - Directory to start the upward search from (defaults to cwd)
  */
 export declare function loadMcpConfig(startDir?: string): McpConfig | null;
+/**
+ * The desktop process supplies this configuration only to a child it spawned
+ * for a specific Agent run. Raw MCP config cannot opt into this trust path:
+ * the explicit child gate, loopback URL, and strong per-run bearer are all
+ * required. Existing user servers always win on key collisions.
+ */
+export declare function resolveDesktopChildComputerMcpServer(existingServers: Record<string, McpServerConfig>, environment?: NodeJS.ProcessEnv): DesktopChildComputerMcpServer | null;
 /**
  * Auto-detect the claude-in-chrome MCP server if it's installed but no
  * config file exists. Gated by `AGENT_NATIVE_DISABLE_MCP_AUTODETECT`.