refactor: remove module barrels (#24554)

packages/opencode/src/project/bootstrap.ts

@@ -1,6 +1,6 @@
 import { Plugin } from "../plugin"
 import { Format } from "../format"
-import { LSP } from "../lsp"
+import { LSP } from "@/lsp/lsp"
 import { File } from "../file"
 import { Snapshot } from "../snapshot"
 import * as Project from "./project"
@@ -8,11 +8,11 @@ import * as Vcs from "./vcs"
 import { Bus } from "../bus"
 import { Command } from "../command"
 import { Instance } from "./instance"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { FileWatcher } from "@/file/watcher"
-import { ShareNext } from "@/share"
+import { ShareNext } from "@/share/share-next"
 import * as Effect from "effect/Effect"
-import { Config } from "@/config"
+import { Config } from "@/config/config"
 
 export const InstanceBootstrap = Effect.gen(function* () {
   Log.Default.info("bootstrapping", { directory: Instance.directory })

packages/opencode/src/project/index.ts

@@ -1,2 +0,0 @@
-export * as Vcs from "./vcs"
-export * as Project from "./project"

packages/opencode/src/project/instance.ts

@@ -3,8 +3,8 @@ import { disposeInstance } from "@/effect/instance-registry"
 import { makeRuntime } from "@/effect/run-service"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { iife } from "@/util/iife"
-import { Log } from "@/util"
-import { LocalContext } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
+import { LocalContext } from "@/util/local-context"
 import * as Project from "./project"
 import { WorkspaceContext } from "@/control-plane/workspace-context"
 

packages/opencode/src/project/project.ts

@@ -1,8 +1,10 @@
 import z from "zod"
-import { and, Database, eq } from "../storage"
+import { and } from "drizzle-orm"
+import { Database } from "@/storage/db"
+import { eq } from "drizzle-orm"
 import { ProjectTable } from "./project.sql"
 import { SessionTable } from "../session/session.sql"
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
@@ -504,3 +506,5 @@ export function setInitialized(id: ProjectID) {
     db.update(ProjectTable).set({ time_initialized: Date.now() }).where(eq(ProjectTable.id, id)).run(),
   )
 }
+
+export * as Project from "./project"

packages/opencode/src/project/vcs.ts

@@ -3,11 +3,11 @@ import { formatPatch, structuredPatch } from "diff"
 import path from "path"
 import { Bus } from "@/bus"
 import { BusEvent } from "@/bus/bus-event"
-import { InstanceState } from "@/effect"
+import { InstanceState } from "@/effect/instance-state"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { FileWatcher } from "@/file/watcher"
 import { Git } from "@/git"
-import { Log } from "@/util"
+import * as Log from "@opencode-ai/core/util/log"
 import { zod } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 
@@ -222,3 +222,5 @@ export const defaultLayer = layer.pipe(
   Layer.provide(AppFileSystem.defaultLayer),
   Layer.provide(Bus.layer),
 )
+
+export * as Vcs from "./vcs"