@opencode/browse 0.0.6-dev.17 → 0.0.6-dev.19

package/dist/{mcp-2smdsn8z.mjs → mcp-p0mcjvq9.mjs}

@@ -1,288 +1,316 @@
 import {
   autoUpdateStatus
-} from "./main-g5mke6rn.mjs";
+} from "./main-yd50d95g.mjs";
 import {
-  parseTargetSelection2,
   getObject2,
-  getString2,
   Service,
   layerFetchMcp,
   relayBuildProblem,
   ensureRelay,
   ensureExtensionConnected
-} from "./main-3qpkwaa7.mjs";
+} from "./main-8a245rm1.mjs";
+import"./main-75rdz6bc.mjs";
 import {
   opencodeBrowserVersion2
-} from "./main-y7c1atbf.mjs";
-import {
-  listSecrets,
-  readClient,
-  settingKeys,
-  settingSpecs,
-  securityVariables
-} from "./main-e4stqtf2.mjs";
+} from "./main-ts9jjqs8.mjs";
 import {
   updateJson2,
   createUpdateWatcher2
-} from "./main-4p2p9eey.mjs";
-import"./main-4bht27ry.mjs";
+} from "./main-2wrztakb.mjs";
+import {
+  settingKeys,
+  settingSpecs,
+  securityVariables,
+  browsersNote2,
+  mcpUpdateNote2,
+  objectSchema,
+  emptyInputSchema,
+  sessionSchemaProperty,
+  sessionAliasSchemaProperty,
+  sessionOnlyInputSchema,
+  ensureSessionExists,
+  parseExecuteArguments,
+  parseAdoptArguments,
+  requiredStringField,
+  optionalStringField,
+  optionalBooleanField,
+  optionalPositiveIntegerField,
+  optionalStringArrayField,
+  requireObject,
+  toolResultForValue2,
+  mcpErrorMessage2,
+  toolResult,
+  readClient,
+  listSecrets
+} from "./main-90enpn5q.mjs";
 
 // src/mcp.ts
 import { NodeStdio } from "@effect/platform-node";
-import { Config, Context, Effect, Layer, Option, Predicate, Schedule } from "effect";
+import { Config, Context, Effect as Effect7, Layer, Option, Schedule } from "effect";
 import { McpProtocol, McpSchema, McpServer } from "effect/ai";
