@hicaru/pi-rlm 0.1.9 → 0.2.1

package/src/core/answer.ts

@@ -37,13 +37,14 @@ export function formatReplOutputs(results: readonly ReplResult[], skippedBlocks
     return "No ```repl``` block found in your response. Write one to interact with the REPL.";
   }
   const multi = results.length > 1;
-  const parts: string[] = [];
+  const parts = new Array<string>(results.length);
   let hadElision = false;
-  for (const [i, r] of results.entries()) {
+  for (let i = 0; i < results.length; i++) {
+    const r = results[i];
     const head = multi ? `[block ${i + 1}]\n` : "";
     const { text, elided } = formatStdout(r);
     hadElision ||= elided;
-    parts.push(`${head}${text}${formatStderr(r)}`);
+    parts[i] = `${head}${text}${formatStderr(r)}`;
   }
   const body = parts.join("\n\n");
   const skipNote = skippedBlocks > 0

package/src/core/artifacts.ts

@@ -6,6 +6,7 @@ import { execFileSync } from "node:child_process";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import type { Result } from "../util/errors.ts";
+import { errorMessage } from "../util/errors.ts";
 
 export const ARTIFACTS_DIR = ".rlm/artifacts";
 
@@ -59,7 +60,7 @@ export function captureGoal(cwd: string, brief: string): GoalCaptureResult {
     writeFileSync(join(cwd, baselinePath), JSON.stringify({ paths }, null, 2), "utf-8");
     return { ok: true, value: { goalPath, baselinePath } };
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+    const message = errorMessage(err);
     return { ok: false, error: message };
   }
 }
@@ -72,7 +73,7 @@ export function saveArtifact(cwd: string, dir: string, slug: string, content: st
     writeFileSync(join(cwd, rel), content, "utf-8");
     return { ok: true, path: rel };
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+    const message = errorMessage(err);
     return { ok: false, error: message };
   }
 }
@@ -82,7 +83,7 @@ export function readArtifact(cwd: string, relPath: string): Result<string, strin
   try {
     return { ok: true, value: readFileSync(join(cwd, relPath), "utf-8") };
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+    const message = errorMessage(err);
     return { ok: false, error: `could not read artifact ${relPath}: ${message}` };
   }
 }

package/src/core/engine.ts

@@ -17,9 +17,11 @@ import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
 import { buildInteractiveHandlers } from "../bridge/interactive.ts";
 import { buildLibraryHandler } from "../bridge/library.ts";
 import { mergeLibraryIntoContext } from "../context/library-context.ts";
-import { createLlmBridge } from "../bridge/llm-query.ts";
+import {
+  createSubcallHandlers,
+  type Invocation,
+} from "../bridge/subcall-handlers.ts";
 import { type ChatMsg, modelComplete } from "../bridge/model.ts";
-import { createRlmHandlers } from "../bridge/rlm-query.ts";
 import { resolveModelId } from "../config/settings.ts";
 import { buildRlmSystemPrompt } from "../prompts/system.ts";
 import { buildTurnPrompt, FINALIZE_PROMPT } from "../prompts/user.ts";
@@ -27,24 +29,14 @@ import { phaseGuidance } from "../prompts/phases.ts";
 import type { RlmEmitter } from "../tool/rlm-events.ts";
 import { PythonSandbox } from "../sandbox/sandbox.ts";
 import {
-  advancePhase as validatePhaseTransition,
-  initialPhaseState,
-  isPhase,
   phaseGatePrompt,
-  PHASES,
-  reconcilePhase,
-  routeAfterValidate,
-  stageForArtifactKind,
-  STAGES,
-  type ArtifactRef,
   type Phase,
   type PhaseState,
-  type SavedArtifact,
   type StageGateData,
 } from "./pipeline.ts";
-import { critiqueArtifact, formatCritique } from "./critique.ts";
+import { PipelineController } from "./pipeline-handlers.ts";
 import type { ValidationGateData } from "./gates.ts";
