@agent-native/dispatch 0.23.2 → 0.23.5

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

@@ -25,7 +25,6 @@ import { toast } from "sonner";
 
 import { cn } from "../lib/utils";
 import {
-  isPendingBuilderHref,
   workspaceAppHref,
   workspaceAppRoute,
   type WorkspaceAppSummary,
@@ -276,7 +275,6 @@ function WorkspaceAppOpenActions({
   href: string | null;
 }) {
   const navigate = useNavigate();
-  const openInNewTab = isPendingBuilderHref(app);
   const appRoute = workspaceAppRoute(app.id);
 
   if (!href) {
@@ -290,14 +288,13 @@ function WorkspaceAppOpenActions({
   return (
     <AppOpenActions
       name={app.name}
-      href={openInNewTab ? href : appRoute}
-      target={openInNewTab ? "_blank" : undefined}
-      rel={openInNewTab ? "noreferrer" : undefined}
-      showInlineOption={openInNewTab}
+      href={href}
+      target="_blank"
+      rel="noreferrer"
+      showInlineOption
       onOpenInline={() => {
         navigate(appRoute);
       }}
-      showNewTabOption={openInNewTab}
     />
   );
 }

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

@@ -153,7 +153,7 @@ describe("WorkspaceTemplateCard", () => {
     );
   });
 
-  it("keeps add app out of the catalog split-button menu", async () => {
+  it("keeps add app available in catalog cards", async () => {
     await act(async () => {
       root.render(<WorkspaceTemplateCard template={template} catalog />);
     });
@@ -162,23 +162,11 @@ describe("WorkspaceTemplateCard", () => {
       (button) => button.textContent?.includes("Add app"),
     );
     expect(addButton).toBeDefined();
-
-    const optionsButton = container.querySelector<HTMLButtonElement>(
-      'button[aria-label="Open options for Weekly report"]',
-    );
-    expect(optionsButton).not.toBeNull();
-    await act(async () => {
-      optionsButton?.dispatchEvent(
-        new MouseEvent("pointerdown", { bubbles: true, button: 0 }),
-      );
-    });
-
-    const addItem = Array.from(
-      document.querySelectorAll<HTMLElement>('[role="menuitem"]'),
-    ).find((item) => item.textContent?.includes("Add app"));
-    expect(addItem).toBeUndefined();
     await act(async () => addButton?.click());
     expect(document.body.textContent).toContain("Choose the URL-safe id");
+    expect(
+      container.querySelector('a[href="https://reports.example.test"]'),
+    ).not.toBeNull();
   });
 
   it("accepts the list action envelope and renders installed state", async () => {

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

@@ -222,7 +222,6 @@ export function WorkspaceTemplateCard({
                 target="_blank"
                 rel="noreferrer"
                 labels={{ openApp: labels.openApp }}
-                showNewTabOption
               />
             ) : null}
             <Button

package/src/config.ts

@@ -13,6 +13,8 @@ export interface DispatchAuthConfig {
   googleOnly?: boolean;
   /** Marketing/branding copy passed straight through to `createAuthPlugin`. */
   marketing?: Record<string, unknown>;
+  /** Exact framework routes that perform their own authentication checks. */
+  publicPaths?: string[];
 }
 
 export interface DispatchIntegrationsConfig {

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

@@ -104,4 +104,30 @@ describe("filterOtherApps", () => {
       },
     ]);
   });
+
+  it("hides the generic chat starter from connected app launchers", () => {
+    expect(
+      filterOtherApps(
+        [
+          {
+            id: "chat",
+            name: "Chat",
+            url: "https://chat.agent-native.com",
+          },
+          {
+            id: "mail",
+            name: "Mail",
+            url: "https://mail.agent-native.com",
+          },
+        ],
+        [],
+      ),
+    ).toEqual([
+      {
+        id: "mail",
+        name: "Mail",
+        url: "https://mail.agent-native.com",
+      },
+    ]);
+  });
 });

package/src/lib/other-apps.ts

@@ -1,3 +1,5 @@
+import { isDefaultWorkspaceAppHiddenId } from "./workspace-apps";
+
 export interface ConnectedAppSummary {
   id: string;
   name: string;
@@ -38,6 +40,7 @@ export function filterOtherApps(
       const id = app.id.trim().toLowerCase();
       if (
         !id ||
+        isDefaultWorkspaceAppHiddenId(id) ||
         HIDDEN_OTHER_APP_IDS.has(id) ||
         workspaceAppIds.has(id) ||
         seen.has(id)

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

@@ -0,0 +1,44 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  isDefaultWorkspaceAppHiddenId,
+  isDispatchWorkspaceAppId,
+  isWorkspaceAppVisibleInDefaultLaunchers,
+  workspaceAppIdFromRoute,
+  workspaceAppRoute,
+} from "./workspace-apps";
+
+describe("workspace app routes", () => {
+  it("round-trips encoded app ids", () => {
+    const route = workspaceAppRoute("sales ops");
+    expect(route).toBe("/apps/sales%20ops");
+    expect(workspaceAppIdFromRoute(route)).toBe("sales ops");
+  });
+
+  it("does not mark app paths or the apps index as an active app route", () => {
+    expect(workspaceAppIdFromRoute("/sales-ops")).toBeNull();
+    expect(workspaceAppIdFromRoute("/apps")).toBeNull();
+    expect(workspaceAppIdFromRoute("/overview")).toBeNull();
+  });
+
+  it("accepts nested app routes while preserving the app id", () => {
+    expect(workspaceAppIdFromRoute("/apps/mail/inbox")).toBe("mail");
+  });
+
+  it("identifies Dispatch regardless of casing or surrounding whitespace", () => {
+    expect(isDispatchWorkspaceAppId(" Dispatch ")).toBe(true);
+    expect(isDispatchWorkspaceAppId("dispatch-tools")).toBe(false);
+  });
+
+  it("hides the generic chat starter and Dispatch from default launchers", () => {
+    expect(isDefaultWorkspaceAppHiddenId(" Chat ")).toBe(true);
+    expect(isWorkspaceAppVisibleInDefaultLaunchers({ id: "chat" })).toBe(false);
+    expect(
+      isWorkspaceAppVisibleInDefaultLaunchers({
+        id: "dispatch",
+        isDispatch: true,
+      }),
+    ).toBe(false);
+    expect(isWorkspaceAppVisibleInDefaultLaunchers({ id: "mail" })).toBe(true);
+  });
+});

package/src/lib/workspace-apps.ts

@@ -27,10 +27,37 @@ export interface WorkspaceAppSummary {
   archived?: boolean;
 }
 
+export function isDispatchWorkspaceAppId(appId: string): boolean {
+  return appId.trim().toLowerCase() === "dispatch";
+}
+
+export function isDefaultWorkspaceAppHiddenId(appId: string): boolean {
+  const normalized = appId.trim().toLowerCase();
+  return normalized === "chat" || isDispatchWorkspaceAppId(normalized);
+}
+
+export function isWorkspaceAppVisibleInDefaultLaunchers(
+  app: Pick<WorkspaceAppSummary, "id" | "isDispatch">,
+): boolean {
+  return !app.isDispatch && !isDefaultWorkspaceAppHiddenId(app.id);
+}
+
 export function workspaceAppRoute(appId: string): string {
   return `/apps/${encodeURIComponent(appId)}`;
 }
 
+export function workspaceAppIdFromRoute(pathname: string): string | null {
+  const match = pathname.match(/^\/apps\/([^/]+)(?:\/|$)/);
+  if (!match) return null;
+  try {
+    const appId = decodeURIComponent(match[1]).trim();
+    return appId || null;
+  } catch {
+    // coercion-ok: malformed app routes are inactive, not app ids.
+    return null;
+  }
+}
+
 export function workspaceAppHref(app: WorkspaceAppSummary): string | null {
   if (app.status === "pending") {
     return app.builderUrl

package/src/routes/index.ts

@@ -44,7 +44,7 @@ export const dispatchRoutes: RouteConfig = [
     route("automations", "./pages/automations.js"),
     route("approvals", "./pages/approvals.js"),
     route("destinations", "./pages/destinations.js"),
-    route("integrations", "./pages/integrations.js"),
+    route("integrations", "./pages/agent-integrations.js"),
     route("transactional-email", "./pages/transactional-email.js"),
     route(
       "transactional-email/:appId/:id",

package/src/routes/pages/agent-integrations.tsx

@@ -0,0 +1,24 @@
+import { useAgentSettingsTabs } from "@agent-native/core/client/settings";
+
+import { DispatchShell } from "../../components/dispatch-shell";
+
+export function meta() {
+  return [{ title: "Integrations — Dispatch" }];
+}
+
+export default function AgentIntegrationsRoute() {
+  const settingsTabs = useAgentSettingsTabs();
+  const integrationsTab = settingsTabs.find((tab) => tab.id === "integrations");
+  if (!integrationsTab) {
+    throw new Error("The shared Integrations settings view is unavailable.");
+  }
+
+  return (
+    <DispatchShell
+      title="Integrations"
+      description="Connect the tools and services available to your agent."
+    >
+      <div className="mx-auto w-full max-w-5xl">{integrationsTab.content}</div>
+    </DispatchShell>
+  );
+}

package/src/routes/pages/apps.$appId.tsx

@@ -5,7 +5,7 @@ import {
 import { useT } from "@agent-native/core/client/i18n";
 import { withBuilderUtmTrackingParams } from "@agent-native/core/shared/builder-link-tracking";
 import { IconArrowLeft, IconClockHour4 } from "@tabler/icons-react";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Link, useParams } from "react-router";
 
 import { ActionQueryError } from "../../components/action-query-error";
@@ -52,6 +52,7 @@ export default function WorkspaceAppRoute() {
   const [embedUrl, setEmbedUrl] = useState<string | null>(null);
   const [embedError, setEmbedError] = useState<Error | null>(null);
   const [embedAttempt, setEmbedAttempt] = useState(0);
+  const embedFrameRef = useRef<HTMLIFrameElement>(null);
   const createEmbedSession = useActionMutation<
     EmbedSessionResult,
     EmbedSessionInput
@@ -96,6 +97,22 @@ export default function WorkspaceAppRoute() {
     embedInput,
   ]);
 
+  useEffect(() => {
+    const handleEmbedSessionExpired = (event: MessageEvent) => {
+      if (
+        event.data?.type !== "agentNative.embedSessionExpired" ||
+        event.source !== embedFrameRef.current?.contentWindow
+      ) {
+        return;
+      }
+      setEmbedAttempt((attempt) => attempt + 1);
+    };
+
+    window.addEventListener("message", handleEmbedSessionExpired);
+    return () =>
+      window.removeEventListener("message", handleEmbedSessionExpired);
+  }, []);
+
   if (appsQuery.isError) {
     return (
       <div className="flex h-full min-h-0 items-center justify-center p-6">
@@ -208,6 +225,7 @@ export default function WorkspaceAppRoute() {
             data-dispatch-workspace-app-frame
             src={embedUrl}
             title={app.name}
+            ref={embedFrameRef}
             referrerPolicy="no-referrer"
             className="h-full w-full border-0 bg-background"
           />

package/src/routes/pages/apps.tsx

@@ -33,7 +33,10 @@ import type {
 } from "../../components/workspace-template-card";
 import type { ConnectedAppSummary } from "../../lib/other-apps";
 import { cn } from "../../lib/utils";
-import type { WorkspaceAppSummary } from "../../lib/workspace-apps";
+import {
+  isWorkspaceAppVisibleInDefaultLaunchers,
+  type WorkspaceAppSummary,
+} from "../../lib/workspace-apps";
 
 export function meta() {
   return [{ title: "Apps — Dispatch" }];
@@ -72,7 +75,7 @@ function AppsRoute() {
   const ws = workspace as WorkspaceInfo | undefined;
   const workspaceLabel = ws?.displayName ?? ws?.name ?? null;
   const allApps = (apps as WorkspaceAppSummary[]).filter(
-    (app) => !app.isDispatch,
+    isWorkspaceAppVisibleInDefaultLaunchers,
   );
   const visibleApps = allApps.filter((app) => !app.archived);
   const activeApps = visibleApps.filter((app) => app.status !== "pending");

package/src/routes/pages/settings.tsx

@@ -68,7 +68,7 @@ export default function SettingsRoute() {
       description={t("settings.description")}
     >
       <SettingsTabsPage
-        extraTabs={agentSettingsTabs}
+        extraTabs={agentSettingsTabs.filter((tab) => tab.id !== "integrations")}
         general={
           <div className="mx-auto w-full max-w-3xl space-y-6">
             <Card>
@@ -141,24 +141,6 @@ export default function SettingsRoute() {
               </CardContent>
             </Card>
 
-            <Card>
-              <CardHeader>
-                <CardTitle className="text-base">
-                  {t("settings.automationsTitle")}
-                </CardTitle>
-                <CardDescription>
-                  {t("settings.automationsDescription")}
-                </CardDescription>
-              </CardHeader>
-              <CardContent>
-                <Button variant="outline" asChild>
-                  <Link to="/admin/automations">
-                    {t("settings.openAutomations")}
-                  </Link>
-                </Button>
-              </CardContent>
-            </Card>
-
             <Card>
               <CardHeader>
                 <CardTitle className="text-base">

package/src/server/plugins/auth.spec.ts

@@ -0,0 +1,45 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  authPlugin: vi.fn(),
+  createAuthPlugin: vi.fn(),
+  getDispatchConfig: vi.fn(),
+}));
+
+vi.mock("@agent-native/core/server", () => ({
+  createAuthPlugin: mocks.createAuthPlugin,
+}));
+
+vi.mock("../index.js", () => ({
+  getDispatchConfig: mocks.getDispatchConfig,
+}));
+
+describe("dispatchAuthPlugin", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    mocks.authPlugin.mockReset();
+    mocks.createAuthPlugin.mockReset();
+    mocks.createAuthPlugin.mockReturnValue(mocks.authPlugin);
+    mocks.getDispatchConfig.mockReset();
+  });
+
+  it("installs template public routes on the primary auth guard", async () => {
+    const { default: dispatchAuthPlugin } = await import("./auth.js");
+    const nitroApp = {};
+    const publicPaths = [
+      "/_agent-native/identity/authorize",
+      "/_agent-native/org/apps",
+    ];
+
+    mocks.getDispatchConfig.mockReturnValue({
+      auth: { googleOnly: true, publicPaths },
+    });
+    await dispatchAuthPlugin(nitroApp);
+
+    expect(mocks.createAuthPlugin).toHaveBeenCalledOnce();
+    expect(mocks.createAuthPlugin).toHaveBeenCalledWith(
+      expect.objectContaining({ googleOnly: true, publicPaths }),
+    );
+    expect(mocks.authPlugin).toHaveBeenCalledWith(nitroApp);
+  });
+});

package/src/server/plugins/auth.ts

@@ -28,6 +28,7 @@ const dispatchAuthPlugin = async (nitroApp: any) => {
   const plugin = createAuthPlugin({
     googleOnly,
     marketing: marketing as any,
+    publicPaths: authConfig.publicPaths,
   });
   return plugin(nitroApp);
 };