nexus-agents 2.80.0 → 2.80.2

package/dist/{chunk-ZU2Q3DWE.js → chunk-5FUVEIJC.js}

@@ -1,7 +1,7 @@
 import {
   CliCircuitBreaker,
   DEFAULT_CIRCUIT_BREAKER_CONFIG
-} from "./chunk-JXDDSNEK.js";
+} from "./chunk-JECCDZ2S.js";
 import {
   CLI_SUBPROCESS_TIMEOUTS,
   CLI_TIMEOUTS,
@@ -24,7 +24,7 @@ import {
   getTimeProvider,
   isRateLimitText,
   ok
-} from "./chunk-YMT6H2HQ.js";
+} from "./chunk-4MHE5UVO.js";
 
 // src/cli-adapters/subprocess-adapter.ts
 import { spawn } from "child_process";
@@ -400,13 +400,23 @@ var BaseCliAdapter = class {
     if (task.timeoutMs !== void 0) return task.timeoutMs;
     return getTimeoutForTaskAuto(this.name, task.content);
   }
+  /**
+   * Whether the shared outer retry loop ({@link executeCliRetryLoop}) is
+   * allowed to retry this adapter's failures. The base adapter honors the
+   * caller's `allowRetry`. Subprocess adapters override this to suppress
+   * the outer loop when their own transient-retry layer is active, so the
+   * two layers do not nest into multiplied spawns (#2824).
+   */
+  shouldOuterRetry(opts) {
+    return opts.allowRetry;
+  }
   /**
    * Executes task with retry logic via shared retry loop.
    */
   async executeWithRetry(task, opts) {
     const result = await executeCliRetryLoop(() => this.executeTask(task, opts), {
       maxRetries: opts.maxRetries,
-      allowRetry: opts.allowRetry,
+      allowRetry: this.shouldOuterRetry(opts),
       baseDelayMs: 1e3,
       maxDelayMs: 16e3,
       cli: this.name,
@@ -576,6 +586,78 @@ var BaseCliAdapter = class {
   }
 };
 
+// src/cli-adapters/subprocess-env.ts
+var BASE_ENV_EXACT = [
+  "PATH",
+  "HOME",
+  "USER",
+  "LOGNAME",
+  "SHELL",
+  "LANG",
+  "TERM",
+  "TZ",
+  "TMPDIR",
+  "TEMP",
+  "TMP",
+  "HTTP_PROXY",
+  "HTTPS_PROXY",
+  "NO_PROXY",
+  "ALL_PROXY",
+  "http_proxy",
+  "https_proxy",
+  "no_proxy",
+  "all_proxy",
+  "NODE_OPTIONS",
+  "NODE_PATH",
+  "NODE_ENV",
+  "NODE_EXTRA_CA_CERTS",
+  "SSL_CERT_FILE",
+  "SSL_CERT_DIR"
+];
+var BASE_ENV_PREFIXES = [
+  "LC_",
+  // locale: LC_ALL, LC_CTYPE, …
+  "NEXUS_",
+  // nexus-agents config + nested-run credentials (a child may be a nested nexus-agents)
+  "npm_config_"
+  // npm/node resolution config: registry, proxy, …
+];
+var CLI_VENDOR_KEYS = {
+  claude: ["ANTHROPIC_API_KEY"],
+  gemini: ["GOOGLE_AI_API_KEY", "GEMINI_API_KEY", "GOOGLE_API_KEY"],
+  codex: ["OPENAI_API_KEY"],
+  opencode: [
+    "ANTHROPIC_API_KEY",
+    "OPENAI_API_KEY",
+    "GOOGLE_AI_API_KEY",
+    "GEMINI_API_KEY",
+    "GOOGLE_API_KEY",
+    "OPENROUTER_API_KEY"
+  ]
+};
+function isAllowed(key, vendorKeys) {
+  if (BASE_ENV_EXACT.includes(key)) return true;
+  if (vendorKeys.includes(key)) return true;
+  return BASE_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function buildChildEnv(cliName) {
+  const source = process.env;
+  const childEnv = {};
+  if (source["NEXUS_SUBPROCESS_ENV_ALLOWLIST"] === "0") {
+    for (const [key, value] of Object.entries(source)) {
+      if (value !== void 0 && key !== "CLAUDECODE") childEnv[key] = value;
+    }
+    return childEnv;
+  }
+  const vendorKeys = CLI_VENDOR_KEYS[cliName];
+  for (const [key, value] of Object.entries(source)) {
+    if (value === void 0) continue;
+    if (key === "CLAUDECODE") continue;
+    if (isAllowed(key, vendorKeys)) childEnv[key] = value;
+  }
+  return childEnv;
+}
+
 // src/security/output-sanitizer.ts
 var REDACTED_KEY_PLACEHOLDER = "[REDACTED_KEY]";
 var KEY_PATTERNS = [
@@ -791,6 +873,18 @@ var SubprocessCliAdapter = class extends BaseCliAdapter {
   transport = "subprocess";
   /** Transient-error retry config. Override in subclass to enable. */
   transientRetry = { enabled: true };
+  /**
+   * The inner {@link retryTransient} layer is the single retry authority
+   * for subprocess CLIs. When it is enabled (the default), the shared
+   * outer retry loop must not also retry: nesting both meant up to 6
+   * subprocess spawns and ~10-minute hangs on a persistent TIMEOUT, since
+   * the inner layer's timeout extension compounds on every outer attempt
+   * (#2824). The outer loop still runs once, so circuit-breaker failure
+   * recording is unaffected.
+   */
+  shouldOuterRetry(opts) {
+    return opts.allowRetry && !this.transientRetry.enabled;
+  }
   /**
    * Executes a task via subprocess, with optional transient-error retry.
    * When `transientRetry.enabled` is true, transient errors (timeout,
@@ -850,8 +944,7 @@ var SubprocessCliAdapter = class extends BaseCliAdapter {
         runCleanup();
         resolveOuter(result);
       };
-      const childEnv = { ...process.env };
-      delete childEnv["CLAUDECODE"];
+      const childEnv = buildChildEnv(this.name);
       const child = spawn(cmdConfig.command, cmdConfig.args, {
         stdio: ["pipe", "pipe", "pipe"],
         env: childEnv
@@ -1698,7 +1791,7 @@ var GeminiCliAdapter = class extends SubprocessCliAdapter {
   async executeWithRetryTracking(task, options) {
     return executeCliRetryLoop(() => this.executeTask(task, options), {
       maxRetries: options.maxRetries,
-      allowRetry: options.allowRetry,
+      allowRetry: this.shouldOuterRetry(options),
       baseDelayMs: this.baseDelayMs,
       maxDelayMs: this.maxDelayMs,
       circuitBreaker: this.circuitBreaker,
@@ -3087,4 +3180,4 @@ export {
   isCliAvailable,
   getAvailableClis
 };
-//# sourceMappingURL=chunk-ZU2Q3DWE.js.map
+//# sourceMappingURL=chunk-5FUVEIJC.js.map