@desplega.ai/agent-swarm 1.173.0 → 2.1.0

package/dist/{cli-wd0hz6ah.js → cli-kbrt8gqa.js}

@@ -1,11 +1,16 @@
+import {
+  require_extend
+} from "./cli-kceah1eh.js";
 import {
   retryProviderRequest
 } from "./cli-zy39d433.js";
 import {
-  require_ecdsa_sig_formatter,
-  require_jws,
   require_p_retry
-} from "./cli-yatxqynm.js";
+} from "./cli-rhs9pz33.js";
+import {
+  require_ecdsa_sig_formatter,
+  require_jws
+} from "./cli-9ha6hs2d.js";
 import {
   getJsonSchemaToolParameters,
   resolveJsonSchemaStrictSampling,
@@ -28,93 +33,6 @@ import {
   __toESM
 } from "./cli-bc05qbss.js";
 
-// node_modules/extend/index.js
-var require_extend = __commonJS(function(exports, module) {
-  var hasOwn = Object.prototype.hasOwnProperty;
-  var toStr = Object.prototype.toString;
-  var defineProperty = Object.defineProperty;
-  var gOPD = Object.getOwnPropertyDescriptor;
-  var isArray = function isArray2(arr) {
-    if (typeof Array.isArray === "function") {
-      return Array.isArray(arr);
-    }
-    return toStr.call(arr) === "[object Array]";
-  };
-  var isPlainObject = function isPlainObject2(obj) {
-    if (!obj || toStr.call(obj) !== "[object Object]") {
-      return false;
-    }
-    var hasOwnConstructor = hasOwn.call(obj, "constructor");
-    var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, "isPrototypeOf");
-    if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
-      return false;
-    }
-    var key;
-    for (key in obj) {}
-    return typeof key === "undefined" || hasOwn.call(obj, key);
-  };
-  var setProperty = function setProperty2(target, options) {
-    if (defineProperty && options.name === "__proto__") {
-      defineProperty(target, options.name, {
-        enumerable: true,
-        configurable: true,
-        value: options.newValue,
-        writable: true
-      });
-    } else {
-      target[options.name] = options.newValue;
-    }
-  };
-  var getProperty = function getProperty2(obj, name) {
-    if (name === "__proto__") {
-      if (!hasOwn.call(obj, name)) {
-        return;
-      } else if (gOPD) {
-        return gOPD(obj, name).value;
-      }
-    }
-    return obj[name];
-  };
-  module.exports = function extend() {
-    var options, name, src, copy, copyIsArray, clone;
-    var target = arguments[0];
-    var i = 1;
-    var length = arguments.length;
-    var deep = false;
-    if (typeof target === "boolean") {
-      deep = target;
-      target = arguments[1] || {};
-      i = 2;
-    }
-    if (target == null || typeof target !== "object" && typeof target !== "function") {
-      target = {};
-    }
-    for (;i < length; ++i) {
-      options = arguments[i];
-      if (options != null) {
-        for (name in options) {
-          src = getProperty(target, name);
-          copy = getProperty(options, name);
-          if (target !== copy) {
-            if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
-              if (copyIsArray) {
-                copyIsArray = false;
-                clone = src && isArray(src) ? src : [];
-              } else {
-                clone = src && isPlainObject(src) ? src : {};
-              }
-              setProperty(target, { name, newValue: extend(deep, clone, copy) });
-            } else if (typeof copy !== "undefined") {
-              setProperty(target, { name, newValue: copy });
-            }
-          }
-        }
-      }
-    }
-    return target;
-  };
-});
-
 // node_modules/gaxios/package.json
 var require_package = __commonJS(function(exports, module) {
   module.exports = {
@@ -843,7 +761,7 @@ Content-Type: ${partContentType}\r
     static #proxyAgent;
     static #fetch;
     static async#getProxyAgent() {
-      this.#proxyAgent ||= (await import("./index-9ch1n761.js").then((m)=>__toESM(m.default))).HttpsProxyAgent;
+      this.#proxyAgent ||= (await import("./index-mh85qhec.js").then((m)=>__toESM(m.default))).HttpsProxyAgent;
       return this.#proxyAgent;
     }
     static async#getFetch() {

package/dist/cli-kceah1eh.js

@@ -0,0 +1,92 @@
+import {
+  __commonJS
+} from "./cli-bc05qbss.js";
+
+// node_modules/extend/index.js
+var require_extend = __commonJS(function(exports, module) {
+  var hasOwn = Object.prototype.hasOwnProperty;
+  var toStr = Object.prototype.toString;
+  var defineProperty = Object.defineProperty;
+  var gOPD = Object.getOwnPropertyDescriptor;
+  var isArray = function isArray2(arr) {
+    if (typeof Array.isArray === "function") {
+      return Array.isArray(arr);
+    }
+    return toStr.call(arr) === "[object Array]";
+  };
+  var isPlainObject = function isPlainObject2(obj) {
+    if (!obj || toStr.call(obj) !== "[object Object]") {
+      return false;
+    }
+    var hasOwnConstructor = hasOwn.call(obj, "constructor");
+    var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, "isPrototypeOf");
+    if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+      return false;
+    }
+    var key;
+    for (key in obj) {}
+    return typeof key === "undefined" || hasOwn.call(obj, key);
+  };
+  var setProperty = function setProperty2(target, options) {
+    if (defineProperty && options.name === "__proto__") {
+      defineProperty(target, options.name, {
+        enumerable: true,
+        configurable: true,
+        value: options.newValue,
+        writable: true
+      });
+    } else {
+      target[options.name] = options.newValue;
+    }
+  };
+  var getProperty = function getProperty2(obj, name) {
+    if (name === "__proto__") {
+      if (!hasOwn.call(obj, name)) {
+        return;
+      } else if (gOPD) {
+        return gOPD(obj, name).value;
+      }
+    }
+    return obj[name];
+  };
+  module.exports = function extend() {
+    var options, name, src, copy, copyIsArray, clone;
+    var target = arguments[0];
+    var i = 1;
+    var length = arguments.length;
+    var deep = false;
+    if (typeof target === "boolean") {
+      deep = target;
+      target = arguments[1] || {};
+      i = 2;
+    }
+    if (target == null || typeof target !== "object" && typeof target !== "function") {
+      target = {};
+    }
+    for (;i < length; ++i) {
+      options = arguments[i];
+      if (options != null) {
+        for (name in options) {
+          src = getProperty(target, name);
+          copy = getProperty(options, name);
+          if (target !== copy) {
+            if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+              if (copyIsArray) {
+                copyIsArray = false;
+                clone = src && isArray(src) ? src : [];
+              } else {
+                clone = src && isPlainObject(src) ? src : {};
+              }
+              setProperty(target, { name, newValue: extend(deep, clone, copy) });
+            } else if (typeof copy !== "undefined") {
+              setProperty(target, { name, newValue: copy });
+            }
+          }
+        }
+      }
+    }
+    return target;
+  };
+});
+
+export { require_extend };

