@agent-native/dispatch 0.29.2 → 0.29.4

package/src/actions/list-workspace-apps.ts

@@ -20,6 +20,9 @@ export default defineAction({
       .describe(
         "Fetch each ready app's /.well-known/agent-card.json with a short non-throwing timeout and include agentCardUrl, agentCardReachable, a2aEndpointUrl, agentName, and agentSkillsCount. Defaults to true for agent calls; UI polling should pass false. Pending Builder apps are not probed.",
       ),
+    includeArchived: httpBoolean
+      .default(false)
+      .describe("Include archived workspace apps in the result."),
     audience: z
       .enum(["all", "internal", "public"])
       .default("all")

package/src/components/layout/Layout.tsx

@@ -106,9 +106,13 @@ import { toast } from "sonner";
 import { cn } from "../../lib/utils";
 import {
   isDispatchWorkspaceAppId,
+  isPathMountedWorkspaceApp,
   isWorkspaceAppVisibleInDefaultLaunchers,
+  isWorkspaceSsoApp,
   mergeChatFirstWorkspaceApps,
+  navigateToWorkspaceApp,
   workspaceAppIdFromRoute,
+  workspaceAppDirectHref,
   workspaceAppRoute,
   type WorkspaceAppSummary,
 } from "../../lib/workspace-apps";
@@ -1403,7 +1407,7 @@ export function Layout({
   const chatFirstAppLayoutHydratedRef = useRef(false);
   const chatFirstAppsQuery = useActionQuery<WorkspaceAppSummary[]>(
     "list-workspace-apps",
-    { includeAgentCards: false },
+    { includeAgentCards: false, includeArchived: true },
     { enabled: chatFirstMode },
   );
   const chatFirstGrantedAppsQuery = useActionQuery<ChatFirstGrantedAppsResult>(
@@ -1450,6 +1454,26 @@ export function Layout({
         })),
     [chatFirstAppRegistrations],
   );
+  const openChatFirstApp = useCallback(
+    (app: ChatFirstAppItem) => {
+      if (isDispatchWorkspaceAppId(app.id)) return;
+      const registration = chatFirstAppRegistrations.find(
+        (candidate) => candidate.id.toLowerCase() === app.id.toLowerCase(),
+      );
+      const directHref =
+        registration &&
+        !isWorkspaceSsoApp(registration) &&
+        isPathMountedWorkspaceApp(registration)
+          ? workspaceAppDirectHref(registration, "/")
+          : null;
+      if (directHref) {
+        navigateToWorkspaceApp(directHref);
+        return;
+      }
+      navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)));
+    },
+    [chatFirstAppRegistrations, navigate],
+  );
   const chatFirstCopy = useMemo(() => createDispatchChatFirstCopy(t), [t]);
   const [chatFirstPane, setChatFirstPane] =
     useState<DispatchChatFirstPane | null>(null);
@@ -2448,7 +2472,7 @@ export function Layout({
               onChatFirstAppOpen={(app) => {
                 if (isDispatchWorkspaceAppId(app.id)) return;
                 setSidebarCollapsed(true);
-                navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)));
+                openChatFirstApp(app);
               }}
               onChatFirstAppsRetry={() => void chatFirstAppsQuery.refetch()}
               collapsible
@@ -2489,9 +2513,7 @@ export function Layout({
                     chatFirstSurfaceTabsStore.closeAll();
                     setChatFirstSurfacePanelOpen(false);
                   }}
-                  onChatFirstAppOpen={(app) =>
-                    navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)))
-                  }
+                  onChatFirstAppOpen={openChatFirstApp}
                   onChatFirstAppsRetry={() => void chatFirstAppsQuery.refetch()}
                   onNavigate={() => setMobileOpen(false)}
                 />

package/src/components/workspace-app-card.spec.tsx

@@ -53,6 +53,7 @@ describe("WorkspaceAppCard", () => {
                 id: "analytics",
                 name: "Analytics",
                 path: "/analytics",
+                url: "https://analytics.agent-native.com",
                 description: "Explore product and growth performance.",
                 status: "ready",
               }}
@@ -116,6 +117,65 @@ describe("WorkspaceAppCard", () => {
     ).toBeNull();
   });
 
