mastracode 0.22.3 → 0.23.0

package/dist/{chunk-OXYE6SUY.js → chunk-GKGPZBID.js}

@@ -1,23 +1,20 @@
-import { tintHex, mastra, theme, getMarkdownTheme, CHAT_INDENT, BOX_INDENT, getTermWidth, ensureTerminalGlyphContrast, TERM_WIDTH_BUFFER, getEditorTheme, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, resolveThreadActiveModelPackId, saveSettings, getAvailableOmPacks, ONBOARDING_VERSION, THREAD_ACTIVE_MODEL_PACK_ID_KEY, BOX_INDENT_STR, resolveModel, ThreadLockError, getSelectListTheme, luminance, extendedColors, MEMORY_GATEWAY_DEFAULT_URL, getThemeMode, applyThemeMode, createBrowserFromSettings, setProfileProvider, getCustomProviderId, OBSERVABILITY_AUTH_PREFIX, checkProfileProviderMismatch, getSettingsListTheme, mastraBrand, toCustomProviderModelId } from './chunk-W7Y7QIJA.js';
+import { tintHex, mastra, theme, getMarkdownTheme, CHAT_INDENT, BOX_INDENT, getTermWidth, ensureTerminalGlyphContrast, TERM_WIDTH_BUFFER, getEditorTheme, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, resolveThreadActiveModelPackId, saveSettings, getAvailableOmPacks, ONBOARDING_VERSION, THREAD_ACTIVE_MODEL_PACK_ID_KEY, BOX_INDENT_STR, ThreadLockError, getSelectListTheme, luminance, extendedColors, MEMORY_GATEWAY_DEFAULT_URL, getThemeMode, applyThemeMode, createBrowserFromSettings, setProfileProvider, getCustomProviderId, mastraBrand, OBSERVABILITY_AUTH_PREFIX, checkProfileProviderMismatch, getSettingsListTheme, toCustomProviderModelId } from './chunk-FXYM4OEI.js';
 import { getOAuthProviders, detectProject, DEFAULT_CONFIG_DIR, getUserId, getCurrentGitBranchAsync, getUserName, PROVIDER_DEFAULT_MODELS, getAppDataDir } from './chunk-5FT2NNFO.js';
 import { MC_TOOLS, getToolCategory, TOOL_CATEGORIES } from './chunk-UOFNLVKF.js';
 import { exec, spawn, execFile, execSync, execFileSync } from 'child_process';
-import { visibleWidth, Box, Text, Spacer, Input, Container, fuzzyFilter, getKeybindings, Markdown, ProcessTerminal, TUI, truncateToWidth, Editor, matchesKey, CombinedAutocompleteProvider, SelectList, wrapTextWithAnsi, SettingsList, parseKey } from '@mariozechner/pi-tui';
-import chalk14 from 'chalk';
+import { visibleWidth, Box, Text, Spacer, Input, Container, fuzzyFilter, getKeybindings, Markdown, ProcessTerminal, TUI, truncateToWidth, Editor, matchesKey, CombinedAutocompleteProvider, SelectList, wrapTextWithAnsi, SettingsList, parseKey } from '@earendil-works/pi-tui';
+import chalk12 from 'chalk';
 import fs2, { statSync, readFileSync, realpathSync, promises, unlinkSync } from 'fs';
 import * as path5 from 'path';
 import path5__default, { extname, join } from 'path';
 import { fileURLToPath } from 'url';
-import stripAnsi2 from 'strip-ansi';
 import { randomUUID } from 'crypto';
-import { Agent } from '@mastra/core/agent';
-import { StreamErrorRetryProcessor, PrefillErrorHandler, ProviderHistoryCompat } from '@mastra/core/processors';
-import { createWorkspaceTools, formatSkillActivation } from '@mastra/core/workspace';
-import { z } from 'zod';
+import { formatSkillActivation } from '@mastra/core/workspace';
 import { defaultOMProgressState, parseSubagentMeta, assignTaskIds } from '@mastra/core/harness';
 import { TASKS_STATE_ID } from '@mastra/core/tools';
 import { safeStringify } from '@mastra/core/utils';
 import process2 from 'process';
+import stripAnsi from 'strip-ansi';
 import * as os from 'os';
 import { tmpdir, homedir } from 'os';
 import { highlight } from 'cli-highlight';
@@ -480,7 +477,6 @@ var AskQuestionInlineComponent = class _AskQuestionInlineComponent extends Conta
       this.borderedBox = new AskQuestionBorderedBox([], "", [], void 0, void 0, true);
     }
     this.addChild(this.borderedBox);
-    this.addChild(new Spacer(1));
   }
   /**
    * Update the question text and options from streaming partial args.
@@ -639,6 +635,9 @@ var AskQuestionInlineComponent = class _AskQuestionInlineComponent extends Conta
       this.input.handleInput(data);
     }
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 
 // src/onboarding/onboarding-inline.ts
@@ -751,7 +750,7 @@ var OnboardingInlineComponent = class extends Box {
     box.addChild(new Text(theme.bold(theme.fg("accent", "\u{1F44B} Welcome to Mastra Code")), 0, 0));
     box.addChild(new Spacer(1));
     box.addChild(new Text(theme.fg("text", "Let's configure your models and preferences."), 0, 0));
-    box.addChild(new Text(chalk14.white("You can re-run this anytime with /setup."), 0, 0));
+    box.addChild(new Text(chalk12.white("You can re-run this anytime with /setup."), 0, 0));
     box.addChild(new Spacer(1));
     const items = [
       { value: "continue", label: `  ${theme.fg("success", "Continue")}` },
@@ -886,9 +885,9 @@ var OnboardingInlineComponent = class extends Box {
       this.modePackDetail.setText(theme.fg("dim", "  You'll pick a model for each mode in the next steps."));
     } else {
       const detail = [
-        `  ${chalk14.hex(mastra.blue)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
-        `  ${chalk14.hex(mastra.purple)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
-        `  ${chalk14.hex(mastra.green)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
+        `  ${chalk12.hex(mastra.blue)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
+        `  ${chalk12.hex(mastra.purple)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
+        `  ${chalk12.hex(mastra.green)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
       ].join("\n");
       this.modePackDetail.setText(detail);
     }
@@ -959,7 +958,7 @@ var OnboardingInlineComponent = class extends Box {
       models: { build: models.build, plan: models.plan, fast: models.fast }
     };
     this.collapseStep(
-      `Model pack \u2192 ${theme.bold(packName)}  ${chalk14.hex(mastra.blue)("plan")} ${models.plan}  ${chalk14.hex(mastra.purple)("build")} ${models.build}  ${chalk14.hex(mastra.green)("fast")} ${models.fast}`
+      `Model pack \u2192 ${theme.bold(packName)}  ${chalk12.hex(mastra.blue)("plan")} ${models.plan}  ${chalk12.hex(mastra.purple)("build")} ${models.build}  ${chalk12.hex(mastra.green)("fast")} ${models.fast}`
     );
     this.renderStep("omPack");
     this.tui.requestRender();
@@ -1073,9 +1072,9 @@ var OnboardingInlineComponent = class extends Box {
     box.addChild(new Spacer(1));
     const lines = [
       `Model pack: ${theme.bold(this.selectedModePack.name)}`,
-      `  ${chalk14.hex(mastra.blue)("plan")}  \u2192 ${this.selectedModePack.models.plan}`,
-      `  ${chalk14.hex(mastra.purple)("build")} \u2192 ${this.selectedModePack.models.build}`,
-      `  ${chalk14.hex(mastra.green)("fast")}  \u2192 ${this.selectedModePack.models.fast}`,
+      `  ${chalk12.hex(mastra.blue)("plan")}  \u2192 ${this.selectedModePack.models.plan}`,
+      `  ${chalk12.hex(mastra.purple)("build")} \u2192 ${this.selectedModePack.models.build}`,
+      `  ${chalk12.hex(mastra.green)("fast")}  \u2192 ${this.selectedModePack.models.fast}`,
       `Observational memory: ${theme.bold(this.selectedOmPack.name)}`,
       `YOLO mode: ${theme.bold(this.selectedYolo ? "enabled" : "disabled")}`
     ];
@@ -1175,7 +1174,7 @@ function getInstallCommand(pm, version) {
 }
 function getCurrentVersion() {
   {
-    return "0.22.3";
+    return "0.23.0";
   }
 }
 async function fetchLatestVersion() {
@@ -1274,6 +1273,15 @@ function buildInstallArgs(pm, version) {
       return ["install", "-g", pkg];
   }
 }
+var ChatBoundarySpacer = class extends Spacer {
+  isChatBoundarySpacer = true;
+  constructor(lines = 1) {
+    super(lines);
+  }
+};
+function isChatBoundarySpacer(component) {
+  return !!component && component.isChatBoundarySpacer === true;
+}
 
 // src/tui/components/chat-spacing.ts
 function getChatSpacingKind(component) {
@@ -1309,84 +1317,13 @@ function isToolSpacingKind(kind) {
   return kind === "quiet-compact-tool" || kind === "quiet-shell-tool" || kind === "normal-tool";
 }
 
-// src/tui/components/chat-boundary-spacer.ts
-var ChatBoundarySpacer = class {
-  constructor(getPrev, getNext, getPrevPrev = () => void 0, getNextNext = () => void 0) {
-    this.getPrev = getPrev;
-    this.getNext = getNext;
-    this.getPrevPrev = getPrevPrev;
-    this.getNextNext = getNextNext;
-  }
-  getPrev;
-  getNext;
-  getPrevPrev;
-  getNextNext;
-  isChatBoundarySpacer = true;
-  invalidate() {
-  }
-  render() {
-    const spacing = getSpacingBetweenComponents(this.getPrev(), this.getNext(), this.getPrevPrev(), this.getNextNext());
-    return Array.from({ length: spacing }, () => "");
-  }
-};
-function isChatBoundarySpacer(component) {
-  return !!component && component.isChatBoundarySpacer === true;
-}
-
 // src/tui/chat-boundary-reconciliation.ts
 function insertChatComponentWithBoundarySpacing(chatContainer, child, index = chatContainer.children.length) {
   const children = chatContainer.children;
   const boundedIndex = Math.max(0, Math.min(index, children.length));
-  const previous = findPreviousSpacingComponent(children, boundedIndex);
-  const previousPrevious = findPreviousSpacingComponent(children, previous ? children.indexOf(previous) : -1);
-  const next = findNextSpacingComponent(children, boundedIndex);
-  const nextNext = findNextSpacingComponent(children, next ? children.indexOf(next) + 1 : children.length);
-  const inserted = [];
-  if (previous) {
-    inserted.push(
-      new ChatBoundarySpacer(
-        () => previous,
-        () => child,
-        () => previousPrevious,
-        () => next
-      )
-    );
-  }
-  inserted.push(child);
-  if (next) {
-    inserted.push(
-      new ChatBoundarySpacer(
-        () => child,
-        () => next,
-        () => previous,
-        () => nextNext
-      )
-    );
-  }
-  children.splice(boundedIndex, 0, ...inserted);
+  children.splice(boundedIndex, 0, child);
   reconcileChatBoundarySpacers(chatContainer);
 }
-function findPreviousSpacingComponent(children, index) {
-  for (let i = index - 1; i >= 0; i--) {
-    const child = children[i];
-    if (child && !isChatBoundarySpacer(child) && getChatSpacingKind(child)) return child;
-  }
-  return void 0;
-}
-function findNextSpacingComponent(children, index) {
-  for (let i = index; i < children.length; i++) {
-    const child = children[i];
-    if (child && !isChatBoundarySpacer(child) && getChatSpacingKind(child)) return child;
-  }
-  return void 0;
-}
-function findPreviousSpacingComponentInList(components, index) {
-  for (let i = index - 1; i >= 0; i--) {
-    const child = components[i];
-    if (child && getChatSpacingKind(child)) return child;
-  }
-  return void 0;
-}
 function findNextSpacingComponentInList(components, index) {
   for (let i = index + 1; i < components.length; i++) {
     const child = components[i];
@@ -1395,11 +1332,15 @@ function findNextSpacingComponentInList(components, index) {
   return void 0;
 }
 function reconcileChatBoundarySpacers(chatContainer) {
-  const components = chatContainer.children.filter((child) => !isChatBoundarySpacer(child));
+  const children = chatContainer.children;
+  const components = children.filter((child) => !isChatBoundarySpacer(child));
+  const spacerPool = children.filter(isChatBoundarySpacer);
+  let poolIndex = 0;
   const nextChildren = [];
   let previousCompactToolGroupKey;
   let previousCompactToolSummary;
   let currentCompactRun = [];
+  let previousSpacingComponent;
   const flushCompactRunColor = () => {
     const color = getCompactRunLabelColor(currentCompactRun);
     for (const participant of currentCompactRun) {
@@ -1431,22 +1372,24 @@ function reconcileChatBoundarySpacers(chatContainer) {
       previousCompactToolGroupKey = compactToolGroupKey;
       previousCompactToolSummary = compactToolGroupSummary;
     }
-    nextChildren.push(component);
-    if (getChatSpacingKind(component)) {
-      const previous = findPreviousSpacingComponentInList(components, i);
-      const nextIndex = next ? components.indexOf(next) : -1;
-      const nextNext = nextIndex >= 0 ? findNextSpacingComponentInList(components, nextIndex) : void 0;
-      if (next) {
-        nextChildren.push(
-          new ChatBoundarySpacer(
-            () => component,
-            () => next,
-            () => previous,
-            () => nextNext
-          )
-        );
+    if (getChatSpacingKind(component) && previousSpacingComponent) {
+      const spacing = getSpacingBetweenComponents(previousSpacingComponent, component);
+      if (spacing > 0) {
+        let spacer;
+        if (poolIndex < spacerPool.length) {
+          spacer = spacerPool[poolIndex];
+          spacer.setLines(spacing);
+          poolIndex++;
+        } else {
+          spacer = new ChatBoundarySpacer(spacing);
+        }
+        nextChildren.push(spacer);
       }
     }
+    if (getChatSpacingKind(component)) {
+      previousSpacingComponent = component;
+    }
+    nextChildren.push(component);
   }
   flushCompactRunColor();
   chatContainer.children = nextChildren;
@@ -1569,116 +1512,6 @@ var GoalCyclesDialogComponent = class extends Box {
     this.input.handleInput(data);
   }
 };
-var JUDGE_COLOR = mastraBrand.blue;
-var MUTED_COLOR = "#8a8a8a";
-var PAUSED_COLOR = "#f5a524";
-var WAITING_COLOR = "#8a8a8a";
-var JudgeDisplayComponent = class extends Container {
-  result;
-  turnsUsed;
-  maxTurns;
-  activity = [];
-  constructor(result = null, turnsUsed = 0, maxTurns = 0) {
-    super();
-    this.result = result;
-    this.turnsUsed = turnsUsed;
-    this.maxTurns = maxTurns;
-    this.renderContent();
-  }
-  addActivity(line) {
-    if (this.activity[this.activity.length - 1] !== line) {
-      this.activity.push(line);
-    }
-    if (this.activity.length > 6) {
-      this.activity = this.activity.slice(-6);
-    }
-    this.renderContent();
-  }
-  setResult(result, turnsUsed, maxTurns) {
-    this.result = result;
-    this.turnsUsed = turnsUsed;
-    this.maxTurns = maxTurns;
-    this.renderContent();
-  }
-  setInterrupted() {
-    this.setResult({ decision: "paused", reason: "Judge evaluation was interrupted." }, this.turnsUsed, this.maxTurns);
-  }
-  renderContent() {
-    this.clear();
-    const border = (char) => chalk14.hex(JUDGE_COLOR)(char);
-    const title = chalk14.hex(JUDGE_COLOR).bold("Goal");
-    const termWidth = getTermWidth();
-    const innerWidth = Math.max(20, termWidth - BOX_INDENT * 2 - 4);
-    const horizontal = "\u2500".repeat(innerWidth + 1);
-    this.addChild(new Spacer(1));
-    this.addChild(new Text(`${border("\u256D")}${border(horizontal)}${border("\u256E")}`, BOX_INDENT, 0));
-    this.addChild(new Text(this.renderRow(this.renderHeader(title), innerWidth, border), BOX_INDENT, 0));
-    if (!this.result && this.activity.length === 0) {
-      this.addChild(new Text(this.renderRow(chalk14.dim("evaluating\u2026"), innerWidth, border), BOX_INDENT, 0));
-    }
-    for (const line of this.activity) {
-      this.addChild(new Text(this.renderRow(this.renderActivityLine(line), innerWidth, border), BOX_INDENT, 0));
-    }
-    if (this.activity.length > 0 && this.result) {
-      this.addChild(new Text(this.renderRow("", innerWidth, border), BOX_INDENT, 0));
-    }
-    if (this.result) {
-      for (const line of this.wrapLine(this.result.reason, innerWidth)) {
-        this.addChild(new Text(this.renderRow(chalk14.dim(line), innerWidth, border), BOX_INDENT, 0));
-      }
-    }
-    this.addChild(new Text(`${border("\u2570")}${border(horizontal)}${border("\u256F")}`, BOX_INDENT, 0));
-  }
-  renderActivityLine(line) {
-    const toolName = getActivityToolName(line);
-    if (!toolName) return theme.fg("dim", `\u2022 ${line}`);
-    const rest = line.slice(toolName.length);
-    return `${theme.fg("dim", "\u2022 ")}${theme.fg("dim", theme.italic(toolName))}${theme.fg("dim", rest)}`;
-  }
-  renderHeader(title) {
-    if (!this.result) {
-      return `${title}  \u25CC ${chalk14.hex(WAITING_COLOR).bold("evaluating")}`;
-    }
-    const decisionIcon = this.result.decision === "done" ? "\u25CF" : this.result.decision === "paused" ? "!" : this.result.decision === "waiting" ? "\u25CC" : "\u25CB";
-    const decisionText = getDecisionText(this.result.decision);
-    const turnInfo = this.maxTurns > 0 ? chalk14.hex(MUTED_COLOR)(`(${this.turnsUsed}/${this.maxTurns})`) : "";
-    return `${title}  ${decisionIcon} ${decisionText}${turnInfo ? `  ${turnInfo}` : ""}`;
-  }
-  renderRow(text, width, border) {
-    const content = this.padLine(text, width);
-    return `${border("\u2502")} ${content}${border("\u2502")}`;
-  }
-  wrapLine(text, width) {
-    const lines = [];
-    let remaining = text;
-    while (remaining.length > width) {
-      const breakAt = remaining.lastIndexOf(" ", width);
-      const splitAt = breakAt > 0 ? breakAt : width;
-      lines.push(remaining.slice(0, splitAt));
-      remaining = remaining.slice(splitAt).trimStart();
-    }
-    lines.push(remaining);
-    return lines;
-  }
-  padLine(text, width) {
-    const visibleLength = stripAnsi2(text).length;
-    if (visibleLength >= width) {
-      return stripAnsi2(text).slice(0, width);
-    }
-    return text + " ".repeat(width - visibleLength);
-  }
-};
-function getActivityToolName(line) {
-  if (line.startsWith("find files ")) return "find files";
-  const [toolName] = line.split(" ");
-  return toolName || null;
-}
-function getDecisionText(decision) {
-  if (decision === "done") return chalk14.hex("#16c858").bold("done");
-  if (decision === "paused") return chalk14.hex(PAUSED_COLOR).bold("paused");
-  if (decision === "waiting") return chalk14.hex(WAITING_COLOR).bold("waiting");
-  return chalk14.hex(JUDGE_COLOR).bold("continue");
-}
 function makeCustomModelItem(id, models) {
   const parts = id.split("/");
   const provider = parts.length > 1 ? parts[0] : "custom";
@@ -1726,7 +1559,7 @@ var ModelSelectorComponent = class extends Box {
     this.buildUI();
   }
   buildUI() {
-    const titleText = this.titleColor ? chalk14.bgHex(this.titleColor).white.bold(` ${this.title} `) : theme.bold(theme.fg("accent", this.title));
+    const titleText = this.titleColor ? chalk12.bgHex(this.titleColor).white.bold(` ${this.title} `) : theme.bold(theme.fg("accent", this.title));
     this.addChild(new Text(titleText, 0, 0));
     this.addChild(new Spacer(1));
     this.addChild(new Text(theme.fg("muted", "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select \u2022 Esc cancel"), 0, 0));
@@ -1854,173 +1687,35 @@ var ModelSelectorComponent = class extends Box {
     return this.searchInput;
   }
 };
-var GRADIENT_WIDTH = 30;
-var BASE_COLOR = [22, 200, 88];
-function getMinBrightness() {
-  return getThemeMode() === "dark" ? 0.45 : 0.55;
-}
-function hexToRgb(hex) {
-  const h = hex.replace("#", "");
-  return [parseInt(h.slice(0, 2), 16), parseInt(h.slice(2, 4), 16), parseInt(h.slice(4, 6), 16)];
-}
-var IDLE_BRIGHTNESS = 0.8;
-function applyGradientSweep(text, offset, color, fadeProgress = 0) {
-  const chars = [...text];
-  const totalChars = chars.length;
-  if (totalChars === 0) return text;
-  const baseColor = color ? hexToRgb(color) : BASE_COLOR;
-  const gradientCenter = offset % 1 * 100;
-  const halfGradient = GRADIENT_WIDTH / 2;
-  const minBrightness = getMinBrightness();
-  const brightnessRange = 1 - minBrightness;
-  let result = "";
-  let batchChars = "";
-  let batchR = -1, batchG = -1, batchB = -1;
-  for (let i = 0; i < totalChars; i++) {
-    const char = chars[i];
-    if (char === " ") {
-      if (batchChars) {
-        result += chalk14.rgb(batchR, batchG, batchB)(batchChars);
-        batchChars = "";
-      }
-      result += " ";
-      continue;
-    }
-    const charPosition = i / totalChars * 100;
-    let distance = Math.abs(charPosition - gradientCenter);
-    if (distance > 50) distance = 100 - distance;
-    const normalizedDistance = Math.min(distance / halfGradient, 1);
-    const animBrightness = minBrightness + brightnessRange * (1 - normalizedDistance);
-    const brightness = animBrightness + (IDLE_BRIGHTNESS - animBrightness) * fadeProgress;
-    const r = Math.floor(baseColor[0] * brightness);
-    const g = Math.floor(baseColor[1] * brightness);
-    const b = Math.floor(baseColor[2] * brightness);
-    if (r === batchR && g === batchG && b === batchB) {
-      batchChars += char;
-    } else {
-      if (batchChars) {
-        result += chalk14.rgb(batchR, batchG, batchB)(batchChars);
-      }
-      batchChars = char;
-      batchR = r;
-      batchG = g;
-      batchB = b;
-    }
-  }
-  if (batchChars) {
-    result += chalk14.rgb(batchR, batchG, batchB)(batchChars);
-  }
-  return result;
-}
-var GradientAnimator = class {
-  offset = 0;
-  intervalId = null;
-  onTick;
-  _isFadingOut = false;
-  _isFadingIn = false;
-  _fadeProgress = 0;
-  // 0 = full animation, 1 = fully idle
-  constructor(onTick) {
-    this.onTick = onTick;
-  }
-  start() {
-    if (this.intervalId && !this._isFadingOut) return;
-    if (this.intervalId) {
-      clearInterval(this.intervalId);
-      this.intervalId = null;
-    }
-    this._isFadingOut = false;
-    this._isFadingIn = true;
-    this._fadeProgress = 1;
-    this.offset = 0;
-    this.intervalId = setInterval(() => {
-      this.offset += 0.03;
-      if (this._isFadingIn) {
-        this._fadeProgress -= 0.06;
-        if (this._fadeProgress <= 0) {
-          this._fadeProgress = 0;
-          this._isFadingIn = false;
-        }
-      }
-      this.onTick();
-    }, 80);
-  }
-  /**
-   * Smoothly fade the gradient to idle state over ~500ms.
-   */
-  fadeOut() {
-    if (!this.intervalId) return;
-    if (this._isFadingOut) return;
-    this._isFadingOut = true;
-    this._isFadingIn = false;
-    this._fadeProgress = 0;
-    clearInterval(this.intervalId);
-    this.intervalId = setInterval(() => {
-      this._fadeProgress += 0.08;
-      if (this._fadeProgress >= 1) {
-        this._fadeProgress = 1;
-        this.stop();
-      }
-      this.onTick();
-    }, 40);
-  }
-  stop() {
-    if (this.intervalId) {
-      clearInterval(this.intervalId);
-      this.intervalId = null;
-    }
-    this._isFadingOut = false;
-    this._isFadingIn = false;
-    this._fadeProgress = 0;
-    this.offset = 0;
-  }
-  getOffset() {
-    return this.offset;
-  }
-  /** 0 = full animation, 1 = fully idle. Use to interpolate colors. */
-  getFadeProgress() {
-    return this._fadeProgress;
-  }
-  isFadingOut() {
-    return this._isFadingOut;
-  }
-  isFadingIn() {
-    return this._isFadingIn;
-  }
-  isRunning() {
-    return this.intervalId !== null;
-  }
-};
 var DEFAULT_MAX_TURNS = 50;
 var THREAD_GOAL_KEY = "goal";
-var JUDGE_MAX_STEPS = 50;
-var JUDGE_RETRY_PROMPT = 'You did not produce a structured decision. You MUST respond with a JSON object containing "decision" (one of "done", "continue", or "waiting") and "reason" (a brief explanation). Do not use any tools \u2014 respond with the JSON decision immediately based on what you already know.';
-var JUDGE_SYSTEM_PROMPT = `You are the goal judge. Your decision directly controls whether the assistant continues working toward the goal.
-
-Given a goal and the assistant's latest response, reason about whether the goal's requirements have been satisfied. Compare what the goal asks for against what the assistant has actually produced. Focus on substance, not phrasing.
-
-Use "done" when the goal is fully achieved.
-Use "waiting" when the goal explicitly requires a user checkpoint, user feedback, human verification, human confirmation, or another external event outside the goal-judge loop before the assistant should continue, and the assistant has correctly stopped at that checkpoint.
-Use "waiting" when the latest user message asks a question or requests clarification and the latest assistant message answers it; let the user acknowledge the answer, ask a follow-up, or otherwise return control before continuing goal work. Use common sense and do not wait if the user explicitly asked the assistant to continue autonomously after answering.
-Use "continue" when the goal is not done and the assistant should keep working autonomously, including when it asked for input that the goal did not explicitly require.
-If your previous decision was "waiting" for an explicit user checkpoint, keep choosing "waiting" when the user's latest response asks a question, requests clarification, or otherwise does not satisfy the checkpoint. Do not continue until the required user feedback/confirmation/verification has actually been provided.
-If the goal says to wait for the goal judge, judge, evaluator, or you to respond, approve, verify, validate, tell the assistant to continue, or otherwise provide the next signal, treat your own decision as that judge response. Verification can be performed by you unless the goal explicitly says it needs human/user verification. Choose "continue" when the assistant should proceed to the next step. Do not choose "waiting" for judge-controlled checkpoints, because that would mean waiting for yourself.
-
-Your "reason" field is sent back to the assistant as guidance when the goal is not yet done \u2014 be specific about what still needs to be accomplished. When choosing "continue", write the reason as an instruction for what the assistant should do next. When choosing "waiting", explain what specific user checkpoint is still outstanding.`;
-var judgeSchema = z.object({
-  decision: z.enum(["done", "continue", "waiting"]).describe(
-    "Whether the goal is done, should continue autonomously, or is at an explicit user checkpoint required by the goal"
-  ),
-  reason: z.string().describe("Brief explanation of what was accomplished or what remains to be done")
-});
 var GoalManager = class {
-  goal = null;
+  /** Synchronous in-memory view of the active objective record (source of truth is ThreadState). */
+  record = null;
+  /** Display-only active-timer accounting (not persisted to the objective record). */
+  activeStartedAt = null;
+  activeDurationMs = 0;
   persistGoalOnNextThreadCreate = false;
+  // ---------------------------------------------------------------------------
+  // Synchronous TUI surface
+  // ---------------------------------------------------------------------------
   getGoal() {
-    return this.goal;
+    if (!this.record) return null;
+    const { judgeModelId, maxTurns } = this.effectiveSettings(this.record);
+    return {
+      id: this.record.id,
+      objective: this.record.objective,
+      status: this.record.status,
+      turnsUsed: this.record.runsUsed,
+      maxTurns,
+      judgeModelId,
+      startedAt: new Date(this.record.startedAt).toISOString(),
+      activeStartedAt: this.activeStartedAt ?? void 0,
+      activeDurationMs: this.activeDurationMs
+    };
   }
   isActive() {
-    return this.goal?.status === "active";
+    return this.record?.status === "active";
   }
   persistOnNextThreadCreate() {
     this.persistGoalOnNextThreadCreate = true;
@@ -2030,404 +1725,231 @@ var GoalManager = class {
     this.persistGoalOnNextThreadCreate = false;
     return true;
   }
-  /**
-   * Set a new goal objective. Resets turn counter.
-   */
-  setGoal(objective, judgeModelId, maxTurns = DEFAULT_MAX_TURNS) {
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    this.goal = {
-      id: randomUUID(),
-      objective,
-      status: "active",
-      turnsUsed: 0,
-      maxTurns,
-      judgeModelId,
-      startedAt: now,
-      activeStartedAt: now,
-      activeDurationMs: 0
-    };
-    return this.goal;
-  }
-  /**
-   * Load goal state from thread metadata (called on thread switch).
-   */
-  loadFromThreadMetadata(metadata) {
-    const saved = metadata?.[THREAD_GOAL_KEY];
-    if (saved && saved.objective && saved.status) {
-      this.goal = {
-        ...saved,
-        id: saved.id ?? randomUUID(),
-        startedAt: saved.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-        activeStartedAt: void 0,
-        activeDurationMs: saved.activeDurationMs ?? 0
-      };
-    } else {
-      this.goal = null;
-    }
-    this.persistGoalOnNextThreadCreate = false;
-  }
-  /**
-   * Persist goal state to thread metadata.
-   */
-  async saveToThread(state) {
-    try {
-      if (this.goal) {
-        await state.harness.setThreadSetting({ key: THREAD_GOAL_KEY, value: this.goal });
-      } else {
-        await state.harness.setThreadSetting({ key: THREAD_GOAL_KEY, value: void 0 });
-      }
-    } catch {
-    }
-  }
-  pause() {
-    if (this.goal && this.goal.status === "active") {
-      this.stopActiveTimer();
-      this.goal.status = "paused";
-    }
-    return this.goal;
-  }
-  resume() {
-    if (this.goal && this.goal.status === "paused") {
-      this.goal.status = "active";
-      this.startActiveTimer();
-    }
-    return this.goal;
-  }
   startActiveTimer() {
-    if (this.goal?.status === "active" && !this.goal.activeStartedAt) {
-      this.goal.activeStartedAt = (/* @__PURE__ */ new Date()).toISOString();
+    if (this.record?.status === "active" && !this.activeStartedAt) {
+      this.activeStartedAt = (/* @__PURE__ */ new Date()).toISOString();
     }
   }
   stopActiveTimer() {
-    if (!this.goal?.activeStartedAt) return;
-    const activeStartedMs = Date.parse(this.goal.activeStartedAt);
-    if (Number.isFinite(activeStartedMs)) {
-      this.goal.activeDurationMs = (this.goal.activeDurationMs ?? 0) + Math.max(0, Date.now() - activeStartedMs);
-    }
-    this.goal.activeStartedAt = void 0;
-  }
-  updateJudgeDefaults(judgeModelId, maxTurns) {
-    if (this.goal) {
-      this.goal.judgeModelId = judgeModelId;
-      this.goal.maxTurns = maxTurns;
+    if (!this.activeStartedAt) return;
+    const startedMs = Date.parse(this.activeStartedAt);
+    if (Number.isFinite(startedMs)) {
+      this.activeDurationMs += Math.max(0, Date.now() - startedMs);
     }
-    return this.goal;
+    this.activeStartedAt = null;
   }
-  clear() {
-    this.goal = null;
-    this.persistGoalOnNextThreadCreate = false;
-  }
-  markDone() {
-    if (this.goal) {
-      this.stopActiveTimer();
-      this.goal.status = "done";
-    }
+  /** Reset active-timer accounting to zero (e.g. for an untriggered plan goal). */
+  resetActiveTimer() {
+    this.activeStartedAt = null;
+    this.activeDurationMs = 0;
   }
+  // ---------------------------------------------------------------------------
+  // Objective lifecycle (ThreadState-backed via the agent)
+  // ---------------------------------------------------------------------------
   /**
-   * Called after each agent turn completes. Evaluates whether to continue.
-   * Returns a GoalEvaluationResult with continuation prompt and judge result.
+   * Set a new objective. Persists to ThreadState via `agent.setObjective` and
+   * updates the in-memory view. Only the provided settings are persisted into
+   * the record; unset ones fall back to the agent's `goal` config at read time.
    */
-  async evaluateAfterTurn(state, options = {}) {
-    if (!this.goal || this.goal.status !== "active") {
-      return { continuation: null, judgeResult: null };
-    }
-    const evaluatedGoalId = this.goal.id;
-    const context = await this.getRecentConversationContext(state);
-    if (!this.goal || this.goal.id !== evaluatedGoalId || this.goal.status !== "active") {
-      return { continuation: null, judgeResult: null };
-    }
-    if (!context.lastAssistantContent) {
-      if (options.requireAssistantMessage) {
-        const result2 = {
-          decision: "paused",
-          reason: "Judge could not evaluate this turn: no assistant response."
-        };
-        this.stopActiveTimer();
-        this.goal.status = "paused";
-        this.goal.lastPauseWasJudgeFailure = true;
-        await this.saveToThread(state);
-        return { continuation: null, judgeResult: result2 };
-      }
-      if (this.goal.turnsUsed >= this.goal.maxTurns) {
-        this.stopActiveTimer();
-        this.goal.status = "paused";
-        this.goal.lastPauseWasJudgeFailure = false;
-        await this.saveToThread(state);
-        return { continuation: null, judgeResult: null };
-      }
-      await this.saveToThread(state);
-      return { continuation: this.buildContinuationPrompt("No response yet, keep working."), judgeResult: null };
-    }
-    const result = await this.callJudge(
-      state,
-      {
-        lastUserContent: context.lastUserContent,
-        assistantStepsSinceLastUser: context.assistantStepsSinceLastUser,
-        lastAssistantContent: context.lastAssistantContent
-      },
-      options
-    );
-    if (!this.goal || this.goal.id !== evaluatedGoalId || this.goal.status !== "active") {
-      return { continuation: null, judgeResult: null };
-    }
-    if (result.decision === "continue" || result.decision === "done") {
-      this.goal.turnsUsed++;
-      this.goal.lastPauseWasJudgeFailure = false;
-    }
-    if (result.decision === "paused") {
-      this.stopActiveTimer();
-      this.goal.status = "paused";
-      this.goal.lastPauseWasJudgeFailure = isJudgeFailureReason(result.reason);
-      await this.saveToThread(state);
-      return { continuation: null, judgeResult: result };
-    }
-    if (result.decision === "done") {
-      this.stopActiveTimer();
-      this.goal.status = "done";
-      await this.saveToThread(state);
-      return { continuation: null, judgeResult: result };
-    }
-    if (result.decision === "waiting") {
-      this.stopActiveTimer();
-      await this.saveToThread(state);
-      return { continuation: null, judgeResult: result };
-    }
-    if (this.goal.turnsUsed >= this.goal.maxTurns) {
-      this.stopActiveTimer();
-      this.goal.status = "paused";
-      this.goal.lastPauseWasJudgeFailure = false;
-      await this.saveToThread(state);
-      return { continuation: null, judgeResult: result };
-    }
-    this.startActiveTimer();
-    await this.saveToThread(state);
-    return { continuation: this.buildContinuationPrompt(result.reason), judgeResult: result };
-  }
-  // ===========================================================================
-  // Private
-  // ===========================================================================
-  async getRecentConversationContext(state) {
-    try {
-      const messages = await state.harness.listMessages();
-      let lastUserIndex = -1;
-      let lastAssistantContent = null;
-      for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i];
-        if (!lastAssistantContent && msg.role === "assistant") {
-          lastAssistantContent = this.extractTextContent(msg.content);
-        }
-        if (msg.role === "user") {
-          lastUserIndex = i;
-          break;
-        }
-      }
-      const lastUserContent = lastUserIndex >= 0 ? this.extractTextContent(messages[lastUserIndex].content) : null;
-      const assistantStepsSinceLastUser = lastUserIndex >= 0 ? messages.slice(lastUserIndex + 1).filter((msg) => msg.role === "assistant").length : 0;
-      return { lastUserContent, assistantStepsSinceLastUser, lastAssistantContent };
-    } catch {
-      return { lastUserContent: null, assistantStepsSinceLastUser: 0, lastAssistantContent: null };
-    }
-  }
-  extractTextContent(content) {
-    if (typeof content === "string") return content;
-    if (Array.isArray(content)) {
-      return content.map((part) => {
-        if (typeof part === "string") return part;
-        if (typeof part?.text === "string") return part.text;
-        if (typeof part?.content === "string") return part.content;
-        return null;
-      }).filter((text) => Boolean(text)).join("\n");
-    }
-    return String(content ?? "");
-  }
-  async callJudge(state, context, options) {
-    try {
-      const memory = await this.getJudgeMemory(state);
-      const tools = await this.createJudgeTools(state);
-      const judgeAgent = this.createJudgeAgent(memory, tools);
-      if (!judgeAgent) {
-        return { decision: "paused", reason: "Judge model could not be initialized." };
-      }
-      const recentUser = context.lastUserContent ? `
-
-Latest user message:
-${truncateForJudge(context.lastUserContent)}
-
-Assistant steps since that user message: ${context.assistantStepsSinceLastUser}` : "";
-      const prompt = `Goal: ${this.goal.objective}${recentUser}
-
-Latest assistant message:
-${context.lastAssistantContent}`;
-      const memoryOpts = memory ? { memory: { thread: this.getJudgeThreadId(state), resource: state.harness.getResourceId() } } : {};
-      const streamOpts = {
-        ...memoryOpts,
-        abortSignal: options.abortSignal,
-        maxSteps: JUDGE_MAX_STEPS,
-        structuredOutput: {
-          schema: judgeSchema,
-          errorStrategy: "warn"
-        }
-      };
-      const stream = await judgeAgent.stream(prompt, streamOpts);
-      await this.consumeJudgeStream(stream, options.onActivity);
-      const output = (await stream.getFullOutput()).object;
-      if (output) {
-        return { decision: output.decision, reason: output.reason };
-      }
-      if (options.abortSignal?.aborted) {
-        return { decision: "paused", reason: "Judge evaluation was interrupted." };
-      }
-      options.onActivity?.("retrying (no structured decision)");
-      const retryStream = await judgeAgent.stream(JUDGE_RETRY_PROMPT, streamOpts);
-      await this.consumeJudgeStream(retryStream, options.onActivity);
-      const retryOutput = (await retryStream.getFullOutput()).object;
-      if (retryOutput) {
-        return { decision: retryOutput.decision, reason: retryOutput.reason };
-      }
-      return { decision: "paused", reason: "Judge returned no structured decision." };
-    } catch (error) {
-      if (options.abortSignal?.aborted) {
-        return { decision: "paused", reason: "Judge evaluation was interrupted." };
-      }
-      return { decision: "paused", reason: `Judge could not evaluate this turn: ${formatError(error)}` };
+  async setGoal(state, objective, judgeModelId, maxTurns = DEFAULT_MAX_TURNS) {
+    const threadId = state.harness.getCurrentThreadId();
+    const agent = this.getAgent(state);
+    const now = Date.now();
+    const id = randomUUID();
+    if (agent && threadId) {
+      const persisted = await agent.setObjective(objective, {
+        threadId,
+        resourceId: state.harness.getResourceId(),
+        ...judgeModelId ? { judgeModelId } : {},
+        maxRuns: maxTurns
+      });
+      this.record = persisted ? { ...persisted, id } : this.localRecord(objective, judgeModelId, maxTurns, now, id);
+    } else {
+      this.record = this.localRecord(objective, judgeModelId, maxTurns, now, id);
     }
+    this.activeStartedAt = new Date(now).toISOString();
+    this.activeDurationMs = 0;
+    return this.getGoal();
   }
-  async createJudgeTools(state) {
-    const workspace = state.harness.getWorkspace?.() ?? state.workspace;
-    if (!workspace) return {};
-    const workspaceTools = await createWorkspaceTools(workspace, {
-      requestContext: {},
-      workspace
-    });
-    const allowedTools = /* @__PURE__ */ new Set([
-      MC_TOOLS.VIEW,
-      MC_TOOLS.SEARCH_CONTENT,
-      MC_TOOLS.FIND_FILES,
-      MC_TOOLS.FILE_STAT,
-      MC_TOOLS.LSP_INSPECT
-    ]);
-    const tools = {};
-    for (const [name, tool] of Object.entries(workspaceTools)) {
-      if (!allowedTools.has(name)) continue;
-      const { needsApprovalFn: _needsApprovalFn, ...toolWithoutApproval } = tool;
-      tools[name] = { ...toolWithoutApproval, requireApproval: false };
+  /**
+   * Update the judge model / max-runs defaults. Persists into the active record
+   * (so the override is remembered in thread state) when a goal is set.
+   */
+  async updateJudgeDefaults(state, judgeModelId, maxTurns) {
+    if (!this.record) return null;
+    const threadId = state.harness.getCurrentThreadId();
+    const agent = this.getAgent(state);
+    if (agent && threadId) {
+      const updated = await agent.updateObjectiveOptions({
+        threadId,
+        ...judgeModelId ? { judgeModelId } : {},
+        maxRuns: maxTurns
+      });
+      if (updated) this.record = { ...updated, id: this.record.id };
+    } else {
+      this.record = {
+        ...this.record,
+        ...judgeModelId ? { judgeModelId } : {},
+        maxRuns: maxTurns,
+        updatedAt: Date.now()
+      };
     }
-    return tools;
+    return this.getGoal();
   }
-  async consumeJudgeStream(stream, onActivity) {
-    if (!stream.fullStream) {
-      await stream.consumeStream();
-      return;
+  pause() {
+    if (this.record && this.record.status === "active") {
+      this.stopActiveTimer();
+      this.record = { ...this.record, status: "paused", updatedAt: Date.now() };
     }
-    for await (const chunk of stream.fullStream) {
-      if (chunk?.type === "tool-call") {
-        const toolName = getToolName(chunk);
-        if (!toolName) continue;
-        const line = formatJudgeActivity(toolName, parseToolInput(chunk));
-        if (line) onActivity?.(line);
-      }
+    return this.getGoal();
+  }
+  resume() {
+    if (this.record && this.record.status === "paused") {
+      this.record = { ...this.record, status: "active", updatedAt: Date.now() };
+      this.startActiveTimer();
     }
+    return this.getGoal();
   }
-  async getJudgeMemory(state) {
-    const harness = state.harness;
-    const memory = await harness.getResolvedMemory?.() ?? null;
-    if (!memory || !this.goal) return memory;
-    const threadId = this.getJudgeThreadId(state);
-    const existing = await memory.getThreadById({ threadId });
-    if (!existing) {
-      await memory.createThread({
-        threadId,
-        resourceId: state.harness.getResourceId(),
-        title: `Goal judge: ${this.goal.objective.slice(0, 80)}`,
-        metadata: {
-          forkedSubagent: true,
-          goalJudge: true,
-          parentThreadId: state.harness.getCurrentThreadId(),
-          goalId: this.goal.id
-        }
-      });
+  markDone() {
+    if (this.record) {
+      this.stopActiveTimer();
+      this.record = { ...this.record, status: "done", updatedAt: Date.now() };
     }
-    return memory;
   }
-  getJudgeThreadId(state) {
-    return `${state.harness.getCurrentThreadId() ?? "no-thread"}-${this.goal.id}`;
+  clear() {
+    this.record = null;
+    this.activeStartedAt = null;
+    this.activeDurationMs = 0;
+    this.persistGoalOnNextThreadCreate = false;
+  }
+  /**
+   * Sync the latest objective record from ThreadState into the in-memory view.
+   * Called from the `goal` stream-chunk handler after each evaluation.
+   */
+  applyEvaluation(update) {
+    if (!this.record) return null;
+    this.record = { ...this.record, runsUsed: update.runsUsed, status: update.status, updatedAt: Date.now() };
+    if (update.status !== "active") this.stopActiveTimer();
+    return this.getGoal();
   }
-  createJudgeAgent(memory, tools) {
-    if (!this.goal?.judgeModelId) return null;
+  // ---------------------------------------------------------------------------
+  // Persistence
+  // ---------------------------------------------------------------------------
+  /**
+   * Persist the active objective to ThreadState via the agent. The objective
+   * record is the source of truth; the legacy thread-metadata key is cleared so
+   * stale state from older sessions does not resurface.
+   */
+  async saveToThread(state) {
+    const threadId = state.harness.getCurrentThreadId();
+    const agent = this.getAgent(state);
     try {
-      const model = resolveModel(this.goal.judgeModelId);
-      return new Agent({
-        id: "goal-judge",
-        name: "Goal Judge",
-        instructions: JUDGE_SYSTEM_PROMPT,
-        model,
-        tools,
-        ...memory ? { memory } : {},
-        inputProcessors: [new ProviderHistoryCompat()],
-        errorProcessors: [new StreamErrorRetryProcessor(), new PrefillErrorHandler(), new ProviderHistoryCompat()]
-      });
+      if (agent && threadId) {
+        if (this.record) {
+          const updated = await agent.updateObjectiveOptions({
+            threadId,
+            status: this.record.status,
+            ...this.record.judgeModelId ? { judgeModelId: this.record.judgeModelId } : {},
+            ...this.record.maxRuns !== void 0 ? { maxRuns: this.record.maxRuns } : {}
+          });
+          if (!updated) {
+            const desiredStatus = this.record.status;
+            await agent.setObjective(this.record.objective, {
+              threadId,
+              resourceId: state.harness.getResourceId(),
+              ...this.record.judgeModelId ? { judgeModelId: this.record.judgeModelId } : {},
+              ...this.record.maxRuns !== void 0 ? { maxRuns: this.record.maxRuns } : {}
+            });
+            if (desiredStatus !== "active") {
+              await agent.updateObjectiveOptions({ threadId, status: desiredStatus });
+            }
+          }
+        } else {
+          await agent.clearObjective({ threadId });
+        }
+      }
+      await state.harness.setThreadSetting({ key: THREAD_GOAL_KEY, value: void 0 });
     } catch {
-      return null;
     }
   }
-  buildContinuationPrompt(judgeReason) {
-    const turn = this.goal.turnsUsed;
-    const max = this.goal.maxTurns;
-    return `[Goal attempt ${turn}/${max}] The goal is not yet complete. Judge feedback: ${judgeReason}
-
-Continue working toward the goal: ${this.goal.objective}`;
+  /**
+   * Load the objective from ThreadState (called on thread switch). Falls back to
+   * the legacy thread-metadata goal for threads created before this migration.
+   */
+  async loadFromThread(state) {
+    this.persistGoalOnNextThreadCreate = false;
+    this.activeStartedAt = null;
+    this.activeDurationMs = 0;
+    const threadId = state.harness.getCurrentThreadId();
+    const agent = this.getAgent(state);
+    if (agent && threadId) {
+      try {
+        const record = await agent.getObjective({ threadId });
+        if (record) {
+          this.record = { ...record, id: randomUUID() };
+          return;
+        }
+      } catch {
+      }
+    }
+    this.record = null;
   }
-};
-function truncateForJudge(value) {
-  return value.length > 4e3 ? value.slice(0, 4e3) + "\n...[truncated]" : value;
-}
-function getToolName(chunk) {
-  const toolName = chunk.payload?.toolName ?? chunk.toolName;
-  return typeof toolName === "string" ? toolName : null;
-}
-function parseToolInput(chunk) {
-  const input = chunk.payload?.args ?? chunk.input ?? chunk.args ?? chunk.toolInput;
-  if (!input) return {};
-  if (typeof input === "string") {
+  /**
+   * Legacy entry point retained for thread-switch call sites that only have the
+   * thread metadata available. Hydrates from a previously-persisted GoalState.
+   */
+  loadFromThreadMetadata(metadata) {
+    const saved = metadata?.[THREAD_GOAL_KEY];
+    this.persistGoalOnNextThreadCreate = false;
+    this.activeStartedAt = null;
+    this.activeDurationMs = 0;
+    if (saved && saved.objective && saved.status) {
+      this.record = {
+        objective: saved.objective,
+        status: saved.status,
+        runsUsed: saved.turnsUsed ?? 0,
+        maxRuns: saved.maxTurns ?? DEFAULT_MAX_TURNS,
+        judgeModelId: saved.judgeModelId ?? "",
+        startedAt: saved.startedAt ? Date.parse(saved.startedAt) || Date.now() : Date.now(),
+        updatedAt: Date.now(),
+        id: saved.id ?? randomUUID()
+      };
+      this.activeDurationMs = saved.activeDurationMs ?? 0;
+    } else {
+      this.record = null;
+    }
+  }
+  // ---------------------------------------------------------------------------
+  // Private
+  // ---------------------------------------------------------------------------
+  getAgent(state) {
     try {
-      return JSON.parse(input);
+      return state.harness.getCurrentAgent();
     } catch {
-      return { input };
+      return void 0;
     }
   }
-  return input;
-}
-function formatJudgeActivity(toolName, input) {
-  if (toolName === MC_TOOLS.VIEW) return `read ${formatActivityValue(input.path)}`;
-  if (toolName === MC_TOOLS.SEARCH_CONTENT) return `search ${formatQuotedActivityValue(input.pattern)}`;
-  if (toolName === MC_TOOLS.FIND_FILES) return `find files ${formatActivityValue(input.pattern ?? input.path)}`;
-  if (toolName === MC_TOOLS.FILE_STAT) return `stat ${formatActivityValue(input.path)}`;
-  if (toolName === MC_TOOLS.LSP_INSPECT) return `inspect ${formatActivityValue(input.path)}`;
-  return null;
-}
-function formatActivityValue(value) {
-  if (typeof value === "string" && value.length > 0) {
-    return value.length > 80 ? value.slice(0, 77) + "..." : value;
+  /** Resolve effective judge model + max runs (record value → settings default). */
+  effectiveSettings(record) {
+    const settings = loadSettings();
+    return {
+      judgeModelId: record.judgeModelId ?? settings.models.goalJudgeModel ?? "",
+      maxTurns: record.maxRuns ?? settings.models.goalMaxTurns ?? DEFAULT_MAX_TURNS
+    };
   }
-  return "workspace";
-}
-function formatQuotedActivityValue(value) {
-  const formatted = formatActivityValue(value);
-  return formatted === "workspace" ? formatted : JSON.stringify(formatted);
-}
-function formatError(error) {
-  return error instanceof Error ? error.message : String(error);
-}
-var JUDGE_FAILURE_PATTERNS = [
-  "no structured decision",
-  "could not be initialized",
-  "could not evaluate",
-  "was interrupted"
-];
-function isJudgeFailureReason(reason) {
-  const lower = reason.toLowerCase();
-  return JUDGE_FAILURE_PATTERNS.some((p) => lower.includes(p));
-}
+  localRecord(objective, judgeModelId, maxTurns, now, id) {
+    return {
+      objective,
+      status: "active",
+      runsUsed: 0,
+      maxRuns: maxTurns,
+      ...judgeModelId ? { judgeModelId } : {},
+      startedAt: now,
+      updatedAt: now,
+      id
+    };
+  }
+};
 function parseSizeValue(value, total) {
   if (typeof value === "number") return value;
   const match = value?.match(/^(\d+(?:\.\d+)?)%$/);
@@ -2647,14 +2169,8 @@ async function handleGoalCommand(ctx, args) {
       ctx.showInfo("Goal is already done. Use /goal <text> to set a new goal.");
       return;
     }
-    const wasJudgeFailure = goal.lastPauseWasJudgeFailure;
     goalManager.resume();
     await goalManager.saveToThread(state);
-    if (wasJudgeFailure) {
-      ctx.showInfo(`Goal resumed: "${goal.objective}" \u2014 retriggering judge evaluation...`);
-      triggerGoalJudge(ctx, { requireAssistantMessage: true });
-      return;
-    }
     ctx.showInfo(
       `Goal resumed: "${goal.objective}" \u2014 ${goal.turnsUsed}/${goal.maxTurns} turns used. Sending continuation...`
     );
@@ -2676,6 +2192,10 @@ async function handleGoalCommand(ctx, args) {
     ctx.showInfo("Goal cleared.");
     return;
   }
+  if (subCommand === "judge") {
+    await handleJudgeCommand(ctx);
+    return;
+  }
   const objective = args.join(" ");
   await startGoalWithDefaults(ctx, objective);
 }
@@ -2746,9 +2266,12 @@ async function showGoalActionModal(ctx) {
 async function handleJudgeCommand(ctx) {
   const defaults = await promptForJudgeDefaults(ctx, "Judge settings unchanged.");
   if (!defaults) return;
-  const activeGoal = ctx.state.goalManager.updateJudgeDefaults(defaults.judgeModelId, defaults.maxTurns);
+  const activeGoal = await ctx.state.goalManager.updateJudgeDefaults(
+    ctx.state,
+    defaults.judgeModelId,
+    defaults.maxTurns
+  );
   if (activeGoal) {
-    await ctx.state.goalManager.saveToThread(ctx.state);
     ctx.showInfo(
       `Judge defaults set: ${defaults.judgeModelId}, ${defaults.maxTurns} max attempts. Current goal updated.`
     );
@@ -2825,105 +2348,6 @@ async function promptForJudgeDefaults(ctx, cancelMessage) {
     selector.focused = true;
   });
 }
-function triggerGoalJudge(ctx, options = {}) {
-  const { state } = ctx;
-  const goal = state.goalManager.getGoal();
-  if (!goal) return;
-  const evaluatedGoalId = goal.id;
-  if (!state.gradientAnimator) {
-    state.gradientAnimator = new GradientAnimator(() => {
-      ctx.updateStatusLine();
-    });
-  }
-  const abortController = new AbortController();
-  const judgeComponent = new JudgeDisplayComponent(null, goal.turnsUsed, goal.maxTurns);
-  const activeGoalJudge = { modelId: goal.judgeModelId, abortController, component: judgeComponent };
-  state.activeGoalJudge = activeGoalJudge;
-  state.chatContainer.addChild(judgeComponent);
-  state.gradientAnimator.start();
-  ctx.updateStatusLine();
-  state.ui.requestRender();
-  state.goalManager.evaluateAfterTurn(state, {
-    abortSignal: abortController.signal,
-    requireAssistantMessage: options.requireAssistantMessage,
-    onActivity: (line) => {
-      if (state.activeGoalJudge === activeGoalJudge) {
-        judgeComponent.addActivity(line);
-        state.ui.requestRender();
-      }
-    }
-  }).then(async ({ continuation, judgeResult }) => {
-    if (state.activeGoalJudge !== activeGoalJudge) return;
-    const currentGoal = state.goalManager.getGoal();
-    if (!currentGoal || currentGoal.id !== evaluatedGoalId) return;
-    if (judgeResult) {
-      judgeComponent.setResult(judgeResult, currentGoal.turnsUsed, currentGoal.maxTurns);
-      state.ui.requestRender();
-    }
-    if (abortController.signal.aborted) {
-      state.userInitiatedAbort = false;
-      return;
-    }
-    if (continuation) {
-      if (currentGoal.status !== "active") return;
-      try {
-        await state.harness.sendSignal({
-          type: "system-reminder",
-          contents: continuation,
-          attributes: { type: "goal-judge" },
-          metadata: {
-            goalId: currentGoal.id,
-            turnsUsed: currentGoal.turnsUsed,
-            maxTurns: currentGoal.maxTurns,
-            judgeModelId: currentGoal.judgeModelId
-          }
-        }).accepted;
-      } catch (error) {
-        state.goalManager.pause();
-        await state.goalManager.saveToThread(state);
-        ctx.showError(`Failed to send goal continuation: ${error instanceof Error ? error.message : String(error)}`);
-      }
-    } else {
-      if (judgeResult) {
-        const harness = state.harness;
-        try {
-          await harness.saveSystemReminderMessage?.({
-            reminderType: "goal-judge",
-            message: `${judgeResult.decision} (${currentGoal.turnsUsed}/${currentGoal.maxTurns})
-${judgeResult.reason}`
-          });
-        } catch (error) {
-          ctx.showError(
-            `Failed to persist goal judge result: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
-      }
-      if (currentGoal.status === "paused") {
-        ctx.showInfo(
-          `Goal paused (attempt ${currentGoal.turnsUsed}/${currentGoal.maxTurns}). Use /goal resume to continue.`
-        );
-      }
-      if (judgeResult?.decision === "done" && currentGoal.id === state.planStartedGoalId) {
-        const goalId = state.planStartedGoalId;
-        state.planStartedGoalId = void 0;
-        try {
-          await state.harness.switchMode({ modeId: "plan" });
-        } catch (error) {
-          ctx.showError(`Failed to switch to Plan mode: ${error instanceof Error ? error.message : String(error)}`);
-          state.planStartedGoalId = goalId;
-        }
-      }
-    }
-  }).catch(() => {
-  }).finally(() => {
-    if (state.activeGoalJudge === activeGoalJudge) {
-      state.activeGoalJudge = void 0;
-    }
-    state.gradientAnimator?.fadeOut();
-    ctx.updateStatusLine();
-    state.ui.requestRender();
-  });
-}
 async function startGoal(ctx, objective, judgeModelId, maxTurns, options = {}) {
   const { state } = ctx;
   const goalManager = state.goalManager;
@@ -2932,11 +2356,14 @@ async function startGoal(ctx, objective, judgeModelId, maxTurns, options = {}) {
     state.pendingNewThread = false;
   }
   const shouldPersistToCreatedThread = !state.harness.getCurrentThreadId();
-  const goal = goalManager.setGoal(objective, judgeModelId, maxTurns);
+  const goal = await goalManager.setGoal(state, objective, judgeModelId, maxTurns);
+  if (!goal) {
+    ctx.showError("Failed to set goal.");
+    return;
+  }
   state.planStartedGoalId = void 0;
   if (options.trigger === "none") {
-    goal.activeStartedAt = void 0;
-    goal.activeDurationMs = 0;
+    goalManager.resetActiveTimer();
   }
   if (shouldPersistToCreatedThread) {
     goalManager.persistOnNextThreadCreate();
@@ -3000,7 +2427,7 @@ function getCommands(modes) {
     { key: "/observability", description: "Configure cloud observability" },
     { key: "/github", description: "Subscribe/sync GitHub PR signals" },
     { key: "/goal", description: "Set/manage persistent goal (Ralph loop)" },
-    { key: "/judge", description: "Set goal judge defaults" }
+    { key: "/goal judge", description: "Set the goal judge model and max attempts" }
   ];
   if (modes > 1) {
     cmds.push({ key: "/mode", description: "Switch or list modes" });
@@ -3563,7 +2990,7 @@ var McpSelectorComponent = class extends Box {
     this.startPollingIfNeeded();
   }
   buildUI() {
-    const titleText = chalk14.bgHex("#16c858").white.bold(" Manage MCP servers ");
+    const titleText = chalk12.bgHex("#16c858").white.bold(" Manage MCP servers ");
     this.addChild(new Text(titleText, 0, 0));
     this.addChild(new Spacer(1));
     this.listContainer = new Container();
@@ -4102,20 +3529,30 @@ function reasonToMessage(reason) {
 }
 
 // src/tui/display.ts
+var InfoMessageComponent = class extends Container {
+  constructor(lines) {
+    super();
+    for (const line of lines) {
+      this.addChild(line);
+    }
+  }
+  getChatSpacingKind() {
+    return "system";
+  }
+};
 function showError(state, message) {
-  state.chatContainer.addChild(new Spacer(1));
-  state.chatContainer.addChild(new Text(theme.fg("error", `Error: ${message}`), 1, 0));
+  const component = new InfoMessageComponent([new Text(theme.fg("error", `Error: ${message}`), 1, 0)]);
+  insertChatComponentWithBoundarySpacing(state.chatContainer, component);
   state.ui.requestRender();
 }
 function showInfo(state, message) {
-  state.chatContainer.addChild(new Spacer(1));
-  state.chatContainer.addChild(new Text(theme.fg("muted", message), 1, 0));
+  const component = new InfoMessageComponent([new Text(theme.fg("muted", message), 1, 0)]);
+  insertChatComponentWithBoundarySpacing(state.chatContainer, component);
   state.ui.requestRender();
 }
 function showFormattedError(state, event) {
   const error = "error" in event ? event.error : event;
   const parsed = parseError(error);
-  state.chatContainer.addChild(new Spacer(1));
   let errorText = `Error: ${parsed.message}`;
   if (parsed.detail && parsed.detail !== parsed.message) {
     errorText += theme.fg("muted", ` (${parsed.detail})`);
@@ -4129,11 +3566,13 @@ function showFormattedError(state, event) {
     const seconds = Math.ceil(retryDelay / 1e3);
     errorText += theme.fg("muted", ` (retry in ${seconds}s)`);
   }
-  state.chatContainer.addChild(new Text(theme.fg("error", errorText), 1, 0));
+  const lines = [new Text(theme.fg("error", errorText), 1, 0)];
   const hint = getErrorHint(parsed.type);
   if (hint) {
-    state.chatContainer.addChild(new Text(theme.fg("muted", `  Hint: ${hint}`), 1, 0));
+    lines.push(new Text(theme.fg("muted", `  Hint: ${hint}`), 1, 0));
   }
+  const component = new InfoMessageComponent(lines);
+  insertChatComponentWithBoundarySpacing(state.chatContainer, component);
   state.ui.requestRender();
 }
 function getErrorHint(errorType) {
@@ -4294,7 +3733,8 @@ function showTextStatus(ctx) {
 
 // src/tui/commands/mode.ts
 function applyCurrentModeColorToRenderedTools(ctx) {
-  const modeColor = ctx.harness.getCurrentMode?.()?.color;
+  const color = ctx.harness.getCurrentMode?.()?.metadata?.color;
+  const modeColor = typeof color === "string" ? color : void 0;
   for (const tool of ctx.state.allToolComponents) {
     tool.setCompactToolModeColor?.(modeColor);
   }
@@ -4315,7 +3755,7 @@ async function handleModeCommand(ctx, args) {
     }
   } else {
     const currentMode = ctx.harness.getCurrentMode();
-    const modeList = modes.map((m) => `  ${m.id === currentMode?.id ? "* " : "  "}${m.id}${m.name ? ` - ${m.name}` : ""}`).join("\n");
+    const modeList = modes.map((m) => `  ${m.id === currentMode?.id ? "* " : "  "}${m.name}${m.description ? ` - ${m.description}` : ""}`).join("\n");
     ctx.showInfo(`Modes:
 ${modeList}`);
   }
@@ -4342,10 +3782,10 @@ var SlashCommandComponent = class extends Container {
   }
   rebuild() {
     this.clear();
-    const border = (char) => chalk14.bold.hex(getBorderColor())(char);
+    const border = (char) => chalk12.bold.hex(getBorderColor())(char);
     const termWidth = getTermWidth();
     const maxLineWidth = termWidth - 6 - BOX_INDENT * 2;
-    const heading = chalk14.hex(mastra.specialGray)(`/${this.commandName}`);
+    const heading = chalk12.hex(mastra.specialGray)(`/${this.commandName}`);
     if (this.contentLines.length === 0) {
       this.addChild(new Text(`${border("\u2570\u2500\u2500")} ${heading}`, BOX_INDENT, 0));
       return;
@@ -4369,17 +3809,19 @@ var SlashCommandComponent = class extends Container {
     const truncated = !this.expanded && wrappedLines.length > MAX_COLLAPSED_LINES + 1;
     const displayLines = truncated ? wrappedLines.slice(0, MAX_COLLAPSED_LINES) : wrappedLines;
     const contentText = displayLines.map(
-      (line) => `${border("\u2502")} ${chalk14.hex(mastra.mainGray)(line.length > maxLineWidth ? line.slice(0, maxLineWidth - 1) + "\u2026" : line)}`
+      (line) => `${border("\u2502")} ${chalk12.hex(mastra.mainGray)(line.length > maxLineWidth ? line.slice(0, maxLineWidth - 1) + "\u2026" : line)}`
     ).join("\n");
     this.addChild(new Text(contentText, BOX_INDENT, 0));
     if (truncated) {
-      const moreText = chalk14.hex(mastra.darkGray)(
+      const moreText = chalk12.hex(mastra.darkGray)(
         `... ${wrappedLines.length - MAX_COLLAPSED_LINES} more lines (ctrl+e to expand)`
       );
       this.addChild(new Text(`${border("\u2502")} ${moreText}`, BOX_INDENT, 0));
     }
     this.addChild(new Text(`${border("\u2570\u2500\u2500")} ${heading}`, BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
+  }
+  getChatSpacingKind() {
+    return "other";
   }
 };
 var _compId = 0;
@@ -4472,7 +3914,7 @@ var AssistantMessageComponent = class extends Container {
 var NotificationSummaryComponent = class extends Container {
   constructor(options) {
     super();
-    const title = chalk14.hex(mastra.orange).bold(`Notification summary: ${options.pending} pending`);
+    const title = chalk12.hex(mastra.orange).bold(`Notification summary: ${options.pending} pending`);
     this.addChild(new Text(title, BOX_INDENT, 0));
     const sourceSummary = Object.entries(options.bySource).sort(([a], [b]) => a.localeCompare(b)).map(([source, count]) => `${source}: ${count}`).join(", ");
     const message = sourceSummary || options.message.trim();
@@ -4482,7 +3924,6 @@ var NotificationSummaryComponent = class extends Container {
     this.addChild(
       new Text(theme.fg("dim", "Use notification_inbox to inspect pending notifications."), BOX_INDENT + 2, 0)
     );
-    this.addChild(new Spacer(1));
   }
   getChatSpacingKind() {
     return "system";
@@ -4552,14 +3993,14 @@ var NotificationComponent = class extends Container {
     const messageLines = message ? wrapText(message, maxContentWidth) : [];
     const allLines = [...titleLines, ...detailLines, ...messageLines];
     const contentWidth = Math.max(...allLines.map((line) => visibleWidth(line)), 1);
-    const borderColor = chalk14.hex(mastra.blue);
+    const borderColor = chalk12.hex(mastra.blue);
     const top = `\u256D${"\u2500".repeat(contentWidth + 2)}\u256E`;
     const bottom = `\u2570${"\u2500".repeat(contentWidth + 2)}\u256F`;
     this.addChild(new Text(borderColor(top), BOX_INDENT, 0));
     for (const line of titleLines) {
       this.addChild(
         new Text(
-          `${borderColor("\u2502")} ${chalk14.hex(priorityColor(options.priority)).bold(padLine(line, contentWidth))} ${borderColor("\u2502")}`,
+          `${borderColor("\u2502")} ${chalk12.hex(priorityColor(options.priority)).bold(padLine(line, contentWidth))} ${borderColor("\u2502")}`,
           BOX_INDENT,
           0
         )
@@ -4578,7 +4019,6 @@ var NotificationComponent = class extends Container {
       this.addChild(new Text(`${borderColor("\u2502")} ${padLine(line, contentWidth)} ${borderColor("\u2502")}`, BOX_INDENT, 0));
     }
     this.addChild(new Text(borderColor(bottom), BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
   }
   getChatSpacingKind() {
     return "system";
@@ -4606,7 +4046,6 @@ var OMMarkerComponent = class extends Container {
     super();
     this.textChild = new Text(formatMarker(data), BOX_INDENT, 0);
     this.addChild(this.textChild);
-    this.addChild(new Spacer(1));
   }
   /**
    * Update the marker in-place (e.g., from start → end).
@@ -4614,6 +4053,9 @@ var OMMarkerComponent = class extends Container {
   update(data) {
     this.textChild.setText(formatMarker(data));
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 function formatMarker(data) {
   const isReflection = "operationType" in data && data.operationType === "reflection";
@@ -4758,7 +4200,7 @@ var OMOutputComponent = class extends Container {
     this.clear();
     const isReflection = this.data.type === "reflection";
     const color = isReflection ? getReflectorColor() : getObserverColor();
-    const border = (char) => chalk14.bold.hex(color)(char);
+    const border = (char) => chalk12.bold.hex(color)(char);
     const termWidth = getTermWidth();
     const maxLineWidth = termWidth - 6 - BOX_INDENT * 2;
     const originalLines = this.data.observations.split("\n");
@@ -4790,22 +4232,22 @@ var OMOutputComponent = class extends Container {
       truncated = hiddenGroups > 0;
       if (truncated) {
         for (const line of headLines) {
-          borderedLines.push(border("\u2502") + " " + chalk14.hex(mastra.specialGray)(line));
+          borderedLines.push(border("\u2502") + " " + chalk12.hex(mastra.specialGray)(line));
         }
         borderedLines.push(
-          border("\u2502") + " " + chalk14.hex(mastra.mainGray)(`... ${originalLineCount} lines total (ctrl+e to expand)`)
+          border("\u2502") + " " + chalk12.hex(mastra.mainGray)(`... ${originalLineCount} lines total (ctrl+e to expand)`)
         );
         for (const line of tailLines) {
-          borderedLines.push(border("\u2502") + " " + chalk14.hex(mastra.specialGray)(line));
+          borderedLines.push(border("\u2502") + " " + chalk12.hex(mastra.specialGray)(line));
         }
       } else {
         for (const line of wrappedLines) {
-          borderedLines.push(border("\u2502") + " " + chalk14.hex(mastra.specialGray)(line));
+          borderedLines.push(border("\u2502") + " " + chalk12.hex(mastra.specialGray)(line));
         }
       }
     } else {
       for (const line of wrappedLines) {
-        borderedLines.push(border("\u2502") + " " + chalk14.hex(mastra.specialGray)(line));
+        borderedLines.push(border("\u2502") + " " + chalk12.hex(mastra.specialGray)(line));
       }
     }
     const displayOutput = borderedLines.join("\n");
@@ -4813,15 +4255,14 @@ var OMOutputComponent = class extends Container {
       this.addChild(new Text(displayOutput, BOX_INDENT, 0));
     }
     if (this.data.currentTask && (this.expanded || !truncated)) {
-      const taskLine = border("\u2502") + " " + chalk14.hex(color).bold("Current task: ") + chalk14.hex(mastra.specialGray)(this.data.currentTask);
+      const taskLine = border("\u2502") + " " + chalk12.hex(color).bold("Current task: ") + chalk12.hex(mastra.specialGray)(this.data.currentTask);
       this.addChild(new Text(truncateAnsi(taskLine, termWidth - 2 - BOX_INDENT * 2), BOX_INDENT, 0));
     }
     if (this.data.suggestedResponse && (this.expanded || !truncated)) {
-      const sugLine = border("\u2502") + " " + chalk14.hex(color).bold("Suggested response: ") + chalk14.hex(mastra.specialGray)(this.data.suggestedResponse);
+      const sugLine = border("\u2502") + " " + chalk12.hex(color).bold("Suggested response: ") + chalk12.hex(mastra.specialGray)(this.data.suggestedResponse);
       this.addChild(new Text(truncateAnsi(sugLine, termWidth - 2 - BOX_INDENT * 2), BOX_INDENT, 0));
     }
     this.addChild(new Text(`${border("\u2570\u2500\u2500")} ${footerText}`, BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
   }
   buildFooterText(color) {
     const isReflection = this.data.type === "reflection";
@@ -4832,16 +4273,19 @@ var OMOutputComponent = class extends Container {
       const ratio = (this.data.tokensObserved ?? 0) > 0 && (this.data.compressedTokens ?? this.data.observationTokens ?? 0) > 0 ? `${Math.round((this.data.tokensObserved ?? 0) / (this.data.compressedTokens ?? this.data.observationTokens ?? 1))}x` : "";
       const durationStr = this.data.durationMs ? ` in ${(this.data.durationMs / 1e3).toFixed(1)}s` : "";
       const ratioStr = ratio ? ` (${ratio} compression)` : "";
-      return `${emoji} ${chalk14.hex(color)(`Reflected: ${observed} \u2192 ${compressed} tokens${ratioStr}${durationStr}`)} ${chalk14.hex(mastra.green)("\u2713")}`;
+      return `${emoji} ${chalk12.hex(color)(`Reflected: ${observed} \u2192 ${compressed} tokens${ratioStr}${durationStr}`)} ${chalk12.hex(mastra.green)("\u2713")}`;
     } else {
       const observed = formatTokens2(this.data.tokensObserved ?? 0);
       const compressed = formatTokens2(this.data.observationTokens ?? 0);
       const ratio = (this.data.tokensObserved ?? 0) > 0 && (this.data.observationTokens ?? 0) > 0 ? `${Math.round((this.data.tokensObserved ?? 0) / (this.data.observationTokens ?? 1))}x` : "";
       const durationStr = this.data.durationMs ? ` in ${(this.data.durationMs / 1e3).toFixed(1)}s` : "";
       const ratioStr = ratio ? ` (${ratio} compression)` : "";
-      return `${emoji} ${chalk14.hex(color)(`Observed: ${observed} \u2192 ${compressed} tokens${ratioStr}${durationStr}`)} ${chalk14.hex(mastra.green)("\u2713")}`;
+      return `${emoji} ${chalk12.hex(color)(`Observed: ${observed} \u2192 ${compressed} tokens${ratioStr}${durationStr}`)} ${chalk12.hex(mastra.green)("\u2713")}`;
     }
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 var PlanContentBox = class {
   constructor(plan) {
@@ -4857,7 +4301,7 @@ var PlanContentBox = class {
       color: (text) => theme.fg("text", text)
     });
     const rendered = markdown.render(innerWidth).flatMap((line) => line.length > 0 ? [line] : [""]);
-    const border = (text) => chalk14.hex(mastra.purple)(text);
+    const border = (text) => chalk12.hex(mastra.purple)(text);
     const top = `${border("\u256D")}${border("\u2500".repeat(innerWidth + 2))}${border("\u256E")}`;
     const bottom = `${border("\u2570")}${border("\u2500".repeat(innerWidth + 2))}${border("\u256F")}`;
     const body = rendered.map((line) => {
@@ -5113,11 +4557,10 @@ var PlanResultComponent = class extends Container {
 var ReactiveSignalComponent = class extends Container {
   constructor(options) {
     super();
-    this.addChild(new Text(chalk14.hex(mastra.orange).bold(`Signal: ${options.tagName}`), BOX_INDENT, 0));
+    this.addChild(new Text(chalk12.hex(mastra.orange).bold(`Signal: ${options.tagName}`), BOX_INDENT, 0));
     if (options.message?.trim()) {
       this.addChild(new Text(theme.fg("dim", options.message.trim()), BOX_INDENT + 2, 0));
     }
-    this.addChild(new Spacer(1));
   }
   getChatSpacingKind() {
     return "system";
@@ -5126,14 +4569,13 @@ var ReactiveSignalComponent = class extends Container {
 var StateSignalComponent = class extends Container {
   constructor(options) {
     super();
-    const title = chalk14.hex(mastra.blue).bold(`State ${options.mode}: ${options.stateId}`);
+    const title = chalk12.hex(mastra.blue).bold(`State ${options.mode}: ${options.stateId}`);
     this.addChild(new Text(title, BOX_INDENT, 0));
     const message = options.message?.trim();
     if (message) {
       const preview = message.length > 180 ? `${message.slice(0, 177)}...` : message;
       this.addChild(new Text(theme.fg("dim", preview), BOX_INDENT + 2, 0));
     }
-    this.addChild(new Spacer(1));
   }
   getChatSpacingKind() {
     return "system";
@@ -5295,7 +4737,6 @@ var SubagentExecutionComponent = class extends Container {
       }
     }
     this.addChild(new Text(`${border("\u2570\u2500\u2500")} ${footerText}`, BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
     this.invalidate();
     this.ui.requestRender();
   }
@@ -5384,12 +4825,12 @@ var SystemReminderComponent = class extends Container {
       return;
     }
     const accent = getReminderAccent(this.reminderType);
-    const border = (char) => accent ? chalk14.hex(accent).bold(char) : theme.bold(theme.fg("toolTitle", char));
+    const border = (char) => accent ? chalk12.hex(accent).bold(char) : theme.bold(theme.fg("toolTitle", char));
     const titleText = getReminderTitle(this.reminderType, this.path, {
       goalMaxTurns: this.goalMaxTurns,
       judgeModelId: this.judgeModelId
     });
-    const title = accent ? chalk14.hex(accent).bold(titleText) : theme.bold(theme.fg("toolTitle", titleText));
+    const title = accent ? chalk12.hex(accent).bold(titleText) : theme.bold(theme.fg("toolTitle", titleText));
     const metadataColor = (text) => theme.fg("dim", text);
     const bodyColor = (text) => theme.fg("text", text);
     const hintColor = (text) => theme.fg("dim", text);
@@ -5419,12 +4860,11 @@ var SystemReminderComponent = class extends Container {
       this.addChild(new Text(renderRow(hint, innerWidth, border), BOX_INDENT, 0));
     }
     this.addChild(new Text(`${border("\u2570")}${border(horizontal)}${border("\u256F")}`, BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
   }
 };
 function renderRow(text, width, border) {
   const content = padLine2(text, width);
-  const rightPadding = hasWideGlyph(stripAnsi2(text)) ? " " : "";
+  const rightPadding = hasWideGlyph(stripAnsi(text)) ? " " : "";
   return `${border("\u2502")} ${content}${rightPadding}${border("\u2502")}`;
 }
 function splitMessageLines(message) {
@@ -5493,7 +4933,7 @@ function wrapLines(lines, maxLineWidth) {
   return wrappedLines;
 }
 function padLine2(text, width) {
-  const visibleLength = stripAnsi2(text).length;
+  const visibleLength = stripAnsi(text).length;
   if (visibleLength === width) {
     return text;
   }
@@ -5503,17 +4943,19 @@ function padLine2(text, width) {
   return text + " ".repeat(width - visibleLength);
 }
 function truncateLine(text, width) {
-  const plain = stripAnsi2(text);
+  const plain = stripAnsi(text);
   return plain.length <= width ? text : plain.slice(0, Math.max(0, width - 1)) + "\u2026";
 }
 var TemporalGapComponent = class extends Container {
   constructor(options) {
     super();
     this.addChild(new Text(theme.fg("dim", `  \u23F3 ${resolveGapText(options)}`), BOX_INDENT, 0));
-    this.addChild(new Spacer(1));
   }
   setExpanded(_expanded) {
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 function resolveGapText(options) {
   const gapText = options.gapText?.trim();
@@ -5766,7 +5208,9 @@ var ErrorDisplayComponent = class extends Container {
     }
     const borderBottom = new Text(theme.fg("error", "\u2570" + "\u2500".repeat(59) + "\u256F"), 0, 0);
     box.addChild(borderBottom);
-    this.addChild(new Spacer(1));
+  }
+  getChatSpacingKind() {
+    return "other";
   }
   createCodeContext(context, errorLine) {
     const container = new Container();
@@ -5940,22 +5384,22 @@ var ToolValidationErrorComponent = class extends Container {
 // src/tui/components/tool-execution-enhanced.ts
 var CODE_HIGHLIGHT_THEME = {
   default: (text) => theme.fg("toolArgs", text),
-  keyword: chalk14.hex("#c084fc"),
-  built_in: chalk14.hex("#93c5fd"),
-  type: chalk14.hex("#93c5fd"),
-  literal: chalk14.hex("#fca5a5"),
-  number: chalk14.hex("#fbbf24"),
-  string: chalk14.hex("#86efac"),
-  regexp: chalk14.hex("#fca5a5"),
-  title: chalk14.hex("#93c5fd"),
-  function: chalk14.hex("#93c5fd"),
-  params: chalk14.hex("#d4d4d8"),
-  comment: chalk14.hex("#71717a"),
-  meta: chalk14.hex("#a1a1aa"),
-  attr: chalk14.hex("#fbbf24"),
-  variable: chalk14.hex("#d4d4d8"),
-  tag: chalk14.hex("#c084fc"),
-  name: chalk14.hex("#c084fc")
+  keyword: chalk12.hex("#c084fc"),
+  built_in: chalk12.hex("#93c5fd"),
+  type: chalk12.hex("#93c5fd"),
+  literal: chalk12.hex("#fca5a5"),
+  number: chalk12.hex("#fbbf24"),
+  string: chalk12.hex("#86efac"),
+  regexp: chalk12.hex("#fca5a5"),
+  title: chalk12.hex("#93c5fd"),
+  function: chalk12.hex("#93c5fd"),
+  params: chalk12.hex("#d4d4d8"),
+  comment: chalk12.hex("#71717a"),
+  meta: chalk12.hex("#a1a1aa"),
+  attr: chalk12.hex("#fbbf24"),
+  variable: chalk12.hex("#d4d4d8"),
+  tag: chalk12.hex("#c084fc"),
+  name: chalk12.hex("#c084fc")
 };
 var COMPACT_TOOL_COLOR = mastra.orange;
 var COMPACT_TOOL_ARGS_BG = "#141414";
@@ -5965,23 +5409,23 @@ function normalizeHexColor(color) {
   return color;
 }
 var QUIET_CODE_HIGHLIGHT_THEME = {
-  default: chalk14.hex("#b4b4bd"),
-  keyword: chalk14.hex("#c4b5fd"),
-  built_in: chalk14.hex("#93c5fd"),
-  type: chalk14.hex("#93c5fd"),
-  literal: chalk14.hex("#fca5a5"),
-  number: chalk14.hex("#fbbf24"),
-  string: chalk14.hex("#9ecfa9"),
-  regexp: chalk14.hex("#fca5a5"),
-  title: chalk14.hex("#93c5fd"),
-  function: chalk14.hex("#7dd3fc"),
-  params: chalk14.hex("#b4b4bd"),
-  comment: chalk14.hex("#71717a"),
-  meta: chalk14.hex("#71717a"),
-  attr: chalk14.hex("#fbbf24"),
-  variable: chalk14.hex("#d4d4d8"),
-  tag: chalk14.hex("#c4b5fd"),
-  name: chalk14.hex("#c4b5fd")
+  default: chalk12.hex("#b4b4bd"),
+  keyword: chalk12.hex("#c4b5fd"),
+  built_in: chalk12.hex("#93c5fd"),
+  type: chalk12.hex("#93c5fd"),
+  literal: chalk12.hex("#fca5a5"),
+  number: chalk12.hex("#fbbf24"),
+  string: chalk12.hex("#9ecfa9"),
+  regexp: chalk12.hex("#fca5a5"),
+  title: chalk12.hex("#93c5fd"),
+  function: chalk12.hex("#7dd3fc"),
+  params: chalk12.hex("#b4b4bd"),
+  comment: chalk12.hex("#71717a"),
+  meta: chalk12.hex("#71717a"),
+  attr: chalk12.hex("#fbbf24"),
+  variable: chalk12.hex("#d4d4d8"),
+  tag: chalk12.hex("#c4b5fd"),
+  name: chalk12.hex("#c4b5fd")
 };
 var SHELL_CONTROL_WORDS = /* @__PURE__ */ new Set([
   "if",
@@ -6273,22 +5717,22 @@ var ToolExecutionComponentEnhanced = class extends Container {
       -this.quietPreviewLineLimit
     );
     return wrapped.map((line) => {
-      const linePrefix = `  ${chalk14.hex(this.getQuietToolRailColor())("\u2502")} `;
+      const linePrefix = `  ${chalk12.hex(this.getQuietToolRailColor())("\u2502")} `;
       return truncateAnsi2(`${linePrefix}${this.formatQuietActivePreview(line)}`, maxLineWidth);
     });
   }
   getQuietCodePreviewLines(preview, maxLineWidth) {
-    const linePrefix = `  ${chalk14.hex(this.getQuietToolRailColor())("\u2502")} `;
+    const linePrefix = `  ${chalk12.hex(this.getQuietToolRailColor())("\u2502")} `;
     return this.highlightQuietCodePreview(preview).split("\n").slice(-this.quietPreviewLineLimit).map((line) => truncateAnsi2(`${linePrefix}${line}`, maxLineWidth));
   }
   isQuietCodePreviewTool() {
     return this.toolName === MC_TOOLS.VIEW || this.toolName === MC_TOOLS.WRITE_FILE || this.toolName === MC_TOOLS.STRING_REPLACE_LSP;
   }
   getQuietPreviewCapLine() {
-    return `  ${chalk14.hex(this.getQuietToolRailColor())("\u2570\u2500\u2500")}`;
+    return `  ${chalk12.hex(this.getQuietToolRailColor())("\u2570\u2500\u2500")}`;
   }
   getQuietPreviewSpacerLine() {
-    return `  ${chalk14.hex(this.getQuietToolRailColor())("\u2502")}`;
+    return `  ${chalk12.hex(this.getQuietToolRailColor())("\u2502")}`;
   }
   shouldCloseQuietPreview() {
     return !this.compactToolHasFollowingContinuation;
@@ -6316,7 +5760,7 @@ var ToolExecutionComponentEnhanced = class extends Container {
     return tokens.map((token) => {
       if (/^\s+$/.test(token)) return { text: token, color: (value) => value };
       if (token.startsWith('"') && token.endsWith('"') || token.startsWith("'") && token.endsWith("'")) {
-        return { text: token, color: chalk14.white };
+        return { text: token, color: chalk12.white };
       }
       if (token === "&&" || token === "||" || token === "|" || token === ";" || token === "&") {
         return { text: token, color: (value) => theme.fg("muted", value) };
@@ -6325,7 +5769,7 @@ var ToolExecutionComponentEnhanced = class extends Container {
         return { text: token, color: (value) => theme.fg("muted", value) };
       }
       if (SHELL_CONTROL_WORDS.has(token)) {
-        return { text: token, color: chalk14.blue };
+        return { text: token, color: chalk12.blue };
       }
       return { text: token, color: (value) => theme.fg("toolArgs", value) };
     });
@@ -6425,11 +5869,11 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const color = this.getCompactToolAccentColor(toolLabelColor);
     const argsBg = this.getCompactToolArgsBg(toolLabelColor);
     const argsColor = this.getCompactToolArgsColor(toolLabelColor);
-    const leftHalf = chalk14.hex(color)("\u2590");
-    const rightHalf = summary ? chalk14.hex(color).bgHex(argsBg)("\u258C") : chalk14.hex(color)("\u258C");
-    const label = `${leftHalf}${chalk14.bgHex(color).hex("#000000").bold(toolLabel)}${rightHalf}`;
+    const leftHalf = chalk12.hex(color)("\u2590");
+    const rightHalf = summary ? chalk12.hex(color).bgHex(argsBg)("\u258C") : chalk12.hex(color)("\u258C");
+    const label = `${leftHalf}${chalk12.bgHex(color).hex("#000000").bold(toolLabel)}${rightHalf}`;
     const args = summary ? this.formatCompactSummaryBadge(summary, argsBg, argsColor) : "";
-    const trail = summary ? chalk14.hex(argsBg)("\u258C") : "";
+    const trail = summary ? chalk12.hex(argsBg)("\u258C") : "";
     return `${label}${args}${trail}`;
   }
   getCompactToolAccentColor(toolLabelColor) {
@@ -6452,7 +5896,7 @@ var ToolExecutionComponentEnhanced = class extends Container {
     return ensureTerminalGlyphContrast(color);
   }
   formatToolBorder(char) {
-    return theme.bold(chalk14.hex(ensureTerminalGlyphContrast(theme.getTheme().toolBorderSuccess))(char));
+    return theme.bold(chalk12.hex(ensureTerminalGlyphContrast(theme.getTheme().toolBorderSuccess))(char));
   }
   getCompactToolLabelColor() {
     if (this.compactToolGroupLabelColor) return this.compactToolGroupLabelColor;
@@ -6620,9 +6064,9 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const isStreamingContinuation = !this.isComplete() && this.quietPreviewLineLimit > 0;
     if (isStreamingContinuation) {
       const circleColor = this.getQuietToolCircleColor(this.getCompactToolAccentColor(this.getCompactToolLabelColor()));
-      return `${chalk14.hex(circleColor)("\u25CF")}${chalk14.hex(railColor)("\u2500")}`;
+      return `${chalk12.hex(circleColor)("\u25CF")}${chalk12.hex(railColor)("\u2500")}`;
     }
-    return chalk14.hex(railColor)(this.compactToolHasFollowingContinuation ? "\u251C\u2500" : "\u2570\u2500");
+    return chalk12.hex(railColor)(this.compactToolHasFollowingContinuation ? "\u251C\u2500" : "\u2570\u2500");
   }
   formatCompactContinuationLine(summary) {
     const lineMatch = summary.match(/^─+/);
@@ -6637,17 +6081,17 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const railColor = this.getQuietToolRailColor();
     const circleColor = this.getQuietToolCircleColor(color);
     const isStreamingContinuation = this.compactToolContinuation && !this.isComplete() && this.quietPreviewLineLimit > 0;
-    const branch = hasFollowing || isStreamingContinuation ? `${hasPreview || isStreamingContinuation ? chalk14.hex(circleColor)("\u25CF") : chalk14.hex(railColor)("\u251C")}${chalk14.hex(railColor)(`\u2500${separator}${linePrefix}`)}` : chalk14.hex(railColor)(`\u2570\u2500${separator}${linePrefix}`);
+    const branch = hasFollowing || isStreamingContinuation ? `${hasPreview || isStreamingContinuation ? chalk12.hex(circleColor)("\u25CF") : chalk12.hex(railColor)("\u251C")}${chalk12.hex(railColor)(`\u2500${separator}${linePrefix}`)}` : chalk12.hex(railColor)(`\u2570\u2500${separator}${linePrefix}`);
     const continuationSummary = ` ${summary.slice(linePrefix.length)}`;
-    const trail = continuationSummary ? chalk14.hex(argsBg)("\u258C") : "";
+    const trail = continuationSummary ? chalk12.hex(argsBg)("\u258C") : "";
     return `${branch}${this.formatCompactSummaryBadge(continuationSummary, argsBg, argsColor)}${trail}`;
   }
   formatCompactSummaryBadge(summary, argsBg, argsColor) {
-    const styleText = (text) => argsColor ? chalk14.hex(argsColor)(text) : theme.fg("text", text);
+    const styleText = (text) => argsColor ? chalk12.hex(argsColor)(text) : theme.fg("text", text);
     const rangeMatch = summary.match(/(:\d+(?:-\d+)?)$/);
-    if (!rangeMatch?.[1]) return chalk14.bgHex(argsBg)(styleText(summary));
+    if (!rangeMatch?.[1]) return chalk12.bgHex(argsBg)(styleText(summary));
     const rangeStart = summary.length - rangeMatch[1].length;
-    return `${chalk14.bgHex(argsBg)(styleText(summary.slice(0, rangeStart)))}${chalk14.bgHex(argsBg)(theme.fg("dim", rangeMatch[1]))}`;
+    return `${chalk12.bgHex(argsBg)(styleText(summary.slice(0, rangeStart)))}${chalk12.bgHex(argsBg)(theme.fg("dim", rangeMatch[1]))}`;
   }
   getCompactContinuationSummary() {
     const summary = this.getCompactToolSummary();
@@ -7243,8 +6687,8 @@ var ToolExecutionComponentEnhanced = class extends Container {
         const t = theme.getTheme();
         const color = diag.severity === "error" ? t.error : diag.severity === "warning" ? t.warning : t.muted;
         const icon = diag.severity === "error" ? "\u2717" : diag.severity === "warning" ? "\u26A0" : "\u2139";
-        const location = diag.location ? chalk14.hex(color)(diag.location) + " " : "";
-        const line = `  ${chalk14.hex(color)(icon)} ${location}${theme.fg("thinkingText", diag.message)}`;
+        const location = diag.location ? chalk12.hex(color)(diag.location) + " " : "";
+        const line = `  ${chalk12.hex(color)(icon)} ${location}${theme.fg("thinkingText", diag.message)}`;
         this.contentBox.addChild(new Text(line, 0, 0));
       }
       if (shouldCollapse) {
@@ -7298,8 +6742,8 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const newLines = newStr.split("\n");
     const lines = [];
     let firstChangeIndex = -1;
-    const removedColor = chalk14.hex(mastra.red);
-    const addedColor = chalk14.hex(theme.getTheme().success);
+    const removedColor = chalk12.hex(mastra.red);
+    const addedColor = chalk12.hex(theme.getTheme().success);
     const maxLines = Math.max(oldLines.length, newLines.length);
     for (let i = 0; i < maxLines; i++) {
       if (i >= oldLines.length) {
@@ -8033,7 +7477,7 @@ ${stackMatch.join("\n")}`;
   }
   return err;
 }
-function stripAnsi3(s) {
+function stripAnsi2(s) {
   return s.replace(/\x1b\[[0-9;]*m/g, "");
 }
 var BorderedBox = class {
@@ -8051,7 +7495,7 @@ var BorderedBox = class {
     this.child.invalidate?.();
   }
   render(width) {
-    const borderColor = (s) => this.borderColor ? chalk14.hex(this.borderColor)(s) : this.pending ? chalk14.hex(theme.getTheme().dim)(s) : chalk14.hex(tintHex(mastra.green, 1))(s);
+    const borderColor = (s) => this.borderColor ? chalk12.hex(this.borderColor)(s) : this.pending ? chalk12.hex(theme.getTheme().dim)(s) : chalk12.hex(tintHex(mastra.green, 1))(s);
     const maxInnerWidth = Math.max(1, width - 6 - 2 - BOX_INDENT_STR.length - 1);
     const childLines = this.child.render(maxInnerWidth);
     if (childLines.length === 0) {
@@ -8062,7 +7506,7 @@ var BorderedBox = class {
     for (const line of childLines) {
       const trimmed = line.replace(/\s+$/, "");
       trimmedLines.push(trimmed);
-      const w = visibleWidth(stripAnsi3(trimmed));
+      const w = visibleWidth(stripAnsi2(trimmed));
       if (w > maxContentWidth) maxContentWidth = w;
     }
     const maxAllowedContent = maxInnerWidth;
@@ -8075,25 +7519,25 @@ var BorderedBox = class {
     }
     const boxWidth = boxInner + 4;
     const lines = [];
-    const promptPrefix = chalk14.hex(tintHex(mastra.green, 1))("\xBB") + " ";
+    const promptPrefix = chalk12.hex(tintHex(mastra.green, 1))("\xBB") + " ";
     const promptWidth = 2;
     if (this.label) {
       const labelText = ` ${this.label} `;
       const labelLen = labelText.length;
       const remaining = Math.max(0, boxWidth - 2 - labelLen);
       lines.push(
-        borderColor("\u256D") + chalk14.hex(theme.getTheme().dim)(labelText) + borderColor(`${"\u2500".repeat(remaining)}\u256E`)
+        borderColor("\u256D") + chalk12.hex(theme.getTheme().dim)(labelText) + borderColor(`${"\u2500".repeat(remaining)}\u256E`)
       );
     } else {
       lines.push(borderColor(`\u256D${"\u2500".repeat(boxWidth - 2)}\u256E`));
     }
     for (let i = 0; i < trimmedLines.length; i++) {
       let trimmed = trimmedLines[i];
-      let vis = visibleWidth(stripAnsi3(trimmed));
+      let vis = visibleWidth(stripAnsi2(trimmed));
       const lineMaxWidth = i === 0 ? boxInner - promptWidth : boxInner;
       if (vis > lineMaxWidth) {
         trimmed = truncateToWidth(trimmed, lineMaxWidth);
-        vis = visibleWidth(stripAnsi3(trimmed));
+        vis = visibleWidth(stripAnsi2(trimmed));
       }
       if (i === 0) {
         const padNeeded = Math.max(0, boxInner - vis - promptWidth);
@@ -8128,7 +7572,6 @@ var PendingUserMessageComponent = class extends Container {
     const prefix = imageCount > 0 ? `[${imageCount} image${imageCount > 1 ? "s" : ""}] ` : "";
     const displayText = `${prefix}${text.replace(/\[image\]\s*/g, "").trim()}`.trim();
     this.addChild(new Text(theme.fg("dim", `\u21B3 ${displayText || "Message"} pending\u2026`), BOX_INDENT_STR.length, 0));
-    this.addChild(new Spacer(1));
   }
   getChatSpacingKind() {
     return "user-message";
@@ -8174,8 +7617,8 @@ var ToolApprovalDialogComponent = class extends Box {
     }
     this.addChild(new Spacer(1));
     const categoryHint = this.categoryLabel ? `lways allow ${this.categoryLabel.toLowerCase()}` : "lways allow category";
-    const dimColor = chalk14.hex(theme.getTheme().dim);
-    const key = chalk14.hex(theme.getTheme().text).bold;
+    const dimColor = chalk12.hex(theme.getTheme().dim);
+    const key = chalk12.hex(theme.getTheme().text).bold;
     this.addChild(
       new Text(
         theme.fg("accent", "Allow? ") + key("y") + dimColor("es  ") + key("n") + dimColor("o  ") + key("a") + dimColor(categoryHint + "  ") + key("Y") + dimColor("olo"),
@@ -8244,7 +7687,8 @@ var ToolApprovalDialogComponent = class extends Box {
 
 // src/tui/handlers/tool.ts
 function getCurrentModeColor(ctx) {
-  return ctx.state.harness.getCurrentMode?.()?.color;
+  const color = ctx.state.harness.getCurrentMode?.()?.metadata?.color;
+  return typeof color === "string" ? color : void 0;
 }
 function isTaskMutationTool(toolName) {
   return toolName === "task_write" || toolName === "task_update" || toolName === "task_complete";
@@ -8575,6 +8019,7 @@ function handleToolEnd(ctx, toolCallId, result, isError) {
 // src/tui/render-messages.ts
 var WHILE_ACTIVE_USER_MESSAGE_LABEL = "steer";
 var HIDDEN_REACTIVE_SIGNAL_TAGS = /* @__PURE__ */ new Set(["github-subscribe-pr", "github-unsubscribe-pr"]);
+var GOAL_STATE_SIGNAL_ID = "goal";
 function shouldRenderReactiveSignal(tagName) {
   return !HIDDEN_REACTIVE_SIGNAL_TAGS.has(tagName);
 }
@@ -8586,7 +8031,8 @@ function getPendingUserMessageLabel(isInterjection) {
   return isInterjection ? WHILE_ACTIVE_USER_MESSAGE_LABEL : void 0;
 }
 function getCurrentModeColor2(state) {
-  return state.harness.getCurrentMode?.()?.color;
+  const color = state.harness.getCurrentMode?.()?.metadata?.color;
+  return typeof color === "string" ? color : void 0;
 }
 var TaskHistoryComponent = class extends Container {
   getChatSpacingKind() {
@@ -8606,11 +8052,10 @@ function renderClearedTasksInline(state, clearedTasks, insertIndex = -1) {
   const label = count === 1 ? "Task" : "Tasks";
   container.addChild(new Text(theme.fg("accent", `${label} cleared`), BOX_INDENT, 0));
   for (const task of clearedTasks) {
-    const icon = task.status === "completed" ? chalk14.hex(mastra.green)("\u2713") : chalk14.hex(mastra.darkGray)("\u25CB");
-    const text = chalk14.hex(theme.getTheme().dim).strikethrough(task.content);
+    const icon = task.status === "completed" ? chalk12.hex(mastra.green)("\u2713") : chalk12.hex(mastra.darkGray)("\u25CB");
+    const text = chalk12.hex(theme.getTheme().dim).strikethrough(task.content);
     container.addChild(new Text(`  ${icon} ${text}`, BOX_INDENT, 0));
   }
-  container.addChild(new Spacer(1));
   insertTaskHistoryComponent(state, container, insertIndex);
 }
 function renderTaskTransitionFromHistory(state, previousTasks, nextTasks) {
@@ -8779,7 +8224,7 @@ function addUserMessage(state, message, options) {
     return;
   }
   const stateSignalPart = message.content.find((content) => content.type === "state_signal");
-  if (stateSignalPart && stateSignalPart.stateId === TASKS_STATE_ID) {
+  if (stateSignalPart && (stateSignalPart.stateId === TASKS_STATE_ID || stateSignalPart.stateId === GOAL_STATE_SIGNAL_ID)) {
     return;
   }
   if (stateSignalPart) {
@@ -8860,7 +8305,7 @@ function addUserMessage(state, message, options) {
     }
     const slashComp = new SlashCommandComponent(commandName, commandContent);
     state.allSlashCommandComponents.push(slashComp);
-    state.chatContainer.addChild(slashComp);
+    insertChatComponentWithBoundarySpacing(state.chatContainer, slashComp);
     state.ui.requestRender();
     return;
   }
@@ -8884,7 +8329,7 @@ function addUserMessage(state, message, options) {
     }
     const skillComp = new SlashCommandComponent(commandName, skillContent);
     state.allSlashCommandComponents.push(skillComp);
-    state.chatContainer.addChild(skillComp);
+    insertChatComponentWithBoundarySpacing(state.chatContainer, skillComp);
     state.ui.requestRender();
     return;
   }
@@ -9338,7 +8783,7 @@ ARGUMENTS: ${trimmedArgs}` : ""}`.trim();
     if (!isCurrentThreadActive(ctx)) {
       const component = new SlashCommandComponent(`skill/${skill.name}`, content);
       ctx.state.allSlashCommandComponents.push(component);
-      ctx.state.chatContainer.addChild(component);
+      insertChatComponentWithBoundarySpacing(ctx.state.chatContainer, component);
       ctx.state.ui.requestRender();
     }
     const displayText = `/skill/${skill.name}${trimmedArgs ? ` ${trimmedArgs}` : ""}`;
@@ -9362,7 +8807,7 @@ ${escapeSkillBoundary(content)}
 // src/tui/commands/new.ts
 async function handleNewCommand(ctx) {
   const { state } = ctx;
-  state.harness.abort();
+  state.harness.detachFromCurrentThread();
   state.pendingNewThread = true;
   state.chatContainer.clear();
   state.pendingTools.clear();
@@ -9690,11 +9135,11 @@ async function handleResourceCommand(ctx, args) {
 }
 function colorizeDiffLine(line) {
   const t = theme.getTheme();
-  const addedColor = chalk14.hex(t.success);
-  const hunkHeaderColor = chalk14.hex(t.toolBorderPending);
-  const fileHeaderColor = chalk14.bold.hex(t.accent);
-  const removedColor = chalk14.hex(mastra.red);
-  const metaColor = chalk14.hex(mastra.mainGray);
+  const addedColor = chalk12.hex(t.success);
+  const hunkHeaderColor = chalk12.hex(t.toolBorderPending);
+  const fileHeaderColor = chalk12.bold.hex(t.accent);
+  const removedColor = chalk12.hex(mastra.red);
+  const metaColor = chalk12.hex(mastra.mainGray);
   if (line.startsWith("+++") || line.startsWith("---")) {
     return fileHeaderColor(line);
   }
@@ -9719,7 +9164,6 @@ function colorizeDiffLine(line) {
 var DiffOutputComponent = class extends Container {
   constructor(command, diffOutput) {
     super();
-    this.addChild(new Spacer(1));
     this.addChild(
       new Text(
         `${theme.fg("success", "\u2713")} ${theme.bold(theme.fg("muted", "$"))} ${theme.fg("text", command)}`,
@@ -9735,6 +9179,9 @@ var DiffOutputComponent = class extends Container {
       }
     }
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 
 // src/tui/commands/diff.ts
@@ -10547,33 +9994,170 @@ function getLinuxClipboardImageXclip() {
   } catch {
     return null;
   }
-}
-function getLinuxClipboardImageWlPaste() {
-  try {
-    const types = execSync("wl-paste --list-types", {
-      encoding: "utf-8",
-      timeout: 3e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    if (!types.includes("image/png")) {
-      return null;
+}
+function getLinuxClipboardImageWlPaste() {
+  try {
+    const types = execSync("wl-paste --list-types", {
+      encoding: "utf-8",
+      timeout: 3e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    if (!types.includes("image/png")) {
+      return null;
+    }
+    const buffer = execSync("wl-paste --type image/png", {
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"],
+      maxBuffer: 50 * 1024 * 1024
+    });
+    if (!Buffer.isBuffer(buffer) || buffer.length === 0) {
+      return null;
+    }
+    return {
+      data: buffer.toString("base64"),
+      mimeType: "image/png"
+    };
+  } catch {
+    return null;
+  }
+}
+var GRADIENT_WIDTH = 30;
+var BASE_COLOR = [22, 200, 88];
+function getMinBrightness() {
+  return getThemeMode() === "dark" ? 0.45 : 0.55;
+}
+function hexToRgb(hex) {
+  const h = hex.replace("#", "");
+  return [parseInt(h.slice(0, 2), 16), parseInt(h.slice(2, 4), 16), parseInt(h.slice(4, 6), 16)];
+}
+var IDLE_BRIGHTNESS = 0.8;
+function applyGradientSweep(text, offset, color, fadeProgress = 0) {
+  const chars = [...text];
+  const totalChars = chars.length;
+  if (totalChars === 0) return text;
+  const baseColor = color ? hexToRgb(color) : BASE_COLOR;
+  const gradientCenter = offset % 1 * 100;
+  const halfGradient = GRADIENT_WIDTH / 2;
+  const minBrightness = getMinBrightness();
+  const brightnessRange = 1 - minBrightness;
+  let result = "";
+  let batchChars = "";
+  let batchR = -1, batchG = -1, batchB = -1;
+  for (let i = 0; i < totalChars; i++) {
+    const char = chars[i];
+    if (char === " ") {
+      if (batchChars) {
+        result += chalk12.rgb(batchR, batchG, batchB)(batchChars);
+        batchChars = "";
+      }
+      result += " ";
+      continue;
+    }
+    const charPosition = i / totalChars * 100;
+    let distance = Math.abs(charPosition - gradientCenter);
+    if (distance > 50) distance = 100 - distance;
+    const normalizedDistance = Math.min(distance / halfGradient, 1);
+    const animBrightness = minBrightness + brightnessRange * (1 - normalizedDistance);
+    const brightness = animBrightness + (IDLE_BRIGHTNESS - animBrightness) * fadeProgress;
+    const r = Math.floor(baseColor[0] * brightness);
+    const g = Math.floor(baseColor[1] * brightness);
+    const b = Math.floor(baseColor[2] * brightness);
+    if (r === batchR && g === batchG && b === batchB) {
+      batchChars += char;
+    } else {
+      if (batchChars) {
+        result += chalk12.rgb(batchR, batchG, batchB)(batchChars);
+      }
+      batchChars = char;
+      batchR = r;
+      batchG = g;
+      batchB = b;
+    }
+  }
+  if (batchChars) {
+    result += chalk12.rgb(batchR, batchG, batchB)(batchChars);
+  }
+  return result;
+}
+var GradientAnimator = class {
+  offset = 0;
+  intervalId = null;
+  onTick;
+  _isFadingOut = false;
+  _isFadingIn = false;
+  _fadeProgress = 0;
+  // 0 = full animation, 1 = fully idle
+  constructor(onTick) {
+    this.onTick = onTick;
+  }
+  start() {
+    if (this.intervalId && !this._isFadingOut) return;
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
     }
-    const buffer = execSync("wl-paste --type image/png", {
-      timeout: 5e3,
-      stdio: ["pipe", "pipe", "pipe"],
-      maxBuffer: 50 * 1024 * 1024
-    });
-    if (!Buffer.isBuffer(buffer) || buffer.length === 0) {
-      return null;
+    this._isFadingOut = false;
+    this._isFadingIn = true;
+    this._fadeProgress = 1;
+    this.offset = 0;
+    this.intervalId = setInterval(() => {
+      this.offset += 0.03;
+      if (this._isFadingIn) {
+        this._fadeProgress -= 0.06;
+        if (this._fadeProgress <= 0) {
+          this._fadeProgress = 0;
+          this._isFadingIn = false;
+        }
+      }
+      this.onTick();
+    }, 80);
+  }
+  /**
+   * Smoothly fade the gradient to idle state over ~500ms.
+   */
+  fadeOut() {
+    if (!this.intervalId) return;
+    if (this._isFadingOut) return;
+    this._isFadingOut = true;
+    this._isFadingIn = false;
+    this._fadeProgress = 0;
+    clearInterval(this.intervalId);
+    this.intervalId = setInterval(() => {
+      this._fadeProgress += 0.08;
+      if (this._fadeProgress >= 1) {
+        this._fadeProgress = 1;
+        this.stop();
+      }
+      this.onTick();
+    }, 40);
+  }
+  stop() {
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
     }
-    return {
-      data: buffer.toString("base64"),
-      mimeType: "image/png"
-    };
-  } catch {
-    return null;
+    this._isFadingOut = false;
+    this._isFadingIn = false;
+    this._fadeProgress = 0;
+    this.offset = 0;
   }
-}
+  getOffset() {
+    return this.offset;
+  }
+  /** 0 = full animation, 1 = fully idle. Use to interpolate colors. */
+  getFadeProgress() {
+    return this._fadeProgress;
+  }
+  isFadingOut() {
+    return this._isFadingOut;
+  }
+  isFadingIn() {
+    return this._isFadingIn;
+  }
+  isRunning() {
+    return this.intervalId !== null;
+  }
+};
 var OMProgressComponent = class extends Container {
   state = defaultOMProgressState();
   statusText;
@@ -10636,11 +10220,11 @@ var OMProgressComponent = class extends Container {
     } else if (this.state.status === "observing") {
       const elapsed = this.state.startTime ? Math.round((Date.now() - this.state.startTime) / 1e3) : 0;
       const spinner = this.getSpinner();
-      this.statusText.setText(chalk14.hex(mastra.orange)(`${spinner} Observing... ${elapsed}s`));
+      this.statusText.setText(chalk12.hex(mastra.orange)(`${spinner} Observing... ${elapsed}s`));
     } else if (this.state.status === "reflecting") {
       const elapsed = this.state.startTime ? Math.round((Date.now() - this.state.startTime) / 1e3) : 0;
       const spinner = this.getSpinner();
-      this.statusText.setText(chalk14.hex(mastra.pink)(`${spinner} Reflecting... ${elapsed}s`));
+      this.statusText.setText(chalk12.hex(mastra.pink)(`${spinner} Reflecting... ${elapsed}s`));
     }
   }
   renderProgressBar(percent, width) {
@@ -10648,11 +10232,11 @@ var OMProgressComponent = class extends Container {
     const empty = width - filled;
     const bar = "\u2501".repeat(filled) + "\u2500".repeat(empty);
     if (percent >= 90) {
-      return chalk14.hex(mastra.red)(bar);
+      return chalk12.hex(mastra.red)(bar);
     } else if (percent >= 70) {
-      return chalk14.hex(mastra.orange)(bar);
+      return chalk12.hex(mastra.orange)(bar);
     } else {
-      return chalk14.hex(mastra.darkGray)(bar);
+      return chalk12.hex(mastra.darkGray)(bar);
     }
   }
   spinnerFrame = 0;
@@ -10678,21 +10262,21 @@ function formatTokensThreshold(n) {
   return (s.endsWith(".0") ? s.slice(0, -2) : s) + "k";
 }
 function colorByPercent(text, percent) {
-  if (percent >= 90) return chalk14.hex(mastra.red)(text);
-  if (percent >= 70) return chalk14.hex(mastra.orange)(text);
-  return chalk14.hex("#71717a")(text);
+  if (percent >= 90) return chalk12.hex(mastra.red)(text);
+  if (percent >= 70) return chalk12.hex(mastra.orange)(text);
+  return chalk12.hex("#71717a")(text);
 }
 function formatObservationStatus(state, compact, labelStyler) {
   const percent = Math.round(state.thresholdPercent);
   const pct = colorByPercent(`${percent}%`, percent);
-  const defaultStyler = (s) => chalk14.hex(mastra.specialGray)(s);
+  const defaultStyler = (s) => chalk12.hex(mastra.specialGray)(s);
   const styleLabel = labelStyler ?? defaultStyler;
   if (compact === "percentOnly") {
     return styleLabel("msg ") + pct;
   }
   const label = compact === "full" ? "messages" : "msg";
   const fraction = `${formatTokensValue(state.pendingTokens)}/${formatTokensThreshold(state.threshold)}`;
-  const buffered = compact !== "noBuffer" && state.buffered.observations.projectedMessageRemoval > 0 ? chalk14.italic(
+  const buffered = compact !== "noBuffer" && state.buffered.observations.projectedMessageRemoval > 0 ? chalk12.italic(
     theme.fg("muted", ` \u2193${formatTokensThreshold(state.buffered.observations.projectedMessageRemoval)}`)
   ) : "";
   return styleLabel(`${label} `) + colorByPercent(fraction, percent) + buffered;
@@ -10700,7 +10284,7 @@ function formatObservationStatus(state, compact, labelStyler) {
 function formatReflectionStatus(state, compact, labelStyler) {
   const percent = Math.round(state.reflectionThresholdPercent);
   const pct = colorByPercent(`${percent}%`, percent);
-  const defaultStyler = (s) => chalk14.hex(mastra.specialGray)(s);
+  const defaultStyler = (s) => chalk12.hex(mastra.specialGray)(s);
   const styleLabel = labelStyler ?? defaultStyler;
   const label = styleLabel(compact === "full" ? "memory" : "mem") + " ";
   if (compact === "percentOnly") {
@@ -10708,7 +10292,7 @@ function formatReflectionStatus(state, compact, labelStyler) {
   }
   const fraction = `${formatTokensValue(state.observationTokens)}/${formatTokensThreshold(state.reflectionThreshold)}`;
   const savings = state.buffered.reflection.inputObservationTokens - state.buffered.reflection.observationTokens;
-  const buffered = compact !== "noBuffer" && state.buffered.reflection.status === "complete" && savings > 0 ? chalk14.italic(theme.fg("muted", ` \u2193${formatTokensThreshold(savings)}`)) : "";
+  const buffered = compact !== "noBuffer" && state.buffered.reflection.status === "complete" && savings > 0 ? chalk12.italic(theme.fg("muted", ` \u2193${formatTokensThreshold(savings)}`)) : "";
   return label + colorByPercent(fraction, percent) + buffered;
 }
 function formatOMStatus(state) {
@@ -10737,7 +10321,7 @@ function formatGithubPrLabel(state, subscription) {
       )
     };
   }
-  return { plain: label, styled: chalk14.hex(color)(label) };
+  return { plain: label, styled: chalk12.hex(color)(label) };
 }
 function formatGoalDuration(goal) {
   const activeStartedAt = goal.activeStartedAt ?? (goal.activeDurationMs === void 0 ? goal.startedAt : void 0);
@@ -10766,7 +10350,8 @@ function updateStatusLine(state) {
   const modes = state.harness.listModes();
   const currentMode = modes.length > 1 ? state.harness.getCurrentMode() : void 0;
   const judgeModeColor = mastra.blue;
-  const mainModeColor = currentMode?.color;
+  const currentModeColor = currentMode?.metadata?.color;
+  const mainModeColor = typeof currentModeColor === "string" ? currentModeColor : void 0;
   const modeColor = isJudging ? judgeModeColor : showOMMode ? isObserving ? getObserverColor2() : getReflectorColor2() : mainModeColor;
   const tintBg = modeColor ? tintHex(modeColor, 0.15) : void 0;
   const badgeName = isJudging ? "judge" : showOMMode ? isObserving ? "observe" : "reflect" : currentMode ? currentMode.name || currentMode.id || "unknown" : void 0;
@@ -10787,8 +10372,8 @@ function updateStatusLine(state) {
     const mr = Math.floor(mcr * badgeBrightness);
     const mg = Math.floor(mcg * badgeBrightness);
     const mb = Math.floor(mcb * badgeBrightness);
-    const rightHalf = tintBg ? chalk14.rgb(mr, mg, mb).bgHex(tintBg)("\u258C") : chalk14.rgb(mr, mg, mb)("\u258C");
-    modeBadge = chalk14.rgb(mr, mg, mb)("\u2590") + chalk14.bgRgb(mr, mg, mb).hex("#000000").bold(badgeName.toLowerCase()) + rightHalf;
+    const rightHalf = tintBg ? chalk12.rgb(mr, mg, mb).bgHex(tintBg)("\u258C") : chalk12.rgb(mr, mg, mb)("\u258C");
+    modeBadge = chalk12.rgb(mr, mg, mb)("\u2590") + chalk12.bgRgb(mr, mg, mb).hex("#000000").bold(badgeName.toLowerCase()) + rightHalf;
     modeBadgeWidth = badgeName.length + 2;
   } else if (badgeName) {
     modeBadge = " " + theme.fg("dim", badgeName) + " ";
@@ -10834,7 +10419,7 @@ function updateStatusLine(state) {
   const dirFull = !threadTitle && branch ? `${displayPath} (${branch})` : displayPath;
   const dirBranchOnly = !threadTitle && branch ? branch : null;
   const dirBranchShort = !threadTitle && branch && branch.length > 24 ? branch.slice(0, 12) + ".." + branch.slice(-8) : dirBranchOnly;
-  const modelTrail = tintBg ? chalk14.hex(tintBg)("\u258C") : "";
+  const modelTrail = tintBg ? chalk12.hex(tintBg)("\u258C") : "";
   const styleModelId = (id) => {
     if (!state.modelAuthStatus.hasAuth) {
       const envVar = state.modelAuthStatus.apiKeyEnvVar;
@@ -10844,8 +10429,8 @@ function updateStatusLine(state) {
       const fade = state.gradientAnimator.getFadeProgress();
       const easedFade = fade * fade * (3 - 2 * fade);
       const text = applyGradientSweep(id, state.gradientAnimator.getOffset(), modeColor, easedFade);
-      const styled = chalk14.italic(text);
-      const bg = tintBg ? chalk14.bgHex(tintBg)(styled) : styled;
+      const styled = chalk12.italic(text);
+      const bg = tintBg ? chalk12.bgHex(tintBg)(styled) : styled;
       return bg + modelTrail;
     }
     if (modeColor) {
@@ -10855,11 +10440,11 @@ function updateStatusLine(state) {
         parseInt(modeColor.slice(5, 7), 16)
       ];
       const idleBright = 0.8;
-      const fgStyled = chalk14.rgb(Math.floor(cr * idleBright), Math.floor(cg * idleBright), Math.floor(cb * idleBright)).bold.italic(id);
-      const bg = tintBg ? chalk14.bgHex(tintBg)(fgStyled) : fgStyled;
+      const fgStyled = chalk12.rgb(Math.floor(cr * idleBright), Math.floor(cg * idleBright), Math.floor(cb * idleBright)).bold.italic(id);
+      const bg = tintBg ? chalk12.bgHex(tintBg)(fgStyled) : fgStyled;
       return bg + modelTrail;
     }
-    return chalk14.hex(mastra.specialGray).bold.italic(id);
+    return chalk12.hex(mastra.specialGray).bold.italic(id);
   };
   let shortModeBadge = "";
   let shortModeBadgeWidth = 0;
@@ -10882,8 +10467,8 @@ function updateStatusLine(state) {
     const sr = Math.floor(mcr * sBadgeBrightness);
     const sg = Math.floor(mcg * sBadgeBrightness);
     const sb = Math.floor(mcb * sBadgeBrightness);
-    const shortRightHalf = tintBg ? chalk14.rgb(sr, sg, sb).bgHex(tintBg)("\u258C") : chalk14.rgb(sr, sg, sb)("\u258C");
-    shortModeBadge = chalk14.rgb(sr, sg, sb)("\u2590") + chalk14.bgRgb(sr, sg, sb).hex("#000000").bold(shortName) + shortRightHalf;
+    const shortRightHalf = tintBg ? chalk12.rgb(sr, sg, sb).bgHex(tintBg)("\u258C") : chalk12.rgb(sr, sg, sb)("\u258C");
+    shortModeBadge = chalk12.rgb(sr, sg, sb)("\u2590") + chalk12.bgRgb(sr, sg, sb).hex("#000000").bold(shortName) + shortRightHalf;
     shortModeBadgeWidth = shortName.length + 2;
   } else if (badgeName) {
     const shortName = badgeName.toLowerCase().charAt(0);
@@ -11198,9 +10783,9 @@ async function askCustomPackEditTarget(ctx, pack) {
     const selectList = new SelectList(
       [
         { value: "rename", label: `  Rename \u2192 ${theme.fg("text", pack.name)}` },
-        { value: "plan", label: `  ${chalk14.hex(mastra.purple)("plan")} \u2192 ${theme.fg("text", pack.models.plan)}` },
-        { value: "build", label: `  ${chalk14.hex(mastra.green)("build")} \u2192 ${theme.fg("text", pack.models.build)}` },
-        { value: "fast", label: `  ${chalk14.hex(mastra.orange)("fast")} \u2192 ${theme.fg("text", pack.models.fast)}` },
+        { value: "plan", label: `  ${chalk12.hex(mastra.purple)("plan")} \u2192 ${theme.fg("text", pack.models.plan)}` },
+        { value: "build", label: `  ${chalk12.hex(mastra.green)("build")} \u2192 ${theme.fg("text", pack.models.build)}` },
+        { value: "fast", label: `  ${chalk12.hex(mastra.orange)("fast")} \u2192 ${theme.fg("text", pack.models.fast)}` },
         { value: "save", label: `  ${theme.fg("success", "Save")}` }
       ],
       5,
@@ -11227,9 +10812,9 @@ async function askCustomPackEditTarget(ctx, pack) {
 }
 async function runCustomFlow(ctx, options) {
   const modes = [
-    { id: "plan", label: "plan", color: mastra.purple },
-    { id: "build", label: "build", color: mastra.green },
-    { id: "fast", label: "fast", color: mastra.orange }
+    { id: "plan", label: "plan", metadata: { color: mastra.purple } },
+    { id: "build", label: "build", metadata: { color: mastra.green } },
+    { id: "fast", label: "fast", metadata: { color: mastra.orange } }
   ];
   const name = options?.skipNamePrompt ? options?.name : await askCustomPackName(ctx, void 0);
   if (!name) return null;
@@ -11243,7 +10828,7 @@ async function runCustomFlow(ctx, options) {
     const modelId = await selectModel(
       ctx,
       `Select model for ${mode.label} mode`,
-      mode.color,
+      mode.metadata.color,
       models[mode.id] || void 0
     );
     if (!modelId) return null;
@@ -11380,9 +10965,9 @@ function getPackDetail(pack) {
     return theme.fg("dim", "  Create a named custom pack and pick a model for each mode.");
   }
   return [
-    `  ${chalk14.hex(mastra.purple)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
-    `  ${chalk14.hex(mastra.green)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
-    `  ${chalk14.hex(mastra.orange)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
+    `  ${chalk12.hex(mastra.purple)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
+    `  ${chalk12.hex(mastra.green)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
+    `  ${chalk12.hex(mastra.orange)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
   ].join("\n");
 }
 async function saveCustomPackEdits(ctx, pack, previousPackId) {
@@ -12879,7 +12464,8 @@ async function handleApiKeysCommand(ctx) {
 
 // src/tui/commands/settings.ts
 function getCurrentModeColor3(ctx) {
-  return ctx.state.harness.getCurrentMode?.()?.color;
+  const color = ctx.state.harness.getCurrentMode?.()?.metadata?.color;
+  return typeof color === "string" ? color : void 0;
 }
 function commandExists(command) {
   return new Promise((resolve3) => {
@@ -13140,9 +12726,11 @@ Using the same profile across different providers can cause compatibility issues
 }
 function applyBrowserToAgents(ctx, browser, browserSettings) {
   const modes = ctx.harness.listModes();
+  let harnessState;
   for (const mode of modes) {
-    const agent = typeof mode.agent === "function" ? mode.agent(ctx.state.harness.getState()) : mode.agent;
-    agent.setBrowser(browser);
+    const modeAgent = mode.agent;
+    const agent = typeof modeAgent === "function" ? modeAgent(harnessState ??= ctx.state.harness.getState()) : modeAgent;
+    agent?.setBrowser?.(browser);
   }
   ctx.harness.setState({ [ACTIVE_BROWSER_KEY]: browserSettings });
 }
@@ -13404,8 +12992,7 @@ Run /browser on to apply.`);
       return;
     }
     const currentMode = ctx.harness.getCurrentMode();
-    const agent = typeof currentMode.agent === "function" ? currentMode.agent(ctx.state.harness.getState()) : currentMode.agent;
-    const browserInstance = agent.browser;
+    const browserInstance = currentMode.agent?.browser;
     if (!browserInstance) {
       ctx.showError("Browser not enabled. Run /browser on first.");
       return;
@@ -13415,9 +13002,10 @@ Run /browser on to apply.`);
       ctx.showError("Current browser instance does not support exporting storage state.");
       return;
     }
+    const exportableBrowser = browserInstance;
     const expandedPath = exportPath.replace(/^~/, process.env.HOME || "~");
     try {
-      await browserInstance.exportStorageState(expandedPath);
+      await exportableBrowser.exportStorageState(expandedPath);
       ctx.showInfo(`Storage state exported to: ${expandedPath}`);
     } catch (error) {
       ctx.showError(`Failed to export storage state: ${error instanceof Error ? error.message : String(error)}`);
@@ -14977,9 +14565,6 @@ async function dispatchSlashCommand(input, state, buildCtx) {
     case "goal":
       await handleGoalCommand(buildCtx(), args);
       return true;
-    case "judge":
-      await handleJudgeCommand(buildCtx());
-      return true;
     default: {
       const customCommand = state.customSlashCommands.find((cmd) => cmd.name === command);
       if (customCommand) {
@@ -15053,7 +14638,7 @@ async function handleCustomSlashCommand(state, command, args, ctx, displayText)
       if (!isCurrentThreadActive(commandCtx)) {
         const slashComp = new SlashCommandComponent(command.name, processedContent.trim());
         state.allSlashCommandComponents.push(slashComp);
-        state.chatContainer.addChild(slashComp);
+        insertChatComponentWithBoundarySpacing(state.chatContainer, slashComp);
         state.ui.requestRender();
       }
       const wrapped = `<slash-command name="${command.name}">
@@ -15067,6 +14652,126 @@ ${processedContent.trim()}
     showError(state, `Error executing //${command.name}: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
+function evaluationToJudgeResult(payload) {
+  const decision = payload.passed ? "done" : payload.status === "paused" ? "paused" : "continue";
+  return { decision, reason: payload.reason ?? "" };
+}
+var JUDGE_COLOR = mastraBrand.blue;
+var MUTED_COLOR = "#8a8a8a";
+var PAUSED_COLOR = "#f5a524";
+var WAITING_COLOR = "#8a8a8a";
+var JudgeDisplayComponent = class extends Container {
+  result;
+  turnsUsed;
+  maxTurns;
+  activity = [];
+  constructor(result = null, turnsUsed = 0, maxTurns = 0) {
+    super();
+    this.result = result;
+    this.turnsUsed = turnsUsed;
+    this.maxTurns = maxTurns;
+    this.renderContent();
+  }
+  addActivity(line) {
+    if (this.activity[this.activity.length - 1] !== line) {
+      this.activity.push(line);
+    }
+    if (this.activity.length > 6) {
+      this.activity = this.activity.slice(-6);
+    }
+    this.renderContent();
+  }
+  setResult(result, turnsUsed, maxTurns) {
+    this.result = result;
+    this.turnsUsed = turnsUsed;
+    this.maxTurns = maxTurns;
+    this.renderContent();
+  }
+  /** Render the result of an in-loop goal evaluation chunk. */
+  setEvaluation(payload) {
+    this.setResult(evaluationToJudgeResult(payload), payload.iteration, payload.maxRuns);
+  }
+  setInterrupted() {
+    this.setResult({ decision: "paused", reason: "Judge evaluation was interrupted." }, this.turnsUsed, this.maxTurns);
+  }
+  renderContent() {
+    this.clear();
+    const border = (char) => chalk12.hex(JUDGE_COLOR)(char);
+    const title = chalk12.hex(JUDGE_COLOR).bold("Goal");
+    const termWidth = getTermWidth();
+    const innerWidth = Math.max(20, termWidth - BOX_INDENT * 2 - 4);
+    const horizontal = "\u2500".repeat(innerWidth + 1);
+    this.addChild(new Text(`${border("\u256D")}${border(horizontal)}${border("\u256E")}`, BOX_INDENT, 0));
+    this.addChild(new Text(this.renderRow(this.renderHeader(title), innerWidth, border), BOX_INDENT, 0));
+    if (!this.result && this.activity.length === 0) {
+      this.addChild(new Text(this.renderRow(chalk12.dim("evaluating\u2026"), innerWidth, border), BOX_INDENT, 0));
+    }
+    for (const line of this.activity) {
+      this.addChild(new Text(this.renderRow(this.renderActivityLine(line), innerWidth, border), BOX_INDENT, 0));
+    }
+    if (this.activity.length > 0 && this.result) {
+      this.addChild(new Text(this.renderRow("", innerWidth, border), BOX_INDENT, 0));
+    }
+    if (this.result) {
+      for (const line of this.wrapLine(this.result.reason, innerWidth)) {
+        this.addChild(new Text(this.renderRow(chalk12.dim(line), innerWidth, border), BOX_INDENT, 0));
+      }
+    }
+    this.addChild(new Text(`${border("\u2570")}${border(horizontal)}${border("\u256F")}`, BOX_INDENT, 0));
+  }
+  renderActivityLine(line) {
+    const toolName = getActivityToolName(line);
+    if (!toolName) return theme.fg("dim", `\u2022 ${line}`);
+    const rest = line.slice(toolName.length);
+    return `${theme.fg("dim", "\u2022 ")}${theme.fg("dim", theme.italic(toolName))}${theme.fg("dim", rest)}`;
+  }
+  renderHeader(title) {
+    if (!this.result) {
+      return `${title}  \u25CC ${chalk12.hex(WAITING_COLOR).bold("evaluating")}`;
+    }
+    const decisionIcon = this.result.decision === "done" ? "\u25CF" : this.result.decision === "paused" ? "!" : this.result.decision === "waiting" ? "\u25CC" : "\u25CB";
+    const decisionText = getDecisionText(this.result.decision);
+    const turnInfo = this.maxTurns > 0 ? chalk12.hex(MUTED_COLOR)(`(${this.turnsUsed}/${this.maxTurns})`) : "";
+    return `${title}  ${decisionIcon} ${decisionText}${turnInfo ? `  ${turnInfo}` : ""}`;
+  }
+  renderRow(text, width, border) {
+    const content = this.padLine(text, width);
+    return `${border("\u2502")} ${content}${border("\u2502")}`;
+  }
+  wrapLine(text, width) {
+    const lines = [];
+    let remaining = text;
+    while (remaining.length > width) {
+      const breakAt = remaining.lastIndexOf(" ", width);
+      const splitAt = breakAt > 0 ? breakAt : width;
+      lines.push(remaining.slice(0, splitAt));
+      remaining = remaining.slice(splitAt).trimStart();
+    }
+    lines.push(remaining);
+    return lines;
+  }
+  padLine(text, width) {
+    const visibleLength = stripAnsi(text).length;
+    if (visibleLength >= width) {
+      return stripAnsi(text).slice(0, width);
+    }
+    return text + " ".repeat(width - visibleLength);
+  }
+  getChatSpacingKind() {
+    return "other";
+  }
+};
+function getActivityToolName(line) {
+  if (line.startsWith("find files ")) return "find files";
+  const [toolName] = line.split(" ");
+  return toolName || null;
+}
+function getDecisionText(decision) {
+  if (decision === "done") return chalk12.hex("#16c858").bold("done");
+  if (decision === "paused") return chalk12.hex(PAUSED_COLOR).bold("paused");
+  if (decision === "waiting") return chalk12.hex(WAITING_COLOR).bold("waiting");
+  return chalk12.hex(JUDGE_COLOR).bold("continue");
+}
 
 // src/tui/prune-chat.ts
 var MAX_CHILDREN = 5e3;
@@ -15114,6 +14819,7 @@ function handleAgentStart(ctx) {
 }
 function handleAgentEnd(ctx) {
   const { state } = ctx;
+  state.goalManager.stopActiveTimer();
   if (state.gradientAnimator) {
     state.gradientAnimator.fadeOut();
   }
@@ -15134,10 +14840,7 @@ function handleAgentEnd(ctx) {
   ctx.updateStatusLine();
   state.ui.requestRender();
   ctx.notify("agent_done");
-  if (drainQueuedAction(ctx)) {
-    return;
-  }
-  maybeGoalContinuation(ctx);
+  drainQueuedAction(ctx);
 }
 function drainQueuedAction(ctx) {
   const { state } = ctx;
@@ -15203,8 +14906,7 @@ function handleAgentAborted(ctx) {
     state.streamingComponent = void 0;
     state.streamingMessage = void 0;
   } else if (state.userInitiatedAbort) {
-    state.chatContainer.addChild(new Text(theme.fg("error", "Interrupted"), BOX_INDENT, 0));
-    state.chatContainer.addChild(new Spacer(1));
+    showError(state, "Interrupted");
   }
   state.userInitiatedAbort = false;
   if (state.activeGoalJudge) {
@@ -15250,117 +14952,46 @@ function handleAgentError(ctx) {
   state.ui.requestRender();
 }
 function removeJudgeComponent(state, component) {
-  const children = state.chatContainer.children;
-  const index = children.indexOf(component);
-  if (index >= 0) {
-    children.splice(index, 1);
-    state.chatContainer.invalidate?.();
+  if (state.chatContainer.children.includes(component)) {
+    state.chatContainer.removeChild(component);
   }
 }
-function maybeGoalContinuation(ctx) {
+function handleGoalEvaluation(ctx, payload) {
   const { state } = ctx;
-  if (!state.goalManager.isActive()) return;
-  const goal = state.goalManager.getGoal();
-  if (!goal) return;
-  const evaluatedGoalId = goal.id;
-  if (!state.gradientAnimator) {
-    state.gradientAnimator = new GradientAnimator(() => {
-      ctx.updateStatusLine();
-    });
+  let activeGoalJudge = state.activeGoalJudge;
+  if (!activeGoalJudge) {
+    const goal = state.goalManager.getGoal();
+    const component = new JudgeDisplayComponent(null, payload.iteration, payload.maxRuns);
+    activeGoalJudge = {
+      modelId: goal?.judgeModelId ?? "",
+      abortController: new AbortController(),
+      component
+    };
+    state.activeGoalJudge = activeGoalJudge;
+    insertChatComponentWithBoundarySpacing(state.chatContainer, component);
   }
-  const abortController = new AbortController();
-  const judgeComponent = new JudgeDisplayComponent(null, goal.turnsUsed, goal.maxTurns);
-  const activeGoalJudge = { modelId: goal.judgeModelId, abortController, component: judgeComponent };
-  state.activeGoalJudge = activeGoalJudge;
-  state.chatContainer.addChild(judgeComponent);
-  state.gradientAnimator.start();
+  activeGoalJudge.component.setEvaluation(payload);
+  state.goalManager.applyEvaluation({ runsUsed: payload.iteration, status: payload.status });
   ctx.updateStatusLine();
   state.ui.requestRender();
-  state.goalManager.evaluateAfterTurn(state, {
-    abortSignal: abortController.signal,
-    onActivity: (line) => {
-      if (state.activeGoalJudge === activeGoalJudge) {
-        judgeComponent.addActivity(line);
-        state.ui.requestRender();
-      }
-    }
-  }).then(async ({ continuation, judgeResult }) => {
-    if (state.activeGoalJudge !== activeGoalJudge) {
-      return;
-    }
-    const currentGoal = state.goalManager.getGoal();
-    if (!currentGoal || currentGoal.id !== evaluatedGoalId) {
-      removeJudgeComponent(state, judgeComponent);
-      return;
-    }
-    if (judgeResult) {
-      judgeComponent.setResult(judgeResult, currentGoal.turnsUsed, currentGoal.maxTurns);
-      state.ui.requestRender();
-    }
-    if (abortController.signal.aborted) {
-      state.userInitiatedAbort = false;
-      return;
-    }
-    if (continuation) {
-      if (currentGoal.status !== "active") {
-        return;
-      }
-      if (drainQueuedAction(ctx)) {
-        return;
-      }
-      try {
-        await state.harness.sendSignal({
-          type: "system-reminder",
-          contents: continuation,
-          attributes: { type: "goal-judge" },
-          metadata: {
-            goalId: currentGoal.id,
-            turnsUsed: currentGoal.turnsUsed,
-            maxTurns: currentGoal.maxTurns,
-            judgeModelId: currentGoal.judgeModelId
-          }
-        }).accepted;
-      } catch (error) {
-        ctx.showError(`Failed to send goal continuation: ${error instanceof Error ? error.message : String(error)}`);
-      }
-    } else {
-      if (judgeResult) {
-        const harness = state.harness;
-        await harness.saveSystemReminderMessage?.({
-          reminderType: "goal-judge",
-          message: `${judgeResult.decision} (${currentGoal.turnsUsed}/${currentGoal.maxTurns})
-${judgeResult.reason}`
-        });
-      }
-      if (currentGoal.status === "paused") {
-        showInfo(
-          state,
-          `Goal paused (attempt ${currentGoal.turnsUsed}/${currentGoal.maxTurns}). Use /goal resume to continue.`
-        );
-      }
-      if (judgeResult?.decision === "done" && currentGoal.id === state.planStartedGoalId) {
-        const goalId = state.planStartedGoalId;
-        state.planStartedGoalId = void 0;
-        try {
-          await state.harness.switchMode({ modeId: "plan" });
-        } catch (error) {
-          ctx.showError(`Failed to switch to Plan mode: ${error instanceof Error ? error.message : String(error)}`);
-          state.planStartedGoalId = goalId;
-        }
-      }
-    }
-  }).catch(() => {
-  }).finally(() => {
-    if (state.activeGoalJudge === activeGoalJudge) {
-      state.activeGoalJudge = void 0;
+  if (payload.status !== "active") {
+    state.activeGoalJudge = void 0;
+  }
+  if (payload.status === "done") {
+    const goal = state.goalManager.getGoal();
+    if (goal && goal.id === state.planStartedGoalId) {
+      const goalId = state.planStartedGoalId;
+      state.planStartedGoalId = void 0;
+      state.harness.switchMode({ modeId: "plan" }).catch((error) => {
+        ctx.showError(`Failed to switch to Plan mode: ${error instanceof Error ? error.message : String(error)}`);
+        state.planStartedGoalId = goalId;
+      });
     }
-    state.gradientAnimator?.fadeOut();
-    ctx.updateStatusLine();
-    state.ui.requestRender();
-  });
+  }
 }
 function getCurrentModeColor4(ctx) {
-  return ctx.state.harness.getCurrentMode?.()?.color;
+  const color = ctx.state.harness.getCurrentMode?.()?.metadata?.color;
+  return typeof color === "string" ? color : void 0;
 }
 function getTrailingContentParts(message) {
   let lastToolIndex = -1;
@@ -15377,6 +15008,7 @@ function getTrailingContentParts(message) {
   return message.content.slice(lastToolIndex + 1);
 }
 var HIDDEN_REACTIVE_SIGNAL_TAGS2 = /* @__PURE__ */ new Set(["github-subscribe-pr", "github-unsubscribe-pr"]);
+var GOAL_STATE_SIGNAL_ID2 = "goal";
 function shouldRenderReactiveSignal2(tagName) {
   return !HIDDEN_REACTIVE_SIGNAL_TAGS2.has(tagName);
 }
@@ -15585,7 +15217,7 @@ function handleMessageUpdate(ctx, message) {
   const notificationSummaryParts = message.content.map(toStreamedNotificationSummaryPart).filter((part) => part !== void 0);
   const notificationParts = message.content.map(toStreamedNotificationPart).filter((part) => part !== void 0);
   for (const stateSignal of stateSignalParts) {
-    if (stateSignal.stateId === TASKS_STATE_ID) continue;
+    if (stateSignal.stateId === TASKS_STATE_ID || stateSignal.stateId === GOAL_STATE_SIGNAL_ID2) continue;
     const stateSignalKey = `state:${message.id}:${stateSignal.cacheKey ?? ""}:${stateSignal.stateId}:${stateSignal.mode}:${stateSignal.version ?? ""}:${stateSignal.message ?? ""}`;
     if (!state.currentRunSystemReminderKeys.has(stateSignalKey)) {
       state.currentRunSystemReminderKeys.add(stateSignalKey);
@@ -15744,23 +15376,23 @@ function getInsertIndexBeforeStreaming(ctx) {
 }
 function addChildBeforeStreaming(ctx, child) {
   const insertIndex = getInsertIndexBeforeStreaming(ctx);
-  if (insertIndex < ctx.state.chatContainer.children.length) {
-    ctx.state.chatContainer.children.splice(insertIndex, 0, child);
-    ctx.state.chatContainer.invalidate();
-    return;
-  }
-  ctx.state.chatContainer.addChild(child);
+  insertChatComponentWithBoundarySpacing(ctx.state.chatContainer, child, insertIndex);
 }
 function isImmediatelyBeforeStreamingInsert(ctx, child) {
   const insertIndex = getInsertIndexBeforeStreaming(ctx);
-  return insertIndex > 0 && ctx.state.chatContainer.children[insertIndex - 1] === child;
+  for (let i = insertIndex - 1; i >= 0; i--) {
+    if (!isChatBoundarySpacer(ctx.state.chatContainer.children[i])) {
+      return ctx.state.chatContainer.children[i] === child;
+    }
+  }
+  return false;
 }
 function removeChatChild(ctx, child) {
   if (!child) return;
   const idx = ctx.state.chatContainer.children.indexOf(child);
   if (idx >= 0) {
     ctx.state.chatContainer.children.splice(idx, 1);
-    ctx.state.chatContainer.invalidate();
+    reconcileChatBoundarySpacers(ctx.state.chatContainer);
   }
 }
 function handleOMObservationStart(ctx, cycleId, tokensToObserve) {
@@ -16552,12 +16184,12 @@ var CustomEditor = class extends Editor {
     const promptBrightness = isPromptAnimated ? Math.max(chevronBrightness, dotBrightness) : 1;
     if (this._cachedModeColorHex !== color) {
       this._cachedModeColorHex = color;
-      this._cachedColorFn = chalk14.hex(color);
+      this._cachedColorFn = chalk12.hex(color);
     }
     const colorFn = this._cachedColorFn;
     const b = colorFn;
     const [r, g, bValue] = parseHex(color);
-    const prompt = chalk14.bold.rgb(
+    const prompt = chalk12.bold.rgb(
       Math.round(r * promptBrightness),
       Math.round(g * promptBrightness),
       Math.round(bValue * promptBrightness)
@@ -16988,7 +16620,8 @@ function createTUIState(options) {
     if (result.activeGoalJudge) {
       return mastra.blue;
     }
-    return options.harness.getCurrentMode()?.color;
+    const color = options.harness.getCurrentMode()?.metadata?.color;
+    return typeof color === "string" ? color : void 0;
   };
   return result;
 }
@@ -17091,7 +16724,10 @@ async function dispatchEvent(event, ectx, state) {
         state.activeGithubPrSubscriptions = getGithubPrSubscriptionsFromMetadata(metadata);
         state.githubPrPollingActive = false;
         state.githubPrGradientAnimator?.stop();
-        state.goalManager?.loadFromThreadMetadata(metadata);
+        await state.goalManager.loadFromThread(state);
+        if (!state.goalManager.getGoal()) {
+          state.goalManager.loadFromThreadMetadata(metadata);
+        }
       }
       break;
     }
@@ -17237,6 +16873,10 @@ async function dispatchEvent(event, ectx, state) {
       }
       break;
     }
+    case "goal_evaluation": {
+      handleGoalEvaluation(ectx, event.payload);
+      break;
+    }
     case "tool_suspended": {
       const payload = event.suspendPayload ?? {};
       if (event.toolName === "request_access" || payload.kind === "sandbox_access_request") {
@@ -17399,7 +17039,7 @@ function gradientChar(ch, colIdx, totalCols) {
   const segment = Math.min(Math.floor(t * segmentCount), segmentCount - 1);
   const frac = t * segmentCount - segment;
   const [r, g, b] = lerpColor(GRADIENT_STOPS[segment], GRADIENT_STOPS[segment + 1], frac);
-  return chalk14.rgb(r, g, b)(ch);
+  return chalk12.rgb(r, g, b)(ch);
 }
 function colorLine(line) {
   const chars = [...line];
@@ -17550,7 +17190,7 @@ var TaskProgressComponent = class extends Container {
     switch (task.status) {
       case "completed": {
         const icon = theme.fg("dim", "\u2713");
-        const text = chalk14.strikethrough(theme.fg("dim", task.content));
+        const text = chalk12.strikethrough(theme.fg("dim", task.content));
         return `${icon} ${text}`;
       }
       case "in_progress": {
@@ -17570,7 +17210,7 @@ var TaskProgressComponent = class extends Container {
     switch (task.status) {
       case "completed": {
         const icon = theme.fg("success", "\u2713");
-        const text = chalk14.hex(theme.getTheme().success).strikethrough(task.content);
+        const text = chalk12.hex(theme.getTheme().success).strikethrough(task.content);
         return `${indent}${icon} ${text}`;
       }
       case "in_progress": {
@@ -17731,6 +17371,9 @@ function abortActiveGoalJudge(state) {
   state.userInitiatedAbort = true;
   activeGoalJudge.abortController.abort();
   activeGoalJudge.component.setInterrupted();
+  state.goalManager.pause();
+  void state.goalManager.saveToThread(state);
+  state.activeGoalJudge = void 0;
   state.ui.requestRender();
   return true;
 }
@@ -17855,10 +17498,10 @@ function setupAutocomplete(state) {
         { value: "status", label: "status", description: "Show current goal status" },
         { value: "pause", label: "pause", description: "Pause the goal continuation loop" },
         { value: "resume", label: "resume", description: "Resume the current goal" },
-        { value: "clear", label: "clear", description: "Clear the current goal" }
+        { value: "clear", label: "clear", description: "Clear the current goal" },
+        { value: "judge", label: "judge", description: "Set the goal judge model and max attempts" }
       ].filter((command) => command.value.startsWith(argumentPrefix.toLowerCase()))
     },
-    { name: "judge", description: "Set goal judge defaults" },
     { name: "exit", description: "Exit the TUI" },
     { name: "help", description: "Show available commands" }
   ];
@@ -18087,7 +17730,6 @@ var ShellStreamComponent = class extends Container {
   }
   rebuild() {
     this.clear();
-    this.addChild(new Spacer(1));
     const border = (char) => theme.bold(theme.fg("accent", char));
     const termWidth = getTermWidth();
     const maxLineWidth = termWidth - 6;
@@ -18125,6 +17767,9 @@ var ShellStreamComponent = class extends Container {
     }
     this.invalidate();
   }
+  getChatSpacingKind() {
+    return "other";
+  }
 };
 
 // src/tui/shell-result.ts
@@ -18188,7 +17833,7 @@ async function handleShellPassthrough(state, command) {
     component.setExpanded(true);
   }
   state.allShellComponents.push(component);
-  state.chatContainer.addChild(component);
+  insertChatComponentWithBoundarySpacing(state.chatContainer, component);
   state.ui.requestRender();
   try {
     const { invocation, subprocess } = await createShellPassthroughSubprocess(command, loadSettings().shellPassthrough);
@@ -18242,7 +17887,10 @@ async function syncInitialThreadState(state) {
   }
   const metadata = initThread?.metadata;
   state.activeGithubPrSubscriptions = getGithubPrSubscriptionsFromMetadata(metadata);
-  state.goalManager.loadFromThreadMetadata(metadata);
+  await state.goalManager.loadFromThread(state);
+  if (!state.goalManager.getGoal()) {
+    state.goalManager.loadFromThreadMetadata(metadata);
+  }
 }
 function shouldUseCaffeinate() {
   return process.platform === "darwin" && process.env.MASTRACODE_DISABLE_CAFFEINATE !== "1";
@@ -19129,7 +18777,7 @@ var MastraTUI = class _MastraTUI {
         onSelectModel: async (title, modeColor) => {
           const availableModels = await this.state.harness.listAvailableModels();
           if (availableModels.length === 0) return void 0;
-          return new Promise((resolveModel2) => {
+          return new Promise((resolveModel) => {
             const selector = new ModelSelectorComponent({
               tui: this.state.ui,
               models: availableModels,
@@ -19139,11 +18787,11 @@ var MastraTUI = class _MastraTUI {
               onSelect: async (model) => {
                 this.state.ui.hideOverlay();
                 await promptForApiKeyIfNeeded(this.state.ui, model, this.state.authStorage);
-                resolveModel2(model.id);
+                resolveModel(model.id);
               },
               onCancel: () => {
                 this.state.ui.hideOverlay();
-                resolveModel2(void 0);
+                resolveModel(void 0);
               }
             });
             showModalOverlay(this.state.ui, selector, { maxHeight: "75%" });
@@ -19245,7 +18893,8 @@ var MastraTUI = class _MastraTUI {
     const tools = this.state.allToolComponents.filter(
       (tool) => typeof tool.setQuietModeDisplay === "function"
     );
-    const modeColor = this.state.harness?.getCurrentMode?.()?.color;
+    const color = this.state.harness?.getCurrentMode?.()?.metadata?.color;
+    const modeColor = typeof color === "string" ? color : void 0;
     for (const tool of tools) {
       tool.setCompactToolModeColor?.(modeColor);
       tool.setQuietModeDisplay?.(enabled ? "quiet" : "normal");
@@ -19363,7 +19012,7 @@ Would you like to update now?`;
         },
         this.state.ui
       );
-      this.state.chatContainer.addChild(component);
+      insertChatComponentWithBoundarySpacing(this.state.chatContainer, component);
       this.state.activeInlineQuestion = component;
       component.focused = true;
       this.state.ui.requestRender();
@@ -19391,5 +19040,5 @@ Would you like to update now?`;
 };
 
 export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus, getCurrentVersion };
-//# sourceMappingURL=chunk-OXYE6SUY.js.map
-//# sourceMappingURL=chunk-OXYE6SUY.js.map
+//# sourceMappingURL=chunk-GKGPZBID.js.map
+//# sourceMappingURL=chunk-GKGPZBID.js.map