teapot-coding-agent 0.37.99 → 0.37.101

package/dist/master.js

@@ -350,6 +350,27 @@ export class Master {
         this.keyPools.set(name, pool);
         return pool;
     }
+    /**
+     * The llm an agent should be using, derived from the CURRENT config.
+     *
+     * One owner on purpose: a running agent holds its own `opts.llm`, so a provider edit (a rotated token, a
+     * new baseUrl, a changed default provider) only reaches it if something re-derives from
+     * `config.providers`. `addAgent` and `updateConfig` both need that derivation, and two copies would drift
+     * the same way every other duplicated fact in this codebase has.
+     */
+    llmFor(ac) {
+        const provName = ac.provider ?? this.config.defaultProvider ?? "openrouter";
+        const prov = this.config.providers?.[provName];
+        const inlineKey = typeof ac.apiKey === "string" && ac.apiKey.trim() ? ac.apiKey.trim() : undefined;
+        const pool = inlineKey ? undefined : this.keyPoolFor(provName, prov);
+        return {
+            baseUrl: ac.baseUrl ?? prov?.baseUrl ?? this.config.llm.baseUrl,
+            apiKey: inlineKey ?? currentKey(pool) ?? prov?.apiKey ?? this.config.llm.apiKey,
+            model: ac.model ?? prov?.model ?? this.config.llm.model,
+            timeoutMs: 120_000,
+            ...(pool && pool.keys.length > 1 ? { keyPool: pool } : {}),
+        };
+    }
     keyPoolReport() {
         return [...this.keyPools.entries()].map(([provider, pool]) => ({
             provider,
@@ -456,6 +477,43 @@ export class Master {
                 lastRunMin: t.lastRunMin ?? -1,
             }));
         }
+        /**
+         * A provider edit has to reach agents that are already running.
+         *
+         * Each agent holds its own `opts.llm`, built when it was created, so writing the new key into
+         * `config.providers` alone left every live agent sending the OLD token — a rotated key looked like it had
+         * not been saved, and the next request 401'd. Re-derive for live agents; agents with their own inline
+         * `apiKey`/`baseUrl` keep them, because that is what those fields mean.
+         */
+        if (patch.providers || patch.defaultProvider !== undefined) {
+            for (const [agentId, agent] of this.agents) {
+                // the config entry is the source of an agent's provider/model overrides, but it only exists for
+                // persisted agents — fall back to what the live agent reports about itself
+                const ac = this.config.agents.find((x) => x.id === agentId) ?? {
+                    id: agentId,
+                    workspace: "",
+                    provider: agent.providerName || undefined,
+                    model: agent.llm.model || undefined,
+                };
+                const next = this.llmFor(ac);
+                const merged = {
+                    ...agent.llm,
+                    baseUrl: next.baseUrl || agent.llm.baseUrl,
+                    // exact, not `||`: clearing a token means clearing it, and an empty baseUrl/model would break the
+                    // agent, so those two keep the working value
+                    apiKey: next.apiKey,
+                    model: next.model || agent.llm.model,
+                };
+                if (next.keyPool)
+                    merged.keyPool = next.keyPool;
+                else
+                    delete merged.keyPool;
+                agent.setLlmConfig(merged);
+                // the name shown in the UI has to match the llm actually in use
+                agent.opts.provider =
+                    ac.provider ?? this.config.defaultProvider ?? "";
+            }
+        }
         this.saveConfig();
     }
     async loadPluginsAndMcp() {
@@ -615,18 +673,7 @@ export class Master {
         if (!prov && !ac.baseUrl && !this.config.llm.baseUrl) {
             throw new Error(`agent ${ac.id}: unknown provider "${provName}" and no fallback`);
         }
-        const inlineKey = typeof ac.apiKey === "string" && ac.apiKey.trim() ? ac.apiKey.trim() : undefined;
-        const pool = inlineKey ? undefined : this.keyPoolFor(provName, prov);
-        const llm = {
-            baseUrl: ac.baseUrl ?? prov?.baseUrl ?? this.config.llm.baseUrl,
-            apiKey: inlineKey ??
-                currentKey(pool) ??
-                prov?.apiKey ??
-                this.config.llm.apiKey,
-            model: ac.model ?? prov?.model ?? this.config.llm.model,
-            timeoutMs: 120_000,
-            ...(pool && pool.keys.length > 1 ? { keyPool: pool } : {}),
-        };
+        const llm = this.llmFor(ac);
         if (!llm.model)
             throw new Error(`agent ${ac.id}: no model configured (set model on the agent or on its provider)`);
         const myDepth = ac.parent ? this.depthOf(ac.parent) + 1 : 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teapot-coding-agent",
-  "version": "0.37.99",
+  "version": "0.37.101",
   "description": "A lightweight, always-on multi-agent harness for AI coding agents",
   "type": "module",
   "license": "AGPL-3.0-or-later",