@agent-native/dispatch 0.15.23 → 0.15.25

package/src/actions/remix-workspace-template.ts

@@ -17,11 +17,11 @@ function buildRemixPrompt(input: {
   description?: string | null;
 }): string {
   return [
-    "Create a private workspace remix of a curated first-party template.",
+    "Create a private workspace app from a curated first-party template.",
     `Source template: ${input.templateName} (${input.templateId}).`,
     "Recreate the source template's product shape and capabilities as an independent workspace app.",
     "Never copy source-app data, records, user content, secrets, credentials, tokens, API keys, or private configuration.",
-    "Use empty or synthetic seed data only, keep the remix private to the current workspace, and do not create a public demo.",
+    "Use empty or synthetic seed data only, keep the new app private to the current workspace, and do not create a public demo.",
     `Setup note: ${input.setupNote}`,
     input.description?.trim()
       ? `Requested customization: ${input.description.trim()}`
@@ -31,7 +31,7 @@ function buildRemixPrompt(input: {
 
 export default defineAction({
   description:
-    "Create a private, independent remix of one of Dispatch's curated first-party workspace templates. Valid templates are mail, calendar, analytics, slides, content, clips, brain, assets, forms, and design. The remix must not copy source-app data, secrets, credentials, or private configuration; local workspaces scaffold the template, while hosted workspaces start a Builder app-creation branch.",
+    "Create a private, independent app from one of Dispatch's curated first-party workspace templates. Valid templates are mail, calendar, analytics, slides, content, clips, brain, assets, forms, and design. The new app must not copy source-app data, secrets, credentials, or private configuration; local workspaces scaffold the template, while hosted workspaces start a Builder app-creation branch.",
   schema: z.object({
     templateId: z
       .string()
@@ -56,7 +56,7 @@ export default defineAction({
       .max(500)
       .optional()
       .nullable()
-      .describe("Optional customization or purpose for the private remix."),
+      .describe("Optional customization or purpose for the private app."),
   }),
   run: async (input) => {
     const sourceTemplate = getCuratedWorkspaceTemplate(input.templateId);
@@ -83,7 +83,7 @@ export default defineAction({
       action: "workspace-app.remix-requested",
       targetType: "workspace-app",
       targetId: appId,
-      summary: `Requested private remix of ${sourceTemplate.name}`,
+      summary: `Requested private app from ${sourceTemplate.name}`,
       metadata: {
         sourceTemplate: sourceTemplate.template,
         mode:

package/src/actions/search-agent-threads.ts

@@ -5,7 +5,7 @@ import { searchAgentThreads } from "../server/lib/thread-debug-store.js";
 
 export default defineAction({
   description:
-    "Search agent chat threads by title, preview, or full persisted thread content. Non-admins are limited to their own current Dispatch DB threads.",
+    "Search agent chat threads by title, preview, full persisted thread content, or an exact request/run ID. Non-admins are limited to their own current Dispatch DB threads.",
   schema: z.object({
     sourceId: z
       .string()

package/src/actions/start-workspace-app-creation.ts

@@ -6,7 +6,7 @@ import { startWorkspaceAppCreation } from "../server/lib/app-creation-store.js";
 
 export default defineAction({
   description:
-    'Start creating a new workspace app from Dispatch when the request truly needs its own app. Callers should include a concise generated description by default; Dispatch generates one from the prompt when omitted. In local dev this returns a code-agent prompt; in production it creates a Builder branch only when a Builder branch project is configured. If the result mode is "coming-soon", the work still requires a code change but no Builder Cloud Agent can run here; tell the user to edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way they like, and do not send them to Builder org/beta settings. The result must be a separate workspace app under apps/<app-id>, not a new route or file in apps/chat. If chat is used as the source template, the finished app must be branded as the requested app and must not leave visible "Chat", "Starter", "Blank app", or "New app" UI behind. If the request needs Mail, Calendar, Analytics, Brain, Assets, or another first-party app, use the existing hosted/connected app via links or A2A; do not clone, wrap, or nest those templates inside the new app unless the user explicitly asks for a customized copy.',
+    'Start creating a new workspace app from Dispatch when the request truly needs its own app. Callers should include a concise generated description by default; Dispatch generates one from the prompt when omitted. In local dev this returns a code-agent prompt; in production it creates a Builder branch only when a Builder branch project is configured. If the result mode is "coming-soon", the work still requires a code change but no Builder Cloud Agent can run here; tell the user to edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way they like, and do not send them to Builder org/beta settings. The result must be a separate workspace app under apps/<app-id>, not a new route or file in apps/chat. If chat is used as the source template, the finished app must be branded as the requested app and must not leave visible "Chat", "Starter", "Blank app", or "New app" UI behind. If the request needs Mail, Calendar, Analytics, Brain, Assets, or another first-party app, use the existing hosted/connected app via links or A2A; do not wrap or nest those apps inside the new app unless the user explicitly asks for a customized app from that template.',
   schema: z.object({
     prompt: z.string().min(1).describe("The user's app creation request"),
     appId: z

package/src/components/create-app-popover.tsx

@@ -117,8 +117,8 @@ function buildAppCreationPrompt(input: {
     `Use relative workspace links like /${input.appId}. Do not hardcode localhost, 127.0.0.1, 8080, 8100, or any dev port; the active workspace gateway/browser origin owns the port.`,
     `Use the framework/template UI stack: shadcn/ui components and @tabler/icons-react. Do not add lucide-react or another icon library for standard UI.`,
     `Existing first-party apps are neighbors, not implementation details for this app. If the user's prompt mentions Mail, Calendar, Analytics, Brain, Assets, Dispatch, or other templates, treat them as existing hosted/connected apps that this app can link to or call through A2A/default connected agents. For example, Mail, Calendar, Analytics, Brain, and Assets already exist at https://mail.agent-native.com, https://calendar.agent-native.com, https://analytics.agent-native.com, https://brain.agent-native.com, and https://assets.agent-native.com.`,
-    `Do not clone first-party templates, create wrapper apps, or scaffold child apps/routes for Mail, Calendar, Analytics, Brain, Assets, etc. inside apps/${input.appId} just so this app can access them. If the request is a cross-app dashboard or overview, build only the new dashboard/overview app and delegate to the existing apps for domain work.`,
-    `Only create another first-party app copy when the user explicitly asks for a customized fork/copy of that app; otherwise keep using the hosted/shared app so improvements to the base template keep flowing to users.`,
+    `Do not create wrapper apps or scaffold child apps/routes for Mail, Calendar, Analytics, Brain, Assets, etc. inside apps/${input.appId} just so this app can access them. If the request is a cross-app dashboard or overview, build only the new dashboard/overview app and delegate to the existing apps for domain work.`,
+    `Only create another first-party app when the user explicitly asks for a customized app from that template; otherwise keep using the hosted/shared app so improvements to the base app keep flowing to users.`,
     `Do not satisfy this by adding a route, page, component, or file inside apps/chat or another existing app unless the user explicitly asks to modify that existing app.`,
     input.vaultAccessMode === "all-apps"
       ? `Do not create per-app Dispatch vault grants unless the workspace switches vault access to manual or the user explicitly asks for manual grants.`

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

@@ -95,7 +95,7 @@ describe("WorkspaceTemplateCard", () => {
     ).toBe(null);
   });
 
-  it("remixes with the default app id and allows an override", async () => {
+  it("creates an app with the default app id and allows an override", async () => {
     await act(async () => {
       root.render(
         <WorkspaceTemplateCard template={template} defaultAppId="pipeline" />,
@@ -103,7 +103,7 @@ describe("WorkspaceTemplateCard", () => {
     });
 
     const trigger = Array.from(container.querySelectorAll("button")).find(
-      (button) => button.textContent?.includes("Remix into workspace"),
+      (button) => button.textContent?.includes("Create from template"),
     );
     expect(trigger).not.toBeUndefined();
 
@@ -140,7 +140,7 @@ describe("WorkspaceTemplateCard", () => {
       });
     });
     expect(toast.success).toHaveBeenCalledWith(
-      "Template remixed into your workspace.",
+      "Template app creation started.",
     );
   });
 
@@ -167,7 +167,7 @@ describe("WorkspaceTemplateCard", () => {
     expect(container.textContent).toContain("Installed");
     expect(container.querySelector('a[href^="https://"]')).toBeNull();
     const remixButton = Array.from(container.querySelectorAll("button")).find(
-      (button) => button.textContent?.includes("Remix into workspace"),
+      (button) => button.textContent?.includes("Create from template"),
     );
     expect(remixButton).not.toHaveProperty("disabled", true);
   });

package/src/components/workspace-template-card.tsx

@@ -78,10 +78,10 @@ const DEFAULT_LABELS: WorkspaceTemplateLabels = {
   cancel: "Cancel",
   integrationSetup: "Integration setup",
   installed: "Installed",
-  remix: "Remix into workspace",
-  remixing: "Remixing…",
-  remixSuccess: "Template remixed into your workspace.",
-  remixError: "Could not remix this template",
+  remix: "Create from template",
+  remixing: "Creating app…",
+  remixSuccess: "Template app creation started.",
+  remixError: "Could not create an app from this template",
   appIdRequired: "App ID is required.",
   source: "Source",
   viewLiveApp: "View the live app",

package/src/routes/pages/thread-debug.tsx

@@ -87,6 +87,7 @@ interface ThreadDebugResponse {
   };
   access: { viewerEmail: string; scope: string; canInspectAll: boolean };
   thread: ThreadSearchResult;
+  lookup?: { requestedId: string; threadId: string; runId: string | null };
   messages: ThreadMessage[];
   debug: any;
   debugRuns: any[];
@@ -424,7 +425,7 @@ export default function ThreadDebugRoute() {
   const [sourceId, setSourceId] = useState(initialSourceId);
   const [query, setQuery] = useState(initialQuery);
   const [ownerEmail, setOwnerEmail] = useState(initialOwnerEmail);
-  const [threadId, setThreadId] = useState("");
+  const [lookupId, setLookupId] = useState("");
   const [submittedSearch, setSubmittedSearch] = useState({
     sourceId: initialSourceId,
     query: initialQuery,
@@ -432,7 +433,8 @@ export default function ThreadDebugRoute() {
   });
   const [selected, setSelected] = useState<{
     sourceId: string;
-    threadId: string;
+    lookupId: string;
+    lookupKind: "thread" | "run";
     ownerEmail?: string;
   } | null>(null);
 
@@ -475,7 +477,9 @@ export default function ThreadDebugRoute() {
   const detailParams = useMemo(
     () => ({
       sourceId: selected?.sourceId ?? "current",
-      threadId: selected?.threadId ?? "",
+      ...(selected?.lookupKind === "run"
+        ? { runId: selected.lookupId }
+        : { threadId: selected?.lookupId ?? "" }),
       ownerEmail: selected?.ownerEmail,
       maxRuns: 20,
       maxEvents: 800,
@@ -492,7 +496,7 @@ export default function ThreadDebugRoute() {
     "get-agent-thread-debug",
     detailParams,
     {
-      enabled: Boolean(selected?.threadId),
+      enabled: Boolean(selected?.lookupId),
     },
   );
 
@@ -512,10 +516,21 @@ export default function ThreadDebugRoute() {
         sourceId,
         query,
         ownerEmail: ownerEmail.trim() || undefined,
-        threadId: selected?.threadId ?? (threadId.trim() || undefined),
+        threadId:
+          selected?.lookupKind === "thread"
+            ? selected.lookupId
+            : !selected && lookupId.trim() && !lookupId.startsWith("run-")
+              ? lookupId.trim()
+              : undefined,
+        runId:
+          selected?.lookupKind === "run"
+            ? selected.lookupId
+            : !selected && lookupId.trim() && lookupId.startsWith("run-")
+              ? lookupId.trim()
+              : undefined,
       }),
     }).catch(() => {});
-  }, [ownerEmail, query, selected?.threadId, sourceId, threadId]);
+  }, [ownerEmail, query, selected, sourceId, lookupId]);
 
   return (
     <DispatchShell
@@ -573,20 +588,21 @@ export default function ThreadDebugRoute() {
 
           <div className="mt-3 grid gap-3 lg:grid-cols-[1fr_auto]">
             <Input
-              value={threadId}
-              onChange={(event) => setThreadId(event.target.value)}
-              placeholder="Paste thread ID"
+              value={lookupId}
+              onChange={(event) => setLookupId(event.target.value)}
+              placeholder="Paste thread or request/run ID"
               className="font-mono"
             />
             <Button
               type="button"
               variant="outline"
               onClick={() => {
-                const trimmed = threadId.trim();
+                const trimmed = lookupId.trim();
                 if (!trimmed) return;
                 setSelected({
                   sourceId,
-                  threadId: trimmed,
+                  lookupId: trimmed,
+                  lookupKind: trimmed.startsWith("run-") ? "run" : "thread",
                   ownerEmail: ownerEmail.trim() || undefined,
                 });
               }}
@@ -660,11 +676,15 @@ export default function ThreadDebugRoute() {
                 <ResultCard
                   key={result.id}
                   result={result}
-                  selected={selected?.threadId === result.id}
+                  selected={
+                    selected?.lookupKind === "thread" &&
+                    selected.lookupId === result.id
+                  }
                   onSelect={() =>
                     setSelected({
                       sourceId: submittedSearch.sourceId,
-                      threadId: result.id,
+                      lookupId: result.id,
+                      lookupKind: "thread",
                       ownerEmail: submittedSearch.ownerEmail || undefined,
                     })
                   }
@@ -691,7 +711,7 @@ export default function ThreadDebugRoute() {
             ) : (
               <div className="flex min-h-[520px] flex-col items-center justify-center rounded-lg border border-dashed bg-card px-4 text-center text-sm text-muted-foreground">
                 <IconFileSearch className="mb-2 h-5 w-5" />
-                Select or inspect a thread.
+                Select or inspect a thread or request/run ID.
               </div>
             )}
           </section>

package/src/server/lib/app-creation-store.ts

@@ -1765,8 +1765,8 @@ function buildWorkspaceAppPrompt(input: {
       `Use the workspace app layout: create it under apps/${appId}, mount it at /${appId}, keep it on the shared workspace database/hosting model, and avoid table-name collisions by namespacing any new domain tables to the app.`,
       `Important routing rule: from outside the app, link to /${appId}; inside apps/${appId}, React Router routes are app-local. Use <Link to="/review"> and navigate("/review"), not "/${appId}/review"; APP_BASE_PATH supplies the mounted prefix, and hardcoding it causes doubled URLs like /${appId}/${appId}/review.`,
       "Existing first-party apps are neighbors, not implementation details for this app. If the user prompt mentions Mail, Calendar, Analytics, Dispatch, or other templates, treat them as existing hosted/connected apps that this app can link to or call through A2A/default connected agents. For example, Mail, Calendar, and Analytics already exist at https://mail.agent-native.com, https://calendar.agent-native.com, and https://analytics.agent-native.com.",
-      `Do not clone first-party templates, create wrapper apps, or scaffold child apps/routes for Mail, Calendar, Analytics, etc. inside apps/${appId} just so this app can access them. If the request is a cross-app dashboard or overview, build only the new dashboard/overview app and delegate to the existing apps for domain work.`,
-      "Only create another first-party app copy when the user explicitly asks for a customized fork/copy of that app; otherwise keep using the hosted/shared app so improvements to the base template keep flowing to users.",
+      `Do not create wrapper apps or scaffold child apps/routes for Mail, Calendar, Analytics, etc. inside apps/${appId} just so this app can access them. If the request is a cross-app dashboard or overview, build only the new dashboard/overview app and delegate to the existing apps for domain work.`,
+      "Only create another first-party app when the user explicitly asks for a customized app from that template; otherwise keep using the hosted/shared app so improvements to the base app keep flowing to users.",
       selectedKeys.length
         ? `Dispatch will create pending vault requests for the selected keys for appId "${appId}" after this app creation request is accepted. Do not grant or sync vault keys directly from the app-creation branch.`
         : "Do not grant or request any Dispatch vault keys unless the user asks later.",

package/src/server/lib/curated-workspace-templates.ts

@@ -17,7 +17,7 @@ export interface CuratedWorkspaceTemplateStatus extends CuratedWorkspaceTemplate
 }
 
 /**
- * Stable first-party template metadata for the initial remix catalog.
+ * Stable first-party template metadata for the initial app-creation catalog.
  * `liveUrl` identifies the product URL; it is not a public-demo claim.
  */
 export const CURATED_WORKSPACE_TEMPLATES: readonly CuratedWorkspaceTemplate[] =
@@ -85,7 +85,7 @@ export const CURATED_WORKSPACE_TEMPLATES: readonly CuratedWorkspaceTemplate[] =
       liveUrl: "https://content.agent-native.com",
       category: "content",
       setupNote:
-        "Choose a content folder or create a first document for the private remix.",
+        "Choose a content folder or create a first document for the private app.",
     },
     {
       id: "clips",

package/src/server/lib/thread-debug-store.spec.ts

@@ -0,0 +1,82 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  execute: vi.fn(),
+}));
+
+vi.mock("@agent-native/core/db", () => ({
+  createDbExec: vi.fn(),
+  getDbExec: () => ({ execute: mocks.execute }),
+}));
+
+vi.mock("./dispatch-store.js", () => ({
+  currentOrgId: () => null,
+  currentOwnerEmail: () => "owner@example.com",
+}));
+
+import {
+  getAgentThreadDebug,
+  searchAgentThreads,
+} from "./thread-debug-store.js";
+
+const thread = {
+  id: "thread-1",
+  owner_email: "owner@example.com",
+  title: "A production run",
+  preview: "Investigate this run",
+  thread_data: JSON.stringify({ messages: [] }),
+  message_count: 0,
+  created_at: 1,
+  updated_at: 2,
+};
+
+const run = {
+  id: "run-prod-1",
+  thread_id: "thread-1",
+  status: "completed",
+  started_at: 1,
+  completed_at: 2,
+  heartbeat_at: 2,
+};
+
+function rowsForQuery(sql: string, args: unknown[]) {
+  if (sql.includes("FROM org_members")) return [];
+  if (sql.includes("FROM agent_runs") && sql.includes("WHERE id = ?")) {
+    return [run];
+  }
+  if (sql.includes("FROM agent_runs") && sql.includes("WHERE thread_id = ?")) {
+    return [run];
+  }
+  if (sql.includes("FROM chat_threads")) {
+    return args[0] === "thread-1" || args[0] === "owner@example.com"
+      ? [thread]
+      : [];
+  }
+  return [];
+}
+
+describe("thread-debug-store request/run lookup", () => {
+  beforeEach(() => {
+    mocks.execute.mockImplementation(async ({ sql, args }) => ({
+      rows: rowsForQuery(sql, args),
+    }));
+  });
+
+  it("finds a thread when search input is an exact run id", async () => {
+    const result = await searchAgentThreads({ query: run.id });
+
+    expect(result.threads).toHaveLength(1);
+    expect(result.threads[0]?.id).toBe(thread.id);
+  });
+
+  it("resolves a run id before loading its debug snapshot", async () => {
+    const result = await getAgentThreadDebug({ runId: run.id });
+
+    expect(result.lookup).toEqual({
+      requestedId: run.id,
+      threadId: thread.id,
+      runId: run.id,
+    });
+    expect(result.thread.id).toBe(thread.id);
+  });
+});

package/src/server/lib/thread-debug-store.ts

@@ -565,12 +565,30 @@ export async function searchAgentThreads(input: {
   const scope = ownerScope(access, input.ownerEmail);
   const where = [scope.sql];
   const args: unknown[] = [...scope.args];
+  const runThreadIds = q
+    ? (
+        await optionalRows<{ thread_id: string }>(
+          exec,
+          "SELECT thread_id FROM agent_runs WHERE id = ? LIMIT 1",
+          [q],
+        )
+      )
+        .map((row) => String(row.thread_id ?? "").trim())
+        .filter(Boolean)
+    : [];
   if (q) {
-    const pattern = `%${escapeLike(q.toLowerCase())}%`;
+    const pattern = "%" + escapeLike(q.toLowerCase()) + "%";
+    const runIdClause =
+      runThreadIds.length > 0
+        ? " OR id IN (" + runThreadIds.map(() => "?").join(", ") + ")"
+        : "";
     where.push(
-      `(LOWER(title) LIKE ? ESCAPE '\\' OR LOWER(preview) LIKE ? ESCAPE '\\' OR LOWER(thread_data) LIKE ? ESCAPE '\\')`,
+      "(LOWER(title) LIKE ? ESCAPE '\\' OR LOWER(preview) LIKE ? ESCAPE '\\' OR LOWER(thread_data) LIKE ? ESCAPE '\\'" +
+        runIdClause +
+        ")",
     );
     args.push(pattern, pattern, pattern);
+    args.push(...runThreadIds);
   }
   args.push(limit);
 
@@ -603,7 +621,8 @@ export async function searchAgentThreads(input: {
 
 export async function getAgentThreadDebug(input: {
   sourceId?: string;
-  threadId: string;
+  threadId?: string;
+  runId?: string;
   ownerEmail?: string;
   maxRuns?: number;
   maxEvents?: number;
@@ -614,17 +633,49 @@ export async function getAgentThreadDebug(input: {
   assertSourceAccess(source, access);
   const exec = await execForSource(source);
   const scope = ownerScope(access, input.ownerEmail);
-  const rows = await queryRows<ChatThreadRow>(
+  const requestedId = input.runId?.trim() || input.threadId?.trim() || "";
+  if (!requestedId) {
+    throw new Error("A thread ID or request/run ID is required.");
+  }
+
+  let rows = await queryRows<ChatThreadRow>(
     exec,
     `SELECT id, owner_email, title, preview, thread_data, message_count, created_at, updated_at
        FROM chat_threads
       WHERE id = ? AND ${scope.sql}
       LIMIT 1`,
-    [input.threadId, ...scope.args],
+    [input.threadId?.trim() || requestedId, ...scope.args],
   );
+  let resolvedRunId = input.runId?.trim() || null;
+
+  if (!rows[0]) {
+    const runRows = await optionalRows<{ id: string; thread_id: string }>(
+      exec,
+      `SELECT id, thread_id
+         FROM agent_runs
+        WHERE id = ?
+        LIMIT 1`,
+      [requestedId],
+    );
+    const threadId = runRows[0]?.thread_id
+      ? String(runRows[0].thread_id).trim()
+      : "";
+    if (threadId) {
+      rows = await queryRows<ChatThreadRow>(
+        exec,
+        `SELECT id, owner_email, title, preview, thread_data, message_count, created_at, updated_at
+           FROM chat_threads
+          WHERE id = ? AND ${scope.sql}
+          LIMIT 1`,
+        [threadId, ...scope.args],
+      );
+      if (rows[0]) resolvedRunId = requestedId;
+    }
+  }
+
   const row = rows[0];
   if (!row) {
-    throw new Error(`Thread "${input.threadId}" was not found.`);
+    throw new Error(`Thread or request/run ID "${requestedId}" was not found.`);
   }
 
   const threadData = safeJsonParse<Record<string, unknown>>(
@@ -763,6 +814,11 @@ export async function getAgentThreadDebug(input: {
       createdAt: numberField(row.created_at),
       updatedAt: numberField(row.updated_at),
     },
+    lookup: {
+      requestedId,
+      threadId: String(row.id),
+      runId: resolvedRunId,
+    },
     messages: normalizeMessages(threadData),
     debug: (threadData as any)?._debug ?? null,
     debugRuns: Array.isArray((threadData as any)?._debugRuns)

package/src/server/plugins/integrations.ts

@@ -40,7 +40,7 @@ When a user asks for something:
 - After call-agent returns an answer, RELAY IT DIRECTLY to the user with at most a one-line preface — do not rephrase, summarize, or add commentary. The downstream agent already crafted the answer; your job is delivery, not editing. This minimizes round-trips and keeps the user-visible reply fast.
 - Exception: if the downstream agent reports a missing model/provider credential, do not name exact env vars, Vault keys, tokens, or secrets. Say the target app needs an LLM connection and recommend connecting Builder/managed LLM for that app; keep bring-your-own provider keys as a secondary option only if the user asks.
 - If the user asks to create, build, make, scaffold, or generate an "agent" from Dispatch chat or by tagging @agent-native in Slack, email, or Telegram, first classify the ask. If it is a simple Dispatch-native behavior like a reminder, digest, monitor, routing rule, saved instruction, or recurring workflow, create or update the recurring job/resource/destination in Dispatch. If it is a robust unique product or teammate that needs its own UI, data model, actions, integrations, or domain workflow, treat it as a new workspace app and call start-workspace-app-creation.
-- If a new-app prompt asks for access to Mail, Calendar, Analytics, Brain, Assets, or similar first-party app data/agents, keep using the existing hosted/connected app and A2A path. Do not ask Builder to scaffold those apps as children of the new app unless the user explicitly asks for a customized fork/copy.
+- If a new-app prompt asks for access to Mail, Calendar, Analytics, Brain, Assets, or similar first-party app data/agents, keep using the existing hosted/connected app and A2A path. Do not ask Builder to scaffold those apps as children of the new app unless the user explicitly asks for a customized app from that template.
 - If the chat template is used, treat it as scaffolding only: the finished app must be branded as the requested app with its own home screen/navigation/package metadata/manifest, and must not leave visible "Chat", "Starter", "Blank app", or "New app" UI behind.
 - If the user explicitly asks for a new app or workspace app, call start-workspace-app-creation with their prompt and include a concise generated description by default. Do not satisfy a new-app request by adding a route, page, component, or file inside apps/chat or another existing app unless the user explicitly asks to modify that existing app. If the request is too vague to classify, ask one concise follow-up. If the action returns mode "builder", reply with the Builder branch URL; Builder is responsible for creating the separate workspace app under apps/<app-id>, mounting it at /<app-id>, ensuring apps/<app-id>/package.json exists with name/displayName and description so Dispatch discovers it, using relative /<app-id> links instead of hardcoded localhost/dev ports, and preserving APP_BASE_PATH/VITE_APP_BASE_PATH via appBasePath() in the React Router client entry. The new app lives at the workspace root /<app-id>, NOT under /dispatch/<app-id>, /apps/<app-id>, or any other Dispatch tab — when telling the user where to find it, link to /<app-id> only. There is no separate workspace app registry to edit. If it returns mode "local-agent", tell the user it is ready for the local code agent and include the returned app path/prompt summary. If it returns mode "coming-soon", say this requires a code change and they can edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way they like; do not send them to Builder org/beta settings. If it returns mode "builder-unavailable", the action also returns a \`reason\` code plus a user-facing \`message\` and (for some reasons) an operator-facing \`detail\`. Relay the \`message\` to the user as-is; only surface \`detail\` when the user is clearly an operator debugging the deployment (e.g. troubleshooting a broken Builder connection for the workspace), never as routine detail for an end user.
 - For digests, reminders, or saved behavior, prefer recurring jobs, resources, or destinations over chat replies.