@agent-native/dispatch 0.40.30 → 0.40.33

package/dist/server/lib/app-creation-store.js

@@ -2,13 +2,13 @@ import { spawn } from "node:child_process";
 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 { getOrgDomain, isWorkspaceAppAccessAllowed, workspaceApps, } from "@agent-native/core/org";
-import { CredentialStoreUnavailableError, FeatureNotConfiguredError, createBuilderProject, getBuilderBranchProjectId, getConfiguredAppBasePath, getRequestContext, inferWorkspaceAppRootHomePath, isIntegrationCallerRequest, readConfiguredWorkspaceAppHomePath, resolveAppRuntimeUrl, resolveVercelDeploymentProtectionHeaders, normalizeBuilderAgentAttachments, runBuilderAgent, } from "@agent-native/core/server";
+import { getOrgA2ASecret, getOrgDomain, isWorkspaceAppAccessAllowed, workspaceApps, } from "@agent-native/core/org";
+import { CredentialStoreUnavailableError, FeatureNotConfiguredError, createBuilderProject, getBuilderBranchProjectId, getConfiguredAppBasePath, getRequestContext, inferWorkspaceAppRootHomePath, isIntegrationCallerRequest, readConfiguredWorkspaceAppHomePath, readOrgMemberRole, resolveAppRuntimeUrl, resolveVercelDeploymentProtectionHeaders, normalizeBuilderAgentAttachments, runBuilderAgent, } from "@agent-native/core/server";
 import { getOrgSetting } from "@agent-native/core/settings";
 import { getSetting, mutateSetting, putSetting, } from "@agent-native/core/settings";
 import { BUILDER_CONNECT_PROVIDER, BUILDER_CONNECT_PROVIDER_LABEL, assertValidWorkspaceAppId, connectRequiredResult, normalizeWorkspaceAppHomePath, parseAgentProfileMetadata, } from "@agent-native/core/shared";
@@ -89,13 +89,11 @@ function requireWorkspaceAppOrgId() {
         throw new WorkspaceAppOrgRequiredError();
     return orgId;
 }
-class WorkspaceAppsGatewayAuthorizationError extends Error {
-    constructor(statusCode, message = `Workspace apps gateway rejected the request with HTTP ${statusCode}.`) {
-        super(message);
+class WorkspaceAppsGatewayAuthorizationError extends ActionContractError {
+    constructor(statusCode, errorCode = "workspace_gateway_rejected", message = `Workspace apps gateway rejected the request with HTTP ${statusCode}.`) {
+        super(message, { statusCode, errorCode });
         this.name = "WorkspaceAppsGatewayAuthorizationError";
-        this.statusCode = statusCode;
     }
-    statusCode;
 }
 function warnWorkspaceAppsGatewayDenial(denial, source) {
     if (!denial)
@@ -581,6 +579,20 @@ function parseWorkspaceAppsManifest(parsed) {
         .sort(sortWorkspaceApps);
     return apps.length ? apps : null;
 }
+function parseWorkspaceAppsGatewayResponse(parsed) {
+    const rawApps = parsed && typeof parsed === "object" && !Array.isArray(parsed)
+        ? parsed.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) {
     if (!value)
         return null;
@@ -1371,27 +1383,64 @@ async function readWorkspaceAppsFromGateway() {
         return null;
     }
     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 = {};
     if (requestContext?.userEmail) {
-        const orgDomain = requestContext.orgId
-            ? (await getOrgDomain(requestContext.orgId))?.trim().toLowerCase()
-            : undefined;
+        let orgDomain;
+        let orgSecret;
+        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 apps gateway cannot authenticate without a resolved organization domain.");
+            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),
-            });
-            authHeaders.Authorization = `Bearer ${token}`;
+        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.");
+            }
         }
-        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.
+        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.");
+        }
+        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.");
+            }
         }
     }
     const controller = new AbortController();
@@ -1413,36 +1462,46 @@ async function readWorkspaceAppsFromGateway() {
     const protectedRedirect = protectionHeaders["x-vercel-protection-bypass"]
         ? { redirect: "manual" }
         : {};
+    const readAppsResponse = async (response) => {
+        let payload;
+        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), {
                 headers,
                 ...protectedRedirect,
                 signal: controller.signal,
             });
             if (localResponse.status === 401 || localResponse.status === 403) {
-                throw new WorkspaceAppsGatewayAuthorizationError(localResponse.status);
+                throw new WorkspaceAppsGatewayAuthorizationError(localResponse.status, "workspace_gateway_rejected");
+            }
+            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}`,
+                });
             }
-            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));
-                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);
@@ -1454,20 +1513,25 @@ async function readWorkspaceAppsFromGateway() {
             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)
+        if (actionResponse.status === 404)
             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 !== 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)
+        if (error instanceof ActionContractError)
             throw error;
-        return null;
+        throw new ActionContractError("Workspace apps gateway could not be reached.", {
+            statusCode: 503,
+            errorCode: "workspace_gateway_unavailable",
+        });
     }
     finally {
         clearTimeout(timeout);
@@ -1698,6 +1762,9 @@ async function listWorkspaceAppsWithPrincipal(options = {}, principal = "user")
     if (gatewayApps) {
         return finalize(gatewayApps.apps);
     }
+    if (gatewayDenial && gatewayDenial.statusCode >= 500) {
+        throw gatewayDenial;
+    }
     const unverified = gatewayDenial !== null;
     const workspaceRoot = findWorkspaceRoot();
     const localFilesystemApps = workspaceRoot && isLocalAppCreationRuntime()
@@ -1717,8 +1784,9 @@ async function listWorkspaceAppsWithPrincipal(options = {}, principal = "user")
     // 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)
+    if (gatewayDenial && gatewayDenial.statusCode !== 403) {
         throw gatewayDenial;
+    }
     warnWorkspaceAppsGatewayDenial(gatewayDenial, "deployment's own app list");
     if (!workspaceRoot) {
         return finalize([
@@ -2085,19 +2153,10 @@ function isSyntheticIntegrationOwner(ownerEmail) {
 }
 async function requestOwnerRole() {
     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]?.role;
-        return typeof role === "string" ? role : null;
+        return await readOrgMemberRole(orgId, currentOwnerEmail());
     }
     catch (error) {
         throw new AppCreationOwnerRoleUnavailableError(error);