package/dist/{cli-d603qf86.js → cli-ksphgh48.js}

@@ -4,27 +4,29 @@ import {
 import {
   readPkgVersion
 } from "./cli-vv0qtfpx.js";
-import {
-  checkToolLoop
-} from "./cli-hp1n6zq3.js";
 import {
   CONTEXT_FORMULA,
   clampContextPercent,
   computeContextUsedUnified,
   getContextWindowSize
-} from "./cli-7avy4v8w.js";
+} from "./cli-w1q7h2r2.js";
+import {
+  checkToolLoop
+} from "./cli-hp1n6zq3.js";
 import {
   Anthropic
-} from "./cli-gmdajfw5.js";
+} from "./cli-gxzkg1de.js";
 import {
   init_runtime_model_catalog,
-  init_src,
   runtimeCatalogModel
-} from "./cli-014vns2y.js";
+} from "./cli-stfs0k5s.js";
 import {
   init_secret_scrubber,
   scrubSecrets
-} from "./cli-d161g69q.js";
+} from "./cli-shk7r5cs.js";
+import {
+  init_src
+} from "./cli-e3g5mbkz.js";
 
 // src/providers/claude-managed-adapter.ts
 init_secret_scrubber();

package/dist/{cli-3nxdmjrc.js → cli-mgz4nbgg.js}

@@ -1,7 +1,7 @@
 import {
   createRuntimeProvider,
   init_runtime_providers
-} from "./cli-cd0hv9nh.js";
+} from "./cli-j67mh2vg.js";
 import {
   createAgent,
   decryptSecret,
@@ -22,7 +22,7 @@ import {
   upsertSwarmConfig,
   validateControllerTokenTtlDays,
   validateRuntimeTokenTtlHours
-} from "./cli-fmhj1ehj.js";
+} from "./cli-y3167wt1.js";
 import {
   RuntimeControllerCreateSchema,
   RuntimeControllerUpdateSchema,
@@ -30,13 +30,13 @@ import {
   RuntimePoolCreateSchema,
   RuntimePoolUpdateSchema,
   init_types
-} from "./cli-hsem16hb.js";
+} from "./cli-pe05f8yk.js";
 import {
   init_secret_scrubber,
   registerVolatileSecret,
   scrubSecrets,
   unregisterVolatileSecret
-} from "./cli-d161g69q.js";
+} from "./cli-shk7r5cs.js";
 import {
   __esm
 } from "./cli-bc05qbss.js";

