@agent-native/dispatch 0.40.31 → 0.40.33

package/src/actions/connect-external-agent.spec.ts

@@ -1,15 +1,15 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
-  getDbExec: vi.fn(),
   resourcePutIfAbsent: vi.fn(),
   sharedResourceOwner: vi.fn(),
+  readOrgMemberRole: vi.fn(),
   currentOrgId: vi.fn(),
   currentOwnerEmail: vi.fn(),
 }));
 
-vi.mock("@agent-native/core/db", () => ({
-  getDbExec: mocks.getDbExec,
+vi.mock("@agent-native/core/server", () => ({
+  readOrgMemberRole: mocks.readOrgMemberRole,
 }));
 
 vi.mock("@agent-native/core/resources/store", () => ({
@@ -31,11 +31,9 @@ describe("connect-external-agent action", () => {
     vi.clearAllMocks();
     mocks.currentOrgId.mockReturnValue("org_1");
     mocks.currentOwnerEmail.mockReturnValue("owner@example.com");
+    mocks.readOrgMemberRole.mockResolvedValue("admin");
     mocks.sharedResourceOwner.mockReturnValue("shared-owner");
     mocks.resourcePutIfAbsent.mockResolvedValue({ id: "resource_1" });
-    mocks.getDbExec.mockReturnValue({
-      execute: vi.fn().mockResolvedValue({ rows: [{ role: "owner" }] }),
-    });
   });
 
   it("rejects a malformed endpoint URL with a clean validation error instead of an unhandled throw", async () => {
@@ -115,16 +113,14 @@ describe("connect-external-agent action", () => {
     }
 
     expect(isActionContractError(caught)).toBe(true);
-    expect(mocks.getDbExec).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
     expect(mocks.sharedResourceOwner).not.toHaveBeenCalled();
     expect(mocks.resourcePutIfAbsent).not.toHaveBeenCalled();
   });
 
   it("requires an owner or admin actor for shared agents before writing", async () => {
     mocks.currentOrgId.mockReturnValue("org_1");
-    mocks.getDbExec.mockReturnValue({
-      execute: vi.fn().mockResolvedValue({ rows: [{ role: "member" }] }),
-    });
+    mocks.readOrgMemberRole.mockResolvedValue("member");
 
     let caught: unknown;
     try {
@@ -154,7 +150,7 @@ describe("connect-external-agent action", () => {
 
     expect(result.status).toBe("created");
     expect(result.scope).toBe("personal");
-    expect(mocks.getDbExec).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
     expect(mocks.resourcePutIfAbsent).toHaveBeenCalledWith(
       "member@example.com",
       "remote-agents/personal-agent.json",
@@ -173,6 +169,24 @@ describe("connect-external-agent action", () => {
     expect(mocks.resourcePutIfAbsent).toHaveBeenCalled();
   });
 
+  it("does not let an asserted owner register a shared agent without an admin role", async () => {
+    mocks.currentOrgId.mockReturnValue("org-1");
+    mocks.currentOwnerEmail.mockReturnValue("owner@example.com");
+    mocks.readOrgMemberRole.mockResolvedValue("member");
+
+    await expect(
+      action.run({
+        url: "https://agent.example.com",
+        scope: "shared",
+      } as never),
+    ).rejects.toMatchObject({ statusCode: 403 });
+    expect(mocks.readOrgMemberRole).toHaveBeenCalledWith(
+      "org-1",
+      "owner@example.com",
+    );
+    expect(mocks.resourcePutIfAbsent).not.toHaveBeenCalled();
+  });
+
   it("rejects a concurrent duplicate connect as a clean 409, not an overwrite", async () => {
     mocks.resourcePutIfAbsent.mockResolvedValue(null);
 

package/src/actions/connect-external-agent.ts

@@ -1,9 +1,9 @@
 import { defineAction, fail } from "@agent-native/core/action";
-import { getDbExec } from "@agent-native/core/db";
 import {
   resourcePutIfAbsent,
   sharedResourceOwner,
 } from "@agent-native/core/resources/store";
+import { readOrgMemberRole } from "@agent-native/core/server";
 import { z } from "zod";
 
 import { normalizeConnectUrl } from "../lib/connect-apps.js";
@@ -30,14 +30,7 @@ async function assertCanManageSharedAgent() {
     });
   }
   const actor = currentOwnerEmail().trim().toLowerCase();
-  const result = 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, actor],
-  });
-  const role = result.rows[0]?.role;
+  const role = await readOrgMemberRole(orgId, actor);
   if (role !== "owner" && role !== "admin") {
     fail("Only organization owners and admins can connect agents.", {
       statusCode: 403,

package/src/actions/index.spec.ts

@@ -94,5 +94,8 @@ describe("dispatch action registry", () => {
       "workspaceAppCreationsByUserMonth",
     );
     expect(action.tool.description).toContain("app adoption metrics");
+    expect(action.tool.description).toContain(
+      "do not include customer/account/company usage or product data",
+    );
   });
 });

package/src/actions/list-dispatch-usage-metrics.ts

@@ -5,7 +5,7 @@ import { listDispatchUsageMetrics } from "../server/lib/usage-metrics-store.js";
 
 export default defineAction({
   description:
-    "Get personal, workspace, or owner-authorized app adoption metrics for Dispatch, including LLM usage, spend or Builder.io credit spend, active users, tracked app actions, app attribution, prompt previews, and recent activity. billing.unit is unknown when historical usage lacks engine metadata or mixes billing sources; monthlyByUser credits are null in that case. Workspace results also include monthlyByUser credit rows and workspaceAppCreationsByUserMonth rows from the shared token_usage and Dispatch audit tables. App scope is aggregate-only and returns daily/weekly active users plus tracked action counts for the selected app.",
+    "Get personal or workspace-member agent usage and spend, or aggregate app adoption metrics for Dispatch. Workspace results do not include customer/account/company usage or product data; use the relevant workspace app for those. Results may include active users, tracked app actions, app attribution, prompt previews, and recent activity. billing.unit is unknown when historical usage lacks engine metadata or mixes billing sources; monthlyByUser credits are null in that case. Workspace results also include monthlyByUser credit rows and workspaceAppCreationsByUserMonth rows from the shared token_usage and Dispatch audit tables. App scope is aggregate-only and returns daily/weekly active users plus tracked action counts for the selected app.",
   schema: z.object({
     sinceDays: z.coerce
       .number()

package/src/actions/provider-api-register.spec.ts

@@ -13,7 +13,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
   getCredentialContext: vi.fn(),
-  execute: vi.fn(),
+  readOrgMemberRole: vi.fn(),
   upsertCustomProvider: vi.fn(),
   deleteCustomProvider: vi.fn(),
   listCustomProviders: vi.fn(),
@@ -22,10 +22,7 @@ const mocks = vi.hoisted(() => ({
 
 vi.mock("@agent-native/core/server", () => ({
   getCredentialContext: mocks.getCredentialContext,
-}));
-
-vi.mock("@agent-native/core/db", () => ({
-  getDbExec: () => ({ execute: mocks.execute }),
+  readOrgMemberRole: mocks.readOrgMemberRole,
 }));
 
 vi.mock("@agent-native/core/provider-api", async (importOriginal) => {
@@ -43,7 +40,7 @@ vi.mock("@agent-native/core/provider-api", async (importOriginal) => {
 const action = (await import("./provider-api-register.js")).default;
 
 function mockOrgRole(role: string | null): void {
-  mocks.execute.mockResolvedValue({ rows: role ? [{ role }] : [] });
+  mocks.readOrgMemberRole.mockResolvedValue(role);
 }
 
 const baseUpsertInput = {
@@ -136,7 +133,7 @@ describe("provider-api-register org-scope authorization", () => {
       "my-api",
       null,
     );
-    expect(mocks.execute).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
   });
 
   it("allows an org-scope upsert/delete when the caller has no active org", async () => {
@@ -165,7 +162,7 @@ describe("provider-api-register org-scope authorization", () => {
       "my-api",
       "owner",
     );
-    expect(mocks.execute).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
   });
 
   it("does not gate org-scope list/get reads on org role", async () => {
@@ -181,6 +178,15 @@ describe("provider-api-register org-scope authorization", () => {
       "org-a",
       "my-api",
     );
-    expect(mocks.execute).not.toHaveBeenCalled();
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
+  });
+
+  it("rejects owner/admin writes when the shared resolver caps a delegated role", async () => {
+    mockOrgRole("member");
+
+    await expect(
+      action.run({ ...baseUpsertInput, scope: "org" }),
+    ).rejects.toThrow(/owners and admins/i);
+    expect(mocks.upsertCustomProvider).not.toHaveBeenCalled();
   });
 });

package/src/actions/provider-api-register.ts

@@ -1,23 +1,15 @@
-import { getDbExec } from "@agent-native/core/db";
 import { createCustomProviderRegistrationAction } from "@agent-native/core/provider-api/actions/custom-provider-registration";
-import { getCredentialContext } from "@agent-native/core/server";
+import {
+  getCredentialContext,
+  readOrgMemberRole,
+} from "@agent-native/core/server";
 
 async function resolveCallerOrgRole(
   orgId: string,
   email: string,
 ): Promise<string | null> {
   try {
-    const client = getDbExec();
-    const { rows } = await client.execute({
-      sql: `SELECT role FROM org_members
-            WHERE org_id = ? AND LOWER(email) = ?
-              AND federation_removal_pending_at IS NULL
-            LIMIT 1`,
-      args: [orgId, email.toLowerCase()],
-    });
-    if (rows.length === 0) return null;
-    const role = (rows[0] as { role?: unknown }).role;
-    return typeof role === "string" && role ? role : null;
+    return await readOrgMemberRole(orgId, email);
   } catch {
     return null;
   }

package/src/db/index.spec.ts

@@ -0,0 +1,74 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => {
+  let registeredResource: any;
+  return {
+    registerShareableResource: vi.fn((resource: any) => {
+      registeredResource = resource;
+    }),
+    readOrgMemberRole: vi.fn(),
+    getRegisteredResource: () => registeredResource,
+  };
+});
+
+vi.mock("@agent-native/core/db", () => ({
+  createGetDb: () => () => ({}),
+}));
+
+vi.mock("@agent-native/core/sharing", () => ({
+  registerShareableResource: mocks.registerShareableResource,
+}));
+
+vi.mock("@agent-native/core/server", () => ({
+  readOrgMemberRole: mocks.readOrgMemberRole,
+}));
+
+await import("./index.js");
+
+describe("Dispatch workspace app share access", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const canManageAccess = () =>
+    mocks.getRegisteredResource().canManageAccess as (
+      resource: { orgId?: string },
+      ctx: { userEmail?: string; orgId?: string },
+    ) => Promise<boolean>;
+
+  it("uses the shared request-scoped role resolver for an admin", async () => {
+    mocks.readOrgMemberRole.mockResolvedValue("admin");
+
+    await expect(
+      canManageAccess()(
+        { orgId: "org-a" },
+        { userEmail: "admin@example.com", orgId: "org-a" },
+      ),
+    ).resolves.toBe(true);
+    expect(mocks.readOrgMemberRole).toHaveBeenCalledWith(
+      "org-a",
+      "admin@example.com",
+    );
+  });
+
+  it("denies org-member assertions whose stored owner role is capped to member", async () => {
+    mocks.readOrgMemberRole.mockResolvedValue("member");
+
+    await expect(
+      canManageAccess()(
+        { orgId: "org-a" },
+        { userEmail: "owner@example.com", orgId: "org-a" },
+      ),
+    ).resolves.toBe(false);
+  });
+
+  it("does not resolve a role for a resource outside the request org", async () => {
+    await expect(
+      canManageAccess()(
+        { orgId: "org-b" },
+        { userEmail: "member@example.com", orgId: "org-a" },
+      ),
+    ).resolves.toBe(false);
+    expect(mocks.readOrgMemberRole).not.toHaveBeenCalled();
+  });
+});

package/src/db/index.ts

@@ -1,4 +1,5 @@
-import { createGetDb, getDbExec } from "@agent-native/core/db";
+import { createGetDb } from "@agent-native/core/db";
+import { readOrgMemberRole } from "@agent-native/core/server";
 import { registerShareableResource } from "@agent-native/core/sharing";
 import type { PgDatabase, PgQueryResultHKT } from "drizzle-orm/pg-core";
 
@@ -24,14 +25,8 @@ registerShareableResource({
     if (!ctx.userEmail || !ctx.orgId || resource?.orgId !== ctx.orgId) {
       return false;
     }
-    const result = await getDbExec().execute({
-      sql: `SELECT 1 FROM org_members
-            WHERE org_id = ? AND LOWER(email) = LOWER(?)
-              AND federation_removal_pending_at IS NULL
-              AND role IN ('owner', 'admin') LIMIT 1`,
-      args: [ctx.orgId, ctx.userEmail],
-    });
-    return result.rows.length > 0;
+    const role = await readOrgMemberRole(ctx.orgId, ctx.userEmail);
+    return role === "owner" || role === "admin";
   },
 });
 

package/src/server/lib/admin-config.spec.ts

@@ -0,0 +1,51 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const getAppConfigMock = vi.hoisted(() => vi.fn());
+
+vi.mock("@agent-native/core/server", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@agent-native/core/server")>()),
+  getAppConfig: () => getAppConfigMock(),
+}));
+
+import { runWithRequestContext } from "@agent-native/core/server";
+
+import { isDispatchEnvironmentAdmin } from "./admin-config.js";
+
+describe("isDispatchEnvironmentAdmin", () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("recognizes configured environment administrators outside delegated requests", () => {
+    getAppConfigMock.mockReturnValue({
+      dispatch: {
+        adminEmails: ["platform@example.test"],
+        workspaceOwnerEmails: [],
+        defaultOwnerEmail: null,
+      },
+    });
+
+    expect(isDispatchEnvironmentAdmin("PLATFORM@example.test")).toBe(true);
+  });
+
+  it("does not turn an org-member assertion for an environment admin into global access", async () => {
+    getAppConfigMock.mockReturnValue({
+      dispatch: {
+        adminEmails: ["platform@example.test"],
+        workspaceOwnerEmails: [],
+        defaultOwnerEmail: null,
+      },
+    });
+
+    await runWithRequestContext(
+      {
+        userEmail: "platform@example.test",
+        orgId: "org-1",
+        a2aIdentityAssurance: "org-member",
+      },
+      () => {
+        expect(isDispatchEnvironmentAdmin("platform@example.test")).toBe(false);
+      },
+    );
+  });
+});

package/src/server/lib/admin-config.ts

@@ -1,8 +1,9 @@
-import { getAppConfig } from "@agent-native/core/server";
+import { getAppConfig, getRequestContext } from "@agent-native/core/server";
 
 export function isDispatchEnvironmentAdmin(email: string): boolean {
   const normalized = email.trim().toLowerCase();
   if (!normalized) return false;
+  if (getRequestContext()?.a2aIdentityAssurance === "org-member") return false;
   const config = getAppConfig().dispatch;
   return [
     ...config.adminEmails,

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

@@ -79,6 +79,7 @@ const mocks = vi.hoisted(() => {
       role: "viewer",
       resource: {},
     })),
+    readOrgMemberRole: vi.fn(async () => state.orgRole),
     getDbExec: vi.fn(() => ({
       execute: vi.fn(async (statement: unknown) => {
         const sql =
@@ -216,6 +217,7 @@ vi.mock("@agent-native/core/server", async (importOriginal) => {
     await importOriginal<typeof import("@agent-native/core/server")>();
   return {
     ...actual,
+    readOrgMemberRole: (...args: any[]) => mocks.readOrgMemberRole(...args),
     resolveBuilderCredentialsDetailed: (...args: any[]) =>
       mocks.resolveBuilderCredentialsDetailed(...args),
     createBuilderProject: (...args: any[]) =>
@@ -261,6 +263,8 @@ afterEach(() => {
     },
   );
   mocks.state.orgRole = "admin";
+  mocks.readOrgMemberRole.mockReset();
+  mocks.readOrgMemberRole.mockImplementation(async () => mocks.state.orgRole);
   mocks.state.workspaceApps = [];
   orgAppsDirectoryCache.clear();
   orgAppsDirectoryAccessCache.clear();
@@ -2324,11 +2328,9 @@ describe("listWorkspaceApps", () => {
   it("reports owner-role lookup failures as unavailable instead of unauthorized", async () => {
     stubNoPendingContext();
     stubManifest([{ id: "todo", name: "Todo", path: "/todo" }]);
-    mocks.getDbExec.mockReturnValue({
-      execute: vi.fn(async () => {
-        throw new Error("database unavailable");
-      }),
-    } as any);
+    mocks.readOrgMemberRole.mockRejectedValue(
+      new Error("database unavailable"),
+    );
 
     await expect(
       runWithRequestContext(
@@ -3203,4 +3205,24 @@ describe("setAppCreationSettings", () => {
     expect(mocks.writeAppSecret).not.toHaveBeenCalled();
     expect(mocks.deleteAppSecret).not.toHaveBeenCalled();
   });
+
+  it("caps a delegated owner before changing the shared Builder project", async () => {
+    mocks.readOrgMemberRole.mockResolvedValueOnce("member");
+
+    await expect(
+      runWithRequestContext(
+        {
+          userEmail: "dev@example.test",
+          orgId,
+          a2aIdentityAssurance: "org-member",
+        },
+        () => setAppCreationSettings({ builderProjectId: projectId }),
+      ),
+    ).rejects.toMatchObject({ statusCode: 403 });
+    expect(mocks.readOrgMemberRole).toHaveBeenCalledWith(
+      orgId,
+      "dev@example.test",
+    );
+    expect(mocks.putSetting).not.toHaveBeenCalled();
+  });
 });

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

@@ -31,6 +31,7 @@ import {
   inferWorkspaceAppRootHomePath,
   isIntegrationCallerRequest,
   readConfiguredWorkspaceAppHomePath,
+  readOrgMemberRole,
   resolveAppRuntimeUrl,
   resolveVercelDeploymentProtectionHeaders,
   normalizeBuilderAgentAttachments,
@@ -2827,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.
   }