@agent-native/core 0.210.0 → 0.210.1-nightly-20261020010058

package/dist/server/agent-engine-api-key-route.d.ts

@@ -66,8 +66,8 @@ export declare function createAgentEngineApiKeyHandler(): import("h3").EventHand
     error: any;
     code: any;
 } | {
-    error?: undefined;
     errorCode?: undefined;
+    error?: undefined;
     code?: undefined;
     ok: boolean;
     key: string;

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

@@ -8,8 +8,8 @@ export declare const AGENT_ENGINE_API_KEY_ACTION_NAME = "agent-engine-api-key";
  * resolveEngine's credential detection.
  */
 export declare function createAgentEngineDisconnectHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
     scope?: undefined;
 } | {
     ok: boolean;

package/dist/server/agent-teams.js

@@ -7,8 +7,9 @@ import { actionsToEngineTools, filterActionsByAllowedNames, filterInitialEngineT
 import { runAgentLoop, appendAgentLoopContinuation, } from "../agent/production-agent.js";
 import { abortRun, getActiveRunForThreadAsync, getRun, startRun, subscribeToRun, } from "../agent/run-manager.js";
 import { ensureRunTables, getRunEventsSince, lockTaskExecutionLease, revokeTaskExecutionLease, } from "../agent/run-store.js";
+import { buildAssistantMessageFromRunJournal } from "../agent/run-thread-projector.js";
 import { resolveMaxSubagentDelegationDepth } from "../agent/runtime-context.js";
-import { buildAssistantMessage, foldAssistantTurn, threadDataToEngineMessages, } from "../agent/thread-data-builder.js";
+import { foldAssistantTurn, threadDataToEngineMessages, } from "../agent/thread-data-builder.js";
 import { attachToolSearch } from "../agent/tool-search.js";
 import { compareAndSetAppState, compareAndSetManyAppState, readAppState, writeAppState, listAppState, deleteAppState, } from "../application-state/script-helpers.js";
 import { redactArgsToValue, redactTextToSummary } from "../audit/redact.js";
@@ -1346,9 +1347,14 @@ async function persistTaskThreadData(task, description, run, runId, turnId) {
         if (!repo.headId)
             repo.headId = userMsgId;
     }
-    const assistantMsg = buildAssistantMessage(run.events ?? [], runId, {
-        suppressInternalContinuation: true,
+    const assistantMsg = await buildAssistantMessageFromRunJournal({
+        threadId: task.threadId,
         turnId,
+        runId,
+        runEvents: run.events ?? [],
+        options: {
+            suppressInternalContinuation: true,
+        },
     });
     if (assistantMsg) {
         repo = foldAssistantTurn(repo, assistantMsg, { runId, turnId });

package/dist/server/framework-request-handler.js

@@ -30,6 +30,8 @@ const EARLY_FRAMEWORK_PATHS_KEY = "_agentNativeEarlyFrameworkPaths";
 const MIDDLEWARE_DISPATCHER_PATCHED_KEY = "_agentNativeMiddlewareDispatcherPatched";
 const REQUEST_CONTEXT_BOUNDARY_KEY = "_agentNativeRequestContextBoundary";
 const RETIRED_PATH_CONTEXT_KEY = "_frameworkRetiredPathname";
+const ROUTE_MIDDLEWARE_BATCH_SIZE = 64;
+const routeMiddlewareBatches = new WeakMap();
 const CANONICAL_AUTH_EARLY_PATHS = [
     "/",
     SIGN_IN_ENTRY_PATH,
@@ -501,6 +503,23 @@ function registerMiddleware(nitroApp, path, handler, options = {}) {
     if (options.prepend) {
         chain.unshift(middleware);
     }
+    else if (path) {
+        const last = chain[chain.length - 1];
+        const existing = last && routeMiddlewareBatches.get(last);
+        if (existing && existing.length < ROUTE_MIDDLEWARE_BATCH_SIZE) {
+            existing.push(middleware);
+            return;
+        }
+        const batch = [middleware];
+        const dispatch = (event, next) => {
+            const run = (index) => index === batch.length
+                ? Promise.resolve().then(next)
+                : batch[index](event, () => run(index + 1));
+            return run(0);
+        };
+        routeMiddlewareBatches.set(dispatch, batch);
+        chain.push(dispatch);
+    }
     else {
         chain.push(middleware);
     }

package/dist/server/fusion-app.d.ts

@@ -42,6 +42,13 @@ export interface SendFusionMessageResult {
      * afterwards, or was fire-and-forget.
      */
     completed?: boolean;
+    /**
+     * True when the message was dispatched but this call stopped hearing from
+     * the run before it ended (timed out or the stream was cut off): Builder
+     * may still be applying it, so it must not be treated as failed-and-safe
+     * to resend, nor as done.
+     */
+    unconfirmed?: boolean;
     response?: string;
     error?: string;
 }

package/dist/server/fusion-app.js

@@ -339,8 +339,16 @@ export async function sendFusionBranchMessage(args) {
     }
     catch (error) {
         if (controller.signal.aborted) {
-            if (dispatched)
-                return { sent: true };
+            if (dispatched) {
+                // Fire-and-forget never waits for the run, so dispatch is the outcome.
+                if (fireAndForget)
+                    return { sent: true };
+                return {
+                    sent: true,
+                    unconfirmed: true,
+                    error: "Timed out waiting for the app agent to finish; it may still be working",
+                };
+            }
             return {
                 sent: false,
                 error: "Timed out sending message to the app agent",
@@ -364,6 +372,7 @@ export async function sendFusionBranchMessage(args) {
             return { sent: dispatched };
         return {
             sent: dispatched,
+            ...(dispatched ? { unconfirmed: true } : {}),
             error: "The app agent's run ended before it finished",
         };
     }

package/dist/templates/builder-code-starter/.agents/skills/actions/SKILL.md.patch

@@ -1,7 +1,7 @@
 ===================================================================
 --- a/.agents/skills/actions/SKILL.md
 +++ b/.agents/skills/actions/SKILL.md
-@@ -156,8 +156,22 @@
+@@ -158,8 +158,22 @@
  ```
  
  CLI flags become action input fields (`--key value` or `--key=value`); the runner does not read or write files for `--input` or `--output`. The default template dispatches through core's `runScript()` in `actions/run.ts`. Action names are lowercase-with-hyphens (`pnpm action my-action` → `actions/my-action.ts`).

package/dist/templates/builder-code-starter/app/hooks/use-navigation-state.ts.patch

@@ -1,10 +1,7 @@
 ===================================================================
 --- a/app/hooks/use-navigation-state.ts
 +++ b/app/hooks/use-navigation-state.ts
-@@ -1,85 +1,41 @@
- import { appBasePath, appPath } from "@agent-native/core/client/api-path";
- import { useAgentRouteState } from "@agent-native/core/client/navigation";
- 
+@@ -7,7 +6,0 @@
 -import {
 -  chatThreadPath,
 -  HOME_PATH,
@@ -12,37 +9,30 @@
 -  NEW_CHAT_PATH,
 -  threadIdFromPath,
 -} from "@/lib/chat-paths";
- import { TAB_ID } from "@/lib/tab-id";
- 
- export interface NavigationState {
-   view: string;
-   path?: string;
+@@ -20,1 +12,0 @@
 -  threadId?: string;
- }
- 
- export function useNavigationState() {
-   useAgentRouteState<NavigationState>({
-     browserTabId: TAB_ID,
-     requestSource: TAB_ID,
--    getNavigationState: ({ pathname }) => {
--      const threadId = threadIdFromPath(pathname);
--      return {
--        view: viewForPath(pathname),
--        path: appPath(pathname),
--        ...(threadId ? { threadId } : {}),
--      };
--    },
+@@ -27,1 +19,5 @@
+-    getNavigationState: ({ pathname }) => navigationStateForPath(pathname),
 +    getNavigationState: ({ pathname }) => ({
 +      view: viewForPath(pathname),
-+      path: appPath(pathname),
++      path: pathname,
++      publicPath: appPathFromLocalRoute(pathname),
 +    }),
-     getCommandPath: (command) =>
--      routerPath(command.path || pathForCommand(command)),
-+      routerPath(command.path || pathForView(command.view)),
-   });
- }
- 
- function viewForPath(pathname: string): string {
+@@ -33,1 +29,1 @@
+-  const fallbackPath = pathForCommand(command);
++  const fallbackPath = pathForView(command?.view);
+@@ -52,10 +47,0 @@
+-export function navigationStateForPath(pathname: string): NavigationState {
+-  const threadId = threadIdFromPath(pathname);
+-  return {
+-    view: viewForPath(pathname),
+-    path: pathname,
+-    publicPath: appPathFromLocalRoute(pathname),
+-    ...(threadId ? { threadId } : {}),
+-  };
+-}
+-
+@@ -63,11 +49,2 @@
 -  if (isChatPathname(pathname)) return "chat";
 -  if (pathname === HOME_PATH) return "home";
 -  if (pathname.startsWith("/database")) return "database";
@@ -56,14 +46,11 @@
 -  return "chat";
 +  if (pathname === "/") return "home";
 +  return "home";
- }
- 
- function pathForView(view?: string): string {
-   switch (view) {
+@@ -78,3 +54,0 @@
 -    case "chat":
 -    case "ask":
 -      return NEW_CHAT_PATH;
-     case "home":
+@@ -82,13 +56,1 @@
 -      return HOME_PATH;
 -    case "database":
 -      return "/database";
@@ -78,12 +65,11 @@
 -    case "team":
 -      return "/settings/organization";
 +      return "/";
-     default:
+@@ -96,1 +58,1 @@
 -      return HOME_PATH;
 +      return "/";
-   }
- }
- 
+@@ -99,8 +60,0 @@
+-
 -export function pathForCommand(command: any): string {
 -  const path = pathForView(command?.view);
 -  if (command?.view !== "chat" && command?.view !== "ask") return path;
@@ -91,8 +77,3 @@
 -    typeof command?.threadId === "string" ? command.threadId.trim() : "";
 -  return threadId ? chatThreadPath(threadId) : path;
 -}
--
- function routerPath(path: string): string {
-   const basePath = appBasePath();
-   if (!basePath) return path;
-   if (path === basePath) return "/";

package/dist/templates/builder-code-starter/server/plugins/agent-chat.ts.patch

@@ -1,7 +1,7 @@
 ===================================================================
 --- a/server/plugins/agent-chat.ts
 +++ b/server/plugins/agent-chat.ts
-@@ -4,23 +4,20 @@
+@@ -4,24 +4,21 @@
    loadActionsFromStaticRegistry,
  } from "@agent-native/core/server";
  
@@ -18,6 +18,7 @@
  export default createAgentChatPlugin({
    appId: "chat",
    actions: loadActionsFromStaticRegistry(actionsRegistry),
+   mcp: { connectorCatalog: [] },
 -  initialToolNames: INITIAL_TOOL_NAMES,
 +  nativeActionsInDev: true,
 +  finalResponseGuard: appOperationFinalResponseGuard,

package/dist/templates/chat/.agents/skills/context-awareness/SKILL.md

@@ -196,6 +196,11 @@ changes. If a command can arrive while a chat stream is rendering, prefer
 `navigate(path, { replace: true, flushSync: true })` over a view-transition
 wrapper so the URL and visible route commit together.
 
+Keep `path` router-local. A segment matching the app mount prefix remains part
+of the local route unless a matching `view` route or explicit `publicPath`
+identifies the mounted URL. Carry the mounted form separately in `publicPath`;
+never infer that `path` is mounted from its prefix alone.
+
 ## Jitter Prevention
 
 Agent-side application-state writes are tagged with

package/dist/templates/chat/app/components/chat/ChatHomeRedirect.tsx

@@ -1,4 +1,4 @@
-import { appPath } from "@agent-native/core/client/api-path";
+import { appPathFromLocalRoute } from "@agent-native/core/client/api-path";
 import { markAgentChatHomeHandoff } from "@agent-native/toolkit/app/chat/agentkit-chat/rail";
 import { useEffect, useRef, useState } from "react";
 
@@ -14,7 +14,7 @@ export default function ChatHomeRedirect() {
     handoffStartedRef.current = true;
     markAgentChatHomeHandoff("chat");
     try {
-      window.location.replace(appPath(chatThreadPath(threadId)));
+      window.location.replace(appPathFromLocalRoute(chatThreadPath(threadId)));
     } catch (error) {
       handoffStartedRef.current = false;
       throw error;

package/dist/templates/chat/app/hooks/use-navigation-state.ts

@@ -1,4 +1,7 @@
-import { appBasePath, appPath } from "@agent-native/core/client/api-path";
+import {
+  appBasePath,
+  appPathFromLocalRoute,
+} from "@agent-native/core/client/api-path";
 import { useAgentRouteState } from "@agent-native/core/client/navigation";
 
 import {
@@ -11,8 +14,9 @@ import {
 import { TAB_ID } from "@/lib/tab-id";
 
 export interface NavigationState {
-  view: string;
+  view?: string;
   path?: string;
+  publicPath?: string;
   threadId?: string;
 }
 
@@ -20,19 +24,54 @@ export function useNavigationState() {
   useAgentRouteState<NavigationState>({
     browserTabId: TAB_ID,
     requestSource: TAB_ID,
-    getNavigationState: ({ pathname }) => {
-      const threadId = threadIdFromPath(pathname);
-      return {
-        view: viewForPath(pathname),
-        path: appPath(pathname),
-        ...(threadId ? { threadId } : {}),
-      };
-    },
-    getCommandPath: (command) =>
-      routerPath(command.path || pathForCommand(command)),
+    getNavigationState: ({ pathname }) => navigationStateForPath(pathname),
+    getCommandPath: commandPathForNavigation,
   });
 }
 
+export function commandPathForNavigation(command: NavigationState): string {
+  const fallbackPath = pathForCommand(command);
+  const path = typeof command?.path === "string" ? command.path : "";
+  if (!path) return fallbackPath;
+
+  const basePath = appBasePath();
+  if (!basePath) return path;
+
+  const suffixIndex = path.search(/[?#]/);
+  const pathname = suffixIndex === -1 ? path : path.slice(0, suffixIndex);
+  const suffix = suffixIndex === -1 ? "" : path.slice(suffixIndex);
+  const publicPath =
+    typeof command?.publicPath === "string" ? command.publicPath : "";
+  const publicPathSuffixIndex = publicPath.search(/[?#]/);
+  const declaredPublicPath =
+    publicPathSuffixIndex === -1
+      ? publicPath
+      : publicPath.slice(0, publicPathSuffixIndex);
+  const publicViewPath = appPathFromLocalRoute(pathForView(command?.view));
+  if (
+    matchesPathPrefix(pathname, basePath) &&
+    (matchesPathPrefix(pathname, publicViewPath) ||
+      (declaredPublicPath && declaredPublicPath === pathname))
+  ) {
+    return `${pathname.slice(basePath.length) || "/"}${suffix}`;
+  }
+  return path;
+}
+
+function matchesPathPrefix(pathname: string, prefix: string): boolean {
+  return pathname === prefix || pathname.startsWith(`${prefix}/`);
+}
+
+export function navigationStateForPath(pathname: string): NavigationState {
+  const threadId = threadIdFromPath(pathname);
+  return {
+    view: viewForPath(pathname),
+    path: pathname,
+    publicPath: appPathFromLocalRoute(pathname),
+    ...(threadId ? { threadId } : {}),
+  };
+}
+
 function viewForPath(pathname: string): string {
   if (isChatPathname(pathname)) return "chat";
   if (pathname === HOME_PATH) return "home";
@@ -78,13 +117,3 @@ export function pathForCommand(command: any): string {
     typeof command?.threadId === "string" ? command.threadId.trim() : "";
   return threadId ? chatThreadPath(threadId) : path;
 }
-
-function routerPath(path: string): string {
-  const basePath = appBasePath();
-  if (!basePath) return path;
-  if (path === basePath) return "/";
-  if (path.startsWith(`${basePath}/`)) {
-    return path.slice(basePath.length) || "/";
-  }
-  return path;
-}

package/dist/templates/chat/server/plugins/agent-chat.ts

@@ -16,6 +16,7 @@ const INITIAL_TOOL_NAMES = [
 export default createAgentChatPlugin({
   appId: "chat",
   actions: loadActionsFromStaticRegistry(actionsRegistry),
+  mcp: { connectorCatalog: [] },
   initialToolNames: INITIAL_TOOL_NAMES,
   resolveOrgId: async (event) => (await getOrgContext(event)).orgId,
   systemPrompt: `You are the Chat app agent.

package/dist/templates/default/.agents/skills/context-awareness/SKILL.md

@@ -196,6 +196,11 @@ changes. If a command can arrive while a chat stream is rendering, prefer
 `navigate(path, { replace: true, flushSync: true })` over a view-transition
 wrapper so the URL and visible route commit together.
 
+Keep `path` router-local. A segment matching the app mount prefix remains part
+of the local route unless a matching `view` route or explicit `publicPath`
+identifies the mounted URL. Carry the mounted form separately in `publicPath`;
+never infer that `path` is mounted from its prefix alone.
+
 ## Jitter Prevention
 
 Agent-side application-state writes are tagged with

package/dist/templates/workspace-core/.agents/skills/context-awareness/SKILL.md

@@ -196,6 +196,11 @@ changes. If a command can arrive while a chat stream is rendering, prefer
 `navigate(path, { replace: true, flushSync: true })` over a view-transition
 wrapper so the URL and visible route commit together.
 
+Keep `path` router-local. A segment matching the app mount prefix remains part
+of the local route unless a matching `view` route or explicit `publicPath`
+identifies the mounted URL. Carry the mounted form separately in `publicPath`;
+never infer that `path` is mounted from its prefix alone.
+
 ## Jitter Prevention
 
 Agent-side application-state writes are tagged with

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

@@ -13,8 +13,6 @@ declare const _default: import("../../action.js").ActionDefinition<{
     executionEngine?: string;
     executionCwd?: string;
 }, {
-    deleted?: undefined;
-    enabled?: undefined;
     created: boolean;
     name: string;
     scope: "organization" | "personal";
@@ -25,31 +23,33 @@ 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;
     executionCwd?: undefined;
 } | {
-    enabled?: undefined;
-    nextRun?: undefined;
     created?: undefined;
     scope?: undefined;
     triggerType?: undefined;
     event?: undefined;
     deleted: boolean;
     name: string;
+    enabled?: undefined;
     schedule?: undefined;
     timezone?: undefined;
     reasoningEffort?: undefined;
     executionHostId?: undefined;
     executionEngine?: undefined;
     executionCwd?: undefined;
+    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.210.0",
+  "version": "0.210.1-nightly-20261020010058",
   "description": "The agentic application framework for building autonomous agents with intuitive UIs",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -711,7 +711,7 @@
     "yaml": "^2.9.0",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.210.0",
+    "@agent-native/agentkit": "^0.210.1-nightly-20261020010058",
     "@agent-native/recap-cli": "^0.5.75"
   },
   "devDependencies": {
@@ -728,7 +728,7 @@
     "@better-auth/scim": "1.7.6",
     "@better-auth/sso": "1.7.6",
     "@builder.io/ai-utils": "^0.84.0",
-    "@electric-sql/pglite": "^0.5.8",
+    "@electric-sql/pglite": "^0.5.9",
     "@excalidraw/excalidraw": "0.18.1",
     "@excalidraw/mermaid-to-excalidraw": "2.2.2",
     "@launchdarkly/node-server-sdk": "^9.13.6",
@@ -782,7 +782,7 @@
     "xlsx": "^0.18.5"
   },
   "peerDependencies": {
-    "@agent-native/core-corpus": ">=0.196.0",
+    "@agent-native/core-corpus": "0.210.1-nightly-20261020010058",
     "@ai-sdk/anthropic": ">=3",
     "@ai-sdk/cohere": ">=3",
     "@ai-sdk/google": ">=3",
@@ -794,7 +794,7 @@
     "@better-auth/scim": "1.7.6",
     "@better-auth/sso": "1.7.6",
     "@builder.io/ai-utils": "^0.84.0",
-    "@electric-sql/pglite": "^0.5.8",
+    "@electric-sql/pglite": "^0.5.9",
     "@launchdarkly/node-server-sdk": "^9.13.6",
     "@openrouter/ai-sdk-provider": ">=2",
     "@opentelemetry/api": "^1.9.1",

package/src/templates/builder-code-starter/.agents/skills/actions/SKILL.md.patch

@@ -1,7 +1,7 @@
 ===================================================================
 --- a/.agents/skills/actions/SKILL.md
 +++ b/.agents/skills/actions/SKILL.md
-@@ -156,8 +156,22 @@
+@@ -158,8 +158,22 @@
  ```
  
  CLI flags become action input fields (`--key value` or `--key=value`); the runner does not read or write files for `--input` or `--output`. The default template dispatches through core's `runScript()` in `actions/run.ts`. Action names are lowercase-with-hyphens (`pnpm action my-action` → `actions/my-action.ts`).

package/src/templates/builder-code-starter/app/hooks/use-navigation-state.ts.patch

@@ -1,10 +1,7 @@
 ===================================================================
 --- a/app/hooks/use-navigation-state.ts
 +++ b/app/hooks/use-navigation-state.ts
-@@ -1,85 +1,41 @@
- import { appBasePath, appPath } from "@agent-native/core/client/api-path";
- import { useAgentRouteState } from "@agent-native/core/client/navigation";
- 
+@@ -7,7 +6,0 @@
 -import {
 -  chatThreadPath,
 -  HOME_PATH,
@@ -12,37 +9,30 @@
 -  NEW_CHAT_PATH,
 -  threadIdFromPath,
 -} from "@/lib/chat-paths";
- import { TAB_ID } from "@/lib/tab-id";
- 
- export interface NavigationState {
-   view: string;
-   path?: string;
+@@ -20,1 +12,0 @@
 -  threadId?: string;
- }
- 
- export function useNavigationState() {
-   useAgentRouteState<NavigationState>({
-     browserTabId: TAB_ID,
-     requestSource: TAB_ID,
--    getNavigationState: ({ pathname }) => {
--      const threadId = threadIdFromPath(pathname);
--      return {
--        view: viewForPath(pathname),
--        path: appPath(pathname),
--        ...(threadId ? { threadId } : {}),
--      };
--    },
+@@ -27,1 +19,5 @@
+-    getNavigationState: ({ pathname }) => navigationStateForPath(pathname),
 +    getNavigationState: ({ pathname }) => ({
 +      view: viewForPath(pathname),
-+      path: appPath(pathname),
++      path: pathname,
++      publicPath: appPathFromLocalRoute(pathname),
 +    }),
-     getCommandPath: (command) =>
--      routerPath(command.path || pathForCommand(command)),
-+      routerPath(command.path || pathForView(command.view)),
-   });
- }
- 
- function viewForPath(pathname: string): string {
+@@ -33,1 +29,1 @@
+-  const fallbackPath = pathForCommand(command);
++  const fallbackPath = pathForView(command?.view);
+@@ -52,10 +47,0 @@
+-export function navigationStateForPath(pathname: string): NavigationState {
+-  const threadId = threadIdFromPath(pathname);
+-  return {
+-    view: viewForPath(pathname),
+-    path: pathname,
+-    publicPath: appPathFromLocalRoute(pathname),
+-    ...(threadId ? { threadId } : {}),
+-  };
+-}
+-
+@@ -63,11 +49,2 @@
 -  if (isChatPathname(pathname)) return "chat";
 -  if (pathname === HOME_PATH) return "home";
 -  if (pathname.startsWith("/database")) return "database";
@@ -56,14 +46,11 @@
 -  return "chat";
 +  if (pathname === "/") return "home";
 +  return "home";
- }
- 
- function pathForView(view?: string): string {
-   switch (view) {
+@@ -78,3 +54,0 @@
 -    case "chat":
 -    case "ask":
 -      return NEW_CHAT_PATH;
-     case "home":
+@@ -82,13 +56,1 @@
 -      return HOME_PATH;
 -    case "database":
 -      return "/database";
@@ -78,12 +65,11 @@
 -    case "team":
 -      return "/settings/organization";
 +      return "/";
-     default:
+@@ -96,1 +58,1 @@
 -      return HOME_PATH;
 +      return "/";
-   }
- }
- 
+@@ -99,8 +60,0 @@
+-
 -export function pathForCommand(command: any): string {
 -  const path = pathForView(command?.view);
 -  if (command?.view !== "chat" && command?.view !== "ask") return path;
@@ -91,8 +77,3 @@
 -    typeof command?.threadId === "string" ? command.threadId.trim() : "";
 -  return threadId ? chatThreadPath(threadId) : path;
 -}
--
- function routerPath(path: string): string {
-   const basePath = appBasePath();
-   if (!basePath) return path;
-   if (path === basePath) return "/";

package/src/templates/builder-code-starter/server/plugins/agent-chat.ts.patch

@@ -1,7 +1,7 @@
 ===================================================================
 --- a/server/plugins/agent-chat.ts
 +++ b/server/plugins/agent-chat.ts
-@@ -4,23 +4,20 @@
+@@ -4,24 +4,21 @@
    loadActionsFromStaticRegistry,
  } from "@agent-native/core/server";
  
@@ -18,6 +18,7 @@
  export default createAgentChatPlugin({
    appId: "chat",
    actions: loadActionsFromStaticRegistry(actionsRegistry),
+   mcp: { connectorCatalog: [] },
 -  initialToolNames: INITIAL_TOOL_NAMES,
 +  nativeActionsInDev: true,
 +  finalResponseGuard: appOperationFinalResponseGuard,

package/src/templates/chat/.agents/skills/context-awareness/SKILL.md

@@ -196,6 +196,11 @@ changes. If a command can arrive while a chat stream is rendering, prefer
 `navigate(path, { replace: true, flushSync: true })` over a view-transition
 wrapper so the URL and visible route commit together.
 
+Keep `path` router-local. A segment matching the app mount prefix remains part
+of the local route unless a matching `view` route or explicit `publicPath`
+identifies the mounted URL. Carry the mounted form separately in `publicPath`;
+never infer that `path` is mounted from its prefix alone.
+
 ## Jitter Prevention
 
 Agent-side application-state writes are tagged with