refactor: remove module barrels (#24554)

packages/opencode/src/config/agent.ts

@@ -4,7 +4,7 @@ import { Exit, Schema, SchemaGetter } from "effect"
 import { Bus } from "@/bus"
 import { zod } from "@/util/effect-zod"
 import { PositiveInt, withStatics } from "@/util/schema"
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { NamedError } from "@opencode-ai/core/util/error"
 import { Glob } from "@opencode-ai/core/util/glob"
 import { configEntryNameFromPath } from "./entry-name"
@@ -119,7 +119,7 @@ export async function load(dir: string) {
       const message = ConfigMarkdown.FrontmatterError.isInstance(err)
         ? err.data.message
         : `Failed to parse agent ${item}`
-      const { Session } = await import("@/session")
+      const { Session } = await import("@/session/session")
       void Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
       log.error("failed to load agent", { agent: item, err })
       return undefined
@@ -151,7 +151,7 @@ export async function loadMode(dir: string) {
       const message = ConfigMarkdown.FrontmatterError.isInstance(err)
         ? err.data.message
         : `Failed to parse mode ${item}`
-      const { Session } = await import("@/session")
+      const { Session } = await import("@/session/session")
       void Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
       log.error("failed to load mode", { mode: item, err })
       return undefined

packages/opencode/src/config/command.ts

@@ -1,6 +1,6 @@
 export * as ConfigCommand from "./command"
 
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import { Schema } from "effect"
 import { NamedError } from "@opencode-ai/core/util/error"
 import { Glob } from "@opencode-ai/core/util/glob"
@@ -36,7 +36,7 @@ export async function load(dir: string) {
       const message = ConfigMarkdown.FrontmatterError.isInstance(err)
         ? err.data.message
         : `Failed to parse command ${item}`
-      const { Session } = await import("@/session")
+      const { Session } = await import("@/session/session")
       void Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
       log.error("failed to load command", { command: item, err })
       return undefined

packages/opencode/src/config/config.ts

@@ -1,4 +1,4 @@
-import { Log } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
 import path from "path"
 import { pathToFileURL } from "url"
 import os from "os"
@@ -20,7 +20,7 @@ import { Account } from "@/account/account"
 import { isRecord } from "@/util/record"
 import type { ConsoleState } from "./console-state"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
-import { InstanceState } from "@/effect"
+import { InstanceState } from "@/effect/instance-state"
 import { Context, Duration, Effect, Exit, Fiber, Layer, Option, Schema } from "effect"
 import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
 import { InstanceRef } from "@/effect/instance-ref"
@@ -795,3 +795,5 @@ export const defaultLayer = layer.pipe(
   Layer.provide(Account.defaultLayer),
   Layer.provide(Npm.defaultLayer),
 )
+
+export * as Config from "./config"

packages/opencode/src/config/index.ts

@@ -1,16 +0,0 @@
-export * as Config from "./config"
-export * as ConfigAgent from "./agent"
-export * as ConfigCommand from "./command"
-export * as ConfigError from "./error"
-export * as ConfigFormatter from "./formatter"
-export * as ConfigLSP from "./lsp"
-export * as ConfigVariable from "./variable"
-export { ConfigManaged } from "./managed"
-export * as ConfigMarkdown from "./markdown"
-export * as ConfigMCP from "./mcp"
-export { ConfigModelID } from "./model-id"
-export * as ConfigParse from "./parse"
-export * as ConfigPermission from "./permission"
-export * as ConfigPaths from "./paths"
-export * as ConfigProvider from "./provider"
-export * as ConfigSkills from "./skills"

packages/opencode/src/config/managed.ts

@@ -3,7 +3,8 @@ export * as ConfigManaged from "./managed"
 import { existsSync } from "fs"
 import os from "os"
 import path from "path"
-import { Log, Process } from "../util"
+import * as Log from "@opencode-ai/core/util/log"
+import { Process } from "@/util/process"
 import { warn } from "console"
 
 const log = Log.create({ service: "config" })

packages/opencode/src/config/markdown.ts

@@ -1,7 +1,7 @@
 import { NamedError } from "@opencode-ai/core/util/error"
 import matter from "gray-matter"
 import { z } from "zod"
-import { Filesystem } from "../util"
+import { Filesystem } from "@/util/filesystem"
 
 export const FILE_REGEX = /(?<![\w`])@(\.?[^\s`,.]*(?:\.[^\s`,.]+)*)/g
 export const SHELL_REGEX = /!`([^`]+)`/g
@@ -95,3 +95,5 @@ export const FrontmatterError = NamedError.create(
     message: z.string(),
   }),
 )
+
+export * as ConfigMarkdown from "./markdown"

packages/opencode/src/config/paths.ts

@@ -1,7 +1,7 @@
 export * as ConfigPaths from "./paths"
 
 import path from "path"
-import { Filesystem } from "@/util"
+import { Filesystem } from "@/util/filesystem"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { Global } from "@opencode-ai/core/global"
 import { unique } from "remeda"

packages/opencode/src/config/variable.ts

@@ -2,7 +2,7 @@ export * as ConfigVariable from "./variable"
 
 import path from "path"
 import os from "os"
-import { Filesystem } from "@/util"
+import { Filesystem } from "@/util/filesystem"
 import { InvalidError } from "./error"
 
 type ParseSource =