@agent-native/dispatch 0.40.0 → 0.40.3

package/src/components/dispatch-control-plane.tsx

@@ -3,16 +3,18 @@ import {
   navigateWithAgentChatViewTransition,
   useChatModels,
 } from "@agent-native/core/client/agent-chat";
-import { PromptBar, PromptComposer } from "@agent-native/core/client/composer";
 import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import { useOrgRole } from "@agent-native/core/client/org";
+import {
+  PromptBar,
+  PromptComposer,
+} from "@agent-native/toolkit/app/chat/composer/index";
 import { IconChevronDown, IconClockHour4, IconPlus } from "@tabler/icons-react";
 import type { ReactNode } from "react";
 import { useState } from "react";
 import { Link, useNavigate } from "react-router";
 
-import type { ConnectedAppSummary } from "../lib/other-apps";
 import { cn } from "../lib/utils";
 import {
   orderWorkspaceApps,
@@ -31,11 +33,6 @@ import {
 } from "./app-list-row";
 import { CreateAppPopover } from "./create-app-popover";
 import { useSetPageTitle } from "./layout/HeaderActions";
-import {
-  filterOtherAppEntries,
-  mergeOtherAppEntries,
-  OtherAppsSection,
-} from "./other-apps-section";
 import { Button } from "./ui/button";
 import {
   Collapsible,
@@ -48,7 +45,6 @@ import {
   WorkspaceAppSearch,
   WorkspaceAppSearchEmpty,
 } from "./workspace-app-search";
-import type { CuratedWorkspaceTemplatesResult } from "./workspace-template-card";
 
 function SectionHeader({
   title,
@@ -163,25 +159,9 @@ function CommandPanel() {
 function AppsPanel({
   apps,
   isLoading,
-  connectedApps,
-  connectedAppsError,
-  connectedAppsLoading,
-  onRetryConnectedApps,
-  curatedTemplates,
-  curatedTemplatesError,
-  curatedTemplatesLoading,
-  onRetryCuratedTemplates,
 }: {
   apps: WorkspaceAppSummary[];
   isLoading: boolean;
-  connectedApps: ConnectedAppSummary[];
-  connectedAppsError?: Error | null;
-  connectedAppsLoading: boolean;
-  onRetryConnectedApps: () => void;
-  curatedTemplates?: CuratedWorkspaceTemplatesResult;
-  curatedTemplatesError?: Error | null;
-  curatedTemplatesLoading: boolean;
-  onRetryCuratedTemplates: () => void;
 }) {
   const t = useT();
   const [showPending, setShowPending] = useState(false);
@@ -200,20 +180,8 @@ function AppsPanel({
   const filteredPendingApps = orderedPendingApps.filter((app) =>
     workspaceAppMatchesQuery(app, searchQuery),
   );
-  const otherAppEntries = filterOtherAppEntries(
-    mergeOtherAppEntries({
-      templates: curatedTemplates,
-      connectedApps,
-      workspaceApps: apps,
-    }),
-    searchQuery,
-  );
   const hasSearchResults =
-    filteredActiveApps.length > 0 ||
-    filteredPendingApps.length > 0 ||
-    otherAppEntries.length > 0;
-  const otherAppsLoading = curatedTemplatesLoading || connectedAppsLoading;
-  const otherAppsError = curatedTemplatesError || connectedAppsError;
+    filteredActiveApps.length > 0 || filteredPendingApps.length > 0;
   const showSkeletons =
     isLoading && activeApps.length === 0 && pendingApps.length === 0;
 
@@ -229,9 +197,7 @@ function AppsPanel({
               </Link>
             </Button>
             {!showSkeletons &&
-            (visibleApps.length > 0 ||
-              otherAppEntries.length > 0 ||
-              Boolean(searchQuery.trim())) ? (
+            (visibleApps.length > 0 || Boolean(searchQuery.trim())) ? (
               <WorkspaceAppSearch
                 className="w-[220px]"
                 query={searchQuery}
@@ -263,10 +229,7 @@ function AppsPanel({
       ) : null}
       {showSkeletons ? (
         <OverviewAppsSkeleton />
-      ) : searchQuery.trim() &&
-        !hasSearchResults &&
-        !otherAppsLoading &&
-        !otherAppsError ? (
+      ) : searchQuery.trim() && !hasSearchResults ? (
         <WorkspaceAppSearchEmpty
           query={searchQuery}
           onClear={() => setSearchQuery("")}
@@ -284,32 +247,14 @@ function AppsPanel({
               />
             ))}
             {filteredActiveApps.length === 0 &&
-            !searchQuery.trim() &&
-            otherAppEntries.length === 0 &&
-            !curatedTemplatesLoading &&
-            !connectedAppsLoading &&
-            !curatedTemplatesError &&
-            !connectedAppsError ? (
+            pendingApps.length === 0 &&
+            !searchQuery.trim() ? (
               <p className="px-4 py-3 text-sm text-muted-foreground">
                 {t("dispatch.pages.noApps", {
                   defaultValue: "No apps yet.",
                 })}
               </p>
             ) : null}
-            <OtherAppsSection
-              templates={curatedTemplates}
-              connectedApps={connectedApps}
-              workspaceApps={apps}
-              templatesLoading={curatedTemplatesLoading}
-              connectedAppsLoading={connectedAppsLoading}
-              templatesError={curatedTemplatesError}
-              connectedAppsError={connectedAppsError}
-              query={searchQuery}
-              onRetryTemplates={onRetryCuratedTemplates}
-              onRetryConnectedApps={onRetryConnectedApps}
-              heading={null}
-              embeddedInList
-            />
           </AppList>
         </>
       )}
@@ -405,14 +350,6 @@ export function DispatchControlPlane() {
     "list-workspace-apps",
     { includeAgentCards: false, includeArchived: true },
   );
-  const connectedAppsQuery = useActionQuery<ConnectedAppSummary[]>(
-    "list-connected-agents",
-    {},
-  );
-  const curatedTemplatesQuery = useActionQuery<CuratedWorkspaceTemplatesResult>(
-    "list-curated-workspace-templates",
-    {},
-  );
   const { data: workspaceApps = [], isLoading: appsLoading } = appsQuery;
 
   return (
@@ -424,18 +361,7 @@ export function DispatchControlPlane() {
           onRetry={() => void appsQuery.refetch()}
         />
       ) : (
-        <AppsPanel
-          apps={workspaceApps ?? []}
-          isLoading={appsLoading}
-          connectedApps={connectedAppsQuery.data ?? []}
-          connectedAppsError={connectedAppsQuery.error}
-          connectedAppsLoading={connectedAppsQuery.isLoading}
-          onRetryConnectedApps={() => void connectedAppsQuery.refetch()}
-          curatedTemplates={curatedTemplatesQuery.data}
-          curatedTemplatesError={curatedTemplatesQuery.error}
-          curatedTemplatesLoading={curatedTemplatesQuery.isLoading}
-          onRetryCuratedTemplates={() => void curatedTemplatesQuery.refetch()}
-        />
+        <AppsPanel apps={workspaceApps ?? []} isLoading={appsLoading} />
       )}
     </div>
   );

package/src/components/layout/Header.tsx

@@ -1,5 +1,5 @@
-import { AgentToggleButton } from "@agent-native/core/client/agent-chat";
-import { RunsTray } from "@agent-native/core/client/progress";
+import { AgentToggleButton } from "@agent-native/toolkit/app/chat";
+import { RunsTray } from "@agent-native/toolkit/app/progress";
 import { IconLayoutSidebar } from "@tabler/icons-react";
 import { useLocation, useNavigate } from "react-router";
 

package/src/components/layout/Layout.app-chat.spec.ts

@@ -30,6 +30,7 @@ describe("Dispatch layout scrolling", () => {
 describe("Dispatch workspace app chat rail", () => {
   it("routes the open-app rail through the shared app-chat component", () => {
     expect(layoutSource).toContain("<WorkspaceAppChatRail");
+    expect(layoutSource).toContain("workspaceAppChatRegistration ? (");
     expect(layoutSource).toContain("data-dispatch-workspace-app-frame");
     expect(layoutSource).toContain('new Event("agent-panel:toggle")');
     expect(layoutSource).toContain('new CustomEvent("agent-panel:toggle"');

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

@@ -1,3 +1,4 @@
+import { isSettingsPathname } from "@agent-native/toolkit/app/settings";
 // @vitest-environment happy-dom
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
@@ -12,7 +13,6 @@ import {
   dispatchNavLinkTarget,
   formatThreadAge,
   isElectronEmbeddedSearch,
-  isSettingsShellPath,
   NavContent,
   renderChatFirstAppSurfaceTab,
   shouldAutoCollapseDispatchSidebar,
@@ -30,18 +30,27 @@ const clientState = vi.hoisted(() => ({
     .mockResolvedValue({ startUrl: "about:blank" }),
 }));
 
-vi.mock("@agent-native/core/client/agent-chat", () => ({
-  AgentSidebar: ({ children }: { children: React.ReactNode }) => (
-    <div data-agent-sidebar>{children}</div>
-  ),
-  ExternalAgentNudge: () => null,
-  focusAgentChat: vi.fn(),
+vi.mock("@agent-native/core/client/agent-chat", async (importOriginal) => ({
+  ...(await importOriginal<
+    typeof import("@agent-native/core/client/agent-chat")
+  >()),
   navigateWithAgentChatViewTransition: (
     navigate: (path: string) => void,
     path: string,
   ) => navigate(path),
   useAgentChatHomeHandoff: () => false,
   useAgentChatHomeHandoffLinks: vi.fn(),
+  useChatModels: () => ({
+    availableModels: [],
+    defaultModel: "auto",
+    selectedModel: "auto",
+    selectedEngine: "",
+    selectedEffort: "medium" as const,
+    isLoading: false,
+    onModelChange: vi.fn(),
+    onEffortChange: vi.fn(),
+    refreshEngines: vi.fn(),
+  }),
   useChatThreads: () => ({
     threads: clientState.threads,
     activeThreadId: "active-thread",
@@ -53,6 +62,14 @@ vi.mock("@agent-native/core/client/agent-chat", () => ({
   }),
 }));
 
+vi.mock("@agent-native/toolkit/app/chat", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@agent-native/toolkit/app/chat")>()),
+  AgentSidebar: ({ children }: { children: React.ReactNode }) => (
+    <div data-agent-sidebar>{children}</div>
+  ),
+  focusAgentChat: vi.fn(),
+}));
+
 vi.mock("@agent-native/core/client/api-path", () => ({
   agentNativePath: (path: string) => path,
   appBasePath: () => clientState.basePath,
@@ -62,9 +79,11 @@ vi.mock("@agent-native/core/client/api-path", () => ({
     clientState.basePath && path.startsWith("/")
       ? `${clientState.basePath}${path}`
       : path,
+  frameworkRoutePrefix: () => "",
 }));
 
-vi.mock("@agent-native/core/client/hooks", () => ({
+vi.mock("@agent-native/core/client/hooks", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@agent-native/core/client/hooks")>()),
   useActionQuery: (action: string) => ({
     data:
       action === "list-workspace-apps" ? clientState.workspaceApps : undefined,
@@ -84,6 +103,7 @@ vi.mock("next-themes", () => ({
 }));
 
 vi.mock("@agent-native/core/client/i18n", () => ({
+  useFormatters: () => ({ formatNumber: (value: number) => String(value) }),
   useT: () => (key: string, values?: Record<string, unknown>) => {
     const messages: Record<string, string> = {
       "dispatch.nav.chat": "Chat",
@@ -105,23 +125,22 @@ vi.mock("@agent-native/core/client/i18n", () => ({
   },
 }));
 
-vi.mock("@agent-native/core/client/navigation", () => ({
+vi.mock("@agent-native/toolkit/app/shared", async (importOriginal) => ({
+  ...(await importOriginal<
+    typeof import("@agent-native/toolkit/app/shared")
+  >()),
   openCommandMenu: vi.fn(),
 }));
 
-vi.mock("@agent-native/core/client/ui", async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import("@agent-native/core/client/ui")>();
-  return {
-    ...actual,
-    AgentNativeIcon: (props: React.SVGProps<SVGSVGElement>) => (
-      <svg data-agent-native-icon {...props} />
-    ),
-    FeedbackButton: () => <div>Feedback</div>,
-  };
-});
+vi.mock("../create-app-popover", () => ({
+  CreateAppPopover: () => null,
+}));
+
+vi.mock("@agent-native/toolkit/app/feedback", () => ({
+  FeedbackButton: () => <div>Feedback</div>,
+}));
 
-vi.mock("@agent-native/core/client/org", () => ({
+vi.mock("@agent-native/toolkit/app/org", () => ({
   InvitationBanner: () => null,
   OrgSwitcher: () => <div>Organization</div>,
 }));
@@ -206,14 +225,14 @@ describe("Dispatch workspace app sidebar", () => {
 
 describe("Dispatch Settings frame", () => {
   it("drops the Dispatch chrome on Settings", () => {
-    expect(isSettingsShellPath("/settings")).toBe(true);
-    expect(isSettingsShellPath("/settings/members")).toBe(true);
-    expect(isSettingsShellPath("/settings/app")).toBe(true);
+    expect(isSettingsPathname("/settings")).toBe(true);
+    expect(isSettingsPathname("/settings/members")).toBe(true);
+    expect(isSettingsPathname("/settings/app")).toBe(true);
   });
 
   it("keeps the Dispatch chrome off Settings", () => {
-    expect(isSettingsShellPath("/admin")).toBe(false);
-    expect(isSettingsShellPath("/apps/mail/settings")).toBe(false);
+    expect(isSettingsPathname("/admin")).toBe(false);
+    expect(isSettingsPathname("/apps/mail/settings")).toBe(false);
   });
 });
 
@@ -750,10 +769,10 @@ describe("chat-first surface panel toggle stacking", () => {
   it("keeps the toggle above the mobile full-screen surface panel overlay", async () => {
     const { ChatFirstSurfacePanelToggle: RealChatFirstSurfacePanelToggle } =
       await vi.importActual<
-        typeof import("@agent-native/core/client/agent-chat")
-      >("@agent-native/core/client/agent-chat");
+        typeof import("@agent-native/toolkit/app/chat/chat-first")
+      >("@agent-native/toolkit/app/chat/chat-first");
     const { ChatFirstSurfacePanel } =
-      await import("@agent-native/core/client/chat-first");
+      await import("@agent-native/toolkit/app/chat/chat-first");
 
     const container = document.createElement("div");
     document.body.appendChild(container);
@@ -805,7 +824,7 @@ describe("chat-first app surface tab chat rail", () => {
 
   async function renderAppTab(isMobileSurface: boolean) {
     const { defaultChatFirstCopy } =
-      await import("@agent-native/core/client/chat-first");
+      await import("@agent-native/toolkit/app/chat/chat-first");
     vi.stubGlobal(
       "fetch",
       vi.fn().mockResolvedValue(new Response("{}", { status: 200 })),