mastracode 0.44.1 → 0.44.2-alpha.0

package/dist/{tui-D2uNETXK.js → tui-ClYkgBN3.js}

@@ -2368,9 +2368,18 @@ async function handleJudgeCommand(ctx) {
 	ctx.showInfo(`Judge defaults set: ${defaults.judgeModelId}, ${defaults.maxTurns} max attempts.`);
 }
 async function startGoalWithDefaults(ctx, objective, cancelMessage = "Goal cancelled.") {
+	const goal = await setGoalWithDefaults(ctx, objective, cancelMessage);
+	if (goal) await sendGoalReminder(ctx, goal);
+}
+/**
+* Replace the thread's goal with `objective` without sending the goal reminder,
+* asking for judge defaults only if they are unset. Resolves to `null` when the
+* user cancels the defaults prompt or the goal could not be set.
+*/
+async function setGoalWithDefaults(ctx, objective, cancelMessage = "Goal cancelled.") {
 	const judgeDefaults = getJudgeDefaults() ?? await promptForJudgeDefaults(ctx, cancelMessage);
-	if (!judgeDefaults) return;
-	await startGoal(ctx, objective, judgeDefaults.judgeModelId, judgeDefaults.maxTurns);
+	if (!judgeDefaults) return null;
+	return setGoal(ctx, objective, judgeDefaults.judgeModelId, judgeDefaults.maxTurns);
 }
 function getJudgeDefaults() {
 	const settings = loadSettings();
@@ -2441,7 +2450,7 @@ async function promptForJudgeDefaults(ctx, cancelMessage) {
 		selector.focused = true;
 	});
 }
