@agent-native/core 0.98.17 → 0.99.1

package/dist/cli/connect.d.ts

@@ -15,11 +15,11 @@
  *   agent-native connect --all  [--client ...]   (separate first-party app MCP resources)
  *
  * Server contract (implemented by another agent on `<url>`):
- *   POST <url>/_agent-native/mcp/connect/device/start  (no auth)
+ *   POST <url>/mcp/connect/device/start  (no auth)
  *     body { client?, app? }
  *     → { device_code, user_code, verification_uri,
  *         verification_uri_complete, interval, expires_in }
- *   POST <url>/_agent-native/mcp/connect/device/poll   (no auth)
+ *   POST <url>/mcp/connect/device/poll   (no auth)
  *     body { device_code }
  *     → { status: "pending" }
  *     | { status: "approved", token, mcpUrl, serverName, mcpServerEntry }

package/dist/cli/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/cli/connect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/cli/connect.ts"],"names":[],"mappings":"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"}

package/dist/cli/connect.js

@@ -15,11 +15,11 @@
  *   agent-native connect --all  [--client ...]   (separate first-party app MCP resources)
  *
  * Server contract (implemented by another agent on `<url>`):
- *   POST <url>/_agent-native/mcp/connect/device/start  (no auth)
+ *   POST <url>/mcp/connect/device/start  (no auth)
  *     body { client?, app? }
  *     → { device_code, user_code, verification_uri,
  *         verification_uri_complete, interval, expires_in }
- *   POST <url>/_agent-native/mcp/connect/device/poll   (no auth)
+ *   POST <url>/mcp/connect/device/poll   (no auth)
  *     body { device_code }
  *     → { status: "pending" }
  *     | { status: "approved", token, mcpUrl, serverName, mcpServerEntry }
@@ -33,13 +33,15 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { MCP_LEGACY_ROUTE_PREFIX, MCP_PUBLIC_ROUTE_PREFIX, } from "../mcp/route-paths.js";
 import { findWorkspaceRoot } from "../mcp/workspace-resolve.js";
 import { CLIENTS, configPathFor, jsonMcpConfigKeyForClient, removeSameUrlDuplicatesForClient, writeCodexBlock, writeHttpEntryForClient, writeJsonMcpEntryForClient, } from "./mcp-config-writers.js";
 import { isFirstPartyPlanHost, writePlanPublishAuth, } from "./plan-publish-store.js";
 import { TEMPLATES, visibleTemplates } from "./templates-meta.js";