+import path5 from "node:path";
+import { fileURLToPath } from "node:url";
+
+// src/mcp/browser.ts
+import { Effect } from "effect";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
-var packageRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-function browsersNote(browsers) {
-  if (browsers.length < 2)
-    return "";
-  const list = browsers.map((browser) => `${browser.id} (${browser.name}${browser.default ? ", default" : ""})`).join(", ");
-  return ` Connected browsers: ${list}. Pass browser to use one other than the default.`;
+
+// src/mcp/registry.ts
+var groups = [];
+function registerMcpTools(options) {
+  groups.push({
+    order: options.order,
+    build: options.build
+  });
 }
-var emptyInputSchema = objectSchema({});
-var sessionSchemaProperty = {
-  type: "string",
-  description: "Optional session id. Defaults to this MCP server's current session."
-};
-var sessionAliasSchemaProperty = { type: "string", description: "Same as id." };
-var sessionOnlyInputSchema = objectSchema({
-  session: sessionSchemaProperty
-});
-function makeToolSpecs(relay, currentSession, update = () => {
-  return;
-}, browsers = []) {
-  const browserNote = browsersNote(browsers);
+function createMcpToolContext(options) {
+  const browsers = options.browsers ?? [];
+  const browserNote = browsersNote2(browsers);
   const browserProperty = {
     type: "string",
     description: `Optional browser id for a new session's tabs; omit for the default browser. A session stays in its browser.${browserNote}`
   };
-  const resolveSessionId = (input, field = "session") => optionalStringField(input, field) ?? (field === "id" ? optionalStringField(input, "session") : undefined) ?? currentSession.id;
+  const resolveSessionId = (input, field = "session") => optionalStringField(input, field) ?? (field === "id" ? optionalStringField(input, "session") : undefined) ?? options.currentSession.id;
   const establishCurrentSession = (id) => {
-    currentSession.id = id;
-    currentSession.established = true;
+    options.currentSession.id = id;
+    options.currentSession.established = true;
   };
-  return [
-    {
-      name: "execute",
-      description: `Execute Playwright JavaScript against the Browse session. Code runs in a sandbox on the relay without process, require, import(), fs, child_process, http/https or Node fetch; save and read files with the files helper inside the execute file roots, and cookie access is limited to the session's pages. The result includes console logs, warnings, a bounded execution-context diagnostic when relevant, and an aftermath summary (URL movement, navigations, error counts, handoffs, and a bot challenge or block page when one appears: hand interactive ones to the user with handoff(), never solve or retry-loop them).${browserNote}`,
-      inputSchema: objectSchema({
-        code: { type: "string", description: `JavaScript code to execute. It receives browser, context, page, state, modules (path, url, util, crypto, buffer, zlib, events, stream), files (dir, path, write, read), fillInput, fillInputs, snapshot(options?) for compact semantic outlines, search, explicit diffs, or automatic deltas, persistent compatible ref(id) locators, webmcp (list/call), screenshot helpers, ariaSnapshot, ghostCursor, handoff, demonstrate, network capture, pageConsole (start/stop capturing the page's own console messages and errors, off by default because pages can detect it), secrets.type(locator, name) to type a stored site secret or a granted Deadbolt login ("deadbolt:<site>[/<username>]", { field: "username" }, or a password/code with { submit: true }; see secrets_list) only on its allowed origins, without seeing it, secrets.signIn({ site?, username? }) for a whole sign-in (same as the signin tool), and secrets.usePasskey({ site, username }) to pick the passkey account for the tab's next passkey request.` },
-        session: { type: "string", description: "Optional existing Browse session id. Explicit ids must already exist; omit this field to use the MCP server's current session, which is created when needed." },
-        targetUrl: { type: "string", description: "Optional URL substring selecting an existing attached page. This does not navigate or open a URL; use page.goto() for that." },
-        targetIndex: { type: "integer", minimum: 0, description: "Optional zero-based attached page index selector." },
-        browser: browserProperty,
-        timeoutMs: { type: "integer", minimum: 0, description: "Optional overall script timeout in milliseconds (paused while handoff() waits on the user); defaults to 60000, 0 disables." }
-      }, ["code"]),
-      readOnly: false,
-      destructive: true,
-      idempotent: false,
-      handle: (input) => Effect.gen(function* () {
-        const args = yield* Effect.try(() => parseExecuteArguments(input));
-        const sessionId = args.session ?? currentSession.id;
-        yield* ensureExtensionConnected({ relay, sessionId, waitForReconnect: true });
-        const result = yield* relay.execute({
-          sessionId,
-          code: args.code,
-          createIfMissing: !args.session,
-          ...args.timeoutMs === undefined ? {} : { timeoutMs: args.timeoutMs },
-          ...args.targetSelection ? { targetSelection: args.targetSelection } : {},
-          ...args.browser ? { browser: args.browser } : {}
-        });
-        const recreated = !args.session && currentSession.established && result.session.created === true;
-        establishCurrentSession(sessionId);
-        return {
-          ...result,
-          ...recreated ? { notice: `Recreated session '${sessionId}' — relay had no such session; page and state were reset.` } : {}
-        };
-      })
-    },
+  return {
+    relay: options.relay,
+    currentSession: options.currentSession,
+    packageRoot: options.packageRoot,
+    update: options.update ?? (() => {
+      return;
+    }),
+    browsers,
+    browserNote,
+    browserProperty,
+    resolveSessionId,
+    establishCurrentSession
+  };
+}
+function buildRegisteredMcpTools(ctx) {
+  return [...groups].sort((left, right) => left.order - right.order).flatMap((group) => group.build(ctx));
+}
+
+// src/mcp/browser.ts
+registerMcpTools({
+  order: 110,
+  build: (ctx) => [
     {
       name: "status",
+      requiresRelayCompatibility: false,
       description: "Return relay, extension, target, and session status.",
       inputSchema: emptyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: false,
       handle: () => Effect.gen(function* () {
-        const [version, status] = yield* Effect.all([relay.version, relay.extensionStatus]);
+        const [version, status] = yield* Effect.all([ctx.relay.version, ctx.relay.extensionStatus]);
         const buildProblem = relayBuildProblem(version);
-        const available = updateJson2(update());
-        return { endpoint: relay.endpoint, currentSession: currentSession.id, version, status, ...buildProblem ? { buildProblem } : {}, ...available ? { update: available } : {}, autoUpdate: autoUpdateStatus() };
+        const available = updateJson2(ctx.update());
+        return {
+          endpoint: ctx.relay.endpoint,
+          currentSession: ctx.currentSession.id,
+          version,
+          status,
+          ...buildProblem ? { buildProblem } : {},
+          ...available ? { update: available } : {},
+          autoUpdate: autoUpdateStatus()
+        };
       })
-    },
+    }
+  ]
+});
+registerMcpTools({
+  order: 420,
+  build: (ctx) => [
     {
-      name: "session_new",
-      description: `Create a Browse session and make it current for this MCP server.${browserNote}`,
+      name: "tabs_cleanup",
+      description: "Close tabs agents opened that nobody has used for a while (no agent command and not visited by the user). Tabs the user shared or pinned, the active tab, tabs playing audio, recording, or waiting for a handoff stay open. Call it when you finish a task to leave the user's browser tidy; Browse also does this automatically after the user's idle setting (10 minutes unless they changed it).",
       inputSchema: objectSchema({
-        browser: browserProperty,
-        id: { type: "string", description: "Optional lowercase session id." },
-        readOnly: { type: "boolean", description: "Create a read-only session: the relay rejects input-dispatching CDP so scripts can inspect but not click or type." },
-        allowedOrigins: { type: "array", items: { type: "string" }, description: "Optional domain allowlist: hosts or origins this session's tabs may load (example.com, *.example.com, https://app.example.com, http://localhost:3000). Navigations elsewhere are refused or sent back to about:blank; private and loopback addresses need an exact entry." }
+        idleMinutes: {
+          type: "integer",
+          minimum: 0,
+          description: "Close tabs idle at least this long. 0 closes every eligible agent tab. Defaults to the user's setting (10 minutes; still 10 when the user set automatic cleanup to never)."
+        }
       }),
       readOnly: false,
-      destructive: false,
-      idempotent: false,
-      handle: (input) => Effect.gen(function* () {
-        const requestedId = optionalStringField(input, "id");
-        const readOnly = optionalBooleanField(input, "readOnly");
-        const allowedOrigins = optionalStringArrayField(input, "allowedOrigins");
-        const browser = optionalStringField(input, "browser");
-        const session = yield* relay.sessionNew(requestedId, {
-          ...readOnly ? { readOnly: true } : {},
-          ...allowedOrigins ? { allowedOrigins } : {},
-          ...browser ? { browser } : {}
-        });
-        establishCurrentSession(session.id);
-        return { session };
-      })
+      destructive: true,
+      idempotent: true,
+      handle: (input) => {
+        const value = typeof input === "object" && input !== null && "idleMinutes" in input ? input.idleMinutes : undefined;
+        return ctx.relay.tabsCleanup(typeof value === "number" && value >= 0 ? value : undefined);
+      }
     },
     {
-      name: "session_allowlist",
-      description: "Set the domain allowlist of a session (the current one by default): the hosts or origins its tabs may load. Pass an empty list to remove it. Use it before typing secrets or working on sites with untrusted content.",
+      name: "settings",
+      description: `Read or change the user's Browse settings, the same ones as the extension's options page: where agent tabs open (window), how they're grouped (grouping), when untouched agent tabs close (idleMinutes), the agent cursor (cursor), human-like input (humanInput) and handoff notifications (handoffNotifications). Use it only when the user asks to change how browse behaves, never on your own initiative. Without \`set\` it returns each setting's stored value, the value in effect, and the relay environment variable that overrides it, if any. With \`set\` it validates every value strictly, applies the change at once (the options page updates live) and returns what changed: tell the user what you changed. A setting an environment variable fixes is not changed, and the result says so. Security switches (${securityVariables.join(", ")}) are environment-only and can never be read or changed here.`,
       inputSchema: objectSchema({
-        session: { type: "string", description: "Session id; defaults to the current session." },
-        allowedOrigins: { type: "array", items: { type: "string" }, description: "Patterns: example.com, *.example.com, https://app.example.com, http://localhost:3000. Empty removes the allowlist." }
-      }, ["allowedOrigins"]),
+        set: {
+          type: "object",
+          description: "Settings to change; omit to only read them.",
+          properties: Object.fromEntries(settingKeys.map((key) => [key, { enum: [...settingSpecs[key].values], description: settingSpecs[key].label }])),
+          additionalProperties: false
+        }
+      }),
       readOnly: false,
       destructive: false,
       idempotent: true,
-      handle: (input) => Effect.gen(function* () {
-        const sessionId = resolveSessionId(input);
-        const allowedOrigins = requireObject(input).allowedOrigins;
-        if (!Array.isArray(allowedOrigins) || !allowedOrigins.every((item) => Predicate.isString(item))) {
-          return yield* Effect.fail(new Error("allowedOrigins must be an array of strings"));
-        }
-        return { session: yield* relay.sessionAllowlist(sessionId, allowedOrigins) };
-      })
-    },
-    {
-      name: "session_list",
-      description: "List Browse sessions.",
-      inputSchema: emptyInputSchema,
-      readOnly: true,
-      destructive: false,
-      idempotent: false,
-      handle: () => relay.sessions.pipe(Effect.map((sessions) => ({ sessions })))
-    },
+      handle: (input) => {
+        const set = getObject2(input)?.set;
+        if (set === undefined)
+          return ctx.relay.settingsGet;
+        const changes = getObject2(set);
+        return changes ? ctx.relay.settingsSet(changes) : Effect.fail(new Error('set must be an object, for example { "grouping": "shared" }'));
+      }
+    }
+  ]
+});
+registerMcpTools({
+  order: 700,
+  build: (ctx) => [
     {
-      name: "session_current",
-      description: "Return this MCP server's current Browse session id.",
+      name: "skill",
+      requiresRelayCompatibility: false,
+      description: "Return the Browse agent skill instructions.",
       inputSchema: emptyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: () => Effect.succeed({ currentSession: currentSession.id })
-    },
-    {
-      name: "session_use",
-      description: "Set this MCP server's current Browse session id.",
-      inputSchema: objectSchema({
-        id: { type: "string", description: "Existing Browse session id." }
-      }, ["id"]),
-      readOnly: false,
-      destructive: false,
-      idempotent: true,
-      handle: (input) => Effect.gen(function* () {
-        const id = yield* Effect.try(() => requiredStringField(input, "id"));
-        yield* ensureSessionExists(relay, id);
-        establishCurrentSession(id);
-        return { currentSession: currentSession.id };
-      })
-    },
-    {
-      name: "session_reset",
-      description: "Reset a Browse session's state and page.",
-      inputSchema: objectSchema({
-        id: sessionSchemaProperty,
-        session: sessionAliasSchemaProperty
-      }),
-      readOnly: false,
-      destructive: true,
-      idempotent: false,
-      handle: (input) => Effect.gen(function* () {
-        const id = resolveSessionId(input, "id");
-        const reset = yield* relay.sessionReset(id);
-        establishCurrentSession(id);
-        return reset;
+      handle: () => Effect.tryPromise({
+        try: () => fs.readFile(path.join(ctx.packageRoot, "skills", "browse", "SKILL.md"), "utf8"),
+        catch: (cause) => new Error("read opencode-browser skill", { cause })
       })
-    },
+    }
+  ]
+});
+
+// src/mcp/execute.ts
+import { Effect as Effect2 } from "effect";
+registerMcpTools({
+  order: 100,
+  build: (ctx) => [
     {
-      name: "session_delete",
-      description: "Delete a Browse session.",
+      name: "execute",
+      listsBrowsers: true,
+      description: `Execute Playwright JavaScript against the Browse session. Code runs in a sandbox on the relay without process, require, import(), fs, child_process, http/https or Node fetch; save and read files with the files helper inside the execute file roots, and cookie access is limited to the session's pages. The result includes console logs, warnings, a bounded execution-context diagnostic when relevant, and an aftermath summary (URL movement, navigations, error counts, handoffs, and a bot challenge or block page when one appears: hand interactive ones to the user with handoff(), never solve or retry-loop them).${ctx.browserNote}`,
       inputSchema: objectSchema({
-        id: sessionSchemaProperty,
-        session: sessionAliasSchemaProperty
-      }),
-      readOnly: false,
-      destructive: true,
-      idempotent: true,
-      handle: (input) => Effect.gen(function* () {
-        const id = resolveSessionId(input, "id");
-        const result = yield* relay.sessionDelete(id);
-        if (currentSession.id === id) {
-          currentSession.id = `mcp-${crypto.randomUUID().slice(0, 8)}`;
-          currentSession.established = false;
+        code: {
+          type: "string",
+          description: `JavaScript code to execute. It receives browser, context, page, state, modules (path, url, util, crypto, buffer, zlib, events, stream), files (dir, path, write, read), fillInput, fillInputs, snapshot(options?) for compact semantic outlines, search, explicit diffs, or automatic deltas, persistent compatible ref(id) locators, webmcp (list/call), screenshot helpers, ariaSnapshot, ghostCursor, handoff, demonstrate, network capture, pageConsole (start/stop capturing the page's own console messages and errors, off by default because pages can detect it), secrets.type(locator, name) to type a stored site secret or a granted Deadbolt login ("deadbolt:<site>[/<username>]", { field: "username" }, or a password/code with { submit: true }; see secrets_list) only on its allowed origins, without seeing it, secrets.signIn({ site?, username? }) for a whole sign-in (same as the signin tool), and secrets.usePasskey({ site, username }) to pick the passkey account for the tab's next passkey request.`
+        },
+        session: {
+          type: "string",
+          description: "Optional existing Browse session id. Explicit ids must already exist; omit this field to use the MCP server's current session, which is created when needed."
+        },
+        targetUrl: {
+          type: "string",
+          description: "Optional URL substring selecting an existing attached page. This does not navigate or open a URL; use page.goto() for that."
+        },
+        targetIndex: {
+          type: "integer",
+          minimum: 0,
+          description: "Optional zero-based attached page index selector."
+        },
+        browser: ctx.browserProperty,
+        timeoutMs: {
+          type: "integer",
+          minimum: 0,
+          description: "Optional overall script timeout in milliseconds (paused while handoff() waits on the user); defaults to 60000, 0 disables."
         }
-        return { ...result, currentSession: currentSession.id };
-      })
-    },
-    {
-      name: "session_adopt",
-      description: "Make an attached tab the Browse session's default page for subsequent bare execute calls. Omit targetUrl and targetIndex when only one user-attached tab is available.",
-      inputSchema: objectSchema({
-        session: { type: "string", description: "Optional existing Browse session id. Explicit ids must already exist; omit this field to use the MCP server's current session, which is created when needed." },
-        targetUrl: { type: "string", description: "Adopt an existing attached page whose URL contains this text. Omit when only one user-attached tab is available. This does not navigate or open a URL." },
-        targetIndex: { type: "integer", minimum: 0, description: "Adopt the attached page at this zero-based target index." },
-        tabId: { type: "integer", description: "Adopt the user's tab with this Chrome tab id (the tab= value in status)." }
-      }),
+      }, ["code"]),
       readOnly: false,
-      destructive: false,
+      destructive: true,
       idempotent: false,
-      handle: (input) => Effect.gen(function* () {
-        const args = yield* Effect.try(() => parseAdoptArguments(input));
-        const sessionId = args.session ?? currentSession.id;
-        const result = yield* relay.sessionAdopt({
+      handle: (input) => Effect2.gen(function* () {
+        const args = yield* Effect2.try(() => parseExecuteArguments(input));
+        const sessionId = args.session ?? ctx.currentSession.id;
+        yield* ensureExtensionConnected({ relay: ctx.relay, sessionId, waitForReconnect: true });
+        const result = yield* ctx.relay.execute({
           sessionId,
+          code: args.code,
           createIfMissing: !args.session,
+          ...args.timeoutMs === undefined ? {} : { timeoutMs: args.timeoutMs },
           ...args.targetSelection ? { targetSelection: args.targetSelection } : {},
-          ...args.tabId === undefined ? {} : { tabId: args.tabId }
+          ...args.browser ? { browser: args.browser } : {}
         });
-        establishCurrentSession(sessionId);
-        return { ...result, confirmation: `Adopted session '${result.session.id}' default page: ${result.adoptedUrl}` };
+        const recreated = !args.session && ctx.currentSession.established && result.session.created === true;
+        ctx.establishCurrentSession(sessionId);
+        return {
+          ...result,
+          ...recreated ? { notice: `Recreated session '${sessionId}' — relay had no such session; page and state were reset.` } : {}
+        };
       })
-    },
+    }
+  ]
+});
+
+// src/mcp/network.ts
+import { Effect as Effect3 } from "effect";
+import path2 from "node:path";
+registerMcpTools({
+  order: 300,
+  build: (ctx) => [
     {
       name: "network_start",
       description: "Start session-scoped network capture. Browse records normalized Playwright exchanges; HAR is only the optional export format. Bodies are embedded by default with per-body and total memory limits.",
       inputSchema: objectSchema({
-        session: { type: "string", description: "Optional existing session id. Omit to use or create this MCP server's current session." },
+        session: {
+          type: "string",
+          description: "Optional existing session id. Omit to use or create this MCP server's current session."
+        },
         urlFilter: { type: "string", description: "Capture only request URLs containing this text." },
-        resourceTypes: { type: "array", items: { type: "string" }, description: "Optional Playwright resource types such as fetch and xhr." },
-        content: { type: "string", enum: ["embed", "omit"], description: "Request and response body mode. Defaults to embed." },
-        maxBodyBytes: { type: "integer", minimum: 1, description: "Maximum bytes captured from each body. Defaults to 1000000." },
-        maxTotalBodyBytes: { type: "integer", minimum: 1, description: "Maximum body bytes retained for the capture. Defaults to 25000000." },
-        maxEntries: { type: "integer", minimum: 1, description: "Maximum captured requests. Defaults to 1000." },
-        maxDurationMs: { type: "integer", minimum: 1, maximum: 86400000, description: "The capture ends by itself, discarding what it captured, after this long. Defaults to 1800000 (30 minutes). It also ends when this MCP server exits." }
+        resourceTypes: {
+          type: "array",
+          items: { type: "string" },
+          description: "Optional Playwright resource types such as fetch and xhr."
+        },
+        content: {
+          type: "string",
+          enum: ["embed", "omit"],
+          description: "Request and response body mode. Defaults to embed."
+        },
+        maxBodyBytes: {
+          type: "integer",
+          minimum: 1,
+          description: "Maximum bytes captured from each body. Defaults to 1000000."
+        },
+        maxTotalBodyBytes: {
+          type: "integer",
+          minimum: 1,
+          description: "Maximum body bytes retained for the capture. Defaults to 25000000."
+        },
+        maxEntries: {
+          type: "integer",
+          minimum: 1,
+          description: "Maximum captured requests. Defaults to 1000."
+        },
+        maxDurationMs: {
+          type: "integer",
+          minimum: 1,
+          maximum: 86400000,
+          description: "The capture ends by itself, discarding what it captured, after this long. Defaults to 1800000 (30 minutes). It also ends when this MCP server exits."
+        }
       }),
       readOnly: false,
       destructive: false,
       idempotent: false,
-      handle: (input) => Effect.gen(function* () {
+      handle: (input) => Effect3.gen(function* () {
         const object = requireObject(input);
         const explicitSession = optionalStringField(object, "session");
-        const sessionId = explicitSession ?? currentSession.id;
+        const sessionId = explicitSession ?? ctx.currentSession.id;
         if (explicitSession) {
-          yield* ensureSessionExists(relay, sessionId);
+          yield* ensureSessionExists(ctx.relay, sessionId);
         } else {
-          yield* relay.sessionEnsure(sessionId);
-          currentSession.established = true;
+          yield* ctx.relay.sessionEnsure(sessionId);
+          ctx.currentSession.established = true;
         }
-        yield* ensureExtensionConnected({ relay, sessionId, waitForReconnect: true });
+        yield* ensureExtensionConnected({ relay: ctx.relay, sessionId, waitForReconnect: true });
         const content = optionalStringField(object, "content");
         if (content !== undefined && content !== "embed" && content !== "omit") {
-          return yield* Effect.fail(new Error("content must be embed or omit"));
+          return yield* Effect3.fail(new Error("content must be embed or omit"));
         }
         const urlFilter = optionalStringField(object, "urlFilter");
         const resourceTypes = optionalStringArrayField(object, "resourceTypes");
@@ -290,7 +318,7 @@ function makeToolSpecs(relay, currentSession, update = () => {
         const maxTotalBodyBytes = optionalPositiveIntegerField(object, "maxTotalBodyBytes");
         const maxEntries = optionalPositiveIntegerField(object, "maxEntries");
         const maxDurationMs = optionalPositiveIntegerField(object, "maxDurationMs");
-        const result = yield* relay.networkStart({
+        const result = yield* ctx.relay.networkStart({
           sessionId,
           ...urlFilter ? { urlFilter } : {},
           ...resourceTypes && resourceTypes.length > 0 ? { resourceTypes } : {},
@@ -305,14 +333,15 @@ function makeToolSpecs(relay, currentSession, update = () => {
     },
     {
       name: "network_status",
+      requiresRelayCompatibility: false,
       description: "Return bounded metadata for a session's active network capture. Captured values are never included.",
       inputSchema: sessionOnlyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
       handle: (input) => {
-        const sessionId = resolveSessionId(input);
-        return relay.networkStatus({ sessionId }).pipe(Effect.map((result) => ({ session: sessionId, ...result })));
+        const sessionId = ctx.resolveSessionId(input);
+        return ctx.relay.networkStatus({ sessionId }).pipe(Effect3.map((result) => ({ session: sessionId, ...result })));
       }
     },
     {
@@ -320,22 +349,25 @@ function makeToolSpecs(relay, currentSession, update = () => {
       description: "Stop network capture. Optionally write a credential-redacted HAR and store lossless credential values in a reusable secret profile. At least one of outputPath or secrets is required.",
       inputSchema: objectSchema({
         session: sessionSchemaProperty,
-        outputPath: { type: "string", description: "Optional artifact path, resolved against the MCP process working directory. The HAR contains stable ${BC_SECRET_N} references (and redaction-only ${BC_REDACTED_N} for passwords, one-time codes and token-like URL path segments), not captured values." },
+        outputPath: {
+          type: "string",
+          description: "Optional artifact path, resolved against the MCP process working directory. The HAR contains stable ${BC_SECRET_N} references (and redaction-only ${BC_REDACTED_N} for passwords, one-time codes and token-like URL path segments), not captured values."
+        },
         secrets: { type: "string", description: "Optional reusable profile name for captured credential values." }
       }),
       readOnly: false,
       destructive: false,
       idempotent: false,
-      handle: (input) => Effect.gen(function* () {
-        const sessionId = resolveSessionId(input);
+      handle: (input) => Effect3.gen(function* () {
+        const sessionId = ctx.resolveSessionId(input);
         const outputPath = optionalStringField(input, "outputPath");
         const secrets = optionalStringField(input, "secrets");
         if (!outputPath && !secrets) {
-          return yield* Effect.fail(new Error("network_stop requires outputPath, secrets, or both"));
+          return yield* Effect3.fail(new Error("network_stop requires outputPath, secrets, or both"));
         }
-        return yield* relay.networkStop({
+        return yield* ctx.relay.networkStop({
           sessionId,
-          ...outputPath ? { outputPath: path.resolve(outputPath) } : {},
+          ...outputPath ? { outputPath: path2.resolve(outputPath) } : {},
           ...secrets ? { secrets } : {}
         });
       })
@@ -347,19 +379,38 @@ function makeToolSpecs(relay, currentSession, update = () => {
       readOnly: false,
       destructive: true,
       idempotent: true,
-      handle: (input) => relay.networkCancel({ sessionId: resolveSessionId(input) })
-    },
+      handle: (input) => ctx.relay.networkCancel({ sessionId: ctx.resolveSessionId(input) })
+    }
+  ]
+});
+
+// src/mcp/recording.ts
+import { Effect as Effect4 } from "effect";
+import path3 from "node:path";
+registerMcpTools({
+  order: 400,
+  build: (ctx) => [
     {
       name: "recording_start",
       description: "Start recording the current session tab. CDP mode records video to WebM or MP4; tab-capture mode supports WebM and optional audio.",
       inputSchema: objectSchema({
         session: sessionSchemaProperty,
-        outputPath: { type: "string", description: "Recording artifact path, resolved against the MCP process working directory." },
-        mode: { type: "string", enum: ["auto", "tab-capture", "cdp"], description: "Recording backend. Defaults to auto." },
+        outputPath: {
+          type: "string",
+          description: "Recording artifact path, resolved against the MCP process working directory."
+        },
+        mode: {
+          type: "string",
+          enum: ["auto", "tab-capture", "cdp"],
+          description: "Recording backend. Defaults to auto."
+        },
         audio: { type: "boolean", description: "Capture tab audio in tab-capture mode." },
         frameRate: { type: "integer", minimum: 1, maximum: 60, description: "Requested frame rate." },
         maxDurationMs: { type: "integer", minimum: 1, description: "Maximum recording duration in milliseconds." },
-        cursor: { type: "boolean", description: "Draw the ghost cursor in the recording, for demo videos. Off by default: recordings show only the page, with nothing from Browse in the frame." }
+        cursor: {
+          type: "boolean",
+          description: "Draw the ghost cursor in the recording, for demo videos. Off by default: recordings show only the page, with nothing from Browse in the frame."
+        }
       }, ["outputPath"]),
       readOnly: false,
       destructive: false,
@@ -368,17 +419,17 @@ function makeToolSpecs(relay, currentSession, update = () => {
         const object = requireObject(input);
         const mode = optionalStringField(object, "mode");
         if (mode !== undefined && mode !== "auto" && mode !== "tab-capture" && mode !== "cdp") {
-          return Effect.fail(new Error("mode must be auto, tab-capture, or cdp"));
+          return Effect4.fail(new Error("mode must be auto, tab-capture, or cdp"));
         }
         const frameRate = optionalPositiveIntegerField(object, "frameRate");
         if (frameRate !== undefined && frameRate > 60)
-          return Effect.fail(new Error("frameRate must be at most 60"));
+          return Effect4.fail(new Error("frameRate must be at most 60"));
         const maxDurationMs = optionalPositiveIntegerField(object, "maxDurationMs");
         const audio = optionalBooleanField(object, "audio");
         const cursor = optionalBooleanField(object, "cursor");
-        return relay.recordingStart({
-          sessionId: resolveSessionId(object),
-          outputPath: path.resolve(requiredStringField(object, "outputPath")),
+        return ctx.relay.recordingStart({
+          sessionId: ctx.resolveSessionId(object),
+          outputPath: path3.resolve(requiredStringField(object, "outputPath")),
           ...mode ? { mode } : {},
           ...audio === undefined ? {} : { audio },
           ...frameRate === undefined ? {} : { frameRate },
@@ -394,52 +445,22 @@ function makeToolSpecs(relay, currentSession, update = () => {
       readOnly: false,
       destructive: false,
       idempotent: false,
-      handle: (input) => relay.recordingStop({ sessionId: resolveSessionId(input) })
-    },
-    {
-      name: "tabs_cleanup",
-      description: "Close tabs agents opened that nobody has used for a while (no agent command and not visited by the user). Tabs the user shared or pinned, the active tab, tabs playing audio, recording, or waiting for a handoff stay open. Call it when you finish a task to leave the user's browser tidy; Browse also does this automatically after the user's idle setting (10 minutes unless they changed it).",
-      inputSchema: objectSchema({
-        idleMinutes: { type: "integer", minimum: 0, description: "Close tabs idle at least this long. 0 closes every eligible agent tab. Defaults to the user's setting (10 minutes; still 10 when the user set automatic cleanup to never)." }
-      }),
-      readOnly: false,
-      destructive: true,
-      idempotent: true,
-      handle: (input) => {
-        const value = typeof input === "object" && input !== null && "idleMinutes" in input ? input.idleMinutes : undefined;
-        return relay.tabsCleanup(typeof value === "number" && value >= 0 ? value : undefined);
-      }
-    },
-    {
-      name: "settings",
-      description: `Read or change the user's Browse settings, the same ones as the extension's options page: where agent tabs open (window), how they're grouped (grouping), when untouched agent tabs close (idleMinutes), the agent cursor (cursor), human-like input (humanInput) and handoff notifications (handoffNotifications). Use it only when the user asks to change how browse behaves, never on your own initiative. Without \`set\` it returns each setting's stored value, the value in effect, and the relay environment variable that overrides it, if any. With \`set\` it validates every value strictly, applies the change at once (the options page updates live) and returns what changed: tell the user what you changed. A setting an environment variable fixes is not changed, and the result says so. Security switches (${securityVariables.join(", ")}) are environment-only and can never be read or changed here.`,
-      inputSchema: objectSchema({
-        set: {
-          type: "object",
-          description: "Settings to change; omit to only read them.",
-          properties: Object.fromEntries(settingKeys.map((key) => [key, { enum: [...settingSpecs[key].values], description: settingSpecs[key].label }])),
-          additionalProperties: false
-        }
-      }),
-      readOnly: false,
-      destructive: false,
-      idempotent: true,
-      handle: (input) => {
-        const set = getObject2(input)?.set;
-        if (set === undefined)
-          return relay.settingsGet;
-        const changes = getObject2(set);
-        return changes ? relay.settingsSet(changes) : Effect.fail(new Error('set must be an object, for example { "grouping": "shared" }'));
-      }
-    },
+      handle: (input) => ctx.relay.recordingStop({ sessionId: ctx.resolveSessionId(input) })
+    }
+  ]
+});
+registerMcpTools({
+  order: 500,
+  build: (ctx) => [
     {
       name: "recording_status",
+      requiresRelayCompatibility: false,
       description: "Return bounded status and quality counters for a session recording.",
       inputSchema: sessionOnlyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: (input) => relay.recordingStatus({ sessionId: resolveSessionId(input) })
+      handle: (input) => ctx.relay.recordingStatus({ sessionId: ctx.resolveSessionId(input) })
     },
     {
       name: "recording_cancel",
@@ -448,15 +469,25 @@ function makeToolSpecs(relay, currentSession, update = () => {
       readOnly: false,
       destructive: true,
       idempotent: true,
-      handle: (input) => relay.recordingCancel({ sessionId: resolveSessionId(input) })
+      handle: (input) => ctx.relay.recordingCancel({ sessionId: ctx.resolveSessionId(input) })
     },
     {
       name: "flight_recorder_start",
       description: "Start a rolling in-memory video buffer for the current session tab. Saving a clip does not stop buffering.",
       inputSchema: objectSchema({
         session: sessionSchemaProperty,
-        retentionMs: { type: "integer", minimum: 1000, maximum: 120000, description: "Rolling retention window. Defaults to 60000." },
-        frameRate: { type: "integer", minimum: 1, maximum: 60, description: "Saved clip frame rate. Defaults to 60." },
+        retentionMs: {
+          type: "integer",
+          minimum: 1000,
+          maximum: 120000,
+          description: "Rolling retention window. Defaults to 60000."
+        },
+        frameRate: {
+          type: "integer",
+          minimum: 1,
+          maximum: 60,
+          description: "Saved clip frame rate. Defaults to 60."
+        },
         cursor: { type: "boolean", description: "Draw the ghost cursor in the buffered video. Off by default." }
       }),
       readOnly: false,
@@ -467,8 +498,8 @@ function makeToolSpecs(relay, currentSession, update = () => {
         const retentionMs = optionalPositiveIntegerField(object, "retentionMs");
         const frameRate = optionalPositiveIntegerField(object, "frameRate");
         const cursor = optionalBooleanField(object, "cursor");
-        return relay.flightRecorderStart({
-          sessionId: resolveSessionId(object),
+        return ctx.relay.flightRecorderStart({
+          sessionId: ctx.resolveSessionId(object),
           ...retentionMs === undefined ? {} : { retentionMs },
           ...frameRate === undefined ? {} : { frameRate },
           ...cursor === undefined ? {} : { cursor }
@@ -477,20 +508,28 @@ function makeToolSpecs(relay, currentSession, update = () => {
     },
     {
       name: "flight_recorder_status",
+      requiresRelayCompatibility: false,
       description: "Return bounded rolling-buffer duration, frame, byte, and drop counters.",
       inputSchema: sessionOnlyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: (input) => relay.flightRecorderStatus({ sessionId: resolveSessionId(input) })
+      handle: (input) => ctx.relay.flightRecorderStatus({ sessionId: ctx.resolveSessionId(input) })
     },
     {
       name: "flight_recorder_save_last",
       description: "Encode and save the most recent buffered browser video without stopping the flight recorder.",
       inputSchema: objectSchema({
         session: sessionSchemaProperty,
-        outputPath: { type: "string", description: "Fresh .webm or .mp4 path, resolved against the MCP process working directory." },
-        durationMs: { type: "integer", minimum: 1, description: "Recent duration to save. Defaults to 30000 and cannot exceed retention." }
+        outputPath: {
+          type: "string",
+          description: "Fresh .webm or .mp4 path, resolved against the MCP process working directory."
+        },
+        durationMs: {
+          type: "integer",
+          minimum: 1,
+          description: "Recent duration to save. Defaults to 30000 and cannot exceed retention."
+        }
       }, ["outputPath"]),
       readOnly: false,
       destructive: false,
@@ -498,9 +537,9 @@ function makeToolSpecs(relay, currentSession, update = () => {
       handle: (input) => {
         const object = requireObject(input);
         const durationMs = optionalPositiveIntegerField(object, "durationMs");
-        return relay.flightRecorderSaveLast({
-          sessionId: resolveSessionId(object),
-          outputPath: path.resolve(requiredStringField(object, "outputPath")),
+        return ctx.relay.flightRecorderSaveLast({
+          sessionId: ctx.resolveSessionId(object),
+          outputPath: path3.resolve(requiredStringField(object, "outputPath")),
           ...durationMs === undefined ? {} : { durationMs }
         });
       }
@@ -512,21 +551,45 @@ function makeToolSpecs(relay, currentSession, update = () => {
       readOnly: false,
       destructive: true,
       idempotent: true,
-      handle: (input) => relay.flightRecorderCancel({ sessionId: resolveSessionId(input) })
-    },
+      handle: (input) => ctx.relay.flightRecorderCancel({ sessionId: ctx.resolveSessionId(input) })
+    }
+  ]
+});
+
+// src/mcp/secrets.ts
+import { Effect as Effect5 } from "effect";
+import path4 from "node:path";
+registerMcpTools({
+  order: 600,
+  build: (ctx) => [
     {
       name: "secrets_list",
+      requiresRelayCompatibility: false,
       description: 'List what agents may type without seeing: site secrets the user stored (names, kinds and allowed origins; type them with secrets.type(target, name) in execute; only the user adds them with `opencode-browser secrets add`), and Deadbolt logins the user granted to Browse for this session\'s allowed sites (title, username, which values and passkeys, never values; sign in with the signin tool or secrets.signIn(), or type one value with secrets.type(target, "deadbolt:<site>[/<username>]", { field })). Passkeys are listed by account (username, displayName). Only the user grants Deadbolt logins, in Deadbolt (`deadbolt agents allow <site>`, or `deadbolt agents allow --all`).',
       inputSchema: sessionOnlyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: (input) => Effect.gen(function* () {
+      handle: (input) => Effect5.gen(function* () {
         const secrets = yield* listSecrets();
         if (!readClient()) {
-          return { secrets, deadbolt: { connected: false, logins: [], passkeys: [], note: "Browse isn't connected to Deadbolt. The user can connect it with `opencode-browser deadbolt connect` and grant logins with `deadbolt agents allow <site>`." } };
+          return {
+            secrets,
+            deadbolt: {
+              connected: false,
+              logins: [],
+              passkeys: [],
+              note: "Browse isn't connected to Deadbolt. The user can connect it with `opencode-browser deadbolt connect` and grant logins with `deadbolt agents allow <site>`."
+            }
+          };
         }
-        const deadbolt = yield* relay.deadboltLogins({ sessionId: resolveSessionId(input) }).pipe(Effect.catch((error) => Effect.succeed({ connected: true, origins: [], logins: [], passkeys: [], error: { code: "unavailable", message: error.message } })));
+        const deadbolt = yield* ctx.relay.deadboltLogins({ sessionId: ctx.resolveSessionId(input) }).pipe(Effect5.catch((error) => Effect5.succeed({
+          connected: true,
+          origins: [],
+          logins: [],
+          passkeys: [],
+          error: { code: "unavailable", message: error.message }
+        })));
         return { secrets, deadbolt };
       })
     },
@@ -534,39 +597,59 @@ function makeToolSpecs(relay, currentSession, update = () => {
       name: "signin",
       description: 'Sign in to a site in the session\'s page with a Deadbolt login the user granted to Browse, without seeing any value. The relay does the whole sign-in in one call: username, submit, password, an authenticator (TOTP) code when asked (split boxes too), "Use password instead" toggles, and Sign in with Google when a Google login is granted. A username also picks the passkey account when the site signs in with a passkey. Returns only {status: signed_in | needs_user | needs_choice | not_granted | failed, step, reason}; needs_choice comes with choices [{username, displayName}] when several passkeys could sign in: call again with one username. needs_user means a captcha, a code sent by SMS or email, a push approval or a new-device check: hand it to the user with handoff() in execute. not_granted: tell the user what to allow (`deadbolt agents allow <site>`). Navigate to the sign-in page first, or pass site.',
       inputSchema: objectSchema({
-        site: { type: "string", description: "The login's site: a host like github.com, or an exact origin. Defaults to the page's site; the page goes there first when it is elsewhere." },
-        username: { type: "string", description: "Which login (and which passkey account), when several are granted for the site." },
+        site: {
+          type: "string",
+          description: "The login's site: a host like github.com, or an exact origin. Defaults to the page's site; the page goes there first when it is elsewhere."
+        },
+        username: {
+          type: "string",
+          description: "Which login (and which passkey account), when several are granted for the site."
+        },
         session: sessionSchemaProperty,
         timeoutMs: { type: "integer", minimum: 1, description: "Overall limit. Defaults to 90000." }
       }),
       readOnly: false,
       destructive: true,
       idempotent: false,
-      handle: (input) => Effect.gen(function* () {
+      handle: (input) => Effect5.gen(function* () {
         const object = input === undefined ? {} : requireObject(input);
         const site = optionalStringField(object, "site");
         const username = optionalStringField(object, "username");
         const timeoutMs = optionalPositiveIntegerField(object, "timeoutMs");
         const explicitSession = optionalStringField(object, "session");
-        const sessionId = explicitSession ?? currentSession.id;
-        yield* ensureExtensionConnected({ relay, sessionId, waitForReconnect: true });
-        const options = { ...site ? { site } : {}, ...username ? { username } : {}, ...timeoutMs === undefined ? {} : { timeoutMs } };
+        const sessionId = explicitSession ?? ctx.currentSession.id;
+        yield* ensureExtensionConnected({ relay: ctx.relay, sessionId, waitForReconnect: true });
+        const options = {
+          ...site ? { site } : {},
+          ...username ? { username } : {},
+          ...timeoutMs === undefined ? {} : { timeoutMs }
+        };
         const outerTimeoutMs = timeoutMs === undefined ? 120000 : Math.max(60000, timeoutMs + 1e4);
-        const result = yield* relay.execute({ sessionId, code: `return await secrets.signIn(${JSON.stringify(options)})`, createIfMissing: !explicitSession, timeoutMs: outerTimeoutMs });
-        establishCurrentSession(sessionId);
+        const result = yield* ctx.relay.execute({
+          sessionId,
+          code: `return await secrets.signIn(${JSON.stringify(options)})`,
+          createIfMissing: !explicitSession,
+          timeoutMs: outerTimeoutMs
+        });
+        ctx.establishCurrentSession(sessionId);
         if (result.isError)
-          return yield* Effect.fail(new Error(result.text));
-        return { ...result.value, ...result.aftermath?.endUrl ? { url: result.aftermath.endUrl } : {}, ...result.warnings?.length ? { warnings: result.warnings } : {} };
+          return yield* Effect5.fail(new Error(result.text));
+        return {
+          ...result.value,
+          ...result.aftermath?.endUrl ? { url: result.aftermath.endUrl } : {},
+          ...result.warnings?.length ? { warnings: result.warnings } : {}
+        };
       })
     },
     {
       name: "secrets_status",
+      requiresRelayCompatibility: false,
       description: "Return secret profile references, sources, and expiration metadata without revealing credential values.",
       inputSchema: objectSchema({ name: { type: "string", description: "Secret profile name." } }, ["name"]),
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: (input) => relay.authStatus({ name: requiredStringField(input, "name") })
+      handle: (input) => ctx.relay.authStatus({ name: requiredStringField(input, "name") })
     },
     {
       name: "secrets_refresh",
@@ -584,8 +667,8 @@ function makeToolSpecs(relay, currentSession, update = () => {
         const object = requireObject(input);
         const timeoutMs = optionalPositiveIntegerField(object, "timeoutMs");
         const urlFilter = optionalStringField(object, "urlFilter");
-        return relay.authRefresh({
-          sessionId: resolveSessionId(object),
+        return ctx.relay.authRefresh({
+          sessionId: ctx.resolveSessionId(object),
           name: requiredStringField(object, "name"),
           ...urlFilter ? { urlFilter } : {},
           ...timeoutMs === undefined ? {} : { timeoutMs }
@@ -610,30 +693,204 @@ function makeToolSpecs(relay, currentSession, update = () => {
         const args = optionalStringArrayField(object, "args");
         const cwd = optionalStringField(object, "cwd");
         const timeoutMs = optionalPositiveIntegerField(object, "timeoutMs");
-        return relay.authRun({
+        return ctx.relay.authRun({
           name: requiredStringField(object, "name"),
           command: requiredStringField(object, "command"),
           ...args ? { args } : {},
-          cwd: path.resolve(cwd ?? process.cwd()),
+          cwd: path4.resolve(cwd ?? process.cwd()),
           ...timeoutMs === undefined ? {} : { timeoutMs }
         });
       }
+    }
+  ]
+});
+
+// src/mcp/session.ts
+import { Effect as Effect6, Predicate } from "effect";
+registerMcpTools({
+  order: 200,
+  build: (ctx) => [
+    {
+      name: "session_new",
+      listsBrowsers: true,
+      description: `Create a Browse session and make it current for this MCP server.${ctx.browserNote}`,
+      inputSchema: objectSchema({
+        browser: ctx.browserProperty,
+        id: { type: "string", description: "Optional lowercase session id." },
+        readOnly: {
+          type: "boolean",
+          description: "Create a read-only session: the relay rejects input-dispatching CDP so scripts can inspect but not click or type."
+        },
+        allowedOrigins: {
+          type: "array",
+          items: { type: "string" },
+          description: "Optional domain allowlist: hosts or origins this session's tabs may load (example.com, *.example.com, https://app.example.com, http://localhost:3000). Navigations elsewhere are refused or sent back to about:blank; private and loopback addresses need an exact entry."
+        }
+      }),
+      readOnly: false,
+      destructive: false,
+      idempotent: false,
+      handle: (input) => Effect6.gen(function* () {
+        const requestedId = optionalStringField(input, "id");
+        const readOnly = optionalBooleanField(input, "readOnly");
+        const allowedOrigins = optionalStringArrayField(input, "allowedOrigins");
+        const browser = optionalStringField(input, "browser");
+        const session = yield* ctx.relay.sessionNew(requestedId, {
+          ...readOnly ? { readOnly: true } : {},
+          ...allowedOrigins ? { allowedOrigins } : {},
+          ...browser ? { browser } : {}
+        });
+        ctx.establishCurrentSession(session.id);
+        return { session };
+      })
     },
     {
-      name: "skill",
-      description: "Return the Browse agent skill instructions.",
+      name: "session_allowlist",
+      description: "Set the domain allowlist of a session (the current one by default): the hosts or origins its tabs may load. Pass an empty list to remove it. Use it before typing secrets or working on sites with untrusted content.",
+      inputSchema: objectSchema({
+        session: { type: "string", description: "Session id; defaults to the current session." },
+        allowedOrigins: {
+          type: "array",
+          items: { type: "string" },
+          description: "Patterns: example.com, *.example.com, https://app.example.com, http://localhost:3000. Empty removes the allowlist."
+        }
+      }, ["allowedOrigins"]),
+      readOnly: false,
+      destructive: false,
+      idempotent: true,
+      handle: (input) => Effect6.gen(function* () {
+        const sessionId = ctx.resolveSessionId(input);
+        const allowedOrigins = requireObject(input).allowedOrigins;
+        if (!Array.isArray(allowedOrigins) || !allowedOrigins.every((item) => Predicate.isString(item))) {
+          return yield* Effect6.fail(new Error("allowedOrigins must be an array of strings"));
+        }
+        return { session: yield* ctx.relay.sessionAllowlist(sessionId, allowedOrigins) };
+      })
+    },
+    {
+      name: "session_list",
+      requiresRelayCompatibility: false,
+      description: "List Browse sessions.",
+      inputSchema: emptyInputSchema,
+      readOnly: true,
+      destructive: false,
+      idempotent: false,
+      handle: () => ctx.relay.sessions.pipe(Effect6.map((sessions) => ({ sessions })))
+    },
+    {
+      name: "session_current",
+      requiresRelayCompatibility: false,
+      description: "Return this MCP server's current Browse session id.",
       inputSchema: emptyInputSchema,
       readOnly: true,
       destructive: false,
       idempotent: true,
-      handle: () => Effect.tryPromise({
-        try: () => fs.readFile(path.join(packageRoot, "skills", "browse", "SKILL.md"), "utf8"),
-        catch: (cause) => new Error("read opencode-browser skill", { cause })
+      handle: () => Effect6.succeed({ currentSession: ctx.currentSession.id })
+    },
+    {
+      name: "session_use",
+      description: "Set this MCP server's current Browse session id.",
+      inputSchema: objectSchema({
+        id: { type: "string", description: "Existing Browse session id." }
+      }, ["id"]),
+      readOnly: false,
+      destructive: false,
+      idempotent: true,
+      handle: (input) => Effect6.gen(function* () {
+        const id = yield* Effect6.try(() => requiredStringField(input, "id"));
+        yield* ensureSessionExists(ctx.relay, id);
+        ctx.establishCurrentSession(id);
+        return { currentSession: ctx.currentSession.id };
+      })
+    },
+    {
+      name: "session_reset",
+      description: "Reset a Browse session's state and page.",
+      inputSchema: objectSchema({
+        id: sessionSchemaProperty,
+        session: sessionAliasSchemaProperty
+      }),
+      readOnly: false,
+      destructive: true,
+      idempotent: false,
+      handle: (input) => Effect6.gen(function* () {
+        const id = ctx.resolveSessionId(input, "id");
+        const reset = yield* ctx.relay.sessionReset(id);
+        ctx.establishCurrentSession(id);
+        return reset;
+      })
+    },
+    {
+      name: "session_delete",
+      description: "Delete a Browse session.",
+      inputSchema: objectSchema({
+        id: sessionSchemaProperty,
+        session: sessionAliasSchemaProperty
+      }),
+      readOnly: false,
+      destructive: true,
+      idempotent: true,
+      handle: (input) => Effect6.gen(function* () {
+        const id = ctx.resolveSessionId(input, "id");
+        const result = yield* ctx.relay.sessionDelete(id);
+        if (ctx.currentSession.id === id) {
+          ctx.currentSession.id = `mcp-${crypto.randomUUID().slice(0, 8)}`;
+          ctx.currentSession.established = false;
+        }
+        return { ...result, currentSession: ctx.currentSession.id };
+      })
+    },
+    {
+      name: "session_adopt",
+      description: "Make an attached tab the Browse session's default page for subsequent bare execute calls. Omit targetUrl and targetIndex when only one user-attached tab is available.",
+      inputSchema: objectSchema({
+        session: {
+          type: "string",
+          description: "Optional existing Browse session id. Explicit ids must already exist; omit this field to use the MCP server's current session, which is created when needed."
+        },
+        targetUrl: {
+          type: "string",
+          description: "Adopt an existing attached page whose URL contains this text. Omit when only one user-attached tab is available. This does not navigate or open a URL."
+        },
+        targetIndex: {
+          type: "integer",
+          minimum: 0,
+          description: "Adopt the attached page at this zero-based target index."
+        },
+        tabId: {
+          type: "integer",
+          description: "Adopt the user's tab with this Chrome tab id (the tab= value in status)."
+        }
+      }),
+      readOnly: false,
+      destructive: false,
+      idempotent: false,
+      handle: (input) => Effect6.gen(function* () {
+        const args = yield* Effect6.try(() => parseAdoptArguments(input));
+        const sessionId = args.session ?? ctx.currentSession.id;
+        const result = yield* ctx.relay.sessionAdopt({
+          sessionId,
+          createIfMissing: !args.session,
+          ...args.targetSelection ? { targetSelection: args.targetSelection } : {},
+          ...args.tabId === undefined ? {} : { tabId: args.tabId }
+        });
+        ctx.establishCurrentSession(sessionId);
+        return {
+          ...result,
+          confirmation: `Adopted session '${result.session.id}' default page: ${result.adoptedUrl}`
+        };
       })
     }
-  ];
+  ]
+});
+
+// src/mcp.ts
+var packageRoot = path5.dirname(path5.dirname(fileURLToPath(import.meta.url)));
+function shimSession() {
+  const value = process.env.OPENCODE_BROWSER_MCP_SESSION;
+  return value && /^mcp-[0-9a-f]{8}$/.test(value) ? value : undefined;
 }
-var registerTools = Effect.gen(function* () {
+var registerTools = Effect7.gen(function* () {
   const server = yield* McpServer.McpServer;
   const relay = yield* Service;
   const configuredSession = Option.getOrUndefined(yield* Config.option(Config.String("OPENCODE_BROWSER_SESSION")));
@@ -654,7 +911,7 @@ var registerTools = Effect.gen(function* () {
       return result;
     return new McpSchema.CallToolResult({
       ...result,
-      content: [...result.content, McpSchema.TextContent.make({ text: mcpUpdateNote(notice) })]
+      content: [...result.content, McpSchema.TextContent.make({ text: mcpUpdateNote2(notice) })]
     });
   };
   const register = (spec) => server.addTool({
@@ -671,37 +928,33 @@ var registerTools = Effect.gen(function* () {
     }),
     annotations: Context.empty(),
     handle: (payload) => {
-      const operation = mcpToolRequiresRelayCompatibility(spec.name) ? ensureRelay({ relay }).pipe(Effect.flatMap((readiness) => readiness.buildProblem ? Effect.fail(new Error(readiness.buildProblem)) : spec.handle(payload))) : spec.handle(payload);
-      return operation.pipe(Effect.match({
-        onFailure: (error) => toolResult({ text: mcpErrorMessage(spec.name, error.message), isError: true }),
-        onSuccess: (value) => toolResultForValue(value)
-      }), Effect.map((result) => withUpdateNote(spec.name, result)));
+      const operation = spec.requiresRelayCompatibility !== false ? ensureRelay({ relay }).pipe(Effect7.flatMap((readiness) => readiness.buildProblem ? Effect7.fail(new Error(readiness.buildProblem)) : spec.handle(payload))) : spec.handle(payload);
+      return operation.pipe(Effect7.match({
+        onFailure: (error) => toolResult({ text: mcpErrorMessage2(spec.name, error.message), isError: true }),
+        onSuccess: (value) => toolResultForValue2(value)
+      }), Effect7.map((result) => withUpdateNote(spec.name, result)));
     }
   });
-  const connectedBrowsers = relay.extensionStatus.pipe(Effect.map((status) => (status.browsers ?? []).map(({ id, name, default: isDefault }) => ({ id, name, default: isDefault }))), Effect.orElseSucceed(() => []));
-  let browsers = yield* connectedBrowsers.pipe(Effect.timeoutOption(1000), Effect.map(Option.getOrElse(() => [])));
-  yield* Effect.forEach(makeToolSpecs(relay, currentSession, () => updates.current, browsers), register, { discard: true });
-  const refreshBrowsers = Effect.gen(function* () {
+  const connectedBrowsers = relay.extensionStatus.pipe(Effect7.map((status) => (status.browsers ?? []).map(({ id, name, default: isDefault }) => ({ id, name, default: isDefault }))), Effect7.orElseSucceed(() => []));
+  let browsers = yield* connectedBrowsers.pipe(Effect7.timeoutOption(1000), Effect7.map(Option.getOrElse(() => [])));
+  const buildSpecs = (currentBrowsers) => buildRegisteredMcpTools(createMcpToolContext({
+    relay,
+    currentSession,
+    packageRoot,
+    update: () => updates.current,
+    browsers: currentBrowsers
+  }));
+  yield* Effect7.forEach(buildSpecs(browsers), register, { discard: true });
+  const refreshBrowsers = Effect7.gen(function* () {
     const next = yield* connectedBrowsers;
-    if (browsersNote(next) === browsersNote(browsers))
+    if (browsersNote2(next) === browsersNote2(browsers))
       return;
     browsers = next;
-    const specs = makeToolSpecs(relay, currentSession, () => updates.current, browsers).filter((spec) => browserTools.has(spec.name));
-    yield* Effect.forEach(specs, register, { discard: true });
+    const specs = buildSpecs(browsers).filter((spec) => spec.listsBrowsers === true);
+    yield* Effect7.forEach(specs, register, { discard: true });
   });
-  yield* refreshBrowsers.pipe(Effect.repeat(Schedule.spaced("5 seconds")), Effect.forkDetach);
+  yield* refreshBrowsers.pipe(Effect7.repeat(Schedule.spaced("5 seconds")), Effect7.forkDetach);
 });
-var browserTools = new Set(["execute", "session_new"]);
-function mcpUpdateNote(notice) {
-  return `Note: Browse has an update: ${notice.summary}. Tell the user they can run \`${notice.command}\` and then restart opencode, or ask you to run it for them.`;
-}
-function shimSession() {
-  const value = process.env.OPENCODE_BROWSER_MCP_SESSION;
-  return value && /^mcp-[0-9a-f]{8}$/.test(value) ? value : undefined;
-}
-function mcpToolRequiresRelayCompatibility(name) {
-  return !["status", "session_list", "session_current", "network_status", "recording_status", "flight_recorder_status", "secrets_status", "secrets_list", "skill"].includes(name);
-}
 var mcpServerLayer = McpServer.layerStdio({
   name: "browse",
   version: opencodeBrowserVersion2,
@@ -709,162 +962,12 @@ var mcpServerLayer = McpServer.layerStdio({
 });
 var mcpToolsLayer = Layer.effectDiscard(registerTools);
 var runMcpServer = Layer.launch(mcpToolsLayer.pipe(Layer.provide(mcpServerLayer), Layer.provide(NodeStdio.layer), Layer.provide(layerFetchMcp)));
-var ensureSessionExists = Effect.fnUntraced(function* (relay, id) {
-  const sessions = yield* relay.sessions;
-  const exists = sessions.some((session) => {
-    return session.id === id;
-  });
-  if (!exists) {
-    return yield* Effect.fail(new Error(`Session not found: ${id}`));
-  }
-});
-function parseExecuteArguments(input) {
-  const object = requireObject(input);
-  const code = requiredStringField(object, "code");
-  const session = optionalStringField(object, "session");
-  const timeoutMs = optionalNonNegativeIntegerField(object, "timeoutMs");
-  const targetSelection = parseMcpTargetSelection(object);
-  const browser = optionalStringField(object, "browser");
-  return {
-    code,
-    ...session ? { session } : {},
-    ...timeoutMs === undefined ? {} : { timeoutMs },
-    ...targetSelection ? { targetSelection } : {},
-    ...browser ? { browser } : {}
-  };
-}
-function parseAdoptArguments(input) {
-  const object = requireObject(input);
-  const session = optionalStringField(object, "session");
-  const targetSelection = parseMcpTargetSelection(object);
-  const tabId = typeof object.tabId === "number" && Number.isInteger(object.tabId) ? object.tabId : undefined;
-  if (tabId !== undefined && targetSelection)
-    throw new Error("Use only one of tabId, targetUrl, or targetIndex");
-  return {
-    ...session ? { session } : {},
-    ...targetSelection ? { targetSelection } : {},
-    ...tabId === undefined ? {} : { tabId }
-  };
-}
-function parseMcpTargetSelection(input) {
-  const urlIncludes = optionalStringField(input, "targetUrl");
-  const selection = parseTargetSelection2({
-    ...urlIncludes ? { urlIncludes } : {},
-    ...input.targetIndex === undefined ? {} : { index: input.targetIndex }
-  });
-  return selection?.urlIncludes || selection?.index !== undefined ? selection : undefined;
-}
-function requiredStringField(input, field) {
-  const value = optionalStringField(input, field);
-  if (!value) {
-    throw new Error(`${field} is required`);
-  }
-  return value;
-}
-function optionalStringField(input, field) {
-  const value = getString2(requireObject(input), field);
-  return value ? value : undefined;
-}
-function optionalBooleanField(input, field) {
-  const value = requireObject(input)[field];
-  return Predicate.isBoolean(value) ? value : undefined;
-}
-function optionalPositiveIntegerField(input, field) {
-  const value = requireObject(input)[field];
-  if (value === undefined)
-    return;
-  if (!Predicate.isNumber(value) || !Number.isInteger(value) || value <= 0) {
-    throw new Error(`${field} must be a positive integer`);
-  }
-  return value;
-}
-function optionalNonNegativeIntegerField(input, field) {
-  const value = requireObject(input)[field];
-  if (value === undefined)
-    return;
-  if (!Predicate.isNumber(value) || !Number.isInteger(value) || value < 0) {
-    throw new Error(`${field} must be a non-negative integer`);
-  }
-  return value;
-}
-function optionalStringArrayField(input, field) {
-  const value = requireObject(input)[field];
-  if (value === undefined)
-    return;
-  if (!Array.isArray(value) || !value.every((item) => Predicate.isString(item) && item.length > 0)) {
-    throw new Error(`${field} must be an array of non-empty strings`);
-  }
-  return value;
-}
-function requireObject(input) {
-  const object = getObject2(input);
-  if (!object) {
-    throw new Error("Expected arguments object");
-  }
-  return object;
-}
-function stringifyResult(value) {
-  if (Predicate.isString(value)) {
-    return value;
-  }
-  return JSON.stringify(value, null, 2);
-}
-function toolResultForValue(value) {
-  const object = getObject2(value);
-  const isError = object?.isError === true;
-  const media = Array.isArray(object?.media) ? object.media.flatMap((item) => {
-    const image = getObject2(item);
-    const mimeType = getString2(image, "mimeType");
-    const data = getString2(image, "data");
-    return image?.type === "image" && mimeType !== undefined && data !== undefined ? [{ data, mimeType }] : [];
-  }) : [];
-  const errorText = isError ? getString2(object, "text") : undefined;
-  if (media.length > 0) {
-    const { media: _media, ...structuredContent } = object ?? {};
-    const text = errorText ?? stringifyResult(structuredContent);
-    return new McpSchema.CallToolResult({
-      content: [
-        McpSchema.TextContent.make({ text }),
-        ...media.map((image) => McpSchema.ImageContent.make({
-          data: new Uint8Array(Buffer.from(image.data, "base64")),
-          mimeType: image.mimeType
-        }))
-      ],
-      structuredContent,
-      isError
-    });
-  }
-  const text = errorText ?? stringifyResult(value);
-  return toolResult({ text, ...object ? { structuredContent: object } : {}, isError });
-}
-function mcpErrorMessage(tool, message) {
-  if (!message.startsWith("Session not found:")) {
-    return message;
-  }
-  return tool === "execute" || tool === "session_adopt" ? `${message} Create it with session_new first, or omit the explicit session id to use the MCP current session.` : `${message} Create it with session_new first.`;
-}
-function toolResult(options) {
-  return new McpSchema.CallToolResult({
-    content: [McpSchema.TextContent.make({ text: options.text })],
-    structuredContent: options.structuredContent,
-    isError: options.isError
-  });
-}
-function objectSchema(properties, required = []) {
-  return {
-    type: "object",
-    properties,
-    required: [...required],
-    additionalProperties: false
-  };
-}
 export {
-  browsersNote,
-  mcpErrorMessage,
+  browsersNote2 as browsersNote,
+  mcpErrorMessage2 as mcpErrorMessage,
   mcpServerLayer,
-  mcpToolRequiresRelayCompatibility,
   mcpToolsLayer,
-  mcpUpdateNote,
+  mcpUpdateNote2 as mcpUpdateNote,
   runMcpServer,
-  toolResultForValue
+  toolResultForValue2 as toolResultForValue
 };