-async function startGoal(ctx, objective, judgeModelId, maxTurns) {
+async function setGoal(ctx, objective, judgeModelId, maxTurns) {
 	const { state } = ctx;
 	const goalManager = state.goalManager;
 	const shouldPersistToCreatedThread = state.pendingNewThread || !state.session.thread.getId();
@@ -2460,13 +2469,24 @@ async function startGoal(ctx, objective, judgeModelId, maxTurns) {
 	if (!goal) {
 		if (shouldPersistToCreatedThread) goalManager.consumePersistOnNextThreadCreate();
 		ctx.showError("Failed to set goal.");
-		return;
+		return null;
 	}
 	state.planStartedGoalId = void 0;
 	await goalManager.saveToThread(state);
 	ctx.updateStatusLine();
+	return goal;
+}
+/**
+* Send the canonical goal reminder for `goal`. It is delivered into an active
+* run; on an idle thread it starts the goal run, or with `persistIfIdle` it is
+* only recorded so no new run starts.
+*/
+async function sendGoalReminder(ctx, goal, options = {}) {
+	const { state } = ctx;
+	const goalManager = state.goalManager;
+	const signal = createGoalReminderSignal(goal);
 	try {
-		await state.session.sendSignal(createGoalReminderSignal(goal)).accepted;
+		await (options.persistIfIdle ? state.session.sendSignal(signal, { ifIdle: { behavior: "persist" } }) : state.session.sendSignal(signal)).accepted;
 	} catch (err) {
 		goalManager.pause();
 		await goalManager.saveToThread(state);
@@ -22364,6 +22384,32 @@ function resumeApprovedPlan(ctx, toolCallId, title, plan, submittedPath) {
 function formatPlanGoalObjective(title, plan) {
 	return `# ${title}\n\n${plan}`;
 }
+/**
+* Resolves `true` once the resumed tool's result is recorded (`tool_end`), or
+* `false` if the run ends or parks first.
+*/
+function waitForToolEnd(session, toolCallId) {
+	let unsubscribe;
+	let settle;
+	const promise = new Promise((resolve) => {
+		settle = resolve;
+	});
+	const cancel = () => {
+		unsubscribe?.();
+		unsubscribe = void 0;
+		settle(false);
+	};
+	unsubscribe = session.subscribe((event) => {
+		if (event.type === "tool_end" && event.toolCallId === toolCallId) {
+			settle(true);
+			cancel();
+		} else if (event.type === "agent_end" || event.type === "error" || event.type === "tool_suspended") cancel();
+	});
+	return {
+		promise,
+		cancel
+	};
+}
 async function handlePlanApproval(ctx, toolCallId, submittedPath) {
 	const { state } = ctx;
 	const projectPath = state.session.state.get()?.projectPath;
@@ -22408,13 +22454,24 @@ async function handlePlanApproval(ctx, toolCallId, submittedPath) {
 				releaseApprovalFocus();
 				firePermissionResult("approved");
 				await prepareApprovedPlan(ctx, resolvedTitle, plan, planPath);
+				const goal = await ctx.setGoal(formatPlanGoalObjective(resolvedTitle, plan), "Goal cancelled.").catch((error) => {
+					ctx.showError(`Failed to set goal: ${error instanceof Error ? error.message : String(error)}`);
+					return null;
+				});
+				if (goal) state.planStartedGoalId = goal.id;
+				const approvalRecorded = goal ? waitForToolEnd(state.session, toolCallId) : void 0;
 				const resumed = resumeApprovedPlan(ctx, toolCallId, resolvedTitle, plan, snapshotKey);
 				resolve();
+				if (goal && approvalRecorded) {
+					let recorded = false;
+					try {
+						recorded = await Promise.race([approvalRecorded.promise, resumed.then(() => false)]);
+					} finally {
+						approvalRecorded.cancel();
+					}
+					if (recorded) await ctx.sendGoalReminder(goal, { persistIfIdle: true });
+				}
 				await resumed;
-				const objective = formatPlanGoalObjective(resolvedTitle, plan);
-				await ctx.startGoal(objective, "Goal cancelled.");
-				const goal = state.goalManager.getGoal();
-				if (goal?.id) state.planStartedGoalId = goal.id;
 			},
 			onReject: () => {
 				releaseApprovalFocus();
@@ -27781,7 +27838,8 @@ var MastraTUI = class MastraTUI {
 			addUserMessage: (msg) => addUserMessage(this.state, msg),
 			addChildBeforeFollowUps: (child) => this.addChildBeforeFollowUps(child),
 			fireMessage: (content, images) => this.fireMessage(content, images),
-			startGoal: (objective, cancelMessage) => startGoalWithDefaults(this.buildCommandContext(), objective, cancelMessage),
+			setGoal: (objective, cancelMessage) => setGoalWithDefaults(this.buildCommandContext(), objective, cancelMessage),
+			sendGoalReminder: (goal, options) => sendGoalReminder(this.buildCommandContext(), goal, options),
 			queueFollowUpMessage: (content) => this.queueFollowUpMessage(content),
 			renderExistingMessages: (isCurrent) => this.renderExistingMessagesAndSeedIdleCounter(isCurrent),
 			renderClearedTasksInline: (clearedTasks, insertIndex) => renderClearedTasksInline(this.state, clearedTasks, insertIndex),
@@ -28171,4 +28229,4 @@ var MastraTUI = class MastraTUI {
 //#endregion
 export { mastraBrand as _, OMProgressComponent as a, TUI_CO_AUTHOR as b, ToolExecutionComponentEnhanced as c, detectTerminalTheme as d, applyThemeMode as f, mastra as g, getThemeMode as h, LoginDialogComponent as i, ModelSelectorComponent as l, getMarkdownTheme as m, createTUIState as n, formatOMStatus as o, getEditorTheme as p, LoginSelectorComponent as r, UserMessageComponent as s, MastraTUI as t, AssistantMessageComponent as u, restoreTerminalForeground as v, theme as y };
 
-//# sourceMappingURL=tui-D2uNETXK.js.map
+//# sourceMappingURL=tui-ClYkgBN3.js.map