@mrciphersmith/keryx 0.2.44 → 0.2.46

package/dist/cli.js

@@ -12213,6 +12213,304 @@ var init_permission_mode = __esm(() => {
   PERMISSION_MODES = ["ask", "trust", "auto"];
 });
 
+// src/harness/policy/ranks.ts
+function axesOf(trustMode) {
+  switch (trustMode) {
+    case "read-only":
+      return { authority: "read-only", inputTrust: "vetted" };
+    case "trusted-local":
+      return { authority: "acting", inputTrust: "vetted" };
+    case "untrusted":
+      return { authority: "acting", inputTrust: "unvetted" };
+    default:
+      return;
+  }
+}
+function rankOf(map, value) {
+  return Object.prototype.hasOwnProperty.call(map, value) ? map[value] : undefined;
+}
+function exceedingAxes(ceiling, candidate) {
+  const low = axesOf(ceiling);
+  const high = axesOf(candidate);
+  if (low === undefined || high === undefined) {
+    return [AUTHORITY_AXIS, INPUT_TRUST_AXIS];
+  }
+  const exceeded = [];
+  if (AUTHORITY_RANK[high.authority] > AUTHORITY_RANK[low.authority]) {
+    exceeded.push(AUTHORITY_AXIS);
+  }
+  if (INPUT_TRUST_RANK[high.inputTrust] > INPUT_TRUST_RANK[low.inputTrust]) {
+    exceeded.push(INPUT_TRUST_AXIS);
+  }
+  return exceeded;
+}
+function broadeningAxes(parent, child) {
+  const above = axesOf(parent);
+  const below = axesOf(child);
+  if (above === undefined || below === undefined) {
+    return [AUTHORITY_AXIS, INPUT_TRUST_AXIS];
+  }
+  const broadened = [];
+  if (AUTHORITY_RANK[below.authority] > AUTHORITY_RANK[above.authority]) {
+    broadened.push(AUTHORITY_AXIS);
+  }
+  if (INPUT_TRUST_RANK[below.inputTrust] < INPUT_TRUST_RANK[above.inputTrust]) {
+    broadened.push(INPUT_TRUST_AXIS);
+  }
+  return broadened;
+}
+var AUTHORITY_RANK, INPUT_TRUST_RANK, OUTCOME_RANK, ISOLATION_RANK, AUTHORITY_AXIS = "trustMode.authority", INPUT_TRUST_AXIS = "trustMode.inputTrust";
+var init_ranks = __esm(() => {
+  AUTHORITY_RANK = {
+    "read-only": 0,
+    acting: 1
+  };
+  INPUT_TRUST_RANK = {
+    unvetted: 0,
+    vetted: 1
+  };
+  OUTCOME_RANK = {
+    deny: 0,
+    ask: 1,
+    allow: 2
+  };
+  ISOLATION_RANK = {
+    "not-required": 0,
+    "required-fail-closed": 1
+  };
+});
+
+// src/harness/child/isolation.ts
+function inheritBudget(parentRemaining, childRequest) {
+  if (childRequest.maxRuntimeMs > parentRemaining.maxRuntimeMs) {
+    return {
+      ok: false,
+      reason: `child maxRuntimeMs ${childRequest.maxRuntimeMs} exceeds parent remaining ${parentRemaining.maxRuntimeMs}`
+    };
+  }
+  if (childRequest.maxToolCalls !== undefined) {
+    if (parentRemaining.maxToolCalls === undefined) {
+      return {
+        ok: false,
+        reason: `child requests ${childRequest.maxToolCalls} tool calls but the parent exposes no tool-call budget to inherit`
+      };
+    }
+    if (childRequest.maxToolCalls > parentRemaining.maxToolCalls) {
+      return {
+        ok: false,
+        reason: `child maxToolCalls ${childRequest.maxToolCalls} exceeds parent remaining ${parentRemaining.maxToolCalls}`
+      };
+    }
+  }
+  const reservation = {
+    reservationId: childRequest.reservationId,
+    maxRuntimeMs: childRequest.maxRuntimeMs,
+    ...childRequest.maxToolCalls !== undefined ? { maxToolCalls: childRequest.maxToolCalls } : {}
+  };
+  return { ok: true, reservation };
+}
+function isKnownCapability(value) {
+  return CAPABILITY_KEYS.includes(value);
+}
+function inheritPolicy(parent, childRequest) {
+  if (axesOf(childRequest.trustMode) === undefined || axesOf(parent.trustMode) === undefined) {
+    return {
+      ok: false,
+      reason: `unrecognized trustMode (child "${childRequest.trustMode}", parent "${parent.trustMode}")`
+    };
+  }
+  const broadened = broadeningAxes(parent.trustMode, childRequest.trustMode);
+  if (broadened.length > 0) {
+    return {
+      ok: false,
+      reason: `child trustMode "${childRequest.trustMode}" is broader than parent "${parent.trustMode}" on ${broadened.join(", ")}`
+    };
+  }
+  for (const capability of CAPABILITY_KEYS) {
+    const childOutcome = childRequest.defaults[capability];
+    const parentOutcome = parent.defaults[capability];
+    const childRank = rankOf(OUTCOME_RANK, childOutcome);
+    const parentRank = rankOf(OUTCOME_RANK, parentOutcome);
+    if (childRank === undefined || parentRank === undefined) {
+      return {
+        ok: false,
+        reason: `unrecognized capability outcome for "${capability}" (child "${childOutcome}", parent "${parentOutcome}")`
+      };
+    }
+    if (childRank > parentRank) {
+      return {
+        ok: false,
+        reason: `child capability "${capability}" default "${childOutcome}" is more permissive than parent "${parentOutcome}"`
+      };
+    }
+  }
+  const childIsolation = rankOf(ISOLATION_RANK, childRequest.requiredControls.isolation);
+  const parentIsolation = rankOf(ISOLATION_RANK, parent.requiredControls.isolation);
+  if (childIsolation === undefined || parentIsolation === undefined) {
+    return {
+      ok: false,
+      reason: `unrecognized isolation control (child "${childRequest.requiredControls.isolation}", parent "${parent.requiredControls.isolation}")`
+    };
+  }
+  if (childIsolation < parentIsolation) {
+    return {
+      ok: false,
+      reason: `child isolation "${childRequest.requiredControls.isolation}" is weaker than parent "${parent.requiredControls.isolation}"`
+    };
+  }
+  return { ok: true, policy: childRequest };
+}
+function childProvenance(parent, deps) {
+  const taintIds = [...parent.taintIds ?? [], parent.provenanceId];
+  const provenance = {
+    provenanceId: deps.idSeq(),
+    trustLevel: "derived",
+    sourceKind: parent.sourceKind,
+    taintIds
+  };
+  if (parent.sourceHash !== undefined) {
+    provenance.sourceHash = parent.sourceHash;
+  }
+  return provenance;
+}
+var CAPABILITY_KEYS;
+var init_isolation = __esm(() => {
+  init_ranks();
+  CAPABILITY_KEYS = [
+    "read",
+    "write",
+    "shell",
+    "network",
+    "delegate"
+  ];
+});
+
+// src/harness/parallel/scheduler.ts
+function byTaskId(a, b) {
+  return a.taskId < b.taskId ? -1 : a.taskId > b.taskId ? 1 : 0;
+}
+function computeExcluded(tasks) {
+  const excluded = new Set;
+  for (const t of tasks) {
+    if (t.cancelled === true)
+      excluded.add(t.taskId);
+  }
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const t of tasks) {
+      if (excluded.has(t.taskId))
+        continue;
+      if (t.dependsOn.some((dep) => excluded.has(dep))) {
+        excluded.add(t.taskId);
+        changed = true;
+      }
+    }
+  }
+  return excluded;
+}
+function decrementRemaining(remaining, reservation) {
+  const maxRuntimeMs = remaining.maxRuntimeMs - reservation.maxRuntimeMs;
+  if (remaining.maxToolCalls !== undefined && reservation.maxToolCalls !== undefined) {
+    return { maxRuntimeMs, maxToolCalls: remaining.maxToolCalls - reservation.maxToolCalls };
+  }
+  return remaining.maxToolCalls !== undefined ? { maxRuntimeMs, maxToolCalls: remaining.maxToolCalls } : { maxRuntimeMs };
+}
+function planWaves(tasks, config, _deps) {
+  if (!Number.isInteger(config.maxConcurrency) || config.maxConcurrency < 1) {
+    return { ok: false, reason: `maxConcurrency must be a positive integer, got ${config.maxConcurrency}` };
+  }
+  const excluded = computeExcluded(tasks);
+  const universe = tasks.filter((t) => !excluded.has(t.taskId));
+  const scheduled = new Set;
+  const waveTaskLists = [];
+  while (scheduled.size < universe.length) {
+    const ready = universe.filter((t) => !scheduled.has(t.taskId) && t.dependsOn.every((dep) => scheduled.has(dep))).sort(byTaskId);
+    if (ready.length === 0) {
+      return { ok: false, reason: "dependency cycle detected: no ready task set could be formed" };
+    }
+    const waveTasks = ready.slice(0, config.maxConcurrency);
+    for (const t of waveTasks)
+      scheduled.add(t.taskId);
+    waveTaskLists.push(waveTasks);
+  }
+  let remaining = config.parentRemaining;
+  const waves = [];
+  for (const waveTasks of waveTaskLists) {
+    const taskIds = [];
+    const reservations = [];
+    for (const t of waveTasks) {
+      const granted = inheritBudget(remaining, t.budgetRequest);
+      if (!granted.ok) {
+        return { ok: false, reason: granted.reason };
+      }
+      taskIds.push(t.taskId);
+      reservations.push(granted.reservation);
+      remaining = decrementRemaining(remaining, granted.reservation);
+    }
+    waves.push({ taskIds, reservations });
+  }
+  return { ok: true, waves };
+}
+async function executeWaves(tasks, waves, deps) {
+  const byTaskId2 = new Map;
+  for (const t of tasks)
+    byTaskId2.set(t.taskId, t);
+  const results = new Map;
+  for (let waveIndex = 0;waveIndex < waves.length; waveIndex++) {
+    const wave = waves[waveIndex];
+    if (wave === undefined)
+      continue;
+    const settled = await Promise.allSettled(wave.taskIds.map((taskId, i) => {
+      const task = byTaskId2.get(taskId);
+      if (task === undefined) {
+        return Promise.reject(new Error(`executeWaves: wave ${waveIndex} references unknown taskId "${taskId}" (not in \`tasks\`)`));
+      }
+      const reservation = wave.reservations[i];
+      if (reservation === undefined) {
+        return Promise.reject(new Error(`executeWaves: wave ${waveIndex} taskIds/reservations length mismatch at index ${i} (malformed Wave)`));
+      }
+      return deps.run(task, reservation);
+    }));
+    const failedTaskIds = [];
+    const causes = [];
+    for (let i = 0;i < settled.length; i++) {
+      const outcome = settled[i];
+      const taskId = wave.taskIds[i];
+      if (outcome === undefined || taskId === undefined)
+        continue;
+      if (outcome.status === "fulfilled") {
+        results.set(taskId, outcome.value);
+      } else {
+        failedTaskIds.push(taskId);
+        causes.push(outcome.reason);
+      }
+    }
+    if (failedTaskIds.length > 0) {
+      throw new WaveExecutionError(waveIndex, failedTaskIds, causes, new Map(results));
+    }
+  }
+  return results;
+}
+var WaveExecutionError;
+var init_scheduler = __esm(() => {
+  init_isolation();
+  WaveExecutionError = class WaveExecutionError extends Error {
+    waveIndex;
+    failedTaskIds;
+    causes;
+    partialResults;
+    constructor(waveIndex, failedTaskIds, causes, partialResults) {
+      super(`executeWaves: wave ${waveIndex} had ${failedTaskIds.length} rejected task(s): ${failedTaskIds.join(", ")}`);
+      this.name = "WaveExecutionError";
+      this.waveIndex = waveIndex;
+      this.failedTaskIds = failedTaskIds;
+      this.causes = causes;
+      this.partialResults = partialResults;
+    }
+  };
+});
+
 // src/ctx/assembly.ts
 import { createHash as createHash6 } from "crypto";
 import { mkdir as mkdir24, rename as rename2, writeFile as writeFile26 } from "fs/promises";
