mastracode 0.4.0 → 0.5.0

package/dist/{chunk-X3BGE7CL.js → chunk-YQNZ7DHQ.js}

@@ -1,22 +1,133 @@
-import { theme, mastra, getMarkdownTheme, getEditorTheme, loadSettings, saveSettings, getAvailableModePacks, getAvailableOmPacks, ONBOARDING_VERSION, ThreadLockError, parseSubagentMeta, tintHex, getSelectListTheme, getThemeMode, applyThemeMode, getSettingsListTheme } from './chunk-REVOTI2T.js';
-import { getOAuthProviders, detectProject, getUserId, getCurrentGitBranch, PROVIDER_DEFAULT_MODELS } from './chunk-SM3QCOA7.js';
-import { getToolCategory, TOOL_CATEGORIES } from './chunk-U5A7TFNT.js';
+import { theme, mastra, getMarkdownTheme, getEditorTheme, loadSettings, getAvailableModePacks, resolveThreadActiveModelPackId, saveSettings, getAvailableOmPacks, ONBOARDING_VERSION, THREAD_ACTIVE_MODEL_PACK_ID_KEY, ThreadLockError, parseSubagentMeta, tintHex, getSelectListTheme, getThemeMode, applyThemeMode, getCustomProviderId, getSettingsListTheme, toCustomProviderModelId } from './chunk-JI4M5525.js';
+import { getOAuthProviders, detectProject, getUserId, getCurrentGitBranch, getAppDataDir, PROVIDER_DEFAULT_MODELS } from './chunk-SM3QCOA7.js';
+import { MC_TOOLS, getToolCategory, TOOL_CATEGORIES } from './chunk-CC2724NI.js';
 import { Box, Text, Spacer, Input, Container, fuzzyFilter, getEditorKeybindings, Markdown, ProcessTerminal, TUI, Editor, matchesKey, CombinedAutocompleteProvider, SelectList, visibleWidth, SettingsList, isKeyRelease } from '@mariozechner/pi-tui';
 import chalk10 from 'chalk';
-import { exec, execFileSync, execSync } from 'child_process';
-import fs2, { readFileSync, unlinkSync, promises } from 'fs';
-import * as path4 from 'path';
-import path4__default, { join } from 'path';
+import { exec, execFile, execSync, execFileSync } from 'child_process';
+import fs2, { realpathSync, readFileSync, unlinkSync, promises } from 'fs';
+import { createRequire } from 'module';
+import * as path5 from 'path';
+import path5__default, { join } from 'path';
 import { defaultOMProgressState } from '@mastra/core/harness';
 import * as os from 'os';
 import { tmpdir } from 'os';
 import { highlight } from 'cli-highlight';
+import fs4 from 'fs/promises';
 import { parse } from 'partial-json';
 import * as yaml from 'js-yaml';
 
 // src/auth/claude-max-warning.ts
 var ANTHROPIC_OAUTH_PROVIDER_ID = "anthropic";
 var CLAUDE_MAX_OAUTH_WARNING_MESSAGE = "OAuth with a Claude Max plan is a grey area. Anthropic has reportedly banned users for using Claude max credentials outside of Claude Code, and it may violate Anthropic Terms of Service. Proceed at your own risk.";
+var AskQuestionInlineComponent = class extends Container {
+  contentBox;
+  selectList;
+  input;
+  onSubmit;
+  onCancel;
+  formatResult;
+  isNegativeAnswer;
+  allowEmptyInput = false;
+  answered = false;
+  questionText;
+  _focused = false;
+  get focused() {
+    return this._focused;
+  }
+  set focused(value) {
+    this._focused = value;
+    if (!this.answered && this.input) {
+      this.input.focused = value;
+    }
+  }
+  constructor(options, _ui) {
+    super();
+    this.onSubmit = options.onSubmit;
+    this.onCancel = options.onCancel;
+    this.formatResult = options.formatResult;
+    this.isNegativeAnswer = options.isNegativeAnswer;
+    this.allowEmptyInput = Boolean(options.allowEmptyInput);
+    this.questionText = options.question;
+    this.addChild(new Spacer(1));
+    this.contentBox = new Box(1, 1, (text) => theme.bg("toolPendingBg", text));
+    this.addChild(this.contentBox);
+    this.contentBox.addChild(new Text(theme.bold(theme.fg("accent", "\u2753 Question")), 0, 0));
+    this.contentBox.addChild(new Spacer(1));
+    for (const line of options.question.split("\n")) {
+      this.contentBox.addChild(new Text(theme.fg("text", line), 0, 0));
+    }
+    this.contentBox.addChild(new Spacer(1));
+    if (options.options && options.options.length > 0) {
+      this.buildSelectMode(options.options);
+    } else {
+      this.buildInputMode();
+    }
+  }
+  buildSelectMode(opts) {
+    const items = opts.map((opt) => ({
+      value: opt.label,
+      label: opt.description ? `  ${opt.label}  ${theme.fg("dim", opt.description)}` : `  ${opt.label}`
+    }));
+    this.selectList = new SelectList(items, Math.min(items.length, 8), getSelectListTheme());
+    this.selectList.onSelect = (item) => {
+      this.handleAnswer(item.value);
+    };
+    this.selectList.onCancel = () => {
+      this.handleCancel();
+    };
+    this.contentBox.addChild(this.selectList);
+    this.contentBox.addChild(new Spacer(1));
+    this.contentBox.addChild(new Text(theme.fg("dim", "\u2191\u2193 to navigate \xB7 Enter to select \xB7 Esc to skip"), 0, 0));
+  }
+  buildInputMode() {
+    this.input = new Input();
+    this.input.onSubmit = (value) => {
+      const trimmed = value.trim();
+      if (trimmed || this.allowEmptyInput) {
+        this.handleAnswer(trimmed);
+      }
+    };
+    this.contentBox.addChild(this.input);
+    this.contentBox.addChild(new Spacer(1));
+    this.contentBox.addChild(new Text(theme.fg("dim", "Enter to submit \xB7 Esc to skip"), 0, 0));
+  }
+  handleAnswer(answer) {
+    if (this.answered) return;
+    this.answered = true;
+    const isNegative = this.isNegativeAnswer?.(answer) ?? false;
+    this.contentBox.clear();
+    this.contentBox.setBgFn((text) => theme.bg(isNegative ? "toolErrorBg" : "toolSuccessBg", text));
+    const resultText = this.formatResult ? this.formatResult(answer) : `${this.questionText} \u2192 ${answer}`;
+    const icon = isNegative ? theme.fg("error", "\u2717") : theme.fg("success", "\u2713");
+    this.contentBox.addChild(new Text(theme.fg("text", `${icon} ${resultText}`), 0, 0));
+    this.onSubmit(answer);
+  }
+  handleCancel() {
+    if (this.answered) return;
+    this.answered = true;
+    this.contentBox.clear();
+    this.contentBox.setBgFn((text) => theme.bg("toolErrorBg", text));
+    this.contentBox.addChild(
+      new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} ${this.questionText} (cancelled)`), 0, 0)
+    );
+    this.onCancel();
+  }
+  handleInput(data) {
+    if (this.answered) return;
+    if (this.selectList) {
+      this.selectList.handleInput(data);
+    } else if (this.input) {
+      const kb = getEditorKeybindings();
+      if (kb.matches(data, "selectCancel")) {
+        this.handleCancel();
+        return;
+      }
+      this.input.handleInput(data);
+    }
+  }
+};
+
+// src/onboarding/onboarding-inline.ts
 var OnboardingInlineComponent = class extends Container {
   tui;
   options;
@@ -24,6 +135,7 @@ var OnboardingInlineComponent = class extends Container {
   currentStep = "welcome";
   stepBox;
   selectList;
+  activeInlineQuestion;
   _finished = false;
   // Collected choices
   loginRequested = false;
@@ -235,25 +347,22 @@ var OnboardingInlineComponent = class extends Container {
   modePackDetail;
   renderModePack() {
     const packs = this.options.modePacks;
+    const box = this.makeBox();
     if (!this.options.hasProviderAccess) {
-      const box2 = this.makeBox();
-      box2.addChild(new Text(theme.bold(theme.fg("error", "No model providers configured")), 0, 0));
-      box2.addChild(new Spacer(1));
-      box2.addChild(new Text(theme.fg("text", "To use Mastra Code you need at least one API key or OAuth login"), 0, 0));
-      box2.addChild(new Text(theme.fg("text", "for Anthropic, OpenAI, or another supported provider."), 0, 0));
-      box2.addChild(new Spacer(1));
-      box2.addChild(
+      box.addChild(new Text(theme.bold(theme.fg("warning", "No model providers configured")), 0, 0));
+      box.addChild(new Spacer(1));
+      box.addChild(new Text(theme.fg("text", "To use Mastra Code you need at least one API key or OAuth login"), 0, 0));
+      box.addChild(new Text(theme.fg("text", "for Anthropic, OpenAI, or another supported provider."), 0, 0));
+      box.addChild(new Spacer(1));
+      box.addChild(
         new Text(theme.fg("dim", "See https://mastra.ai/models for supported providers and API key env vars."), 0, 0)
       );
-      box2.addChild(new Spacer(1));
-      box2.addChild(
+      box.addChild(new Spacer(1));
+      box.addChild(
         new Text(theme.fg("dim", "Set an API key and restart, or run /login to authenticate via OAuth."), 0, 0)
       );
-      this._finished = true;
-      setTimeout(() => process.exit(1), 3e3);
-      return;
+      box.addChild(new Spacer(1));
     }
-    const box = this.makeBox();
     box.addChild(new Text(theme.bold(theme.fg("accent", "Model Packs")), 0, 0));
     box.addChild(new Spacer(1));
     box.addChild(new Text(theme.fg("text", "Choose default models for each mode (build / plan / fast):"), 0, 0));
@@ -310,9 +419,42 @@ var OnboardingInlineComponent = class extends Container {
   // ---------------------------------------------------------------------------
   // Custom pack flow — sequential model selection for each mode
   // ---------------------------------------------------------------------------
+  async promptCustomPackName() {
+    return new Promise((resolve2) => {
+      const question = new AskQuestionInlineComponent(
+        {
+          question: "Name this custom pack",
+          formatResult: (answer) => `Custom pack: ${answer}`,
+          onSubmit: (answer) => {
+            this.activeInlineQuestion = void 0;
+            const trimmed = answer.trim();
+            resolve2(trimmed.length > 0 ? trimmed : null);
+          },
+          onCancel: () => {
+            this.activeInlineQuestion = void 0;
+            resolve2(null);
+          }
+        },
+        this.tui
+      );
+      this.activeInlineQuestion = question;
+      this.stepBox.addChild(new Spacer(1));
+      this.stepBox.addChild(question);
+      this.tui.requestRender();
+    });
+  }
   async runCustomPackFlow() {
     this.selectList = void 0;
-    this.collapseStep("Model pack \u2192 Custom");
+    const packName = await this.promptCustomPackName();
+    if (!packName) {
+      const fallback = this.options.modePacks.find((p) => p.id !== "custom") ?? this.options.modePacks[0];
+      this.selectedModePack = fallback;
+      this.collapseStep(`Model pack \u2192 ${theme.bold(this.selectedModePack.name)} (cancelled custom)`);
+      this.renderStep("omPack");
+      this.tui.requestRender();
+      return;
+    }
+    this.collapseStep(`Model pack \u2192 Custom (${packName})`);
     const modes = [
       { id: "plan", label: "plan", color: mastra.blue },
       { id: "build", label: "build", color: mastra.purple },
@@ -333,13 +475,13 @@ var OnboardingInlineComponent = class extends Container {
       models[mode.id] = modelId;
     }
     this.selectedModePack = {
-      id: "custom",
-      name: "Custom",
-      description: "User-selected models",
+      id: `custom:${packName}`,
+      name: packName,
+      description: "Saved custom pack",
       models: { build: models.build, plan: models.plan, fast: models.fast }
     };
     this.collapseStep(
-      `Model pack \u2192 ${theme.bold("Custom")}  ${chalk10.hex(mastra.blue)("plan")} ${models.plan}  ${chalk10.hex(mastra.purple)("build")} ${models.build}  ${chalk10.hex(mastra.green)("fast")} ${models.fast}`
+      `Model pack \u2192 ${theme.bold(packName)}  ${chalk10.hex(mastra.blue)("plan")} ${models.plan}  ${chalk10.hex(mastra.purple)("build")} ${models.build}  ${chalk10.hex(mastra.green)("fast")} ${models.fast}`
     );
     this.renderStep("omPack");
     this.tui.requestRender();
@@ -481,125 +623,128 @@ var OnboardingInlineComponent = class extends Container {
     this.stepBox.setBgFn((text) => theme.bg("toolSuccessBg", text));
     this.stepBox.addChild(new Text(`${theme.fg("success", "\u2713")} ${theme.fg("text", summary)}`, 0, 0));
     this.selectList = void 0;
+    this.activeInlineQuestion = void 0;
   }
   // ---------------------------------------------------------------------------
   // Input handling
   // ---------------------------------------------------------------------------
   handleInput(data) {
     if (this._finished) return;
+    if (this.activeInlineQuestion) {
+      this.activeInlineQuestion.handleInput(data);
+      return;
+    }
     if (this.selectList) {
       this.selectList.handleInput(data);
       return;
     }
   }
 };
-var AskQuestionInlineComponent = class extends Container {
-  contentBox;
-  selectList;
-  input;
-  onSubmit;
-  onCancel;
-  formatResult;
-  isNegativeAnswer;
-  answered = false;
-  questionText;
-  _focused = false;
-  get focused() {
-    return this._focused;
+var PACKAGE_NAME = "mastracode";
+var NPM_REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+var FETCH_TIMEOUT_MS = 5e3;
+function matchPM(str) {
+  if (/pnpm/i.test(str)) return "pnpm";
+  if (/\byarn\b/i.test(str)) return "yarn";
+  if (/\bbun\b/i.test(str)) return "bun";
+  if (/\bnpm\b/i.test(str)) return "npm";
+  return null;
+}
+async function detectPackageManager() {
+  const userAgent = process.env.npm_config_user_agent;
+  if (userAgent) {
+    const pm = matchPM(userAgent);
+    if (pm) return pm;
   }
-  set focused(value) {
-    this._focused = value;
-    if (!this.answered && this.input) {
-      this.input.focused = value;
-    }
+  const execPath = process.env.npm_execpath;
+  if (execPath) {
+    const pm = matchPM(execPath);
+    if (pm) return pm;
   }
-  constructor(options, _ui) {
-    super();
-    this.onSubmit = options.onSubmit;
-    this.onCancel = options.onCancel;
-    this.formatResult = options.formatResult;
-    this.isNegativeAnswer = options.isNegativeAnswer;
-    this.questionText = options.question;
-    this.addChild(new Spacer(1));
-    this.contentBox = new Box(1, 1, (text) => theme.bg("toolPendingBg", text));
-    this.addChild(this.contentBox);
-    this.contentBox.addChild(new Text(theme.bold(theme.fg("accent", "\u2753 Question")), 0, 0));
-    this.contentBox.addChild(new Spacer(1));
-    for (const line of options.question.split("\n")) {
-      this.contentBox.addChild(new Text(theme.fg("text", line), 0, 0));
-    }
-    this.contentBox.addChild(new Spacer(1));
-    if (options.options && options.options.length > 0) {
-      this.buildSelectMode(options.options);
-    } else {
-      this.buildInputMode();
-    }
-  }
-  buildSelectMode(opts) {
-    const items = opts.map((opt) => ({
-      value: opt.label,
-      label: opt.description ? `  ${opt.label}  ${theme.fg("dim", opt.description)}` : `  ${opt.label}`
-    }));
-    this.selectList = new SelectList(items, Math.min(items.length, 8), getSelectListTheme());
-    this.selectList.onSelect = (item) => {
-      this.handleAnswer(item.value);
-    };
-    this.selectList.onCancel = () => {
-      this.handleCancel();
-    };
-    this.contentBox.addChild(this.selectList);
-    this.contentBox.addChild(new Spacer(1));
-    this.contentBox.addChild(new Text(theme.fg("dim", "\u2191\u2193 to navigate \xB7 Enter to select \xB7 Esc to skip"), 0, 0));
+  const nodePath = process.env.NODE_PATH;
+  if (nodePath) {
+    if (/[/\\]\.pnpm[/\\]/.test(nodePath) || /[/\\]pnpm[/\\]/.test(nodePath)) return "pnpm";
+    if (/[/\\]\.yarn[/\\]/.test(nodePath)) return "yarn";
+    if (/[/\\]\.bun[/\\]/.test(nodePath)) return "bun";
   }
-  buildInputMode() {
-    this.input = new Input();
-    this.input.onSubmit = (value) => {
-      const trimmed = value.trim();
-      if (trimmed) {
-        this.handleAnswer(trimmed);
-      }
-    };
-    this.contentBox.addChild(this.input);
-    this.contentBox.addChild(new Spacer(1));
-    this.contentBox.addChild(new Text(theme.fg("dim", "Enter to submit \xB7 Esc to skip"), 0, 0));
+  try {
+    const scriptPath = realpathSync(process.argv[1] ?? "");
+    if (/[/\\]\.?pnpm[/\\]/.test(scriptPath)) return "pnpm";
+    if (/[/\\]\.?yarn[/\\]/.test(scriptPath)) return "yarn";
+    if (/[/\\]\.?bun[/\\]/.test(scriptPath)) return "bun";
+  } catch {
   }
-  handleAnswer(answer) {
-    if (this.answered) return;
-    this.answered = true;
-    const isNegative = this.isNegativeAnswer?.(answer) ?? false;
-    this.contentBox.clear();
-    this.contentBox.setBgFn((text) => theme.bg(isNegative ? "toolErrorBg" : "toolSuccessBg", text));
-    const resultText = this.formatResult ? this.formatResult(answer) : `${this.questionText} \u2192 ${answer}`;
-    const icon = isNegative ? theme.fg("error", "\u2717") : theme.fg("success", "\u2713");
-    this.contentBox.addChild(new Text(theme.fg("text", `${icon} ${resultText}`), 0, 0));
-    this.onSubmit(answer);
+  const pnpmResult = await new Promise((resolve2) => {
+    execFile("pnpm", ["list", "-g", "--depth=0", PACKAGE_NAME], { timeout: 3e3 }, (error, stdout) => {
+      resolve2(!error && stdout.includes(PACKAGE_NAME));
+    });
+  });
+  if (pnpmResult) return "pnpm";
+  return "npm";
+}
+function getInstallCommand(pm, version) {
+  const pkg = version ? `${PACKAGE_NAME}@${version}` : `${PACKAGE_NAME}@latest`;
+  switch (pm) {
+    case "pnpm":
+      return `pnpm add -g ${pkg}`;
+    case "yarn":
+      return `yarn global add ${pkg}`;
+    case "bun":
+      return `bun add -g ${pkg}`;
+    default:
+      return `npm install -g ${pkg}`;
   }
-  handleCancel() {
-    if (this.answered) return;
-    this.answered = true;
-    this.contentBox.clear();
-    this.contentBox.setBgFn((text) => theme.bg("toolErrorBg", text));
-    this.contentBox.addChild(
-      new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} ${this.questionText} (cancelled)`), 0, 0)
-    );
-    this.onCancel();
+}
+function getCurrentVersion() {
+  const require2 = createRequire(import.meta.url);
+  const pkg = require2("../../package.json");
+  return pkg.version;
+}
+async function fetchLatestVersion() {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    const res = await fetch(NPM_REGISTRY_URL, { signal: controller.signal });
+    clearTimeout(timeout);
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.version ?? null;
+  } catch {
+    return null;
   }