+  it("opens mounted workspace apps at their published URL", async () => {
+    const originalParent = window.parent;
+    const originalTop = window.top;
+    const topWindow = { location: { href: "" } } as unknown as Window;
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: {},
+    });
+    Object.defineProperty(window, "top", {
+      configurable: true,
+      value: topWindow,
+    });
+
+    try {
+      await act(async () => {
+        root.render(
+          <MemoryRouter>
+            <TooltipProvider>
+              <WorkspaceAppCard
+                app={{
+                  id: "feedback-leaderboard",
+                  name: "Feedback leaderboard",
+                  path: "/feedback-leaderboard",
+                  url: "https://agent-workspace.builder.io/feedback-leaderboard/leaderboard",
+                  status: "ready",
+                }}
+              />
+            </TooltipProvider>
+          </MemoryRouter>,
+        );
+      });
+
+      const openButton = container.querySelector<HTMLButtonElement>(
+        ".app-open-actions__primary",
+      );
+      expect(openButton).not.toBeNull();
+      expect(openButton?.textContent).toContain("Open app");
+      expect(
+        container.querySelector(
+          'a[href="https://agent-workspace.builder.io/feedback-leaderboard/leaderboard"]',
+        ),
+      ).toBeNull();
+
+      await act(async () => openButton?.click());
+      expect(topWindow.location.href).toBe(
+        "https://agent-workspace.builder.io/feedback-leaderboard/leaderboard",
+      );
+    } finally {
+      Object.defineProperty(window, "parent", {
+        configurable: true,
+        value: originalParent,
+      });
+      Object.defineProperty(window, "top", {
+        configurable: true,
+        value: originalTop,
+      });
+    }
+  });
+
   it("keeps pinning in the app open menu", async () => {
     const onTogglePinned = vi.fn();
     await act(async () => {

package/src/components/workspace-app-card.tsx

@@ -26,6 +26,10 @@ import { toast } from "sonner";
 
 import { cn } from "../lib/utils";
 import {
+  isPathMountedWorkspaceApp,
+  isWorkspaceSsoApp,
+  navigateToWorkspaceApp,
+  workspaceAppDirectHref,
   workspaceAppHref,
   workspaceAppRoute,
   type WorkspaceAppSummary,
@@ -75,6 +79,12 @@ export function WorkspaceAppCard({
 }) {
   const t = useT();
   const href = workspaceAppHref(app);
+  const directHref =
+    app.status !== "pending" &&
+    !isWorkspaceSsoApp(app) &&
+    isPathMountedWorkspaceApp(app)
+      ? workspaceAppDirectHref(app, "/")
+      : null;
   const isPending = app.status === "pending";
   const pendingLabel = app.statusLabel || "Builder branch";
   const pendingOpenLabel = t("dispatch.pages.openBuilderBranch", {
@@ -193,7 +203,8 @@ export function WorkspaceAppCard({
         <div className="flex shrink-0 items-center gap-2">
           <WorkspaceAppOpenActions
             app={app}
-            href={href}
+            href={directHref ?? href}
+            openDirectly={Boolean(directHref)}
             isPinned={isPinned}
             pinLabel={pinLabel}
             pendingOpenLabel={pendingOpenLabel}
@@ -285,6 +296,7 @@ export function WorkspaceAppCard({
 function WorkspaceAppOpenActions({
   app,
   href,
+  openDirectly,
   isPinned,
   pinLabel,
   pendingOpenLabel,
@@ -292,6 +304,7 @@ function WorkspaceAppOpenActions({
 }: {
   app: WorkspaceAppSummary;
   href: string | null;
+  openDirectly: boolean;
   isPinned: boolean;
   pinLabel: string;
   pendingOpenLabel: string;
@@ -328,9 +341,9 @@ function WorkspaceAppOpenActions({
       name={app.name}
       href={href}
       showNewTabOption
-      onOpen={() => {
-        navigate(appRoute);
-      }}
+      onOpen={() =>
+        openDirectly ? navigateToWorkspaceApp(href) : navigate(appRoute)
+      }
       menuItems={
         onTogglePinned
           ? [

package/src/components/workspace-app-host.spec.tsx

@@ -2,6 +2,7 @@
 
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
+import { MemoryRouter } from "react-router";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const clientState = vi.hoisted(() => {
@@ -13,8 +14,19 @@ const clientState = vi.hoisted(() => {
   }));
   const legacyErrorMutateAsync = vi.fn();
   const actionNames: string[] = [];
+  const actionQueryParams: Array<{
+    name: string;
+    params?: unknown;
+  }> = [];
+  const actionQueryOptions: Array<{
+    name: string;
+    options?: Record<string, unknown>;
+  }> = [];
   return {
     actionNames,
+    actionQueryParams,
+    actionQueryOptions,
+    workspaceApps: null as Array<Record<string, unknown>> | null,
     grantedApps: [
       {
         id: "analytics.agent-native.com",
@@ -98,44 +110,54 @@ vi.mock("@agent-native/core/client/hooks", () => ({
             : clientState.legacyMutateAsync,
     };
   },
-  useActionQuery: (name: string) => ({
-    data:
-      name === "list_apps"
-        ? { apps: clientState.grantedApps }
-        : [
-            {
-              id: "mail",
-              name: "Mail",
-              path: "/mail",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "calendar",
-              name: "Calendar",
-              path: "/calendar",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "documents",
-              name: "Documents",
-              path: "/documents",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "settings",
-              name: "Settings",
-              path: "/settings",
-              url: null,
-              status: "ready",
-            },
-          ],
-    isError: false,
-    isLoading: false,
-    refetch: vi.fn(),
-  }),
+  useActionQuery: (name: string, params?: unknown, options?: unknown) => {
+    clientState.actionQueryParams.push({ name, params });
+    clientState.actionQueryOptions.push({
+      name,
+      options:
+        options && typeof options === "object"
+          ? (options as Record<string, unknown>)
+          : undefined,
+    });
+    return {
+      data:
+        name === "list_apps"
+          ? { apps: clientState.grantedApps }
+          : (clientState.workspaceApps ?? [
+              {
+                id: "mail",
+                name: "Mail",
+                path: "/mail",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "calendar",
+                name: "Calendar",
+                path: "/calendar",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "documents",
+                name: "Documents",
+                path: "/documents",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "settings",
+                name: "Settings",
+                path: "/settings",
+                url: null,
+                status: "ready",
+              },
+            ]),
+      isError: false,
+      isLoading: false,
+      refetch: vi.fn(),
+    };
+  },
 }));
 
 vi.mock("@agent-native/core/client/i18n", () => ({
@@ -158,6 +180,9 @@ describe("WorkspaceAppKeepAlive", () => {
     document.body.appendChild(container);
     root = createRoot(container);
     clientState.actionNames.length = 0;
+    clientState.actionQueryParams.length = 0;
+    clientState.actionQueryOptions.length = 0;
+    clientState.workspaceApps = null;
     clientState.legacyMutateAsync.mockClear();
     clientState.legacyMutateError = null;
     clientState.legacyErrorMutateAsync.mockReset();
@@ -212,6 +237,15 @@ describe("WorkspaceAppKeepAlive", () => {
     expect(calendarEntry?.classList.contains("hidden")).toBe(false);
     expect(calendarEntry?.querySelector("iframe")).not.toBeNull();
     expect(container.querySelectorAll("iframe")).toHaveLength(2);
+    expect(
+      clientState.actionQueryParams.find(
+        (query) => query.name === "list-workspace-apps",
+      )?.params,
+    ).toEqual({ includeAgentCards: false, includeArchived: true });
+    expect(
+      clientState.actionQueryOptions.find((query) => query.name === "list_apps")
+        ?.options?.enabled,
+    ).toBe(false);
   });
 
   it("resolves a granted external app instead of showing app not found", async () => {
@@ -236,6 +270,38 @@ describe("WorkspaceAppKeepAlive", () => {
       url: "https://analytics.agent-native.com",
       chrome: "minimal",
     });
+    expect(
+      clientState.actionQueryOptions.find((query) => query.name === "list_apps")
+        ?.options?.enabled,
+    ).toBe(true);
+  });
+
+  it("does not resolve archived workspace apps from granted discovery", async () => {
+    clientState.workspaceApps = [
+      {
+        id: "analytics.agent-native.com",
+        name: "Hidden app",
+        path: "/hidden-app",
+        url: null,
+        status: "ready",
+        archived: true,
+      },
+    ];
+
+    await act(async () => {
+      root.render(
+        <MemoryRouter>
+          <WorkspaceAppKeepAlive activeAppId="analytics.agent-native.com" />
+        </MemoryRouter>,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(
+      container.querySelector('[data-chat-first-app-status="ready"]'),
+    ).toBeNull();
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
   });
 
   it("uses the app-scoped workspace session action when the rollout is enabled", async () => {
@@ -243,7 +309,14 @@ describe("WorkspaceAppKeepAlive", () => {
 
     await act(async () => {
       root.render(
-        <WorkspaceAppFrame app={{ id: "mail", name: "Mail", path: "/mail" }} />,
+        <WorkspaceAppFrame
+          app={{
+            id: "mail",
+            name: "Mail",
+            path: "/mail",
+            url: "https://mail.agent-native.com",
+          }}
+        />,
       );
       await Promise.resolve();
       await Promise.resolve();
@@ -251,12 +324,99 @@ describe("WorkspaceAppKeepAlive", () => {
 
     expect(clientState.workspaceSsoMutateAsync).toHaveBeenCalledWith({
       app: "mail",
-      path: "/mail",
+      url: "https://mail.agent-native.com",
       chrome: "minimal",
     });
     expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
   });
 
+  it("uses the granted-app session when a mounted app reuses a canonical id", async () => {
+    clientState.workspaceSsoEnabled = true;
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame
+          app={{
+            id: "mail",
+            name: "Internal Mail",
+            path: "/mail",
+            url: "https://agent-workspace.builder.io/mail",
+          }}
+        />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(clientState.legacyMutateAsync).toHaveBeenCalledWith({
+      app: "mail",
+      url: "https://agent-workspace.builder.io/mail",
+      chrome: "minimal",
+    });
+    expect(clientState.workspaceSsoMutateAsync).not.toHaveBeenCalled();
+  });
+
+  it("uses the granted-app session action for mounted apps outside the SSO registry", async () => {
+    clientState.workspaceSsoEnabled = true;
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame
+          app={{
+            id: "feedback-leaderboard",
+            name: "Feedback leaderboard",
+            path: "/feedback-leaderboard",
+            url: "https://agent-workspace.builder.io/feedback-leaderboard/leaderboard",
+          }}
+        />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(clientState.legacyMutateAsync).toHaveBeenCalledWith({
+      app: "feedback-leaderboard",
+      url: "https://agent-workspace.builder.io/feedback-leaderboard/leaderboard",
+      chrome: "minimal",
+    });
+    expect(clientState.workspaceSsoMutateAsync).not.toHaveBeenCalled();
+  });
+
+  it("mints custom SSO before navigating an embedded Dispatch surface", async () => {
+    clientState.workspaceSsoEnabled = true;
+    const navigateToTopWindow = vi.fn(() => true);
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: {},
+    });
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame
+          app={{
+            id: "custom-sso",
+            name: "Custom SSO",
+            path: "/custom-sso",
+            url: "https://custom.example/custom-sso",
+            workspaceSso: true,
+          }}
+          navigateToTopWindow={navigateToTopWindow}
+        />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(clientState.workspaceSsoMutateAsync).toHaveBeenCalledWith({
+      app: "custom-sso",
+      url: "https://custom.example/custom-sso",
+      chrome: "minimal",
+    });
+    expect(navigateToTopWindow).toHaveBeenCalledWith("about:blank");
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
+    expect(container.querySelector("iframe")).toBeNull();
+  });
+
   it("sends the parent theme on iframe load and when the parent changes", async () => {
     await act(async () => {
       root.render(
@@ -354,7 +514,14 @@ describe("WorkspaceAppKeepAlive", () => {
 
     await act(async () => {
       root.render(
-        <WorkspaceAppFrame app={{ id: "mail", name: "Mail", path: "/mail" }} />,
+        <WorkspaceAppFrame
+          app={{
+            id: "mail",
+            name: "Mail",
+            path: "/mail",
+            url: "https://mail.agent-native.com",
+          }}
+        />,
       );
       await Promise.resolve();
       await Promise.resolve();