mastracode 0.3.0 → 0.4.0

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

@@ -1,9 +1,9 @@
-import { mastra, bg, bold, fg, getMarkdownTheme, theme, getEditorTheme, loadSettings, getAvailableModePacks, getAvailableOmPacks, ONBOARDING_VERSION, saveSettings, ThreadLockError, parseSubagentMeta, tintHex, getSelectListTheme, getSettingsListTheme } from './chunk-V4HZ2AVV.js';
-import { getOAuthProviders, detectProject, getUserId, PROVIDER_DEFAULT_MODELS } from './chunk-VRZZSUQE.js';
+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 { Box, Text, Spacer, Input, Container, fuzzyFilter, getEditorKeybindings, Markdown, ProcessTerminal, TUI, Editor, matchesKey, CombinedAutocompleteProvider, SelectList, visibleWidth, SettingsList } from '@mariozechner/pi-tui';
+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, execSync } from 'child_process';
+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';
@@ -14,6 +14,9 @@ import { highlight } from 'cli-highlight';
 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 OnboardingInlineComponent = class extends Container {
   tui;
   options;
@@ -73,6 +76,10 @@ var OnboardingInlineComponent = class extends Container {
       this.selectedOmPack = packs[0];
     }
   }
+  /** Update whether the user has any provider access (e.g. after a login). */
+  updateHasProviderAccess(hasAccess) {
+    this.options.hasProviderAccess = hasAccess;
+  }
   // ---------------------------------------------------------------------------
   // Rendering helpers
   // ---------------------------------------------------------------------------
@@ -89,6 +96,8 @@ var OnboardingInlineComponent = class extends Container {
         return this.renderWelcome();
       case "auth":
         return this.renderAuth();
+      case "claudeMaxWarning":
+        return this.renderClaudeMaxWarning();
       case "modePack":
         return this.renderModePack();
       case "omPack":
@@ -115,14 +124,14 @@ var OnboardingInlineComponent = class extends Container {
   // ---------------------------------------------------------------------------
   renderWelcome() {
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("accent", "\u{1F44B} Welcome to Mastra Code")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("accent", "\u{1F44B} Welcome to Mastra Code")), 0, 0));
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("text", "Let's configure your models and preferences."), 0, 0));
+    box.addChild(new Text(theme.fg("text", "Let's configure your models and preferences."), 0, 0));
     box.addChild(new Text(chalk10.white("You can re-run this anytime with /setup."), 0, 0));
     box.addChild(new Spacer(1));
     const items = [
-      { value: "continue", label: `  ${fg("success", "Continue")}` },
-      { value: "skip", label: `  ${fg("dim", "Skip")}` }
+      { value: "continue", label: `  ${theme.fg("success", "Continue")}` },
+      { value: "skip", label: `  ${theme.fg("dim", "Skip")}` }
     ];
     this.selectList = new SelectList(items, items.length, getSelectListTheme());
     this.selectList.onSelect = (item) => {
@@ -147,25 +156,31 @@ var OnboardingInlineComponent = class extends Container {
   // ---------------------------------------------------------------------------
   renderAuth() {
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("accent", "\u{1F511} Authentication")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("accent", "\u{1F511} Authentication")), 0, 0));
     box.addChild(new Spacer(1));
     const providers = this.options.authProviders;
     if (providers.length === 0) {
-      box.addChild(new Text(fg("dim", "No OAuth providers available. Skipping."), 0, 0));
+      box.addChild(new Text(theme.fg("dim", "No OAuth providers available. Skipping."), 0, 0));
       setTimeout(() => this.renderStep("modePack"), 100);
       return;
     }
-    box.addChild(new Text(fg("text", "Log in with an AI provider to use your subscription:"), 0, 0));
+    box.addChild(new Text(theme.fg("text", "Log in with an AI provider to use your subscription,"), 0, 0));
+    box.addChild(new Text(theme.fg("text", "or skip if you have API keys configured as environment variables."), 0, 0));
     box.addChild(new Spacer(1));
     const items = providers.map((p) => ({
       value: p.value,
-      label: p.loggedIn ? `  ${p.label}  ${fg("success", "\u2713 logged in")}` : `  ${p.label}`
+      label: p.loggedIn ? `  ${p.label}  ${theme.fg("success", "\u2713 logged in")}` : `  ${p.label}`
     }));
-    items.push({ value: "__skip", label: `  ${fg("dim", "Skip (configure later with /login)")}` });
+    items.push({
+      value: "__skip",
+      label: `  ${theme.fg("dim", "Skip (use API keys or configure later with /login)")}`
+    });
     this.selectList = new SelectList(items, Math.min(items.length, 8), getSelectListTheme());
     this.selectList.onSelect = (item) => {
       if (item.value === "__skip") {
         this.renderStep("modePack");
+      } else if (item.value === ANTHROPIC_OAUTH_PROVIDER_ID) {
+        this.renderStep("claudeMaxWarning");
       } else {
         this.loginRequested = true;
         this.loginProvider = item.value;
@@ -179,7 +194,39 @@ var OnboardingInlineComponent = class extends Container {
     };
     box.addChild(this.selectList);
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc skip"), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc skip"), 0, 0));
+  }
+  // ---------------------------------------------------------------------------
+  // Step: Claude Max OAuth Warning
+  // ---------------------------------------------------------------------------
+  renderClaudeMaxWarning() {
+    const box = this.makeBox();
+    box.addChild(new Text(theme.bold(theme.fg("warning", "\u26A0 Claude Max OAuth Warning")), 0, 0));
+    box.addChild(new Spacer(1));
+    box.addChild(new Text(theme.fg("text", CLAUDE_MAX_OAUTH_WARNING_MESSAGE), 0, 0));
+    box.addChild(new Spacer(1));
+    const items = [
+      { value: "continue", label: `  ${theme.fg("success", "Continue")}` },
+      { value: "cancel", label: `  ${theme.fg("dim", "Cancel")}` }
+    ];
+    this.selectList = new SelectList(items, items.length, getSelectListTheme());
+    this.selectList.onSelect = (item) => {
+      if (item.value === "continue") {
+        this.loginRequested = true;
+        this.loginProvider = ANTHROPIC_OAUTH_PROVIDER_ID;
+        this.options.onLogin(ANTHROPIC_OAUTH_PROVIDER_ID, () => {
+          this.renderStep("modePack");
+        });
+      } else {
+        this.renderStep("auth");
+      }
+    };
+    this.selectList.onCancel = () => {
+      this.renderStep("auth");
+    };
+    box.addChild(this.selectList);
+    box.addChild(new Spacer(1));
+    box.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc go back"), 0, 0));
   }
   // ---------------------------------------------------------------------------
   // Step: Mode pack
@@ -188,32 +235,33 @@ var OnboardingInlineComponent = class extends Container {
   modePackDetail;
   renderModePack() {
     const packs = this.options.modePacks;
-    const hasProviderPack = packs.some((p) => !p.id.startsWith("custom"));
-    if (!hasProviderPack) {
+    if (!this.options.hasProviderAccess) {
       const box2 = this.makeBox();
-      box2.addChild(new Text(bold(fg("error", "No model providers configured")), 0, 0));
+      box2.addChild(new Text(theme.bold(theme.fg("error", "No model providers configured")), 0, 0));
       box2.addChild(new Spacer(1));
-      box2.addChild(new Text(fg("text", "To use Mastra Code you need at least one API key or OAuth login"), 0, 0));
-      box2.addChild(new Text(fg("text", "for Anthropic, OpenAI, or another supported provider."), 0, 0));
+      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(
-        new Text(fg("dim", "See https://mastra.ai/docs/models for supported providers and API key env vars."), 0, 0)
+        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(new Text(fg("dim", "Set an API key and restart, or run /login to authenticate via OAuth."), 0, 0));
+      box2.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;
     }
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("accent", "Model Packs")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("accent", "Model Packs")), 0, 0));
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("text", "Choose default models for each mode (build / plan / fast):"), 0, 0));
+    box.addChild(new Text(theme.fg("text", "Choose default models for each mode (build / plan / fast):"), 0, 0));
     box.addChild(new Spacer(1));
     const prevId = this.options.previous?.modePackId ?? null;
     const items = packs.map((p) => ({
       value: p.id,
-      label: `  ${p.name}  ${fg("dim", p.description)}${p.id === prevId ? fg("dim", " (current)") : ""}`
+      label: `  ${p.name}  ${theme.fg("dim", p.description)}${p.id === prevId ? theme.fg("dim", " (current)") : ""}`
     }));
     this.selectList = new SelectList(items, items.length, getSelectListTheme());
     const prevIdx = prevId ? packs.findIndex((p) => p.id === prevId) : -1;
@@ -224,12 +272,12 @@ var OnboardingInlineComponent = class extends Container {
         this.runCustomPackFlow();
       } else {
         this.selectedModePack = pack;
-        this.collapseStep(`Model pack \u2192 ${bold(this.selectedModePack.name)}`);
+        this.collapseStep(`Model pack \u2192 ${theme.bold(this.selectedModePack.name)}`);
         this.renderStep("omPack");
       }
     };
     this.selectList.onCancel = () => {
-      this.collapseStep(`Model pack \u2192 ${bold(this.selectedModePack.name)} (default)`);
+      this.collapseStep(`Model pack \u2192 ${theme.bold(this.selectedModePack.name)} (default)`);
       this.renderStep("omPack");
     };
     this.selectList.onSelectionChange = (item) => {
@@ -242,18 +290,18 @@ var OnboardingInlineComponent = class extends Container {
     const initialId = prevIdx > 0 ? packs[prevIdx].id : packs[0].id;
     this.updateModePackDetail(packs, initialId);
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
   }
   updateModePackDetail(packs, highlightedId) {
     const pack = packs.find((p) => p.id === highlightedId);
     if (!pack || !this.modePackDetail) return;
     if (pack.id === "custom") {
-      this.modePackDetail.setText(fg("dim", "  You'll pick a model for each mode in the next steps."));
+      this.modePackDetail.setText(theme.fg("dim", "  You'll pick a model for each mode in the next steps."));
     } else {
       const detail = [
-        `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${fg("text", pack.models.plan)}`,
-        `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${fg("text", pack.models.build)}`,
-        `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${fg("text", pack.models.fast)}`
+        `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
+        `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
+        `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
       ].join("\n");
       this.modePackDetail.setText(detail);
     }
@@ -277,7 +325,7 @@ var OnboardingInlineComponent = class extends Container {
       if (!modelId) {
         const fallback = this.options.modePacks.find((p) => p.id !== "custom") ?? this.options.modePacks[0];
         this.selectedModePack = fallback;
-        this.collapseStep(`Model pack \u2192 ${bold(this.selectedModePack.name)} (cancelled custom)`);
+        this.collapseStep(`Model pack \u2192 ${theme.bold(this.selectedModePack.name)} (cancelled custom)`);
         this.renderStep("omPack");
         this.tui.requestRender();
         return;
@@ -291,7 +339,7 @@ var OnboardingInlineComponent = class extends Container {
       models: { build: models.build, plan: models.plan, fast: models.fast }
     };
     this.collapseStep(
-      `Model pack \u2192 ${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("Custom")}  ${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();
@@ -306,15 +354,15 @@ var OnboardingInlineComponent = class extends Container {
       return;
     }
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("accent", "\u{1F9E0} Observational Memory")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("accent", "\u{1F9E0} Observational Memory")), 0, 0));
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("text", "Choose the model for observational memory:"), 0, 0));
-    box.addChild(new Text(fg("dim", "https://mastra.ai/docs/memory/observational-memory"), 0, 0));
+    box.addChild(new Text(theme.fg("text", "Choose the model for observational memory:"), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "https://mastra.ai/docs/memory/observational-memory"), 0, 0));
     box.addChild(new Spacer(1));
     const prevOmId = this.options.previous?.omPackId ?? null;
     const items = omPacks.map((p) => ({
       value: p.id,
-      label: `  ${p.name}  ${fg("dim", p.description)}${p.id === prevOmId ? fg("dim", " (current)") : ""}`
+      label: `  ${p.name}  ${theme.fg("dim", p.description)}${p.id === prevOmId ? theme.fg("dim", " (current)") : ""}`
     }));
     this.selectList = new SelectList(items, items.length, getSelectListTheme());
     const prevOmIdx = prevOmId ? omPacks.findIndex((p) => p.id === prevOmId) : -1;
@@ -325,32 +373,32 @@ var OnboardingInlineComponent = class extends Container {
         this.runCustomOmFlow();
       } else {
         this.selectedOmPack = pack;
-        this.collapseStep(`Observational memory \u2192 ${bold(this.selectedOmPack.name)}`);
+        this.collapseStep(`Observational memory \u2192 ${theme.bold(this.selectedOmPack.name)}`);
         this.renderStep("yolo");
       }
     };
     this.selectList.onCancel = () => {
-      this.collapseStep(`Observational memory \u2192 ${bold(this.selectedOmPack.name)} (default)`);
+      this.collapseStep(`Observational memory \u2192 ${theme.bold(this.selectedOmPack.name)} (default)`);
       this.renderStep("yolo");
     };
     box.addChild(this.selectList);
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
   }
   async runCustomOmFlow() {
     this.selectList = void 0;
-    this.collapseStep(`Observational memory \u2192 ${bold("Custom")}`);
+    this.collapseStep(`Observational memory \u2192 ${theme.bold("Custom")}`);
     const modelId = await this.options.onSelectModel("Select model for observational memory");
     if (modelId) {
       this.selectedOmPack = { id: "custom", name: "Custom", description: "User-selected model", modelId };
-      this.collapseStep(`Observational memory \u2192 ${bold("Custom")}  ${modelId}`);
+      this.collapseStep(`Observational memory \u2192 ${theme.bold("Custom")}  ${modelId}`);
     } else {
       const fallback = this.options.omPacks.find((p) => p.id !== "custom");
       if (fallback) {
         this.selectedOmPack = fallback;
-        this.collapseStep(`Observational memory \u2192 ${bold(fallback.name)} (cancelled custom)`);
+        this.collapseStep(`Observational memory \u2192 ${theme.bold(fallback.name)} (cancelled custom)`);
       } else {
-        this.collapseStep(`Observational memory \u2192 ${bold("Custom")} (cancelled)`);
+        this.collapseStep(`Observational memory \u2192 ${theme.bold("Custom")} (cancelled)`);
       }
     }
     this.renderStep("yolo");
@@ -361,22 +409,22 @@ var OnboardingInlineComponent = class extends Container {
   // ---------------------------------------------------------------------------
   renderYolo() {
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("accent", "\u26A1 Tool Approval")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("accent", "\u26A1 Tool Approval")), 0, 0));
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("text", "YOLO mode auto-approves all tool calls (edits, commands, etc)."), 0, 0));
-    box.addChild(new Text(fg("text", "You can toggle this anytime with Ctrl+Y or /yolo."), 0, 0));
+    box.addChild(new Text(theme.fg("text", "YOLO mode auto-approves all tool calls (edits, commands, etc)."), 0, 0));
+    box.addChild(new Text(theme.fg("text", "You can toggle this anytime with Ctrl+Y or /yolo."), 0, 0));
     box.addChild(new Spacer(1));
     const prevYolo = this.options.previous?.yolo ?? null;
