@agent-native/dispatch 0.29.1 → 0.29.3

package/dist/routes/pages/$appId.js

@@ -4,7 +4,7 @@ import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import { withBuilderUtmTrackingParams } from "@agent-native/core/shared/builder-link-tracking";
 import { IconArrowLeft, IconArrowUpRight, IconClockHour4, } from "@tabler/icons-react";
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { Link, Navigate, redirect, useParams, } from "react-router";
 import { ActionQueryError } from "../../components/action-query-error.js";
 import { DispatchShell } from "../../components/dispatch-shell.js";
@@ -12,7 +12,7 @@ import { Badge } from "../../components/ui/badge.js";
 import { Button } from "../../components/ui/button.js";
 import { Spinner } from "../../components/ui/spinner.js";
 import { resolveServerCatchAllTarget } from "../../lib/catch-all-target.js";
-import { workspaceAppHref, } from "../../lib/workspace-apps.js";
+import { navigateToWorkspaceApp, workspaceAppHref, } from "../../lib/workspace-apps.js";
 export function meta() {
     return [{ title: "Workspace app - Dispatch" }];
 }
@@ -90,20 +90,29 @@ export default function WorkspaceAppCatchAllRoute() {
     const app = useMemo(() => apps.find((item) => item.id === appId) ?? null, [appId, apps]);
     const href = app ? workspaceAppHref(app) : null;
     const isSelfReference = appId === "dispatch";
+    const hasApp = app !== null;
+    const appIsPending = app?.status === "pending";
+    const [navigationFailed, setNavigationFailed] = useState(false);
     useEffect(() => {
         if (isSelfReference)
             return;
-        if (!app || app.status === "pending" || !href)
+        if (!hasApp || appIsPending || !href) {
+            setNavigationFailed(false);
             return;
-        window.location.assign(href);
-    }, [app, href, isSelfReference]);
+        }
+        setNavigationFailed(!navigateToWorkspaceApp(href));
+    }, [appIsPending, hasApp, href, isSelfReference]);
     if (isSelfReference) {
         return _jsx(Navigate, { to: appPath("/overview"), replace: true });
     }
     if (appsQuery.isError) {
         return (_jsx(DispatchShell, { title: t("dispatch.pages.dataLoadFailed"), description: t("dispatch.pages.pageNotFoundDescription"), children: _jsx(ActionQueryError, { error: appsQuery.error, onRetry: () => void appsQuery.refetch() }) }));
     }
