@a-t-h-i/bot-lobby 0.3.0 → 0.4.0

package/src/execution/pi-runner.ts

@@ -3,6 +3,12 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
 import { activityWord } from "../pi/activity.ts";
+import { shortDuration } from "../text.ts";
+
+/** Live control over one running subagent: queue a steering message for its next turn. */
+export interface RunHandle {
+  steer(text: string): void;
+}
 
 export interface PiRunOptions {
   cwd: string;
@@ -15,6 +21,18 @@ export interface PiRunOptions {
   signal?: AbortSignal;
   /** Reports the current one-word tool activity while the agent works. */
   onActivity?: (activity: string) => void;
+  /** Every streamed agent event (tools, turns, thinking/writing, retries, usage). */
+  onEvent?: (event: PiStreamEvent) => void;
+  /** Extra environment for the subagent process. */
+  env?: Record<string, string>;
+  /** Kill the agent after this long without any output; 0 disables. */
+  stallTimeoutMs?: number;
+  /** Silence allowed while one tool call is in flight (tests, builds); 0 disables. */
+  toolStallTimeoutMs?: number;
+  /** Ask the agent to wrap up and report at this elapsed time; 0 disables. */
+  wrapUpAtMs?: number;
+  /** Receives the steering handle once the process is running. */
+  onStart?: (handle: RunHandle) => void;
 }
 
 export interface ProcessOutcome {
@@ -23,20 +41,44 @@ export interface ProcessOutcome {
   stderr: string;
   killed: boolean;
   timedOut: boolean;
+  /** Killed by the watchdog after going silent. */
+  stalled?: boolean;
+  /** The agent was asked to wrap up before its deadline. */
+  wrappedUp?: boolean;
+  /** The RPC host rejected the prompt itself. */
+  protocolError?: string;
 }
 
 /** Streaming agent events forwarded as they arrive on stdout. */
-export interface PiStreamEvent {
-  type: "tool_execution_start";
-  toolName: string;
-}
+export type PiStreamEvent =
+  | { type: "tool_execution_start"; toolName: string; args?: unknown }
+  | { type: "tool_execution_end"; toolName: string; isError: boolean }
+  | { type: "turn_start" }
+  | { type: "thinking" }
+  | { type: "writing" }
+  | { type: "retry"; attempt: number; maxAttempts: number; delayMs: number; error: string }
+  | { type: "retry_end"; success: boolean }
+  | { type: "compaction" }
+  | { type: "usage"; input: number; output: number; cost: number; model?: string }
+  | { type: "wrap_up" }
+  | { type: "heartbeat" };
 
 export interface ProcessRunOptions {
   cwd: string;
   signal?: AbortSignal;
   timeoutMs: number;
-  /** Optional sink for streaming agent events (tool starts). */
+  /** The task message sent to the agent over RPC stdin. */
+  prompt?: string;
+  /** Optional sink for streaming agent events. */
   onEvent?: (event: PiStreamEvent) => void;
+  env?: Record<string, string>;
+  stallTimeoutMs?: number;
+  toolStallTimeoutMs?: number;
+  wrapUpAtMs?: number;
+  wrapUpMessage?: string;
+  onStart?: (handle: RunHandle) => void;
+  /** Grace between the deadline abort and the hard kill. */
+  graceMs?: number;
 }
 
 export type ProcessRunner = (
@@ -50,6 +92,8 @@ export interface PiRunResult {
   error?: string;
   usage: { input: number; output: number; cost: number; turns: number };
   model?: string;
+  stalled?: boolean;
+  wrappedUp?: boolean;
 }
 
 export interface ParsedStream {
@@ -61,6 +105,31 @@ export interface ParsedStream {
 }
 
 const MAX_STREAM_CHARS = 5_000_000;
+const HEARTBEAT_MS = 2000;
+const SETTLE_FALLBACK_MS = 3000;
+const EXIT_DRAIN_MS = 1500;
+const DEADLINE_GRACE_MS = 5000;
+const DIALOG_METHODS = new Set(["select", "confirm", "input", "editor"]);
+
+/** The steering message sent at the wrap-up point. */
+export const WRAP_UP_MESSAGE = [
+  "bot-lobby: you are close to your time limit.",
+  "Stop exploring now. Finish or revert any half-done edit so every file is consistent,",
+  "then write your final report in the required output format.",
+  "List anything unfinished under Blockers or Notes.",
+].join(" ");
+
+/** RPC protocol lines the process host reacts to (never forwarded to the caller). */
+export interface ControlEvent {
+  type: string;
+  id?: string;
+  command?: string;
+  success?: boolean;
+  error?: string;
+  method?: string;
+  willRetry?: boolean;
+  delayMs?: number;
+}
 
 /** Buffers one JSON-mode stream, keeping only lines parsePiStream consumes. */
 export interface StreamCollector {
@@ -68,21 +137,88 @@ export interface StreamCollector {
   finish(): string;
 }
 
+const INTERESTING = [
+  '"tool_execution_start"',
+  '"tool_execution_end"',
+  '"message_end"',
+  '"turn_start"',
+  '"auto_retry_',
+  '"compaction_start"',
+  '"agent_settled"',
+  '"agent_end"',
+  '"extension_ui_request"',
+  '"response"',
+];
+
+function num(value: unknown): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+
+interface RawEvent {
+  type?: string;
+  toolName?: string;
+  args?: unknown;
+  isError?: boolean;
+  attempt?: number;
+  maxAttempts?: number;
+  delayMs?: number;
+  errorMessage?: string;
+  success?: boolean;
+  message?: MessageLike;
+}
+
+/** Map one parsed stream line to the caller-facing event, if it is one. */
+function streamEvent(event: RawEvent): PiStreamEvent | undefined {
+  switch (event.type) {
+    case "tool_execution_start":
+      return typeof event.toolName === "string" ? { type: "tool_execution_start", toolName: event.toolName, args: event.args } : undefined;
+    case "tool_execution_end":
+      return { type: "tool_execution_end", toolName: String(event.toolName ?? ""), isError: event.isError === true };
+    case "turn_start":
+      return { type: "turn_start" };
+    case "auto_retry_start":
+      return { type: "retry", attempt: num(event.attempt), maxAttempts: num(event.maxAttempts), delayMs: num(event.delayMs), error: String(event.errorMessage ?? "") };
+    case "auto_retry_end":
+      return { type: "retry_end", success: event.success === true };
+    case "compaction_start":
+      return { type: "compaction" };
+    case "message_end": {
+      const message = event.message;
+      if (message?.role !== "assistant") return undefined;
+      return { type: "usage", input: num(message.usage?.input), output: num(message.usage?.output), cost: num(message.usage?.cost?.total), model: message.model };
+    }
+    default:
+      return undefined;
+  }
+}
+
 /**
- * Buffers one JSON-mode stream, keeping only lines parsePiStream consumes and
- * forwarding tool-start events to an optional sink. Keeping only assistant
- * `message_end` events means a tool-heavy run cannot exhaust memory or
- * truncate the final report. Events split across chunk boundaries are
- * reassembled; malformed lines are ignored exactly as parsePiStream ignores
- * them.
+ * Buffers one JSON-lines stream, keeping only assistant `message_end` lines for
+ * parsePiStream and forwarding agent events to `onEvent` and RPC protocol lines
+ * to `onControl`. Per-token `message_update` deltas are never parsed: a cheap
+ * prefix check reports only thinking/writing phase changes, so a chatty run
+ * cannot exhaust memory. Events split across chunks are reassembled; malformed
+ * lines are ignored exactly as parsePiStream ignores them.
  */
-export function createStreamCollector(onEvent?: (event: PiStreamEvent) => void): StreamCollector {
+export function createStreamCollector(
+  onEvent?: (event: PiStreamEvent) => void,
+  onControl?: (event: ControlEvent) => void,
+): StreamCollector {
   const partial: string[] = [];
   const kept: string[] = [];
+  let phase: "thinking" | "writing" | undefined;
+  let lastBeat = 0;
+  const deltaPhase = (line: string) => {
+    if (!line.startsWith('{"type":"message_update"')) return;
+    const next = line.includes('"thinking_delta"') ? "thinking" : line.includes('"text_delta"') ? "writing" : undefined;
+    if (next && next !== phase) {
+      phase = next;
+      onEvent?.({ type: next });
+    }
+  };
   const keep = (line: string) => {
-    // Most lines are per-token `message_update` deltas or large tool results;
-    // skip the parse for any line that cannot be one of the two kept events.
-    if (!line.includes('"tool_execution_start"') && !line.includes('"message_end"')) return;
+    deltaPhase(line);
+    if (!INTERESTING.some((marker) => line.includes(marker))) return;
     let raw: unknown;
     try {
       raw = JSON.parse(line);
@@ -90,12 +226,19 @@ export function createStreamCollector(onEvent?: (event: PiStreamEvent) => void):
       return; // Malformed lines never parse; drop them.
     }
     if (raw === null || typeof raw !== "object") return;
-    const event = raw as { type?: string; toolName?: string; message?: { role?: string } };
-    if (event.type === "tool_execution_start" && typeof event.toolName === "string") {
-      onEvent?.({ type: "tool_execution_start", toolName: event.toolName });
-    }
+    const event = raw as RawEvent;
+    if (event.type === "tool_execution_start" || event.type === "turn_start") phase = undefined;
+    const forwarded = streamEvent(event);
+    if (forwarded) onEvent?.(forwarded);
+    onControl?.(event as ControlEvent);
     if (event.type === "message_end" && event.message?.role === "assistant") kept.push(line);
   };
+  const beat = () => {
+    const now = Date.now();
+    if (now - lastBeat < HEARTBEAT_MS) return;
+    lastBeat = now;
+    onEvent?.({ type: "heartbeat" });
+  };
   return {
     // Scan only the new chunk for line breaks; a long line split over many
     // chunks is joined once, when its newline finally arrives.
@@ -109,6 +252,7 @@ export function createStreamCollector(onEvent?: (event: PiStreamEvent) => void):
         newline = chunk.indexOf("\n", start);
       }
       if (start < chunk.length) partial.push(chunk.slice(start));
+      beat();
     },
     finish() {
       if (partial.length > 0) keep(partial.splice(0).join(""));
@@ -117,14 +261,13 @@ export function createStreamCollector(onEvent?: (event: PiStreamEvent) => void):
   };
 }
 
-/** Build the `pi` argv for one isolated, non-interactive agent run. */
-export function buildPiArgs(options: PiRunOptions & { systemPromptFile?: string }): string[] {
-  const args = ["--mode", "json", "-p", "--no-session"];
+/** Build the `pi` argv for one isolated, headless RPC agent run; the task goes over stdin. */
+export function buildPiArgs(options: Omit<PiRunOptions, "task"> & { systemPromptFile?: string }): string[] {
+  const args = ["--mode", "rpc", "--no-session", "--no-prompt-templates", "--no-themes"];
   if (options.model && options.model !== "inherit") args.push("--model", options.model);
   if (options.thinking) args.push("--thinking", options.thinking);
   if (options.tools && options.tools.length > 0) args.push("--tools", options.tools.join(","));
   if (options.systemPromptFile) args.push("--append-system-prompt", options.systemPromptFile);
-  args.push(`Task: ${options.task}`);
   return args;
 }
 
@@ -148,7 +291,7 @@ function messageText(content: unknown): string {
     .join("");
 }
 
-/** Parse the JSON-mode stream defensively; malformed lines are ignored. */
+/** Parse the JSON-lines stream defensively; malformed lines are ignored. */
 export function parsePiStream(stdout: string): ParsedStream {
   const parsed: ParsedStream = { text: "", usage: { input: 0, output: 0, cost: 0, turns: 0 } };
   for (const line of stdout.split("\n")) {
@@ -194,80 +337,214 @@ export function isPiLauncher(script: string): boolean {
   return base === "pi" || base === "pi.js" || script.includes("pi-coding-agent");
 }
 
-function terminate(proc: ChildProcess): void {
-  proc.kill("SIGTERM");
-  const escalation = setTimeout(() => {
-    if (proc.exitCode === null) proc.kill("SIGKILL");
-  }, 5000);
+const POSIX = process.platform !== "win32";
+
+/** Signal the child's whole process group (POSIX), so grandchildren go too. */
+function signalGroup(proc: ChildProcess, signal: NodeJS.Signals): void {
+  if (proc.pid === undefined) return;
+  if (POSIX) {
+    try {
+      process.kill(-proc.pid, signal);
+      return;
+    } catch {
+      // The group is already gone; fall through to the child itself.
+    }
+  }
+  try {
+    proc.kill(signal);
+  } catch {
+    // Already exited.
+  }
+}
+
+function terminate(proc: ChildProcess, graceMs = 5000): void {
+  signalGroup(proc, "SIGTERM");
+  const escalation = setTimeout(() => signalGroup(proc, "SIGKILL"), graceMs);
   escalation.unref();
 }
 
-function wireOutput(
-  proc: ChildProcess,
-  buffers: { stdout: string; stderr: string },
-  onEvent?: (event: PiStreamEvent) => void,
-): () => void {
-  const collector = createStreamCollector(onEvent);
-  // Decode as UTF-8 streams so a multi-byte character split across chunks survives.
-  proc.stdout?.setEncoding("utf8");
-  proc.stderr?.setEncoding("utf8");
-  proc.stdout?.on("data", (chunk: string) => collector.push(chunk));
-  proc.stderr?.on("data", (chunk: string) => {
-    // Keep stderr head-bounded: it only feeds exit-code error messages.
-    if (buffers.stderr.length < MAX_STREAM_CHARS) buffers.stderr += chunk;
+/** Line-oriented stdin writer for RPC commands; a closed pipe silently drops writes. */
+function rpcInput(proc: ChildProcess): { send(command: object): void; close(): void } {
+  let open = true;
+  proc.stdin?.on("error", () => {
+    open = false;
   });
-  return () => {
-    buffers.stdout = collector.finish();
+  return {
+    send(command) {
+      if (!open || !proc.stdin?.writable) return;
+      try {
+        proc.stdin.write(`${JSON.stringify(command)}\n`);
+      } catch {
+        open = false;
+      }
+    },
+    close() {
+      if (!open) return;
+      open = false;
+      try {
+        proc.stdin?.end();
+      } catch {
+        // Already closed.
+      }
+    },
   };
 }
 
-/** Default runner: spawn the same pi binary in JSON mode and collect output. */
+interface RunState {
+  killed: boolean;
+  timedOut: boolean;
+  stalled: boolean;
+  wrappedUp: boolean;
+  settled: boolean;
+  protocolError?: string;
+}
+
+/** Smallest positive limit, used to pick a watchdog cadence that can see it. */
+function watchInterval(...limits: Array<number | undefined>): number {
+  const positive = limits.filter((limit): limit is number => typeof limit === "number" && limit > 0);
+  const smallest = positive.length > 0 ? Math.min(...positive) : 4000;
+  return Math.max(25, Math.min(1000, Math.floor(smallest / 4)));
+}
+
+/**
+ * Default runner: spawn pi in RPC mode, send the task over stdin, and watch it.
+ * The child leads its own process group so a stall, deadline or cancel takes
+ * its grandchildren (dev servers, watch-mode tests) with it, and the run ends
+ * on process exit rather than waiting for a pipe a grandchild may hold open.
+ * Near the deadline the agent is steered to wrap up and report; at the
+ * deadline it is aborted; after prolonged silence it is killed as stalled.
+ */
 export function spawnPiProcess(args: string[], options: ProcessRunOptions): Promise<ProcessOutcome> {
   return new Promise((resolve) => {
     const invocation = resolvePiInvocation(args);
     const proc = spawn(invocation.command, invocation.args, {
       cwd: options.cwd,
-      // Marks subagent processes so bot-lobby skips master-only quiet wiring.
-      env: { ...process.env, BOT_LOBBY_SUBAGENT: "1" },
+      // Marks subagent processes so bot-lobby skips master-only wiring, and
+      // skips pi's startup network work (update checks, package refresh).
+      env: { ...process.env, BOT_LOBBY_SUBAGENT: "1", PI_SKIP_VERSION_CHECK: "1", PI_OFFLINE: "1", ...options.env },
       shell: false,
-      stdio: ["ignore", "pipe", "pipe"],
+      detached: POSIX,
+      windowsHide: true,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    const state: RunState = { killed: false, timedOut: false, stalled: false, wrappedUp: false, settled: false };
+    const input = rpcInput(proc);
+    const started = Date.now();
+    let lastOutput = started;
+    let quietGraceUntil = 0;
+    let toolsInFlight = 0;
+    let stderr = "";
+    let exitCode: number | undefined;
+    let settleTimer: ReturnType<typeof setTimeout> | undefined;
+    let done = false;
+
+    const onEvent = (event: PiStreamEvent) => {
+      if (event.type === "tool_execution_start") toolsInFlight += 1;
+      if (event.type === "tool_execution_end") toolsInFlight = Math.max(0, toolsInFlight - 1);
+      if (event.type === "retry") quietGraceUntil = Date.now() + event.delayMs;
+      options.onEvent?.(event);
+    };
+    const onControl = (event: ControlEvent) => {
+      if (event.type === "response" && event.command === "prompt" && event.success === false) {
+        state.protocolError = event.error ?? "the prompt was rejected";
+        input.close();
+      } else if (event.type === "extension_ui_request" && event.method && DIALOG_METHODS.has(event.method)) {
+        // Nobody can answer a dialog inside a subagent; cancel it instead of blocking forever.
+        input.send({ type: "extension_ui_response", id: event.id, cancelled: true });
+      } else if (event.type === "agent_settled") {
+        state.settled = true;
+        input.close();
+      } else if (event.type === "agent_end" && event.willRetry !== true && !settleTimer) {
+        settleTimer = setTimeout(() => input.close(), SETTLE_FALLBACK_MS);
+      }
+    };
+    const collector = createStreamCollector(onEvent, onControl);
+    proc.stdout?.setEncoding("utf8");
+    proc.stderr?.setEncoding("utf8");
+    proc.stdout?.on("data", (chunk: string) => {
+      lastOutput = Date.now();
+      collector.push(chunk);
+    });
+    proc.stderr?.on("data", (chunk: string) => {
+      // Keep stderr head-bounded: it only feeds exit-code error messages.
+      if (stderr.length < MAX_STREAM_CHARS) stderr += chunk;
     });
-    const buffers = { stdout: "", stderr: "" };
-    const state = { killed: false, timedOut: false };
-    const flush = wireOutput(proc, buffers, options.onEvent);
 
-    const finish = (exitCode: number) => {
-      clearTimeout(timer);
+    const finish = (code: number) => {
+      if (done) return;
+      done = true;
+      clearTimeout(deadline);
+      clearTimeout(settleTimer);
+      clearInterval(watch);
       options.signal?.removeEventListener("abort", onAbort);
-      flush();
-      resolve({ exitCode, ...buffers, ...state });
+      input.close();
+      // Reap anything the agent left running in its group.
+      if (POSIX) signalGroup(proc, "SIGTERM");
+      const { killed, timedOut, stalled, wrappedUp, protocolError } = state;
+      resolve({ exitCode: code, stdout: collector.finish(), stderr, killed, timedOut, stalled, wrappedUp, protocolError });
     };
     const onAbort = () => {
       state.killed = true;
-      terminate(proc);
+      input.send({ type: "abort" });
+      input.close();
+      terminate(proc, 3000);
     };
-    const timer = setTimeout(() => {
+    const deadline = setTimeout(() => {
       state.killed = true;
       state.timedOut = true;
-      terminate(proc);
+      input.send({ type: "abort" });
+      input.close();
+      setTimeout(() => terminate(proc), options.graceMs ?? DEADLINE_GRACE_MS).unref();
     }, options.timeoutMs);
+    const watch = setInterval(() => {
+      if (state.killed || done) return;
+      const now = Date.now();
+      if (!state.wrappedUp && !state.settled && options.wrapUpAtMs && options.wrapUpAtMs > 0 && now - started >= options.wrapUpAtMs) {
+        state.wrappedUp = true;
+        input.send({ type: "steer", message: options.wrapUpMessage ?? WRAP_UP_MESSAGE });
+        options.onEvent?.({ type: "wrap_up" });
+      }
+      const limit = toolsInFlight > 0 ? options.toolStallTimeoutMs : options.stallTimeoutMs;
+      if (limit && limit > 0 && now - Math.max(lastOutput, quietGraceUntil) >= limit) {
+        state.killed = true;
+        state.stalled = true;
+        input.close();
+        terminate(proc, 3000);
+      }
+    }, watchInterval(options.stallTimeoutMs, options.toolStallTimeoutMs, options.wrapUpAtMs));
+    watch.unref();
 
-    proc.on("close", (code) => finish(code ?? 0));
+    proc.on("exit", (code, signal) => {
+      exitCode = code ?? (signal ? 1 : 0);
+      // A grandchild may hold stdout open forever; give the pipe a moment to drain, then move on.
+      setTimeout(() => finish(exitCode ?? 0), EXIT_DRAIN_MS);
+    });
+    proc.on("close", (code) => finish(exitCode ?? code ?? 0));
     proc.on("error", (error: Error) => {
-      buffers.stderr += error.message;
+      stderr += error.message;
       finish(1);
     });
+    if (options.prompt !== undefined) input.send({ id: "task", type: "prompt", message: options.prompt });
+    options.onStart?.({ steer: (text) => input.send({ type: "steer", message: text }) });
     if (options.signal?.aborted) onAbort();
     else options.signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
 
-function toResult(parsed: ParsedStream, outcome: ProcessOutcome, aborted: boolean): PiRunResult {
-  const base = { output: parsed.text, usage: parsed.usage, model: parsed.model };
-  if (outcome.timedOut) return { ...base, status: "timeout", error: "agent timed out" };
+function toResult(parsed: ParsedStream, outcome: ProcessOutcome, aborted: boolean, options: PiRunOptions): PiRunResult {
+  const base = { output: parsed.text, usage: parsed.usage, model: parsed.model, wrappedUp: outcome.wrappedUp === true };
+  if (outcome.stalled) {
+    const quiet = shortDuration(options.stallTimeoutMs ?? 0);
+    return { ...base, status: "timeout", stalled: true, error: `stalled: no output for ${quiet}` };
+  }
+  if (outcome.timedOut) {
+    const note = outcome.wrappedUp ? " after a wrap-up request" : "";
+    return { ...base, status: "timeout", error: `hit the ${shortDuration(options.timeoutMs)} time limit${note}` };
+  }
   if (outcome.killed || aborted || parsed.stopReason === "aborted") {
     return { ...base, status: "cancelled", error: "agent was cancelled" };
   }
+  if (outcome.protocolError) return { ...base, status: "failed", error: outcome.protocolError };
   if (outcome.exitCode !== 0) {
     const detail = parsed.errorMessage ?? outcome.stderr.trim();
     return { ...base, status: "failed", error: detail || `pi exited with code ${outcome.exitCode}` };
@@ -295,9 +572,18 @@ export async function runPiAgent(options: PiRunOptions, run: ProcessRunner = spa
       cwd: options.cwd,
       signal: options.signal,
       timeoutMs: options.timeoutMs,
-      onEvent: (event) => options.onActivity?.(activityWord(event.toolName)),
+      prompt: `Task: ${options.task}`,
+      env: options.env,
+      stallTimeoutMs: options.stallTimeoutMs,
+      toolStallTimeoutMs: options.toolStallTimeoutMs,
+      wrapUpAtMs: options.wrapUpAtMs,
+      onStart: options.onStart,
+      onEvent: (event) => {
+        if (event.type === "tool_execution_start") options.onActivity?.(activityWord(event.toolName));
+        options.onEvent?.(event);
+      },
     });
-    return toResult(parsePiStream(outcome.stdout), outcome, options.signal?.aborted === true);
+    return toResult(parsePiStream(outcome.stdout), outcome, options.signal?.aborted === true, options);
   } finally {
     prompt?.cleanup();
   }

package/src/index.ts

@@ -4,10 +4,14 @@ import { registerLifecycle } from "./pi/events.ts";
 import { registerOrchestrateTool } from "./pi/tools.ts";
 import { onTransition } from "./state/task-state.ts";
 import { ping } from "./pi/notify.ts";
+import { isSubagentProcess } from "./pi/quiet.ts";
+import { registerDeskClient } from "./desk/client-extension.ts";
 
 export default function (pi: ExtensionAPI): void {
   registerLifecycle(pi, CONFIG_DIR_NAME);
   onTransition((task) => ping(task.state, task.title));
   registerCommands(pi, CONFIG_DIR_NAME);
   registerOrchestrateTool(pi, CONFIG_DIR_NAME);
+  // Parallel workers share files through the master's file desk.
+  if (isSubagentProcess()) registerDeskClient(pi);
 }

package/src/master/master.ts

@@ -1,10 +1,10 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import type { BotLobbyConfig } from "../schemas/configuration.ts";
+import { profileFor, type BotLobbyConfig, type ProfileResolver } from "../schemas/configuration.ts";
 import type { Domain } from "../schemas/agent.ts";
 import type { AgentRun, ReviewResult, ScoutResult, WorkerResult } from "../schemas/findings.ts";
 import { domainSpec } from "../agents/registry.ts";
-import { runAgent, runParallel, type AgentRequest } from "../execution/agent-runner.ts";
+import { runAgent, runParallel, watchdogOptions, type AgentRequest } from "../execution/agent-runner.ts";
 import { spawnPiProcess, type ProcessRunner } from "../execution/pi-runner.ts";
 import { readAgentKnowledge, writeFileEnsured } from "../knowledge/store.ts";
 import { selectKnowledge, type KnowledgeSelection } from "../knowledge/selector.ts";
@@ -32,14 +32,16 @@ export interface ScoutRequest {
   dataRoots: readonly string[];
   taskDir: string;
   config: BotLobbyConfig;
+  /** Settings-derived model/thinking/time limit, clamped to the model; plain settings when absent. */
+  profile?: ProfileResolver;
   signal?: AbortSignal;
   onUpdate?: (run: AgentRun) => void;
 }
 
-/** Models are inherited from the session unless the config pins one. */
-export function resolveModel(config: BotLobbyConfig, domain: Domain): string | undefined {
-  const model = config.agents[domain].model;
-  return model === "inherit" ? undefined : model;
+/** Model, thinking and time limit for one run, from settings. */
+function profileFields(config: BotLobbyConfig, resolver: ProfileResolver | undefined, domain: Domain, role: AgentRequest["role"]) {
+  const profile = profileFor(config, resolver, domain, role);
+  return { model: profile.model, thinking: profile.thinking, timeoutMs: profile.timeoutMs };
 }
 
 function scoutInstruction(request: ScoutRequest, domain: Domain): string {
@@ -82,13 +84,11 @@ export async function runScouts(request: ScoutRequest, run: ProcessRunner = spaw
     role: "scout",
     instruction: scoutInstruction(request, domain),
     context: scoutContext(request, domain),
-    model: resolveModel(request.config, domain),
-    thinking: request.config.agents[domain].thinking,
-    timeoutMs: request.config.workflow.agentTimeoutMs,
+    ...profileFields(request.config, request.profile, domain, "scout"),
     cwd: request.cwd,
     signal: request.signal,
     onUpdate: request.onUpdate,
-    retries: request.config.workflow.maxAgentRetries,
+    ...watchdogOptions(request.config.workflow),
   }));
   const runs = await runParallel(requests, request.config.workflow.maxParallelScouts, run);
   const outcomes = runs.map((agentRun) => toOutcome(agentRun, agentRun.domain));
@@ -136,6 +136,8 @@ export interface WorkerOutcome {
 }
 
 export interface WorkerRequest {
+  /** Extra run wiring for parallel batches: the file desk's env, tools and hooks. */
+  agent?: Pick<AgentRequest, "env" | "extraTools" | "onStart" | "onAttemptEnd">;
   taskId: string;
   domain: Domain;
   /** What the Master wants implemented. */
@@ -146,6 +148,8 @@ export interface WorkerRequest {
   cwd: string;
   dataRoots: readonly string[];
   config: BotLobbyConfig;
+  /** Settings-derived model/thinking/time limit, clamped to the model; plain settings when absent. */
+  profile?: ProfileResolver;
   signal?: AbortSignal;
   onUpdate?: (run: AgentRun) => void;
 }
@@ -184,13 +188,12 @@ export async function runWorker(
         instructions: request.config.agents[request.domain].instructions,
         workflowContext: workerWorkflowContext(request),
       },
-      model: resolveModel(request.config, request.domain),
-      thinking: request.config.agents[request.domain].thinking,
-      timeoutMs: request.config.workflow.agentTimeoutMs,
+      ...profileFields(request.config, request.profile, request.domain, "worker"),
       cwd: request.cwd,
       signal: request.signal,
       onUpdate: request.onUpdate,
-      retries: request.config.workflow.maxAgentRetries,
+      ...watchdogOptions(request.config.workflow),
+      ...request.agent,
     },
     run,
   );
@@ -219,6 +222,8 @@ export interface ReviewerRequest {
   cwd: string;
   dataRoots: readonly string[];
   config: BotLobbyConfig;
+  /** Settings-derived model/thinking/time limit, clamped to the model; plain settings when absent. */
+  profile?: ProfileResolver;
   signal?: AbortSignal;
   onUpdate?: (run: AgentRun) => void;
 }
@@ -262,12 +267,11 @@ function reviewerAgentRequest(request: ReviewerRequest, selected: KnowledgeSelec
       instructions: request.config.agents[request.domain].instructions,
       workflowContext: reviewerContext(request),
     },
-    model: resolveModel(request.config, request.domain),
-    thinking: request.config.agents[request.domain].thinking,
-    timeoutMs: request.config.workflow.agentTimeoutMs,
+    ...profileFields(request.config, request.profile, request.domain, "reviewer"),
     cwd: request.cwd,
     signal: request.signal,
     onUpdate: request.onUpdate,
+    ...watchdogOptions(request.config.workflow),
     retries: 0,
   };
 }