-    const currentOn = prevYolo === true ? fg("dim", " (current)") : "";
-    const currentOff = prevYolo === false ? fg("dim", " (current)") : "";
+    const currentOn = prevYolo === true ? theme.fg("dim", " (current)") : "";
+    const currentOff = prevYolo === false ? theme.fg("dim", " (current)") : "";
     const items = [
       {
         value: "on",
-        label: `  ${fg("success", "Enable YOLO")}  ${fg("dim", "(recommended \u2014 auto-approve everything)")}${currentOn}`
+        label: `  ${theme.fg("success", "Enable YOLO")}  ${theme.fg("dim", "(recommended \u2014 auto-approve everything)")}${currentOn}`
       },
       {
         value: "off",
-        label: `  ${fg("warning", "Disable YOLO")}  ${fg("dim", "(ask before each tool call)")}${currentOff}`
+        label: `  ${theme.fg("warning", "Disable YOLO")}  ${theme.fg("dim", "(ask before each tool call)")}${currentOff}`
       }
     ];
     this.selectList = new SelectList(items, items.length, getSelectListTheme());
@@ -384,16 +432,16 @@ var OnboardingInlineComponent = class extends Container {
     this.selectList.onSelect = (item) => {
       this.selectedYolo = item.value === "on";
       const label = this.selectedYolo ? "enabled" : "disabled";
-      this.collapseStep(`YOLO mode \u2192 ${bold(label)}`);
+      this.collapseStep(`YOLO mode \u2192 ${theme.bold(label)}`);
       this.renderStep("done");
     };
     this.selectList.onCancel = () => {
-      this.collapseStep(`YOLO mode \u2192 ${bold("enabled")} (default)`);
+      this.collapseStep(`YOLO mode \u2192 ${theme.bold("enabled")} (default)`);
       this.renderStep("done");
     };
     box.addChild(this.selectList);
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc use default"), 0, 0));
   }
   // ---------------------------------------------------------------------------
   // Step: Done
@@ -401,21 +449,21 @@ var OnboardingInlineComponent = class extends Container {
   renderDone() {
     this._finished = true;
     const box = this.makeBox();
-    box.addChild(new Text(bold(fg("success", "\u2713 Setup complete!")), 0, 0));
+    box.addChild(new Text(theme.bold(theme.fg("success", "\u2713 Setup complete!")), 0, 0));
     box.addChild(new Spacer(1));
     const lines = [
-      `Model pack: ${bold(this.selectedModePack.name)}`,
+      `Model pack: ${theme.bold(this.selectedModePack.name)}`,
       `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${this.selectedModePack.models.plan}`,
       `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${this.selectedModePack.models.build}`,
       `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${this.selectedModePack.models.fast}`,
-      `Observational memory: ${bold(this.selectedOmPack.name)}`,
-      `YOLO mode: ${bold(this.selectedYolo ? "enabled" : "disabled")}`
+      `Observational memory: ${theme.bold(this.selectedOmPack.name)}`,
+      `YOLO mode: ${theme.bold(this.selectedYolo ? "enabled" : "disabled")}`
     ];
     for (const line of lines) {
-      box.addChild(new Text(fg("text", line), 0, 0));
+      box.addChild(new Text(theme.fg("text", line), 0, 0));
     }
     box.addChild(new Spacer(1));
-    box.addChild(new Text(fg("dim", "Type a message to start coding, or use /help for commands."), 0, 0));
+    box.addChild(new Text(theme.fg("dim", "Type a message to start coding, or use /help for commands."), 0, 0));
     this.options.onComplete({
       modePack: this.selectedModePack,
       omPack: this.selectedOmPack,
@@ -431,7 +479,7 @@ var OnboardingInlineComponent = class extends Container {
     if (!this.stepBox) return;
     this.stepBox.clear();
     this.stepBox.setBgFn((text) => theme.bg("toolSuccessBg", text));
-    this.stepBox.addChild(new Text(`${fg("success", "\u2713")} ${fg("text", summary)}`, 0, 0));
+    this.stepBox.addChild(new Text(`${theme.fg("success", "\u2713")} ${theme.fg("text", summary)}`, 0, 0));
     this.selectList = void 0;
   }
   // ---------------------------------------------------------------------------
@@ -445,22 +493,178 @@ var OnboardingInlineComponent = class extends Container {
     }
   }
 };
+var AskQuestionInlineComponent = class extends Container {
+  contentBox;
+  selectList;
+  input;
+  onSubmit;
+  onCancel;
+  formatResult;
+  isNegativeAnswer;
+  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.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.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/tui/claude-max-warning.ts
+function showClaudeMaxOAuthWarning(state, mode) {
+  const options = mode === "login" ? [
+    { label: "Continue", description: "Proceed with Anthropic OAuth" },
+    { label: "Cancel", description: "Go back" }
+  ] : [
+    { label: "Continue", description: "Keep Anthropic OAuth credentials" },
+    { label: "Remove OAuth", description: "Log out from Anthropic" }
+  ];
+  return new Promise((resolve2) => {
+    const questionComponent = new AskQuestionInlineComponent(
+      {
+        question: CLAUDE_MAX_OAUTH_WARNING_MESSAGE,
+        options,
+        formatResult: (answer) => `Claude Max OAuth warning \u2192 ${answer}`,
+        isNegativeAnswer: (answer) => answer !== "Continue",
+        onSubmit: (answer) => {
+          state.activeInlineQuestion = void 0;
+          if (answer === "Continue") {
+            resolve2("continue");
+          } else if (answer === "Cancel") {
+            resolve2("cancel");
+          } else {
+            resolve2("remove");
+          }
+        },
+        onCancel: () => {
+          state.activeInlineQuestion = void 0;
+          resolve2("cancel");
+        }
+      },
+      state.ui
+    );
+    state.activeInlineQuestion = questionComponent;
+    state.chatContainer.addChild(questionComponent);
+    state.chatContainer.addChild(new Spacer(1));
+    state.ui.requestRender();
+    state.chatContainer.invalidate();
+  });
+}
 async function processSlashCommand(command, args, workingDir) {
-  let result = command.template;
-  result = replaceArguments(result, args);
+  const { result: withArgs, shouldAppendRawArgs } = replaceArguments(command.template, args);
+  let result = withArgs;
   result = await replaceShellOutput(result, workingDir);
   result = await replaceFileReferences(result, workingDir);
+  if (shouldAppendRawArgs) {
+    result = result.trimEnd() + `
+
+ARGUMENTS: ${args.join(" ")}`;
+  }
   return result;
 }
 function replaceArguments(template, args) {
   let result = template;
+  const hasArgumentsVar = /\$ARGUMENTS/.test(template);
+  const hasPositionalVar = /\$[1-9]\d*/.test(template);
   result = result.replace(/\$ARGUMENTS/g, args.join(" "));
   args.forEach((arg, index) => {
     const pattern = new RegExp(`\\$${index + 1}`, "g");
     result = result.replace(pattern, arg);
   });
-  result = result.replace(/\$\d+/g, "");
-  return result;
+  result = result.replace(/\$[1-9]\d*/g, "");
+  return {
+    result,
+    shouldAppendRawArgs: !hasArgumentsVar && !hasPositionalVar && args.length > 0
+  };
 }
 async function replaceShellOutput(template, workingDir) {
   const shellPattern = /!`([^`]+)`/g;
@@ -525,7 +729,8 @@ function getCommands(modes) {
     { key: "/mcp", description: "Show/reload MCP connections" },
     { key: "/login", description: "Login with OAuth provider" },
     { key: "/logout", description: "Logout from OAuth provider" },
-    { key: "/setup", description: "Run the setup wizard" }
+    { key: "/setup", description: "Run the setup wizard" },
+    { key: "/theme", description: "Switch color theme (auto/dark/light)" }
   ];
   if (modes > 1) {
     cmds.push({ key: "/mode", description: "Switch or list modes" });
@@ -605,22 +810,129 @@ function handleYoloCommand(ctx) {
   ctx.harness.setState({ yolo: !current });
   ctx.showInfo(!current ? "YOLO mode ON \u2014 tools auto-approved" : "YOLO mode OFF \u2014 tools require approval");
 }
+var BASE_THINKING_LEVELS = [
+  { id: "off", label: "Off", providerValue: "none", description: "Reasoning disabled" },
+  { id: "low", label: "Low", providerValue: "low", description: "Light reasoning" },
+  { id: "medium", label: "Medium", providerValue: "medium", description: "Balanced reasoning" },
+  { id: "high", label: "High", providerValue: "high", description: "Deep reasoning" },
+  { id: "xhigh", label: "Very High", providerValue: "xhigh", description: "Maximum reasoning depth" }
+];
+function isOpenAIModel(modelId) {
+  return modelId.startsWith("openai/");
+}
+function getThinkingLevelsForModel(modelId) {
+  if (!isOpenAIModel(modelId)) {
+    return [...BASE_THINKING_LEVELS];
+  }
+  return BASE_THINKING_LEVELS.map((level) => ({
+    ...level,
+    label: level.providerValue
+  }));
+}
+var THINKING_LEVELS = getThinkingLevelsForModel("");
+function getThinkingLevelForModel(modelId, levelId) {
+  return getThinkingLevelsForModel(modelId).find((level) => level.id === levelId) ?? getThinkingLevelsForModel(modelId)[0];
+}
 
 // src/tui/commands/think.ts
-async function handleThinkCommand(ctx) {
+function supportsThinking(modelId) {
+  return modelId.startsWith("openai/");
+}
+function getThinkingStatusLine(modelId, levelId) {
+  const level = getThinkingLevelForModel(modelId, levelId);
+  return `Thinking: ${level.label}`;
+}
+function getModelNote(ctx) {
+  const modelId = ctx.state.harness.getCurrentModelId() ?? "";
+  if (!modelId) return "No model selected.";
+  if (!supportsThinking(modelId)) {
+    return `Warning: current model (${modelId}) may not support reasoning effort. Setting will be saved but may not take effect.`;
+  }
+  return null;
+}
+async function handleThinkCommand(ctx, args = []) {
   const currentLevel = ctx.harness.getState()?.thinkingLevel ?? "off";
-  const levels = [
-    { label: "Off", id: "off" },
-    { label: "Minimal", id: "minimal" },
-    { label: "Low", id: "low" },
-    { label: "Medium", id: "medium" },
-    { label: "High", id: "high" }
-  ];
-  const currentIdx = levels.findIndex((l) => l.id === currentLevel);
-  const nextIdx = (currentIdx + 1) % levels.length;
-  const next = levels[nextIdx];
-  await ctx.harness.setState({ thinkingLevel: next.id });
-  ctx.showInfo(`Thinking: ${next.label}`);
+  const modelId = ctx.state.harness.getCurrentModelId() ?? "";
+  const thinkingLevels = getThinkingLevelsForModel(modelId);
+  const arg = args[0]?.toLowerCase();
+  if (arg === "status") {
+    ctx.showInfo(getThinkingStatusLine(modelId, currentLevel));
+    return;
+  }
+  if (arg) {
+    const selected = thinkingLevels.find((l) => l.id === arg);
+    if (!selected) {
+      ctx.showInfo(
+        `Invalid thinking level: ${arg}. Use one of: ${THINKING_LEVELS.map((l) => l.id).join(", ")} or 'status'.`
+      );
+      return;
+    }
+    const note = getModelNote(ctx);
+    await ctx.harness.setState({ thinkingLevel: selected.id });
+    ctx.showInfo(getThinkingStatusLine(modelId, selected.id) + (note ? ` (${note})` : ""));
+    return;
+  }
+  const items = thinkingLevels.map((l) => ({
+    value: l.id,
+    label: `  ${l.label}  ${theme.fg("dim", l.description)}${l.id === currentLevel ? theme.fg("dim", " (current)") : ""}`
+  }));
+  const modelNote = getModelNote(ctx);
+  return new Promise((resolve2) => {
+    const container = new Box(1, 1);
+    container.addChild(new Text(theme.bold(theme.fg("accent", "Thinking Level")), 0, 0));
+    container.addChild(new Spacer(1));
+    if (modelNote) {
+      container.addChild(new Text(theme.fg("warning", modelNote), 0, 0));
+      container.addChild(new Spacer(1));
+    }
+    const selectList = new SelectList(items, items.length, getSelectListTheme());
+    selectList.onSelect = async (item) => {
+      ctx.state.activeInlineQuestion = void 0;
+      try {
+        await ctx.harness.setState({ thinkingLevel: item.value });
+        const selectedLabel = getThinkingLevelForModel(modelId, item.value).label;
+        collapseResult(
+          `Thinking \u2192 ${theme.bold(item.value === currentLevel ? `${selectedLabel} (unchanged)` : selectedLabel)}`
+        );
+      } catch {
+        collapseResult("cancelled");
+      } finally {
+        ctx.state.ui.requestRender();
+        resolve2();
+      }
+    };
+    selectList.onCancel = () => {
+      ctx.state.activeInlineQuestion = void 0;
+      collapseResult("cancelled");
+      ctx.state.ui.requestRender();
+      resolve2();
+    };
+    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 currentIdx = thinkingLevels.findIndex((l) => l.id === currentLevel);
+    if (currentIdx > 0) selectList.setSelectedIndex(currentIdx);
+    const collapseResult = (result) => {
+      container.clear();
+      if (result === "cancelled") {
+        container.addChild(new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} Thinking level (cancelled)`), 0, 0));
+      } else {
+        container.addChild(new Text(theme.fg("text", `${theme.fg("success", "\u2713")} ${result}`), 0, 0));
+      }
+    };
+    const inputShim = {
+      handleInput: (data) => {
+        if (isKeyRelease(data)) return;
+        selectList.handleInput(data);
+      }
+    };
+    ctx.state.activeInlineQuestion = inputShim;
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.chatContainer.addChild(container);
+    ctx.state.chatContainer.addChild(new Spacer(1));
+    ctx.state.ui.requestRender();
+    ctx.state.chatContainer.invalidate();
+  });
 }
 
 // src/tui/commands/permissions.ts