-    if ((isLoading && !app) || (app && app.status !== "pending" && href)) {
+    if (navigationFailed && href) {
+        return (_jsx(DispatchShell, { title: t("dispatch.pages.dataLoadFailed"), description: t("dispatch.pages.pageNotFoundDescription"), children: _jsx(ActionQueryError, { onRetry: () => setNavigationFailed(!navigateToWorkspaceApp(href)) }) }));
+    }
+    if ((isLoading && !app) ||
+        (app && app.status !== "pending" && href && !navigationFailed)) {
         return (_jsx("div", { className: "flex h-screen w-full items-center justify-center", children: _jsx(Spinner, { className: "size-8" }) }));
     }
     return (_jsx(DispatchShell, { title: app?.name || t("dispatch.pages.pageNotFound"), description: t("dispatch.pages.pageNotFoundDescription"), children: _jsxs("div", { className: "max-w-2xl rounded-lg bg-card p-5", children: [_jsx(Button, { asChild: true, size: "sm", variant: "ghost", className: "-ml-2 mb-4", children: _jsxs(Link, { to: appPath("/overview"), children: [_jsx(IconArrowLeft, { size: 15, className: "mr-1.5" }), t("dispatch.nav.overview")] }) }), app?.status === "pending" ? (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("h2", { className: "text-base font-semibold text-foreground", children: app.name }), _jsxs(Badge, { variant: "outline", className: "gap-1 border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-300", children: [_jsx(IconClockHour4, { size: 12 }), t("dispatch.pages.building")] })] }), _jsxs("p", { className: "text-sm text-muted-foreground", children: [t("dispatch.pages.appBuildingPrefix"), " ", _jsx("span", { className: "font-mono text-foreground", children: app.path }), " ", t("dispatch.pages.appBuildingSuffix")] }), app.builderUrl ? (_jsx(Button, { asChild: true, children: _jsxs("a", { href: withBuilderUtmTrackingParams(app.builderUrl, {

package/dist/routes/pages/$appId.js.map

@@ -1 +1 @@
-{"version":3,"file":"$appId.js","sourceRoot":"","sources":["../../../src/routes/pages/$appId.tsx"],"names":[],"mappings":"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","sourcesContent":["import { appPath } from \"@agent-native/core/client/api-path\";\nimport { useActionQuery } from \"@agent-native/core/client/hooks\";\nimport { useT } from \"@agent-native/core/client/i18n\";\nimport { withBuilderUtmTrackingParams } from \"@agent-native/core/shared/builder-link-tracking\";\nimport {\n  IconArrowLeft,\n  IconArrowUpRight,\n  IconClockHour4,\n} from \"@tabler/icons-react\";\nimport { useEffect, useMemo } from \"react\";\nimport {\n  Link,\n  Navigate,\n  redirect,\n  useParams,\n  type ClientLoaderFunctionArgs,\n  type LoaderFunctionArgs,\n} from \"react-router\";\n\nimport { ActionQueryError } from \"../../components/action-query-error\";\nimport { DispatchShell } from \"../../components/dispatch-shell\";\nimport { Badge } from \"../../components/ui/badge\";\nimport { Button } from \"../../components/ui/button\";\nimport { Spinner } from \"../../components/ui/spinner\";\nimport { resolveServerCatchAllTarget } from \"../../lib/catch-all-target\";\nimport {\n  workspaceAppHref,\n  type WorkspaceAppSummary,\n} from \"../../lib/workspace-apps\";\n\nexport function meta() {\n  return [{ title: \"Workspace app - Dispatch\" }];\n}\n\n/**\n * Catch-all for `/dispatch/<segment>` paths that don't match an explicit\n * Dispatch route. When `<segment>` is the id of a workspace app sibling\n * (e.g. `/dispatch/todo` after Builder.io routes a \"navigate to /todo\"\n * call through Dispatch's mount point), bounce to the absolute `/<appId>`\n * so the user lands on the actual app instead of a 404 inside Dispatch.\n *\n * Server-side redirect: we resolve the workspace app manifest via the\n * shared `loadWorkspaceAppsManifest()` helper, which checks the\n * `AGENT_NATIVE_WORKSPACE_APPS_JSON` env var, then the\n * `.agent-native/workspace-apps.json` file written by `workspace-deploy.ts`,\n * then a live filesystem scan of `apps/` for local dev. We then throw\n * `redirect(\"/<appId>\")`. React Router 7 does not prepend the basename to\n * absolute paths returned from a loader, so the redirect escapes Dispatch's\n * `/dispatch` mount cleanly.\n *\n * Why a catch-all instead of fixing the agent prompt: Builder.io currently\n * resolves \"navigate to /todo\" relative to Dispatch's mount, sending the\n * user to /dispatch/todo. The same wrong path then gets captured as the\n * OAuth callbackURL, so Google sign-in completes back at /dispatch/todo\n * and looks broken. This route fixes both the post-creation navigation\n * and the OAuth round-trip from a single place.\n *\n * Built-in template fallback: when no workspace manifest is available\n * (framework dev with each template on its own port, hosted dispatch with\n * no sibling apps), redirect to the matching first-party template's deploy\n * URL — `http://localhost:<devPort>` in dev, `https://<id>.agent-native.com`\n * in production. Without this, a user visiting `/forms` on dispatch is\n * forced to sign in (auth guard) and then lands on this route's \"Page not\n * found\" pane after the post-login reload.\n *\n * `appId === \"dispatch\"` short-circuit: when the segment matches Dispatch\n * itself (e.g. `/dispatch/dispatch`), we go straight to the overview rather\n * than chaining through `/dispatch` (which polled `useActionQuery` re-fired\n * `window.location.assign` against and looped forever in production).\n */\nfunction dispatchSelfRedirect(appId: string | undefined): string | null {\n  if (appId === \"dispatch\") return appPath(\"/overview\");\n  return null;\n}\n\nexport async function loader({ params }: LoaderFunctionArgs) {\n  const appId = params.appId;\n  if (!appId) return null;\n  const selfTarget = dispatchSelfRedirect(appId);\n  if (selfTarget) throw redirect(selfTarget);\n  const target = await resolveServerCatchAllTarget(appId);\n  if (target) throw redirect(target);\n  return null;\n}\n\nexport async function clientLoader({\n  params,\n  serverLoader,\n}: ClientLoaderFunctionArgs) {\n  const selfTarget = dispatchSelfRedirect(params.appId);\n  if (selfTarget) throw redirect(selfTarget);\n  // Defer to the server loader so the built-in template fallback runs on\n  // SPA navigations too (e.g. clicking a `/<template-id>` link inside\n  // dispatch). Without this the client side would only check the workspace\n  // apps query, which never lists the static first-party templates and so\n  // the user would land on the \"Page not found\" pane.\n  return serverLoader();\n}\n\nexport default function WorkspaceAppCatchAllRoute() {\n  const t = useT();\n  const { appId } = useParams();\n  const appsQuery = useActionQuery(\"list-workspace-apps\", {\n    includeAgentCards: false,\n  });\n  const { data: apps = [], isLoading } = appsQuery;\n  const app = useMemo(\n    () =>\n      (apps as WorkspaceAppSummary[]).find((item) => item.id === appId) ?? null,\n    [appId, apps],\n  );\n  const href = app ? workspaceAppHref(app) : null;\n  const isSelfReference = appId === \"dispatch\";\n\n  useEffect(() => {\n    if (isSelfReference) return;\n    if (!app || app.status === \"pending\" || !href) return;\n    window.location.assign(href);\n  }, [app, href, isSelfReference]);\n\n  if (isSelfReference) {\n    return <Navigate to={appPath(\"/overview\")} replace />;\n  }\n\n  if (appsQuery.isError) {\n    return (\n      <DispatchShell\n        title={t(\"dispatch.pages.dataLoadFailed\")}\n        description={t(\"dispatch.pages.pageNotFoundDescription\")}\n      >\n        <ActionQueryError\n          error={appsQuery.error}\n          onRetry={() => void appsQuery.refetch()}\n        />\n      </DispatchShell>\n    );\n  }\n\n  if ((isLoading && !app) || (app && app.status !== \"pending\" && href)) {\n    return (\n      <div className=\"flex h-screen w-full items-center justify-center\">\n        <Spinner className=\"size-8\" />\n      </div>\n    );\n  }\n\n  return (\n    <DispatchShell\n      title={app?.name || t(\"dispatch.pages.pageNotFound\")}\n      description={t(\"dispatch.pages.pageNotFoundDescription\")}\n    >\n      <div className=\"max-w-2xl rounded-lg bg-card p-5\">\n        <Button asChild size=\"sm\" variant=\"ghost\" className=\"-ml-2 mb-4\">\n          <Link to={appPath(\"/overview\")}>\n            <IconArrowLeft size={15} className=\"mr-1.5\" />\n            {t(\"dispatch.nav.overview\")}\n          </Link>\n        </Button>\n\n        {app?.status === \"pending\" ? (\n          <div className=\"space-y-4\">\n            <div className=\"flex flex-wrap items-center gap-2\">\n              <h2 className=\"text-base font-semibold text-foreground\">\n                {app.name}\n              </h2>\n              <Badge\n                variant=\"outline\"\n                className=\"gap-1 border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-300\"\n              >\n                <IconClockHour4 size={12} />\n                {t(\"dispatch.pages.building\")}\n              </Badge>\n            </div>\n            <p className=\"text-sm text-muted-foreground\">\n              {t(\"dispatch.pages.appBuildingPrefix\")}{\" \"}\n              <span className=\"font-mono text-foreground\">{app.path}</span>{\" \"}\n              {t(\"dispatch.pages.appBuildingSuffix\")}\n            </p>\n            {app.builderUrl ? (\n              <Button asChild>\n                <a\n                  href={withBuilderUtmTrackingParams(app.builderUrl, {\n                    campaign: \"product\",\n                    content: \"dispatch_branch\",\n                  })}\n                  target=\"_blank\"\n                  rel=\"noreferrer\"\n                >\n                  {t(\"dispatch.pages.openBuilderBranch\", {\n                    defaultValue: \"Open in Builder\",\n                  })}\n                  <IconArrowUpRight size={15} className=\"ml-1.5\" />\n                </a>\n              </Button>\n            ) : null}\n          </div>\n        ) : (\n          <div className=\"space-y-3\">\n            <h2 className=\"text-base font-semibold text-foreground\">\n              {t(\"dispatch.pages.pageNotFound\")}\n            </h2>\n            <p className=\"text-sm text-muted-foreground\">\n              <span className=\"font-mono text-foreground\">/{appId}</span> isn't\n              {t(\"dispatch.pages.notDispatchOrWorkspaceApp\")}\n            </p>\n            <Button asChild>\n              <Link to={appPath(\"/apps\")}>\n                {t(\"dispatch.pages.browseApps\")}\n              </Link>\n            </Button>\n          </div>\n        )}\n      </div>\n    </DispatchShell>\n  );\n}\n"]}
+{"version":3,"file":"$appId.js","sourceRoot":"","sources":["../../../src/routes/pages/$appId.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,iDAAiD,CAAC;AAC/F,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,SAAS,GAGV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACL,sBAAsB,EACtB,gBAAgB,GAEjB,MAAM,0BAA0B,CAAC;AAElC,MAAM,UAAU,IAAI;IAClB,OAAO,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,SAAS,oBAAoB,CAAC,KAAyB;IACrD,IAAI,KAAK,KAAK,UAAU;QAAE,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;IACtD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAE,MAAM,EAAsB;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,UAAU;QAAE,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,MAAM;QAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EACjC,MAAM,EACN,YAAY,GACa;IACzB,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,UAAU;QAAE,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC3C,uEAAuE;IACvE,oEAAoE;IACpE,yEAAyE;IACzE,wEAAwE;IACxE,oDAAoD;IACpD,OAAO,YAAY,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,yBAAyB;IAC/C,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;IACjB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,cAAc,CAAC,qBAAqB,EAAE;QACtD,iBAAiB,EAAE,KAAK;KACzB,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjD,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CACF,IAA8B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,IAAI,IAAI,EAC3E,CAAC,KAAK,EAAE,IAAI,CAAC,CACd,CAAC;IACF,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,MAAM,eAAe,GAAG,KAAK,KAAK,UAAU,CAAC;IAC7C,MAAM,MAAM,GAAG,GAAG,KAAK,IAAI,CAAC;IAC5B,MAAM,YAAY,GAAG,GAAG,EAAE,MAAM,KAAK,SAAS,CAAC;IAC/C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,eAAe;YAAE,OAAO;QAC5B,IAAI,CAAC,MAAM,IAAI,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC;YACrC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,mBAAmB,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAElD,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,KAAC,QAAQ,IAAC,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,SAAG,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAE,CAAC,CAAC,+BAA+B,CAAC,EACzC,WAAW,EAAE,CAAC,CAAC,wCAAwC,CAAC,YAExD,KAAC,gBAAgB,IACf,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,SAAS,CAAC,OAAO,EAAE,GACvC,GACY,CACjB,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;QAC7B,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAE,CAAC,CAAC,+BAA+B,CAAC,EACzC,WAAW,EAAE,CAAC,CAAC,wCAAwC,CAAC,YAExD,KAAC,gBAAgB,IACf,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,GACjE,GACY,CACjB,CAAC;IACJ,CAAC;IAED,IACE,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,IAAI,CAAC,gBAAgB,CAAC,EAC9D,CAAC;QACD,OAAO,CACL,cAAK,SAAS,EAAC,kDAAkD,YAC/D,KAAC,OAAO,IAAC,SAAS,EAAC,QAAQ,GAAG,GAC1B,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,6BAA6B,CAAC,EACpD,WAAW,EAAE,CAAC,CAAC,wCAAwC,CAAC,YAExD,eAAK,SAAS,EAAC,kCAAkC,aAC/C,KAAC,MAAM,IAAC,OAAO,QAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,OAAO,EAAC,SAAS,EAAC,YAAY,YAC9D,MAAC,IAAI,IAAC,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,aAC5B,KAAC,aAAa,IAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAC,QAAQ,GAAG,EAC7C,CAAC,CAAC,uBAAuB,CAAC,IACtB,GACA,EAER,GAAG,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAC3B,eAAK,SAAS,EAAC,WAAW,aACxB,eAAK,SAAS,EAAC,mCAAmC,aAChD,aAAI,SAAS,EAAC,yCAAyC,YACpD,GAAG,CAAC,IAAI,GACN,EACL,MAAC,KAAK,IACJ,OAAO,EAAC,SAAS,EACjB,SAAS,EAAC,8EAA8E,aAExF,KAAC,cAAc,IAAC,IAAI,EAAE,EAAE,GAAI,EAC3B,CAAC,CAAC,yBAAyB,CAAC,IACvB,IACJ,EACN,aAAG,SAAS,EAAC,+BAA+B,aACzC,CAAC,CAAC,kCAAkC,CAAC,EAAE,GAAG,EAC3C,eAAM,SAAS,EAAC,2BAA2B,YAAE,GAAG,CAAC,IAAI,GAAQ,EAAC,GAAG,EAChE,CAAC,CAAC,kCAAkC,CAAC,IACpC,EACH,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAChB,KAAC,MAAM,IAAC,OAAO,kBACb,aACE,IAAI,EAAE,4BAA4B,CAAC,GAAG,CAAC,UAAU,EAAE;oCACjD,QAAQ,EAAE,SAAS;oCACnB,OAAO,EAAE,iBAAiB;iCAC3B,CAAC,EACF,MAAM,EAAC,QAAQ,EACf,GAAG,EAAC,YAAY,aAEf,CAAC,CAAC,kCAAkC,EAAE;wCACrC,YAAY,EAAE,iBAAiB;qCAChC,CAAC,EACF,KAAC,gBAAgB,IAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAC,QAAQ,GAAG,IAC/C,GACG,CACV,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,WAAW,aACxB,aAAI,SAAS,EAAC,yCAAyC,YACpD,CAAC,CAAC,6BAA6B,CAAC,GAC9B,EACL,aAAG,SAAS,EAAC,+BAA+B,aAC1C,gBAAM,SAAS,EAAC,2BAA2B,kBAAG,KAAK,IAAQ,YAC1D,CAAC,CAAC,0CAA0C,CAAC,IAC5C,EACJ,KAAC,MAAM,IAAC,OAAO,kBACb,KAAC,IAAI,IAAC,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,YACvB,CAAC,CAAC,2BAA2B,CAAC,GAC1B,GACA,IACL,CACP,IACG,GACQ,CACjB,CAAC;AACJ,CAAC","sourcesContent":["import { appPath } from \"@agent-native/core/client/api-path\";\nimport { useActionQuery } from \"@agent-native/core/client/hooks\";\nimport { useT } from \"@agent-native/core/client/i18n\";\nimport { withBuilderUtmTrackingParams } from \"@agent-native/core/shared/builder-link-tracking\";\nimport {\n  IconArrowLeft,\n  IconArrowUpRight,\n  IconClockHour4,\n} from \"@tabler/icons-react\";\nimport { useEffect, useMemo, useState } from \"react\";\nimport {\n  Link,\n  Navigate,\n  redirect,\n  useParams,\n  type ClientLoaderFunctionArgs,\n  type LoaderFunctionArgs,\n} from \"react-router\";\n\nimport { ActionQueryError } from \"../../components/action-query-error\";\nimport { DispatchShell } from \"../../components/dispatch-shell\";\nimport { Badge } from \"../../components/ui/badge\";\nimport { Button } from \"../../components/ui/button\";\nimport { Spinner } from \"../../components/ui/spinner\";\nimport { resolveServerCatchAllTarget } from \"../../lib/catch-all-target\";\nimport {\n  navigateToWorkspaceApp,\n  workspaceAppHref,\n  type WorkspaceAppSummary,\n} from \"../../lib/workspace-apps\";\n\nexport function meta() {\n  return [{ title: \"Workspace app - Dispatch\" }];\n}\n\n/**\n * Catch-all for `/dispatch/<segment>` paths that don't match an explicit\n * Dispatch route. When `<segment>` is the id of a workspace app sibling\n * (e.g. `/dispatch/todo` after Builder.io routes a \"navigate to /todo\"\n * call through Dispatch's mount point), bounce to the absolute `/<appId>`\n * so the user lands on the actual app instead of a 404 inside Dispatch.\n *\n * Server-side redirect: we resolve the workspace app manifest via the\n * shared `loadWorkspaceAppsManifest()` helper, which checks the\n * `AGENT_NATIVE_WORKSPACE_APPS_JSON` env var, then the\n * `.agent-native/workspace-apps.json` file written by `workspace-deploy.ts`,\n * then a live filesystem scan of `apps/` for local dev. We then throw\n * `redirect(\"/<appId>\")`. React Router 7 does not prepend the basename to\n * absolute paths returned from a loader, so the redirect escapes Dispatch's\n * `/dispatch` mount cleanly.\n *\n * Why a catch-all instead of fixing the agent prompt: Builder.io currently\n * resolves \"navigate to /todo\" relative to Dispatch's mount, sending the\n * user to /dispatch/todo. The same wrong path then gets captured as the\n * OAuth callbackURL, so Google sign-in completes back at /dispatch/todo\n * and looks broken. This route fixes both the post-creation navigation\n * and the OAuth round-trip from a single place.\n *\n * Built-in template fallback: when no workspace manifest is available\n * (framework dev with each template on its own port, hosted dispatch with\n * no sibling apps), redirect to the matching first-party template's deploy\n * URL — `http://localhost:<devPort>` in dev, `https://<id>.agent-native.com`\n * in production. Without this, a user visiting `/forms` on dispatch is\n * forced to sign in (auth guard) and then lands on this route's \"Page not\n * found\" pane after the post-login reload.\n *\n * `appId === \"dispatch\"` short-circuit: when the segment matches Dispatch\n * itself (e.g. `/dispatch/dispatch`), we go straight to the overview rather\n * than chaining through `/dispatch` (which polled `useActionQuery` re-fired\n * `window.location.assign` against and looped forever in production).\n */\nfunction dispatchSelfRedirect(appId: string | undefined): string | null {\n  if (appId === \"dispatch\") return appPath(\"/overview\");\n  return null;\n}\n\nexport async function loader({ params }: LoaderFunctionArgs) {\n  const appId = params.appId;\n  if (!appId) return null;\n  const selfTarget = dispatchSelfRedirect(appId);\n  if (selfTarget) throw redirect(selfTarget);\n  const target = await resolveServerCatchAllTarget(appId);\n  if (target) throw redirect(target);\n  return null;\n}\n\nexport async function clientLoader({\n  params,\n  serverLoader,\n}: ClientLoaderFunctionArgs) {\n  const selfTarget = dispatchSelfRedirect(params.appId);\n  if (selfTarget) throw redirect(selfTarget);\n  // Defer to the server loader so the built-in template fallback runs on\n  // SPA navigations too (e.g. clicking a `/<template-id>` link inside\n  // dispatch). Without this the client side would only check the workspace\n  // apps query, which never lists the static first-party templates and so\n  // the user would land on the \"Page not found\" pane.\n  return serverLoader();\n}\n\nexport default function WorkspaceAppCatchAllRoute() {\n  const t = useT();\n  const { appId } = useParams();\n  const appsQuery = useActionQuery(\"list-workspace-apps\", {\n    includeAgentCards: false,\n  });\n  const { data: apps = [], isLoading } = appsQuery;\n  const app = useMemo(\n    () =>\n      (apps as WorkspaceAppSummary[]).find((item) => item.id === appId) ?? null,\n    [appId, apps],\n  );\n  const href = app ? workspaceAppHref(app) : null;\n  const isSelfReference = appId === \"dispatch\";\n  const hasApp = app !== null;\n  const appIsPending = app?.status === \"pending\";\n  const [navigationFailed, setNavigationFailed] = useState(false);\n\n  useEffect(() => {\n    if (isSelfReference) return;\n    if (!hasApp || appIsPending || !href) {\n      setNavigationFailed(false);\n      return;\n    }\n    setNavigationFailed(!navigateToWorkspaceApp(href));\n  }, [appIsPending, hasApp, href, isSelfReference]);\n\n  if (isSelfReference) {\n    return <Navigate to={appPath(\"/overview\")} replace />;\n  }\n\n  if (appsQuery.isError) {\n    return (\n      <DispatchShell\n        title={t(\"dispatch.pages.dataLoadFailed\")}\n        description={t(\"dispatch.pages.pageNotFoundDescription\")}\n      >\n        <ActionQueryError\n          error={appsQuery.error}\n          onRetry={() => void appsQuery.refetch()}\n        />\n      </DispatchShell>\n    );\n  }\n\n  if (navigationFailed && href) {\n    return (\n      <DispatchShell\n        title={t(\"dispatch.pages.dataLoadFailed\")}\n        description={t(\"dispatch.pages.pageNotFoundDescription\")}\n      >\n        <ActionQueryError\n          onRetry={() => setNavigationFailed(!navigateToWorkspaceApp(href))}\n        />\n      </DispatchShell>\n    );\n  }\n\n  if (\n    (isLoading && !app) ||\n    (app && app.status !== \"pending\" && href && !navigationFailed)\n  ) {\n    return (\n      <div className=\"flex h-screen w-full items-center justify-center\">\n        <Spinner className=\"size-8\" />\n      </div>\n    );\n  }\n\n  return (\n    <DispatchShell\n      title={app?.name || t(\"dispatch.pages.pageNotFound\")}\n      description={t(\"dispatch.pages.pageNotFoundDescription\")}\n    >\n      <div className=\"max-w-2xl rounded-lg bg-card p-5\">\n        <Button asChild size=\"sm\" variant=\"ghost\" className=\"-ml-2 mb-4\">\n          <Link to={appPath(\"/overview\")}>\n            <IconArrowLeft size={15} className=\"mr-1.5\" />\n            {t(\"dispatch.nav.overview\")}\n          </Link>\n        </Button>\n\n        {app?.status === \"pending\" ? (\n          <div className=\"space-y-4\">\n            <div className=\"flex flex-wrap items-center gap-2\">\n              <h2 className=\"text-base font-semibold text-foreground\">\n                {app.name}\n              </h2>\n              <Badge\n                variant=\"outline\"\n                className=\"gap-1 border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-300\"\n              >\n                <IconClockHour4 size={12} />\n                {t(\"dispatch.pages.building\")}\n              </Badge>\n            </div>\n            <p className=\"text-sm text-muted-foreground\">\n              {t(\"dispatch.pages.appBuildingPrefix\")}{\" \"}\n              <span className=\"font-mono text-foreground\">{app.path}</span>{\" \"}\n              {t(\"dispatch.pages.appBuildingSuffix\")}\n            </p>\n            {app.builderUrl ? (\n              <Button asChild>\n                <a\n                  href={withBuilderUtmTrackingParams(app.builderUrl, {\n                    campaign: \"product\",\n                    content: \"dispatch_branch\",\n                  })}\n                  target=\"_blank\"\n                  rel=\"noreferrer\"\n                >\n                  {t(\"dispatch.pages.openBuilderBranch\", {\n                    defaultValue: \"Open in Builder\",\n                  })}\n                  <IconArrowUpRight size={15} className=\"ml-1.5\" />\n                </a>\n              </Button>\n            ) : null}\n          </div>\n        ) : (\n          <div className=\"space-y-3\">\n            <h2 className=\"text-base font-semibold text-foreground\">\n              {t(\"dispatch.pages.pageNotFound\")}\n            </h2>\n            <p className=\"text-sm text-muted-foreground\">\n              <span className=\"font-mono text-foreground\">/{appId}</span> isn't\n              {t(\"dispatch.pages.notDispatchOrWorkspaceApp\")}\n            </p>\n            <Button asChild>\n              <Link to={appPath(\"/apps\")}>\n                {t(\"dispatch.pages.browseApps\")}\n              </Link>\n            </Button>\n          </div>\n        )}\n      </div>\n    </DispatchShell>\n  );\n}\n"]}

package/dist/routes/pages/apps.$appId.d.ts

@@ -1,3 +1,4 @@
+export declare function navigateWorkspaceAppFromRoute(href: string): boolean;
 export declare function meta(): {
     title: string;
 }[];

package/dist/routes/pages/apps.$appId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apps.$appId.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/apps.$appId.tsx"],"names":[],"mappings":"AAIA,wBAAgB,IAAI;;IAEnB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,oDAGxC"}
+{"version":3,"file":"apps.$appId.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/apps.$appId.tsx"],"names":[],"mappings":"AAKA,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,IAAI;;IAEnB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,oDAQxC"}

package/dist/routes/pages/apps.$appId.js

@@ -1,11 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useParams } from "react-router";
 import { WorkspaceAppHost } from "../../components/workspace-app-host.js";
+import { navigateToWorkspaceApp } from "../../lib/workspace-apps.js";
+export function navigateWorkspaceAppFromRoute(href) {
+    return navigateToWorkspaceApp(href);
+}
 export function meta() {
     return [{ title: "Workspace app - Dispatch" }];
 }
 export default function WorkspaceAppRoute() {
     const { appId } = useParams();
-    return _jsx(WorkspaceAppHost, { appId: appId });
+    return (_jsx(WorkspaceAppHost, { appId: appId, navigateToTopWindow: navigateWorkspaceAppFromRoute }));
 }
 //# sourceMappingURL=apps.$appId.js.map

package/dist/routes/pages/apps.$appId.js.map

@@ -1 +1 @@
-{"version":3,"file":"apps.$appId.js","sourceRoot":"","sources":["../../../src/routes/pages/apps.$appId.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,MAAM,UAAU,IAAI;IAClB,OAAO,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB;IACvC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAC;IAC9B,OAAO,KAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC;AAC5C,CAAC","sourcesContent":["import { useParams } from \"react-router\";\n\nimport { WorkspaceAppHost } from \"../../components/workspace-app-host\";\n\nexport function meta() {\n  return [{ title: \"Workspace app - Dispatch\" }];\n}\n\nexport default function WorkspaceAppRoute() {\n  const { appId } = useParams();\n  return <WorkspaceAppHost appId={appId} />;\n}\n"]}
+{"version":3,"file":"apps.$appId.js","sourceRoot":"","sources":["../../../src/routes/pages/apps.$appId.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,UAAU,6BAA6B,CAAC,IAAY;IACxD,OAAO,sBAAsB,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,IAAI;IAClB,OAAO,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB;IACvC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAC;IAC9B,OAAO,CACL,KAAC,gBAAgB,IACf,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,6BAA6B,GAClD,CACH,CAAC;AACJ,CAAC","sourcesContent":["import { useParams } from \"react-router\";\n\nimport { WorkspaceAppHost } from \"../../components/workspace-app-host\";\nimport { navigateToWorkspaceApp } from \"../../lib/workspace-apps\";\n\nexport function navigateWorkspaceAppFromRoute(href: string): boolean {\n  return navigateToWorkspaceApp(href);\n}\n\nexport function meta() {\n  return [{ title: \"Workspace app - Dispatch\" }];\n}\n\nexport default function WorkspaceAppRoute() {\n  const { appId } = useParams();\n  return (\n    <WorkspaceAppHost\n      appId={appId}\n      navigateToTopWindow={navigateWorkspaceAppFromRoute}\n    />\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/dispatch",
-  "version": "0.29.1",
+  "version": "0.29.3",
   "description": "Dispatch — workspace control plane for agent-native apps. Vault, integrations, destinations, scheduled jobs, and cross-app delegation, shipped as a single drop-in package.",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -101,7 +101,7 @@
     "typescript-7": "npm:typescript@^7.0.2",
     "vite": "8.1.0",
     "vitest": "^4.1.5",
-    "@agent-native/core": "0.161.14"
+    "@agent-native/core": "0.161.17"
   },
   "peerDependencies": {
     "@agent-native/core": ">=0.8.0",

package/src/actions/list-workspace-apps.ts

@@ -20,6 +20,9 @@ export default defineAction({
       .describe(
         "Fetch each ready app's /.well-known/agent-card.json with a short non-throwing timeout and include agentCardUrl, agentCardReachable, a2aEndpointUrl, agentName, and agentSkillsCount. Defaults to true for agent calls; UI polling should pass false. Pending Builder apps are not probed.",
       ),
+    includeArchived: httpBoolean
+      .default(false)
+      .describe("Include archived workspace apps in the result."),
     audience: z
       .enum(["all", "internal", "public"])
       .default("all")

package/src/components/layout/Layout.tsx

@@ -1403,7 +1403,7 @@ export function Layout({
   const chatFirstAppLayoutHydratedRef = useRef(false);
   const chatFirstAppsQuery = useActionQuery<WorkspaceAppSummary[]>(
     "list-workspace-apps",
-    { includeAgentCards: false },
+    { includeAgentCards: false, includeArchived: true },
     { enabled: chatFirstMode },
   );
   const chatFirstGrantedAppsQuery = useActionQuery<ChatFirstGrantedAppsResult>(

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

@@ -2,6 +2,7 @@
 
 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 clientState = vi.hoisted(() => {
@@ -13,8 +14,19 @@ const clientState = vi.hoisted(() => {
   }));
   const legacyErrorMutateAsync = vi.fn();
   const actionNames: string[] = [];
+  const actionQueryParams: Array<{
+    name: string;
+    params?: unknown;
+  }> = [];
+  const actionQueryOptions: Array<{
+    name: string;
+    options?: Record<string, unknown>;
+  }> = [];
   return {
     actionNames,
+    actionQueryParams,
+    actionQueryOptions,
+    workspaceApps: null as Array<Record<string, unknown>> | null,
     grantedApps: [
       {
         id: "analytics.agent-native.com",
@@ -25,6 +37,7 @@ const clientState = vi.hoisted(() => {
     legacyMutateAsync,
     legacyMutateError: null as Error | null,
     legacyErrorMutateAsync,
+    inBuilderFrame: false,
     frameLoadHandler: null as (() => void) | null,
     suppressFrameLoad: false,
     theme: "dark" as "dark" | "light",
@@ -81,6 +94,10 @@ vi.mock("@agent-native/core/client/feature-flags", () => ({
   useFeatureFlag: () => clientState.workspaceSsoEnabled,
 }));
 
+vi.mock("@agent-native/core/client/host", () => ({
+  isInBuilderFrame: () => clientState.inBuilderFrame,
+}));
+
 vi.mock("@agent-native/core/client/hooks", () => ({
   useActionMutation: (name: string) => {
     clientState.actionNames.push(name);
@@ -93,44 +110,54 @@ vi.mock("@agent-native/core/client/hooks", () => ({
             : clientState.legacyMutateAsync,
     };
   },
-  useActionQuery: (name: string) => ({
-    data:
-      name === "list_apps"
-        ? { apps: clientState.grantedApps }
-        : [
-            {
-              id: "mail",
-              name: "Mail",
-              path: "/mail",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "calendar",
-              name: "Calendar",
-              path: "/calendar",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "documents",
-              name: "Documents",
-              path: "/documents",
-              url: null,
-              status: "ready",
-            },
-            {
-              id: "settings",
-              name: "Settings",
-              path: "/settings",
-              url: null,
-              status: "ready",
-            },
-          ],
-    isError: false,
-    isLoading: false,
-    refetch: vi.fn(),
-  }),
+  useActionQuery: (name: string, params?: unknown, options?: unknown) => {
+    clientState.actionQueryParams.push({ name, params });
+    clientState.actionQueryOptions.push({
+      name,
+      options:
+        options && typeof options === "object"
+          ? (options as Record<string, unknown>)
+          : undefined,
+    });
+    return {
+      data:
+        name === "list_apps"
+          ? { apps: clientState.grantedApps }
+          : (clientState.workspaceApps ?? [
+              {
+                id: "mail",
+                name: "Mail",
+                path: "/mail",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "calendar",
+                name: "Calendar",
+                path: "/calendar",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "documents",
+                name: "Documents",
+                path: "/documents",
+                url: null,
+                status: "ready",
+              },
+              {
+                id: "settings",
+                name: "Settings",
+                path: "/settings",
+                url: null,
+                status: "ready",
+              },
+            ]),
+      isError: false,
+      isLoading: false,
+      refetch: vi.fn(),
+    };
+  },
 }));
 
 vi.mock("@agent-native/core/client/i18n", () => ({
@@ -153,9 +180,13 @@ describe("WorkspaceAppKeepAlive", () => {
     document.body.appendChild(container);
     root = createRoot(container);
     clientState.actionNames.length = 0;
+    clientState.actionQueryParams.length = 0;
+    clientState.actionQueryOptions.length = 0;
+    clientState.workspaceApps = null;
     clientState.legacyMutateAsync.mockClear();
     clientState.legacyMutateError = null;
     clientState.legacyErrorMutateAsync.mockReset();
+    clientState.inBuilderFrame = false;
     clientState.frameLoadHandler = null;
     clientState.suppressFrameLoad = false;
     clientState.workspaceSsoMutateAsync.mockClear();
@@ -166,6 +197,14 @@ describe("WorkspaceAppKeepAlive", () => {
   afterEach(() => {
     act(() => root.unmount());
     container.remove();
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: window,
+    });
+    Object.defineProperty(window, "top", {
+      configurable: true,
+      value: window,
+    });
     vi.unstubAllGlobals();
   });
 
@@ -198,6 +237,15 @@ describe("WorkspaceAppKeepAlive", () => {
     expect(calendarEntry?.classList.contains("hidden")).toBe(false);
     expect(calendarEntry?.querySelector("iframe")).not.toBeNull();
     expect(container.querySelectorAll("iframe")).toHaveLength(2);
+    expect(
+      clientState.actionQueryParams.find(
+        (query) => query.name === "list-workspace-apps",
+      )?.params,
+    ).toEqual({ includeAgentCards: false, includeArchived: true });
+    expect(
+      clientState.actionQueryOptions.find((query) => query.name === "list_apps")
+        ?.options?.enabled,
+    ).toBe(false);
   });
 
   it("resolves a granted external app instead of showing app not found", async () => {
@@ -222,6 +270,38 @@ describe("WorkspaceAppKeepAlive", () => {
       url: "https://analytics.agent-native.com",
       chrome: "minimal",
     });
+    expect(
+      clientState.actionQueryOptions.find((query) => query.name === "list_apps")
+        ?.options?.enabled,
+    ).toBe(true);
+  });
+
+  it("does not resolve archived workspace apps from granted discovery", async () => {
+    clientState.workspaceApps = [
+      {
+        id: "analytics.agent-native.com",
+        name: "Hidden app",
+        path: "/hidden-app",
+        url: null,
+        status: "ready",
+        archived: true,
+      },
+    ];
+
+    await act(async () => {
+      root.render(
+        <MemoryRouter>
+          <WorkspaceAppKeepAlive activeAppId="analytics.agent-native.com" />
+        </MemoryRouter>,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(
+      container.querySelector('[data-chat-first-app-status="ready"]'),
+    ).toBeNull();
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
   });
 
   it("uses the app-scoped workspace session action when the rollout is enabled", async () => {
@@ -354,6 +434,110 @@ describe("WorkspaceAppKeepAlive", () => {
     ).toBe("Workspace SSO is temporarily unavailable");
   });
 
+  it("opens the app in the top window when Dispatch is inside an iframe", async () => {
+    const topWindow = { location: { href: "" } } as unknown as Window;
+    const expectedUrl = new URL("/mail", window.location.href).href;
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: {},
+    });
+    Object.defineProperty(window, "top", {
+      configurable: true,
+      value: topWindow,
+    });
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame app={{ id: "mail", name: "Mail", path: "/mail" }} />,
+      );
+      await Promise.resolve();
+    });
+
+    expect(topWindow.location.href).toBe(expectedUrl);
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
+    expect(container.querySelector("iframe")).toBeNull();
+  });
+
+  it("falls back to the embedded app when top-window navigation is blocked", async () => {
+    const navigateToTopWindow = vi.fn(() => false);
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: {},
+    });
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame
+          app={{ id: "mail", name: "Mail", path: "/mail" }}
+          navigateToTopWindow={navigateToTopWindow}
+        />,
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(navigateToTopWindow).toHaveBeenCalledWith("/mail");
+    expect(clientState.legacyMutateAsync).toHaveBeenCalledWith({
+      app: "mail",
+      path: "/mail",
+      chrome: "minimal",
+    });
+    expect(container.querySelector("iframe")).not.toBeNull();
+  });
+
+  it("preserves a chat-first deep route in the top window when embedded", async () => {
+    const topWindow = { location: { href: "" } } as unknown as Window;
+    const embedPath = "/emails?status=failed#latest";
+    const expectedUrl = new URL(
+      "/mail/emails?status=failed#latest",
+      window.location.href,
+    ).href;
+    Object.defineProperty(window, "parent", {
+      configurable: true,
+      value: {},
+    });
+    Object.defineProperty(window, "top", {
+      configurable: true,
+      value: topWindow,
+    });
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame
+          app={{ id: "mail", name: "Mail", path: "/mail" }}
+          embedPath={embedPath}
+        />,
+      );
+      await Promise.resolve();
+    });
+
+    expect(topWindow.location.href).toBe(expectedUrl);
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
+    expect(container.querySelector("iframe")).toBeNull();
+  });
+
+  it("opens the app in the top window for a Builder webview", async () => {
+    const topWindow = { location: { href: "" } } as unknown as Window;
+    const expectedUrl = new URL("/mail", window.location.href).href;
+    clientState.inBuilderFrame = true;
+    Object.defineProperty(window, "top", {
+      configurable: true,
+      value: topWindow,
+    });
+
+    await act(async () => {
+      root.render(
+        <WorkspaceAppFrame app={{ id: "mail", name: "Mail", path: "/mail" }} />,
+      );
+      await Promise.resolve();
+    });
+
+    expect(topWindow.location.href).toBe(expectedUrl);
+    expect(clientState.legacyMutateAsync).not.toHaveBeenCalled();
+    expect(container.querySelector("iframe")).toBeNull();
+  });
+
   it("evicts the oldest inactive app after reaching the keep-alive limit", async () => {
     await act(async () => {
       root.render(<WorkspaceAppKeepAlive activeAppId="mail" />);