@agent-native/dispatch 0.40.13 → 0.40.14-nightly-20261006010750

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

@@ -1,6 +1,88 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
-import { filterOtherApps } from "./other-apps.js";
+import { filterBuiltInApps, filterOtherApps } from "./other-apps.js";
+
+describe("filterBuiltInApps", () => {
+  it("keeps configured first-party apps not mounted in the workspace", () => {
+    expect(
+      filterBuiltInApps(
+        [
+          {
+            id: "slides",
+            name: "Slides",
+            url: "https://slides.agent-native.com",
+            source: "builtin",
+          },
+          {
+            id: "clips",
+            name: "Clips",
+            url: "https://clips.agent-native.com",
+            source: "builtin",
+          },
+          {
+            id: "custom-agent",
+            name: "Custom agent",
+            url: "https://agent.example.test",
+            source: "custom",
+          },
+          {
+            id: "workspace-agent",
+            name: "Workspace agent",
+            url: "https://workspace.example.test",
+            source: "workspace",
+          },
+          {
+            id: "invalid",
+            name: "Invalid",
+            url: "/invalid",
+            source: "builtin",
+          },
+        ],
+        [{ id: "clips" }],
+      ),
+    ).toEqual([
+      {
+        id: "slides",
+        name: "Slides",
+        url: "https://slides.agent-native.com",
+        source: "builtin",
+      },
+    ]);
+  });
+
+  it("keeps built-in app launches on the current beta lane", () => {
+    vi.stubGlobal("window", {
+      location: { hostname: "beta.agent-workspace.builder.io" },
+    });
+
+    try {
+      expect(
+        filterBuiltInApps(
+          [
+            {
+              id: "clips",
+              name: "Clips",
+              url: "https://clips.agent-native.com/",
+              homeUrl: "https://clips.agent-native.com/recordings",
+              source: "builtin",
+            },
+          ],
+          [],
+        ),
+      ).toEqual([
+        {
+          id: "clips",
+          name: "Clips",
+          url: "https://beta.clips.agent-native.com/",
+          homeUrl: "https://beta.clips.agent-native.com/recordings",
+          source: "builtin",
+        },
+      ]);
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+});
 
 describe("filterOtherApps", () => {
   it("keeps available linked apps while excluding workspace apps", () => {

package/src/lib/other-apps.ts

@@ -1,4 +1,7 @@
-import { isDefaultWorkspaceAppHiddenId } from "./workspace-apps";
+import {
+  defaultWorkspaceAppUrl,
+  isDefaultWorkspaceAppHiddenId,
+} from "./workspace-apps";
 
 export interface ConnectedAppSummary {
   id: string;
@@ -54,3 +57,38 @@ export function filterOtherApps(
     })
     .sort((a, b) => a.name.localeCompare(b.name));
 }
+
+export function filterBuiltInApps(
+  connectedApps: ConnectedAppSummary[],
+  workspaceApps: WorkspaceAppId[],
+): ConnectedAppSummary[] {
+  const workspaceAppIds = new Set([
+    "dispatch",
+    ...workspaceApps.map((app) => app.id.trim().toLowerCase()),
+  ]);
+  const seen = new Set<string>();
+
+  return connectedApps
+    .filter((app) => {
+      const id = app.id.trim().toLowerCase();
+      const url = app.homeUrl?.trim() || app.url;
+      if (
+        !id ||
+        app.source !== "builtin" ||
+        isDefaultWorkspaceAppHiddenId(id) ||
+        workspaceAppIds.has(id) ||
+        seen.has(id) ||
+        !isHttpUrl(url)
+      ) {
+        return false;
+      }
+      seen.add(id);
+      return true;
+    })
+    .map((app) => ({
+      ...app,
+      url: defaultWorkspaceAppUrl(app.url),
+      ...(app.homeUrl ? { homeUrl: defaultWorkspaceAppUrl(app.homeUrl) } : {}),
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name));
+}

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

@@ -352,6 +352,25 @@ describe("workspace app routes", () => {
     }
   });
 
+  it("preserves configured built-in launch paths over canonical defaults", () => {
+    const apps = mergeChatFirstWorkspaceApps(
+      undefined,
+      ["clips"],
+      [
+        {
+          id: "clips",
+          name: "Clips",
+          url: "https://clips.agent-native.com/recordings",
+          source: "builtin",
+        },
+      ],
+    );
+
+    expect(apps.find((app) => app.id === "clips")?.url).toBe(
+      "https://clips.agent-native.com/recordings",
+    );
+  });
+
   it("lets a mounted workspace app override a default row", () => {
     const apps = mergeChatFirstWorkspaceApps(
       [
@@ -385,6 +404,40 @@ describe("workspace app routes", () => {
     ]);
   });
 
+  it("adds every configured first-party app to the launcher", () => {
+    const apps = mergeChatFirstWorkspaceApps(
+      [],
+      ["mail", "clips", "slides"],
+      [
+        {
+          id: "mail",
+          name: "Mail",
+          url: "https://mail.agent-native.com",
+          source: "builtin",
+        },
+        {
+          id: "clips",
+          name: "Clips",
+          url: "https://clips.agent-native.com",
+          source: "builtin",
+        },
+        {
+          id: "slides",
+          name: "Slides",
+          url: "https://slides.agent-native.com",
+          source: "builtin",
+        },
+      ],
+    );
+
+    expect(apps.map((app) => app.id)).toEqual(["mail", "clips", "slides"]);
+    expect(apps.map((app) => app.source)).toEqual([
+      "builtin",
+      "builtin",
+      "builtin",
+    ]);
+  });
+
   it("adds no defaults when built-ins are off or not yet resolved", () => {
     const workspace = [{ id: "crm", name: "CRM", path: "/crm" }];
     expect(

package/src/lib/workspace-apps.ts

@@ -195,7 +195,7 @@ const DEFAULT_WORKSPACE_APP_DESCRIPTIONS: Record<
   },
 };
 
-function defaultWorkspaceAppUrl(rawUrl: string): string {
+export function defaultWorkspaceAppUrl(rawUrl: string): string {
   if (typeof window === "undefined") return rawUrl;
 
   const hostname = window.location.hostname
@@ -464,7 +464,7 @@ export function navigateToWorkspaceApp(href: string): boolean {
  * of this workspace. `enabledBuiltinAppIds` must come from the server
  * (list-connected-agents entries with source "builtin"), which already applies
  * the builder's `agent-native.builtinAgents` config. While it is unknown, no
- * default is added. `extraApps` are appended only when no entry has that id.
+ * default is added. `extraApps` fill missing rows and configured built-in URLs.
  */
 export function mergeChatFirstWorkspaceApps(
   apps: readonly WorkspaceAppSummary[] | undefined,
@@ -512,13 +512,21 @@ export function mergeChatFirstWorkspaceApps(
     });
   }
 
-  const existingIds = new Set(
-    [...merged.values()].map((app) => app.id.trim().toLowerCase()),
-  );
   for (const app of extraApps) {
     const id = app.id.trim().toLowerCase();
-    if (!id || existingIds.has(id)) continue;
-    existingIds.add(id);
+    if (!id) continue;
+    const existing = merged.get(id);
+    if (existing) {
+      if (existing.source === "builtin" && app.source === "builtin") {
+        merged.set(id, {
+          ...existing,
+          name: app.name.trim() || existing.name,
+          description: app.description ?? existing.description,
+          url: app.url?.trim() || existing.url,
+        });
+      }
+      continue;
+    }
     merged.set(id, {
       id,
       name: app.name.trim() || id,

package/src/routes/pages/apps.spec.tsx

@@ -0,0 +1,132 @@
+// @vitest-environment happy-dom
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { MemoryRouter } from "react-router";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const queryState = vi.hoisted(() => ({
+  workspaceApps: [] as Array<Record<string, unknown>>,
+  workspaceAppsError: null as Error | null,
+  workspaceAppsLoading: false,
+  connectedApps: [] as Array<Record<string, unknown>>,
+  connectedAppsError: null as Error | null,
+  connectedAppsLoading: false,
+}));
+
+vi.mock("@agent-native/core/client/hooks", () => ({
+  useActionQuery: (action: string) => {
+    const workspaceApps = action === "list-workspace-apps";
+    const connectedApps = action === "list-connected-agents";
+    const error = workspaceApps
+      ? queryState.workspaceAppsError
+      : connectedApps
+        ? queryState.connectedAppsError
+        : null;
+    return {
+      data: workspaceApps
+        ? queryState.workspaceApps
+        : connectedApps
+          ? queryState.connectedApps
+          : { name: null, displayName: null, appCount: 0 },
+      error,
+      isError: Boolean(error),
+      isLoading: workspaceApps
+        ? queryState.workspaceAppsLoading
+        : connectedApps
+          ? queryState.connectedAppsLoading
+          : false,
+      refetch: vi.fn(),
+    };
+  },
+}));
+
+vi.mock("@agent-native/core/client/i18n", () => ({
+  useT: () => (key: string, values?: Record<string, unknown>) =>
+    key === "dispatch.pages.noWorkspaceApps"
+      ? "No workspace apps"
+      : String(values?.defaultValue ?? key),
+}));
+
+vi.mock("../../components/action-query-error", () => ({
+  ActionQueryError: ({ error }: { error: Error }) => (
+    <div role="alert">{error.message}</div>
+  ),
+}));
+
+vi.mock("../../components/create-app-popover", () => ({
+  CreateAppPopover: () => null,
+}));
+
+vi.mock("../../components/dispatch-shell", () => ({
+  DispatchShell: ({ children }: { children: React.ReactNode }) => (
+    <div>{children}</div>
+  ),
+}));
+
+vi.mock("../../components/workspace-app-search", () => ({
+  WorkspaceAppSearch: () => null,
+  WorkspaceAppSearchEmpty: () => <div>No search results</div>,
+}));
+
+vi.mock("../../lib/workspace-app-layout", () => ({
+  orderWorkspaceApps: (apps: unknown[]) => apps,
+  useWorkspaceAppLayout: () => ({
+    layout: { pinnedIds: [], orderedIds: [] },
+    persistenceError: null,
+    togglePinned: vi.fn(),
+  }),
+  workspaceAppMatchesQuery: () => true,
+}));
+
+import AppsRouteEntry from "./apps";
+
+describe("Dispatch apps route", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    queryState.workspaceApps = [];
+    queryState.workspaceAppsError = null;
+    queryState.workspaceAppsLoading = false;
+    queryState.connectedApps = [];
+    queryState.connectedAppsError = null;
+    queryState.connectedAppsLoading = false;
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  async function renderAppsRoute() {
+    await act(async () => {
+      root.render(
+        <MemoryRouter initialEntries={["/apps"]}>
+          <AppsRouteEntry />
+        </MemoryRouter>,
+      );
+    });
+  }
+
+  it("does not show the empty state when connected-app discovery fails", async () => {
+    queryState.connectedAppsError = new Error("Connected apps unavailable");
+
+    await renderAppsRoute();
+
+    expect(container.querySelector('[role="alert"]')?.textContent).toContain(
+      "Connected apps unavailable",
+    );
+    expect(container.textContent).not.toContain("No workspace apps");
+  });
+
+  it("shows the empty state after successful app discovery", async () => {
+    await renderAppsRoute();
+
+    expect(container.textContent).toContain("No workspace apps");
+  });
+});

package/src/routes/pages/apps.tsx

@@ -16,6 +16,7 @@ import {
   APP_LIST_GRID_ROW_CLASS,
   AppList,
 } from "../../components/app-list-row";
+import { ConnectedAppCard } from "../../components/connected-app-card";
 import { CreateAppPopover } from "../../components/create-app-popover";
 import { DispatchShell } from "../../components/dispatch-shell";
 import { Button } from "../../components/ui/button";
@@ -30,6 +31,10 @@ import {
   WorkspaceAppSearch,
   WorkspaceAppSearchEmpty,
 } from "../../components/workspace-app-search";
+import {
+  filterBuiltInApps,
+  type ConnectedAppSummary,
+} from "../../lib/other-apps";
 import { cn } from "../../lib/utils";
 import {
   orderWorkspaceApps,
@@ -66,6 +71,10 @@ function AppsRoute() {
     includeAgentCards: false,
     includeArchived: true,
   });
+  const connectedAppsQuery = useActionQuery<ConnectedAppSummary[]>(
+    "list-connected-agents",
+    {},
+  );
   const { data: apps = [], isLoading: appsLoading } = appsQuery;
   const { data: workspace } = useActionQuery(
     "get-workspace-info",
@@ -81,6 +90,7 @@ function AppsRoute() {
   const activeApps = visibleApps.filter((app) => app.status !== "pending");
   const pendingApps = visibleApps.filter((app) => app.status === "pending");
   const archivedApps = allApps.filter((app) => app.archived);
+  const defaultApps = filterBuiltInApps(connectedAppsQuery.data ?? [], allApps);
   const orderedActiveApps = orderWorkspaceApps(activeApps, layout);
   const orderedPendingApps = orderWorkspaceApps(pendingApps, layout);
   const orderedArchivedApps = orderWorkspaceApps(archivedApps, layout);
@@ -93,11 +103,19 @@ function AppsRoute() {
   const filteredArchivedApps = orderedArchivedApps.filter((app) =>
     workspaceAppMatchesQuery(app, searchQuery),
   );
+  const filteredDefaultApps = defaultApps.filter((app) =>
+    workspaceAppMatchesQuery(app, searchQuery),
+  );
   const hasSearchResults =
     filteredActiveApps.length > 0 ||
     filteredPendingApps.length > 0 ||
-    filteredArchivedApps.length > 0;
-  const showAppSkeletons = appsLoading && allApps.length === 0;
+    filteredArchivedApps.length > 0 ||
+    filteredDefaultApps.length > 0;
+  const showAppSkeletons =
+    (appsLoading || connectedAppsQuery.isLoading) &&
+    allApps.length === 0 &&
+    defaultApps.length === 0;
+  const appDiscoveryFailed = appsQuery.isError || connectedAppsQuery.isError;
 
   return (
     <DispatchShell
@@ -132,7 +150,9 @@ function AppsRoute() {
                   onQueryChange={setSearchQuery}
                 />
               ) : null}
-              {activeApps.length > 0 || pendingApps.length > 0 ? (
+              {activeApps.length > 0 ||
+              pendingApps.length > 0 ||
+              defaultApps.length > 0 ? (
                 <CreateAppPopover
                   align="end"
                   trigger={
@@ -165,14 +185,17 @@ function AppsRoute() {
               error={appsQuery.error}
               onRetry={() => void appsQuery.refetch()}
             />
-          ) : showAppSkeletons ? (
-            <AppsSkeletonGrid />
-          ) : !hasSearchResults && searchQuery.trim() ? (
-            <WorkspaceAppSearchEmpty
-              query={searchQuery}
-              onClear={() => setSearchQuery("")}
+          ) : null}
+          {connectedAppsQuery.isError ? (
+            <ActionQueryError
+              error={connectedAppsQuery.error}
+              onRetry={() => void connectedAppsQuery.refetch()}
             />
-          ) : filteredActiveApps.length > 0 ? (
+          ) : null}
+          {showAppSkeletons ? (
+            <AppsSkeletonGrid />
+          ) : filteredActiveApps.length > 0 ||
+            filteredDefaultApps.length > 0 ? (
             <AppList className={APP_LIST_GRID_CLASS}>
               {filteredActiveApps.map((app) => (
                 <WorkspaceAppCard
@@ -183,7 +206,20 @@ function AppsRoute() {
                   onTogglePinned={() => togglePinned(app.id)}
                 />
               ))}
+              {filteredDefaultApps.map((app) => (
+                <ConnectedAppCard
+                  key={app.id}
+                  app={app}
+                  className={APP_LIST_GRID_ROW_CLASS}
+                />
+              ))}
             </AppList>
+          ) : appDiscoveryFailed ? null : !hasSearchResults &&
+            searchQuery.trim() ? (
+            <WorkspaceAppSearchEmpty
+              query={searchQuery}
+              onClear={() => setSearchQuery("")}
+            />
           ) : searchQuery.trim() ? null : pendingApps.length > 0 ? (
             <EmptyActiveAppsState />
           ) : (