@agent-native/dispatch 0.40.30 → 0.40.33

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

@@ -3,12 +3,20 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { canonicalA2AAudience, signA2AToken } from "@agent-native/core/a2a";
-import { isActionContractError } from "@agent-native/core/action";
+import {
+  canonicalA2AAudience,
+  getGlobalA2ASecret,
+  signA2AToken,
+} from "@agent-native/core/a2a";
+import {
+  ActionContractError,
+  isActionContractError,
+} from "@agent-native/core/action";
 import { describeErrorWithCauses } from "@agent-native/core/agent/engine/error-detail";
 import { getDbExec } from "@agent-native/core/db";
 import { and, eq, inArray } from "@agent-native/core/db/schema";
 import {
+  getOrgA2ASecret,
   getOrgDomain,
   isWorkspaceAppAccessAllowed,
   workspaceApps,
@@ -23,6 +31,7 @@ import {
   inferWorkspaceAppRootHomePath,
   isIntegrationCallerRequest,
   readConfiguredWorkspaceAppHomePath,
+  readOrgMemberRole,
   resolveAppRuntimeUrl,
   resolveVercelDeploymentProtectionHeaders,
   normalizeBuilderAgentAttachments,
@@ -152,17 +161,15 @@ function requireWorkspaceAppOrgId(): string {
   return orgId;
 }
 
-class WorkspaceAppsGatewayAuthorizationError extends Error {
+class WorkspaceAppsGatewayAuthorizationError extends ActionContractError {
   constructor(
-    statusCode: 401 | 403,
+    statusCode: 401 | 403 | 503,
+    errorCode = "workspace_gateway_rejected",
     message = `Workspace apps gateway rejected the request with HTTP ${statusCode}.`,
   ) {
-    super(message);
+    super(message, { statusCode, errorCode });
     this.name = "WorkspaceAppsGatewayAuthorizationError";
-    this.statusCode = statusCode;
   }
-
-  statusCode: 401 | 403;
 }
 
 function warnWorkspaceAppsGatewayDenial(
@@ -871,6 +878,21 @@ function parseWorkspaceAppsManifest(parsed: any): WorkspaceAppSummary[] | null {
   return apps.length ? apps : null;
 }
 
+function parseWorkspaceAppsGatewayResponse(
+  parsed: unknown,
+): WorkspaceAppSummary[] | null {
+  const rawApps =
+    parsed && typeof parsed === "object" && !Array.isArray(parsed)
+      ? (parsed as { apps?: unknown }).apps
+      : parsed;
+  if (!Array.isArray(rawApps)) return null;
+  if (rawApps.length === 0) return [];
+  const apps = parseWorkspaceAppsManifest(parsed);
+  if (!apps || apps.length !== rawApps.length) return null;
+  const ids = new Set(apps.map((app) => app.id.toLowerCase()));
+  return ids.size === apps.length ? apps : null;
+}
+
 function parseDateMs(value: string | null | undefined): number | null {
   if (!value) return null;
   const ms = Date.parse(value);
@@ -1863,37 +1885,89 @@ async function readWorkspaceAppsFromGateway(): Promise<WorkspaceAppDiscovery | n
   }
 
   const requestContext = getRequestContext();
+  const isLocalGateway = isLocalWorkspaceGateway(baseUrl);
+  const requestOrigin = requestContext?.requestOrigin;
+  const isSameOriginGateway = requestOrigin
+    ? (() => {
+        try {
+          return new URL(requestOrigin).origin === baseUrl.origin;
+        } catch {
+          // coercion-ok: an invalid request origin cannot prove a self-fetch.
+          return false;
+        }
+      })()
+    : false;
+  if (isSameOriginGateway && !isLocalGateway) return null;
+
   const authHeaders: Record<string, string> = {};
   if (requestContext?.userEmail) {
-    const orgDomain = requestContext.orgId
-      ? (await getOrgDomain(requestContext.orgId))?.trim().toLowerCase()
-      : undefined;
+    let orgDomain: string | undefined;
+    let orgSecret: string | undefined;
+    if (requestContext.orgId) {
+      try {
+        orgDomain =
+          (await getOrgDomain(requestContext.orgId))?.trim().toLowerCase() ||
+          undefined;
+      } catch {
+        throw new WorkspaceAppsGatewayAuthorizationError(
+          503,
+          "workspace_gateway_org_domain_unavailable",
+          "Workspace apps gateway organization domain could not be read.",
+        );
+      }
+    }
     if (requestContext.orgId && !orgDomain) {
       throw new WorkspaceAppsGatewayAuthorizationError(
         401,
+        "workspace_gateway_org_domain_missing",
         "Workspace apps gateway cannot authenticate without a resolved organization domain.",
       );
     }
-    try {
-      const token = await signA2AToken(
-        requestContext.userEmail,
-        orgDomain,
-        undefined,
-        {
-          expiresIn: "1m",
-          preferGlobalSecret: true,
-          audience: canonicalA2AAudience(
-            baseUrl.toString(),
-            getConfiguredAppBasePath() || undefined,
-          ),
-        },
+    if (requestContext.orgId) {
+      try {
+        orgSecret =
+          (await getOrgA2ASecret(requestContext.orgId))?.trim() || undefined;
+      } catch {
+        throw new WorkspaceAppsGatewayAuthorizationError(
+          503,
+          "workspace_gateway_org_a2a_secret_unavailable",
+          "Workspace apps gateway organization A2A secret could not be read.",
+        );
+      }
+    }
+    const globalSecret = getGlobalA2ASecret();
+    const allowLocalUnauthenticatedRequest =
+      isLocalGateway && !orgSecret && !globalSecret;
+    if (!orgSecret && !globalSecret && !allowLocalUnauthenticatedRequest) {
+      throw new WorkspaceAppsGatewayAuthorizationError(
+        503,
+        "workspace_gateway_a2a_secret_missing",
+        "Workspace apps gateway cannot authenticate because no A2A secret is configured.",
       );
-      authHeaders.Authorization = `Bearer ${token}`;
-    } catch {
-      // coercion-ok: absent signing credentials keep local unauthenticated
-      // gateway discovery available and make hosted discovery fail closed.
-      // Keep the unauthenticated local-dev gateway path available. A hosted
-      // gateway will fail closed below when its action route needs identity.
+    }
+    if (!allowLocalUnauthenticatedRequest) {
+      try {
+        const token = await signA2AToken(
+          requestContext.userEmail,
+          orgDomain,
+          orgSecret,
+          {
+            expiresIn: "1m",
+            preferGlobalSecret: false,
+            audience: canonicalA2AAudience(
+              baseUrl.toString(),
+              getConfiguredAppBasePath() || undefined,
+            ),
+          },
+        );
+        authHeaders.Authorization = `Bearer ${token}`;
+      } catch {
+        throw new WorkspaceAppsGatewayAuthorizationError(
+          503,
+          "workspace_gateway_token_signing_failed",
+          "Workspace apps gateway could not sign the authenticated request.",
+        );
+      }
     }
   }
 
@@ -1923,9 +1997,34 @@ async function readWorkspaceAppsFromGateway(): Promise<WorkspaceAppDiscovery | n
   const protectedRedirect = protectionHeaders["x-vercel-protection-bypass"]
     ? { redirect: "manual" as const }
     : {};
+  const readAppsResponse = async (response: Response) => {
+    let payload: unknown;
+    try {
+      payload = await response.json();
+    } catch {
+      throw new ActionContractError(
+        "Workspace apps gateway returned an unreadable response.",
+        {
+          statusCode: 503,
+          errorCode: "workspace_gateway_invalid_response",
+        },
+      );
+    }
+    const apps = parseWorkspaceAppsGatewayResponse(payload);
+    if (!apps) {
+      throw new ActionContractError(
+        "Workspace apps gateway returned an invalid response.",
+        {
+          statusCode: 503,
+          errorCode: "workspace_gateway_invalid_response",
+        },
+      );
+    }
+    return { apps };
+  };
 
   try {
-    if (isLocalWorkspaceGateway(baseUrl)) {
+    if (isLocalGateway) {
       const localResponse = await fetch(
         gatewayUrl(WORKSPACE_APPS_GATEWAY_PATH),
         {
@@ -1935,29 +2034,25 @@ async function readWorkspaceAppsFromGateway(): Promise<WorkspaceAppDiscovery | n
         },
       );
       if (localResponse.status === 401 || localResponse.status === 403) {
-        throw new WorkspaceAppsGatewayAuthorizationError(localResponse.status);
+        throw new WorkspaceAppsGatewayAuthorizationError(
+          localResponse.status,
+          "workspace_gateway_rejected",
+        );
       }
-      if (localResponse.ok) {
-        const apps = parseWorkspaceAppsManifest(
-          // coercion-ok: malformed gateway JSON is an unavailable registry and
-          // must fall through to the local manifest sources.
-          await localResponse.json().catch(() => null),
+      if (localResponse.status !== 404 && localResponse.status !== 200) {
+        throw new ActionContractError(
+          `Workspace apps gateway returned HTTP ${localResponse.status}.`,
+          {
+            statusCode: 503,
+            errorCode: `workspace_gateway_http_${localResponse.status}`,
+          },
         );
-        return apps ? { apps } : null;
+      }
+      if (localResponse.status === 200) {
+        return await readAppsResponse(localResponse);
       }
     }
 
-    const requestOrigin = requestContext?.requestOrigin;
-    const isSameOriginGateway = requestOrigin
-      ? (() => {
-          try {
-            return new URL(requestOrigin).origin === baseUrl.origin;
-          } catch {
-            // coercion-ok: an invalid request origin cannot prove a self-fetch.
-            return false;
-          }
-        })()
-      : false;
     if (isSameOriginGateway || !authHeaders.Authorization) return null;
     const actionUrl = gatewayUrl(WORKSPACE_APPS_ACTION_PATH);
     actionUrl.searchParams.set("includeAgentCards", "false");
@@ -1968,18 +2063,31 @@ async function readWorkspaceAppsFromGateway(): Promise<WorkspaceAppDiscovery | n
       signal: controller.signal,
     });
     if (actionResponse.status === 401 || actionResponse.status === 403) {
-      throw new WorkspaceAppsGatewayAuthorizationError(actionResponse.status);
+      throw new WorkspaceAppsGatewayAuthorizationError(
+        actionResponse.status,
+        "workspace_gateway_rejected",
+      );
     }
-    if (!actionResponse.ok) return null;
-    const apps = parseWorkspaceAppsManifest(
-      // coercion-ok: malformed gateway JSON is an unavailable registry and
-      // must fall through to the local manifest sources.
-      await actionResponse.json().catch(() => null),
-    );
-    return apps ? { apps } : null;
+    if (actionResponse.status === 404) return null;
+    if (actionResponse.status !== 200) {
+      throw new ActionContractError(
+        `Workspace apps gateway returned HTTP ${actionResponse.status}.`,
+        {
+          statusCode: 503,
+          errorCode: `workspace_gateway_http_${actionResponse.status}`,
+        },
+      );
+    }
+    return await readAppsResponse(actionResponse);
   } catch (error) {
-    if (error instanceof WorkspaceAppsGatewayAuthorizationError) throw error;
-    return null;
+    if (error instanceof ActionContractError) throw error;
+    throw new ActionContractError(
+      "Workspace apps gateway could not be reached.",
+      {
+        statusCode: 503,
+        errorCode: "workspace_gateway_unavailable",
+      },
+    );
   } finally {
     clearTimeout(timeout);
   }
@@ -2260,6 +2368,9 @@ async function listWorkspaceAppsWithPrincipal(
   if (gatewayApps) {
     return finalize(gatewayApps.apps);
   }
+  if (gatewayDenial && gatewayDenial.statusCode >= 500) {
+    throw gatewayDenial;
+  }
   const unverified = gatewayDenial !== null;
 
   const workspaceRoot = findWorkspaceRoot();
@@ -2284,7 +2395,9 @@ async function listWorkspaceAppsWithPrincipal(
   // means the registry will not show this reader its apps, so they get the
   // deployment's own list instead, and none of it is recorded. (A manifest
   // answers earlier for both, with the warning above.)
-  if (gatewayDenial?.statusCode === 401) throw gatewayDenial;
+  if (gatewayDenial && gatewayDenial.statusCode !== 403) {
+    throw gatewayDenial;
+  }
   warnWorkspaceAppsGatewayDenial(gatewayDenial, "deployment's own app list");
 
   if (!workspaceRoot) {
@@ -2715,18 +2828,9 @@ function isSyntheticIntegrationOwner(ownerEmail: string): boolean {
 
 async function requestOwnerRole(): Promise<string | null> {
   const orgId = currentOrgId();
-  const ownerEmail = currentOwnerEmail();
   if (!orgId) return null;
   try {
-    const { rows } = await getDbExec().execute({
-      sql: `SELECT role FROM org_members
-            WHERE org_id = ? AND LOWER(email) = ?
-              AND federation_removal_pending_at IS NULL
-            LIMIT 1`,
-      args: [orgId, ownerEmail.toLowerCase()],
-    });
-    const role = (rows[0] as any)?.role;
-    return typeof role === "string" ? role : null;
+    return await readOrgMemberRole(orgId, currentOwnerEmail());
   } catch (error) {
     throw new AppCreationOwnerRoleUnavailableError(error);
   }

package/src/server/lib/community-apps.ts

@@ -95,7 +95,7 @@ export const CURATED_COMMUNITY_APP_SOURCES: readonly CuratedCommunityAppSource[]
         },
         {
           path: "package.json",
-          blobSha: "c7803d346368f927621329b2acbf5f6cc744dc18",
+          blobSha: "de917f7c794eceef303bb6f5a434ece39a6ab6fd",
         },
         {
           path: "server/db/index.ts",

package/src/server/lib/mcp-access-store.spec.ts

@@ -1,15 +1,16 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
-  execute: vi.fn(),
+  readOrgMemberRole: vi.fn(),
   getOrgSetting: vi.fn(),
   getUserSetting: vi.fn(),
   putOrgSetting: vi.fn(),
   putUserSetting: vi.fn(),
 }));
 
-vi.mock("@agent-native/core/db", () => ({
-  getDbExec: () => ({ execute: mocks.execute }),
+vi.mock("@agent-native/core/server", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@agent-native/core/server")>()),
+  readOrgMemberRole: (...args: unknown[]) => mocks.readOrgMemberRole(...args),
 }));
 
 vi.mock("@agent-native/core/settings", () => ({
@@ -29,7 +30,7 @@ import {
 
 beforeEach(() => {
   vi.clearAllMocks();
-  mocks.execute.mockResolvedValue({ rows: [] });
+  mocks.readOrgMemberRole.mockResolvedValue("owner");
 });
 
 describe("normalizeMcpAppAccessSettings", () => {
@@ -63,7 +64,7 @@ describe("setDispatchMcpAppAccessSettings", () => {
   it.each(["owner", "admin"])(
     "lets an organization %s change the app grants",
     async (role) => {
-      mocks.execute.mockResolvedValue({ rows: [{ role }] });
+      mocks.readOrgMemberRole.mockResolvedValue(role);
 
       const result = await runWithRequestContext(
         { userEmail: "manager@example.test", orgId: "org-1" },
@@ -74,10 +75,10 @@ describe("setDispatchMcpAppAccessSettings", () => {
           }),
       );
 
-      expect(mocks.execute).toHaveBeenCalledWith({
-        sql: expect.stringContaining("FROM org_members"),
-        args: ["org-1", "manager@example.test"],
-      });
+      expect(mocks.readOrgMemberRole).toHaveBeenCalledWith(
+        "org-1",
+        "manager@example.test",
+      );
       expect(mocks.putOrgSetting).toHaveBeenCalledWith(
         "org-1",
         "dispatch-mcp-app-access",
@@ -92,7 +93,7 @@ describe("setDispatchMcpAppAccessSettings", () => {
   );
 
   it("rejects an organization member without changing grants", async () => {
-    mocks.execute.mockResolvedValue({ rows: [{ role: "member" }] });
+    mocks.readOrgMemberRole.mockResolvedValue("member");
 
     await expect(
       runWithRequestContext(
@@ -109,8 +110,34 @@ describe("setDispatchMcpAppAccessSettings", () => {
     expect(mocks.putOrgSetting).not.toHaveBeenCalled();
   });
 
+  it("caps a delegated owner before changing organization app grants", async () => {
+    mocks.readOrgMemberRole.mockResolvedValue("member");
+
+    await expect(
+      runWithRequestContext(
+        {
+          userEmail: "owner@example.test",
+          orgId: "org-1",
+          a2aIdentityAssurance: "org-member",
+        },
+        () =>
+          setDispatchMcpAppAccessSettings({
+            mode: "selected-apps",
+            selectedAppIds: ["analytics"],
+          }),
+      ),
+    ).rejects.toMatchObject({ statusCode: 403 });
+    expect(mocks.readOrgMemberRole).toHaveBeenCalledWith(
+      "org-1",
+      "owner@example.test",
+    );
+    expect(mocks.putOrgSetting).not.toHaveBeenCalled();
+  });
+
   it("fails closed when organization membership cannot be verified", async () => {
-    mocks.execute.mockRejectedValue(new Error("org lookup unavailable"));
+    mocks.readOrgMemberRole.mockRejectedValue(
+      new Error("org lookup unavailable"),
+    );
 
     await expect(
       runWithRequestContext(
@@ -132,7 +159,7 @@ describe("setDispatchMcpAppAccessSettings", () => {
       }),
     );
 
-    expect(mocks.execute).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
     expect(mocks.putUserSetting).toHaveBeenCalledWith(
       "solo@example.test",
       "dispatch-mcp-app-access",

package/src/server/lib/mcp-access-store.ts

@@ -1,7 +1,7 @@
-import { getDbExec } from "@agent-native/core/db";
 import {
   getRequestOrgId,
   getRequestUserEmail,
+  readOrgMemberRole,
 } from "@agent-native/core/server";
 import {
   getOrgSetting,
@@ -78,16 +78,9 @@ function currentAccessScope(): AccessScope {
 async function assertCanManageMcpAppAccess(scope: AccessScope): Promise<void> {
   if (scope.kind === "user") return;
 
-  let role: unknown = null;
+  let role: string | null = null;
   try {
-    const { rows } = await getDbExec().execute({
-      sql: `SELECT role FROM org_members
-            WHERE org_id = ? AND LOWER(email) = ?
-              AND federation_removal_pending_at IS NULL
-            LIMIT 1`,
-      args: [scope.id, scope.actor.toLowerCase()],
-    });
-    role = rows[0]?.role;
+    role = await readOrgMemberRole(scope.id, scope.actor);
   } catch {
     // Fail closed when org membership cannot be verified.
   }

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

@@ -6,6 +6,7 @@ const mocks = vi.hoisted(() => ({
   createDbExec: vi.fn(),
   orgId: null as string | null,
   ownerEmail: "owner@example.com",
+  delegatedOrgMember: false,
   dispatchConfig: {
     adminEmails: [] as string[],
     workspaceOwnerEmails: [] as string[],
@@ -20,10 +21,29 @@ vi.mock("@agent-native/core/db", () => ({
 }));
 
 vi.mock("@agent-native/core/server", () => ({
+  getRequestContext: () =>
+    mocks.delegatedOrgMember
+      ? {
+          a2aIdentityAssurance: "org-member",
+          userEmail: mocks.ownerEmail,
+          orgId: mocks.orgId,
+        }
+      : undefined,
   getAppConfig: () => ({
     dispatch: mocks.dispatchConfig,
     observability: { superOrgId: mocks.superOrgId },
   }),
+  readOrgMemberRole: async (orgId: string, email: string) => {
+    const result = await mocks.currentExecute({
+      sql: "SELECT role FROM org_members",
+      args: [orgId, email.toLowerCase()],
+    });
+    const role = result.rows[0]?.role;
+    if (mocks.delegatedOrgMember && (role === "owner" || role === "admin")) {
+      return "member";
+    }
+    return typeof role === "string" ? role : null;
+  },
 }));
 
 vi.mock("./dispatch-store.js", () => ({
@@ -114,6 +134,7 @@ describe("thread-debug-store", () => {
   beforeEach(() => {
     mocks.orgId = null;
     mocks.ownerEmail = "owner@example.com";
+    mocks.delegatedOrgMember = false;
     mocks.dispatchConfig.adminEmails = [];
     mocks.dispatchConfig.workspaceOwnerEmails = [];
     mocks.dispatchConfig.defaultOwnerEmail = undefined;
@@ -458,6 +479,27 @@ describe("thread-debug-store", () => {
     expect(result.thread.ownerEmail).toBe("outsider@example.com");
   });
 
+  it("scopes a delegated owner assertion to its own transcripts", async () => {
+    mocks.orgId = "org-1";
+    mocks.ownerEmail = "owner@example.com";
+    mocks.delegatedOrgMember = true;
+    mocks.currentExecute.mockImplementation(async ({ sql, args }) => {
+      if (sql.includes("SELECT role FROM org_members")) {
+        return { rows: [{ role: "owner" }] };
+      }
+      if (sql.includes("FROM chat_threads")) {
+        expect(sql).toContain("owner_email = ?");
+        expect(args).toContain("owner@example.com");
+        return { rows: [] };
+      }
+      return { rows: [] };
+    });
+
+    await expect(
+      getAgentThreadDebug({ threadId: "other-members-thread" }),
+    ).rejects.toMatchObject({ statusCode: 404 });
+  });
+
   it("keeps explicit remote sources admin-only", async () => {
     vi.stubEnv("REMOTE_DATABASE_URL", "postgres://remote/db");
 
@@ -471,6 +513,28 @@ describe("thread-debug-store", () => {
     expect(mocks.createDbExec).not.toHaveBeenCalled();
   });
 
+  it("does not let an environment admin assertion inspect remote transcripts", async () => {
+    mocks.orgId = "org-1";
+    mocks.ownerEmail = "platform-admin@example.com";
+    mocks.delegatedOrgMember = true;
+    mocks.dispatchConfig.adminEmails = ["platform-admin@example.com"];
+    mocks.currentExecute.mockImplementation(async ({ sql }) =>
+      sql.includes("SELECT role FROM org_members")
+        ? { rows: [{ role: "owner" }] }
+        : { rows: [] },
+    );
+    vi.stubEnv("REMOTE_DATABASE_URL", "postgres://remote/db");
+
+    await expect(
+      listAgentRunFailures({ sourceId: "remote" }),
+    ).rejects.toMatchObject({
+      statusCode: 403,
+      message:
+        "Only Dispatch admins can inspect thread databases from other apps.",
+    });
+    expect(mocks.createDbExec).not.toHaveBeenCalled();
+  });
+
   it("prevents organization admins from requesting an owner outside their organization", async () => {
     mocks.orgId = "org-1";
     mocks.currentExecute.mockImplementation(async ({ sql }) => {

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

@@ -4,7 +4,7 @@ import {
   type AgentFailureRegime,
 } from "@agent-native/core/agent/engine";
 import { createDbExec, getDbExec, type DbExec } from "@agent-native/core/db";
-import { getAppConfig } from "@agent-native/core/server";
+import { getAppConfig, readOrgMemberRole } from "@agent-native/core/server";
 import { ForbiddenError } from "@agent-native/core/sharing";
 
 import {
@@ -436,14 +436,7 @@ async function viewerOrgRole(
   viewerEmail: string,
 ): Promise<string | null> {
   if (!orgId) return null;
-  const rows = await currentDbRows<{ role?: string }>(
-    `SELECT role FROM org_members
-     WHERE org_id = ? AND LOWER(email) = ?
-       AND federation_removal_pending_at IS NULL
-     LIMIT 1`,
-    [orgId, viewerEmail.toLowerCase()],
-  );
-  return typeof rows[0]?.role === "string" ? rows[0].role : null;
+  return readOrgMemberRole(orgId, viewerEmail);
 }
 
 async function currentOrgMembers(orgId: string | null): Promise<string[]> {