@agent-native/dispatch 0.23.1 → 0.23.3

package/src/components/layout/Layout.tsx

@@ -55,6 +55,7 @@ import {
   type ChatFirstAppItem,
   type ChatFirstCopy,
   type ChatFirstEmbedTarget,
+  type ChatFirstPrimaryTab,
 } from "@agent-native/core/client/chat-first";
 import { writeClipboardText } from "@agent-native/core/client/clipboard";
 import {
@@ -104,6 +105,8 @@ import { toast } from "sonner";
 import { cn } from "../../lib/utils";
 import {
   mergeChatFirstWorkspaceApps,
+  workspaceAppIdFromRoute,
+  workspaceAppRoute,
   type WorkspaceAppSummary,
 } from "../../lib/workspace-apps";
 import { AppIcon } from "../app-icon";
@@ -296,6 +299,31 @@ function localDispatchPath(pathname: string): string {
   return pathname;
 }
 
+function chatFirstPrimaryTabForPath(
+  pathname: string,
+): ChatFirstPrimaryTab | undefined {
+  if (pathname === "/chat" || pathname.startsWith("/chat/")) {
+    return "new-chat";
+  }
+  if (
+    pathname === "/integrations" ||
+    pathname.startsWith("/integrations/") ||
+    pathname === "/admin/integrations" ||
+    pathname.startsWith("/admin/integrations/")
+  ) {
+    return "integrations";
+  }
+  if (
+    pathname === "/automations" ||
+    pathname.startsWith("/automations/") ||
+    pathname === "/admin/automations" ||
+    pathname.startsWith("/admin/automations/")
+  ) {
+    return "scheduled";
+  }
+  return undefined;
+}
+
 function dispatchNavLinkTarget(path: string): string {
   if (typeof window === "undefined") return path;
   const basePath = appBasePath();
@@ -543,6 +571,8 @@ function DispatchChatsSection({
   chatFirstMode?: boolean;
   chatFirstEmbedded?: boolean;
   chatFirstNavigation?: {
+    activeTab?: ChatFirstPrimaryTab;
+    onNewChat?: () => void;
     onOpenIntegrations: () => void;
     onOpenScheduled: () => void;
   };
@@ -683,13 +713,17 @@ function DispatchChatsSection({
       )}
     >
       {showNewChat && chatFirstNavigation ? (
-        <nav className="space-y-0.5 px-0 py-2">
+        <nav className="space-y-0.5 px-2 py-2">
           <ChatFirstPrimaryNavigation
             copy={chatFirstCopy}
-            onNewChat={() => void handleNewChat()}
+            onNewChat={() => {
+              chatFirstNavigation.onNewChat?.();
+              void handleNewChat();
+            }}
             onOpenIntegrations={chatFirstNavigation.onOpenIntegrations}
             onOpenScheduled={chatFirstNavigation.onOpenScheduled}
             onSearch={openCommandMenu}
+            activeTab={chatFirstNavigation.activeTab}
           />
         </nav>
       ) : null}
@@ -816,7 +850,7 @@ function DispatchChatsSection({
               ) : null}
             </>
           )}
-          className="min-w-0"
+          className="min-w-0 px-2"
         />
       ) : (
         <ChatHistoryRail
@@ -883,7 +917,7 @@ function DispatchChatsSection({
               ) : null}
             </>
           )}
-          className="min-w-0"
+          className={cn("min-w-0", chatFirstMode && "px-2")}
         />
       )}
     </div>
