mastracode 0.48.1 → 0.48.2-alpha.0

package/dist/tui/voice/engines/macos-native-engine.d.ts

@@ -15,7 +15,7 @@
  */
 import type { PermissionGuidance, STTEngine, STTSession, STTSessionCallbacks } from './types.js';
 export declare class MacosNativeSTTEngine implements STTEngine {
-    readonly kind: "macos-native";
+    readonly kind: 'macos-native';
     checkReady(): string | null;
     /**
      * Deeper preflight: confirm the Swift toolchain compiles the recognizer, then

package/dist/tui/voice/engines/macos-native-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"macos-native-engine.d.ts","sourceRoot":"","sources":["../../../../src/tui/voice/engines/macos-native-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAqcjG,qBAAa,oBAAqB,YAAW,SAAS;IACpD,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAU;IAExC,UAAU,IAAI,MAAM,GAAG,IAAI;IAO3B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAetC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,kBAAkB,CAAC;IA2BhD,KAAK,CAAC,SAAS,EAAE,mBAAmB,GAAG,UAAU;CAGlD"}
+{"version":3,"file":"macos-native-engine.d.ts","sourceRoot":"","sources":["../../../../src/tui/voice/engines/macos-native-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAqcjG,qBAAa,oBAAqB,YAAW,SAAS;IACpD,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAU;IAExC,UAAU,IAAI,MAAM,GAAG,IAAI,CAK1B;IAED;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAarC;IAED;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAyB/C;IAED,KAAK,CAAC,SAAS,EAAE,mBAAmB,GAAG,UAAU,CAEhD;CACF"}

package/dist/tui/voice/mic-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mic-capture.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/mic-capture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,uDAAuD;IACvD,GAAG,EAAE,MAAM,CAAC;CACb;AAKD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,IAAI,YAAY,GAAG,IAAI,CAsBpD;AAYD;;GAEG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,OAAO,CAAS;gBAEZ,QAAQ,EAAE,YAAY;IAsBlC;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgCpC;;;;;;;OAOG;IACH,QAAQ,IAAI,MAAM,GAAG,IAAI;IAazB;;OAEG;IACH,MAAM,IAAI,IAAI;IAWd,OAAO,CAAC,OAAO;CAOhB"}
+{"version":3,"file":"mic-capture.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/mic-capture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,uDAAuD;IACvD,GAAG,EAAE,MAAM,CAAC;CACb;AAKD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,IAAI,YAAY,GAAG,IAAI,CAsBpD;AAYD;;GAEG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,OAAO,CAAS;IAExB,YAAY,QAAQ,EAAE,YAAY,EAoBjC;IAED;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8BnC;IAED;;;;;;;OAOG;IACH,QAAQ,IAAI,MAAM,GAAG,IAAI,CAWxB;IAED;;OAEG;IACH,MAAM,IAAI,IAAI,CASb;IAED,OAAO,CAAC,OAAO;CAOhB"}

package/dist/tui/voice/transcribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transcribe.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/transcribe.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AA6BjE,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,QAAQ,EAAE,MAAM;CAQ7B;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAKrG;AA6BD,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAUrG;AAED;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5C;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,iBAAsB,GAAG,mBAAmB,CAetF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAE1F"}
+{"version":3,"file":"transcribe.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/transcribe.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AA6BjE,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,QAAQ,EAAE,MAAM,EAO3B;CACF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAKrG;AA6BD,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAUrG;AAED;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5C;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,iBAAsB,GAAG,mBAAmB,CAetF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAE1F"}

package/dist/tui/voice/voice-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"voice-controller.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/voice-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,KAAK,EAAE,kBAAkB,EAAyB,MAAM,oBAAoB,CAAC;AAEpF,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,mDAAmD;IACnD,QAAQ,EAAE,aAAa,CAAC;IACxB,4DAA4D;IAC5D,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,8CAA8C;IAC9C,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,sCAAsC;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,cAAc,CAAC;AAE/D,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAgB;IAIhC,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;gBAErC,OAAO,EAAE,sBAAsB;IAM3C;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAa1C,SAAS,IAAI,OAAO;IAIpB;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK3C;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAK9D,QAAQ,IAAI,UAAU;IAItB,WAAW,IAAI,OAAO;IAItB;;;;OAIG;IACH,MAAM,IAAI,OAAO;IAQjB,MAAM,IAAI,OAAO;IAWjB;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAMtB,OAAO,IAAI,IAAI;IAMf;;;;OAIG;IACH,cAAc,IAAI,IAAI;IA8BtB;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC;;OAEG;IACH,eAAe,IAAI,IAAI;IAWvB;;;;OAIG;YACW,kBAAkB;IAmBhC;;;;OAIG;YACW,gBAAgB;CAW/B"}
+{"version":3,"file":"voice-controller.d.ts","sourceRoot":"","sources":["../../../src/tui/voice/voice-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,KAAK,EAAE,kBAAkB,EAAyB,MAAM,oBAAoB,CAAC;AAEpF,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,mDAAmD;IACnD,QAAQ,EAAE,aAAa,CAAC;IACxB,4DAA4D;IAC5D,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,8CAA8C;IAC9C,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,sCAAsC;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,cAAc,CAAC;AAE/D,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAgB;IAIhC,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IAEjD,YAAY,OAAO,EAAE,sBAAsB,EAI1C;IAED;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAWzC;IAED,SAAS,IAAI,OAAO,CAEnB;IAED;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAG1C;IAED;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAG7D;IAED,QAAQ,IAAI,UAAU,CAErB;IAED,WAAW,IAAI,OAAO,CAErB;IAED;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAMhB;IAED,MAAM,IAAI,OAAO,CAShB;IAED;;;;OAIG;IACH,cAAc,IAAI,IAAI,CAIrB;IAED,OAAO,IAAI,IAAI,CAId;IAED;;;;OAIG;IACH,cAAc,IAAI,IAAI,CA4BrB;IAED;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAWnC;IAED;;OAEG;IACH,eAAe,IAAI,IAAI,CAStB;IAED;;;;OAIG;YACW,kBAAkB;IAmBhC;;;;OAIG;YACW,gBAAgB;CAW/B"}

package/dist/{tui-ByXZNoag.cjs → tui-4Evog5Ks.cjs}

@@ -88,6 +88,70 @@ let _mastra_core_request_context = require("@mastra/core/request-context");
 let _mastra_code_sdk_utils_maintenance_lock = require("@mastra/code-sdk/utils/maintenance-lock");
 let _mastra_code_sdk_utils_storage_maintenance = require("@mastra/code-sdk/utils/storage-maintenance");
 let _mastra_code_sdk_utils_slash_command_loader = require("@mastra/code-sdk/utils/slash-command-loader");
+// src/browser-lifecycle.ts
+/**
+* The browser Mastra Code's agents currently use. Mastra Code owns it: a local
+* browser keeps running (and holds its profile's lock) until it is closed, so
+* it must be closed when replaced and when Mastra Code exits.
+*/
+let activeBrowser;
+const CLOSE_TIMEOUT_MS = 5e3;
+/**
+* Retire a browser: it closes and never relaunches, even for a tool call that
+* still holds it. If close fails or takes longer than CLOSE_TIMEOUT_MS, its
+* processes are killed so the old Chrome cannot keep holding the profile.
+*/
+async function closeBrowser(browser) {
+	let timer;
+	const closed = await Promise.race([browser.retire().then(() => true, () => false), new Promise((resolve) => {
+		timer = setTimeout(() => resolve(false), CLOSE_TIMEOUT_MS);
+		timer.unref?.();
+	})]);
+	clearTimeout(timer);
+	if (!closed) browser.killProcesses();
+}
+/**
+* Counts replacements, so a caller that started creating a browser can tell
+* whether another caller replaced the active browser in the meantime.
+*/
+let generation = 0;
+function activeBrowserGeneration() {
+	return generation;
+}
+/** Close a browser that never became active. Bounded like any other close. */
+function discardBrowser(browser) {
+	return closeBrowser(browser);
+}
+/**
+* Every close still in flight, chained so a later replacement (or exit) waits
+* for all of them, not just the browser it replaced. Each browser is retired once.
+*/
+let retiring = Promise.resolve();
+let retiringBrowser;
+/**
+* Make `next` the active browser, closing the previous one first so it
+* releases its profile before `next` launches on it. Also waits for any
+* browser an earlier replacement is still closing.
+*
+* Returns whether `next` is still the active browser once those closes finish.
+* False means a later call replaced (and closed) it meanwhile, so the caller
+* must not hand `next` to agents.
+*/
+async function replaceActiveBrowser(next) {
+	const previous = activeBrowser;
+	activeBrowser = next;
+	const mine = ++generation;
+	if (previous && previous !== next && previous !== retiringBrowser) {
+		retiringBrowser = previous;
+		retiring = Promise.all([retiring, closeBrowser(previous)]).then(() => {});
+	}
+	await retiring;
+	return generation === mine;
+}
+/** Close the active browser. Bounded so a hung browser cannot block exit. */
+async function closeActiveBrowser() {
+	await replaceActiveBrowser(void 0);
+}
 // src/commit-attribution.ts
 const TUI_CO_AUTHOR = { name: "mastracode" };
 // src/tui/bundled-themes.ts
@@ -19822,16 +19886,28 @@ function resolveModeAgent(mode, agentControllerState) {
 /**
 * @param chatModelId the chat model passed to `createBrowserFromSettings` for
 *   this browser, so the recorded model matches what was really launched.
+* @param startedAt `activeBrowserGeneration()` read before this call started
+*   creating `browser`. If another /browser call replaced the active browser
+*   since then, that call owns the agents: `browser` is discarded and false returned.
 */
-function applyBrowserToAgents(ctx, browser, browserSettings, chatModelId) {
-	const modes = ctx.controller.listModes();
-	let agentControllerState;
-	for (const mode of modes) resolveModeAgent(mode, agentControllerState ??= ctx.state.session.state.get())?.setBrowser?.(browser);
-	ctx.state.local?.controller.setBrowser(browser);
+async function applyBrowserToAgents(ctx, browser, browserSettings, chatModelId, startedAt) {
+	if (startedAt !== void 0 && activeBrowserGeneration() !== startedAt) {
+		if (browser) await discardBrowser(browser);
+		return false;
+	}
+	setAgentsBrowser(ctx, void 0);
+	if (!await replaceActiveBrowser(browser)) return false;
+	setAgentsBrowser(ctx, browser);
 	ctx.state.session.state.set({
 		[ACTIVE_BROWSER_KEY]: browserSettings ? (0, _mastra_code_sdk_onboarding_settings.toActiveBrowserSettings)(browserSettings) : void 0,
 		[ACTIVE_BROWSER_MODEL_KEY]: browserSettings?.enabled ? (0, _mastra_code_sdk_onboarding_settings.resolveStagehandModel)(browserSettings, { chatModelId }) : void 0
 	});
+	return true;
+}
+function setAgentsBrowser(ctx, browser) {
+	let agentControllerState;
+	for (const mode of ctx.controller.listModes()) resolveModeAgent(mode, agentControllerState ??= ctx.state.session.state.get())?.setBrowser?.(browser);
+	ctx.state.local?.controller.setBrowser(browser);
 }
 /**
 * Get a summary key for browser settings to detect config drift.
@@ -20039,9 +20115,12 @@ async function handleBrowserCommand(ctx, args = []) {
 			...settings.browser,
 			enabled: false
 		};
+		if (!await applyBrowserToAgents(ctx, void 0, disabledSettings)) {
+			ctx.showInfo("Another /browser command replaced this browser.");
+			return;
+		}
 		settings.browser = disabledSettings;
 		(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
-		applyBrowserToAgents(ctx, void 0, disabledSettings);
 		ctx.showInfo("Browser disabled.");
 		return;
 	}
@@ -20056,7 +20135,11 @@ async function handleBrowserCommand(ctx, args = []) {
 		}
 		try {
 			const chatModelId = launchChatModelId(ctx);
-			applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(nextBrowser, { chatModelId }), nextBrowser, chatModelId);
+			const startedAt = activeBrowserGeneration();
+			if (!await applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(nextBrowser, { chatModelId }), nextBrowser, chatModelId, startedAt)) {
+				ctx.showInfo("Another /browser command replaced this browser.");
+				return;
+			}
 			if (nextBrowser.profile && nextBrowser.provider) (0, _mastra_code_sdk_onboarding_settings.setProfileProvider)(nextBrowser.profile, nextBrowser.provider);
 			settings.browser = nextBrowser;
 			(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
@@ -20080,18 +20163,29 @@ async function handleBrowserCommand(ctx, args = []) {
 					height: 720
 				}
 			};
-			(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
-			if (wasEnabled) try {
-				const chatModelId = launchChatModelId(ctx);
-				applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(settings.browser, { chatModelId }), settings.browser, chatModelId);
-			} catch (err) {
-				settings.browser.enabled = false;
-				(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
-				applyBrowserToAgents(ctx, void 0);
-				ctx.showError(`Browser settings reset, but failed to restart: ${err instanceof Error ? err.message : String(err)}`);
+			if (wasEnabled) {
+				const startedAt = activeBrowserGeneration();
+				try {
+					const chatModelId = launchChatModelId(ctx);
+					if (!await applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(settings.browser, { chatModelId }), settings.browser, chatModelId, startedAt)) {
+						ctx.showInfo("Another /browser command replaced this browser.");
+						return;
+					}
+				} catch (err) {
+					if (!await applyBrowserToAgents(ctx, void 0, void 0, void 0, startedAt)) {
+						ctx.showInfo("Another /browser command replaced this browser.");
+						return;
+					}
+					settings.browser.enabled = false;
+					(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
+					ctx.showError(`Browser settings reset, but failed to restart: ${err instanceof Error ? err.message : String(err)}`);
+					return;
+				}
+			} else if (!await applyBrowserToAgents(ctx, void 0)) {
+				ctx.showInfo("Another /browser command replaced this browser.");
 				return;
 			}
-			else applyBrowserToAgents(ctx, void 0);
+			(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
 			ctx.showInfo("Browser settings reset to defaults.");
 			return;
 		}
@@ -20141,8 +20235,12 @@ async function handleBrowserCommand(ctx, args = []) {
 		let browserInstance = resolveModeAgent(ctx.state.session.mode.resolve(), ctx.state.session.state.get())?.browser;
 		if (!browserInstance && browser.enabled) {
 			const chatModelId = launchChatModelId(ctx);
+			const startedAt = activeBrowserGeneration();
 			browserInstance = await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(browser, { chatModelId });
-			applyBrowserToAgents(ctx, browserInstance, browser, chatModelId);
+			if (!await applyBrowserToAgents(ctx, browserInstance, browser, chatModelId, startedAt)) {
+				ctx.showError("Another /browser command replaced the browser. Run the export again.");
+				return;
+			}
 		}
 		if (!browserInstance) {
 			ctx.showError("Browser not enabled. Run /browser on first.");
@@ -20200,9 +20298,12 @@ async function handleBrowserCommand(ctx, args = []) {
 	}
 	if (enableChoice === "No") {
 		if (browser.enabled) {
+			if (!await applyBrowserToAgents(ctx, void 0)) {
+				ctx.showInfo("Another /browser command replaced this browser.");
+				return;
+			}
 			settings.browser.enabled = false;
 			(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
-			applyBrowserToAgents(ctx, void 0);
 			ctx.showInfo("Browser automation disabled.");
 		} else ctx.showInfo("Browser automation remains disabled.");
 		return;
@@ -20348,7 +20449,11 @@ async function handleBrowserCommand(ctx, args = []) {
 	}
 	const chatModelId = launchChatModelId(ctx);
 	try {
-		applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(nextBrowser, { chatModelId }), nextBrowser, chatModelId);
+		const startedAt = activeBrowserGeneration();
+		if (!await applyBrowserToAgents(ctx, await (0, _mastra_code_sdk_onboarding_settings.createBrowserFromSettings)(nextBrowser, { chatModelId }), nextBrowser, chatModelId, startedAt)) {
+			ctx.showInfo("Another /browser command replaced this browser.");
+			return;
+		}
 		if (nextBrowser.profile && nextBrowser.provider) (0, _mastra_code_sdk_onboarding_settings.setProfileProvider)(nextBrowser.profile, nextBrowser.provider);
 		settings.browser = nextBrowser;
 		(0, _mastra_code_sdk_onboarding_settings.saveSettings)(settings);
@@ -28796,6 +28901,12 @@ Object.defineProperty(exports, "__toESM", {
 		return __toESM;
 	}
 });
+Object.defineProperty(exports, "activeBrowserGeneration", {
+	enumerable: true,
+	get: function() {
+		return activeBrowserGeneration;
+	}
+});
 Object.defineProperty(exports, "applyThemeMode", {
 	enumerable: true,
 	get: function() {
@@ -28808,12 +28919,24 @@ Object.defineProperty(exports, "applyThemePreference", {
 		return applyThemePreference;
 	}
 });
+Object.defineProperty(exports, "closeActiveBrowser", {
+	enumerable: true,
+	get: function() {
+		return closeActiveBrowser;
+	}
+});
 Object.defineProperty(exports, "createTUIState", {
 	enumerable: true,
 	get: function() {
 		return createTUIState;
 	}
 });
+Object.defineProperty(exports, "discardBrowser", {
+	enumerable: true,
+	get: function() {
+		return discardBrowser;
+	}
+});
 Object.defineProperty(exports, "formatInstallingLabel", {
 	enumerable: true,
 	get: function() {
@@ -28880,6 +29003,12 @@ Object.defineProperty(exports, "normalizeThemePreference", {
 		return normalizeThemePreference;
 	}
 });
+Object.defineProperty(exports, "replaceActiveBrowser", {
+	enumerable: true,
+	get: function() {
+		return replaceActiveBrowser;
+	}
+});
 Object.defineProperty(exports, "theme", {
 	enumerable: true,
 	get: function() {
@@ -28887,4 +29016,4 @@ Object.defineProperty(exports, "theme", {
 	}
 });
 
-//# sourceMappingURL=tui-ByXZNoag.cjs.map
+//# sourceMappingURL=tui-4Evog5Ks.cjs.map