@agent-native/core 0.79.17 → 0.79.18

package/dist/file-upload/actions/upload-image.d.ts

@@ -3,18 +3,18 @@ declare const _default: import("../../action.js").ActionDefinition<{
     url?: string;
     filename?: string;
 }, {
+    id?: undefined;
     error: string;
     configured?: undefined;
     connectPath?: undefined;
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
 } | {
+    id?: undefined;
     error: string;
     configured: boolean;
     connectPath: string;
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
 } | {
     error?: undefined;

package/dist/file-upload/index.d.ts

@@ -1,5 +1,5 @@
 export type { FileUploadInput, FileUploadProvider, FileUploadResult, } from "./types.js";
-export { registerFileUploadProvider, unregisterFileUploadProvider, listFileUploadProviders, getActiveFileUploadProvider, uploadFile, } from "./registry.js";
+export { registerFileUploadProvider, unregisterFileUploadProvider, listFileUploadProviders, getActiveFileUploadProvider, getActiveFileUploadProviderForRequest, uploadFile, } from "./registry.js";
 export { builderFileUploadProvider } from "./builder.js";
 export { preUploadImageAttachments, preUploadAttachments, isFileUploadProviderConfigured, type PreUploadAttachmentsResult, type PreUploadedImageAttachment, type PreUploadedFileAttachment, } from "./pre-upload-attachments.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/file-upload/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file-upload/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,EACvB,2BAA2B,EAC3B,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,8BAA8B,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file-upload/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,EACvB,2BAA2B,EAC3B,qCAAqC,EACrC,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,8BAA8B,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,6BAA6B,CAAC"}

package/dist/file-upload/index.js

@@ -1,4 +1,4 @@
-export { registerFileUploadProvider, unregisterFileUploadProvider, listFileUploadProviders, getActiveFileUploadProvider, uploadFile, } from "./registry.js";
+export { registerFileUploadProvider, unregisterFileUploadProvider, listFileUploadProviders, getActiveFileUploadProvider, getActiveFileUploadProviderForRequest, uploadFile, } from "./registry.js";
 export { builderFileUploadProvider } from "./builder.js";
 export { preUploadImageAttachments, preUploadAttachments, isFileUploadProviderConfigured, } from "./pre-upload-attachments.js";
 //# sourceMappingURL=index.js.map

package/dist/file-upload/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/file-upload/index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,EACvB,2BAA2B,EAC3B,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,8BAA8B,GAI/B,MAAM,6BAA6B,CAAC","sourcesContent":["export type {\n  FileUploadInput,\n  FileUploadProvider,\n  FileUploadResult,\n} from \"./types.js\";\nexport {\n  registerFileUploadProvider,\n  unregisterFileUploadProvider,\n  listFileUploadProviders,\n  getActiveFileUploadProvider,\n  uploadFile,\n} from \"./registry.js\";\nexport { builderFileUploadProvider } from \"./builder.js\";\nexport {\n  preUploadImageAttachments,\n  preUploadAttachments,\n  isFileUploadProviderConfigured,\n  type PreUploadAttachmentsResult,\n  type PreUploadedImageAttachment,\n  type PreUploadedFileAttachment,\n} from \"./pre-upload-attachments.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/file-upload/index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,EACvB,2BAA2B,EAC3B,qCAAqC,EACrC,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,8BAA8B,GAI/B,MAAM,6BAA6B,CAAC","sourcesContent":["export type {\n  FileUploadInput,\n  FileUploadProvider,\n  FileUploadResult,\n} from \"./types.js\";\nexport {\n  registerFileUploadProvider,\n  unregisterFileUploadProvider,\n  listFileUploadProviders,\n  getActiveFileUploadProvider,\n  getActiveFileUploadProviderForRequest,\n  uploadFile,\n} from \"./registry.js\";\nexport { builderFileUploadProvider } from \"./builder.js\";\nexport {\n  preUploadImageAttachments,\n  preUploadAttachments,\n  isFileUploadProviderConfigured,\n  type PreUploadAttachmentsResult,\n  type PreUploadedImageAttachment,\n  type PreUploadedFileAttachment,\n} from \"./pre-upload-attachments.js\";\n"]}

