@agent-native/dispatch 0.27.0 → 0.27.2

package/src/components/create-app-popover.spec.tsx

@@ -216,6 +216,26 @@ describe("CreateAppFlow", () => {
     ).toBe(false);
   });
 
+  it("reuses an empty local chat for direct dev-mode app creation", async () => {
+    devState.isDevMode = true;
+
+    await renderAndSubmit("Build a quality dashboard");
+
+    expect(sendToAgentChatMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        submit: true,
+        type: "code",
+        newTab: true,
+        reuseEmptyTab: true,
+      }),
+    );
+    expect(
+      fetchSpy.mock.calls.some(([input]) =>
+        String(input).includes("start-workspace-app-creation"),
+      ),
+    ).toBe(false);
+  });
+
   it("opens a fresh local chat when the server hands off app creation", async () => {
     startWorkspaceAppCreationResponse.result = {
       mode: "local-agent",

package/src/components/create-app-popover.tsx

@@ -253,7 +253,13 @@ export function CreateAppFlow({
         setStatusMessage("Sent to Builder chat.");
         onClose?.();
       } else if (isDevMode) {
-        sendToAgentChat({ message, submit: true, type: "code", newTab: true });
+        sendToAgentChat({
+          message,
+          submit: true,
+          type: "code",
+          newTab: true,
+          reuseEmptyTab: true,
+        });
         setStatusMessage("Sent to the local agent.");
         onClose?.();
       } else {

package/src/components/layout/Layout.spec.tsx

@@ -220,6 +220,33 @@ describe("Dispatch NavContent", () => {
     expect(lists[0].querySelector("a")?.className).toContain("size-9");
   });
 
+  it("keeps chat-first primary actions in the collapsed sidebar", async () => {
+    await act(async () => {
+      root.render(
+        <MemoryRouter initialEntries={["/chat"]}>
+          <TooltipProvider>
+            <NavContent
+              chatFirstMode
+              collapsed
+              chatFirstApps={[{ id: "mail", name: "Mail" }]}
+            />
+          </TooltipProvider>
+        </MemoryRouter>,
+      );
+    });
+
+    for (const label of ["New chat", "Integrations", "Search"]) {
+      expect(
+        [...container.querySelectorAll("button")].find(
+          (button) => button.textContent?.trim() === label,
+        ),
+      ).toBeDefined();
+    }
+    expect(
+      container.querySelector("[data-chat-first-apps-rail]"),
+    ).not.toBeNull();
+  });
+
   it("keeps management routes out of the primary navigation", async () => {
     await act(async () => {
       root.render(

package/src/components/layout/Layout.tsx

@@ -569,6 +569,7 @@ function DispatchChatsSection({
   prelude,
   chatFirstMode = false,
   chatFirstEmbedded = false,
+  collapsed = false,
   chatFirstNavigation,
 }: {
   onNavigate?: () => void;
@@ -576,6 +577,7 @@ function DispatchChatsSection({
   prelude?: ReactNode;
   chatFirstMode?: boolean;
   chatFirstEmbedded?: boolean;
+  collapsed?: boolean;
   chatFirstNavigation?: {
     activeTab?: ChatFirstPrimaryTab;
     onNewChat?: () => void;
@@ -722,6 +724,8 @@ function DispatchChatsSection({
     if (threadId) openThread(threadId, { isNew: true });
   }
 
+  const collapsedChatFirst = collapsed && chatFirstMode;
+
   return (
     <div
       className={cn(
@@ -730,7 +734,7 @@ function DispatchChatsSection({
       )}
     >
       {showNewChat && chatFirstNavigation ? (
-        <nav className="space-y-0.5 px-2 py-2">
+        <nav className={cn("space-y-0.5 py-2", collapsed ? "px-1.5" : "px-2")}>
           <ChatFirstPrimaryNavigation
             copy={chatFirstCopy}
             onNewChat={() => {
@@ -741,11 +745,12 @@ function DispatchChatsSection({
             onOpenScheduled={chatFirstNavigation.onOpenScheduled}
             onSearch={openCommandMenu}
             activeTab={chatFirstNavigation.activeTab}
+            collapsed={collapsed}
           />
         </nav>
       ) : null}
       {prelude}
-      {!chatFirstMode ? (
+      {!collapsedChatFirst && !chatFirstMode ? (
         <div className="flex justify-end px-2 pt-0.5">
           <Tooltip>
             <TooltipTrigger asChild>
@@ -784,7 +789,8 @@ function DispatchChatsSection({
           </Tooltip>
         </div>
       ) : null}
-      {!chatFirstMode &&
+      {!collapsedChatFirst &&
+        !chatFirstMode &&
         chatsLoading &&
         visibleThreads.length === 0 &&
         Array.from({ length: 3 }).map((_, index) => (
@@ -796,7 +802,9 @@ function DispatchChatsSection({
             <Skeleton className="h-3 w-3/4 rounded" />
           </div>
         ))}
-      {chatFirstMode && (chatsLoading || visibleThreads.length > 0) ? (
+      {!collapsedChatFirst &&
+      chatFirstMode &&
+      (chatsLoading || visibleThreads.length > 0) ? (
         <ChatFirstChatHistory
           items={chatItems}
           activeId={displayedActiveThreadId}
@@ -870,7 +878,7 @@ function DispatchChatsSection({
           )}
           className="min-w-0 px-2"
         />
-      ) : (
+      ) : !collapsedChatFirst ? (
         <ChatHistoryRail
           items={chatItems}
           activeId={displayedActiveThreadId}
@@ -938,7 +946,7 @@ function DispatchChatsSection({
           )}
           className="min-w-0 px-2"
         />
-      )}
+      ) : null}
     </div>
   );
 }
@@ -1273,29 +1281,26 @@ export function NavContent({
 
       {chatFirstMode ? (
         <div className="flex min-h-0 flex-1 flex-col overflow-y-auto">
-          {!collapsed ? (
-            <DispatchChatsSection
-              onNavigate={onNavigate}
-              showNewChat
-              chatFirstMode
-              chatFirstEmbedded={chatFirstEmbedded}
-              chatFirstNavigation={{
-                activeTab: chatFirstActivePrimaryTab,
-                onNewChat: onChatFirstNewChat,
-                onOpenIntegrations: () => {
-                  navigate(dispatchNavLinkTarget("/admin/integrations"));
-                  onNavigate?.();
-                },
-                onOpenScheduled: () => {
-                  navigate(dispatchNavLinkTarget("/admin/automations"));
-                  onNavigate?.();
-                },
-              }}
-              prelude={chatFirstAppsRail}
-            />
-          ) : (
-            chatFirstAppsRail
-          )}
+          <DispatchChatsSection
+            onNavigate={onNavigate}
+            showNewChat
+            chatFirstMode
+            chatFirstEmbedded={chatFirstEmbedded}
+            collapsed={collapsed}
+            chatFirstNavigation={{
+              activeTab: chatFirstActivePrimaryTab,
+              onNewChat: onChatFirstNewChat,
+              onOpenIntegrations: () => {
+                navigate(dispatchNavLinkTarget("/admin/integrations"));
+                onNavigate?.();
+              },
+              onOpenScheduled: () => {
+                navigate(dispatchNavLinkTarget("/admin/automations"));
+                onNavigate?.();
+              },
+            }}
+            prelude={chatFirstAppsRail}
+          />
         </div>
       ) : null}
       <div
@@ -2374,7 +2379,7 @@ export function Layout({
   const content = isChatRoute ? (
     <div
       className={cn(
-        "agent-layout-main-surface flex min-w-0 flex-1 overflow-hidden",
+        "agent-layout-main-surface flex h-full min-w-0 flex-1 overflow-hidden",
         chatFirstMode && "dispatch-chat-first-surface",
       )}
     >

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

@@ -11,10 +11,22 @@ const clientState = vi.hoisted(() => {
   const workspaceSsoMutateAsync = vi.fn().mockImplementation(async () => ({
     startUrl: "about:blank",
   }));
+  const legacyErrorMutateAsync = vi.fn();
   const actionNames: string[] = [];
   return {
     actionNames,
+    grantedApps: [
+      {
+        id: "analytics.agent-native.com",
+        name: "Analytics",
+        url: "https://analytics.agent-native.com",
+      },
+    ],
     legacyMutateAsync,
+    legacyMutateError: null as Error | null,
+    legacyErrorMutateAsync,
+    frameLoadHandler: null as (() => void) | null,
+    suppressFrameLoad: false,
     theme: "dark" as "dark" | "light",
     workspaceSsoEnabled: false,
     workspaceSsoMutateAsync,
@@ -22,20 +34,43 @@ const clientState = vi.hoisted(() => {
 });
 
 vi.mock("@agent-native/core/client/chat-first", () => ({
+  CHAT_FIRST_DEFAULT_APP_IDS: [
+    "content",
+    "design",
+    "mail",
+    "calendar",
+    "clips",
+  ],
   ChatFirstAppPane: ({
     app,
     embedUrl,
+    errorMessage,
     renderEmbed,
     status,
   }: {
     app: { name: string } | null;
     embedUrl?: string | null;
+    errorMessage?: string;
     renderEmbed: (target: { url: string; title?: string }) => React.ReactNode;
     status: string;
   }) => (
-    <div data-chat-first-app-status={status}>
+    <div
+      data-chat-first-app-error={errorMessage ?? ""}
+      data-chat-first-app-status={status}
+    >
       {status === "ready" && embedUrl
-        ? renderEmbed({ url: embedUrl, title: app?.name })
+        ? (() => {
+            const frame = renderEmbed({ url: embedUrl, title: app?.name });
+            if (clientState.suppressFrameLoad && React.isValidElement(frame)) {
+              clientState.frameLoadHandler =
+                (frame.props as { onLoad?: () => void }).onLoad ?? null;
+              return React.cloneElement(frame, {
+                onLoad: undefined,
+                src: undefined,
+              });
+            }
+            return frame;
+          })()
         : null}
     </div>
   ),
@@ -53,34 +88,45 @@ vi.mock("@agent-native/core/client/hooks", () => ({
       mutateAsync:
         name === "create-workspace-app-embed-session"
           ? clientState.workspaceSsoMutateAsync
-          : clientState.legacyMutateAsync,
+          : clientState.legacyMutateError
+            ? clientState.legacyErrorMutateAsync
+            : clientState.legacyMutateAsync,
     };
   },
-  useActionQuery: () => ({
-    data: [
-      { 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",
-      },
-    ],
+  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(),
@@ -108,6 +154,10 @@ describe("WorkspaceAppKeepAlive", () => {
     root = createRoot(container);
     clientState.actionNames.length = 0;
     clientState.legacyMutateAsync.mockClear();
+    clientState.legacyMutateError = null;
+    clientState.legacyErrorMutateAsync.mockReset();
+    clientState.frameLoadHandler = null;
+    clientState.suppressFrameLoad = false;
     clientState.workspaceSsoMutateAsync.mockClear();
     clientState.theme = "dark";
     clientState.workspaceSsoEnabled = false;
@@ -150,6 +200,30 @@ describe("WorkspaceAppKeepAlive", () => {
     expect(container.querySelectorAll("iframe")).toHaveLength(2);
   });
 
+  it("resolves a granted external app instead of showing app not found", async () => {
+    await act(async () => {
+      root.render(
+        <WorkspaceAppKeepAlive activeAppId="analytics.agent-native.com" />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(
+      container.querySelector(
+        '[data-dispatch-workspace-app-cache-entry="analytics.agent-native.com"]',
+      ),
+    ).not.toBeNull();
+    expect(
+      container.querySelector('[data-chat-first-app-status="ready"]'),
+    ).not.toBeNull();
+    expect(clientState.legacyMutateAsync).toHaveBeenCalledWith({
+      app: "analytics.agent-native.com",
+      url: "https://analytics.agent-native.com",
+      chrome: "minimal",
+    });
+  });
+
   it("uses the app-scoped workspace session action when the rollout is enabled", async () => {
     clientState.workspaceSsoEnabled = true;
 
@@ -220,6 +294,44 @@ describe("WorkspaceAppKeepAlive", () => {
     );
   });
 
+  it("clears the embed error after a direct fallback iframe loads", async () => {
+    clientState.legacyMutateError = new Error("Restore request failed");
+    clientState.legacyErrorMutateAsync.mockRejectedValue(
+      clientState.legacyMutateError,
+    );
+    clientState.suppressFrameLoad = true;
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame app={{ id: "mail", name: "Mail", path: "/mail" }} />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const iframe = container.querySelector<HTMLIFrameElement>("iframe");
+    expect(iframe).not.toBeNull();
+    expect(
+      container
+        .querySelector("[data-chat-first-app-error]")
+        ?.getAttribute("data-chat-first-app-error"),
+    ).toBe("Restore request failed");
+
+    if (!iframe) throw new Error("Workspace app iframe was not rendered");
+    expect(clientState.frameLoadHandler).not.toBeNull();
+
+    await act(async () => {
+      clientState.frameLoadHandler?.();
+      await Promise.resolve();
+    });
+
+    expect(
+      container
+        .querySelector("[data-chat-first-app-error]")
+        ?.getAttribute("data-chat-first-app-error"),
+    ).toBe("");
+  });
+
   it("evicts the oldest inactive app after reaching the keep-alive limit", async () => {
     await act(async () => {
       root.render(<WorkspaceAppKeepAlive activeAppId="mail" />);

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

@@ -23,6 +23,7 @@ import { Link } from "react-router";
 
 import { isEmbedSessionExpiredMessage } from "../lib/embed-session-recovery";
 import {
+  mergeChatFirstWorkspaceApps,
   workspaceAppDirectHref,
   workspaceAppEmbedTarget,
   workspaceAppHref,
@@ -45,6 +46,16 @@ interface EmbedSessionInput {
   chrome: "minimal";
 }
 
+interface GrantedWorkspaceAppSummary {
+  id: string;
+  name: string;
+  url?: string | null;
+}
+
+interface GrantedWorkspaceAppsResult {
+  apps: GrantedWorkspaceAppSummary[];
+}
+
 type WorkspaceAppTheme = "light" | "dark";
 type WorkspaceAppAuthState = "unknown" | "authenticated" | "unauthenticated";
 
@@ -118,6 +129,7 @@ export function WorkspaceAppFrame({
         : "light";
   const [embedUrl, setEmbedUrl] = useState<string | null>(null);
   const [embedError, setEmbedError] = useState<Error | null>(null);
+  const [isDirectFallback, setIsDirectFallback] = useState(false);
   const [embedAttempt, setEmbedAttempt] = useState(0);
   const [authState, setAuthState] = useState<WorkspaceAppAuthState>("unknown");
   const embedFrameRef = useRef<HTMLIFrameElement>(null);
@@ -129,6 +141,7 @@ export function WorkspaceAppFrame({
   }, [theme]);
   const handleFrameLoad = useCallback(() => {
     postThemeToFrame();
+    if (isDirectFallback) setEmbedError(null);
     const frame = embedFrameRef.current;
     let frameUrl = embedUrl;
     try {
@@ -139,7 +152,7 @@ export function WorkspaceAppFrame({
     }
     const nextAuthState = resolveWorkspaceAppAuthState(frameUrl);
     if (nextAuthState !== "unknown") setAuthState(nextAuthState);
-  }, [embedUrl, postThemeToFrame]);
+  }, [embedUrl, isDirectFallback, postThemeToFrame]);
   const workspaceSsoEnabled = useFeatureFlag(DISPATCH_WORKSPACE_SSO_FLAG.key);
   const createEmbedSession = useActionMutation<
     EmbedSessionResult,
@@ -176,6 +189,7 @@ export function WorkspaceAppFrame({
     let cancelled = false;
     setEmbedUrl(null);
     setEmbedError(null);
+    setIsDirectFallback(false);
     setAuthState("unknown");
     const createSession = workspaceSsoEnabled
       ? createWorkspaceSsoEmbedSession
@@ -187,6 +201,7 @@ export function WorkspaceAppFrame({
       })
       .catch((cause: unknown) => {
         if (cancelled) return;
+        setIsDirectFallback(true);
         setEmbedUrl(
           workspaceAppDirectHref(
             { path: app.path ?? "", url: app.url },
@@ -326,23 +341,58 @@ export function WorkspaceAppFrame({
 
 export function WorkspaceAppHost({ appId }: { appId?: string }) {
   const t = useT();
-  const appsQuery = useActionQuery("list-workspace-apps", {
-    includeAgentCards: false,
-  });
-  const { data: apps = [], isLoading } = appsQuery;
+  const workspaceAppsQuery = useActionQuery<WorkspaceAppSummary[]>(
+    "list-workspace-apps",
+    { includeAgentCards: false },
+  );
+  const grantedAppsQuery = useActionQuery<GrantedWorkspaceAppsResult>(
+    "list_apps",
+    {},
+  );
+  const apps = useMemo(() => {
+    const merged = new Map<string, WorkspaceAppSummary>();
+
+    for (const app of mergeChatFirstWorkspaceApps(workspaceAppsQuery.data)) {
+      merged.set(app.id.trim().toLowerCase(), app);
+    }
+    for (const app of grantedAppsQuery.data?.apps ?? []) {
+      const id = app.id.trim();
+      if (!id || merged.has(id.toLowerCase())) continue;
+      merged.set(id.toLowerCase(), {
+        id,
+        name: app.name.trim() || id,
+        path: "",
+        url: app.url?.trim() || null,
+        status: "ready",
+      });
+    }
+
+    return [...merged.values()];
+  }, [grantedAppsQuery.data?.apps, workspaceAppsQuery.data]);
   const app = useMemo(
     () =>
-      (apps as WorkspaceAppSummary[]).find((item) => item.id === appId) ?? null,
+      apps.find(
+        (item) => item.id.trim().toLowerCase() === appId?.trim().toLowerCase(),
+      ) ?? null,
     [appId, apps],
   );
+  const isLoading = workspaceAppsQuery.isLoading || grantedAppsQuery.isLoading;
+  const queryError = workspaceAppsQuery.isError
+    ? workspaceAppsQuery.error
+    : grantedAppsQuery.isError
+      ? grantedAppsQuery.error
+      : null;
 
-  if (appsQuery.isError) {
+  if (queryError && !app) {
     return (
       <div className="flex h-full min-h-0 items-center justify-center p-6">
         <div className="w-full max-w-2xl">
           <ActionQueryError
-            error={appsQuery.error}
-            onRetry={() => void appsQuery.refetch()}
+            error={queryError}
+            onRetry={() => {
+              void workspaceAppsQuery.refetch();
+              void grantedAppsQuery.refetch();
+            }}
           />
         </div>
       </div>

package/src/lib/workspace-apps.spec.ts

@@ -4,6 +4,7 @@ import {
   isDefaultWorkspaceAppHiddenId,
   isDispatchWorkspaceAppId,
   isWorkspaceAppVisibleInDefaultLaunchers,
+  mergeChatFirstWorkspaceApps,
   workspaceAppIdFromRoute,
   workspaceAppRoute,
 } from "./workspace-apps";
@@ -41,4 +42,54 @@ describe("workspace app routes", () => {
     ).toBe(false);
     expect(isWorkspaceAppVisibleInDefaultLaunchers({ id: "mail" })).toBe(true);
   });
+
+  it("maps default first-party apps to their canonical hosted origins", () => {
+    const apps = mergeChatFirstWorkspaceApps(undefined);
+    expect(apps).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: "content",
+          path: "/",
+          url: "https://content.agent-native.com",
+        }),
+        expect.objectContaining({
+          id: "design",
+          path: "/",
+          url: "https://design.agent-native.com",
+        }),
+        expect.objectContaining({
+          id: "mail",
+          path: "/",
+          url: "https://mail.agent-native.com",
+        }),
+        expect.objectContaining({
+          id: "calendar",
+          path: "/",
+          url: "https://calendar.agent-native.com",
+        }),
+        expect.objectContaining({
+          id: "clips",
+          path: "/",
+          url: "https://clips.agent-native.com",
+        }),
+      ]),
+    );
+  });
+
+  it("lets a mounted workspace app override a default row", () => {
+    const apps = mergeChatFirstWorkspaceApps([
+      {
+        id: "mail",
+        name: "Internal Mail",
+        path: "/internal-mail",
+        url: null,
+        status: "ready",
+      },
+    ]);
+    expect(apps.find((app) => app.id === "mail")).toMatchObject({
+      name: "Internal Mail",
+      path: "/internal-mail",
+      url: null,
+    });
+  });
 });

package/src/lib/workspace-apps.ts

@@ -1,6 +1,8 @@
 import { CHAT_FIRST_DEFAULT_APP_IDS } from "@agent-native/core/client/chat-first";
 import { withBuilderUtmTrackingParams } from "@agent-native/core/shared/builder-link-tracking";
 
+import { CANONICAL_WORKSPACE_SSO_APP_ORIGINS } from "../shared/workspace-sso";
+
 export interface WorkspaceAppSummary {
   id: string;
   name: string;
@@ -169,8 +171,11 @@ export function mergeChatFirstWorkspaceApps(
     merged.set(id, {
       id,
       name: id.charAt(0).toUpperCase() + id.slice(1),
-      path: `/${id}`,
-      url: null,
+      // The five default rows are hosted sibling apps, not routes owned by
+      // Dispatch. Keep a mounted path for legacy callers, but give embed
+      // session resolution the exact canonical origin.
+      path: "/",
+      url: CANONICAL_WORKSPACE_SSO_APP_ORIGINS[id],
       status: "ready",
     });
   }

package/src/server/lib/vault-store.spec.ts

@@ -102,9 +102,11 @@ describe("vault authorization", () => {
       execute: vi.fn().mockResolvedValue({ rows: [{ role: "member" }] }),
     });
 
-    await expect(assertCanManageVault()).rejects.toThrow(
-      "Only organization owners and admins can manage the workspace vault.",
-    );
+    await expect(assertCanManageVault()).rejects.toMatchObject({
+      message:
+        "Only organization owners and admins can manage the workspace vault.",
+      statusCode: 403,
+    });
   });
 
   it("rejects organization members before listing or reading grants", async () => {