@agent-native/core 0.200.0-nightly-20261002153252 → 0.200.0

package/dist/agent/production-agent.d.ts

@@ -10,6 +10,7 @@ import { type BuilderGatewayAuth } from "../server/credential-provider.js";
 import { fireInternalDispatch } from "../server/self-dispatch.js";
 import { type RefusedTurnRetryContext } from "../shared/agent-chat-run-not-started.js";
 import { type ReasoningEffort } from "../shared/reasoning-effort.js";
+import type { TrackingMeta } from "../tracking/registry.js";
 import { type ResolveEngineConfig } from "./engine/index.js";
 import { PROVIDER_TO_ENV } from "./engine/provider-env-vars.js";
 import type { AgentEngine, EngineTool, EngineMessage, EngineContentPart } from "./engine/types.js";
@@ -232,6 +233,9 @@ export declare function filterActionsByAllowedNames(actions: Record<string, Acti
 export declare const PLAN_MODE_SYSTEM_PROMPT = "## Plan Mode Active\n\nYou are in Plan mode. This turn is for research, clarification, and a proposed approach only.\n\nHard rules:\n- Use only read-only tools. Do not edit files, write resources, run mutating bash commands, mutate SQL rows, navigate the UI, send notifications, create jobs, create tools, send messages or tasks to external agents, or change external systems.\n- If a needed detail is unclear, ask a concise clarifying question before proposing a plan.\n- When ready, present a concrete plan with the files/tools you expect to touch, the intended changes, validation steps, and notable risks.\n- Do not treat approval as implicit while Plan mode is still active. Tell the user to switch to Act mode with the mode selector or /act before implementation.";
 export declare function isPlanModeToolCallAllowed(name: string, input: unknown, entry: ActionEntry): boolean;
 export declare function createPlanModeActionRegistry(actions: Record<string, ActionEntry>): Record<string, ActionEntry>;
+type AgentRunTrackingSource = Pick<TrackingMeta, "userId" | "authUserId" | "anonymousId" | "sessionId"> & {
+    isSyntheticTraffic?: boolean;
+};
 export interface ProductionAgentOptions {
     actions?: Record<string, ActionEntry>;
     /** @deprecated Use `actions` instead */
@@ -252,7 +256,7 @@ export interface ProductionAgentOptions {
     hostedHarnessConfig?: AgentNativeHarnessSetting;
     reasoningEffort?: ReasoningEffort;
     providerOptions?: EngineMessage extends never ? never : any;
-    onRunComplete?: (run: ActiveRun, threadId: string | undefined) => void;
+    onRunComplete?: (run: ActiveRun, threadId: string | undefined, trackingSource?: AgentRunTrackingSource) => void;
     onRunPrepared?: (details: {
         runId: string;
         turnId: string;

package/dist/agent/production-agent.js

@@ -958,6 +958,35 @@ export async function resolveAgentOwnerEmail(options, event) {
     }
     return ownerEmail ?? getRequestUserEmail() ?? null;
 }
+function snapshotAgentRunTrackingSource() {
+    const requestContext = getRequestContext();
+    if (!requestContext)
+        return undefined;
+    const source = requestContext.agentRunAnonymous
+        ? {
+            ...(requestContext.userEmail
+                ? { anonymousId: requestContext.userEmail }
+                : {}),
+            ...(requestContext.browserSessionId
+                ? { sessionId: requestContext.browserSessionId }
+                : {}),
+        }
+        : {
+            ...(requestContext.userEmail
+                ? { userId: requestContext.userEmail }
+                : {}),
+            ...(requestContext.authUserId
+                ? { authUserId: requestContext.authUserId }
+                : {}),
+            ...(requestContext.browserSessionId
+                ? { sessionId: requestContext.browserSessionId }
+                : {}),
+        };
+    const isSyntheticTraffic = requestContext.isSyntheticTraffic === true;
+    return Object.keys(source).length > 0 || isSyntheticTraffic
+        ? { ...source, ...(isSyntheticTraffic ? { isSyntheticTraffic: true } : {}) }
+        : undefined;
+}
 const MAX_RETRIES = 3;
 const COMPLETION_DATABASE_RETRY_DELAYS_MS = [250, 750, 1_500];
 export async function runCompletionCallbackWithDatabaseRetry(callback, options) {
@@ -6336,6 +6365,9 @@ export function createProductionAgentHandler(options) {
     };
     const getEngineTools = (actions) => actionsToEngineTools(getRequestActions(actions));
     return defineEventHandler(async (event) => {
+        let completionTrackingSource = options.onRunComplete
+            ? snapshotAgentRunTrackingSource()
+            : undefined;
         const setupT0 = Date.now();
         const setupMarks = {};
         const setupMark = (k) => {
@@ -7634,12 +7666,15 @@ export function createProductionAgentHandler(options) {
         const baseHandleRunComplete = options.onRunComplete || trackedProgressRunId
             ? async (run) => {
                 try {
-                    await runCompletionCallbackWithDatabaseRetry(() => options.onRunComplete?.(run, threadId));
+                    await runCompletionCallbackWithDatabaseRetry(() => options.onRunComplete?.(run, threadId, completionTrackingSource));
                 }
                 catch (err) {
                     await completeTrackedProgressRun(run, err);
                     throw err;
                 }
+                finally {
+                    completionTrackingSource = undefined;
+                }
                 await completeTrackedProgressRun(run);
             }
             : undefined;

package/dist/cli/design-connect.d.ts

@@ -51,6 +51,7 @@ export interface DesignConnectManifest {
 }
 export interface DesignConnectBridge {
     server: Server;
+    close: () => Promise<void>;
     manifest: DesignConnectManifest;
     /** Per-rootPath bridge token. Kept in-process only; never serialised into
      *  the manifest JSON so it is not exposed over the network via GET /manifest.

package/dist/cli/design-connect.js

@@ -5,6 +5,7 @@ import fs from "node:fs/promises";
 import http from "node:http";
 import https from "node:https";
 import path from "node:path";
+import { WebSocket, WebSocketServer } from "ws";
 import { injectDocumentMarkup } from "../shared/html-document.js";
 const DEFAULT_BRIDGE_PORT = 7331;
 const ROUTE_MANIFEST_FILE = path.join(".agent-native", "design-routes.json");
@@ -1200,6 +1201,53 @@ function addPreviewTokenToResourceUrl(resourceUrl, previewToken) {
     const withoutStaleToken = stripQueryPair(search, "previewToken");
     return `${pathname}${appendQueryPair(withoutStaleToken, "previewToken", previewToken)}${hash}`;
 }
+const MAX_PREVIEW_HMR_MESSAGE_BYTES = 1024 * 1024;
+function rewriteViteHmrUpdate(payload, previewToken) {
+    if (payload.length > MAX_PREVIEW_HMR_MESSAGE_BYTES)
+        return undefined;
+    let message;
+    try {
+        message = JSON.parse(payload.toString("utf8"));
+    }
+    catch {
+        // coercion-ok: non-JSON Vite control frames are relayed unchanged.
+        return undefined;
+    }
+    if (!message ||
+        typeof message !== "object" ||
+        !("type" in message) ||
+        message.type !== "update" ||
+        !("updates" in message) ||
+        !Array.isArray(message.updates)) {
+        return undefined;
+    }
+    let changed = false;
+    for (const candidate of message.updates) {
+        if (!candidate ||
+            typeof candidate !== "object" ||
+            !("type" in candidate) ||
+            candidate.type !== "js-update" ||
+            !("acceptedPath" in candidate) ||
+            typeof candidate.acceptedPath !== "string" ||
+            !("timestamp" in candidate) ||
+            typeof candidate.timestamp !== "number" ||
+            !Number.isSafeInteger(candidate.timestamp)) {
+            continue;
+        }
+        // Vite compares path and acceptedPath as module identities before it imports
+        // the update, so carry proxy auth in its cache-busting query instead.
+        candidate.timestamp = `${candidate.timestamp}&previewToken=${encodeURIComponent(previewToken)}`;
+        changed = true;
+    }
+    return changed ? Buffer.from(JSON.stringify(message)) : undefined;
+}
+function webSocketDataBuffer(data) {
+    if (Buffer.isBuffer(data))
+        return data;
+    if (Array.isArray(data))
+        return Buffer.concat(data);
+    return Buffer.from(data);
+}
 function addOpaqueFrameCredentials(html, previewToken) {
     const withCredentialedResources = html.replace(/<(script|link|img|audio|video|source|track|iframe)\b([^>]*?)>/gi, (fullTag, tagName, attributes) => {
         const resourceMatch = attributes.match(/\b(src|href)\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i);
@@ -1243,9 +1291,12 @@ function addOpaqueFrameCredentials(html, previewToken) {
         },
     });
     const withImportMap = injectDocumentMarkup(withHmrToken, `<script type="importmap" data-agent-native-opaque-preview-imports>${previewImportMap}</script>`, { target: "head" });
-    return injectDocumentMarkup(withImportMap, 
+    const withViteHmrStyleAuth = injectDocumentMarkup(withImportMap, 
+    // coercion-ok: malformed Vite-generated CSS URLs stay unchanged in the frame.
+    `<script data-agent-native-vite-css-auth>(function(t){var p=Element.prototype.after;Element.prototype.after=function(){for(var i=0;i<arguments.length;i++){var n=arguments[i];if(!n||n.nodeType!==1||n.tagName!=="LINK")continue;try{var b=new URL(document.baseURI),u=new URL(n.getAttribute("href"),b);if(u.origin===b.origin&&!u.searchParams.has("previewToken")){u.searchParams.set("previewToken",t);n.setAttribute("href",u.toString())}}catch(_){}}return p.apply(this,arguments)}})(${previewTokenLiteral});</script>`, { target: "head" });
+    return injectDocumentMarkup(withViteHmrStyleAuth, 
     // coercion-ok: invalid browser-owned URLs stay unchanged in the frame.
-    String.raw `<script data-agent-native-opaque-preview-auth>(function(){var t=${previewTokenLiteral},o,h;try{var b=new URL(document.baseURI);o=b.origin;h=b.host}catch(_){return}function u(v){try{var a=new URL(String(v),document.baseURI),same=a.origin===o||(h===a.host&&(a.protocol==="ws:"||a.protocol==="wss:"));if(!same||a.searchParams.has("previewToken"))return null;a.searchParams.set("previewToken",t);return a.toString()}catch(_){return null}}function c(v){return String(v).replace(/url\(\s*(["']?)([^"'()]+)\1\s*\)/gi,function(h,q,v){var s=u(v);return s?"url("+q+s+q+")":h})}var f=window.fetch.bind(window);window.fetch=function(i,n){var v=i instanceof Request?i.url:i,s=u(v);return s?f(i instanceof Request?new Request(s,i):s,n):f(i,n)};var x=XMLHttpRequest.prototype.open;XMLHttpRequest.prototype.open=function(m,v){var s=u(v);return x.call(this,m,s||v,...Array.prototype.slice.call(arguments,2))};var e=window.EventSource;if(e){var E=function(v,n){return new e(u(v)||v,n);};E.prototype=e.prototype;window.EventSource=E}var W=window.WebSocket;if(W){var S=function(v,p){var s=u(v);return p===undefined?new W(s||v):new W(s||v,p)};S.prototype=W.prototype;S.CONNECTING=W.CONNECTING;S.OPEN=W.OPEN;S.CLOSING=W.CLOSING;S.CLOSED=W.CLOSED;window.WebSocket=S}var p=Node.prototype.appendChild;Node.prototype.appendChild=function(n){if(n&&n.nodeType===1){var a=n.tagName==="SCRIPT"?"src":n.tagName==="LINK"?"href":n.tagName==="IMG"?"src":n.tagName==="IFRAME"?"src":null;if(a){var v=n.getAttribute(a),s=u(v);if(s)n.setAttribute(a,s)}else if(n.tagName==="STYLE"&&n.textContent){n.textContent=c(n.textContent)}}return p.call(this,n)}})();</script>`, { target: "head" });
+    String.raw `<script data-agent-native-opaque-preview-auth>(function(){var t=${previewTokenLiteral},o,h;try{var b=new URL(document.baseURI);o=b.origin;h=b.host}catch(_){return}function u(v){try{var a=new URL(String(v),document.baseURI),same=a.origin===o||(h===a.host&&(a.protocol==="ws:"||a.protocol==="wss:"));if(!same||a.searchParams.has("previewToken"))return null;a.searchParams.set("previewToken",t);return a.toString()}catch(_){return null}}function c(v){return String(v).replace(/url\(\s*(["']?)([^"'()]+)\1\s*\)/gi,function(h,q,v){var s=u(v);return s?"url("+q+s+q+")":h})}var f=window.fetch.bind(window);window.fetch=function(i,n){var v=i instanceof Request?i.url:i,s=u(v);return s?f(i instanceof Request?new Request(s,i):s,n):f(i,n)};var x=XMLHttpRequest.prototype.open;XMLHttpRequest.prototype.open=function(m,v){var s=u(v);return x.call(this,m,s||v,...Array.prototype.slice.call(arguments,2))};var e=window.EventSource;if(e){var E=function(v,n){return new e(u(v)||v,n);};E.prototype=e.prototype;window.EventSource=E}var W=window.WebSocket;if(W){var S=function(v,p){var s=u(v);return p===undefined?new W(s||v):new W(s||v,p)};S.prototype=W.prototype;S.CONNECTING=W.CONNECTING;S.OPEN=W.OPEN;S.CLOSING=W.CLOSING;S.CLOSED=W.CLOSED;window.WebSocket=S}function d(n){if(n&&n.nodeType===1){var a=n.tagName==="SCRIPT"?"src":n.tagName==="LINK"?"href":n.tagName==="IMG"?"src":n.tagName==="IFRAME"?"src":null;if(a){var v=n.getAttribute(a),s=u(v);if(s)n.setAttribute(a,s)}else if(n.tagName==="STYLE"&&n.textContent){n.textContent=c(n.textContent)}}return n}var p=Node.prototype.appendChild;Node.prototype.appendChild=function(n){return p.call(this,d(n))};var i=Node.prototype.insertBefore;Node.prototype.insertBefore=function(n,r){return i.call(this,d(n),r)}})();</script>`, { target: "head" });
 }
 function addOpaqueFrameResourceTokens(css, previewToken) {
     const withImportTokens = css.replace(/(@import\s+)(["'])([^"']+)\2/gi, (_full, prefix, quote, resourceUrl) => `${prefix}${quote}${addPreviewTokenToResourceUrl(resourceUrl, previewToken)}${quote}`);
@@ -2107,6 +2158,11 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
     const isValidLiveEditRegistrationCapability = (req, designId) => constantTimeTokenMatches(readHeader(req, "x-agent-native-live-edit-registration-capability"), deriveDesignScopedLiveEditRegistrationCapability(bridgeToken, designId));
     const bridgeInstanceId = crypto.randomBytes(16).toString("hex");
     const previewSessionCookies = new PreviewSessionCookieJar(manifest.devServerUrl);
+    const hmrWebSocketServer = new WebSocketServer({
+        noServer: true,
+        perMessageDeflate: false,
+        handleProtocols: (protocols) => protocols.has("vite-hmr") ? "vite-hmr" : false,
+    });
     const server = http.createServer((req, res) => {
         const requestUrl = new URL(req.url ?? "/", manifest.bridgeUrl);
         const pathname = requestUrl.pathname;
@@ -2326,6 +2382,7 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
                 sendJson(res, 200, {
                     ok: true,
                     pending: pendingVisualEditPayloads.get(designId)?.pending ?? null,
+                    revision: pendingVisualEditRevisionHighWaterMarks.get(designId) ?? 0,
                 });
                 return;
             }
@@ -2406,7 +2463,7 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
                                     : stored === "stale"
                                         ? "stale pending publication revision"
                                         : "conflicting pending publication revision",
-                                revision: existing?.revision,
+                                revision: pendingVisualEditRevisionHighWaterMarks.get(pendingDesignId) ?? 0,
                             });
                             return;
                         }
@@ -2472,7 +2529,7 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
                                 : stored === "stale"
                                     ? "stale pending publication revision"
                                     : "conflicting pending publication revision",
-                            revision: existing?.revision,
+                            revision: pendingVisualEditRevisionHighWaterMarks.get(candidate.designId) ?? 0,
                         });
                         return;
                     }
@@ -2889,6 +2946,16 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
         }
         sendJson(res, 404, { ok: false, error: "not found" });
     });
+    const terminateHmrClients = () => {
+        for (const client of hmrWebSocketServer.clients)
+            client.terminate();
+    };
+    // noServer upgrades are not closed by http.Server.close().
+    const closeHttpServer = server.close.bind(server);
+    server.close = (callback) => {
+        terminateHmrClients();
+        return closeHttpServer(callback);
+    };
     // Vite's proxied /@vite/client derives its HMR socket from the document's
     // bridge origin. Tunnel WebSocket upgrades to the one connected dev-server
     // origin so Fast Refresh remains live inside URL-backed screens. The target
@@ -2903,6 +2970,9 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
             "";
         const browserOrigin = readHeader(req, "origin");
         const sameBridgeOrigin = browserOrigin === new URL(manifest.bridgeUrl).origin;
+        const isViteHmrSocket = readHeader(req, "sec-websocket-protocol")
+            .split(",")
+            .some((protocol) => protocol.trim() === "vite-hmr");
         if (!constantTimeTokenMatches(providedPreviewToken, previewToken)) {
             clientSocket.end("HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 0\r\n\r\n");
             return;
@@ -2921,11 +2991,60 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
         delete upstreamHeaders["x-agent-native-live-edit-capability"];
         delete upstreamHeaders["authorization"];
         delete upstreamHeaders["cookie"];
+        if (isViteHmrSocket) {
+            delete upstreamHeaders["connection"];
+            delete upstreamHeaders["upgrade"];
+            delete upstreamHeaders["sec-websocket-key"];
+            delete upstreamHeaders["sec-websocket-version"];
+            delete upstreamHeaders["sec-websocket-protocol"];
+            delete upstreamHeaders["sec-websocket-extensions"];
+        }
         upstreamHeaders.host = targetUrl.host;
         upstreamHeaders.origin = new URL(manifest.devServerUrl).origin;
         const cookie = mergePreviewCookieHeaders(previewSessionCookies.headerFor(targetUrl.toString()), sameBridgeOrigin ? readHeader(req, "cookie") : "");
         if (cookie)
             upstreamHeaders.cookie = cookie;
+        if (isViteHmrSocket) {
+            const hmrUrl = new URL(targetUrl);
+            hmrUrl.protocol = targetUrl.protocol === "https:" ? "wss:" : "ws:";
+            hmrWebSocketServer.handleUpgrade(req, clientSocket, clientHead, (browserSocket) => {
+                const upstreamSocket = new WebSocket(hmrUrl, "vite-hmr", {
+                    headers: upstreamHeaders,
+                    perMessageDeflate: false,
+                });
+                const queuedMessages = [];
+                browserSocket.on("message", (data, isBinary) => {
+                    if (upstreamSocket.readyState === WebSocket.OPEN) {
+                        upstreamSocket.send(data, { binary: isBinary });
+                    }
+                    else if (upstreamSocket.readyState === WebSocket.CONNECTING) {
+                        queuedMessages.push({ data, isBinary });
+                    }
+                });
+                upstreamSocket.once("open", () => {
+                    for (const message of queuedMessages) {
+                        upstreamSocket.send(message.data, { binary: message.isBinary });
+                    }
+                    queuedMessages.length = 0;
+                });
+                upstreamSocket.on("message", (data, isBinary) => {
+                    const payload = webSocketDataBuffer(data);
+                    const rewritten = isBinary
+                        ? undefined
+                        : rewriteViteHmrUpdate(payload, previewToken);
+                    browserSocket.send(rewritten ?? payload, { binary: isBinary });
+                });
+                browserSocket.once("close", () => upstreamSocket.terminate());
+                upstreamSocket.once("close", () => browserSocket.close());
+                upstreamSocket.on("error", () => {
+                    if (browserSocket.readyState === WebSocket.OPEN) {
+                        browserSocket.close(1011, "Dev server HMR connection failed");
+                    }
+                });
+                browserSocket.on("error", () => upstreamSocket.terminate());
+            });
+            return;
+        }
         const requestImpl = targetUrl.protocol === "https:" ? https : http;
         let upgraded = false;
         const upstreamRequest = requestImpl.request({
@@ -2972,6 +3091,17 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
         });
         upstreamRequest.end();
     });
+    let closePromise;
+    const close = () => {
+        closePromise ??= (async () => {
+            terminateHmrClients();
+            await new Promise((resolve) => hmrWebSocketServer.close(resolve));
+            await new Promise((resolve, reject) => {
+                server.close((error) => (error ? reject(error) : resolve()));
+            });
+        })();
+        return closePromise;
+    };
     await new Promise((resolve, reject) => {
         server.once("error", reject);
         server.listen(new URL(manifest.bridgeUrl).port, "127.0.0.1", () => {
@@ -2984,11 +3114,18 @@ export async function startDesignConnectBridge(manifest, seedOrOptions) {
             await persistBridgeToken(manifest.rootPath, bridgeToken);
         }
         catch (error) {
-            await new Promise((resolve) => server.close(() => resolve()));
+            await close();
             throw error;
         }
     }
-    return { server, manifest, bridgeToken, previewToken, bridgeInstanceId };
+    return {
+        close,
+        server,
+        manifest,
+        bridgeToken,
+        previewToken,
+        bridgeInstanceId,
+    };
 }
 export function resolveAppUrl(explicit) {
     const raw = explicit ||
@@ -3338,7 +3475,10 @@ export async function runDesign(argv) {
     }
     return await new Promise((resolve) => {
         const stop = () => {
-            bridge.server.close(() => resolve(0));
+            void bridge.close().then(() => resolve(0), (error) => {
+                console.error("[design connect] bridge shutdown failed", error);
+                resolve(1);
+            });
         };
         for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
             process.once(signal, stop);

package/dist/collab/awareness.d.ts

@@ -38,19 +38,19 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;

package/dist/collab/routes.d.ts

@@ -8,8 +8,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
     state: 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

@@ -1,6 +1,6 @@
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/file-upload/actions/upload-image.d.ts

@@ -42,8 +42,8 @@ declare const _default: import("../../action.js").ActionDefinition<{
     url: string;
     id: string;
     provider: string;
-    configured?: undefined;
     error?: undefined;
+    configured?: undefined;
 } | {
     url?: undefined;
     id?: undefined;

package/dist/file-upload/builder.js

@@ -34,6 +34,13 @@ async function assertOk(res, label) {
         throw Object.assign(new Error(`${label} (${res.status}): ${body || res.statusText}`), { status: res.status });
     }
 }
+function confirmedBuilderAuthorizationFailure(error) {
+    const cause = error instanceof Error ? error : new Error(String(error));
+    return Object.assign(new Error(cause.message, { cause }), {
+        status: 401,
+        errorCode: "builder_credentials_rejected",
+    });
+}
 /**
  * Run a Builder asset API call, and on a 401 refresh the OAuth access token
  * once and retry. A token can be revoked or rotated before its stated
@@ -51,10 +58,21 @@ async function withAssetAuthorization(run, held = {}) {
         const refreshed = await assetAuthorization({ forceRefresh: true });
         // The same token again (no refresh token, a key credential) would only
         // repeat the 401; report the original refusal instead.
-        if (refreshed.authorization === auth.authorization)
+        if (refreshed.authorization === auth.authorization) {
+            if (auth.apiKey)
+                throw confirmedBuilderAuthorizationFailure(error);
             throw error;
+        }
         held.auth = refreshed;
-        return run(refreshed);
+        try {
+            return await run(refreshed);
+        }
+        catch (retryError) {
+            if (retryError?.status !== 401) {
+                throw retryError;
+            }
+            throw confirmedBuilderAuthorizationFailure(retryError);
+        }
     }
 }
 async function uploadLargeFileViaSignedUrl(input, held, bareMimeType, bytes) {

package/dist/jobs/actions/manage-recurring-job.d.ts

@@ -11,9 +11,9 @@ declare const _default: import("../../action.js").ActionDefinition<{
     enabled?: undefined;
     nextRun?: undefined;
 } | {
+    deleted?: undefined;
     name: string;
     enabled: boolean;
     nextRun: string;
-    deleted?: undefined;
 }>;
 export default _default;

package/dist/mcp-client/app-api.d.ts

@@ -10,10 +10,20 @@ export interface AppMcpTool {
 }
 export interface ListVisibleMcpToolsOptions {
     serverId?: string;
+    /**
+     * Keep only tools served from this provider's MCP endpoint, matched on the
+     * server URL. A server id is a name the user chose, so it cannot prove which
+     * provider answers the call.
+     */
+    providerId?: string;
+}
+export interface CallMcpToolOptions {
+    /** Refuse the call unless the server's URL belongs to this provider. */
+    providerId?: string;
 }
 export declare class McpAppApiError extends Error {
     readonly statusCode: 401 | 403 | 503;
     constructor(message: string, statusCode: 401 | 403 | 503);
 }
 export declare function listVisibleMcpTools(options?: ListVisibleMcpToolsOptions): Promise<AppMcpTool[]>;
-export declare function callMcpTool(serverId: string, originalToolName: string, args?: Record<string, unknown>): Promise<unknown>;
+export declare function callMcpTool(serverId: string, originalToolName: string, args?: Record<string, unknown>, options?: CallMcpToolOptions): Promise<unknown>;

package/dist/mcp-client/app-api.js

@@ -1,6 +1,7 @@
 import { isToolVisibilityModelOnly } from "@modelcontextprotocol/ext-apps/app-bridge";
 import { getMcpManagerForPrincipal } from "../server/agent-chat/mcp-glue.js";
 import { getRequestContext } from "../server/request-context.js";
+import { hasMcpProviderMatchRules, mcpServerUrlMatchesProvider, } from "../shared/mcp-provider-hosts.js";
 import { buildMcpToolName, } from "./manager.js";
 import { normalizeMcpPrincipal } from "./principal.js";
 import { parseMergedKey } from "./remote-store.js";
@@ -20,16 +21,19 @@ export async function listVisibleMcpTools(options = {}) {
         ? manager.getToolsForServer(options.serverId)
         : manager.getTools();
     return tools
-        .filter((tool) => isToolVisibleToApp(tool, context))
+        .filter((tool) => isToolVisibleToApp(tool, context) &&
+        isServerForProvider(manager, tool.source, options.providerId))
         .map(toAppMcpTool);
 }
-export async function callMcpTool(serverId, originalToolName, args = {}) {
+export async function callMcpTool(serverId, originalToolName, args = {}, options = {}) {
     const context = requireAuthenticatedRequest();
     const manager = await requireMcpManager(context);
     const tool = manager
         .getToolsForServer(serverId)
         .find((candidate) => candidate.originalName === originalToolName);
-    if (!tool || !isToolVisibleToApp(tool, context)) {
+    if (!tool ||
+        !isToolVisibleToApp(tool, context) ||
+        !isServerForProvider(manager, serverId, options.providerId)) {
         throw new McpAppApiError("MCP tool is not available in this request scope.", 403);
     }
     return manager.callTool(buildMcpToolName(serverId, originalToolName), args);
@@ -81,6 +85,16 @@ function isToolVisibleToApp(tool, context) {
         return false;
     }
 }
+function isServerForProvider(manager, serverId, providerId) {
+    if (providerId === undefined)
+        return true;
+    if (!hasMcpProviderMatchRules(providerId)) {
+        throw new Error(`No MCP provider match rules for "${providerId}". Add it to MCP_PROVIDER_ENDPOINTS or MCP_LINK_HOSTS before filtering by it.`);
+    }
+    const config = manager.getServerConfig(serverId);
+    return (config?.type === "http" &&
+        mcpServerUrlMatchesProvider(providerId, config.url) === true);
+}
 function toAppMcpTool(tool) {
     return {
         serverId: tool.source,

package/dist/mcp-client/index.d.ts

@@ -10,7 +10,7 @@ export { mountMcpServersRoutes, buildMergedConfig, builtinMergedConfigKey, McpCo
 export { mountMcpHubRoutes, listHubServers, getHubStatus, isHubServeEnabled, isHubConsumeEnabled, type HubServerRecord, type HubServersResponse, } from "./hub-routes.js";
 export { fetchHubServers } from "./hub-client.js";
 export { isMcpToolAllowedForRequest } from "./visibility.js";
-export { callMcpTool, listVisibleMcpTools, McpAppApiError, type AppMcpTool, type ListVisibleMcpToolsOptions, } from "./app-api.js";
+export { callMcpTool, listVisibleMcpTools, McpAppApiError, type AppMcpTool, type CallMcpToolOptions, type ListVisibleMcpToolsOptions, } from "./app-api.js";
 export { classifyMcpToolCall, evaluateMcpToolCallPolicy, type McpToolCallClassification, type McpToolEffect, type McpToolFamily, type McpToolInvocationPolicy, type McpToolPolicyDecision, } from "./tool-policy.js";
 export { configureScreenMemory, queryScreenMemoryForAgent, queryScreenMemoryContext, readScreenMemoryStatus, type ScreenMemoryConfig, type ScreenMemoryAgentQueryResult, type ScreenMemoryContextItem, type ScreenMemoryCoverageGap, type ScreenMemoryEvidenceItem, type ScreenMemoryEvidenceSourceType, type ScreenMemoryQueryResult, type ScreenMemoryRetrievalCoverage, type ScreenMemorySegmentReference, type ScreenMemoryStatus, type ScreenMemoryTimeRange, type ScreenMemoryTruncation, } from "./screen-memory-local.js";
 export { MCP_ACTION_RESULT_MARKER, isMcpActionResult, type AgentMcpAppPayload, type AgentMcpAppResourceContent, type McpActionResult, } from "./app-result.js";

package/dist/mcp-client/manager.d.ts

@@ -1,4 +1,4 @@
-import type { McpConfig } from "./config.js";
+import type { McpConfig, McpServerConfig } from "./config.js";
 export declare const MCP_TOOL_PREFIX = "mcp__";
 export interface McpTool {
     source: string;
@@ -66,6 +66,8 @@ export declare class McpClientManager {
     getTools(): McpTool[];
     getTool(prefixedName: string): McpTool | null;
     getToolsForServer(serverId: string): McpTool[];
+    /** The config the server's current tools were loaded from. */
+    getServerConfig(serverId: string): McpServerConfig | null;
     hasServer(serverId: string): boolean;
     callTool(prefixedName: string, args: unknown): Promise<unknown>;
     readResource(serverId: string, uri: string): Promise<unknown>;

package/dist/mcp-client/manager.js

@@ -526,6 +526,10 @@ export class McpClientManager {
     getToolsForServer(serverId) {
         return [...(this.servers.get(serverId)?.tools ?? [])];
     }
+    /** The config the server's current tools were loaded from. */
+    getServerConfig(serverId) {
+        return this.servers.get(serverId)?.config ?? null;
+    }
     hasServer(serverId) {
         const entry = this.servers.get(serverId);
         return !!entry?.client && !entry.error;

package/dist/notifications/routes.d.ts

@@ -1,21 +1,21 @@
 export declare function createNotificationsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<"" | import("./types.js").Notification[] | {
+    error?: undefined;
     count: number;
     updated?: undefined;
     ok?: undefined;
-    error?: undefined;
 } | {
+    error?: undefined;
     count?: undefined;
     updated: number;
     ok?: undefined;
-    error?: undefined;
 } | {
     count?: undefined;
     updated?: undefined;
     error: string;
     ok?: undefined;
 } | {
+    error?: undefined;
     count?: undefined;
     updated?: undefined;
     ok: boolean;
-    error?: undefined;
 }>>;

package/dist/observability/routes.d.ts

@@ -59,6 +59,6 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/server/agent-chat/run-code-tools.d.ts

@@ -3,4 +3,11 @@ import type { SandboxCodeEvaluator } from "../../coding-tools/run-code.js";
 export declare function loadRunCodeToolEntries(supplier: () => Record<string, ActionEntry>, runCodeOptions?: {
     bridgeTools?: string[];
     evaluator?: SandboxCodeEvaluator;
+    /**
+     * Names of actions the app defines itself. These entries are spread after
+     * the app's actions, so a same-named entry here would silently replace the
+     * app's version (and drop its `mcpTool` exposure). Leave those names to
+     * the app.
+     */
+    appActionNames?: Iterable<string>;
 }): Promise<Record<string, ActionEntry>>;

package/dist/server/agent-chat/run-code-tools.js

@@ -1,5 +1,12 @@
 import { getAppConfig } from "../../app-config/index.js";
 export async function loadRunCodeToolEntries(supplier, runCodeOptions) {
+    const entries = await createRunCodeToolEntries(supplier, runCodeOptions);
+    for (const name of runCodeOptions?.appActionNames ?? []) {
+        delete entries[name];
+    }
+    return entries;
+}
+async function createRunCodeToolEntries(supplier, runCodeOptions) {
     try {
         const { createRunCodeEntry, createGetCodeExecutionEntry } = await import("../../coding-tools/run-code.js");
         const { createToolOrchestrationEntry } = await import("../../coding-tools/tool-orchestration.js");

package/dist/server/agent-chat-plugin.d.ts

@@ -5,10 +5,14 @@ import { foldAssistantTurn, type ThreadSuggestionRun } from "../agent/thread-dat
 import type { AgentChatEvent, AgentChatScope } from "../agent/types.js";
 import { type QueuedMessage } from "../chat-threads/store.js";
 import type { ResolvedKeyReference } from "../secrets/substitution.js";
+import { type TrackingMeta } from "../tracking/registry.js";
 import { handleSharedThreadRequest, type SharedThreadRouteDependencies } from "./agent-chat/shared-thread.js";
 export { handleSharedThreadRequest };
 export type { SharedThreadRouteDependencies };
-export declare function trackAgentChatRunLifecycle(event: "run_started" | "run_finished" | "run_no_reply", threadId: string | undefined, attemptId: string | undefined, userId?: string, properties?: Record<string, unknown>, appId?: string): void;
+type AgentChatRunTrackingSource = Pick<TrackingMeta, "userId" | "authUserId" | "anonymousId" | "sessionId"> & {
+    isSyntheticTraffic?: boolean;
+};
+export declare function trackAgentChatRunLifecycle(event: "run_started" | "run_finished" | "run_no_reply", threadId: string | undefined, attemptId: string | undefined, userId?: string, properties?: Record<string, unknown>, appId?: string, trackingSource?: AgentChatRunTrackingSource): void;
 import { buildSelectedA2AReceiverContext, createA2AEngineToolSurface, DEFAULT_DELEGATED_MAX_ITERATIONS, DEFAULT_DELEGATED_MAX_RUN_INPUT_TOKENS, DEFAULT_DELEGATED_MAX_TOOL_RESULT_CHARS, isSelectedA2AReceiver, runA2AAgentLoop, runMCPAgentLoop, assembleA2AFinalResponse, buildPublicAgentA2ASkills } from "./agent-chat/action-filters-a2a.js";
 import { _agentChatPromptSectionsForTests } from "./agent-chat/framework-prompts.js";
 import { type AgentChatPluginOptions, type NitroPluginDef } from "./agent-chat/plugin-options.js";

package/dist/server/agent-chat-plugin.js

@@ -71,15 +71,18 @@ import { getModelFamilyOverlay } from "./prompts/index.js";
 import { mountRealtimeVoiceRoutes } from "./realtime-voice.js";
 import { runWithRequestContext, getRequestContext, getRequestOrgId, getRequestUserEmail, getRequestRunContext, ensureRequestRunContext, } from "./request-context.js";
 export { handleSharedThreadRequest };
-export function trackAgentChatRunLifecycle(event, threadId, attemptId, userId, properties = {}, appId) {
-    if (!threadId?.trim() || !attemptId?.trim())
+export function trackAgentChatRunLifecycle(event, threadId, attemptId, userId, properties = {}, appId, trackingSource) {
+    if (!threadId?.trim() ||
+        !attemptId?.trim() ||
+        trackingSource?.isSyntheticTraffic === true) {
         return;
+    }
     track(event, {
         ...properties,
         ...(appId ? { app_name: appId, template_name: appId } : {}),
         thread_id: threadId,
         attempt_id: attemptId,
-    }, runLifecycleTrackingSource(userId));
+    }, trackingSource ?? runLifecycleTrackingSource(userId));
 }
 /**
  * The run's owner is set on the run context only once its system prompt is
@@ -1392,6 +1395,7 @@ export function createAgentChatPlugin(options) {
             () => filterRuntimeActionsToSurface(prodRunCodeToolActions), {
                 bridgeTools: options?.codeExecution?.bridgeTools,
                 evaluator: productionEvaluator,
+                appActionNames: Object.keys(templateScriptsAll),
             });
             const leanRunCodeTool = await loadRunCodeToolEntries(
             // Lean prompt mode intentionally exposes a much smaller action
@@ -1399,6 +1403,7 @@ export function createAgentChatPlugin(options) {
             () => filterRuntimeActionsToSurface(leanRunCodeToolActions), {
                 bridgeTools: options?.codeExecution?.bridgeTools,
                 evaluator: productionEvaluator,
+                appActionNames: Object.keys(templateScriptsAll),
             });
             // Full coding tool registry (bash/read/edit/write) for "trusted" prod.
             // In dev mode this is handled separately via devHandler below.
@@ -1431,6 +1436,7 @@ export function createAgentChatPlugin(options) {
                 ? await loadRunCodeToolEntries(() => filterRuntimeActionsToSurface(devRunCodeToolActions), {
                     bridgeTools: options?.codeExecution?.bridgeTools,
                     evaluator: "node",
+                    appActionNames: Object.keys(templateScriptsAll),
                 })
                 : {};
             // Registry `generateCorpusToolsPrompt` (below) reads from to decide what
@@ -2656,7 +2662,7 @@ export function createAgentChatPlugin(options) {
             }
             // Callback to persist agent response when run finishes (even if client disconnected).
             // Reconstructs the assistant message from buffered events and appends to thread_data.
-            const onRunComplete = async (run, threadId) => {
+            const onRunComplete = async (run, threadId, trackingSource) => {
                 const runThreadId = String(run?.threadId ?? threadId ?? "");
                 const chatScope = getRequestRunContext()?.chatScope;
                 const assistantMsg = buildAssistantMessage(run.events ?? [], run.runId, {
@@ -2682,9 +2688,9 @@ export function createAgentChatPlugin(options) {
                     ...(failureCode?.type === "error"
                         ? { failure_code: failureCode.errorCode ?? "unknown" }
                         : {}),
-                }, options?.appId);
+                }, options?.appId, trackingSource);
                 if (!assistantMsg) {
-                    trackAgentChatRunLifecycle("run_no_reply", runThreadId || undefined, run.runId, getRequestRunContext()?.owner, {}, options?.appId);
+                    trackAgentChatRunLifecycle("run_no_reply", runThreadId || undefined, run.runId, getRequestRunContext()?.owner, {}, options?.appId, trackingSource);
                 }
                 if (!threadId) {
                     if (runThreadId)
@@ -3535,10 +3541,10 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     trackAgentChatRunLifecycle("run_started", threadId, runId, runCtx?.owner, {}, options?.appId);
                     await runPreAgentTurnAutosave(options?.onAgentTurnStart, runCtx?.chatScope, { threadId, runId });
                 },
-                onRunComplete: async (run, threadId) => {
+                onRunComplete: async (run, threadId, trackingSource) => {
                     if (threadId)
                         _runSendByThread.delete(threadId);
-                    await onRunComplete(run, threadId);
+                    await onRunComplete(run, threadId, trackingSource);
                 },
                 resolveAdditionalActions: ({ ownerEmail, orgId }) => getMcpActionEntriesForPrincipal(ownerEmail, orgId),
                 // Resolve owner from session for usage attribution in hosted prod
@@ -3588,10 +3594,10 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         }
                         trackAgentChatRunLifecycle("run_started", threadId, runId, runCtx?.owner, {}, options?.appId);
                     },
-                    onRunComplete: async (run, threadId) => {
+                    onRunComplete: async (run, threadId, trackingSource) => {
                         if (threadId)
                             _runSendByThread.delete(threadId);
-                        await onRunComplete(run, threadId);
+                        await onRunComplete(run, threadId, trackingSource);
                     },
                     resolveOwnerEmail: getOwnerFromEvent,
                 })
@@ -3790,10 +3796,10 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         trackAgentChatRunLifecycle("run_started", threadId, runId, runCtx?.owner, {}, options?.appId);
                         await runPreAgentTurnAutosave(options?.onAgentTurnStart, runCtx?.chatScope, { threadId, runId });
                     },
-                    onRunComplete: async (run, threadId) => {
+                    onRunComplete: async (run, threadId, trackingSource) => {
                         if (threadId)
                             _runSendByThread.delete(threadId);
-                        await onRunComplete(run, threadId);
+                        await onRunComplete(run, threadId, trackingSource);
                     },
                 });
             }

package/dist/server/agent-engine-default-model-route.d.ts

@@ -16,9 +16,9 @@ export declare function createAgentEngineDisconnectHandler(): import("h3").Event
     error: any;
     scope?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     scope: "org" | "user";
-    error?: undefined;
 }>>;
 export interface DefaultModelSelectionRequest {
     engine: string;

package/dist/server/core-routes-plugin.d.ts

@@ -626,8 +626,8 @@ export declare function createPublicRemoteAgentsHandler(discover?: PublicAgentDi
     error: string;
     agents?: undefined;
 } | {
-    error?: undefined;
     agents: Omit<import("./agent-discovery.js").DiscoveredAgent, "auth" | "kind">[];
+    error?: undefined;
 }>>;
 export declare function getBuilderConnectErrorDisposition(error: unknown, connectAttemptId: string | null): "correlated" | "legacy" | null;
 export declare function getBuilderConnectErrorKey(ownerEmail: string, connectAttemptId?: string | null): string;

package/dist/server/realtime-token.d.ts

@@ -54,8 +54,8 @@ export declare function createRealtimeTokenHandler(): import("h3").EventHandlerW
     expiresAt?: undefined;
     ttlSeconds?: undefined;
 } | {
+    error?: undefined;
     token: string;
     expiresAt: string;
     ttlSeconds: number;
-    error?: undefined;
 }>>;

package/dist/triggers/actions/manage-automation.d.ts

@@ -13,6 +13,7 @@ declare const _default: import("../../action.js").ActionDefinition<{
     executionEngine?: string;
     executionCwd?: string;
 }, {
+    deleted?: undefined;
     created: boolean;
     name: string;
     scope: "organization" | "personal";
@@ -23,7 +24,6 @@ declare const _default: import("../../action.js").ActionDefinition<{
     reasoningEffort: "auto" | "high" | "low" | "max" | "medium" | "minimal" | "none" | "xhigh";
     webhookPath: string;
     nextRun: string;
-    deleted?: undefined;
     enabled?: undefined;
     executionHostId?: undefined;
     executionEngine?: undefined;
@@ -45,11 +45,11 @@ declare const _default: import("../../action.js").ActionDefinition<{
     nextRun?: undefined;
     webhookPath?: undefined;
 } | {
+    deleted?: undefined;
     created?: undefined;
     scope?: undefined;
     triggerType?: undefined;
     event?: undefined;
-    deleted?: undefined;
     name: string;
     enabled: boolean;
     schedule: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.200.0-nightly-20261002153252",
+  "version": "0.200.0",
   "description": "The agentic application framework for building autonomous agents with intuitive UIs",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -663,12 +663,13 @@
     "safe-regex2": "5.1.1",
     "turndown": "^7.2.4",
     "undici": "^7.28.0",
+    "ws": "^8.22.0",
     "y-protocols": "^1.0.7",
     "yaml": "^2.9.0",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.200.0-nightly-20261002153252",
-    "@agent-native/recap-cli": "^0.5.59"
+    "@agent-native/agentkit": "^0.200.0",
+    "@agent-native/recap-cli": "^0.5.60"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.71",
@@ -735,11 +736,10 @@
     "typescript-7": "npm:typescript@^7.0.2",
     "vite": "8.1.0",
     "vitest": "^4.1.5",
-    "ws": "^8.18.0",
     "xlsx": "^0.18.5"
   },
   "peerDependencies": {
-    "@agent-native/core-corpus": "0.200.0-nightly-20261002153252",
+    "@agent-native/core-corpus": ">=0.196.0",
     "@ai-sdk/anthropic": ">=3",
     "@ai-sdk/cohere": ">=3",
     "@ai-sdk/google": ">=3",
@@ -781,7 +781,6 @@
     "tailwindcss": ">=4",
     "ts-morph": "^28.0.0",
     "vite": ">=7",
-    "ws": ">=8",
     "xlsx": "^0.18.5"
   },
   "peerDependenciesMeta": {
@@ -914,9 +913,6 @@
     "vite": {
       "optional": true
     },
-    "ws": {
-      "optional": true
-    },
     "xlsx": {
       "optional": true
     }