omnius 1.0.535 → 1.0.537

package/dist/index.js

@@ -6981,7 +6981,7 @@ var init_file_write = __esm({
     init_text_encoding();
     FileWriteTool = class {
       name = "file_write";
-      description = "Create new files or deliberately replace small, empty, or placeholder files; use file_edit/file_patch for local changes. For content with heavy quoting, raw JSON, control characters, or large full-file payloads, pass content_base64 instead of shell heredocs/cat/tee.";
+      description = "Create new files or deliberately replace small, empty, or placeholder files; use file_edit/file_patch for local changes. Existing-file replacement requires overwrite=true plus expected_hash from a fresh file_read; never use this as a fallback after a failed targeted edit. For content with heavy quoting, raw JSON, control characters, or large full-file payloads, pass content_base64 instead of shell heredocs/cat/tee.";
       parameters = {
         type: "object",
         properties: {
@@ -296557,8 +296557,8 @@ var init_cron_agent = __esm({
         }
         const lines = [];
         const formatJob = (job, scopeLabel, isThisProject) => {
-          const statusIcon = job.status === "active" ? "●" : job.status === "completed" ? "✔" : job.status === "paused" ? "⏸" : "✖";
-          lines.push(`  ${statusIcon} [${job.id}] ${job.status.toUpperCase()} [${scopeLabel}]`);
+          const statusIcon2 = job.status === "active" ? "●" : job.status === "completed" ? "✔" : job.status === "paused" ? "⏸" : "✖";
+          lines.push(`  ${statusIcon2} [${job.id}] ${job.status.toUpperCase()} [${scopeLabel}]`);
           lines.push(`    Goal: ${job.goal.slice(0, 80)}${job.goal.length > 80 ? "..." : ""}`);
           lines.push(`    Schedule: ${job.scheduleDescription}`);
           lines.push(`    Runs: ${job.runCount}${job.maxRuns > 0 ? `/${job.maxRuns}` : ""}`);
@@ -553281,6 +553281,7 @@ function spawnFullSubAgent(task, opts, onOutput, onComplete) {
   child.stderr?.on("data", (chunk) => {
     const text2 = chunk.toString();
     outputBuffer.push(...text2.split("\n").filter((l2) => l2.length > 0));
+    onOutput?.(text2);
   });
   child.on("exit", (code8) => {
     clearInterval(heartbeatTimer);
@@ -567114,13 +567115,103 @@ function normalizeShellCommand(command) {
 function splitConjunctiveVerifyCommand(command) {
   return normalizeShellCommand(command).split(/\s+&&\s+/).map((part) => part.trim()).filter(Boolean);
 }
+function stripVerifierFallbackSuffix(command) {
+  let quote2 = null;
+  for (let i2 = 0; i2 < command.length - 1; i2++) {
+    const ch = command[i2];
+    if (quote2) {
+      if (ch === quote2 && command[i2 - 1] !== "\\")
+        quote2 = null;
+      continue;
+    }
+    if (ch === "'" || ch === '"') {
+      quote2 = ch;
+      continue;
+    }
+    if (ch === "|" && command[i2 + 1] === "|") {
+      return command.slice(0, i2).trim();
+    }
+  }
+  return command.trim();
+}
+function stageHeadProgram(stage2) {
+  const tokens = stage2.trim().split(/\s+/);
+  let i2 = 0;
+  while (i2 < tokens.length) {
+    const token = tokens[i2];
+    if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(token)) {
+      i2++;
+      continue;
+    }
+    const base3 = token.replace(/^["']|["']$/g, "").split("/").pop() ?? token;
+    if (STAGE_PREFIX_PROGRAMS.has(base3)) {
+      i2++;
+      if (base3 === "timeout" && /^[0-9]+[smhd]?$/.test(tokens[i2] ?? ""))
+        i2++;
+      continue;
+    }
+    return base3.toLowerCase();
+  }
+  return null;
+}
+function commandIsPureReadOnlyPipeline(command) {
+  const stages = [];
+  let current = "";
+  let quote2 = null;
+  const raw = command.trim();
+  if (!raw)
+    return false;
+  for (let i2 = 0; i2 < raw.length; i2++) {
+    const ch = raw[i2];
+    if (quote2) {
+      current += ch;
+      if (ch === quote2 && raw[i2 - 1] !== "\\")
+        quote2 = null;
+      continue;
+    }
+    if (ch === "'" || ch === '"') {
+      quote2 = ch;
+      current += ch;
+      continue;
+    }
+    if (ch === "&" && raw[i2 + 1] === "&") {
+      stages.push(current);
+      current = "";
+      i2++;
+      continue;
+    }
+    if (ch === "|") {
+      stages.push(current);
+      current = "";
+      if (raw[i2 + 1] === "|")
+        i2++;
+      continue;
+    }
+    if (ch === ";") {
+      stages.push(current);
+      current = "";
+      continue;
+    }
+    if (ch === "$" && raw[i2 + 1] === "(")
+      return false;
+    if (ch === "`")
+      return false;
+    current += ch;
+  }
+  stages.push(current);
+  const meaningful = stages.map((s2) => s2.trim()).filter(Boolean);
+  if (meaningful.length === 0)
+    return false;
+  return meaningful.every((stage2) => {
+    const head = stageHeadProgram(stage2);
+    return head !== null && PURE_READER_PROGRAMS.has(head);
+  });
+}
 function commandReliablySatisfiesVerifyCommand(observedCommand, verifyCommand) {
   const observed = normalizeShellCommand(observedCommand);
-  const expected = normalizeShellCommand(verifyCommand);
+  const expected = normalizeShellCommand(stripVerifierFallbackSuffix(verifyCommand));
   if (!observed || !expected)
     return false;
-  if (expected.includes(" || "))
-    return false;
   if (observed === expected)
     return true;
   if (observed.startsWith(`${expected} && `) && !observed.includes(" || ")) {
@@ -567141,9 +567232,93 @@ function verifyCommandSatisfiedByShellHistory(verifyCommand, history) {
     return false;
   return parts.every((part) => successful.some((entry) => commandReliablySatisfiesVerifyCommand(entry.command, part)));
 }
+var PURE_READER_PROGRAMS, STAGE_PREFIX_PROGRAMS;
 var init_verificationCommand = __esm({
   "packages/orchestrator/dist/verificationCommand.js"() {
     "use strict";
+    PURE_READER_PROGRAMS = /* @__PURE__ */ new Set([
+      "cat",
+      "tac",
+      "tail",
+      "head",
+      "less",
+      "more",
+      "grep",
+      "egrep",
+      "fgrep",
+      "rg",
+      "ag",
+      "awk",
+      "gawk",
+      "sed",
+      "gsed",
+      "sort",
+      "uniq",
+      "wc",
+      "cut",
+      "tr",
+      "column",
+      "echo",
+      "printf",
+      "ls",
+      "dir",
+      "find",
+      "fd",
+      "stat",
+      "file",
+      "strings",
+      "hexdump",
+      "xxd",
+      "od",
+      "jq",
+      "yq",
+      "tee",
+      "dirname",
+      "basename",
+      "readlink",
+      "realpath",
+      "pwd",
+      "date",
+      "true",
+      "false",
+      "test",
+      "type",
+      "which",
+      "whoami",
+      "env",
+      "printenv",
+      "sleep",
+      "cd",
+      "diff",
+      "cmp",
+      "md5sum",
+      "sha1sum",
+      "sha256sum",
+      "du",
+      "df",
+      "nl",
+      "paste",
+      "join",
+      "comm",
+      "expand",
+      "unexpand",
+      "fold",
+      "rev",
+      "seq",
+      "xargs"
+    ]);
+    STAGE_PREFIX_PROGRAMS = /* @__PURE__ */ new Set([
+      "sudo",
+      "command",
+      "builtin",
+      "nice",
+      "ionice",
+      "time",
+      "timeout",
+      "nohup",
+      "stdbuf",
+      "unbuffer"
+    ]);
   }
 });
 
@@ -586374,6 +586549,8 @@ var init_agenticRunner = __esm({
       _completionCaveat = null;
       _completionLedger = null;
       _staleEditFamilies = /* @__PURE__ */ new Map();
+      /** Semantic retry counter for blocked full-file writes (payload-independent). */
+      _blockedFullWriteAttempts = /* @__PURE__ */ new Map();
       _lastReadTurnByPathKey = /* @__PURE__ */ new Map();
       _recentSuccessfulReplacements = [];
       // ── WO-AM-01/04/10: Associative memory stores ──
@@ -589283,8 +589460,9 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           return this._declaredVerifierCommand;
         }
         const diagnostics = parseCompilerDiagnostics(output);
-        if (diagnostics.length > 0 && this._shellResultLooksLikeVerification({ command: trimmed }, { success: false, output })) {
-          return trimmed;
+        if (diagnostics.length > 0 && !commandIsPureReadOnlyPipeline(trimmed)) {
+          const latched = stripVerifierFallbackSuffix(trimmed);
+          return latched || trimmed;
         }
         return null;
       }
@@ -589294,19 +589472,68 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           return false;
         return commandReliablySatisfiesVerifyCommand(command.trim(), state.verifierCommand);
       }
+      /**
+       * When a tool result was triaged for size (full payload saved to
+       * `.omnius/tool-results/<hash>.txt`), append the saved payload so
+       * diagnostics parsing sees the complete output. Without this, a large
+       * failed build's `file:line:col: error:` lines can be cut out of the
+       * triage envelope and the run never registers as a verifier run.
+       * Best effort and bounded — never throws into the loop.
+       */
+      _expandTriagedPayloadForDiagnostics(text2) {
+        if (!text2 || !text2.includes(TRIAGE_SAVED_PATH_MARKER))
+          return text2;
+        const MAX_PAYLOAD_BYTES = 1e6;
+        const MAX_FILES2 = 2;
+        const extras = [];
+        let searchFrom = 0;
+        for (let i2 = 0; i2 < MAX_FILES2; i2++) {
+          const markerAt = text2.indexOf(TRIAGE_SAVED_PATH_MARKER, searchFrom);
+          if (markerAt === -1)
+            break;
+          const pathStart = markerAt + TRIAGE_SAVED_PATH_MARKER.length;
+          const restOfLine = text2.slice(pathStart, text2.indexOf("\n", pathStart) === -1 ? void 0 : text2.indexOf("\n", pathStart));
+          searchFrom = pathStart;
+          const endIdx = (() => {
+            const emDash = restOfLine.indexOf(" — ");
+            if (emDash !== -1)
+              return emDash;
+            const bracket = restOfLine.indexOf("]");
+            return bracket !== -1 ? bracket : restOfLine.length;
+          })();
+          const savedPath = restOfLine.slice(0, endIdx).trim();
+          if (!savedPath)
+            continue;
+          try {
+            if (!_fsExistsSync(savedPath))
+              continue;
+            const stat9 = _fsStatSync(savedPath);
+            if (!stat9.isFile())
+              continue;
+            const raw = _fsReadFileSync(savedPath, "utf8");
+            extras.push(raw.length > MAX_PAYLOAD_BYTES ? raw.slice(0, MAX_PAYLOAD_BYTES) : raw);
+          } catch {
+          }
+        }
+        if (extras.length === 0)
+          return text2;
+        return `${text2}
+${extras.join("\n")}`;
+      }
       _observeCompileVerifierResult(input) {
         const diagnostics = rankCompilerDiagnostics(parseCompilerDiagnostics(input.output));
+        const verifierCommand = stripVerifierFallbackSuffix(input.verifierCommand) || input.verifierCommand.trim();
         const previousDiagnostics = this._lastDeclaredVerifierDiagnostics;
-        this._declaredVerifierCommand = input.verifierCommand;
+        this._declaredVerifierCommand = verifierCommand;
         this._lastDeclaredVerifierOutput = input.output;
         this._lastDeclaredVerifierDiagnostics = diagnostics;
         if (!this._compileFixLoop && diagnostics.length === 0)
           return null;
-        const verifierFingerprint = compileFixVerifierFingerprint(input.verifierCommand);
+        const verifierFingerprint = compileFixVerifierFingerprint(verifierCommand);
         const existingCards = this._compileFixLoop?.cards ?? [];
         const cards = diagnostics.length > 0 ? buildCompileFixCards({
           diagnostics,
-          verifierCommand: input.verifierCommand,
+          verifierCommand,
           turn: input.turn,
           existingCards
         }) : existingCards;
@@ -589315,22 +589542,25 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           existingCards,
           observedCards: cards,
           diagnostics,
-          verifierCommand: input.verifierCommand,
+          verifierCommand,
           turn: input.turn,
           verifierPassed: input.success && diagnostics.length === 0
         });
         this._compileFixLoop = {
           active: diagnostics.length > 0 || nextCards.some((card) => card.status !== "verified"),
-          verifierCommand: input.verifierCommand,
+          verifierCommand,
           verifierFingerprint,
           verifierDirtySinceTurn: null,
           lastVerifierRunTurn: input.turn,
           lastVerifierPassedTurn: input.success && diagnostics.length === 0 ? input.turn : null,
           lastMutationTurn: this._compileFixLoop?.lastMutationTurn ?? null,
-          cards: nextCards
+          cards: nextCards,
+          // A live verifier run resolves the gate's demand — the block streak
+          // is over regardless of pass/fail.
+          preflightBlockStreak: 0
         };
         this._mirrorCompileFixCardsToWorkboard(nextCards, {
-          command: input.verifierCommand,
+          command: verifierCommand,
           success: input.success && diagnostics.length === 0,
           turn: input.turn,
           beforeDiagnosticCount: previousDiagnostics.length,
@@ -589342,7 +589572,7 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
         if (input.success && diagnostics.length === 0) {
           this.emit({
             type: "status",
-            content: `compile_error_fix_loop: verifier passed (${input.verifierCommand}); compile cards verified`,
+            content: `compile_error_fix_loop: verifier passed (${verifierCommand}); compile cards verified`,
             turn: input.turn,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
@@ -589361,7 +589591,7 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
         }
         this.emit({
           type: "status",
-          content: `compile_error_fix_loop_started: verifierCommand=${input.verifierCommand}; cardId=${top.id}; diagnosticFingerprint=${top.diagnostic.fingerprint}; afterDiagnosticCount=${diagnostics.length}`,
+          content: `compile_error_fix_loop_started: verifierCommand=${verifierCommand}; cardId=${top.id}; diagnosticFingerprint=${top.diagnostic.fingerprint}; afterDiagnosticCount=${diagnostics.length}`,
           turn: input.turn,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
@@ -589561,14 +589791,7 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
         if (!state?.active)
           return;
         const normalized = paths.map((p2) => this._normalizeEvidencePath(p2)).filter(Boolean);
-        const owned = state.cards.flatMap((card) => card.ownedFiles);
-        const todos = this.readSessionTodos() || [];
-        const artifacts = todos.flatMap((todo) => Array.isArray(todo.declaredArtifacts) ? todo.declaredArtifacts.filter((p2) => typeof p2 === "string") : []);
-        const relevant = normalized.length === 0 || normalized.some((pathValue) => {
-          if (pathValue.startsWith(".omnius/"))
-            return false;
-          return owned.some((ownedPath) => this._pathsOverlapForVerifier(pathValue, ownedPath)) || artifacts.some((artifactPath) => this._pathsOverlapForVerifier(pathValue, artifactPath)) || /\.(ts|tsx|js|jsx|mjs|cjs|py|go|rs|java|kt|c|cc|cpp|cxx|h|hpp|hh|hxx|ino)$/i.test(pathValue);
-        });
+        const relevant = normalized.length === 0 || this._compileFixPathsTouchProjectSources(normalized, state);
         if (!relevant)
           return;
         state.verifierDirtySinceTurn = turn;
@@ -589595,6 +589818,24 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
+      /**
+       * True when any of the given normalized paths touches project source:
+       * files owned by compile-fix cards, declared todo artifacts, or files
+       * with a source-code extension. Build side effects (logs, artifacts,
+       * `.omnius/` bookkeeping) do not count.
+       */
+      _compileFixPathsTouchProjectSources(normalizedPaths, state) {
+        const owned = state.cards.flatMap((card) => card.ownedFiles);
+        const todos = this.readSessionTodos() || [];
+        const artifacts = todos.flatMap((todo) => Array.isArray(todo.declaredArtifacts) ? todo.declaredArtifacts.filter((p2) => typeof p2 === "string") : []);
+        return normalizedPaths.some((pathValue) => {
+          if (pathValue.startsWith(".omnius/"))
+            return false;
+          return owned.some((ownedPath) => this._pathsOverlapForVerifier(pathValue, ownedPath)) || artifacts.some((artifactPath) => this._pathsOverlapForVerifier(pathValue, artifactPath)) || /\.(ts|tsx|js|jsx|mjs|cjs|py|go|rs|java|kt|c|cc|cpp|cxx|h|hpp|hh|hxx|ino)$/i.test(pathValue);
+        });
+      }
+      /** Consecutive preflight blocks before the gate yields instead of blocking. */
+      static COMPILE_FIX_GATE_YIELD_AFTER = 3;
       _compileFixLoopPreflightBlock(toolName, args, turn, shellLikelyMutatesFilesystem) {
         const state = this._compileFixLoop;
         if (!state?.active)
@@ -589605,29 +589846,62 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
         if (toolName === "shell") {
           const command = String(args["command"] ?? args["cmd"] ?? "").trim();
           if (commandReliablySatisfiesVerifyCommand(command, state.verifierCommand)) {
+            state.preflightBlockStreak = 0;
             return null;
           }
           if (!shellLikelyMutatesFilesystem)
             return null;
+          const extraction = extractShellMutationPaths(command, {
+            workingDir: this.authoritativeWorkingDirectory()
+          });
+          const mutationPaths = extraction.paths.map((p2) => this._normalizeEvidencePath(p2)).filter(Boolean);
+          if (mutationPaths.length === 0 || !this._compileFixPathsTouchProjectSources(mutationPaths, state)) {
+            return null;
+          }
         } else if (!this._isProjectEditTool(toolName)) {
           return null;
         }
+        const yieldAfter = _AgenticRunner.COMPILE_FIX_GATE_YIELD_AFTER;
+        const streak = (state.preflightBlockStreak ?? 0) + 1;
+        if (streak > yieldAfter) {
+          state.preflightBlockStreak = 0;
+          this.emit({
+            type: "status",
+            content: `compile_error_verifier_dirty: gate yielded to ${toolName} after ${yieldAfter} consecutive blocks at turn ${turn}`,
+            turn,
+            timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          });
+          return {
+            kind: "yield",
+            notice: [
+              `[COMPILE FIX GATE YIELDED — verifier still required]`,
+              `The verifier-required gate blocked ${yieldAfter} consecutive tool calls and is yielding so work can continue.`,
+              `Verifier evidence is still stale. Run the verifier as your next evidence step:`,
+              `  ${state.verifierCommand}`,
+              `Any real build/test command whose output shows current compiler diagnostics is also accepted as the live verifier.`,
+              `task_complete remains blocked until a verifier run passes after the last mutation.`
+            ].join("\n")
+          };
+        }
+        state.preflightBlockStreak = streak;
         const message2 = [
           `[COMPILE ERROR FIX LOOP BLOCKED — declared verifier required]`,
           `A compile-fix card was patched, so the next mutation/evidence step must be the live verifier.`,
-          `verifierCommand: ${state.verifierCommand}`,
+          `Run this now: ${state.verifierCommand}`,
+          `Any real build/test command whose output shows current compiler diagnostics is also accepted.`,
           `dirtySinceTurn: ${state.verifierDirtySinceTurn}`,
           `lastMutationTurn: ${state.lastMutationTurn}`,
           `lastVerifierRunTurn: ${state.lastVerifierRunTurn}`,
-          `blockedTool: ${toolName}`
+          `blockedTool: ${toolName}`,
+          `consecutiveBlocks: ${streak}/${yieldAfter} (gate yields after ${yieldAfter})`
         ].join("\n");
         this.emit({
           type: "status",
-          content: `compile_error_verifier_dirty: blocked ${toolName} at turn ${turn}`,
+          content: `compile_error_verifier_dirty: blocked ${toolName} at turn ${turn} (${streak}/${yieldAfter})`,
           turn,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
-        return message2;
+        return { kind: "block", message: message2 };
       }
       _compileFixLoopCompletionBlocker(turn) {
         const state = this._compileFixLoop;
@@ -589985,6 +590259,8 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
         if (!command.trim())
           return false;
         void result;
+        if (commandIsPureReadOnlyPipeline(command))
+          return false;
         return /\b(test|tests|vitest|jest|pytest|go test|cargo test|npm test|pnpm test|yarn test|typecheck|tsc|build|verify|verification|check)\b/i.test(command);
       }
       _shouldSuppressCompletionDiscoveryEvidence(toolName, result, targetPaths) {
@@ -594502,6 +594778,7 @@ Respond with your assessment, then take action.`;
         this._lastDeclaredVerifierOutput = null;
         this._lastDeclaredVerifierDiagnostics = [];
         this._staleEditFamilies.clear();
+        this._blockedFullWriteAttempts.clear();
         this._lastReadTurnByPathKey.clear();
         this._recentSuccessfulReplacements = [];
         this._lastWorldStateTurn = -1;
@@ -595882,7 +596159,7 @@ Respond with EXACTLY this structure before your next tool call:
   PICK: <number 1-3>
   WHY: <one sentence>
   FALSIFICATION: <observable signal that would refute the pick>
-  NEXT ACTION: <a single creative edit — file_write / file_edit / batch_edit>`;
+  NEXT ACTION: <a single targeted edit — file_edit / file_patch / batch_edit; file_write only for a verified-new file>`;
               messages2.push({ role: "system", content: _replan60 });
               stagnationCooldownUntilTurn = turn + REG60_COOLDOWN_TURNS;
               const _tel60 = this._describeTopClusterTelemetry();
@@ -596143,7 +596420,7 @@ If this matches your current shape, try it before continuing.`
                 ] : [
                   `Pick ONE of these for your next response:`,
                   ``,
-                  `  (a) PRODUCE: emit a file_write / file_edit / file_patch that creates or changes project content. Even a partial draft of the next planned file is progress. Use shell only for commands/tests/system operations, not as a workaround for failed edit-tool encoding.`,
+                  `  (a) PRODUCE: emit a targeted file_edit / file_patch / batch_edit that creates or changes project content. Use file_write only after verifying the target is new/placeholder and never as recovery for a blocked existing-file write. Use shell only for commands/tests/system operations, not as a workaround for failed edit-tool encoding.`,
                   ``,
                   `  (b) ERROR-INFORMED LOCAL TRIAGE: anchor on the freshest local failure, identify the implicated file/path/symbol/command, then make one targeted local move instead of broad exploration.`,
                   ``,
@@ -597859,7 +598136,7 @@ Corrective action: try a different approach first: read relevant files, adjust a
                   `A REG-61 FIRST-EDIT NUDGE was issued earlier and has not yet been satisfied. The directive asks you to prioritize a creative edit. You issued '${tc.name}' instead, which is a read/explore/shell call.`,
                   ``,
                   `This call was ALLOWED through (needed context should never be blocked), but try to make a creative edit next:`,
-                  `  • file_write   — create a new file`,
+                  `  • file_write   — create a verified-new file only (never use it to repair an existing target)`,
                   `  • file_edit    — modify an existing file (find/replace)`,
                   `  • batch_edit   — multiple find/replace edits in one call`,
                   `  • file_patch   — apply a version-checked line-range patch`,
@@ -598024,7 +598301,7 @@ Read the current file if needed, make a different concrete edit, or move to veri
                   systemGuidance: staleBlockOutput
                 };
               }
-              const staleRewriteBlock = this.staleEditOverwritePreflightBlock(tc.name, tc.arguments ?? {});
+              const staleRewriteBlock = this.staleEditOverwritePreflightBlock(tc.name, tc.arguments ?? {}, turn);
               if (staleRewriteBlock) {
                 const focusDecision2 = this._focusSupervisor?.evaluateProposedCall({
                   turn,
@@ -598420,8 +598697,10 @@ ${cachedResult}`,
                   };
                 }
               }
-              const compileLoopPreflightBlock = !repeatShortCircuit ? this._compileFixLoopPreflightBlock(tc.name, tc.arguments ?? {}, turn, shellLikelyMutatesFilesystem) : null;
-              if (compileLoopPreflightBlock) {
+              const compileLoopPreflight = !repeatShortCircuit ? this._compileFixLoopPreflightBlock(tc.name, tc.arguments ?? {}, turn, shellLikelyMutatesFilesystem) : null;
+              if (compileLoopPreflight?.kind === "yield") {
+                pushSoftInjection("system", compileLoopPreflight.notice);
+              } else if (compileLoopPreflight) {
                 this.emit({
                   type: "tool_call",
                   toolName: tc.name,
@@ -598433,7 +598712,7 @@ ${cachedResult}`,
                   type: "tool_result",
                   toolName: tc.name,
                   success: false,
-                  content: compileLoopPreflightBlock.slice(0, 120),
+                  content: compileLoopPreflight.message.slice(0, 120),
                   turn,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString()
                 });
@@ -598443,9 +598722,9 @@ ${cachedResult}`,
                 });
                 return {
                   tc,
-                  output: compileLoopPreflightBlock,
+                  output: compileLoopPreflight.message,
                   success: false,
-                  systemGuidance: compileLoopPreflightBlock
+                  systemGuidance: compileLoopPreflight.message
                 };
               }
               this.emit({
@@ -600037,8 +600316,7 @@ ${structuralGuardGuidance}` : structuralGuardGuidance;
               }
               if (tc.name === "shell" && result.runtimeAuthored !== true) {
                 const shellCommand = String(tc.arguments?.["command"] ?? tc.arguments?.["cmd"] ?? "");
-                const compileOutput = `${result.output ?? ""}
-${result.error ?? ""}`;
+                const compileOutput = this._expandTriagedPayloadForDiagnostics([result.output, result.llmContent, result.error].filter((part) => typeof part === "string" && part.length > 0).join("\n"));
                 const verifierCommand = this._declaredVerifierCommandForShell(shellCommand, compileOutput);
                 if (verifierCommand) {
                   const compileGuidance = this._observeCompileVerifierResult({
@@ -603032,6 +603310,29 @@ ${marker}` : marker);
         const path16 = this.extractPrimaryToolPath(args);
         if (!path16)
           return null;
+        const pathKey = this.staleEditPathKey(path16);
+        const active = [...this._staleEditFamilies.values()].filter((entry) => entry.pathKey === pathKey).sort((a2, b) => b.lastFailureTurn - a2.lastFailureTurn).find((entry) => {
+          const hasFreshRead = entry.lastReadTurn > entry.lastFailureTurn;
+          const hasFreshMutation = entry.lastMutationTurn > entry.lastFailureTurn;
+          return !hasFreshMutation && (entry.count >= 2 || !hasFreshRead);
+        });
+        if (active) {
+          const tier = this.options.modelTier ?? "large";
+          if (tier !== "small" && tier !== "medium")
+            return null;
+          return [
+            `[EDIT REPAIR LOCK] A recent narrow edit to ${active.path} failed because the model-visible target diverged from disk (${active.errorKind}; latest_file_hash=${active.latestFileHash || "unknown"}).`,
+            `This full-file overwrite was NOT executed. A stale narrow edit must not be repaired by broad file regeneration; preserve a constrained edit path until fresh target evidence is used.`,
+            ``,
+            `Allowed next actions:`,
+            `1. file_read ${active.path} once and construct file_edit from exact current text.`,
+            `2. file_patch/file_edit against the latest file hash or a different target.`,
+            `3. file_write with dry_run=true only to validate a full rewrite proposal without changing disk.`,
+            `4. run verification if the desired change is already present, or report the explicit blocker instead of completing.`,
+            ``,
+            `Stale target preview: ${active.preview}`
+          ].join("\n");
+        }
         let exists2 = false;
         try {
           const st = _fsStatSync(this._absoluteToolPath(path16), {
@@ -603043,6 +603344,15 @@ ${marker}` : marker);
         }
         if (!exists2)
           return null;
+        const overwrite = args["overwrite"] === true || args["overwriteExisting"] === true;
+        if (!overwrite) {
+          return [
+            "[FULL FILE REWRITE CONTRACT]",
+            `file_write would overwrite existing file ${path16}, but overwrite=true is missing.`,
+            "This call was not executed. Prefer file_edit/file_patch for a local change.",
+            "If a deliberate whole-file replacement is truly required, first file_read the current file and retry with overwrite=true and expected_hash equal to that read's sha256."
+          ].join("\n");
+        }
         if (!this._toolCallUsesFreshFileReadEvidence(toolName, args)) {
           const fresh = this._freshReadHashForEditPath(path16);
           return [
@@ -603156,16 +603466,13 @@ ${marker}` : marker);
         }
         return null;
       }
-      staleEditOverwritePreflightBlock(toolName, args) {
+      staleEditOverwritePreflightBlock(toolName, args, turn = 0) {
         if (toolName !== "file_write")
           return null;
         if (process.env["OMNIUS_ALLOW_STALE_REPAIR_OVERWRITE"] === "1")
           return null;
         if (args?.["dry_run"] === true || args?.["dryRun"] === true)
           return null;
-        const tier = this.options.modelTier ?? "large";
-        if (tier !== "small" && tier !== "medium")
-          return null;
         const path16 = this.extractPrimaryToolPath(args);
         if (!path16)
           return null;
@@ -603175,19 +603482,49 @@ ${marker}` : marker);
           const hasFreshMutation = entry.lastMutationTurn > entry.lastFailureTurn;
           return !hasFreshMutation && (entry.count >= 2 || !hasFreshRead);
         });
-        if (!active)
+        if (active) {
+          const tier = this.options.modelTier ?? "large";
+          if (tier !== "small" && tier !== "medium")
+            return null;
+          return [
+            `[EDIT REPAIR LOCK] A recent narrow edit to ${active.path} failed because the model-visible target diverged from disk (${active.errorKind}; latest_file_hash=${active.latestFileHash || "unknown"}).`,
+            `This full-file overwrite was NOT executed. A stale narrow edit must not be repaired by broad file regeneration; preserve a constrained edit path until fresh target evidence is used.`,
+            ``,
+            `Allowed next actions:`,
+            `1. file_read ${active.path} once and construct file_edit from exact current text.`,
+            `2. file_patch/file_edit against the latest file hash or a different target.`,
+            `3. file_write with dry_run=true only to validate a full rewrite proposal without changing disk.`,
+            `4. run verification if the desired change is already present, or report the explicit blocker instead of completing.`,
+            ``,
+            `Stale target preview: ${active.preview}`
+          ].join("\n");
+        }
+        let exists2 = false;
+        try {
+          const st = _fsStatSync(this._absoluteToolPath(path16), {
+            throwIfNoEntry: false
+          });
+          exists2 = !!st && st.isFile();
+        } catch {
+          exists2 = false;
+        }
+        if (!exists2)
+          return null;
+        const overwrite = args?.["overwrite"] === true || args?.["overwriteExisting"] === true;
+        const hasFreshContract = overwrite && this._toolCallUsesFreshFileReadEvidence(toolName, args ?? {});
+        if (hasFreshContract) {
+          this._blockedFullWriteAttempts.delete(pathKey);
+          return null;
+        }
+        const previous = this._blockedFullWriteAttempts.get(pathKey);
+        const count = (previous?.count ?? 0) + 1;
+        this._blockedFullWriteAttempts.set(pathKey, { count, lastTurn: turn });
+        if (count < 2)
           return null;
         return [
-          `[EDIT REPAIR LOCK] A recent narrow edit to ${active.path} failed because the model-visible target diverged from disk (${active.errorKind}; latest_file_hash=${active.latestFileHash || "unknown"}).`,
-          `This full-file overwrite was NOT executed. A stale narrow edit must not be repaired by broad file regeneration; preserve a constrained edit path until fresh target evidence is used.`,
-          ``,
-          `Allowed next actions:`,
-          `1. file_read ${active.path} once and construct file_edit from exact current text.`,
-          `2. file_patch/file_edit against the latest file hash or a different target.`,
-          `3. file_write with dry_run=true only to validate a full rewrite proposal without changing disk.`,
-          `4. run verification if the desired change is already present, or report the explicit blocker instead of completing.`,
-          ``,
-          `Stale target preview: ${active.preview}`
+          `[FULL FILE WRITE LOOP BLOCKED] ${path16} has already received ${count} blocked full-file write attempts.`,
+          `This call was NOT executed, even if the replacement payload changed. Do not call file_write again for this path until a fresh file_read is completed.`,
+          `Next action: use file_read ${path16}, then prefer file_patch/file_edit for the local change. Only an intentional whole-file replacement may use file_write with overwrite=true and expected_hash from that fresh read.`
         ].join("\n");
       }
       editReversalPreflightBlock(toolName, args, turn) {
@@ -603281,7 +603618,9 @@ ${marker}` : marker);
       noteStaleEditGuardOutcome(toolName, args, result, turn) {
         const path16 = this.extractPrimaryToolPath(args);
         const pathKey = path16 ? this.staleEditPathKey(path16) : "";
-        if (toolName === "file_read" && path16 && result.success) {
+        const isFreshRead = toolName === "file_read" && path16 && result.success && result.runtimeAuthored !== true;
+        if (isFreshRead) {
+          this._blockedFullWriteAttempts.delete(pathKey);
           for (const entry of this._staleEditFamilies.values()) {
             if (entry.pathKey === pathKey)
               entry.lastReadTurn = turn;
@@ -603289,6 +603628,7 @@ ${marker}` : marker);
           return;
         }
         if (toolName === "file_write" && path16 && this._isRealProjectMutation(toolName, result)) {
+          this._blockedFullWriteAttempts.delete(pathKey);
           for (const [key2, entry] of this._staleEditFamilies) {
             if (entry.pathKey === pathKey)
               this._staleEditFamilies.delete(key2);
@@ -603302,6 +603642,7 @@ ${marker}` : marker);
           return;
         const targetPathKey = this.staleEditPathKey(target.path);
         if (this._isRealProjectMutation(toolName, result) || result.alreadyApplied === true) {
+          this._blockedFullWriteAttempts.delete(targetPathKey);
           for (const [key2, entry] of this._staleEditFamilies) {
             if (entry.pathKey === targetPathKey)
               this._staleEditFamilies.delete(key2);
@@ -640617,6 +640958,50 @@ var init_dist9 = __esm({
 });
 
 // packages/cli/src/tui/stageIndicator.ts
+function stageForToolName(toolName) {
+  const name10 = String(toolName ?? "").trim().toLowerCase();
+  if (name10 === "file_read" || name10 === "structured_read") return "reading";
+  if (name10 === "grep_search" || name10 === "glob_find" || name10 === "find_files" || name10 === "web_search" || name10 === "web_fetch" || name10 === "web_crawl")
+    return "searching";
+  if (name10 === "file_write" || name10 === "file_edit" || name10 === "file_patch" || name10 === "batch_edit" || name10 === "structured_file")
+    return "writing";
+  if (name10 === "shell" || name10 === "shell_async" || name10 === "run_tests" || name10 === "repl_exec")
+    return "building";
+  return "tool_call";
+}
+function stageForAgentEvent(event) {
+  switch (event.type) {
+    case "tool_call":
+      return { stage: stageForToolName(event.toolName), detail: event.toolName };
+    case "tool_result":
+      return event.success === false ? {
+        stage: "failed",
+        detail: event.toolName ? `${event.toolName} failed` : void 0
+      } : {
+        stage: stageForToolName(event.toolName),
+        detail: event.toolName
+      };
+    case "stream_start":
+    case "assistant_text":
+    case "model_response":
+      return { stage: "planning" };
+    case "compaction":
+      return { stage: "compacting" };
+    case "debug_adversary":
+      return { stage: "adversary_audit" };
+    case "complete":
+      return { stage: "completed", detail: "done" };
+    case "error":
+      return {
+        stage: "failed",
+        detail: event.content?.trim().slice(0, 40) || void 0
+      };
+    case "user_interrupt":
+      return { stage: "blocked", detail: "interrupted" };
+    default:
+      return null;
+  }
+}
 function tri360(x) {
   const t2 = (x % 360 + 360) % 360;
   return t2 < 180 ? t2 / 90 - 1 : 3 - t2 / 90;
@@ -640641,6 +641026,9 @@ function supportsTruecolor() {
 function isSweepingStage(stage2) {
   return SWEEPING_STAGES.has(stage2);
 }
+function stageLabel2(stage2) {
+  return STAGE_META[stage2].label;
+}
 function stageBlockNeededWidth(stage2, detail) {
   const meta = STAGE_META[stage2];
   let body = meta.label;
@@ -640790,6 +641178,125 @@ var init_stageIndicator = __esm({
   }
 });
 
+// packages/cli/src/tui/sub-agent-live-block.ts
+function stageFallbackColor(stage2) {
+  return STAGE_FALLBACK_COLOR[stage2];
+}
+function sanitizeSubAgentActivity(value2) {
+  return value2.replace(ANSI_RE2, "").replace(/[\x00-\x1F\x7F]/g, " ").replace(/\s+/g, " ").trim().slice(0, MAX_ACTIVITY_CHARS);
+}
+function appendSubAgentActivity(entry, value2, maxLines = 3) {
+  const line = sanitizeSubAgentActivity(value2);
+  if (!line) return;
+  entry.activity.push(line);
+  if (entry.activity.length > maxLines) {
+    entry.activity.splice(0, entry.activity.length - maxLines);
+  }
+  entry.updatedAt = Date.now();
+}
+function buildSubAgentLiveBlockLines(sourceEntries, width, phase, truecolor = supportsTruecolor()) {
+  const entries = Array.from(sourceEntries).slice(-MAX_PREVIEW_AGENTS);
+  if (entries.length === 0) return [];
+  const w = Math.max(48, Math.floor(width));
+  const inner = Math.max(1, w - 4);
+  const primary = entries.find((entry) => entry.status === "running") ?? entries[0];
+  const title = " Sub-agent activity ";
+  const top = `╭─┤${title}├${"─".repeat(Math.max(0, w - 5 - title.length))}╮`;
+  const bottom = `╰${"─".repeat(Math.max(0, w - 2))}╯`;
+  const lines = [paint(top, primary.stage, phase, 0, truecolor)];
+  for (const entry of entries) {
+    const icon = statusIcon(entry.status);
+    const label = entry.label || entry.id;
+    const state = entry.status === "running" ? `${stageLabel2(entry.stage)}${entry.detail ? ` ${entry.detail}` : ""}` : entry.status;
+    const activity = entry.activity.at(-1) ?? "waiting for activity";
+    lines.push(
+      contentRow(
+        `${icon} ${label} · ${state}`,
+        inner,
+        entry.stage,
+        phase,
+        truecolor
+      )
+    );
+    lines.push(
+      contentRow(
+        `  └─ ${activity}`,
+        inner,
+        entry.stage,
+        phase,
+        truecolor
+      )
+    );
+  }
+  lines.push(paint(bottom, primary.stage, phase, 0, truecolor));
+  return lines;
+}
+function contentRow(value2, width, stage2, phase, truecolor) {
+  return `│ ${paint(fit2(value2, width), stage2, phase, 1, truecolor)} │`;
+}
+function paint(value2, stage2, phase, offset, truecolor) {
+  let out = "";
+  const chars = Array.from(value2);
+  for (let i2 = 0; i2 < chars.length; i2++) {
+    const char = chars[i2];
+    if (truecolor) {
+      const [r2, g, b] = stageGradientRgb(stage2, i2 + offset, phase);
+      out += `\x1B[38;2;${r2};${g};${b}m${char}`;
+    } else {
+      out += `\x1B[38;5;${STAGE_FALLBACK_COLOR[stage2]}m${char}`;
+    }
+  }
+  return `${out}\x1B[0m`;
+}
+function fit2(value2, width) {
+  const plain = value2.replace(ANSI_RE2, "").replace(/\s+$/g, "");
+  const chars = Array.from(plain);
+  if (chars.length > width) {
+    return `${chars.slice(0, Math.max(0, width - 1)).join("")}…`;
+  }
+  return plain + " ".repeat(Math.max(0, width - chars.length));
+}
+function statusIcon(status) {
+  switch (status) {
+    case "completed":
+      return "✓";
+    case "failed":
+      return "✗";
+    case "paused":
+    case "stopped":
+      return "○";
+    default:
+      return "●";
+  }
+}
+var ANSI_RE2, MAX_PREVIEW_AGENTS, MAX_ACTIVITY_CHARS, STAGE_FALLBACK_COLOR;
+var init_sub_agent_live_block = __esm({
+  "packages/cli/src/tui/sub-agent-live-block.ts"() {
+    init_stageIndicator();
+    ANSI_RE2 = /\x1B\[[0-?]*[ -/]*[@-~]|\x1B\].*?(?:\x07|\x1B\\)/g;
+    MAX_PREVIEW_AGENTS = 4;
+    MAX_ACTIVITY_CHARS = 220;
+    STAGE_FALLBACK_COLOR = {
+      idle: 39,
+      planning: 141,
+      tool_call: 45,
+      reading: 39,
+      searching: 129,
+      editing: 42,
+      writing: 43,
+      testing: 82,
+      building: 220,
+      verifying: 214,
+      reflecting: 177,
+      compacting: 51,
+      adversary_audit: 207,
+      blocked: 208,
+      completed: 46,
+      failed: 196
+    };
+  }
+});
+
 // packages/cli/src/tui/tui-tasks-renderer.ts
 var tui_tasks_renderer_exports = {};
 __export(tui_tasks_renderer_exports, {
@@ -643427,6 +643934,7 @@ __export(status_bar_exports, {
   refreshThemeVars: () => refreshThemeVars,
   setTermTitleWriter: () => setTermTitleWriter,
   setTerminalTitle: () => setTerminalTitle,
+  stripSubAgentPrefix: () => stripSubAgentPrefix,
   unlockFooterRedraws: () => unlockFooterRedraws
 });
 import { basename as basename30, dirname as dirname44 } from "node:path";
@@ -643451,7 +643959,8 @@ function headerTelegramFg() {
   return themeMode() === "system" ? "\x1B[39m" : "\x1B[38;5;45m";
 }
 function stripSubAgentPrefix(label) {
-  const stripped = label.replace(/^\s*sub[-\s]?agents?\b[\s:_–—-]*/i, "").trim();
+  let stripped = label.replace(/^\s*sub[-\s]?agents?\b[\s:_–—-]*/i, "").trim();
+  stripped = stripped.replace(/^omnius-/i, "").trim();
   return stripped.length > 0 ? stripped : label.trim();
 }
 function xterm256ToRgb2(i2) {
@@ -643549,6 +644058,7 @@ var init_status_bar = __esm({
   "packages/cli/src/tui/status-bar.ts"() {
     init_render();
     init_stageIndicator();
+    init_sub_agent_live_block();
     init_tui_tasks_renderer();
     init_braille_spinner();
     init_project_context();
@@ -643789,6 +644299,8 @@ var init_status_bar = __esm({
       _activeViewId = "main";
       _headerExpanded = false;
       // toggles sub-agent / scroll info below header
+      _subAgentLiveBlockId = "sub-agent-live-preview";
+      _subAgentLiveBlockAppended = false;
       // Virtual scrollback buffer — stores content lines for Page Up/Down scrolling.
       // Since we're in alternate screen buffer, there's no native scrollback.
       // NOTE: _contentLines is now a reference to the ACTIVE view's buffer.
@@ -644401,6 +644913,46 @@ var init_status_bar = __esm({
        *  - Category A: Version + menu buttons (help/voice/model/endpoint/sponsor)
        *  - Category B: Systems (agents/voice status/nexus status)
        *  Each category paginates independently across N pages. */
+      /** Filled header button whose hue band follows the child agent's current action. */
+      paintAgentButton(content, stage2, active) {
+        const useTruecolor = supportsTruecolor();
+        const chars = Array.from(content);
+        let body = "";
+        for (let i2 = 0; i2 < chars.length; i2++) {
+          const char = chars[i2];
+          if (useTruecolor) {
+            const [r2, g, b] = stageGradientRgb(stage2, i2, this._stagePhase);
+            const luma = 0.299 * r2 + 0.587 * g + 0.114 * b;
+            const fg2 = luma >= 140 ? "\x1B[38;2;16;16;16m" : "\x1B[38;2;255;255;255m";
+            body += `${active ? "\x1B[1m" : ""}${fg2}\x1B[48;2;${r2};${g};${b}m${char}\x1B[0m`;
+          } else {
+            const fallback = stageFallbackColor(stage2);
+            body += `${active ? "\x1B[1m" : ""}\x1B[38;5;${contrastTextColor(fallback)}m\x1B[48;5;${fallback}m${char}\x1B[0m`;
+          }
+        }
+        const [lr, lg, lb] = stageGradientRgb(stage2, 0, this._stagePhase);
+        const leftBorder = useTruecolor ? `\x1B[38;2;${lr};${lg};${lb}m` : `\x1B[38;5;${stageFallbackColor(stage2)}m`;
+        const [rr, rg, rb] = stageGradientRgb(
+          stage2,
+          Math.max(0, chars.length - 1),
+          this._stagePhase
+        );
+        const rightBorder = useTruecolor ? `\x1B[38;2;${rr};${rg};${rb}m` : `\x1B[38;5;${stageFallbackColor(stage2)}m`;
+        return `${leftBorder}${HEADER_BUTTON_LEFT}${RESET4}` + body + `${RESET4}${PANEL_BG_SEQ}${rightBorder}${HEADER_BUTTON_RIGHT}${RESET4}${PANEL_BG_SEQ}`;
+      }
+      paintAgentText(value2, stage2, offset = 0) {
+        const chars = Array.from(value2);
+        let out = "";
+        for (let i2 = 0; i2 < chars.length; i2++) {
+          if (supportsTruecolor()) {
+            const [r2, g, b] = stageGradientRgb(stage2, i2 + offset, this._stagePhase);
+            out += `\x1B[38;2;${r2};${g};${b}m${chars[i2]}`;
+          } else {
+            out += `\x1B[38;5;${stageFallbackColor(stage2)}m${chars[i2]}`;
+          }
+        }
+        return `${out}${RESET4}`;
+      }
       _rebuildHeaderPanels() {
         this._headerPanels = [];
         const savedIdx = this._headerPanelIndex;
@@ -644412,12 +644964,6 @@ var init_status_bar = __esm({
         const decorateMenuButton = (cmd, label) => {
           return `${HEADER_BUTTON_GLYPH_FG}${HEADER_BUTTON_LEFT}\x1B[0m${HEADER_BUTTON_BG}${HEADER_BUTTON_FG}${label}\x1B[0m${PANEL_BG_SEQ}${HEADER_BUTTON_GLYPH_FG}${HEADER_BUTTON_RIGHT}\x1B[0m${PANEL_BG_SEQ}`;
         };
-        const decorateAgentButton = (content, color, active) => {
-          const bg = `\x1B[48;5;${color}m`;
-          const fg2 = `\x1B[38;5;${contrastTextColor(color)}m`;
-          const weight = active ? "\x1B[1m" : "";
-          return `\x1B[38;5;${color}m${HEADER_BUTTON_LEFT}\x1B[0m${weight}${fg2}${bg}${content}\x1B[0m${PANEL_BG_SEQ}\x1B[38;5;${color}m${HEADER_BUTTON_RIGHT}\x1B[0m${PANEL_BG_SEQ}`;
-        };
         const renderBtn = (cmd, label) => {
           return linkify(cmd, decorateMenuButton(cmd, label));
         };
@@ -644505,9 +645051,8 @@ var init_status_bar = __esm({
             if (view.id === "main" && this._activeViewId === "main") continue;
             const icon = view.status === "running" ? "●" : view.status === "completed" ? "✓" : view.status === "failed" ? "✗" : "○";
             const content = ` ${trunc3(view.label)} ${icon} `;
-            const viewColor = view.colorCode ?? (view.type === "telegram" ? 45 : 213);
             const active = view.id === this._activeViewId;
-            const btn = decorateAgentButton(content, viewColor, active);
+            const btn = this.paintAgentButton(content, view.stage, active);
             sysItems.push({
               render: () => linkify(`view:${view.id}`, btn) + " ",
               w: content.length + 2 + 1
@@ -644758,10 +645303,24 @@ var init_status_bar = __esm({
           buf += `\x1B[${subRow};1H${PANEL_BG_SEQ}\x1B[2K`;
           buf += `${BOX_FG}│${RESET4}${PANEL_BG_SEQ}`;
           buf += `\x1B[38;5;${TEXT_DIM}m${PANEL_BG_SEQ}`;
-          const subAgents = this._agentViews.size > 1 ? Array.from(this._agentViews.values()).filter((v) => v.id !== "main").map(
-            (v) => `${v.status === "running" ? "●" : v.status === "completed" ? "✓" : "○"} ${v.label}`
-          ).join("  ") : "no sub-agents";
-          buf += ` ${subAgents.substring(0, w - 4)}`;
+          if (this._agentViews.size > 1) {
+            let used = 1;
+            for (const view of Array.from(this._agentViews.values()).filter(
+              (candidate) => candidate.id !== "main"
+            )) {
+              const icon = view.status === "running" ? "●" : view.status === "completed" ? "✓" : view.status === "failed" ? "✗" : "○";
+              const raw = `${icon} ${view.label}`;
+              const gap = used > 1 ? "  " : " ";
+              const remaining = Math.max(0, w - 2 - used);
+              if (remaining <= 0) break;
+              const clipped = raw.length > remaining ? `${raw.slice(0, Math.max(0, remaining - 1))}…` : raw;
+              buf += `${PANEL_BG_SEQ}${this.paintAgentText(`${gap}${clipped}`, view.stage, used)}`;
+              used += gap.length + clipped.length;
+              if (clipped !== raw) break;
+            }
+          } else {
+            buf += ` ${NO_SUB_AGENTS_HEADER_LABEL.trim()}`;
+          }
           buf += `\x1B[${subRow};${w}H${BOX_FG}│${RESET4}${PANEL_BG_SEQ}`;
           const scrollRow = subRow + 1;
           let expandedBottom = `${BOX_BL3}${BOX_H3.repeat(w - 2)}${BOX_BR3}`;
@@ -644902,6 +645461,9 @@ var init_status_bar = __esm({
           this.advanceStagePhase();
           this.renderFooterPreserveCursor();
           refreshTuiTasksAnimationFrame();
+          if (this._agentViews.size > 1 && (String(this.currentHeaderPanel).startsWith("sys-") || this._headerExpanded)) {
+            this.refreshHeaderContent();
+          }
         }, _StatusBar.FOOTER_ANIMATION_INTERVAL_MS);
         this._footerAnimationTimer.unref?.();
       }
@@ -645478,9 +646040,13 @@ var init_status_bar = __esm({
             scrollOffset: 0,
             status: "running",
             taskSummary: "",
-            startedAt: Date.now()
+            startedAt: Date.now(),
+            stage: "idle",
+            activity: [],
+            updatedAt: Date.now()
           });
         }
+        if (this._agentViews.size > 1) this.ensureSubAgentLiveBlock();
         setTermSize(process.stdout.rows ?? 24, process.stdout.columns ?? 80);
         setFooterMetricsVisible(this._footerMetricsVisible);
         this._prevTermRows = termRows();
@@ -646094,8 +646660,101 @@ var init_status_bar = __esm({
         }, 1500);
       }
       // ── Agent View Management (WO-NA1) ────────────────────────────
+      /** Keep one compact, live child-agent preview in the MAIN view. */
+      ensureSubAgentLiveBlock() {
+        if (!this.active || !this._agentViews.has("main") || this._agentViews.size <= 1)
+          return;
+        if (this._subAgentLiveBlockAppended) return;
+        this.registerDynamicBlock(
+          this._subAgentLiveBlockId,
+          (width) => buildSubAgentLiveBlockLines(
+            Array.from(this._agentViews.values()).filter((view) => view.id !== "main"),
+            width,
+            this._stagePhase
+          )
+        );
+        this.appendDynamicBlockToAgentView("main", this._subAgentLiveBlockId);
+        this._subAgentLiveBlockAppended = true;
+      }
+      removeSubAgentLiveBlock() {
+        if (!this._subAgentLiveBlockAppended) return;
+        const main2 = this._agentViews.get("main");
+        const marker = `${this.DYNAMIC_BLOCK_MARK_PREFIX}${this._subAgentLiveBlockId}${this.DYNAMIC_BLOCK_MARK_SUFFIX}`;
+        if (main2) {
+          for (let i2 = main2.contentLines.length - 1; i2 >= 0; i2--) {
+            if (main2.contentLines[i2] === marker) main2.contentLines.splice(i2, 1);
+          }
+        }
+        this.unregisterDynamicBlock(this._subAgentLiveBlockId);
+        this._subAgentLiveBlockAppended = false;
+        if (this.active && this._activeViewId === "main") {
+          this.markContentMutated();
+          this.repaintContent();
+        }
+      }
+      /** Update a child-agent's action state and rolling live preview line. */
+      updateAgentViewActivity(id2, stage2, detail, activity) {
+        const view = this._agentViews.get(id2);
+        if (!view || view.id === "main") return;
+        view.stage = stage2;
+        view.stageDetail = detail?.trim() || void 0;
+        view.updatedAt = Date.now();
+        if (activity) appendSubAgentActivity(view, activity);
+        this.ensureSubAgentLiveBlock();
+        if (this.active) {
+          this.renderAgentTabs();
+          if (this._headerExpanded) this.refreshHeaderContent();
+          this.refreshDynamicBlocks();
+        }
+      }
+      /** Structured-event adapter used by in-process child runners. */
+      updateAgentViewEvent(id2, event, activity) {
+        const view = this._agentViews.get(id2);
+        if (!view) return;
+        const transition = stageForAgentEvent(event);
+        this.updateAgentViewActivity(
+          id2,
+          transition?.stage ?? view.stage,
+          transition?.detail ?? view.stageDetail,
+          activity
+        );
+      }
+      /** Forward a raw full-sub-agent stdout chunk into the same state model. */
+      recordAgentOutput(id2, text2) {
+        const line = text2.replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, "").split(/\r?\n/).map((value2) => value2.trim()).filter(Boolean).at(-1);
+        if (!line) {
+          this.writeToAgentView(id2, text2);
+          return;
+        }
+        const lower = line.toLowerCase();
+        let stage2 = "tool_call";
+        if (/\b(error|failed|failure|exception|blocked)\b/.test(lower)) stage2 = "failed";
+        else if (/\b(complete|completed|done|success|succeeded)\b/.test(lower)) stage2 = "completed";
+        else if (/\b(file_read|read|grep|search|find)\b/.test(lower)) stage2 = "reading";
+        else if (/\b(file_write|file_edit|file_patch|batch_edit|write|edit|patch)\b/.test(lower)) stage2 = "writing";
+        else if (/\b(shell|build|test|compile|npm|pnpm|pio)\b/.test(lower)) stage2 = "building";
+        this.updateAgentViewActivity(id2, stage2, line.slice(0, 40), line);
+        this.writeToAgentView(id2, text2);
+      }
       /** Register a new sub-agent view with its own content buffer */
       registerAgentView(id2, label, type, taskSummary) {
+        const existing = this._agentViews.get(id2);
+        if (existing) {
+          if (existing.id !== "main") {
+            const cleanExistingLabel = stripSubAgentPrefix(existing.label);
+            existing.label = cleanExistingLabel || stripSubAgentPrefix(label);
+          }
+          existing.taskSummary = taskSummary ?? existing.taskSummary;
+          existing.status = "running";
+          existing.updatedAt = Date.now();
+          this.ensureSubAgentLiveBlock();
+          if (this.active) {
+            this._rebuildHeaderPanels?.();
+            this.renderFooterAndPositionInput();
+            this.refreshHeaderContent();
+          }
+          return;
+        }
         this._agentViews.set(id2, {
           id: id2,
           label: stripSubAgentPrefix(label),
@@ -646105,9 +646764,14 @@ var init_status_bar = __esm({
           status: "running",
           taskSummary: taskSummary ?? "",
           startedAt: Date.now(),
-          colorCode: type === "telegram" ? 45 : this.nextAgentColor()
+          colorCode: type === "telegram" ? 45 : this.nextAgentColor(),
+          stage: "planning",
+          stageDetail: "spawn",
+          activity: ["spawned; waiting for first action"],
+          updatedAt: Date.now()
         });
         if (this.active) {
+          this.ensureSubAgentLiveBlock();
           this.applyScrollRegion();
           this._rebuildHeaderPanels?.();
           this.renderFooterAndPositionInput();
@@ -646117,6 +646781,7 @@ var init_status_bar = __esm({
       /** Remove a sub-agent view */
       unregisterAgentView(id2) {
         this._agentViews.delete(id2);
+        if (this._agentViews.size <= 1) this.removeSubAgentLiveBlock();
         if (this._activeViewId === id2) this.switchToView("main");
         if (this.active) {
           this.applyScrollRegion();
@@ -646130,9 +646795,27 @@ var init_status_bar = __esm({
         const view = this._agentViews.get(id2);
         if (!view) return;
         view.status = status;
-        if (status === "completed" || status === "failed")
+        if (status === "completed") {
           view.completedAt = Date.now();
-        if (this.active) this.renderAgentTabs();
+          view.stage = "completed";
+          view.stageDetail = "done";
+          appendSubAgentActivity(view, "completed");
+        } else if (status === "failed") {
+          view.completedAt = Date.now();
+          view.stage = "failed";
+          view.stageDetail = "failed";
+          appendSubAgentActivity(view, "failed");
+        } else if (status === "paused" || status === "stopped") {
+          view.stage = "blocked";
+          view.stageDetail = status;
+          appendSubAgentActivity(view, status);
+        }
+        view.updatedAt = Date.now();
+        if (this.active) {
+          this.renderAgentTabs();
+          if (this._headerExpanded) this.refreshHeaderContent();
+          this.refreshDynamicBlocks();
+        }
       }
       /** Switch which agent's content buffer is displayed */
       switchToView(id2) {
@@ -653078,9 +653761,9 @@ function formatExpandedContextDiagnostic(specs, math) {
   memBits.push(`RAM ${fmtGB(specs.availableRamGB)}/${fmtGB(specs.totalRamGB)}${specs.unifiedMemory ? " unified" : ""}`);
   const mem = memBits.join(", ");
   const kv = `KV ${fmtKB(math.kvBytesPerToken)}/tok (${math.kvSource})`;
-  const fit3 = `fit ${fmtK(math.memoryFit)}, arch ${math.archCtx !== null ? fmtK(math.archCtx) : "n/a"}, floor ${fmtK(math.floor)}`;
+  const fit4 = `fit ${fmtK(math.memoryFit)}, arch ${math.archCtx !== null ? fmtK(math.archCtx) : "n/a"}, floor ${fmtK(math.floor)}`;
   const limit = `→ ${fmtK(math.numCtx)} (${math.limitedBy === "floor" ? "min floor" : math.limitedBy === "arch" ? "arch-capped" : "memory-fit"})`;
-  return `[${mem} | model ${fmtGB(math.modelSizeGB)} | ${kv} | ${fit3} ${limit}]`;
+  return `[${mem} | model ${fmtGB(math.modelSizeGB)} | ${kv} | ${fit4} ${limit}]`;
 }
 async function ensureExpandedContext(modelName, backendUrl2) {
   if (modelName.includes("cloud") || modelName.includes(":cloud")) {
@@ -653359,7 +654042,7 @@ export PATH="${binDir}:$PATH"  # Added by omnius for nvim
   } catch {
   }
 }
-var execAsync2, OMNIUS_FIRST_RUN_BANNER, ANSI_RE2, visibleLen2, SETUP_MODEL_VARIANTS, _toolSupportCache, EXPANDED_VARIANT_MIN_NUM_CTX, _cloudflaredInstallPromise;
+var execAsync2, OMNIUS_FIRST_RUN_BANNER, ANSI_RE3, visibleLen2, SETUP_MODEL_VARIANTS, _toolSupportCache, EXPANDED_VARIANT_MIN_NUM_CTX, _cloudflaredInstallPromise;
 var init_setup = __esm({
   "packages/cli/src/tui/setup.ts"() {
     init_model_picker();
@@ -653378,8 +654061,8 @@ var init_setup = __esm({
       "░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░      ░▒▓█▓▒░ ",
       " ░▒▓██████▓▒░░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓██████▓▒░░▒▓███████▓▒░  "
     ].join("\n");
-    ANSI_RE2 = /\x1B\[[0-?]*[ -/]*[@-~]/g;
-    visibleLen2 = (value2) => Array.from(value2.replace(ANSI_RE2, "")).length;
+    ANSI_RE3 = /\x1B\[[0-?]*[ -/]*[@-~]/g;
+    visibleLen2 = (value2) => Array.from(value2.replace(ANSI_RE3, "")).length;
     SETUP_MODEL_VARIANTS = [
       { tag: "robit/ornith:9b", sizeGB: 6.6, label: "9B params (6.6 GB) - recommended minimum", cloud: false },
       { tag: "robit/ornith:35b", sizeGB: 24, label: "35B params (24 GB) - recommended on 32GB+ unified memory/VRAM", cloud: false }
@@ -674050,12 +674733,12 @@ function cad3dFitIcon(score) {
   if (score >= 40) return c3.yellow("△");
   return c3.red("✖");
 }
-function cad3dModelDetail(spec, fit3) {
+function cad3dModelDetail(spec, fit4) {
   const download = spec.resources.approxDownloadGB ? `~${spec.resources.approxDownloadGB}GB` : "size unknown";
   const vram = spec.resources.recommendedVramGB ? `${spec.resources.recommendedVramGB}GB VRAM rec` : "VRAM varies";
   const license = spec.hf.license ? `license ${spec.hf.license}` : "license unknown";
   const token = spec.deployment.requiresToken ? "requires HF token" : "no token gate";
-  return `${fit3.label} · ${spec.backend} · ${download} · ${vram} · ${license} · ${token}`;
+  return `${fit4.label} · ${spec.backend} · ${download} · ${vram} · ${license} · ${token}`;
 }
 async function startCad3dViewerFromCommand(rawPath) {
   const viewer = await startCadModelViewer(
@@ -674071,11 +674754,11 @@ async function showCad3dModelsMenu(ctx3, hasLocal, mode) {
   const active = mode === "cad" ? settings.cadModel : settings.model3dModel;
   const currentViewer2 = getCurrentCadModelViewer();
   const buildItem = (entry) => {
-    const fit3 = rateCad3dModelForHardware(entry.spec, specs);
+    const fit4 = rateCad3dModelForHardware(entry.spec, specs);
     return {
       key: `model:${entry.spec.id}`,
-      label: `${cad3dFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${entry.spec.label}`,
-      detail: cad3dModelDetail(entry.spec, fit3)
+      label: `${cad3dFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${entry.spec.label}`,
+      detail: cad3dModelDetail(entry.spec, fit4)
     };
   };
   const items = [
@@ -674110,11 +674793,11 @@ async function showCad3dModelsMenu(ctx3, hasLocal, mode) {
     const patch = mode === "cad" ? { cadModel: id2, cadBackend: entry.spec.backend } : { model3dModel: id2, model3dBackend: entry.spec.backend };
     const save3 = hasLocal ? ctx3.saveLocalSettings : ctx3.saveSettings;
     save3(patch);
-    const fit3 = rateCad3dModelForHardware(entry.spec, specs);
+    const fit4 = rateCad3dModelForHardware(entry.spec, specs);
     renderInfo(
       `${mode === "cad" ? "CAD" : "3D"} model: ${id2} (${entry.spec.backend})${hasLocal ? " (project-local)" : ""}`
     );
-    renderInfo(`Hardware fit: ${fit3.score}/100 ${fit3.label} - ${fit3.note}`);
+    renderInfo(`Hardware fit: ${fit4.score}/100 ${fit4.label} - ${fit4.note}`);
     if (entry.spec.resources.approxDownloadGB) {
       renderInfo(
         `Download estimate: ~${entry.spec.resources.approxDownloadGB}GB in ${unifiedModelStoreDir()}`
@@ -674265,19 +674948,19 @@ async function renderImageModelList(ctx3) {
     renderInfo("");
     renderInfo(c3.bold(category));
     for (const preset of presets) {
-      const fit3 = rateImagePresetForHardware(preset, specs);
+      const fit4 = rateImagePresetForHardware(preset, specs);
       const primary = category === "Primary hyper-realistic baseline" ? c3.cyan(" ★") : "";
       const disk = ctx3 ? imageModelDiskStats(ctx3, preset, ollamaSizes) : { downloaded: false, bytes: 0, paths: [] };
       const diskInfo = disk.downloaded ? ` ${c3.green("✓")} ${formatFileSize(disk.bytes)}` : "";
       renderInfo(
-        `${imageFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${c3.bold(preset.label)}${primary}${diskInfo}`
+        `${imageFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${c3.bold(preset.label)}${primary}${diskInfo}`
       );
       renderInfo(`    id: ${preset.id}`);
       renderInfo(
-        `    type: ${preset.backend} · ${preset.sizeClass ?? "unknown size"} · ${fit3.label}`
+        `    type: ${preset.backend} · ${preset.sizeClass ?? "unknown size"} · ${fit4.label}`
       );
       renderImagePresetDetail("    quality: ", preset.quality ?? preset.note);
-      renderImagePresetDetail("    fit: ", fit3.note);
+      renderImagePresetDetail("    fit: ", fit4.note);
       if (preset.deployment)
         renderImagePresetDetail("    deploy: ", preset.deployment);
     }
@@ -674420,13 +675103,13 @@ async function showImageModelsMenu(ctx3, hasLocal) {
     () => /* @__PURE__ */ new Map()
   );
   const buildModelItem = (preset) => {
-    const fit3 = rateImagePresetForHardware(preset, specs);
+    const fit4 = rateImagePresetForHardware(preset, specs);
     const disk = imageModelDiskStats(ctx3, preset, ollamaSizes);
     const downloaded = disk.downloaded ? `${c3.green("✓")} ` : "";
     return {
       key: `model:${preset.id}`,
-      label: `${downloaded}${imageFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${preset.label}`,
-      detail: `${fit3.score}/100 ${fit3.label} · ${preset.category ?? preset.backend} · ${preset.sizeClass ?? preset.id}${downloadedModelSuffix(disk)}`
+      label: `${downloaded}${imageFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${preset.label}`,
+      detail: `${fit4.score}/100 ${fit4.label} · ${preset.category ?? preset.backend} · ${preset.sizeClass ?? preset.id}${downloadedModelSuffix(disk)}`
     };
   };
   const items = [
@@ -674511,9 +675194,9 @@ async function showImageModelsMenu(ctx3, hasLocal) {
     renderInfo(
       `Image model: ${model} (${backend})${hasLocal ? " (project-local)" : ""}`
     );
-    const fit3 = preset ? rateImagePresetForHardware(preset, specs) : void 0;
-    if (fit3)
-      renderInfo(`Hardware fit: ${fit3.score}/100 ${fit3.label} — ${fit3.note}`);
+    const fit4 = preset ? rateImagePresetForHardware(preset, specs) : void 0;
+    if (fit4)
+      renderInfo(`Hardware fit: ${fit4.score}/100 ${fit4.label} — ${fit4.note}`);
     if (preset?.install) renderInfo(`Prewarm command: ${preset.install}`);
     await prewarmImageModel(ctx3, model, backend);
   }
@@ -674829,19 +675512,19 @@ async function renderVideoModelList(ctx3) {
     renderInfo("");
     renderInfo(c3.bold(category));
     for (const preset of presets) {
-      const fit3 = rateVideoPresetForHardware(preset, specs);
+      const fit4 = rateVideoPresetForHardware(preset, specs);
       const disk = videoModelDiskStats(ctx3, preset);
       const diskInfo = disk.downloaded ? ` ${c3.green("✓")} ${formatFileSize(disk.bytes)}` : "";
       renderInfo(
-        `${imageFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${c3.bold(preset.label)}${diskInfo}`
+        `${imageFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${c3.bold(preset.label)}${diskInfo}`
       );
       renderInfo(`    id: ${preset.id}`);
       renderInfo(
-        `    type: ${preset.backend} · ${preset.sizeClass} · ${preset.kinds.join("/")} · ${fit3.label}`
+        `    type: ${preset.backend} · ${preset.sizeClass} · ${preset.kinds.join("/")} · ${fit4.label}`
       );
       renderImagePresetDetail("    quality: ", preset.quality);
       renderImagePresetDetail("    output: ", preset.output);
-      renderImagePresetDetail("    fit: ", fit3.note);
+      renderImagePresetDetail("    fit: ", fit4.note);
       renderImagePresetDetail("    deploy: ", preset.deployment);
       if (preset.licenseNote)
         renderImagePresetDetail("    license: ", preset.licenseNote);
@@ -674852,13 +675535,13 @@ async function showVideoModelsMenu(ctx3, hasLocal) {
   const settings = resolveSettings(ctx3.repoRoot);
   const specs = await detectSystemSpecsAsync();
   const buildModelItem = (preset) => {
-    const fit3 = rateVideoPresetForHardware(preset, specs);
+    const fit4 = rateVideoPresetForHardware(preset, specs);
     const disk = videoModelDiskStats(ctx3, preset);
     const downloaded = disk.downloaded ? `${c3.green("✓")} ` : "";
     return {
       key: `model:${preset.id}`,
-      label: `${downloaded}${imageFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${preset.label}`,
-      detail: `${fit3.label} · ${preset.category} · ${preset.kinds.join("/")}${downloadedModelSuffix(disk)}`
+      label: `${downloaded}${imageFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${preset.label}`,
+      detail: `${fit4.label} · ${preset.category} · ${preset.kinds.join("/")}${downloadedModelSuffix(disk)}`
     };
   };
   const items = [
@@ -674937,8 +675620,8 @@ async function showVideoModelsMenu(ctx3, hasLocal) {
       `Video model: ${model} (${backend})${hasLocal ? " (project-local)" : ""}`
     );
     if (preset) {
-      const fit3 = rateVideoPresetForHardware(preset, specs);
-      renderInfo(`Hardware fit: ${fit3.score}/100 ${fit3.label} — ${fit3.note}`);
+      const fit4 = rateVideoPresetForHardware(preset, specs);
+      renderInfo(`Hardware fit: ${fit4.score}/100 ${fit4.label} — ${fit4.note}`);
       if (preset.licenseNote) renderInfo(`License: ${preset.licenseNote}`);
       if (preset.install) renderInfo(`Prewarm command: ${preset.install}`);
     }
@@ -675200,19 +675883,19 @@ async function renderAudioModelList(ctx3, kind) {
     renderInfo("");
     renderInfo(c3.bold(category));
     for (const preset of presets) {
-      const fit3 = rateAudioPresetForHardware(preset, specs);
+      const fit4 = rateAudioPresetForHardware(preset, specs);
       const disk = audioModelDiskStats(ctx3, preset);
       const diskInfo = disk.downloaded ? ` ${c3.green("✓")} ${formatFileSize(disk.bytes)}` : "";
       renderInfo(
-        `${audioFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${c3.bold(preset.label)}${diskInfo}`
+        `${audioFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${c3.bold(preset.label)}${diskInfo}`
       );
       renderInfo(`    id: ${preset.id}`);
       renderInfo(
-        `    type: ${preset.backend} · ${preset.sizeClass} · ${fit3.label}`
+        `    type: ${preset.backend} · ${preset.sizeClass} · ${fit4.label}`
       );
       renderImagePresetDetail("    quality: ", preset.quality);
       renderImagePresetDetail("    output: ", preset.output);
-      renderImagePresetDetail("    fit: ", fit3.note);
+      renderImagePresetDetail("    fit: ", fit4.note);
       renderImagePresetDetail("    deploy: ", preset.deployment);
     }
   }
@@ -675237,13 +675920,13 @@ async function showAudioGenerationMenu(ctx3, hasLocal, kind) {
   const activeModel = activeAudioModel(settings, kind);
   const title = kind === "music" ? "Music Generation" : "Sound Generation";
   const buildModelItem = (preset) => {
-    const fit3 = rateAudioPresetForHardware(preset, specs);
+    const fit4 = rateAudioPresetForHardware(preset, specs);
     const disk = audioModelDiskStats(ctx3, preset);
     const downloaded = disk.downloaded ? `${c3.green("✓")} ` : "";
     return {
       key: `model:${preset.id}`,
-      label: `${downloaded}${audioFitIcon(fit3.score)} ${String(fit3.score).padStart(3)}/100 ${preset.label}`,
-      detail: `${fit3.label} · ${preset.category} · ${preset.sizeClass}${downloadedModelSuffix(disk)}`
+      label: `${downloaded}${audioFitIcon(fit4.score)} ${String(fit4.score).padStart(3)}/100 ${preset.label}`,
+      detail: `${fit4.label} · ${preset.category} · ${preset.sizeClass}${downloadedModelSuffix(disk)}`
     };
   };
   const setupItems = kind === "music" ? [
@@ -675364,8 +676047,8 @@ async function showAudioGenerationMenu(ctx3, hasLocal, kind) {
       `${kind === "music" ? "Music" : "Sound"} model: ${model} (${backend})${hasLocal ? " (project-local)" : ""}`
     );
     if (preset) {
-      const fit3 = rateAudioPresetForHardware(preset, specs);
-      renderInfo(`Hardware fit: ${fit3.score}/100 ${fit3.label} - ${fit3.note}`);
+      const fit4 = rateAudioPresetForHardware(preset, specs);
+      renderInfo(`Hardware fit: ${fit4.score}/100 ${fit4.label} - ${fit4.note}`);
       renderInfo(`Prewarm command: ${preset.install}`);
     }
     await prewarmAudioModel(ctx3, kind, model, backend);
@@ -700701,10 +701384,10 @@ ${message2}`)
       telegramModelMenuItems(generation) {
         return this.telegramGenerationModelDescriptors(generation).map((model) => {
           const cached = model.cachedBytes > 0 ? `cached ${formatModelBytes(model.cachedBytes)}` : "not downloaded";
-          const fit3 = model.recommendedVramGB ? `${model.recommendedVramGB}GB VRAM rec` : model.minVramGB ? `${model.minVramGB}GB VRAM min` : "VRAM n/a";
+          const fit4 = model.recommendedVramGB ? `${model.recommendedVramGB}GB VRAM rec` : model.minVramGB ? `${model.minVramGB}GB VRAM min` : "VRAM n/a";
           return {
             label: model.label,
-            description: `${model.backend} - ${model.category} - ${fit3} - ${cached}`,
+            description: `${model.backend} - ${model.category} - ${fit4} - ${cached}`,
             action: {
               type: "model_detail",
               generation,
@@ -714814,17 +715497,17 @@ function buildShellLiveBlockLines(state, width) {
   const body = visibleLines.slice(-state.maxRows);
   const rows = [
     top,
-    contentRow(`$ ${state.command}`, inner),
-    contentRow("", inner)
+    contentRow2(`$ ${state.command}`, inner),
+    contentRow2("", inner)
   ];
   if (hidden > 0)
     rows.push(
-      contentRow(`... ${hidden} earlier line${hidden === 1 ? "" : "s"}`, inner)
+      contentRow2(`... ${hidden} earlier line${hidden === 1 ? "" : "s"}`, inner)
     );
   if (body.length === 0) {
-    rows.push(contentRow("(waiting for output)", inner));
+    rows.push(contentRow2("(waiting for output)", inner));
   } else {
-    for (const line of body) rows.push(contentRow(line, inner));
+    for (const line of body) rows.push(contentRow2(line, inner));
   }
   rows.push(bottom);
   return rows;
@@ -714836,10 +715519,10 @@ function pushShellLiveLine(state, line) {
     state.lines.splice(0, state.lines.length - maxStored);
   }
 }
-function contentRow(value2, inner) {
-  return `│ ${fit2(value2, inner)} │`;
+function contentRow2(value2, inner) {
+  return `│ ${fit3(value2, inner)} │`;
 }
-function fit2(value2, width) {
+function fit3(value2, width) {
   const plain = value2.replace(ANSI_OR_OSC_RE, "").replace(/\s+$/g, "");
   const chars = Array.from(plain);
   if (chars.length > width) {
@@ -748668,6 +749351,8 @@ function appendSubAgentNoteBox(statusBar, agentId, event, title, metrics2, conte
   );
 }
 function writeSubAgentEventForView(statusBar, agentId, event, verbose = false) {
+  const previewLine = formatSubAgentEventForView(event);
+  statusBar.updateAgentViewEvent(agentId, event, previewLine ?? event.type);
   switch (event.type) {
     case "tool_call": {
       subAgentPendingToolCalls.set(agentId, {
@@ -748751,7 +749436,7 @@ function writeSubAgentEventForView(statusBar, agentId, event, verbose = false) {
       return true;
     }
     default: {
-      const line = formatSubAgentEventForView(event);
+      const line = previewLine;
       if (line) statusBar.writeToAgentView(agentId, line);
       return Boolean(line);
     }
@@ -750374,7 +751059,7 @@ ${content}
         });
         statusBar.ensureMonitorTimer();
       },
-      onViewWrite: (id2, text2) => statusBar.writeToAgentView(id2, text2),
+      onViewWrite: (id2, text2) => statusBar.recordAgentOutput(id2, text2),
       onViewEvent: (id2, event) => writeSubAgentEventForView(statusBar, id2, event, config.verbose),
       onViewStatus: (id2, status) => {
         statusBar.updateAgentViewStatus(id2, status);
@@ -750954,40 +751639,9 @@ ${entry.fullContent}`
   };
   runner.onEvent((event) => {
     emotionEngine?.appraise(event);
-    switch (event.type) {
-      case "tool_call": {
-        const tn = event.toolName ?? "";
-        if (tn === "file_read" || tn === "structured_read")
-          setStage("reading", tn);
-        else if (tn === "grep_search" || tn === "glob_find" || tn === "web_search" || tn === "web_fetch" || tn === "web_crawl")
-          setStage("searching", tn);
-        else if (tn === "file_write" || tn === "file_edit" || tn === "file_patch" || tn === "batch_edit" || tn === "structured_file")
-          setStage("writing", tn);
-        else if (tn === "shell" || tn === "shell_async" || tn === "run_tests" || tn === "repl_exec")
-          setStage("building", tn);
-        else setStage("tool_call", tn);
-        break;
-      }
-      case "stream_start":
-        setStage("planning");
-        break;
-      case "compaction":
-        setStage("compacting");
-        break;
-      case "debug_adversary":
-        setStage("adversary_audit");
-        break;
-      case "complete":
-        setStage("completed");
-        break;
-      case "error":
-        setStage("failed", event.content?.slice(0, 40));
-        break;
-      case "user_interrupt":
-        setStage("blocked");
-        break;
-      default:
-        break;
+    const stageTransition = stageForAgentEvent(event);
+    if (stageTransition) {
+      setStage(stageTransition.stage, stageTransition.detail);
     }
     switch (event.type) {
       case "tool_call":
@@ -752406,7 +753060,7 @@ async function startInteractive(config, repoPath2) {
           });
           statusBar.ensureMonitorTimer();
         },
-        onViewWrite: (id2, text2) => statusBar.writeToAgentView(id2, text2),
+        onViewWrite: (id2, text2) => statusBar.recordAgentOutput(id2, text2),
         onViewStatus: (id2, status) => {
           statusBar.updateAgentViewStatus(id2, status);
           const agent = registry2.subAgents.get(id2);
@@ -752447,7 +753101,7 @@ async function startInteractive(config, repoPath2) {
           });
           statusBar.ensureMonitorTimer();
         },
-        onViewWrite: (id2, text2) => statusBar.writeToAgentView(id2, text2),
+        onViewWrite: (id2, text2) => statusBar.recordAgentOutput(id2, text2),
         onViewEvent: (id2, event) => writeSubAgentEventForView(statusBar, id2, event, config.verbose),
         onViewStatus: (id2, status) => {
           statusBar.updateAgentViewStatus(id2, status);
@@ -752661,7 +753315,7 @@ ${result.summary}`
             },
             // Stream the full sub-agent's stdout into its toolbar view so the
             // clickable tab shows live output instead of staying empty.
-            (text2) => statusBar.writeToAgentView(opts.id, text2),
+            (text2) => statusBar.recordAgentOutput(opts.id, text2),
             (id2, exitCode) => statusBar.updateAgentViewStatus(
               opts.id,
               exitCode === 0 ? "completed" : "failed"
@@ -755250,7 +755904,7 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
           );
           statusBar.ensureMonitorTimer();
         },
-        onWrite: (id2, text2) => statusBar.writeToAgentView(id2, text2),
+        onWrite: (id2, text2) => statusBar.recordAgentOutput(id2, text2),
         onStatus: (id2, status) => {
           statusBar.updateAgentViewStatus(id2, status);
           const agent = registry2.subAgents.get(id2);