package/dist/file-upload/registry.d.ts

@@ -13,6 +13,7 @@ export declare function listFileUploadProviders(): FileUploadProvider[];
  * SQL fallback.
  */
 export declare function getActiveFileUploadProvider(): FileUploadProvider | null;
+export declare function getActiveFileUploadProviderForRequest(): Promise<FileUploadProvider | null>;
 /**
  * Upload a file via the active provider, or `null` if no provider is
  * configured. Callers use `null` as the signal to fall back to SQL

package/dist/file-upload/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/file-upload/registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAmBpB;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAE7E;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE7D;AAED,wBAAgB,uBAAuB,IAAI,kBAAkB,EAAE,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,IAAI,kBAAkB,GAAG,IAAI,CAQvE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA4ClC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/file-upload/registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAmBpB;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAE7E;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE7D;AAED,wBAAgB,uBAAuB,IAAI,kBAAkB,EAAE,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,IAAI,kBAAkB,GAAG,IAAI,CAQvE;AAED,wBAAsB,qCAAqC,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAgBhG;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA0ClC"}

package/dist/file-upload/registry.js

@@ -31,6 +31,26 @@ export function getActiveFileUploadProvider() {
     }
     return null;
 }
+export async function getActiveFileUploadProviderForRequest() {
+    for (const provider of providers.values()) {
+        if (provider.isConfigured())
+            return provider;
+        if (provider.isConfiguredForRequest) {
+            try {
+                if (await provider.isConfiguredForRequest())
+                    return provider;
+            }
+            catch {
+                // Treat failed scoped credential lookups as unavailable. The upload
+                // call will surface real provider errors after a provider is selected.
+            }
+        }
+    }
+    if (builderFileUploadProvider.isConfigured()) {
+        return builderFileUploadProvider;
+    }
+    return null;
+}
 /**
  * Upload a file via the active provider, or `null` if no provider is
  * configured. Callers use `null` as the signal to fall back to SQL
@@ -38,12 +58,10 @@ export function getActiveFileUploadProvider() {
  * storing files in SQL is not optimal for production.
  */
 export async function uploadFile(input) {
-    const provider = getActiveFileUploadProvider();
-    // Only trust user-registered providers (S3, etc.) from the sync check.
-    // The builder builtin's isConfigured() only checks process.env, which causes
-    // hard failures for authenticated non-local users on multi-tenant deployments
-    // where BUILDER_PRIVATE_KEY is set at the deploy level but the user has no
-    // personal credentials. Always resolve builder credentials asynchronously.
+    const provider = await getActiveFileUploadProviderForRequest();
+    // User-registered providers (S3, etc.) may be configured by sync runtime
+    // state or request-scoped DB secrets. Builder still gets an explicit async
+    // credential check below because its sync isConfigured() only checks env.
     if (provider && provider !== builderFileUploadProvider) {
         return provider.upload(input);
     }

package/dist/file-upload/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/file-upload/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAkBzD,MAAM,OAAO,GAAG,UAAmD,CAAC;AACpE,MAAM,SAAS,GACb,CAAC,OAAO,CAAC,gCAAgC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;AAC3D,MAAM,iBAAiB,GACrB,CAAC,OAAO,CAAC,qCAAqC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAEvE;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAA4B;IACrE,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,EAAU;IACrD,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B;IACzC,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QAC1C,IAAI,QAAQ,CAAC,YAAY,EAAE;YAAE,OAAO,QAAQ,CAAC;IAC/C,CAAC;IACD,IAAI,yBAAyB,CAAC,YAAY,EAAE,EAAE,CAAC;QAC7C,OAAO,yBAAyB,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,KAAsB;IAEtB,MAAM,QAAQ,GAAG,2BAA2B,EAAE,CAAC;IAC/C,uEAAuE;IACvE,6EAA6E;IAC7E,8EAA8E;IAC9E,2EAA2E;IAC3E,2EAA2E;IAC3E,IAAI,QAAQ,IAAI,QAAQ,KAAK,yBAAyB,EAAE,CAAC;QACvD,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,wEAAwE;IACxE,6EAA6E;IAC7E,sEAAsE;IACtE,iDAAiD;IACjD,IAAI,UAAU,GAAkB,IAAI,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,wBAAwB,EAAE,GAChC,MAAM,MAAM,CAAC,kCAAkC,CAAC,CAAC;QACnD,UAAU,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAChD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,oEAAoE;QACpE,kDAAkD;QAClD,OAAO,CAAC,IAAI,CACV,iDAAiD,EACjD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,oEAAoE;QACpE,OAAO,MAAM,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC7B,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,OAAO,CAAC,IAAI,CACV,qDAAqD;YACnD,8DAA8D;YAC9D,kFAAkF,CACrF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import { builderFileUploadProvider } from \"./builder.js\";\nimport type {\n  FileUploadInput,\n  FileUploadProvider,\n  FileUploadResult,\n} from \"./types.js\";\n\n// Why globalThis: in dev (Vite HMR) and in some Nitro/Rollup bundle splits,\n// this module can be evaluated more than once — the plugin file that\n// registers a provider lands in one module instance and the request handler\n// that reads providers lands in another, so the call site sees an empty map\n// even though `registerFileUploadProvider` succeeded. Pinning the singletons\n// on `globalThis` guarantees one set of providers per Node process,\n// independent of how the bundler split the chunks.\ninterface FileUploadGlobals {\n  __agentNativeFileUploadProviders?: Map<string, FileUploadProvider>;\n  __agentNativeFileUploadWarnedFallback?: { value: boolean };\n}\nconst globals = globalThis as typeof globalThis & FileUploadGlobals;\nconst providers: Map<string, FileUploadProvider> =\n  (globals.__agentNativeFileUploadProviders ??= new Map());\nconst warnedFallbackRef: { value: boolean } =\n  (globals.__agentNativeFileUploadWarnedFallback ??= { value: false });\n\n/**\n * Register a file upload provider. Call from a server plugin or app\n * bootstrap. Idempotent per id — later calls with the same id replace.\n */\nexport function registerFileUploadProvider(provider: FileUploadProvider): void {\n  providers.set(provider.id, provider);\n}\n\nexport function unregisterFileUploadProvider(id: string): void {\n  providers.delete(id);\n}\n\nexport function listFileUploadProviders(): FileUploadProvider[] {\n  return [...providers.values()];\n}\n\n/**\n * Returns the first configured provider, checking user-registered ones first\n * and falling back to the built-in Builder.io provider when its env is set.\n * Returns `null` when nothing is configured — callers should then use the\n * SQL fallback.\n */\nexport function getActiveFileUploadProvider(): FileUploadProvider | null {\n  for (const provider of providers.values()) {\n    if (provider.isConfigured()) return provider;\n  }\n  if (builderFileUploadProvider.isConfigured()) {\n    return builderFileUploadProvider;\n  }\n  return null;\n}\n\n/**\n * Upload a file via the active provider, or `null` if no provider is\n * configured. Callers use `null` as the signal to fall back to SQL\n * storage. On the first fallback we log a one-time warning because\n * storing files in SQL is not optimal for production.\n */\nexport async function uploadFile(\n  input: FileUploadInput,\n): Promise<FileUploadResult | null> {\n  const provider = getActiveFileUploadProvider();\n  // Only trust user-registered providers (S3, etc.) from the sync check.\n  // The builder builtin's isConfigured() only checks process.env, which causes\n  // hard failures for authenticated non-local users on multi-tenant deployments\n  // where BUILDER_PRIVATE_KEY is set at the deploy level but the user has no\n  // personal credentials. Always resolve builder credentials asynchronously.\n  if (provider && provider !== builderFileUploadProvider) {\n    return provider.upload(input);\n  }\n\n  // Resolve credentials asynchronously (works when request context is set\n  // via runWithRequestContext — actions always have one via action-routes.ts).\n  // Two separate try-catch blocks ensure a real upload failure is never\n  // silently swallowed as a \"no credentials\" case.\n  let builderKey: string | null = null;\n  try {\n    const { resolveBuilderPrivateKey } =\n      await import(\"../server/credential-provider.js\");\n    builderKey = await resolveBuilderPrivateKey();\n  } catch (err) {\n    // DB unavailable or credential store not ready — can't resolve key.\n    // Log and fall through to the SQL fallback below.\n    console.warn(\n      \"[agent-native] Builder credential check failed:\",\n      err instanceof Error ? err.message : String(err),\n    );\n  }\n\n  if (builderKey) {\n    // Credentials confirmed — attempt the upload. Real errors (network,\n    // API, rate-limit) propagate to the caller; do NOT catch them here.\n    return await builderFileUploadProvider.upload(input);\n  }\n\n  if (!warnedFallbackRef.value) {\n    warnedFallbackRef.value = true;\n    console.warn(\n      \"[agent-native] No file upload provider configured. \" +\n        \"Connect or reconnect Builder.io in Settings → File uploads, \" +\n        \"or register a custom provider (S3, R2, GCS, …) via registerFileUploadProvider().\",\n    );\n  }\n  return null;\n}\n"]}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/file-upload/registry.ts"],"names":[],"mappings":"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","sourcesContent":["import { builderFileUploadProvider } from \"./builder.js\";\nimport type {\n  FileUploadInput,\n  FileUploadProvider,\n  FileUploadResult,\n} from \"./types.js\";\n\n// Why globalThis: in dev (Vite HMR) and in some Nitro/Rollup bundle splits,\n// this module can be evaluated more than once — the plugin file that\n// registers a provider lands in one module instance and the request handler\n// that reads providers lands in another, so the call site sees an empty map\n// even though `registerFileUploadProvider` succeeded. Pinning the singletons\n// on `globalThis` guarantees one set of providers per Node process,\n// independent of how the bundler split the chunks.\ninterface FileUploadGlobals {\n  __agentNativeFileUploadProviders?: Map<string, FileUploadProvider>;\n  __agentNativeFileUploadWarnedFallback?: { value: boolean };\n}\nconst globals = globalThis as typeof globalThis & FileUploadGlobals;\nconst providers: Map<string, FileUploadProvider> =\n  (globals.__agentNativeFileUploadProviders ??= new Map());\nconst warnedFallbackRef: { value: boolean } =\n  (globals.__agentNativeFileUploadWarnedFallback ??= { value: false });\n\n/**\n * Register a file upload provider. Call from a server plugin or app\n * bootstrap. Idempotent per id — later calls with the same id replace.\n */\nexport function registerFileUploadProvider(provider: FileUploadProvider): void {\n  providers.set(provider.id, provider);\n}\n\nexport function unregisterFileUploadProvider(id: string): void {\n  providers.delete(id);\n}\n\nexport function listFileUploadProviders(): FileUploadProvider[] {\n  return [...providers.values()];\n}\n\n/**\n * Returns the first configured provider, checking user-registered ones first\n * and falling back to the built-in Builder.io provider when its env is set.\n * Returns `null` when nothing is configured — callers should then use the\n * SQL fallback.\n */\nexport function getActiveFileUploadProvider(): FileUploadProvider | null {\n  for (const provider of providers.values()) {\n    if (provider.isConfigured()) return provider;\n  }\n  if (builderFileUploadProvider.isConfigured()) {\n    return builderFileUploadProvider;\n  }\n  return null;\n}\n\nexport async function getActiveFileUploadProviderForRequest(): Promise<FileUploadProvider | null> {\n  for (const provider of providers.values()) {\n    if (provider.isConfigured()) return provider;\n    if (provider.isConfiguredForRequest) {\n      try {\n        if (await provider.isConfiguredForRequest()) return provider;\n      } catch {\n        // Treat failed scoped credential lookups as unavailable. The upload\n        // call will surface real provider errors after a provider is selected.\n      }\n    }\n  }\n  if (builderFileUploadProvider.isConfigured()) {\n    return builderFileUploadProvider;\n  }\n  return null;\n}\n\n/**\n * Upload a file via the active provider, or `null` if no provider is\n * configured. Callers use `null` as the signal to fall back to SQL\n * storage. On the first fallback we log a one-time warning because\n * storing files in SQL is not optimal for production.\n */\nexport async function uploadFile(\n  input: FileUploadInput,\n): Promise<FileUploadResult | null> {\n  const provider = await getActiveFileUploadProviderForRequest();\n  // User-registered providers (S3, etc.) may be configured by sync runtime\n  // state or request-scoped DB secrets. Builder still gets an explicit async\n  // credential check below because its sync isConfigured() only checks env.\n  if (provider && provider !== builderFileUploadProvider) {\n    return provider.upload(input);\n  }\n\n  // Resolve credentials asynchronously (works when request context is set\n  // via runWithRequestContext — actions always have one via action-routes.ts).\n  // Two separate try-catch blocks ensure a real upload failure is never\n  // silently swallowed as a \"no credentials\" case.\n  let builderKey: string | null = null;\n  try {\n    const { resolveBuilderPrivateKey } =\n      await import(\"../server/credential-provider.js\");\n    builderKey = await resolveBuilderPrivateKey();\n  } catch (err) {\n    // DB unavailable or credential store not ready — can't resolve key.\n    // Log and fall through to the SQL fallback below.\n    console.warn(\n      \"[agent-native] Builder credential check failed:\",\n      err instanceof Error ? err.message : String(err),\n    );\n  }\n\n  if (builderKey) {\n    // Credentials confirmed — attempt the upload. Real errors (network,\n    // API, rate-limit) propagate to the caller; do NOT catch them here.\n    return await builderFileUploadProvider.upload(input);\n  }\n\n  if (!warnedFallbackRef.value) {\n    warnedFallbackRef.value = true;\n    console.warn(\n      \"[agent-native] No file upload provider configured. \" +\n        \"Connect or reconnect Builder.io in Settings → File uploads, \" +\n        \"or register a custom provider (S3, R2, GCS, …) via registerFileUploadProvider().\",\n    );\n  }\n  return null;\n}\n"]}

