refactor: remove module barrels (#24554)

packages/opencode/src/storage/db.ts

@@ -2,17 +2,17 @@ import { type SQLiteBunDatabase } from "drizzle-orm/bun-sqlite"
 import { migrate } from "drizzle-orm/bun-sqlite/migrator"
 import { type SQLiteTransaction } from "drizzle-orm/sqlite-core"
 export * from "drizzle-orm"
-import { LocalContext } from "../util"
+import { LocalContext } from "@/util/local-context"
 import { lazy } from "../util/lazy"
 import { Global } from "@opencode-ai/core/global"
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { NamedError } from "@opencode-ai/core/util/error"
 import z from "zod"
 import path from "path"
 import { readFileSync, readdirSync, existsSync } from "fs"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { InstallationChannel } from "@opencode-ai/core/installation/version"
-import { InstanceState } from "@/effect"
+import { InstanceState } from "@/effect/instance-state"
 import { iife } from "@/util/iife"
 import { init } from "#db"
 
@@ -170,3 +170,5 @@ export function transaction<T>(
     throw err
   }
 }
+
+export * as Database from "./db"

packages/opencode/src/storage/index.ts

@@ -1,26 +0,0 @@
-export * as JsonMigration from "./json-migration"
-export * as Database from "./db"
-export * as Storage from "./storage"
-export {
-  asc,
-  eq,
-  and,
-  or,
-  inArray,
-  desc,
-  not,
-  sql,
-  isNull,
-  isNotNull,
-  count,
-  like,
-  exists,
-  between,
-  gt,
-  gte,
-  lt,
-  lte,
-  ne,
-} from "drizzle-orm"
-export type { SQL } from "drizzle-orm"
-export { NotFoundError } from "./storage"

packages/opencode/src/storage/json-migration.ts

@@ -1,13 +1,13 @@
 import type { SQLiteBunDatabase } from "drizzle-orm/bun-sqlite"
 import type { NodeSQLiteDatabase } from "drizzle-orm/node-sqlite"
 import { Global } from "@opencode-ai/core/global"
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { ProjectTable } from "../project/project.sql"
 import { SessionTable, MessageTable, PartTable, TodoTable, PermissionTable } from "../session/session.sql"
 import { SessionShareTable } from "../share/share.sql"
 import path from "path"
 import { existsSync } from "fs"
-import { Filesystem } from "../util"
+import { Filesystem } from "@/util/filesystem"
 import { Glob } from "@opencode-ai/core/util/glob"
 
 const log = Log.create({ service: "json-migration" })
@@ -426,3 +426,5 @@ export async function run(db: SQLiteBunDatabase<any, any> | NodeSQLiteDatabase<a
 
   return stats
 }
+
+export * as JsonMigration from "./json-migration"

packages/opencode/src/storage/storage.ts

@@ -1,4 +1,4 @@
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import path from "path"
 import { Global } from "@opencode-ai/core/global"
 import { NamedError } from "@opencode-ai/core/util/error"
@@ -329,3 +329,5 @@ export const layer = Layer.effect(
 )
 
 export const defaultLayer = layer.pipe(Layer.provide(AppFileSystem.defaultLayer), Layer.provide(Git.defaultLayer))
+
+export * as Storage from "./storage"