-import { captureGoal, readArtifact, saveArtifact, type GoalCapture } from "./artifacts.ts";
+import { captureGoal, type GoalCapture } from "./artifacts.ts";
 import { previewStdout, previewText } from "../text/preview.ts";
 import { contextLength, contextSizeStats, contextTypeLabel } from "../text/tokens.ts";
 import { finalAnswerOf, formatReplOutputs, latestAnswerContentOf, turnHadError } from "./answer.ts";
@@ -67,6 +59,14 @@ import { STATE_SCHEMA_VERSION } from "../state/rows.ts";
 import type { PhaseRow, RunHeader } from "../state/rows.ts";
 import { serializeForSandbox, type ContextBundle } from "../context/repomix-context.ts";
 import { formatError } from "../util/errors.ts";
+import { createSubcallGates, type SubcallGates } from "../util/concurrency.ts";
+
+/**
+ * Grace period for detached sub-calls to settle before the run disposes its sandbox.
+ * Past it the abort signal (or process exit) is what stops them; waiting longer would
+ * hold a finished run open on work whose result nobody can receive.
+ */
+const DETACHED_SETTLE_MS = 5_000;
 
 
 export interface EngineDeps extends InteractiveDeps {
@@ -75,6 +75,8 @@ export interface EngineDeps extends InteractiveDeps {
   readonly registry: ModelRegistry;
   readonly config: RlmConfig;
   readonly limits?: Limits;
+  /** Session-wide sub-call admission, shared with the repl() tool. Private one if omitted. */
+  readonly gates?: SubcallGates;
   readonly signal?: AbortSignal;
   /** Live RlmDetails reporting via onUpdate. Required — replaces SubcallObserver. */
   readonly emitter: RlmEmitter;
@@ -181,57 +183,65 @@ export function createEngine(deps: EngineDeps): RunRlm {
       maxErrors: deps.limits?.maxErrors,
       maxTokens: deps.limits?.maxTokens,
     }, input.resume?.usageSeed.durationMs ?? 0);
-    const remainingBudget = (): { readonly budgetUsd?: number; readonly timeoutMs?: number } => ({
-      budgetUsd: limits.remainingBudgetUsd(),
-      timeoutMs: limits.remainingTimeoutMs(),
-    });
 
-    const llm = createLlmBridge({
-      workerModel: deps.workerModel,
-      registry: deps.registry,
-      subSystem: deps.config.subSystemPrompt,
-      maxPromptChars: deps.config.maxPromptChars,
-      maxConcurrent: deps.config.maxConcurrentSubcalls,
-      sampling: deps.config.subSampling,
-      signal: deps.signal,
-      onUsage: (u) => {
-        limits.addUsage(u);
-        deps.onUsage?.(u, "sub");
-      },
+    // One Invocation for the whole run: this engine owns exactly one sandbox at one depth,
+    // and its emitter and LimitGuard outlive every sub-call it services — including
+    // detached ones, which is why the headless path needs no session registry.
+    const invocation: Invocation = {
       emitter,
       parentId: selfReportId,
       depth: input.depth,
-      remainingBudget,
-    });
-    const rlm = createRlmHandlers({
-      run,
-      llm,
-      emitter,
-      maxDepth: deps.config.maxDepth,
-      maxConcurrent: deps.config.maxConcurrentSubcalls,
-      parentNodeId: selfReportId,
-      remainingBudget,
-      onChildUsage: (costUsd, inputTokens, outputTokens) => {
-        limits.addRaw(costUsd, inputTokens, outputTokens);
+      limits: {
+        remainingBudgetUsd: () => limits.remainingBudgetUsd(),
+        remainingTimeoutMs: () => limits.remainingTimeoutMs(),
+        addUsage: (u) => {
+          limits.addUsage(u);
+          deps.onUsage?.(u, "sub");
+        },
+        addRaw: (costUsd, inputTokens, outputTokens) => {
+          limits.addRaw(costUsd, inputTokens, outputTokens);
+        },
+      },
+    };
+    // Detached work must not outlive the sandbox we dispose in `finally`: track it so the
+    // run can settle or abort it first (a child engine left running would keep spending).
+    let detachedInFlight = 0;
+    let detachedIdle: (() => void) | undefined;
+    const subcalls = createSubcallHandlers({
+      resolve: () => invocation,
+      gates: deps.gates ?? createSubcallGates(deps.config.maxConcurrentSubcalls),
+      registry: deps.registry,
+      getWorkerModel: () => deps.workerModel,
+      getModel: () => model,
+      getConfig: () => deps.config,
+      signal: deps.signal,
+      runChild: run,
+      trackDetached: async (task) => {
+        detachedInFlight += 1;
+        try {
+          return await task();
+        } finally {
+          detachedInFlight -= 1;
+          if (detachedInFlight === 0) detachedIdle?.();
+        }
       },
     });
+    /** Wait (bounded) for detached work before the sandbox goes away. */
+    const settleDetached = async (): Promise<void> => {
+      if (detachedInFlight === 0) return;
+      await new Promise<void>((resolve) => {
+        detachedIdle = resolve;
+        setTimeout(resolve, DETACHED_SETTLE_MS).unref?.();
+      });
+      detachedIdle = undefined;
+    };
     let sandbox: PythonSandbox | undefined;
     let best = "";
     let lastAnswer = "";
     let compactions = 0;
     let completedTurns = 0;
-    let phaseState: PhaseState | undefined;
-    /**
-     * Latest save per phase: path + optional gate memo (single record so they cannot desync).
-     * Invalidated by clearLastSaved on phase exit / loop-back.
-     */
-    let lastSaved: Partial<Record<Phase, SavedArtifact>> = {};
-    /** Advisory warnings accumulated from save_artifact critiques (TUI). */
-    let pipelineWarnings: string[] = [];
-    /** Serviced ask_user_question rounds in the current phase (session-only; reset on transition). */
-    let askRoundsThisPhase = 0;
-    let pendingHistoryReset: ChatMsg[] | undefined;
-    let goal: GoalCapture | undefined;
+    /** Owns all pipeline state (phase, per-phase latest save, ask rounds, pending reset). */
+    let pipeline: PipelineController | undefined;
     let nodeStatus: "done" | "error" = "done";
     let persistOn = persist;
     if (persist && deps.runState && !input.resume && runId) {
@@ -284,13 +294,6 @@ export function createEngine(deps: EngineDeps): RunRlm {
       if (!ok) persistOn = false;
     };
 
-    /** Clear lastSaved so a re-entered stage cannot re-gate with a stale artifact. */
-    const clearLastSaved = (...phases: readonly Phase[]): void => {
-      const next: Partial<Record<Phase, SavedArtifact>> = { ...lastSaved };
-      for (const p of phases) delete next[p];
-      lastSaved = next;
-    };
-
     try {
       const pipelineOn = input.depth === 0 && deps.config.pipeline;
       const meta = {
@@ -309,111 +312,22 @@ export function createEngine(deps: EngineDeps): RunRlm {
         libraryLoader: deps.config.libraryLoader,
       });
 
-      const phaseHandlers = pipelineOn
-        ? {
-            saveArtifact: async (kind: string, content: string): Promise<string> => {
-              const stage = stageForArtifactKind(kind);
-              if (stage === undefined) {
-                return formatError(`unknown artifact kind '${kind}' (valid: clarification, research, plan, validation)`);
-              }
-              const current = phaseState?.current ?? PHASES[0];
-              if (stage.phase !== current) {
-                return formatError(
-                  `artifact kind '${kind}' belongs to phase '${stage.phase}', but the pipeline is in '${current}'`,
-                );
-              }
-              const saved = saveArtifact(runCwd, stage.artifactDir, kind, content);
-              if (!saved.ok) return formatError(saved.error);
-              // Preflight: run the SAME gate advance_phase will run, now instead of a turn later.
-              const critique = critiqueArtifact(stage, content, saved.path, runCwd);
-              // One assignment: path + optional gate memo (undefined when gate failed).
-              lastSaved = {
-                ...lastSaved,
-                [stage.phase]: Object.freeze({
-                  path: saved.path,
-                  gateData: critique.gateData,
-                }),
-              };
-              if (critique.warnings.length > 0) {
-                const next = new Array<string>(pipelineWarnings.length + critique.warnings.length);
-                for (let i = 0; i < pipelineWarnings.length; i++) next[i] = pipelineWarnings[i];
-                for (let i = 0; i < critique.warnings.length; i++) {
-                  next[pipelineWarnings.length + i] = critique.warnings[i];
-                }
-                pipelineWarnings = next;
-                emitter.emitWarnings(Object.freeze([...pipelineWarnings]));
-              }
-              return `ok — saved ${saved.path}.\n${formatCritique(critique)}`;
-            },
-            advancePhase: async (phase: string, summary: string | undefined): Promise<string> => {
-              const current = phaseState?.current ?? PHASES[0];
-              const outcome = validatePhaseTransition(current, phase);
-              if (!outcome.ok) return formatError(outcome.error);
-
-              // Clarify interview gate: engine counts serviced ask_user_question rounds
-              // (un-gameable — the model cannot advance without having actually asked).
-              if (current === "clarify" && askRoundsThisPhase === 0) {
-                return formatError(
-                  "clarify requires at least one ask_user_question round — interview the user before advancing",
-                );
-              }
-
-              // GATE: measure the CURRENT stage's latest save only (never fall back to
-              // phaseState.artifacts — those are completed-channel paths and may be stale
-              // across a corrective loop). Prefer the memo filled by save_artifact.
-              const stage = STAGES[current];
-              const savedEntry = lastSaved[current];
-              const artifactPath = savedEntry?.path;
-              if (stage.artifactDir !== "" && artifactPath === undefined) {
-                return formatError(
-                  `phase '${current}' has no saved artifact — call save_artifact("${stage.artifactKind}", content) first`,
-                );
-              }
-              let gateData: StageGateData | undefined;
-              if (stage.artifactDir !== "" && artifactPath !== undefined) {
-                if (savedEntry?.gateData !== undefined) {
-                  gateData = savedEntry.gateData;
-                } else {
-                  const content = readArtifact(runCwd, artifactPath);
-                  if (!content.ok) return formatError(content.error);
-                  const gate = stage.gate(content.value, artifactPath, runCwd);
-                  if (!gate.ok) return formatError(gate.error);
-                  gateData = gate.value;
-                  lastSaved = {
-                    ...lastSaved,
-                    [current]: Object.freeze({ path: artifactPath, gateData }),
-                  };
-                }
-              }
-
-              // Transition accepted: persist row, schedule root history reset (fresh session).
-              const prevArtifacts = phaseState?.artifacts ?? {};
-              const nextArtifacts: Partial<Record<Phase, ArtifactRef>> = { ...prevArtifacts };
-              if (artifactPath !== undefined) {
-                nextArtifacts[current] = Object.freeze({ path: artifactPath, status: "active" });
-              }
-              phaseState = {
-                current: outcome.phase,
-                advancedAt: completedTurns,
-                summary,
-                artifacts: nextArtifacts,
-                backwardJumps: phaseState?.backwardJumps ?? 0,
-              };
-              await persistPhaseRow(phaseState, artifactPath, artifactPath !== undefined ? current : undefined, gateData);
-              clearLastSaved(current);
-              askRoundsThisPhase = 0;
-              pendingHistoryReset = resetHistoryForPhase(system, phaseState, { goal });
-              return `ok — phase advanced to '${outcome.phase}' (was '${current}'${summary ? `, summary: ${summary.slice(0, 80)}` : ""})`;
-            },
-          }
-        : {};
+      pipeline = new PipelineController({
+        runCwd,
+        maxBackwardJumps: deps.config.maxBackwardJumps,
+        emitter,
+        completedTurns: () => completedTurns,
+        resetHistoryForPhase: (state, options) => resetHistoryForPhase(system, state, options),
+        persistPhaseRow,
+      });
+      const phaseHandlers = pipelineOn ? pipeline.handlers() : {};
       const baseAsk = deps.config.askUserQuestion ? deps.onAskUserQuestion : undefined;
       const interactiveHandlers = buildInteractiveHandlers({
         onAskUserQuestion: baseAsk
           ? async (questions) => {
               const answers = await baseAsk(questions);
               // Count only successfully serviced root-depth rounds (handler already rejects depth>0).
-              askRoundsThisPhase++;
+              pipeline?.noteAskRound();
               return answers;
             }
           : undefined,
@@ -471,9 +385,10 @@ export function createEngine(deps: EngineDeps): RunRlm {
         signal: deps.signal,
         initTimeoutMs: deps.config.sandboxInitTimeoutMs,
         maxPromptChars: deps.config.maxPromptChars,
+        awaitTimeoutS: Math.round(deps.config.requestTimeoutMs / 1000),
         // Pipeline at depth 0 is read-only: guard open() write modes in the worker.
         readOnly: pipelineOn,
-        handlers: { ...llm, ...rlm, ...phaseHandlers, ...interactiveHandlers, ...libraryHandlers },
+        handlers: { ...subcalls, ...phaseHandlers, ...interactiveHandlers, ...libraryHandlers },
       });
 
       let history: ChatMsg[] = input.resume ? input.resume.history : [{ role: "system", content: system }];
@@ -484,43 +399,14 @@ export function createEngine(deps: EngineDeps): RunRlm {
         best = input.resume.best;
         compactions = input.resume.compactions;
         completedTurns = input.resume.completedTurns;
-        if (input.resume.phase) {
-          const resumePhase = input.resume.phase;
-          const artifacts: Partial<Record<Phase, ArtifactRef>> = {};
-          if (resumePhase.artifacts) {
-            for (const [k, v] of Object.entries(resumePhase.artifacts)) {
-              if (v !== undefined && isPhase(k)) {
-                artifacts[k] = Object.freeze({
-                  path: v.path,
-                  status: v.superseded ? "superseded" as const : "active" as const,
-                });
-              }
-            }
-          }
-          phaseState = {
-            current: reconcilePhase(resumePhase.current),
-            advancedAt: resumePhase.advancedAt,
-            summary: resumePhase.summary,
-            artifacts,
-            backwardJumps: resumePhase.backwardJumps ?? 0,
-          };
-          // lastSaved is session-only: never rehydrate from trail (would re-gate stale
-          // plan/validation after loop-back / mid-stage resume without a fresh save).
-          lastSaved = {};
-          // askRoundsThisPhase is session-only (like lastSaved): a resume mid-clarify
-          // restarts the interview count so the model must ask again in this process.
-          askRoundsThisPhase = 0;
-        }
+        if (input.resume.phase) pipeline.seedFromResume(input.resume.phase);
       } else if (pipelineOn) {
         // Goal capture (script, no LLM) + seed phase state + fresh history.
         const captured = captureGoal(runCwd, input.rootPrompt);
-        let goalNotice: string | undefined;
-        if (captured.ok) {
-          goal = captured.value;
-        } else {
-          // Fail-soft: fold into the first reset message (never console — corrupts TUI).
-          goalNotice = `Note: goal artifact could not be written (${captured.error}); the brief remains only in the system prompt.`;
-        }
+        // Fail-soft: fold the failure into the first reset message (never console — corrupts TUI).
+        const goalNotice = captured.ok
+          ? undefined
+          : `Note: goal artifact could not be written (${captured.error}); the brief remains only in the system prompt.`;
         // Clarify only when interviews are enabled AND the host wired a callback.
         // Config alone is not enough: without onAskUserQuestion every ask throws and
         // the run would burn maxIterations stuck at clarify (askRounds stays 0).
@@ -528,8 +414,7 @@ export function createEngine(deps: EngineDeps): RunRlm {
           deps.config.askUserQuestion && deps.onAskUserQuestion !== undefined
             ? "clarify"
             : "research";
-        phaseState = initialPhaseState(0, startPhase);
-        history = resetHistoryForPhase(system, phaseState, { goal, notice: goalNotice });
+        history = pipeline.seedFresh(startPhase, captured.ok ? captured.value : undefined, goalNotice);
       }
 
       // Context: serialize ContextBundle to sandbox-ready JSON array, pass raw strings through.
@@ -550,9 +435,9 @@ export function createEngine(deps: EngineDeps): RunRlm {
         else emitter.emitTurn(i + 1, deps.config.maxIterations);
 
         // Apply deferred history reset from a prior advance_phase (fresh session policy).
-        if (pendingHistoryReset !== undefined) {
-          history = pendingHistoryReset;
-          pendingHistoryReset = undefined;
+        const scheduledReset = pipeline.takePendingReset();
+        if (scheduledReset !== undefined) {
+          history = scheduledReset;
           pendingReplOutputs = undefined;
         }
 
@@ -588,7 +473,7 @@ export function createEngine(deps: EngineDeps): RunRlm {
           pendingReplOutputs = undefined;
         }
 
-        const gateMsg = deps.config.pipeline ? phaseGatePrompt(phaseState, completedTurns) : undefined;
+        const gateMsg = deps.config.pipeline ? phaseGatePrompt(pipeline.phase, completedTurns) : undefined;
         const gateUserMsg = gateMsg ? `[${new Date().toISOString()}] ${gateMsg}` : undefined;
         // Phase guidance lives only in resetHistoryForPhase (fresh session) — do not re-inject
         // into every turn prompt (avoids duplication on turn 1 and dead post-transition flags).
@@ -625,79 +510,27 @@ export function createEngine(deps: EngineDeps): RunRlm {
         completedTurns = i + 1;
         const final = finalAnswerOf(turn.results);
         if (final != null) {
-          // Validate-phase finalize: measure THIS turn's validation save only (lastSaved),
-          // never fall back to phaseState.artifacts (stale after a prior loop).
-          if (pipelineOn && phaseState?.current === "validate") {
-            const vPath = lastSaved.validate?.path;
-            if (vPath === undefined) {
-              // Reject finalize — push error into next turn.
-              history.push({ role: "assistant", content: turn.response });
-              pendingReplOutputs = formatError(
-                "finalize rejected — save the validation artifact first via save_artifact(\"validation\", content) with status: ready, blockers_count, and verdict",
-              );
-              continue;
-            }
-            const content = readArtifact(runCwd, vPath);
-            if (!content.ok) {
-              history.push({ role: "assistant", content: turn.response });
-              pendingReplOutputs = formatError(content.error);
-              continue;
-            }
-            const gate = STAGES.validate.gate(content.value, vPath, runCwd);
-            if (!gate.ok) {
-              history.push({ role: "assistant", content: turn.response });
-              pendingReplOutputs = formatError(gate.error);
-              continue;
-            }
-            if (gate.value.kind !== "validation") {
+          // Validate-phase finalize is gated: the controller measures THIS turn's validation
+          // save only, never phase.artifacts (stale after a prior corrective loop).
+          if (pipelineOn && pipeline.phase?.current === "validate") {
+            const outcome = await pipeline.finalizeInValidate(final);
+            if (outcome.kind === "reject") {
               history.push({ role: "assistant", content: turn.response });
-              pendingReplOutputs = formatError("internal: validate gate did not return validation data");
+              pendingReplOutputs = outcome.error;
               continue;
             }
-            const validation = gate.value.validation;
-            const route = routeAfterValidate(
-              validation,
-              phaseState.backwardJumps,
-              deps.config.maxBackwardJumps,
-            );
-            if (route.kind === "loop-back") {
-              // Keep all prior artifacts; mark blueprint as superseded by this validation.
-              // lastSaved is still cleared so the gate must see a genuinely FRESH plan.
-              const prior = phaseState.artifacts.blueprint;
-              const nextArtifacts: Partial<Record<Phase, ArtifactRef>> = {
-                ...phaseState.artifacts,
-                validate: Object.freeze({ path: vPath, status: "active" }),
-              };
-              if (prior !== undefined) {
-                nextArtifacts.blueprint = Object.freeze({
-                  path: prior.path,
-                  status: "superseded",
-                  supersededBy: vPath,
-                });
-              }
-              phaseState = {
-                current: "blueprint",
-                advancedAt: completedTurns,
-                summary: `loop-back: ${validation.blockersCount} blocker(s)`,
-                artifacts: nextArtifacts,
-                backwardJumps: phaseState.backwardJumps + 1,
-              };
-              await persistPhaseRow(phaseState, vPath, "validate", gate.value, prior?.path);
-              clearLastSaved("blueprint", "validate");
-              askRoundsThisPhase = 0;
-              history = resetHistoryForPhase(system, phaseState, { goal, validation });
+            if (outcome.kind === "loop-back") {
+              history = outcome.history;
               pendingReplOutputs = undefined;
-              pendingHistoryReset = undefined;
               continue;
             }
-            if (route.kind === "halt") {
-              const report = `${route.reason}\n\n${final}`;
-              const halted = result(report, i + 1, limits);
+            if (outcome.kind === "halt") {
+              const halted = result(outcome.report, i + 1, limits);
               await recordTerminal("completed", halted);
               lastAnswer = halted.answer;
               return halted;
             }
-            // route.kind === "done" — accept final answer
+            // outcome.kind === "accept" — take the model's final answer
           }
           const done = result(final, i + 1, limits);
           await recordTerminal("completed", done);
@@ -709,9 +542,9 @@ export function createEngine(deps: EngineDeps): RunRlm {
         // Always capture this turn's REPL outputs for the JSONL trail (fidelity).
         const turnReplOutputs = formatReplOutputs(turn.results, turn.skippedBlocks);
         // If advance_phase scheduled a history reset, apply it now (do not pollute fresh history).
-        if (pendingHistoryReset !== undefined) {
-          history = pendingHistoryReset;
-          pendingHistoryReset = undefined;
+        const nextReset = pipeline.takePendingReset();
+        if (nextReset !== undefined) {
+          history = nextReset;
           // Fanout/advance result is already embedded in the reset user message — do not
           // also append raw REPL stdout as a next-turn user message.
           pendingReplOutputs = undefined;
@@ -774,6 +607,7 @@ export function createEngine(deps: EngineDeps): RunRlm {
         if (nodeStatus !== "error" && lastAnswer) emitter.emitAnswer(previewText(lastAnswer));
         emitter.emitStatus(nodeStatus === "error" ? "error" : "done");
       }
+      await settleDetached();
       await sandbox?.dispose();
     }
   };

package/src/core/gates.ts

@@ -135,7 +135,7 @@ export function sectionHasNonEmptyBody(content: string, heading: string): boolea
   const headingRe = new RegExp(`^##\\s+${escapeRegExp(heading)}\\s*$`);
   let inSection = false;
   let seen = false; // first match wins — do not re-enter on a later duplicate heading
-  let body = "";
+  let hasBody = false; // only emptiness matters — never accumulate the body itself
   forEachLineOutsideFences(content, (line) => {
     if (/^##\s+/.test(line)) {
       if (inSection) {
@@ -148,9 +148,9 @@ export function sectionHasNonEmptyBody(content: string, heading: string): boolea
       }
       return;
     }
-    if (inSection) body += `${line}\n`;
+    if (inSection && line.trim().length > 0) hasBody = true;
   });
-  return body.trim().length > 0;
+  return hasBody;
 }
 
 function escapeRegExp(s: string): string {

package/src/core/limits.ts

@@ -13,6 +13,24 @@ export interface Limits {
   readonly maxErrors?: number;
 }
 
+/** Pick the limit caps out of a config (`RlmConfig` satisfies this structurally). */
+export function limitsFromConfig(config: Limits): Limits {
+  return {
+    maxBudgetUsd: config.maxBudgetUsd,
+    maxTimeoutMs: config.maxTimeoutMs,
+    maxTokens: config.maxTokens,
+    maxErrors: config.maxErrors,
+  };
+}
+
+/** Point-in-time totals for a run. */
+export interface UsageSnapshot {
+  readonly inputTokens: number;
+  readonly outputTokens: number;
+  readonly costUsd: number;
+  readonly durationMs: number;
+}
+
 export class LimitError extends Error {
   constructor(
     public readonly kind: "timeout" | "tokens" | "budget" | "errors",
@@ -71,7 +89,7 @@ export class LimitGuard {
     }
   }
 
-  usage() {
+  usage(): UsageSnapshot {
     return {
       inputTokens: this.inputTokens,
       outputTokens: this.outputTokens,