mastracode 0.44.2-alpha.0 → 0.45.0-alpha.2

package/dist/{tui-ClYkgBN3.js → tui-CUNuxs-4.js}

@@ -2510,10 +2510,18 @@ function getCommands(modes) {
 			key: "/new",
 			description: "Start a new thread"
 		},
+		{
+			key: "/clone",
+			description: "Clone the current thread"
+		},
 		{
 			key: "/threads",
 			description: "Switch between threads"
 		},
+		{
+			key: "/resume",
+			description: "Alias for /threads"
+		},
 		{
 			key: "/thread",
 			description: "Show current thread info"
@@ -2526,6 +2534,10 @@ function getCommands(modes) {
 			key: "/name",
 			description: "Rename current thread"
 		},
+		{
+			key: "/rename",
+			description: "Alias for /name"
+		},
 		{
 			key: "/resource",
 			description: "Show/switch resource ID"
@@ -20936,6 +20948,8 @@ const TRACKED_COMMANDS = /* @__PURE__ */ new Set([
 	"memory-gateway",
 	"custom-providers",
 	"threads",
+	"resume",
+	"clone",
 	"new"
 ]);
 /**
@@ -21007,6 +21021,7 @@ async function dispatchSlashCommand(input, state, buildCtx) {
 			await handleCloneCommand(ctx);
 			return true;
 		case "threads":
+		case "resume":
 			await handleThreadsCommand(ctx);
 			return true;
 		case "thread":
@@ -21089,6 +21104,7 @@ async function dispatchSlashCommand(input, state, buildCtx) {
 			await handleDiffCommand(ctx, args[0]);
 			return true;
 		case "name":
+		case "rename":
 			await handleNameCommand(ctx, args);
 			return true;
 		case "resource":
@@ -25871,120 +25887,6 @@ function formatIdleStatusTimingSegments(state, now = Date.now()) {
 	} : null;
 }
 //#endregion
-//#region src/tui/components/simple-progress.ts
-/**
-* Simple progress indicator component for single operations.
-* Shows a compact progress display with spinner and status text.
-*/
-/**
-* Lightweight progress indicator for simple operations.
-* Features:
-* - Animated spinner
-* - Custom status text
-* - Optional elapsed time
-* - Optional percentage display
-*/
-var SimpleProgressComponent = class extends Container {
-	status = "";
-	progress;
-	startTime;
-	spinnerFrame = 0;
-	lastRenderTime = 0;
-	isActive = false;
-	options;
-	constructor(options = {}) {
-		super();
-		this.options = {
-			prefix: "",
-			showElapsed: true,
-			showPercentage: true,
-			...options
-		};
-		this.startTime = Date.now();
-	}
-	/**
-	* Start showing progress with initial status.
-	*/
-	start(status) {
-		this.status = status;
-		this.isActive = true;
-		this.startTime = Date.now();
-		this.rebuild();
-	}
-	/**
-	* Update the status text.
-	*/
-	updateStatus(status) {
-		this.status = status;
-		this.rebuild();
-	}
-	/**
-	* Update the progress percentage (0-100).
-	*/
-	updateProgress(progress) {
-		this.progress = Math.min(100, Math.max(0, progress));
-		this.rebuild();
-	}
-	/**
-	* Mark the operation as complete.
-	*/
-	complete(message) {
-		this.isActive = false;
-		this.status = message || "Complete";
-		this.progress = 100;
-		this.rebuild();
-	}
-	/**
-	* Mark the operation as failed.
-	*/
-	fail(error) {
-		this.isActive = false;
-		this.status = error;
-		this.rebuild();
-	}
-	rebuild() {
-		this.clear();
-		if (!this.status) return;
-		const now = Date.now();
-		if (this.isActive && now - this.lastRenderTime > 100) {
-			this.spinnerFrame = (this.spinnerFrame + 1) % 10;
-			this.lastRenderTime = now;
-		}
-		let text = "";
-		if (this.options.prefix) text += this.options.prefix + " ";
-		if (this.isActive) {
-			const spinner = this.getSpinner();
-			text += theme.fg("accent", spinner) + " ";
-		} else if (this.progress === 100) text += theme.fg("success", "✓") + " ";
-		else text += theme.fg("error", "✗") + " ";
-		text += this.status;
-		if (this.options.showPercentage && this.progress !== void 0) text += theme.fg("dim", ` (${this.progress}%)`);
-		if (this.options.showElapsed && this.isActive) {
-			const elapsed = Math.floor((now - this.startTime) / 1e3);
-			text += theme.fg("dim", ` ${elapsed}s`);
-		}
-		this.addChild(new Text(text, 0, 0));
-	}
-	getSpinner() {
-		return [
-			"⠋",
-			"⠙",
-			"⠹",
-			"⠸",
-			"⠼",
-			"⠴",
-			"⠦",
-			"⠧",
-			"⠇",
-			"⠏"
-		][this.spinnerFrame];
-	}
-	render(maxWidth) {
-		this.rebuild();
-		return super.render(maxWidth);
-	}
-};
-//#endregion
 //#region src/tui/setup.ts
 /**
 * TUI setup: keyboard shortcuts, layout building, autocomplete, key handlers.
@@ -26248,6 +26150,10 @@ function setupAutocomplete(state) {
 			name: "threads",
 			description: "Switch between threads"
 		},
+		{
+			name: "resume",
+			description: "Alias for /threads"
+		},
 		{
 			name: "models",
 			description: "Switch model pack"
@@ -26317,6 +26223,10 @@ function setupAutocomplete(state) {
 			name: "name",
 			description: "Rename current thread"
 		},
+		{
+			name: "rename",
+			description: "Alias for /name"
+		},
 		{
 			name: "resource",
 			description: "Show/switch resource ID (tag for sharing)"
@@ -26685,94 +26595,6 @@ function subscribeToAgentController(state, handleEvent) {
 	state.waitForAgentControllerEvents = state.options.backgroundToolsEnabled ? () => eventQueue : void 0;
 	state.unsubscribe = state.session.subscribe(listener);
 }
-async function promptForThreadSelection(state) {
-	const currentPath = state.projectInfo.rootPath;
-	const currentResourceId = state.session.identity.getResourceId();
-	const allThreads = await state.session.thread.list();
-	const activeThreadId = state.session.thread.getId();
-	const taggedThreads = allThreads.filter((t) => {
-		const threadPath = t.metadata?.projectPath;
-		return !!threadPath && threadPath === currentPath;
-	});
-	const threads = [];
-	for (const thread of taggedThreads) {
-		if (thread.id === activeThreadId && !thread.title) {
-			if ((await state.session.thread.listMessages({
-				threadId: thread.id,
-				limit: 1
-			})).length === 0) continue;
-		}
-		threads.push(thread);
-	}
-	if (threads.length === 0) {
-		const [thread] = [...(await state.session.thread.list({
-			allResources: true,
-			metadata: { projectPath: currentPath }
-		})).filter((t) => t.resourceId !== currentResourceId)].sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime());
-		if (thread) {
-			if (await askModalQuestion(state.ui, {
-				question: [
-					"This directory is tagged on a different resource.",
-					"",
-					`Project: ${currentPath}`,
-					`Thread: ${thread.title || thread.id}`,
-					`Old resource: ${thread.resourceId}`,
-					`Current resource: ${currentResourceId}`,
-					"",
-					"Clone this thread into the current resource and resume the clone?"
-				].join("\n"),
-				options: [{ label: "Clone and resume" }, { label: "Start fresh" }],
-				selectedOptionLabel: "Clone and resume",
-				allowCustomResponse: false,
-				overlay: {
-					widthPercent: 80,
-					maxHeight: "70%"
-				}
-			}) === "Clone and resume") {
-				const progress = new SimpleProgressComponent({
-					showElapsed: false,
-					showPercentage: false
-				});
-				progress.start("Cloning thread into the current resource...");
-				showModalOverlay(state.ui, progress, {
-					widthPercent: 70,
-					maxHeight: "40%",
-					minHeightPercent: .35
-				});
-				state.ui.requestRender();
-				try {
-					await new Promise((resolve) => setTimeout(resolve, 50));
-					progress.updateStatus("Loading cloned thread...");
-					state.ui.requestRender();
-					await state.session.thread.cloneToCurrentResource({
-						threadId: thread.id,
-						expectedResourceId: thread.resourceId,
-						expectedProjectPath: currentPath
-					});
-				} finally {
-					state.ui.hideOverlay();
-					state.ui.requestRender();
-				}
-				return;
-			}
-		}
-		state.pendingNewThread = true;
-		return;
-	}
-	const sortedThreads = [...threads].sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime());
-	for (const thread of sortedThreads) try {
-		await state.session.thread.switch({ threadId: thread.id });
-		if (!thread.metadata?.projectPath) await state.session.thread.setSetting({
-			key: "projectPath",
-			value: currentPath
-		});
-		return;
-	} catch (error) {
-		if (error instanceof ThreadLockError) continue;
-		throw error;
-	}
-	state.pendingNewThread = true;
-}
 async function renderExistingTasks(state) {
 	try {
 		const tasks = state.session.displayState.get().tasks;
@@ -26953,6 +26775,239 @@ async function handleShellPassthrough(state, command) {
 	}
 }
 //#endregion
+//#region src/tui/components/simple-progress.ts
+/**
+* Simple progress indicator component for single operations.
+* Shows a compact progress display with spinner and status text.
+*/
+/**
+* Lightweight progress indicator for simple operations.
+* Features:
+* - Animated spinner
+* - Custom status text
+* - Optional elapsed time
+* - Optional percentage display
+*/
+var SimpleProgressComponent = class extends Container {
+	status = "";
+	progress;
+	startTime;
+	spinnerFrame = 0;
+	lastRenderTime = 0;
+	isActive = false;
+	options;
+	constructor(options = {}) {
+		super();
+		this.options = {
+			prefix: "",
+			showElapsed: true,
+			showPercentage: true,
+			...options
+		};
+		this.startTime = Date.now();
+	}
+	/**
+	* Start showing progress with initial status.
+	*/
+	start(status) {
+		this.status = status;
+		this.isActive = true;
+		this.startTime = Date.now();
+		this.rebuild();
+	}
+	/**
+	* Update the status text.
+	*/
+	updateStatus(status) {
+		this.status = status;
+		this.rebuild();
+	}
+	/**
+	* Update the progress percentage (0-100).
+	*/
+	updateProgress(progress) {
+		this.progress = Math.min(100, Math.max(0, progress));
+		this.rebuild();
+	}
+	/**
+	* Mark the operation as complete.
+	*/
+	complete(message) {
+		this.isActive = false;
+		this.status = message || "Complete";
+		this.progress = 100;
+		this.rebuild();
+	}
+	/**
+	* Mark the operation as failed.
+	*/
+	fail(error) {
+		this.isActive = false;
+		this.status = error;
+		this.rebuild();
+	}
+	rebuild() {
+		this.clear();
+		if (!this.status) return;
+		const now = Date.now();
+		if (this.isActive && now - this.lastRenderTime > 100) {
+			this.spinnerFrame = (this.spinnerFrame + 1) % 10;
+			this.lastRenderTime = now;
+		}
+		let text = "";
+		if (this.options.prefix) text += this.options.prefix + " ";
+		if (this.isActive) {
+			const spinner = this.getSpinner();
+			text += theme.fg("accent", spinner) + " ";
+		} else if (this.progress === 100) text += theme.fg("success", "✓") + " ";
+		else text += theme.fg("error", "✗") + " ";
+		text += this.status;
+		if (this.options.showPercentage && this.progress !== void 0) text += theme.fg("dim", ` (${this.progress}%)`);
+		if (this.options.showElapsed && this.isActive) {
+			const elapsed = Math.floor((now - this.startTime) / 1e3);
+			text += theme.fg("dim", ` ${elapsed}s`);
+		}
+		this.addChild(new Text(text, 0, 0));
+	}
+	getSpinner() {
+		return [
+			"⠋",
+			"⠙",
+			"⠹",
+			"⠸",
+			"⠼",
+			"⠴",
+			"⠦",
+			"⠧",
+			"⠇",
+			"⠏"
+		][this.spinnerFrame];
+	}
+	render(maxWidth) {
+		this.rebuild();
+		return super.render(maxWidth);
+	}
+};
+//#endregion
+//#region src/tui/thread-startup.ts
+/**
+* Selects the thread to open at startup. A requested thread that is missing or
+* locked does not throw; the session is left pending a new thread and the issue
+* is returned so the caller can tell the user once the UI is ready.
+*/
+async function resumeThreadOnStartup(state, requestedThreadId) {
+	const currentPath = state.projectInfo.rootPath;
+	const allThreads = await state.session.thread.list(requestedThreadId ? { allResources: true } : void 0);
+	const activeThreadId = state.session.thread.getId();
+	if (requestedThreadId) {
+		const thread = allThreads.find((candidate) => candidate.id === requestedThreadId);
+		if (!thread) {
+			await startPendingNewThread(state);
+			return {
+				kind: "missing",
+				threadId: requestedThreadId
+			};
+		}
+		const originalResourceId = state.session.identity.getResourceId();
+		if (thread.resourceId !== originalResourceId) await state.controller.setResourceId(state.session, { resourceId: thread.resourceId });
+		if (requestedThreadId !== activeThreadId) try {
+			await state.session.thread.switch({ threadId: requestedThreadId });
+		} catch (error) {
+			if (!(error instanceof ThreadLockError)) throw error;
+			if (state.session.identity.getResourceId() !== originalResourceId) await state.controller.setResourceId(state.session, { resourceId: originalResourceId });
+			await startPendingNewThread(state);
+			return {
+				kind: "locked",
+				threadId: thread.id,
+				title: thread.title || thread.id,
+				ownerPid: error.ownerPid
+			};
+		}
+		state.pendingNewThread = false;
+		return;
+	}
+	const threads = allThreads.filter((thread) => thread.metadata?.projectPath === currentPath);
+	if (threads.length === 0) {
+		if (await cloneDriftedThread(state)) return;
+		state.pendingNewThread = true;
+		return;
+	}
+	for (const thread of [...threads].sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime())) {
+		if (thread.id === state.session.thread.getId()) return;
+		try {
+			await state.session.thread.switch({ threadId: thread.id });
+			return;
+		} catch (error) {
+			if (error instanceof ThreadLockError) continue;
+			throw error;
+		}
+	}
+	state.pendingNewThread = true;
+}
+/**
+* Leave the session waiting for a new thread. Session creation may already have
+* bound the latest project thread; unbind it (and release its lock) so the UI
+* and exit hint don't show a thread the user didn't ask for.
+*/
+async function startPendingNewThread(state) {
+	state.session.thread.cleanupSubscription();
+	await state.session.thread.clearAndReleaseLock();
+	state.pendingNewThread = true;
+}
+async function cloneDriftedThread(state) {
+	const currentPath = state.projectInfo.rootPath;
+	const currentResourceId = state.session.identity.getResourceId();
+	const thread = [...(await state.session.thread.list({
+		allResources: true,
+		metadata: { projectPath: currentPath }
+	})).filter((thread) => thread.resourceId !== currentResourceId)].sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime())[0];
+	if (!thread) return false;
+	if (await askModalQuestion(state.ui, {
+		question: [
+			"This directory is tagged on a different resource.",
+			"",
+			`Project: ${currentPath}`,
+			`Thread: ${thread.title || thread.id}`,
+			`Old resource: ${thread.resourceId}`,
+			`Current resource: ${currentResourceId}`,
+			"",
+			"Clone this thread into the current resource and resume the clone?"
+		].join("\n"),
+		options: [{ label: "Clone and resume" }, { label: "Start fresh" }],
+		selectedOptionLabel: "Clone and resume",
+		allowCustomResponse: false,
+		overlay: {
+			widthPercent: 80,
+			maxHeight: "70%"
+		}
+	}) !== "Clone and resume") return false;
+	const progress = new SimpleProgressComponent({
+		showElapsed: false,
+		showPercentage: false
+	});
+	progress.start("Cloning thread into the current resource...");
+	showModalOverlay(state.ui, progress, {
+		widthPercent: 70,
+		maxHeight: "40%",
+		minHeightPercent: .35
+	});
+	state.ui.requestRender();
+	try {
+		await new Promise((resolve) => setTimeout(resolve, 50));
+		progress.updateStatus("Loading cloned thread...");
+		state.ui.requestRender();
+		await state.session.thread.cloneToCurrentResource({
+			threadId: thread.id,
+			expectedResourceId: thread.resourceId,
+			expectedProjectPath: currentPath
+		});
+	} finally {
+		state.ui.hideOverlay();
+		state.ui.requestRender();
+	}
+	return true;
+}
+//#endregion
 //#region src/tui/mastra-tui.ts
 /**
 * Main TUI class for Mastra Code.
@@ -27100,6 +27155,7 @@ var MastraTUI = class MastraTUI {
 				clearFinishedBackgroundActivities: () => this.clearFinishedBackgroundActivity()
 			} : {}
 		});
+		this.installUserInputHandler();
 	}
 	getCurrentThreadBackgroundActivities() {
 		return getBackgroundActivitiesForTarget(this.state.backgroundActivities, this.state.session.identity.getResourceId(), this.state.pendingNewThread ? null : this.state.session.thread.getId());
@@ -27349,6 +27405,10 @@ var MastraTUI = class MastraTUI {
 		updateStatusLine(this.state);
 		flushRender(this.state);
 	}
+	/** The thread to suggest resuming on exit, or null while waiting for a new thread. */
+	getResumeThreadId() {
+		return this.state.pendingNewThread ? null : this.state.session.thread.getId();
+	}
 	/**
 	* Stop the TUI and clean up.
 	*/
