@agent-native/dispatch 0.40.41-same-host-mcp-20261027-20261027081850 → 0.40.41

package/src/server/lib/mcp-gateway.spec.ts

@@ -132,7 +132,9 @@ import { runWithRequestContext } from "@agent-native/core/server";
 
 import {
   createGrantedDispatchMcpEmbedSession,
+  createGrantedDispatchMcpEmbedSessionForWorkspaceAppChat,
   createWorkspaceSsoEmbedSession,
+  createWorkspaceSsoEmbedSessionForWorkspaceAppChat,
   askGrantedDispatchMcpApp,
   getGrantedDispatchMcpAppTask,
   listGrantedDispatchMcpApps,
@@ -208,6 +210,7 @@ beforeEach(() => {
   mocks.getOrgA2ASecret.mockResolvedValue(null);
   mocks.getOrgDomain.mockResolvedValue(null);
   vi.stubEnv("A2A_SECRET", "");
+  vi.stubEnv("APP_URL", "http://localhost:8092");
   mocks.isFeatureFlagEnabled.mockResolvedValue(true);
 });
 
@@ -1465,6 +1468,58 @@ describe("createGrantedDispatchMcpEmbedSession", () => {
     });
   });
 
+  it("pins Dispatch self embeds to configured hosts instead of request context", async () => {
+    vi.stubEnv("WORKSPACE_GATEWAY_URL", "");
+    vi.stubEnv("APP_URL", "https://dispatch.agent-native.test");
+    vi.stubEnv("APP_BASE_PATH", "");
+    vi.stubEnv("VITE_APP_BASE_PATH", "");
+
+    const result = await runWithRequestContext(
+      {
+        userEmail: "owner@example.test",
+        requestOrigin: "https://attacker.example",
+      },
+      () =>
+        createGrantedDispatchMcpEmbedSession({
+          app: "dispatch",
+          path: "/extensions/ext-1/github-stars-over-time",
+          chrome: "minimal",
+        }),
+    );
+
+    expect(result.startUrl).toBe(
+      "https://dispatch.agent-native.test/_agent-native/embed/start?ticket=ticket-123",
+    );
+  });
+
+  it("logs an invalid production origin while accepting a trusted runtime origin", async () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => undefined);
+    vi.stubEnv("APP_URL", "not-a-url");
+    vi.stubEnv("WORKSPACE_GATEWAY_URL", "https://runtime.example/dispatch");
+    vi.stubEnv("APP_BASE_PATH", "");
+
+    const result = await runWithRequestContext(
+      {
+        userEmail: "owner@example.test",
+        requestOrigin: "https://runtime.example",
+      },
+      () =>
+        createGrantedDispatchMcpEmbedSession({
+          app: "dispatch",
+          path: "/extensions/ext-1/github-stars-over-time",
+          chrome: "minimal",
+        }),
+    );
+
+    expect(result.startUrl).toBe(
+      "https://runtime.example/_agent-native/embed/start?ticket=ticket-123",
+    );
+    expect(warn).toHaveBeenCalledWith(
+      "[dispatch] invalid configured request origin",
+      { source: "production" },
+    );
+  });
+
   it("keeps workspace sign-in behind the rollout flag", async () => {
     mocks.isFeatureFlagEnabled.mockResolvedValue(false);
 
@@ -1627,7 +1682,7 @@ describe("createGrantedDispatchMcpEmbedSession", () => {
         },
       ]);
       mocks.getUserSetting.mockResolvedValue({ mode: "all-apps" });
-      mocks.managerCallTool.mockResolvedValueOnce({
+      mocks.managerCallTool.mockResolvedValue({
         structuredContent: {
           startUrl:
             "https://beta.agent-workspace.builder.io/customer-ticket-triage/_agent-native/embed/start?ticket=remote",
@@ -1681,6 +1736,22 @@ describe("createGrantedDispatchMcpEmbedSession", () => {
       expect(result.startUrl).toBe(
         "https://beta.agent-workspace.builder.io/customer-ticket-triage/_agent-native/embed/start?ticket=remote",
       );
+
+      const chatSession = await runWithRequestContext(
+        {
+          userEmail: "owner@example.test",
+          requestOrigin: "https://beta.agent-workspace.builder.io",
+        },
+        () =>
+          route === "workspace-sso"
+            ? createWorkspaceSsoEmbedSessionForWorkspaceAppChat(workspaceApp.id)
+            : createGrantedDispatchMcpEmbedSessionForWorkspaceAppChat(
+                workspaceApp.id,
+              ),
+      );
+      expect(chatSession.appBaseUrl).toBe(
+        "https://beta.agent-workspace.builder.io/customer-ticket-triage",
+      );
     },
   );
 
@@ -1831,6 +1902,69 @@ describe("createGrantedDispatchMcpEmbedSession", () => {
     },
   );
 
+  it.each(["workspace-sso", "dispatch-grant"] as const)(
+    "retains the Workspace gateway path for discovered-only app chats through %s",
+    async (route) => {
+      vi.stubEnv("A2A_SECRET", "test-a2a-secret");
+      vi.stubEnv("APP_URL", "https://beta.agent-workspace.builder.io");
+      vi.stubEnv(
+        "WORKSPACE_GATEWAY_URL",
+        "https://beta.agent-workspace.builder.io/dispatch",
+      );
+      vi.stubEnv("APP_BASE_PATH", "");
+      vi.stubEnv("VITE_APP_BASE_PATH", "");
+      vi.stubEnv(
+        "IDENTITY_SSO_APP_REGISTRY_JSON",
+        JSON.stringify([
+          {
+            appId: "customer-ticket-triage",
+            clientId: "workspace-client",
+            origin: "https://beta.agent-workspace.builder.io",
+            callbackPath: "/_agent-native/identity/callback",
+            capabilities: ["identity-sso"],
+          },
+        ]),
+      );
+      mocks.listWorkspaceApps.mockResolvedValue([]);
+      mocks.discoverAgents.mockResolvedValue([
+        {
+          id: "customer-ticket-triage",
+          name: "Customer Ticket Triage",
+          description: "Triage customer tickets",
+          url: "https://beta.agent-workspace.builder.io",
+          color: "#14B8A6",
+        },
+      ]);
+      mocks.managerCallTool.mockResolvedValue({
+        structuredContent: {
+          startUrl:
+            "https://beta.agent-workspace.builder.io/dispatch/_agent-native/embed/start?ticket=remote",
+        },
+      });
+
+      const result = await runWithRequestContext(
+        {
+          userEmail: "owner@example.test",
+          requestOrigin: "https://beta.dispatch.agent-native.com",
+        },
+        () =>
+          route === "workspace-sso"
+            ? createWorkspaceSsoEmbedSessionForWorkspaceAppChat(
+                "customer-ticket-triage",
+              )
+            : createGrantedDispatchMcpEmbedSessionForWorkspaceAppChat(
+                "customer-ticket-triage",
+              ),
+      );
+
+      expect(result).toEqual({
+        startUrl:
+          "https://beta.agent-workspace.builder.io/dispatch/_agent-native/embed/start?ticket=remote",
+        appBaseUrl: "https://beta.agent-workspace.builder.io/dispatch",
+      });
+    },
+  );
+
   it("does not fall back when the configured Workspace gateway URL is invalid", async () => {
     vi.stubEnv("WORKSPACE_GATEWAY_URL", "not-a-url");
     mocks.listWorkspaceApps.mockResolvedValue([

package/src/server/lib/mcp-gateway.ts

@@ -21,10 +21,12 @@ import {
   buildDeepLink,
   buildEmbedStartPath,
   createEmbedSessionTicket,
+  getAppProductionUrl,
   getConfiguredAppBasePath,
   getRequestContext,
   getRequestOrgId,
   getRequestUserEmail,
+  resolveAppRuntimeUrl,
 } from "@agent-native/core/server";
 import {
   discoverAgents,
@@ -484,7 +486,9 @@ function withConfiguredBasePath(baseUrl: string): string {
 
 function dispatchSelfBaseUrl(): string {
   const requestOrigin = normalizeBaseUrl(getRequestContext()?.requestOrigin);
-  if (requestOrigin) return withConfiguredBasePath(requestOrigin);
+  if (requestOrigin && isTrustedRequestOrigin(requestOrigin)) {
+    return withConfiguredBasePath(requestOrigin);
+  }
 
   const configured =
     normalizeBaseUrl(process.env.WORKSPACE_GATEWAY_URL) ??
@@ -499,6 +503,24 @@ function dispatchSelfBaseUrl(): string {
     : "http://localhost:8092";
 }
 
+function isTrustedRequestOrigin(value: string): boolean {
+  // An embed ticket is fetched from this origin and becomes a bearer token.
+  const origin = new URL(value).origin;
+  const candidates = [
+    { source: "production", value: getAppProductionUrl() },
+    { source: "runtime", value: resolveAppRuntimeUrl() },
+  ];
+  return candidates.some(({ source, value }) => {
+    if (!value) return false;
+    const url = normalizeBaseUrl(value);
+    if (!url) {
+      console.warn("[dispatch] invalid configured request origin", { source });
+      return false;
+    }
+    return new URL(url).origin === origin;
+  });
+}
+
 function dispatchSelfApp(
   settings: DispatchMcpAppAccessSettings,
 ): DispatchMcpAccessibleApp {
@@ -647,6 +669,14 @@ function appMcpBaseUrl(app: DispatchMcpAccessibleApp): string {
   return url.toString().replace(/\/$/, "");
 }
 
+function appChatBaseUrl(app: DispatchMcpAccessibleApp): string {
+  const homeUrl = new URL(appHomeBaseUrl(app));
+  if (homeUrl.pathname !== "/") {
+    return homeUrl.toString().replace(/\/+$/, "");
+  }
+  return appMcpBaseUrl(app);
+}
+
 function resolveGrantedAppEmbedStartUrl(
   app: DispatchMcpAccessibleApp,
   startUrl: string,
@@ -1469,17 +1499,34 @@ async function createDispatchSelfEmbedSession(input: {
   };
 }
 
-export async function createGrantedDispatchMcpEmbedSession(input: {
-  app?: string;
-  url?: string;
-  path?: string;
-  chrome?: "full" | "minimal";
-}): Promise<{
+type InternalEmbedSession = {
   startUrl: string;
   targetPath?: string;
   expiresAt?: number;
   app: string;
-}> {
+  appBaseUrl: string;
+};
+
+function publicEmbedSession({
+  startUrl,
+  targetPath,
+  expiresAt,
+  app,
+}: InternalEmbedSession) {
+  return {
+    startUrl,
+    ...(targetPath ? { targetPath } : {}),
+    ...(typeof expiresAt === "number" ? { expiresAt } : {}),
+    app,
+  };
+}
+
+async function createGrantedDispatchMcpEmbedSessionResult(input: {
+  app?: string;
+  url?: string;
+  path?: string;
+  chrome?: "full" | "minimal";
+}): Promise<InternalEmbedSession> {
   const userEmail = getRequestUserEmail();
   if (!userEmail) throw new Error("no authenticated user");
   const target = await resolveDispatchEmbedTarget(input);
@@ -1492,6 +1539,33 @@ export async function createGrantedDispatchMcpEmbedSession(input: {
   });
 }
 
+export async function createGrantedDispatchMcpEmbedSession(input: {
+  app?: string;
+  url?: string;
+  path?: string;
+  chrome?: "full" | "minimal";
+}): Promise<{
+  startUrl: string;
+  targetPath?: string;
+  expiresAt?: number;
+  app: string;
+}> {
+  return publicEmbedSession(
+    await createGrantedDispatchMcpEmbedSessionResult(input),
+  );
+}
+
+export async function createGrantedDispatchMcpEmbedSessionForWorkspaceAppChat(
+  appId: string,
+): Promise<{ startUrl: string; appBaseUrl: string }> {
+  const session = await createGrantedDispatchMcpEmbedSessionResult({
+    app: appId,
+    path: "/",
+    chrome: "minimal",
+  });
+  return { startUrl: session.startUrl, appBaseUrl: session.appBaseUrl };
+}
+
 async function createEmbedSessionForResolvedApp(input: {
   ownerEmail: string;
   orgId?: string;
@@ -1502,17 +1576,21 @@ async function createEmbedSessionForResolvedApp(input: {
   targetPath?: string;
   expiresAt?: number;
   app: string;
+  appBaseUrl: string;
 }> {
   const { ownerEmail, orgId, target, chrome } = input;
 
   if (target.app.id === DISPATCH_APP_ID) {
-    return createDispatchSelfEmbedSession({
-      ownerEmail,
-      orgId,
-      path: target.path,
-      baseUrl: appBaseUrl(target.app),
-      chrome,
-    });
+    return {
+      ...(await createDispatchSelfEmbedSession({
+        ownerEmail,
+        ...(orgId !== undefined ? { orgId } : {}),
+        path: target.path,
+        baseUrl: appBaseUrl(target.app),
+        ...(chrome !== undefined ? { chrome } : {}),
+      })),
+      appBaseUrl: appBaseUrl(target.app),
+    };
   }
 
   const targetMcpUrl = appMcpUrl(target.app);
@@ -1600,26 +1678,23 @@ async function createEmbedSessionForResolvedApp(input: {
     targetPath?: string;
     expiresAt?: number;
     app: string;
+    appBaseUrl: string;
   } = {
     startUrl,
     app: target.app.id,
+    appBaseUrl: appChatBaseUrl(target.app),
   };
   if (parsed.targetPath) output.targetPath = parsed.targetPath;
   if (typeof parsed.expiresAt === "number") output.expiresAt = parsed.expiresAt;
   return output;
 }
 
-export async function createWorkspaceSsoEmbedSession(input: {
+async function createWorkspaceSsoEmbedSessionResult(input: {
   app?: string;
   url?: string;
   path?: string;
   chrome?: "full" | "minimal";
-}): Promise<{
-  startUrl: string;
-  targetPath?: string;
-  expiresAt?: number;
-  app: string;
-}> {
+}): Promise<InternalEmbedSession> {
   const ownerEmail = getRequestUserEmail();
   if (!ownerEmail) {
     console.warn("[dispatch] workspace embed mint rejected", {
@@ -1660,3 +1735,28 @@ export async function createWorkspaceSsoEmbedSession(input: {
     chrome: input.chrome,
   });
 }
+
+export async function createWorkspaceSsoEmbedSession(input: {
+  app?: string;
+  url?: string;
+  path?: string;
+  chrome?: "full" | "minimal";
+}): Promise<{
+  startUrl: string;
+  targetPath?: string;
+  expiresAt?: number;
+  app: string;
+}> {
+  return publicEmbedSession(await createWorkspaceSsoEmbedSessionResult(input));
+}
+
+export async function createWorkspaceSsoEmbedSessionForWorkspaceAppChat(
+  appId: string,
+): Promise<{ startUrl: string; appBaseUrl: string }> {
+  const session = await createWorkspaceSsoEmbedSessionResult({
+    app: appId,
+    path: "/",
+    chrome: "minimal",
+  });
+  return { startUrl: session.startUrl, appBaseUrl: session.appBaseUrl };
+}