@@ -17203,7 +17501,7 @@ ${block}
 }
 async function runAgentTurn(io, deps, history, userLine, options = {}) {
   try {
-    await runAgentTurnCore(io, deps, history, userLine, options);
+    return await runAgentTurnCore(io, deps, history, userLine, options);
   } finally {
     await closeSlateOnFlowDone(io, deps, options);
   }
@@ -17245,7 +17543,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
     io.onSystem?.(`
 [stopped] Model turn interrupted by user.
 `);
-    return;
+    return {};
   }
   const toolByName = new Map(deps.tools.map((t) => [t.definition.name, t]));
   const toolDefs = deps.tools.map((t) => t.definition);
@@ -17354,7 +17652,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
           system(`
 [stopped] Model turn interrupted by user.
 `);
-          return;
+          return {};
         }
         if (event.kind === "reasoning_delta") {
           reasoningText += event.text ?? "";
@@ -17401,7 +17699,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
         system(`
 [stopped] Model turn interrupted by user.
 `);
-        return;
+        return {};
       }
       system(`
 [error] ${cause instanceof Error ? cause.message : String(cause)}
@@ -17417,10 +17715,10 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
       system(`
 [stopped] Model turn interrupted by user.
 `);
-      return;
+      return {};
     }
     if (errored) {
-      return;
+      return {};
     }
     if (calls.length === 0) {
       const shouldReprompt = actionRequest && (assistantText.length === 0 || modelClaimedAction(assistantText));
@@ -17441,27 +17739,35 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
         system(`
 [warning] The provider/model did not emit a tool call for an explicit action request. ` + "Use a chat-safe fallback (`keryx shell --chat`) or switch to a tool-capable model.\n");
       }
-      return;
+      return {};
     }
     if (isAborted()) {
       system(`
 [stopped] Model turn interrupted by user.
 `);
-      return;
+      return {};
     }
     let exhaustedBudget;
     let executedAny = false;
     const batchContainsUntrustedWeb = calls.some((call) => call.name === "web_fetch" || call.name === "web_search");
+    const reservationByCallId = new Map;
+    for (const call of calls) {
+      const callRisk = toolByName.get(call.name)?.definition.risk;
+      reservationByCallId.set(call.id, reserveToolAttempt(budget, call.name, call.input, callRisk));
+    }
+    const spawnConcurrencyCandidates = calls.filter((call) => call.name === "spawn_subagent" && reservationByCallId.get(call.id)?.ok === true);
+    const untrustedGateBlocksSpawns = untrustedContentSeen || batchContainsUntrustedWeb;
+    const concurrentSpawnResults = spawnConcurrencyCandidates.length >= 2 && !untrustedGateBlocksSpawns ? await runConcurrentSpawnBatch(spawnConcurrencyCandidates, toolByName, io, deps) : undefined;
     for (const call of calls) {
       if (isAborted()) {
         system(`
 [stopped] Model turn interrupted by user.
 `);
-        return;
+        return {};
       }
       if (deps.unattended === true && call.name === "ask_user") {
         await emitTerminalState(io, deps, options, "ask_user_unanswerable");
-        return;
+        return {};
       }
       if (untrustedContentSeen || batchContainsUntrustedWeb && call.name !== "web_fetch" && call.name !== "web_search") {
         const result2 = {
@@ -17475,7 +17781,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
       }
       io.onToolCall?.(call.name, call.input);
       const risk = toolByName.get(call.name)?.definition.risk;
-      const reservation = reserveToolAttempt(budget, call.name, call.input, risk);
+      const reservation = reservationByCallId.get(call.id) ?? reserveToolAttempt(budget, call.name, call.input, risk);
       if (!reservation.ok) {
         const result2 = { output: reservation.reason, isError: true };
         io.onToolResult?.(call.name, result2);
@@ -17492,7 +17798,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
         continue;
       }
       executedAny = true;
-      const result = await executeCall(call, toolByName, io.requestApproval, io.permissionMode, io.onAutoApproved);
+      const result = concurrentSpawnResults?.get(call.id) ?? await executeCall(call, toolByName, io.requestApproval, io.permissionMode, io.onAutoApproved);
       io.onToolResult?.(call.name, result);
       const modelOutput = redactSensitiveText(result.output);
       history.push({
@@ -17544,9 +17850,10 @@ ${hint}
     }
     const noProgress = !executedAny && calls.length > 0;
     if (exhaustedBudget !== undefined || noProgress) {
+      const finishReason = exhaustedBudget !== undefined ? "budget" : "no-progress";
       if (deps.unattended === true) {
         await emitTerminalState(io, deps, options, "budget_exhausted");
-        return;
+        return { finishReason };
       }
       await finishWithBudgetSummary(io, deps, history, parentRunId, {
         maxUnique: maxToolCalls,
@@ -17560,7 +17867,7 @@ ${hint}
         ...exhaustedBudget !== undefined ? { exhaustedBudget } : {},
         noProgress
       });
-      return;
+      return { finishReason };
     }
   }
 }
@@ -17652,6 +17959,68 @@ function isApprovalFor(response, fingerprint) {
   }
   return response.fingerprint === undefined || response.fingerprint === fingerprint;
 }
+async function runConcurrentSpawnBatch(spawnCalls, toolByName, io, deps) {
+  const maxConcurrency = deps.maxSubagentConcurrency ?? DEFAULT_MAX_SUBAGENT_CONCURRENCY;
+  const perTaskRuntimeMs = NOMINAL_CONCURRENT_SPAWN_RUNTIME_MS;
+  const tasks = spawnCalls.map((call) => ({
+    taskId: call.id,
+    dependsOn: [],
+    budgetRequest: { reservationId: call.id, maxRuntimeMs: perTaskRuntimeMs }
+  }));
+  const runOne = (call) => executeCall(call, toolByName, io.requestApproval, io.permissionMode, io.onAutoApproved);
+  const plan = planWaves(tasks, {
+    maxConcurrency,
+    parentRemaining: { maxRuntimeMs: perTaskRuntimeMs * tasks.length }
+  });
+  if (!plan.ok) {
+    io.onSystem?.(`
+[warning] concurrent subagent wave planning denied (${plan.reason}); running sequentially.
+`);
+    const results = new Map;
+    for (const call of spawnCalls) {
+      try {
+        results.set(call.id, await runOne(call));
+      } catch (cause) {
+        const message2 = cause instanceof Error ? cause.message : String(cause);
+        results.set(call.id, {
+          output: `subagent call ${call.id} failed: sequential fallback error: ${message2}`,
+          isError: true
+        });
+      }
+    }
+    return results;
+  }
+  try {
+    return await executeWaves(tasks, plan.waves, {
+      run: (task) => {
+        const call = spawnCalls.find((c) => c.id === task.taskId);
+        if (call === undefined) {
+          return Promise.resolve({
+            output: `internal error: unknown concurrent spawn taskId ${task.taskId}`,
+            isError: true
+          });
+        }
+        return runOne(call);
+      }
+    });
+  } catch (cause) {
+    const message2 = cause instanceof Error ? cause.message : String(cause);
+    const isWaveError = cause instanceof WaveExecutionError;
+    io.onSystem?.(`
+[warning] concurrent subagent wave failed${isWaveError ? "" : " (unexpected)"} (degraded): ${message2}
+`);
+    const partialResults = cause instanceof WaveExecutionError ? cause.partialResults : undefined;
+    const results = new Map;
+    for (const call of spawnCalls) {
+      const settled = partialResults?.get(call.id);
+      results.set(call.id, settled ?? {
+        output: `subagent call ${call.id} failed: concurrent wave error: ${message2}`,
+        isError: true
+      });
+    }
+    return results;
+  }
+}
 async function executeCall(call, toolByName, requestApproval, permissionMode, onAutoApproved) {
   const tool = toolByName.get(call.name);
   if (tool === undefined) {
@@ -17703,190 +18072,20 @@ async function executeCall(call, toolByName, requestApproval, permissionMode, on
   }
   return tool.invoke(input2);
 }
-var DEFAULT_MAX_TOOL_CALLS = 48, ENV_AGENT_MAX_TOOL_CALLS = "KERYX_AGENT_MAX_TOOL_CALLS", MAX_AGENT_MAX_TOOL_CALLS = 256, DEFAULT_MAX_READ_TOOL_CALLS = 40, DEFAULT_MAX_NON_READ_TOOL_CALLS = 8, MAX_ATTEMPTS_PER_HASH = 3, ENV_AGENT_MAX_ATTEMPTS_PER_HASH = "KERYX_AGENT_MAX_ATTEMPTS_PER_HASH", MAX_AGENT_MAX_ATTEMPTS_PER_HASH = 10, REPEAT_FAILURE_HINT_THRESHOLD = 2, MAX_TOOLLESS_REPROMPTS = 1;
+var DEFAULT_MAX_TOOL_CALLS = 48, ENV_AGENT_MAX_TOOL_CALLS = "KERYX_AGENT_MAX_TOOL_CALLS", MAX_AGENT_MAX_TOOL_CALLS = 256, DEFAULT_MAX_READ_TOOL_CALLS = 40, DEFAULT_MAX_NON_READ_TOOL_CALLS = 8, DEFAULT_MAX_SUBAGENT_CONCURRENCY = 3, MAX_ATTEMPTS_PER_HASH = 3, ENV_AGENT_MAX_ATTEMPTS_PER_HASH = "KERYX_AGENT_MAX_ATTEMPTS_PER_HASH", MAX_AGENT_MAX_ATTEMPTS_PER_HASH = 10, REPEAT_FAILURE_HINT_THRESHOLD = 2, MAX_TOOLLESS_REPROMPTS = 1, NOMINAL_CONCURRENT_SPAWN_RUNTIME_MS;
 var init_agent = __esm(() => {
   init_validator();
   init_command_risk();
   init_permission_mode();
   init_redact();
+  init_scheduler();
   init_slate();
   init_slate_course();
   init_workspace_resolve();
   init_machine_wrap_up();
   init_slate_lifecycle();
   init_slate_terminal_state();
-});
-
-// src/harness/policy/ranks.ts
-function axesOf(trustMode) {
-  switch (trustMode) {
-    case "read-only":
-      return { authority: "read-only", inputTrust: "vetted" };
-    case "trusted-local":
-      return { authority: "acting", inputTrust: "vetted" };
-    case "untrusted":
-      return { authority: "acting", inputTrust: "unvetted" };
-    default:
-      return;
-  }
-}
-function rankOf(map, value) {
-  return Object.prototype.hasOwnProperty.call(map, value) ? map[value] : undefined;
-}
-function exceedingAxes(ceiling, candidate) {
-  const low = axesOf(ceiling);
-  const high = axesOf(candidate);
-  if (low === undefined || high === undefined) {
-    return [AUTHORITY_AXIS, INPUT_TRUST_AXIS];
-  }
-  const exceeded = [];
-  if (AUTHORITY_RANK[high.authority] > AUTHORITY_RANK[low.authority]) {
-    exceeded.push(AUTHORITY_AXIS);
-  }
-  if (INPUT_TRUST_RANK[high.inputTrust] > INPUT_TRUST_RANK[low.inputTrust]) {
-    exceeded.push(INPUT_TRUST_AXIS);
-  }
-  return exceeded;
-}
-function broadeningAxes(parent, child) {
-  const above = axesOf(parent);
-  const below = axesOf(child);
-  if (above === undefined || below === undefined) {
-    return [AUTHORITY_AXIS, INPUT_TRUST_AXIS];
-  }
-  const broadened = [];
-  if (AUTHORITY_RANK[below.authority] > AUTHORITY_RANK[above.authority]) {
-    broadened.push(AUTHORITY_AXIS);
-  }
-  if (INPUT_TRUST_RANK[below.inputTrust] < INPUT_TRUST_RANK[above.inputTrust]) {
-    broadened.push(INPUT_TRUST_AXIS);
-  }
-  return broadened;
-}
-var AUTHORITY_RANK, INPUT_TRUST_RANK, OUTCOME_RANK, ISOLATION_RANK, AUTHORITY_AXIS = "trustMode.authority", INPUT_TRUST_AXIS = "trustMode.inputTrust";
-var init_ranks = __esm(() => {
-  AUTHORITY_RANK = {
-    "read-only": 0,
-    acting: 1
-  };
-  INPUT_TRUST_RANK = {
-    unvetted: 0,
-    vetted: 1
-  };
-  OUTCOME_RANK = {
-    deny: 0,
-    ask: 1,
-    allow: 2
-  };
-  ISOLATION_RANK = {
-    "not-required": 0,
-    "required-fail-closed": 1
-  };
-});
-
-// src/harness/child/isolation.ts
-function inheritBudget(parentRemaining, childRequest) {
-  if (childRequest.maxRuntimeMs > parentRemaining.maxRuntimeMs) {
-    return {
-      ok: false,
-      reason: `child maxRuntimeMs ${childRequest.maxRuntimeMs} exceeds parent remaining ${parentRemaining.maxRuntimeMs}`
-    };
-  }
-  if (childRequest.maxToolCalls !== undefined) {
-    if (parentRemaining.maxToolCalls === undefined) {
-      return {
-        ok: false,
-        reason: `child requests ${childRequest.maxToolCalls} tool calls but the parent exposes no tool-call budget to inherit`
-      };
-    }
-    if (childRequest.maxToolCalls > parentRemaining.maxToolCalls) {
-      return {
-        ok: false,
-        reason: `child maxToolCalls ${childRequest.maxToolCalls} exceeds parent remaining ${parentRemaining.maxToolCalls}`
-      };
-    }
-  }
-  const reservation = {
-    reservationId: childRequest.reservationId,
-    maxRuntimeMs: childRequest.maxRuntimeMs,
-    ...childRequest.maxToolCalls !== undefined ? { maxToolCalls: childRequest.maxToolCalls } : {}
-  };
-  return { ok: true, reservation };
-}
-function isKnownCapability(value) {
-  return CAPABILITY_KEYS.includes(value);
-}
-function inheritPolicy(parent, childRequest) {
-  if (axesOf(childRequest.trustMode) === undefined || axesOf(parent.trustMode) === undefined) {
-    return {
-      ok: false,
-      reason: `unrecognized trustMode (child "${childRequest.trustMode}", parent "${parent.trustMode}")`
-    };
-  }
-  const broadened = broadeningAxes(parent.trustMode, childRequest.trustMode);
-  if (broadened.length > 0) {
-    return {
-      ok: false,
-      reason: `child trustMode "${childRequest.trustMode}" is broader than parent "${parent.trustMode}" on ${broadened.join(", ")}`
-    };
-  }
-  for (const capability of CAPABILITY_KEYS) {
-    const childOutcome = childRequest.defaults[capability];
-    const parentOutcome = parent.defaults[capability];
-    const childRank = rankOf(OUTCOME_RANK, childOutcome);
-    const parentRank = rankOf(OUTCOME_RANK, parentOutcome);
-    if (childRank === undefined || parentRank === undefined) {
-      return {
-        ok: false,
-        reason: `unrecognized capability outcome for "${capability}" (child "${childOutcome}", parent "${parentOutcome}")`
-      };
-    }
-    if (childRank > parentRank) {
-      return {
-        ok: false,
-        reason: `child capability "${capability}" default "${childOutcome}" is more permissive than parent "${parentOutcome}"`
-      };
-    }
-  }
-  const childIsolation = rankOf(ISOLATION_RANK, childRequest.requiredControls.isolation);
-  const parentIsolation = rankOf(ISOLATION_RANK, parent.requiredControls.isolation);
-  if (childIsolation === undefined || parentIsolation === undefined) {
-    return {
-      ok: false,
-      reason: `unrecognized isolation control (child "${childRequest.requiredControls.isolation}", parent "${parent.requiredControls.isolation}")`
-    };
-  }
-  if (childIsolation < parentIsolation) {
-    return {
-      ok: false,
-      reason: `child isolation "${childRequest.requiredControls.isolation}" is weaker than parent "${parent.requiredControls.isolation}"`
-    };
-  }
-  return { ok: true, policy: childRequest };
-}
-function childProvenance(parent, deps) {
-  const taintIds = [...parent.taintIds ?? [], parent.provenanceId];
-  const provenance = {
-    provenanceId: deps.idSeq(),
-    trustLevel: "derived",
-    sourceKind: parent.sourceKind,
-    taintIds
-  };
-  if (parent.sourceHash !== undefined) {
-    provenance.sourceHash = parent.sourceHash;
-  }
-  return provenance;
-}
-var CAPABILITY_KEYS;
-var init_isolation = __esm(() => {
-  init_ranks();
-  CAPABILITY_KEYS = [
-    "read",
-    "write",
-    "shell",
-    "network",
-    "delegate"
-  ];
+  NOMINAL_CONCURRENT_SPAWN_RUNTIME_MS = 5 * 60000;
 });
 
 // src/harness/child/ledger.ts
@@ -44896,76 +45095,8 @@ function evaluateExtensionGrant(input2, deps) {
   return { ok: true };
 }
 
-// src/harness/parallel/scheduler.ts
-init_isolation();
-function byTaskId(a, b) {
-  return a.taskId < b.taskId ? -1 : a.taskId > b.taskId ? 1 : 0;
-}
-function computeExcluded(tasks) {
-  const excluded = new Set;
-  for (const t of tasks) {
-    if (t.cancelled === true)
-      excluded.add(t.taskId);
-  }
-  let changed = true;
-  while (changed) {
-    changed = false;
-    for (const t of tasks) {
-      if (excluded.has(t.taskId))
-        continue;
-      if (t.dependsOn.some((dep) => excluded.has(dep))) {
-        excluded.add(t.taskId);
-        changed = true;
-      }
-    }
-  }
-  return excluded;
-}
-function decrementRemaining(remaining, reservation) {
-  const maxRuntimeMs = remaining.maxRuntimeMs - reservation.maxRuntimeMs;
-  if (remaining.maxToolCalls !== undefined && reservation.maxToolCalls !== undefined) {
-    return { maxRuntimeMs, maxToolCalls: remaining.maxToolCalls - reservation.maxToolCalls };
-  }
-  return remaining.maxToolCalls !== undefined ? { maxRuntimeMs, maxToolCalls: remaining.maxToolCalls } : { maxRuntimeMs };
-}
-function planWaves(tasks, config, _deps) {
-  if (!Number.isInteger(config.maxConcurrency) || config.maxConcurrency < 1) {
-    return { ok: false, reason: `maxConcurrency must be a positive integer, got ${config.maxConcurrency}` };
-  }
-  const excluded = computeExcluded(tasks);
-  const universe = tasks.filter((t) => !excluded.has(t.taskId));
-  const scheduled = new Set;
-  const waveTaskLists = [];
-  while (scheduled.size < universe.length) {
-    const ready = universe.filter((t) => !scheduled.has(t.taskId) && t.dependsOn.every((dep) => scheduled.has(dep))).sort(byTaskId);
-    if (ready.length === 0) {
-      return { ok: false, reason: "dependency cycle detected: no ready task set could be formed" };
-    }
-    const waveTasks = ready.slice(0, config.maxConcurrency);
-    for (const t of waveTasks)
-      scheduled.add(t.taskId);
-    waveTaskLists.push(waveTasks);
-  }
-  let remaining = config.parentRemaining;
-  const waves = [];
-  for (const waveTasks of waveTaskLists) {
-    const taskIds = [];
-    const reservations = [];
-    for (const t of waveTasks) {
-      const granted = inheritBudget(remaining, t.budgetRequest);
-      if (!granted.ok) {
-        return { ok: false, reason: granted.reason };
-      }
-      taskIds.push(t.taskId);
-      reservations.push(granted.reservation);
-      remaining = decrementRemaining(remaining, granted.reservation);
-    }
-    waves.push({ taskIds, reservations });
-  }
-  return { ok: true, waves };
-}
-
 // src/harness/extension/bound-wave.ts
+init_scheduler();
 function buildPlannedAttemptEvidence(extension, deps) {
   const causal = {
     runId: extension.parentRunId,
@@ -47903,7 +48034,7 @@ function createSpawnSubagentTool(deps) {
     invoke: async (input2) => {
       const task = typeof input2.task === "string" ? input2.task.trim() : "";
       if (task.length === 0) {
-        return { output: "spawn_subagent requires a non-empty 'task'", isError: true };
+        return { status: "Error", output: "spawn_subagent requires a non-empty 'task'", isError: true };
       }
       const mode = input2.mode === "general" ? "general" : "read_only";
       const maxToolCalls = typeof input2.max_tool_calls === "number" && input2.max_tool_calls > 0 ? Math.min(MAX_SUBAGENT_MAX_TOOL_CALLS, Math.floor(input2.max_tool_calls)) : DEFAULT_SUBAGENT_MAX_TOOL_CALLS;
@@ -47954,6 +48085,7 @@ function createSpawnSubagentTool(deps) {
           task
         });
         return {
+          status: "Denied",
           output: `spawn_subagent denied by MAE: ${spawned.reason}`,
           isError: true
         };
@@ -48143,6 +48275,7 @@ function createSpawnSubagentTool(deps) {
 
 ` + "Return a concise summary of findings and any recommended next steps for the parent agent.";
         const turn = runAgentTurn(io, childDeps, history, userLine, { signal: childAbort.signal });
+        let turnResult;
         if (deadlineMs > 0) {
           let timer;
           const expired = new Promise((resolve3) => {
@@ -48164,20 +48297,26 @@ function createSpawnSubagentTool(deps) {
             await foldChildSlateAndCleanup("incomplete");
             const partial = assistant.trim();
             return {
+              status: "Timeout",
               output: `subagent ${label} (${workerId}) timed out after ${deadlineMs}ms and was abandoned ` + `(tighten or disable with ${ENV_SUBAGENT_TIMEOUT_MS})` + (partial.length > 0 ? `
 --- partial output ---
 ${boundSummary(partial)}` : ""),
-              isError: true
+              isError: true,
+              ...partial.length > 0 ? { partial: boundSummary(partial) } : {}
             };
           }
+          turnResult = await turn;
         } else {
-          await turn;
+          turnResult = await turn;
         }
         closed = true;
         releaseBudget();
         const raw = assistant.trim().length > 0 ? assistant.trim() : history.filter((m) => m.role === "assistant").map((m) => m.content).join(`
 `).trim() || "(subagent produced no text)";
         const folded = foldChildSummary(raw);
+        const finishReason = turnResult?.finishReason;
+        const status = finishReason === "budget" ? "BudgetExhausted" : finishReason === "no-progress" ? "NoProgress" : "Completed";
+        const isError = status !== "Completed";
         emitSubagentFleet({
           kind: "upsert",
           id: workerId,
@@ -48189,11 +48328,13 @@ ${boundSummary(partial)}` : ""),
         });
         await foldChildSlateAndCleanup("completed");
         return {
+          status,
+          isError,
           output: `subagent ${label} (${workerId}) ${mode} via ${runModel.provider}/${runModel.model}
 ` + `MAE reservation: tools\u2264${spawned.reservation.maxToolCalls ?? maxToolCalls} ` + `runtime\u2264${spawned.reservation.maxRuntimeMs}ms children=${ledger.childCount}
 ` + `--- summary ---
 ${boundSummary(folded.text)}`,
-          isError: false
+          ...status !== "Completed" ? { partial: boundSummary(folded.text) } : {}
         };
       } catch (cause) {
         closed = true;
@@ -48209,7 +48350,7 @@ ${boundSummary(folded.text)}`,
           task
         });
         await foldChildSlateAndCleanup("incomplete");
-        return { output: `subagent ${label} failed: ${msg}`, isError: true };
+        return { status: "Error", output: `subagent ${label} failed: ${msg}`, isError: true };
       }
     }
   };
