pi-workflow-engine 0.10.2 → 0.11.0

package/.pi/extensions/pi-workflow-engine/src/agent-runner.ts

@@ -1,560 +1,119 @@
-import { createAgentSession, defineTool, SessionManager } from "@earendil-works/pi-coding-agent";
-import type { CreateAgentSessionOptions, ModelRegistry, ToolDefinition } from "@earendil-works/pi-coding-agent";
-import type { Api, Model } from "@earendil-works/pi-ai";
-import type { AgentOptions } from "./types.ts";
-import type { Semaphore } from "./concurrency.ts";
-import type { PerfSink } from "./perf.ts";
-import type { WorkflowUsageSink } from "./usage.ts";
-import { WorkflowBudgetExceededError, type WorkflowBudget } from "./budget.ts";
+import { assertWorkflowBudgetAvailable } from "./budget.ts";
 import { throwIfAborted } from "./cancellation.ts";
-import { appendSkillReminder, createAgentSkillResourceLoader, extractSkillSelectorsFromText } from "./agent-skills.ts";
-import { agentJournalKey, type WorkflowJournal } from "./journal.ts";
-import type { WorktreeRegistry } from "./worktree.ts";
-
-/** Name of the synthetic terminating tool that carries structured output. */
-const FINAL_TOOL = "final_answer";
-const SCHEMA_REPROMPT_ATTEMPTS = 1;
-const SCHEMA_REPROMPT =
-  `You ended your turn without calling the ${FINAL_TOOL} tool, so no result was recorded. ` +
-  `Call ${FINAL_TOOL} now with your final answer as its arguments. Do not reply with plain text.`;
-const BUILTIN_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls"] as const;
-const DEFAULT_SEARCH_BASE_TOOLS = ["read", "bash", "grep", "find", "ls"];
-
-export interface AgentRunnerEvent {
-  readonly type: string;
-  readonly toolName?: string;
-}
-
-export interface AgentRunnerToolInfo {
-  readonly name: string;
-  readonly description?: string;
-}
-
-export interface AgentRunnerSession {
-  readonly state: { readonly messages: readonly unknown[] };
-  prompt(text: string): Promise<void>;
-  subscribe(listener: (event: AgentRunnerEvent) => void): () => void;
-  dispose(): void;
-  abort(): Promise<void>;
-  getAllTools?(): readonly AgentRunnerToolInfo[];
-  setActiveToolsByName?(toolNames: readonly string[]): void;
-}
-
-export type CreateAgentSession = (options: CreateAgentSessionOptions) => Promise<{ session: AgentRunnerSession }>;
-
-export interface AgentProgress {
-  agentQueued(phase: string | undefined, label: string): number;
-  agentStart(phase: string | undefined, label: string, id?: number): void;
-  agentTool(label: string, tool: string, id?: number): void;
-  agentDone(label: string, id?: number): void;
-  agentFailed(label: string, error: unknown, id?: number): void;
-  log(message: string): void;
-}
-
-/** Shared per-run context threaded into every agent() call. */
-export interface RunContext {
-  cwd: string;
-  hostModel: Model<Api> | undefined;
-  modelRegistry: Pick<ModelRegistry, "find">;
-  semaphore: Semaphore;
-  progress: AgentProgress;
-  signal: AbortSignal | undefined;
-  perf: PerfSink;
-  usage: WorkflowUsageSink;
-  budget: WorkflowBudget;
-  journal: WorkflowJournal;
-  worktrees: WorktreeRegistry;
-  createSession?: CreateAgentSession;
-}
-
-export interface ResolvedAgentModelRequest {
-  readonly ref: string;
-  readonly provider: string;
-  readonly id: string;
-}
-
-export interface ResolvedAgentModel {
-  readonly model: Model<Api> | undefined;
-  readonly requested: ResolvedAgentModelRequest | undefined;
-}
-
-function parseAgentModelRef(modelRef: string): ResolvedAgentModelRequest {
-  const normalized = modelRef.trim();
-  if (normalized.length === 0) {
-    throw new Error('Invalid agent model ref: expected a bare model id or "provider/id".');
-  }
-  if (normalized !== modelRef) {
-    throw new Error(`Invalid agent model ref "${modelRef}": remove leading or trailing whitespace.`);
-  }
-
-  const slash = modelRef.indexOf("/");
-  if (slash === -1) {
-    return { ref: modelRef, provider: "anthropic", id: modelRef };
-  }
-
-  const provider = modelRef.slice(0, slash);
-  const id = modelRef.slice(slash + 1);
-  if (provider.length === 0 || id.length === 0 || id.startsWith("/")) {
-    throw new Error(`Invalid agent model ref "${modelRef}": expected "provider/id".`);
-  }
-  return { ref: modelRef, provider, id };
-}
-
-/**
- * Resolve a workflow agent model reference.
- *
- * Omitted refs inherit the host/session default model. Explicit refs are strict:
- * bare model ids keep the original Anthropic shorthand for compatibility, and
- * provider-qualified refs split only on the first slash so provider routers such
- * as OpenRouter can use ids that contain additional slashes.
- */
-export function resolveAgentModel(
-  modelRef: string | undefined,
-  modelRegistry: Pick<ModelRegistry, "find">,
-  hostModel: Model<Api> | undefined,
-): ResolvedAgentModel {
-  if (modelRef === undefined) {
-    return { model: hostModel, requested: undefined };
-  }
-
-  const parsed = parseAgentModelRef(modelRef);
-  const found = modelRegistry.find(parsed.provider, parsed.id);
-  if (!found) {
-    throw new Error(`Agent model "${modelRef}" not found (resolved as ${parsed.provider}/${parsed.id}).`);
-  }
-
-  return { model: found, requested: parsed };
-}
-
-/** Pull the last assistant message's plain text out of a finished session. */
-function lastAssistantText(state: { readonly messages: readonly unknown[] }): string {
-  const messages = state.messages;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const message = messages[i];
-    if (hasRole(message, "assistant")) {
-      return messageTextContent(message).trim();
-    }
-  }
-  return "";
-}
-
-function hasRole(value: unknown, role: string): value is { role: string } {
-  return typeof value === "object" && value !== null && "role" in value && value.role === role;
-}
-
-function messageTextContent(message: unknown): string {
-  if (!hasContentArray(message)) return "";
-  return message.content
-    .filter(isTextPart)
-    .map((part) => part.text)
-    .join("");
-}
-
-function hasContentArray(value: unknown): value is { content: unknown[] } {
-  return typeof value === "object" && value !== null && "content" in value && Array.isArray(value.content);
-}
-
-function isTextPart(value: unknown): value is { type: "text"; text: string } {
-  return typeof value === "object" && value !== null && "type" in value && value.type === "text" && "text" in value && typeof value.text === "string";
-}
-
-async function defaultCreateSession(options: CreateAgentSessionOptions): Promise<{ session: AgentRunnerSession }> {
-  const { session } = await createAgentSession(options);
-  return { session };
-}
-
-function linkSessionAbort(signal: AbortSignal | undefined, session: AgentRunnerSession): () => void {
-  if (!signal) return () => {};
-  if (signal.aborted) {
-    void session.abort();
-    return () => {};
-  }
-  const onAbort = () => {
-    void session.abort();
-  };
-  signal.addEventListener("abort", onAbort, { once: true });
-  return () => signal.removeEventListener("abort", onAbort);
-}
-
-type ToolSessionOptions = Pick<CreateAgentSessionOptions, "tools" | "excludeTools">;
-
-interface ToolSelection {
-  readonly sessionOptions: ToolSessionOptions;
-  readonly fallbackSessionOptions: ToolSessionOptions;
-  readonly activeTools?: readonly string[];
-  readonly toolHints: NonNullable<AgentOptions["toolHints"]>;
-}
-
-interface DynamicToolSession extends AgentRunnerSession {
-  getAllTools(): readonly AgentRunnerToolInfo[];
-  setActiveToolsByName(toolNames: readonly string[]): void;
-}
-
-function buildToolList(opts: AgentOptions, skillsEnabled: boolean, fallback?: readonly string[]): string[] | undefined {
-  const allow = opts.tools ? [...opts.tools] : fallback ? [...fallback] : undefined;
-  if (!allow) return undefined;
-  if (skillsEnabled && !allow.includes("read")) allow.push("read");
-  if (opts.schema && !allow.includes(FINAL_TOOL)) allow.push(FINAL_TOOL);
-  return allow;
-}
-
-function buildToolSelection(opts: AgentOptions, skillsEnabled: boolean): ToolSelection {
-  const toolHints = opts.toolHints ?? [];
-  const fallback = toolHints.includes("search") ? DEFAULT_SEARCH_BASE_TOOLS : undefined;
-  const activeTools = buildToolList(opts, skillsEnabled, fallback);
-  const strictSessionOptions = { tools: activeTools ? [...activeTools] : undefined };
-
-  if (toolHints.length === 0) {
-    return { sessionOptions: strictSessionOptions, fallbackSessionOptions: strictSessionOptions, activeTools, toolHints };
-  }
-
-  const explicitlyActive = new Set(activeTools ?? []);
-  return {
-    sessionOptions: { excludeTools: BUILTIN_TOOL_NAMES.filter((name) => !explicitlyActive.has(name)) },
-    // If dynamic tool APIs are unavailable, fail closed to the concrete tools we
-    // already know instead of keeping every extension/custom tool active.
-    fallbackSessionOptions: { tools: activeTools ? [...activeTools] : [] },
-    activeTools,
-    toolHints,
-  };
-}
-
-function hasDynamicToolApis(session: AgentRunnerSession): session is DynamicToolSession {
-  return typeof session.getAllTools === "function" && typeof session.setActiveToolsByName === "function";
-}
-
-function applyDynamicToolHints(session: AgentRunnerSession, selection: ToolSelection): boolean {
-  if (selection.toolHints.length === 0) return true;
-  if (!hasDynamicToolApis(session)) return false;
-
-  const active = new Set(selection.activeTools ?? []);
-  for (const tool of session.getAllTools()) {
-    if (matchesToolHints(tool, selection.toolHints)) active.add(tool.name);
-  }
-  session.setActiveToolsByName([...active]);
-  return true;
-}
-
-function matchesToolHints(tool: AgentRunnerToolInfo, toolHints: readonly string[]): boolean {
-  return toolHints.some((hint) => hint === "search" && isSearchLikeTool(tool));
-}
-
-function isSearchLikeTool(tool: AgentRunnerToolInfo): boolean {
-  if (isClearlyMutatingToolName(tool.name)) return false;
-  const name = tool.name.toLowerCase();
-  if (name.includes("grep") || name.includes("find") || name.includes("search") || name === "rg" || name.includes("ripgrep")) return true;
-  const description = tool.description?.toLowerCase() ?? "";
-  return /\b(?:grep|find|search|ripgrep|rg|structural search|code search)\b/.test(description);
-}
-
-function isClearlyMutatingToolName(name: string): boolean {
-  return /(?:^|[-_])(?:edit|write|replace|patch|apply|delete|remove|move|rename|create|commit|push)(?:$|[-_])/.test(name.toLowerCase());
-}
-
-function shouldCreateSkillResourceLoader(rc: RunContext, prompt: string, opts: AgentOptions): boolean {
-  if (!rc.createSession) return true;
-  if (opts.skills !== undefined) return true;
-  return extractSkillSelectorsFromText(prompt).length > 0;
-}
-
-/**
- * Refuse to start a new subagent once the run is over budget. Called before queueing and
- * again after a queued agent acquires a concurrency slot, so an exhausted run stops spending
- * immediately rather than starting stale queued work.
- *
- * Policy: accept overshoot (matches the built-in Workflow tool). `budget.spent()` counts
- * only COMPLETED agents (usage is recorded on session dispose), so agents admitted together
- * can each pass this check and then collectively overshoot `budget.total` — we tolerate that
- * rather than reserving per-agent estimates. An uncapped run (`budget.total === null`,
- * `remaining()` is Infinity) never throws.
- *
- * Heads-up: a throw here is a recoverable branch failure inside `parallel`/`pipeline`, so the
- * over-budget slot becomes null while already-started siblings can finish. The intended primary
- * usage is the loop guard `while (budget.total && budget.remaining() > N) { await agent(...) }`,
- * where this throw is only a backstop.
- */
-function ensureWithinBudget(budget: WorkflowBudget): void {
-  if (budget.total !== null && budget.remaining() <= 0) {
-    throw new WorkflowBudgetExceededError(budget.total, budget.spent());
-  }
-}
-
-interface AgentWorkspace {
-  readonly cwd: string;
-  wrapResult(result: unknown): Promise<unknown>;
-  dispose(): Promise<void>;
-}
-
-async function createAgentWorkspace(rc: RunContext, opts: AgentOptions, label: string): Promise<AgentWorkspace> {
-  if (opts.isolation !== "worktree") {
-    return {
-      cwd: rc.cwd,
-      async wrapResult(result) {
-        return result;
-      },
-      async dispose() {},
-    };
-  }
-
-  const probe = await rc.worktrees.probe(rc.signal);
-  if (!probe.ok) {
-    throw new Error(`Failed to check git worktree availability for isolated agent: ${probe.error ?? "unknown git error"}`);
-  }
-  if (!probe.inside) {
-    throw new Error("Agent requested worktree isolation, but the workflow cwd is not inside a git work tree.");
-  }
-
-  const added = await rc.worktrees.add(rc.signal);
-  if ("error" in added) throw new Error(`Failed to create isolated worktree: ${added.error}`);
-  const worktreePath = added.path;
-  rc.progress.log(`${label}: using isolated worktree ${worktreePath}`);
-
-  return {
-    cwd: worktreePath,
-    async wrapResult(result) {
-      return await isolatedResult(rc, worktreePath, result);
-    },
-    async dispose() {
-      const removed = await rc.worktrees.remove(worktreePath);
-      if (!removed.ok) {
-        rc.progress.log(`${label}: failed to remove isolated worktree (${removed.error ?? (removed.stderr.trim() || "unknown error")})`);
-      }
-    },
-  };
-}
-
-async function disposeAgentWorkspace(rc: RunContext, label: string, workspace: AgentWorkspace | undefined): Promise<void> {
-  if (!workspace) return;
-  try {
-    await workspace.dispose();
-  } catch (error) {
-    rc.progress.log(`${label}: failed to dispose isolated workspace (${errorMessage(error)})`);
-  }
-}
-
-async function recordJournalResult(rc: RunContext, label: string, key: string, value: unknown): Promise<void> {
-  try {
-    const recorded = await rc.journal.record(key, value);
-    if (!recorded.ok) {
-      rc.progress.log(`${label}: workflow journal write failed (${recorded.error}); future resume may be incomplete`);
-    }
-  } catch (error) {
-    rc.progress.log(`${label}: workflow journal write failed (${errorMessage(error)}); future resume may be incomplete`);
-  }
-}
+import { executeAgentAttempt } from "./agent-attempt.ts";
+import {
+  createAgentReplayPlan,
+  isReplayEnabled,
+  settleAgentAttempt,
+  type AgentReplayPlan,
+} from "./agent-replay.ts";
+import {
+  resolveAgentModel,
+  type ResolvedAgentModel,
+} from "./agent-session.ts";
+import type {
+  AgentExecutionOptions,
+  AgentRunTags,
+  RunContext,
+} from "./agent-runner-types.ts";
+import type { AgentResumeBaseContext } from "./resume-context.ts";
+import { unknownErrorMessage } from "./unknown-error.ts";
+
+export type {
+  AgentExecutionOptions,
+  AgentProgress,
+  AgentRunnerEvent,
+  AgentRunnerSession,
+  AgentRunnerToolInfo,
+  CreateAgentSession,
+  RunContext,
+} from "./agent-runner-types.ts";
+export { resolveAgentModel } from "./agent-session.ts";
+export type { ResolvedAgentModel, ResolvedAgentModelRequest } from "./agent-session.ts";
 
 /**
  * Run one subagent to completion in an isolated in-memory session.
  *
- * Structured output trick: when `opts.schema` is set we register a single
- * terminating tool whose `parameters` IS the schema. The agent's last action is to
- * call it; pi validates the args against the schema, hands them to `execute`, and
- * `terminate: true` ends the turn with no extra LLM round-trip. We capture those
- * validated args in a closure — that captured object is the structured result, so
- * no event-stream parsing is needed.
+ * Session construction, replay validation, and workspace cleanup live in focused
+ * modules; this boundary owns only admission, progress, and the one cache-to-live retry.
  */
