@agent-native/dispatch 0.15.24 → 0.15.26

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

@@ -66,6 +66,9 @@ export interface WorkspaceAppSummary {
   builderUrl?: string | null;
   branchName?: string | null;
   createdAt?: string | null;
+  createdBy?: string | null;
+  owner?: string | null;
+  teams?: string[];
   agentCardUrl?: string | null;
   agentCardReachable?: boolean;
   a2aEndpointUrl?: string | null;
@@ -125,6 +128,9 @@ interface PendingWorkspaceApp {
   contextId: string | null;
   contextLabel: string | null;
   audience?: WorkspaceAppAudience;
+  createdBy?: string | null;
+  owner?: string | null;
+  teams?: string[];
   createdAt: string;
   updatedAt: string;
   expiresAt: string | null;
@@ -387,6 +393,12 @@ function applyWorkspaceAppMetadataOverride(
     ...app,
     ...(shouldApplyName ? { name } : {}),
     ...(shouldApplyDescription ? { description } : {}),
+    ...(app.status === "pending" && !app.createdBy && override.updatedBy
+      ? { createdBy: override.updatedBy }
+      : {}),
+    ...(app.status === "pending" && !app.owner && override.updatedBy
+      ? { owner: override.updatedBy }
+      : {}),
   };
 }
 
@@ -448,6 +460,75 @@ function normalizeWorkspaceAppPathList(value: unknown): string[] {
   return Array.from(new Set(paths));
 }
 
+function normalizeWorkspaceAppTeams(value: unknown): string[] {
+  const rawTeams = Array.isArray(value)
+    ? value
+    : typeof value === "string"
+      ? value.split(",")
+      : [];
+  return Array.from(
+    new Set(
+      rawTeams
+        .map((team) => (typeof team === "string" ? team.trim() : ""))
+        .filter(Boolean),
+    ),
+  );
+}
+
+function workspaceAppMetadataFromRecord(
+  record: Record<string, any>,
+): Pick<WorkspaceAppSummary, "createdAt" | "createdBy" | "owner" | "teams"> {
+  const config = record["agent-native"] ?? record.agentNative;
+  const workspaceConfig =
+    config && typeof config === "object" && !Array.isArray(config)
+      ? (config.workspaceApp ?? config.workspace ?? config)
+      : {};
+  const metadata =
+    record.metadata &&
+    typeof record.metadata === "object" &&
+    !Array.isArray(record.metadata)
+      ? record.metadata
+      : {};
+  const pick = (...values: unknown[]) =>
+    values.map(cleanOptionalText).find((value) => value !== undefined);
+
+  const teams = normalizeWorkspaceAppTeams(
+    record.teams ??
+      record.team ??
+      metadata.teams ??
+      metadata.team ??
+      workspaceConfig.teams ??
+      workspaceConfig.team,
+  );
+  return {
+    createdAt: pick(
+      record.createdAt,
+      record.created_at,
+      metadata.createdAt,
+      workspaceConfig.createdAt,
+    ),
+    createdBy: pick(
+      record.createdBy,
+      record.createdByEmail,
+      record.created_by,
+      metadata.createdBy,
+      metadata.createdByEmail,
+      workspaceConfig.createdBy,
+      workspaceConfig.createdByEmail,
+    ),
+    owner: pick(
+      record.owner,
+      record.ownerEmail,
+      record.owner_email,
+      metadata.owner,
+      metadata.ownerEmail,
+      workspaceConfig.owner,
+      workspaceConfig.ownerEmail,
+    ),
+    teams,
+  };
+}
+
 function workspaceAppAudienceFromPackageJson(
   pkg: unknown,
 ): WorkspaceAppAudience | undefined {
@@ -513,6 +594,7 @@ function parseWorkspaceAppsManifest(parsed: any): WorkspaceAppSummary[] | null {
       const id = typeof entry.id === "string" ? entry.id.trim() : "";
       const pathValue = typeof entry.path === "string" ? entry.path.trim() : "";
       if (!id || !pathValue.startsWith("/")) return null;
+      const metadata = workspaceAppMetadataFromRecord(entry);
       return {
         id,
         name:
@@ -534,6 +616,7 @@ function parseWorkspaceAppsManifest(parsed: any): WorkspaceAppSummary[] | null {
         publicPaths: normalizeWorkspaceAppPathList(entry.publicPaths),
         protectedPaths: normalizeWorkspaceAppPathList(entry.protectedPaths),
         status: "ready",
+        ...metadata,
       } satisfies WorkspaceAppSummary;
     })
     .filter(
@@ -645,6 +728,9 @@ function parsePendingWorkspaceApps(value: unknown): PendingWorkspaceApp[] {
             : null,
         contextId: cleanOptionalString(record.contextId),
         contextLabel: cleanOptionalString(record.contextLabel),
+        createdBy: cleanOptionalString(record.createdBy),
+        owner: cleanOptionalString(record.owner ?? record.ownerEmail),
+        teams: normalizeWorkspaceAppTeams(record.teams ?? record.team),
         ...(record.audience === undefined
           ? {}
           : { audience: normalizeWorkspaceAppAudience(record.audience) }),
@@ -755,6 +841,9 @@ function pendingAppToSummary(app: PendingWorkspaceApp): WorkspaceAppSummary {
     builderUrl: app.builderUrl,
     branchName: app.branchName,
     createdAt: app.createdAt,
+    createdBy: app.createdBy,
+    owner: app.owner,
+    teams: app.teams,
   };
 }
 
@@ -918,6 +1007,8 @@ async function recordPendingWorkspaceApp(input: {
     projectId: input.projectId,
     contextId: context?.id ?? null,
     contextLabel: context?.label ?? null,
+    createdBy: currentOwnerEmail(),
+    owner: currentOwnerEmail(),
     createdAt: existing?.createdAt || now,
     updatedAt: now,
     expiresAt: pendingWorkspaceAppExpiresAt(existing?.createdAt || now),
@@ -1038,6 +1129,7 @@ function readWorkspaceAppsFromFilesystem(
       const pkg = readJson(path.join(appDir, "package.json"));
       if (!pkg) return null;
       const routeAccess = workspaceAppRouteAccessFromPackageJson(pkg);
+      const metadata = workspaceAppMetadataFromRecord(pkg);
       return {
         id: entry.name,
         name: pkg.displayName || titleCase(entry.name),
@@ -1051,6 +1143,7 @@ function readWorkspaceAppsFromFilesystem(
         publicPaths: routeAccess.publicPaths,
         protectedPaths: routeAccess.protectedPaths,
         status: "ready",
+        ...metadata,
       } satisfies WorkspaceAppSummary;
     })
     .filter((app): app is WorkspaceAppSummary => !!app)
@@ -1765,8 +1858,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.