@@ -854,7 +1166,15 @@ ${modeList}`);
 
 // src/tui/commands/skills.ts
 async function handleSkillsCommand(ctx) {
-  const workspace = ctx.getResolvedWorkspace();
+  let workspace = ctx.getResolvedWorkspace();
+  if (!workspace && ctx.harness.hasWorkspace()) {
+    try {
+      workspace = await ctx.harness.resolveWorkspace();
+    } catch (error) {
+      ctx.showError(`Failed to resolve workspace: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+  }
   if (!workspace?.skills) {
     ctx.showInfo(
       "No skills configured.\n\nAdd skills to any of these locations:\n  .mastracode/skills/   (project-local)\n  .claude/skills/       (project-local)\n  ~/.mastracode/skills/ (global)\n  ~/.claude/skills/     (global)\n\nEach skill is a folder with a SKILL.md file.\nInstall skills: npx add-skill <github-url>"
@@ -933,12 +1253,13 @@ async function handleResourceCommand(ctx, args) {
   state.ui.requestRender();
   ctx.showInfo(sub === "reset" ? `Resource ID reset to: ${defaultId}` : `Switched to resource: ${newId}`);
 }
-var addedColor = chalk10.hex("#5cb85c");
-var hunkHeaderColor = chalk10.hex("#61afef");
-var fileHeaderColor = chalk10.bold.hex("#c678dd");
-var removedColor = chalk10.hex(mastra.red);
-var metaColor = chalk10.hex(mastra.mainGray);
 function colorizeDiffLine(line) {
+  const t = theme.getTheme();
+  const addedColor = chalk10.hex(t.success);
+  const hunkHeaderColor = chalk10.hex(t.toolBorderPending);
+  const fileHeaderColor = chalk10.bold.hex(t.accent);
+  const removedColor = chalk10.hex(mastra.red);
+  const metaColor = chalk10.hex(mastra.mainGray);
   if (line.startsWith("+++") || line.startsWith("---")) {
     return fileHeaderColor(line);
   }
@@ -957,7 +1278,7 @@ function colorizeDiffLine(line) {
   if (line.startsWith("index ") || line.startsWith("new file") || line.startsWith("deleted file") || line.startsWith("similarity") || line.startsWith("rename")) {
     return metaColor(line);
   }
-  const statMatch = line.match(/^(.+\|.+?)(\++)([-]*)$/);
+  const statMatch = line.match(/^(.+\|.+?)(\++)([- ]*)$/);
   if (statMatch) {
     return statMatch[1] + addedColor(statMatch[2]) + removedColor(statMatch[3]);
   }
@@ -970,7 +1291,9 @@ var DiffOutputComponent = class extends Container {
   constructor(command, diffOutput) {
     super();
     this.addChild(new Spacer(1));
-    this.addChild(new Text(`${fg("success", "\u2713")} ${bold(fg("muted", "$"))} ${fg("text", command)}`, 1, 0));
+    this.addChild(
+      new Text(`${theme.fg("success", "\u2713")} ${theme.bold(theme.fg("muted", "$"))} ${theme.fg("text", command)}`, 1, 0)
+    );
     const output = diffOutput.trimEnd();
     if (output) {
       const lines = output.split("\n");
@@ -1045,117 +1368,12 @@ async function handleDiffCommand(ctx, filePath) {
       opCounts.set(op, (opCounts.get(op) || 0) + 1);
     }
     const ops = Array.from(opCounts.entries()).map(([op, count]) => count > 1 ? `${op}\xD7${count}` : op).join(", ");
-    lines.push(`  ${fg("path", fp)} ${fg("muted", `(${ops})`)}`);
+    lines.push(`  ${theme.fg("path", fp)} ${theme.fg("muted", `(${ops})`)}`);
   }
   lines.push("");
-  lines.push(fg("muted", "Use /diff <path> to see the git diff for a specific file."));
+  lines.push(theme.fg("muted", "Use /diff <path> to see the git diff for a specific file."));
   ctx.showInfo(lines.join("\n"));
 }
-var AskQuestionInlineComponent = class extends Container {
-  contentBox;
-  selectList;
-  input;
-  onSubmit;
-  onCancel;
-  formatResult;
-  isNegativeAnswer;
-  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.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.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);
-    }
-  }
-};
 var ThreadSelectorComponent = class extends Box {
   searchInput;
   listContainer;
@@ -1179,7 +1397,7 @@ var ThreadSelectorComponent = class extends Box {
     this.searchInput.focused = value;
   }
   constructor(options) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.tui = options.tui;
     this.currentResourceId = options.currentResourceId;
     this.allThreads = this.sortThreads(options.threads, options.currentThreadId);
@@ -1206,9 +1424,9 @@ var ThreadSelectorComponent = class extends Box {
     this.tui.requestRender();
   }
   buildUI() {
-    this.addChild(new Text(bold(fg("accent", "Select Thread")), 0, 0));
+    this.addChild(new Text(theme.bold(theme.fg("accent", "Select Thread")), 0, 0));
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select \u2022 Esc cancel"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select \u2022 Esc cancel"), 0, 0));
     this.addChild(new Spacer(1));
     this.searchInput = new Input();
     this.searchInput.onSubmit = () => {
@@ -1271,33 +1489,33 @@ var ThreadSelectorComponent = class extends Box {
       if (!thread) continue;
       const isSelected = i === this.selectedIndex;
       const isCurrent = thread.id === this.currentThreadId;
-      const checkmark = isCurrent ? fg("success", " \u2713") : "";
+      const checkmark = isCurrent ? theme.fg("success", " \u2713") : "";
       const shortId = thread.id.slice(-6);
       const threadPath = thread.metadata?.projectPath;
-      const pathTag = threadPath ? fg("dim", ` [${threadPath.split("/").pop()}]`) : "";
+      const pathTag = threadPath ? theme.fg("dim", ` [${threadPath.split("/").pop()}]`) : "";
       const displayId = `${thread.resourceId}/${shortId}`;
-      const timeAgo = fg("muted", ` (${this.formatTimeAgo(thread.updatedAt)})`);
+      const timeAgo = theme.fg("muted", ` (${this.formatTimeAgo(thread.updatedAt)})`);
       const hasCustomTitle = thread.title && thread.title !== "New Thread";
       let line = "";
       if (isSelected) {
-        line = fg("accent", `\u2192 ${displayId}`) + pathTag + timeAgo + checkmark;
+        line = theme.fg("accent", `\u2192 ${displayId}`) + pathTag + timeAgo + checkmark;
       } else {
         line = `  ${displayId}` + pathTag + timeAgo + checkmark;
       }
       this.listContainer.addChild(new Text(line, 0, 0));
       const preview = this.messagePreviews.get(thread.id);
       if (preview) {
-        this.listContainer.addChild(new Text(`     ${fg("muted", `"${preview}"`)}`, 0, 0));
+        this.listContainer.addChild(new Text(`     ${theme.fg("muted", `"${preview}"`)}`, 0, 0));
       } else if (hasCustomTitle) {
-        this.listContainer.addChild(new Text(`     ${fg("muted", `"${thread.title}"`)}`, 0, 0));
+        this.listContainer.addChild(new Text(`     ${theme.fg("muted", `"${thread.title}"`)}`, 0, 0));
       }
     }
     if (startIndex > 0 || endIndex < this.filteredThreads.length) {
-      const scrollInfo = fg("muted", `(${this.selectedIndex + 1}/${this.filteredThreads.length})`);
+      const scrollInfo = theme.fg("muted", `(${this.selectedIndex + 1}/${this.filteredThreads.length})`);
       this.listContainer.addChild(new Text(scrollInfo, 0, 0));
     }
     if (this.filteredThreads.length === 0) {
-      this.listContainer.addChild(new Text(fg("muted", "No matching threads"), 0, 0));
+      this.listContainer.addChild(new Text(theme.fg("muted", "No matching threads"), 0, 0));
     }
   }
   handleInput(keyData) {
@@ -1448,7 +1666,7 @@ async function handleThreadTagDirCommand(ctx) {
     const questionComponent = new AskQuestionInlineComponent(
       {
         question: `Tag this thread with directory "${dirName}"?
-  ${fg("dim", projectPath)}`,
+  ${theme.fg("dim", projectPath)}`,
         options: [{ label: "Yes" }, { label: "No" }],
         formatResult: (answer) => answer === "Yes" ? `Tagged thread with: ${dirName}` : `Thread not tagged`,
         onSubmit: async (answer) => {
@@ -1618,7 +1836,7 @@ var ModelSelectorComponent = class extends Box {
     this.searchInput.focused = value;
   }
   constructor(options) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.tui = options.tui;
     this.title = options.title ?? "Select Model";
     this.titleColor = options.titleColor;
@@ -1630,10 +1848,10 @@ var ModelSelectorComponent = class extends Box {
     this.buildUI();
   }
   buildUI() {
-    const titleText = this.titleColor ? chalk10.bgHex(this.titleColor).white.bold(` ${this.title} `) : bold(fg("accent", this.title));
+    const titleText = this.titleColor ? chalk10.bgHex(this.titleColor).white.bold(` ${this.title} `) : theme.bold(theme.fg("accent", this.title));
     this.addChild(new Text(titleText, 0, 0));
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select \u2022 Esc cancel"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter select \u2022 Esc cancel"), 0, 0));
     this.addChild(new Spacer(1));
     this.searchInput = new Input();
     this.searchInput.onSubmit = () => {
@@ -1696,7 +1914,7 @@ var ModelSelectorComponent = class extends Box {
       if (this.hasCustomItem && i === 0) {
         const query = this.searchInput.getValue().trim();
         const isSelected2 = this.selectedIndex === 0;
-        const line2 = isSelected2 ? fg("accent", "\u2192 ") + bold(fg("accent", `Use: ${query}`)) : "  " + fg("muted", `Use: ${query}`);
+        const line2 = isSelected2 ? theme.fg("accent", "\u2192 ") + theme.bold(theme.fg("accent", `Use: ${query}`)) : "  " + theme.fg("muted", `Use: ${query}`);
         this.listContainer.addChild(new Text(line2, 0, 0));
         continue;
       }
@@ -1705,23 +1923,23 @@ var ModelSelectorComponent = class extends Box {
       if (!item) continue;
       const isSelected = i === this.selectedIndex;
       const isCurrent = item.id === this.currentModelId;
-      const checkmark = isCurrent ? fg("success", " \u2713") : "";
-      const noKeyIndicator = !item.hasApiKey ? fg("error", " \u2717") + fg("muted", item.apiKeyEnvVar ? ` (${item.apiKeyEnvVar})` : " (no key)") : "";
+      const checkmark = isCurrent ? theme.fg("success", " \u2713") : "";
+      const noKeyIndicator = !item.hasApiKey ? theme.fg("error", " \u2717") + theme.fg("muted", item.apiKeyEnvVar ? ` (${item.apiKeyEnvVar})` : " (no key)") : "";
       let line = "";
       if (isSelected) {
-        line = fg("accent", "\u2192 " + item.id) + checkmark + noKeyIndicator;
+        line = theme.fg("accent", "\u2192 " + item.id) + checkmark + noKeyIndicator;
       } else {
-        const modelText = item.hasApiKey ? item.id : fg("muted", item.id);
+        const modelText = item.hasApiKey ? item.id : theme.fg("muted", item.id);
         line = "  " + modelText + checkmark + noKeyIndicator;
       }
       this.listContainer.addChild(new Text(line, 0, 0));
     }
     if (startIndex > 0 || endIndex < totalItems) {
-      const scrollInfo = fg("muted", `(${this.selectedIndex + 1}/${totalItems})`);
+      const scrollInfo = theme.fg("muted", `(${this.selectedIndex + 1}/${totalItems})`);
       this.listContainer.addChild(new Text(scrollInfo, 0, 0));
     }
     if (totalItems === 0) {
-      this.listContainer.addChild(new Text(fg("muted", "No matching models"), 0, 0));
+      this.listContainer.addChild(new Text(theme.fg("muted", "No matching models"), 0, 0));
     }
   }
   handleInput(keyData) {
@@ -1906,7 +2124,9 @@ async function handleModelsCommand(ctx) {
 }
 var GRADIENT_WIDTH = 30;
 var BASE_COLOR = [124, 58, 237];
-var MIN_BRIGHTNESS = 0.45;
+function getMinBrightness() {
+  return getThemeMode() === "dark" ? 0.45 : 0.55;
+}
 function hexToRgb(hex) {
   const h = hex.replace("#", "");
   return [parseInt(h.slice(0, 2), 16), parseInt(h.slice(2, 4), 16), parseInt(h.slice(4, 6), 16)];
@@ -1926,7 +2146,8 @@ function applyGradientSweep(text, offset, color, fadeProgress = 0) {
       distance = 100 - distance;
     }
     const normalizedDistance = Math.min(distance / (GRADIENT_WIDTH / 2), 1);
-    const animBrightness = MIN_BRIGHTNESS + (1 - MIN_BRIGHTNESS) * (1 - normalizedDistance);
+    const minBrightness = getMinBrightness();
+    const animBrightness = minBrightness + (1 - minBrightness) * (1 - normalizedDistance);
     const brightness = animBrightness + (IDLE_BRIGHTNESS - animBrightness) * fadeProgress;
     const r = Math.floor(baseColor[0] * brightness);
     const g = Math.floor(baseColor[1] * brightness);
@@ -2063,7 +2284,7 @@ var OMProgressComponent = class extends Container {
       if (this.state.thresholdPercent > 0) {
         const percent = Math.round(this.state.thresholdPercent);
         const bar = this.renderProgressBar(percent, 10);
-        this.statusText.setText(fg("muted", `OM ${bar} ${percent}%`));
+        this.statusText.setText(theme.fg("muted", `OM ${bar} ${percent}%`));
       } else {
         this.statusText.setText("");
       }
@@ -2126,7 +2347,7 @@ function formatObservationStatus(state, compact, labelStyler) {
   }
   const label = compact === "full" ? "messages" : "msg";
   const fraction = `${formatTokensValue(state.pendingTokens)}/${formatTokensThreshold(state.threshold)}`;
-  const buffered = compact !== "noBuffer" && state.buffered.observations.projectedMessageRemoval > 0 ? chalk10.hex("#555")(` \u2193${formatTokensThreshold(state.buffered.observations.projectedMessageRemoval)}`) : "";
+  const buffered = compact !== "noBuffer" && state.buffered.observations.projectedMessageRemoval > 0 ? theme.fg("muted", ` \u2193${formatTokensThreshold(state.buffered.observations.projectedMessageRemoval)}`) : "";
   return styleLabel(`${label} `) + colorByPercent(fraction, percent) + buffered;
 }
 function formatReflectionStatus(state, compact, labelStyler) {
@@ -2140,7 +2361,7 @@ function formatReflectionStatus(state, compact, labelStyler) {
   }
   const fraction = `${formatTokensValue(state.observationTokens)}/${formatTokensThreshold(state.reflectionThreshold)}`;
   const savings = state.buffered.reflection.inputObservationTokens - state.buffered.reflection.observationTokens;
-  const buffered = compact !== "noBuffer" && state.buffered.reflection.status === "complete" ? chalk10.hex("#555")(` \u2193${formatTokensThreshold(savings)}`) : "";
+  const buffered = compact !== "noBuffer" && state.buffered.reflection.status === "complete" ? theme.fg("muted", ` \u2193${formatTokensThreshold(savings)}`) : "";
   return label + colorByPercent(fraction, percent) + buffered;
 }
 function formatOMStatus(state) {
@@ -2150,6 +2371,16 @@ function formatOMStatus(state) {
 // src/tui/status-line.ts
 var OBSERVER_COLOR = mastra.orange;
 var REFLECTOR_COLOR = mastra.pink;
+function lighten(r, g, b, factor) {
+  return [Math.floor(r + (255 - r) * factor), Math.floor(g + (255 - g) * factor), Math.floor(b + (255 - b) * factor)];
+}
+function adjustBadgeColor(r, g, b, modeColor) {
+  if (getThemeMode() !== "light") return [r, g, b];
+  if (modeColor === mastra.purple || modeColor === mastra.blue) {
+    return lighten(r, g, b, 0.25);
+  }
+  return [r, g, b];
+}
 function updateStatusLine(state) {
   if (!state.statusLine) return;
   const termWidth = (process.stdout.columns || 80) - 1;
@@ -2180,25 +2411,26 @@ function updateStatusLine(state) {
         badgeBrightness = animBrightness + (0.9 - animBrightness) * fade;
       }
     }
-    const [mr, mg, mb] = [
+    const [mr, mg, mb] = adjustBadgeColor(
       Math.floor(mcr * badgeBrightness),
       Math.floor(mcg * badgeBrightness),
-      Math.floor(mcb * badgeBrightness)
-    ];
-    modeBadge = chalk10.bgRgb(mr, mg, mb).hex(mastra.bg).bold(` ${badgeName.toLowerCase()} `);
+      Math.floor(mcb * badgeBrightness),
+      modeColor
+    );
+    modeBadge = chalk10.bgRgb(mr, mg, mb).hex("#000000").bold(` ${badgeName.toLowerCase()} `);
     modeBadgeWidth = badgeName.length + 2;
   } else if (badgeName) {
-    modeBadge = fg("dim", badgeName) + " ";
+    modeBadge = theme.fg("dim", badgeName) + " ";
     modeBadgeWidth = badgeName.length + 1;
   }
   if (mainModeColor) {
-    const [br, bg2, bb] = [
+    const [br, bg, bb] = [
       parseInt(mainModeColor.slice(1, 3), 16),
       parseInt(mainModeColor.slice(3, 5), 16),
       parseInt(mainModeColor.slice(5, 7), 16)
     ];
     const dim = 0.35;
-    state.editor.borderColor = (text) => chalk10.rgb(Math.floor(br * dim), Math.floor(bg2 * dim), Math.floor(bb * dim))(text);
+    state.editor.borderColor = (text) => chalk10.rgb(Math.floor(br * dim), Math.floor(bg * dim), Math.floor(bb * dim))(text);
   }
   const fullModelId = showOMMode ? isObserving ? state.harness.getObserverModelId() : state.harness.getReflectorModelId() : state.harness.getFullModelId();
   const shortModelId = fullModelId.includes("/") ? fullModelId.slice(fullModelId.indexOf("/") + 1) : fullModelId;
@@ -2208,14 +2440,15 @@ function updateStatusLine(state) {
   if (homedir2 && displayPath.startsWith(homedir2)) {
     displayPath = "~" + displayPath.slice(homedir2.length);
   }
-  if (state.projectInfo.gitBranch) {
-    displayPath = `${displayPath} (${state.projectInfo.gitBranch})`;
-  }
+  const branch = state.projectInfo.gitBranch;
+  const dirFull = branch ? `${displayPath} (${branch})` : displayPath;
+  const dirBranchOnly = branch || null;
+  const dirBranchShort = branch && branch.length > 24 ? branch.slice(0, 12) + ".." + branch.slice(-8) : dirBranchOnly;
   const isYolo = state.harness.getState().yolo === true;
   const styleModelId = (id) => {
     if (!state.modelAuthStatus.hasAuth) {
       const envVar = state.modelAuthStatus.apiKeyEnvVar;
-      return fg("dim", id) + fg("error", " \u2717") + fg("muted", envVar ? ` (${envVar})` : " (no key)");
+      return theme.fg("dim", id) + theme.fg("error", " \u2717") + theme.fg("muted", envVar ? ` (${envVar})` : " (no key)");
     }
     const tintBg = modeColor ? tintHex(modeColor, 0.15) : void 0;
     const padded = ` ${id} `;
@@ -2233,11 +2466,12 @@ function updateStatusLine(state) {
       }
     }
     if (modeColor) {
-      const [r, g, b] = [
+      const [r, g, b] = adjustBadgeColor(
         parseInt(modeColor.slice(1, 3), 16),
         parseInt(modeColor.slice(3, 5), 16),
-        parseInt(modeColor.slice(5, 7), 16)
-      ];
+        parseInt(modeColor.slice(5, 7), 16),
+        modeColor
+      );
       const dim = 0.8;
       const fgStyled = chalk10.rgb(Math.floor(r * dim), Math.floor(g * dim), Math.floor(b * dim)).bold(padded);
       return tintBg ? chalk10.bgHex(tintBg)(fgStyled) : fgStyled;
@@ -2262,16 +2496,17 @@ function updateStatusLine(state) {
         sBadgeBrightness = animBrightness + (0.9 - animBrightness) * fade;
       }
     }
-    const [sr, sg, sb] = [
+    const [sr, sg, sb] = adjustBadgeColor(
       Math.floor(mcr * sBadgeBrightness),
       Math.floor(mcg * sBadgeBrightness),
-      Math.floor(mcb * sBadgeBrightness)
-    ];
-    shortModeBadge = chalk10.bgRgb(sr, sg, sb).hex(mastra.bg).bold(` ${shortName} `);
+      Math.floor(mcb * sBadgeBrightness),
+      modeColor
+    );
+    shortModeBadge = chalk10.bgRgb(sr, sg, sb).hex("#000000").bold(` ${shortName} `);
     shortModeBadgeWidth = shortName.length + 2;
   } else if (badgeName) {
     const shortName = badgeName.toLowerCase().charAt(0);
-    shortModeBadge = fg("dim", shortName) + " ";
+    shortModeBadge = theme.fg("dim", shortName) + " ";
     shortModeBadgeWidth = shortName.length + 1;
   }
   const buildLine = (opts) => {
@@ -2312,16 +2547,18 @@ function updateStatusLine(state) {
     if (ref) {
       parts.push({ plain: ref, styled: ref });
     }
-    if (opts.showDir) {
+    const dirText = opts.dir !== void 0 ? opts.dir : opts.showDir ? dirFull : null;
+    if (dirText) {
       parts.push({
-        plain: displayPath,
-        styled: fg("dim", displayPath)
+        plain: dirText,
+        styled: theme.fg("dim", dirText)
       });
     }
     const totalPlain = useBadgeWidth + parts.reduce((sum, p, i) => sum + visibleWidth(p.plain) + (i > 0 ? SEP.length : 0), 0);
     if (totalPlain > termWidth) return null;
     let styledLine;
-    if (opts.showDir && parts.length >= 3) {
+    const hasDir = !!dirText;
+    if (hasDir && parts.length >= 3) {
       const leftPart = parts[0];
       const centerParts = parts.slice(1, -1);
       const dirPart = parts[parts.length - 1];
@@ -2333,7 +2570,7 @@ function updateStatusLine(state) {
       const gapLeft = Math.floor(freeSpace / 2);
       const gapRight = freeSpace - gapLeft;
       styledLine = useBadge + leftPart.styled + " ".repeat(Math.max(gapLeft, 1)) + centerParts.map((p) => p.styled).join(SEP) + " ".repeat(Math.max(gapRight, 1)) + dirPart.styled;
-    } else if (opts.showDir && parts.length === 2) {
+    } else if (hasDir && parts.length === 2) {
       const mainStr = useBadge + parts[0].styled;
       const dirPart = parts[parts.length - 1];
       const gap = termWidth - totalPlain;
@@ -2344,23 +2581,25 @@ function updateStatusLine(state) {
     return { plain: "", styled: styledLine };
   };
   const result = (
-    // 1. Full badge + full model + long labels + fractions + buffer + dir
-    buildLine({ modelId: fullModelId, memCompact: "full", showDir: true }) ?? // 2. Drop directory
-    buildLine({ modelId: fullModelId, memCompact: "full", showDir: false }) ?? // 3. Drop provider + "claude-" prefix, keep full labels + fractions + buffer
-    buildLine({ modelId: tinyModelId, memCompact: "full", showDir: false }) ?? // 4. Short labels (msg/mem) + fractions + buffer
-    buildLine({ modelId: tinyModelId, showDir: false }) ?? // 5. Short badge + short labels + fractions + buffer
-    buildLine({ modelId: tinyModelId, showDir: false, badge: "short" }) ?? // 6. Short badge + fractions (drop buffer indicator)
+    // 1. Full badge + full model + long labels + fractions + buffer + full dir
+    buildLine({ modelId: fullModelId, memCompact: "full", showDir: false, dir: dirFull }) ?? // 2. Full badge + full model + branch only (drop path)
+    buildLine({ modelId: fullModelId, memCompact: "full", showDir: false, dir: dirBranchOnly }) ?? // 3. Full badge + full model + abbreviated branch
+    buildLine({ modelId: fullModelId, memCompact: "full", showDir: false, dir: dirBranchShort }) ?? // 4. Drop directory entirely
+    buildLine({ modelId: fullModelId, memCompact: "full", showDir: false }) ?? // 5. Drop provider + "claude-" prefix, keep full labels + fractions + buffer
+    buildLine({ modelId: tinyModelId, memCompact: "full", showDir: false }) ?? // 6. Short labels (msg/mem) + fractions + buffer
+    buildLine({ modelId: tinyModelId, showDir: false }) ?? // 7. Short badge + short labels + fractions + buffer
+    buildLine({ modelId: tinyModelId, showDir: false, badge: "short" }) ?? // 8. Short badge + fractions (drop buffer indicator)
     buildLine({
       modelId: tinyModelId,
       memCompact: "noBuffer",
       showDir: false,
       badge: "short"
-    }) ?? // 7. Full badge + percent only
+    }) ?? // 9. Full badge + percent only
     buildLine({
       modelId: tinyModelId,
       memCompact: "percentOnly",
       showDir: false
-    }) ?? // 8. Short badge + percent only
+    }) ?? // 10. Short badge + percent only
     buildLine({
       modelId: tinyModelId,
       memCompact: "percentOnly",
@@ -2471,16 +2710,21 @@ function applyPack(ctx, pack) {
   }
   s.models.subagentModels = {};
   saveSettings(s);
+  const hasOpenAI = Object.values(pack.models).some((m) => m.startsWith("openai/"));
+  const currentThinking = harness.getState()?.thinkingLevel ?? "off";
+  if (hasOpenAI && currentThinking === "off") {
+    harness.setState({ thinkingLevel: "low" });
+  }
   updateStatusLine(ctx.state);
 }
 function getPackDetail(pack) {
   if (pack.id === "custom") {
-    return fg("dim", "  You'll pick a model for each mode.");
+    return theme.fg("dim", "  You'll pick a model for each mode.");
   }
   return [
-    `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${fg("text", pack.models.plan)}`,
-    `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${fg("text", pack.models.build)}`,
-    `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${fg("text", pack.models.fast)}`
+    `  ${chalk10.hex(mastra.blue)("plan")}  \u2192 ${theme.fg("text", pack.models.plan)}`,
+    `  ${chalk10.hex(mastra.purple)("build")} \u2192 ${theme.fg("text", pack.models.build)}`,
+    `  ${chalk10.hex(mastra.green)("fast")}  \u2192 ${theme.fg("text", pack.models.fast)}`
   ].join("\n");
 }
 async function handleModelsPackCommand(ctx) {
@@ -2508,11 +2752,11 @@ async function handleModelsPackCommand(ctx) {
   const currentPackId = settings.models.activeModelPackId;
   const items = packs.map((p) => ({
     value: p.id,
-    label: `  ${p.name}  ${fg("dim", p.description)}${p.id === currentPackId ? fg("dim", " (current)") : ""}`
+    label: `  ${p.name}  ${theme.fg("dim", p.description)}${p.id === currentPackId ? theme.fg("dim", " (current)") : ""}`
   }));
   return new Promise((resolve2) => {
     const container = new Box(1, 1);
-    container.addChild(new Text(bold(fg("accent", "Switch model pack")), 0, 0));
+    container.addChild(new Text(theme.bold(theme.fg("accent", "Switch model pack")), 0, 0));
     container.addChild(new Spacer(1));
     const selectList = new SelectList(items, items.length, getSelectListTheme());
     const detailText = new Text("", 0, 0);
@@ -2535,14 +2779,14 @@ async function handleModelsPackCommand(ctx) {
         const customPack = await runCustomFlow(ctx);
         if (customPack) {
           applyPack(ctx, customPack);
-          collapseResult(`Model pack \u2192 ${bold("Custom")}`);
+          collapseResult(`Model pack \u2192 ${theme.bold("Custom")}`);
           ctx.showInfo("Switched to Custom pack");
         } else {
           collapseResult("cancelled");
         }
       } else {
         applyPack(ctx, pack);
-        collapseResult(`Model pack \u2192 ${bold(pack.name)}`);
+        collapseResult(`Model pack \u2192 ${theme.bold(pack.name)}`);
         ctx.showInfo(`Switched to ${pack.name} pack`);
       }
       resolve2();
@@ -2559,7 +2803,7 @@ async function handleModelsPackCommand(ctx) {
     container.addChild(new Spacer(1));
     container.addChild(detailText);
     container.addChild(new Spacer(1));
-    container.addChild(new Text(fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc cancel"), 0, 0));
+    container.addChild(new Text(theme.fg("dim", "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc cancel"), 0, 0));
     const currentIdx = packs.findIndex((p) => p.id === currentPackId);
     const initialIdx = currentIdx >= 0 ? currentIdx : 0;
     if (initialIdx > 0) selectList.setSelectedIndex(initialIdx);
@@ -2569,9 +2813,9 @@ async function handleModelsPackCommand(ctx) {
     const collapseResult = (result) => {
       container.clear();
       if (result === "cancelled") {
-        container.addChild(new Text(fg("dim", `${fg("error", "\u2717")} Model pack (cancelled)`), 0, 0));
+        container.addChild(new Text(theme.fg("dim", `${theme.fg("error", "\u2717")} Model pack (cancelled)`), 0, 0));
       } else if (result) {
-        container.addChild(new Text(fg("text", `${fg("success", "\u2713")} ${result}`), 0, 0));
+        container.addChild(new Text(theme.fg("text", `${theme.fg("success", "\u2713")} ${result}`), 0, 0));
       }
     };
     ctx.state.chatContainer.addChild(new Spacer(1));
@@ -2757,13 +3001,13 @@ var ThresholdSubmenu = class extends Container {
     super();
     this.onDone = onDone;
     this.onBack = onBack;
-    this.addChild(new Text(bold(fg("accent", title)), 0, 0));
+    this.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "  _k tokens (type a number, e.g. 30 for 30k):"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "  _k tokens (type a number, e.g. 30 for 30k):"), 0, 0));
     this.input = new Input();
     this.addChild(this.input);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "  Or pick a preset:"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "  Or pick a preset:"), 0, 0));
     const items = presets.map((p) => ({
       value: String(p),
       label: `  ${formatTokens(p)} tokens`
@@ -2779,7 +3023,7 @@ var ThresholdSubmenu = class extends Container {
     this.selectList.onCancel = onBack;
     this.addChild(this.selectList);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("dim", "  Enter to confirm \xB7 \u2193 for presets \xB7 Esc to go back"), 0, 0));
+    this.addChild(new Text(theme.fg("dim", "  Enter to confirm \xB7 \u2193 for presets \xB7 Esc to go back"), 0, 0));
   }
   handleInput(data) {
     if (this.inInputMode) {
@@ -2822,9 +3066,9 @@ var ModelSelectSubmenu = class extends Container {
     this.onSelect = onSelect;
     this.onCancel = onCancel;
     this.tui = tui;
-    this.addChild(new Text(bold(fg("accent", title)), 0, 0));
+    this.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "Type to search \xB7 \u2191\u2193 navigate \xB7 Enter select \xB7 Esc back"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "Type to search \xB7 \u2191\u2193 navigate \xB7 Enter select \xB7 Esc back"), 0, 0));
     this.addChild(new Spacer(1));
     this.searchInput = new Input();
     this.addChild(this.searchInput);
@@ -2852,15 +3096,15 @@ var ModelSelectSubmenu = class extends Container {
       const item = this.filteredModels[i];
       const isSelected = i === this.selectedIndex;
       const isCurrent = item.id === this.currentModelId;
-      const checkmark = isCurrent ? fg("success", " \u2713") : "";
-      const line = isSelected ? fg("accent", `\u2192 ${item.label}`) + checkmark : `  ${item.label}` + checkmark;
+      const checkmark = isCurrent ? theme.fg("success", " \u2713") : "";
+      const line = isSelected ? theme.fg("accent", `\u2192 ${item.label}`) + checkmark : `  ${item.label}` + checkmark;
       this.listContainer.addChild(new Text(line, 0, 0));
     }
     if (startIndex > 0 || endIndex < total) {
-      this.listContainer.addChild(new Text(fg("muted", `(${this.selectedIndex + 1}/${total})`), 0, 0));
+      this.listContainer.addChild(new Text(theme.fg("muted", `(${this.selectedIndex + 1}/${total})`), 0, 0));
     }
     if (total === 0) {
-      this.listContainer.addChild(new Text(fg("muted", "No matching models"), 0, 0));
+      this.listContainer.addChild(new Text(theme.fg("muted", "No matching models"), 0, 0));
     }
   }
   handleInput(data) {
@@ -2899,8 +3143,8 @@ var OMSettingsComponent = class extends Box {
     this._focused = value;
   }
   constructor(config, callbacks, models, tui) {
-    super(2, 1, (text) => bg("overlayBg", text));
-    this.addChild(new Text(bold(fg("accent", "Observational Memory Settings")), 0, 0));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
+    this.addChild(new Text(theme.bold(theme.fg("accent", "Observational Memory Settings")), 0, 0));
     this.addChild(new Spacer(1));
     const items = [
       {
@@ -3096,15 +3340,15 @@ var StorageBackendSubmenu = class extends Container {
     this.phase = "connection";
     this.clear();
     if (this.pendingBackend === "pg") {
-      this.addChild(new Text(bold(fg("accent", "PostgreSQL Connection")), 0, 0));
+      this.addChild(new Text(theme.bold(theme.fg("accent", "PostgreSQL Connection")), 0, 0));
       this.addChild(new Spacer(1));
-      this.addChild(new Text(fg("muted", "Enter a connection string:"), 0, 0));
-      this.addChild(new Text(fg("dim", "e.g. postgresql://user:pass@localhost:5432/mydb"), 0, 0));
+      this.addChild(new Text(theme.fg("muted", "Enter a connection string:"), 0, 0));
+      this.addChild(new Text(theme.fg("dim", "e.g. postgresql://user:pass@localhost:5432/mydb"), 0, 0));
     } else {
-      this.addChild(new Text(bold(fg("accent", "LibSQL Connection")), 0, 0));
+      this.addChild(new Text(theme.bold(theme.fg("accent", "LibSQL Connection")), 0, 0));
       this.addChild(new Spacer(1));
-      this.addChild(new Text(fg("muted", "Enter a URL or leave empty for default local file:"), 0, 0));
-      this.addChild(new Text(fg("dim", "e.g. libsql://your-db.turso.io"), 0, 0));
+      this.addChild(new Text(theme.fg("muted", "Enter a URL or leave empty for default local file:"), 0, 0));
+      this.addChild(new Text(theme.fg("dim", "e.g. libsql://your-db.turso.io"), 0, 0));
     }
     this.addChild(new Spacer(1));
     this.input = new Input();
@@ -3114,7 +3358,7 @@ var StorageBackendSubmenu = class extends Container {
     }
     this.addChild(this.input);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("dim", "Enter to save \xB7 Esc to go back"), 0, 0));
+    this.addChild(new Text(theme.fg("dim", "Enter to save \xB7 Esc to go back"), 0, 0));
   }
   handleInput(data) {
     if (this.phase === "select") {
@@ -3154,8 +3398,8 @@ var SettingsComponent = class extends Box {
     this._focused = value;
   }
   constructor(config, callbacks) {
-    super(2, 1, (text) => bg("overlayBg", text));
-    this.addChild(new Text(bold(fg("accent", "Settings")), 0, 0));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
+    this.addChild(new Text(theme.bold(theme.fg("accent", "Settings")), 0, 0));
     this.addChild(new Spacer(1));
     const notificationModes = [
       { value: "off", label: "Off", desc: "No notifications" },
@@ -3163,13 +3407,11 @@ var SettingsComponent = class extends Box {
       { value: "system", label: "System", desc: "Native OS notification" },
       { value: "both", label: "Both", desc: "Bell + system notification" }
     ];
-    const thinkingLevels = [
-      { value: "off", label: "Off", desc: "No extended thinking" },
-      { value: "minimal", label: "Minimal", desc: "~1k budget tokens" },
-      { value: "low", label: "Low", desc: "~4k budget tokens" },
-      { value: "medium", label: "Medium", desc: "~10k budget tokens" },
-      { value: "high", label: "High", desc: "~32k budget tokens" }
-    ];
+    const thinkingLevels = getThinkingLevelsForModel(config.currentModelId).map((level) => ({
+      value: level.id,
+      label: level.label,
+      desc: level.description
+    }));
     const getNotifLabel = (mode) => notificationModes.find((m) => m.value === mode)?.label ?? mode;
     const getThinkingLabel = (level) => thinkingLevels.find((l) => l.value === level)?.label ?? level;
     const items = [
@@ -3223,7 +3465,7 @@ var SettingsComponent = class extends Box {
       {
         id: "thinking",
         label: "Thinking level",
-        description: "Extended thinking budget for Anthropic models (currently disabled)",
+        description: "Reasoning depth level",
         currentValue: getThinkingLabel(config.thinkingLevel),
         submenu: (_currentValue, done) => new SelectSubmenu(
           thinkingLevels.map((l) => ({
@@ -3313,6 +3555,7 @@ async function handleSettingsCommand(ctx) {
     notifications: state?.notifications ?? "off",
     yolo: state?.yolo === true,
     thinkingLevel: state?.thinkingLevel ?? "off",
+    currentModelId: ctx.state.harness.getCurrentModelId() ?? "",
     escapeAsCancel: ctx.state.editor.escapeEnabled,
     storageBackend: globalSettings.storage.backend,
     pgConnectionString: globalSettings.storage.pg?.connectionString ?? "",
@@ -3367,12 +3610,12 @@ Storage backend changed to ${label}. Restarting is required.
 }
 var LoginDialogComponent = class extends Box {
   constructor(tui, providerId, onComplete) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.onComplete = onComplete;
     this.tui = tui;
     const providerInfo = getOAuthProviders().find((p) => p.id === providerId);
     const providerName = providerInfo?.name || providerId;
-    this.addChild(new Text(fg("warning", `Login to ${providerName}`)));
+    this.addChild(new Text(theme.fg("warning", `Login to ${providerName}`)));
     this.addChild(new Spacer(1));
     this.contentContainer = new Container();
     this.addChild(this.contentContainer);
@@ -3423,13 +3666,13 @@ var LoginDialogComponent = class extends Box {
    */
   showAuth(url, instructions) {
     this.contentContainer.clear();
-    this.contentContainer.addChild(new Text(fg("accent", url)));
+    this.contentContainer.addChild(new Text(theme.fg("accent", url)));
     const clickHint = process.platform === "darwin" ? "Cmd+click to open" : "Ctrl+click to open";
     const hyperlink = `\x1B]8;;${url}\x07${clickHint}\x1B]8;;\x07`;
-    this.contentContainer.addChild(new Text(fg("muted", hyperlink)));
+    this.contentContainer.addChild(new Text(theme.fg("muted", hyperlink)));
     if (instructions) {
       this.contentContainer.addChild(new Spacer(1));
-      this.contentContainer.addChild(new Text(fg("warning", instructions)));
+      this.contentContainer.addChild(new Text(theme.fg("warning", instructions)));
     }
     const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
     exec(`${openCmd} "${url}"`);
@@ -3440,12 +3683,12 @@ var LoginDialogComponent = class extends Box {
    */
   showPrompt(message, placeholder) {
     this.contentContainer.addChild(new Spacer(1));
-    this.contentContainer.addChild(new Text(fg("text", message)));
+    this.contentContainer.addChild(new Text(theme.fg("text", message)));
     if (placeholder) {
-      this.contentContainer.addChild(new Text(fg("muted", `e.g., ${placeholder}`)));
+      this.contentContainer.addChild(new Text(theme.fg("muted", `e.g., ${placeholder}`)));
     }
     this.contentContainer.addChild(this.input);
-    this.contentContainer.addChild(new Text(fg("muted", "(Escape to cancel, Enter to submit)")));
+    this.contentContainer.addChild(new Text(theme.fg("muted", "(Escape to cancel, Enter to submit)")));
     this.input.setValue("");
     this.tui.requestRender();
     return new Promise((resolve2, reject) => {
@@ -3457,7 +3700,7 @@ var LoginDialogComponent = class extends Box {
    * Show progress message
    */
   showProgress(message) {
-    this.contentContainer.addChild(new Text(fg("muted", message)));
+    this.contentContainer.addChild(new Text(theme.fg("muted", message)));
     this.tui.requestRender();
   }
   handleInput(data) {
@@ -3478,6 +3721,15 @@ async function performLogin(ctx, providerId) {
     ctx.showError("Auth storage not configured");
     return;
   }
+  if (providerId === ANTHROPIC_OAUTH_PROVIDER_ID) {
+    const warningResult = await showClaudeMaxOAuthWarning(ctx.state, "login");
+    if (warningResult !== "continue") {
+      return;
+    }
+    const settings = loadSettings();
+    settings.onboarding.claudeMaxOAuthWarningAcknowledgedAt = (/* @__PURE__ */ new Date()).toISOString();
+    saveSettings(settings);
+  }
   return new Promise((resolve2) => {
     const dialog = new LoginDialogComponent(ctx.state.ui, providerId, (success, message) => {
       ctx.state.ui.hideOverlay();
@@ -3639,6 +3891,121 @@ Pay special attention to: ${focusArea}
 async function handleSetupCommand(ctx) {
   await ctx.showOnboarding();
 }
+
+// src/tui/detect-theme.ts
+function queryTerminalBackground(timeoutMs = 200) {
+  return new Promise((resolve2) => {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      resolve2(null);
+      return;
+    }
+    let settled = false;
+    let buffer = "";
+    let wasRaw;
+    let wasResumed = false;
+    let timer;
+    const cleanup = () => {
+      if (settled) return;
+      settled = true;
+      if (timer) {
+        clearTimeout(timer);
+        timer = void 0;
+      }
+      process.stdin.removeListener("data", onData);
+      try {
+        if (process.stdin.isTTY) {
+          process.stdin.setRawMode(wasRaw);
+        }
+      } catch {
+      }
+      if (wasResumed) {
+        process.stdin.pause();
+      }
+    };
+    const onData = (data) => {
+      buffer += data.toString();
+      const match = buffer.match(/\x1b\]11;rgb:([0-9a-fA-F]+)\/([0-9a-fA-F]+)\/([0-9a-fA-F]+)/);
+      if (match) {
+        cleanup();
+        const rHex = match[1];
+        const gHex = match[2];
+        const bHex = match[3];
+        const normalize = (hex) => {
+          const val = parseInt(hex, 16);
+          return hex.length <= 2 ? val / 255 : val / 65535;
+        };
+        const r = normalize(rHex);
+        const g = normalize(gHex);
+        const b = normalize(bHex);
+        const linearize = (c) => c <= 0.03928 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4);
+        const luma = 0.2126 * linearize(r) + 0.7152 * linearize(g) + 0.0722 * linearize(b);
+        resolve2(luma >= 0.5 ? "light" : "dark");
+        return;
+      }
+    };
+    timer = setTimeout(() => {
+      cleanup();
+      resolve2(null);
+    }, timeoutMs);
+    if (timer.unref) timer.unref();
+    try {
+      wasRaw = process.stdin.isRaw ?? false;
+      process.stdin.setRawMode(true);
+      if (process.stdin.isPaused()) {
+        process.stdin.resume();
+        wasResumed = true;
+      }
+      process.stdin.on("data", onData);
+      process.stdout.write("\x1B]11;?\x07");
+    } catch {
+      cleanup();
+      resolve2(null);
+    }
+  });
+}
+function detectFromColorFgBg() {
+  const colorFgBg = process.env.COLORFGBG;
+  if (!colorFgBg) return null;
+  const parts = colorFgBg.split(";");
+  const bgPart = parts[parts.length - 1];
+  if (bgPart === void 0) return null;
+  const bgIndex = parseInt(bgPart, 10);
+  if (isNaN(bgIndex)) return null;
+  return bgIndex >= 7 ? "light" : "dark";
+}
+async function detectTerminalTheme() {
+  const envTheme = process.env.MASTRA_THEME?.toLowerCase();
+  if (envTheme === "light") return "light";
+  if (envTheme === "dark") return "dark";
+  const oscResult = await queryTerminalBackground(200);
+  if (oscResult) return oscResult;
+  const fgbgResult = detectFromColorFgBg();
+  if (fgbgResult) return fgbgResult;
+  return "dark";
+}
+
+// src/tui/commands/theme.ts
+async function handleThemeCommand(ctx, args) {
+  const arg = args[0]?.toLowerCase();
+  if (!arg) {
+    const mode = getThemeMode();
+    const settings2 = loadSettings();
+    const pref = settings2.preferences.theme ?? "auto";
+    ctx.showInfo(`Theme: ${mode} (preference: ${pref})`);
+    return;
+  }
+  if (arg !== "auto" && arg !== "dark" && arg !== "light") {
+    ctx.showError("Usage: /theme [auto|dark|light]");
+    return;
+  }
+  const settings = loadSettings();
+  settings.preferences.theme = arg;
+  saveSettings(settings);
+  const resolved = arg === "auto" ? await detectTerminalTheme() : arg;
+  applyThemeMode(resolved);
+  ctx.showInfo(`Theme set to ${arg}${arg === "auto" ? ` (detected: ${resolved})` : ""}`);
+  ctx.state.ui.requestRender();
+}
 var MAX_COLLAPSED_LINES = 3;
 var BORDER_COLOR = mastra.purple;
 var SlashCommandComponent = class extends Container {
@@ -3866,12 +4233,12 @@ function reasonToMessage(reason) {
 // src/tui/display.ts
 function showError(state, message) {
   state.chatContainer.addChild(new Spacer(1));
-  state.chatContainer.addChild(new Text(fg("error", `Error: ${message}`), 1, 0));
+  state.chatContainer.addChild(new Text(theme.fg("error", `Error: ${message}`), 1, 0));
   state.ui.requestRender();
 }
 function showInfo(state, message) {
   state.chatContainer.addChild(new Spacer(1));
-  state.chatContainer.addChild(new Text(fg("muted", message), 1, 0));
+  state.chatContainer.addChild(new Text(theme.fg("muted", message), 1, 0));
   state.ui.requestRender();
 }
 function showFormattedError(state, event) {
@@ -3881,9 +4248,9 @@ function showFormattedError(state, event) {
   const errorMessage = error.message || String(error);
   const isValidationError = errorMessage.toLowerCase().includes("validation failed") || errorMessage.toLowerCase().includes("required parameter") || errorMessage.includes("Required");
   if (isValidationError) {
-    state.chatContainer.addChild(new Text(fg("error", "Tool validation error - see details above"), 1, 0));
+    state.chatContainer.addChild(new Text(theme.fg("error", "Tool validation error - see details above"), 1, 0));
     state.chatContainer.addChild(
-      new Text(fg("muted", "  Check the tool execution box for specific parameter requirements"), 1, 0)
+      new Text(theme.fg("muted", "  Check the tool execution box for specific parameter requirements"), 1, 0)
     );
   } else {
     let errorText = `Error: ${parsed.message}`;
@@ -3891,12 +4258,12 @@ function showFormattedError(state, event) {
     const retryDelay = "retryDelay" in event ? event.retryDelay : parsed.retryDelay;
     if (retryable && retryDelay) {
       const seconds = Math.ceil(retryDelay / 1e3);
-      errorText += fg("muted", ` (retry in ${seconds}s)`);
+      errorText += theme.fg("muted", ` (retry in ${seconds}s)`);
     }
-    state.chatContainer.addChild(new Text(fg("error", errorText), 1, 0));
+    state.chatContainer.addChild(new Text(theme.fg("error", errorText), 1, 0));
     const hint = getErrorHint(parsed.type);
     if (hint) {
-      state.chatContainer.addChild(new Text(fg("muted", `  Hint: ${hint}`), 1, 0));
+      state.chatContainer.addChild(new Text(theme.fg("muted", `  Hint: ${hint}`), 1, 0));
     }
   }
   state.ui.requestRender();
@@ -3971,7 +4338,7 @@ async function dispatchSlashCommand(input, state, buildCtx) {
       await handleOMCommand(buildCtx());
       return true;
     case "think":
-      await handleThinkCommand(buildCtx());
+      await handleThinkCommand(buildCtx(), args);
       return true;
     case "permissions":
       await handlePermissionsCommand(buildCtx(), args);
@@ -4018,6 +4385,9 @@ async function dispatchSlashCommand(input, state, buildCtx) {
     case "setup":
       await handleSetupCommand(buildCtx());
       return true;
+    case "theme":
+      await handleThemeCommand(buildCtx(), args);
+      return true;
     default: {
       const customCommand = state.customSlashCommands.find((cmd) => cmd.name === command);
       if (customCommand) {
@@ -4050,6 +4420,10 @@ ${processedContent.trim()}
 }
 function handleAgentStart(ctx) {
   const { state } = ctx;
+  const freshBranch = getCurrentGitBranch(state.projectInfo.rootPath);
+  if (freshBranch) {
+    state.projectInfo.gitBranch = freshBranch;
+  }
   if (!state.gradientAnimator) {
     state.gradientAnimator = new GradientAnimator(() => {
       ctx.updateStatusLine();
@@ -4062,6 +4436,10 @@ function handleAgentEnd(ctx) {
   if (state.gradientAnimator) {
     state.gradientAnimator.fadeOut();
   }
+  const freshBranch = getCurrentGitBranch(state.projectInfo.rootPath);
+  if (freshBranch) {
+    state.projectInfo.gitBranch = freshBranch;
+  }
   if (state.streamingComponent) {
     state.streamingComponent = void 0;
     state.streamingMessage = void 0;
@@ -4316,11 +4694,11 @@ function formatStackTrace(stack) {
     if (line.match(/^\s*at\s+/)) {
       return line.replace(
         /(\s+at\s+)([^(]+)(\s*\()([^)]+)(\))/,
-        (match, at, fn, open, loc, close) => `${fg("muted", at)}${fg("function", fn)}${fg("muted", open)}${fg("path", loc)}${fg("muted", close)}`
+        (match, at, fn, open, loc, close) => `${theme.fg("muted", at)}${theme.fg("function", fn)}${theme.fg("muted", open)}${theme.fg("path", loc)}${theme.fg("muted", close)}`
       );
     }
     if (!line.trim() || line.includes("node_modules")) {
-      return fg("muted", line);
+      return theme.fg("muted", line);
     }
     return line;
   });
@@ -4351,23 +4729,23 @@ var ErrorDisplayComponent = class extends Container {
   }
   build() {
     const info = parseErrorInfo(this.error);
-    const borderTop = new Text(fg("error", "\u250C\u2500 Error \u2500" + "\u2500".repeat(50) + "\u2510"), 0, 0);
+    const borderTop = new Text(theme.fg("error", "\u250C\u2500 Error \u2500" + "\u2500".repeat(50) + "\u2510"), 0, 0);
     this.addChild(borderTop);
     const errorContainer = new Container();
-    const errorBg = (text) => bg("errorBg", text);
+    const errorBg = (text) => theme.bg("errorBg", text);
     if (info.name && info.name !== "Error") {
       const typeLine = new Container();
       typeLine.addChild(new Text("\u2502 ", 0, 0));
-      typeLine.addChild(new Text(errorBg(` ${bold(fg("error", info.name))} `), 0, 0));
+      typeLine.addChild(new Text(errorBg(` ${theme.bold(theme.fg("error", info.name))} `), 0, 0));
       errorContainer.addChild(typeLine);
     }
     const msgLine = new Container();
     msgLine.addChild(new Text("\u2502 ", 0, 0));
-    msgLine.addChild(new Text(bold(info.message), 0, 0));
+    msgLine.addChild(new Text(theme.bold(info.message), 0, 0));
     errorContainer.addChild(msgLine);
     if (info.file && info.line) {
       const location = `${info.file}:${info.line}${info.column ? `:${info.column}` : ""}`;
-      errorContainer.addChild(new Text(fg("muted", `  at ${location}`), 0, 0));
+      errorContainer.addChild(new Text(theme.fg("muted", `  at ${location}`), 0, 0));
     }
     this.addChild(errorContainer);
     if (this.options.showContext && info.context) {
@@ -4378,26 +4756,26 @@ var ErrorDisplayComponent = class extends Container {
       this.addChild(new Spacer(1));
       this.addChild(new CollapsibleStackTrace(info.stack, { expanded: this.options.expanded }, this.ui));
     }
-    const borderBottom = new Text(fg("error", "\u2514" + "\u2500".repeat(60) + "\u2518"), 0, 0);
+    const borderBottom = new Text(theme.fg("error", "\u2514" + "\u2500".repeat(60) + "\u2518"), 0, 0);
     this.addChild(borderBottom);
   }
   createCodeContext(context, errorLine) {
     const container = new Container();
     const codeBlock = new Container();
-    codeBlock.addChild(new Text(fg("muted", "Code context:"), 0, 0));
+    codeBlock.addChild(new Text(theme.fg("muted", "Code context:"), 0, 0));
     if (context.before) {
       context.before.forEach((line, i) => {
         const lineNum = errorLine ? errorLine - context.before.length + i : i + 1;
-        codeBlock.addChild(new Text(fg("muted", `${lineNum.toString().padStart(4)} \u2502 ${line}`), 0, 0));
+        codeBlock.addChild(new Text(theme.fg("muted", `${lineNum.toString().padStart(4)} \u2502 ${line}`), 0, 0));
       });
     }
     if (context.line && errorLine) {
-      codeBlock.addChild(new Text(fg("error", `${errorLine.toString().padStart(4)} \u2502 ${context.line}`), 0, 0));
+      codeBlock.addChild(new Text(theme.fg("error", `${errorLine.toString().padStart(4)} \u2502 ${context.line}`), 0, 0));
     }
     if (context.after) {
       context.after.forEach((line, i) => {
         const lineNum = errorLine ? errorLine + i + 1 : i + 1;
-        codeBlock.addChild(new Text(fg("muted", `${lineNum.toString().padStart(4)} \u2502 ${line}`), 0, 0));
+        codeBlock.addChild(new Text(theme.fg("muted", `${lineNum.toString().padStart(4)} \u2502 ${line}`), 0, 0));
       });
     }
     container.addChild(codeBlock);
@@ -4959,17 +5337,18 @@ var ToolExecutionComponentEnhanced = class extends Container {
       const maxDiags = shouldCollapse ? COLLAPSED_DIAG_LINES : diagnostics.entries.length;
       const entriesToShow = diagnostics.entries.slice(0, maxDiags);
       for (const diag of entriesToShow) {
-        const color = diag.severity === "error" ? "#e06c75" : diag.severity === "warning" ? "#f59e0b" : "#71717a";
+        const t = theme.getTheme();
+        const color = diag.severity === "error" ? t.error : diag.severity === "warning" ? t.warning : t.muted;
         const icon = diag.severity === "error" ? "\u2717" : diag.severity === "warning" ? "\u26A0" : "\u2139";
         const location = diag.location ? chalk10.hex(color)(diag.location) + " " : "";
-        const line = `  ${chalk10.hex(color)(icon)} ${location}${chalk10.hex("#a1a1aa")(diag.message)}`;
+        const line = `  ${chalk10.hex(color)(icon)} ${location}${theme.fg("thinkingText", diag.message)}`;
         this.contentBox.addChild(new Text(line, 0, 0));
       }
       if (shouldCollapse) {
         const remaining = diagnostics.entries.length - COLLAPSED_DIAG_LINES;
         this.contentBox.addChild(
           new Text(
-            chalk10.hex("#71717a")(`  ... ${remaining} more diagnostic${remaining > 1 ? "s" : ""} (ctrl+e to expand)`),
+            theme.fg("muted", `  ... ${remaining} more diagnostic${remaining > 1 ? "s" : ""} (ctrl+e to expand)`),
             0,
             0
           )
@@ -5016,20 +5395,20 @@ var ToolExecutionComponentEnhanced = class extends Container {
     const newLines = newStr.split("\n");
     const lines = [];
     let firstChangeIndex = -1;
-    const removedColor2 = chalk10.hex(mastra.red);
-    const addedColor2 = chalk10.hex("#5cb85c");
+    const removedColor = chalk10.hex(mastra.red);
+    const addedColor = chalk10.hex(theme.getTheme().success);
     const maxLines = Math.max(oldLines.length, newLines.length);
     for (let i = 0; i < maxLines; i++) {
       if (i >= oldLines.length) {
         if (firstChangeIndex === -1) firstChangeIndex = lines.length;
-        lines.push(addedColor2(newLines[i]));
+        lines.push(addedColor(newLines[i]));
       } else if (i >= newLines.length) {
         if (firstChangeIndex === -1) firstChangeIndex = lines.length;
-        lines.push(removedColor2(oldLines[i]));
+        lines.push(removedColor(oldLines[i]));
       } else if (oldLines[i] !== newLines[i]) {
         if (firstChangeIndex === -1) firstChangeIndex = lines.length;
-        lines.push(removedColor2(oldLines[i]));
-        lines.push(addedColor2(newLines[i]));
+        lines.push(removedColor(oldLines[i]));
+        lines.push(addedColor(newLines[i]));
       } else {
         lines.push(theme.fg("muted", oldLines[i]));
       }
@@ -5604,7 +5983,7 @@ function formatMarker(data) {
   switch (data.type) {
     case "om_observation_start": {
       const tokens = data.tokensToObserve > 0 ? ` ~${formatTokens2(data.tokensToObserve)} tokens` : "";
-      return fg("muted", `  \u{1F9E0} ${label} in progress${tokens}...`);
+      return theme.fg("muted", `  \u{1F9E0} ${label} in progress${tokens}...`);
     }
     case "om_observation_end": {
       const observed = formatTokens2(data.tokensObserved);
@@ -5612,36 +5991,36 @@ function formatMarker(data) {
       const ratio = data.tokensObserved > 0 && data.observationTokens > 0 ? `${Math.round(data.tokensObserved / data.observationTokens)}x` : "";
       const duration = (data.durationMs / 1e3).toFixed(1);
       const ratioStr = ratio ? ` (${ratio} compression)` : "";
-      return fg("success", `  \u{1F9E0} Observed: ${observed} \u2192 ${compressed} tokens${ratioStr} in ${duration}s \u2713`);
+      return theme.fg("success", `  \u{1F9E0} Observed: ${observed} \u2192 ${compressed} tokens${ratioStr} in ${duration}s \u2713`);
     }
     case "om_observation_failed": {
       const tokens = data.tokensAttempted ? ` (${formatTokens2(data.tokensAttempted)} tokens)` : "";
-      return fg("error", `  \u2717 ${label} failed${tokens}: ${data.error}`);
+      return theme.fg("error", `  \u2717 ${label} failed${tokens}: ${data.error}`);
     }
     case "om_buffering_start": {
       const tokens = data.tokensToBuffer > 0 ? ` ~${formatTokens2(data.tokensToBuffer)} tokens` : "";
-      return fg("muted", `  \u27F3 Buffering ${label.toLowerCase()}${tokens}...`);
+      return theme.fg("muted", `  \u27F3 Buffering ${label.toLowerCase()}${tokens}...`);
     }
     case "om_buffering_end": {
       const input = formatTokens2(data.tokensBuffered);
       const outputTokens = data.operationType === "observation" && data.observations ? Math.round(data.observations.length / 4) : data.bufferedTokens;
       const output = formatTokens2(outputTokens);
       const ratio = data.tokensBuffered > 0 && outputTokens > 0 ? ` (${Math.round(data.tokensBuffered / outputTokens)}x)` : "";
-      return fg("success", `  \u2713 Buffered ${label.toLowerCase()}: ${input} \u2192 ${output} tokens${ratio}`);
+      return theme.fg("success", `  \u2713 Buffered ${label.toLowerCase()}: ${input} \u2192 ${output} tokens${ratio}`);
     }
     case "om_buffering_failed": {
-      return fg("error", `  \u2717 Buffering ${label.toLowerCase()} failed: ${data.error}`);
+      return theme.fg("error", `  \u2717 Buffering ${label.toLowerCase()} failed: ${data.error}`);
     }
     case "om_activation": {
       const kind = data.operationType === "reflection" ? "reflection" : "observations";
       const msgTokens = formatTokens2(data.tokensActivated);
       const obsTokens = formatTokens2(data.observationTokens);
-      return fg("success", `  \u2713 Activated ${kind}: -${msgTokens} msg tokens, +${obsTokens} obs tokens`);
+      return theme.fg("success", `  \u2713 Activated ${kind}: -${msgTokens} msg tokens, +${obsTokens} obs tokens`);
     }
   }
 }
-var OBSERVER_COLOR2 = "#f59e0b";
-var REFLECTOR_COLOR2 = "#ef4444";
+var OBSERVER_COLOR2 = mastra.orange;
+var REFLECTOR_COLOR2 = mastra.red;
 var COLLAPSED_LINES = 10;
 function formatTokens3(tokens) {
   if (tokens === 0) return "0";
@@ -5966,13 +6345,13 @@ var AskQuestionDialogComponent = class extends Box {
     if (this.input) this.input.focused = value;
   }
   constructor(options) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.onSubmit = options.onSubmit;
     this.onCancel = options.onCancel;
-    this.addChild(new Text(bold(fg("accent", "Question")), 0, 0));
+    this.addChild(new Text(theme.bold(theme.fg("accent", "Question")), 0, 0));
     this.addChild(new Spacer(1));
     for (const line of options.question.split("\n")) {
-      this.addChild(new Text(fg("text", line), 0, 0));
+      this.addChild(new Text(theme.fg("text", line), 0, 0));
     }
     this.addChild(new Spacer(1));
     if (options.options && options.options.length > 0) {
@@ -5984,7 +6363,7 @@ var AskQuestionDialogComponent = class extends Box {
   buildSelectMode(opts) {
     const items = opts.map((opt) => ({
       value: opt.label,
-      label: opt.description ? `  ${opt.label}  ${fg("dim", opt.description)}` : `  ${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) => {
@@ -5993,7 +6372,7 @@ var AskQuestionDialogComponent = class extends Box {
     this.selectList.onCancel = this.onCancel;
     this.addChild(this.selectList);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("dim", "  \u2191\u2193 to navigate \xB7 Enter to select \xB7 Esc to skip"), 0, 0));
+    this.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();
@@ -6005,7 +6384,7 @@ var AskQuestionDialogComponent = class extends Box {
     };
     this.addChild(this.input);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("dim", "  Enter to submit \xB7 Esc to skip"), 0, 0));
+    this.addChild(new Text(theme.fg("dim", "  Enter to submit \xB7 Esc to skip"), 0, 0));
   }
   handleInput(data) {
     if (this.selectList) {
@@ -6255,7 +6634,7 @@ async function handleSandboxAccessRequest(ctx, questionId, requestedPath, reason
     const questionComponent = new AskQuestionInlineComponent(
       {
         question: `Grant sandbox access to "${requestedPath}"?
-${fg("dim", `Reason: ${reason}`)}`,
+${theme.fg("dim", `Reason: ${reason}`)}`,
         options: [
           { label: "Yes", description: "Allow access to this directory" },
           { label: "No", description: "Deny access" }
@@ -6603,7 +6982,7 @@ var ToolApprovalDialogComponent = class extends Box {
     this._focused = value;
   }
   constructor(options) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.toolName = options.toolName;
     this.args = options.args;
     this.categoryLabel = options.categoryLabel;
@@ -6611,28 +6990,28 @@ var ToolApprovalDialogComponent = class extends Box {
     this.buildUI();
   }
   buildUI() {
-    this.addChild(new Text(fg("warning", "\u26A0 Tool Approval Required"), 0, 0));
+    this.addChild(new Text(theme.fg("warning", "\u26A0 Tool Approval Required"), 0, 0));
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("accent", `Tool: `) + fg("text", this.toolName), 0, 0));
+    this.addChild(new Text(theme.fg("accent", `Tool: `) + theme.fg("text", this.toolName), 0, 0));
     if (this.categoryLabel) {
-      this.addChild(new Text(fg("accent", `Category: `) + fg("text", this.categoryLabel), 0, 0));
+      this.addChild(new Text(theme.fg("accent", `Category: `) + theme.fg("text", this.categoryLabel), 0, 0));
     }
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "Arguments:"), 0, 0));
+    this.addChild(new Text(theme.fg("muted", "Arguments:"), 0, 0));
     const argsText = this.formatArgs(this.args);
     for (const line of argsText.split("\n").slice(0, 10)) {
-      this.addChild(new Text(fg("text", "  " + line), 0, 0));
+      this.addChild(new Text(theme.fg("text", "  " + line), 0, 0));
     }
     if (argsText.split("\n").length > 10) {
-      this.addChild(new Text(fg("muted", "  ... (truncated)"), 0, 0));
+      this.addChild(new Text(theme.fg("muted", "  ... (truncated)"), 0, 0));
     }
     this.addChild(new Spacer(1));
     const categoryHint = this.categoryLabel ? `lways allow ${this.categoryLabel.toLowerCase()}` : "lways allow category";
-    const dim = chalk10.hex("#555");
-    const key = chalk10.white.bold;
+    const dimColor = chalk10.hex(theme.getTheme().dim);
+    const key = chalk10.hex(theme.getTheme().text).bold;
     this.addChild(
       new Text(
-        fg("accent", "Allow? ") + key("y") + dim("es  ") + key("n") + dim("o  ") + key("a") + dim(categoryHint + "  ") + key("Y") + dim("olo"),
+        theme.fg("accent", "Allow? ") + key("y") + dimColor("es  ") + key("n") + dimColor("o  ") + key("a") + dimColor(categoryHint + "  ") + key("Y") + dimColor("olo"),
         0,
         0
       )
@@ -6950,6 +7329,10 @@ async function dispatchEvent(event, ectx, state) {
       ectx.showInfo(`Switched to thread: ${event.threadId}`);
       await ectx.renderExistingMessages();
       await state.harness.loadOMProgress();
+      const freshBranch = getCurrentGitBranch(state.projectInfo.rootPath);
+      if (freshBranch) {
+        state.projectInfo.gitBranch = freshBranch;
+      }
       const threadState = state.harness.getState();
       if (state.taskProgress) {
         state.taskProgress.updateTasks(threadState.tasks ?? []);
@@ -7116,7 +7499,7 @@ var UserMessageComponent = class extends Container {
 
 // src/tui/render-messages.ts
 function renderCompletedTasksInline(state, tasks, insertIndex = -1, collapsed = false) {
-  const headerText = bold(fg("accent", "Tasks")) + fg("dim", ` [${tasks.length}/${tasks.length} completed]`);
+  const headerText = theme.bold(theme.fg("accent", "Tasks")) + theme.fg("dim", ` [${tasks.length}/${tasks.length} completed]`);
   const container = new Container();
   container.addChild(new Spacer(1));
   container.addChild(new Text(headerText, 0, 0));
@@ -7131,7 +7514,11 @@ function renderCompletedTasksInline(state, tasks, insertIndex = -1, collapsed =
   }
   if (remaining > 0) {
     container.addChild(
-      new Text(fg("dim", `  ... ${remaining} more completed task${remaining > 1 ? "s" : ""} (ctrl+e to expand)`), 0, 0)
+      new Text(
+        theme.fg("dim", `  ... ${remaining} more completed task${remaining > 1 ? "s" : ""} (ctrl+e to expand)`),
+        0,
+        0
+      )
     );
   }
   if (insertIndex >= 0) {
@@ -7146,10 +7533,10 @@ function renderClearedTasksInline(state, clearedTasks, insertIndex = -1) {
   container.addChild(new Spacer(1));
   const count = clearedTasks.length;
   const label = count === 1 ? "Task" : "Tasks";
-  container.addChild(new Text(fg("accent", `${label} cleared`), 0, 0));
+  container.addChild(new Text(theme.fg("accent", `${label} cleared`), 0, 0));
   for (const task of clearedTasks) {
     const icon = task.status === "completed" ? chalk10.hex(mastra.green)("\u2713") : chalk10.hex(mastra.darkGray)("\u25CB");
-    const text = chalk10.dim.strikethrough(task.content);
+    const text = chalk10.hex(theme.getTheme().dim).strikethrough(task.content);
     container.addChild(new Text(`  ${icon} ${text}`, 0, 0));
   }
   if (insertIndex >= 0) {
@@ -7511,15 +7898,15 @@ function colorLine(line) {
 function renderBanner(version, appName) {
   const name = appName;
   if (name !== "Mastra Code") {
-    return fg("accent", "\u25C6") + " " + bold(fg("accent", name)) + fg("dim", ` v${version}`);
+    return theme.fg("accent", "\u25C6") + " " + theme.bold(theme.fg("accent", name)) + theme.fg("dim", ` v${version}`);
   }
   const cols = process.stdout.columns || 80;
   if (cols < 30) {
-    return fg("accent", "\u25C6") + " " + bold(fg("accent", "Mastra Code")) + fg("dim", ` v${version}`);
+    return theme.fg("accent", "\u25C6") + " " + theme.bold(theme.fg("accent", "Mastra Code")) + theme.fg("dim", ` v${version}`);
   }
   const art = cols >= 50 ? FULL_ART : SHORT_ART;
   const coloredLines = art.map((line) => colorLine(line));
-  coloredLines.push(fg("dim", `v${version}`));
+  coloredLines.push(theme.fg("dim", `v${version}`));
   return coloredLines.join("\n");
 }
 var TaskProgressComponent = class extends Container {
@@ -7546,7 +7933,7 @@ var TaskProgressComponent = class extends Container {
     const completed = this.tasks.filter((t) => t.status === "completed").length;
     const total = this.tasks.length;
     if (completed === total) return;
-    const headerText = "  " + bold(fg("accent", "Tasks")) + fg("dim", ` [${completed}/${total} completed]`);
+    const headerText = "  " + theme.bold(theme.fg("accent", "Tasks")) + theme.fg("dim", ` [${completed}/${total} completed]`);
     this.addChild(new Spacer(1));
     this.addChild(new Text(headerText, 0, 0));
     for (const task of this.tasks) {
@@ -7557,18 +7944,18 @@ var TaskProgressComponent = class extends Container {
     const indent = "    ";
     switch (task.status) {
       case "completed": {
-        const icon = chalk10.green("\u2713");
-        const text = chalk10.green.strikethrough(task.content);
+        const icon = theme.fg("success", "\u2713");
+        const text = chalk10.hex(theme.getTheme().success).strikethrough(task.content);
         return `${indent}${icon} ${text}`;
       }
       case "in_progress": {
-        const icon = chalk10.yellow("\u25B6");
-        const text = chalk10.yellow.bold(task.activeForm);
+        const icon = theme.fg("warning", "\u25B6");
+        const text = theme.bold(theme.fg("warning", task.activeForm));
         return `${indent}${icon} ${text}`;
       }
       case "pending": {
-        const icon = chalk10.dim("\u25CB");
-        const text = chalk10.dim(task.content);
+        const icon = theme.fg("dim", "\u25CB");
+        const text = theme.fg("dim", task.content);
         return `${indent}${icon} ${text}`;
       }
     }
@@ -7676,13 +8063,13 @@ function buildLayout(state, refreshModelAuthStatus) {
     state.projectInfo.gitBranch ? `Branch: ${state.projectInfo.gitBranch}` : null,
     state.projectInfo.isWorktree ? `Worktree of: ${state.projectInfo.mainRepoPath}` : null,
     `User: ${getUserId(state.projectInfo.rootPath)}`
-  ].filter(Boolean).map((line) => fg("muted", line)).join("\n");
-  const sep = fg("dim", " \xB7 ");
+  ].filter(Boolean).map((line) => theme.fg("muted", line)).join("\n");
+  const sep = theme.fg("dim", " \xB7 ");
   const hintParts = [];
   if (state.harness.listModes().length > 1) {
-    hintParts.push(`${fg("accent", "\u21E7+Tab")} ${fg("muted", "cycle modes")}`);
+    hintParts.push(`${theme.fg("accent", "\u21E7+Tab")} ${theme.fg("muted", "cycle modes")}`);
   }
-  hintParts.push(`${fg("accent", "/help")} ${fg("muted", "info & shortcuts")}`);
+  hintParts.push(`${theme.fg("accent", "/help")} ${theme.fg("muted", "info & shortcuts")}`);
   const instructions = `  ${hintParts.join(sep)}`;
   state.ui.addChild(new Spacer(1));
   state.ui.addChild(new Text(banner, 1, 0));
@@ -7704,6 +8091,17 @@ function buildLayout(state, refreshModelAuthStatus) {
   refreshModelAuthStatus();
   state.ui.setFocus(state.editor);
 }
+function detectFdPath() {
+  const whichCmd = process.platform === "win32" ? "where" : "which";
+  for (const bin of ["fd", "fdfind"]) {
+    try {
+      const resolved = execFileSync(whichCmd, [bin], { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim().split(/\r?\n/)[0];
+      if (resolved) return resolved;
+    } catch {
+    }
+  }
+  return null;
+}
 function setupAutocomplete(state) {
   const slashCommands = [
     { name: "new", description: "Start a new thread" },
@@ -7712,7 +8110,7 @@ function setupAutocomplete(state) {
     { name: "models:pack", description: "Switch model pack" },
     { name: "subagents", description: "Configure subagent model defaults" },
     { name: "om", description: "Configure Observational Memory models" },
-    { name: "think", description: "Set thinking level (Anthropic)" },
+    { name: "think", description: "Set thinking (off|low|medium|high|xhigh|status)" },
     { name: "login", description: "Login with OAuth provider" },
     { name: "skills", description: "List available skills" },
     { name: "cost", description: "Show token usage and estimated costs" },
@@ -7747,6 +8145,7 @@ function setupAutocomplete(state) {
     },
     { name: "review", description: "Review a GitHub pull request" },
     { name: "setup", description: "Re-run the setup wizard" },
+    { name: "theme", description: "Switch color theme (auto/dark/light)" },
     { name: "exit", description: "Exit the TUI" },
     { name: "help", description: "Show available commands" }
   ];
@@ -7760,7 +8159,8 @@ function setupAutocomplete(state) {
       description: customCmd.description || `Custom: ${customCmd.name}`
     });
   }
-  state.autocompleteProvider = new CombinedAutocompleteProvider(slashCommands, process.cwd());
+  const fdPath = detectFdPath();
+  state.autocompleteProvider = new CombinedAutocompleteProvider(slashCommands, process.cwd(), fdPath);
   state.editor.setAutocompleteProvider(state.autocompleteProvider);
 }
 async function loadCustomSlashCommands(state) {
@@ -7862,16 +8262,22 @@ var ShellOutputComponent = class extends Container {
     this.addChild(new Spacer(1));
     const statusIcon = exitCode === 0 ? "\u2713" : "\u2717";
     const statusColor = exitCode === 0 ? "success" : "error";
-    this.addChild(new Text(`${fg(statusColor, statusIcon)} ${bold(fg("muted", "$"))} ${fg("text", command)}`, 1, 0));
+    this.addChild(
+      new Text(
+        `${theme.fg(statusColor, statusIcon)} ${theme.bold(theme.fg("muted", "$"))} ${theme.fg("text", command)}`,
+        1,
+        0
+      )
+    );
     const output = (stdout + (stderr ? (stdout ? "\n" : "") + stderr : "")).trimEnd();
     if (output) {
       const lines = output.split("\n");
       for (const line of lines) {
-        this.addChild(new Text(fg("toolOutput", `  ${line}`), 0, 0));
+        this.addChild(new Text(theme.fg("toolOutput", `  ${line}`), 0, 0));
       }
     }
     if (exitCode !== 0) {
-      this.addChild(new Text(fg("error", `  Exit code: ${exitCode}`), 0, 0));
+      this.addChild(new Text(theme.fg("error", `  Exit code: ${exitCode}`), 0, 0));
     }
   }
 };
@@ -8260,6 +8666,10 @@ var MastraTUI = class _MastraTUI {
           showInfo(this.state, "No model selected. Use /models to select a model, or /login to authenticate.");
           continue;
         }
+        const allowed = await this.runUserPromptHook(userInput);
+        if (!allowed) {
+          continue;
+        }
         const images = this.state.pendingImages.length > 0 ? [...this.state.pendingImages] : void 0;
         this.state.pendingImages = [];
         addUserMessage(this.state, {
@@ -8334,6 +8744,7 @@ var MastraTUI = class _MastraTUI {
     updateTerminalTitle(this.state);
     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;
@@ -8358,6 +8769,44 @@ var MastraTUI = class _MastraTUI {
   }
   async handleEvent(event) {
     await dispatchEvent(event, this.getEventContext(), this.state);
+    if (event.type === "agent_end") {
+      const stopReason = event.reason === "aborted" ? "aborted" : event.reason === "error" ? "error" : "complete";
+      await this.runStopHook(stopReason);
+    }
+  }
+  showHookWarnings(event, warnings) {
+    for (const warning of warnings) {
+      showInfo(this.state, `[${event}] ${warning}`);
+    }
+  }
+  async runStopHook(stopReason) {
+    const hookMgr = this.state.hookManager;
+    if (!hookMgr) return;
+    try {
+      const result = await hookMgr.runStop(void 0, stopReason);
+      this.showHookWarnings("Stop", result.warnings);
+      if (!result.allowed && result.blockReason) {
+        showError(this.state, `Stop hook blocked: ${result.blockReason}`);
+      }
+    } catch (error) {
+      showError(this.state, `Stop hook failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async runUserPromptHook(userInput) {
+    const hookMgr = this.state.hookManager;
+    if (!hookMgr) return true;
+    try {
+      const result = await hookMgr.runUserPromptSubmit(userInput);
+      this.showHookWarnings("UserPromptSubmit", result.warnings);
+      if (!result.allowed) {
+        showError(this.state, result.blockReason || "Blocked by UserPromptSubmit hook");
+        return false;
+      }
+      return true;
+    } catch (error) {
+      showError(this.state, `UserPromptSubmit hook failed: ${error instanceof Error ? error.message : String(error)}`);
+      return false;
+    }
   }
   // ===========================================================================
   /**
@@ -8426,6 +8875,26 @@ var MastraTUI = class _MastraTUI {
     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.
+   */
+  async checkClaudeMaxOAuthWarning() {
+    const authStorage = this.state.authStorage;
+    if (!authStorage || !authStorage.isLoggedIn(ANTHROPIC_OAUTH_PROVIDER_ID)) return;
+    const settings = loadSettings();
+    if (settings.onboarding.claudeMaxOAuthWarningAcknowledgedAt) return;
+    const result = await showClaudeMaxOAuthWarning(this.state, "startup");
+    if (result === "continue") {
+      settings.onboarding.claudeMaxOAuthWarningAcknowledgedAt = (/* @__PURE__ */ new Date()).toISOString();
+      saveSettings(settings);
+    } else if (result === "remove") {
+      authStorage.logout(ANTHROPIC_OAUTH_PROVIDER_ID);
+      settings.onboarding.claudeMaxOAuthWarningAcknowledgedAt = (/* @__PURE__ */ new Date()).toISOString();
+      saveSettings(settings);
+      await this.refreshModelAuthStatus();
+    }
+  }
   /**
    * Get the workspace, preferring harness-owned workspace over the direct option.
    */
@@ -8519,7 +8988,7 @@ var MastraTUI = class _MastraTUI {
         signal: dialog.signal
       }).then(async () => {
         this.state.ui.hideOverlay();
-        const { PROVIDER_DEFAULT_MODELS: PROVIDER_DEFAULT_MODELS2 } = await import('./storage-52Y5MKTG.js');
+        const { PROVIDER_DEFAULT_MODELS: PROVIDER_DEFAULT_MODELS2 } = await import('./storage-PQOHJLBI.js');
         const defaultModel = PROVIDER_DEFAULT_MODELS2[providerId];
         if (defaultModel) {
           await this.state.harness.switchModel({ modelId: defaultModel });
@@ -8564,6 +9033,7 @@ var MastraTUI = class _MastraTUI {
       };
     };
     const access = await buildAccess();
+    const hasProviderAccess = Object.values(access).some(Boolean);
     const savedSettings = loadSettings();
     const modePacks = getAvailableModePacks(access, savedSettings.customModelPacks);
     const omPacks = getAvailableOmPacks(access);
@@ -8582,6 +9052,7 @@ var MastraTUI = class _MastraTUI {
         authProviders,
         modePacks,
         omPacks,
+        hasProviderAccess,
         previous,
         onComplete: async (result) => {
           this.state.activeOnboarding = void 0;
@@ -8599,11 +9070,23 @@ var MastraTUI = class _MastraTUI {
           resolve2();
         },
         onLogin: (providerId, done) => {
+          if (providerId === ANTHROPIC_OAUTH_PROVIDER_ID) {
+            const s = loadSettings();
+            s.onboarding.claudeMaxOAuthWarningAcknowledgedAt = (/* @__PURE__ */ new Date()).toISOString();
+            saveSettings(s);
+          }
           this.performLogin(providerId).then(async () => {
-            const updatedAccess = await buildAccess();
-            component.updateModePacks(getAvailableModePacks(updatedAccess, savedSettings.customModelPacks));
-            component.updateOmPacks(getAvailableOmPacks(updatedAccess));
-            done();
+            try {
+              const updatedAccess = await buildAccess();
+              const updatedHasAccess = Object.values(updatedAccess).some(Boolean);
+              component.updateModePacks(getAvailableModePacks(updatedAccess, savedSettings.customModelPacks));
+              component.updateOmPacks(getAvailableOmPacks(updatedAccess));
+              component.updateHasProviderAccess(updatedHasAccess);
+            } catch (err) {
+              console.error("Failed to refresh provider access after login:", err);
+            } finally {
+              done();
+            }
           });
         },
         onSelectModel: async (title, modeColor) => {
@@ -8725,19 +9208,19 @@ var LoginSelectorComponent = class extends Box {
   onSelectCallback;
   onCancelCallback;
   constructor(mode, authSource, onSelect, onCancel) {
-    super(2, 1, (text) => bg("overlayBg", text));
+    super(2, 1, (text) => theme.bg("overlayBg", text));
     this.mode = mode;
     this.authSource = authSource;
     this.onSelectCallback = onSelect;
     this.onCancelCallback = onCancel;
     this.loadProviders();
     const title = mode === "login" ? "Select provider to login:" : "Select provider to logout:";
-    this.addChild(new Text(fg("text", title)));
+    this.addChild(new Text(theme.fg("text", title)));
     this.addChild(new Spacer(1));
     this.listContainer = new Container();
     this.addChild(this.listContainer);
     this.addChild(new Spacer(1));
-    this.addChild(new Text(fg("muted", "Press Enter to select, Escape to cancel")));
+    this.addChild(new Text(theme.fg("muted", "Press Enter to select, Escape to cancel")));
     this.updateList();
   }
   loadProviders() {
@@ -8750,10 +9233,10 @@ var LoginSelectorComponent = class extends Box {
       if (!provider) continue;
       const isSelected = i === this.selectedIndex;
       const isLoggedIn = this.authSource.isLoggedIn(provider.id);
-      const statusIndicator = isLoggedIn ? fg("success", " \u2713 logged in") : "";
+      const statusIndicator = isLoggedIn ? theme.fg("success", " \u2713 logged in") : "";
       let line = "";
       if (isSelected) {
-        line = fg("accent", "\u2192 " + provider.name) + statusIndicator;
+        line = theme.fg("accent", "\u2192 " + provider.name) + statusIndicator;
       } else {
         line = "  " + provider.name + statusIndicator;
       }
@@ -8761,7 +9244,7 @@ var LoginSelectorComponent = class extends Box {
     }
     if (this.allProviders.length === 0) {
       const message = this.mode === "login" ? "No OAuth providers available" : "No OAuth providers logged in. Use /login first.";
-      this.listContainer.addChild(new Text(fg("muted", message)));
+      this.listContainer.addChild(new Text(theme.fg("muted", message)));
     }
   }
   handleInput(keyData) {
@@ -8783,6 +9266,6 @@ var LoginSelectorComponent = class extends Box {
   }
 };
 
-export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, formatOMStatus };
-//# sourceMappingURL=chunk-LYETHS2L.js.map
-//# sourceMappingURL=chunk-LYETHS2L.js.map
+export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus };
+//# sourceMappingURL=chunk-X3BGE7CL.js.map
+//# sourceMappingURL=chunk-X3BGE7CL.js.map