package/dist/{cli-saqyage0.js → cli-mz5as5ha.js}

@@ -9,7 +9,7 @@ import {
   renderGoalReminder,
   summarizeTranscript,
   syncIdentityFilesToServer
-} from "./cli-na2pxe4f.js";
+} from "./cli-2pwa0q4d.js";
 import {
   fetchInstalledMcpServers
 } from "./cli-tng3131n.js";
@@ -23,17 +23,19 @@ import {
   CONTEXT_FORMULA,
   clampContextPercent,
   getContextWindowSize
-} from "./cli-7avy4v8w.js";
+} from "./cli-w1q7h2r2.js";
 import {
   applyReasoningEffort
-} from "./cli-tmhsxhb8.js";
+} from "./cli-0veb92a3.js";
 import {
   swarmRuntimeInstanceId
 } from "./cli-re8z5p8p.js";
 import {
   init_credentials,
+  openAICompatibleKeyLabels,
+  splitCredentialPool,
   validateOpencodeCredentials
-} from "./cli-tadfgd0t.js";
+} from "./cli-x1r545x8.js";
 import {
   DEFAULT_OPENROUTER_BASE_URL,
   getOpenRouterAttributionHeaders,
@@ -46,10 +48,23 @@ import {
 } from "./cli-ej6gbxfb.js";
 import {
   init_secret_scrubber,
+  registerVolatileSecret,
   scrubSecrets
-} from "./cli-d161g69q.js";
+} from "./cli-shk7r5cs.js";
+import {
+  baseUrlOverride,
+  ignoredBaseUrlVar,
+  init_src,
+  openAICompatibleKeyVars,
+  openAICompatibleProvider,
+  openAICompatibleProviders,
+  providerBaseUrl,
+  providerForKeyVar,
+  providerKeyVars
+} from "./cli-e3g5mbkz.js";
 
 // src/providers/opencode-adapter.ts
+init_src();
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 init_credentials();
@@ -117,11 +132,29 @@ class OpenRouterBilling {
 }
 
 // src/providers/opencode-swarm-plugin.ts
