@wrongstack/core 0.54.1 → 0.66.13

package/dist/{compactor-Duhsf0ge.d.ts → compactor-D_ExJajC.d.ts}

@@ -1,4 +1,4 @@
-import { d as Context } from './context-DtPKqKYV.js';
+import { d as Context } from './context-y87Jc5ei.js';
 
 interface CompactRepairReport {
     removedToolUses: string[];

package/dist/{config-bht0txXS.d.ts → config--86aHSln.d.ts}

@@ -1,5 +1,100 @@
 import { W as WireFamily } from './models-registry-BcYJDKLm.js';
-import { a as Capabilities, P as Permission } from './context-DtPKqKYV.js';
+import { a as Capabilities, P as Permission } from './context-y87Jc5ei.js';
+
+/**
+ * Lifecycle hook types — the pure, serializable contract shared by the config
+ * layer, the in-process plugin API, and the shell-hook executor.
+ *
+ * These types intentionally avoid referencing the live `Context` (which lives
+ * in `core/`, a higher layer) so `types/config.ts` can import them without
+ * creating a layering cycle. The runtime pieces (`hooks/registry`,
+ * `hooks/runner`, `hooks/shell-executor`) translate live run state into the
+ * serializable `HookInput` below.
+ */
+/** Lifecycle phases a hook can subscribe to. */
+type HookEvent = 'PreToolUse' | 'PostToolUse' | 'UserPromptSubmit' | 'SessionStart' | 'Stop';
+/**
+ * Tool-name matcher for `PreToolUse`/`PostToolUse` hooks. A pipe-delimited
+ * list of exact tool names, or `*` for all tools. Examples: `"Bash"`,
+ * `"edit|write"`, `"*"`. Ignored (treated as `*`) for non-tool events.
+ */
+type HookMatcher = string;
+/**
+ * The JSON payload handed to a hook. For shell hooks this is serialized to
+ * stdin; for in-process hooks it is passed as the sole argument. Kept flat and
+ * serializable so both transports see the same shape.
+ */
+interface HookInput {
+    event: HookEvent;
+    /** Present for PreToolUse / PostToolUse. */
+    toolName?: string;
+    /** Tool arguments (PreToolUse / PostToolUse). */
+    toolInput?: unknown;
+    /** Tool result preview (PostToolUse only). */
+    toolResult?: {
+        content: string;
+        isError: boolean;
+    };
+    /** The submitted user text (UserPromptSubmit only). */
+    prompt?: string;
+    /** Absolute working directory of the session. */
+    cwd: string;
+    /** Active session id, when known. */
+    sessionId?: string;
+}
+/**
+ * What a hook returns. Every field is optional — an empty object (or a hook
+ * that returns nothing) is a no-op "allow".
+ */
+interface HookOutcome {
+    /**
+     * `block` stops the action (PreToolUse → tool not run; UserPromptSubmit →
+     * turn short-circuited). `allow` is the explicit no-op. Omitted = allow.
+     */
+    decision?: 'block' | 'allow';
+    /** Human-readable reason, surfaced to the model when blocking. */
+    reason?: string;
+    /**
+     * PreToolUse only: replacement tool arguments. The executor swaps these in
+     * and RE-VALIDATES them against the tool's input schema before running.
+     */
+    modifiedInput?: Record<string, unknown>;
+    /**
+     * Extra context to fold back to the model — appended to the tool_result
+     * (PostToolUse), the user message (UserPromptSubmit), or the system preamble
+     * (SessionStart).
+     */
+    additionalContext?: string;
+}
+/** An in-process hook function (registered via the plugin API). */
+type InProcessHook = (input: HookInput) => HookOutcome | void | Promise<HookOutcome | void>;
+/**
+ * A shell-command hook (declared in `config.hooks`). Claude-compatible: the
+ * `HookInput` JSON is written to the command's stdin; a JSON `HookOutcome` may
+ * be printed to stdout, and exit code 2 forces `decision: 'block'`.
+ */
+interface ShellHook {
+    /** Command line run via the platform shell. */
+    command: string;
+    /** Tool-name matcher (defaults to `*`). */
+    matcher?: HookMatcher;
+    /** Per-invocation timeout in ms (default 5000). */
+    timeoutMs?: number;
+}
+/** A registered hook entry, discriminated by transport. */
+type HookEntry = {
+    kind: 'inprocess';
+    event: HookEvent;
+    matcher: HookMatcher;
+    hook: InProcessHook;
+    owner?: string;
+} | {
+    kind: 'shell';
+    event: HookEvent;
+    matcher: HookMatcher;
+    command: string;
+    timeoutMs?: number;
+};
 
 type ContextWindowModeId = 'balanced' | 'frugal' | 'deep' | 'archival';
 type ContextWindowAggressiveOn = 'hard' | 'soft' | 'warn';
@@ -266,6 +361,21 @@ interface Config {
     context: ContextConfig;
     tools: ToolsConfig;
     mcpServers?: Record<string, MCPServerConfig>;
+    /**
+     * Ordered list of fallback model references tried, in order, when the
+     * primary model is overloaded (HTTP 429/529/5xx) and its own retries are
+     * exhausted. Each entry is a model reference: a bare model id (same
+     * provider), `provider/model`, or `provider model`. The primary is always
+     * re-tried first at the start of every user turn. See `createFallbackModelExtension`.
+     */
+    fallbackModels?: string[];
+    /**
+     * Lifecycle shell hooks, keyed by event. Each command receives the hook
+     * `HookInput` JSON on stdin; a JSON `HookOutcome` on stdout (and exit code 2
+     * = block) steers the agent. In-process hooks are registered separately via
+     * the plugin API. Disabled entirely under `--bare` / `--no-hooks`.
+     */
+    hooks?: Partial<Record<HookEvent, ShellHook[]>>;
     plugins?: (string | PluginConfig)[];
     log: LogConfig;
     features: FeaturesConfig;
@@ -341,4 +451,4 @@ interface ConfigStore {
     watch(cb: (next: Readonly<Config>, prev: Readonly<Config>) => void): () => void;
 }
 
-export { type AutonomyConfig as A, CONTEXT_WINDOW_MODES as C, DEFAULT_CONTEXT_WINDOW_MODE_ID as D, type FeaturesConfig as F, type LogConfig as L, type MCPServerConfig as M, type PluginConfig as P, type SessionLoggingConfig as S, type ToolsConfig as T, type Config as a, type ConfigLoader as b, type ConfigStore as c, type ContextConfig as d, type ContextWindowAggressiveOn as e, type ContextWindowConfigLike as f, type ContextWindowMode as g, type ContextWindowModeId as h, type ContextWindowPolicy as i, type ContextWindowThresholds as j, type CustomModelDefinition as k, type ModelMatrixEntry as l, type ProviderApiKey as m, type ProviderConfig as n, type SyncCategory as o, type SyncConfig as p, formatContextWindowModeList as q, getContextWindowMode as r, isContextWindowModeId as s, listContextWindowModes as t, resolveContextWindowPolicy as u };
+export { type AutonomyConfig as A, CONTEXT_WINDOW_MODES as C, DEFAULT_CONTEXT_WINDOW_MODE_ID as D, type FeaturesConfig as F, type HookEntry as H, type InProcessHook as I, type LogConfig as L, type MCPServerConfig as M, type PluginConfig as P, type SessionLoggingConfig as S, type ToolsConfig as T, type Config as a, type ConfigLoader as b, type ConfigStore as c, type ContextConfig as d, type ContextWindowAggressiveOn as e, type ContextWindowConfigLike as f, type ContextWindowMode as g, type ContextWindowModeId as h, type ContextWindowPolicy as i, type ContextWindowThresholds as j, type CustomModelDefinition as k, type HookEvent as l, type HookInput as m, type HookMatcher as n, type HookOutcome as o, type ModelMatrixEntry as p, type ProviderApiKey as q, type ProviderConfig as r, type ShellHook as s, type SyncCategory as t, type SyncConfig as u, formatContextWindowModeList as v, getContextWindowMode as w, isContextWindowModeId as x, listContextWindowModes as y, resolveContextWindowPolicy as z };

package/dist/{context-DtPKqKYV.d.ts → context-y87Jc5ei.d.ts}

@@ -265,12 +265,12 @@ declare function isFsError(err: unknown): err is FsError;
 
 type Permission = 'auto' | 'confirm' | 'deny';
 /**
- * Risk tier for tools in YOLO mode. Even in YOLO, tools classified as
- * `destructive` still prompt for confirmation unless `--force-all-yolo`
- * is set.
+ * Risk tier for tools in YOLO mode. YOLO auto-approves everything by default,
+ * including destructive calls. Use `--confirm-destructive` to re-enable
+ * confirmation prompts for destructive operations.
  *
  * - `safe`       — read-only, no side effects (read, glob, grep, etc.)
- * - `standard`   — non-destructive writes and mutations (write, edit, bash with safe commands)
+ * - `standard`   — non-destructive writes and mutations (write, edit, safe shell commands)
  * - `destructive` — irreversible or broadside effects (recursive deletes, db drops, etc.)
  */
 type RiskTier = 'safe' | 'standard' | 'destructive';
@@ -324,10 +324,10 @@ interface Tool<I = unknown, O = unknown> {
     permission: Permission;
     mutating: boolean;
     /**
-     * Risk tier for selective YOLO gating. When YOLO is active, `destructive`
-     * tools still emit `confirm` unless `forceAllYolo` is set. Defaults to
-     * `standard` when omitted — callers should always check `riskTier` after
-     * the basic permission decision.
+     * Risk tier for selective YOLO gating. When YOLO is active, clearly
+     * destructive calls still emit `confirm` unless the destructive override is
+     * set. Defaults to `standard` when omitted — callers should always check
+     * `riskTier` after the basic permission decision.
      */
     riskTier?: RiskTier;
     /**

package/dist/coordination/index.d.ts

@@ -1,21 +1,21 @@
-export { B as BrainArbiter, a as BrainDecision, b as BrainDecisionOption, c as BrainDecisionQueue, d as BrainDecisionRequest, e as BrainDecisionSource, f as BrainFallback, g as BrainRisk, D as DefaultBrainArbiter, h as DefaultBrainArbiterOptions, H as HumanEscalatingBrainArbiter, O as ObservableBrainArbiter, l as formatHumanPrompt } from '../events-CbHTS4ZZ.js';
-export { A as ACP_AGENTS, a as AGENTS_BY_PHASE, b as AGENT_CATALOG, c as ALL_AGENT_DEFINITIONS, d as ALL_FLEET_AGENTS, e as AUDIT_LOG_AGENT, f as AutoExtendCeiling, g as AutoExtendPolicy, B as BUG_HUNTER_AGENT, h as BugFinding, C as CollabBudgetConfig, i as CollabBudgetOverrides, j as CollabBudgetWarningPayload, k as CollabDebugReport, l as CollabSession, m as CollabSessionOptions, n as CreateDelegateToolOptions, o as CriticConcern, p as CriticEvaluation, D as DEFAULT_DIRECTOR_PREAMBLE, q as DEFAULT_SUBAGENT_BASELINE, r as DelegateHost, s as Director, t as DirectorAlert, u as DirectorAlertLevel, v as DirectorCancelCollabPayload, w as DirectorPromptParts, x as DirectorSessionFactory, y as DirectorSessionFactoryOptions, F as FLEET_ROSTER, z as FLEET_ROSTER_BUDGETS, E as FLEET_ROSTER_WITHACP, G as FleetCostCapError, H as FleetManager, I as FleetManagerOptions, J as FleetRosterBudget, K as FleetSpawnBudgetError, L as ICoordinator, M as IFleetManager, N as LargeAnswerStore, O as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, P as RefactorPhase, Q as RefactorPlan, S as SECURITY_SCANNER_AGENT, T as SharedFileEntry, U as SharedFileSnapshot, V as SubagentPromptParts, W as applyRosterBudget, X as attachAutoExtend, Y as composeDirectorPrompt, Z as composeSubagentPrompt, _ as createDelegateTool, $ as getAgentDefinition, a0 as makeAskResultTool, a1 as makeAskTool, a2 as makeAssignTool, a3 as makeAwaitTasksTool, a4 as makeCollabDebugTool, a5 as makeDirectorSessionFactory, a6 as makeFleetEmitTool, a7 as makeFleetHealthTool, a8 as makeFleetSessionTool, a9 as makeFleetStatusTool, aa as makeFleetUsageTool, ab as makeRollUpTool, ac as makeSpawnTool, ad as makeTerminateTool, ae as makeWorkCompleteTool, af as rosterSummaryFromConfigs } from '../null-fleet-bus-BNiSlTna.js';
-import { b as AgentDefinition } from '../multi-agent-coordinator-CjNX4uBD.js';
-export { T as AGENT_TOOL_PRESETS, A as AgentBudgetTier, a as AgentCapability, c as AgentPhase, D as DEFAULT_DISPATCH_ROLE, d as DefaultMultiAgentCoordinator, e as DispatchCandidate, f as DispatchClassifier, g as DispatchMethod, h as DispatchOptions, i as DispatchResult, H as HEAVY_BUDGET, L as LIGHT_BUDGET, M as MEDIUM_BUDGET, j as MultiAgentCoordinatorOptions, k as dispatchAgent, m as makeLLMClassifier, s as scoreAgents } from '../multi-agent-coordinator-CjNX4uBD.js';
-export { c as BudgetExceededError, d as BudgetKind, e as BudgetLimits, f as BudgetNegotiationMode, g as BudgetThresholdDecision, h as BudgetThresholdHandler, i as BudgetThresholdSignal, j as BudgetUsage, m as SubagentBudget } from '../multi-agent-BmC_xiog.js';
-export { A as AgentFactory, a as AgentFactoryResult, b as AgentRunnerOptions, F as FleetBus, c as FleetEvent, d as FleetHandler, e as FleetUsage, f as FleetUsageAggregator, S as SubagentUsageSnapshot, m as makeAgentSubagentRunner } from '../agent-subagent-runner-By7jruZ_.js';
-export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-Dnhw4tnM.js';
-import '../context-DtPKqKYV.js';
+export { B as BrainArbiter, a as BrainDecision, b as BrainDecisionOption, c as BrainDecisionQueue, d as BrainDecisionRequest, e as BrainDecisionSource, f as BrainFallback, g as BrainRisk, D as DefaultBrainArbiter, h as DefaultBrainArbiterOptions, H as HumanEscalatingBrainArbiter, O as ObservableBrainArbiter, l as formatHumanPrompt } from '../events-CIplI98R.js';
+export { A as ACP_AGENTS, a as AGENTS_BY_PHASE, b as AGENT_CATALOG, c as ALL_AGENT_DEFINITIONS, d as ALL_FLEET_AGENTS, e as AUDIT_LOG_AGENT, f as AutoExtendCeiling, g as AutoExtendPolicy, B as BUG_HUNTER_AGENT, h as BugFinding, C as CollabBudgetConfig, i as CollabBudgetOverrides, j as CollabBudgetWarningPayload, k as CollabDebugReport, l as CollabSession, m as CollabSessionOptions, n as CreateDelegateToolOptions, o as CriticConcern, p as CriticEvaluation, D as DEFAULT_DIRECTOR_PREAMBLE, q as DEFAULT_SUBAGENT_BASELINE, r as DelegateHost, s as Director, t as DirectorAlert, u as DirectorAlertLevel, v as DirectorCancelCollabPayload, w as DirectorPromptParts, x as DirectorSessionFactory, y as DirectorSessionFactoryOptions, F as FLEET_ROSTER, z as FLEET_ROSTER_BUDGETS, E as FLEET_ROSTER_WITHACP, G as FleetCostCapError, H as FleetManager, I as FleetManagerOptions, J as FleetRosterBudget, K as FleetSpawnBudgetError, L as ICoordinator, M as IFleetManager, N as LargeAnswerStore, O as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, P as RefactorPhase, Q as RefactorPlan, S as SECURITY_SCANNER_AGENT, T as SharedFileEntry, U as SharedFileSnapshot, V as SubagentPromptParts, W as applyRosterBudget, X as attachAutoExtend, Y as composeDirectorPrompt, Z as composeSubagentPrompt, _ as createDelegateTool, $ as getAgentDefinition, a0 as makeAskResultTool, a1 as makeAskTool, a2 as makeAssignTool, a3 as makeAwaitTasksTool, a4 as makeCollabDebugTool, a5 as makeDirectorSessionFactory, a6 as makeFleetEmitTool, a7 as makeFleetHealthTool, a8 as makeFleetSessionTool, a9 as makeFleetStatusTool, aa as makeFleetUsageTool, ab as makeRollUpTool, ac as makeSpawnTool, ad as makeTerminateTool, ae as makeWorkCompleteTool, af as rosterSummaryFromConfigs } from '../null-fleet-bus-VApKRxcp.js';
+import { b as AgentDefinition } from '../multi-agent-coordinator-CWnH-CiX.js';
+export { T as AGENT_TOOL_PRESETS, A as AgentBudgetTier, a as AgentCapability, c as AgentPhase, D as DEFAULT_DISPATCH_ROLE, d as DefaultMultiAgentCoordinator, e as DispatchCandidate, f as DispatchClassifier, g as DispatchMethod, h as DispatchOptions, i as DispatchResult, H as HEAVY_BUDGET, L as LIGHT_BUDGET, M as MEDIUM_BUDGET, j as MultiAgentCoordinatorOptions, k as dispatchAgent, m as makeLLMClassifier, s as scoreAgents } from '../multi-agent-coordinator-CWnH-CiX.js';
+export { c as AgentFactory, d as AgentFactoryResult, e as AgentRunnerOptions, g as BudgetExceededError, h as BudgetKind, i as BudgetLimits, j as BudgetNegotiationMode, k as BudgetThresholdDecision, l as BudgetThresholdHandler, m as BudgetThresholdSignal, n as BudgetUsage, F as FleetBus, p as FleetEvent, q as FleetHandler, r as FleetUsage, s as FleetUsageAggregator, K as SubagentBudget, V as SubagentUsageSnapshot, _ as makeAgentSubagentRunner } from '../agent-subagent-runner-DRZ9-NnR.js';
+export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-D-j6OOBT.js';
+import '../context-y87Jc5ei.js';
 import 'node:events';
 import '../director-state-BmYi3DGA.js';
-import '../config-bht0txXS.js';
+import '../config--86aHSln.js';
 import '../models-registry-BcYJDKLm.js';
-import '../index-CI271MjL.js';
+import '../index-DKUvyTvV.js';
 import '../logger-DDd5C--Z.js';
-import '../system-prompt-dtzV_mLm.js';
+import '../system-prompt-b61lOd49.js';
 import '../observability-BhnVLBLS.js';
 import '../secret-scrubber-3MHDDAtm.js';
-import '../permission-Drm7LpPo.js';
+import '../permission-C1A5whY5.js';
+import '../retry-policy-CG3qvH_e.js';
 
 /** Phase 1 · Discovery — map the territory before any work begins. */
 declare const DISCOVERY_AGENTS: AgentDefinition[];

package/dist/coordination/index.js

@@ -1174,6 +1174,10 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
     return lines.join("\n");
   }
   cleanup() {
+    if (this._timeoutTimer) {
+      clearTimeout(this._timeoutTimer);
+      this._timeoutTimer = void 0;
+    }
     for (const dispose of this.disposers) dispose();
     this.disposers.length = 0;
   }
@@ -4679,15 +4683,22 @@ var SubagentBudget = class _SubagentBudget {
     void this.checkLimits();
   }
   /**
-   * Wall-clock budget check. Unlike other limits, timeout is always a hard stop
-   * — wall-clock time cannot be "extended" by the coordinator, so it throws
-   * synchronously rather than entering the negotiation flow.
+   * Wall-clock / idle budget check. Delegates to `checkLimits(elapsed)`, so
+   * `timeout` and `idle_timeout` follow the SAME negotiation path as the other
+   * kinds — they are NOT a special-cased hard stop. This is deliberate: a
+   * heartbeat-aware policy (see `attachAutoExtend` and `CollabSession`) grants
+   * a timeout extension only while the agent is making progress and denies it
+   * once the agent is genuinely stuck, which is safer than an unconditional
+   * hard kill of a long-but-working agent. The runner translates the resulting
+   * `BudgetThresholdSignal` decision (`extend` → patch limits in place,
+   * `stop` → abort) just like every other kind.
    *
-   * Decision table:
-   * - no `onThreshold` handler         → throw `BudgetExceededError`
-   * - `mode === 'sync'`               → throw `BudgetExceededError`
-   * - `mode === 'auto'` + no listener  → throw `BudgetExceededError`
-   * - `mode === 'auto'` + listener     → throw `BudgetExceededError` (timeout is not extendable)
+   * Decision table (same as `checkLimits`):
+   * - no `onThreshold` handler        → throw `BudgetExceededError` (hard stop)
+   * - `mode === 'sync'`               → throw `BudgetExceededError` (hard stop)
+   * - `mode === 'auto'` + no listener → throw `BudgetExceededError` (no one to ask)
+   * - `mode === 'auto'` + listener    → throw `BudgetThresholdSignal` (negotiated;
+   *                                     a heartbeat-aware policy may extend the timeout)
    */
   checkTimeout() {
     if (this.startTime === null) return;
@@ -5086,7 +5097,10 @@ var NICKNAME_POOL = {
   "lavoisier": { name: "Lavoisier", domain: "chemistry" },
   "mendeleev": { name: "Mendeleev", domain: "chemistry" }
 };
-var ALL_NICKNAMES = Object.values(NICKNAME_POOL);
+var ALL_NICKNAMES = Object.entries(NICKNAME_POOL);
+var NAME_TO_KEY = Object.fromEntries(
+  ALL_NICKNAMES.map(([key, entry]) => [entry.name, key])
+);
 var DOMAIN_PREFERENCES = {
   "security": ["shannon", "turing", "lamarr", "stallman"],
   "bug-hunter": ["darwin", "curie", "feynman", "fermi"],
@@ -5119,17 +5133,23 @@ function assignNickname(role, used) {
   for (const key of preferences) {
     const entry = NICKNAME_POOL[key];
     if (entry && !used.has(key)) {
-      return `${entry.name} (${formatRole(role)})`;
+      return { key, display: `${entry.name} (${formatRole(role)})` };
     }
   }
-  for (const entry of ALL_NICKNAMES) {
-    const key = Object.entries(NICKNAME_POOL).find(([, v]) => v.name === entry.name)?.[0];
-    if (key && !used.has(key)) {
-      return `${entry.name} (${formatRole(role)})`;
+  for (const [key, entry] of ALL_NICKNAMES) {
+    if (!used.has(key)) {
+      return { key, display: `${entry.name} (${formatRole(role)})` };
     }
   }
   const counter = used.size + 1;
-  return `Scientist #${counter} (${formatRole(role)})`;
+  return { key: `scientist-${counter}`, display: `Scientist #${counter} (${formatRole(role)})` };
+}
+function nicknameKeyFromDisplay(display) {
+  const base = display.replace(/\s*\([^)]*\)\s*$/, "").trim();
+  const key = NAME_TO_KEY[base];
+  if (key) return key;
+  const synthesized = base.match(/^Scientist #(\d+)$/);
+  return synthesized ? `scientist-${synthesized[1]}` : void 0;
 }
 function formatRole(role) {
   return role.split(/[-_]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
@@ -5216,11 +5236,10 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     const name = subagent.name?.trim() ?? "";
     const isPlaceholder = name === "" || name.toLowerCase() === role.toLowerCase() || name === "subagent" || name === "adhoc" || name === "generic" || /^slot-/.test(name);
     if (!isPlaceholder) return subagent;
-    const nickname = assignNickname(role, this.usedNicknames);
-    const baseKey = nickname.split(" ")[0].toLowerCase().replace(/[^a-z0-9-]/g, "-");
-    this.usedNicknames.add(baseKey);
-    this.subagentNicknames.set(subagentId, baseKey);
-    return { ...subagent, name: nickname };
+    const { key, display } = assignNickname(role, this.usedNicknames);
+    this.usedNicknames.add(key);
+    this.subagentNicknames.set(subagentId, key);
+    return { ...subagent, name: display };
   }
   async spawn(subagent) {
     const id = subagent.id || randomUUID();
@@ -5472,23 +5491,32 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
    */
   drainPendingAsAborted(message) {
     const dropped = this.pendingTasks.splice(0, this.pendingTasks.length);
-    for (const t of dropped) {
-      const synthetic = {
-        subagentId: t.subagentId ?? "unassigned",
-        taskId: t.id,
-        status: "stopped",
-        error: {
-          kind: "aborted_by_parent",
-          message,
-          retryable: false
-        },
-        iterations: 0,
-        toolCalls: 0,
-        durationMs: 0
-      };
-      this.completedResults.push(synthetic);
-      this.emit("task.completed", { task: t, result: synthetic });
-    }
+    for (const t of dropped) this.emitPendingAborted(t, message);
+  }
+  /**
+   * Emit a synthetic `stopped`/`aborted_by_parent` completion for a single
+   * PENDING task — one that was never counted in `inFlight`. This MUST bypass
+   * `recordCompletion`: that path does `inFlight--`, which for a pending task
+   * steals a decrement from a genuinely in-flight task and trips the underflow
+   * guard — suppressing that real task's `task.completed` and hanging its
+   * `awaitTasks()` caller. Pushes the result and fires the event directly.
+   */
+  emitPendingAborted(task, message) {
+    const synthetic = {
+      subagentId: task.subagentId ?? "unassigned",
+      taskId: task.id,
+      status: "stopped",
+      error: {
+        kind: "aborted_by_parent",
+        message,
+        retryable: false
+      },
+      iterations: 0,
+      toolCalls: 0,
+      durationMs: 0
+    };
+    this.completedResults.push(synthetic);
+    this.emit("task.completed", { task, result: synthetic });
   }
   async runDispatched(subagentId, task) {
     const subagent = this.subagents.get(subagentId);
@@ -5749,20 +5777,10 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     const orphaned = this.pendingTasks.filter((t) => t.subagentId === subagentId);
     this.pendingTasks = this.pendingTasks.filter((t) => t.subagentId !== subagentId);
     for (const t of orphaned) {
-      const synthetic = {
-        subagentId,
-        taskId: t.id,
-        status: "stopped",
-        error: {
-          kind: "aborted_by_parent",
-          message: `Subagent "${subagentId}" was removed while task "${t.id}" was pending`,
-          retryable: false
-        },
-        iterations: 0,
-        toolCalls: 0,
-        durationMs: 0
-      };
-      this.recordCompletion(synthetic);
+      this.emitPendingAborted(
+        t,
+        `Subagent "${subagentId}" was removed while task "${t.id}" was pending`
+      );
     }
     this.fleetBus?.emit({
       subagentId,
@@ -6188,18 +6206,20 @@ var Director = class _Director {
       if (e.subagentId.startsWith("bug-hunter-") || e.subagentId.startsWith("refactor-planner-") || e.subagentId.startsWith("critic-")) {
         return;
       }
-      if (payload.kind === "timeout") {
+      if (payload.kind === "timeout" || payload.kind === "idle_timeout") {
+        const heartbeatKey = `${e.subagentId}:${payload.kind}`;
         const progress = progressBySubagent.get(e.subagentId) ?? 0;
-        const lastProgress = lastTimeoutProgress.get(e.subagentId) ?? -1;
+        const lastProgress = lastTimeoutProgress.get(heartbeatKey) ?? -1;
         if (progress <= lastProgress) {
           payload.deny();
           return;
         }
-        lastTimeoutProgress.set(e.subagentId, progress);
+        lastTimeoutProgress.set(heartbeatKey, progress);
+        const field = payload.kind === "timeout" ? "timeoutMs" : "idleTimeoutMs";
         setImmediate(() => {
           const newLimit = Math.min(Math.ceil(payload.limit * 2), 24 * 60 * 6e4);
-          this.recordExtension(e.subagentId, e.taskId, "timeout", newLimit);
-          payload.extend({ timeoutMs: newLimit });
+          this.recordExtension(e.subagentId, e.taskId, payload.kind, newLimit);
+          payload.extend({ [field]: newLimit });
         });
         return;
       }
@@ -6515,10 +6535,9 @@ var Director = class _Director {
       if (this.fleetManager) {
         this.fleetManager.assignNicknameAndRecord(config);
       } else {
-        config.name = assignNickname(role, this._usedNicknames);
-        this._usedNicknames.add(
-          config.name.split(" ")[0].toLowerCase().replace(/[^a-z0-9-]/g, "-")
-        );
+        const { key, display } = assignNickname(role, this._usedNicknames);
+        config.name = display;
+        this._usedNicknames.add(key);
       }
     }
     result = await this.coordinator.spawn(config);
@@ -6840,8 +6859,8 @@ var Director = class _Director {
     } else {
       const entry = this.manifestEntries.get(subagentId);
       if (entry?.name) {
-        const nicknameKey = entry.name.split(" ")[0].toLowerCase().replace(/[^a-z0-9-]/g, "-");
-        this._usedNicknames.delete(nicknameKey);
+        const nicknameKey = nicknameKeyFromDisplay(entry.name);
+        if (nicknameKey) this._usedNicknames.delete(nicknameKey);
       }
     }
     this.manifestEntries.delete(subagentId);
@@ -8453,11 +8472,10 @@ var FleetManager = class {
    */
   assignNicknameAndRecord(config) {
     const role = config.role ?? "subagent";
-    const nickname = assignNickname(role, this._usedNicknames);
-    const baseKey = nickname.split(" ")[0].toLowerCase().replace(/[^a-z0-9-]/g, "-");
-    this._usedNicknames.add(baseKey);
-    config.name = nickname;
-    return nickname;
+    const { key, display } = assignNickname(role, this._usedNicknames);
+    this._usedNicknames.add(key);
+    config.name = display;
+    return display;
   }
   /**
    * Returns the set of already-assigned nickname keys — useful for debugging
@@ -8642,8 +8660,8 @@ var FleetManager = class {
   removeSubagent(subagentId) {
     const entry = this.manifestEntries.get(subagentId);
     if (entry?.name) {
-      const nicknameKey = entry.name.split(" ")[0].toLowerCase().replace(/[^a-z0-9-]/g, "-");
-      this._usedNicknames.delete(nicknameKey);
+      const nicknameKey = nicknameKeyFromDisplay(entry.name);
+      if (nicknameKey) this._usedNicknames.delete(nicknameKey);
     }
     for (const [taskId, task] of this.pendingTasks) {
       if (task.subagentId === subagentId) {