package/dist/file-upload/types.d.ts

@@ -29,8 +29,13 @@ export interface FileUploadProvider {
     id: string;
     /** Human-readable name. */
     name: string;
-    /** Returns true if this provider is currently configured (env vars etc.). */
+    /** Returns true if this provider is configured from synchronous runtime state. */
     isConfigured: () => boolean;
+    /**
+     * Returns true if this provider is configured for the active request.
+     * Use for DB-backed user/org/workspace secrets that require request context.
+     */
+    isConfiguredForRequest?: () => Promise<boolean>;
     /** Upload a file and return a URL. Throw on failure. */
     upload: (input: FileUploadInput) => Promise<FileUploadResult>;
 }

package/dist/file-upload/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/file-upload/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,eAAe;IAC9B,qBAAqB;IACrB,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,YAAY,EAAE,MAAM,OAAO,CAAC;IAC5B,wDAAwD;IACxD,MAAM,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC/D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/file-upload/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,eAAe;IAC9B,qBAAqB;IACrB,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,YAAY,EAAE,MAAM,OAAO,CAAC;IAC5B;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,wDAAwD;IACxD,MAAM,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC/D"}

package/dist/file-upload/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/file-upload/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG","sourcesContent":["/**\n * File upload framework primitive.\n *\n * Templates call `uploadFile()` to upload a file and get back a URL.\n * The framework dispatches to whichever provider is registered (Builder.io\n * built-in, or a user-supplied one). If no provider is active, it falls back\n * to the SQL resources store — fine for dev, not recommended for production.\n */\n\nexport interface FileUploadInput {\n  /** File contents. */\n  data: Uint8Array | Buffer;\n  /** Original filename, used for extension/display. */\n  filename?: string;\n  /** MIME type, e.g. \"image/png\". */\n  mimeType?: string;\n  /** Optional owner email for per-user scoping in fallback storage. */\n  ownerEmail?: string;\n}\n\nexport interface FileUploadResult {\n  /** Public URL where the file can be fetched. */\n  url: string;\n  /** Optional provider-specific id (e.g. resource id, Builder asset id). */\n  id?: string;\n  /** The provider that handled the upload. */\n  provider: string;\n}\n\nexport interface FileUploadProvider {\n  /** Unique id, e.g. \"builder\", \"s3\". */\n  id: string;\n  /** Human-readable name. */\n  name: string;\n  /** Returns true if this provider is currently configured (env vars etc.). */\n  isConfigured: () => boolean;\n  /** Upload a file and return a URL. Throw on failure. */\n  upload: (input: FileUploadInput) => Promise<FileUploadResult>;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/file-upload/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG","sourcesContent":["/**\n * File upload framework primitive.\n *\n * Templates call `uploadFile()` to upload a file and get back a URL.\n * The framework dispatches to whichever provider is registered (Builder.io\n * built-in, or a user-supplied one). If no provider is active, it falls back\n * to the SQL resources store — fine for dev, not recommended for production.\n */\n\nexport interface FileUploadInput {\n  /** File contents. */\n  data: Uint8Array | Buffer;\n  /** Original filename, used for extension/display. */\n  filename?: string;\n  /** MIME type, e.g. \"image/png\". */\n  mimeType?: string;\n  /** Optional owner email for per-user scoping in fallback storage. */\n  ownerEmail?: string;\n}\n\nexport interface FileUploadResult {\n  /** Public URL where the file can be fetched. */\n  url: string;\n  /** Optional provider-specific id (e.g. resource id, Builder asset id). */\n  id?: string;\n  /** The provider that handled the upload. */\n  provider: string;\n}\n\nexport interface FileUploadProvider {\n  /** Unique id, e.g. \"builder\", \"s3\". */\n  id: string;\n  /** Human-readable name. */\n  name: string;\n  /** Returns true if this provider is configured from synchronous runtime state. */\n  isConfigured: () => boolean;\n  /**\n   * Returns true if this provider is configured for the active request.\n   * Use for DB-backed user/org/workspace secrets that require request context.\n   */\n  isConfiguredForRequest?: () => Promise<boolean>;\n  /** Upload a file and return a URL. Throw on failure. */\n  upload: (input: FileUploadInput) => Promise<FileUploadResult>;\n}\n"]}

package/dist/integrations/adapters/email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../src/integrations/adapters/email.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,eAAe,EAKhB,MAAM,aAAa,CAAC;AAoCrB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,IAAI,eAAe,CAwR9C"}
+{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../src/integrations/adapters/email.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,eAAe,EAKhB,MAAM,aAAa,CAAC;AAoCrB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,IAAI,eAAe,CA4R9C"}

package/dist/integrations/adapters/email.js

@@ -1,6 +1,7 @@
 import { timingSafeEqual } from "node:crypto";
 import { getHeader, readRawBody as h3ReadRawBody } from "h3";
 import { getDbExec } from "../../db/client.js";
+import { resolveSecret } from "../../server/credential-provider.js";
 import { sendEmail, isEmailConfigured, getEmailProvider, } from "../../server/email.js";
 import { getIntegrationConfig } from "../config-store.js";
 /** Max body length before truncation */
@@ -84,8 +85,8 @@ export function emailAdapter() {
             return { handled: false };
         },
         async verifyWebhook(event) {
-            const secret = process.env.EMAIL_INBOUND_WEBHOOK_SECRET;
-            const provider = getEmailProvider();
+            const secret = (await resolveSecret("EMAIL_INBOUND_WEBHOOK_SECRET")) ?? undefined;
+            const provider = await getEmailProvider();
             if (provider === "resend") {
                 return verifyResendWebhook(event, secret);
             }
@@ -97,8 +98,8 @@ export function emailAdapter() {
             return false;
         },
         async parseIncomingMessage(event) {
-            const provider = getEmailProvider();
-            const agentAddress = process.env.EMAIL_AGENT_ADDRESS?.toLowerCase();
+            const provider = await getEmailProvider();
+            const agentAddress = (await resolveSecret("EMAIL_AGENT_ADDRESS"))?.toLowerCase();
             if (!agentAddress) {
                 console.warn("[email] EMAIL_AGENT_ADDRESS not configured");
                 return null;
@@ -190,7 +191,7 @@ export function emailAdapter() {
             };
         },
         async sendResponse(message, context) {
-            const agentAddress = process.env.EMAIL_AGENT_ADDRESS;
+            const agentAddress = await resolveSecret("EMAIL_AGENT_ADDRESS");
             if (!agentAddress) {
                 console.error("[email] EMAIL_AGENT_ADDRESS not configured");
                 return;
@@ -200,9 +201,8 @@ export function emailAdapter() {
             // EMAIL_FROM overrides the from-address — required when the receiving
             // address is on a sub-domain that can't be a verified sender (e.g.
             // *.resend.app). Inbound and outbound addresses can differ.
-            const fromAddress = process.env.EMAIL_FROM
-                ? process.env.EMAIL_FROM
-                : `${displayName} <${agentAddress}>`;
+            const emailFrom = await resolveSecret("EMAIL_FROM");
+            const fromAddress = emailFrom || `${displayName} <${agentAddress}>`;
             const subject = context.platformContext.subject;
             const reSubject = subject.startsWith("Re: ") ? subject : `Re: ${subject}`;
             try {
@@ -215,7 +215,7 @@ export function emailAdapter() {
                     inReplyTo: context.platformContext.messageId,
                     references: buildReferencesHeader(context.platformContext),
                     cc: context.platformContext.isCC
-                        ? buildReplyAllCc(context)
+                        ? buildReplyAllCc(context, agentAddress)
                         : undefined,
                 });
             }
@@ -224,7 +224,7 @@ export function emailAdapter() {
             }
         },
         async sendMessageToTarget(message, target) {
-            const agentAddress = process.env.EMAIL_AGENT_ADDRESS;
+            const agentAddress = await resolveSecret("EMAIL_AGENT_ADDRESS");
             if (!agentAddress) {
                 console.error("[email] EMAIL_AGENT_ADDRESS not configured");
                 return;
@@ -257,9 +257,9 @@ export function emailAdapter() {
             return { text: html, platformContext: {} };
         },
         async getStatus(_baseUrl) {
-            const hasAgentAddress = !!process.env.EMAIL_AGENT_ADDRESS;
-            const hasEmailProvider = isEmailConfigured();
-            const hasWebhookSecret = !!process.env.EMAIL_INBOUND_WEBHOOK_SECRET;
+            const hasAgentAddress = !!(await resolveSecret("EMAIL_AGENT_ADDRESS"));
+            const hasEmailProvider = await isEmailConfigured();
+            const hasWebhookSecret = !!(await resolveSecret("EMAIL_INBOUND_WEBHOOK_SECRET"));
             const configured = hasAgentAddress && hasEmailProvider;
             return {
                 platform: "email",
@@ -270,10 +270,10 @@ export function emailAdapter() {
                     hasAgentAddress,
                     hasEmailProvider,
                     hasWebhookSecret,
-                    provider: getEmailProvider(),
+                    provider: await getEmailProvider(),
                 },
                 error: !configured
-                    ? "Set EMAIL_AGENT_ADDRESS and either RESEND_API_KEY or SENDGRID_API_KEY"
+                    ? "Save EMAIL_AGENT_ADDRESS and either RESEND_API_KEY or SENDGRID_API_KEY in settings"
                     : undefined,
             };
         },
@@ -737,8 +737,8 @@ function buildReferencesHeader(ctx) {
  * Build CC list for reply-all when agent was CC'd.
  * Include original To addresses and other CC addresses, excluding the agent and the original sender.
  */
-function buildReplyAllCc(context) {
-    const agentAddress = process.env.EMAIL_AGENT_ADDRESS?.toLowerCase();
+function buildReplyAllCc(context, agentAddress) {
+    const normalizedAgentAddress = agentAddress.toLowerCase();
     const senderEmail = context.senderId?.toLowerCase();
     const toAddresses = context.platformContext.to || [];
     const ccAddresses = context.platformContext.cc || [];
@@ -746,7 +746,7 @@ function buildReplyAllCc(context) {
     for (const addr of [...toAddresses, ...ccAddresses]) {
         const normalized = addr.toLowerCase().trim();
         // Exclude agent address and original sender (sender goes in To)
-        if (normalized !== agentAddress && normalized !== senderEmail) {
+        if (normalized !== normalizedAgentAddress && normalized !== senderEmail) {
             allRecipients.add(normalized);
         }
     }