@standardagents/builder 0.27.6 → 0.27.7

package/dist/runtime.d.ts

@@ -3605,6 +3605,28 @@ declare class ProviderRegistryImpl {
     private providerOverrideFn;
     private providerOverrideRevision;
     setProviderOverride(fn: ProviderOverrideFn | null): void;
+    /**
+     * The env a provider resolves against for a given execution, scoped to the
+     * THREAD rather than just the instance: thread env overrides win, then the
+     * thread OWNER's user env, then instance/Worker env. This is what makes
+     * per-user BYOK providers work — a credential a user installs in their own
+     * account env (e.g. an OAuth token a companion service rotates) is honored
+     * for that user's threads no matter which authorized actor plays the turn.
+     *
+     * Best-effort by design: a missing user id (super-admin/local threads) or
+     * an older AgentBuilder DO without user-env storage simply contributes
+     * nothing, leaving instance-env behavior untouched.
+     */
+    buildThreadScopedEnv(state: {
+        env: Env;
+        thread: {
+            metadata?: {
+                user_id?: string | null;
+                env?: Record<string, unknown> | null;
+                tenvs?: Record<string, unknown> | null;
+            };
+        };
+    }): Promise<Env>;
     /**
      * Get provider for a model.
      *

package/dist/runtime.js

@@ -890,6 +890,42 @@ var init_ProviderRegistry = __esm({
         this.providerOverrideFn = fn;
         this.providerOverrideRevision += 1;
       }
+      /**
+       * The env a provider resolves against for a given execution, scoped to the
+       * THREAD rather than just the instance: thread env overrides win, then the
+       * thread OWNER's user env, then instance/Worker env. This is what makes
+       * per-user BYOK providers work — a credential a user installs in their own
+       * account env (e.g. an OAuth token a companion service rotates) is honored
+       * for that user's threads no matter which authorized actor plays the turn.
+       *
+       * Best-effort by design: a missing user id (super-admin/local threads) or
+       * an older AgentBuilder DO without user-env storage simply contributes
+       * nothing, leaving instance-env behavior untouched.
+       */
+      async buildThreadScopedEnv(state) {
+        const threadEnv = state.thread.metadata?.env ?? state.thread.metadata?.tenvs ?? null;
+        const userId = state.thread.metadata?.user_id ?? null;
+        let userEnv = null;
+        if (userId) {
+          try {
+            const agentBuilderId = state.env.AGENT_BUILDER.idFromName("singleton");
+            const agentBuilder = state.env.AGENT_BUILDER.get(agentBuilderId);
+            if (typeof agentBuilder.getUserEnvEntries === "function") {
+              const entries = await agentBuilder.getUserEnvEntries(userId);
+              if (Array.isArray(entries) && entries.length > 0) {
+                userEnv = {};
+                for (const entry of entries) {
+                  if (entry?.name) userEnv[entry.name] = entry.value;
+                }
+              }
+            }
+          } catch (error) {
+            console.warn("buildThreadScopedEnv: user env unavailable:", error instanceof Error ? error.message : String(error));
+          }
+        }
+        if (!userEnv && !threadEnv) return state.env;
+        return { ...state.env, ...userEnv ?? {}, ...threadEnv ?? {} };
+      }
       /**
        * Get provider for a model.
        *
@@ -1801,7 +1837,8 @@ var init_LLMRequest = __esm({
        */
       static async callModel(modelId, context, state, logId) {
         const { ProviderRegistry: ProviderRegistry2 } = await Promise.resolve().then(() => (init_providers(), providers_exports));
-        const { provider, modelName, modelDef, viaPlatform, platformProxyOrigin } = await ProviderRegistry2.getProvider(modelId, state.env, state.thread.instance);
+        const providerEnv = await ProviderRegistry2.buildThreadScopedEnv(state);
+        const { provider, modelName, modelDef, viaPlatform, platformProxyOrigin } = await ProviderRegistry2.getProvider(modelId, providerEnv, state.thread.instance);
         const streamAbort = new AbortController();
         const parentSignal = state.abortController?.signal;
         let onParentAbort;