refactor(browser): colocate the public API plugin

Hona · Sep 7, 2026 · Sep 1, 2026 · Sep 1, 2026 · Sep 1, 2026 · Sep 1, 2026
commit 3d5652a816b3b669c9cae76ac033098ef09ef994
diff --git a/bun.lock b/bun.lock
diff --git a/packages/browser/package.json b/packages/browser/package.json
diff --git a/packages/browser/test/plugin.test.ts b/packages/browser/test/plugin.test.ts
diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json
diff --git a/packages/browser/README.md → packages/core/src/plugin/browser/README.md b/packages/browser/README.md → packages/core/src/plugin/browser/README.md
@@ -1,13 +1,14 @@
 # Experimental Browser Plugin
 
-The server-side browser tool is a standalone Effect plugin. It uses only the public
-plugin API and keeps its RPC contract in `@opencode-ai/browser/rpc`.
+The server-side browser tool lives alongside the other built-in plugins. Its
+implementation uses only the public plugin API, public schemas, and Effect. The
+shared RPC contract is `@opencode-ai/schema/browser`; desktop clients do not import Core.
 
-Load the workspace package with normal plugin configuration:
+Disable it through normal plugin configuration:
 
 ```jsonc
 {
-  "plugins": ["./packages/browser"],
+  "plugins": ["-opencode.browser"],
 }
 ```
 

diff --git a/packages/browser/src/index.ts → packages/core/src/plugin/browser/index.ts b/packages/browser/src/index.ts → packages/core/src/plugin/browser/index.ts
@@ -1,7 +1,7 @@
 import { Plugin, Session, Tool } from "@opencode-ai/plugin/effect"
 import type { RpcRegistration } from "@opencode-ai/plugin/effect/rpc"
 import { Deferred, Effect, Encoding, Stream } from "effect"
-import { Browser } from "./rpc.js"
+import { Browser } from "@opencode-ai/schema/browser"
 
 type Attachment = {
   connectionID: string

diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
@@ -79,6 +79,7 @@ import { WebSearchTool } from "../tool/plugin/websearch.js"
 import { WellKnown } from "../wellknown.js"
 import { WriteTool } from "../tool/plugin/write.js"
 import { AgentPlugin } from "./agent.js"
+import BrowserPlugin from "./browser/index.js"
 import { CommandPlugin } from "./command.js"
 import { PlanPlugin } from "./plan.js"
 import { ModelsDevPlugin } from "./models-dev.js"
@@ -192,6 +193,7 @@ export const requirements = LayerNode.group([
 export type InternalPlugin = Plugin<Requirements | Scope.Scope>
 
 const pre = [
+  BrowserPlugin,
   ConfigMcpPlugin.Plugin,
   McpCodeModeExclusionPlugin.Plugin,
   WellKnownPlugin.Plugin,