mastracode 0.26.0-alpha.5 → 0.26.0

package/dist/{chunk-L67CU2OP.js → chunk-LUSQ75XP.js}

@@ -1,4 +1,4 @@
-import { tintHex, mastra, theme, getMarkdownTheme, CHAT_INDENT, BOX_INDENT, getTermWidth, ensureTerminalGlyphContrast, TERM_WIDTH_BUFFER, getEditorTheme, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, resolveThreadActiveModelPackId, saveSettings, getAvailableOmPacks, ONBOARDING_VERSION, THREAD_ACTIVE_MODEL_PACK_ID_KEY, BOX_INDENT_STR, ThreadLockError, getPlanFilename, getSelectListTheme, luminance, extendedColors, mastraBrand, savePlanSnapshot, MEMORY_GATEWAY_DEFAULT_URL, getThemeMode, applyThemeMode, createBrowserFromSettings, setProfileProvider, getCustomProviderId, OBSERVABILITY_AUTH_PREFIX, checkProfileProviderMismatch, getSettingsListTheme, savePlanToDisk, toCustomProviderModelId } from './chunk-F3TKSK3C.js';
+import { tintHex, mastra, theme, getMarkdownTheme, CHAT_INDENT, BOX_INDENT, getTermWidth, ensureTerminalGlyphContrast, TERM_WIDTH_BUFFER, getEditorTheme, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, resolveThreadActiveModelPackId, saveSettings, getAvailableOmPacks, ONBOARDING_VERSION, THREAD_ACTIVE_MODEL_PACK_ID_KEY, BOX_INDENT_STR, ThreadLockError, resolvePlanPath, readPlanFile, getSelectListTheme, luminance, extendedColors, mastraBrand, MEMORY_GATEWAY_DEFAULT_URL, getThemeMode, applyThemeMode, createBrowserFromSettings, setProfileProvider, getCustomProviderId, OBSERVABILITY_AUTH_PREFIX, checkProfileProviderMismatch, getSettingsListTheme, approvePlanFile, toCustomProviderModelId } from './chunk-NDCWIAKG.js';
 import { getOAuthProviders, detectProject, DEFAULT_CONFIG_DIR, getUserId, getCurrentGitBranchAsync, getUserName, PROVIDER_DEFAULT_MODELS } from './chunk-Z5EMG7I2.js';
 import { MC_TOOLS, getToolCategory, TOOL_CATEGORIES } from './chunk-UOFNLVKF.js';
 import { exec, spawn, execFile, execSync, execFileSync } from 'child_process';
