pi-firecode 1.0.2 → 1.0.3

package/dist/index.js

@@ -5,6 +5,9 @@ import { fileURLToPath } from "node:url";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
 // jsonc.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function parseJsonc(text) {
   let output = "";
   let inString = false;
@@ -60,22 +63,15 @@ function seedConfig() {
   }
 }
 function readConfigFile() {
-  let text;
+  let parsed;
   try {
-    text = readFileSync(CONFIG_PATH, "utf8");
+    parsed = parseJsonc(readFileSync(CONFIG_PATH, "utf8"));
   } catch (error) {
     if (error.code === "ENOENT")
       return { raw: {}, fault: { kind: "missing" } };
     return { raw: {}, fault: { kind: "parse", message: error instanceof Error ? error.message : String(error) } };
   }
-  try {
-    const parsed = parseJsonc(text);
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed))
-      return { raw: parsed };
-    return { raw: {}, fault: { kind: "notObject" } };
-  } catch (error) {
-    return { raw: {}, fault: { kind: "parse", message: error instanceof Error ? error.message : String(error) } };
-  }
+  return isRecord(parsed) ? { raw: parsed } : { raw: {}, fault: { kind: "notObject" } };
 }
 
 // i18n.ts
@@ -123,7 +119,6 @@ var msg = defineMessages({
       modelSegment: (value) => `模型段不是 provider/model：${value}`,
       thinkingLevel: (value) => `思考档无效：${value}`,
       modelAtomFaults: (shape, faults) => `${shape}（${faults.join("；")}）`,
-      reviewBackground: "review.background 已随审查子进程层删除，请直接移除该键",
       reviewIncomplete: "请显式完整配置 review",
       reviewReviewers: "review.reviewers 必须包含 1–5 个模型原子",
       reviewToolsArray: "review.tools 必须是字符串数组",
@@ -172,7 +167,6 @@ var msg = defineMessages({
       modelSegment: (value) => `model segment is not provider/model: ${value}`,
       thinkingLevel: (value) => `invalid thinking level: ${value}`,
       modelAtomFaults: (shape, faults) => `${shape} (${faults.join("; ")})`,
-      reviewBackground: "review.background was removed together with the review subprocess layer; delete this key",
       reviewIncomplete: "Configure review explicitly and completely",
       reviewReviewers: "review.reviewers must contain 1–5 model atoms",
       reviewToolsArray: "review.tools must be an array of strings",
@@ -202,6 +196,7 @@ var msg = defineMessages({
 });
 
 // config.ts
+var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
 var FEATURES = [
   "header",
   "statusbar",
@@ -233,11 +228,8 @@ function readFile({ raw, fault }, problems) {
       return {};
   }
 }
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function asRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+  return isRecord(value) ? value : {};
 }
 function rejectUnknownKeys(record, allowed, field, problems) {
   for (const key of Object.keys(record))
@@ -295,7 +287,7 @@ function loadConfig() {
     return cached;
   const blocking = [];
   const raw = readFile(readConfigFile(), blocking);
-  const featuresBroken = raw.features !== undefined && !isPlainObject(raw.features);
+  const featuresBroken = raw.features !== undefined && !isRecord(raw.features);
   if (featuresBroken)
     blocking.push(msg.config.featuresNotObject);
   const features = featuresBroken ? Object.fromEntries(FEATURES.map((feature) => [feature, false])) : asRecord(raw.features);
@@ -315,7 +307,7 @@ function loadConfig() {
     problems.push(msg.config.language);
   const section = (name, refused, parse, incomplete) => {
     const own = [];
-    if (raw[name] !== undefined && !isPlainObject(raw[name]))
+    if (raw[name] !== undefined && !isRecord(raw[name]))
       own.push(msg.config.mustBeObject(name));
     const config = parse(asRecord(raw[name]), own);
     if (features[name] !== false)
@@ -341,15 +333,6 @@ function loadConfig() {
   };
   return cached;
 }
-var THINKING_LEVELS = new Set([
-  "off",
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max"
-]);
 var FALLBACK_THINKING = "medium";
 function parseModelAtom(value, field, problems) {
   const shape = msg.config.modelAtomShape(field);
@@ -361,7 +344,7 @@ function parseModelAtom(value, field, problems) {
   const model = slash > 0 ? value.slice(0, slash) : "";
   const thinking = slash > 0 ? value.slice(slash + 1) : value;
   const providerSlash = model.indexOf("/");
-  const valid = THINKING_LEVELS.has(thinking);
+  const valid = THINKING_LEVELS.includes(thinking);
   const faults = [];
   if (providerSlash <= 0 || providerSlash === model.length - 1)
     faults.push(msg.config.modelSegment(model || value));
@@ -375,14 +358,14 @@ var PRESET_KEYS = ["model", "tools", "instructions", "key"];
 function parsePresets(value, problems) {
   if (value === undefined)
     return {};
-  if (!isPlainObject(value)) {
+  if (!isRecord(value)) {
     problems.push(msg.config.mustBeObject("presets"));
     return {};
   }
   return Object.fromEntries(Object.entries(value).map(([name, raw]) => [name, parsePreset(raw, `presets.${name}`, problems)]));
 }
 function parsePreset(value, field, problems) {
-  if (!isPlainObject(value)) {
+  if (!isRecord(value)) {
     problems.push(msg.config.mustBeObject(field));
     return {};
   }
@@ -394,21 +377,10 @@ function parsePreset(value, field, problems) {
     ...value.key === undefined ? {} : { key: stringValue(value.key, `${field}.key`, problems) }
   };
 }
-var REVIEW_KEYS = new Set([
-  "advisor",
-  "reviewers",
-  "maxRounds",
-  "advisorAfterFailures",
-  "timeoutMinutes",
-  "tools"
-]);
+var REVIEW_KEYS = ["advisor", "reviewers", "maxRounds", "advisorAfterFailures", "timeoutMinutes", "tools"];
 var DEFAULT_TOOLS = ["read", "grep", "find", "ls", "bash"];
 function parseReviewConfig(raw, problems) {
-  for (const key of Object.keys(raw)) {
-    if (REVIEW_KEYS.has(key))
-      continue;
-    problems.push(key === "background" ? msg.config.reviewBackground : msg.config.unknownField(`review.${key}`));
-  }
+  rejectUnknownKeys(raw, REVIEW_KEYS, "review", problems);
   for (const key of REVIEW_KEYS)
     if (key !== "advisor" && key !== "reviewers" && !(key in raw))
       problems.push(msg.config.mustSet(`review.${key}`));
@@ -457,22 +429,17 @@ function parseMasterConfig(raw, problems) {
       problems.push(msg.config.unknownField(`master.${key}`));
   const exclusions = stringArray(raw.workerExcludeExtensions, "master.workerExcludeExtensions", problems);
   const autoActivate = booleanValue(raw.autoActivate, "master.autoActivate", true, problems);
-  if (raw.roles === undefined)
-    return { roles: [], workerExcludeExtensions: exclusions, autoActivate };
-  if (!isPlainObject(raw.roles) || Object.keys(raw.roles).length === 0) {
+  const table = raw.roles;
+  if (table !== undefined && (!isRecord(table) || Object.keys(table).length === 0))
     problems.push(msg.config.masterRoles);
-    return { roles: [], workerExcludeExtensions: exclusions, autoActivate };
-  }
-  const roles = Object.entries(raw.roles).map(([role, value]) => masterRole(value, `master.roles.${role}`, role, problems));
+  const roles = isRecord(table) ? Object.entries(table).map(([role, value]) => masterRole(value, `master.roles.${role}`, role, problems)) : [];
   return { roles, workerExcludeExtensions: exclusions, autoActivate };
 }
 function masterRole(value, field, role, problems) {
   const record = asRecord(value);
   rejectUnknownKeys(record, ["model", "use", "fallback"], field, problems);
   const atom = parseModelAtom(record.model, `${field}.model`, problems);
-  const use = typeof record.use === "string" && record.use ? record.use : "";
-  if (!use)
-    problems.push(msg.config.mustBeString(`${field}.use`));
+  const use = stringValue(record.use, `${field}.use`, problems) ?? "";
   const fallback = masterFallback(record.fallback, `${field}.fallback`, problems);
   return { role, ...atom, use, fallback };
 }
@@ -606,8 +573,8 @@ function flame(cells, phase) {
   return out;
 }
 function settleMark(kind, sinceMs) {
-  const k = easeOut(sinceMs / SETTLE_MS);
-  return kind === "done" ? paint(mix(HEAT_COLORS.orange, HEAT_COLORS.green, k), "✓") : paint(mix(HEAT_COLORS.orange, HEAT_COLORS.fail, k), "✗");
+  const done = kind === "done";
+  return paint(mix(HEAT_COLORS.orange, done ? HEAT_COLORS.green : HEAT_COLORS.fail, easeOut(sinceMs / SETTLE_MS)), done ? "✓" : "✗");
 }
 var settling = (sinceMs) => sinceMs < SETTLE_MS;
 var SPINNER = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏";
@@ -732,8 +699,6 @@ var FADE_FROM = [20, 19, 18];
 var RULE2 = [60, 57, 53];
 var TINY_SUBTITLE_MIN = 8;
 var TINY_RULE_MIN = 3;
-var clamp2 = (value) => Math.min(1, Math.max(0, value));
-var ease = (k) => 1 - (1 - clamp2(k)) ** 3;
 var FLAME = [
   "......#......",
   "......##.....",
@@ -785,12 +750,12 @@ function flameHeat(y) {
   return v < FLAME_RED_END ? mix(HEAT_COLORS.red, HEAT_COLORS.orange, v / FLAME_RED_END) : mix(HEAT_COLORS.orange, HEAT_COLORS.gold, (v - FLAME_RED_END) / (1 - FLAME_RED_END));
 }
 function logo(t) {
-  const flameLine = ease(t / IGNITE_END) * (FLAME.length + 4);
+  const flameLine = easeOut(t / IGNITE_END) * (FLAME.length + 4);
   const wordWidth = WORD_ROWS[0].length;
   const wordEdge = (t - REVEAL_START) / (SETTLE_END - REVEAL_START) * wordWidth;
   return FLAME.map((row, y) => {
     const burnt = flameLine - (FLAME.length - y);
-    const color = mix(HEAT_COLORS.white, flameHeat(y), clamp2(burnt / 4));
+    const color = mix(HEAT_COLORS.white, flameHeat(y), clamp(burnt / 4));
     const pixels = [...row].map((dot) => dot === "#" && burnt >= 0 ? color : undefined);
     pixels.push(...Array(LOGO_GAP).fill(undefined));
     const word = WORD_ROWS[y - WORD_TOP] ?? "";
@@ -812,7 +777,7 @@ function fitSubtitle({ version, cwd }, width) {
   return clip(segments.at(-1) ?? cwd, width, "start");
 }
 function subtitleLine(subtitle, width, t) {
-  return paint(mix(FADE_FROM, HEAT_COLORS.ash, ease((t - 0.4) / 0.6)), fitSubtitle(subtitle, width));
+  return paint(mix(FADE_FROM, HEAT_COLORS.ash, easeOut((t - 0.4) / 0.6)), fitSubtitle(subtitle, width));
 }
 function large(t, subtitle) {
   const rows = halfBlocks(logo(t));
@@ -826,10 +791,10 @@ function tiny(width, t, glyph, subtitle) {
   const room = width - visibleWidth2(word) - 1 - TINY_RULE_MIN;
   const head = room >= TINY_SUBTITLE_MIN ? `${word}${subtitleLine(subtitle, room, t)} ` : word;
   const length = width - visibleWidth2(head);
-  const reveal = clamp2((t - REVEAL_START) / (SETTLE_END - REVEAL_START));
+  const reveal = clamp((t - REVEAL_START) / (SETTLE_END - REVEAL_START));
   let rule = "";
   for (let index = 0;index < length; index++)
-    rule += index / length <= reveal ? paint(mix(HEAT_COLORS.gold, RULE2, ease(index / Math.max(8, length * 0.7))), "─") : " ";
+    rule += index / length <= reveal ? paint(mix(HEAT_COLORS.gold, RULE2, easeOut(index / Math.max(8, length * 0.7))), "─") : " ";
   return clip(head + rule, width, "end", "");
 }
 function center(lines, width) {
@@ -882,8 +847,6 @@ function registerHeader(pi) {
 // provider/claude-sub.ts
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { appendFileSync, mkdirSync as mkdirSync2 } from "node:fs";
-import { dirname as dirname2, resolve } from "node:path";
 
 // provider/messages.ts
 var msg2 = defineMessages({
@@ -912,13 +875,9 @@ var msg2 = defineMessages({
 // provider/claude-sub.ts
 var BILLING_PREFIX = "x-anthropic-billing-header:";
 var FALLBACK_CLAUDE_CODE_VERSION = "2.1.281";
-var DEFAULT_ENTRYPOINT = "cli";
 var BILLING_SALT = "59cf53e54c78";
-function isObject(value) {
-  return typeof value === "object" && value !== null;
-}
 function isTextBlock(value) {
-  return isObject(value) && value.type === "text" && typeof value.text === "string";
+  return isRecord(value) && value.type === "text" && typeof value.text === "string";
 }
 function shouldApply(ctx) {
   const model = ctx.model;
@@ -943,33 +902,16 @@ function detectClaudeCodeVersion() {
 var claudeCodeVersion = detectClaudeCodeVersion();
 function firstUserText(messages) {
   const list = Array.isArray(messages) ? messages : [];
-  const firstUser = list.find((message) => isObject(message) && message.role === "user");
-  return isObject(firstUser) ? textOf(firstUser.content) : "";
+  const firstUser = list.find((message) => isRecord(message) && message.role === "user");
+  return isRecord(firstUser) ? textOf(firstUser.content) : "";
 }
 function versionSuffix(messageText) {
-  const explicit = process.env.PI_CLAUDE_CODE_VERSION_SUFFIX;
-  if (explicit)
-    return explicit;
   const sampled = [4, 7, 20].map((index) => messageText[index] ?? "0").join("");
   return createHash("sha256").update(`${BILLING_SALT}${sampled}${claudeCodeVersion}`).digest("hex").slice(0, 3);
 }
 function buildBillingHeader(messages) {
   const version = `${claudeCodeVersion}.${versionSuffix(firstUserText(messages))}`;
-  const entrypoint = process.env.PI_CLAUDE_CODE_ENTRYPOINT ?? process.env.CLAUDE_CODE_ENTRYPOINT ?? DEFAULT_ENTRYPOINT;
-  const workload = process.env.PI_CLAUDE_CODE_WORKLOAD ?? process.env.CLAUDE_CODE_WORKLOAD;
-  const workloadPart = workload ? ` cc_workload=${workload};` : "";
-  return `${BILLING_PREFIX} cc_version=${version}; cc_entrypoint=${entrypoint}; cch=00000;${workloadPart}`;
-}
-function log(details) {
-  const logFile = process.env.PI_CLAUDE_OAUTH_LOG_FILE;
-  if (!logFile)
-    return;
-  const path = resolve(logFile);
-  try {
-    mkdirSync2(dirname2(path), { recursive: true });
-    appendFileSync(path, `${JSON.stringify({ timestamp: new Date().toISOString(), ...details })}
-`, "utf8");
-  } catch {}
+  return `${BILLING_PREFIX} cc_version=${version}; cc_entrypoint=cli; cch=00000;`;
 }
 function isRevokedTokenFailure(entry) {
   if (entry?.type !== "message" || entry.message.role !== "assistant")
@@ -997,14 +939,13 @@ function registerClaudeSub(pi) {
   });
   pi.on("before_provider_request", (event, ctx) => {
     const payload = event.payload;
-    if (!shouldApply(ctx) || !isObject(payload))
+    if (!shouldApply(ctx) || !isRecord(payload))
       return;
     const { system, messages } = payload;
     const blocks = Array.isArray(system) ? system : [];
     if (blocks.some((block) => isTextBlock(block) && block.text.startsWith(BILLING_PREFIX)))
       return;
     const header = { type: "text", text: buildBillingHeader(messages) };
-    log({ event: "billing_header_injected", header: header.text });
     return { ...payload, system: [header, ...blocks] };
   });
   pi.on("agent_before_settle", (event, ctx) => {
@@ -1021,9 +962,6 @@ function registerClaudeSub(pi) {
 // provider/openai-native/src/config.ts
 import { closeSync, openSync, readFileSync as readFileSync3, renameSync, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
 var TEXT_VERBOSITIES = ["low", "medium", "high"];
-function isRecord(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function isTextVerbosity(value) {
   return typeof value === "string" && TEXT_VERBOSITIES.includes(value);
 }
@@ -1083,11 +1021,8 @@ function replaceKeyedObject(text, key, value) {
   }
   return;
 }
-function openaiRoot(root) {
-  return isRecord(root.openai) ? root.openai : root;
-}
-function isFirecodeConfig(root) {
-  return "openai" in root || "presets" in root || "keys" in root || "features" in root;
+function openaiSection(root) {
+  return isRecord(root.openai) ? root.openai : {};
 }
 function parseProviderSettings(provider, value, warnings) {
   if (!isRecord(value)) {
@@ -1181,17 +1116,10 @@ function acquireConfigLock(lockPath) {
   rmSync(lockPath, { force: true });
   return openSync(lockPath, "wx", 384);
 }
-function writeConfig(configPath, settings, firecodeRoot) {
+function writeConfig(configPath, settings, root) {
   const serialized = serializeSettings(settings);
-  let text;
-  if (firecodeRoot) {
-    const original = readFileSync3(configPath, "utf8");
-    text = replaceKeyedObject(original, "openai", serialized) ?? `${JSON.stringify({ ...firecodeRoot, openai: serialized }, null, "\t")}
-`;
-  } else {
-    text = `${JSON.stringify(serialized, null, 2)}
+  const text = replaceKeyedObject(readFileSync3(configPath, "utf8"), "openai", serialized) ?? `${JSON.stringify({ ...root, openai: serialized }, null, "\t")}
 `;
-  }
   const temporaryPath = `${configPath}.${process.pid}.${crypto.randomUUID()}.tmp`;
   try {
     writeFileSync2(temporaryPath, text, {
@@ -1217,11 +1145,11 @@ function withConfigLock(configPath, action) {
 }
 function loadOpenAINativeSettings(configPath) {
   try {
-    return parseSettings(openaiRoot(readConfig(configPath)));
+    return parseSettings(openaiSection(readConfig(configPath)));
   } catch (error) {
     return {
       settings: createDefaultSettings(),
-      warnings: [`config.json: ${error instanceof Error ? error.message : String(error)}`]
+      warnings: [`config.jsonc: ${error instanceof Error ? error.message : String(error)}`]
     };
   }
 }
@@ -1231,7 +1159,7 @@ function togglePriority(provider, configPath) {
   }
   return withConfigLock(configPath, () => {
     const root = readConfig(configPath);
-    const loaded = parseSettings(openaiRoot(root));
+    const loaded = parseSettings(openaiSection(root));
     const providerSettings = loaded.settings.providers[provider] ?? {};
     const enabled = providerSettings.priority !== true;
     const providers = {
@@ -1251,16 +1179,13 @@ function togglePriority(provider, configPath) {
       nativeCompaction: loaded.settings.nativeCompaction,
       providers
     };
-    writeConfig(configPath, settings, isFirecodeConfig(root) ? root : undefined);
+    writeConfig(configPath, settings, root);
     return {
       enabled,
       loaded: { settings, warnings: loaded.warnings }
     };
   });
 }
-function providerSettings(settings, provider) {
-  return provider ? settings.providers[provider] : undefined;
-}
 
 // provider/openai-native/src/native-compaction.ts
 import { buildSessionContext } from "@earendil-works/pi-coding-agent";
@@ -1269,9 +1194,6 @@ import { buildSessionContext } from "@earendil-works/pi-coding-agent";
 var JSON_CONTENT_TYPE = "application/json";
 var COMPACTION_TRIGGER = { type: "compaction_trigger" };
 var RETAINED_MESSAGE_TOKEN_BUDGET = 64000;
-function isRecord2(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function isAbortError(error) {
   return error instanceof DOMException && error.name === "AbortError" || error instanceof Error && (error.name === "AbortError" || error.name === "ABORT_ERR");
 }
@@ -1287,34 +1209,34 @@ function normalizeResponseTimestamp(value) {
   return Number.isNaN(parsed) ? value.trim() : new Date(parsed).toISOString();
 }
 function errorMessage(value) {
-  if (!isRecord2(value)) {
+  if (!isRecord(value)) {
     return;
   }
   if (typeof value.message === "string" && value.message.trim()) {
     return value.message.trim();
   }
-  if (isRecord2(value.error)) {
+  if (isRecord(value.error)) {
     return errorMessage(value.error);
   }
-  if (isRecord2(value.response)) {
+  if (isRecord(value.response)) {
     return errorMessage(value.response);
   }
   return;
 }
 function providerError(value) {
-  if (!isRecord2(value)) {
+  if (!isRecord(value)) {
     return;
   }
-  if (isRecord2(value.error)) {
+  if (isRecord(value.error)) {
     return value.error;
   }
   return providerError(value.response);
 }
 function parseFailedResponse(value) {
-  if (!isRecord2(value)) {
+  if (!isRecord(value)) {
     return;
   }
-  const response = isRecord2(value.response) ? value.response : value;
+  const response = isRecord(value.response) ? value.response : value;
   if (value.type !== "response.failed" && value.type !== "error" && response.status !== "failed") {
     return;
   }
@@ -1334,10 +1256,10 @@ function parseErrorDetail(responseText) {
   }
 }
 function isOutputArray(value) {
-  return Array.isArray(value) && value.every(isRecord2);
+  return Array.isArray(value) && value.every(isRecord);
 }
 function parseJsonOutput(value) {
-  if (!isRecord2(value) || !isOutputArray(value.output)) {
+  if (!isRecord(value) || !isOutputArray(value.output)) {
     return;
   }
   return { output: value.output, createdAt: value.created_at };
@@ -1358,17 +1280,17 @@ function parseSseOutput(responseText) {
     } catch {
       continue;
     }
-    if (!isRecord2(event)) {
+    if (!isRecord(event)) {
       continue;
     }
-    if (event.type === "response.output_item.done" && isRecord2(event.item)) {
+    if (event.type === "response.output_item.done" && isRecord(event.item)) {
       streamedItems.push(event.item);
       continue;
     }
     if (event.type === "response.completed") {
       completed = parseJsonOutput(event.response) ?? {
         output: [],
-        createdAt: isRecord2(event.response) ? event.response.created_at : undefined
+        createdAt: isRecord(event.response) ? event.response.created_at : undefined
       };
       continue;
     }
@@ -1408,7 +1330,7 @@ function parseResponseOutput(responseText) {
   return sse ? { ok: false, ...sse } : { ok: false, reason: "malformed-response" };
 }
 function isRetainedInputItem(value) {
-  return isRecord2(value) && (value.role === "user" || value.role === "developer" || value.role === "system");
+  return isRecord(value) && (value.role === "user" || value.role === "developer" || value.role === "system");
 }
 function itemText(item) {
   if (typeof item.content === "string") {
@@ -1417,7 +1339,7 @@ function itemText(item) {
   if (!Array.isArray(item.content)) {
     return "";
   }
-  return item.content.filter(isRecord2).map((part) => typeof part.text === "string" ? part.text : "").join("");
+  return item.content.filter(isRecord).map((part) => typeof part.text === "string" ? part.text : "").join("");
 }
 function estimateTokens(item) {
   return Math.max(1, Math.ceil(itemText(item).length / 4));
@@ -1447,14 +1369,14 @@ function decodeJwtPayload(token) {
   }
   try {
     const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-    return isRecord2(payload) ? payload : undefined;
+    return isRecord(payload) ? payload : undefined;
   } catch {
     return;
   }
 }
 function codexAccountId(token) {
   const authClaims = decodeJwtPayload(token)?.["https://api.openai.com/auth"];
-  if (!isRecord2(authClaims) || typeof authClaims.chatgpt_account_id !== "string") {
+  if (!isRecord(authClaims) || typeof authClaims.chatgpt_account_id !== "string") {
     return;
   }
   return authClaims.chatgpt_account_id.trim() || undefined;
@@ -1540,9 +1462,6 @@ async function executeNativeCompaction(args) {
 // provider/openai-native/src/native-details.ts
 var NATIVE_COMPACTION_STRATEGY = "openai-native-compact";
 var NATIVE_COMPACTION_SUMMARY = "[OpenAI native compaction checkpoint]";
-function isRecord3(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function isNonEmptyString(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
@@ -1553,10 +1472,10 @@ function isStructuredValue(value) {
   if (Array.isArray(value)) {
     return value.every(isStructuredValue);
   }
-  return isRecord3(value) && Object.values(value).every(isStructuredValue);
+  return isRecord(value) && Object.values(value).every(isStructuredValue);
 }
 function isCompactedWindowItem(value) {
-  return isRecord3(value) && Object.values(value).every(isStructuredValue);
+  return isRecord(value) && Object.values(value).every(isStructuredValue);
 }
 function hasNativeCompactionIdentity(value) {
   return isNonEmptyString(value.provider) && isNonEmptyString(value.api) && isNonEmptyString(value.model) && isNonEmptyString(value.baseUrl);
@@ -1568,13 +1487,13 @@ function cloneStructuredValue(value) {
   if (Array.isArray(value)) {
     return value.map(cloneStructuredValue);
   }
-  if (isRecord3(value)) {
+  if (isRecord(value)) {
     return Object.fromEntries(Object.entries(value).map(([key, nestedValue]) => [key, cloneStructuredValue(nestedValue)]));
   }
   throw new Error(`Unsupported structured value: ${typeof value}`);
 }
 function isNativeCompactionDetails(value) {
-  if (!isRecord3(value) || value.strategy !== NATIVE_COMPACTION_STRATEGY || !hasNativeCompactionIdentity(value)) {
+  if (!isRecord(value) || value.strategy !== NATIVE_COMPACTION_STRATEGY || !hasNativeCompactionIdentity(value)) {
     return false;
   }
   return Array.isArray(value.compactedWindow) && value.compactedWindow.every(isCompactedWindowItem) && isNonEmptyString(value.createdAt);
@@ -1930,11 +1849,8 @@ function isToolCallBlock(block) {
 }
 
 // provider/openai-native/src/native-replay.ts
-function isRecord4(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function isResponsesInputContentItem(value) {
-  if (!isRecord4(value) || typeof value.type !== "string") {
+  if (!isRecord(value) || typeof value.type !== "string") {
     return false;
   }
   if (value.type === "input_text") {
@@ -1943,7 +1859,7 @@ function isResponsesInputContentItem(value) {
   return value.type === "input_image" && value.detail === "auto" && typeof value.image_url === "string";
 }
 function isResponsesInputMessageItem(value) {
-  if (!isRecord4(value) || value.role !== "user" && value.role !== "developer" && value.role !== "system") {
+  if (!isRecord(value) || value.role !== "user" && value.role !== "developer" && value.role !== "system") {
     return false;
   }
   return typeof value.content === "string" || Array.isArray(value.content) && value.content.every(isResponsesInputContentItem);
@@ -1981,7 +1897,7 @@ function areEquivalentValues(left, right) {
   if (Array.isArray(left) || Array.isArray(right)) {
     return Array.isArray(left) && Array.isArray(right) && left.length === right.length && left.every((item, index) => areEquivalentValues(item, right[index]));
   }
-  if (!isRecord4(left) || !isRecord4(right)) {
+  if (!isRecord(left) || !isRecord(right)) {
     return false;
   }
   const leftKeys = Object.keys(left).sort();
@@ -2306,12 +2222,6 @@ var PRIORITY_MODEL_IDS = new Set([
   "gpt-6.1-sol",
   "gpt-6-luna"
 ]);
-function isRecord5(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function isTextVerbosity2(value) {
-  return value === "low" || value === "medium" || value === "high";
-}
 function isOpenAIResponsesModel(model) {
   return model !== undefined && OPENAI_RESPONSES_APIS.has(model.api);
 }
@@ -2326,24 +2236,24 @@ function fastModeEnabled(model, settings) {
   if (!model || !supportsFastMode(model)) {
     return false;
   }
-  return providerSettings(settings, model.provider)?.priority === true;
+  return settings.providers[model.provider]?.priority === true;
 }
 function resolveTextVerbosity(model, settings, verbosityOverride) {
   if (verbosityOverride !== undefined) {
-    return isTextVerbosity2(verbosityOverride) ? verbosityOverride : undefined;
+    return isTextVerbosity(verbosityOverride) ? verbosityOverride : undefined;
   }
-  return providerSettings(settings, model.provider)?.textVerbosity;
+  return settings.providers[model.provider]?.textVerbosity;
 }
 function applyOpenAIOptions(payload, model, settings, verbosityOverride) {
-  const configuredProvider = model ? providerSettings(settings, model.provider) : undefined;
+  const configuredProvider = model ? settings.providers[model.provider] : undefined;
   let nextPayload = payload;
   if (model && isOpenAIResponsesModel(model)) {
     const textVerbosity = resolveTextVerbosity(model, settings, verbosityOverride);
-    if (textVerbosity && (!isRecord5(payload.text) || payload.text.verbosity !== textVerbosity)) {
+    if (textVerbosity && (!isRecord(payload.text) || payload.text.verbosity !== textVerbosity)) {
       nextPayload = {
         ...nextPayload,
         text: {
-          ...isRecord5(nextPayload.text) ? nextPayload.text : {},
+          ...isRecord(nextPayload.text) ? nextPayload.text : {},
           verbosity: textVerbosity
         }
       };
@@ -2357,12 +2267,9 @@ function applyOpenAIOptions(payload, model, settings, verbosityOverride) {
 }
 
 // provider/openai-native/src/request-pipeline.ts
-function isRecord6(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function rewriteOpenAIProviderRequest(payload, ctx, settings, verbosityOverride) {
   let nextPayload = settings.nativeCompaction ? replayOpenAINative(payload, ctx) ?? payload : payload;
-  if (isRecord6(nextPayload)) {
+  if (isRecord(nextPayload)) {
     nextPayload = applyOpenAIOptions(nextPayload, ctx.model, settings, verbosityOverride);
   }
   return nextPayload;
@@ -2607,20 +2514,21 @@ function describe(preset) {
   return parts.join(" | ");
 }
 function registerPresets(pi) {
-  let presets = {};
+  const { presets } = loadConfig().config;
   let activeName;
-  let activePreset;
   let originalState;
   let applying = false;
   pi.registerFlag("preset", {
     description: msg3.presets.flagDescription,
     type: "string"
   });
-  const updateStatus = (ctx) => ctx.ui.setStatus("preset", activeName && (activePreset?.tools?.length || activePreset?.instructions) ? ctx.ui.theme.fg("accent", title(activeName)) : undefined);
-  const noPresetsHint = (ctx) => ctx.ui.notify(msg3.presets.noneDefined, "warning");
+  const updateStatus = (ctx) => {
+    const active = activePreset();
+    ctx.ui.setStatus("preset", activeName && (active?.tools?.length || active?.instructions) ? ctx.ui.theme.fg("accent", title(activeName)) : undefined);
+  };
+  const activePreset = () => activeName === undefined ? undefined : presets[activeName];
   function setActive(name, ctx) {
     activeName = name;
-    activePreset = name === undefined ? undefined : presets[name];
     if (name === undefined)
       originalState = undefined;
     pi.appendEntry(STATE_ENTRY, { name: name ?? null });
@@ -2637,7 +2545,8 @@ function registerPresets(pi) {
     if (valid.length)
       pi.setActiveTools(valid);
   }
-  async function applyPreset(name, preset, ctx) {
+  async function applyPreset(name, ctx) {
+    const preset = presets[name];
     const snapshot = activeName === undefined ? { model: ctx.model, thinkingLevel: pi.getThinkingLevel(), tools: pi.getActiveTools() } : originalState;
     applying = true;
     const failure = await applyModel(preset, ctx).finally(() => {
@@ -2665,18 +2574,13 @@ function registerPresets(pi) {
     return;
   }
   function dropIfDiverged(ctx) {
-    if (!activeName || !activePreset || holds(activePreset, ctx.model))
+    const active = activePreset();
+    if (!activeName || !active || holds(active, ctx.model))
       return;
     const name = activeName;
     setActive(undefined, ctx);
     ctx.ui.notify(msg3.presets.diverged(name), "info");
   }
-  async function activate(name, ctx) {
-    const preset = presets[name];
-    if (!preset)
-      return;
-    await applyPreset(name, preset, ctx);
-  }
   async function clearPreset(ctx) {
     const original = originalState;
     setActive(undefined, ctx);
@@ -2691,7 +2595,7 @@ function registerPresets(pi) {
   async function showSelector(ctx) {
     const names = Object.keys(presets);
     if (names.length === 0) {
-      noPresetsHint(ctx);
+      ctx.ui.notify(msg3.presets.noneDefined, "warning");
       return;
     }
     const items = names.map((name) => ({
@@ -2734,15 +2638,14 @@ function registerPresets(pi) {
     if (choice === CLEAR_ITEM)
       await clearPreset(ctx);
     else
-      await activate(choice, ctx);
+      await applyPreset(choice, ctx);
   }
-  const { presets: configured } = loadConfig().config;
-  for (const [name, preset] of Object.entries(configured)) {
+  for (const [name, preset] of Object.entries(presets)) {
     if (!preset.key)
       continue;
     pi.registerShortcut(preset.key, {
       description: msg3.presets.shortcutDescription(name),
-      handler: (ctx) => activate(name, ctx)
+      handler: (ctx) => applyPreset(name, ctx)
     });
   }
   pi.registerCommand("preset", {
@@ -2762,7 +2665,7 @@ function registerPresets(pi) {
         ctx.ui.notify(msg3.presets.unknown(name, available), "error");
         return;
       }
-      await activate(name, ctx);
+      await applyPreset(name, ctx);
     }
   });
   pi.on("model_select", (_event, ctx) => {
@@ -2771,15 +2674,15 @@ function registerPresets(pi) {
   });
   pi.on("before_agent_start", async (event, ctx) => {
     dropIfDiverged(ctx);
-    if (!activePreset?.instructions)
+    const instructions = activePreset()?.instructions;
+    if (!instructions)
       return;
     return { systemPrompt: `${event.systemPrompt}
 
-${activePreset.instructions}` };
+${instructions}` };
   });
   const reset = () => {
     activeName = undefined;
-    activePreset = undefined;
     originalState = undefined;
   };
   pi.on("session_tree", (_event, ctx) => {
@@ -2789,11 +2692,10 @@ ${activePreset.instructions}` };
   });
   pi.on("session_start", async (_event, ctx) => {
     reset();
-    presets = loadConfig().config.presets;
     const flag = pi.getFlag("preset");
     if (typeof flag === "string" && flag) {
       if (presets[flag]) {
-        await applyPreset(flag, presets[flag], ctx);
+        await applyPreset(flag, ctx);
       } else {
         const available = Object.keys(presets).join(", ") || msg3.presets.noneAvailable;
         ctx.ui.notify(msg3.presets.unknown(flag, available), "warning");
@@ -2814,7 +2716,6 @@ ${activePreset.instructions}` };
       return;
     }
     activeName = name;
-    activePreset = preset;
     originalState = { model: undefined, thinkingLevel: pi.getThinkingLevel(), tools: pi.getActiveTools() };
   }
 }
@@ -2982,11 +2883,12 @@ var SOURCE = "firecode";
 var AGENT = "pi";
 var RETRY_TIMEOUT_MS = 1500;
 var UNSAFE_ARGUMENT = /['\u0000-\u001f\u007f]/;
-var seq = Date.now() * 1000;
-var nextSeq = () => seq += 1;
+var seq = 0;
+var nextSeq = () => seq = Math.max(seq + 1, Date.now() * 1000);
 var agentKey = (p) => `${p.working}\x00${p.resume?.join("\x00") ?? ""}`;
 var metaKey = (p) => `${p.title}\x00${p.agent}\x00${p.label ?? ""}`;
-function identityOf(ctx, thinking) {
+function identityOf(ctx, pi) {
+  const thinking = ctx.model?.reasoning ? pi.getThinkingLevel() : undefined;
   const level = thinking && thinking !== "off" ? `/${thinking}` : "";
   return { title: ctx.sessionManager.getSessionName() ?? "", agent: `pi·${formatModelName(ctx.model?.id)}${level}` };
 }
@@ -2999,9 +2901,9 @@ function labelOf(view) {
     return msg3.herdr.review;
   return !view.agentRunning && view.inFlight > 0 ? msg3.herdr.workers : undefined;
 }
-function registerHerdrProjection(pi, subsession = false) {
+function registerHerdrProjection(pi) {
   const env = herdrPaneEnv();
-  if (!env || subsession)
+  if (!env)
     return () => Promise.resolve();
   const paneId = env.paneId;
   let enabled = false;
@@ -3072,14 +2974,14 @@ function registerHerdrProjection(pi, subsession = false) {
   });
   const syncIdentity = (ctx) => {
     if (ctx.mode === "tui")
-      update(identityOf(ctx, ctx.model?.reasoning ? pi.getThinkingLevel() : undefined));
+      update(identityOf(ctx, pi));
   };
   pi.on("session_start", (_event, ctx) => {
     if (ctx.mode !== "tui")
       return;
     carriedRun = !ctx.isIdle();
     enabled = true;
-    desired = { ...desired, ...identityOf(ctx, ctx.model?.reasoning ? pi.getThinkingLevel() : undefined), resume: resumeOf(ctx) };
+    desired = { ...desired, ...identityOf(ctx, pi), resume: resumeOf(ctx) };
     project();
   });
   pi.on("session_info_changed", (_event, ctx) => syncIdentity(ctx));
@@ -3796,6 +3698,9 @@ class Shell {
     this.stopClock?.();
     this.stopClock = undefined;
     this.requestRender = () => {};
+    this.busy = IDLE;
+    this.settled = undefined;
+    this.review = undefined;
   }
   sync(view) {
     this.busy = view;
@@ -3895,9 +3800,7 @@ class ShellEditor extends CustomEditor {
     return hiddenLineCount > 0 ? super.renderBottomBorder(width, hiddenLineCount) : bottomBorder(width, this.bottomParts(), this.borderColor);
   }
 }
-function registerStatusBar(pi, subsession = false) {
-  if (subsession)
-    return;
+function registerStatusBar(pi) {
   const shell = new Shell;
   const updateTitle = (ctx, incoming) => {
     shell.title = displayTitle(ctx, incoming);
@@ -3948,9 +3851,6 @@ function registerStatusBar(pi, subsession = false) {
   pi.on("model_select", () => shell.requestRender());
   pi.on("session_shutdown", (_event, ctx) => {
     shell.dispose();
-    shell.busy = IDLE;
-    shell.settled = undefined;
-    shell.review = undefined;
     ctx.ui.setFooter(undefined);
     ctx.ui.setEditorComponent(undefined);
   });
@@ -4160,7 +4060,6 @@ function genericArgsParts(args) {
 }
 
 // tools/actions.ts
-var LABEL = msg4.labels;
 var argPath = (args) => args?.file_path ?? args?.path ?? "";
 function rangeSuffix(args) {
   if (args.offset === undefined && args.limit === undefined)
@@ -4193,9 +4092,10 @@ function toolTarget(tool, args, cwd) {
       return { value: genericArgsParts(args), clip: "end" };
   }
 }
+var toolTargetText = (tool, args, cwd) => toolTarget(tool, args, cwd).value.map((part) => part.text).join("").trim();
 function toolActionText(tool, args, cwd) {
-  const word = LABEL[tool] ?? tool;
-  const target = toolTarget(tool, args, cwd).value.map((part) => part.text).join("");
+  const word = msg4.labels[tool] ?? tool;
+  const target = toolTargetText(tool, args, cwd);
   return target ? `${word} ${target}` : word;
 }
 
@@ -4511,7 +4411,11 @@ function entryShell(marker) {
   shell.hasContent = () => true;
   return shell;
 }
-var ABORTED_TEXT = "Operation aborted";
+function failureResult(message) {
+  const text = message.stopReason === "aborted" ? "Operation aborted" : message.errorMessage || "Error";
+  return { content: [{ type: "text", text }], isError: true };
+}
+var failed = (message) => message.stopReason === "aborted" || message.stopReason === "error";
 
 class ChatMirror {
   sources;
@@ -4537,8 +4441,8 @@ class ChatMirror {
         if (call.type !== "toolCall")
           continue;
         const row = this.toolRow(call.name, call.id, call.arguments);
-        if (message.stopReason === "aborted" || message.stopReason === "error")
-          row.updateResult({ content: [{ type: "text", text: message.stopReason === "aborted" ? ABORTED_TEXT : message.errorMessage || "Error" }], isError: true });
+        if (failed(message))
+          row.updateResult(failureResult(message));
         else
           this.pending.set(call.id, row);
       }
@@ -4554,20 +4458,15 @@ class ChatMirror {
   handle(event) {
     switch (event.type) {
       case "message_start":
-        if (event.message.role === "assistant") {
-          this.streaming = this.assistant(event.message, true);
-          this.chat.addChild(this.streaming);
-        } else
+        if (event.message.role === "assistant")
+          this.stream(event.message);
+        else
           this.add(event.message);
         return true;
       case "message_update":
         if (event.message.role !== "assistant")
           return false;
-        if (!this.streaming) {
-          this.streaming = this.assistant(event.message, true);
-          this.chat.addChild(this.streaming);
-        }
-        this.streaming.updateContent(event.message, true);
+        (this.streaming ?? this.stream(event.message)).updateContent(event.message, true);
         for (const call of event.message.content) {
           if (call.type !== "toolCall")
             continue;
@@ -4582,10 +4481,9 @@ class ChatMirror {
         if (!this.streaming || event.message.role !== "assistant")
           return false;
         this.streaming.updateContent(event.message, false);
-        if (event.message.stopReason === "aborted" || event.message.stopReason === "error") {
-          const text = event.message.stopReason === "aborted" ? ABORTED_TEXT : event.message.errorMessage || "Error";
+        if (failed(event.message)) {
           for (const row of this.pending.values())
-            row.updateResult({ content: [{ type: "text", text }], isError: true });
+            row.updateResult(failureResult(event.message));
           this.pending.clear();
         } else
           for (const row of this.pending.values())
@@ -4651,6 +4549,11 @@ class ChatMirror {
       this.chat.addChild(new Spacer(1));
     this.chat.addChild(new UserMessageComponent(text, getMarkdownTheme2()));
   }
+  stream(message) {
+    this.streaming = this.assistant(message, true);
+    this.chat.addChild(this.streaming);
+    return this.streaming;
+  }
   assistant(message, streaming = false) {
     const component = new AssistantMessageComponent(message, true, getMarkdownTheme2());
     if (streaming)
@@ -4758,9 +4661,10 @@ var enTerms = {
 };
 var ALL_TERMS = [zhTerms, enTerms];
 var escapeRegExp = (literal) => literal.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
-function termPattern(pick, ...extra) {
-  return `(?:${[...ALL_TERMS.map(pick), ...extra].map(escapeRegExp).join("|")})`;
+function termPattern(pick) {
+  return `(?:${ALL_TERMS.map(pick).map(escapeRegExp).join("|")})`;
 }
+var SUGGESTIONS_HEADING = new RegExp(`^##\\s+${termPattern((terms) => terms.suggestions)}\\s*$`, "iu");
 var REDUNDANT_VERDICT_LINES = new Set([
   "PASS",
   "FAIL",
@@ -4808,9 +4712,7 @@ var msg6 = defineMessages({
       passed: zhTerms.passed,
       failed: zhTerms.failed,
       round: (round, title) => `第 ${round} 轮${title}`,
-      advisorNote: "顾问建议",
       stoppedByAdvisor: "审查已由顾问终止",
-      cancelled: "审查已取消",
       incomplete: "审查未完成",
       timeoutBlocker: `${zhTerms.blocker}：审查超时`,
       timeoutReason: `${zhTerms.reason}：超过总体时限`,
@@ -4819,8 +4721,6 @@ var msg6 = defineMessages({
       advisorGuidance: (decision) => `顾问指引 · ${decision}`,
       modelLine: (model) => `**${zhTerms.model} · ${model}**`,
       elapsed: (elapsed, total) => total === undefined ? `${zhTerms.elapsed}：${elapsed}` : `${zhTerms.elapsed}：${elapsed} / ${zhTerms.total} ${total}`,
-      stoppedBy: { user: "已按你的操作停止", shutdown: "会话关闭时停止", other: "已停止" },
-      stopReason: { advisor: "顾问建议停止", maxRounds: "已达到最大审查轮数" },
       decision: { continue: "继续修复", narrow: "收窄范围", stop: "停止修复" }
     },
     summary: {
@@ -4850,11 +4750,11 @@ var msg6 = defineMessages({
       advisorScope: "顾问收窄后的范围（以此为准）：",
       advisorAdvice: "顾问建议：",
       materialTruncated: (omitted) => `[材料截断：省略 ${omitted} 字]`,
-      materialLabel: { passed: "末轮审查结论：", maxRounds: "末轮未通过的发现：", advisorStop: "顾问裁决：" },
+      materialLabel: { passed: "末轮审查结论：", max_rounds: "末轮未通过的发现：", advisor_stop: "顾问裁决：" },
       summaryInstruction: {
         passed: (rounds) => `对抗审查已通过（共 ${rounds} 轮）。请给用户一个简洁的人话收尾总结：1) 各轮审查发现了什么、你修了什么；2) 最终靠什么通过（关键修复与验证证据）；3) 审查中提到但未阻塞通过的建议——逐条列出，并给出你建议处理还是不处理及理由。只做总结：不要修改代码、不要运行工具，直接以最终回复结束本回合。`,
-        maxRounds: (rounds) => `对抗审查在 ${rounds} 轮内未能通过，已按上限终止。请如实向用户总结（人话）：1) 各轮分别卡在什么发现上、你做了哪些修复尝试；2) 你认为无法收敛的根因；3) 当前代码的真实状态与剩余风险；4) 建议用户下一步怎么办。只做总结：不要再继续修改代码或运行工具，直接以最终回复结束本回合。`,
-        advisorStop: (rounds) => `对抗审查被顾问裁定终止（第 ${rounds} 轮）。请结合下方顾问裁决向用户总结：1) 审查循环走到了哪一步、修了什么；2) 顾问为什么叫停；3) 当前状态与你建议的下一步。只做总结：不要再修改代码或运行工具，直接以最终回复结束本回合。`
+        max_rounds: (rounds) => `对抗审查在 ${rounds} 轮内未能通过，已按上限终止。请如实向用户总结（人话）：1) 各轮分别卡在什么发现上、你做了哪些修复尝试；2) 你认为无法收敛的根因；3) 当前代码的真实状态与剩余风险；4) 建议用户下一步怎么办。只做总结：不要再继续修改代码或运行工具，直接以最终回复结束本回合。`,
+        advisor_stop: (rounds) => `对抗审查被顾问裁定终止（第 ${rounds} 轮）。请结合下方顾问裁决向用户总结：1) 审查循环走到了哪一步、修了什么；2) 顾问为什么叫停；3) 当前状态与你建议的下一步。只做总结：不要再修改代码或运行工具，直接以最终回复结束本回合。`
       }
     },
     reviewer: {
@@ -4929,9 +4829,7 @@ Stopped by user`
       passed: enTerms.passed,
       failed: enTerms.failed,
       round: (round, title) => `Round ${round} ${title}`,
-      advisorNote: "Advisor note",
       stoppedByAdvisor: "Review stopped by advisor",
-      cancelled: "Review cancelled",
       incomplete: "Review incomplete",
       timeoutBlocker: `${enTerms.blocker}: review timed out`,
       timeoutReason: `${enTerms.reason}: overall time limit exceeded`,
@@ -4940,8 +4838,6 @@ Stopped by user`
       advisorGuidance: (decision) => `Advisor guidance · ${decision}`,
       modelLine: (model) => `**${enTerms.model} · ${model}**`,
       elapsed: (elapsed, total) => total === undefined ? `${enTerms.elapsed}: ${elapsed}` : `${enTerms.elapsed}: ${elapsed} / ${enTerms.total} ${total}`,
-      stoppedBy: { user: "Stopped by user", shutdown: "Stopped when the session closed", other: "Stopped" },
-      stopReason: { advisor: "Advisor recommends stopping", maxRounds: "Maximum review rounds reached" },
       decision: { continue: "Continue fixing", narrow: "Narrow scope", stop: "Stop fixing" }
     },
     summary: {
@@ -4971,11 +4867,11 @@ Stopped by user`
       advisorScope: "Advisor scope (authoritative):",
       advisorAdvice: "Advisor note:",
       materialTruncated: (omitted) => `[material truncated: ${omitted} characters omitted]`,
-      materialLabel: { passed: "Final review verdict:", maxRounds: "Final round findings:", advisorStop: "Advisor ruling:" },
+      materialLabel: { passed: "Final review verdict:", max_rounds: "Final round findings:", advisor_stop: "Advisor ruling:" },
       summaryInstruction: {
         passed: (rounds) => `The adversarial review passed after ${rounds} round(s). Give the user a concise plain-language wrap-up: 1) what the review rounds found and what you fixed; 2) how it finally passed (key fixes and verification evidence); 3) non-blocking suggestions raised during review — list each and say whether you recommend addressing it and why. Summary only: do not change code or run tools; end this turn with the final reply.`,
-        maxRounds: (rounds) => `The adversarial review did not pass within ${rounds} round(s) and stopped at the limit. Summarize honestly for the user in plain language: 1) what each round got stuck on and what fixes you attempted; 2) your root-cause read on why it would not converge; 3) the real current state of the code and remaining risks; 4) what you recommend the user do next. Summary only: do not keep changing code or run tools; end this turn with the final reply.`,
-        advisorStop: (rounds) => `The adversarial review was stopped by the advisor (round ${rounds}). Using the advisor ruling below, summarize for the user: 1) how far the review loop got and what was fixed; 2) why the advisor called it off; 3) the current state and your recommended next step. Summary only: do not change code or run tools; end this turn with the final reply.`
+        max_rounds: (rounds) => `The adversarial review did not pass within ${rounds} round(s) and stopped at the limit. Summarize honestly for the user in plain language: 1) what each round got stuck on and what fixes you attempted; 2) your root-cause read on why it would not converge; 3) the real current state of the code and remaining risks; 4) what you recommend the user do next. Summary only: do not keep changing code or run tools; end this turn with the final reply.`,
+        advisor_stop: (rounds) => `The adversarial review was stopped by the advisor (round ${rounds}). Using the advisor ruling below, summarize for the user: 1) how far the review loop got and what was fixed; 2) why the advisor called it off; 3) the current state and your recommended next step. Summary only: do not change code or run tools; end this turn with the final reply.`
       }
     },
     reviewer: {
@@ -5173,7 +5069,6 @@ class Line {
 }
 
 // tools/group-view.ts
-var rowData = toolFacts;
 function actionLine(component) {
   return component && "actionWord" in component && typeof component.actionWord === "string" ? component : undefined;
 }
@@ -5253,8 +5148,8 @@ function scan(segment, activity, env) {
     const age = settled ? env.clock.arrivalAge(item) : Infinity;
     if (settled && age < ARRIVAL_FLASH_MS)
       arrival = { text: settled.title, failed: settled.alarm, age };
-    if (item instanceof ToolExecutionComponent2 && rowData(item).isPartial)
-      running.push(rowData(item));
+    if (item instanceof ToolExecutionComponent2 && toolFacts(item).isPartial)
+      running.push(toolFacts(item));
   }
   const record = combineRounds(rounds);
   return { notice, arrival, round: record?.round, earlier: record?.earlier, failures: failed.size, action: actionOf(running.at(-1), activity, env) };
@@ -5262,7 +5157,7 @@ function scan(segment, activity, env) {
 function actionOf(tool, activity, env) {
   if (tool) {
     const line = actionLine(tool.callRendererComponent);
-    return line ? { word: line.actionWord, target: line.actionTarget } : { word: tool.toolDefinition?.label ?? tool.toolName, target: toolTarget(tool.toolName, tool.args, tool.cwd).value.map((part) => part.text).join("").trim() };
+    return line ? { word: line.actionWord, target: line.actionTarget } : { word: tool.toolDefinition?.label ?? tool.toolName, target: toolTargetText(tool.toolName, tool.args, tool.cwd) };
   }
   if (activity)
     return { word: msg4.activity[activity] };
@@ -5319,7 +5214,7 @@ class ToolItem {
   }
   invalidate() {}
   render(width) {
-    const data = rowData(this.row);
+    const data = toolFacts(this.row);
     if (!data.expanded) {
       const renderer = actionLine(data.callRendererComponent) ?? compactLine(data, this.ui.theme);
       return renderer.render(width);
@@ -5329,9 +5224,9 @@ class ToolItem {
     return lines.slice(this.leadingRows);
   }
   handleMouse(event) {
-    if (rowData(this.row).expanded)
+    if (toolFacts(this.row).expanded)
       return this.row.handleMouse({ ...event, y: event.y + this.leadingRows, height: event.height + this.leadingRows });
-    if (event.type !== "click" || event.button !== "left" || !rowData(this.row).result)
+    if (event.type !== "click" || event.button !== "left" || !toolFacts(this.row).result)
       return;
     this.toggle(this.row);
     return { handled: true };
@@ -5517,7 +5412,7 @@ function processList(segment, env) {
   return list;
 }
 function toggleToolDetails(row, setExpanded) {
-  setExpanded.call(row, !rowData(row).expanded);
+  setExpanded.call(row, !toolFacts(row).expanded);
 }
 
 // tools/grouping.ts
@@ -5672,21 +5567,14 @@ function attach(tui, ui, options) {
 }
 
 // tools/index.ts
-var cache = new Map;
 function createTools(cwd) {
-  return {
-    read: createReadTool(cwd),
-    bash: createBashTool(cwd),
-    edit: createEditTool(cwd),
-    write: createWriteTool(cwd)
-  };
+  return { read: createReadTool(cwd), bash: createBashTool(cwd), edit: createEditTool(cwd), write: createWriteTool(cwd) };
 }
+var cache = new Map;
 function tools(cwd) {
   let value = cache.get(cwd);
-  if (!value) {
-    value = createTools(cwd);
-    cache.set(cwd, value);
-  }
+  if (!value)
+    cache.set(cwd, value = createTools(cwd));
   return value;
 }
 function lineCount(text) {
@@ -5697,8 +5585,13 @@ function lineCount(text) {
   return text.endsWith(`
 `) ? lines - 1 : lines;
 }
-function invoke(execute, args) {
-  return Reflect.apply(execute, undefined, args);
+function shell(name, meta) {
+  return {
+    label: msg4.labels[name],
+    renderShell: "self",
+    execute: (id, params, signal, update, ctx) => executeTimed(id, () => tools(ctx.cwd)[name].execute(id, params, signal, update, ctx)),
+    renderCall: (args, theme, ctx) => new ToolLine({ label: msg4.labels[name], ...toolTarget(name, args, ctx.cwd), meta: meta?.(args), theme, ctx })
+  };
 }
 var EDIT_RESULT = makeResultRenderer(false);
 var definitions;
@@ -5708,43 +5601,11 @@ function toolDefinitions() {
 function buildDefinitions() {
   const initial = tools(process.cwd());
   return {
-    read: defineTool({
-      ...initial.read,
-      label: LABEL.read,
-      renderShell: "self",
-      execute: (id, params, signal, update, ctx) => executeTimed(id, () => invoke(tools(ctx.cwd).read.execute, [id, params, signal, update, ctx])),
-      renderCall: (args, theme, ctx) => new ToolLine({
-        label: LABEL.read,
-        ...toolTarget("read", args, ctx.cwd),
-        theme,
-        ctx
-      }),
-      renderResult: makeResultRenderer(true)
-    }),
-    bash: defineTool({
-      ...initial.bash,
-      label: LABEL.bash,
-      renderShell: "self",
-      execute: (id, params, signal, update, ctx) => executeTimed(id, () => invoke(tools(ctx.cwd).bash.execute, [id, params, signal, update, ctx])),
-      renderCall: (args, theme, ctx) => new ToolLine({
-        label: LABEL.bash,
-        ...toolTarget("bash", args, ctx.cwd),
-        theme,
-        ctx
-      }),
-      renderResult: makeResultRenderer(true)
-    }),
+    read: defineTool({ ...initial.read, ...shell("read"), renderResult: makeResultRenderer(true) }),
+    bash: defineTool({ ...initial.bash, ...shell("bash"), renderResult: makeResultRenderer(true) }),
     edit: defineTool({
       ...initial.edit,
-      label: LABEL.edit,
-      renderShell: "self",
-      execute: (id, params, signal, update, ctx) => executeTimed(id, () => invoke(tools(ctx.cwd).edit.execute, [id, params, signal, update, ctx])),
-      renderCall: (args, theme, ctx) => new ToolLine({
-        label: LABEL.edit,
-        ...toolTarget("edit", args, ctx.cwd),
-        theme,
-        ctx
-      }),
+      ...shell("edit"),
       renderResult(result, options, theme, ctx) {
         const details = result.details;
         const diff = !ctx.isError && typeof details?.diff === "string" ? details.diff : undefined;
@@ -5755,16 +5616,7 @@ function buildDefinitions() {
     }),
     write: defineTool({
       ...initial.write,
-      label: LABEL.write,
-      renderShell: "self",
-      execute: (id, params, signal, update, ctx) => executeTimed(id, () => invoke(tools(ctx.cwd).write.execute, [id, params, signal, update, ctx])),
-      renderCall: (args, theme, ctx) => new ToolLine({
-        label: LABEL.write,
-        ...toolTarget("write", args, ctx.cwd),
-        meta: [{ text: ` +${lineCount(args.content ?? "")}`, color: "toolDiffAdded" }],
-        theme,
-        ctx
-      }),
+      ...shell("write", (args) => [{ text: " +" + lineCount(args.content ?? ""), color: "toolDiffAdded" }]),
       renderResult: makeResultRenderer(false)
     })
   };
@@ -5805,7 +5657,7 @@ import { randomUUID } from "node:crypto";
 
 // master/spawn.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { basename, dirname as dirname3 } from "node:path";
+import { basename, dirname as dirname2 } from "node:path";
 import {
   createAgentSession,
   createCodemodeExtension,
@@ -5830,8 +5682,7 @@ var msg7 = defineMessages({
       thinking: "可选思考档覆盖；省略时使用角色原子档或当前档。",
       cwd: "Worker 工作目录的绝对路径；start 默认当前目录，send 给空闲 Worker 换检出时带上（同一会话重开）。",
       review: "按审查纪律为 start/send 记录义务；true 不自动开审。",
-      onlyInMaster: (tool) => `${tool} 只在 Master 中可用`,
-      unknownAction: (action) => `未知 subagents action：${action}`
+      onlyInMaster: (tool) => `${tool} 只在 Master 中可用`
     },
     command: {
       description: "翻转当前会话的指挥官模式；status 查看状态",
@@ -5931,7 +5782,6 @@ var msg7 = defineMessages({
     },
     guard: (path) => `子代理只能修改当前 checkout 或系统临时目录：${path}`,
     state: {
-      legacy: (version, current) => `Master Worker Pool 状态是旧版 v${version}（当前 v${current}），不再读取；重新启动指挥官模式会从空池重建，旧运行时进程不会纳入新池，需要手动清理`,
       invalidJson: (path) => `Master Worker Pool 状态不是合法 JSON：${path}`,
       invalidShape: (path) => `Master Worker Pool 状态结构无效：${path}`,
       missing: (name) => `子代理不存在：${name}`,
@@ -5995,8 +5845,7 @@ var msg7 = defineMessages({
       thinking: "Optional thinking-level override; defaults to the role atom's level or the current level.",
       cwd: "Absolute path of the Worker's working directory; start defaults to the current directory, and send passes it to move an idle Worker to another checkout (the same session is reopened).",
       review: "Record a review obligation for start/send per the review discipline; true does not start a review automatically.",
-      onlyInMaster: (tool) => `${tool} is only available in Master mode`,
-      unknownAction: (action) => `Unknown subagents action: ${action}`
+      onlyInMaster: (tool) => `${tool} is only available in Master mode`
     },
     command: {
       description: "Toggle Master mode for the current session; status shows the state",
@@ -6096,7 +5945,6 @@ var msg7 = defineMessages({
     },
     guard: (path) => `Workers may only modify the current checkout or the system temp directory: ${path}`,
     state: {
-      legacy: (version, current) => `The Master Worker Pool state is legacy v${version} (current v${current}) and is no longer read; restarting Master mode rebuilds from an empty pool, old runtime processes are not adopted into the new pool and need manual cleanup`,
       invalidJson: (path) => `The Master Worker Pool state is not valid JSON: ${path}`,
       invalidShape: (path) => `The Master Worker Pool state has an invalid structure: ${path}`,
       missing: (name) => `Worker does not exist: ${name}`,
@@ -6237,7 +6085,6 @@ class InProcessSessionPool {
     this.held.set(key, held);
     return {
       session: created,
-      sessionPath,
       prompt: (text) => created.prompt(text),
       dispose: () => this.release(held)
     };
@@ -6304,7 +6151,7 @@ class InProcessSessionPool {
   }
 }
 function preallocateWorkerSession(mainSessionPath, cwd) {
-  const sessionPath = SessionManager.create(cwd, `${dirname3(mainSessionPath)}/subagents`).getSessionFile();
+  const sessionPath = SessionManager.create(cwd, `${dirname2(mainSessionPath)}/subagents`).getSessionFile();
   if (!sessionPath)
     throw new Error(msg7.spawn.noSessionPath);
   return sessionPath;
@@ -6312,7 +6159,7 @@ function preallocateWorkerSession(mainSessionPath, cwd) {
 function makeSessionManager(persistence, cwd) {
   if (persistence.type === "memory")
     return SessionManager.inMemory(cwd);
-  return SessionManager.open(persistence.sessionPath, dirname3(persistence.sessionPath), cwd);
+  return SessionManager.open(persistence.sessionPath, dirname2(persistence.sessionPath), cwd);
 }
 function matchesExtension(path, exclusions) {
   return exclusions.some((excluded) => excluded === path || excluded === basename(path));
@@ -6321,257 +6168,603 @@ function matchesExtension(path, exclusions) {
 // review/card.ts
 import { getMarkdownTheme as getMarkdownTheme4 } from "@earendil-works/pi-coding-agent";
 import { Box, Markdown as Markdown3, Spacer as Spacer4, Text as Text5 } from "@earendil-works/pi-tui";
-var CARD_TYPE = "firecode-review-card";
-var VERSION2 = 1;
-var CARD_KINDS = new Set([
-  "queued",
-  "start",
-  "pass",
-  "fail",
-  "stop",
-  "cancel",
-  "timeout",
-  "error",
-  "advisor"
-]);
-var CARD_TONES = new Set(["success", "warning", "error", "neutral", "accent"]);
-var MARKS = {
-  start: { glyph: "⠿", color: "review" },
-  advisor: { glyph: "⠿", color: "review" },
-  pass: { glyph: "✓", color: "success" },
-  fail: { glyph: "✗", color: "error" },
-  stop: { glyph: "✗", color: "error" },
-  timeout: { glyph: "◌", color: "error" },
-  error: { glyph: "◌", color: "error" },
-  cancel: { glyph: "‖", color: "muted" }
-};
-function paintMark(details, theme) {
-  const mark = MARKS[details.kind];
-  if (!mark)
-    return details.icon;
-  return mark.color === "review" ? paint(HEAT_COLORS.gold, details.icon) : theme.fg(mark.color, details.icon);
-}
-function isValidCardDetails(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value))
-    return false;
-  const record = value;
-  if (Object.keys(record).length !== 6)
-    return false;
-  if (record.version !== VERSION2)
-    return false;
-  if (typeof record.kind !== "string" || !CARD_KINDS.has(record.kind))
-    return false;
-  if (typeof record.title !== "string")
-    return false;
-  if (!Array.isArray(record.lines) || !record.lines.every((line) => typeof line === "string"))
-    return false;
-  if (typeof record.tone !== "string" || !CARD_TONES.has(record.tone))
-    return false;
-  return typeof record.icon === "string";
-}
-function registerCardRenderer(pi) {
-  pi.registerMessageRenderer(CARD_TYPE, (message, _options, theme) => new ReviewCard(message.details, message.content, theme));
-}
 
-class ReviewCard {
-  card;
-  fallback;
-  constructor(details, content, theme) {
-    this.fallback = new Text5(plainContent(content), 0, 0);
-    let card;
-    try {
-      card = isValidCardDetails(details) ? nativeCard(details, theme) : undefined;
-    } catch {
-      card = undefined;
-    }
-    this.card = card;
-  }
-  render(width) {
-    try {
-      return (this.card ?? this.fallback).render(Math.max(1, width));
-    } catch {
-      try {
-        return this.fallback.render(Math.max(1, width));
-      } catch {
-        return [];
-      }
-    }
-  }
-  invalidate() {
-    this.card?.invalidate?.();
-    this.fallback.invalidate?.();
-  }
+// review/state.ts
+var ISSUE_LINE = new RegExp(`^[-*+]\\s*(?:\\*\\*)?${termPattern((terms) => terms.field.issue)}(?:\\*\\*)?\\s*[:：]\\s*(.+)$`, "iu");
+function initialState(runId) {
+  return {
+    runId,
+    phase: "idle",
+    round: 0,
+    focus: "",
+    history: [],
+    active: null,
+    pending: null,
+    repair: null,
+    summary: null,
+    consecutiveFailures: 0,
+    startedAt: 0,
+    roundStartedAt: 0,
+    updatedAt: 0
+  };
 }
-function nativeCard(details, theme) {
-  const box = new Box(1, 0, (text) => theme.bg(backgroundFor(details.tone), text));
-  box.addChild(new Text5(`${paintMark(details, theme)} ${details.title}`, 0, 0));
-  box.addChild(new Spacer4(1));
-  box.addChild(new Markdown3(details.lines.join(`
-`), 0, 0, getMarkdownTheme4()));
-  return box;
+function reduce(state, event, limits, now) {
+  switch (event.type) {
+    case "START":
+      return onStart(state, event, now);
+    case "RECOVER":
+      return onRecover(state);
+    case "REVIEWER_SETTLED":
+      return onReviewerSettled(state, event, limits, now);
+    case "ADVISOR_SETTLED":
+      return onAdvisorSettled(state, event, limits, now);
+    case "ADVISOR_SKIPPED":
+      return onAdvisorSkipped(state, now);
+    case "INFRASTRUCTURE_ERROR":
+      return onInfrastructureError(state, event.details, now);
+    case "ADVANCE":
+      return onAdvance(state, limits, now);
+    case "FEEDBACK_DISPATCHED":
+      return updateRepairStatus(state, "pending", "awaiting_start", now);
+    case "REPAIR_STARTED":
+      return updateRepairStatus(state, "awaiting_start", "running", now);
+    case "REPAIR_COMPLETED":
+      return updateRepairStatus(state, "running", "completed", now);
+    case "SUMMARY_DISPATCHED":
+      return updateSummaryStatus(state, "pending", "awaiting_start", now);
+    case "SUMMARY_STARTED":
+      return updateSummaryStatus(state, "awaiting_start", "running", now);
+    case "SUMMARY_SETTLED":
+      return onSummarySettled(state, now);
+    case "CANCEL":
+      return onInterrupted(state, now, "cancelled", event.reason, event.reason === "user" ? [{ kind: "notify_cancelled" }] : []);
+    case "TIMEOUT":
+      return onInterrupted(state, now, "timed_out", "timeout", [{ kind: "send_card", card: { kind: "timeout" } }]);
+  }
 }
-function backgroundFor(tone) {
-  if (tone === "success")
-    return "toolSuccessBg";
-  if (tone === "warning" || tone === "error")
-    return "toolErrorBg";
-  return "customMessageBg";
+function onStart(state, event, now) {
+  return {
+    state: { ...initialState(state.runId), phase: "queued", focus: event.focus.trim(), startedAt: now, updatedAt: now },
+    effects: [{ kind: "advance" }]
+  };
 }
-function plainContent(content) {
-  if (typeof content === "string")
-    return content;
-  if (!Array.isArray(content))
-    return "";
-  return content.map(plainPart).filter(Boolean).join(`
-`);
+function onRecover(state) {
+  if (state.phase === "idle" || state.phase === "settled")
+    return { state, effects: [] };
+  const repair = state.phase === "awaiting_fix" && state.repair && state.repair.status !== "completed" ? { ...state.repair, status: "pending" } : state.repair;
+  const summary = state.phase === "summarizing" && state.summary ? { ...state.summary, status: "pending" } : state.summary;
+  return { state: { ...state, repair, summary }, effects: [] };
 }
-function plainPart(part) {
-  return typeof part === "object" && part !== null && "text" in part ? String(part.text) : "";
+function updateRepairStatus(state, expected, status, now) {
+  if (state.phase !== "awaiting_fix" || state.repair?.status !== expected)
+    return { state, effects: [] };
+  return {
+    state: { ...state, repair: { ...state.repair, status }, updatedAt: now },
+    effects: []
+  };
 }
-function buildCard(card) {
-  switch (card.kind) {
-    case "start":
-      return started(card);
-    case "pass":
-      return passed(card);
-    case "fail":
-      return failed(card);
-    case "stop":
-      return stopped(card);
-    case "cancel":
-      return cancelled(card);
-    case "timeout":
-      return timedOut(card);
-    case "error":
-      return errored(card);
-    case "advisor":
-      return advisorCard(card);
-  }
+function updateSummaryStatus(state, expected, status, now) {
+  if (state.phase !== "summarizing" || state.summary?.status !== expected)
+    return { state, effects: [] };
+  return {
+    state: { ...state, summary: { ...state.summary, status }, updatedAt: now },
+    effects: []
+  };
 }
-function started(card) {
-  return spec("start", msg6.card.started, [msg6.card.startedModels(card.models.map(shortModel))], "neutral");
+function onSummarySettled(state, now) {
+  if (state.phase !== "summarizing")
+    return { state, effects: [] };
+  return {
+    state: { ...state, phase: "settled", summary: null, updatedAt: now },
+    effects: []
+  };
 }
-function shortModel(model) {
-  return model.split("/").at(-1) || model;
+function summarizing(kind) {
+  return { phase: "summarizing", summary: { kind, status: "pending" } };
 }
-function passed(card) {
-  const title = qualityTitle(card.round, msg6.card.passed);
-  const lines = withFooter(formatReviewResultLines(card.summary), [
-    elapsedLine(card.elapsedMs, card.totalElapsedMs, card.round > 1)
-  ]);
-  return spec("pass", title, lines, "success");
+function onAdvance(state, limits, now) {
+  if (state.phase === "queued")
+    return {
+      state: beginRound(state, 1, limits, now),
+      effects: [
+        { kind: "send_card", card: { kind: "start", models: limits.reviewers.map((item) => item.model) } },
+        { kind: "advance" }
+      ]
+    };
+  if (state.phase !== "awaiting_fix" || state.repair?.status !== "completed")
+    return { state, effects: [] };
+  return {
+    state: beginRound(state, state.round + 1, limits, now),
+    effects: [{ kind: "advance" }]
+  };
 }
-function failed(card) {
-  const title = qualityTitle(card.round, msg6.card.failed);
-  const footer = [
-    ...card.advisor?.advice ? [msg6.card.advisorNote, ...adviceLines(card.advisor.advice)] : [],
-    ...card.elapsedMs === undefined ? [] : [elapsedLine(card.elapsedMs, card.totalElapsedMs, false)]
-  ];
-  return spec("fail", title, withFooter(formatReviewResultLines(card.details), footer), "warning");
+function onReviewerSettled(state, event, limits, now) {
+  if (state.phase !== "reviewing" || !state.active)
+    return { state, effects: [] };
+  const active = state.active;
+  const reviewers = active.reviewers.map((item) => item.index === event.index ? { ...item, status: event.result.status, result: event.result } : item);
+  const settledCount = active.settledCount + 1;
+  const nextActive = { ...active, reviewers, settledCount };
+  if (settledCount < reviewers.length)
+    return { state: { ...state, active: nextActive, updatedAt: now }, effects: [] };
+  return settleRound(state, nextActive, resultsOf(reviewers), limits, now);
 }
-function stopped(card) {
-  const footer = card.elapsedMs === undefined ? [] : [elapsedLine(card.elapsedMs, card.totalElapsedMs, false)];
-  if (card.reason === "advisor") {
-    const title = qualityTitle(card.round, msg6.card.stoppedByAdvisor);
-    const body = [advisorModelLine(card.advisorModel), "", ...adviceLines(card.advisor.advice)];
-    return spec("stop", title, withFooter(body, footer), "warning");
+function settleRound(state, active, settled, limits, now) {
+  const { result, details, feedbackDetails, summary } = aggregate(settled);
+  const base = { ...state, active: null, updatedAt: now };
+  const round = closeRound(state, now, { round: active.round, result, details, reviewers: settled });
+  const history = [...state.history, round];
+  if (result === "passed")
+    return {
+      state: { ...base, ...summarizing("passed"), history },
+      effects: [
+        {
+          kind: "send_card",
+          card: {
+            kind: "pass",
+            round: active.round,
+            summary: appendClosedFindings(summary, state.history, active.round),
+            elapsedMs: round.elapsedMs,
+            totalElapsedMs: Math.max(0, now - state.startedAt)
+          }
+        },
+        { kind: "advance" }
+      ]
+    };
+  if (result === "error")
+    return {
+      state: { ...base, phase: "settled", history },
+      effects: [{ kind: "send_card", card: { kind: "error", message: details, elapsedMs: round.elapsedMs } }]
+    };
+  const consecutiveFailures = state.consecutiveFailures + 1;
+  if (active.round >= limits.maxRounds)
+    return {
+      state: { ...base, ...summarizing("max_rounds"), consecutiveFailures, history },
+      effects: [
+        { kind: "send_card", card: { kind: "stop", reason: "max_rounds", round: active.round, details, elapsedMs: round.elapsedMs } },
+        { kind: "advance" }
+      ]
+    };
+  const failCard = {
+    kind: "send_card",
+    card: { kind: "fail", round: active.round, details, elapsedMs: round.elapsedMs }
+  };
+  if (consecutiveFailures >= limits.advisorAfterFailures)
+    return {
+      state: {
+        ...base,
+        phase: "needs_fix",
+        pending: { round: active.round, reviewers: settled, details: feedbackDetails },
+        consecutiveFailures
+      },
+      effects: [failCard, { kind: "advance" }]
+    };
+  return {
+    state: {
+      ...base,
+      phase: "awaiting_fix",
+      pending: null,
+      repair: { details: feedbackDetails, advisor: null, status: "pending" },
+      consecutiveFailures,
+      history
+    },
+    effects: [failCard, { kind: "advance" }]
+  };
+}
+function onAdvisorSettled(state, event, limits, now) {
+  if (state.phase !== "needs_fix" || !state.pending)
+    return { state, effects: [] };
+  const pending = state.pending;
+  const advisor = event.result;
+  const consultMs = Math.max(0, now - state.updatedAt);
+  if (advisor.verdict === "stop") {
+    const round = closeRound(state, now, { round: pending.round, result: "stopped", details: advisor.advice, reviewers: pending.reviewers, advisor });
+    return {
+      state: { ...state, ...summarizing("advisor_stop"), pending: null, history: [...state.history, round], updatedAt: now },
+      effects: [
+        {
+          kind: "send_card",
+          card: { kind: "stop", reason: "advisor", round: pending.round, details: advisor.advice, advisor, advisorModel: limits.advisorModel, elapsedMs: consultMs }
+        },
+        { kind: "advance" }
+      ]
+    };
   }
-  const title = qualityTitle(card.round, msg6.card.failed);
-  const body = formatReviewResultLines(card.details || stopReason(card.reason));
-  return spec("stop", title, withFooter(body, footer), "warning");
+  const round = closeRound(state, now, { round: pending.round, result: "failed", details: pending.details, reviewers: pending.reviewers, advisor });
+  return {
+    state: {
+      ...state,
+      phase: "awaiting_fix",
+      pending: null,
+      repair: { details: pending.details, advisor, status: "pending" },
+      history: [...state.history, round],
+      updatedAt: now
+    },
+    effects: [
+      { kind: "send_card", card: { kind: "advisor", advisor, advisorModel: limits.advisorModel, elapsedMs: consultMs } },
+      { kind: "advance" }
+    ]
+  };
 }
-function cancelled(card) {
-  return spec("cancel", msg6.card.cancelled, [reasonText(card.reason)], "neutral");
+function onAdvisorSkipped(state, now) {
+  if (state.phase !== "needs_fix" || !state.pending)
+    return { state, effects: [] };
+  const pending = state.pending;
+  const round = closeRound(state, now, { round: pending.round, result: "failed", details: pending.details, reviewers: pending.reviewers });
+  return {
+    state: {
+      ...state,
+      phase: "awaiting_fix",
+      pending: null,
+      repair: { details: pending.details, advisor: null, status: "pending" },
+      history: [...state.history, round],
+      updatedAt: now
+    },
+    effects: [{ kind: "advance" }]
+  };
 }
-function timedOut(_card) {
-  return spec("timeout", msg6.card.incomplete, [msg6.card.timeoutBlocker, msg6.card.timeoutReason], "warning");
+function onInterrupted(state, now, result, reason, effects) {
+  if (state.phase === "idle" || state.phase === "settled")
+    return { state, effects: [] };
+  if (state.phase === "summarizing")
+    return onSummarySettled(state, now);
+  const round = interruptedRound(state, now, result, reason);
+  return {
+    state: {
+      ...state,
+      phase: "settled",
+      active: null,
+      pending: null,
+      repair: null,
+      history: round ? [...state.history, round] : state.history,
+      updatedAt: now
+    },
+    effects
+  };
 }
-function reasonText(reason) {
-  if (reason === "user")
-    return msg6.card.stoppedBy.user;
-  if (reason === "shutdown")
-    return msg6.card.stoppedBy.shutdown;
-  return msg6.card.stoppedBy.other;
+function onInfrastructureError(state, details, now) {
+  if (state.phase === "idle" || state.phase === "settled")
+    return { state, effects: [] };
+  if (state.phase === "summarizing")
+    return onSummarySettled(state, now);
+  const reviewers = state.active ? resultsOf(state.active.reviewers) : state.pending?.reviewers ?? [];
+  const round = state.round > 0 ? closeRound(state, now, { round: state.round, result: "error", details, reviewers }) : undefined;
+  return {
+    state: {
+      ...state,
+      phase: "settled",
+      active: null,
+      pending: null,
+      repair: null,
+      history: round ? [...state.history, round] : state.history,
+      updatedAt: now
+    },
+    effects: [{ kind: "send_card", card: { kind: "error", message: details } }]
+  };
 }
-function stopReason(reason) {
-  if (reason === "advisor")
-    return msg6.card.stopReason.advisor;
-  if (reason === "max_rounds")
-    return msg6.card.stopReason.maxRounds;
-  return reasonText(reason);
+function beginRound(state, round, limits, now) {
+  const reviewers = limits.reviewers.map((item, index) => ({
+    index,
+    model: item.model,
+    thinking: item.thinking,
+    status: "running",
+    result: null
+  }));
+  return {
+    ...state,
+    phase: "reviewing",
+    round,
+    active: { round, reviewers, settledCount: 0 },
+    pending: null,
+    repair: null,
+    summary: null,
+    roundStartedAt: now,
+    updatedAt: now
+  };
 }
-function errored(card) {
-  const lines = [
-    msg6.card.errorBlocker,
-    msg6.card.errorReason(card.message),
-    ...card.elapsedMs === undefined ? [] : ["", elapsedLine(card.elapsedMs, card.totalElapsedMs, false)]
-  ];
-  return spec("error", msg6.card.incomplete, lines, "warning");
+function resultsOf(reviewers) {
+  return reviewers.flatMap((item) => item.result ? [item.result] : []);
 }
-function advisorCard(card) {
-  const title = msg6.card.advisorGuidance(decisionText(card.advisor.verdict));
-  const body = [advisorModelLine(card.advisorModel), "", ...adviceLines(card.advisor.advice)];
-  const footer = card.elapsedMs === undefined ? [] : [elapsedLine(card.elapsedMs, undefined, false)];
-  return spec("advisor", title, withFooter(body, footer), "neutral");
+function aggregate(reviewers) {
+  const verdicts = reviewers.filter((item) => item.status === "passed" || item.status === "failed");
+  const details = aggregateDetails(reviewers);
+  if (verdicts.length === 0)
+    return { result: "error", details, feedbackDetails: "", summary: "" };
+  const failed = verdicts.filter((item) => item.status === "failed");
+  if (failed.length > 0)
+    return { result: "failed", details, feedbackDetails: aggregateDetails(failed), summary: "" };
+  const absent = reviewers.filter((item) => item.status === "error");
+  return { result: "passed", details, feedbackDetails: "", summary: aggregatePassSummary(verdicts, absent) };
 }
-function decisionText(verdict) {
-  return msg6.card.decision[verdict];
+function aggregateDetails(reviewers) {
+  return reviewers.map((item) => `${modelLabel(item)}
+${item.details.trim()}`).join(`
+
+`);
 }
-function advisorModelLine(model) {
-  return msg6.card.modelLine(shortModel(model));
+function aggregatePassSummary(passed, absent) {
+  const fallback = msg6.summary.passedFallback;
+  const lines = passed.length === 1 ? [passBody(passed[0]?.summary ?? "") || fallback] : passed.map((item) => msg6.summary.modelBullet(shortModel(item.model), passBody(item.summary) || fallback));
+  if (absent.length > 0)
+    lines.push(msg6.summary.absent(absent.map((item) => ({ model: shortModel(item.model), reason: firstLine(item.details) }))));
+  const suggestions = [...new Set(passed.flatMap((item) => splitSuggestions(item.details)))];
+  if (suggestions.length === 0)
+    return lines.join(`
+`);
+  return [
+    ...lines,
+    "",
+    `## ${msg6.terms.suggestions}`,
+    ...suggestions.map((item) => `- ${item}`)
+  ].join(`
+`);
 }
-function adviceLines(advice) {
-  const output = [];
-  for (const line of advice.split(/\r?\n/u)) {
-    if (/^\*\*[^*]+\*\*\s*[:：]/u.test(line.trim()) && output.length > 0 && output.at(-1) !== "")
-      output.push("");
-    output.push(line);
-  }
-  return output;
+function firstLine(text) {
+  return text.trim().split(/\r?\n/u, 1)[0]?.split(/[：:]/u, 1)[0]?.trim() ?? "";
 }
-function qualityTitle(round, title) {
-  return round <= 1 ? title : msg6.card.round(round, title);
+function splitSuggestions(details) {
+  const lines = details.split(/\r?\n/u);
+  const index = lines.findIndex((line) => SUGGESTIONS_HEADING.test(line.trim()));
+  if (index < 0)
+    return [];
+  return lines.slice(index + 1).map((line) => line.replace(/^[-*]\s*/u, "").trim()).filter(Boolean);
 }
-function withFooter(lines, footer) {
-  if (footer.length === 0)
-    return lines;
-  return [...lines, ...lines.length > 0 ? ["", "---", ""] : [], ...footer];
+function passBody(summary) {
+  return summary.replace(/^(?:PASS\s*)/iu, "").trim();
 }
-function elapsedLine(ms, totalMs, showTotal) {
-  return msg6.card.elapsed(formatDuration(ms), showTotal && totalMs !== undefined ? formatDuration(totalMs) : undefined);
+function shortModel(model) {
+  return model.split("/").at(-1) || model;
 }
-var MODEL_SECTION = new RegExp(String.raw`^${termPattern((terms) => terms.model)}\s+\d+\s+·\s+`, "iu");
-var EVIDENCE_LABEL = new RegExp(String.raw`^[-*+]?\s*(?:\*\*)?${termPattern((terms) => terms.field.evidence)}(?:\*\*)?\s*[:：]`, "u");
-function formatReviewResultLines(review) {
-  const lines = review.split(/\r?\n/u);
-  const sections = [];
-  const preface = [];
-  let current;
-  for (const line of lines) {
-    if (MODEL_SECTION.test(line.trim())) {
-      if (current)
-        sections.push(current);
-      current = { title: line.trim(), body: [] };
-    } else if (current)
-      current.body.push(line);
-    else
-      preface.push(line);
-  }
-  if (current)
-    sections.push(current);
-  if (sections.length === 0)
-    return normalizedReviewLines(review);
-  return [
-    ...normalizedReviewLines(preface.join(`
-`)),
-    ...preface.join("").trim() ? [""] : [],
-    ...sections.flatMap((section, index) => [
-      ...index > 0 ? ["", "---", ""] : [],
-      `**${section.title}**`,
-      "",
-      ...normalizedReviewLines(section.body.join(`
-`))
-    ])
+function appendClosedFindings(summary, history, beforeRound) {
+  const seen = new Set;
+  const findings = [];
+  for (const round of history) {
+    if (round.round >= beforeRound || round.result !== "failed")
+      continue;
+    for (const line of round.details.split(/\r?\n/u)) {
+      const match = ISSUE_LINE.exec(line.trim());
+      const issue = match?.[1]?.replace(/`([^`]+)`/gu, "$1").trim();
+      if (!issue)
+        continue;
+      const key = issue.replace(/\s+/gu, "");
+      if (seen.has(key))
+        continue;
+      seen.add(key);
+      findings.push({ round: round.round, issue });
+    }
+  }
+  if (findings.length === 0)
+    return summary;
+  const shown = findings.slice(0, 6);
+  const recap = [msg6.summary.closedHeading, ...shown.map((finding) => msg6.summary.closedItem(finding.issue, finding.round))];
+  if (findings.length > shown.length)
+    recap.push(msg6.summary.closedMore(findings.length - shown.length));
+  return `${summary}
+
+${recap.join(`
+`)}`;
+}
+function modelLabel(item) {
+  return msg6.summary.modelSection(item.index + 1, shortModel(item.model));
+}
+function interruptedRound(state, now, result, reason) {
+  if (state.phase === "reviewing" && state.active)
+    return closeRound(state, now, { round: state.active.round, result, details: "", reviewers: resultsOf(state.active.reviewers), reason });
+  if (state.phase === "needs_fix" && state.pending)
+    return closeRound(state, now, { round: state.pending.round, result, details: "", reviewers: state.pending.reviewers, reason });
+  return;
+}
+function closeRound(state, now, record) {
+  return { ...record, elapsedMs: state.roundStartedAt ? Math.max(0, now - state.roundStartedAt) : 0 };
+}
+
+// review/card.ts
+var CARD_TYPE = "firecode-review-card";
+var VERSION2 = 1;
+var MARKS = {
+  start: { glyph: "⠿", color: "review" },
+  advisor: { glyph: "⠿", color: "review" },
+  pass: { glyph: "✓", color: "success" },
+  fail: { glyph: "✗", color: "error" },
+  stop: { glyph: "✗", color: "error" },
+  timeout: { glyph: "◌", color: "error" },
+  error: { glyph: "◌", color: "error" }
+};
+var CARD_KINDS = new Set(Object.keys(MARKS));
+var TONES = ["success", "warning", "neutral"];
+function paintMark(details, theme) {
+  const { color } = MARKS[details.kind];
+  return color === "review" ? paint(HEAT_COLORS.gold, details.icon) : theme.fg(color, details.icon);
+}
+function isValidCardDetails(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value))
+    return false;
+  const record = value;
+  if (Object.keys(record).length !== 6)
+    return false;
+  if (record.version !== VERSION2)
+    return false;
+  if (typeof record.kind !== "string" || !CARD_KINDS.has(record.kind))
+    return false;
+  if (typeof record.title !== "string")
+    return false;
+  if (!Array.isArray(record.lines) || !record.lines.every((line) => typeof line === "string"))
+    return false;
+  if (!TONES.includes(record.tone))
+    return false;
+  return typeof record.icon === "string";
+}
+function registerCardRenderer(pi) {
+  pi.registerMessageRenderer(CARD_TYPE, (message, _options, theme) => new ReviewCard(message.details, message.content, theme));
+}
+
+class ReviewCard {
+  card;
+  fallback;
+  constructor(details, content, theme) {
+    this.fallback = new Text5(plainContent(content), 0, 0);
+    let card;
+    try {
+      card = isValidCardDetails(details) ? nativeCard(details, theme) : undefined;
+    } catch {
+      card = undefined;
+    }
+    this.card = card;
+  }
+  render(width) {
+    try {
+      return (this.card ?? this.fallback).render(Math.max(1, width));
+    } catch {
+      try {
+        return this.fallback.render(Math.max(1, width));
+      } catch {
+        return [];
+      }
+    }
+  }
+  invalidate() {
+    this.card?.invalidate?.();
+    this.fallback.invalidate?.();
+  }
+}
+function nativeCard(details, theme) {
+  const box = new Box(1, 0, (text) => theme.bg(backgroundFor(details.tone), text));
+  box.addChild(new Text5(`${paintMark(details, theme)} ${details.title}`, 0, 0));
+  box.addChild(new Spacer4(1));
+  box.addChild(new Markdown3(details.lines.join(`
+`), 0, 0, getMarkdownTheme4()));
+  return box;
+}
+function backgroundFor(tone) {
+  if (tone === "success")
+    return "toolSuccessBg";
+  return tone === "warning" ? "toolErrorBg" : "customMessageBg";
+}
+function plainContent(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.map(plainPart).filter(Boolean).join(`
+`);
+}
+function plainPart(part) {
+  return typeof part === "object" && part !== null && "text" in part ? String(part.text) : "";
+}
+function buildCard(card) {
+  switch (card.kind) {
+    case "start":
+      return started(card);
+    case "pass":
+      return passed(card);
+    case "fail":
+      return failed2(card);
+    case "stop":
+      return stopped(card);
+    case "timeout":
+      return timedOut();
+    case "error":
+      return errored(card);
+    case "advisor":
+      return advisorCard(card);
+  }
+}
+function started(card) {
+  return spec("start", msg6.card.started, [msg6.card.startedModels(card.models.map(shortModel))], "neutral");
+}
+function passed(card) {
+  const title = qualityTitle(card.round, msg6.card.passed);
+  const lines = withFooter(formatReviewResultLines(card.summary), [
+    elapsedLine(card.elapsedMs, card.round > 1 ? card.totalElapsedMs : undefined)
+  ]);
+  return spec("pass", title, lines, "success");
+}
+function failed2(card) {
+  const title = qualityTitle(card.round, msg6.card.failed);
+  return spec("fail", title, withFooter(formatReviewResultLines(card.details), [elapsedLine(card.elapsedMs)]), "warning");
+}
+function stopped(card) {
+  const footer = card.elapsedMs === undefined ? [] : [elapsedLine(card.elapsedMs)];
+  if (card.reason === "advisor") {
+    const title = qualityTitle(card.round, msg6.card.stoppedByAdvisor);
+    const body = [advisorModelLine(card.advisorModel), "", ...adviceLines(card.advisor.advice)];
+    return spec("stop", title, withFooter(body, footer), "warning");
+  }
+  const title = qualityTitle(card.round, msg6.card.failed);
+  const body = formatReviewResultLines(card.details);
+  return spec("stop", title, withFooter(body, footer), "warning");
+}
+function timedOut() {
+  return spec("timeout", msg6.card.incomplete, [msg6.card.timeoutBlocker, msg6.card.timeoutReason], "warning");
+}
+function errored(card) {
+  const lines = [
+    msg6.card.errorBlocker,
+    msg6.card.errorReason(card.message),
+    ...card.elapsedMs === undefined ? [] : ["", elapsedLine(card.elapsedMs)]
+  ];
+  return spec("error", msg6.card.incomplete, lines, "warning");
+}
+function advisorCard(card) {
+  const title = msg6.card.advisorGuidance(msg6.card.decision[card.advisor.verdict]);
+  const body = [advisorModelLine(card.advisorModel), "", ...adviceLines(card.advisor.advice)];
+  return spec("advisor", title, withFooter(body, [elapsedLine(card.elapsedMs)]), "neutral");
+}
+function advisorModelLine(model) {
+  return msg6.card.modelLine(shortModel(model));
+}
+function adviceLines(advice) {
+  const output = [];
+  for (const line of advice.split(/\r?\n/u)) {
+    if (/^\*\*[^*]+\*\*\s*[:：]/u.test(line.trim()) && output.length > 0 && output.at(-1) !== "")
+      output.push("");
+    output.push(line);
+  }
+  return output;
+}
+function qualityTitle(round, title) {
+  return round <= 1 ? title : msg6.card.round(round, title);
+}
+function withFooter(lines, footer) {
+  if (footer.length === 0)
+    return lines;
+  return [...lines, ...lines.length > 0 ? ["", "---", ""] : [], ...footer];
+}
+function elapsedLine(ms, totalMs) {
+  return msg6.card.elapsed(formatDuration(ms), totalMs === undefined ? undefined : formatDuration(totalMs));
+}
+var MODEL_SECTION = new RegExp(String.raw`^${termPattern((terms) => terms.model)}\s+\d+\s+·\s+`, "iu");
+var EVIDENCE_LABEL = new RegExp(String.raw`^[-*+]?\s*(?:\*\*)?${termPattern((terms) => terms.field.evidence)}(?:\*\*)?\s*[:：]`, "u");
+function formatReviewResultLines(review) {
+  const lines = review.split(/\r?\n/u);
+  const sections = [];
+  const preface = [];
+  let current;
+  for (const line of lines) {
+    if (MODEL_SECTION.test(line.trim())) {
+      if (current)
+        sections.push(current);
+      current = { title: line.trim(), body: [] };
+    } else if (current)
+      current.body.push(line);
+    else
+      preface.push(line);
+  }
+  if (current)
+    sections.push(current);
+  if (sections.length === 0)
+    return normalizedReviewLines(review);
+  return [
+    ...normalizedReviewLines(preface.join(`
+`)),
+    ...preface.join("").trim() ? [""] : [],
+    ...sections.flatMap((section, index) => [
+      ...index > 0 ? ["", "---", ""] : [],
+      `**${section.title}**`,
+      "",
+      ...normalizedReviewLines(section.body.join(`
+`))
+    ])
   ];
 }
 function normalizedReviewLines(review) {
@@ -6639,13 +6832,7 @@ var ROUND_RESULTS = new Set([
 ]);
 var REVIEWER_STATUSES = new Set(["running", "passed", "failed", "error"]);
 var ADVISOR_VERDICTS = new Set(["continue", "stop", "narrow"]);
-var STOP_REASONS = new Set([
-  "advisor",
-  "max_rounds",
-  "user",
-  "shutdown",
-  "timeout"
-]);
+var STOP_REASONS = new Set(["user", "shutdown", "timeout"]);
 var REPAIR_STATUSES = new Set(["pending", "awaiting_start", "running", "completed"]);
 var SUMMARY_KINDS = new Set(["passed", "max_rounds", "advisor_stop"]);
 var SUMMARY_STATUSES = new Set(["pending", "awaiting_start", "running"]);
@@ -6716,9 +6903,6 @@ var CHECKPOINT_KEYS = keysOf({
   roundStartedAt: true,
   updatedAt: true
 });
-function isRecord7(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function isString(value) {
   return typeof value === "string";
 }
@@ -6732,21 +6916,21 @@ function hasOnlyKeys(record, keys) {
   return Object.keys(record).every((key) => keys.includes(key));
 }
 function isValidReviewerResult(value) {
-  if (!isRecord7(value))
+  if (!isRecord(value))
     return false;
   if (!isNonNegativeInt(value.index) || !hasOnlyKeys(value, REVIEWER_RESULT_KEYS))
     return false;
   return isString(value.model) && isString(value.thinking) && oneOf(value.status, REVIEWER_STATUSES) && value.status !== "running" && isString(value.summary) && isString(value.details);
 }
 function isValidActiveReviewer(value) {
-  if (!isRecord7(value) || !isNonNegativeInt(value.index))
+  if (!isRecord(value) || !isNonNegativeInt(value.index))
     return false;
   if (!hasOnlyKeys(value, ACTIVE_REVIEWER_KEYS))
     return false;
   return isString(value.model) && isString(value.thinking) && oneOf(value.status, REVIEWER_STATUSES) && (value.result === null || isValidReviewerResult(value.result));
 }
 function isValidActiveCheck(value) {
-  if (!isRecord7(value))
+  if (!isRecord(value))
     return false;
   if (!hasOnlyKeys(value, ACTIVE_CHECK_KEYS))
     return false;
@@ -6757,19 +6941,19 @@ function isValidActiveCheck(value) {
   return round >= 1 && Array.isArray(value.reviewers) && value.reviewers.every(isValidActiveReviewer) && value.reviewers.length > 0 && settledCount <= value.reviewers.length;
 }
 function isValidAdvisor(value) {
-  if (!isRecord7(value) || !hasOnlyKeys(value, ADVISOR_KEYS))
+  if (!isRecord(value) || !hasOnlyKeys(value, ADVISOR_KEYS))
     return false;
   return oneOf(value.verdict, ADVISOR_VERDICTS) && isString(value.advice);
 }
 function isValidRound(value) {
-  if (!isRecord7(value))
+  if (!isRecord(value))
     return false;
   if (!hasOnlyKeys(value, ROUND_KEYS))
     return false;
   return isNonNegativeInt(value.round) && oneOf(value.result, ROUND_RESULTS) && isString(value.details) && Array.isArray(value.reviewers) && value.reviewers.every(isValidReviewerResult) && (value.advisor === undefined || isValidAdvisor(value.advisor)) && (value.reason === undefined || oneOf(value.reason, STOP_REASONS)) && isNonNegativeInt(value.elapsedMs);
 }
 function isValidPendingRound(value) {
-  if (!isRecord7(value))
+  if (!isRecord(value))
     return false;
   if (!hasOnlyKeys(value, PENDING_ROUND_KEYS))
     return false;
@@ -6777,13 +6961,13 @@ function isValidPendingRound(value) {
   return isNonNegativeInt(round) && round >= 1 && Array.isArray(value.reviewers) && value.reviewers.every(isValidReviewerResult) && isString(value.details);
 }
 function isValidRepair(value) {
-  return isRecord7(value) && hasOnlyKeys(value, REPAIR_KEYS) && isString(value.details) && (value.advisor === null || isValidAdvisor(value.advisor)) && oneOf(value.status, REPAIR_STATUSES);
+  return isRecord(value) && hasOnlyKeys(value, REPAIR_KEYS) && isString(value.details) && (value.advisor === null || isValidAdvisor(value.advisor)) && oneOf(value.status, REPAIR_STATUSES);
 }
 function isValidSummary(value) {
-  return isRecord7(value) && hasOnlyKeys(value, SUMMARY_KEYS) && oneOf(value.kind, SUMMARY_KINDS) && oneOf(value.status, SUMMARY_STATUSES);
+  return isRecord(value) && hasOnlyKeys(value, SUMMARY_KEYS) && oneOf(value.kind, SUMMARY_KINDS) && oneOf(value.status, SUMMARY_STATUSES);
 }
 function isValidCheckpoint(value) {
-  if (!isRecord7(value))
+  if (!isRecord(value))
     return false;
   if (!hasOnlyKeys(value, CHECKPOINT_KEYS))
     return false;
@@ -6810,29 +6994,23 @@ function toCheckpoint(state) {
   };
 }
 function readCheckpoint(ctx) {
-  const entry = latestEntry(ctx);
-  return entry ? entry : undefined;
+  return latestData(ctx);
+}
+function isCheckpointEntry(value) {
+  return isRecord(value) && value.type === "custom" && value.customType === CHECKPOINT_TYPE && "data" in value;
 }
-function latestEntry(ctx) {
+function latestData(ctx) {
   const entries = ctx.sessionManager.getBranch();
   for (let index = entries.length - 1;index >= 0; index -= 1) {
     const entry = entries[index];
-    if (!isRecord7(entry) || entry.type !== "custom")
-      continue;
-    if (entry.customType !== CHECKPOINT_TYPE)
-      continue;
-    if (!isValidCheckpoint(entry.data))
-      return;
-    return entry.data;
+    if (isCheckpointEntry(entry))
+      return isValidCheckpoint(entry.data) ? entry.data : undefined;
   }
   return;
 }
 function readStamp(ctx) {
-  const entry = latestEntry(ctx);
-  if (!entry)
-    return null;
-  const data = entry;
-  return { runId: data.runId, seq: data.seq };
+  const data = latestData(ctx);
+  return data ? { runId: data.runId, seq: data.seq } : null;
 }
 function appendCheckpoint(pi, state, seq) {
   const data = { ...toCheckpoint(state), seq };
@@ -6841,12 +7019,12 @@ function appendCheckpoint(pi, state, seq) {
   pi.appendEntry(CHECKPOINT_TYPE, data);
   return { runId: state.runId, seq };
 }
-function beginCheckpoint(pi, _ctx, state) {
+function beginCheckpoint(pi, state) {
   return appendCheckpoint(pi, state, 1);
 }
 function writeCheckpoint(pi, ctx, state, expected) {
   const current = readStamp(ctx);
-  if (!current || current.runId !== expected.runId || current.seq !== expected.seq)
+  if (current?.runId !== expected.runId || current.seq !== expected.seq)
     throw new CheckpointConflictError;
   return appendCheckpoint(pi, state, expected.seq + 1);
 }
@@ -6888,7 +7066,7 @@ ${omitted > 0 ? `${msg6.evidence.gap(omitted)}
 function collectFailedCalls(entries) {
   const failed = new Set;
   for (const entry of entries) {
-    if (!isRecord8(entry) || entry.type !== "message")
+    if (!isRecord(entry) || entry.type !== "message")
       continue;
     const message = asRecord2(entry.message);
     if (message?.role !== "toolResult" || message.isError !== true)
@@ -6899,7 +7077,7 @@ function collectFailedCalls(entries) {
   return failed;
 }
 function renderEntry(entry, render) {
-  if (!isRecord8(entry))
+  if (!isRecord(entry))
     return [];
   switch (entry.type) {
     case "message": {
@@ -6926,11 +7104,13 @@ ${assistantBody(message.content, render)}` }];
 ${clip2(textOf(entry.content), render)}` }];
     }
     case "compaction":
-      return typeof entry.summary === "string" && entry.summary ? [{ text: `## ${msg6.evidence.compaction}
-${clip2(entry.summary, render)}` }] : [];
-    case "branch_summary":
-      return typeof entry.summary === "string" && entry.summary ? [{ text: `## ${msg6.evidence.branchSummary}
-${clip2(entry.summary, render)}` }] : [];
+    case "branch_summary": {
+      if (typeof entry.summary !== "string" || !entry.summary)
+        return [];
+      const label = entry.type === "compaction" ? msg6.evidence.compaction : msg6.evidence.branchSummary;
+      return [{ text: `## ${label}
+${clip2(entry.summary, render)}` }];
+    }
     default:
       return [];
   }
@@ -6985,11 +7165,8 @@ function isCjk(char) {
   const code = char.codePointAt(0) ?? 0;
   return code >= 19968 && code <= 40959 || code >= 13312 && code <= 19903 || code >= 63744 && code <= 64255;
 }
-function isRecord8(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function asRecord2(value) {
-  return isRecord8(value) ? value : undefined;
+  return isRecord(value) ? value : undefined;
 }
 
 // review/ui.ts
@@ -6997,7 +7174,6 @@ import { basename as basename2 } from "node:path";
 import {
   CustomEditor as CustomEditor2
 } from "@earendil-works/pi-coding-agent";
-var reviewTitleActive = false;
 function lockEditor(ctx, cancel) {
   if (ctx.hasUI === false || typeof ctx.ui.setEditorComponent !== "function")
     return () => {};
@@ -7032,26 +7208,47 @@ class ReviewEditor extends CustomEditor2 {
     return [lines[0], `\x1B[2m${hint}\x1B[22m`, lines[lines.length - 1]];
   }
 }
-function showReviewTitle(ctx, round) {
-  if (!ctx.hasUI || typeof ctx.ui.setTitle !== "function")
-    return;
-  const manager = ctx.sessionManager;
-  const rawName = manager.getSessionName?.();
-  const rawCwd = manager.getCwd?.();
-  const who = typeof rawName === "string" && rawName ? rawName : typeof rawCwd === "string" ? basename2(rawCwd) : "";
-  reviewTitleActive = true;
-  ctx.ui.setTitle(`${msg6.ui.reviewing}${round > 0 ? ` R${round}` : ""}${who ? ` · ${who}` : ""}`);
-}
-function hideReviewTitle(ctx) {
-  if (!reviewTitleActive || !ctx.hasUI || typeof ctx.ui.setTitle !== "function")
-    return;
-  reviewTitleActive = false;
+
+class ReviewUi {
+  unlockEditor;
+  titleShown = false;
+  show(ctx, round, canCancel, cancel) {
+    this.showTitle(ctx, round);
+    if (!canCancel)
+      return this.releaseEditor();
+    this.unlockEditor ??= lockEditor(ctx, cancel);
+  }
+  clear(ctx) {
+    if (this.titleShown && canSetTitle(ctx))
+      ctx.ui.setTitle(restoredTitle(ctx));
+    this.titleShown = false;
+    this.releaseEditor();
+  }
+  showTitle(ctx, round) {
+    if (!canSetTitle(ctx))
+      return;
+    const { name, dir } = identity(ctx);
+    const who = name || dir;
+    this.titleShown = true;
+    ctx.ui.setTitle(`${msg6.ui.reviewing}${round > 0 ? ` R${round}` : ""}${who ? ` · ${who}` : ""}`);
+  }
+  releaseEditor() {
+    this.unlockEditor?.();
+    this.unlockEditor = undefined;
+  }
+}
+function canSetTitle(ctx) {
+  return ctx.hasUI && typeof ctx.ui.setTitle === "function";
+}
+function identity(ctx) {
   const manager = ctx.sessionManager;
-  const rawName = manager.getSessionName?.();
-  const rawCwd = manager.getCwd?.();
-  const name = typeof rawName === "string" && rawName ? rawName : undefined;
-  const dir = typeof rawCwd === "string" ? basename2(rawCwd) : "";
-  ctx.ui.setTitle(name ? `π - ${name} - ${dir}` : `π - ${dir}`);
+  const name = manager.getSessionName?.();
+  const cwd = manager.getCwd?.();
+  return { name: typeof name === "string" && name ? name : undefined, dir: typeof cwd === "string" ? basename2(cwd) : "" };
+}
+function restoredTitle(ctx) {
+  const { name, dir } = identity(ctx);
+  return name ? `π - ${name} - ${dir}` : `π - ${dir}`;
 }
 
 // review/prompt.ts
@@ -7120,16 +7317,14 @@ function buildFixFeedback(input) {
 `));
 }
 var SUMMARY_MATERIAL_LIMIT = 4000;
-var SUMMARY_KEYS2 = { passed: "passed", max_rounds: "maxRounds", advisor_stop: "advisorStop" };
 function buildSummaryPrompt(input) {
   const omitted = input.material.length - SUMMARY_MATERIAL_LIMIT;
   const material = omitted > 0 ? `${input.material.slice(0, SUMMARY_MATERIAL_LIMIT)}
 ${msg6.prompt.materialTruncated(omitted)}` : input.material;
-  const key = SUMMARY_KEYS2[input.kind];
-  const body = msg6.prompt.summaryInstruction[key](input.rounds);
+  const body = msg6.prompt.summaryInstruction[input.kind](input.rounds);
   const content = material.trim() ? `${body}
 
-${msg6.prompt.materialLabel[key]}
+${msg6.prompt.materialLabel[input.kind]}
 ${material}` : body;
   return wrapEnvelope("firecode_review", content);
 }
@@ -7138,28 +7333,16 @@ ${material}` : body;
 async function runAdvisor(options) {
   const result = await options.runSession({
     role: "advisor",
-    model: options.config.model,
-    thinking: options.config.thinking,
-    tools: options.config.tools,
+    config: options.config,
     prompt: options.prompt,
     cwd: options.cwd,
-    timeoutMs: options.config.timeoutMs,
     signal: options.signal
   });
   if (result.kind !== "output")
-    throw new Error(advisorProcessError(result));
+    throw new Error(msg6.advisor.unavailable(result.kind === "error" ? result.message : result.kind));
   return parseAdvisorOutput(result.text);
 }
 var VERDICTS = new Set(["continue", "stop", "narrow"]);
-function advisorProcessError(result) {
-  if (result.kind === "aborted")
-    return msg6.advisor.unavailable("aborted");
-  if (result.kind === "timeout")
-    return msg6.advisor.unavailable("timeout");
-  if (result.kind === "empty")
-    return msg6.advisor.unavailable("empty output");
-  return msg6.advisor.unavailable(result.message);
-}
 var VERDICT_SCAN_LINES = 8;
 function parseAdvisorOutput(text) {
   const lines = unwrapCodeFence(text.trim().split(/\r?\n/));
@@ -7205,12 +7388,9 @@ function normalizeVerdict(line) {
 async function runReviewer(options) {
   const result = await options.runSession({
     role: "reviewer",
-    model: options.config.model,
-    thinking: options.config.thinking,
-    tools: options.config.tools,
+    config: options.config,
     prompt: options.prompt,
     cwd: options.cwd,
-    timeoutMs: options.config.timeoutMs,
     signal: options.signal
   });
   const parsed = result.kind === "output" ? parseReviewOutput(result.text) : processFailure(result);
@@ -7272,22 +7452,13 @@ var FILE_SEGMENT = new RegExp(`${termPattern((terms) => terms.anchor.files)}\\s*
 var COMMAND_SEGMENT = new RegExp(`${termPattern((terms) => terms.anchor.commands)}\\s*=\\s*([^;；]*)`, "iu");
 var FILE_ANCHOR = /[\w@./-]*\w\.[a-zA-Z]\w{0,5}\b/u;
 var FINDING_HEADING = new RegExp(`^#{1,6}\\s*${termPattern((terms) => terms.finding)}`, "u");
-var SUGGESTIONS_HEADING = new RegExp(`^##\\s+${termPattern((terms) => terms.suggestions)}\\s*$`, "iu");
 var SUGGESTIONS_HEADING_SPLIT = new RegExp(SUGGESTIONS_HEADING.source, "imu");
 var bulletField = (label, value = "") => new RegExp(`^[-*+]\\s*(?:\\*\\*)?${label}(?:\\*\\*)?\\s*[:：]\\s*${value}`, "iu");
 var FINDING_ISSUE = bulletField(termPattern((terms) => terms.field.issue), "(.*)$");
-var FINDING_FIELDS = [
-  { key: "issue", label: termPattern((terms) => terms.field.issue) },
-  { key: "evidence", label: termPattern((terms) => terms.field.evidence) },
-  {
-    key: "contract",
-    label: termPattern((terms) => terms.field.contract, "违反的约定与期望", "违反的契约或期望行为", "违反的契约", "Violated agreement", "Contract or expected behavior violated", "Contract violated")
-  },
-  {
-    key: "commands",
-    label: termPattern((terms) => terms.field.commands, "需要运行的验证命令", "Verification commands", "Verification command to run", "Verification commands to run")
-  }
-];
+var FINDING_FIELDS = ["issue", "evidence", "contract", "commands"].map((key) => ({
+  key,
+  label: termPattern((terms) => terms.field[key])
+}));
 var SEVERITY_LABEL = termPattern((terms) => terms.field.severity);
 var SEVERITY_LINE = bulletField(SEVERITY_LABEL, `(?:${termPattern((terms) => terms.high)}|${termPattern((terms) => terms.medium)})\\s*$`);
 var FIELD_START = new RegExp(`^[-*+]\\s*(?:\\*\\*)?(?:${[SEVERITY_LABEL, ...FINDING_FIELDS.map((field) => field.label)].join("|")})`, "iu");
@@ -7378,28 +7549,28 @@ function clean(text) {
 
 // review/session.ts
 function createReviewSessionRunner(pool) {
-  return (options) => runReviewSession({ ...options, pool });
+  return (request) => runReviewSession(pool, request);
 }
-async function runReviewSession(options) {
-  if (options.signal?.aborted)
+async function runReviewSession(pool, { role, config, prompt, cwd, signal }) {
+  if (signal?.aborted)
     return { kind: "aborted" };
   let spawned;
   try {
-    spawned = await options.pool.spawn({
-      cwd: options.cwd,
-      role: options.role,
-      model: await options.pool.resolveModel(options.model),
-      thinking: options.thinking,
-      tools: [...new Set(options.tools)].filter((tool) => tool !== "write" && tool !== "edit"),
-      systemPrompt: { mode: "replace", text: clean2(options.prompt.system) },
+    spawned = await pool.spawn({
+      cwd,
+      role,
+      model: await pool.resolveModel(config.model),
+      thinking: config.thinking,
+      tools: [...new Set(config.tools)].filter((tool) => tool !== "write" && tool !== "edit"),
+      systemPrompt: { mode: "replace", text: clean2(prompt.system) },
       contextFiles: false,
       persistence: { type: "memory" },
       isolated: true
     });
   } catch (error) {
-    return options.signal?.aborted ? { kind: "aborted" } : { kind: "error", message: errorText(error) };
+    return signal?.aborted ? { kind: "aborted" } : { kind: "error", message: errorText(error) };
   }
-  if (options.signal?.aborted) {
+  if (signal?.aborted) {
     await spawned.dispose();
     return { kind: "aborted" };
   }
@@ -7421,13 +7592,13 @@ async function runReviewSession(options) {
     interrupted = "aborted";
     wake();
   };
-  options.signal?.addEventListener("abort", onAbort, { once: true });
+  signal?.addEventListener("abort", onAbort, { once: true });
   const timeout = setTimeout(() => {
     interrupted = "timeout";
     wake();
-  }, options.timeoutMs);
+  }, config.timeoutMs);
   try {
-    const run = spawned.prompt(clean2(options.prompt.user)).catch((error) => {
+    const run = spawned.prompt(clean2(prompt.user)).catch((error) => {
       finalError = errorText(error);
     });
     await Promise.race([run, interruption]);
@@ -7438,7 +7609,7 @@ async function runReviewSession(options) {
     return finalText?.trim() ? { kind: "output", text: finalText } : { kind: "empty" };
   } finally {
     clearTimeout(timeout);
-    options.signal?.removeEventListener("abort", onAbort);
+    signal?.removeEventListener("abort", onAbort);
     unsubscribe();
     await spawned.dispose();
   }
@@ -7448,572 +7619,25 @@ function assistantMessage(event) {
     return event.message.role === "assistant" ? event.message : undefined;
   if (event.type !== "agent_end")
     return;
-  return [...event.messages].reverse().find((message) => message.role === "assistant");
-}
-function clean2(text) {
-  return text.replaceAll("\x00", "");
-}
-function errorText(error) {
-  return error instanceof Error ? error.message : String(error);
-}
-
-// review/state.ts
-var SUGGESTIONS_HEADING2 = new RegExp(`^##\\s*${termPattern((terms) => terms.suggestions)}`, "iu");
-var ISSUE_LINE = new RegExp(`^[-*+]\\s*(?:\\*\\*)?${termPattern((terms) => terms.field.issue)}(?:\\*\\*)?\\s*[:：]\\s*(.+)$`, "iu");
-function initialState(runId) {
-  return {
-    runId,
-    phase: "idle",
-    round: 0,
-    focus: "",
-    history: [],
-    active: null,
-    pending: null,
-    repair: null,
-    summary: null,
-    consecutiveFailures: 0,
-    startedAt: 0,
-    roundStartedAt: 0,
-    updatedAt: 0
-  };
-}
-function reduce(state, event, limits, now) {
-  switch (event.type) {
-    case "START":
-      return onStart(state, event, limits, now);
-    case "RECOVER":
-      return onRecover(state);
-    case "REVIEWER_SETTLED":
-      return onReviewerSettled(state, event, limits, now);
-    case "ADVISOR_SETTLED":
-      return onAdvisorSettled(state, event, limits, now);
-    case "ADVISOR_SKIPPED":
-      return onAdvisorSkipped(state, now);
-    case "INFRASTRUCTURE_ERROR":
-      return onInfrastructureError(state, event.details, now);
-    case "ADVANCE":
-      return onAdvance(state, limits, now);
-    case "FEEDBACK_DISPATCHED":
-      return updateRepairStatus(state, "pending", "awaiting_start", now);
-    case "REPAIR_STARTED":
-      return updateRepairStatus(state, "awaiting_start", "running", now);
-    case "REPAIR_COMPLETED":
-      return updateRepairStatus(state, "running", "completed", now);
-    case "SUMMARY_DISPATCHED":
-      return updateSummaryStatus(state, "pending", "awaiting_start", now);
-    case "SUMMARY_STARTED":
-      return updateSummaryStatus(state, "awaiting_start", "running", now);
-    case "SUMMARY_SETTLED":
-      return onSummarySettled(state, now);
-    case "CANCEL":
-      return onCancel(state, event.reason, now);
-    case "TIMEOUT":
-      return onTimeout(state, now);
-  }
-}
-function onStart(state, event, limits, now) {
-  if (state.phase === "reviewing" || state.phase === "needs_fix" || state.phase === "awaiting_fix")
-    return { state, effects: [] };
-  const focus = event.focus.trim();
-  if (event.busy)
-    return {
-      state: {
-        ...initialState(state.runId),
-        phase: "queued",
-        focus,
-        startedAt: now,
-        updatedAt: now
-      },
-      effects: [{ kind: "advance" }]
-    };
-  return {
-    state: beginRound({ ...initialState(state.runId), startedAt: now }, focus, 1, limits, now),
-    effects: [
-      {
-        kind: "send_card",
-        card: {
-          kind: "start",
-          round: 1,
-          focus,
-          models: limits.reviewers.map((item) => item.model)
-        }
-      },
-      { kind: "advance" }
-    ]
-  };
-}
-function onRecover(state) {
-  if (state.phase === "idle" || state.phase === "settled")
-    return { state, effects: [] };
-  const repair = state.phase === "awaiting_fix" && state.repair && state.repair.status !== "completed" ? { ...state.repair, status: "pending" } : state.repair;
-  const summary = state.phase === "summarizing" && state.summary ? { ...state.summary, status: "pending" } : state.summary;
-  return { state: { ...state, repair, summary }, effects: [] };
-}
-function updateRepairStatus(state, expected, status, now) {
-  if (state.phase !== "awaiting_fix" || state.repair?.status !== expected)
-    return { state, effects: [] };
-  return {
-    state: { ...state, repair: { ...state.repair, status }, updatedAt: now },
-    effects: []
-  };
-}
-function updateSummaryStatus(state, expected, status, now) {
-  if (state.phase !== "summarizing" || state.summary?.status !== expected)
-    return { state, effects: [] };
-  return {
-    state: { ...state, summary: { ...state.summary, status }, updatedAt: now },
-    effects: []
-  };
-}
-function onSummarySettled(state, now) {
-  if (state.phase !== "summarizing")
-    return { state, effects: [] };
-  return {
-    state: { ...state, phase: "settled", summary: null, updatedAt: now },
-    effects: []
-  };
-}
-function summarizing(kind) {
-  return { phase: "summarizing", summary: { kind, status: "pending" } };
-}
-function onAdvance(state, limits, now) {
-  if (state.phase === "queued")
-    return {
-      state: beginRound(state, state.focus, 1, limits, now),
-      effects: [
-        {
-          kind: "send_card",
-          card: {
-            kind: "start",
-            round: 1,
-            focus: state.focus,
-            models: limits.reviewers.map((item) => item.model)
-          }
-        },
-        { kind: "advance" }
-      ]
-    };
-  if (state.phase !== "awaiting_fix" || state.repair?.status !== "completed")
-    return { state, effects: [] };
-  if (state.round >= limits.maxRounds)
-    return {
-      state: { ...state, ...summarizing("max_rounds"), repair: null, updatedAt: now },
-      effects: [
-        {
-          kind: "send_card",
-          card: { kind: "stop", reason: "max_rounds", round: state.round, details: "" }
-        },
-        { kind: "advance" }
-      ]
-    };
-  return {
-    state: beginRound(state, state.focus, state.round + 1, limits, now),
-    effects: [{ kind: "advance" }]
-  };
-}
-function onReviewerSettled(state, event, limits, now) {
-  if (state.phase !== "reviewing" || !state.active)
-    return { state, effects: [] };
-  const active = state.active;
-  const settled = [];
-  const reviewers = active.reviewers.map((item) => {
-    if (item.index !== event.index)
-      return item;
-    settled.push(event.result);
-    return { ...item, status: event.result.status, result: event.result };
-  });
-  const settledCount = active.settledCount + 1;
-  const nextActive = { ...active, reviewers, settledCount };
-  if (settledCount < reviewers.length)
-    return {
-      state: { ...state, active: nextActive, updatedAt: now },
-      effects: []
-    };
-  const allSettled = nextActive.reviewers.flatMap((item) => item.result ? [item.result] : []);
-  return settleRound(state, nextActive, allSettled, limits, now);
-}
-function settleRound(state, active, settled, limits, now) {
-  const { result, displayDetails, feedbackDetails, archiveDetails, summary } = aggregate(settled);
-  const base = { ...state, active: null, updatedAt: now };
-  const totalElapsedMs = Math.max(0, now - state.startedAt);
-  const passSummary = result === "passed" ? appendClosedFindings(summary, state.history, active.round) : summary;
-  if (result === "passed" || result === "error") {
-    const round = roundRecord(active.round, result, archiveDetails, settled, undefined, state.roundStartedAt, now);
-    const history = [...state.history, round];
-    if (result === "passed")
-      return {
-        state: { ...base, ...summarizing("passed"), history },
-        effects: [
-          {
-            kind: "send_card",
-            card: {
-              kind: "pass",
-              round: active.round,
-              summary: passSummary,
-              details: archiveDetails,
-              elapsedMs: round.elapsedMs,
-              totalElapsedMs
-            }
-          },
-          { kind: "advance" }
-        ]
-      };
-    return {
-      state: { ...base, phase: "settled", history },
-      effects: [
-        {
-          kind: "send_card",
-          card: { kind: "error", message: displayDetails, elapsedMs: round.elapsedMs, totalElapsedMs }
-        }
-      ]
-    };
-  }
-  const consecutiveFailures = state.consecutiveFailures + 1;
-  if (active.round >= limits.maxRounds) {
-    const round = roundRecord(active.round, "failed", archiveDetails, settled, undefined, state.roundStartedAt, now);
-    return {
-      state: {
-        ...base,
-        ...summarizing("max_rounds"),
-        consecutiveFailures,
-        history: [...state.history, round]
-      },
-      effects: [
-        {
-          kind: "send_card",
-          card: {
-            kind: "stop",
-            reason: "max_rounds",
-            round: active.round,
-            details: displayDetails,
-            elapsedMs: round.elapsedMs
-          }
-        },
-        { kind: "advance" }
-      ]
-    };
-  }
-  const failCard = {
-    kind: "send_card",
-    card: {
-      kind: "fail",
-      round: active.round,
-      details: displayDetails,
-      advisor: null,
-      elapsedMs: Math.max(0, now - state.roundStartedAt),
-      totalElapsedMs
-    }
-  };
-  const pending = { round: active.round, reviewers: settled, details: feedbackDetails };
-  if (consecutiveFailures >= limits.advisorAfterFailures)
-    return {
-      state: { ...base, phase: "needs_fix", pending, consecutiveFailures },
-      effects: [failCard, { kind: "advance" }]
-    };
-  return {
-    state: {
-      ...base,
-      phase: "awaiting_fix",
-      pending: null,
-      repair: { details: feedbackDetails, advisor: null, status: "pending" },
-      consecutiveFailures,
-      history: [
-        ...state.history,
-        roundRecord(active.round, "failed", archiveDetails, settled, undefined, state.roundStartedAt, now)
-      ]
-    },
-    effects: [failCard, { kind: "advance" }]
-  };
-}
-function onAdvisorSettled(state, event, limits, now) {
-  if (state.phase !== "needs_fix" || !state.pending)
-    return { state, effects: [] };
-  const pending = state.pending;
-  const advisor = event.result;
-  if (advisor.verdict === "stop") {
-    const round = roundRecord(pending.round, "stopped", advisor.advice, pending.reviewers, advisor, state.roundStartedAt, now);
-    return {
-      state: { ...state, ...summarizing("advisor_stop"), pending: null, history: [...state.history, round], updatedAt: now },
-      effects: [
-        {
-          kind: "send_card",
-          card: {
-            kind: "stop",
-            reason: "advisor",
-            round: pending.round,
-            details: advisor.advice,
-            advisor,
-            advisorModel: limits.advisorModel,
-            elapsedMs: Math.max(0, now - state.updatedAt),
-            totalElapsedMs: Math.max(0, now - state.startedAt)
-          }
-        },
-        { kind: "advance" }
-      ]
-    };
-  }
-  const round = roundRecord(pending.round, "failed", pending.details, pending.reviewers, advisor, state.roundStartedAt, now);
-  return {
-    state: {
-      ...state,
-      phase: "awaiting_fix",
-      pending: null,
-      repair: { details: pending.details, advisor, status: "pending" },
-      history: [...state.history, round],
-      updatedAt: now
-    },
-    effects: [
-      {
-        kind: "send_card",
-        card: {
-          kind: "advisor",
-          advisor,
-          advisorModel: limits.advisorModel,
-          elapsedMs: Math.max(0, now - state.updatedAt)
-        }
-      },
-      { kind: "advance" }
-    ]
-  };
-}
-function onAdvisorSkipped(state, now) {
-  if (state.phase !== "needs_fix" || !state.pending)
-    return { state, effects: [] };
-  const pending = state.pending;
-  const round = roundRecord(pending.round, "failed", pending.details, pending.reviewers, undefined, state.roundStartedAt, now);
-  return {
-    state: {
-      ...state,
-      phase: "awaiting_fix",
-      pending: null,
-      repair: { details: pending.details, advisor: null, status: "pending" },
-      history: [...state.history, round],
-      updatedAt: now
-    },
-    effects: [{ kind: "advance" }]
-  };
-}
-function onCancel(state, reason, now) {
-  if (state.phase === "idle" || state.phase === "settled")
-    return { state, effects: [] };
-  if (state.phase === "summarizing")
-    return onSummarySettled(state, now);
-  if (state.phase === "queued")
-    return {
-      state: { ...state, phase: "settled", updatedAt: now },
-      effects: [{ kind: "send_card", card: { kind: "cancel", round: 0, reason } }]
-    };
-  const round = resolveRoundRecord(state, "cancelled", reason, now);
-  return {
-    state: {
-      ...state,
-      phase: "settled",
-      active: null,
-      pending: null,
-      repair: null,
-      history: round ? [...state.history, round] : state.history,
-      updatedAt: now
-    },
-    effects: [{ kind: "send_card", card: { kind: "cancel", round: state.round, reason } }]
-  };
-}
-function onInfrastructureError(state, details, now) {
-  if (state.phase === "idle" || state.phase === "settled")
-    return { state, effects: [] };
-  if (state.phase === "summarizing")
-    return onSummarySettled(state, now);
-  const message = details.trim() || "review infrastructure unavailable";
-  const reviewers = state.active?.reviewers.flatMap((item) => item.result ? [item.result] : []) ?? state.pending?.reviewers ?? [];
-  const round = state.round > 0 ? roundRecord(state.round, "error", message, reviewers, undefined, state.roundStartedAt, now) : undefined;
-  return {
-    state: {
-      ...state,
-      phase: "settled",
-      active: null,
-      pending: null,
-      repair: null,
-      history: round ? [...state.history, round] : state.history,
-      updatedAt: now
-    },
-    effects: [{ kind: "send_card", card: { kind: "error", message } }]
-  };
-}
-function onTimeout(state, now) {
-  if (state.phase === "idle" || state.phase === "settled")
-    return { state, effects: [] };
-  if (state.phase === "summarizing")
-    return onSummarySettled(state, now);
-  if (state.phase === "queued")
-    return {
-      state: { ...state, phase: "settled", updatedAt: now },
-      effects: [{ kind: "send_card", card: { kind: "timeout", round: 0, reason: "timeout" } }]
-    };
-  const round = resolveRoundRecord(state, "timed_out", "timeout", now);
-  return {
-    state: {
-      ...state,
-      phase: "settled",
-      active: null,
-      pending: null,
-      repair: null,
-      history: round ? [...state.history, round] : state.history,
-      updatedAt: now
-    },
-    effects: [
-      { kind: "send_card", card: { kind: "timeout", round: state.round, reason: "timeout" } }
-    ]
-  };
-}
-function beginRound(state, focus, round, limits, now) {
-  const reviewers = limits.reviewers.map((item, index) => ({
-    index,
-    model: item.model,
-    thinking: item.thinking,
-    status: "running",
-    result: null
-  }));
-  return {
-    ...state,
-    phase: "reviewing",
-    round,
-    focus,
-    active: { round, reviewers, settledCount: 0 },
-    pending: null,
-    repair: null,
-    summary: null,
-    roundStartedAt: now,
-    updatedAt: now
-  };
-}
-function aggregate(reviewers) {
-  const verdicts = reviewers.filter((item) => item.status === "passed" || item.status === "failed");
-  const absent = reviewers.filter((item) => item.status === "error");
-  const archiveDetails = aggregateDetails(reviewers);
-  if (verdicts.length === 0)
-    return { result: "error", displayDetails: archiveDetails, feedbackDetails: "", archiveDetails, summary: "" };
-  const failed = verdicts.filter((item) => item.status === "failed");
-  if (failed.length > 0)
-    return {
-      result: "failed",
-      displayDetails: archiveDetails,
-      feedbackDetails: aggregateDetails(failed),
-      archiveDetails,
-      summary: ""
-    };
-  return {
-    result: "passed",
-    displayDetails: archiveDetails,
-    feedbackDetails: "",
-    archiveDetails,
-    summary: aggregatePassSummary(verdicts, absent)
-  };
-}
-function aggregateDetails(reviewers) {
-  return reviewers.map((item) => `${modelLabel(item)}
-${item.details.trim()}`).join(`
-
-`);
-}
-function aggregatePassSummary(passed, absent) {
-  const fallback = msg6.summary.passedFallback;
-  const lines = passed.length === 1 ? [passBody(passed[0]?.summary ?? "") || fallback] : passed.map((item) => msg6.summary.modelBullet(shortModel2(item.model), passBody(item.summary) || fallback));
-  if (absent.length > 0)
-    lines.push(msg6.summary.absent(absent.map((item) => ({ model: shortModel2(item.model), reason: firstLine(item.details) }))));
-  const suggestions = [...new Set(passed.flatMap((item) => splitSuggestions(item.details).suggestions))];
-  if (suggestions.length === 0)
-    return lines.join(`
-`);
-  return [
-    ...lines,
-    "",
-    `## ${msg6.terms.suggestions}`,
-    ...suggestions.map((item) => `- ${item}`)
-  ].join(`
-`);
-}
-function firstLine(text) {
-  return text.trim().split(/\r?\n/u, 1)[0]?.split(/[：:]/u, 1)[0]?.trim() ?? "";
-}
-function splitSuggestions(summary) {
-  const lines = summary.split(/\r?\n/u);
-  const index = lines.findIndex((line) => SUGGESTIONS_HEADING2.test(line.trim()));
-  if (index < 0)
-    return { body: summary, suggestions: [] };
-  return {
-    body: lines.slice(0, index).join(`
-`),
-    suggestions: lines.slice(index + 1).map((line) => line.replace(/^[-*]\s*/u, "").trim()).filter(Boolean)
-  };
-}
-function passBody(summary) {
-  return summary.replace(/^(?:PASS\s*)/iu, "").trim();
-}
-function shortModel2(model) {
-  return model.split("/").at(-1) || model;
-}
-function appendClosedFindings(summary, history, beforeRound) {
-  const seen = new Set;
-  const findings = [];
-  for (const round of history) {
-    if (round.round >= beforeRound || round.result !== "failed")
-      continue;
-    for (const line of round.details.split(/\r?\n/u)) {
-      const match = ISSUE_LINE.exec(line.trim());
-      const issue = match?.[1]?.replace(/`([^`]+)`/gu, "$1").trim();
-      if (!issue)
-        continue;
-      const key = issue.replace(/\s+/gu, "");
-      if (seen.has(key))
-        continue;
-      seen.add(key);
-      findings.push({ round: round.round, issue });
-    }
-  }
-  if (findings.length === 0)
-    return summary;
-  const shown = findings.slice(0, 6);
-  const recap = [msg6.summary.closedHeading, ...shown.map((finding) => msg6.summary.closedItem(finding.issue, finding.round))];
-  if (findings.length > shown.length)
-    recap.push(msg6.summary.closedMore(findings.length - shown.length));
-  return `${summary}
-
-${recap.join(`
-`)}`;
-}
-function modelLabel(item) {
-  return msg6.summary.modelSection(item.index + 1, shortModel2(item.model));
+  return [...event.messages].reverse().find((message) => message.role === "assistant");
 }
-function resolveRoundRecord(state, result, reason, now) {
-  if (state.phase === "reviewing" && state.active) {
-    const settled = state.active.reviewers.flatMap((item) => item.result ? [item.result] : []);
-    return roundRecord(state.active.round, result, "", settled, undefined, state.roundStartedAt, now, reason);
-  }
-  if (state.phase === "needs_fix" && state.pending)
-    return roundRecord(state.pending.round, result, "", state.pending.reviewers, undefined, state.roundStartedAt, now, reason);
-  return;
+function clean2(text) {
+  return text.replaceAll("\x00", "");
 }
-function roundRecord(round, result, details, reviewers, advisor, roundStartedAt, now, reason) {
-  return {
-    round,
-    result,
-    details,
-    reviewers,
-    ...advisor ? { advisor } : {},
-    ...reason ? { reason } : {},
-    elapsedMs: roundStartedAt ? Math.max(0, now - roundStartedAt) : 0
-  };
+function errorText(error) {
+  return error instanceof Error ? error.message : String(error);
 }
 
 // review/index.ts
 var FEEDBACK_TYPE = "firecode-review-feedback";
 var SUMMARY_REQUEST_TYPE = "firecode-review-summary";
-var FEEDBACK_START_TIMEOUT_MS = 2000;
+var FOLLOW_UP_START_TIMEOUT_MS = 2000;
 var PROMPTS = new URL("./prompts/", new URL("./review/index.js", import.meta.url).href);
 function overallTimeoutMs(config) {
   return Math.max(30 * 60000, config.maxRounds * config.timeoutMinutes * 2 * 60000);
 }
 function isActive(state) {
-  return state.phase === "queued" || state.phase === "reviewing" || state.phase === "needs_fix" || state.phase === "awaiting_fix" || state.phase === "summarizing";
+  return state.phase !== "idle" && state.phase !== "settled";
 }
 function registerReview(pi, enabled = true, configBroken = false, dependencies = {}) {
   registerCardRenderer(pi);
@@ -8048,23 +7672,23 @@ function registerReview(pi, enabled = true, configBroken = false, dependencies =
   pi.on("session_shutdown", (event, ctx) => handleShutdown(rt, event.reason, ctx));
   return handle;
 }
+function sealCheckpoint(pi, state) {
+  beginCheckpoint(pi, {
+    ...state,
+    phase: "settled",
+    active: null,
+    pending: null,
+    repair: null,
+    summary: null,
+    updatedAt: Date.now()
+  });
+}
 function settleDisabledCheckpoint(pi, ctx) {
   const checkpoint = readCheckpoint(ctx);
   if (!checkpoint || !isActive(checkpoint))
     return;
-  settleUnavailableCheckpoint(pi, ctx, checkpoint);
-}
-function settleUnavailableCheckpoint(pi, ctx, checkpoint) {
   try {
-    beginCheckpoint(pi, ctx, {
-      ...checkpoint,
-      phase: "settled",
-      active: null,
-      pending: null,
-      repair: null,
-      summary: null,
-      updatedAt: Date.now()
-    });
+    sealCheckpoint(pi, checkpoint);
   } catch (error) {
     if (ctx.hasUI)
       ctx.ui.notify(msg6.notify.cannotSealOld(errorText2(error)), "error");
@@ -8081,23 +7705,22 @@ function dispatch(rt, event) {
       if (!persist(rt, state))
         return;
       if (!isActive(state))
-        clearWatchdog(rt);
+        clearWatchdog(active);
       syncOccupancy(rt, active);
-      syncUi(rt);
+      syncUi(rt, active);
     }
     await runEffects(rt, effects);
   });
-  rt.queue = run.catch((error) => {
-    notifyEffectFailure(rt, error);
-  });
+  rt.queue = run.catch((error) => notifyEffectFailure(rt, error));
   return rt.queue;
 }
+function notify(active, message, level) {
+  if (active.ctx.hasUI)
+    active.ctx.ui.notify(message, level);
+}
 function notifyEffectFailure(rt, error) {
-  const active = rt.controller;
-  if (!active?.ctx.hasUI)
-    return;
-  const message = error instanceof Error ? error.message : String(error);
-  active.ctx.ui.notify(msg6.notify.stepFailed(message), "warning");
+  if (rt.controller)
+    notify(rt.controller, msg6.notify.stepFailed(errorText2(error)), "warning");
 }
 function loadReviewConfig() {
   return loadConfig().review;
@@ -8113,31 +7736,30 @@ function limitsOf(config) {
     }))
   };
 }
+function newController(ctx, config, state, stamp) {
+  return {
+    ctx,
+    config,
+    state,
+    signal: new AbortController,
+    watchdog: undefined,
+    persistedStamp: stamp,
+    pendingCards: [],
+    ui: new ReviewUi
+  };
+}
 async function handleCommand(rt, args, ctx) {
   const loaded = loadReviewConfig();
   if ("error" in loaded)
     return refuse(rt, ctx, loaded.error, "error");
-  const config = loaded.config;
   if (rt.controller && isActive(rt.controller.state))
     return refuse(rt, ctx, msg6.command.alreadyRunning, "info");
-  const command = parseCommand(args);
-  if ("error" in command)
-    return refuse(rt, ctx, command.error, "error");
-  rt.controller = {
-    ctx,
-    config,
-    state: initialState(randomUUID()),
-    signal: new AbortController,
-    watchdog: undefined,
-    persistedStamp: null,
-    pendingCards: []
-  };
+  const input = args.trim();
+  if (input.startsWith("--"))
+    return refuse(rt, ctx, msg6.command.invalidArgs, "error");
+  rt.controller = newController(ctx, loaded.config, initialState(randomUUID()), null);
   armWatchdog(rt);
-  dispatch(rt, {
-    type: "START",
-    focus: command.focus,
-    busy: true
-  });
+  dispatch(rt, { type: "START", focus: input });
 }
 function refuse(rt, ctx, message, level) {
   recordRefusal(rt.pi, message);
@@ -8149,35 +7771,27 @@ function handleSessionStart(rt, ctx) {
   if (!checkpoint || !isActive(checkpoint))
     return;
   const loaded = loadReviewConfig();
-  if ("error" in loaded) {
+  if ("error" in loaded)
     return;
-  }
-  const config = loaded.config;
-  rt.controller = {
-    ctx,
-    config,
-    state: checkpoint,
-    signal: new AbortController,
-    watchdog: undefined,
-    persistedStamp: readStamp(ctx),
-    pendingCards: []
-  };
+  const active = newController(ctx, loaded.config, checkpoint, readStamp(ctx));
+  rt.controller = active;
   armWatchdog(rt);
-  syncOccupancy(rt, rt.controller);
-  syncUi(rt);
+  syncOccupancy(rt, active);
+  syncUi(rt, active);
   return dispatch(rt, { type: "RECOVER" });
 }
 async function handleAgentStart(rt) {
   const active = rt.controller;
   if (!active)
     return;
-  if (active.state.phase === "awaiting_fix" && active.state.repair?.status === "awaiting_start") {
-    clearFeedbackStartTimer(active);
+  const { state } = active;
+  if (state.phase === "awaiting_fix" && state.repair?.status === "awaiting_start") {
+    clearStartTimer(active);
     await dispatch(rt, { type: "REPAIR_STARTED" });
     return;
   }
-  if (active.state.phase === "summarizing" && active.state.summary?.status === "awaiting_start") {
-    clearFeedbackStartTimer(active);
+  if (state.phase === "summarizing" && state.summary?.status === "awaiting_start") {
+    clearStartTimer(active);
     await dispatch(rt, { type: "SUMMARY_STARTED" });
     return;
   }
@@ -8198,8 +7812,8 @@ function handleAgentEnd(rt, event) {
     return dispatch(rt, { type: "SUMMARY_SETTLED" });
   if (active.state.phase !== "awaiting_fix" || active.state.repair?.status !== "running")
     return;
-  const assistant = [...event.messages].reverse().find((message) => isRecord9(message) && message.role === "assistant");
-  if (isRecord9(assistant) && assistant.stopReason !== "error" && assistant.stopReason !== "aborted")
+  const assistant = [...event.messages].reverse().find((message) => message.role === "assistant");
+  if (assistant && assistant.stopReason !== "error" && assistant.stopReason !== "aborted")
     return dispatch(rt, { type: "REPAIR_COMPLETED" });
   active.signal.abort();
   return dispatch(rt, { type: "CANCEL", reason: "user" });
@@ -8208,8 +7822,7 @@ function requestAdvance(rt, ctx) {
   const active = rt.controller;
   if (!active)
     return;
-  const runId = active.state.runId;
-  advanceWhenIdle(rt, ctx, runId).catch((error) => {
+  advanceWhenIdle(rt, ctx, active.state.runId).catch((error) => {
     notifyEffectFailure(rt, error);
     if (rt.controller !== active)
       return;
@@ -8224,51 +7837,41 @@ async function advanceWhenIdle(rt, ctx, runId) {
   active.ctx = ctx;
   flushPendingCards(rt);
   const { state } = active;
-  if (state.phase === "queued") {
-    await dispatch(rt, { type: "ADVANCE" });
-    return;
-  }
-  if (state.phase === "reviewing") {
-    startAction(rt, active, `review:${state.round}`, "reviewer", () => startReviewers(rt));
-    return;
-  }
-  if (state.phase === "needs_fix") {
-    startAction(rt, active, `advisor:${state.round}`, "advisor", () => consultAdvisor(rt));
-    return;
-  }
-  if (state.phase === "summarizing") {
-    if (state.summary?.status !== "pending")
+  switch (state.phase) {
+    case "queued":
+      return dispatch(rt, { type: "ADVANCE" });
+    case "reviewing":
+      return startAction(rt, active, `review:${state.round}`, "reviewer", (signal) => startReviewers(rt, active, signal));
+    case "needs_fix":
+      return startAction(rt, active, `advisor:${state.round}`, "advisor", (signal) => consultAdvisor(rt, active, signal));
+    case "summarizing":
+      if (state.summary?.status !== "pending")
+        return;
+      await dispatch(rt, { type: "SUMMARY_DISPATCHED" });
+      if (rt.controller === active && active.state.phase === "summarizing" && active.state.summary?.status === "awaiting_start")
+        deliverSummary(rt, active, active.state);
+      return;
+    case "awaiting_fix":
+      if (state.repair?.status === "completed")
+        return dispatch(rt, { type: "ADVANCE" });
+      if (state.repair?.status !== "pending")
+        return;
+      await dispatch(rt, { type: "FEEDBACK_DISPATCHED" });
+      if (rt.controller === active && active.state.repair?.status === "awaiting_start")
+        deliverFeedback(rt, active, active.state.repair);
       return;
-    await dispatch(rt, { type: "SUMMARY_DISPATCHED" });
-    const current = rt.controller?.state;
-    if (rt.controller === active && current?.phase === "summarizing" && current.summary?.status === "awaiting_start")
-      deliverSummaryNow(rt, current);
-    return;
-  }
-  if (state.phase !== "awaiting_fix" || !state.repair)
-    return;
-  if (state.repair.status === "pending") {
-    await dispatch(rt, { type: "FEEDBACK_DISPATCHED" });
-    const repair = rt.controller?.state.repair;
-    if (rt.controller === active && repair?.status === "awaiting_start")
-      deliverFeedbackNow(rt, repair.details, repair.advisor);
-    return;
   }
-  if (state.repair.status === "completed")
-    await dispatch(rt, { type: "ADVANCE" });
 }
 function startAction(rt, active, key, kind, run) {
   if (active.runningAction === key)
     return;
   active.runningAction = key;
-  active.actionController = new AbortController;
-  const action = run().catch(async (error) => {
-    if (rt.controller !== active || active.actionController?.signal.aborted)
+  const controller = new AbortController;
+  active.actionController = controller;
+  const action = run(controller.signal).catch(async (error) => {
+    if (rt.controller !== active || controller.signal.aborted)
       return;
-    await dispatch(rt, {
-      type: "INFRASTRUCTURE_ERROR",
-      details: sessionErrorText(kind, error)
-    });
+    await dispatch(rt, { type: "INFRASTRUCTURE_ERROR", details: sessionErrorText(kind, error) });
   }).finally(() => {
     if (active.actionPromise !== action)
       return;
@@ -8285,15 +7888,14 @@ async function handleShutdown(rt, reason, ctx) {
   setOccupancy(rt, active, false);
   active.signal.abort();
   active.actionController?.abort();
-  clearWatchdog(rt);
-  clearFeedbackStartTimer(active);
+  clearWatchdog(active);
+  clearStartTimer(active);
   await active.actionPromise;
-  if (active.ctx !== ctx)
-    active.ctx = ctx;
+  active.ctx = ctx;
   if (reason === "quit")
     await dispatch(rt, { type: "CANCEL", reason: "shutdown" });
   else {
-    clearUi(active);
+    active.ui.clear(active.ctx);
     await rt.queue;
   }
   if (rt.controller === active)
@@ -8303,7 +7905,7 @@ function armWatchdog(rt) {
   const active = rt.controller;
   if (!active)
     return;
-  clearWatchdog(rt);
+  clearWatchdog(active);
   const elapsed = active.state.startedAt ? Math.max(0, Date.now() - active.state.startedAt) : 0;
   const remaining = Math.max(0, overallTimeoutMs(active.config) - elapsed);
   if (remaining === 0) {
@@ -8320,14 +7922,14 @@ function armWatchdog(rt) {
   }, remaining);
   active.watchdog.unref?.();
 }
-function clearWatchdog(rt) {
-  if (rt.controller?.watchdog)
-    clearTimeout(rt.controller.watchdog);
+function clearWatchdog(active) {
+  if (active.watchdog)
+    clearTimeout(active.watchdog);
 }
-function clearFeedbackStartTimer(active) {
-  if (active.feedbackStartTimer)
-    clearTimeout(active.feedbackStartTimer);
-  active.feedbackStartTimer = undefined;
+function clearStartTimer(active) {
+  if (active.startTimer)
+    clearTimeout(active.startTimer);
+  active.startTimer = undefined;
 }
 function persist(rt, state) {
   const active = rt.controller;
@@ -8337,45 +7939,37 @@ function persist(rt, state) {
   if (persisted === undefined)
     return false;
   try {
-    active.persistedStamp = persisted === null ? beginCheckpoint(rt.pi, active.ctx, state) : writeCheckpoint(rt.pi, active.ctx, state, persisted);
+    active.persistedStamp = persisted === null ? beginCheckpoint(rt.pi, state) : writeCheckpoint(rt.pi, active.ctx, state, persisted);
     return true;
   } catch (error) {
-    const halt = (message, level) => {
-      setOccupancy(rt, active, false);
-      active.persistedStamp = undefined;
-      active.signal.abort();
-      active.actionController?.abort();
-      if (active.ctx.hasUI)
-        active.ctx.ui.notify(message, level);
-    };
-    if (error instanceof CheckpointConflictError) {
-      halt(msg6.notify.checkpointConflict, "warning");
-      dispatch(rt, { type: "CANCEL", reason: "shutdown" });
-      return false;
-    }
-    halt(msg6.notify.checkpointWriteFailed(errorText2(error)), "error");
-    clearUi(active);
-    let sealed = true;
-    try {
-      beginCheckpoint(rt.pi, active.ctx, {
-        ...state,
-        phase: "settled",
-        active: null,
-        pending: null,
-        repair: null,
-        summary: null
-      });
-    } catch {
-      sealed = false;
-    }
-    clearWatchdog(rt);
-    clearFeedbackStartTimer(active);
-    rt.controller = undefined;
-    if (!sealed && active.ctx.hasUI)
-      active.ctx.ui.notify(msg6.notify.cannotSeal, "warning");
+    haltOnPersistFailure(rt, active, state, error);
     return false;
   }
 }
+function haltOnPersistFailure(rt, active, state, error) {
+  setOccupancy(rt, active, false);
+  active.persistedStamp = undefined;
+  active.signal.abort();
+  active.actionController?.abort();
+  if (error instanceof CheckpointConflictError) {
+    notify(active, msg6.notify.checkpointConflict, "warning");
+    dispatch(rt, { type: "CANCEL", reason: "shutdown" });
+    return;
+  }
+  notify(active, msg6.notify.checkpointWriteFailed(errorText2(error)), "error");
+  active.ui.clear(active.ctx);
+  let sealed = true;
+  try {
+    sealCheckpoint(rt.pi, state);
+  } catch {
+    sealed = false;
+  }
+  clearWatchdog(active);
+  clearStartTimer(active);
+  rt.controller = undefined;
+  if (!sealed)
+    notify(active, msg6.notify.cannotSeal, "warning");
+}
 function errorText2(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -8391,29 +7985,16 @@ function setOccupancy(rt, active, held) {
     rt.pi.events.emit(OCCUPANCY_CHANNEL, payload);
   } catch (error) {
     try {
-      if (active.ctx.hasUI)
-        active.ctx.ui.notify(msg6.notify.occupancyFailed(errorText2(error)), "warning");
+      notify(active, msg6.notify.occupancyFailed(errorText2(error)), "warning");
     } catch {}
   }
 }
-function syncUi(rt) {
-  const active = rt.controller;
-  if (!active)
-    return;
+function syncUi(rt, active) {
   if (!isActive(active.state) || !active.ctx.hasUI)
-    return clearUi(active);
-  showReviewTitle(active.ctx, active.state.round);
-  if (!canCancelWithKey(rt))
-    return releaseEditor(active);
-  active.unlockEditor ??= lockEditor(active.ctx, () => cancelByUser(rt));
-}
-function clearUi(active) {
-  hideReviewTitle(active.ctx);
-  releaseEditor(active);
-}
-function releaseEditor(active) {
-  active.unlockEditor?.();
-  active.unlockEditor = undefined;
+    return active.ui.clear(active.ctx);
+  const { phase, round } = active.state;
+  const canCancel = phase === "queued" || phase === "reviewing" || phase === "needs_fix";
+  active.ui.show(active.ctx, round, canCancel, () => cancelByUser(rt));
 }
 var STAGE = {
   queued: "queued",
@@ -8424,17 +8005,13 @@ var STAGE = {
 };
 function reviewProgress(rt) {
   const state = rt.controller?.state;
-  const stage = state && isActive(state) ? STAGE[state.phase] : undefined;
+  const stage = state && STAGE[state.phase];
   if (!state || !stage)
     return;
   const reviewers = stage === "reviewing" ? state.active?.reviewers ?? [] : [];
   const count = (status) => reviewers.filter((reviewer) => reviewer.status === status).length;
   return { stage, round: state.round, passed: count("passed"), blocked: count("failed"), total: reviewers.length };
 }
-function canCancelWithKey(rt) {
-  const phase = rt.controller?.state.phase;
-  return phase === "queued" || phase === "reviewing" || phase === "needs_fix";
-}
 function cancelByUser(rt) {
   const active = rt.controller;
   if (!active)
@@ -8453,35 +8030,31 @@ async function runEffects(rt, effects) {
     const active = rt.controller;
     if (!active)
       return;
-    if (effect.kind === "advance") {
+    if (effect.kind === "advance")
       requestAdvance(rt, active.ctx);
-      continue;
-    }
-    try {
-      sendCard(rt, effect.card);
-    } catch (error) {
-      notifyEffectFailure(rt, error);
-    }
+    else if (effect.kind === "notify_cancelled")
+      notify(active, msg6.notify.cancelled, "info");
+    else
+      try {
+        sendCard(rt, active, effect.card);
+      } catch (error) {
+        notifyEffectFailure(rt, error);
+      }
   }
 }
-function reviewerModelConfig(model, config) {
+function modelConfig(atom, config) {
   return {
-    model: model.model,
-    thinking: model.thinking,
+    model: atom.model,
+    thinking: atom.thinking,
     tools: config.tools,
     timeoutMs: config.timeoutMinutes * 60000
   };
 }
-async function startReviewers(rt) {
-  const active = rt.controller;
-  if (!active)
-    return;
+async function startReviewers(rt, active, signal) {
   const { state, config } = active;
   if (!state.active)
     return;
-  const currentActive = state.active;
-  const actionSignal = active.actionController?.signal ?? active.signal.signal;
-  const evidence = buildEvidence(sessionEntries(rt), { sessionFile: active.ctx.sessionManager.getSessionFile() });
+  const evidence = buildEvidence(sessionEntries(active), { sessionFile: active.ctx.sessionManager.getSessionFile() });
   const prompt = buildReviewPrompt(readPrompt(PROMPTS, "review"), {
     scope: msg6.command.scope,
     focus: state.focus,
@@ -8489,20 +8062,20 @@ async function startReviewers(rt) {
     history: state.history,
     round: state.round
   });
-  const tasks = currentActive.reviewers.filter((reviewer) => reviewer.status === "running").map(async (reviewer) => {
+  const tasks = state.active.reviewers.filter((reviewer) => reviewer.status === "running").map(async (reviewer) => {
     try {
       const result = await runReviewer({
         index: reviewer.index,
-        config: reviewerModelConfig(reviewer, config),
+        config: modelConfig(reviewer, config),
         prompt,
         cwd: active.ctx.cwd,
-        signal: actionSignal,
+        signal,
         runSession: rt.runSession
       });
-      if (!actionSignal.aborted)
+      if (!signal.aborted)
         await dispatch(rt, { type: "REVIEWER_SETTLED", index: result.index, result });
     } catch (error) {
-      if (actionSignal.aborted)
+      if (signal.aborted)
         return;
       await dispatch(rt, {
         type: "REVIEWER_SETTLED",
@@ -8520,128 +8093,103 @@ async function startReviewers(rt) {
   });
   await Promise.all(tasks);
 }
-async function consultAdvisor(rt) {
-  const active = rt.controller;
-  if (!active)
-    return;
+async function consultAdvisor(rt, active, signal) {
   const { state, config } = active;
   if (!state.pending)
     return;
-  const pending = state.pending;
-  const actionSignal = active.actionController?.signal ?? active.signal.signal;
   const prompt = buildAdvisorPrompt(readPrompt(PROMPTS, "advisor"), {
     focus: state.focus,
-    details: pending.details,
+    details: state.pending.details,
     history: state.history,
-    round: pending.round
+    round: state.pending.round
   });
   try {
     const result = await runAdvisor({
-      config: reviewerModelConfig(config.advisor, config),
+      config: modelConfig(config.advisor, config),
       prompt,
       cwd: active.ctx.cwd,
-      signal: actionSignal,
+      signal,
       runSession: rt.runSession
     });
-    if (!actionSignal.aborted)
+    if (!signal.aborted)
       await dispatch(rt, { type: "ADVISOR_SETTLED", result });
   } catch (error) {
-    if (actionSignal.aborted)
+    if (signal.aborted)
       return;
-    await dispatch(rt, {
-      type: "INFRASTRUCTURE_ERROR",
-      details: sessionErrorText("advisor", error)
-    });
+    await dispatch(rt, { type: "INFRASTRUCTURE_ERROR", details: sessionErrorText("advisor", error) });
   }
 }
 function sessionErrorText(kind, error) {
   const reason = errorText2(error);
   return kind === "reviewer" ? msg6.failure.reviewerSession(reason) : msg6.failure.advisorSession(reason);
 }
-function deliverFeedbackNow(rt, details, advisor) {
-  const active = rt.controller;
-  if (!active)
-    return;
-  const feedback = buildFixFeedback({
-    details,
-    advisor
-  });
-  clearFeedbackStartTimer(active);
-  active.feedbackStartTimer = setTimeout(() => {
-    if (rt.controller !== active || active.state.phase !== "awaiting_fix" || active.state.repair?.status !== "awaiting_start")
+function sendFollowUp(rt, active, customType, content, handlers) {
+  clearStartTimer(active);
+  active.startTimer = setTimeout(() => {
+    if (rt.controller !== active || !handlers.stillAwaiting(active.state))
       return;
-    active.feedbackStartTimer = undefined;
-    if (active.ctx.hasUI)
-      active.ctx.ui.notify(msg6.notify.feedbackNotStarted, "error");
-    active.signal.abort();
-    dispatch(rt, { type: "CANCEL", reason: "user" });
-  }, FEEDBACK_START_TIMEOUT_MS);
-  active.feedbackStartTimer.unref?.();
+    active.startTimer = undefined;
+    handlers.onNotStarted();
+  }, FOLLOW_UP_START_TIMEOUT_MS);
+  active.startTimer.unref?.();
   try {
-    rt.pi.sendMessage({ customType: FEEDBACK_TYPE, content: feedback, display: false }, { deliverAs: "followUp", triggerTurn: true });
+    rt.pi.sendMessage({ customType, content, display: false }, { deliverAs: "followUp", triggerTurn: true });
   } catch (error) {
-    clearFeedbackStartTimer(active);
-    throw error;
+    clearStartTimer(active);
+    handlers.onSendError(error);
   }
 }
-function deliverSummaryNow(rt, state) {
-  const active = rt.controller;
-  if (!active || !state.summary)
+function deliverFeedback(rt, active, repair) {
+  sendFollowUp(rt, active, FEEDBACK_TYPE, buildFixFeedback(repair), {
+    stillAwaiting: (state) => state.phase === "awaiting_fix" && state.repair?.status === "awaiting_start",
+    onNotStarted: () => {
+      notify(active, msg6.notify.feedbackNotStarted, "error");
+      active.signal.abort();
+      dispatch(rt, { type: "CANCEL", reason: "user" });
+    },
+    onSendError: (error) => {
+      throw error;
+    }
+  });
+}
+function deliverSummary(rt, active, state) {
+  if (!state.summary)
     return;
   const last = state.history.at(-1);
   const material = state.summary.kind === "advisor_stop" ? last?.advisor?.advice ?? last?.details ?? "" : last?.details ?? "";
-  const prompt = buildSummaryPrompt({
-    kind: state.summary.kind,
-    rounds: state.history.length,
-    material
+  const prompt = buildSummaryPrompt({ kind: state.summary.kind, rounds: state.history.length, material });
+  sendFollowUp(rt, active, SUMMARY_REQUEST_TYPE, prompt, {
+    stillAwaiting: (current) => current.phase === "summarizing" && current.summary?.status === "awaiting_start",
+    onNotStarted: () => {
+      notify(active, msg6.notify.summaryNotStarted, "warning");
+      dispatch(rt, { type: "SUMMARY_SETTLED" });
+    },
+    onSendError: (error) => {
+      notifyEffectFailure(rt, error);
+      dispatch(rt, { type: "SUMMARY_SETTLED" });
+    }
   });
-  clearFeedbackStartTimer(active);
-  active.feedbackStartTimer = setTimeout(() => {
-    if (rt.controller !== active || active.state.phase !== "summarizing" || active.state.summary?.status !== "awaiting_start")
-      return;
-    active.feedbackStartTimer = undefined;
-    if (active.ctx.hasUI)
-      active.ctx.ui.notify(msg6.notify.summaryNotStarted, "warning");
-    dispatch(rt, { type: "SUMMARY_SETTLED" });
-  }, FEEDBACK_START_TIMEOUT_MS);
-  active.feedbackStartTimer.unref?.();
-  try {
-    rt.pi.sendMessage({ customType: SUMMARY_REQUEST_TYPE, content: prompt, display: false }, { deliverAs: "followUp", triggerTurn: true });
-  } catch (error) {
-    clearFeedbackStartTimer(active);
-    notifyEffectFailure(rt, error);
-    dispatch(rt, { type: "SUMMARY_SETTLED" });
-  }
 }
-function sendCard(rt, card) {
-  const active = rt.controller;
-  if (!active)
-    return;
-  if (card.kind === "cancel") {
-    if (card.reason === "user" && active.ctx.hasUI)
-      active.ctx.ui.notify(msg6.notify.cancelled, "info");
-    return;
-  }
+function sendCard(rt, active, card) {
   if (!active.ctx.isIdle()) {
     active.pendingCards.push(card);
     return;
   }
-  sendCardNow(rt, active, card);
+  sendCardNow(rt, card);
 }
 function flushPendingCards(rt) {
   const active = rt.controller;
   if (!active || !active.ctx.isIdle() || active.pendingCards.length === 0)
     return;
-  const cards = active.pendingCards.splice(0);
-  for (const card of cards) {
+  for (const card of active.pendingCards.splice(0)) {
     try {
-      sendCardNow(rt, active, card);
+      sendCardNow(rt, card);
     } catch (error) {
       notifyEffectFailure(rt, error);
     }
   }
 }
-function sendCardNow(rt, active, card) {
+function sendCardNow(rt, card) {
   const built = buildCard(card);
   rt.pi.sendMessage({
     customType: CARD_TYPE,
@@ -8650,22 +8198,13 @@ function sendCardNow(rt, active, card) {
     details: built.details
   });
 }
-function parseCommand(args) {
-  const input = args.trim();
-  return input.startsWith("--") ? { error: msg6.command.invalidArgs } : { focus: input };
-}
-function sessionEntries(rt) {
-  const manager = rt.controller?.ctx.sessionManager;
-  const entries = manager?.getBranch?.() ?? [];
-  return entries.filter((entry) => !isRecord9(entry) || entry.type !== "custom_message" || entry.customType !== CARD_TYPE && entry.customType !== FEEDBACK_TYPE && entry.customType !== SUMMARY_REQUEST_TYPE);
-}
-function isRecord9(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function sessionEntries(active) {
+  const own = new Set([CARD_TYPE, FEEDBACK_TYPE, SUMMARY_REQUEST_TYPE]);
+  return active.ctx.sessionManager.getBranch().filter((entry) => entry.type !== "custom_message" || !own.has(entry.customType));
 }
 
 // master/index.ts
 import { StringEnum, Type } from "@earendil-works/pi-ai";
-import { getAgentDir as getAgentDir5 } from "@earendil-works/pi-coding-agent";
 
 // master/actions.ts
 import { existsSync as existsSync3 } from "node:fs";
@@ -8681,7 +8220,7 @@ function readReviewOutcome(sessionPath) {
   } catch (error) {
     if (isMissingFile(error))
       return { status: "none" };
-    return { status: "error", message: msg6.failure.cannotReadSession(errorMessage2(error)) };
+    return { status: "error", message: msg6.failure.cannotReadSession(error instanceof Error ? error.message : String(error)) };
   }
   let latest;
   let damage;
@@ -8734,14 +8273,8 @@ function outcomeOf2(latest) {
   }
   return { status: "failed", runId: latest.runId, rounds, reason: last?.details?.trim() || result || "unknown" };
 }
-function isCheckpointEntry(value) {
-  return typeof value === "object" && value !== null && value.type === "custom" && value.customType === CHECKPOINT_TYPE && "data" in value;
-}
 function isMissingFile(error) {
-  return typeof error === "object" && error !== null && error.code === "ENOENT";
-}
-function errorMessage2(error) {
-  return error instanceof Error ? error.message : String(error);
+  return error?.code === "ENOENT";
 }
 
 // master/list-view.ts
@@ -8790,42 +8323,40 @@ function currentWorkerAction(worker, live) {
   const current = [...live?.currentTools.values() ?? []].at(-1);
   return current ? { kind: "tool", ...current } : undefined;
 }
+function actionParts(action) {
+  if (action?.kind === "tool")
+    return [{ text: ` · ${action.tool} · ${msg7.list.running(formatDuration(Math.max(0, Date.now() - action.startedAt)))}`, color: "accent" }];
+  if (action?.kind === "idle")
+    return [{
+      text: action.since ? ` · ${msg7.list.settledAgo(formatDuration(Date.now() - action.since))}` : ` · ${msg7.list.settled}`,
+      color: "muted"
+    }];
+  if (action?.kind === "review")
+    return [{ text: ` · ${msg7.list.reviewRound(action.round, action.settled, action.total)}`, color: "accent" }];
+  return [];
+}
 function expandedWorkerList(workers, theme, context) {
   return {
     invalidate() {},
     render(width) {
-      return ["", ...workers.flatMap((value) => {
-        const worker = value;
-        const action = worker.currentAction;
-        const actionParts = action?.kind === "tool" && action.tool && action.startedAt ? [{
-          text: ` · ${action.tool} · ${msg7.list.running(formatDuration(Math.max(0, Date.now() - action.startedAt)))}`,
-          color: "accent"
-        }] : action?.kind === "idle" ? [{
-          text: action.since ? ` · ${msg7.list.settledAgo(formatDuration(Date.now() - action.since))}` : ` · ${msg7.list.settled}`,
-          color: "muted"
-        }] : action?.kind === "review" ? [{ text: ` · ${msg7.list.reviewRound(action.round, action.settled, action.total)}`, color: "accent" }] : [];
-        return new ToolLine({
-          label: String(worker.name),
-          value: [
-            { text: roleStatusText(worker), color: "accent" },
-            ...actionParts,
-            { text: ` · ${String(worker.model).split("/").pop()}/${String(worker.thinking)}`, color: "muted" }
-          ],
-          clip: "end",
-          theme,
-          ctx: { ...context, state: {}, expanded: false }
-        }).render(width);
-      })];
+      return ["", ...workers.flatMap((worker) => new ToolLine({
+        label: worker.name,
+        value: [
+          { text: roleStatusText(worker), color: "accent" },
+          ...actionParts(worker.currentAction),
+          { text: ` · ${worker.model.split("/").pop()}/${worker.thinking}`, color: "muted" }
+        ],
+        clip: "end",
+        theme,
+        ctx: { ...context, state: {}, expanded: false }
+      }).render(width))];
     }
   };
 }
 function listMeta(workers) {
   if (!workers.length)
     return [{ text: ` — ${msg7.list.poolEmpty}`, color: "muted" }];
-  const summary = workers.map((value) => {
-    const worker = value;
-    return `${String(worker.name)} ${roleStatusText(worker)}`;
-  }).join(" · ");
+  const summary = workers.map((worker) => `${worker.name} ${roleStatusText(worker)}`).join(" · ");
   return [{ text: ` — ${msg7.list.pool(workers.length, summary)}`, color: "muted" }];
 }
 function statusText(workers) {
@@ -8833,8 +8364,7 @@ function statusText(workers) {
 `) : msg7.list.noWorkers;
 }
 function roleStatusText(worker) {
-  const status = STATUS_WORD[worker.status] ?? String(worker.status);
-  return worker.role ? `${String(worker.role)}·${status}` : status;
+  return `${worker.role}·${STATUS_WORD[worker.status]}`;
 }
 function optionalText(value) {
   return typeof value === "string" && value.trim() ? value.trim() : undefined;
@@ -8923,7 +8453,7 @@ async function spawnWorker(active, worker, resume) {
     thinking: worker.thinking,
     tools: active.setup.pi.getActiveTools().includes(CODEMODE_TOOL) ? [...WORKER_TOOLS, CODEMODE_TOOL] : WORKER_TOOLS,
     excludeExtensions: exclusions,
-    systemPrompt: { mode: "append", text: assembleWorkerPrompt(active.setup.workerPrompt(), worker.name) },
+    systemPrompt: { mode: "append", text: assembleWorkerPrompt(active.setup.workerPrompt, worker.name) },
     contextFiles: true,
     persistence: { type: "file", sessionPath: worker.sessionPath, ...resume ? { resume: true } : {} }
   });
@@ -8989,7 +8519,7 @@ function settleInterrupted(active, identity) {
   if (!current)
     return;
   const interrupted = { ...current, status: "idle", interruptedAt: Date.now() };
-  active.store.dispatch({ type: "UPSERT_WORKER", worker: interrupted });
+  active.store.upsert(interrupted);
   active.markIdle(interrupted, { kind: "interrupted" }, interrupted.interruptedAt);
   active.outbox.enqueue(masterEvent.interrupted(identity.name, current.reviewNeeded === true, takeViewPrompts(active, identity)), identity.name);
 }
@@ -9006,7 +8536,7 @@ function armInterruptReminder(active, worker) {
     const current = active.find(worker);
     if (!current?.interruptedAt || current.interruptedAt !== worker.interruptedAt)
       return;
-    active.store.dispatch({ type: "UPSERT_WORKER", worker: { ...current, disposition: "reminded" } });
+    active.store.upsert({ ...current, disposition: "reminded" });
     active.outbox.enqueue(masterEvent.resumeReminder(worker.name), worker.name);
   }, delay);
   live.interruptTimer.unref?.();
@@ -9044,7 +8574,7 @@ function settleWorker(active, identity, terminal, error) {
     return;
   const failure = error instanceof Error ? error.message : error === undefined ? terminalFailure(terminal) : String(error);
   const idle = { ...current, status: "idle" };
-  active.store.dispatch({ type: "UPSERT_WORKER", worker: idle });
+  active.store.upsert(idle);
   active.markIdle(idle, failure ? { kind: "failed", note: firstSentence(failure) } : { kind: "done", note: firstSentence(terminal.text) });
   const obligation = current.reviewNeeded === true;
   const event = failure ? masterEvent.failed(identity.name, failure, obligation, takeViewPrompts(active, identity)) : masterEvent.returned(identity.name, terminal.text, obligation, takeViewPrompts(active, identity));
@@ -9062,15 +8592,15 @@ function monitorAndSettleReview(active, target, session, previousRunId) {
       return;
     const { reviewNeeded: _needed, ...fulfilled } = current;
     const idle = { ...outcome.status === "passed" || outcome.status === "stopped" ? fulfilled : current, status: "idle" };
-    active.store.dispatch({ type: "UPSERT_WORKER", worker: idle });
+    active.store.upsert(idle);
     active.markIdle(idle, reviewOutcomeRow(outcome));
-    active.outbox.enqueue(masterEvent.review(target.name, outcome, latestAssistantText(session.messages)), target.name);
+    active.outbox.enqueue(masterEvent.review(target.name, outcome, textOf(lastAssistant(session.messages)?.content)), target.name);
   }, (error) => {
     const current = reviewing();
     if (!current)
       return;
     const idle = { ...current, status: "idle" };
-    active.store.dispatch({ type: "UPSERT_WORKER", worker: idle });
+    active.store.upsert(idle);
     active.markIdle(idle, { kind: "failed", note: msg7.run.reviewIncomplete });
     active.outbox.enqueue(masterEvent.reviewIncomplete(target.name, String(error)), target.name);
   });
@@ -9127,7 +8657,7 @@ function reviewOutcomeRow(outcome) {
   return { kind: "failed", note: outcome.status === "stopped" ? msg7.run.reviewStopped : msg7.run.reviewIncomplete };
 }
 function captureWorkerTerminal(messages) {
-  const message = messages.findLast((candidate) => candidate.role === "assistant");
+  const message = lastAssistant(messages);
   if (!message)
     return;
   return {
@@ -9154,8 +8684,8 @@ function faultSummary(terminal) {
   const [first = message] = message.split(/(?<=[.。!！?？])\s|\n/u);
   return clip(first.trim(), FAULT_SUMMARY_WIDTH);
 }
-function latestAssistantText(messages) {
-  return textOf(messages.findLast((candidate) => candidate.role === "assistant")?.content);
+function lastAssistant(messages) {
+  return messages.findLast((candidate) => candidate.role === "assistant");
 }
 function nextFallback(role, worker) {
   const chain = [role, ...role.fallback];
@@ -9175,174 +8705,106 @@ function fallbackResumePrompt(from, to, reason) {
 }
 
 // master/state.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync6, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname4, join as join3 } from "node:path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync6, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname3, join as join3 } from "node:path";
 var STATE_VERSION = 9;
+var WORKER_NAME = /^[a-z][a-z0-9_-]{0,31}$/u;
 var THINKING_LEVELS2 = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
-function initialMasterState() {
-  return { version: STATE_VERSION, workers: [] };
-}
-function reduceMaster(state, event) {
-  switch (event.type) {
-    case "UPSERT_WORKER":
-      return { ...state, workers: upsertWorker(state.workers, event.worker) };
-    case "REMOVE_WORKER": {
-      const workers = state.workers.filter((worker) => worker.name !== event.name);
-      return workers.length === state.workers.length ? state : { ...state, workers };
-    }
-    case "CLEAR":
-      return initialMasterState();
-  }
-}
-function recoverMasterState(state, interruptedAt = Date.now()) {
-  let changed = false;
-  const workers = state.workers.map((worker) => {
-    if (worker.status === "idle")
-      return worker;
-    changed = true;
-    return { ...worker, status: "idle", interruptedAt };
-  });
-  return changed ? { ...state, workers } : state;
-}
-function restoreMasterState(data) {
-  if (!data || typeof data !== "object" || Array.isArray(data))
-    return;
-  const record = data;
-  if (record.version !== STATE_VERSION || !Array.isArray(record.workers) || !record.workers.every(isWorker))
-    return;
-  const workers = record.workers;
-  if (new Set(workers.map((worker) => worker.name)).size !== workers.length)
-    return;
-  if (new Set(workers.map((worker) => worker.sessionPath)).size !== workers.length)
-    return;
-  return { version: STATE_VERSION, workers };
-}
-
-class LegacyMasterStateError extends Error {
-  version;
-  constructor(version) {
-    super(msg7.state.legacy(version, STATE_VERSION));
-    this.version = version;
-  }
-}
 function masterStatePath(agentDir, sessionId) {
   const safeId = sessionId.replace(/[^a-zA-Z0-9_-]/gu, "-");
   return join3(agentDir, "tmp", `firecode-master-${safeId}.json`);
 }
-function loadMasterState(path) {
-  let raw;
-  try {
-    raw = readFileSync6(path, "utf8");
-  } catch (error) {
-    if (error.code === "ENOENT")
-      return;
-    throw error;
-  }
-  let data;
-  try {
-    data = JSON.parse(raw);
-  } catch {
-    throw new Error(msg7.state.invalidJson(path));
-  }
-  const version = data?.version;
-  if (typeof version === "number" && version !== STATE_VERSION && version !== 8)
-    throw new LegacyMasterStateError(version);
-  const state = restoreMasterState(version === 8 ? migrateFromV8(data) : data);
-  if (!state)
-    throw new Error(msg7.state.invalidShape(path));
-  return state;
-}
 
 class MasterStore {
-  stateValue;
   path;
   onChange;
+  list;
   discardedLegacyVersion;
-  constructor(path, restored, onChange) {
+  constructor(path, onChange) {
     this.path = path;
     this.onChange = onChange;
-    if (restored)
-      this.stateValue = restored;
-    else {
-      const loaded = this.loadOwnedState();
-      this.stateValue = loaded.state;
-      this.discardedLegacyVersion = loaded.discardedLegacyVersion;
-    }
-  }
-  get state() {
-    return this.stateValue;
-  }
-  dispatch(event) {
-    const next = reduceMaster(this.stateValue, event);
-    if (next === this.stateValue)
-      return next;
-    if (event.type === "CLEAR")
-      rmSync2(this.path, { force: true });
-    else
-      writeState(this.path, next);
-    this.stateValue = next;
+    const loaded = load(path);
+    this.discardedLegacyVersion = loaded.legacyVersion;
+    const now = Date.now();
+    this.list = loaded.workers.map((worker) => worker.status === "idle" ? worker : { ...worker, status: "idle", interruptedAt: now });
+    if (this.list.some((worker, index) => worker !== loaded.workers[index]))
+      this.persist();
+  }
+  get workers() {
+    return this.list;
+  }
+  find(name) {
+    return this.list.find((worker) => worker.name === name);
+  }
+  require(name) {
+    const worker = this.find(name);
+    if (!worker)
+      throw new Error(msg7.state.missing(name));
+    return worker;
+  }
+  upsert(worker) {
+    const owner = this.list.find((candidate) => candidate.sessionPath === worker.sessionPath);
+    if (owner && owner.name !== worker.name)
+      throw new Error(msg7.state.pathTaken(worker.sessionPath));
+    const existing = this.find(worker.name);
+    if (existing && existing.sessionPath !== worker.sessionPath)
+      throw new Error(msg7.state.pathChange(worker.name));
+    this.list = existing ? this.list.map((candidate) => candidate === existing ? worker : candidate) : [...this.list, worker];
+    this.commit();
+  }
+  remove(name) {
+    if (!this.find(name))
+      return false;
+    this.list = this.list.filter((worker) => worker.name !== name);
+    this.commit();
+    return true;
+  }
+  commit() {
+    this.persist();
     this.onChange?.();
-    return next;
   }
-  loadOwnedState() {
+  persist() {
+    mkdirSync2(dirname3(this.path), { recursive: true, mode: 448 });
+    const temporary = `${this.path}.${process.pid}.${crypto.randomUUID()}.tmp`;
     try {
-      return { state: loadMasterState(this.path) ?? initialMasterState() };
+      writeFileSync3(temporary, `${JSON.stringify({ version: STATE_VERSION, workers: this.list })}
+`, { encoding: "utf8", mode: 384 });
+      renameSync2(temporary, this.path);
     } catch (error) {
-      if (!(error instanceof LegacyMasterStateError))
-        throw error;
-      rmSync2(this.path, { force: true });
-      return { state: initialMasterState(), discardedLegacyVersion: error.version };
+      rmSync2(temporary, { force: true });
+      throw error;
     }
   }
 }
-function migrateFromV8(data) {
-  if (!Array.isArray(data.workers))
-    return data;
-  const workers = data.workers;
-  const created = (index) => typeof workers[index]?.createdAt === "number" ? workers[index].createdAt : -Infinity;
-  const order = workers.map((_, index) => index).sort((a, b) => created(a) - created(b) || a - b);
-  return {
-    version: STATE_VERSION,
-    workers: workers.map((worker, index) => {
-      const { createdAt: _createdAt, ...rest } = worker ?? {};
-      return { ...rest, launch: order.indexOf(index) + 1 };
-    })
-  };
-}
-function requireWorker(state, name) {
-  const worker = state.workers.find((candidate) => candidate.name === name);
-  if (!worker)
-    throw new Error(msg7.state.missing(name));
-  return worker;
-}
-function writeState(path, state) {
-  mkdirSync3(dirname4(path), { recursive: true, mode: 448 });
-  const temporary = `${path}.${process.pid}.${crypto.randomUUID()}.tmp`;
+function load(path) {
+  let raw;
   try {
-    writeFileSync3(temporary, `${JSON.stringify(state)}
-`, { encoding: "utf8", mode: 384 });
-    renameSync2(temporary, path);
+    raw = readFileSync6(path, "utf8");
   } catch (error) {
-    rmSync2(temporary, { force: true });
+    if (error.code === "ENOENT")
+      return { workers: [] };
     throw error;
   }
-}
-function upsertWorker(workers, worker) {
-  const index = workers.findIndex((candidate) => candidate.name === worker.name);
-  const sessionOwner = workers.find((candidate) => candidate.sessionPath === worker.sessionPath);
-  if (sessionOwner && sessionOwner.name !== worker.name)
-    throw new Error(msg7.state.pathTaken(worker.sessionPath));
-  if (index < 0)
-    return [...workers, worker];
-  if (workers[index].sessionPath !== worker.sessionPath)
-    throw new Error(msg7.state.pathChange(worker.name));
-  return workers.map((candidate, position) => position === index ? worker : candidate);
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    throw new Error(msg7.state.invalidJson(path));
+  }
+  if (typeof data?.version === "number" && data.version !== STATE_VERSION) {
+    rmSync2(path, { force: true });
+    return { workers: [], legacyVersion: data.version };
+  }
+  const workers = data?.workers;
+  if (data?.version !== STATE_VERSION || !Array.isArray(workers) || !workers.every(isWorker) || new Set(workers.map((worker) => worker.name)).size !== workers.length || new Set(workers.map((worker) => worker.sessionPath)).size !== workers.length)
+    throw new Error(msg7.state.invalidShape(path));
+  return { workers };
 }
 function isWorker(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return false;
   const record = value;
-  if (typeof record.name !== "string" || !/^[a-z][a-z0-9_-]{0,31}$/u.test(record.name) || typeof record.role !== "string" || !record.role || typeof record.model !== "string" || !record.model || typeof record.thinking !== "string" || !THINKING_LEVELS2.includes(record.thinking) || typeof record.status !== "string" || !isStatus(record.status) || typeof record.sessionPath !== "string" || !record.sessionPath)
+  if (typeof record.name !== "string" || !WORKER_NAME.test(record.name) || typeof record.role !== "string" || !record.role || typeof record.model !== "string" || !record.model || typeof record.thinking !== "string" || !THINKING_LEVELS2.includes(record.thinking) || record.status !== "working" && record.status !== "idle" && record.status !== "reviewing" || typeof record.sessionPath !== "string" || !record.sessionPath)
     return false;
   if (record.cwd !== undefined && (typeof record.cwd !== "string" || !record.cwd))
     return false;
@@ -9352,12 +8814,7 @@ function isWorker(value) {
     return false;
   if (typeof record.launch !== "number" || !Number.isInteger(record.launch) || record.launch <= 0)
     return false;
-  if (record.disposition !== undefined && record.disposition !== "pending" && record.disposition !== "reminded")
-    return false;
-  return true;
-}
-function isStatus(value) {
-  return value === "working" || value === "idle" || value === "reviewing";
+  return record.disposition === undefined || record.disposition === "pending" || record.disposition === "reminded";
 }
 
 // master/actions.ts
@@ -9365,24 +8822,24 @@ var ACTIONS = ["start", "send", "interrupt", "review", "tail", "ack", "kill"];
 var MAX_IN_FLIGHT = 15;
 var ACTION_HANDLERS = { start, send, interrupt, review, tail: tail2, ack, kill };
 async function kill(active, params) {
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   active.remove(target.name);
   await active.setup.pool.dispose(target.sessionPath);
   return toolResult({ killed: true });
 }
 async function tail2(active, params) {
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   return { content: [{ type: "text", text: await readWorkerTrace(target) }], details: undefined };
 }
 async function ack(active, params) {
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   if (target.reviewNeeded)
     throw new Error(msg7.action.ackObligation(target.name));
   if (target.status !== "idle")
     throw new Error(msg7.action.ackStatus(target.name, target.status));
   if (target.disposition) {
     const { disposition: _disposition, ...rest } = target;
-    active.store.dispatch({ type: "UPSERT_WORKER", worker: rest });
+    active.store.upsert(rest);
   }
   const live = active.live.get(target.name);
   if (live?.outcome && live.outcome.kind !== "done")
@@ -9393,7 +8850,7 @@ async function ack(active, params) {
 async function review(active, params) {
   if (active.setup.reviewGate)
     throw new Error(active.setup.reviewGate);
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   const live = active.liveOf(target.name);
   if (target.status !== "idle" || live.transitioning)
     throw new Error(msg7.action.reviewBusy(target.name));
@@ -9413,7 +8870,7 @@ async function review(active, params) {
   }
 }
 async function interrupt(active, params) {
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   if (target.status !== "working")
     throw new Error(msg7.action.interruptStatus(target.name, target.status));
   const session = active.setup.pool.getSession(target.sessionPath);
@@ -9438,7 +8895,7 @@ async function send(active, params) {
   const { reviewGate, pool, roster } = active.setup;
   if (params.review === true && reviewGate)
     throw new Error(reviewGate);
-  const target = requireWorker(active.store.state, requiredString(params.worker, "worker"));
+  const target = targetOf(active, params);
   const live = active.liveOf(target.name);
   if (live.transitioning)
     throw new Error(msg7.action.switching(target.name));
@@ -9527,9 +8984,9 @@ async function start(active, params, ctx) {
   const name = params.worker.trim();
   validateWorkerName(name);
   const starting = [...active.live].flatMap(([candidate, live]) => live.starting ? [candidate] : []);
-  if (active.store.state.workers.some((worker) => worker.name === name) || starting.includes(name))
+  if (active.store.find(name) || starting.includes(name))
     throw new Error(msg7.action.exists(name));
-  const inFlight = active.store.state.workers.filter((worker) => worker.status === "working" || worker.status === "reviewing");
+  const inFlight = active.store.workers.filter((worker) => worker.status === "working" || worker.status === "reviewing");
   if (inFlight.length + starting.length >= MAX_IN_FLIGHT)
     throw new Error(msg7.action.limit(MAX_IN_FLIGHT, [...inFlight.map((worker) => worker.name), ...starting]));
   const prompt = requiredString(params.prompt, "prompt");
@@ -9557,7 +9014,7 @@ async function start(active, params, ctx) {
       launch,
       ...params.review === true ? { reviewNeeded: true } : {}
     };
-    active.store.dispatch({ type: "UPSERT_WORKER", worker });
+    active.store.upsert(worker);
     live.starting = undefined;
     active.beginRun(name);
     const session = await spawnWorker(active, worker, false);
@@ -9596,6 +9053,9 @@ ${lines.join(`
 function toolResult(value) {
   return { content: [{ type: "text", text: JSON.stringify(value) }], details: value };
 }
+function targetOf(active, params) {
+  return active.store.require(requiredString(params.worker, "worker"));
+}
 function requiredString(value, field) {
   if (typeof value !== "string" || !value.trim())
     throw new Error(msg7.action.empty(field));
@@ -9613,7 +9073,7 @@ function resolveRole(roles, role) {
   return roles.find((candidate) => candidate.role === role);
 }
 function validateWorkerName(name) {
-  if (!/^[a-z][a-z0-9_-]{0,31}$/u.test(name))
+  if (!WORKER_NAME.test(name))
     throw new Error(msg7.action.badName);
 }
 function validateDelegationText(prompt) {
@@ -9640,40 +9100,12 @@ async function resolveSendCwd(worker, requested) {
 
 // master/event-card.ts
 import { getMarkdownTheme as getMarkdownTheme5 } from "@earendil-works/pi-coding-agent";
-import { Box as Box2, Markdown as Markdown4, Text as Text6 } from "@earendil-works/pi-tui";
+import { Box as Box2, Markdown as Markdown4 } from "@earendil-works/pi-tui";
 function registerMasterEventRenderer(pi) {
-  pi.registerMessageRenderer(MASTER_EVENT_TYPE, (message, options, theme) => new MasterEventCard(message.content, options.expanded, theme));
-}
-
-class MasterEventCard {
-  card;
-  fallback;
-  constructor(content, expanded, theme) {
-    const text = textOf(content);
-    this.fallback = new Text6(text, 0, 0);
-    let card;
-    try {
-      card = !expanded ? compactCard(text, theme) : fullCard(text, theme);
-    } catch {
-      card = undefined;
-    }
-    this.card = card ?? this.fallback;
-  }
-  render(width) {
-    try {
-      return this.card.render(Math.max(1, width));
-    } catch {
-      try {
-        return this.fallback.render(Math.max(1, width));
-      } catch {
-        return [];
-      }
-    }
-  }
-  invalidate() {
-    this.card.invalidate?.();
-    this.fallback.invalidate?.();
-  }
+  pi.registerMessageRenderer(MASTER_EVENT_TYPE, (message, options, theme) => {
+    const text = textOf(message.content);
+    return options.expanded ? fullCard(text, theme) : compactCard(text, theme);
+  });
 }
 function compactCard(text, theme) {
   const entries = machineEntries(text);
@@ -9708,7 +9140,7 @@ function card(theme, children) {
 // master/guard.ts
 import { realpath as realpath2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "node:path";
+import { basename as basename3, dirname as dirname4, isAbsolute as isAbsolute2, relative, resolve, sep } from "node:path";
 import { isToolCallEventType } from "@earendil-works/pi-coding-agent";
 function registerWorkerGuard(pi) {
   pi.on("tool_call", async (event, ctx) => {
@@ -9721,7 +9153,7 @@ function registerWorkerGuard(pi) {
 }
 var TEMP_ROOTS = [tmpdir(), "/tmp"];
 async function outsideCheckoutReason(path, cwd) {
-  const target = await canonicalWritePath(resolve2(cwd, path));
+  const target = await canonicalWritePath(resolve(cwd, path));
   const roots = await Promise.all([cwd, ...TEMP_ROOTS].map(canonicalWritePath));
   return roots.some((root) => within(root, target)) ? undefined : msg7.guard(path);
 }
@@ -9734,9 +9166,9 @@ async function canonicalWritePath(path) {
   const missing = [];
   while (true) {
     try {
-      return resolve2(await realpath2(ancestor), ...missing.reverse());
+      return resolve(await realpath2(ancestor), ...missing.reverse());
     } catch {
-      const parent = dirname5(ancestor);
+      const parent = dirname4(ancestor);
       if (parent === ancestor)
         return path;
       missing.push(basename3(ancestor));
@@ -10038,7 +9470,7 @@ class Outbox {
       if (this.active.closed)
         return;
       const names = new Set;
-      for (const worker of this.active.store.state.workers)
+      for (const worker of this.active.store.workers)
         if ((worker.status === "working" || worker.status === "reviewing") && this.active.live.get(worker.name)?.origin !== "view")
           names.add(worker.name);
       for (const event of [...this.queued, ...this.delivering])
@@ -10105,9 +9537,9 @@ class Outbox {
       for (const event of batch) {
         if (!event.worker)
           continue;
-        const worker = active.store.state.workers.find((candidate) => candidate.name === event.worker);
+        const worker = active.store.find(event.worker);
         if (worker?.status === "idle" && worker.disposition !== "reminded")
-          active.store.dispatch({ type: "UPSERT_WORKER", worker: { ...worker, disposition: "pending" } });
+          active.store.upsert({ ...worker, disposition: "pending" });
       }
       this.scheduleInFlight();
     }, (error) => {
@@ -10191,7 +9623,7 @@ function runtimeSource(active) {
     runtimeDrafts.set(active, drafts = new Map);
   return {
     facts: () => active.activityFacts(),
-    worker: (name) => active.store.state.workers.find((worker) => worker.name === name),
+    worker: (name) => active.store.find(name),
     session: (worker) => active.setup.pool.getSession(worker.sessionPath),
     onSession: (listener) => active.onWorkerSession(listener),
     onWorkerRemoved: (listener) => active.onWorkerRemoved(listener),
@@ -10622,6 +10054,7 @@ class WorkerView {
 // master/runtime.ts
 var LIST_WIDGET_KEY = "firecode-master-list";
 var MASTER_IDENTITY = paint(HEAT_COLORS.orange, msg7.command.identity);
+var newLive = () => ({ currentTools: new Map, viewPrompts: [], origin: "master" });
 
 class MasterRuntime {
   setup;
@@ -10635,12 +10068,12 @@ class MasterRuntime {
   stopReleaseWatch;
   sessionListeners = new Set;
   removedListeners = new Set;
-  constructor(setup, ctx, restored) {
+  constructor(setup, ctx) {
     this.setup = setup;
     this.ctx = ctx;
     this.outbox = new Outbox(this);
-    this.store = new MasterStore(masterStatePath(getAgentDir4(), ctx.sessionManager.getSessionId()), restored, () => this.render());
-    this.launchSeq = Math.max(0, ...this.store.state.workers.map((worker) => worker.launch));
+    this.store = new MasterStore(masterStatePath(getAgentDir4(), ctx.sessionManager.getSessionId()), () => this.render());
+    this.launchSeq = Math.max(0, ...this.store.workers.map((worker) => worker.launch));
     this.stopReleaseWatch = setup.pool.onRelease((sessionPath) => {
       for (const live of this.live.values())
         if (live.observed?.sessionPath === sessionPath)
@@ -10671,11 +10104,11 @@ class MasterRuntime {
   liveOf(name) {
     let live = this.live.get(name);
     if (!live)
-      this.live.set(name, live = { currentTools: new Map, viewPrompts: [], origin: "master" });
+      this.live.set(name, live = newLive());
     return live;
   }
   reserve(name) {
-    const live = { currentTools: new Map, viewPrompts: [], origin: "master", starting: true };
+    const live = { ...newLive(), starting: true };
     this.live.set(name, live);
     return { live, launch: ++this.launchSeq };
   }
@@ -10687,27 +10120,26 @@ class MasterRuntime {
         this.unobserve(live);
       this.live.delete(name);
     }
-    const before = this.store.state;
-    if (this.store.dispatch({ type: "REMOVE_WORKER", name }) === before)
+    if (!this.store.remove(name))
       return;
     for (const notify of this.removedListeners)
       notify(name);
   }
   current(identity) {
     this.assertOpen();
-    const current = this.store.state.workers.find((worker) => worker.name === identity.name);
-    if (current?.sessionPath === identity.sessionPath)
+    const current = this.find(identity);
+    if (current)
       return current;
     this.setup.pool.dispose(identity.sessionPath);
     throw new Error(msg7.runtime.killed(identity.name));
   }
   commit(identity, update) {
     const next = update(this.current(identity));
-    this.store.dispatch({ type: "UPSERT_WORKER", worker: next });
+    this.store.upsert(next);
     return next;
   }
   find(identity) {
-    const current = this.store.state.workers.find((worker) => worker.name === identity.name);
+    const current = this.store.find(identity.name);
     return current?.sessionPath === identity.sessionPath ? current : undefined;
   }
   markIdle(worker, outcome, at = Date.now()) {
@@ -10768,7 +10200,7 @@ class MasterRuntime {
     live.observed = undefined;
   }
   activityFacts() {
-    const workers = this.store.state.workers;
+    const workers = this.store.workers;
     const byPath = (pick) => new Map(workers.flatMap((worker) => {
       const live = this.live.get(worker.name);
       const value = live && pick(live);
@@ -10794,16 +10226,12 @@ var WAKE_QUIET_MS = 1500;
 function registerMaster(pi, dependencies = {}, worker = false) {
   if (worker)
     return registerWorkerGuard(pi);
-  const loaded = loadConfig().master;
+  const all = loadConfig();
+  const loaded = all.master;
   const prompts = loadMasterPrompts();
-  const startupError = "error" in loaded ? loaded.error : ("error" in prompts) ? prompts.error : undefined;
+  const startupError = "error" in loaded ? loaded.error : prompts.error;
   const roster = "error" in loaded ? [] : loaded.config.roles;
   const autoActivate = "error" in loaded ? false : loaded.config.autoActivate;
-  const requirePrompts = () => {
-    if ("error" in prompts)
-      throw new Error(prompts.error);
-    return prompts;
-  };
   let publishedInFlight = 0;
   const publishInFlight = (count, teardown = false) => {
     if (count === publishedInFlight)
@@ -10820,8 +10248,8 @@ function registerMaster(pi, dependencies = {}, worker = false) {
     pool: dependencies.pool ?? new InProcessSessionPool,
     roster,
     exclusions: "error" in loaded ? [] : loaded.config.workerExcludeExtensions,
-    workerPrompt: () => requirePrompts().worker,
-    reviewGate: reviewGateError(),
+    workerPrompt: prompts.worker,
+    reviewGate: all.config.features.review === false ? msg7.command.reviewOff : ("error" in all.review) ? all.review.error : undefined,
     interruptResumeMs: dependencies.interruptResumeMs ?? INTERRUPT_RESUME_MS,
     wakeQuietMs: dependencies.wakeQuietMs ?? WAKE_QUIET_MS,
     publishInFlight,
@@ -10833,19 +10261,18 @@ function registerMaster(pi, dependencies = {}, worker = false) {
     const tools = pi.getActiveTools().filter((name) => !MASTER_TOOLS.includes(name));
     pi.setActiveTools(active ? [...tools, ...MASTER_TOOLS] : tools);
   };
-  const activate = (ctx, restored) => {
+  const activate = (ctx) => {
     if (startupError)
       throw new Error(startupError);
-    if (runtime) {
-      runtime.ctx = ctx;
-      return runtime;
-    }
-    const active = runtime = new MasterRuntime(setup, ctx, restored);
+    const active = runtime = new MasterRuntime(setup, ctx);
     setTools(true);
     if (active.store.discardedLegacyVersion !== undefined)
       ctx.ui.notify(msg7.command.legacyPool(active.store.discardedLegacyVersion), "warning");
     active.render();
-    return active;
+    for (const worker of active.store.workers)
+      if (worker.interruptedAt)
+        armInterruptReminder(active, worker);
+    active.outbox.replayUnacked(ctx);
   };
   const deactivate = async () => {
     const active = runtime;
@@ -10855,34 +10282,12 @@ function registerMaster(pi, dependencies = {}, worker = false) {
     await setup.pool.disposeAll();
     setTools(false);
   };
-  const activateSession = (ctx) => {
-    if (runtime)
-      return activate(ctx);
-    let restored;
-    try {
-      restored = loadMasterState(masterStatePath(getAgentDir5(), ctx.sessionManager.getSessionId()));
-    } catch {
-      return activate(ctx);
-    }
-    const active = activate(ctx, restored);
-    if (restored) {
-      const recovered = recoverMasterState(restored);
-      for (const worker of recovered.workers) {
-        if (worker !== restored.workers.find((candidate) => candidate.name === worker.name))
-          active.store.dispatch({ type: "UPSERT_WORKER", worker });
-        if (worker.interruptedAt)
-          armInterruptReminder(active, worker);
-      }
-    }
-    active.outbox.replayUnacked(ctx);
-    return active;
-  };
   pi.registerCommand("fire-master", {
     description: msg7.command.description,
     handler: async (args, ctx) => {
       const input = args.trim();
       if (input === "status") {
-        ctx.ui.notify(runtime ? statusText(runtime.store.state.workers) : msg7.command.notStarted, "info");
+        ctx.ui.notify(runtime ? statusText(runtime.store.workers) : msg7.command.notStarted, "info");
         return;
       }
       if (input) {
@@ -10895,7 +10300,7 @@ function registerMaster(pi, dependencies = {}, worker = false) {
         return;
       }
       try {
-        activateSession(ctx);
+        activate(ctx);
         ctx.ui.notify(msg7.command.on, "info");
       } catch (error) {
         ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
@@ -10912,7 +10317,7 @@ function registerMaster(pi, dependencies = {}, worker = false) {
     return {
       systemPrompt: `${event.systemPrompt}
 
-${assembleMasterPrompt(requirePrompts().master, rosterText(roster))}`
+${assembleMasterPrompt(prompts.master, rosterText(roster))}`
     };
   });
   pi.registerTool({
@@ -10922,10 +10327,10 @@ ${assembleMasterPrompt(requirePrompts().master, rosterText(roster))}`
     renderShell: "self",
     renderCall: (_args, theme, ctx) => new ToolLine({ label: msg7.tool.label, value: subagentsCallParts({ action: "list" }), clip: "end", theme, ctx }),
     renderResult: (result, options, theme, context) => {
-      const details = result.details;
-      context.state.meta = !context.isError && Array.isArray(details?.workers) ? listMeta(details.workers) : undefined;
-      if (options.expanded && Array.isArray(details?.workers))
-        return expandedWorkerList(details.workers, theme, context);
+      const workers = result.details?.workers;
+      context.state.meta = !context.isError && workers ? listMeta(workers) : undefined;
+      if (options.expanded && workers)
+        return expandedWorkerList(workers, theme, context);
       return renderSubagentsResult(result, options, theme, context);
     },
     parameters: Type.Object({}),
@@ -10933,7 +10338,7 @@ ${assembleMasterPrompt(requirePrompts().master, rosterText(roster))}`
       const active = runtime;
       if (!active)
         throw new Error(msg7.tool.onlyInMaster(MASTER_LIST_TOOL));
-      const workers = active.store.state.workers.map(compactWorker);
+      const workers = active.store.workers.map(compactWorker);
       return {
         content: [{ type: "text", text: JSON.stringify({ workers }) }],
         details: {
@@ -10962,10 +10367,7 @@ ${assembleMasterPrompt(requirePrompts().master, rosterText(roster))}`
       const active = runtime;
       if (!active)
         throw new Error(msg7.tool.onlyInMaster(MASTER_TOOL));
-      const handler = ACTION_HANDLERS[params.action];
-      if (!handler)
-        throw new Error(msg7.tool.unknownAction(String(params.action)));
-      return handler(active, params, ctx);
+      return ACTION_HANDLERS[params.action](active, params, ctx);
     }
   });
   pi.on("session_start", async (_event, ctx) => {
@@ -10973,24 +10375,18 @@ ${assembleMasterPrompt(requirePrompts().master, rosterText(roster))}`
     if (!autoActivate)
       return;
     try {
-      activateSession(ctx);
+      activate(ctx);
     } catch (error) {
       ctx.ui.notify(msg7.command.restoreFailed(error instanceof Error ? error.message : String(error)), "error");
     }
   });
   pi.on("session_shutdown", () => deactivate());
 }
-function reviewGateError() {
-  const loaded = loadConfig();
-  if (loaded.config.features.review === false)
-    return msg7.command.reviewOff;
-  return "error" in loaded.review ? loaded.review.error : undefined;
-}
 function loadMasterPrompts() {
   try {
     return { master: readMasterPrompt("master"), worker: readMasterPrompt("worker") };
   } catch (error) {
-    return { error: error instanceof Error ? error.message : String(error) };
+    return { master: "", worker: "", error: error instanceof Error ? error.message : String(error) };
   }
 }
 function rosterText(models) {
@@ -11001,7 +10397,7 @@ function rosterText(models) {
 }
 
 // watcher/card.ts
-import { Text as Text7 } from "@earendil-works/pi-tui";
+import { Text as Text6 } from "@earendil-works/pi-tui";
 
 // watcher/messages.ts
 var msg8 = defineMessages({
@@ -11070,17 +10466,14 @@ var msg8 = defineMessages({
 // watcher/card.ts
 var WATCHER_MESSAGE_TYPE = "firecode-watcher-note";
 function adviceMessage(card) {
-  return wrapEnvelope("firecode_watcher", `${adviceHeadline(card)}
+  return wrapEnvelope("firecode_watcher", `${msg8.card.headline(card.turnIndex)}
 ${card.note}
 ${msg8.card.weighNotice}`);
 }
-function adviceHeadline(card) {
-  return msg8.card.headline(card.turnIndex);
-}
 function registerWatcherCardRenderer(pi) {
   pi.registerMessageRenderer(WATCHER_MESSAGE_TYPE, (message, options, theme) => {
     const advice = parseAdvice(message.content);
-    return advice ? new AdviceLine(advice, options.expanded, theme) : new Text7(textOf(message.content), 0, 0);
+    return advice ? new AdviceLine(advice, options.expanded, theme) : new Text6(textOf(message.content), 0, 0);
   });
 }
 function parseAdvice(content) {
@@ -11097,32 +10490,24 @@ class AdviceLine {
   card;
   expanded;
   theme;
-  fallback;
   constructor(card, expanded, theme) {
     this.card = card;
     this.expanded = expanded;
     this.theme = theme;
-    this.fallback = new Text7(`${card.headline} ${card.note}`, 0, 0);
   }
+  invalidate() {}
   render(width) {
     const columns = Math.max(1, width);
-    try {
-      const bgFn = (text) => this.theme.bg("toolPendingBg", text);
-      if (this.expanded) {
-        const headline = this.theme.fg("warning", clip(oneLine(this.card.headline), columns));
-        const body = new Text7(this.theme.fg("dim", `  ${this.card.note}
+    const bgFn = (text) => this.theme.bg("toolPendingBg", text);
+    if (this.expanded) {
+      const headline = this.theme.fg("warning", clip(oneLine(this.card.headline), columns));
+      const body = new Text6(this.theme.fg("dim", `  ${this.card.note}
   ${msg8.card.expandedFooter}`), 0, 0);
-        return [paintBgLine(headline, columns, bgFn), ...body.render(columns)];
-      }
-      const firstLine = oneLine(this.card.note.split(/\r?\n/u, 1)[0] ?? "");
-      const line = clip(`${this.theme.fg("dim", RAIL)}${this.theme.fg("warning", msg8.card.label)}${this.theme.fg("dim", ` — ${firstLine}`)}`, columns);
-      return [paintBgLine(line, columns, bgFn)];
-    } catch {
-      return this.fallback.render(columns);
+      return [paintBgLine(headline, columns, bgFn), ...body.render(columns)];
     }
-  }
-  invalidate() {
-    this.fallback.invalidate?.();
+    const firstLine = oneLine(this.card.note.split(/\r?\n/u, 1)[0] ?? "");
+    const line = clip(`${this.theme.fg("dim", RAIL)}${this.theme.fg("warning", msg8.card.label)}${this.theme.fg("dim", ` — ${firstLine}`)}`, columns);
+    return [paintBgLine(line, columns, bgFn)];
   }
 }
 
@@ -11138,8 +10523,8 @@ async function createObserver(options) {
     model: options.model,
     thinking: options.thinking,
     tools: OBSERVER_TOOLS,
-    customTools: [adviseTool(() => advice, (next) => {
-      advice = next;
+    customTools: [adviseTool(() => advice, (note) => {
+      advice = note;
     })],
     systemPrompt: { mode: "replace", text: readPrompt(PROMPTS2, "watch") },
     contextFiles: true,
@@ -11169,7 +10554,7 @@ function adviseTool(current, capture) {
       const note = typeof params.note === "string" ? params.note.trim() : "";
       if (!note)
         throw new Error(msg8.advise.emptyNote);
-      capture({ note });
+      capture(note);
       return { content: [{ type: "text", text: msg8.advise.recorded }], details: undefined };
     }
   };
@@ -11205,18 +10590,15 @@ function toolCallLine2(part, context) {
 function argumentText(key, value, context) {
   const text = typeof value === "string" ? value : JSON.stringify(value) ?? "";
   if (context === "full")
-    return oneLine2(text);
-  return BODY_KEYS.has(key) ? msg8.transcript.characters(text.length) : oneLine2(text);
+    return oneLine(text);
+  return BODY_KEYS.has(key) ? msg8.transcript.characters(text.length) : oneLine(text);
 }
 var BODY_KEYS = new Set(["content", "oldText", "newText", "old_text", "new_text", "edits"]);
 function blocks(content) {
   return Array.isArray(content) ? content.filter((part) => !!part && typeof part === "object") : [];
 }
-function oneLine2(text) {
-  return text.replace(/\s+/gu, " ").trim();
-}
 function clipText(text, budget) {
-  const single = oneLine2(text);
+  const single = oneLine(text);
   return single.length > budget ? `${single.slice(0, budget)}…` : single;
 }
 
@@ -11265,8 +10647,8 @@ function registerWatcher(pi, dependencies = {}, subsession = false) {
     ctx.ui.setStatus("watcher", ctx.ui.theme.fg("dim", msg8.statusLabel));
     return owner;
   };
-  const speak = async (owner, advice, turnIndex) => {
-    const card = { note: advice.note, turnIndex };
+  const speak = async (owner, note, turnIndex) => {
+    const card = { note, turnIndex };
     try {
       await deliver(pi, owner.ctx, { customType: WATCHER_MESSAGE_TYPE, content: adviceMessage(card) });
     } catch (error) {
@@ -11387,9 +10769,10 @@ var REGISTRARS = {
   presets: registerPresets,
   stats: registerStats,
   claudeSub: registerClaudeSub,
-  openaiNative: registerOpenAINative
+  openaiNative: registerOpenAINative,
+  statusbar: registerStatusBar
 };
-var MAIN_ONLY = new Set(["header", "tools", "presets", "stats"]);
+var MAIN_ONLY = new Set(["header", "tools", "presets", "stats", "statusbar"]);
 function registerFirecode(pi, role = "main") {
   let seeding = seedForMainSession(role);
   const { config, problems, featuresBroken } = loadConfig();
@@ -11402,13 +10785,12 @@ function registerFirecode(pi, role = "main") {
       continue;
     register(pi);
   }
-  if (config.features.statusbar !== false)
-    registerStatusBar(pi, subsession);
   if (config.features.watcher !== false)
     registerWatcher(pi, {}, subsession);
   if (config.features.master !== false)
     registerMaster(pi, {}, subsession);
-  registerHerdrProjection(pi, subsession);
+  if (!subsession)
+    registerHerdrProjection(pi);
   registerReview(pi, reviewEnabled, featuresBroken);
   if (problems.length === 0 && !seeding)
     return;