refactor: remove module barrels (#24554)

packages/opencode/src/server/error.ts

@@ -1,6 +1,6 @@
 import { resolver } from "hono-openapi"
 import z from "zod"
-import { NotFoundError } from "../storage"
+import { NotFoundError } from "@/storage/storage"
 
 export const ERRORS = {
   400: {

packages/opencode/src/server/fence.ts

@@ -1,9 +1,10 @@
 import type { MiddlewareHandler } from "hono"
-import { Database, inArray } from "@/storage"
+import { Database } from "@/storage/db"
+import { inArray } from "drizzle-orm"
 import { EventSequenceTable } from "@/sync/event.sql"
 import { Workspace } from "@/control-plane/workspace"
 import type { WorkspaceID } from "@/control-plane/schema"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 
 const HEADER = "x-opencode-sync"
 type State = Record<string, number>

packages/opencode/src/server/mdns.ts

@@ -1,4 +1,4 @@
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Bonjour } from "bonjour-service"
 
 const log = Log.create({ service: "mdns" })

packages/opencode/src/server/middleware.ts

@@ -1,11 +1,11 @@
-import { Provider } from "../provider"
+import { Provider } from "@/provider/provider"
 import { NamedError } from "@opencode-ai/core/util/error"
-import { NotFoundError } from "../storage"
-import { Session } from "../session"
+import { NotFoundError } from "@/storage/storage"
+import { Session } from "@/session/session"
 import type { ContentfulStatusCode } from "hono/utils/http-status"
 import type { ErrorHandler, MiddlewareHandler } from "hono"
 import { HTTPException } from "hono/http-exception"
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { basicAuth } from "hono/basic-auth"
 import { cors } from "hono/cors"

packages/opencode/src/server/projectors.ts

@@ -1,8 +1,9 @@
 import sessionProjectors from "../session/projectors"
 import { SyncEvent } from "@/sync"
-import { Session } from "@/session"
+import { Session } from "@/session/session"
 import { SessionTable } from "@/session/session.sql"
-import { Database, eq } from "@/storage"
+import { Database } from "@/storage/db"
+import { eq } from "drizzle-orm"
 
 export function initProjectors() {
   SyncEvent.init({

packages/opencode/src/server/proxy.ts

@@ -1,6 +1,6 @@
 import { Hono } from "hono"
 import type { UpgradeWebSocket } from "hono/ws"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import * as Fence from "./fence"
 import type { WorkspaceID } from "@/control-plane/schema"
 import { Workspace } from "@/control-plane/workspace"

packages/opencode/src/server/routes/control/index.ts

@@ -1,6 +1,6 @@
 import { Auth } from "@/auth"
 import { AppRuntime } from "@/effect/app-runtime"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Effect } from "effect"
 import { ProviderID } from "@/provider/schema"
 import { Hono } from "hono"

packages/opencode/src/server/routes/control/workspace.ts

@@ -8,7 +8,7 @@ import { zodObject } from "@/util/effect-zod"
 import { Instance } from "@/project/instance"
 import { errors } from "../../error"
 import { lazy } from "@/util/lazy"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { errorData } from "@/util/error"
 
 const log = Log.create({ service: "server.workspace" })

packages/opencode/src/server/routes/global.ts

@@ -11,9 +11,9 @@ import { AsyncQueue } from "@/util/queue"
 import { Instance } from "../../project/instance"
 import { Installation } from "@/installation"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
-import { Log } from "../../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { lazy } from "../../util/lazy"
-import { Config } from "../../config"
+import { Config } from "@/config/config"
 import { errors } from "../error"
 
 const log = Log.create({ service: "server" })

packages/opencode/src/server/routes/instance/config.ts

@@ -1,8 +1,8 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
-import { Config } from "@/config"
-import { Provider } from "@/provider"
+import { Config } from "@/config/config"
+import { Provider } from "@/provider/provider"
 import { errors } from "../../error"
 import { lazy } from "@/util/lazy"
 import { jsonRequest } from "./trace"

packages/opencode/src/server/routes/instance/event.ts

@@ -2,7 +2,7 @@ import z from "zod"
 import { Hono } from "hono"
 import { describeRoute, resolver } from "hono-openapi"
 import { streamSSE } from "hono/streaming"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { AsyncQueue } from "@/util/queue"

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

@@ -3,13 +3,13 @@ import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
 import * as EffectZod from "@/util/effect-zod"
 import { ProviderID, ModelID } from "@/provider/schema"
-import { ToolRegistry } from "@/tool"
+import { ToolRegistry } from "@/tool/registry"
 import { Worktree } from "@/worktree"
 import { Instance } from "@/project/instance"
-import { Project } from "@/project"
+import { Project } from "@/project/project"
 import { MCP } from "@/mcp"
-import { Session } from "@/session"
-import { Config } from "@/config"
+import { Session } from "@/session/session"
+import { Config } from "@/config/config"
 import { ConsoleState } from "@/config/console-state"
 import { Account } from "@/account/account"
 import { AccountID, OrgID } from "@/account/schema"

packages/opencode/src/server/routes/instance/file.ts

@@ -3,7 +3,7 @@ import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
 import { File } from "@/file"
 import { Ripgrep } from "@/file/ripgrep"
-import { LSP } from "@/lsp"
+import { LSP } from "@/lsp/lsp"
 import { Instance } from "@/project/instance"
 import { lazy } from "@/util/lazy"
 import { jsonRequest } from "./trace"

packages/opencode/src/server/routes/instance/httpapi/config.ts

@@ -1,5 +1,5 @@
-import { Config } from "@/config"
-import { Provider } from "@/provider"
+import { Config } from "@/config/config"
+import { Provider } from "@/provider/provider"
 import * as InstanceState from "@/effect/instance-state"
 import { Effect, Layer } from "effect"
 import { HttpApi, HttpApiBuilder, HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"

packages/opencode/src/server/routes/instance/httpapi/event.ts

@@ -1,5 +1,5 @@
 import { Bus } from "@/bus"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Effect } from "effect"
 import * as Stream from "effect/Stream"
 import { HttpRouter, HttpServerResponse } from "effect/unstable/http"

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

@@ -1,13 +1,13 @@
 import { Account } from "@/account/account"
 import { AccountID, OrgID } from "@/account/schema"
 import { Agent } from "@/agent/agent"
-import { Config } from "@/config"
-import { InstanceState } from "@/effect"
+import { Config } from "@/config/config"
+import { InstanceState } from "@/effect/instance-state"
 import { MCP } from "@/mcp"
-import { Project } from "@/project"
+import { Project } from "@/project/project"
 import { ProviderID, ModelID } from "@/provider/schema"
-import { Session } from "@/session"
-import { ToolRegistry } from "@/tool"
+import { Session } from "@/session/session"
+import { ToolRegistry } from "@/tool/registry"
 import * as EffectZod from "@/util/effect-zod"
 import { Worktree } from "@/worktree"
 import { Effect, Layer, Option, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/file.ts

@@ -1,7 +1,7 @@
 import { File } from "@/file"
 import { Ripgrep } from "@/file/ripgrep"
 import * as InstanceState from "@/effect/instance-state"
-import { LSP } from "@/lsp"
+import { LSP } from "@/lsp/lsp"
 import { Effect, Layer, Schema } from "effect"
 import { HttpApi, HttpApiBuilder, HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { Authorization } from "./auth"

packages/opencode/src/server/routes/instance/httpapi/instance.ts

@@ -2,8 +2,8 @@ import { Agent } from "@/agent/agent"
 import { Command } from "@/command"
 import { Format } from "@/format"
 import { Global } from "@opencode-ai/core/global"
-import { LSP } from "@/lsp"
-import { Vcs } from "@/project"
+import { LSP } from "@/lsp/lsp"
+import { Vcs } from "@/project/vcs"
 import { Skill } from "@/skill"
 import * as InstanceState from "@/effect/instance-state"
 import { Effect, Layer, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/project.ts

@@ -1,6 +1,6 @@
 import * as InstanceState from "@/effect/instance-state"
 import { AppRuntime } from "@/effect/app-runtime"
-import { Project } from "@/project"
+import { Project } from "@/project/project"
 import { InstanceBootstrap } from "@/project/bootstrap"
 import { ProjectID } from "@/project/schema"
 import { Effect, Layer, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/provider.ts

@@ -1,7 +1,7 @@
-import { ProviderAuth } from "@/provider"
-import { Config } from "@/config"
-import { ModelsDev } from "@/provider"
-import { Provider } from "@/provider"
+import { ProviderAuth } from "@/provider/auth"
+import { Config } from "@/config/config"
+import { ModelsDev } from "@/provider/models"
+import { Provider } from "@/provider/provider"
 import { ProviderID } from "@/provider/schema"
 import { mapValues } from "remeda"
 import { Effect, Layer, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/pty.ts

@@ -1,4 +1,4 @@
-import { EffectBridge } from "@/effect"
+import { EffectBridge } from "@/effect/bridge"
 import { Pty } from "@/pty"
 import { PtyID } from "@/pty/schema"
 import { Effect, Layer, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/server.ts

@@ -4,13 +4,13 @@ import { HttpRouter, HttpServer, HttpServerRequest } from "effect/unstable/http"
 import { Bus } from "@/bus"
 import { AppRuntime } from "@/effect/app-runtime"
 import { InstanceRef, WorkspaceRef } from "@/effect/instance-ref"
-import { Observability } from "@/effect"
+import * as Observability from "@opencode-ai/core/effect/observability"
 import { InstanceBootstrap } from "@/project/bootstrap"
 import { Instance } from "@/project/instance"
 import { Pty } from "@/pty"
-import { Session } from "@/session"
+import { Session } from "@/session/session"
 import { lazy } from "@/util/lazy"
-import { Filesystem } from "@/util"
+import { Filesystem } from "@/util/filesystem"
 import { authorizationLayer } from "./auth"
 import { ConfigApi, configHandlers } from "./config"
 import { eventRoute } from "./event"

packages/opencode/src/server/routes/instance/httpapi/session.ts

@@ -7,8 +7,8 @@ import { Permission } from "@/permission"
 import { PermissionID } from "@/permission/schema"
 import { Instance } from "@/project/instance"
 import { ModelID, ProviderID } from "@/provider/schema"
-import { SessionShare } from "@/share"
-import { Session } from "@/session"
+import { SessionShare } from "@/share/session"
+import { Session } from "@/session/session"
 import { SessionCompaction } from "@/session/compaction"
 import { MessageV2 } from "@/session/message-v2"
 import { SessionPrompt } from "@/session/prompt"
@@ -19,7 +19,7 @@ import { SessionSummary } from "@/session/summary"
 import { Todo } from "@/session/todo"
 import { MessageID, PartID, SessionID } from "@/session/schema"
 import { Snapshot } from "@/snapshot"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { NamedError } from "@opencode-ai/core/util/error"
 import { Effect, Layer, Schema, Struct } from "effect"
 import * as Stream from "effect/Stream"

packages/opencode/src/server/routes/instance/httpapi/sync.ts

@@ -1,6 +1,12 @@
 import { startWorkspaceSyncing } from "@/control-plane/workspace"
 import * as InstanceState from "@/effect/instance-state"
-import { Database, asc, and, eq, lte, not, or } from "@/storage"
+import { Database } from "@/storage/db"
+import { asc } from "drizzle-orm"
+import { and } from "drizzle-orm"
+import { eq } from "drizzle-orm"
+import { lte } from "drizzle-orm"
+import { not } from "drizzle-orm"
+import { or } from "drizzle-orm"
 import { SyncEvent } from "@/sync"
 import { EventTable } from "@/sync/event.sql"
 import { Effect, Layer, Schema } from "effect"

packages/opencode/src/server/routes/instance/httpapi/tui.ts

@@ -1,7 +1,9 @@
 import { Bus } from "@/bus"
 import { TuiEvent } from "@/cli/cmd/tui/event"
-import { Session } from "@/session"
 import { SessionID } from "@/session/schema"
+import { SessionTable } from "@/session/session.sql"
+import * as Database from "@/storage/db"
+import { eq } from "drizzle-orm"
 import { Effect, Layer, Schema } from "effect"
 import { HttpApi, HttpApiBuilder, HttpApiEndpoint, HttpApiError, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { nextTuiRequest, submitTuiResponse } from "../tui"
@@ -181,7 +183,6 @@ export const TuiApi = HttpApi.make("tui")
 export const tuiHandlers = Layer.unwrap(
   Effect.gen(function* () {
     const bus = yield* Bus.Service
-    const session = yield* Session.Service
     const publishCommand = (command: typeof TuiEvent.CommandExecute.properties.Type.command) =>
       bus.publish(TuiEvent.CommandExecute, { command })
 
@@ -250,9 +251,10 @@ export const tuiHandlers = Layer.unwrap(
     const selectSession = Effect.fn("TuiHttpApi.selectSession")(function* (ctx: {
       payload: typeof TuiEvent.SessionSelect.properties.Type
     }) {
-      yield* session
-        .get(ctx.payload.sessionID)
-        .pipe(Effect.catchCause(() => Effect.fail(new HttpApiError.NotFound({}))))
+      const row = yield* Effect.sync(() =>
+        Database.use((db) => db.select({ id: SessionTable.id }).from(SessionTable).where(eq(SessionTable.id, ctx.payload.sessionID)).get()),
+      )
+      if (!row) return yield* new HttpApiError.NotFound({})
       yield* bus.publish(TuiEvent.SessionSelect, ctx.payload)
       return true
     })

packages/opencode/src/server/routes/instance/index.ts

@@ -6,11 +6,11 @@ import z from "zod"
 import { Format } from "@/format"
 import { TuiRoutes } from "./tui"
 import { Instance } from "@/project/instance"
-import { Vcs } from "@/project"
+import { Vcs } from "@/project/vcs"
 import { Agent } from "@/agent/agent"
 import { Skill } from "@/skill"
 import { Global } from "@opencode-ai/core/global"
-import { LSP } from "@/lsp"
+import { LSP } from "@/lsp/lsp"
 import { Command } from "@/command"
 import { QuestionRoutes } from "./question"
 import { PermissionRoutes } from "./permission"

packages/opencode/src/server/routes/instance/project.ts

@@ -2,7 +2,7 @@ import { Hono } from "hono"
 import { describeRoute, validator } from "hono-openapi"
 import { resolver } from "hono-openapi"
 import { Instance } from "@/project/instance"
-import { Project } from "@/project"
+import { Project } from "@/project/project"
 import z from "zod"
 import { ProjectID } from "@/project/schema"
 import { errors } from "../../error"

packages/opencode/src/server/routes/instance/provider.ts

@@ -1,10 +1,10 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
-import { Config } from "@/config"
-import { Provider } from "@/provider"
-import { ModelsDev } from "@/provider"
-import { ProviderAuth } from "@/provider"
+import { Config } from "@/config/config"
+import { Provider } from "@/provider/provider"
+import { ModelsDev } from "@/provider/models"
+import { ProviderAuth } from "@/provider/auth"
 import { ProviderID } from "@/provider/schema"
 import { mapValues } from "remeda"
 import { errors } from "../../error"

packages/opencode/src/server/routes/instance/pty.ts

@@ -7,7 +7,7 @@ import { AppRuntime } from "@/effect/app-runtime"
 import { Pty } from "@/pty"
 import { PtyID } from "@/pty/schema"
 import { Shell } from "@/shell/shell"
-import { NotFoundError } from "@/storage"
+import { NotFoundError } from "@/storage/storage"
 import { errors } from "../../error"
 import { jsonRequest, runRequest } from "./trace"
 

packages/opencode/src/server/routes/instance/session.ts

@@ -3,13 +3,13 @@ import { stream } from "hono/streaming"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import { SessionID, MessageID, PartID } from "@/session/schema"
 import z from "zod"
-import { Session } from "@/session"
+import { Session } from "@/session/session"
 import { MessageV2 } from "@/session/message-v2"
 import { SessionPrompt } from "@/session/prompt"
 import { SessionRunState } from "@/session/run-state"
 import { SessionCompaction } from "@/session/compaction"
 import { SessionRevert } from "@/session/revert"
-import { SessionShare } from "@/share"
+import { SessionShare } from "@/share/session"
 import { SessionStatus } from "@/session/status"
 import { SessionSummary } from "@/session/summary"
 import { Todo } from "@/session/todo"
@@ -17,7 +17,7 @@ import { Effect } from "effect"
 import { Agent } from "@/agent/agent"
 import { Snapshot } from "@/snapshot"
 import { Command } from "@/command"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Permission } from "@/permission"
 import { PermissionID } from "@/permission/schema"
 import { ModelID, ProviderID } from "@/provider/schema"

packages/opencode/src/server/routes/instance/sync.ts

@@ -2,10 +2,16 @@ import z from "zod"
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import { SyncEvent } from "@/sync"
-import { Database, asc, and, not, or, lte, eq } from "@/storage"
+import { Database } from "@/storage/db"
+import { asc } from "drizzle-orm"
+import { and } from "drizzle-orm"
+import { not } from "drizzle-orm"
+import { or } from "drizzle-orm"
+import { lte } from "drizzle-orm"
+import { eq } from "drizzle-orm"
 import { EventTable } from "@/sync/event.sql"
 import { lazy } from "@/util/lazy"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { startWorkspaceSyncing } from "@/control-plane/workspace"
 import { Instance } from "@/project/instance"
 import { errors } from "../../error"

packages/opencode/src/server/routes/instance/tui.ts

@@ -3,7 +3,7 @@ import { describeRoute, validator, resolver } from "hono-openapi"
 import { Schema } from "effect"
 import z from "zod"
 import { Bus } from "@/bus"
-import { Session } from "@/session"
+import { Session } from "@/session/session"
 import type { SessionID } from "@/session/schema"
 import { TuiEvent } from "@/cli/cmd/tui/event"
 import { zodObject } from "@/util/effect-zod"

packages/opencode/src/server/server.ts

@@ -2,7 +2,7 @@ import { generateSpecs } from "hono-openapi"
 import { Hono } from "hono"
 import { adapter } from "#hono"
 import { lazy } from "@/util/lazy"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { WorkspaceID } from "@/control-plane/schema"
 import { MDNS } from "./mdns"

packages/opencode/src/server/workspace.ts

@@ -7,11 +7,11 @@ import { Workspace } from "@/control-plane/workspace"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { InstanceBootstrap } from "@/project/bootstrap"
 import { Instance } from "@/project/instance"
-import { Session } from "@/session"
+import { Session } from "@/session/session"
 import { SessionID } from "@/session/schema"
 import { AppRuntime } from "@/effect/app-runtime"
 import { Effect } from "effect"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { ServerProxy } from "./proxy"
 
 type Rule = { method?: string; path: string; exact?: boolean; action: "local" | "forward" }