@@ -10,7 +10,8 @@ import path4__default, { extname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { randomUUID } from 'crypto';
 import { formatSkillActivation } from '@mastra/core/workspace';
-import { defaultOMProgressState, parseSubagentMeta, assignTaskIds } from '@mastra/core/harness';
+import { defaultOMProgressState, parseSubagentMeta } from '@mastra/core/agent-controller';
+import { assignTaskIds } from '@mastra/core/signals';
 import { TASKS_STATE_ID } from '@mastra/core/tools';
 import stripAnsi2 from 'strip-ansi';
 import { safeStringify } from '@mastra/core/utils';
@@ -1174,7 +1175,7 @@ function getInstallCommand(pm, version) {
 }
 function getCurrentVersion() {
   {
-    return "0.26.0-alpha.5";
+    return "0.26.0";
   }
 }
 async function fetchLatestVersion() {
@@ -1933,7 +1934,7 @@ var GoalManager = class {
   // ---------------------------------------------------------------------------
   getAgent(state) {
     try {
-      return state.harness.getCurrentAgent(state.session);
+      return state.controller.getCurrentAgent(state.session);
     } catch {
       return void 0;
     }
@@ -2311,7 +2312,7 @@ function getJudgeDefaults() {
 }
 async function promptForJudgeDefaults(ctx, cancelMessage) {
   const { state } = ctx;
-  const availableModels = await state.harness.listAvailableModels();
+  const availableModels = await state.controller.listAvailableModels();
   if (availableModels.length === 0) {
     ctx.showError("No models available. Cannot set goal judge defaults.");
     return null;
@@ -2644,7 +2645,7 @@ function describeShellPassthroughInvocation(invocation) {
 function handleHelpCommand(ctx) {
   const shellInvocation = resolveShellPassthroughInvocation("", loadSettings().shellPassthrough);
   const text = buildHelpText({
-    modes: ctx.harness.listModes().length,
+    modes: ctx.controller.listModes().length,
     customSlashCommands: ctx.customSlashCommands,
     shellModeLabel: describeShellPassthroughInvocation(shellInvocation)
   });
@@ -3759,7 +3760,7 @@ function applyCurrentModeColorToRenderedTools(ctx) {
   ctx.state.ui.requestRender();
 }
 async function handleModeCommand(ctx, args) {
-  const modes = ctx.harness.listModes();
+  const modes = ctx.controller.listModes();
   if (modes.length <= 1) {
     ctx.showInfo("Only one mode available");
     return;
@@ -4432,6 +4433,48 @@ var OMOutputComponent = class extends Container {
     return "other";
   }
 };
+
+// src/utils/plan-diff.ts
+function generatePlanDiff(oldText, newText) {
+  const oldLines = oldText.split(/\r?\n/);
+  const newLines = newText.split(/\r?\n/);
+  const n = oldLines.length;
+  const m = newLines.length;
+  const lcs = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
+  for (let i2 = n - 1; i2 >= 0; i2--) {
+    for (let j2 = m - 1; j2 >= 0; j2--) {
+      lcs[i2][j2] = oldLines[i2] === newLines[j2] ? lcs[i2 + 1][j2 + 1] + 1 : Math.max(lcs[i2 + 1][j2], lcs[i2][j2 + 1]);
+    }
+  }
+  const entries = [];
+  let i = 0;
+  let j = 0;
+  while (i < n && j < m) {
+    if (oldLines[i] === newLines[j]) {
+      entries.push({ type: "context", text: oldLines[i] });
+      i++;
+      j++;
+    } else if (lcs[i + 1][j] >= lcs[i][j + 1]) {
+      entries.push({ type: "removed", text: oldLines[i] });
+      i++;
+    } else {
+      entries.push({ type: "added", text: newLines[j] });
+      j++;
+    }
+  }
+  while (i < n) entries.push({ type: "removed", text: oldLines[i++] });
+  while (j < m) entries.push({ type: "added", text: newLines[j++] });
+  return entries;
+}
+function shouldShowDiff(previousPlan, plan, maxChangedRatio = 0.5) {
+  if (!previousPlan || previousPlan === plan) return false;
+  const entries = generatePlanDiff(previousPlan, plan);
+  const changed = entries.filter((e) => e.type !== "context").length;
+  if (changed === 0) return false;
+  return changed / Math.max(entries.length, 1) <= maxChangedRatio;
+}
+
+// src/tui/components/plan-approval-inline.ts
 var PlanContentBox = class {
   constructor(plan) {
     this.plan = plan;
@@ -4494,25 +4537,6 @@ var PlanDiffBox = class {
     return [top, ...body, bottom];
   }
 };
-function generatePlanDiff(oldText, newText) {
-  const oldLines = oldText.split("\n");
-  const newLines = newText.split("\n");
-  const entries = [];
-  const maxLines = Math.max(oldLines.length, newLines.length);
-  for (let i = 0; i < maxLines; i++) {
-    if (i >= oldLines.length) {
-      entries.push({ type: "added", text: newLines[i] });
-    } else if (i >= newLines.length) {
-      entries.push({ type: "removed", text: oldLines[i] });
-    } else if (oldLines[i] !== newLines[i]) {
-      entries.push({ type: "removed", text: oldLines[i] });
-      entries.push({ type: "added", text: newLines[i] });
-    } else {
-      entries.push({ type: "context", text: oldLines[i] });
-    }
-  }
-  return entries;
-}
 var PlanApprovalInlineComponent = class _PlanApprovalInlineComponent extends Container {
   constructor(options, ui) {
     super();
@@ -4582,12 +4606,8 @@ var PlanApprovalInlineComponent = class _PlanApprovalInlineComponent extends Con
   updateArgs(args) {
     if (!args || typeof args !== "object" || this.resolved) return;
     const partial = args;
-    if (typeof partial.title === "string") {
-      this.planTitle = partial.title || "Untitled plan";
-      this.planFilename = getPlanFilename(this.planTitle);
-    }
-    if (typeof partial.plan === "string") {
-      this.planContent = partial.plan;
+    if (typeof partial.path === "string" && partial.path) {
+      this.planFilename = partial.path;
     }
     if (this.mode === "streaming") {
       this.renderStreaming();
@@ -4640,7 +4660,7 @@ var PlanApprovalInlineComponent = class _PlanApprovalInlineComponent extends Con
   renderPlanHeader(prefix = "") {
     this.contentBox.addChild(new Text(`${prefix}${theme.bold(theme.fg("accent", `Plan: ${this.planTitle}`))}`, 0, 0));
     if (this.planFilename) {
-      this.contentBox.addChild(new Text(theme.fg("dim", `.mastracode/plans/${this.planFilename}`), 0, 0));
+      this.contentBox.addChild(new Text(theme.fg("dim", this.planFilename), 0, 0));
     }
     this.contentBox.addChild(new Spacer(1));
   }
@@ -4711,7 +4731,7 @@ var PlanResultComponent = class extends Container {
     const status = options.isApproved ? "Approved" : options.feedback ? "Changes requested" : "Rejected";
     contentBox.addChild(new Text(theme.bold(theme.fg("accent", `Plan: ${options.title}`)), 0, 0));
     if (options.planFilename) {
-      contentBox.addChild(new Text(theme.fg("dim", `.mastracode/plans/${options.planFilename}`), 0, 0));
+      contentBox.addChild(new Text(theme.fg("dim", options.planFilename), 0, 0));
     }
     contentBox.addChild(new Spacer(1));
     contentBox.addChild(new PlanContentBox(options.plan));
@@ -8899,10 +8919,16 @@ async function renderExistingMessages(state) {
           if (content.name === "submit_plan" && toolResult?.type === "tool_result") {
             const args = content.args;
             let resultText = "";
+            let submittedPlan;
             if (typeof toolResult.result === "string") {
               resultText = toolResult.result;
-            } else if (typeof toolResult.result === "object" && toolResult.result !== null && "content" in toolResult.result && typeof toolResult.result.content === "string") {
-              resultText = toolResult.result.content;
+            } else if (typeof toolResult.result === "object" && toolResult.result !== null) {
+              if ("content" in toolResult.result && typeof toolResult.result.content === "string") {
+                resultText = toolResult.result.content;
+              }
+              if ("submittedPlan" in toolResult.result && typeof toolResult.result.submittedPlan === "object") {
+                submittedPlan = toolResult.result.submittedPlan;
+              }
             }
             const isApproved = resultText.startsWith("Plan approved");
             let feedback;
@@ -8910,17 +8936,24 @@ async function renderExistingMessages(state) {
               const feedbackMatch = resultText.match(/User feedback:\s*(.+?)(?:\n|$)/);
               feedback = feedbackMatch?.[1] || "Revision requested";
             }
-            if (args?.title && args?.plan) {
+            const submittedPath = submittedPlan?.path || args?.path;
+            if (submittedPath) {
+              const sessionState = state.session.state.get();
+              const projectPath = sessionState?.projectPath;
+              const recoverAbsPath = !submittedPlan?.plan ? resolvePlanPath(projectPath ?? process.cwd(), submittedPath) : void 0;
+              const recovered = recoverAbsPath ? await readPlanFile(recoverAbsPath) : void 0;
+              const planBody = submittedPlan?.plan ?? recovered?.plan ?? "";
+              const planTitle = submittedPlan?.title || recovered?.title || "Implementation Plan";
               const planResult = new PlanResultComponent({
-                title: args.title,
-                plan: args.plan,
-                planFilename: getPlanFilename(args.title),
+                title: planTitle,
+                plan: planBody,
+                planFilename: submittedPath,
                 isApproved,
                 feedback
               });
               state.chatContainer.addChild(planResult);
               replacedWithInline = true;
-              state.previousPlanSnapshot = { title: args.title, plan: args.plan };
+              state.previousPlanSnapshot = { path: submittedPath, plan: planBody };
             }
           }
           if (!replacedWithInline) {
@@ -9047,8 +9080,8 @@ function escapeSkillBoundary(value) {
 }
 async function resolveWorkspace(ctx) {
   let workspace = ctx.getResolvedWorkspace();
-  if (!workspace && ctx.harness.hasWorkspace()) {
-    workspace = await ctx.harness.resolveWorkspace({ session: ctx.state.session });
+  if (!workspace && ctx.controller.hasWorkspace()) {
+    workspace = await ctx.controller.resolveWorkspace({ session: ctx.state.session });
   }
   return workspace;
 }
@@ -9418,13 +9451,13 @@ async function handleCloneCommand(ctx) {
 
 // src/tui/commands/resource.ts
 async function handleResourceCommand(ctx, args) {
-  const { state, harness } = ctx;
+  const { state, controller } = ctx;
   const { session } = state;
   const sub = args[0]?.trim();
   const current = session.identity.getResourceId();
   const defaultId = session.identity.getDefaultResourceId();
   if (!sub) {
-    const knownIds = await harness.getKnownResourceIds(session);
+    const knownIds = await controller.getKnownResourceIds(session);
     const isOverridden = current !== defaultId;
     const lines = [
       `Current: ${current}${isOverridden ? ` (auto-detected: ${defaultId})` : ""}`,
@@ -9445,7 +9478,7 @@ async function handleResourceCommand(ctx, args) {
     ctx.showInfo(`Already on resource: ${current}`);
     return;
   }
-  await harness.setResourceId(session, { resourceId: newId });
+  await controller.setResourceId(session, { resourceId: newId });
   const threads = await session.thread.list();
   const latest = [...threads].sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime())[0];
   if (latest) {
@@ -9964,7 +9997,7 @@ async function handleThreadsCommand(ctx) {
           return;
         }
         if (thread.resourceId !== currentResourceId) {
-          await state.harness.setResourceId(state.session, { resourceId: thread.resourceId });
+          await state.controller.setResourceId(state.session, { resourceId: thread.resourceId });
         }
         try {
           await state.session.thread.switch({ threadId: thread.id });
@@ -10088,8 +10121,8 @@ async function handleThreadTagDirCommand(ctx) {
   }
 }
 async function sandboxAddPath(ctx, rawPath) {
-  const harnessState = ctx.state.session.state.get();
-  const currentPaths = harnessState?.sandboxAllowedPaths ?? [];
+  const controllerWithState = ctx.state.session.state.get();
+  const currentPaths = controllerWithState?.sandboxAllowedPaths ?? [];
   const resolved = path4__default.resolve(rawPath);
   if (currentPaths.includes(resolved)) {
     ctx.showInfo(`Path already allowed: ${resolved}`);
@@ -10138,8 +10171,8 @@ async function showSandboxAddPrompt(ctx) {
   });
 }
 async function handleSandboxCommand(ctx, args) {
-  const harnessState = ctx.state.session.state.get();
-  const currentPaths = harnessState?.sandboxAllowedPaths ?? [];
+  const agentControllerState = ctx.state.session.state.get();
+  const currentPaths = agentControllerState?.sandboxAllowedPaths ?? [];
   const subcommand = args[0]?.toLowerCase();
   if (subcommand === "add" && args.length > 1) {
     await sandboxAddPath(ctx, args.slice(1).join(" ").trim());
@@ -10693,7 +10726,7 @@ function updateStatusLine(state) {
   const showOMMode = !isJudging && (isObserving || isReflecting);
   let modeBadge = "";
   let modeBadgeWidth = 0;
-  const modes = state.harness.listModes();
+  const modes = state.controller.listModes();
   const currentMode = modes.length > 1 ? state.session.mode.resolve() : void 0;
   const judgeModeColor = mastra.blue;
   const currentModeColor = currentMode?.metadata?.color;
@@ -10851,6 +10884,13 @@ function updateStatusLine(state) {
     if (ref) {
       parts.push({ plain: ref, styled: ref });
     }
+    if (state.tokensPerSec > 0) {
+      const tpsLabel = `${state.tokensPerSec} tok/s`;
+      parts.push({
+        plain: tpsLabel,
+        styled: theme.fg("dim", tpsLabel)
+      });
+    }
     if (opts.showQueue && queuedLabel) {
       parts.push({
         plain: queuedLabel,
@@ -11027,7 +11067,7 @@ function deserializePack(input) {
   }
 }
 async function selectModel(ctx, title, modeColor, currentModelId) {
-  const availableModels = await ctx.state.harness.listAvailableModels();
+  const availableModels = await ctx.state.controller.listAvailableModels();
   if (availableModels.length === 0) return void 0;
   return new Promise((resolve3) => {
     const selector = new ModelSelectorComponent({
@@ -11262,8 +11302,8 @@ function removeCustomPackFromSettings(settings, packId) {
   }
 }
 async function applyPack(ctx, pack, previousPackId) {
-  const harness = ctx.state.harness;
-  const modes = harness.listModes();
+  const controller = ctx.state.controller;
+  const modes = controller.listModes();
   for (const mode of modes) {
     const modelId = pack.models[mode.id];
     if (modelId) {
@@ -11416,8 +11456,8 @@ async function askImportCollision(ctx, existingName) {
   });
 }
 async function handleModelsPackCommand(ctx) {
-  const harness = ctx.state.harness;
-  const models = await harness.listAvailableModels();
+  const controller = ctx.state.controller;
+  const models = await controller.listAvailableModels();
   const hasEnv = (provider) => models.some((m) => m.provider === provider && m.hasApiKey);
   const accessLevel = (storageProviderId) => {
     const cred = ctx.authStorage?.get(storageProviderId);
@@ -11843,7 +11883,7 @@ var BUILT_IN_SUBAGENT_TYPES = [
   }
 ];
 async function showSubagentModelListForScope(ctx, scope, agentType, agentTypeLabel) {
-  const availableModels = await ctx.state.harness.listAvailableModels();
+  const availableModels = await ctx.state.controller.listAvailableModels();
   if (availableModels.length === 0) {
     ctx.showInfo("No models available. Check your Mastra configuration.");
     return;
@@ -11911,8 +11951,8 @@ async function showSubagentScopeThenList(ctx, agentType, agentTypeLabel) {
   }
 }
 function getConfiguredSubagentTypes(ctx) {
-  const harnessWithConfig = ctx.state.harness;
-  const configuredSubagents = harnessWithConfig.config?.subagents;
+  const controllerWithConfig = ctx.state.controller;
+  const configuredSubagents = controllerWithConfig.config?.subagents;
   return configuredSubagents && configuredSubagents.length > 0 ? configuredSubagents.map((subagent) => ({
     id: subagent.id,
     label: subagent.name,
@@ -12231,15 +12271,15 @@ function persistOmObserveAttachments(value) {
   saveSettings(settings);
 }
 async function handleOMCommand(ctx) {
-  const availableModels = await ctx.state.harness.listAvailableModels();
-  const harnessState = ctx.state.session.state.get();
+  const availableModels = await ctx.state.controller.listAvailableModels();
+  const agentControllerState = ctx.state.session.state.get();
   const config = {
     observerModelId: ctx.state.session.om.observer.modelId() ?? "",
     reflectorModelId: ctx.state.session.om.reflector.modelId() ?? "",
     observationThreshold: ctx.state.session.om.observer.threshold() ?? 3e4,
     reflectionThreshold: ctx.state.session.om.reflector.threshold() ?? 4e4,
-    cavemanObservations: harnessState?.cavemanObservations ?? false,
-    observeAttachments: harnessState?.observeAttachments ?? "auto"
+    cavemanObservations: agentControllerState?.cavemanObservations ?? false,
+    observeAttachments: agentControllerState?.observeAttachments ?? "auto"
   };
   return new Promise((resolve3) => {
     const settings = new OMSettingsComponent(
@@ -12648,12 +12688,17 @@ var SettingsComponent = class extends Box {
     this.settingsList.handleInput(data);
   }
 };
+function getAuthProviderId(provider) {
+  return provider === "openai" ? "openai-codex" : provider;
+}
 function getProviderList(ctx, models) {
   const seen = /* @__PURE__ */ new Map();
   for (const model of models) {
     if (seen.has(model.provider)) continue;
     let source = "none";
-    if (ctx.authStorage?.hasStoredApiKey(model.provider)) {
+    if (ctx.authStorage?.isLoggedIn(getAuthProviderId(model.provider))) {
+      source = "oauth";
+    } else if (ctx.authStorage?.hasStoredApiKey(model.provider)) {
       source = "stored";
     } else if (model.apiKeyEnvVar && process.env[model.apiKeyEnvVar]) {
       source = "env";
@@ -12670,6 +12715,8 @@ function getProviderList(ctx, models) {
 }
 function statusLabel(info) {
   switch (info.source) {
+    case "oauth":
+      return theme.fg("success", "\u2713") + theme.fg("dim", " (oauth)");
     case "env":
       return theme.fg("success", "\u2713") + theme.fg("dim", " (env)");
     case "stored":
@@ -12685,7 +12732,7 @@ function buildItems(providers) {
   }));
 }
 async function handleApiKeysCommand(ctx) {
-  let models = await ctx.state.harness.listAvailableModels();
+  let models = await ctx.state.controller.listAvailableModels();
   let providers = getProviderList(ctx, models);
   if (providers.length === 0) {
     ctx.showInfo("No model providers found.");
@@ -12700,7 +12747,9 @@ async function handleApiKeysCommand(ctx) {
     const updateDetail = (providerName) => {
       const info = providers.find((p) => p.provider === providerName);
       if (!info) return;
-      if (info.source === "env") {
+      if (info.source === "oauth") {
+        detailText.setText(theme.fg("dim", "  Authenticated via OAuth. Press Enter to add an API key override."));
+      } else if (info.source === "env") {
         detailText.setText(
           theme.fg("dim", "  Key set via environment variable. Press Enter to store a local override.")
         );
@@ -12738,8 +12787,8 @@ async function handleApiKeysCommand(ctx) {
             if (info.envVar && process.env[info.envVar] === storedKey) {
               delete process.env[info.envVar];
             }
-            ctx.state.harness.invalidateAvailableModelsCache();
-            models = await ctx.state.harness.listAvailableModels();
+            ctx.state.controller.invalidateAvailableModelsCache();
+            models = await ctx.state.controller.listAvailableModels();
             providers = getProviderList(ctx, models);
             ctx.showInfo(`API key removed for ${info.provider}`);
             rebuildList();
@@ -13070,18 +13119,18 @@ Using the same profile across different providers can cause compatibility issues
   ]);
   return proceed === "Yes";
 }
-function resolveModeAgent(mode, harnessState) {
+function resolveModeAgent(mode, agentControllerState) {
   const modeAgent = mode.agent;
-  return typeof modeAgent === "function" ? modeAgent(harnessState) : modeAgent;
+  return typeof modeAgent === "function" ? modeAgent(agentControllerState) : modeAgent;
 }
 function applyBrowserToAgents(ctx, browser, browserSettings) {
-  const modes = ctx.harness.listModes();
-  let harnessState;
+  const modes = ctx.controller.listModes();
+  let agentControllerState;
   for (const mode of modes) {
-    const agent = resolveModeAgent(mode, harnessState ??= ctx.state.session.state.get());
+    const agent = resolveModeAgent(mode, agentControllerState ??= ctx.state.session.state.get());
     agent?.setBrowser?.(browser);
   }
-  ctx.harness.setBrowser?.(browser);
+  ctx.controller.setBrowser?.(browser);
   void ctx.state.session.state.set({ [ACTIVE_BROWSER_KEY]: browserSettings });
 }
 function getBrowserConfigKey(settings) {
@@ -14336,7 +14385,7 @@ async function handleFeedbackCommand(ctx, args) {
     ctx.showError("No active session to attach feedback to.");
     return;
   }
-  const mastra2 = ctx.harness.getMastra();
+  const mastra2 = ctx.controller.getMastra();
   const observability = mastra2?.observability;
   if (!observability?.addFeedback) {
     ctx.showError("Observability not configured \u2014 cannot save feedback.");
@@ -14970,8 +15019,8 @@ async function handleGoalSourceCommand(state, sourceName, args, ctx) {
   if (goalSkill) {
     try {
       let workspace = ctx.getResolvedWorkspace();
-      if (!workspace && ctx.harness?.hasWorkspace?.()) {
-        workspace = await ctx.harness.resolveWorkspace({ session: ctx.state.session });
+      if (!workspace && ctx.controller?.hasWorkspace?.()) {
+        workspace = await ctx.controller.resolveWorkspace({ session: ctx.state.session });
       }
       const skill = await workspace?.skills?.get(goalSkill.path || goalSkill.name);
       if (!skill || skill.metadata?.goal !== true) {
@@ -14999,7 +15048,7 @@ async function handleCustomSlashCommand(state, command, args, ctx, displayText)
   try {
     const processedContent = await processSlashCommand(command, args, process.cwd());
     if (processedContent.trim()) {
-      const commandCtx = { ...ctx, state, harness: ctx.harness ?? state.harness };
+      const commandCtx = { ...ctx, state, controller: ctx.controller ?? state.controller };
       if (!isCurrentThreadActive(commandCtx)) {
         const slashComp = new SlashCommandComponent(command.name, processedContent.trim());
         state.allSlashCommandComponents.push(slashComp);
@@ -15145,7 +15194,10 @@ function handleAgentAborted(ctx) {
   if (state.gradientAnimator) {
     state.gradientAnimator.fadeOut();
   }
-  if (state.streamingComponent && state.streamingMessage) {
+  if (state.planRejectionAbort) {
+    state.streamingComponent = void 0;
+    state.streamingMessage = void 0;
+  } else if (state.streamingComponent && state.streamingMessage) {
     state.streamingMessage.stopReason = "aborted";
     state.streamingMessage.errorMessage = "Interrupted";
     state.streamingComponent.updateContent(state.streamingMessage);
@@ -15155,6 +15207,7 @@ function handleAgentAborted(ctx) {
     showError(state, "Interrupted");
   }
   state.userInitiatedAbort = false;
+  state.planRejectionAbort = false;
   if (state.activeGoalJudge) {
     removeJudgeComponent(state, state.activeGoalJudge.component);
     state.activeGoalJudge = void 0;
@@ -16014,7 +16067,7 @@ ${theme.fg("dim", `Reason: ${reason}`)}`,
     ctx.notify("sandbox_access", `Sandbox access requested: ${requestedPath}`);
   });
 }
-async function approvePlan(ctx, toolCallId, title, plan) {
+async function approvePlan(ctx, toolCallId, title, plan, planPath, submittedPath) {
   const { state } = ctx;
   await state.session.state.set({
     activePlan: {
@@ -16023,15 +16076,19 @@ async function approvePlan(ctx, toolCallId, title, plan) {
       approvedAt: (/* @__PURE__ */ new Date()).toISOString()
     }
   });
-  savePlanToDisk({
-    title,
-    plan,
-    resourceId: state.session.identity.getResourceId()
-  }).catch(() => {
-  });
+  if (planPath) {
+    await approvePlanFile({
+      planPath,
+      title,
+      resourceId: state.session.identity.getResourceId()
+    }).catch(() => {
+    });
+  }
+  state.previousPlanSnapshot = void 0;
+  state.lastSubmitPlanComponent = void 0;
   await state.session.respondToToolSuspension({
     toolCallId,
-    resumeData: { action: "approved" }
+    resumeData: { action: "approved", path: submittedPath, title, plan }
   });
 }
 function formatPlanGoalObjective(title, plan) {
@@ -16039,34 +16096,42 @@ function formatPlanGoalObjective(title, plan) {
 
 ${plan}`;
 }
-async function handlePlanApproval(ctx, toolCallId, title, plan) {
+async function handlePlanApproval(ctx, toolCallId, submittedPath) {
   const { state } = ctx;
-  const previousPlan = state.previousPlanSnapshot?.plan;
-  state.previousPlanSnapshot = { title, plan };
   const projectPath = state.session.state.get()?.projectPath;
-  if (projectPath) {
-    savePlanSnapshot({ title, plan, projectPath }).catch(() => {
-    });
+  const planPath = submittedPath ? resolvePlanPath(projectPath ?? process.cwd(), submittedPath) : void 0;
+  const current = planPath ? await readPlanFile(planPath) : void 0;
+  if (!current) {
+    state.previousPlanSnapshot = void 0;
+  }
+  const plan = current?.plan ?? `\u26A0\uFE0F Could not read the plan file at \`${submittedPath}\`. Make sure it exists before submitting it.`;
+  const resolvedTitle = current?.title || "Implementation Plan";
+  const snapshotKey = submittedPath;
+  const snapshot = state.previousPlanSnapshot;
+  const snapshotPlan = snapshot && snapshot.path === snapshotKey ? snapshot.plan : void 0;
+  const previousPlan = snapshotPlan && shouldShowDiff(snapshotPlan, plan) ? snapshotPlan : void 0;
+  if (current) {
+    state.previousPlanSnapshot = { path: snapshotKey, plan };
   }
   return new Promise((resolve3) => {
-    const planFilename = getPlanFilename(title);
+    const planFilename = snapshotKey;
     const approvalOptions = {
       toolCallId,
-      title,
+      title: resolvedTitle,
       plan,
       planFilename,
       previousPlan,
       onApprove: async () => {
         state.activeInlinePlanApproval = void 0;
         state.ui.setFocus(state.editor);
-        await approvePlan(ctx, toolCallId, title, plan);
+        await approvePlan(ctx, toolCallId, resolvedTitle, plan, planPath, snapshotKey);
         resolve3();
       },
       onGoal: async () => {
         state.activeInlinePlanApproval = void 0;
         state.ui.setFocus(state.editor);
-        await approvePlan(ctx, toolCallId, title, plan);
-        const objective = formatPlanGoalObjective(title, plan);
+        await approvePlan(ctx, toolCallId, resolvedTitle, plan, planPath, snapshotKey);
+        const objective = formatPlanGoalObjective(resolvedTitle, plan);
         await ctx.startGoal(objective, "Goal cancelled.");
         const goal = state.goalManager.getGoal();
         if (goal?.id) {
@@ -16074,13 +16139,20 @@ async function handlePlanApproval(ctx, toolCallId, title, plan) {
         }
         resolve3();
       },
-      onReject: async () => {
+      onReject: () => {
         state.activeInlinePlanApproval = void 0;
         state.ui.setFocus(state.editor);
-        await state.session.respondToToolSuspension({
-          toolCallId,
-          resumeData: { action: "rejected" }
-        });
+        void (async () => {
+          try {
+            await state.session.respondToToolSuspension({
+              toolCallId,
+              resumeData: { action: "rejected", path: snapshotKey, title: resolvedTitle, plan }
+            });
+          } finally {
+            state.planRejectionAbort = true;
+            state.session.abort();
+          }
+        })();
         resolve3();
       }
     };
@@ -16110,7 +16182,7 @@ async function handlePlanApproval(ctx, toolCallId, title, plan) {
     state.ui.requestRender();
     state.chatContainer.invalidate();
     state.ui.setFocus(approvalComponent);
-    ctx.notify("plan_approval", `Plan "${title}" requires approval`);
+    ctx.notify("plan_approval", `Plan "${resolvedTitle}" requires approval`);
   });
 }
 
@@ -16800,7 +16872,7 @@ function createTUIState(options) {
   const editor = new CustomEditor(ui, getEditorTheme());
   const result = {
     // Core dependencies
-    harness: options.harness,
+    controller: options.controller,
     session: options.session,
     options,
     hookManager: options.hookManager,
@@ -16855,6 +16927,9 @@ function createTUIState(options) {
     projectInfo: detectProject(process.cwd()),
     modelAuthStatus: { hasAuth: true },
     githubPrPollingActive: false,
+    // Tokens/sec tracking
+    decodeStartedAt: 0,
+    tokensPerSec: 0,
     // Goal loop
     goalManager: new GoalManager(),
     planStartedGoalId: void 0,
@@ -16865,7 +16940,8 @@ function createTUIState(options) {
     pendingImages: [],
     // Abort tracking
     lastCtrlCTime: 0,
-    userInitiatedAbort: false
+    userInitiatedAbort: false,
+    planRejectionAbort: false
   };
   editor.getModeColor = () => {
     if (result.activeGoalJudge) {
@@ -16884,9 +16960,12 @@ function trackInteractivePrompt(ectx, promptType, properties) {
 async function dispatchEvent(event, ectx, state) {
   switch (event.type) {
     case "agent_start":
+      state.tokensPerSec = 0;
+      state.decodeStartedAt = 0;
       handleAgentStart(ectx);
       break;
     case "agent_end":
+      state.decodeStartedAt = 0;
       if (event.reason === "aborted") {
         handleAgentAborted(ectx);
       } else if (event.reason === "error") {
@@ -16899,6 +16978,9 @@ async function dispatchEvent(event, ectx, state) {
       handleMessageStart(ectx, event.message);
       break;
     case "message_update":
+      if (state.decodeStartedAt === 0) {
+        state.decodeStartedAt = Date.now();
+      }
       handleMessageUpdate(ectx, event.message);
       break;
     case "message_end":
@@ -16961,7 +17043,7 @@ async function dispatchEvent(event, ectx, state) {
       }
       state.taskToolInsertIndex = -1;
       await ectx.renderExistingMessages();
-      await state.harness.loadOMProgress(state.session);
+      await state.controller.loadOMProgress(state.session);
       getCurrentGitBranchAsync(state.projectInfo.rootPath).then((freshBranch) => {
         if (freshBranch) {
           state.projectInfo.gitBranch = freshBranch;
@@ -17010,8 +17092,23 @@ async function dispatchEvent(event, ectx, state) {
       state.taskToolInsertIndex = -1;
       break;
     }
-    case "usage_update":
+    case "usage_update": {
+      const now = Date.now();
+      const stepTokens = (event.usage.completionTokens ?? 0) + (event.usage.reasoningTokens ?? 0);
+      if (state.decodeStartedAt > 0 && stepTokens > 0) {
+        const decodeSec = (now - state.decodeStartedAt) / 1e3;
+        if (decodeSec > 0) {
+          const instantaneous = stepTokens / decodeSec;
+          const alpha = 0.3;
+          const ema = state.tokensPerSec > 0 ? alpha * instantaneous + (1 - alpha) * state.tokensPerSec : instantaneous;
+          state.tokensPerSec = Math.round(ema);
+        }
+      }
+      state.decodeStartedAt = 0;
+      ectx.updateStatusLine();
+      state.ui.requestRender();
       break;
+    }
     // Observational Memory events
     case "om_status":
       break;
@@ -17152,7 +17249,7 @@ async function dispatchEvent(event, ectx, state) {
           payload.selectionMode
         );
       } else if (event.toolName === "submit_plan") {
-        await handlePlanApproval(ectx, event.toolCallId, String(payload.title ?? ""), String(payload.plan ?? ""));
+        await handlePlanApproval(ectx, event.toolCallId, String(payload.path ?? ""));
       }
       break;
     }
@@ -17565,7 +17662,7 @@ function setupKeyboardShortcuts(state, callbacks) {
       showInfo(state, "Resolve the plan approval first");
       return;
     }
-    const modes = state.harness.listModes();
+    const modes = state.controller.listModes();
     if (modes.length <= 1) return;
     const currentId = state.session.mode.get();
     const currentIndex = modes.findIndex((m) => m.id === currentId);
@@ -17634,7 +17731,7 @@ function buildLayout(state, refreshModelAuthStatus) {
   ].filter(Boolean).map((line) => theme.fg("muted", line)).join("\n");
   const sep = theme.fg("dim", " \xB7 ");
   const hintParts = [];
-  if (state.harness.listModes().length > 1) {
+  if (state.controller.listModes().length > 1) {
     hintParts.push(`${theme.fg("accent", "\u21E7+Tab")} ${theme.fg("muted", "cycle modes")}`);
   }
   hintParts.push(`${theme.fg("accent", "/help")} ${theme.fg("muted", "info & shortcuts")}`);
@@ -17749,7 +17846,7 @@ function setupAutocomplete(state) {
     { name: "exit", description: "Exit the TUI" },
     { name: "help", description: "Show available commands" }
   ];
-  const modes = state.harness.listModes();
+  const modes = state.controller.listModes();
   if (modes.length > 1) {
     slashCommands.push({ name: "mode", description: "Switch agent mode" });
   }
@@ -17800,9 +17897,9 @@ async function loadCustomSlashCommands(state) {
 }
 async function loadSkillCommands(state) {
   try {
-    let workspace = state.harness.getWorkspace() ?? state.workspace;
-    if (!workspace && state.harness.hasWorkspace()) {
-      workspace = await state.harness.resolveWorkspace({ session: state.session });
+    let workspace = state.controller.getWorkspace() ?? state.workspace;
+    if (!workspace && state.controller.hasWorkspace()) {
+      workspace = await state.controller.resolveWorkspace({ session: state.session });
     }
     if (!workspace?.skills) {
       state.skillCommands = [];
@@ -17849,7 +17946,7 @@ function setupKeyHandlers(state, callbacks) {
     process.off("SIGINT", sigintHandler);
   };
 }
-function subscribeToHarness(state, handleEvent) {
+function subscribeToAgentController(state, handleEvent) {
   let eventQueue = Promise.resolve();
   const listener = (event) => {
     eventQueue = eventQueue.then(async () => {
@@ -18348,7 +18445,7 @@ var MastraTUI = class _MastraTUI {
   }
   /**
    * Fire off a message without blocking the main loop.
-   * Errors are handled via harness events.
+   * Errors are handled via controller events.
    */
   fireMessage(content, images) {
     this.clearIdleCounter();
@@ -18516,8 +18613,8 @@ var MastraTUI = class _MastraTUI {
   // ===========================================================================
   async init() {
     if (this.state.isInitialized) return;
-    await this.state.harness.init();
-    await this.state.harness.getMastra()?.startWorkers();
+    await this.state.controller.init();
+    await this.state.controller.getMastra()?.startWorkers();
     await loadCustomSlashCommands(this.state);
     setupAutocomplete(this.state);
     refreshSkillsAutocomplete(this.state).catch((err) => {
@@ -18532,12 +18629,12 @@ var MastraTUI = class _MastraTUI {
     });
     this.state.ui.start();
     await promptForThreadSelection(this.state);
-    subscribeToHarness(this.state, (event) => this.handleEvent(event));
+    subscribeToAgentController(this.state, (event) => this.handleEvent(event));
     const escState = this.state.session.state.get();
     if (escState?.escapeAsCancel === false) {
       this.state.editor.escapeEnabled = false;
     }
-    await this.state.harness.loadOMProgress(this.state.session);
+    await this.state.controller.loadOMProgress(this.state.session);
     await syncInitialThreadState(this.state);
     this.state.isInitialized = true;
     if (this.state.mcpManager?.hasServers()) {
@@ -18569,7 +18666,7 @@ var MastraTUI = class _MastraTUI {
     }, UPDATE_RECHECK_INTERVAL_MS);
   }
   async refreshModelAuthStatus() {
-    this.state.modelAuthStatus = await this.state.harness.getCurrentModelAuthStatus(this.state.session);
+    this.state.modelAuthStatus = await this.state.controller.getCurrentModelAuthStatus(this.state.session);
     updateStatusLine(this.state);
   }
   startIdleCounter(idleStartedAt = Date.now(), now = Date.now()) {
@@ -18631,7 +18728,7 @@ var MastraTUI = class _MastraTUI {
     }
     try {
       await dispatchEvent(event, this.getEventContext(), this.state);
-      this.captureHarnessAnalytics(event);
+      this.captureAgentControllerAnalytics(event);
       if (event.type === "thread_created") {
         await this.syncThreadActivePackMetadata(event.thread);
       } else if (event.type === "thread_changed") {
@@ -18652,7 +18749,7 @@ var MastraTUI = class _MastraTUI {
       }
     }
   }
-  captureHarnessAnalytics(event) {
+  captureAgentControllerAnalytics(event) {
     const analytics = this.state.analytics;
     if (!analytics) {
       return;
@@ -18688,12 +18785,12 @@ var MastraTUI = class _MastraTUI {
     }
   }
   emitErrorFeedback(errorMessage) {
-    const harness = this.state.harness;
+    const controller = this.state.controller;
     const traceId = this.state.session.run.getTraceId() ?? void 0;
     const runId = this.state.session.getCurrentRunId() ?? void 0;
     const threadId = this.state.session.thread.getId() ?? void 0;
     if (!traceId && !runId && !threadId) return;
-    const mastra2 = harness.getMastra();
+    const mastra2 = controller.getMastra();
     const observability = mastra2?.observability;
     if (!observability?.addFeedback) return;
     const comment = errorMessage.length > 500 ? errorMessage.slice(0, 500) + "\u2026" : errorMessage;
@@ -18747,7 +18844,7 @@ var MastraTUI = class _MastraTUI {
     child.kill();
   }
   async buildProviderAccess() {
-    const models = await this.state.harness.listAvailableModels();
+    const models = await this.state.controller.listAvailableModels();
     const hasEnv = (provider) => models.some((m) => m.provider === provider && m.hasApiKey);
     const accessLevel = (storageProviderId) => {
       const cred = this.state.authStorage?.get(storageProviderId);
@@ -18891,10 +18988,10 @@ var MastraTUI = class _MastraTUI {
     });
   }
   /**
-   * Get the workspace, preferring harness-owned workspace over the direct option.
+   * Get the workspace, preferring controller-owned workspace over the direct option.
    */
   getResolvedWorkspace() {
-    return this.state.harness.getWorkspace() ?? this.state.workspace;
+    return this.state.controller.getWorkspace() ?? this.state.workspace;
   }
   // ===========================================================================
   // Observational Memory Settings
@@ -18908,7 +19005,7 @@ var MastraTUI = class _MastraTUI {
   buildCommandContext() {
     return {
       state: this.state,
-      harness: this.state.harness,
+      controller: this.state.controller,
       session: this.state.session,
       hookManager: this.state.hookManager,
       mcpManager: this.state.mcpManager,
@@ -19073,7 +19170,7 @@ var MastraTUI = class _MastraTUI {
           });
         },
         onSelectModel: async (title, modeColor) => {
-          const availableModels = await this.state.harness.listAvailableModels();
+          const availableModels = await this.state.controller.listAvailableModels();
           if (availableModels.length === 0) return void 0;
           return new Promise((resolveModel) => {
             const selector = new ModelSelectorComponent({
@@ -19103,9 +19200,9 @@ var MastraTUI = class _MastraTUI {
     });
   }
   async applyOnboardingResult(result) {
-    const harness = this.state.harness;
+    const controller = this.state.controller;
     const modePack = result.modePack;
-    const modes = harness.listModes();
+    const modes = controller.listModes();
     for (const mode of modes) {
       const modelId = modePack.models[mode.id];
       if (modelId) {
@@ -19339,5 +19436,5 @@ Would you like to update now?`;
 };
 
 export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus, getCurrentVersion };
-//# sourceMappingURL=chunk-L67CU2OP.js.map
-//# sourceMappingURL=chunk-L67CU2OP.js.map
+//# sourceMappingURL=chunk-LUSQ75XP.js.map
+//# sourceMappingURL=chunk-LUSQ75XP.js.map