@mastra/agent-browser 0.5.2 → 0.5.3-alpha.0

package/dist/index.js

@@ -769,7 +769,7 @@ var AgentBrowser = class extends MastraBrowser {
 				this.notifyBrowserReady(session.threadId);
 			},
 			onBrowserCreated: (manager, threadId) => {
-				this.setupCloseListenerForThread(manager, threadId);
+				this.setupCloseListenerForThread(manager, threadId, this.isRemoteThreadBrowser());
 			}
 		};
 		const createTm = config.createThreadManager ?? ((opts) => new AgentBrowserThreadManager(opts));
@@ -824,24 +824,29 @@ var AgentBrowser = class extends MastraBrowser {
 		if (localConfig.cdpHeaders) launchOptions.cdpHeaders = localConfig.cdpHeaders;
 		await this.sharedManager.launch(launchOptions);
 		this.threadManager.setSharedManager(this.sharedManager);
-		this.setupCloseListenerForSharedScope(this.sharedManager);
+		this.setupCloseListenerForSharedScope(this.sharedManager, Boolean(launchOptions.cdpUrl));
 	}
 	/**
 	* Set up close event listeners for 'shared' scope browser.
 	* This handles the case where the shared browser is closed externally.
 	*/
-	setupCloseListenerForSharedScope(manager) {
+	setupCloseListenerForSharedScope(manager, connectedOverCdp = false) {
 		try {
-			const pidLookup = getBrowserPid(manager).then((pid) => {
-				if (pid && this.sharedManager === manager) this.sharedBrowserPid = pid;
-			}).finally(() => this.pidLookups.delete(pidLookup));
-			this.pidLookups.add(pidLookup);
+			let pidLookup;
+			if (!connectedOverCdp) {
+				pidLookup = getBrowserPid(manager).then((pid) => {
+					if (pid && this.sharedManager === manager) this.sharedBrowserPid = pid;
+				}).finally(() => {
+					if (pidLookup) this.pidLookups.delete(pidLookup);
+				});
+				this.pidLookups.add(pidLookup);
+			}
 			let disconnectHandled = false;
 			const handleDisconnect = () => {
 				if (disconnectHandled) return;
 				disconnectHandled = true;
 				this.rememberClosedBrowserState(manager, "user");
-				pidLookup.catch(() => void 0).then(() => this.handleBrowserDisconnected());
+				Promise.resolve(pidLookup).catch(() => void 0).then(() => this.handleBrowserDisconnected());
 			};
 			const context = manager.getContext();
 			if (context) context.on("close", handleDisconnect);
@@ -955,18 +960,36 @@ var AgentBrowser = class extends MastraBrowser {
 	* Set up close event listener for a thread's browser manager.
 	* This handles the case where a thread's browser is closed externally.
 	*/
-	setupCloseListenerForThread(manager, threadId) {
+	/**
+	* Whether per-thread browsers are reached over CDP (a remote/container
+	* browser we do not own). When true, their PID is never captured — signalling
+	* it locally is meaningless and dangerous (issue #23588).
+	*
+	* Base AgentBrowser only connects over CDP when a `cdpUrl` is configured
+	* (thread scope with `cdpUrl` is normally rejected by config validation, so
+	* this is defense in depth). Subclasses that always drive a remote browser
+	* per thread (e.g. Firecrawl) override this to return `true`.
+	*/
+	isRemoteThreadBrowser() {
+		return Boolean(this.config.cdpUrl);
+	}
+	setupCloseListenerForThread(manager, threadId, connectedOverCdp = false) {
 		try {
-			const pidLookup = getBrowserPid(manager).then((pid) => {
-				if (pid && this.threadManager?.getExistingManagerForThread(threadId) === manager) this.threadBrowserPids.set(threadId, pid);
-			}).finally(() => this.pidLookups.delete(pidLookup));
-			this.pidLookups.add(pidLookup);
+			let pidLookup;
+			if (!connectedOverCdp) {
+				pidLookup = getBrowserPid(manager).then((pid) => {
+					if (pid && this.threadManager?.getExistingManagerForThread(threadId) === manager) this.threadBrowserPids.set(threadId, pid);
+				}).finally(() => {
+					if (pidLookup) this.pidLookups.delete(pidLookup);
+				});
+				this.pidLookups.add(pidLookup);
+			}
 			let disconnectHandled = false;
 			const handleDisconnect = () => {
 				if (disconnectHandled) return;
 				disconnectHandled = true;
 				this.rememberClosedBrowserState(manager, "user", threadId);
-				pidLookup.catch(() => void 0).then(() => this.handleThreadBrowserDisconnected(threadId));
+				Promise.resolve(pidLookup).catch(() => void 0).then(() => this.handleThreadBrowserDisconnected(threadId));
 			};
 			const context = manager.getContext();
 			if (context) context.on("close", handleDisconnect);