@@ -48605,7 +48746,7 @@ import { spawnSync as spawnSync2 } from "child_process";
 // package.json
 var package_default = {
   name: "@mrciphersmith/keryx",
-  version: "0.2.44",
+  version: "0.2.46",
   description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   private: false,
   publishConfig: {
@@ -50460,6 +50601,37 @@ function openFlows(otui, chrome, options) {
   return presentFlows((hostOtui, hostChrome, input2) => openModal(hostOtui, hostChrome, input2), otui, chrome, options);
 }
 
+// src/tui/busy-dispatch.ts
+function classifyBusyDispatch(params) {
+  const { line, commandName, isSessionInfo, isFlows, isWorkspace, isReview } = params;
+  if (commandName === "/exit")
+    return "exit";
+  if (commandName === "/help")
+    return "help";
+  if (commandName === "/interrupt")
+    return "interrupt";
+  if (commandName === "/queue")
+    return "queue";
+  if (commandName === "/think")
+    return "think";
+  if (commandName === "/expand")
+    return "expand";
+  if (commandName === "/copy")
+    return "copy";
+  const isBusyReadonlyCommand = isSessionInfo || isFlows || isWorkspace || isReview;
+  if (isBusyReadonlyCommand && isSessionInfo)
+    return "session-info";
+  if (isBusyReadonlyCommand && isFlows)
+    return "flows";
+  if (isBusyReadonlyCommand && isWorkspace)
+    return "workspace";
+  if (isBusyReadonlyCommand && isReview)
+    return "review";
+  if (commandName !== undefined || line.startsWith("/"))
+    return "deferred";
+  return "not-a-command";
+}
+
 // src/tui/workspace-inspector.ts
 var WORKSPACE_COMMAND = "/workspace";
 var WORKSPACE_FOOTER = [
@@ -55523,81 +55695,122 @@ Staying in the current session.
         return;
       }
       const displayLine = summarizeSubmittedLine(line);
-      const isBusyReadonlyCommand = isSessionInfoCommand(line) || isFlowsCommand(line);
       if (chrome.isBusy()) {
         const command2 = findAgentCommand(line, "agent");
-        if (command2?.name === "/exit") {
-          (async () => {
-            await closeSlateSession(slateSession, mintTimestampAttemptId);
-            r.off("theme_mode", onThemeMode);
-            r.destroy();
-          })();
-          return;
-        }
-        if (command2?.name === "/help") {
-          transcript.add(new otui.TextRenderable(r, {
-            id: `c${uid++}`,
-            content: otui.t`${otui.cyan(`\u276F ${line}`)}`,
-            marginTop: 1
-          }));
-          io.onSystem?.("Main agent is busy. Type a normal question to spawn a side worker " + `(sees main status + recent context; read-only). /status \u0438 /flows still open info panels. /exit still works.
+        const decision = classifyBusyDispatch({
+          line,
+          commandName: command2?.name,
+          isSessionInfo: isSessionInfoCommand(line),
+          isFlows: isFlowsCommand(line),
+          isWorkspace: isWorkspaceCommand(line),
+          isReview: isReviewCommand(line)
+        });
+        switch (decision) {
+          case "exit": {
+            (async () => {
+              await closeSlateSession(slateSession, mintTimestampAttemptId);
+              r.off("theme_mode", onThemeMode);
+              r.destroy();
+            })();
+            return;
+          }
+          case "help": {
+            transcript.add(new otui.TextRenderable(r, {
+              id: `c${uid++}`,
+              content: otui.t`${otui.cyan(`\u276F ${line}`)}`,
+              marginTop: 1
+            }));
+            io.onSystem?.("Main agent is busy. Type a normal question to spawn a side worker " + `(sees main status + recent context; read-only). /status \u0438 /flows still open info panels. /exit still works.
 `);
-          return;
-        }
-        if (command2?.name === "/interrupt") {
-          if (mainTurnAbortController !== undefined && !mainTurnAbortController.signal.aborted) {
-            mainTurnAbortController.abort();
-            io.onSystem?.(`\u25C7 main turn interrupted.
+            return;
+          }
+          case "interrupt": {
+            if (mainTurnAbortController !== undefined && !mainTurnAbortController.signal.aborted) {
+              mainTurnAbortController.abort();
+              io.onSystem?.(`\u25C7 main turn interrupted.
+`);
+              return;
+            }
+            io.onSystem?.(`\u25C7 no active main turn to interrupt.
 `);
             return;
           }
-          io.onSystem?.(`\u25C7 no active main turn to interrupt.
+          case "queue": {
+            const parsed = parseQueueCommand(line.trim().split(/\s+/).slice(1).join(" "));
+            if (parsed === undefined) {
+              io.onSystem?.(`\u25C7 usage: /queue <remove|edit|force> [N]  (N = qN position, default 1)
 `);
-          return;
-        }
-        if (command2?.name === "/queue") {
-          const parsed = parseQueueCommand(line.trim().split(/\s+/).slice(1).join(" "));
-          if (parsed === undefined) {
-            io.onSystem?.(`\u25C7 usage: /queue <remove|edit|force> [N]  (N = qN position, default 1)
+              return;
+            }
+            const index = parsed.position - 1;
+            if (index < 0 || index >= mainQueue.length) {
+              io.onSystem?.(`\u25C7 queue: no item q${parsed.position}.
+`);
+              return;
+            }
+            if (parsed.action === "remove") {
+              removeMainQueue(index);
+              io.onSystem?.(`\u25C7 removed q${parsed.position} from the main queue.
+`);
+              return;
+            }
+            if (parsed.action === "edit") {
+              editMainQueue(index);
+              io.onSystem?.(`\u25C7 q${parsed.position} moved to the composer \u2014 edit and submit to re-queue at the same position.
 `);
+              return;
+            }
+            forceMainQueue(index);
             return;
           }
-          const index = parsed.position - 1;
-          if (index < 0 || index >= mainQueue.length) {
-            io.onSystem?.(`\u25C7 queue: no item q${parsed.position}.
+          case "think": {
+            if (toggleNewestBlock("thought") === undefined) {
+              io.onSystem?.(`No reasoning yet.
 `);
+            }
             return;
           }
-          if (parsed.action === "remove") {
-            removeMainQueue(index);
-            io.onSystem?.(`\u25C7 removed q${parsed.position} from the main queue.
+          case "expand": {
+            if (toggleNewestBlock("output") === undefined && toggleNewestBlock() === undefined) {
+              io.onSystem?.(`Nothing to expand \u2014 no tool output yet.
 `);
+            }
             return;
           }
-          if (parsed.action === "edit") {
-            editMainQueue(index);
-            io.onSystem?.(`\u25C7 q${parsed.position} moved to the composer \u2014 edit and submit to re-queue at the same position.
+          case "copy": {
+            const target = newestBlock();
+            if (target === undefined || !copyBlock(target.id)) {
+              io.onSystem?.(`Nothing to copy yet.
 `);
+            }
             return;
           }
-          forceMainQueue(index);
-          return;
-        }
-        if (isBusyReadonlyCommand && isSessionInfoCommand(line)) {
-          showSessionInfo();
-          return;
-        }
-        if (isBusyReadonlyCommand && isFlowsCommand(line)) {
-          showFlows();
-          return;
-        }
-        if (command2 !== undefined || line.startsWith("/")) {
-          transcript.add(new otui.TextRenderable(r, {
-            id: `c${uid++}`,
-            content: otui.t`${otui.yellow(`\u25C7 main is busy \u2014 command deferred. Ask a normal question for a side worker, or wait.`)}`,
-            marginTop: 1
-          }));
-          return;
+          case "session-info": {
+            showSessionInfo();
+            return;
+          }
+          case "flows": {
+            showFlows();
+            return;
+          }
+          case "workspace": {
+            showWorkspace();
+            return;
+          }
+          case "review": {
+            showReview();
+            return;
+          }
+          case "deferred": {
+            transcript.add(new otui.TextRenderable(r, {
+              id: `c${uid++}`,
+              content: otui.t`${otui.yellow(`\u25C7 main is busy \u2014 command deferred. Ask a normal question for a side worker, or wait.`)}`,
+              marginTop: 1
+            }));
+            return;
+          }
+          case "not-a-command":
+            break;
         }
         if (pendingQueueEdit !== undefined) {
           const edit = pendingQueueEdit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {