agentic-browser 2.6.0 → 2.6.2

package/AGENTS.md

@@ -3,14 +3,14 @@
 ## Quick Reference
 
 ```bash
-npm run build        # tsdown (~20ms)
-npm run typecheck    # tsc --noEmit
-npm run lint         # oxlint
-npm run lint:fix     # oxlint --fix
-npm run format       # oxfmt --write
-npm test             # vitest run
-npm run test:watch   # vitest
-npm run docs:dev     # vocs dev server
+pnpm build # tsdown (~20ms)
+pnpm typecheck # tsc --noEmit
+pnpm lint # oxlint
+pnpm lint:fix # oxlint --fix
+pnpm format # oxfmt --write
+pnpm test # vitest run
+pnpm test:watch # vitest
+pnpm docs:dev # vocs dev server
 ```
 
 ## Architecture
@@ -29,7 +29,7 @@ src/
     commands/agent.ts     — Stateful agent commands (auto-restart, retry, session persistence)
     commands/*.ts         — Low-level CLI command handlers
   mcp/
-    index.ts              — MCP server (stdio transport, 7 tools wrapping AgenticBrowserCore)
+    index.ts              — MCP server (stdio transport, tools wrapping AgenticBrowserCore)
   session/
     browser-controller.ts — BrowserController interface + ChromeCdpBrowserController (CDP WebSocket)
     session-manager.ts    — Orchestrates sessions, commands, memory recording
@@ -68,7 +68,7 @@ AgenticBrowserCore → ControlApi → SessionManager → BrowserController (CDP)
 
 - **ESM-only**: `"type": "module"`, use `.js` extensions in all TypeScript imports
 - **Zod v4**: `import { z } from "zod"` — `z.record()` requires key+value args
-- **Commander.js v14**: colon-namespaced commands (`session:start`, `memory:search`)
+- **Commander.js v15**: colon-namespaced commands (`session:start`, `memory:search`)
 - **CLI output**: exactly one JSON line to `stdout`, errors to `stderr`
 - **Types**: interfaces for public contracts, type aliases for unions/inferred
 - **No console.log in MCP server**: use `process.stderr.write()` for debug output
@@ -111,21 +111,27 @@ AgenticBrowserCore → ControlApi → SessionManager → BrowserController (CDP)
 - `AGENTIC_BROWSER_DIR` — base dir for sessions/memory/events (default: `~/.agentic-browser`)
 - `AGENTIC_BROWSER_CHROME_EXECUTABLE_PATH` — explicit Chrome path (auto-discovered if not set)
 - `AGENTIC_BROWSER_CDP_URL` — connect to an already-running Chrome via CDP (e.g. `http://127.0.0.1:9222`)
+- `AGENTIC_BROWSER_ALLOW_FILE_URLS` — allow `file:` URLs in navigate (`true` or `1`); default is http(s) and about:blank only
 - `AGENTIC_BROWSER_USER_PROFILE` — use real Chrome profile (`default`, `true`, or absolute path)
+- `AGENTIC_BROWSER_CHROME_PATH` — alias of `AGENTIC_BROWSER_CHROME_EXECUTABLE_PATH`
+- `AGENTIC_BROWSER_HEADLESS` — `true` or `1` to launch Chrome headless
+- `AGENTIC_BROWSER_USER_AGENT` — override the browser user agent
 
 ## MCP Server
 
 Subcommand: `agentic-browser mcp` (stdio transport). Setup: `agentic-browser setup`. Tools:
 
-| Tool                    | Purpose                                                                                                   |
-| ----------------------- | --------------------------------------------------------------------------------------------------------- |
-| `browser_start_session` | Start Chrome, return sessionId                                                                            |
-| `browser_navigate`      | Navigate to URL                                                                                           |
-| `browser_interact`      | click / type / press / waitFor / scroll / hover / select / toggle / goBack / goForward / refresh / dialog |
-| `browser_get_content`   | Get page title / text / html                                                                              |
-| `browser_get_elements`  | Discover interactive elements                                                                             |
-| `browser_search_memory` | Search task memory                                                                                        |
-| `browser_stop_session`  | Stop Chrome session                                                                                       |
+| Tool                      | Purpose                                                                                                   |
+| ------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `browser_start_session`   | Start Chrome, return sessionId                                                                            |
+| `browser_navigate`        | Navigate to URL                                                                                           |
+| `browser_interact`        | click / type / press / waitFor / scroll / hover / select / toggle / goBack / goForward / refresh / dialog |
+| `browser_get_content`     | Get page title / text / html                                                                              |
+| `browser_get_elements`    | Discover interactive elements                                                                             |
+| `browser_search_memory`   | Search task memory                                                                                        |
+| `browser_stop_session`    | Stop Chrome session                                                                                       |
+| `browser_dismiss_cookies` | Dismiss cookie or consent banner                                                                          |
+| `browser_screenshot`      | Screenshot as base64 (jpeg or png, optional full page)                                                    |
 
 ## For Browser Automation Tasks
 

package/README.md

@@ -13,7 +13,7 @@ CLI and MCP server to control a local Chrome session for AI agents.
 
 ## Requirements
 
-- Node.js 20+
+- Node.js 22+
 - Installed Chrome
 
 ## Install

package/dist/cli/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { r as createCliRuntime } from "../runtime-BzdbtFF4.mjs";
+import { a as isConnectionError, o as ensurePrivateDir, r as createCliRuntime, s as writePrivateFileSync } from "../runtime-Bo7FmRYk.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
 import { Command } from "commander";
-//#region src/cli/commands/agent.ts
+// src/cli/commands/agent.ts
 const STATE_FILE_NAME = "agent-state.json";
 function stateFilePath(runtime) {
 	return path.join(runtime.context.config.dataDir, STATE_FILE_NAME);
@@ -20,8 +20,8 @@ function loadState(runtime) {
 }
 function saveState(runtime, state) {
 	const dir = path.dirname(stateFilePath(runtime));
-	fs.mkdirSync(dir, { recursive: true });
-	fs.writeFileSync(stateFilePath(runtime), JSON.stringify(state, null, 2));
+	ensurePrivateDir(dir);
+	writePrivateFileSync(stateFilePath(runtime), JSON.stringify(state, null, 2));
 }
 function requireSessionId(runtime) {
 	const state = loadState(runtime);
@@ -63,6 +63,12 @@ async function agentStop(runtime) {
 		sessionId
 	};
 }
+/** Only connection-level failures justify a restart + re-run. */
+function isRetryableFailure(message) {
+	if (isConnectionError(message)) return true;
+	const lower = message.toLowerCase();
+	return lower.includes("session") && (lower.includes("dead") || lower.includes("terminated"));
+}
 async function executeAgentCommand(runtime, input) {
 	const sessionId = requireSessionId(runtime);
 	await ensureReady(runtime, sessionId);
@@ -71,16 +77,24 @@ async function executeAgentCommand(runtime, input) {
 		type: input.type,
 		payload: input.payload
 	});
