bosun 0.41.8 → 0.41.10

package/.env.example

@@ -201,7 +201,7 @@ VOICE_DELEGATE_EXECUTOR=codex-sdk
 # earlier: it summarizes large, noisy command outputs before they ever land in
 # the active turn, while preserving a `bosun --tool-log <id>` retrieval path.
 # CONTEXT_SHREDDING_ENABLED=true
-# CONTEXT_SHREDDING_LIVE_TOOL_COMPACTION_ENABLED=false
+# CONTEXT_SHREDDING_LIVE_TOOL_COMPACTION_ENABLED=true
 # CONTEXT_SHREDDING_LIVE_TOOL_COMPACTION_MODE=auto
 # CONTEXT_SHREDDING_LIVE_TOOL_COMPACTION_MIN_CHARS=4000
 # CONTEXT_SHREDDING_LIVE_TOOL_COMPACTION_TARGET_CHARS=1800

package/README.md

@@ -12,7 +12,7 @@ _The name "Bosun" comes from "boatswain", the ship's officer responsible for coo
 _That maps directly to the Bosun project: it does not replace the captain or crew, it orchestrates the work. Our Bosun plans tasks, routes them to the right executors, enforces operational checks, and keeps humans in control while the system keeps delivery moving. Autonomous engineering with you in control of the operation._
 
 <p align="center">
-  <a href="https://bosun.engineer">Website</a> · <a href="https://bosun.engineer/docs/">Docs</a> · <a href="https://github.com/virtengine/bosun?tab=readme-ov-file#bosun">GitHub</a> · <a href="https://www.npmjs.com/package/bosun">npm</a> · <a href="https://github.com/virtengine/bosun/issues">Issues</a>
+  <a href="https://bosun.engineer">Website</a> · <a href="https://bosun.engineer/docs/">Docs</a> · <a href="https://github.com/virtengine/bosun?tab=readme-ov-file#bosun">GitHub</a> · <a href="https://www.npmjs.com/package/bosun">npm</a> · <a href="https://hub.docker.com/r/virtengine/bosun">Docker Hub</a> · <a href="https://github.com/virtengine/bosun/issues">Issues</a>
 </p>
 
 <p align="center">