-export async function runAgent(rc: RunContext, prompt: string, opts: AgentOptions = {}): Promise<unknown> {
+export async function runAgent(
+  rc: RunContext,
+  prompt: string,
+  opts: AgentExecutionOptions,
+  resumeBaseContext: AgentResumeBaseContext,
+): Promise<unknown> {
   if (typeof prompt !== "string") {
     throw new Error(`agent() prompt must be a string; received ${describeAgentPrompt(prompt)}`);
   }
 
   const label = opts.label ?? "agent";
   const phase = opts.phase ?? "Workflow";
-  const tags = { label, phase };
+  const tags: AgentRunTags = { label, phase };
 
   return await rc.perf.time("agent.total_ms", async () => {
     throwIfAborted(rc.signal);
-    const journalKey = agentJournalKey(prompt, opts);
-    const cached = rc.journal.lookup(journalKey);
-    if (cached.hit) {
-      rc.progress.log(`${label}: using cached result from workflow journal`);
-      rc.perf.counter("agent.cache_hit", 1, tags);
-      await recordJournalResult(rc, label, journalKey, cached.value);
-      return cached.value;
-    }
-    // Stop spending the moment the run is over budget — before queueing.
-    ensureWithinBudget(rc.budget);
-    // Track queued agents before acquiring a global concurrency slot.
+    const model = resolveModel(rc, opts, label);
+    const replay = createAgentReplayPlan(prompt, opts);
+    if (!isReplayEnabled(replay)) assertWorkflowBudgetAvailable(rc.budget);
+
     const rowId = rc.progress.agentQueued(opts.phase, label);
-    let failureHandled = false;
     try {
       return await rc.semaphore.run(
         async () => {
-        throwIfAborted(rc.signal);
-        // Re-check after waiting for a slot; earlier agents may have exhausted the budget.
-        ensureWithinBudget(rc.budget);
-        rc.progress.agentStart(opts.phase, label, rowId);
-
-        let captured: unknown = null;
-        let failed = false;
-        let session: AgentRunnerSession | undefined;
-        let usageRecorded = false;
-        let unsubscribe: (() => void) | undefined;
-        let workspace: AgentWorkspace | undefined;
-        const recordUsage = (activeSession: AgentRunnerSession): void => {
-          if (usageRecorded) return;
-          usageRecorded = true;
-          rc.usage.recordAgentSession({ label, phase, messages: activeSession.state.messages });
-        };
-        const customTools: ToolDefinition[] = opts.schema
-          ? [
-              defineTool({
-                name: FINAL_TOOL,
-                label: "Final Answer",
-                description:
-                  "Return your final structured answer. This MUST be your last action — do not write a normal reply after calling it.",
-                parameters: opts.schema,
-                async execute(_toolCallId, params) {
-                  captured = params;
-                  return { content: [{ type: "text", text: "Recorded." }], details: params, terminate: true };
-                },
-              }),
-            ]
-          : [];
-
-        try {
-          workspace = await createAgentWorkspace(rc, opts, label);
-          const agentCwd = workspace.cwd;
-
-          const { model } = resolveAgentModel(opts.model, rc.modelRegistry, rc.hostModel);
-          const skillSetup = shouldCreateSkillResourceLoader(rc, prompt, opts)
-            ? await rc.perf.time(
-                "agent.skills_ms",
-                () =>
-                  createAgentSkillResourceLoader({
-                    cwd: agentCwd,
-                    prompt,
-                    skills: opts.skills,
-                    log: (message) => rc.progress.log(`${label}: ${message}`),
-                  }),
-                tags,
-              )
-            : undefined;
-          const selectedSkills = skillSetup?.selectedSkills ?? [];
-          // When the workflow restricts tools, keep the terminating tool visible.
-          // Skill opt-ins also need read so the subagent can load SKILL.md on demand.
-          const toolSelection = buildToolSelection(opts, selectedSkills.length > 0);
-
-          const createSessionForRun = rc.createSession ?? defaultCreateSession;
-          const createSubagentSession = (sessionOptions: ToolSessionOptions) =>
-            rc.perf.time(
-              "agent.create_session_ms",
-              () =>
-                createSessionForRun({
-                  cwd: agentCwd,
-                  model,
-                  modelRegistry: rc.modelRegistry as ModelRegistry,
-                  thinkingLevel: opts.thinkingLevel,
-                  tools: sessionOptions.tools,
-                  excludeTools: sessionOptions.excludeTools,
-                  customTools,
-                  resourceLoader: skillSetup?.resourceLoader,
-                  sessionManager: SessionManager.inMemory(agentCwd),
-                }),
-              tags,
-            );
-
           throwIfAborted(rc.signal);
-          let created = await createSubagentSession(toolSelection.sessionOptions);
-          session = created.session;
-          let activeSession = session;
-          if (!applyDynamicToolHints(activeSession, toolSelection)) {
-            rc.progress.log(`${label}: dynamic tool hints unavailable; falling back to concrete tools only`);
-            rc.perf.counter("agent.tool_hint_fallback", 1, tags);
-            const dynamicSession = activeSession;
-            session = undefined;
-            rc.perf.timeSync("agent.dispose_ms", () => dynamicSession.dispose(), tags);
-            throwIfAborted(rc.signal);
-            created = await createSubagentSession(toolSelection.fallbackSessionOptions);
-            session = created.session;
-            activeSession = session;
+          if (!isReplayEnabled(replay)) assertWorkflowBudgetAvailable(rc.budget);
+          rc.progress.agentStart(opts.phase, label, rowId);
+          if (replay.kind === "disabled") {
+            rc.progress.log(`${label}: resume disabled for this call (${replay.reason})`);
           }
-          throwIfAborted(rc.signal);
-
-          unsubscribe = activeSession.subscribe((event) => {
-            if (event.type === "tool_execution_start" && event.toolName !== undefined && event.toolName !== FINAL_TOOL) {
-              rc.progress.agentTool(label, event.toolName, rowId);
-            }
-          });
-
-          const promptedWithSkills = appendSkillReminder(prompt, selectedSkills);
-          const finalPrompt = opts.schema
-            ? `${promptedWithSkills}\n\nWhen finished, return your result by calling the ${FINAL_TOOL} tool.`
-            : promptedWithSkills;
-          throwIfAborted(rc.signal);
-          const unlinkPromptAbort = linkSessionAbort(rc.signal, activeSession);
-          try {
-            await rc.perf.time("agent.prompt_ms", () => activeSession.prompt(finalPrompt), tags);
-            if (opts.schema) {
-              for (let attempt = 0; captured === null && attempt < SCHEMA_REPROMPT_ATTEMPTS; attempt++) {
-                throwIfAborted(rc.signal);
-                rc.progress.log(`${label}: no final answer; re-prompting (${attempt + 1}/${SCHEMA_REPROMPT_ATTEMPTS})`);
-                rc.perf.counter("agent.structured_reprompt", 1, tags);
-                await rc.perf.time("agent.prompt_ms", () => activeSession.prompt(SCHEMA_REPROMPT), tags);
-              }
-            }
-          } finally {
-            unlinkPromptAbort();
-          }
-          recordUsage(activeSession);
-          throwIfAborted(rc.signal);
 
-          const rawResult = rc.perf.timeSync(
-            "agent.extract_result_ms",
-            () => {
-              if (opts.schema) {
-                if (captured === null) {
-                  rc.progress.log(`${label}: no structured answer returned`);
-                  rc.perf.counter("agent.structured_missing", 1, tags);
-                }
-                return captured;
-              }
-              return lastAssistantText(activeSession.state);
-            },
-            tags,
-          );
-          const result = await workspace.wrapResult(rawResult);
-          await recordJournalResult(rc, label, journalKey, result);
-          return result;
-        } catch (error) {
-          failed = true;
-          failureHandled = true;
-          rc.progress.agentFailed(label, error, rowId);
-          rc.progress.log(`${label} failed: ${error instanceof Error ? error.message : String(error)}`);
-          throw error;
-        } finally {
-          const disposable = session;
-          if (disposable) {
-            recordUsage(disposable);
-            rc.perf.timeSync(
-              "agent.dispose_ms",
-              () => {
-                unsubscribe?.();
-                disposable.dispose();
-              },
+          let attemptPlan: AgentReplayPlan = replay;
+          while (true) {
+            const outcome = await executeAgentAttempt({
+              rc,
+              prompt,
+              opts,
+              resumeBaseContext,
+              model,
+              replay: attemptPlan,
+              label,
+              rowId,
               tags,
-            );
+            });
+            const settlement = await settleAgentAttempt({ rc, label, tags, replay: attemptPlan, outcome });
+            if (settlement.kind === "retry-live") {
+              attemptPlan = { kind: "off" };
+              continue;
+            }
+            rc.progress.agentDone(label, rowId);
+            return settlement.result;
           }
-          await disposeAgentWorkspace(rc, label, workspace);
-          if (!failed) rc.progress.agentDone(label, rowId);
-        }
         },
-        { onQueueWaitMs: (durationMs) => rc.perf.observe("agent.queue_wait_ms", durationMs, tags), signal: rc.signal },
+        {
+          onQueueWaitMs: (durationMs) => rc.perf.observe("agent.queue_wait_ms", durationMs, tags),
+          signal: rc.signal,
+        },
       );
     } catch (error) {
-      if (!failureHandled) {
-        rc.progress.agentFailed(label, error, rowId);
-        rc.progress.log(`${label} failed: ${error instanceof Error ? error.message : String(error)}`);
-      }
+      rc.progress.agentFailed(label, error, rowId);
+      rc.progress.log(`${label} failed: ${unknownErrorMessage(error)}`);
       throw error;
     }
   }, tags);
 }
 
-async function isolatedResult(rc: RunContext, worktreePath: string, result: unknown): Promise<{ readonly result: unknown; readonly patch: string; readonly changed: boolean }> {
-  const patch = await rc.worktrees.capturePatch(worktreePath, rc.signal);
-  if ("error" in patch) throw new Error(`Failed to capture isolated worktree patch: ${patch.error}`);
-  return { result, patch: patch.patch, changed: patch.changed };
+function resolveModel(
+  rc: RunContext,
+  opts: AgentExecutionOptions,
+  label: string,
+): ResolvedAgentModel["model"] {
+  try {
+    return resolveAgentModel(opts.model, rc.modelRegistry, rc.hostModel).model;
+  } catch (error) {
+    rc.progress.agentFailed(label, error);
+    throw error;
+  }
 }
 
 function describeAgentPrompt(value: unknown): string {
@@ -562,7 +121,3 @@ function describeAgentPrompt(value: unknown): string {
   if (Array.isArray(value)) return "array";
   return typeof value;
 }
-
-function errorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}