@@ -904,6 +938,8 @@ export function NavContent({
   chatFirstAppsLoading = false,
   chatFirstAppsError,
   chatFirstActiveAppId,
+  chatFirstActivePrimaryTab,
+  onChatFirstNewChat,
   onChatFirstAppOpen,
   onChatFirstAppsRetry,
 }: {
@@ -920,6 +956,8 @@ export function NavContent({
   chatFirstAppsLoading?: boolean;
   chatFirstAppsError?: string | null;
   chatFirstActiveAppId?: string;
+  chatFirstActivePrimaryTab?: ChatFirstPrimaryTab;
+  onChatFirstNewChat?: () => void;
   onChatFirstAppOpen?: (app: ChatFirstAppItem) => void;
   onChatFirstAppsRetry?: () => void;
 }) {
@@ -1219,6 +1257,8 @@ export function NavContent({
               chatFirstMode
               chatFirstEmbedded={chatFirstEmbedded}
               chatFirstNavigation={{
+                activeTab: chatFirstActivePrimaryTab,
+                onNewChat: onChatFirstNewChat,
                 onOpenIntegrations: () => {
                   navigate(dispatchNavLinkTarget("/admin/integrations"));
                   onNavigate?.();
@@ -1307,6 +1347,12 @@ export function Layout({
   const chatFirstMode =
     extensions?.chatFirst === true || chatFirstPreference || chatFirstEmbedded;
   const chatFirstHasActiveChat = chatFirstSurfaceScope !== "new";
+  useEffect(() => {
+    if (!chatFirstMode || chatFirstEmbedded || localPathname !== "/overview") {
+      return;
+    }
+    navigate(dispatchNavLinkTarget("/chat"), { replace: true });
+  }, [chatFirstEmbedded, chatFirstMode, localPathname, navigate]);
   const [chatFirstAppLayout, setChatFirstAppLayout] =
     useState<ChatFirstAppLayoutPreference>(() => readChatFirstAppLayout());
   const chatFirstAppLayoutHydratedRef = useRef(false);
@@ -1371,6 +1417,7 @@ export function Layout({
     null,
   );
   const [chatFirstEmbedAttempt, setChatFirstEmbedAttempt] = useState(0);
+  const chatFirstAppFrameRef = useRef<HTMLIFrameElement>(null);
   const [chatFirstNotice, setChatFirstNotice] = useState<string | null>(null);
   const chatFirstSessionWatch = useChatFirstSessionWatch();
   const chatFirstSurfaceTabs = useChatFirstSurfaceTabs(chatFirstSurfaceScope);
@@ -1410,6 +1457,19 @@ export function Layout({
     isChatRoute &&
     activeChatFirstSurfaceTab?.kind === "app" &&
     activeChatFirstSurfaceTab.placement === "main";
+  const chatFirstAppSelected =
+    chatFirstMode && activeChatFirstSurfaceTab?.kind === "app";
+  const chatFirstActivePrimaryTab = chatFirstAppSelected
+    ? activeChatFirstSurfaceTab?.kind === "app" &&
+      activeChatFirstSurfaceTab.appId === "dispatch"
+      ? chatFirstPrimaryTabForPath(activeChatFirstSurfaceTab.path ?? "")
+      : undefined
+    : chatFirstPrimaryTabForPath(localPathname);
+  const chatFirstActiveAppId = isWorkspaceAppRoute
+    ? (workspaceAppIdFromRoute(localPathname) ?? undefined)
+    : chatFirstAppSelected && activeChatFirstSurfaceTab?.kind === "app"
+      ? activeChatFirstSurfaceTab.appId
+      : undefined;
   const activeChatFirstAppRegistration = useMemo(
     () =>
       activeChatFirstSurfaceTab?.kind === "app" &&
@@ -1496,6 +1556,25 @@ export function Layout({
     createChatFirstEmbedSession.mutateAsync,
     isChatRoute,
   ]);
+
+  useEffect(() => {
+    if (!chatFirstMode || !isChatRoute || !activeChatFirstApp) return;
+
+    const handleEmbedSessionExpired = (event: MessageEvent) => {
+      if (
+        event.data?.type !== "agentNative.embedSessionExpired" ||
+        event.source !== chatFirstAppFrameRef.current?.contentWindow
+      ) {
+        return;
+      }
+      setChatFirstEmbedAttempt((attempt) => attempt + 1);
+    };
+
+    window.addEventListener("message", handleEmbedSessionExpired);
+    return () =>
+      window.removeEventListener("message", handleEmbedSessionExpired);
+  }, [activeChatFirstApp, chatFirstMode, isChatRoute]);
+
   const persistChatFirstPane = useCallback(
     (pane: DispatchChatFirstPane | null) => {
       setChatFirstPane(pane);
@@ -1507,6 +1586,17 @@ export function Layout({
     },
     [],
   );
+  useEffect(() => {
+    if (!chatFirstMode || isChatRoute) return;
+    persistChatFirstPane(null);
+    closeChatFirstSessionWatch();
+    chatFirstSurfaceTabsStore.closeAll();
+  }, [
+    chatFirstMode,
+    chatFirstSurfaceTabsStore,
+    isChatRoute,
+    persistChatFirstPane,
+  ]);
   const openChatFirstPane = useCallback(
     (
       pane: DispatchChatFirstPane,
@@ -2023,6 +2113,7 @@ export function Layout({
                 data-dispatch-chat-first-app-frame
                 src={url}
                 title={title ?? chatFirstCopy("appUnavailable")}
+                ref={chatFirstAppFrameRef}
                 referrerPolicy="no-referrer"
                 allow="clipboard-read; clipboard-write"
                 className="h-full w-full border-0 bg-background"
@@ -2305,13 +2396,15 @@ export function Layout({
                   ? chatFirstCopy("appsLoadError")
                   : null
               }
-              chatFirstActiveAppId={
-                activeChatFirstSurfaceTab?.kind === "app"
-                  ? activeChatFirstSurfaceTab.appId
-                  : undefined
-              }
+              chatFirstActiveAppId={chatFirstActiveAppId}
+              chatFirstActivePrimaryTab={chatFirstActivePrimaryTab}
+              onChatFirstNewChat={() => {
+                closeChatFirstSessionWatch();
+                chatFirstSurfaceTabsStore.closeAll();
+                setChatFirstSurfacePanelOpen(false);
+              }}
               onChatFirstAppOpen={(app) =>
-                openChatFirstPane({ appId: app.id }, "main")
+                navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)))
               }
               onChatFirstAppsRetry={() => void chatFirstAppsQuery.refetch()}
               collapsible
@@ -2345,13 +2438,15 @@ export function Layout({
                       ? chatFirstCopy("appsLoadError")
                       : null
                   }
-                  chatFirstActiveAppId={
-                    activeChatFirstSurfaceTab?.kind === "app"
-                      ? activeChatFirstSurfaceTab.appId
-                      : undefined
-                  }
+                  chatFirstActiveAppId={chatFirstActiveAppId}
+                  chatFirstActivePrimaryTab={chatFirstActivePrimaryTab}
+                  onChatFirstNewChat={() => {
+                    closeChatFirstSessionWatch();
+                    chatFirstSurfaceTabsStore.closeAll();
+                    setChatFirstSurfacePanelOpen(false);
+                  }}
                   onChatFirstAppOpen={(app) =>
-                    openChatFirstPane({ appId: app.id }, "main")
+                    navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)))
                   }
                   onChatFirstAppsRetry={() => void chatFirstAppsQuery.refetch()}
                   onNavigate={() => setMobileOpen(false)}

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

@@ -5,6 +5,7 @@ import { Link, useLocation } from "react-router";
 
 import { cn } from "../../lib/utils";
 import {
+  workspaceAppIdFromRoute,
   workspaceAppRoute,
   workspaceAppHref,
   type WorkspaceAppSummary,
@@ -12,32 +13,8 @@ import {
 import { AppIcon } from "../app-icon";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
 
-function pathFromValue(value: string | null | undefined): string | null {
-  const trimmed = value?.trim();
-  if (!trimmed) return null;
-
-  try {
-    const pathname = new URL(trimmed, "https://dispatch.local").pathname;
-    return pathname.replace(/\/+$/, "") || "/";
-  } catch {
-    // coercion-ok: malformed app URLs cannot match a workspace route.
-    return null;
-  }
-}
-
 function appMatchesPath(app: WorkspaceAppSummary, pathname: string): boolean {
-  const appRoute = workspaceAppRoute(app.id);
-  if (pathname === appRoute || pathname.startsWith(`${appRoute}/`)) {
-    return true;
-  }
-
-  const candidatePaths = [app.path, app.url]
-    .map(pathFromValue)
-    .filter((path): path is string => !!path);
-
-  return candidatePaths.some(
-    (path) => pathname === path || pathname.startsWith(`${path}/`),
-  );
+  return workspaceAppIdFromRoute(pathname) === app.id;
 }
 
 function appLabel(app: WorkspaceAppSummary): string {

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

@@ -62,21 +62,21 @@ describe("WorkspaceAppCard", () => {
     });
 
     const appLink = container.querySelector<HTMLAnchorElement>(
-      'a[href="/apps/analytics"]',
+      'a[href="/analytics"]',
     );
     expect(appLink).not.toBeNull();
     expect(appLink?.textContent).toContain("Open app");
-    expect(appLink?.className).toContain("bg-accent");
-    expect(appLink?.getAttribute("target")).toBeNull();
-    expect(appLink?.getAttribute("rel")).toBeNull();
+    expect(appLink?.getAttribute("target")).toBe("_blank");
+    expect(appLink?.getAttribute("rel")).toBe("noreferrer");
     expect(appLink?.querySelector("svg")).toBeNull();
-    expect(container.textContent).not.toContain("/apps/analytics");
 
     expect(
       container.querySelector(
         'button[aria-label="Open options for Analytics"]',
       ),
-    ).toBeNull();
+    ).not.toBeNull();
+    expect(document.body.textContent).not.toContain("Open in new tab");
+    expect(document.body.textContent).not.toContain("Add app");
 
     const settingsButton = container.querySelector<HTMLButtonElement>(
       'button[aria-label="Settings for Analytics"]',

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/lib/workspace-apps.spec.ts

@@ -0,0 +1,21 @@
+import { describe, expect, it } from "vitest";
+
+import { 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");
+  });
+});

package/src/lib/workspace-apps.ts

@@ -31,6 +31,18 @@ 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/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/lib/dispatch-integrations.ts

@@ -433,8 +433,8 @@ export async function resolveDispatchExecutionContext(
   }
   if (!scope) throw new Error("Slack channel is not enabled for Agent Native");
   const decision = evaluateIntegrationScopePolicy(scope, {
-    // Thread replies reached this point only after the adapter's active-task
-    // gate, so they are continuation steering rather than ambient chatter.
+    // Slack channel turns only arrive here after an explicit current-message
+    // mention; keep the generic thread_reply trigger for other adapters.
     mentioned:
       incoming.triggerKind === "mention" ||
       incoming.triggerKind === "thread_reply",