@@ -41,6 +41,28 @@ First run launches setup automatically. You can also run setup directly:
 bosun --setup
 ```
 
+### Docker quick start
+
+Run Bosun with no local Node.js install — pull from Docker Hub:
+
+```bash
+docker run -d --name bosun -p 3080:3080 \
+  -v bosun-data:/data \
+  -e BOSUN_API_KEY=your-secret-key \
+  virtengine/bosun:latest
+```
+
+Or build from the cloned repo:
+
+```bash
+git clone https://github.com/virtengine/bosun.git && cd bosun
+docker compose up -d
+```
+
+Open `https://localhost:3080` to start the setup wizard.
+
+> **All installation options** — npm, source, Docker Hub, docker-compose, Electron desktop — are documented in [`INSTALL.md`](INSTALL.md) and on [bosun.engineer/docs/installation](https://bosun.engineer/docs/installation.html).
+
 Requires:
 
 - Node.js 18+

package/agent/agent-event-bus.mjs

@@ -117,6 +117,7 @@ export class AgentEventBus {
     this._sendTelegram = options.sendTelegram || null;
     this._getTask = options.getTask || null;
     this._setTaskStatus = options.setTaskStatus || null;
+    this._updateTask = options.updateTask || null;
     this._supervisor = options.supervisor || null;
 
     this._maxEventLogSize = options.maxEventLogSize || DEFAULTS.maxEventLogSize;
@@ -234,7 +235,7 @@ export class AgentEventBus {
 
     // ── Dedup
     const key = `${type}:${taskId}`;
-    const last = this._recentEmits.get(key);
+    const last = this._recentEmits.get(key);
     if (typeof last === "number" && ts - last < this._dedupeWindowMs) return;
     this._recentEmits.set(key, ts);
     if (this._recentEmits.size > 200) {
@@ -856,6 +857,34 @@ export class AgentEventBus {
             this._setTaskStatus(taskId, "blocked", "agent-event-bus");
           } catch { /* best-effort */ }
         }
+
+        // Persist blocked metadata so auto-recovery can unblock after cooldown.
+        if (this._updateTask) {
+          try {
+            const autoRecoverDelayMs = 30 * 60 * 1000; // 30 min cooldown
+            const retryAt = new Date(now + autoRecoverDelayMs).toISOString();
+            const blockedReason = String(recovery?.reason || "too many consecutive errors").trim();
+            const existingTask = typeof this._getTask === "function" ? this._getTask(taskId) : null;
+            const existingMeta = existingTask?.meta && typeof existingTask.meta === "object" ? existingTask.meta : {};
+            this._updateTask(taskId, {
+              blockedReason,
+              cooldownUntil: retryAt,
+              meta: {
+                ...existingMeta,
+                autoRecovery: {
+                  active: true,
+                  reason: "consecutive_errors",
+                  errorCount: recovery?.errorCount || 0,
+                  pattern: classification?.pattern || null,
+                  retryAt,
+                  recoveryDelayMs: autoRecoverDelayMs,
+                  recordedAt: new Date(now).toISOString(),
+                },
+              },
+            });
+          } catch { /* best-effort */ }
+        }
+
         if (this._sendTelegram) {
           const title = taskTitle || taskId;
           this._sendTelegram(
@@ -1062,4 +1091,4 @@ export class AgentEventBus {
 export function createAgentEventBus(options) {
   return new AgentEventBus(options);
 }
-
+

package/agent/agent-pool.mjs

@@ -43,6 +43,7 @@ import { resolve, dirname } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
 import { loadConfig } from "../config/config.mjs";
 import { resolveRepoRoot, resolveAgentRepoRoot } from "../config/repo-root.mjs";
 import { resolveCodexProfileRuntime } from "../shell/codex-model-profiles.mjs";
@@ -54,8 +55,7 @@ import {
   MAX_STREAM_RETRIES,
 } from "../infra/stream-resilience.mjs";
 import { ensureTestRuntimeSandbox } from "../infra/test-runtime.mjs";
-import { compressAllItems, estimateSavings, estimateContextUsagePct, recordShreddingEvent } from "../workspace/context-cache.mjs";
-import { resolveContextShreddingOptions } from "../config/context-shredding-config.mjs";
+import { maybeCompressSessionItems } from "../workspace/context-cache.mjs";
 
 // Lazy-load MCP registry to avoid circular dependencies.
 // Cached at module scope per AGENTS.md hard rules.
@@ -97,6 +97,31 @@ const HARD_TIMEOUT_BUFFER_MS = 5 * 60_000; // 5 minutes
 
 /** Tag for console logging */
 const TAG = "[agent-pool]";
+const require = createRequire(import.meta.url);
+const MODULE_PRESENCE_CACHE = new Map();
+
+function hasOptionalModule(specifier) {
+  if (MODULE_PRESENCE_CACHE.has(specifier)) {
+    return MODULE_PRESENCE_CACHE.get(specifier);
+  }
+  let ok = false;
+  try {
+    require.resolve(specifier);
+    ok = true;
+  } catch {
+    // ESM-only packages have no CJS "require" export so require.resolve
+    // throws even when the package is installed.  Fall back to checking
+    // whether the package directory exists on disk.
+    try {
+      const pkgDir = resolve(__dirname, "..", "node_modules", ...specifier.split("/"));
+      ok = existsSync(resolve(pkgDir, "package.json"));
+    } catch {
+      ok = false;
+    }
+  }
+  MODULE_PRESENCE_CACHE.set(specifier, ok);
+  return ok;
+}
 const MAX_PROMPT_BYTES = 180_000;
 const MAX_SET_TIMEOUT_MS = 2_147_483_647; // Node.js setTimeout 32-bit signed max
 let timeoutClampWarningKey = "";
@@ -226,29 +251,12 @@ async function maybeCompressResultItems(
 
   const resolvedSessionType = normalizeSessionType(sessionType, "task");
   const agentType = normalizeSdkForShredding(sdk);
-  const shreddingOpts = resolveContextShreddingOptions(
-    resolvedSessionType,
+  return maybeCompressSessionItems(items, {
+    sessionType: resolvedSessionType,
     agentType,
-  );
-  if (shreddingOpts?._skip === true) return items;
-
-  const usagePct = estimateContextUsagePct(items);
-  const threshold = Number.isFinite(shreddingOpts?.contextUsageThreshold)
-    ? Number(shreddingOpts.contextUsageThreshold)
-    : 0.5;
-  if (usagePct < threshold) return items;
-
-  shreddingOpts.contextUsagePct = usagePct;
-  const compressedItems = await compressAllItems(items, shreddingOpts);
-  try {
-    const savings = estimateSavings(items, compressedItems);
-    if (savings.savedChars > 0) {
-      recordShreddingEvent({ ...savings, agentType: agentType || sdk });
-    }
-  } catch {
-    /* non-fatal */
-  }
-  return compressedItems;
+    force: forceCompression,
+    skip: skipCompression,
+  });
 }
 
 function resolveCodexStreamSafety(totalTimeoutMs) {
@@ -424,13 +432,27 @@ function injectGitHubSessionEnv(baseEnv, token) {
 
 /**
  * Extract a human-readable task heading from the prompt built by _buildTaskPrompt.
- * The first line is "# TASKID — Task Title"; we return the title portion only.
+ * The first line is "# Task: Task Title" (legacy: "# TASKID — Task Title");
+ * we return the title portion only.
  * Falls back to the raw first line if no em-dash separator is found.
  * @param {string} prompt
  * @returns {string}
  */
 function extractTaskHeading(prompt) {
   const firstLine = String(prompt || "").split(/\r?\n/)[0].replace(/^#+\s*/, "").trim();
+  if (!firstLine) return "Execute Task";
+  const lowerLine = firstLine.toLowerCase();
+  if (lowerLine.startsWith("task")) {
+    let index = 4;
+    while (index < firstLine.length && /\s/.test(firstLine[index])) index += 1;
+    const separator = firstLine[index];
+    if (separator === ":" || separator === "-" || separator === "\u2014") {
+      index += 1;
+      while (index < firstLine.length && /\s/.test(firstLine[index])) index += 1;
+      const title = firstLine.slice(index).trim();
+      if (title) return title;
+    }
+  }
   const dashIdx = firstLine.indexOf(" \u2014 ");
   const title = dashIdx !== -1 ? firstLine.slice(dashIdx + 3).trim() : firstLine;
   return title || "Execute Task";
@@ -580,15 +602,20 @@ function hasSdkPrerequisites(name, runtimeEnv = process.env) {
   }
 
   if (name === "codex") {
-    // Codex needs an OpenAI API key (or Azure key, or profile-specific key),
-    // OR a valid ~/.codex/config.toml where an env_key reference is satisfied.
+    if (!hasOptionalModule("@openai/codex-sdk")) {
+      return { ok: false, reason: "@openai/codex-sdk not installed" };
+    }
+    // Codex auth can come from env vars, config env_key mappings, or persisted
+    // CLI login state (for example ~/.codex/auth.json). Because login-based
+    // auth is valid and hard to validate exhaustively, avoid false negatives.
     const hasKey =
       runtimeEnv.OPENAI_API_KEY ||
       runtimeEnv.AZURE_OPENAI_API_KEY ||
       runtimeEnv.CODEX_MODEL_PROFILE_XL_API_KEY ||
       runtimeEnv.CODEX_MODEL_PROFILE_M_API_KEY;
     if (hasKey) return { ok: true, reason: null };
-    // Check ~/.codex/config.toml — Codex CLI SDK reads auth env_key refs from there
+
+    // Check ~/.codex/config.toml — Codex CLI SDK reads auth env_key refs from there.
     try {
       const configToml = resolve(homedir(), ".codex", "config.toml");
       if (existsSync(configToml)) {
@@ -601,14 +628,33 @@ function hasSdkPrerequisites(name, runtimeEnv = process.env) {
     } catch {
       // best effort — fall through to failure
     }
-    return { ok: false, reason: "no API key (OPENAI_API_KEY / AZURE_OPENAI_API_KEY) and no satisfied env_key in ~/.codex/config.toml" };
+
+    // Login-based auth sessions are sufficient even without env keys.
+    try {
+      const authJson = resolve(homedir(), ".codex", "auth.json");
+      if (existsSync(authJson)) {
+        const authText = readFileSync(authJson, "utf8").trim();
+        if (authText) return { ok: true, reason: null };
+      }
+    } catch {
+      // best effort — fall through to permissive behavior
+    }
+
+    // Do not hard-block Codex when auth source cannot be determined.
+    return { ok: true, reason: null };
   }
   if (name === "copilot") {
+    if (!hasOptionalModule("@github/copilot-sdk")) {
+      return { ok: false, reason: "@github/copilot-sdk not installed" };
+    }
     // Copilot auth can come from multiple sources (OAuth manager, gh auth,
     // VS Code Copilot login, env tokens). Don't block execution here.
     return { ok: true, reason: null };
   }
   if (name === "claude") {
+    if (!hasOptionalModule("@anthropic-ai/claude-agent-sdk")) {
+      return { ok: false, reason: "@anthropic-ai/claude-agent-sdk not installed" };
+    }
     const hasKey = runtimeEnv.ANTHROPIC_API_KEY;
     if (!hasKey) {
       return { ok: false, reason: "no ANTHROPIC_API_KEY" };
@@ -706,13 +752,14 @@ async function withTemporaryEnv(overrides, fn) {
  * Otherwise strips OPENAI_BASE_URL so the SDK uses its default auth.
  */
 function buildCodexSdkOptions(envInput = process.env) {
-  const { env: resolvedEnv } = resolveCodexProfileRuntime(envInput);
+  const resolved = resolveCodexProfileRuntime(envInput);
+  const { env: resolvedEnv, configProvider } = resolved;
   const baseUrl = resolvedEnv.OPENAI_BASE_URL || "";
   const isAzure = (() => {
         try {
           const parsed = new URL(baseUrl);
           const host = String(parsed.hostname || "").toLowerCase();
-          return host === "openai.azure.com" || host.endsWith(".openai.azure.com");
+          return host === "openai.azure.com" || host.endsWith(".openai.azure.com") || host.endsWith(".cognitiveservices.azure.com");
         } catch {
           return false;
         }
@@ -727,16 +774,20 @@ function buildCodexSdkOptions(envInput = process.env) {
     if (env.OPENAI_API_KEY && !env.AZURE_OPENAI_API_KEY) {
       env.AZURE_OPENAI_API_KEY = env.OPENAI_API_KEY;
     }
+    // Use the config.toml provider section name and env_key when available,
+    // so the SDK config override is consistent with the user's config.toml.
+    const providerSectionName = configProvider?.name || "azure";
+    const providerEnvKey = configProvider?.envKey || "AZURE_OPENAI_API_KEY";
     const azureModel = env.CODEX_MODEL || undefined;
     return {
       env,
       config: {
-        model_provider: "azure",
+        model_provider: providerSectionName,
         model_providers: {
-          azure: {
+          [providerSectionName]: {
             name: "Azure OpenAI",
             base_url: baseUrl,
-            env_key: "AZURE_OPENAI_API_KEY",
+            env_key: providerEnvKey,
             wire_api: "responses",
           },
         },
@@ -1065,6 +1116,19 @@ export function setPoolSdk(name) {
 export function resetPoolSdkCache() {
   resolvedSdkName = null;
   resolutionLogged = false;
+  sdkFailureCooldownUntil.clear();
+}
+
+export function setSdkFailureCooldownForTest(name, cooldownRemainingMs, nowMs = Date.now()) {
+  if (!SDK_ADAPTERS[name]) {
+    throw new Error(`Unknown SDK: ${name}`);
+  }
+  const remainingMs = Number(cooldownRemainingMs);
+  if (!Number.isFinite(remainingMs) || remainingMs <= 0) {
+    sdkFailureCooldownUntil.delete(name);
+    return;
+  }
+  sdkFailureCooldownUntil.set(name, nowMs + Math.trunc(remainingMs));
 }
 
 /**
@@ -1145,6 +1209,11 @@ async function launchCodexThread(prompt, cwd, timeoutMs, extra = {}) {
       : process.env;
   const codexSessionEnv = applyNodeWarningSuppressionEnv(codexRuntimeEnv);
   const codexOpts = buildCodexSdkOptions(codexSessionEnv);
+  const explicitEnvModel = String(envOverrides?.CODEX_MODEL || "").trim();
+  if (explicitEnvModel) {
+    codexOpts.env = { ...(codexOpts.env || {}), CODEX_MODEL: explicitEnvModel };
+    codexOpts.config = { ...(codexOpts.config || {}), model: explicitEnvModel };
+  }
   const modelOverride = String(extra?.model || "").trim();
   if (modelOverride) {
     codexOpts.env = { ...(codexOpts.env || {}), CODEX_MODEL: modelOverride };
@@ -2384,6 +2453,7 @@ export async function launchEphemeralThread(
       ];
 
   let lastAttemptResult = null;
+  let primaryFailureResult = null;
   const triedSdkNames = [];
   const missingPrereqSdks = [];
   const cooledDownSdks = [];
@@ -2443,6 +2513,10 @@ export async function launchEphemeralThread(
       return result;
     }
 
+    if (name === primaryName) {
+      primaryFailureResult = result;
+    }
+
     applySdkFailureCooldown(name, result.error);
 
     if (name === primaryName) {
@@ -2456,15 +2530,170 @@ export async function launchEphemeralThread(
     }
   }
 
+  const eligibleSdks = Array.from(
+    new Set(attemptOrder.filter((name) => SDK_ADAPTERS[name] && !isDisabled(name))),
+  );
+  const runnableSdks = eligibleSdks.filter((name) => {
+    const prereq = hasSdkPrerequisites(name, sessionEnv);
+    if (!prereq.ok) {
+      if (!missingPrereqSdks.some((entry) => entry.name === name)) {
+        missingPrereqSdks.push({ name, reason: prereq.reason });
+      }
+      return false;
+    }
+    return true;
+  });
+  const cooledDownSet = new Set(cooledDownSdks.map((entry) => entry.name));
+  const missingPrereqSet = new Set(missingPrereqSdks.map((entry) => entry.name));
+  const allEligibleUnavailable =
+    eligibleSdks.length > 0 &&
+    eligibleSdks.every(
+      (name) => cooledDownSet.has(name) || missingPrereqSet.has(name),
+    );
+
+  if (
+    !ignoreSdkCooldown &&
+    !lastAttemptResult &&
+    triedSdkNames.length === 0 &&
+    runnableSdks.length > 0 &&
+    runnableSdks.every((name) => cooledDownSet.has(name))
+  ) {
+    const forcedRetryOrder = runnableSdks.includes(primaryName)
+      ? [primaryName, ...runnableSdks.filter((name) => name !== primaryName)]
+      : runnableSdks;
+
+    for (const name of forcedRetryOrder) {
+      const cooldownRemainingMs = getSdkCooldownRemainingMs(name);
+      if (cooldownRemainingMs <= 0) continue;
+
+      const prereq = hasSdkPrerequisites(name, sessionEnv);
+      if (!prereq.ok) {
+        if (!missingPrereqSdks.some((entry) => entry.name === name)) {
+          missingPrereqSdks.push({ name, reason: prereq.reason });
+        }
+        continue;
+      }
+
+      const remainingSec = Math.max(1, Math.ceil(cooldownRemainingMs / 1000));
+      console.warn(
+        `${TAG} all eligible SDKs are cooling down; force-retrying "${name}" (${remainingSec}s remaining)`,
+      );
+
+      triedSdkNames.push(name);
+      const launcher = await SDK_ADAPTERS[name].load();
+      const result = await launcher(prompt, cwd, timeoutMs, launchExtra);
+      lastAttemptResult = result;
+
+      if (result.success) {
+        return result;
+      }
+
+      if (!shouldFallbackForSdkError(result.error)) {
+        return result;
+      }
+
+      applySdkFailureCooldown(name, result.error);
+      break;
+    }
+  }
+
+  // If every eligible SDK is unavailable (cooldown and/or missing credentials),
+  // force one cooled-down attempt so work is not blocked for the full cooldown window.
+  const shouldForceCooldownBypassAttempt =
+    !ignoreSdkCooldown &&
+    !lastAttemptResult &&
+    triedSdkNames.length === 0 &&
+    cooledDownSet.has(primaryName) &&
+    allEligibleUnavailable;
+  const forcedSdkName = shouldForceCooldownBypassAttempt
+    ? cooledDownSet.has(primaryName)
+      ? primaryName
+      : eligibleSdks.find((name) => cooledDownSet.has(name)) || null
+    : null;
+
+  if (forcedSdkName) {
+    const prereq = hasSdkPrerequisites(forcedSdkName, sessionEnv);
+    if (!prereq.ok) {
+      // Cooldown means we recently attempted this SDK. Keep one forced retry path
+      // to avoid hard-blocking work on strict prerequisite heuristics.
+      if (
+        !missingPrereqSdks.some(
+          (entry) => entry.name === forcedSdkName && entry.reason === prereq.reason,
+        )
+      ) {
+        missingPrereqSdks.push({ name: forcedSdkName, reason: prereq.reason });
+      }
+      console.warn(
+        `${TAG} all eligible SDKs unavailable; bypassing SDK "${forcedSdkName}" prerequisite gate for forced retry (${prereq.reason})`,
+      );
+    } else {
+      console.warn(
+        `${TAG} no runnable fallback SDK is available (cooldown/prerequisite gate); forcing SDK "${forcedSdkName}" retry`,
+      );
+    }
+    triedSdkNames.push(forcedSdkName);
+    const launcher = await SDK_ADAPTERS[forcedSdkName].load();
+    const forcedResult = await launcher(prompt, cwd, timeoutMs, launchExtra);
+    if (forcedResult.success) {
+      return forcedResult;
+    }
+    lastAttemptResult = forcedResult;
+    if (!shouldFallbackForSdkError(forcedResult.error)) {
+      return forcedResult;
+    }
+    applySdkFailureCooldown(forcedSdkName, forcedResult.error);
+  }
+
+  // Recovery path: when all SDKs were skipped due cooldown/prereq gates, force
+  // one direct attempt against cooled-down SDKs to surface a concrete error.
+  if (!lastAttemptResult && triedSdkNames.length === 0 && cooledDownSdks.length > 0) {
+    const cooledDownRescueOrder = cooledDownSdks
+      .map((entry) => entry.name)
+      .filter((name, idx, arr) => SDK_ADAPTERS[name] && arr.indexOf(name) === idx)
+      .sort((a, b) => {
+        if (a === primaryName) return -1;
+        if (b === primaryName) return 1;
+        return 0;
+      });
+
+    for (const name of cooledDownRescueOrder) {
+      const remainingMs = getSdkCooldownRemainingMs(name);
+      const remainingSec = Math.max(1, Math.ceil(remainingMs / 1000));
+      console.warn(
+        `${TAG} no runnable SDK remained after gating; rescue-attempting cooled-down SDK "${name}" (${remainingSec}s remaining)`,
+      );
+
+      triedSdkNames.push(name);
+      const launcher = await SDK_ADAPTERS[name].load();
+      const result = await launcher(prompt, cwd, timeoutMs, launchExtra);
+      lastAttemptResult = result;
+
+      if (result.success) {
+        return result;
+      }
+
+      if (!shouldFallbackForSdkError(result.error)) {
+        return result;
+      }
+
+      if (name === primaryName) {
+        primaryFailureResult = result;
+      }
+
+      applySdkFailureCooldown(name, result.error);
+    }
+  }
   // ── All SDKs exhausted ───────────────────────────────────────────────────
   if (lastAttemptResult) {
+    if (
+      primaryFailureResult &&
+      lastAttemptResult.sdk !== primaryFailureResult.sdk
+    ) {
+      return primaryFailureResult;
+    }
     return lastAttemptResult;
   }
 
-  const eligibleSdks = Array.from(
-    new Set(attemptOrder.filter((name) => SDK_ADAPTERS[name] && !isDisabled(name))),
-  );
-
   let errorMsg = `${TAG} no SDK available.`;
   if (triedSdkNames.length > 0) {
     errorMsg += ` Tried: ${triedSdkNames.join(", ")}.`;
@@ -2888,6 +3117,11 @@ async function resumeCodexThread(threadId, prompt, cwd, timeoutMs, extra = {}) {
       : process.env;
   const codexSessionEnv = applyNodeWarningSuppressionEnv(codexRuntimeEnv);
   const codexOpts = buildCodexSdkOptions(codexSessionEnv);
+  const explicitEnvModel = String(envOverrides?.CODEX_MODEL || "").trim();
+  if (explicitEnvModel) {
+    codexOpts.env = { ...(codexOpts.env || {}), CODEX_MODEL: explicitEnvModel };
+    codexOpts.config = { ...(codexOpts.config || {}), model: explicitEnvModel };
+  }
   const modelOverride = String(extra?.model || "").trim();
   if (modelOverride) {
     codexOpts.env = { ...(codexOpts.env || {}), CODEX_MODEL: modelOverride };
@@ -3081,6 +3315,7 @@ async function resumeGenericThread(
  * @param {string}  [extra.sessionType] Interaction type used for context-shredding policy lookup.
  * @param {boolean} [extra.forceContextShredding] Force compression regardless of session type defaults.
  * @param {boolean} [extra.skipContextShredding]  Skip compression regardless of policy.
+ * @param {boolean} [extra.pinSdk]     Keep SDK pinned when provided (disables fallback).
  * @param {Function} [extra.onEvent]   Event callback.
  * @param {AbortController} [extra.abortController]
  * @returns {Promise<{ success: boolean, output: string, items: Array, error: string|null, sdk: string, threadId: string|null, resumed: boolean }>}
@@ -3105,8 +3340,8 @@ export async function launchOrResumeThread(
   restExtra.envOverrides = applyNodeWarningSuppressionEnv(restExtra.envOverrides);
   // Pass taskKey through as steer key so SDK launchers can register active sessions
   restExtra.taskKey = taskKey;
-  if (restExtra.sdk) {
-    // Task-bound runs with an explicit SDK should stay pinned to that SDK.
+  if (restExtra.sdk && restExtra.pinSdk === true) {
+    // Task-bound runs with an explicit SDK can optionally stay pinned to that SDK.
     restExtra.disableFallback = true;
   }
   timeoutMs = clampMonitorMonitorTimeout(timeoutMs, taskKey);

package/agent/agent-prompts.mjs

@@ -8,7 +8,15 @@ export { AGENT_PROMPT_DEFINITIONS, PROMPT_WORKSPACE_DIR };
 
 function normalizeTemplateValue(value) {
   if (value == null) return "";
-  if (typeof value === "string") return value;
+  if (typeof value === "string") {
+    const text = value.trim();
+    if (!text) return "";
+    const sanitized = text
+      .replace(/\{\{\s*[\w.-]+\s*\}\}/g, " ")
+      .replace(/[ \t]{2,}/g, " ")
+      .trim();
+    return sanitized;
+  }
   if (typeof value === "number" || typeof value === "boolean") {
     return String(value);
   }

package/agent/agent-supervisor.mjs

@@ -384,6 +384,7 @@ export class AgentSupervisor {
     this._sendTelegram = opts.sendTelegram || null;
     this._getTask = opts.getTask || null;
     this._setTaskStatus = opts.setTaskStatus || null;
+    this._updateTask = opts.updateTask || null;
     this._reviewAgent = opts.reviewAgent || null;
 
     // ── Dispatch functions ──
@@ -525,6 +526,27 @@ export class AgentSupervisor {
               this._setTaskStatus(taskId, "blocked", "supervisor");
             } catch { /* best-effort */ }
           }
+          // Persist recovery metadata so auto-recovery can unblock later
+          if (this._updateTask) {
+            try {
+              const existing = this._resolveTask(taskId);
+              const existingMeta = existing?.meta || {};
+              const cooldownMs = 30 * 60_000; // 30 minutes
+              this._updateTask(taskId, {
+                blockedReason: `Supervisor: ${reason} (situation: ${situation})`,
+                cooldownUntil: Date.now() + cooldownMs,
+                meta: {
+                  ...existingMeta,
+                  autoRecovery: {
+                    active: true,
+                    reason: "supervisor_block",
+                    situation,
+                    retryAt: Date.now() + cooldownMs,
+                  },
+                },
+              });
+            } catch { /* best-effort */ }
+          }
           const task = this._resolveTask(taskId);
           const title = task?.title || taskId;
           const state = this._ensureTaskState(taskId);

package/agent/autofix.mjs

@@ -545,7 +545,7 @@ export function runCodexExec(
         try {
           const parsed = new URL(baseUrl);
           const host = String(parsed.hostname || "").toLowerCase();
-          return host === "openai.azure.com" || host.endsWith(".openai.azure.com");
+          return host === "openai.azure.com" || host.endsWith(".openai.azure.com") || host.endsWith(".cognitiveservices.azure.com");
         } catch {
           return false;
         }