diff --git a/packages/core/src/plugin/browser/index.ts b/packages/core/src/plugin/browser/index.ts
index 3b2735fd826..1dffe3d7a64 100644
--- a/packages/core/src/plugin/browser/index.ts
+++ b/packages/core/src/plugin/browser/index.ts
@@ -1,5 +1,7 @@
-import { Plugin, Session, Tool } from "@opencode-ai/plugin/effect"
+import { Plugin } from "@opencode-ai/plugin/effect"
 import type { RpcRegistration } from "@opencode-ai/plugin/effect/rpc"
+import type { Session } from "@opencode-ai/schema/session"
+import { Tool } from "@opencode-ai/schema/tool"
 import { Deferred, Effect, Encoding, Stream } from "effect"
 import { Browser } from "@opencode-ai/schema/browser"
 
diff --git a/packages/plugin/src/effect/index.ts b/packages/plugin/src/effect/index.ts
index f455d1cb94f..2ac5a13e1e8 100644
--- a/packages/plugin/src/effect/index.ts
+++ b/packages/plugin/src/effect/index.ts
@@ -13,8 +13,6 @@ export { PersistentPty } from "@opencode-ai/schema/persistent-pty"
 export { Provider } from "@opencode-ai/schema/provider"
 export { Reference } from "@opencode-ai/schema/reference"
 export { Rpc } from "@opencode-ai/schema/rpc"
-export { Session } from "@opencode-ai/schema/session"
 export { Skill } from "@opencode-ai/schema/skill"
-export { Tool } from "@opencode-ai/schema/tool"
 export { Vcs } from "@opencode-ai/schema/vcs"
 export { WebSearch } from "@opencode-ai/schema/websearch"
diff --git a/packages/sdk/test/browser-plugin.test.ts b/packages/sdk/test/browser-plugin.test.ts
index 8b6a3e5a42a..0c129aeb440 100644
--- a/packages/sdk/test/browser-plugin.test.ts
+++ b/packages/sdk/test/browser-plugin.test.ts
@@ -3,7 +3,8 @@ import { mkdir } from "node:fs/promises"
 import path from "node:path"
 import plugin from "@opencode-ai/core/plugin/browser/index"
 import { Browser } from "@opencode-ai/schema/browser"
-import { Agent, Rpc, Tool } from "@opencode-ai/plugin/effect"
+import { Agent, Rpc } from "@opencode-ai/plugin/effect"
+import { Tool } from "@opencode-ai/schema/tool"
 import { AbsolutePath, Location, OpenCode, SessionMessage } from "@opencode-ai/sdk/effect"
 import { Effect, Fiber, Queue, Stream } from "effect"
 import { tmpdirScoped } from "../../core/test/fixture/tmpdir"