-  handleInput(data) {
-    if (this.answered) return;
-    if (this.selectList) {
-      this.selectList.handleInput(data);
-    } else if (this.input) {
-      const kb = getEditorKeybindings();
-      if (kb.matches(data, "selectCancel")) {
-        this.handleCancel();
-        return;
-      }
-      this.input.handleInput(data);
-    }
+}
+function isNewerVersion(current, latest) {
+  const parse = (v) => v.replace(/^v/, "").split("-")[0].split(".").map((s) => {
+    const n = Number(s);
+    return Number.isFinite(n) ? n : 0;
+  });
+  const [cMajor = 0, cMinor = 0, cPatch = 0] = parse(current);
+  const [lMajor = 0, lMinor = 0, lPatch = 0] = parse(latest);
+  if (lMajor !== cMajor) return lMajor > cMajor;
+  if (lMinor !== cMinor) return lMinor > cMinor;
+  return lPatch > cPatch;
+}
+function runUpdate(pm, targetVersion) {
+  const args = buildInstallArgs(pm, targetVersion);
+  return new Promise((resolve2) => {
+    execFile(pm, args, { timeout: 6e4 }, (error) => {
+      resolve2(!error);
+    });
+  });
+}
+function buildInstallArgs(pm, version) {
+  const pkg = `${PACKAGE_NAME}@${version}`;
+  switch (pm) {
+    case "pnpm":
+      return ["add", "-g", pkg];
+    case "yarn":
+      return ["global", "add", pkg];
+    case "bun":
+      return ["add", "-g", pkg];
+    default:
+      return ["install", "-g", pkg];
   }
-};
-
-// src/tui/claude-max-warning.ts
+}
 function showClaudeMaxOAuthWarning(state, mode) {
   const options = mode === "login" ? [
     { label: "Continue", description: "Proceed with Anthropic OAuth" },
@@ -695,7 +840,7 @@ async function replaceFileReferences(template, workingDir) {
   for (const match of matches) {
     const [fullMatch, filePath] = match;
     try {
-      const fullPath = path4.resolve(workingDir, filePath);
+      const fullPath = path5.resolve(workingDir, filePath);
       const content = await promises.readFile(fullPath, "utf-8");
       result = result.replace(fullMatch, content);
     } catch (error) {
@@ -715,13 +860,14 @@ function getCommands(modes) {
     { key: "/name", description: "Rename current thread" },
     { key: "/resource", description: "Show/switch resource ID" },
     { key: "/skills", description: "List available skills" },
-    { key: "/models", description: "Configure model" },
-    { key: "/models:pack", description: "Switch model pack" },
+    { key: "/models", description: "Switch model pack" },
+    { key: "/custom-providers", description: "Manage custom providers and models" },
     { key: "/subagents", description: "Configure subagent models" },
     { key: "/permissions", description: "Tool approval permissions" },
     { key: "/settings", description: "Notifications, YOLO, thinking" },
     { key: "/om", description: "Configure Observational Memory" },
     { key: "/review", description: "Review a GitHub pull request" },
+    { key: "/report-issue", description: "Open or browse mastracode issues" },
     { key: "/cost", description: "Token usage and costs" },
     { key: "/diff", description: "Modified files or git diff" },
     { key: "/sandbox", description: "Manage sandbox allowed paths" },
@@ -748,7 +894,8 @@ function getShortcuts(modes) {
     { key: "Ctrl+T", description: "Toggle thinking blocks" },
     { key: "Ctrl+E", description: "Expand/collapse tool outputs" },
     { key: "Ctrl+Y", description: "Toggle YOLO mode" },
-    { key: "Ctrl+Z", description: "Undo last clear" }
+    { key: "Ctrl+Z", description: "Suspend process (fg to resume)" },
+    { key: "Alt+Z", description: "Undo last clear" }
   ];
   if (modes > 1) {
     shortcuts.push({ key: "\u21E7+Tab", description: "Cycle agent modes" });
@@ -957,7 +1104,7 @@ async function handlePermissionsCommand(ctx, args) {
   await showPermissions(ctx);
 }
 async function showPermissions(ctx) {
-  const { TOOL_CATEGORIES: TOOL_CATEGORIES2, getToolsForCategory } = await import('./permissions-CVXKYIWR.js');
+  const { TOOL_CATEGORIES: TOOL_CATEGORIES2, getToolsForCategory } = await import('./permissions-S3LGXIDB.js');
   const rules = ctx.harness.getPermissionRules();
   const grants = ctx.harness.getSessionGrants();
   const isYolo = ctx.harness.getState().yolo === true;
@@ -1116,13 +1263,21 @@ Example mcp.json:
         "command": "npx",
         "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path"],
         "env": {}
+      },
+      "remote-api": {
+        "url": "https://mcp.example.com/sse",
+        "headers": { "Authorization": "Bearer <token>" }
       }
     }
-  }`
+  }
+
+Note: For dynamic auth (token refresh), use a stdio wrapper.
+"headers" only supports static values.`
     );
     return;
   }
   const statuses = mm.getServerStatuses();
+  const skipped = mm.getSkippedServers();
   const lines = [`MCP Servers:`];
   lines.push(`  Project: ${paths.project}`);
   lines.push(`  Global:  ${paths.global}`);
@@ -1131,13 +1286,20 @@ Example mcp.json:
   for (const status of statuses) {
     const icon = status.connected ? "\u2713" : "\u2717";
     const state = status.connected ? "connected" : `error: ${status.error}`;
-    lines.push(`  ${icon} ${status.name} (${state})`);
+    lines.push(`  ${icon} ${status.name} [${status.transport}] (${state})`);
     if (status.toolNames.length > 0) {
       for (const toolName of status.toolNames) {
         lines.push(`      - ${toolName}`);
       }
     }
   }
+  if (skipped.length > 0) {
+    lines.push("");
+    lines.push("  Skipped:");
+    for (const s of skipped) {
+      lines.push(`    \u2717 ${s.name}: ${s.reason}`);
+    }
+  }
   lines.push("");
   lines.push(`  /mcp reload - Disconnect and reconnect all servers`);
   ctx.showInfo(lines.join("\n"));
@@ -1203,11 +1365,80 @@ Skills are automatically activated by the agent when relevant.`
     ctx.showError(`Failed to list skills: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
-
-// src/tui/commands/new.ts
-function handleNewCommand(ctx) {
+
+// src/tui/commands/new.ts
+function handleNewCommand(ctx) {
+  const { state } = ctx;
+  state.pendingNewThread = true;
+  state.chatContainer.clear();
+  state.pendingTools.clear();
+  state.allToolComponents = [];
+  state.harness.getDisplayState().modifiedFiles.clear();
+  if (state.taskProgress) {
+    state.taskProgress.updateTasks([]);
+  }
+  state.taskWriteInsertIndex = -1;
+  ctx.updateStatusLine();
+  state.ui.requestRender();
+  ctx.showInfo("Ready for new conversation");
+}
+function confirmClone(state, threadLabel) {
+  const label = threadLabel ? `Clone thread "${threadLabel}"?` : "Clone the current thread?";
+  return new Promise((resolve2) => {
+    const question = new AskQuestionInlineComponent(
+      {
+        question: label,
+        options: [
+          { label: "Yes", description: "Clone this thread" },
+          { label: "No", description: "Cancel" }
+        ],
+        formatResult: (answer) => answer === "Yes" ? "Cloning thread..." : "Cancelled.",
+        isNegativeAnswer: (answer) => answer !== "Yes",
+        onSubmit: (answer) => {
+          state.activeInlineQuestion = void 0;
+          resolve2(answer === "Yes");
+        },
+        onCancel: () => {
+          state.activeInlineQuestion = void 0;
+          resolve2(false);
+        }
+      },
+      state.ui
+    );
+    state.activeInlineQuestion = question;
+    state.chatContainer.addChild(question);
+    state.chatContainer.addChild(new Spacer(1));
+    state.ui.requestRender();
+    state.chatContainer.invalidate();
+  });
+}
+function askCloneName(state) {
+  return new Promise((resolve2) => {
+    const question = new AskQuestionInlineComponent(
+      {
+        question: "Give the cloned thread a name? (Esc to skip)",
+        formatResult: (answer) => `Thread name: ${answer}`,
+        onSubmit: (answer) => {
+          state.activeInlineQuestion = void 0;
+          const trimmed = answer.trim();
+          resolve2(trimmed.length > 0 ? trimmed : null);
+        },
+        onCancel: () => {
+          state.activeInlineQuestion = void 0;
+          resolve2(null);
+        }
+      },
+      state.ui
+    );
+    state.activeInlineQuestion = question;
+    state.chatContainer.addChild(question);
+    state.chatContainer.addChild(new Spacer(1));
+    state.ui.requestRender();
+    state.chatContainer.invalidate();
+  });
+}
+async function resetUIAfterClone(ctx, clonedTitle) {
   const { state } = ctx;
-  state.pendingNewThread = true;
   state.chatContainer.clear();
   state.pendingTools.clear();
   state.allToolComponents = [];
@@ -1217,8 +1448,28 @@ function handleNewCommand(ctx) {
   }
   state.taskWriteInsertIndex = -1;
   ctx.updateStatusLine();
+  await ctx.renderExistingMessages();
   state.ui.requestRender();
-  ctx.showInfo("Ready for new conversation");
+  ctx.showInfo(`Cloned thread: ${clonedTitle}`);
+}
+async function handleCloneCommand(ctx) {
+  const { state } = ctx;
+  const currentThreadId = state.harness.getCurrentThreadId();
+  if (!currentThreadId) {
+    ctx.showInfo("No active thread to clone");
+    return;
+  }
+  if (!await confirmClone(state)) return;
+  const customTitle = await askCloneName(state);
+  try {
+    const clonedThread = await state.harness.cloneThread({
+      sourceThreadId: currentThreadId,
+      ...customTitle ? { title: customTitle } : {}
+    });
+    await resetUIAfterClone(ctx, clonedThread.title || clonedThread.id);
+  } catch (error) {
+    ctx.showError(`Failed to clone thread: ${error instanceof Error ? error.message : String(error)}`);
+  }
 }
 
 // src/tui/commands/resource.ts
@@ -1237,21 +1488,42 @@ async function handleResourceCommand(ctx, args) {
       ...knownIds.map((id) => `  ${id === current ? "* " : "  "}${id}`),
       "",
       "Usage:",
-      "  /resource <id>    - Switch to a resource ID",
-      "  /resource reset   - Reset to auto-detected ID"
+      "  /resource          - Show current resource and known IDs",
+      "  /resource <id>     - Switch to a resource ID (resumes latest thread)",
+      "  /resource reset    - Reset to auto-detected ID"
     ];
     ctx.showInfo(lines.join("\n"));
     return;
   }
   const newId = sub === "reset" ? defaultId : args.join(" ").trim();
+  if (newId === current) {
+    ctx.showInfo(`Already on resource: ${current}`);
+    return;
+  }
   harness.setResourceId({ resourceId: newId });
-  state.pendingNewThread = true;
-  state.chatContainer.clear();
-  state.pendingTools.clear();
-  state.allToolComponents = [];
+  const threads = await harness.listThreads();
+  const latest = [...threads].sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime())[0];
+  if (latest) {
+    await harness.switchThread({ threadId: latest.id });
+    state.chatContainer.clear();
+    state.pendingTools.clear();
+    state.allToolComponents = [];
+    state.pendingNewThread = false;
+    await ctx.renderExistingMessages();
+    ctx.showInfo(
+      sub === "reset" ? `Resource ID reset to: ${defaultId} \u2014 resumed thread: ${latest.title || latest.id}` : `Switched to resource: ${newId} \u2014 resumed thread: ${latest.title || latest.id}`
+    );
+  } else {
+    state.chatContainer.clear();
+    state.pendingTools.clear();
+    state.allToolComponents = [];
+    state.pendingNewThread = true;
+    ctx.showInfo(
+      sub === "reset" ? `Resource ID reset to: ${defaultId} (no existing threads, a new one will be created)` : `Switched to resource: ${newId} (no existing threads, a new one will be created)`
+    );
+  }
   ctx.updateStatusLine();
   state.ui.requestRender();
-  ctx.showInfo(sub === "reset" ? `Resource ID reset to: ${defaultId}` : `Switched to resource: ${newId}`);
 }
 function colorizeDiffLine(line) {
   const t = theme.getTheme();
@@ -1382,8 +1654,10 @@ var ThreadSelectorComponent = class extends Box {
   selectedIndex = 0;
   currentThreadId;
   currentResourceId;
+  currentProjectPath;
   onSelectCallback;
   onCancelCallback;
+  onCloneCallback;
   tui;
   getMessagePreview;
   messagePreviews = /* @__PURE__ */ new Map();
@@ -1400,10 +1674,12 @@ var ThreadSelectorComponent = class extends Box {
     super(2, 1, (text) => theme.bg("overlayBg", text));
     this.tui = options.tui;
     this.currentResourceId = options.currentResourceId;
+    this.currentProjectPath = options.currentProjectPath;
     this.allThreads = this.sortThreads(options.threads, options.currentThreadId);
     this.currentThreadId = options.currentThreadId;
     this.onSelectCallback = options.onSelect;
     this.onCancelCallback = options.onCancel;
+    this.onCloneCallback = options.onClone;
     this.getMessagePreview = options.getMessagePreview;
     this.filteredThreads = this.allThreads;
     this.buildUI();
@@ -1426,7 +1702,10 @@ var ThreadSelectorComponent = class extends Box {
   buildUI() {
     this.addChild(new Text(theme.bold(theme.fg("accent", "Select Thread")), 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));
+    const cloneHint = this.onCloneCallback ? " \u2022 c clone" : "";
+    this.addChild(
+      new Text(theme.fg("muted", `Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select${cloneHint} \u2022 Esc cancel`), 0, 0)
+    );
     this.addChild(new Spacer(1));
     this.searchInput = new Input();
     this.searchInput.onSubmit = () => {
@@ -1444,6 +1723,7 @@ var ThreadSelectorComponent = class extends Box {
   sortThreads(threads, currentThreadId) {
     const sorted = [...threads];
     const resId = this.currentResourceId;
+    const projPath = this.currentProjectPath;
     sorted.sort((a, b) => {
       if (a.id === currentThreadId) return -1;
       if (b.id === currentThreadId) return 1;
@@ -1453,6 +1733,12 @@ var ThreadSelectorComponent = class extends Box {
         if (aLocal && !bLocal) return -1;
         if (!aLocal && bLocal) return 1;
       }
+      if (projPath && a.resourceId === b.resourceId) {
+        const aDir = typeof a.metadata?.projectPath === "string" && a.metadata.projectPath === projPath;
+        const bDir = typeof b.metadata?.projectPath === "string" && b.metadata.projectPath === projPath;
+        if (aDir && !bDir) return -1;
+        if (!aDir && bDir) return 1;
+      }
       return b.updatedAt.getTime() - a.updatedAt.getTime();
     });
     return sorted;
@@ -1461,7 +1747,7 @@ var ThreadSelectorComponent = class extends Box {
     this.filteredThreads = query ? fuzzyFilter(
       this.allThreads,
       query,
-      (t) => `${t.title ?? ""} ${t.resourceId} ${t.id} ${t.metadata?.projectPath ?? ""}`
+      (t) => `${t.title ?? ""} ${t.resourceId} ${t.id} ${typeof t.metadata?.projectPath === "string" ? t.metadata.projectPath : ""}`
     ) : this.allThreads;
     this.selectedIndex = Math.min(this.selectedIndex, Math.max(0, this.filteredThreads.length - 1));
     this.updateList();
@@ -1537,6 +1823,11 @@ var ThreadSelectorComponent = class extends Box {
       }
     } else if (kb.matches(keyData, "selectCancel")) {
       this.onCancelCallback();
+    } else if (keyData === "c" && this.onCloneCallback && !this.searchInput.getValue()) {
+      const selected = this.filteredThreads[this.selectedIndex];
+      if (selected) {
+        this.onCloneCallback(selected);
+      }
     } else {
       this.searchInput.handleInput(keyData);
       this.filterThreads(this.searchInput.getValue());
@@ -1553,18 +1844,39 @@ function truncatePreview(text, maxLength = 50) {
   if (text.length <= maxLength) return text;
   return text.slice(0, maxLength - 3) + "...";
 }
-function showThreadLockPrompt(ctx, threadTitle, ownerPid) {
+function showThreadLockPrompt(ctx, threadTitle, ownerPid, lockedThreadId) {
   const questionComponent = new AskQuestionInlineComponent(
     {
-      question: `Thread "${threadTitle}" is locked by pid ${ownerPid}. Create a new thread?`,
+      question: `Thread "${threadTitle}" is locked by pid ${ownerPid}. What would you like to do?`,
       options: [
-        { label: "Yes", description: "Start a new thread" },
-        { label: "No", description: "Exit" }
+        { label: "Switch thread", description: "Pick a different thread" },
+        { label: "New thread", description: "Start a fresh thread" },
+        ...lockedThreadId ? [{ label: "Clone thread", description: "Fork from this thread" }] : [],
+        { label: "Exit", description: "Exit" }
       ],
-      formatResult: (answer) => answer === "Yes" ? "Thread created" : "Exiting.",
+      formatResult: (answer) => {
+        if (answer === "Switch thread") return "Opening thread selector...";
+        if (answer === "Clone thread") return "Cloning thread...";
+        if (answer === "New thread") return "Starting new thread.";
+        return "Exiting.";
+      },
       onSubmit: async (answer) => {
         ctx.state.activeInlineQuestion = void 0;
-        if (!answer.toLowerCase().startsWith("y")) {
+        if (answer === "Switch thread") {
+          await handleThreadsCommand(ctx);
+        } else if (answer === "Clone thread" && lockedThreadId) {
+          try {
+            const customTitle = await askCloneName(ctx.state);
+            const clonedThread = await ctx.state.harness.cloneThread({
+              sourceThreadId: lockedThreadId,
+              ...customTitle ? { title: customTitle } : {}
+            });
+            ctx.state.pendingNewThread = false;
+            await resetUIAfterClone(ctx, clonedThread.title || clonedThread.id);
+          } catch (error) {
+            ctx.showError(`Failed to clone thread: ${error instanceof Error ? error.message : String(error)}`);
+          }
+        } else if (answer === "New thread") ; else {
           process.exit(0);
         }
       },
@@ -1596,6 +1908,7 @@ async function handleThreadsCommand(ctx) {
       threads,
       currentThreadId: currentId,
       currentResourceId,
+      currentProjectPath: state.projectInfo.rootPath,
       getMessagePreview: async (threadId) => {
         const firstUserMessage = await state.harness.getFirstUserMessageForThread({ threadId });
         if (firstUserMessage) {
@@ -1617,7 +1930,7 @@ async function handleThreadsCommand(ctx) {
           await state.harness.switchThread({ threadId: thread.id });
         } catch (error) {
           if (error instanceof ThreadLockError) {
-            showThreadLockPrompt(ctx, thread.title || thread.id, error.ownerPid);
+            showThreadLockPrompt(ctx, thread.title || thread.id, error.ownerPid, thread.id);
           } else {
             ctx.showError(`Failed to switch thread: ${error instanceof Error ? error.message : String(error)}`);
           }
@@ -1632,6 +1945,25 @@ async function handleThreadsCommand(ctx) {
         ctx.showInfo(`Switched to: ${thread.title || thread.id}`);
         resolve2();
       },
+      onClone: async (thread) => {
+        state.ui.hideOverlay();
+        if (!await confirmClone(state, thread.title || thread.id)) {
+          resolve2();
+          return;
+        }
+        try {
+          const customTitle = await askCloneName(state);
+          const clonedThread = await state.harness.cloneThread({
+            sourceThreadId: thread.id,
+            ...customTitle ? { title: customTitle } : {}
+          });
+          state.pendingNewThread = false;
+          await resetUIAfterClone(ctx, clonedThread.title || clonedThread.id);
+        } catch (error) {
+          ctx.showError(`Failed to clone thread: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        resolve2();
+      },
       onCancel: () => {
         state.ui.hideOverlay();
         resolve2();
@@ -1694,7 +2026,7 @@ async function handleThreadTagDirCommand(ctx) {
 async function sandboxAddPath(ctx, rawPath) {
   const harnessState = ctx.state.harness.getState();
   const currentPaths = harnessState.sandboxAllowedPaths ?? [];
-  const resolved = path4__default.resolve(rawPath);
+  const resolved = path5__default.resolve(rawPath);
   if (currentPaths.includes(resolved)) {
     ctx.showInfo(`Path already allowed: ${resolved}`);
     return;
@@ -1711,7 +2043,7 @@ async function sandboxAddPath(ctx, rawPath) {
   ctx.showInfo(`Added to sandbox: ${resolved}`);
 }
 async function sandboxRemovePath(ctx, rawPath, currentPaths) {
-  const resolved = path4__default.resolve(rawPath);
+  const resolved = path5__default.resolve(rawPath);
   const match = currentPaths.find((p) => p === resolved || p === rawPath);
   if (!match) {
     ctx.showError(`Path not in allowed list: ${resolved}`);
@@ -1728,7 +2060,7 @@ async function showSandboxAddPrompt(ctx) {
       {
         question: "Enter path to allow",
         formatResult: (answer) => {
-          return `Path: ${path4__default.resolve(answer)}`;
+          return `Path: ${path5__default.resolve(answer)}`;
         },
         onSubmit: async (answer) => {
           ctx.state.activeInlineQuestion = void 0;
@@ -1979,149 +2311,6 @@ var ModelSelectorComponent = class extends Box {
     return this.searchInput;
   }
 };
-
-// src/tui/commands/models.ts
-async function showModelListForScope(ctx, scope, modeId, modeName) {
-  const availableModels = await ctx.state.harness.listAvailableModels();
-  if (availableModels.length === 0) {
-    ctx.showInfo("No models available. Check your Mastra configuration.");
-    return;
-  }
-  const currentModelId = ctx.state.harness.getCurrentModelId();
-  const scopeLabel = scope === "global" ? `${modeName} \xB7 Global` : `${modeName} \xB7 Thread`;
-  return new Promise((resolve2) => {
-    const selector = new ModelSelectorComponent({
-      tui: ctx.state.ui,
-      models: availableModels,
-      currentModelId,
-      title: `Select model (${scopeLabel})`,
-      onSelect: async (model) => {
-        ctx.state.ui.hideOverlay();
-        try {
-          await ctx.state.harness.switchModel({ modelId: model.id, scope, modeId });
-          if (scope === "global") {
-            const settings = loadSettings();
-            settings.models.activeModelPackId = null;
-            settings.models.modeDefaults[modeId] = model.id;
-            saveSettings(settings);
-          }
-          ctx.showInfo(`Model set for ${scopeLabel}: ${model.id}`);
-        } catch (err) {
-          ctx.showError(`Failed to switch model: ${err instanceof Error ? err.message : String(err)}`);
-        }
-        resolve2();
-      },
-      onCancel: () => {
-        ctx.state.ui.hideOverlay();
-        resolve2();
-      }
-    });
-    ctx.state.ui.showOverlay(selector, {
-      width: "80%",
-      maxHeight: "60%",
-      anchor: "center"
-    });
-    selector.focused = true;
-  });
-}
-async function showModelScopeThenList(ctx, modeId, modeName) {
-  const scopes = [
-    {
-      label: "Thread default",
-      description: `Default for ${modeName} mode in this thread`,
-      scope: "thread"
-    },
-    {
-      label: "Global default",
-      description: `Default for ${modeName} mode in all threads`,
-      scope: "global"
-    }
-  ];
-  return new Promise((resolve2) => {
-    const questionComponent = new AskQuestionInlineComponent(
-      {
-        question: `Select scope for ${modeName}`,
-        options: scopes.map((s) => ({
-          label: s.label,
-          description: s.description
-        })),
-        formatResult: (answer) => `${modeName} \xB7 ${answer}`,
-        onSubmit: async (answer) => {
-          ctx.state.activeInlineQuestion = void 0;
-          try {
-            const selected = scopes.find((s) => s.label === answer);
-            if (selected) {
-              await showModelListForScope(ctx, selected.scope, modeId, modeName);
-            }
-          } catch (err) {
-            ctx.showError(`Model selection failed: ${err instanceof Error ? err.message : String(err)}`);
-          }
-          resolve2();
-        },
-        onCancel: () => {
-          ctx.state.activeInlineQuestion = void 0;
-          resolve2();
-        }
-      },
-      ctx.state.ui
-    );
-    ctx.state.activeInlineQuestion = questionComponent;
-    ctx.state.chatContainer.addChild(new Spacer(1));
-    ctx.state.chatContainer.addChild(questionComponent);
-    ctx.state.chatContainer.addChild(new Spacer(1));
-    ctx.state.ui.requestRender();
-    ctx.state.chatContainer.invalidate();
-  });
-}
-async function handleModelsCommand(ctx) {
-  const modes = ctx.state.harness.listModes();
-  const currentMode = ctx.state.harness.getCurrentMode();
-  const sortedModes = [...modes].sort((a, b) => {
-    if (a.id === currentMode?.id) return -1;
-    if (b.id === currentMode?.id) return 1;
-    return 0;
-  });
-  const modeOptions = sortedModes.map((mode) => ({
-    label: mode.name + (mode.id === currentMode?.id ? " (active)" : ""),
-    modeId: mode.id,
-    modeName: mode.name
-  }));
-  return new Promise((resolve2) => {
-    const questionComponent = new AskQuestionInlineComponent(
-      {
-        question: "Select mode",
-        options: modeOptions.map((m) => ({ label: m.label })),
-        formatResult: (answer) => {
-          const mode = modeOptions.find((m) => m.label === answer);
-          return `Mode: ${mode?.modeName ?? answer}`;
-        },
-        onSubmit: async (answer) => {
-          ctx.state.activeInlineQuestion = void 0;
-          try {
-            const selected = modeOptions.find((m) => m.label === answer);
-            if (selected?.modeId && selected?.modeName) {
-              await showModelScopeThenList(ctx, selected.modeId, selected.modeName);
-            }
-          } catch (err) {
-            ctx.showError(`Model selection failed: ${err instanceof Error ? err.message : String(err)}`);
-          }
-          resolve2();
-        },
-        onCancel: () => {
-          ctx.state.activeInlineQuestion = void 0;
-          resolve2();
-        }
-      },
-      ctx.state.ui
-    );
-    ctx.state.activeInlineQuestion = questionComponent;
-    ctx.state.chatContainer.addChild(new Spacer(1));
-    ctx.state.chatContainer.addChild(questionComponent);
-    ctx.state.chatContainer.addChild(new Spacer(1));
-    ctx.state.ui.requestRender();
-    ctx.state.chatContainer.invalidate();
-  });
-}
 var GRADIENT_WIDTH = 30;
 var BASE_COLOR = [124, 58, 237];
 function getMinBrightness() {
@@ -2617,14 +2806,14 @@ function updateStatusLine(state) {
 }
 
 // src/tui/commands/models-pack.ts
-async function selectModel(ctx, title, modeColor) {
+async function selectModel(ctx, title, modeColor, currentModelId) {
   const availableModels = await ctx.state.harness.listAvailableModels();
   if (availableModels.length === 0) return void 0;
   return new Promise((resolve2) => {
     const selector = new ModelSelectorComponent({
       tui: ctx.state.ui,
       models: availableModels,
-      currentModelId: void 0,
+      currentModelId,
       title,
       titleColor: modeColor,
       onSelect: (model) => {
@@ -2644,66 +2833,268 @@ async function selectModel(ctx, title, modeColor) {
     selector.focused = true;
   });
 }
-async function runCustomFlow(ctx) {
+async function askCustomPackName(ctx, defaultName) {
+  return new Promise((resolve2) => {
+    const question = new AskQuestionInlineComponent(
+      {
+        question: "Name this custom pack",
+        formatResult: (answer) => `Custom pack: ${answer}`,
+        onSubmit: (answer) => {
+          ctx.state.activeInlineQuestion = void 0;
+          const trimmed = answer.trim();
+          resolve2(trimmed.length > 0 ? trimmed : null);
+        },
+        onCancel: () => {
+          ctx.state.activeInlineQuestion = void 0;
+          resolve2(null);
+        }
+      },
+      ctx.state.ui
+    );
+    if (defaultName) {
+      question.input?.setValue?.(defaultName);
+    }
+    ctx.state.activeInlineQuestion = question;
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.chatContainer.addChild(question);
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
+}
+async function askCustomPackAction(ctx, pack) {
+  const actions = [
+    { id: "activate", label: "Activate", description: "Use this pack as-is" },
+    { id: "edit", label: "Edit", description: "Update this pack" },
+    { id: "delete", label: "Delete", description: "Remove this custom pack" }
+  ];
+  return new Promise((resolve2) => {
+    const container = new Box(1, 1);
+    container.addChild(new Text(theme.bold(theme.fg("accent", `Custom pack: ${pack.name}`)), 0, 0));
+    container.addChild(new Spacer(1));
+    const items = actions.map((action) => ({
+      value: action.id,
+      label: `  ${action.label}  ${theme.fg("dim", action.description)}`
+    }));
+    const selectList = new SelectList(items, items.length, getSelectListTheme());
+    const detailText = new Text("", 0, 0);
+    const detailById = {
+      activate: getPackDetail(pack),
+      edit: theme.fg("dim", "  Edit one setting at a time (Rename, plan, build, fast)."),
+      delete: theme.fg("error", "  Permanently removes this custom pack from settings.")
+    };
+    selectList.onSelectionChange = (item) => {
+      detailText.setText(detailById[item.value] ?? "");
+      ctx.state.ui.requestRender();
+    };
+    selectList.onSelect = (item) => {
+      ctx.state.activeInlineQuestion = void 0;
+      container.clear();
+      container.addChild(
+        new Text(theme.fg("text", `${theme.fg("success", "\u2713")} ${pack.name} \u2192 ${theme.bold(item.value)}`), 0, 0)
+      );
+      ctx.state.ui.requestRender();
+      resolve2(item.value);
+    };
+    selectList.onCancel = () => {
+      ctx.state.activeInlineQuestion = void 0;
+      container.clear();
+      container.addChild(new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} ${pack.name} (cancelled)`), 0, 0));
+      ctx.state.ui.requestRender();
+      resolve2(null);
+    };
+    detailText.setText(detailById["activate"]);
+    container.addChild(selectList);
+    container.addChild(new Spacer(1));
+    container.addChild(detailText);
+    container.addChild(new Spacer(1));
+    container.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc cancel"), 0, 0));
+    const inputShim = { handleInput: (data) => selectList.handleInput(data) };
+    ctx.state.activeInlineQuestion = inputShim;
+    ctx.state.chatContainer.addChild(container);
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
+}
+async function askCustomPackEditTarget(ctx, pack) {
+  return new Promise((resolve2) => {
+    const container = new Box(1, 1);
+    container.addChild(new Text(theme.bold(theme.fg("accent", `Edit custom pack: ${pack.name}`)), 0, 0));
+    container.addChild(new Spacer(1));
+    const selectList = new SelectList(
+      [
+        { value: "rename", label: `  Rename \u2192 ${theme.fg("text", pack.name)}` },
+        { value: "plan", label: `  ${chalk10.hex(mastra.blue)("plan")} \u2192 ${theme.fg("text", pack.models.plan)}` },
+        { value: "build", label: `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${theme.fg("text", pack.models.build)}` },
+        { value: "fast", label: `  ${chalk10.hex(mastra.green)("fast")} \u2192 ${theme.fg("text", pack.models.fast)}` },
+        { value: "save", label: `  ${theme.fg("success", "Save")}` }
+      ],
+      5,
+      getSelectListTheme()
+    );
+    const cleanup = () => {
+      if (ctx.state.chatContainer.children.includes(container)) {
+        ctx.state.chatContainer.removeChild(container);
+      }
+      ctx.state.ui.requestRender();
+      ctx.state.chatContainer.invalidate();
+    };
+    selectList.onSelect = (item) => {
+      ctx.state.activeInlineQuestion = void 0;
+      cleanup();
+      resolve2(item.value);
+    };
+    selectList.onCancel = () => {
+      ctx.state.activeInlineQuestion = void 0;
+      cleanup();
+      resolve2(null);
+    };
+    container.addChild(selectList);
+    container.addChild(new Spacer(1));
+    container.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc cancel"), 0, 0));
+    const inputShim = { handleInput: (data) => selectList.handleInput(data) };
+    ctx.state.activeInlineQuestion = inputShim;
+    ctx.state.chatContainer.addChild(container);
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
+}
+async function runCustomFlow(ctx, options) {
   const modes = [
     { id: "plan", label: "plan", color: mastra.blue },
     { id: "build", label: "build", color: mastra.purple },
     { id: "fast", label: "fast", color: mastra.green }
   ];
-  const models = { build: "", plan: "", fast: "" };
+  const name = options?.skipNamePrompt ? options?.name : await askCustomPackName(ctx, void 0);
+  if (!name) return null;
+  const existing = options?.models ?? { build: "", plan: "", fast: "" };
+  const models = {
+    build: existing.build ?? "",
+    plan: existing.plan ?? "",
+    fast: existing.fast ?? ""
+  };
   for (const mode of modes) {
-    const modelId = await selectModel(ctx, `Select model for ${mode.label} mode`, mode.color);
+    const modelId = await selectModel(
+      ctx,
+      `Select model for ${mode.label} mode`,
+      mode.color,
+      models[mode.id] || void 0
+    );
     if (!modelId) return null;
     models[mode.id] = modelId;
   }
-  return {
-    id: "custom",
-    name: "Custom",
-    description: "User-selected models",
-    models
-  };
+  return {
+    id: `custom:${name}`,
+    name,
+    description: "Saved custom pack",
+    models
+  };
+}
+async function runCustomPackEditFlow(ctx, pack) {
+  let workingPack = { ...pack, models: { ...pack.models } };
+  let previousPackId;
+  while (true) {
+    const editTarget = await askCustomPackEditTarget(ctx, workingPack);
+    if (!editTarget) return null;
+    if (editTarget === "save") return { pack: workingPack, previousPackId };
+    if (editTarget === "rename") {
+      const renamed = await askCustomPackName(ctx, workingPack.name);
+      if (!renamed) continue;
+      const renamedPack = {
+        ...workingPack,
+        id: `custom:${renamed}`,
+        name: renamed
+      };
+      if (renamedPack.id !== pack.id && !previousPackId) previousPackId = pack.id;
+      workingPack = renamedPack;
+      continue;
+    }
+    const modeColors = {
+      plan: mastra.blue,
+      build: mastra.purple,
+      fast: mastra.green
+    };
+    const modelId = await selectModel(
+      ctx,
+      `Select model for ${editTarget} mode`,
+      modeColors[editTarget],
+      workingPack.models[editTarget]
+    );
+    if (!modelId) continue;
+    workingPack = {
+      ...workingPack,
+      models: {
+        ...workingPack.models,
+        [editTarget]: modelId
+      }
+    };
+  }
+}
+function upsertCustomPackInSettings(settings, pack, modeDefaults, previousPackId, setActive = true) {
+  if (!pack.id.startsWith("custom:")) return;
+  if (previousPackId && previousPackId.startsWith("custom:") && previousPackId !== pack.id) {
+    removeCustomPackFromSettings(settings, previousPackId);
+  }
+  const customName = pack.id.slice("custom:".length);
+  const entry = { name: customName, models: modeDefaults, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+  const idx = settings.customModelPacks.findIndex((p) => p.name === customName);
+  if (idx >= 0) {
+    settings.customModelPacks[idx] = entry;
+  } else {
+    settings.customModelPacks.push(entry);
+  }
+  if (setActive) {
+    settings.models.activeModelPackId = pack.id;
+    settings.models.modeDefaults = modeDefaults;
+  }
+}
+function removeCustomPackFromSettings(settings, packId) {
+  if (!packId.startsWith("custom:")) return;
+  const packName = packId.slice("custom:".length);
+  const removedPack = settings.customModelPacks.find((p) => p.name === packName);
+  settings.customModelPacks = settings.customModelPacks.filter((p) => p.name !== packName);
+  const modeDefaultsMatchRemovedPack = !!removedPack && settings.models.modeDefaults.plan === removedPack.models.plan && settings.models.modeDefaults.build === removedPack.models.build && settings.models.modeDefaults.fast === removedPack.models.fast;
+  if (settings.models.activeModelPackId === packId) {
+    settings.models.activeModelPackId = null;
+    settings.models.modeDefaults = {};
+  } else if (modeDefaultsMatchRemovedPack) {
+    settings.models.modeDefaults = {};
+  }
+  if (settings.onboarding.modePackId === packId) {
+    settings.onboarding.modePackId = null;
+  }
 }
-function applyPack(ctx, pack) {
+async function applyPack(ctx, pack, previousPackId) {
   const harness = ctx.state.harness;
   const modes = harness.listModes();
   for (const mode of modes) {
     const modelId = pack.models[mode.id];
     if (modelId) {
       mode.defaultModelId = modelId;
-      harness.setThreadSetting({ key: `modeModelId_${mode.id}`, value: modelId });
+      await harness.setThreadSetting({ key: `modeModelId_${mode.id}`, value: modelId });
     }
   }
   const currentModeId = harness.getCurrentModeId();
   const currentModeModel = pack.models[currentModeId];
   if (currentModeModel) {
-    harness.switchModel({ modelId: currentModeModel });
+    await harness.switchModel({ modelId: currentModeModel });
   }
   const subagentModeMap = { explore: "fast", plan: "plan", execute: "build" };
   for (const [agentType, modeId] of Object.entries(subagentModeMap)) {
     const saModelId = pack.models[modeId];
     if (saModelId) {
-      harness.setSubagentModelId({ modelId: saModelId, agentType });
+      await harness.setSubagentModelId({ modelId: saModelId, agentType });
     }
   }
+  await harness.setThreadSetting({ key: THREAD_ACTIVE_MODEL_PACK_ID_KEY, value: pack.id });
   const s = loadSettings();
   const modeDefaults = {};
   for (const mode of modes) {
     const modelId = pack.models[mode.id];
     if (modelId) modeDefaults[mode.id] = modelId;
   }
-  if (pack.id === "custom") {
-    const idx = s.customModelPacks.findIndex((p) => p.name === "Setup");
-    const entry = { name: "Setup", models: modeDefaults, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
-    if (idx >= 0) {
-      s.customModelPacks[idx] = entry;
-    } else {
-      s.customModelPacks.push(entry);
-    }
-    s.models.activeModelPackId = "custom:Setup";
-    s.models.modeDefaults = modeDefaults;
-  } else if (pack.id.startsWith("custom:")) {
-    s.models.activeModelPackId = pack.id;
-    s.models.modeDefaults = modeDefaults;
+  if (pack.id.startsWith("custom:")) {
+    upsertCustomPackInSettings(s, pack, modeDefaults, previousPackId);
   } else {
     s.models.activeModelPackId = pack.id;
     s.models.modeDefaults = {};
@@ -2719,7 +3110,7 @@ function applyPack(ctx, pack) {
 }
 function getPackDetail(pack) {
   if (pack.id === "custom") {
-    return theme.fg("dim", "  You'll pick a model for each mode.");
+    return theme.fg("dim", "  Create a named custom pack and pick a model for each mode.");
   }
   return [
     `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
@@ -2727,6 +3118,46 @@ function getPackDetail(pack) {
     `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
   ].join("\n");
 }
+async function saveCustomPackEdits(ctx, pack, previousPackId) {
+  const settings = loadSettings();
+  const wasActive = previousPackId ? settings.models.activeModelPackId === previousPackId : settings.models.activeModelPackId === pack.id;
+  const wasOnboarding = previousPackId ? settings.onboarding.modePackId === previousPackId : settings.onboarding.modePackId === pack.id;
+  const modeDefaults = {
+    plan: pack.models.plan,
+    build: pack.models.build,
+    fast: pack.models.fast
+  };
+  upsertCustomPackInSettings(settings, pack, modeDefaults, previousPackId, false);
+  if (wasActive) {
+    settings.models.activeModelPackId = pack.id;
+  }
+  if (wasOnboarding) {
+    settings.onboarding.modePackId = pack.id;
+  }
+  saveSettings(settings);
+  if (previousPackId && previousPackId !== pack.id) {
+    const harness = ctx.state.harness;
+    const threadId = harness.getCurrentThreadId();
+    const thread = threadId ? (await harness.listThreads()).find((t) => t.id === threadId) : void 0;
+    const threadPackId = thread?.metadata?.[THREAD_ACTIVE_MODEL_PACK_ID_KEY] ?? null;
+    if (threadPackId === previousPackId) {
+      await harness.setThreadSetting({ key: THREAD_ACTIVE_MODEL_PACK_ID_KEY, value: pack.id });
+    }
+  }
+}
+async function deleteCustomPack(ctx, pack) {
+  if (!pack.id.startsWith("custom:")) return;
+  const harness = ctx.state.harness;
+  const threadId = harness.getCurrentThreadId();
+  const thread = threadId ? (await harness.listThreads()).find((t) => t.id === threadId) : void 0;
+  const threadPackId = thread?.metadata?.[THREAD_ACTIVE_MODEL_PACK_ID_KEY] ?? null;
+  const settings = loadSettings();
+  removeCustomPackFromSettings(settings, pack.id);
+  saveSettings(settings);
+  if (threadPackId === pack.id) {
+    await harness.setThreadSetting({ key: THREAD_ACTIVE_MODEL_PACK_ID_KEY, value: null });
+  }
+}
 async function handleModelsPackCommand(ctx) {
   const harness = ctx.state.harness;
   const models = await harness.listAvailableModels();
@@ -2743,13 +3174,26 @@ async function handleModelsPackCommand(ctx) {
     google: hasEnv("google") ? "apikey" : false,
     deepseek: hasEnv("deepseek") ? "apikey" : false
   };
+  const seen = new Set(Object.keys(access));
+  for (const m of models) {
+    if (!seen.has(m.provider) && m.hasApiKey) {
+      access[m.provider] = "apikey";
+      seen.add(m.provider);
+    }
+  }
   const settings = loadSettings();
   const packs = getAvailableModePacks(access, settings.customModelPacks);
   if (packs.length === 0) {
-    ctx.showInfo("No model packs available. Run /setup to configure.");
+    ctx.showInfo("No model packs available. Configure provider auth first.");
     return;
   }
-  const currentPackId = settings.models.activeModelPackId;
+  const threadId = harness.getCurrentThreadId();
+  const thread = threadId ? (await harness.listThreads()).find((t) => t.id === threadId) : void 0;
+  const currentPackId = resolveThreadActiveModelPackId(
+    settings,
+    packs,
+    thread?.metadata
+  );
   const items = packs.map((p) => ({
     value: p.id,
     label: `  ${p.name}  ${theme.fg("dim", p.description)}${p.id === currentPackId ? theme.fg("dim", " (current)") : ""}`
@@ -2766,9 +3210,19 @@ async function handleModelsPackCommand(ctx) {
       detailText.setText(getPackDetail(pack));
       ctx.state.ui.requestRender();
     };
+    const collapseResult = (result) => {
+      container.clear();
+      if (result === "cancelled") {
+        container.addChild(new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} Model pack (cancelled)`), 0, 0));
+      } else if (result) {
+        container.addChild(new Text(theme.fg("text", `${theme.fg("success", "\u2713")} ${result}`), 0, 0));
+      }
+      ctx.state.ui.requestRender();
+    };
     selectList.onSelect = async (item) => {
       ctx.state.activeInlineQuestion = void 0;
-      const pack = packs.find((p) => p.id === item.value);
+      let pack = packs.find((p) => p.id === item.value);
+      let previousPackId;
       if (!pack) {
         collapseResult("cancelled");
         resolve2();
@@ -2776,19 +3230,44 @@ async function handleModelsPackCommand(ctx) {
       }
       if (pack.id === "custom") {
         collapseResult(null);
-        const customPack = await runCustomFlow(ctx);
-        if (customPack) {
-          applyPack(ctx, customPack);
-          collapseResult(`Model pack \u2192 ${theme.bold("Custom")}`);
-          ctx.showInfo("Switched to Custom pack");
-        } else {
-          collapseResult("cancelled");
+        pack = await runCustomFlow(ctx);
+      } else if (pack.id.startsWith("custom:")) {
+        while (true) {
+          const action = await askCustomPackAction(ctx, pack);
+          if (action === null) {
+            collapseResult("cancelled");
+            resolve2();
+            return;
+          }
+          if (action === "delete") {
+            await deleteCustomPack(ctx, pack);
+            collapseResult(`Deleted custom pack \u2192 ${theme.bold(pack.name)}`);
+            ctx.showInfo(`Deleted custom pack: ${pack.name}`);
+            resolve2();
+            return;
+          }
+          if (action === "activate") {
+            break;
+          }
+          const edited = await runCustomPackEditFlow(ctx, pack);
+          if (!edited) {
+            continue;
+          }
+          previousPackId = edited.previousPackId;
+          pack = edited.pack;
+          await saveCustomPackEdits(ctx, pack, previousPackId);
+          previousPackId = void 0;
+          ctx.showInfo(`Updated custom pack: ${pack.name}`);
         }
-      } else {
-        applyPack(ctx, pack);
-        collapseResult(`Model pack \u2192 ${theme.bold(pack.name)}`);
-        ctx.showInfo(`Switched to ${pack.name} pack`);
       }
+      if (!pack) {
+        collapseResult("cancelled");
+        resolve2();
+        return;
+      }
+      await applyPack(ctx, pack, previousPackId);
+      collapseResult(`Model pack \u2192 ${theme.bold(pack.name)}`);
+      ctx.showInfo(`Switched to ${pack.name} pack`);
       resolve2();
     };
     selectList.onCancel = () => {
@@ -2810,14 +3289,6 @@ async function handleModelsPackCommand(ctx) {
     updateDetail(packs[initialIdx].id);
     const inputShim = { handleInput: (data) => selectList.handleInput(data) };
     ctx.state.activeInlineQuestion = inputShim;
-    const collapseResult = (result) => {
-      container.clear();
-      if (result === "cancelled") {
-        container.addChild(new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} Model pack (cancelled)`), 0, 0));
-      } else if (result) {
-        container.addChild(new Text(theme.fg("text", `${theme.fg("success", "\u2713")} ${result}`), 0, 0));
-      }
-    };
     ctx.state.chatContainer.addChild(new Spacer(1));
     ctx.state.chatContainer.addChild(container);
     ctx.state.chatContainer.addChild(new Spacer(1));
@@ -2825,6 +3296,269 @@ async function handleModelsPackCommand(ctx) {
     ctx.state.chatContainer.invalidate();
   });
 }
+function isValidUrl(value) {
+  try {
+    const parsed = new URL(value);
+    return parsed.protocol === "http:" || parsed.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
+function normalizeProvider(input) {
+  return {
+    name: input.name.trim(),
+    url: input.url.trim(),
+    apiKey: input.apiKey?.trim() || void 0,
+    models: [...new Set(input.models.map((model) => model.trim()).filter(Boolean))]
+  };
+}
+function upsertCustomProviderInSettings(settings, provider, previousProviderId) {
+  const next = normalizeProvider(provider);
+  const nextProviderId = getCustomProviderId(next.name);
+  const filteredProviders = settings.customProviders.filter((existing) => {
+    const id = getCustomProviderId(existing.name);
+    return id !== nextProviderId && (!previousProviderId || id !== previousProviderId);
+  });
+  settings.customProviders = [...filteredProviders, next];
+}
+function removeCustomProviderFromSettings(settings, providerId) {
+  settings.customProviders = settings.customProviders.filter(
+    (provider) => getCustomProviderId(provider.name) !== providerId
+  );
+}
+function addModelToCustomProviderInSettings(settings, providerId, modelName) {
+  const trimmed = modelName.trim();
+  if (!trimmed) return false;
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) return false;
+  provider.models = [.../* @__PURE__ */ new Set([...provider.models, trimmed])];
+  return true;
+}
+function removeModelFromCustomProviderInSettings(settings, providerId, modelName) {
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) return false;
+  const before = provider.models.length;
+  provider.models = provider.models.filter((model) => model !== modelName);
+  return provider.models.length < before;
+}
+function askText(ctx, question, defaultValue, allowEmptyInput = false) {
+  return new Promise((resolve2) => {
+    const component = new AskQuestionInlineComponent(
+      {
+        question,
+        allowEmptyInput,
+        onSubmit: (answer) => {
+          ctx.state.activeInlineQuestion = void 0;
+          const trimmed = answer.trim();
+          resolve2(trimmed.length > 0 ? trimmed : null);
+        },
+        onCancel: () => {
+          ctx.state.activeInlineQuestion = void 0;
+          resolve2(null);
+        }
+      },
+      ctx.state.ui
+    );
+    if (defaultValue) {
+      component.input?.setValue?.(defaultValue);
+    }
+    ctx.state.activeInlineQuestion = component;
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.chatContainer.addChild(component);
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
+}
+async function askOptionalText(ctx, question, defaultValue) {
+  const answer = await askText(ctx, `${question} (leave blank to skip)`, defaultValue, true);
+  return answer?.trim() || void 0;
+}
+function askSelect(ctx, question, options) {
+  return new Promise((resolve2) => {
+    const component = new AskQuestionInlineComponent(
+      {
+        question,
+        options: options.map((option) => ({ label: option.label, description: option.description })),
+        onSubmit: (answer) => {
+          ctx.state.activeInlineQuestion = void 0;
+          const selected = options.find((option) => option.label === answer);
+          resolve2(selected?.value ?? null);
+        },
+        onCancel: () => {
+          ctx.state.activeInlineQuestion = void 0;
+          resolve2(null);
+        }
+      },
+      ctx.state.ui
+    );
+    ctx.state.activeInlineQuestion = component;
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.chatContainer.addChild(component);
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
+}
+async function createProviderFlow(ctx) {
+  const settings = loadSettings();
+  const name = await askText(ctx, "Custom provider name");
+  if (!name) return;
+  const providerId = getCustomProviderId(name);
+  if (settings.customProviders.some((provider) => getCustomProviderId(provider.name) === providerId)) {
+    ctx.showError(`Provider already exists: ${name}`);
+    return;
+  }
+  const url = await askText(ctx, "Base URL (OpenAI-compatible endpoint)");
+  if (!url) return;
+  if (!isValidUrl(url)) {
+    ctx.showError("Invalid URL. Use a full http(s) URL.");
+    return;
+  }
+  const apiKey = await askOptionalText(ctx, "API key");
+  upsertCustomProviderInSettings(settings, { name, url, apiKey, models: [] });
+  saveSettings(settings);
+  ctx.showInfo(`Added custom provider: ${name}`);
+  await manageProviderFlow(ctx, providerId);
+}
+async function editProviderFlow(ctx, providerId) {
+  const settings = loadSettings();
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) {
+    ctx.showError("Provider not found.");
+    return;
+  }
+  const name = await askText(ctx, "Provider name", provider.name);
+  if (!name) return;
+  const nextProviderId = getCustomProviderId(name);
+  if (nextProviderId !== providerId && settings.customProviders.some((entry) => getCustomProviderId(entry.name) === nextProviderId)) {
+    ctx.showError(`Provider already exists: ${name}`);
+    return;
+  }
+  const url = await askText(ctx, "Base URL", provider.url);
+  if (!url) return;
+  if (!isValidUrl(url)) {
+    ctx.showError("Invalid URL. Use a full http(s) URL.");
+    return;
+  }
+  const apiKey = await askOptionalText(ctx, "API key", provider.apiKey);
+  upsertCustomProviderInSettings(
+    settings,
+    {
+      ...provider,
+      name,
+      url,
+      apiKey
+    },
+    providerId
+  );
+  saveSettings(settings);
+  ctx.showInfo(`Updated custom provider: ${name}`);
+}
+async function addProviderModelFlow(ctx, providerId) {
+  const settings = loadSettings();
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) {
+    ctx.showError("Provider not found.");
+    return;
+  }
+  const modelName = await askText(ctx, `Model ID for ${provider.name}`);
+  if (!modelName) return;
+  const added = addModelToCustomProviderInSettings(settings, providerId, modelName);
+  if (!added) {
+    ctx.showError("Unable to add model to provider.");
+    return;
+  }
+  saveSettings(settings);
+  ctx.showInfo(`Added model: ${toCustomProviderModelId(provider.name, modelName)}`);
+}
+async function removeProviderModelFlow(ctx, providerId) {
+  const settings = loadSettings();
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) {
+    ctx.showError("Provider not found.");
+    return;
+  }
+  if (provider.models.length === 0) {
+    ctx.showInfo(`No custom models configured for ${provider.name}.`);
+    return;
+  }
+  const modelName = await askSelect(
+    ctx,
+    `Remove model from ${provider.name}`,
+    provider.models.map((model) => ({
+      label: model,
+      value: model,
+      description: toCustomProviderModelId(provider.name, model)
+    }))
+  );
+  if (!modelName) return;
+  const removed = removeModelFromCustomProviderInSettings(settings, providerId, modelName);
+  if (!removed) {
+    ctx.showError("Unable to remove model from provider.");
+    return;
+  }
+  saveSettings(settings);
+  ctx.showInfo(`Removed model: ${toCustomProviderModelId(provider.name, modelName)}`);
+}
+async function manageProviderFlow(ctx, providerId) {
+  const settings = loadSettings();
+  const provider = settings.customProviders.find((entry) => getCustomProviderId(entry.name) === providerId);
+  if (!provider) {
+    ctx.showError("Provider not found.");
+    return;
+  }
+  const action = await askSelect(ctx, `Manage provider: ${provider.name}`, [
+    { label: "Add model", value: "add-model", description: "Attach a model ID to this provider" },
+    { label: "Remove model", value: "remove-model", description: "Remove a model ID from this provider" },
+    { label: "Edit provider", value: "edit-provider", description: "Rename, change URL, or update API key" },
+    { label: "Delete provider", value: "delete-provider", description: "Remove provider and all its model IDs" }
+  ]);
+  switch (action) {
+    case "add-model":
+      await addProviderModelFlow(ctx, providerId);
+      break;
+    case "remove-model":
+      await removeProviderModelFlow(ctx, providerId);
+      break;
+    case "edit-provider":
+      await editProviderFlow(ctx, providerId);
+      break;
+    case "delete-provider": {
+      const confirm = await askSelect(ctx, `Delete ${provider.name}?`, [
+        { label: "Delete", value: "delete", description: "This cannot be undone" }
+      ]);
+      if (confirm !== "delete") return;
+      const latest = loadSettings();
+      removeCustomProviderFromSettings(latest, providerId);
+      saveSettings(latest);
+      ctx.showInfo(`Deleted custom provider: ${provider.name}`);
+      break;
+    }
+  }
+}
+async function handleCustomProvidersCommand(ctx) {
+  const settings = loadSettings();
+  const providerOptions = settings.customProviders.map((provider) => {
+    const providerId = getCustomProviderId(provider.name);
+    const modelCount = provider.models.length;
+    return {
+      label: provider.name,
+      value: providerId,
+      description: `${provider.url} \xB7 ${modelCount} model${modelCount === 1 ? "" : "s"} \xB7 ${provider.apiKey ? "api key set" : "no api key"}`
+    };
+  });
+  const action = await askSelect(ctx, "Custom providers", [
+    { label: "Add provider", value: "add-provider", description: "Create an OpenAI-compatible provider" },
+    ...providerOptions
+  ]);
+  if (!action) return;
+  if (action === "add-provider") {
+    await createProviderFlow(ctx);
+    return;
+  }
+  await manageProviderFlow(ctx, action);
+}
 async function showSubagentModelListForScope(ctx, scope, agentType, agentTypeLabel) {
   const availableModels = await ctx.state.harness.listAvailableModels();
   if (availableModels.length === 0) {
@@ -3239,6 +3973,12 @@ function getShortModelName(modelId) {
 }
 
 // src/tui/commands/om.ts
+function persistOmModelOverride(modelId) {
+  const settings = loadSettings();
+  settings.models.activeOmPackId = "custom";
+  settings.models.omModelOverride = modelId;
+  saveSettings(settings);
+}
 async function handleOMCommand(ctx) {
   const availableModels = await ctx.state.harness.listAvailableModels();
   const modelOptions = availableModels.map((m) => ({
@@ -3257,10 +3997,12 @@ async function handleOMCommand(ctx) {
       {
         onObserverModelChange: async (modelId) => {
           await ctx.state.harness.switchObserverModel({ modelId });
+          persistOmModelOverride(modelId);
           ctx.showInfo(`Observer model \u2192 ${modelId}`);
         },
         onReflectorModelChange: async (modelId) => {
           await ctx.state.harness.switchReflectorModel({ modelId });
+          persistOmModelOverride(modelId);
           ctx.showInfo(`Reflector model \u2192 ${modelId}`);
         },
         onObservationThresholdChange: (value) => {
@@ -3485,7 +4227,7 @@ var SettingsComponent = class extends Box {
       {
         id: "escapeAsCancel",
         label: "Escape cancels",
-        description: "Use Escape to cancel/clear (Ctrl+C always works). Ctrl+Z undoes a clear.",
+        description: "Use Escape to cancel/clear (Ctrl+C always works).",
         currentValue: config.escapeAsCancel ? "On" : "Off",
         submenu: (_currentValue, done) => new SelectSubmenu(
           [
@@ -3509,6 +4251,33 @@ var SettingsComponent = class extends Box {
           () => done()
         )
       },
+      {
+        id: "quietMode",
+        label: "Quiet mode",
+        description: "Collapse subagent output to a single line after completion.",
+        currentValue: config.quietMode ? "On" : "Off",
+        submenu: (_currentValue, done) => new SelectSubmenu(
+          [
+            {
+              value: "on",
+              label: "  On",
+              description: "Auto-collapse subagent output when done"
+            },
+            {
+              value: "off",
+              label: "  Off",
+              description: "Keep subagent output visible when done"
+            }
+          ],
+          config.quietMode ? "on" : "off",
+          (value) => {
+            config.quietMode = value === "on";
+            callbacks.onQuietModeChange(config.quietMode);
+            done(config.quietMode ? "On" : "Off");
+          },
+          () => done()
+        )
+      },
       {
         id: "storageBackend",
         label: "Storage backend",
@@ -3557,6 +4326,7 @@ async function handleSettingsCommand(ctx) {
     thinkingLevel: state?.thinkingLevel ?? "off",
     currentModelId: ctx.state.harness.getCurrentModelId() ?? "",
     escapeAsCancel: ctx.state.editor.escapeEnabled,
+    quietMode: globalSettings.preferences.quietMode,
     storageBackend: globalSettings.storage.backend,
     pgConnectionString: globalSettings.storage.pg?.connectionString ?? "",
     libsqlUrl: globalSettings.storage.libsql?.url ?? ""
@@ -3578,6 +4348,12 @@ async function handleSettingsCommand(ctx) {
         await ctx.state.harness.setState({ escapeAsCancel: enabled });
         await ctx.state.harness.setThreadSetting({ key: "escapeAsCancel", value: enabled });
       },
+      onQuietModeChange: (enabled) => {
+        const current = loadSettings();
+        current.preferences.quietMode = enabled;
+        saveSettings(current);
+        ctx.state.quietMode = enabled;
+      },
       onStorageBackendChange: (backend, connectionUrl) => {
         const current = loadSettings();
         current.storage.backend = backend;
@@ -3887,6 +4663,93 @@ Pay special attention to: ${focusArea}
   });
 }
 
+// src/tui/commands/report-issue.ts
+var MASTRA_REPO = "mastra-ai/mastra";
+var MASTRA_LABEL = "mastracode";
+async function handleReportIssueCommand(ctx, args) {
+  if (!ctx.state.harness.hasModelSelected()) {
+    ctx.showInfo("No model selected. Use /models to select a model, or /login to authenticate.");
+    return;
+  }
+  if (ctx.state.pendingNewThread) {
+    await ctx.state.harness.createThread();
+    ctx.state.pendingNewThread = false;
+  }
+  const extraContext = args.join(" ").trim();
+  const prompt = `The user wants to report a GitHub issue on ${MASTRA_REPO}. Help them through this process.
+
+` + (extraContext ? `The user provided this initial context: "${extraContext}"
+
+` : "") + `## Step 1: Understand the problem
+
+Ask the user to describe the issue in their own words. Ask follow-up questions to gather:
+- What happened / what's wrong
+- What they expected to happen
+- Steps to reproduce (if applicable)
+
+Also gather environment info by running:
+\`\`\`
+mastracode --version 2>/dev/null || echo "unknown"
+node --version
+uname -s
+\`\`\`
+
+Use the conversation history for additional context about what the user was working on when they hit this issue.
+
+## Step 2: Check for duplicates
+
+Once you understand the problem, search for similar existing issues:
+\`\`\`
+gh issue list --repo ${MASTRA_REPO} --label ${MASTRA_LABEL} --state open --limit 50 --json number,title,body
+\`\`\`
+
+Also search more broadly:
+\`\`\`
+gh search issues --repo ${MASTRA_REPO} --state open "<relevant keywords>" --limit 20 --json number,title,body,labels
+\`\`\`
+
+If you find similar issue(s):
+- Present them with their number, title, and a brief summary
+- Ask the user whether they'd like to add a comment on an existing issue instead of opening a new one
+- If they choose to comment, draft the comment, show it to the user for approval, then run:
+\`\`\`
+gh issue comment <number> --repo ${MASTRA_REPO} --body "<comment>"
+\`\`\`
+Then stop here.
+
+## Step 3: Draft the issue
+
+Based on what you've gathered, write a clear, well-structured issue with:
+- A concise, descriptive title
+- A body covering: description, expected behavior, steps to reproduce, and environment info
+
+**Show the full title and body to the user and ask for their approval before creating it.** Let them suggest edits.
+
+## Step 4: Create the issue
+
+Only after the user approves, create the issue:
+\`\`\`
+gh issue create --repo ${MASTRA_REPO} --label ${MASTRA_LABEL} --title "<title>" --body "<body>"
+\`\`\`
+
+Report the created issue URL back to the user.`;
+  ctx.addUserMessage({
+    id: `user-${Date.now()}`,
+    role: "user",
+    content: [
+      {
+        type: "text",
+        text: extraContext ? `/report-issue ${extraContext}` : "/report-issue"
+      }
+    ],
+    createdAt: /* @__PURE__ */ new Date()
+  });
+  ctx.state.ui.requestRender();
+  ctx.state.harness.sendMessage({ content: prompt }).catch((error) => {
+    ctx.showError(error instanceof Error ? error.message : "Report issue command failed");
+  });
+}
+
 // src/tui/commands/setup.ts
 async function handleSetupCommand(ctx) {
   await ctx.showOnboarding();
@@ -4310,6 +5173,9 @@ async function dispatchSlashCommand(input, state, buildCtx) {
     case "new":
       handleNewCommand(buildCtx());
       return true;
+    case "clone":
+      await handleCloneCommand(buildCtx());
+      return true;
     case "threads":
       await handleThreadsCommand(buildCtx());
       return true;
@@ -4326,11 +5192,11 @@ async function dispatchSlashCommand(input, state, buildCtx) {
       await handleModeCommand(buildCtx(), args);
       return true;
     case "models":
-      await handleModelsCommand(buildCtx());
-      return true;
-    case "models:pack":
       await handleModelsPackCommand(buildCtx());
       return true;
+    case "custom-providers":
+      await handleCustomProvidersCommand(buildCtx());
+      return true;
     case "subagents":
       await handleSubagentsCommand(buildCtx());
       return true;
@@ -4382,6 +5248,9 @@ async function dispatchSlashCommand(input, state, buildCtx) {
     case "review":
       await handleReviewCommand(buildCtx(), args);
       return true;
+    case "report-issue":
+      await handleReportIssueCommand(buildCtx(), args);
+      return true;
     case "setup":
       await handleSetupCommand(buildCtx());
       return true;
@@ -4490,13 +5359,13 @@ function handleAgentError(ctx) {
 }
 var _compId = 0;
 function asmDebugLog(...args) {
-  if (process.env.DEBUG_MASTRA_CODE !== `true`) {
+  if (!["true", "1"].includes(process.env.MASTRA_TUI_DEBUG)) {
     return;
   }
   const line = `[ASM ${(/* @__PURE__ */ new Date()).toISOString()}] ${args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ")}
 `;
   try {
-    fs2.appendFileSync(path4__default.join(process.cwd(), "tui-debug.log"), line);
+    fs2.appendFileSync(path5__default.join(process.cwd(), "tui-debug.log"), line);
   } catch {
   }
 }
@@ -4918,10 +5787,10 @@ var ToolValidationErrorComponent = class extends Container {
     if (toolName === "ask_user" && errors.some((e) => e.field === "question")) {
       suggestions.push('Make sure to provide a "question" parameter with your question text');
     }
-    if (toolName === "execute_command" && errors.some((e) => e.field === "command")) {
+    if (toolName === MC_TOOLS.EXECUTE_COMMAND && errors.some((e) => e.field === "command")) {
       suggestions.push('Provide a "command" parameter with the command to execute');
     }
-    if (toolName === "view" && errors.some((e) => e.field === "path")) {
+    if (toolName === MC_TOOLS.VIEW && errors.some((e) => e.field === "path")) {
       suggestions.push('Provide a "path" parameter with the file or directory path');
     }
     return suggestions;
@@ -4929,12 +5798,12 @@ var ToolValidationErrorComponent = class extends Container {
 };
 
 // src/tui/components/tool-execution-enhanced.ts
-function shortenPath(path5) {
+function shortenPath(path6) {
   const home = os.homedir();
-  if (path5.startsWith(home)) {
-    return `~${path5.slice(home.length)}`;
+  if (path6.startsWith(home)) {
+    return `~${path6.slice(home.length)}`;
   }
-  return path5;
+  return path6;
 }
 function resolveAbsolutePath(filePath) {
   if (filePath.startsWith("/")) return filePath;
@@ -5018,7 +5887,7 @@ var ToolExecutionComponentEnhanced = class extends Container {
    * Only for execute_command tool - shows live output while command runs.
    */
   appendStreamingOutput(output) {
-    if (this.toolName !== "execute_command" && this.toolName !== "mastra_workspace_execute_command") {
+    if (this.toolName !== MC_TOOLS.EXECUTE_COMMAND && this.toolName !== MC_TOOLS.GET_PROCESS_OUTPUT && this.toolName !== MC_TOOLS.KILL_PROCESS) {
       return;
     }
     this.streamingOutput += output;
@@ -5042,12 +5911,13 @@ var ToolExecutionComponentEnhanced = class extends Container {
     this.updateBgColor();
   }
   updateBgColor() {
-    const isShellCommand = this.toolName === "execute_command" || this.toolName === "mastra_workspace_execute_command";
-    const isViewCommand = this.toolName === "view" || this.toolName === "mastra_workspace_read_file";
-    const isEditCommand = this.toolName === "string_replace_lsp" || this.toolName === "mastra_workspace_edit_file";
-    const isWriteCommand = this.toolName === "write_file" || this.toolName === "mastra_workspace_write_file";
+    const isShellCommand = this.toolName === MC_TOOLS.EXECUTE_COMMAND;
+    const isViewCommand = this.toolName === MC_TOOLS.VIEW;
+    const isEditCommand = this.toolName === MC_TOOLS.STRING_REPLACE_LSP;
+    const isWriteCommand = this.toolName === MC_TOOLS.WRITE_FILE;
+    const isProcessCommand = this.toolName === MC_TOOLS.GET_PROCESS_OUTPUT || this.toolName === MC_TOOLS.KILL_PROCESS;
     const isTaskWrite = this.toolName === "task_write";
-    if (isShellCommand || isViewCommand || isEditCommand || isWriteCommand || isTaskWrite) {
+    if (isShellCommand || isViewCommand || isEditCommand || isWriteCommand || isProcessCommand || isTaskWrite) {
       this.contentBox.setBgFn((text) => text);
       return;
     }
@@ -5066,26 +5936,25 @@ var ToolExecutionComponentEnhanced = class extends Container {
     this.contentBox.clear();
     this.collapsible = void 0;
     switch (this.toolName) {
-      case "view":
-      case "mastra_workspace_read_file":
+      case MC_TOOLS.VIEW:
         this.renderViewToolEnhanced();
         break;
-      case "execute_command":
-      case "mastra_workspace_execute_command":
+      case MC_TOOLS.EXECUTE_COMMAND:
         this.renderBashToolEnhanced();
         break;
-      case "string_replace_lsp":
-      case "mastra_workspace_edit_file":
+      case MC_TOOLS.STRING_REPLACE_LSP:
         this.renderEditToolEnhanced();
         break;
-      case "write_file":
-      case "mastra_workspace_write_file":
+      case MC_TOOLS.WRITE_FILE:
         this.renderWriteToolEnhanced();
         break;
-      case "find_files":
-      case "mastra_workspace_list_files":
+      case MC_TOOLS.FIND_FILES:
         this.renderListFilesEnhanced();
         break;
+      case MC_TOOLS.GET_PROCESS_OUTPUT:
+      case MC_TOOLS.KILL_PROCESS:
+        this.renderProcessToolEnhanced();
+        break;
       case "task_write":
         this.renderTaskWriteEnhanced();
         break;
@@ -5099,10 +5968,10 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const viewRange = argsObj?.view_range;
     const startLine = viewRange?.[0] ?? argsObj?.offset ?? 1;
     if (!this.result || this.isPartial) {
-      const path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+      const path7 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
       const rangeDisplay2 = viewRange ? theme.fg("muted", `:${viewRange[0]},${viewRange[1]}`) : "";
       const status2 = this.getStatusIndicator();
-      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path6), fullPath, startLine) : theme.fg("accent", path6);
+      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path7), fullPath, startLine) : theme.fg("accent", path7);
       const headerText = `${theme.bold(theme.fg("toolTitle", "view"))} ${pathDisplay2}${rangeDisplay2}${status2}`;
       this.contentBox.addChild(new Text(headerText, 0, 0));
       return;
@@ -5113,11 +5982,11 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const termWidth = process.stdout.columns || 80;
     const fixedParts = "\u2514\u2500\u2500 view  " + (rangeDisplay ? `:XXX,XXX` : "") + " \u2713";
     const availableForPath = termWidth - fixedParts.length - 6;
-    let path5 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
-    if (path5.length > availableForPath && availableForPath > 10) {
-      path5 = "\u2026" + path5.slice(-(availableForPath - 1));
+    let path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+    if (path6.length > availableForPath && availableForPath > 10) {
+      path6 = "\u2026" + path6.slice(-(availableForPath - 1));
     }
-    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path5), fullPath, startLine) : theme.fg("accent", path5);
+    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path6), fullPath, startLine) : theme.fg("accent", path6);
     const footerText = `${theme.bold(theme.fg("toolTitle", "view"))} ${pathDisplay}${rangeDisplay}${status}`;
     this.contentBox.addChild(new Text("", 0, 0));
     this.contentBox.addChild(new Text(border("\u250C\u2500\u2500"), 0, 0));
@@ -5222,9 +6091,50 @@ var ToolExecutionComponentEnhanced = class extends Container {
       renderBorderedShell(status2, prepareOutputLines(output2));
       return;
     }
-    const status = theme.fg("success", " \u2713");
+    const status = theme.fg("success", " \u2713");
+    const output = this.streamingOutput.trim() || this.getFormattedOutput();
+    renderBorderedShell(status, prepareOutputLines(output));
+  }
+  renderProcessToolEnhanced() {
+    const argsObj = this.args;
+    const pid = argsObj?.pid ? Number(argsObj.pid) : 0;
+    const isKill = this.toolName === MC_TOOLS.KILL_PROCESS;
+    const isWait = !isKill && argsObj?.wait === true;
+    const timeSuffix = this.isPartial ? "" : this.getDurationSuffix();
+    const label = isKill ? "kill" : isWait ? "wait" : "output";
+    const renderBorderedProcess = (status2, outputLines) => {
+      const border = (char) => theme.bold(theme.fg("accent", char));
+      const footerText = `${theme.fg("toolTitle", label)} ${theme.fg("accent", `PID ${pid}`)}${timeSuffix}${status2}`;
+      this.contentBox.addChild(new Text(border("\u250C\u2500\u2500"), 0, 0));
+      const termWidth = process.stdout.columns || 80;
+      const maxLineWidth = termWidth - 6;
+      const borderedLines = outputLines.map((line) => {
+        const truncated = truncateAnsi(line, maxLineWidth);
+        return border("\u2502") + " " + truncated;
+      });
+      const displayOutput = borderedLines.join("\n");
+      if (displayOutput.trim()) {
+        this.contentBox.addChild(new Text(displayOutput, 0, 0));
+      }
+      this.contentBox.addChild(new Text(`${border("\u2514\u2500\u2500")} ${footerText}`, 0, 0));
+    };
+    const prepareOutputLines = (output2) => {
+      let lines = output2.split("\n");
+      while (lines.length > 0 && lines[0] === "") lines.shift();
+      while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+      return lines;
+    };
+    if (!this.result || this.isPartial) {
+      const status2 = this.getStatusIndicator();
+      let lines = this.streamingOutput ? this.streamingOutput.split("\n") : [];
+      while (lines.length > 0 && lines[0] === "") lines.shift();
+      while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+      renderBorderedProcess(status2, lines);
+      return;
+    }
+    const status = this.result.isError ? theme.fg("error", " \u2717") : theme.fg("success", " \u2713");
     const output = this.streamingOutput.trim() || this.getFormattedOutput();
-    renderBorderedShell(status, prepareOutputLines(output));
+    renderBorderedProcess(status, prepareOutputLines(output));
   }
   renderEditToolEnhanced() {
     const argsObj = this.args;
@@ -5232,19 +6142,19 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const startLineNum = argsObj?.start_line ? Number(argsObj.start_line) : void 0;
     const startLine = startLineNum ? `:${String(startLineNum)}` : "";
     if (!this.result || this.isPartial) {
-      const path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+      const path7 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
       const status2 = this.getStatusIndicator();
-      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path6), fullPath, startLineNum) : theme.fg("accent", path6);
-      if (argsObj?.old_str && argsObj?.new_str) {
+      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path7), fullPath, startLineNum) : theme.fg("accent", path7);
+      const oldStr = argsObj?.old_str ?? argsObj?.old_string;
+      const newStr = argsObj?.new_str ?? argsObj?.new_string;
+      if (oldStr != null && newStr != null) {
         const border2 = (char) => theme.bold(theme.fg("accent", char));
         const termWidth2 = process.stdout.columns || 80;
         const maxLineWidth = termWidth2 - 6;
         const footerText2 = `${theme.bold(theme.fg("toolTitle", "edit"))} ${pathDisplay2}${theme.fg("muted", startLine)}${status2}`;
         this.contentBox.addChild(new Text("", 0, 0));
         this.contentBox.addChild(new Text(border2("\u250C\u2500\u2500"), 0, 0));
-        const oldStr = String(argsObj.old_str);
-        const newStr = String(argsObj.new_str);
-        const { lines: diffLines } = this.generateDiffLines(oldStr, newStr);
+        const { lines: diffLines } = this.generateDiffLines(String(oldStr), String(newStr));
         const collapsedLines = 15;
         const totalLines = diffLines.length;
         const hasMore = !this.expanded && totalLines > collapsedLines + 1;
@@ -5276,18 +6186,18 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const termWidth = process.stdout.columns || 80;
     const fixedParts = "\u2514\u2500\u2500 edit  " + startLine + " \u2713";
     const availableForPath = termWidth - fixedParts.length - 6;
-    let path5 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
-    if (path5.length > availableForPath && availableForPath > 10) {
-      path5 = "\u2026" + path5.slice(-(availableForPath - 1));
+    let path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+    if (path6.length > availableForPath && availableForPath > 10) {
+      path6 = "\u2026" + path6.slice(-(availableForPath - 1));
     }
-    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path5), fullPath, startLineNum) : theme.fg("accent", path5);
+    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path6), fullPath, startLineNum) : theme.fg("accent", path6);
     const footerText = `${theme.bold(theme.fg("toolTitle", "edit"))} ${pathDisplay}${theme.fg("muted", startLine)}${status}`;
     this.contentBox.addChild(new Text("", 0, 0));
     this.contentBox.addChild(new Text(border("\u250C\u2500\u2500"), 0, 0));
-    if (argsObj?.old_str && argsObj?.new_str && !this.result.isError) {
-      const oldStr = String(argsObj.old_str);
-      const newStr = String(argsObj.new_str);
-      const { lines: diffLines, firstChangeIndex } = this.generateDiffLines(oldStr, newStr);
+    const finalOldStr = argsObj?.old_str ?? argsObj?.old_string;
+    const finalNewStr = argsObj?.new_str ?? argsObj?.new_string;
+    if (finalOldStr != null && finalNewStr != null && !this.result.isError) {
+      const { lines: diffLines, firstChangeIndex } = this.generateDiffLines(String(finalOldStr), String(finalNewStr));
       const collapsedLines = 15;
       const totalLines = diffLines.length;
       const hasMore = !this.expanded && totalLines > collapsedLines + 1;
@@ -5331,7 +6241,9 @@ var ToolExecutionComponentEnhanced = class extends Container {
     }
     this.contentBox.addChild(new Text(`${border("\u2514\u2500\u2500")} ${footerText}`, 0, 0));
     const diagnostics = this.parseLSPDiagnostics();
-    if (diagnostics && diagnostics.hasIssues) {
+    if (diagnostics && !diagnostics.hasIssues) {
+      this.contentBox.addChild(new Text(theme.fg("muted", `  \u2713 No LSP issues`), 0, 0));
+    } else if (diagnostics && diagnostics.hasIssues) {
       const COLLAPSED_DIAG_LINES = 3;
       const shouldCollapse = !this.expanded && diagnostics.entries.length > COLLAPSED_DIAG_LINES + 1;
       const maxDiags = shouldCollapse ? COLLAPSED_DIAG_LINES : diagnostics.entries.length;
@@ -5424,9 +6336,9 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const content = argsObj?.content ? String(argsObj.content) : "";
     if (!this.result || this.isPartial) {
       if (!content) {
-        const path7 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+        const path8 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
         const status3 = this.getStatusIndicator();
-        const pathDisplay3 = fullPath ? fileLink(theme.fg("accent", path7), fullPath) : theme.fg("accent", path7);
+        const pathDisplay3 = fullPath ? fileLink(theme.fg("accent", path8), fullPath) : theme.fg("accent", path8);
         const headerText = `${theme.bold(theme.fg("toolTitle", "write"))} ${pathDisplay3}${status3}`;
         this.contentBox.addChild(new Text(headerText, 0, 0));
         return;
@@ -5435,13 +6347,13 @@ var ToolExecutionComponentEnhanced = class extends Container {
       const status2 = this.getStatusIndicator();
       const termWidth2 = process.stdout.columns || 80;
       const maxLineWidth2 = termWidth2 - 6;
-      let path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+      let path7 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
       const fixedParts2 = "\u2514\u2500\u2500 write   \u22EF";
       const availableForPath2 = termWidth2 - fixedParts2.length - 6;
-      if (path6.length > availableForPath2 && availableForPath2 > 10) {
-        path6 = "\u2026" + path6.slice(-(availableForPath2 - 1));
+      if (path7.length > availableForPath2 && availableForPath2 > 10) {
+        path7 = "\u2026" + path7.slice(-(availableForPath2 - 1));
       }
-      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path6), fullPath) : theme.fg("accent", path6);
+      const pathDisplay2 = fullPath ? fileLink(theme.fg("accent", path7), fullPath) : theme.fg("accent", path7);
       const footerText2 = `${theme.bold(theme.fg("toolTitle", "write"))} ${pathDisplay2}${status2}`;
       this.contentBox.addChild(new Text("", 0, 0));
       this.contentBox.addChild(new Text(border2("\u250C\u2500\u2500"), 0, 0));
@@ -5472,13 +6384,13 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const status = this.getStatusIndicator();
     const termWidth = process.stdout.columns || 80;
     const maxLineWidth = termWidth - 6;
-    let path5 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
+    let path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "...";
     const fixedParts = "\u2514\u2500\u2500 write   \u2713";
     const availableForPath = termWidth - fixedParts.length - 6;
-    if (path5.length > availableForPath && availableForPath > 10) {
-      path5 = "\u2026" + path5.slice(-(availableForPath - 1));
+    if (path6.length > availableForPath && availableForPath > 10) {
+      path6 = "\u2026" + path6.slice(-(availableForPath - 1));
     }
-    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path5), fullPath) : theme.fg("accent", path5);
+    const pathDisplay = fullPath ? fileLink(theme.fg("accent", path6), fullPath) : theme.fg("accent", path6);
     const footerText = `${theme.bold(theme.fg("toolTitle", "write"))} ${pathDisplay}${status}`;
     this.contentBox.addChild(new Text("", 0, 0));
     this.contentBox.addChild(new Text(border("\u250C\u2500\u2500"), 0, 0));
@@ -5518,25 +6430,26 @@ var ToolExecutionComponentEnhanced = class extends Container {
   renderListFilesEnhanced() {
     const argsObj = this.args;
     const fullPath = argsObj?.path ? String(argsObj.path) : "";
-    const path5 = argsObj?.path ? shortenPath(String(argsObj.path)) : "/";
+    const path6 = argsObj?.path ? shortenPath(String(argsObj.path)) : "/";
     const pattern = argsObj?.pattern ? String(argsObj.pattern) : "";
     const patternDisplay = pattern ? " " + theme.fg("muted", pattern) : "";
     if (!this.result || this.isPartial) {
       const status = this.getStatusIndicator();
-      const pathDisplay = fullPath ? fileLink(theme.fg("accent", path5), fullPath) : theme.fg("accent", path5);
+      const pathDisplay = fullPath ? fileLink(theme.fg("accent", path6), fullPath) : theme.fg("accent", path6);
       const header = `${theme.bold(theme.fg("toolTitle", "list"))} ${pathDisplay}${patternDisplay}${status}`;
       this.contentBox.addChild(new Text(header, 0, 0));
       return;
     }
     const output = this.getFormattedOutput();
     if (output) {
-      const lines = output.split("\n");
-      const fileCount = lines.filter((l) => l.trim() && !l.includes("\u2514") && !l.includes("\u251C") && !l.includes("\u2502")).length;
       const listStatus = this.getStatusIndicator();
+      const lines = output.split("\n");
+      const lastLine = lines[lines.length - 1]?.trim() || "";
+      const summaryMatch = lastLine.match(/^\d+\s+directories?,\s+\d+\s+files?$/);
+      const summaryDisplay = summaryMatch ? " " + theme.fg("muted", lastLine) : "";
       this.collapsible = new CollapsibleComponent(
         {
-          header: `${theme.bold(theme.fg("toolTitle", "list"))} ${theme.fg("accent", path5)}${patternDisplay}${listStatus}`,
-          summary: `${fileCount} items`,
+          header: `${theme.bold(theme.fg("toolTitle", "list"))} ${theme.fg("accent", path6)}${patternDisplay}${summaryDisplay}${listStatus}`,
           expanded: this.expanded,
           collapsedLines: 15,
           expandedLines: 100,
@@ -5715,8 +6628,8 @@ ${stackMatch.join("\n")}`;
     this.contentBox.addChild(errorDisplay);
   }
 };
-function getLanguageFromPath(path5) {
-  const ext = path5.split(".").pop()?.toLowerCase();
+function getLanguageFromPath(path6) {
+  const ext = path6.split(".").pop()?.toLowerCase();
   const langMap = {
     ts: "typescript",
     tsx: "typescript",
@@ -5765,7 +6678,7 @@ function getLanguageFromPath(path5) {
   };
   return ext ? langMap[ext] : void 0;
 }
-function highlightCode(content, path5, startLine) {
+function highlightCode(content, path6, startLine) {
   let lines = content.split("\n").map((line) => line.trimEnd());
   while (lines.length > 0 && (lines[0].includes("Here's the result of running") || lines[0].match(/^\[Truncated \d+ tokens\]$/) || lines[0].match(/^.*\(\d+ bytes\)$/) || lines[0].match(/^.*\(lines \d+-\d+ of \d+, \d+ bytes\)$/))) {
     lines = lines.slice(1);
@@ -5785,7 +6698,7 @@ function highlightCode(content, path5, startLine) {
   }
   try {
     return highlight(codeLines.join("\n"), {
-      language: getLanguageFromPath(path5),
+      language: getLanguageFromPath(path6),
       ignoreIllegals: true
     });
   } catch {
@@ -5921,10 +6834,12 @@ function handleMessageUpdate(ctx, message) {
     }
   }
   const trailingParts = getTrailingContentParts(message);
-  state.streamingComponent.updateContent({
-    ...message,
-    content: trailingParts
-  });
+  if (trailingParts.length > 0) {
+    state.streamingComponent.updateContent({
+      ...message,
+      content: trailingParts
+    });
+  }
   state.ui.requestRender();
 }
 function handleMessageEnd(ctx, message) {
@@ -5933,10 +6848,12 @@ function handleMessageEnd(ctx, message) {
   if (state.streamingComponent && message.role === "assistant") {
     state.streamingMessage = message;
     const trailingParts = getTrailingContentParts(message);
-    state.streamingComponent.updateContent({
-      ...message,
-      content: trailingParts
-    });
+    if (trailingParts.length > 0 || message.stopReason === "aborted" || message.stopReason === "error") {
+      state.streamingComponent.updateContent({
+        ...message,
+        content: trailingParts
+      });
+    }
     if (message.stopReason === "aborted" || message.stopReason === "error") {
       const errorMessage = message.errorMessage || "Operation aborted";
       for (const [, component] of state.pendingTools) {
@@ -6331,6 +7248,27 @@ function handleOMActivation(ctx, operationType, tokensActivated, observationToke
   state.activeBufferingMarker = void 0;
   state.ui.requestRender();
 }
+function slugify(str) {
+  const slug = str.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+  return slug || "untitled";
+}
+async function savePlanToDisk(opts) {
+  const { title, plan, resourceId } = opts;
+  const plansDir = opts.plansDir ?? process.env.MASTRA_PLANS_DIR ?? path5__default.join(getAppDataDir(), "plans");
+  const dir = path5__default.join(plansDir, resourceId);
+  await fs4.mkdir(dir, { recursive: true });
+  const now = /* @__PURE__ */ new Date();
+  const timestamp = now.toISOString().replace(/:/g, "-");
+  const slug = slugify(title);
+  const filename = `${timestamp}-${slug}.md`;
+  const content = `# ${title}
+
+Approved: ${now.toISOString()}
+
+${plan}
+`;
+  await fs4.writeFile(path5__default.join(dir, filename), content, "utf-8");
+}
 var AskQuestionDialogComponent = class extends Box {
   selectList;
   input;
@@ -6488,6 +7426,11 @@ var PlanApprovalInlineComponent = class extends Container {
     this.mode = "feedback";
     this.selectList = void 0;
     this.contentBox.clear();
+    this.contentBox.addChild(new Text(theme.bold(theme.fg("accent", `Plan: ${this.planTitle}`)), 0, 0));
+    this.contentBox.addChild(new Spacer(1));
+    const md = new Markdown(this.planContent, 1, 0, getMarkdownTheme());
+    this.contentBox.addChild(md);
+    this.contentBox.addChild(new Spacer(1));
     this.contentBox.addChild(new Text(theme.fg("accent", "Provide feedback for revision:"), 0, 0));
     this.contentBox.addChild(new Spacer(1));
     this.feedbackInput = new Input();
@@ -6558,55 +7501,71 @@ var PlanResultComponent = class extends Container {
 };
 
 // src/tui/handlers/prompts.ts
+function processNextInlineQuestion(state) {
+  const next = state.pendingInlineQuestions.shift();
+  if (next) {
+    next();
+  }
+}
 async function handleAskQuestion(ctx, questionId, question, options) {
   const { state } = ctx;
   return new Promise((resolve2) => {
     if (state.options.inlineQuestions) {
-      const questionComponent = new AskQuestionInlineComponent(
-        {
-          question,
-          options,
-          onSubmit: (answer) => {
-            state.activeInlineQuestion = void 0;
-            state.harness.respondToQuestion({ questionId, answer });
-            resolve2();
+      const askUserComponent = state.lastAskUserComponent;
+      const activate = () => {
+        const questionComponent = new AskQuestionInlineComponent(
+          {
+            question,
+            options,
+            onSubmit: (answer) => {
+              state.activeInlineQuestion = void 0;
+              state.harness.respondToQuestion({ questionId, answer });
+              resolve2();
+              processNextInlineQuestion(state);
+            },
+            onCancel: () => {
+              state.activeInlineQuestion = void 0;
+              state.harness.respondToQuestion({ questionId, answer: "(skipped)" });
+              resolve2();
+              processNextInlineQuestion(state);
+            }
           },
-          onCancel: () => {
-            state.activeInlineQuestion = void 0;
-            state.harness.respondToQuestion({ questionId, answer: "(skipped)" });
-            resolve2();
-          }
-        },
-        state.ui
-      );
-      state.activeInlineQuestion = questionComponent;
-      if (state.lastAskUserComponent) {
-        const children = [...state.chatContainer.children];
-        const askUserIndex = children.indexOf(state.lastAskUserComponent);
-        if (askUserIndex >= 0) {
-          state.chatContainer.clear();
-          for (let i = 0; i <= askUserIndex; i++) {
-            state.chatContainer.addChild(children[i]);
-          }
-          state.chatContainer.addChild(new Spacer(1));
-          state.chatContainer.addChild(questionComponent);
-          state.chatContainer.addChild(new Spacer(1));
-          for (let i = askUserIndex + 1; i < children.length; i++) {
-            state.chatContainer.addChild(children[i]);
+          state.ui
+        );
+        state.activeInlineQuestion = questionComponent;
+        if (askUserComponent) {
+          const children = [...state.chatContainer.children];
+          const askUserIndex = children.indexOf(askUserComponent);
+          if (askUserIndex >= 0) {
+            state.chatContainer.clear();
+            for (let i = 0; i <= askUserIndex; i++) {
+              state.chatContainer.addChild(children[i]);
+            }
+            state.chatContainer.addChild(new Spacer(1));
+            state.chatContainer.addChild(questionComponent);
+            state.chatContainer.addChild(new Spacer(1));
+            for (let i = askUserIndex + 1; i < children.length; i++) {
+              state.chatContainer.addChild(children[i]);
+            }
+          } else {
+            state.chatContainer.addChild(new Spacer(1));
+            state.chatContainer.addChild(questionComponent);
+            state.chatContainer.addChild(new Spacer(1));
           }
         } else {
           state.chatContainer.addChild(new Spacer(1));
           state.chatContainer.addChild(questionComponent);
           state.chatContainer.addChild(new Spacer(1));
         }
+        state.ui.requestRender();
+        state.chatContainer.invalidate();
+        questionComponent.focused = true;
+      };
+      if (state.activeInlineQuestion) {
+        state.pendingInlineQuestions.push(activate);
       } else {
-        state.chatContainer.addChild(new Spacer(1));
-        state.chatContainer.addChild(questionComponent);
-        state.chatContainer.addChild(new Spacer(1));
+        activate();
       }
-      state.ui.requestRender();
-      state.chatContainer.invalidate();
-      questionComponent.focused = true;
     } else {
       const dialog = new AskQuestionDialogComponent({
         question,
@@ -6631,39 +7590,48 @@ async function handleAskQuestion(ctx, questionId, question, options) {
 async function handleSandboxAccessRequest(ctx, questionId, requestedPath, reason) {
   const { state } = ctx;
   return new Promise((resolve2) => {
-    const questionComponent = new AskQuestionInlineComponent(
-      {
-        question: `Grant sandbox access to "${requestedPath}"?
+    const activate = () => {
+      const questionComponent = new AskQuestionInlineComponent(
+        {
+          question: `Grant sandbox access to "${requestedPath}"?
 ${theme.fg("dim", `Reason: ${reason}`)}`,
-        options: [
-          { label: "Yes", description: "Allow access to this directory" },
-          { label: "No", description: "Deny access" }
-        ],
-        onSubmit: (answer) => {
-          state.activeInlineQuestion = void 0;
-          state.harness.respondToQuestion({ questionId, answer });
-          resolve2();
-        },
-        onCancel: () => {
-          state.activeInlineQuestion = void 0;
-          state.harness.respondToQuestion({ questionId, answer: "No" });
-          resolve2();
-        },
-        formatResult: (answer) => {
-          const approved = answer.toLowerCase().startsWith("y");
-          return approved ? `Granted access to ${requestedPath}` : `Denied access to ${requestedPath}`;
+          options: [
+            { label: "Yes", description: "Allow access to this directory" },
+            { label: "No", description: "Deny access" }
+          ],
+          onSubmit: (answer) => {
+            state.activeInlineQuestion = void 0;
+            state.harness.respondToQuestion({ questionId, answer });
+            resolve2();
+            processNextInlineQuestion(state);
+          },
+          onCancel: () => {
+            state.activeInlineQuestion = void 0;
+            state.harness.respondToQuestion({ questionId, answer: "No" });
+            resolve2();
+            processNextInlineQuestion(state);
+          },
+          formatResult: (answer) => {
+            const approved = answer.toLowerCase().startsWith("y");
+            return approved ? `Granted access to ${requestedPath}` : `Denied access to ${requestedPath}`;
+          },
+          isNegativeAnswer: (answer) => !answer.toLowerCase().startsWith("y")
         },
-        isNegativeAnswer: (answer) => !answer.toLowerCase().startsWith("y")
-      },
-      state.ui
-    );
-    state.activeInlineQuestion = questionComponent;
-    state.chatContainer.addChild(new Spacer(1));
-    state.chatContainer.addChild(questionComponent);
-    state.chatContainer.addChild(new Spacer(1));
-    questionComponent.focused = true;
-    state.ui.requestRender();
-    state.chatContainer.invalidate();
+        state.ui
+      );
+      state.activeInlineQuestion = questionComponent;
+      state.chatContainer.addChild(new Spacer(1));
+      state.chatContainer.addChild(questionComponent);
+      state.chatContainer.addChild(new Spacer(1));
+      questionComponent.focused = true;
+      state.ui.requestRender();
+      state.chatContainer.invalidate();
+    };
+    if (state.activeInlineQuestion) {
+      state.pendingInlineQuestions.push(activate);
+    } else {
+      activate();
+    }
     ctx.notify("sandbox_access", `Sandbox access requested: ${requestedPath}`);
   });
 }
@@ -6684,6 +7652,12 @@ async function handlePlanApproval(ctx, planId, title, plan) {
               approvedAt: (/* @__PURE__ */ new Date()).toISOString()
             }
           });
+          savePlanToDisk({
+            title,
+            plan,
+            resourceId: state.harness.getResourceId()
+          }).catch(() => {
+          });
           await state.harness.respondToPlanApproval({
             planId,
             response: { action: "approved" }
@@ -6757,12 +7731,14 @@ var SubagentExecutionComponent = class extends Container {
   durationMs = 0;
   finalResult;
   expanded = false;
-  constructor(agentType, task, ui, modelId) {
+  collapseOnComplete;
+  constructor(agentType, task, ui, modelId, options) {
     super();
     this.agentType = agentType;
     this.task = task;
     this.modelId = modelId;
     this.ui = ui;
+    this.collapseOnComplete = options?.collapseOnComplete ?? false;
     this.rebuild();
   }
   // ── Mutation API ──────────────────────────────────────────────────────
@@ -6787,6 +7763,9 @@ var SubagentExecutionComponent = class extends Container {
     this.isError = isError;
     this.durationMs = durationMs;
     this.finalResult = result;
+    if (this.collapseOnComplete) {
+      this.expanded = false;
+    }
     this.rebuild();
   }
   setExpanded(expanded) {
@@ -6809,6 +7788,17 @@ var SubagentExecutionComponent = class extends Container {
     const border = (char) => theme.bold(theme.fg("accent", char));
     const termWidth = process.stdout.columns || 80;
     const maxLineWidth = termWidth - 6;
+    const typeLabel = theme.bold(theme.fg("accent", this.agentType));
+    const modelLabel = this.modelId ? theme.fg("muted", ` ${this.modelId}`) : "";
+    const statusIcon = this.done ? this.isError ? theme.fg("error", " \u2717") : theme.fg("success", " \u2713") : theme.fg("muted", " \u22EF");
+    const durationStr = this.done ? theme.fg("muted", ` ${formatDuration(this.durationMs)}`) : "";
+    const footerText = `${theme.bold(theme.fg("toolTitle", "subagent"))} ${typeLabel}${modelLabel}${durationStr}${statusIcon}`;
+    if (this.collapseOnComplete && this.done && !this.expanded) {
+      this.addChild(new Text(`${border("\u2514\u2500\u2500")} ${footerText}`, 0, 0));
+      this.invalidate();
+      this.ui.requestRender();
+      return;
+    }
     this.addChild(new Text(border("\u250C\u2500\u2500"), 0, 0));
     const taskLines = this.task.split("\n");
     const wrappedTaskLines = [];
@@ -6861,18 +7851,10 @@ var SubagentExecutionComponent = class extends Container {
         this.addChild(new Text(`${border("\u2502")} ${moreText}`, 0, 0));
       }
     }
-    const showResult = this.done && this.finalResult && (this.expanded || this.toolCalls.length === 0);
-    if (showResult) {
+    if (this.done && this.finalResult && this.expanded) {
       this.addChild(new Text(`${border("\u2502")} ${theme.fg("muted", "\u2500\u2500\u2500")}`, 0, 0));
       const resultLines = this.finalResult.split("\n");
-      const maxResultLines = this.expanded ? resultLines.length : 10;
-      const truncated = !this.expanded && resultLines.length > maxResultLines + 1;
-      const displayLines = truncated ? resultLines.slice(-maxResultLines) : resultLines;
-      if (truncated) {
-        const hiddenLine = `${border("\u2502")} ${theme.fg("muted", `  ... ${resultLines.length - maxResultLines} more lines (ctrl+e to expand)`)}`;
-        this.addChild(new Text(hiddenLine, 0, 0));
-      }
-      const resultContent = displayLines.map((line) => {
+      const resultContent = resultLines.map((line) => {
         const truncatedLine = line.length > maxLineWidth ? line.slice(0, maxLineWidth - 1) + "\u2026" : line;
         return `${border("\u2502")} ${theme.fg("muted", truncatedLine)}`;
       }).join("\n");
@@ -6880,11 +7862,6 @@ var SubagentExecutionComponent = class extends Container {
         this.addChild(new Text(resultContent, 0, 0));
       }
     }
-    const typeLabel = theme.bold(theme.fg("accent", this.agentType));
-    const modelLabel = this.modelId ? theme.fg("muted", ` ${this.modelId}`) : "";
-    const statusIcon = this.done ? this.isError ? theme.fg("error", " \u2717") : theme.fg("success", " \u2713") : theme.fg("muted", " \u22EF");
-    const durationStr = this.done ? theme.fg("muted", ` ${formatDuration(this.durationMs)}`) : "";
-    const footerText = `${theme.bold(theme.fg("toolTitle", "subagent"))} ${typeLabel}${modelLabel}${durationStr}${statusIcon}`;
     this.addChild(new Text(`${border("\u2514\u2500\u2500")} ${footerText}`, 0, 0));
     this.invalidate();
     this.ui.requestRender();
@@ -6930,7 +7907,9 @@ function summarizeArgs(args) {
 // src/tui/handlers/subagent.ts
 function handleSubagentStart(ctx, toolCallId, agentType, task, modelId) {
   const { state } = ctx;
-  const component = new SubagentExecutionComponent(agentType, task, state.ui, modelId);
+  const component = new SubagentExecutionComponent(agentType, task, state.ui, modelId, {
+    collapseOnComplete: state.quietMode
+  });
   state.pendingSubagents.set(toolCallId, component);
   state.allToolComponents.push(component);
   if (state.streamingComponent) {
@@ -7622,7 +8601,8 @@ async function renderExistingMessages(state) {
               subArgs?.agentType ?? "unknown",
               subArgs?.task ?? "",
               state.ui,
-              modelId
+              modelId,
+              { collapseOnComplete: state.quietMode }
             );
             if (meta?.toolCalls) {
               for (const tc of meta.toolCalls) {
@@ -7757,7 +8737,7 @@ async function parseCommandFile(filePath, baseDir) {
     const content = await promises.readFile(filePath, "utf-8");
     const trimmedContent = content.trim();
     if (!trimmedContent.startsWith("---")) {
-      const name2 = baseDir ? extractCommandName(filePath, baseDir) : path4.basename(filePath, ".md");
+      const name2 = baseDir ? extractCommandName(filePath, baseDir) : path5.basename(filePath, ".md");
       return {
         name: name2,
         description: "",
@@ -7778,7 +8758,7 @@ async function parseCommandFile(filePath, baseDir) {
     } else if (baseDir) {
       name = extractCommandName(filePath, baseDir);
     } else {
-      name = path4.basename(filePath, ".md");
+      name = path5.basename(filePath, ".md");
     }
     return {
       name,
@@ -7793,9 +8773,9 @@ async function parseCommandFile(filePath, baseDir) {
   }
 }
 function extractCommandName(filePath, baseDir) {
-  const relativePath = path4.relative(baseDir, filePath);
-  const dirName = path4.dirname(relativePath);
-  const baseName = path4.basename(relativePath, ".md");
+  const relativePath = path5.relative(baseDir, filePath);
+  const dirName = path5.dirname(relativePath);
+  const baseName = path5.basename(relativePath, ".md");
   if (dirName === "." || dirName === "") {
     return baseName;
   }
@@ -7807,7 +8787,7 @@ async function scanCommandDirectory(dirPath) {
   try {
     const entries = await promises.readdir(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path4.join(dirPath, entry.name);
+      const fullPath = path5.join(dirPath, entry.name);
       if (entry.isDirectory()) {
         const subCommands = await scanCommandDirectory(fullPath);
         commands.push(...subCommands);
@@ -7835,32 +8815,32 @@ async function loadCustomCommands(projectDir) {
   };
   const homeDir = process.env.HOME || process.env.USERPROFILE;
   if (homeDir) {
-    const opencodeUserDir = path4.join(homeDir, ".opencode", "command");
+    const opencodeUserDir = path5.join(homeDir, ".opencode", "command");
     const opencodeUserCommands = await scanCommandDirectory(opencodeUserDir);
     addCommands(opencodeUserCommands);
   }
   if (homeDir) {
-    const claudeUserDir = path4.join(homeDir, ".claude", "commands");
+    const claudeUserDir = path5.join(homeDir, ".claude", "commands");
     const claudeUserCommands = await scanCommandDirectory(claudeUserDir);
     addCommands(claudeUserCommands);
   }
   if (homeDir) {
-    const mastraUserDir = path4.join(homeDir, ".mastracode", "commands");
+    const mastraUserDir = path5.join(homeDir, ".mastracode", "commands");
     const mastraUserCommands = await scanCommandDirectory(mastraUserDir);
     addCommands(mastraUserCommands);
   }
   if (projectDir) {
-    const opencodeProjectDir = path4.join(projectDir, ".opencode", "command");
+    const opencodeProjectDir = path5.join(projectDir, ".opencode", "command");
     const opencodeProjectCommands = await scanCommandDirectory(opencodeProjectDir);
     addCommands(opencodeProjectCommands);
   }
   if (projectDir) {
-    const claudeProjectDir = path4.join(projectDir, ".claude", "commands");
+    const claudeProjectDir = path5.join(projectDir, ".claude", "commands");
     const claudeProjectCommands = await scanCommandDirectory(claudeProjectDir);
     addCommands(claudeProjectCommands);
   }
   if (projectDir) {
-    const mastraProjectDir = path4.join(projectDir, ".mastracode", "commands");
+    const mastraProjectDir = path5.join(projectDir, ".mastracode", "commands");
     const mastraProjectCommands = await scanCommandDirectory(mastraProjectDir);
     addCommands(mastraProjectCommands);
   }
@@ -7975,11 +8955,13 @@ function setupKeyboardShortcuts(state, callbacks) {
       state.pendingApprovalDismiss();
       state.activeInlinePlanApproval = void 0;
       state.activeInlineQuestion = void 0;
+      state.pendingInlineQuestions.length = 0;
       state.userInitiatedAbort = true;
       state.harness.abort();
     } else if (state.harness.isRunning()) {
       state.activeInlinePlanApproval = void 0;
       state.activeInlineQuestion = void 0;
+      state.pendingInlineQuestions.length = 0;
       state.userInitiatedAbort = true;
       state.harness.abort();
     } else {
@@ -7991,6 +8973,26 @@ function setupKeyboardShortcuts(state, callbacks) {
       state.ui.requestRender();
     }
   });
+  state.editor.onAction("suspend", () => {
+    if (process.platform === "win32") {
+      showInfo(state, "Suspend is not supported on Windows");
+      return;
+    }
+    state.ui.stop();
+    const onContinue = () => {
+      state.ui.start();
+      state.ui.requestRender();
+    };
+    process.once("SIGCONT", onContinue);
+    try {
+      process.kill(process.pid, "SIGTSTP");
+    } catch {
+      process.off("SIGCONT", onContinue);
+      state.ui.start();
+      state.ui.requestRender();
+      showError(state, "Unable to suspend in the current terminal");
+    }
+  });
   state.editor.onAction("undo", () => {
     if (state.lastClearedText && state.editor.getText().length === 0) {
       state.editor.setText(state.lastClearedText);
@@ -8105,9 +9107,10 @@ function detectFdPath() {
 function setupAutocomplete(state) {
   const slashCommands = [
     { name: "new", description: "Start a new thread" },
+    { name: "clone", description: "Clone the current thread" },
     { name: "threads", description: "Switch between threads" },
-    { name: "models", description: "Configure model (global/thread/mode)" },
-    { name: "models:pack", description: "Switch model pack" },
+    { name: "models", description: "Switch model pack" },
+    { name: "custom-providers", description: "Manage custom providers and models" },
     { name: "subagents", description: "Configure subagent model defaults" },
     { name: "om", description: "Configure Observational Memory models" },
     { name: "think", description: "Set thinking (off|low|medium|high|xhigh|status)" },
@@ -8144,6 +9147,7 @@ function setupAutocomplete(state) {
       description: "Toggle YOLO mode (auto-approve all tools)"
     },
     { name: "review", description: "Review a GitHub pull request" },
+    { name: "report-issue", description: "Open or browse mastracode issues" },
     { name: "setup", description: "Re-run the setup wizard" },
     { name: "theme", description: "Switch color theme (auto/dark/light)" },
     { name: "exit", description: "Exit the TUI" },
@@ -8190,6 +9194,9 @@ function setupKeyHandlers(state, callbacks) {
     if (state.pendingApprovalDismiss) {
       state.pendingApprovalDismiss();
     }
+    state.activeInlinePlanApproval = void 0;
+    state.activeInlineQuestion = void 0;
+    state.pendingInlineQuestions.length = 0;
     state.userInitiatedAbort = true;
     state.harness.abort();
   });
@@ -8227,23 +9234,37 @@ async function promptForThreadSelection(state) {
     return;
   }
   const sortedThreads = [...threads].sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime());
-  const mostRecent = sortedThreads[0];
-  try {
-    await state.harness.switchThread({ threadId: mostRecent.id });
-    if (!mostRecent.metadata?.projectPath) {
-      await state.harness.setThreadSetting({ key: "projectPath", value: currentPath });
+  if (sortedThreads.length === 1) {
+    const thread = sortedThreads[0];
+    try {
+      await state.harness.switchThread({ threadId: thread.id });
+      if (!thread.metadata?.projectPath) {
+        await state.harness.setThreadSetting({ key: "projectPath", value: currentPath });
+      }
+      return;
+    } catch (error) {
+      if (error instanceof ThreadLockError) {
+        state.pendingNewThread = true;
+        return;
+      }
+      throw error;
     }
-  } catch (error) {
-    if (error instanceof ThreadLockError) {
-      state.pendingNewThread = true;
-      state.pendingLockConflict = {
-        threadTitle: mostRecent.title || mostRecent.id,
-        ownerPid: error.ownerPid
-      };
+  }
+  for (const thread of sortedThreads) {
+    try {
+      await state.harness.switchThread({ threadId: thread.id });
+      if (!thread.metadata?.projectPath) {
+        await state.harness.setThreadSetting({ key: "projectPath", value: currentPath });
+      }
       return;
+    } catch (error) {
+      if (error instanceof ThreadLockError) {
+        continue;
+      }
+      throw error;
     }
-    throw error;
   }
+  state.pendingNewThread = true;
 }
 async function renderExistingTasks(state) {
   try {
@@ -8307,6 +9328,38 @@ async function handleShellPassthrough(state, command) {
     showError(state, error instanceof Error ? error.message : "Shell command failed");
   }
 }
+function getClipboardText() {
+  try {
+    if (process.platform === "darwin") {
+      const text = execSync("pbpaste", {
+        encoding: "utf-8",
+        timeout: 3e3,
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+      return text.length > 0 ? text : null;
+    }
+    if (process.platform === "linux") {
+      try {
+        const text = execSync("xclip -selection clipboard -o", {
+          encoding: "utf-8",
+          timeout: 3e3,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        return text.length > 0 ? text : null;
+      } catch {
+        const text = execSync("wl-paste", {
+          encoding: "utf-8",
+          timeout: 3e3,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        return text.length > 0 ? text : null;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 function getClipboardImage() {
   try {
     if (process.platform === "darwin") {
@@ -8469,6 +9522,22 @@ var CustomEditor = class extends Editor {
         return;
       }
     }
+    if (matchesKey(data, "ctrl+v")) {
+      if (this.onImagePaste) {
+        const clipboardImage = getClipboardImage();
+        if (clipboardImage) {
+          this.onImagePaste(clipboardImage);
+          return;
+        }
+      }
+      const clipboardText = getClipboardText();
+      if (clipboardText) {
+        const syntheticPaste = `${PASTE_START}${clipboardText}${PASTE_END}`;
+        super.handleInput(syntheticPaste);
+        return;
+      }
+      return;
+    }
     if (matchesKey(data, "ctrl+c")) {
       const handler = this.actionHandlers.get("clear");
       if (handler) {
@@ -8491,6 +9560,13 @@ var CustomEditor = class extends Editor {
       return;
     }
     if (matchesKey(data, "ctrl+z")) {
+      const handler = this.actionHandlers.get("suspend");
+      if (handler) {
+        handler();
+        return;
+      }
+    }
+    if (matchesKey(data, "alt+z")) {
       const handler = this.actionHandlers.get("undo");
       if (handler) {
         handler();
@@ -8573,11 +9649,12 @@ function createTUIState(options) {
     pendingSubagents: /* @__PURE__ */ new Map(),
     toolOutputExpanded: false,
     hideThinkingBlock: true,
+    quietMode: false,
     // Thread / conversation
     pendingNewThread: false,
-    pendingLockConflict: null,
     // Inline interaction
     lastClearedText: "",
+    pendingInlineQuestions: [],
     followUpComponents: [],
     pendingSlashCommands: [],
     pendingApprovalDismiss: null,
@@ -8594,11 +9671,15 @@ function createTUIState(options) {
 }
 
 // src/tui/mastra-tui.ts
+var UPDATE_RECHECK_INTERVAL_MS = 45 * 60 * 1e3;
 var MastraTUI = class _MastraTUI {
   state;
+  updateCheckTimer = null;
   static DOUBLE_CTRL_C_MS = 500;
   constructor(options) {
     this.state = createTUIState(options);
+    const savedSettings = loadSettings();
+    this.state.quietMode = savedSettings.preferences.quietMode;
     const originalHandleInput = this.state.editor.handleInput.bind(this.state.editor);
     this.state.editor.handleInput = (data) => {
       if (this.state.activeInlinePlanApproval) {
@@ -8701,7 +9782,8 @@ var MastraTUI = class _MastraTUI {
    * Errors are handled via harness events.
    */
   fireMessage(content, images) {
-    this.state.harness.sendMessage({ content, images: images ? images : void 0 }).catch((error) => {
+    const files = images?.map((img) => ({ data: img.data, mediaType: img.mimeType }));
+    this.state.harness.sendMessage({ content, files }).catch((error) => {
       showError(this.state, error instanceof Error ? error.message : "Unknown error");
     });
   }
@@ -8714,6 +9796,10 @@ var MastraTUI = class _MastraTUI {
       hookMgr.runSessionEnd().catch(() => {
       });
     }
+    if (this.updateCheckTimer) {
+      clearInterval(this.updateCheckTimer);
+      this.updateCheckTimer = null;
+    }
     if (this.state.unsubscribe) {
       this.state.unsubscribe();
     }
@@ -8745,12 +9831,16 @@ var MastraTUI = class _MastraTUI {
     await renderExistingMessages(this.state);
     await renderExistingTasks(this.state);
     await this.checkClaudeMaxOAuthWarning();
-    if (this.state.pendingLockConflict) {
-      this.showThreadLockPrompt(this.state.pendingLockConflict.threadTitle, this.state.pendingLockConflict.ownerPid);
-      this.state.pendingLockConflict = null;
-    } else if (this.shouldShowOnboarding()) {
+    if (this.shouldShowOnboarding()) {
       await this.showOnboarding();
     }
+    await this.checkForUpdate();
+    this.updateCheckTimer = setInterval(() => {
+      void this.checkForUpdate(
+        /* passive */
+        true
+      );
+    }, UPDATE_RECHECK_INTERVAL_MS);
   }
   async refreshModelAuthStatus() {
     this.state.modelAuthStatus = await this.state.harness.getCurrentModelAuthStatus();
@@ -8769,11 +9859,60 @@ var MastraTUI = class _MastraTUI {
   }
   async handleEvent(event) {
     await dispatchEvent(event, this.getEventContext(), this.state);
+    if (event.type === "thread_created") {
+      await this.syncThreadActivePackMetadata(event.thread);
+    } else if (event.type === "thread_changed") {
+      await this.syncThreadActivePackMetadata();
+    }
     if (event.type === "agent_end") {
       const stopReason = event.reason === "aborted" ? "aborted" : event.reason === "error" ? "error" : "complete";
       await this.runStopHook(stopReason);
     }
   }
+  async buildProviderAccess() {
+    const models = await this.state.harness.listAvailableModels();
+    const hasEnv = (provider) => models.some((m) => m.provider === provider && m.hasApiKey);
+    const accessLevel = (provider, oauthId) => {
+      if (this.state.authStorage?.isLoggedIn(oauthId)) return "oauth";
+      if (hasEnv(provider)) return "apikey";
+      return false;
+    };
+    const access = {
+      anthropic: accessLevel("anthropic", "anthropic"),
+      openai: accessLevel("openai", "openai-codex"),
+      cerebras: hasEnv("cerebras") ? "apikey" : false,
+      google: hasEnv("google") ? "apikey" : false,
+      deepseek: hasEnv("deepseek") ? "apikey" : false
+    };
+    const seen = new Set(Object.keys(access));
+    for (const m of models) {
+      if (!seen.has(m.provider) && m.hasApiKey) {
+        access[m.provider] = "apikey";
+        seen.add(m.provider);
+      }
+    }
+    return access;
+  }
+  async syncThreadActivePackMetadata(thread) {
+    const settings = loadSettings();
+    const currentThreadId = this.state.harness.getCurrentThreadId();
+    if (!currentThreadId) return;
+    const resolvedThread = thread?.id === currentThreadId ? thread : (await this.state.harness.listThreads()).find((t) => t.id === currentThreadId);
+    const access = await this.buildProviderAccess();
+    const packs = getAvailableModePacks(access, settings.customModelPacks).filter((p) => p.id !== "custom");
+    const resolvedPackId = resolveThreadActiveModelPackId(
+      settings,
+      packs,
+      resolvedThread?.metadata
+    );
+    if (resolvedPackId && settings.models.activeModelPackId !== resolvedPackId) {
+      const fresh = loadSettings();
+      if (fresh.models.activeModelPackId !== resolvedPackId) {
+        fresh.models.activeModelPackId = resolvedPackId;
+        saveSettings(fresh);
+      }
+    }
+  }
   showHookWarnings(event, warnings) {
     for (const warning of warnings) {
       showInfo(this.state, `[${event}] ${warning}`);
@@ -8839,42 +9978,6 @@ var MastraTUI = class _MastraTUI {
       };
     });
   }
-  /**
-   * Show an inline prompt when a thread is locked by another process.
-   * User can create a new thread (y) or exit (n).
-   */
-  showThreadLockPrompt(threadTitle, ownerPid) {
-    const questionComponent = new AskQuestionInlineComponent(
-      {
-        question: `Thread "${threadTitle}" is locked by pid ${ownerPid}. Create a new thread?`,
-        options: [
-          { label: "Yes", description: "Start a new thread" },
-          { label: "No", description: "Exit" }
-        ],
-        formatResult: (answer) => answer === "Yes" ? "Thread created" : "Exiting.",
-        onSubmit: async (answer) => {
-          this.state.activeInlineQuestion = void 0;
-          if (answer.toLowerCase().startsWith("y")) {
-            if (this.shouldShowOnboarding()) {
-              await this.showOnboarding();
-            }
-          } else {
-            process.exit(0);
-          }
-        },
-        onCancel: () => {
-          this.state.activeInlineQuestion = void 0;
-          process.exit(0);
-        }
-      },
-      this.state.ui
-    );
-    this.state.activeInlineQuestion = questionComponent;
-    this.state.chatContainer.addChild(questionComponent);
-    this.state.chatContainer.addChild(new Spacer(1));
-    this.state.ui.requestRender();
-    this.state.chatContainer.invalidate();
-  }
   /**
    * One-time startup check: if the user has Anthropic OAuth credentials and
    * hasn't yet acknowledged the Claude Max ToS warning, show it now.
@@ -9016,23 +10119,7 @@ var MastraTUI = class _MastraTUI {
       value: p.id,
       loggedIn: this.state.authStorage?.isLoggedIn(p.id) ?? false
     }));
-    const buildAccess = async () => {
-      const models = await this.state.harness.listAvailableModels();
-      const hasEnv = (provider) => models.some((m) => m.provider === provider && m.hasApiKey);
-      const accessLevel = (provider, oauthId) => {
-        if (this.state.authStorage?.isLoggedIn(oauthId)) return "oauth";
-        if (hasEnv(provider)) return "apikey";
-        return false;
-      };
-      return {
-        anthropic: accessLevel("anthropic", "anthropic"),
-        openai: accessLevel("openai", "openai-codex"),
-        cerebras: hasEnv("cerebras") ? "apikey" : false,
-        google: hasEnv("google") ? "apikey" : false,
-        deepseek: hasEnv("deepseek") ? "apikey" : false
-      };
-    };
-    const access = await buildAccess();
+    const access = await this.buildProviderAccess();
     const hasProviderAccess = Object.values(access).some(Boolean);
     const savedSettings = loadSettings();
     const modePacks = getAvailableModePacks(access, savedSettings.customModelPacks);
@@ -9077,7 +10164,7 @@ var MastraTUI = class _MastraTUI {
           }
           this.performLogin(providerId).then(async () => {
             try {
-              const updatedAccess = await buildAccess();
+              const updatedAccess = await this.buildProviderAccess();
               const updatedHasAccess = Object.values(updatedAccess).some(Boolean);
               component.updateModePacks(getAvailableModePacks(updatedAccess, savedSettings.customModelPacks));
               component.updateOmPacks(getAvailableOmPacks(updatedAccess));
@@ -9158,30 +10245,32 @@ var MastraTUI = class _MastraTUI {
     settings.onboarding.completedAt = (/* @__PURE__ */ new Date()).toISOString();
     settings.onboarding.skippedAt = null;
     settings.onboarding.version = ONBOARDING_VERSION;
-    settings.onboarding.modePackId = modePack.id;
     settings.onboarding.omPackId = omPack.id;
     const modeDefaults = {};
     for (const mode of modes) {
       const modelId = modePack.models[mode.id];
       if (modelId) modeDefaults[mode.id] = modelId;
     }
-    if (modePack.id === "custom") {
-      const idx = settings.customModelPacks.findIndex((p) => p.name === "Setup");
-      const entry = { name: "Setup", models: modeDefaults, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+    let activeModePackId = modePack.id;
+    if (modePack.id === "custom" || modePack.id.startsWith("custom:")) {
+      const customName = modePack.id === "custom" ? modePack.name?.trim() || "Custom" : modePack.id.slice("custom:".length) || "Custom";
+      activeModePackId = `custom:${customName}`;
+      const entry = { name: customName, models: modeDefaults, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      const idx = settings.customModelPacks.findIndex((p) => p.name === customName);
       if (idx >= 0) {
         settings.customModelPacks[idx] = entry;
       } else {
         settings.customModelPacks.push(entry);
       }
-      settings.models.activeModelPackId = "custom:Setup";
-      settings.models.modeDefaults = modeDefaults;
-    } else if (modePack.id.startsWith("custom:")) {
-      settings.models.activeModelPackId = modePack.id;
       settings.models.modeDefaults = modeDefaults;
     } else {
-      settings.models.activeModelPackId = modePack.id;
       settings.models.modeDefaults = {};
     }
+    settings.onboarding.modePackId = activeModePackId;
+    settings.models.activeModelPackId = activeModePackId;
+    if (harness.getCurrentThreadId()) {
+      await harness.setThreadSetting({ key: THREAD_ACTIVE_MODEL_PACK_ID_KEY, value: activeModePackId });
+    }
     settings.models.activeOmPackId = omPack.id;
     settings.models.omModelOverride = omPack.id === "custom" ? omPack.modelId : null;
     settings.preferences.yolo = result.yolo;
@@ -9198,6 +10287,92 @@ var MastraTUI = class _MastraTUI {
     }
     return true;
   }
+  // ===========================================================================
+  // Auto-Update
+  // ===========================================================================
+  /**
+   * Check npm for a newer version and prompt the user to update.
+   * - If the user previously dismissed this version, show a passive note instead.
+   * - If the fetch fails or we're already up-to-date, silently return.
+   * @param passive When true, only show an info message (used for periodic rechecks).
+   */
+  async checkForUpdate(passive = false) {
+    const currentVersion = this.state.options.version;
+    if (!currentVersion) return;
+    const latestVersion = await fetchLatestVersion();
+    if (!latestVersion || !isNewerVersion(currentVersion, latestVersion)) return;
+    const pm = await detectPackageManager();
+    if (passive) {
+      const cmd = getInstallCommand(pm);
+      showInfo(
+        this.state,
+        `Update available: v${latestVersion} (current: v${currentVersion}). Run \`${cmd}\` to update.`
+      );
+      return;
+    }
+    const settings = loadSettings();
+    if (settings.updateDismissedVersion && !isNewerVersion(settings.updateDismissedVersion, latestVersion)) {
+      const cmd = getInstallCommand(pm);
+      showInfo(
+        this.state,
+        `Update available: v${latestVersion} (current: v${currentVersion}). Run \`${cmd}\` to update.`
+      );
+      return;
+    }
+    await this.showUpdatePrompt(currentVersion, latestVersion, pm);
+  }
+  /**
+   * Show an inline Y/N prompt offering to auto-update.
+   */
+  showUpdatePrompt(currentVersion, latestVersion, pm) {
+    return new Promise((resolve2) => {
+      const questionComponent = new AskQuestionInlineComponent(
+        {
+          question: `A new version of Mastra Code is available: v${latestVersion} (current: v${currentVersion}). Would you like to update now?`,
+          options: [
+            { label: "Yes", description: "Update and restart" },
+            { label: "No", description: "Skip this version" }
+          ],
+          formatResult: (answer) => answer === "Yes" ? "Updating\u2026" : "Update skipped.",
+          onSubmit: async (answer) => {
+            this.state.activeInlineQuestion = void 0;
+            if (answer === "Yes") {
+              showInfo(this.state, `Updating to v${latestVersion}\u2026`);
+              const ok = await runUpdate(pm, latestVersion);
+              if (ok) {
+                showInfo(this.state, `Updated to v${latestVersion}. Please restart Mastra Code.`);
+                this.stop();
+                process.exit(0);
+              } else {
+                const cmd = getInstallCommand(pm, latestVersion);
+                showError(this.state, `Auto-update failed. Run \`${cmd}\` manually.`);
+              }
+            } else {
+              const settings = loadSettings();
+              settings.updateDismissedVersion = latestVersion;
+              saveSettings(settings);
+              const cmd = getInstallCommand(pm);
+              showInfo(this.state, `Update skipped. Run \`${cmd}\` to update manually.`);
+            }
+            resolve2();
+          },
+          onCancel: () => {
+            this.state.activeInlineQuestion = void 0;
+            const settings = loadSettings();
+            settings.updateDismissedVersion = latestVersion;
+            saveSettings(settings);
+            resolve2();
+          }
+        },
+        this.state.ui
+      );
+      this.state.activeInlineQuestion = questionComponent;
+      this.state.chatContainer.addChild(questionComponent);
+      this.state.chatContainer.addChild(new Spacer(1));
+      this.state.ui.requestRender();
+      this.state.chatContainer.invalidate();
+    });
+  }
 };
 var LoginSelectorComponent = class extends Box {
   listContainer;
@@ -9266,6 +10441,6 @@ var LoginSelectorComponent = class extends Box {
   }
 };
 
-export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus };
-//# sourceMappingURL=chunk-X3BGE7CL.js.map
-//# sourceMappingURL=chunk-X3BGE7CL.js.map
+export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus, getCurrentVersion };
+//# sourceMappingURL=chunk-YQNZ7DHQ.js.map
+//# sourceMappingURL=chunk-YQNZ7DHQ.js.map