mastracode 0.26.0-alpha.6 → 0.26.0

package/dist/{chunk-IXP7JO6S.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';
@@ -1175,7 +1175,7 @@ function getInstallCommand(pm, version) {
 }
 function getCurrentVersion() {
   {
-    return "0.26.0-alpha.6";
+    return "0.26.0";
   }
 }
 async function fetchLatestVersion() {
@@ -4433,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;
@@ -4495,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();
@@ -4583,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();
@@ -4641,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));
   }
@@ -4712,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));
@@ -8900,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;
@@ -8911,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) {
@@ -15162,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);
@@ -15172,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;
@@ -16031,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: {
@@ -16040,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) {
@@ -16056,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) {
@@ -16091,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();
       }
     };
@@ -16127,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`);
   });
 }
 
@@ -16885,7 +16940,8 @@ function createTUIState(options) {
     pendingImages: [],
     // Abort tracking
     lastCtrlCTime: 0,
-    userInitiatedAbort: false
+    userInitiatedAbort: false,
+    planRejectionAbort: false
   };
   editor.getModeColor = () => {
     if (result.activeGoalJudge) {
@@ -17193,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;
     }
@@ -19380,5 +19436,5 @@ Would you like to update now?`;
 };
 
 export { AssistantMessageComponent, LoginDialogComponent, LoginSelectorComponent, MastraTUI, ModelSelectorComponent, OMProgressComponent, ToolExecutionComponentEnhanced, UserMessageComponent, createTUIState, detectTerminalTheme, formatOMStatus, getCurrentVersion };
-//# sourceMappingURL=chunk-IXP7JO6S.js.map
-//# sourceMappingURL=chunk-IXP7JO6S.js.map
+//# sourceMappingURL=chunk-LUSQ75XP.js.map
+//# sourceMappingURL=chunk-LUSQ75XP.js.map