@agent-native/dispatch 0.23.3 → 0.23.5

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

@@ -9,6 +9,7 @@ import { TooltipProvider } from "../ui/tooltip";
 import {
   buildChatFirstEmbedSessionInput,
   formatThreadAge,
+  isElectronEmbeddedSearch,
   NavContent,
 } from "./Layout";
 
@@ -119,6 +120,14 @@ describe("chat-first embed sessions", () => {
   });
 });
 
+describe("Electron control-plane mode", () => {
+  it("recognizes only the explicit Electron query flag", () => {
+    expect(isElectronEmbeddedSearch("?electron=1")).toBe(true);
+    expect(isElectronEmbeddedSearch("?electron=0")).toBe(false);
+    expect(isElectronEmbeddedSearch("?chatFirst=1")).toBe(false);
+  });
+});
+
 describe("Dispatch NavContent", () => {
   let container: HTMLDivElement;
   let root: Root;

package/src/components/layout/Layout.tsx

@@ -104,6 +104,8 @@ import { toast } from "sonner";
 
 import { cn } from "../../lib/utils";
 import {
+  isDispatchWorkspaceAppId,
+  isWorkspaceAppVisibleInDefaultLaunchers,
   mergeChatFirstWorkspaceApps,
   workspaceAppIdFromRoute,
   workspaceAppRoute,
@@ -299,6 +301,10 @@ function localDispatchPath(pathname: string): string {
   return pathname;
 }
 
+export function isElectronEmbeddedSearch(search: string): boolean {
+  return new URLSearchParams(search).get("electron") === "1";
+}
+
 function chatFirstPrimaryTabForPath(
   pathname: string,
 ): ChatFirstPrimaryTab | undefined {
@@ -1330,6 +1336,11 @@ export function Layout({
     }
   });
   const localPathname = localDispatchPath(location.pathname);
+  const [electronEmbedded] = useState(() =>
+    typeof window !== "undefined"
+      ? isElectronEmbeddedSearch(window.location.search)
+      : false,
+  );
   const isChatRoute =
     localPathname === "/chat" || localPathname.startsWith("/chat/");
   const chatFirstSurfaceScope = threadIdFromPath(localPathname) ?? "new";
@@ -1347,6 +1358,17 @@ export function Layout({
   const chatFirstMode =
     extensions?.chatFirst === true || chatFirstPreference || chatFirstEmbedded;
   const chatFirstHasActiveChat = chatFirstSurfaceScope !== "new";
+  useEffect(() => {
+    if (!electronEmbedded || typeof window === "undefined") return;
+    const url = new URL(window.location.href);
+    if (isElectronEmbeddedSearch(url.search)) return;
+    url.searchParams.set("electron", "1");
+    window.history.replaceState(
+      window.history.state,
+      "",
+      `${url.pathname}${url.search}${url.hash}`,
+    );
+  }, [electronEmbedded, location.pathname, location.search]);
   useEffect(() => {
     if (!chatFirstMode || chatFirstEmbedded || localPathname !== "/overview") {
       return;
@@ -1396,7 +1418,9 @@ export function Layout({
   const chatFirstAppItems = useMemo<ChatFirstAppItem[]>(
     () =>
       chatFirstAppRegistrations
-        .filter((app) => app.enabled)
+        .filter(
+          (app) => app.enabled && isWorkspaceAppVisibleInDefaultLaunchers(app),
+        )
         .map((app) => ({
           id: app.id,
           name: app.name ?? app.id,
@@ -1729,6 +1753,19 @@ export function Layout({
         setChatFirstNotice(chatFirstResolutionMessage(resolution.reason));
         return;
       }
+      if (isDispatchWorkspaceAppId(resolution.target.appId)) {
+        closeChatFirstSessionWatch();
+        chatFirstSurfaceTabsStore.closeAll();
+        setChatFirstSurfacePanelOpen(false);
+        persistChatFirstPane(null);
+        if (resolution.target.path) {
+          navigateWithAgentChatViewTransition(
+            navigate,
+            dispatchNavLinkTarget(resolution.target.path),
+          );
+        }
+        return;
+      }
       openChatFirstPane(resolution.target);
     },
     [
@@ -1736,7 +1773,12 @@ export function Layout({
       chatFirstAppsQuery.isError,
       chatFirstAppsQuery.isLoading,
       chatFirstGrantedAppsQuery.isLoading,
+      chatFirstSurfaceTabsStore,
+      closeChatFirstSessionWatch,
       openChatFirstPane,
+      navigate,
+      persistChatFirstPane,
+      setChatFirstSurfacePanelOpen,
     ],
   );
   const chatHomeHandoffActive = useAgentChatHomeHandoff({
@@ -2204,6 +2246,29 @@ export function Layout({
     return <>{children}</>;
   }
 
+  if (electronEmbedded) {
+    return (
+      <DispatchExtensionsContext.Provider value={extensions}>
+        <HeaderActionsProvider>
+          <div
+            data-dispatch-electron-control-plane
+            className="flex h-screen w-full overflow-hidden bg-background"
+          >
+            <div className="relative flex min-w-0 flex-1 flex-col overflow-hidden">
+              <Header showAgentToggle={false} />
+              <InvitationBanner />
+              <main className="flex-1 overflow-y-auto">
+                <div className="mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6">
+                  {children}
+                </div>
+              </main>
+            </div>
+          </div>
+        </HeaderActionsProvider>
+      </DispatchExtensionsContext.Provider>
+    );
+  }
+
   if (isWorkspaceAppHostRoute) {
     return (
       <DispatchExtensionsContext.Provider value={extensions}>
@@ -2403,9 +2468,11 @@ export function Layout({
                 chatFirstSurfaceTabsStore.closeAll();
                 setChatFirstSurfacePanelOpen(false);
               }}
-              onChatFirstAppOpen={(app) =>
-                navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)))
-              }
+              onChatFirstAppOpen={(app) => {
+                if (isDispatchWorkspaceAppId(app.id)) return;
+                setSidebarCollapsed(true);
+                navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)));
+              }}
               onChatFirstAppsRetry={() => void chatFirstAppsQuery.refetch()}
               collapsible
               onCollapsedChange={setSidebarCollapsed}

package/src/components/layout/workspace-apps-rail.tsx

@@ -5,6 +5,7 @@ import { Link, useLocation } from "react-router";
 
 import { cn } from "../../lib/utils";
 import {
+  isWorkspaceAppVisibleInDefaultLaunchers,
   workspaceAppIdFromRoute,
   workspaceAppRoute,
   workspaceAppHref,
@@ -41,7 +42,7 @@ export function WorkspaceAppsRail({
   const apps = appsQuery.data
     .filter(
       (app) =>
-        !app.isDispatch &&
+        isWorkspaceAppVisibleInDefaultLaunchers(app) &&
         !app.archived &&
         app.status !== "pending" &&
         !!workspaceAppHref(app),

package/src/components/other-apps-section.tsx

@@ -3,6 +3,7 @@ import { useT } from "@agent-native/core/client/i18n";
 import { filterOtherApps, type ConnectedAppSummary } from "../lib/other-apps";
 import type { WorkspaceAppId } from "../lib/other-apps";
 import { cn } from "../lib/utils";
+import { isDefaultWorkspaceAppHiddenId } from "../lib/workspace-apps";
 import { ActionQueryError } from "./action-query-error";
 import {
   APP_LIST_GRID_CLASS,
@@ -52,7 +53,13 @@ export function mergeOtherAppEntries({
 
   for (const template of getTemplateItems(templates)) {
     const id = templateKey(template);
-    if (!id || template.installed || workspaceAppIds.has(id)) continue;
+    if (
+      !id ||
+      isDefaultWorkspaceAppHiddenId(id) ||
+      template.installed ||
+      workspaceAppIds.has(id)
+    )
+      continue;
     seen.add(id);
     entries.push({ kind: "template", template });
   }

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

@@ -1,6 +1,12 @@
 import { describe, expect, it } from "vitest";
 
-import { workspaceAppIdFromRoute, workspaceAppRoute } from "./workspace-apps";
+import {
+  isDefaultWorkspaceAppHiddenId,
+  isDispatchWorkspaceAppId,
+  isWorkspaceAppVisibleInDefaultLaunchers,
+  workspaceAppIdFromRoute,
+  workspaceAppRoute,
+} from "./workspace-apps";
 
 describe("workspace app routes", () => {
   it("round-trips encoded app ids", () => {
@@ -18,4 +24,21 @@ describe("workspace app routes", () => {
   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,6 +27,21 @@ 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)}`;
 }

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/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);
 };