-	try {
-		const first = await attempt();
-		if (first.resultStatus === "failed") throw new Error(first.resultMessage ?? "Command failed");
-		return first;
-	} catch {
+	const retryAfterRestart = async () => {
 		await runtime.api.restartSession(sessionId);
 		const second = await attempt();
 		if (second.resultStatus === "failed") throw new Error(second.resultMessage ?? "Command failed after retry");
 		return second;
+	};
+	const noRetry = input.type === "restart" || input.type === "terminate";
+	let first;
+	try {
+		first = await attempt();
+	} catch (error) {
+		if (noRetry || !isRetryableFailure(error.message)) throw error;
+		return await retryAfterRestart();
 	}
+	if (first.resultStatus !== "failed") return first;
+	const message = first.resultMessage ?? "Command failed";
+	if (noRetry || !isRetryableFailure(message)) throw new Error(message);
+	return await retryAfterRestart();
 }
 async function agentNavigate(runtime, input) {
 	const result = await executeAgentCommand(runtime, {
@@ -184,16 +198,14 @@ async function agentCleanup(runtime, input) {
 		...runtime.api.cleanupSessions(input)
 	};
 }
-//#endregion
-//#region src/cli/output/result-formatter.ts
+// src/cli/output/result-formatter.ts
 function formatResult(resultStatus, message) {
 	return {
 		resultStatus,
 		message
 	};
 }
-//#endregion
-//#region src/cli/commands/session-start.ts
+// src/cli/commands/session-start.ts
 async function runSessionStart(runtime, input) {
 	const session = await runtime.api.createSession(input);
 	return {
@@ -201,29 +213,24 @@ async function runSessionStart(runtime, input) {
 		sessionId: session.sessionId
 	};
 }
-//#endregion
-//#region src/cli/commands/session-status.ts
+// src/cli/commands/session-status.ts
 async function runSessionStatus(runtime, input) {
 	return runtime.api.getSession(input.sessionId);
 }
-//#endregion
-//#region src/cli/commands/session-stop.ts
+// src/cli/commands/session-stop.ts
 async function runSessionStop(runtime, input) {
 	await runtime.api.terminateSession(input.sessionId);
 	return { terminated: true };
 }
-//#endregion
-//#region src/cli/commands/session-cleanup.ts
+// src/cli/commands/session-cleanup.ts
 async function runSessionCleanup(runtime, input) {
 	return runtime.api.cleanupSessions(input);
 }
-//#endregion
-//#region src/cli/commands/session-restart.ts
+// src/cli/commands/session-restart.ts
 async function runSessionRestart(runtime, input) {
 	return await runtime.api.restartSession(input.sessionId);
 }
-//#endregion
-//#region src/cli/commands/session-auth.ts
+// src/cli/commands/session-auth.ts
 async function runSessionAuth(runtime, input) {
 	const token = runtime.api.rotateSessionToken(input.sessionId);
 	return {
@@ -231,8 +238,7 @@ async function runSessionAuth(runtime, input) {
 		valid: runtime.context.tokenService.validate(input.sessionId, token)
 	};
 }
-//#endregion
-//#region src/cli/commands/command-run.ts
+// src/cli/commands/command-run.ts
 async function runCommand(runtime, input) {
 	if (!input.sessionId) throw new Error("No active session. Start or restart a session first.");
 	try {
@@ -245,8 +251,7 @@ async function runCommand(runtime, input) {
 		throw new Error(`Command rejected: ${error.message}`, { cause: error });
 	}
 }
-//#endregion
-//#region src/cli/commands/page-content.ts
+// src/cli/commands/page-content.ts
 async function runPageContent(runtime, input) {
 	return await runtime.api.getContent(input.sessionId, {
 		mode: input.mode,
@@ -254,31 +259,26 @@ async function runPageContent(runtime, input) {
 		maxChars: input.maxChars
 	});
 }
-//#endregion
-//#region src/cli/commands/memory-search.ts
+// src/cli/commands/memory-search.ts
 async function runMemorySearch(runtime, input) {
 	if (!input.taskIntent || !input.taskIntent.trim()) throw new Error("taskIntent is required");
 	return runtime.api.searchMemory(input);
 }
-//#endregion
-//#region src/cli/commands/memory-inspect.ts
+// src/cli/commands/memory-inspect.ts
 async function runMemoryInspect(runtime, input) {
 	if (!input.insightId || !input.insightId.trim()) throw new Error("insightId is required");
 	return runtime.api.inspectMemory(input.insightId);
 }
-//#endregion
-//#region src/cli/commands/memory-verify.ts
+// src/cli/commands/memory-verify.ts
 async function runMemoryVerify(runtime, input) {
 	if (!input.insightId || !input.insightId.trim()) throw new Error("insightId is required");
 	return runtime.api.verifyMemory(input.insightId);
 }
-//#endregion
-//#region src/cli/commands/memory-stats.ts
+// src/cli/commands/memory-stats.ts
 async function runMemoryStats(runtime) {
 	return runtime.api.memoryStats();
 }
-//#endregion
-//#region src/cli/index.ts
+// src/cli/index.ts
 const collect = (value, previous = []) => [...previous, value];
 async function main() {
 	const runtime = createCliRuntime();
@@ -513,7 +513,7 @@ async function main() {
 		await startMcpServer();
 	});
 	program.command("setup").description("Configure agentic-browser as MCP server for your AI tool").action(async () => {
-		const { runSetup } = await import("../setup-DUAjdbQ3.mjs");
+		const { runSetup } = await import("../setup-DwFaZOPf.mjs");
 		await runSetup();
 	});
 	await program.parseAsync(process.argv);
@@ -526,5 +526,4 @@ main().then((keepAlive) => {
 	console.error(JSON.stringify({ error: message }));
 	process.exit(1);
 });
-//#endregion
 export {};

package/dist/index.d.mts

@@ -1,7 +1,6 @@
 
-import WebSocket from "ws";
+import "ws";
 import { z } from "zod";
-//#region src/session/browser-controller.d.ts
 type InteractAction = "click" | "type" | "press" | "waitFor" | "evaluate" | "scroll" | "hover" | "select" | "toggle" | "goBack" | "goForward" | "refresh" | "dialog";
 interface InteractPayload {
   action: InteractAction;
@@ -100,8 +99,6 @@ interface BrowserController {
   closeConnection?(targetWsUrl: string): void;
   dispose?(): void;
 }
-//#endregion
-//#region src/memory/memory-schemas.d.ts
 declare const InsightFreshnessSchema: z.ZodEnum<{
   fresh: "fresh";
   stale: "stale";
@@ -233,8 +230,6 @@ interface MemorySearchResult {
   score: number;
   siteProfile?: SiteProfileSummary;
 }
-//#endregion
-//#region src/lib/domain-schemas.d.ts
 declare const SessionStatusSchema: z.ZodEnum<{
   disconnected: "disconnected";
   failed: "failed";
@@ -302,8 +297,6 @@ type CommandType = z.infer<typeof CommandTypeSchema>;
 type Session = z.infer<typeof SessionSchema>;
 type Command = z.infer<typeof CommandSchema>;
 type SessionEvent = z.infer<typeof SessionEventSchema>;
-//#endregion
-//#region src/lib/config.d.ts
 interface AppConfig {
   dataDir: string;
   browserExecutablePath?: string;
@@ -311,10 +304,9 @@ interface AppConfig {
   userProfileDir?: string;
   headless?: boolean;
   userAgent?: string;
+  allowFileUrls: boolean;
 }
 declare function loadConfig(env?: NodeJS.ProcessEnv): AppConfig;
-//#endregion
-//#region src/observability/logger.d.ts
 interface LogContext {
   [key: string]: unknown;
 }
@@ -326,8 +318,6 @@ declare class Logger {
   warning(message: string, context?: LogContext): void;
   error(message: string, context?: LogContext): void;
 }
-//#endregion
-//#region src/observability/event-store.d.ts
 declare class EventStore {
   private readonly events;
   private readonly filePath;
@@ -349,8 +339,6 @@ declare class EventStore {
   private flushAsync;
   private readonly flushSync;
 }
-//#endregion
-//#region src/auth/session-token.d.ts
 declare class SessionTokenService {
   private readonly tokens;
   issue(sessionId: string): string;
@@ -359,8 +347,6 @@ declare class SessionTokenService {
   get(sessionId: string): string | undefined;
   seed(sessionId: string, token: string): void;
 }
-//#endregion
-//#region src/memory/memory-service.d.ts
 interface MemorySearchInput {
   taskIntent: string;
   siteDomain?: string;
@@ -385,6 +371,8 @@ declare class MemoryService {
   constructor(baseDir: string);
   /** Force an immediate synchronous flush of pending writes. */
   flushSync(): void;
+  /** Flush pending writes and release the stores' process exit hooks. */
+  dispose(): void;
   search(input: MemorySearchInput): MemorySearchResult[];
   /** Invalidate search cache when data changes. */
   private invalidateSearchCache;
@@ -400,8 +388,8 @@ declare class MemoryService {
     }>;
   };
   verify(insightId: string): TaskInsight;
-  recordSuccess(input: RecordExecutionInput): TaskInsight;
-  recordFailure(input: RecordExecutionInput, errorMessage: string): TaskInsight | undefined;
+  recordSuccess(rawInput: RecordExecutionInput): TaskInsight;
+  recordFailure(rawInput: RecordExecutionInput, errorMessage: string): TaskInsight | undefined;
   /** Update site profile from page content (call after getContent with mode="summary"). */
   updateProfileFromContent(domain: string, pathPattern: string, structuredContent: {
     headings?: string[];
@@ -421,13 +409,13 @@ declare class MemoryService {
   private findBestExactMatch;
   private scoreExactMatch;
   private sameFirstPathSegment;
+  /** Strip query strings and fragments from every URL-bearing field before it is persisted. */
+  private sanitizeInput;
   private createEvidence;
   private maybeGenerateAliases;
   private deriveAliasName;
   private mergeRecipe;
 }
-//#endregion
-//#region src/cli/app.d.ts
 interface AppContext {
   config: ReturnType<typeof loadConfig>;
   logger: Logger;
@@ -435,8 +423,6 @@ interface AppContext {
   tokenService: SessionTokenService;
   memoryService: MemoryService;
 }
-//#endregion
-//#region src/session/session-store.d.ts
 interface StoredSessionRecord {
   session: Session;
   cdpUrl: string;
@@ -444,8 +430,6 @@ interface StoredSessionRecord {
   pid: number;
   lastUrl?: string;
 }
-//#endregion
-//#region src/session/session-manager.d.ts
 interface CreateSessionInput {
   browser: "chrome";
 }
@@ -584,8 +568,6 @@ declare class SessionManager {
   private buildMemoryContext;
   private parseUrl;
 }
-//#endregion
-//#region src/transport/control-api.d.ts
 declare class ControlApi {
   private readonly sessions;
   constructor(sessions: SessionManager);
@@ -746,8 +728,6 @@ declare class ControlApi {
     dryRun?: boolean;
   }): CleanupResult;
 }
-//#endregion
-//#region src/cli/runtime.d.ts
 interface AgenticBrowserCoreOptions {
   env?: NodeJS.ProcessEnv;
   browserController?: BrowserController;
@@ -758,11 +738,19 @@ interface ExecuteCommandInput {
   type: CommandType;
   payload: Record<string, unknown>;
 }
-declare class AgenticBrowserCore {
+export declare class AgenticBrowserCore {
   readonly context: AppContext;
   readonly sessions: SessionManager;
   readonly api: ControlApi;
+  private readonly browserController;
+  private disposed;
   constructor(context: AppContext, browserController: BrowserController);
+  /**
+   * Release process-level resources (event store and memory store exit handlers,
+   * controller timers). Flushes pending memory writes.
+   * Does not terminate browser sessions. Idempotent.
+   */
+  dispose(): Promise<void>;
   startSession(input?: {
     browser: "chrome";
   }): Promise<{
@@ -909,7 +897,6 @@ declare class AgenticBrowserCore {
     }>;
   };
 }
-declare function createAgenticBrowserCore(options?: AgenticBrowserCoreOptions): AgenticBrowserCore;
-declare function createMockAgenticBrowserCore(env: NodeJS.ProcessEnv): AgenticBrowserCore;
-//#endregion
-export { AgenticBrowserCore, type AgenticBrowserCoreOptions, type DismissCookieBannerResult, type ElementAction, type ErrorCode, type ExecuteCommandInput, type InteractiveElement, type InteractiveElementRole, type InteractiveElementsOptions, type InteractiveElementsResult, type LaunchOptions, type ScreenshotOptions, type ScreenshotResult, createAgenticBrowserCore, createMockAgenticBrowserCore };
+export declare function createAgenticBrowserCore(options?: AgenticBrowserCoreOptions): AgenticBrowserCore;
+export declare function createMockAgenticBrowserCore(env: NodeJS.ProcessEnv): AgenticBrowserCore;
+export type { AgenticBrowserCoreOptions, DismissCookieBannerResult, ElementAction, ErrorCode, ExecuteCommandInput, InteractiveElement, InteractiveElementRole, InteractiveElementsOptions, InteractiveElementsResult, LaunchOptions, ScreenshotOptions, ScreenshotResult };

package/dist/index.mjs

@@ -1,3 +1,2 @@
 #!/usr/bin/env node
-import { i as createMockAgenticBrowserCore, n as createAgenticBrowserCore, t as AgenticBrowserCore } from "./runtime-BzdbtFF4.mjs";
-export { AgenticBrowserCore, createAgenticBrowserCore, createMockAgenticBrowserCore };
+export { t as AgenticBrowserCore, n as createAgenticBrowserCore, i as createMockAgenticBrowserCore } from "./runtime-Bo7FmRYk.mjs";

package/dist/mcp/index.d.mts

@@ -1,5 +1,2 @@
 
-//#region src/mcp/index.d.ts
-declare function main(): Promise<void>;
-//#endregion
-export { main };
+export declare function main(): Promise<void>;

package/dist/mcp/index.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { n as createAgenticBrowserCore } from "../runtime-BzdbtFF4.mjs";
+import { n as createAgenticBrowserCore } from "../runtime-Bo7FmRYk.mjs";
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { z } from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-//#region src/mcp/response-helpers.ts
+// src/mcp/response-helpers.ts
 function uniqueLines(content, maxLineLength = 160) {
 	const seen = /* @__PURE__ */ new Set();
 	const lines = [];
@@ -204,8 +204,7 @@ function compactMemoryResults(results) {
 		return compact;
 	}) };
 }
-//#endregion
-//#region src/mcp/element-refs.ts
+// src/mcp/element-refs.ts
 var ElementRefRegistry = class {
 	bySession = /* @__PURE__ */ new Map();
 	/**
@@ -245,8 +244,41 @@ var ElementRefRegistry = class {
 		this.bySession.delete(sessionId);
 	}
 };
-//#endregion
-//#region src/mcp/index.ts
+// src/mcp/session-resolver.ts
+/**
+* Tracks the active session and auto-starts one on demand. Concurrent callers
+* share a single in-flight start so only one session is launched.
+*/
+function createSessionResolver(start) {
+	let activeSessionId;
+	let pendingSession;
+	return {
+		async resolve(sessionId) {
+			if (sessionId) return sessionId;
+			if (activeSessionId) return activeSessionId;
+			if (pendingSession) return pendingSession;
+			const p = (async () => {
+				const session = await start();
+				activeSessionId = session.sessionId;
+				return session.sessionId;
+			})();
+			pendingSession = p;
+			try {
+				return await p;
+			} finally {
+				pendingSession = void 0;
+			}
+		},
+		current: () => activeSessionId,
+		set(sessionId) {
+			activeSessionId = sessionId;
+		},
+		clear() {
+			activeSessionId = void 0;
+		}
+	};
+}
+// src/mcp/index.ts
 function readPackageVersion() {
 	try {
 		const dir = dirname(fileURLToPath(import.meta.url));
@@ -271,7 +303,7 @@ function classifyError(message) {
 	return "UNKNOWN";
 }
 let core;
-let activeSessionId;
+const sessionResolver = createSessionResolver(() => getCore().startSession());
 const DEFAULT_MCP_MAX_CHARS = {
 	summary: void 0,
 	title: void 0,
@@ -313,10 +345,7 @@ async function snapshotElements(sessionId, opts = {}) {
 * This means the LLM never has to call browser_start_session explicitly.
 */
 async function resolveSession(sessionId) {
-	if (sessionId) return sessionId;
-	if (activeSessionId) return activeSessionId;
-	activeSessionId = (await getCore().startSession()).sessionId;
-	return activeSessionId;
+	return sessionResolver.resolve(sessionId);
 }
 const server = new McpServer({
 	name: "agentic-browser",
@@ -324,7 +353,7 @@ const server = new McpServer({
 });
 server.tool("browser_start_session", "Start a new Chrome browser session (or return the existing one if healthy). Sessions auto-start when you call any other browser tool, so you rarely need to call this explicitly. Use this to force a fresh session after stopping the previous one.", {}, async () => {
 	const session = await getCore().startSession();
-	activeSessionId = session.sessionId;
+	sessionResolver.set(session.sessionId);
 	const { authTokenRef: _, ...compactSession } = session;
 	return { content: [{
 		type: "text",
@@ -536,7 +565,7 @@ server.tool("browser_screenshot", "Capture a screenshot of the current page. Ret
 	}] };
 });
 server.tool("browser_stop_session", "Stop the browser session and terminate Chrome. The next browser tool call will auto-start a fresh session.", { sessionId: z.string().optional().describe("Session ID (uses active session if omitted)") }, async ({ sessionId }) => {
-	const sid = sessionId ?? activeSessionId;
+	const sid = sessionId ?? sessionResolver.current();
 	if (!sid) return { content: [{
 		type: "text",
 		text: JSON.stringify({
@@ -546,7 +575,7 @@ server.tool("browser_stop_session", "Stop the browser session and terminate Chro
 	}] };
 	await getCore().stopSession(sid);
 	refs.clear(sid);
-	if (activeSessionId === sid) activeSessionId = void 0;
+	if (sessionResolver.current() === sid) sessionResolver.clear();
 	return { content: [{
 		type: "text",
 		text: JSON.stringify({
@@ -558,11 +587,12 @@ server.tool("browser_stop_session", "Stop the browser session and terminate Chro
 async function main() {
 	const transport = new StdioServerTransport();
 	transport.onclose = async () => {
-		if (activeSessionId) {
+		const activeId = sessionResolver.current();
+		if (activeId) {
 			try {
-				await getCore().stopSession(activeSessionId);
+				await getCore().stopSession(activeId);
 			} catch {}
-			activeSessionId = void 0;
+			sessionResolver.clear();
 		}
 		try {
 			getCore().context.memoryService.flushSync();
@@ -573,5 +603,4 @@ async function main() {
 	};
 	await server.connect(transport);
 }
-//#endregion
 export { main };