@@ -27422,7 +27482,8 @@ var MastraTUI = class MastraTUI {
 			doubleCtrlCMs: MastraTUI.DOUBLE_CTRL_C_MS
 		});
 		this.state.ui.start();
-		await promptForThreadSelection(this.state);
+		const startupResumeIssue = await resumeThreadOnStartup(this.state, this.state.options.resumeThreadId);
+		await this.syncThreadActivePackMetadata();
 		subscribeToAgentController(this.state, (event) => this.handleEvent(event));
 		if (this.state.options.backgroundToolsEnabled) this.cleanupBackgroundCompletionListener = this.state.options.backgroundCompletionEvents?.subscribe((event) => this.handleBackgroundCompletion(event));
 		if (this.state.session.state.get()?.escapeAsCancel === false) this.state.editor.escapeEnabled = false;
@@ -27440,6 +27501,8 @@ var MastraTUI = class MastraTUI {
 		await renderExistingTasks(this.state);
 		if (this.shouldShowOnboarding()) await this.showOnboarding();
 		await this.showQuietModePreferencePromptIfNeeded();
+		if (startupResumeIssue?.kind === "missing") showError(this.state, `Thread not found: ${startupResumeIssue.threadId}. Started a new thread; use /threads to pick an existing one.`);
+		else if (startupResumeIssue?.kind === "locked") showThreadLockPrompt(this.buildCommandContext(), startupResumeIssue.title, startupResumeIssue.ownerPid, startupResumeIssue.threadId);
 		this.checkForUpdate().catch(() => {});
 		this.updateCheckTimer = setInterval(() => {
 			this.checkForUpdate(true);
@@ -27749,49 +27812,52 @@ var MastraTUI = class MastraTUI {
 		}
 		insertChatComponentWithBoundarySpacing(this.state.chatContainer, child);
 	}
-	getUserInput() {
-		const queued = this.queuedUserInput.shift();
-		if (queued !== void 0) return Promise.resolve(queued);
-		return new Promise((resolve) => {
-			this.pendingUserInputResolve = resolve;
-			this.state.editor.onSubmit = (text) => {
-				if (isGoalJudgeInputLocked(this.state)) {
-					this.state.editor.setText(text);
-					showGoalJudgeInputLockInfo(this.state);
-					flushRender(this.state);
+	installUserInputHandler() {
+		this.state.editor.onSubmit = (text) => {
+			if (isGoalJudgeInputLocked(this.state)) {
+				this.state.editor.setText(text);
+				showGoalJudgeInputLockInfo(this.state);
+				flushRender(this.state);
+				return;
+			}
+			if (text.trim()) this.state.editor.addToHistory(text);
+			this.state.editor.setText("");
+			if (this.state.session.run.isRunning()) {
+				if (text.startsWith("/")) {
+					this.handleSlashCommand(text).catch((error) => {
+						showError(this.state, error instanceof Error ? error.message : "Slash command failed");
+					});
 					return;
 				}
-				if (text.trim()) this.state.editor.addToHistory(text);
-				this.state.editor.setText("");
-				if (this.state.session.run.isRunning()) {
-					if (text.startsWith("/")) {
-						this.handleSlashCommand(text).catch((error) => {
-							showError(this.state, error instanceof Error ? error.message : "Slash command failed");
-						});
-						return;
-					}
-					if (text.startsWith("!")) {
-						handleShellPassthrough(this.state, text.slice(1).trim());
-						return;
-					}
-					const { content, images } = consumePendingImages(text, this.state.pendingImages);
-					this.state.pendingImages = [];
-					if (images?.length) {
-						this.state.pendingImages = images;
-						this.queueFollowUpMessage(text);
-						return;
-					}
-					this.signalMessage(content);
+				if (text.startsWith("!")) {
+					handleShellPassthrough(this.state, text.slice(1).trim());
 					return;
 				}
-				const pending = this.pendingUserInputResolve;
-				if (!pending) {
-					this.queuedUserInput.push(text);
+				const { content, images } = consumePendingImages(text, this.state.pendingImages);
+				this.state.pendingImages = [];
+				if (images?.length) {
+					this.state.pendingImages = images;
+					this.queueFollowUpMessage(text);
 					return;
 				}
-				this.pendingUserInputResolve = void 0;
-				pending(text);
-			};
+				this.signalMessage(content);
+				return;
+			}
+			const pending = this.pendingUserInputResolve;
+			if (!pending) {
+				this.queuedUserInput.push(text);
+				return;
+			}
+			this.pendingUserInputResolve = void 0;
+			pending(text);
+		};
+	}
+	getUserInput() {
+		const queued = this.queuedUserInput.shift();
+		if (queued !== void 0) return Promise.resolve(queued);
+		return new Promise((resolve) => {
+			this.pendingUserInputResolve = resolve;
+			if (!this.state.editor.onSubmit) this.installUserInputHandler();
 		});
 	}
 	/**
@@ -28229,4 +28295,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-ClYkgBN3.js.map
+//# sourceMappingURL=tui-CUNuxs-4.js.map