refactor: switch MCP to direct self-reexport imports

packages/opencode/src/cli/cmd/mcp.ts

@@ -4,7 +4,7 @@ import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/
 import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"
 import * as prompts from "@clack/prompts"
 import { UI } from "../ui"
-import { MCP } from "../../mcp"
+import { MCP } from "../../mcp/mcp"
 import { McpAuth } from "../../mcp/auth"
 import { McpOAuthProvider } from "../../mcp/oauth-provider"
 import { Config } from "../../config"

packages/opencode/src/cli/cmd/tui/worker.ts

@@ -9,7 +9,7 @@ import { Config } from "@/config"
 import { GlobalBus } from "@/bus/global"
 import { Flag } from "@/flag/flag"
 import { writeHeapSnapshot } from "node:v8"
-import { Heap } from "@/cli"
+import { Heap } from "@/cli/heap"
 import { AppRuntime } from "@/effect/app-runtime"
 
 await Log.init({

packages/opencode/src/cli/heap.ts

@@ -8,50 +8,52 @@ const log = Log.create({ service: "heap" })
 const MINUTE = 60_000
 const LIMIT = 2 * 1024 * 1024 * 1024
 
-let timer: Timer | undefined
-let lock = false
-let armed = true
+export namespace Heap {
+  let timer: Timer | undefined
+  let lock = false
+  let armed = true
 
-export function start() {
-  if (!Flag.OPENCODE_AUTO_HEAP_SNAPSHOT) return
-  if (timer) return
+  export function start() {
+    if (!Flag.OPENCODE_AUTO_HEAP_SNAPSHOT) return
+    if (timer) return
 
-  const run = async () => {
-    if (lock) return
+    const run = async () => {
+      if (lock) return
 
-    const stat = process.memoryUsage()
-    if (stat.rss <= LIMIT) {
-      armed = true
-      return
-    }
-    if (!armed) return
+      const stat = process.memoryUsage()
+      if (stat.rss <= LIMIT) {
+        armed = true
+        return
+      }
+      if (!armed) return
 
-    lock = true
-    armed = false
-    const file = path.join(
-      Global.Path.log,
-      `heap-${process.pid}-${new Date().toISOString().replace(/[:.]/g, "")}.heapsnapshot`,
-    )
-    log.warn("heap usage exceeded limit", {
-      rss: stat.rss,
-      heap: stat.heapUsed,
-      file,
-    })
-
-    await Promise.resolve()
-      .then(() => writeHeapSnapshot(file))
-      .catch((err) => {
-        log.error("failed to write heap snapshot", {
-          error: err instanceof Error ? err.message : String(err),
-          file,
-        })
+      lock = true
+      armed = false
+      const file = path.join(
+        Global.Path.log,
+        `heap-${process.pid}-${new Date().toISOString().replace(/[:.]/g, "")}.heapsnapshot`,
+      )
+      log.warn("heap usage exceeded limit", {
+        rss: stat.rss,
+        heap: stat.heapUsed,
+        file,
       })
 
-    lock = false
-  }
+      await Promise.resolve()
+        .then(() => writeHeapSnapshot(file))
+        .catch((err) => {
+          log.error("failed to write heap snapshot", {
+            error: err instanceof Error ? err.message : String(err),
+            file,
+          })
+        })
 
-  timer = setInterval(() => {
-    void run()
-  }, MINUTE)
-  timer.unref?.()
+      lock = false
+    }
+
+    timer = setInterval(() => {
+      void run()
+    }, MINUTE)
+    timer.unref?.()
+  }
 }

packages/opencode/src/cli/index.ts

@@ -1 +0,0 @@
-export * as Heap from "./heap"

packages/opencode/src/command/command.ts

@@ -6,7 +6,7 @@ import { SessionID, MessageID } from "@/session/schema"
 import { Effect, Layer, Context } from "effect"
 import z from "zod"
 import { Config } from "../config"
-import { MCP } from "../mcp"
+import { MCP } from "../mcp/mcp"
 import { Skill } from "../skill"
 import PROMPT_INITIALIZE from "./template/initialize.txt"
 import PROMPT_REVIEW from "./template/review.txt"

packages/opencode/src/effect/app-runtime.ts

@@ -34,7 +34,7 @@ import { SessionPrompt } from "@/session/prompt"
 import { Instruction } from "@/session/instruction"
 import { LLM } from "@/session/llm"
 import { LSP } from "@/lsp"
-import { MCP } from "@/mcp"
+import { MCP } from "@/mcp/mcp"
 import { McpAuth } from "@/mcp/auth"
 import { Command } from "@/command"
 import { Truncate } from "@/tool"

packages/opencode/src/index.ts

@@ -36,7 +36,7 @@ import { JsonMigration } from "./storage"
 import { Database } from "./storage"
 import { errorMessage } from "./util/error"
 import { PluginCommand } from "./cli/cmd/plug"
-import { Heap } from "./cli"
+import { Heap } from "./cli/heap"
 import { drizzle } from "drizzle-orm/bun-sqlite"
 
 process.on("unhandledRejection", (e) => {

packages/opencode/src/mcp/index.ts

@@ -1 +0,0 @@
-export * as MCP from "./mcp"

packages/opencode/src/mcp/mcp.ts

@@ -922,3 +922,5 @@ export const defaultLayer = layer.pipe(
   Layer.provide(CrossSpawnSpawner.defaultLayer),
   Layer.provide(AppFileSystem.defaultLayer),
 )
+
+export * as MCP from "./mcp"

packages/opencode/src/server/instance/experimental.ts

@@ -6,7 +6,7 @@ import { ToolRegistry } from "../../tool"
 import { Worktree } from "../../worktree"
 import { Instance } from "../../project/instance"
 import { Project } from "../../project"
-import { MCP } from "../../mcp"
+import { MCP } from "../../mcp/mcp"
 import { Session } from "../../session"
 import { Config } from "../../config"
 import { ConsoleState } from "../../config/console-state"

packages/opencode/src/server/instance/mcp.ts

@@ -1,7 +1,7 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
-import { MCP } from "../../mcp"
+import { MCP } from "../../mcp/mcp"
 import { Config } from "../../config"
 import { AppRuntime } from "../../effect/app-runtime"
 import { errors } from "../error"

packages/opencode/src/session/prompt.ts

@@ -20,7 +20,7 @@ import PROMPT_PLAN from "../session/prompt/plan.txt"
 import BUILD_SWITCH from "../session/prompt/build-switch.txt"
 import MAX_STEPS from "../session/prompt/max-steps.txt"
 import { ToolRegistry } from "../tool"
-import { MCP } from "../mcp"
+import { MCP } from "../mcp/mcp"
 import { LSP } from "../lsp"
 import { FileTime } from "../file/time"
 import { Flag } from "../flag/flag"

packages/opencode/test/session/prompt-effect.test.ts

@@ -9,7 +9,7 @@ import { Command } from "../../src/command"
 import { Config } from "../../src/config"
 import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
-import { MCP } from "../../src/mcp"
+import { MCP } from "../../src/mcp/mcp"
 import { Permission } from "../../src/permission"
 import { Plugin } from "../../src/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"

packages/opencode/test/session/snapshot-tool-race.test.ts

@@ -35,7 +35,7 @@ import { Command } from "../../src/command"
 import { Config } from "../../src/config"
 import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
-import { MCP } from "../../src/mcp"
+import { MCP } from "../../src/mcp/mcp"
 import { Permission } from "../../src/permission"
 import { Plugin } from "../../src/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"