@agent-native/dispatch 0.31.12 → 0.31.14

package/src/lib/workspace-apps.ts

@@ -149,6 +149,86 @@ export function workspaceAppRoute(appId: string): string {
   return `/apps/${encodeURIComponent(appId)}`;
 }
 
+function normalizeWorkspaceAppRoutePath(rawPath: string): URL | null {
+  if (
+    typeof rawPath !== "string" ||
+    !rawPath.startsWith("/") ||
+    rawPath.startsWith("//") ||
+    /[\u0000-\u001f\u007f]/.test(rawPath)
+  ) {
+    return null;
+  }
+
+  try {
+    return new URL(rawPath, "https://agent-native.invalid");
+  } catch {
+    // coercion-ok: malformed child routes are ignored by the host.
+    return null;
+  }
+}
+
+function normalizedWorkspaceAppMountPath(rawPath: string): string {
+  const pathname = rawPath.split(/[?#]/, 1)[0] ?? rawPath;
+  const normalized = `/${pathname.replace(/^[/\\]+/, "")}`;
+  return normalized.replace(/\/+$/, "") || "/";
+}
+
+function workspaceAppMountPath(
+  app: Pick<WorkspaceAppSummary, "path" | "url">,
+): string {
+  const rawUrl = app.url?.trim();
+  if (rawUrl) {
+    try {
+      const parsed = new URL(rawUrl);
+      if (parsed.protocol === "http:" || parsed.protocol === "https:") {
+        return normalizedWorkspaceAppMountPath(parsed.pathname);
+      }
+      // coercion-ok: invalid URL falls back to app path.
+    } catch {
+      // Fall through to the mounted path when optional URL metadata is invalid.
+    }
+  }
+  return normalizedWorkspaceAppMountPath(app.path?.trim() || "/");
+}
+
+/**
+ * Convert a child app route into Dispatch's shareable workspace-app route.
+ * Mounted workspace apps may report their full mount path, while hosted apps
+ * normally report only the app-local path, so accept both forms here.
+ */
+export function workspaceAppRouteForChildPath(
+  app: Pick<WorkspaceAppSummary, "id" | "path" | "url">,
+  childPath: string,
+): string | null {
+  const parsed = normalizeWorkspaceAppRoutePath(childPath);
+  if (!parsed) return null;
+
+  const mountPath = workspaceAppMountPath(app);
+  const relativePathname =
+    mountPath !== "/" &&
+    (parsed.pathname === mountPath ||
+      parsed.pathname.startsWith(`${mountPath}/`))
+      ? parsed.pathname.slice(mountPath.length) || "/"
+      : parsed.pathname;
+  const routePath = workspaceAppRoute(app.id);
+  const suffix = relativePathname === "/" ? "" : relativePathname;
+  return `${routePath}${suffix}${parsed.search}${parsed.hash}`;
+}
+
+export function workspaceAppInitialPathFromSplat(
+  routeSplat: string | undefined,
+  search: string,
+  hash: string,
+): string | undefined {
+  const pathname = routeSplat?.trim()
+    ? `/${routeSplat.trim().replace(/^[/\\]+/, "")}`
+    : "/";
+  const parsed = normalizeWorkspaceAppRoutePath(`${pathname}${search}${hash}`);
+  if (!parsed) return undefined;
+  const path = `${parsed.pathname}${parsed.search}${parsed.hash}`;
+  return path === "/" ? undefined : path;
+}
+
 export function workspaceAppIdFromRoute(pathname: string): string | null {
   const match = pathname.match(/^\/apps\/([^/]+)(?:\/|$)/);
   if (!match) return null;

package/src/routes/index.spec.ts

@@ -1,3 +1,4 @@
+import { matchRoutes } from "react-router";
 import { describe, expect, it } from "vitest";
 
 import { dispatchRoutes } from "./index.js";
@@ -19,6 +20,7 @@ describe("Dispatch route registration", () => {
     expect(paths).toContain("operations");
     expect(paths).toContain("admin");
     expect(paths).toContain("agents");
+    expect(paths).toContain("apps/:appId/*");
     expect(paths.indexOf("chat")).toBeLessThan(paths.indexOf(":appId"));
     expect(paths.indexOf("chat/:threadId")).toBeLessThan(
       paths.indexOf(":appId"),
@@ -36,4 +38,12 @@ describe("Dispatch route registration", () => {
     expect(adminPaths).not.toContain("apps/:appId");
     expect(adminPaths.indexOf("operations")).toBeGreaterThanOrEqual(0);
   });
+
+  it("matches both workspace-app roots and nested deep links", () => {
+    for (const path of ["/apps/design", "/apps/design/foobar"]) {
+      expect(matchRoutes(dispatchRoutes, path)?.at(-1)?.route.path).toBe(
+        "apps/:appId/*",
+      );
+    }
+  });
 });

package/src/routes/index.ts

@@ -62,7 +62,7 @@ export const dispatchRoutes: RouteConfig = [
   route("metrics", "./pages/metrics.js"),
   route("operations", "./pages/operations.js"),
   route("apps", "./pages/apps.js"),
-  route("apps/:appId", "./pages/apps.$appId.js"),
+  route("apps/:appId/*", "./pages/apps.$appId.js"),
   route("new-app", "./pages/new-app.js"),
   route("vault", "./pages/vault.js"),
   route("integrations", "./pages/integrations.js"),

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

@@ -5,15 +5,22 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const routeState = vi.hoisted(() => ({
   appId: "mail",
+  routeSplat: undefined as string | undefined,
+  location: { pathname: "/apps/mail", search: "", hash: "" },
   hostProps: null as {
     appId?: string;
     navigateToTopWindow?: (href: string) => boolean | void;
+    initialPath?: string;
+    onChildRouteChange?: (path: string) => void;
   } | null,
   navigateToWorkspaceApp: vi.fn(() => true),
+  navigate: vi.fn(),
 }));
 
 vi.mock("react-router", () => ({
-  useParams: () => ({ appId: routeState.appId }),
+  useParams: () => ({ appId: routeState.appId, "*": routeState.routeSplat }),
+  useLocation: () => routeState.location,
+  useNavigate: () => routeState.navigate,
 }));
 
 vi.mock("../../components/workspace-app-host", () => ({
@@ -25,6 +32,14 @@ vi.mock("../../components/workspace-app-host", () => ({
 
 vi.mock("../../lib/workspace-apps", () => ({
   navigateToWorkspaceApp: routeState.navigateToWorkspaceApp,
+  workspaceAppInitialPathFromSplat: (
+    routeSplat: string | undefined,
+    search: string,
+    hash: string,
+  ) =>
+    routeSplat || search || hash
+      ? `/${routeSplat ?? ""}${search}${hash}`
+      : undefined,
 }));
 
 import WorkspaceAppRoute from "./apps.$appId";
@@ -36,8 +51,11 @@ describe("WorkspaceAppRoute", () => {
   beforeEach(() => {
     vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
     routeState.appId = "mail";
+    routeState.routeSplat = undefined;
+    routeState.location = { pathname: "/apps/mail", search: "", hash: "" };
     routeState.hostProps = null;
     routeState.navigateToWorkspaceApp.mockClear();
+    routeState.navigate.mockClear();
     container = document.createElement("div");
     document.body.appendChild(container);
     root = createRoot(container);
@@ -63,4 +81,35 @@ describe("WorkspaceAppRoute", () => {
 
     expect(routeState.navigateToWorkspaceApp).toHaveBeenCalledWith("/mail");
   });
+
+  it("keeps the iframe synchronized with standalone deep-link navigation", async () => {
+    routeState.routeSplat = "foobar";
+    routeState.location = {
+      pathname: "/apps/mail/foobar",
+      search: "?view=all",
+      hash: "#top",
+    };
+
+    await act(async () => {
+      root.render(<WorkspaceAppRoute />);
+    });
+
+    expect(routeState.hostProps?.initialPath).toBe("/foobar?view=all#top");
+
+    routeState.routeSplat = "sent";
+    routeState.location = {
+      pathname: "/apps/mail/sent",
+      search: "",
+      hash: "",
+    };
+    await act(async () => {
+      root.render(<WorkspaceAppRoute />);
+    });
+
+    expect(routeState.hostProps?.initialPath).toBe("/sent");
+    routeState.hostProps?.onChildRouteChange?.("/apps/mail/archive");
+    expect(routeState.navigate).toHaveBeenCalledWith("/apps/mail/archive", {
+      replace: true,
+    });
+  });
 });

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

@@ -1,7 +1,11 @@
-import { useParams } from "react-router";
+import { useCallback } from "react";
+import { useLocation, useNavigate, useParams } from "react-router";
 
 import { WorkspaceAppHost } from "../../components/workspace-app-host";
-import { navigateToWorkspaceApp } from "../../lib/workspace-apps";
+import {
+  navigateToWorkspaceApp,
+  workspaceAppInitialPathFromSplat,
+} from "../../lib/workspace-apps";
 
 export function navigateWorkspaceAppFromRoute(href: string): boolean {
   return navigateToWorkspaceApp(href);
@@ -12,11 +16,30 @@ export function meta() {
 }
 
 export default function WorkspaceAppRoute() {
-  const { appId } = useParams();
+  const params = useParams();
+  const { appId } = params;
+  const location = useLocation();
+  const navigate = useNavigate();
+  const initialPath = workspaceAppInitialPathFromSplat(
+    params["*"],
+    location.search,
+    location.hash,
+  );
+  const onChildRouteChange = useCallback(
+    (path: string) => {
+      const currentPath = `${location.pathname}${location.search}${location.hash}`;
+      if (path === currentPath) return;
+      void navigate(path, { replace: true });
+    },
+    [location.hash, location.pathname, location.search, navigate],
+  );
+
   return (
     <WorkspaceAppHost
       appId={appId}
       navigateToTopWindow={navigateWorkspaceAppFromRoute}
+      initialPath={initialPath}
+      onChildRouteChange={onChildRouteChange}
     />
   );
 }

package/src/routes/pages/apps.tsx

@@ -18,7 +18,11 @@ import {
 } from "../../components/app-list-row";
 import { CreateAppPopover } from "../../components/create-app-popover";
 import { DispatchShell } from "../../components/dispatch-shell";
-import { OtherAppsSection } from "../../components/other-apps-section";
+import {
+  mergeOtherAppEntries,
+  otherAppEntryMatchesQuery,
+  OtherAppsSection,
+} from "../../components/other-apps-section";
 import { Button } from "../../components/ui/button";
 import {
   Collapsible,
@@ -92,6 +96,24 @@ 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 connectedApps =
+    (connectedAppsQuery.data as ConnectedAppSummary[] | undefined) ?? [];
+  const curatedTemplates = curatedTemplatesQuery.data as
+    | CuratedWorkspaceTemplatesResult
+    | undefined;
+  const otherAppEntries = mergeOtherAppEntries({
+    templates: curatedTemplates,
+    connectedApps,
+    workspaceApps: allApps,
+  });
+  const otherAppsSearchReady =
+    !connectedAppsQuery.isLoading && !curatedTemplatesQuery.isLoading;
+  const otherAppsMatchSearch =
+    !searchQuery.trim() ||
+    !otherAppsSearchReady ||
+    otherAppEntries.some((entry) =>
+      otherAppEntryMatchesQuery(entry, searchQuery),
+    );
   const orderedActiveApps = orderWorkspaceApps(activeApps, layout);
   const orderedPendingApps = orderWorkspaceApps(pendingApps, layout);
   const orderedArchivedApps = orderWorkspaceApps(archivedApps, layout);
@@ -107,7 +129,8 @@ function AppsRoute() {
   const hasSearchResults =
     filteredActiveApps.length > 0 ||
     filteredPendingApps.length > 0 ||
-    filteredArchivedApps.length > 0;
+    filteredArchivedApps.length > 0 ||
+    otherAppsMatchSearch;
   const showAppSkeletons = appsLoading && allApps.length === 0;
   const templateLabels: WorkspaceTemplateLabels = {
     appId: t("dispatch.pages.remixAppIdLabel"),
@@ -277,30 +300,23 @@ function AppsRoute() {
           </Collapsible>
         ) : null}
 
-        {!searchQuery.trim() ? (
-          <OtherAppsSection
-            templates={
-              curatedTemplatesQuery.data as
-                | CuratedWorkspaceTemplatesResult
-                | undefined
-            }
-            connectedApps={
-              connectedAppsQuery.data as ConnectedAppSummary[] | undefined
-            }
-            workspaceApps={allApps}
-            templatesLoading={curatedTemplatesQuery.isLoading}
-            connectedAppsLoading={connectedAppsQuery.isLoading}
-            templatesError={curatedTemplatesQuery.error}
-            connectedAppsError={connectedAppsQuery.error}
-            onRetryTemplates={() => void curatedTemplatesQuery.refetch()}
-            onRetryConnectedApps={() => void connectedAppsQuery.refetch()}
-            templateLabels={templateLabels}
-            onRemixSuccess={() => {
-              void appsQuery.refetch();
-              void curatedTemplatesQuery.refetch();
-            }}
-          />
-        ) : null}
+        <OtherAppsSection
+          templates={curatedTemplates}
+          connectedApps={connectedApps}
+          workspaceApps={allApps}
+          query={searchQuery}
+          templatesLoading={curatedTemplatesQuery.isLoading}
+          connectedAppsLoading={connectedAppsQuery.isLoading}
+          templatesError={curatedTemplatesQuery.error}
+          connectedAppsError={connectedAppsQuery.error}
+          onRetryTemplates={() => void curatedTemplatesQuery.refetch()}
+          onRetryConnectedApps={() => void connectedAppsQuery.refetch()}
+          templateLabels={templateLabels}
+          onRemixSuccess={() => {
+            void appsQuery.refetch();
+            void curatedTemplatesQuery.refetch();
+          }}
+        />
 
         {archivedApps.length > 0 &&
         (!searchQuery.trim() || filteredArchivedApps.length > 0) ? (

package/src/server/lib/usage-metrics-store.spec.ts

@@ -33,6 +33,7 @@ vi.mock("@agent-native/core/settings", () => ({
 }));
 
 vi.mock("@agent-native/core/usage", () => ({
+  builderCreditsFromCostCents: (cents: number) => cents / 4,
   getUsageSummary: (...args: any[]) => mocks.getUsageSummary(...args),
   usageBillingForEngine: () => ({
     unit: "usd",
@@ -101,7 +102,7 @@ describe("listDispatchUsageMetrics", () => {
       orgId: null,
       role: null,
       scope: "solo",
-      totalUsers: 0,
+      totalUsers: 1,
     });
     expect(metrics.totals).toEqual({
       costCents: 0,
@@ -195,6 +196,35 @@ describe("listDispatchUsageMetrics", () => {
     ).toBe(true);
   });
 
+  it("keeps an unaffiliated workspace request scoped to the signed-in user", async () => {
+    mocks.getUsageSummary.mockResolvedValue(null);
+    mocks.listWorkspaceApps.mockResolvedValue([]);
+    mocks.execute.mockResolvedValue({ rows: [] });
+
+    const metrics = await listDispatchUsageMetrics({
+      sinceDays: 30,
+      scope: "workspace",
+    });
+
+    expect(metrics.access).toMatchObject({
+      viewerEmail: "owner@example.test",
+      orgId: null,
+      scope: "solo",
+      totalUsers: 1,
+    });
+    const scopedTokenQueries = mocks.execute.mock.calls
+      .map(([query]) => String((query as { sql?: string }).sql))
+      .filter(
+        (sql) => sql.includes("FROM token_usage") && sql.includes("WHERE"),
+      );
+    expect(scopedTokenQueries.length).toBeGreaterThan(0);
+    expect(
+      scopedTokenQueries.every((sql) =>
+        sql.includes("LOWER(owner_email) IN (?)"),
+      ),
+    ).toBe(true);
+  });
+
   it("filters workspace usage and prompts to a selected member", async () => {
     mocks.currentOrgId.mockReturnValue("org-a");
     mocks.currentOwnerEmail.mockReturnValue("owner@example.test");
@@ -237,4 +267,105 @@ describe("listDispatchUsageMetrics", () => {
       }),
     ).toBe(true);
   });
+
+  it("returns monthly credits and workspace app creation rows from shared tables", async () => {
+    const firstUsageAt = Date.UTC(2026, 6, 1, 12);
+    const secondUsageAt = Date.UTC(2026, 6, 15, 12);
+    const firstCreationAt = Date.UTC(2026, 6, 2, 12);
+    const secondCreationAt = Date.UTC(2026, 6, 20, 12);
+
+    mocks.currentOrgId.mockReturnValue("org-a");
+    mocks.currentOwnerEmail.mockReturnValue("owner@example.test");
+    mocks.getUsageSummary.mockResolvedValue(null);
+    mocks.listWorkspaceApps.mockResolvedValue([]);
+    mocks.execute.mockImplementation(async ({ sql }: { sql: string }) => {
+      if (sql.includes("SELECT role FROM org_members")) {
+        return { rows: [{ role: "owner" }] };
+      }
+      if (sql.includes("SELECT email, role, joined_at")) {
+        return {
+          rows: [
+            { email: "owner@example.test", role: "owner", joined_at: null },
+            { email: "member@example.test", role: "member", joined_at: null },
+          ],
+        };
+      }
+      if (
+        sql.includes("FROM token_usage") &&
+        sql.includes("ORDER BY created_at ASC")
+      ) {
+        return {
+          rows: [
+            {
+              created_at: firstUsageAt,
+              owner_email: "member@example.test",
+              label: "chat",
+              input_tokens: 10,
+              output_tokens: 20,
+              cache_read_tokens: 0,
+              cache_write_tokens: 0,
+              cost_cents_x100: 10000,
+            },
+            {
+              created_at: secondUsageAt,
+              owner_email: "member@example.test",
+              label: "tool",
+              input_tokens: 30,
+              output_tokens: 40,
+              cache_read_tokens: 5,
+              cache_write_tokens: 2,
+              cost_cents_x100: 20000,
+            },
+          ],
+        };
+      }
+      if (sql.includes("FROM dispatch_audit_events")) {
+        return {
+          rows: [
+            {
+              created_at: firstCreationAt,
+              owner_email: "member@example.test",
+              actor: "member@example.test",
+              target_id: "app-one",
+            },
+            {
+              created_at: secondCreationAt,
+              owner_email: "member@example.test",
+              actor: "member@example.test",
+              target_id: "app-two",
+            },
+          ],
+        };
+      }
+      return { rows: [] };
+    });
+
+    const metrics = await listDispatchUsageMetrics({
+      sinceDays: 365,
+      scope: "workspace",
+    });
+
+    expect(metrics.monthlyByUser).toEqual([
+      {
+        month: "2026-07",
+        ownerEmail: "member@example.test",
+        costCents: 300,
+        credits: 75,
+        calls: 2,
+        chatCalls: 1,
+        inputTokens: 40,
+        outputTokens: 60,
+        cacheReadTokens: 5,
+        cacheWriteTokens: 2,
+      },
+    ]);
+    expect(metrics.workspaceAppCreationsByUserMonth).toEqual([
+      {
+        month: "2026-07",
+        ownerEmail: "member@example.test",
+        count: 2,
+        appIds: ["app-one", "app-two"],
+      },
+    ]);
+  });
 });