-const DEVICE_START_PATH = "/_agent-native/mcp/connect/device/start";
-const DEVICE_POLL_PATH = "/_agent-native/mcp/connect/device/poll";
-const MCP_PATH = "/_agent-native/mcp";
+const DEVICE_START_PATH = `${MCP_PUBLIC_ROUTE_PREFIX}/connect/device/start`;
+const DEVICE_POLL_PATH = `${MCP_PUBLIC_ROUTE_PREFIX}/connect/device/poll`;
+const MCP_PATH = MCP_PUBLIC_ROUTE_PREFIX;
+const LEGACY_MCP_PATH = MCP_LEGACY_ROUTE_PREFIX;
 const SERVER_NAME_PREFIX = "agent-native";
 const CONNECT_PREFERENCES_VERSION = 1;
 /**
@@ -48,13 +50,13 @@ const CONNECT_PREFERENCES_VERSION = 1;
  * cannot import from there — it imports connect.ts, which would be circular).
  */
 const CANONICAL_SERVER_NAME_BY_MCP_URL = {
-    "https://plan.agent-native.com/_agent-native/mcp": "plan",
-    "https://assets.agent-native.com/_agent-native/mcp": "agent-native-assets",
-    "https://design.agent-native.com/_agent-native/mcp": "agent-native-design",
-    "https://context-xray.agent-native.com/_agent-native/mcp": "agent-native-context-xray",
+    "https://plan.agent-native.com/mcp": "plan",
+    "https://assets.agent-native.com/mcp": "agent-native-assets",
+    "https://design.agent-native.com/mcp": "agent-native-design",
+    "https://context-xray.agent-native.com/mcp": "agent-native-context-xray",
 };
 const LEGACY_SERVER_NAMES_BY_MCP_URL = {
-    "https://plan.agent-native.com/_agent-native/mcp": [
+    "https://plan.agent-native.com/mcp": [
         "agent-native-plan",
         "agent-native-plans",
         "agent-native-visual-plans",
@@ -530,8 +532,9 @@ function responseMessage(json, fallback) {
 function stripMcpPath(baseUrl) {
     const parsed = new URL(baseUrl);
     const pathname = parsed.pathname.replace(/\/+$/, "");
-    if (pathname === MCP_PATH || pathname.endsWith(MCP_PATH)) {
-        parsed.pathname = pathname.slice(0, -MCP_PATH.length) || "/";
+    const suffix = mcpPathSuffix(pathname);
+    if (suffix) {
+        parsed.pathname = pathname.slice(0, -suffix.length) || "/";
         parsed.search = "";
         parsed.hash = "";
         return `${parsed.origin}${parsed.pathname}`.replace(/\/+$/, "");
@@ -541,8 +544,9 @@ function stripMcpPath(baseUrl) {
 function mcpUrlForBaseUrl(baseUrl) {
     const parsed = new URL(baseUrl);
     const pathname = parsed.pathname.replace(/\/+$/, "");
-    if (pathname === MCP_PATH || pathname.endsWith(MCP_PATH)) {
-        parsed.pathname = pathname;
+    const suffix = mcpPathSuffix(pathname);
+    if (suffix) {
+        parsed.pathname = `${pathname.slice(0, -suffix.length)}${MCP_PATH}`;
         parsed.search = "";
         parsed.hash = "";
         return `${parsed.origin}${parsed.pathname}`;
@@ -568,7 +572,8 @@ async function validateOAuthMcpServer(baseUrl, mcpUrl, deps) {
             }
             else {
                 const metadata = (await response.json().catch(() => null));
-                if (metadata?.resource !== mcpUrl) {
+                if (canonicalMcpUrl(String(metadata?.resource ?? "")) !==
+                    canonicalMcpUrl(mcpUrl)) {
                     logErr(`  ${metadataUrl} did not advertise the expected MCP resource ` +
                         `${mcpUrl}.`);
                     return false;
@@ -713,7 +718,7 @@ export async function runDeviceFlow(baseUrl, appSlug, clientArg, deps = {}, opti
             if (isTTY)
                 process.stdout.write("\r\x1b[K");
             const token = poll.token ?? "";
-            const mcpUrl = poll.mcpUrl ?? `${baseUrl}/_agent-native/mcp`;
+            const mcpUrl = mcpUrlForBaseUrl(poll.mcpUrl ?? baseUrl);
             const serverName = poll.serverName ?? `${SERVER_NAME_PREFIX}-${appSlug}`;
             const headers = poll.mcpServerEntry &&
                 typeof poll.mcpServerEntry === "object" &&
@@ -722,7 +727,12 @@ export async function runDeviceFlow(baseUrl, appSlug, clientArg, deps = {}, opti
                 ? poll.mcpServerEntry.headers
                 : undefined;
             logOut("  Approved.");
-            return { token: token || undefined, mcpUrl, serverName, headers };
+            return {
+                token: token || undefined,
+                mcpUrl,
+                serverName,
+                ...(headers ? { headers } : {}),
+            };
         }
         if (poll.status === "expired") {
             if (isTTY)
@@ -1006,12 +1016,25 @@ function canonicalMcpUrl(value) {
     try {
         const url = new URL(value);
         url.hash = "";
+        const pathname = url.pathname.replace(/\/+$/, "");
+        if (pathname === LEGACY_MCP_PATH || pathname.endsWith(LEGACY_MCP_PATH)) {
+            url.pathname = `${pathname.slice(0, -LEGACY_MCP_PATH.length)}${MCP_PATH}`;
+        }
         return url.toString().replace(/\/+$/, "");
     }
     catch {
         return undefined;
     }
 }
+function mcpPathSuffix(pathname) {
+    const normalized = pathname.replace(/\/+$/, "");
+    if (normalized === LEGACY_MCP_PATH || normalized.endsWith(LEGACY_MCP_PATH)) {
+        return LEGACY_MCP_PATH;
+    }
+    if (normalized === MCP_PATH || normalized.endsWith(MCP_PATH))
+        return MCP_PATH;
+    return undefined;
+}
 function sameMcpUrl(a, b) {
     const left = canonicalMcpUrl(a);
     const right = canonicalMcpUrl(b);
@@ -1237,7 +1260,7 @@ async function gatewayAppUrls(gatewayUrl, deps) {
 }
 function devMcpUrl(app, gatewayUrl, gatewayUrls) {
     const base = gatewayUrls.get(app.name) ?? `${gatewayUrl}/${app.name}`;
-    return `${base.replace(/\/+$/, "")}/_agent-native/mcp`;
+    return `${base.replace(/\/+$/, "")}${MCP_PATH}`;
 }
 function serverNameForApp(app) {
     return `${SERVER_NAME_PREFIX}-${app.name}`;
@@ -1366,15 +1389,14 @@ function preferredReconnectEntry(url, entries) {
 }
 /**
  * Return true when `url` is an agent-native MCP endpoint.
- * Matches any URL whose path ends with `/_agent-native/mcp` (after stripping
- * trailing slashes), regardless of the MCP server's name in the config.
+ * Matches either the public `/mcp` path or the legacy `/_agent-native/mcp`
+ * path, regardless of the MCP server's name in the config.
  */
 function isAgentNativeMcpUrl(url) {
     if (!url)
         return false;
     try {
-        const pathname = new URL(url).pathname.replace(/\/+$/, "");
-        return pathname === MCP_PATH || pathname.endsWith(MCP_PATH);
+        return Boolean(mcpPathSuffix(new URL(url).pathname));
     }
     catch {
         return false;
@@ -1506,7 +1528,7 @@ async function resolveReconnectTarget(parsed, clients, deps) {
     logErr("  Re-run with a URL or --name <serverName>. For example:");
     for (const u of urlList) {
         // Strip the MCP path suffix for a cleaner reconnect URL suggestion.
-        const baseUrl = u.replace(/\/_agent-native\/mcp$/, "");
+        const baseUrl = stripMcpPath(u);
         logErr(`    npx -y @agent-native/core@latest reconnect ${baseUrl}`);
     }
     return null;