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

package/src/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/src/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/src/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/src/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/src/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