+var OPENCODE_SHELL_ENV_KEYS = ["TERM", "OPENCODE_TERMINAL"];
+function applyOpencodeShellEnv(callEnv, sessionEnv) {
+  const keep = new Set(OPENCODE_SHELL_ENV_KEYS);
+  for (const key of Object.keys(callEnv)) {
+    if (!keep.has(key))
+      delete callEnv[key];
+  }
+  for (const [key, value] of Object.entries(sessionEnv)) {
+    if (value !== undefined && !keep.has(key))
+      callEnv[key] = value;
+  }
+}
 function createOpencodeSwarmPlugin(config, options = {}) {
   return {
     id: "agent-swarm",
     async setup(ctx) {
       options.onToolRegistry?.(() => ctx.tool.list());
+      const sessionEnv = config.env;
+      if (sessionEnv) {
+        await ctx.shell.hook("create.before", (event) => {
+          applyOpencodeShellEnv(event.env, sessionEnv);
+        });
+      }
       await ctx.tool.hook("execute.before", async (event) => {
         if (!config.isLead && config.taskId) {
           const { cancelled, reason } = await isTaskCancelled(config);
@@ -184,9 +217,22 @@ function opencodeModelToCredKey(modelStr) {
       return "OPENROUTER_API_KEY";
     if (provider === "openai")
       return "OPENAI_API_KEY";
+    const direct = openAICompatibleProvider(provider);
+    if (direct)
+      return direct.envVar;
   }
   return null;
 }
+function credKeyNames(requiredKey) {
+  const direct = providerForKeyVar(requiredKey);
+  return direct ? providerKeyVars(direct) : [requiredKey];
+}
+var OPENCODE_ANY_KEY_VARS = [
+  "OPENROUTER_API_KEY",
+  "ANTHROPIC_API_KEY",
+  "OPENAI_API_KEY",
+  ...openAICompatibleKeyVars()
+];
 function checkOpencodeCredentials(env, opts = {}) {
   const homeDir = opts.homeDir ?? env.HOME ?? "/root";
   const probe = opts.fs?.existsSync ?? existsSync;
@@ -196,7 +242,7 @@ function checkOpencodeCredentials(env, opts = {}) {
   }
   const requiredKey = opencodeModelToCredKey(env.MODEL_OVERRIDE);
   if (requiredKey) {
-    if (env[requiredKey]) {
+    if (credKeyNames(requiredKey).some((name) => env[name])) {
       return { ready: true, missing: [], satisfiedBy: "env" };
     }
     return {
@@ -205,13 +251,24 @@ function checkOpencodeCredentials(env, opts = {}) {
       hint: `MODEL_OVERRIDE=${env.MODEL_OVERRIDE} requires ${requiredKey}; or run \`opencode auth login\` to create ${authFile}.`
     };
   }
-  if (env.OPENROUTER_API_KEY || env.ANTHROPIC_API_KEY || env.OPENAI_API_KEY) {
+  if (OPENCODE_ANY_KEY_VARS.some((name) => env[name])) {
     return { ready: true, missing: [], satisfiedBy: "env" };
   }
   return {
     ready: false,
-    missing: ["OPENROUTER_API_KEY", "ANTHROPIC_API_KEY", "OPENAI_API_KEY", authFile],
-    hint: "Set one of OPENROUTER_API_KEY / ANTHROPIC_API_KEY / OPENAI_API_KEY (any one suffices), or run `opencode auth login` to create ~/.local/share/opencode/auth.json."
+    missing: [
+      "OPENROUTER_API_KEY",
+      "ANTHROPIC_API_KEY",
+      "OPENAI_API_KEY",
+      ...openAICompatibleProviders().map((p) => p.envVar),
+      authFile
+    ],
+    hint: `Set one of ${[
+      "OPENROUTER_API_KEY",
+      "ANTHROPIC_API_KEY",
+      "OPENAI_API_KEY",
+      ...openAICompatibleKeyLabels()
+    ].join(" / ")} (any one suffices), or run \`opencode auth login\` to create ~/.local/share/opencode/auth.json.`
   };
 }
 function defaultOpencodeSkillsDir() {
@@ -275,6 +332,92 @@ function applyOpenRouterBaseUrlOverride(opencodeConfig, env = process.env) {
     }
   };
 }
+function buildOpenAICompatibleProviderBlock(provider, apiKey, modelId, baseUrl = provider.baseUrl) {
+  const models = {};
+  for (const m of provider.models) {
+    models[m.id] = {
+      name: m.name,
+      tool_call: true,
+      reasoning: m.reasoning,
+      limit: { context: m.contextWindow, output: m.maxOutputTokens }
+    };
+  }
+  if (modelId && !models[modelId])
+    models[modelId] = { name: modelId, tool_call: true };
+  return {
+    npm: provider.npm,
+    name: provider.displayName,
+    env: [],
+    options: { baseURL: baseUrl, apiKey },
+    models
+  };
+}
+function envBoundKeyVars(providerId) {
+  if (providerId === "openrouter")
+    return ["OPENROUTER_API_KEY"];
+  const direct = openAICompatibleProvider(providerId);
+  return direct?.catalog === "models.dev" ? providerKeyVars(direct) : undefined;
+}
+function customBlockProvider(providerId) {
+  const direct = openAICompatibleProvider(providerId);
+  return direct?.catalog === "registry" ? direct : undefined;
+}
+function pickProviderKey(env, names) {
+  for (const name of names) {
+    const value = env[name]?.trim();
+    if (!value)
+      continue;
+    const key = splitCredentialPool(value)[0];
+    if (key)
+      return { key, name };
+  }
+  return;
+}
+function applyProviderKeySplice(opencodeConfig, model, env) {
+  const slash = model?.indexOf("/") ?? -1;
+  if (!model || slash <= 0)
+    return;
+  const providerId = model.slice(0, slash);
+  const existing = opencodeConfig.provider?.[providerId];
+  const custom = customBlockProvider(providerId);
+  if (custom) {
+    const picked2 = pickProviderKey(env, providerKeyVars(custom));
+    if (!picked2)
+      return;
+    const block = buildOpenAICompatibleProviderBlock(custom, picked2.key, model.slice(slash + 1), providerBaseUrl(custom, env));
+    opencodeConfig.provider = {
+      ...opencodeConfig.provider,
+      [providerId]: {
+        ...existing,
+        ...block,
+        options: { ...existing?.options, ...block.options },
+        models: { ...existing?.models, ...block.models }
+      }
+    };
+    return picked2;
+  }
+  const names = envBoundKeyVars(providerId);
+  if (!names)
+    return;
+  const picked = pickProviderKey(env, names);
+  if (!picked)
+    return;
+  const direct = openAICompatibleProvider(providerId);
+  const baseURL = direct ? baseUrlOverride(direct, env) : undefined;
+  const options = { ...existing?.options, ...baseURL ? { baseURL } : {}, apiKey: picked.key };
+  if (direct?.baseUrlLocked) {
+    const ignored = ignoredBaseUrlVar(direct, env);
+    if (ignored || options.baseURL !== undefined) {
+      console.warn(`[opencode] ${ignored ?? `provider.${providerId}.options.baseURL`} is ignored: ${direct.displayName} uses its built-in endpoint`);
+    }
+    delete options.baseURL;
+  }
+  opencodeConfig.provider = {
+    ...opencodeConfig.provider,
+    [providerId]: { ...existing, env: [], options }
+  };
+  return picked;
+}
 var SWARM_AGENT_NAME = "swarm";
 var TRANSCRIPT_TAIL_CHARS = 20000;
 var TOOL_RESULT_PREVIEW_CHARS = 500;
@@ -531,9 +674,10 @@ class OpencodeSession {
       autoIndexMemoryFile(this.swarm, path);
     }
   }
-  fail(message) {
+  fail(rawMessage) {
     if (this.aborted || this.completed)
       return;
+    const message = scrubSecrets(rawMessage);
     this.emit({ type: "error", message });
     this.finish(async () => ({
       exitCode: 1,
@@ -681,6 +825,9 @@ class OpencodeAdapter {
         [SWARM_AGENT_NAME]: { mode: "primary", prompt: config.systemPrompt ?? "" }
       }
     };
+    const splicedKey = applyProviderKeySplice(opencodeConfig, config.model, env);
+    if (splicedKey)
+      registerVolatileSecret(splicedKey.key, splicedKey.name);
     const reasoningApplication = applyReasoningEffort("opencode", config.model, config.reasoningEffort);
     const appliedReasoningEffort = reasoningApplication.kind === "opencode-options" ? config.reasoningEffort ?? null : null;
     if (reasoningApplication.kind === "opencode-options") {
@@ -712,21 +859,26 @@ class OpencodeAdapter {
     const { sdk, version: opencodeVersion } = await loadOpencodeSdkImpl();
     let listTools;
     const billing = config.model.startsWith("openrouter/") ? new OpenRouterBilling : undefined;
-    const host = await sdk.OpenCode.create({
-      config: { content: JSON.stringify(opencodeConfig) },
-      plugins: [
-        createOpencodeSwarmPlugin(swarm, {
-          onToolRegistry: (lister) => {
-            listTools = lister;
-          },
-          ...billing ? { onOpenRouterResponse: (response) => billing.observe(response) } : {}
-        })
-      ],
-      log: {
-        level: "warn",
-        emit: (entry) => console.warn(scrubSecrets(`[opencode] ${entry.message}`))
-      }
-    });
+    let host;
+    try {
+      host = await sdk.OpenCode.create({
+        config: { content: JSON.stringify(opencodeConfig) },
+        plugins: [
+          createOpencodeSwarmPlugin(swarm, {
+            onToolRegistry: (lister) => {
+              listTools = lister;
+            },
+            ...billing ? { onOpenRouterResponse: (response) => billing.observe(response) } : {}
+          })
+        ],
+        log: {
+          level: "warn",
+          emit: (entry) => console.warn(scrubSecrets(`[opencode] ${entry.message}`))
+        }
+      });
+    } catch (err) {
+      throw new Error(scrubSecrets(`opencode host failed to start: ${errorMessage(err, "")}`));
+    }
     let sessionId;
     try {
       const created = await host.sessions.create({
@@ -736,7 +888,7 @@ class OpencodeAdapter {
       sessionId = created.id;
     } catch (err) {
       await host.close().catch(() => {});
-      throw err;
+      throw new Error(scrubSecrets(`opencode session create failed: ${errorMessage(err, "")}`));
     }
     const session = new OpencodeSession(host, sessionId, config.model, swarm, config.cwd, appliedReasoningEffort, billing);
     session.emitSessionInit(opencodeVersion ? { version: opencodeVersion } : undefined);
@@ -779,4 +931,4 @@ class OpencodeAdapter {
   }
 }
 
-export { checkOpencodeCredentials, resolveOpencodeSdkSpecifier, _setOpencodeSdkLoaderForTests, applyOpenRouterBaseUrlOverride, _setOpencodeSessionHooksForTests, checkSwarmMcpAdmission, OpencodeSession, OpencodeAdapter };
+export { checkOpencodeCredentials, resolveOpencodeSdkSpecifier, _setOpencodeSdkLoaderForTests, applyOpenRouterBaseUrlOverride, buildOpenAICompatibleProviderBlock, applyProviderKeySplice, _setOpencodeSessionHooksForTests, checkSwarmMcpAdmission, OpencodeSession, OpencodeAdapter };