feat: unwrap config namespaces to flat exports + barrel (#22746)

packages/opencode/script/schema.ts

@@ -2,7 +2,7 @@
 
 import { z } from "zod"
 import { Config } from "../src/config"
-import { TuiConfig } from "../src/config/tui"
+import { TuiConfig } from "../src/config"
 
 function generate(schema: z.ZodType) {
   const result = z.toJSONSchema(schema, {

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

@@ -1,7 +1,7 @@
 import { intro, log, outro, spinner } from "@clack/prompts"
 import type { Argv } from "yargs"
 
-import { ConfigPaths } from "../../config/paths"
+import { ConfigPaths } from "../../config"
 import { Global } from "../../global"
 import { installPlugin, patchPluginConfig, readPluginManifest } from "../../plugin/install"
 import { resolvePluginTarget } from "../../plugin/shared"

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -57,7 +57,7 @@ import { ArgsProvider, useArgs, type Args } from "./context/args"
 import open from "open"
 import { PromptRefProvider, usePromptRef } from "./context/prompt"
 import { TuiConfigProvider, useTuiConfig } from "./context/tui-config"
-import { TuiConfig } from "@/config/tui"
+import { TuiConfig } from "@/config"
 import { createTuiApi, TuiPluginRuntime, type RouteMap } from "./plugin"
 import { FormatError, FormatUnknownError } from "@/cli/error"
 

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

@@ -2,7 +2,7 @@ import { cmd } from "../cmd"
 import { UI } from "@/cli/ui"
 import { tui } from "./app"
 import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32"
-import { TuiConfig } from "@/config/tui"
+import { TuiConfig } from "@/config"
 import { Instance } from "@/project/instance"
 import { existsSync } from "fs"
 

packages/opencode/src/cli/cmd/tui/context/keybind.tsx

@@ -1,7 +1,7 @@
 import { createMemo } from "solid-js"
 import { Keybind } from "@/util"
 import { pipe, mapValues } from "remeda"
-import type { TuiConfig } from "@/config/tui"
+import type { TuiConfig } from "@/config"
 import type { ParsedKey, Renderable } from "@opentui/core"
 import { createStore } from "solid-js/store"
 import { useKeyboard, useRenderer } from "@opentui/solid"

packages/opencode/src/cli/cmd/tui/context/tui-config.tsx

@@ -1,4 +1,4 @@
-import { TuiConfig } from "@/config/tui"
+import { TuiConfig } from "@/config"
 import { createSimpleContext } from "./helper"
 
 export const { use: useTuiConfig, provider: TuiConfigProvider } = createSimpleContext({

packages/opencode/src/cli/cmd/tui/plugin/api.tsx

@@ -8,7 +8,7 @@ import type { useSDK } from "@tui/context/sdk"
 import type { useSync } from "@tui/context/sync"
 import type { useTheme } from "@tui/context/theme"
 import { Dialog as DialogUI, type useDialog } from "@tui/ui/dialog"
-import type { TuiConfig } from "@/config/tui"
+import type { TuiConfig } from "@/config"
 import { createPluginKeybind } from "../context/plugin-keybinds"
 import type { useKV } from "../context/kv"
 import { DialogAlert } from "../ui/dialog-alert"

packages/opencode/src/cli/cmd/tui/plugin/runtime.ts

@@ -14,7 +14,7 @@ import path from "path"
 import { fileURLToPath } from "url"
 
 import { Config } from "@/config"
-import { TuiConfig } from "@/config/tui"
+import { TuiConfig } from "@/config"
 import { Log } from "@/util"
 import { errorData, errorMessage } from "@/util/error"
 import { isRecord } from "@/util/record"

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

@@ -13,7 +13,7 @@ import { Filesystem } from "@/util"
 import type { GlobalEvent } from "@opencode-ai/sdk/v2"
 import type { EventSource } from "./context/sdk"
 import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32"
-import { TuiConfig } from "@/config/tui"
+import { TuiConfig } from "@/config"
 import { Instance } from "@/project/instance"
 import { writeHeapSnapshot } from "v8"
 

packages/opencode/src/cli/cmd/tui/util/scroll.ts

@@ -1,5 +1,5 @@
 import { MacOSScrollAccel, type ScrollAcceleration } from "@opentui/core"
-import type { TuiConfig } from "@/config/tui"
+import type { TuiConfig } from "@/config"
 
 export class CustomSpeedScroll implements ScrollAcceleration {
   constructor(private speed: number) {}

packages/opencode/src/cli/error.ts

@@ -1,5 +1,5 @@
 import { AccountServiceError, AccountTransportError } from "@/account"
-import { ConfigMarkdown } from "@/config/markdown"
+import { ConfigMarkdown } from "@/config"
 import { errorFormat } from "@/util/error"
 import { Config } from "../config"
 import { MCP } from "../mcp"

packages/opencode/src/config/config.ts

@@ -21,7 +21,7 @@ import {
 import { Instance, type InstanceContext } from "../project/instance"
 import { LSPServer } from "../lsp/server"
 import { Installation } from "@/installation"
-import { ConfigMarkdown } from "./markdown"
+import { ConfigMarkdown } from "."
 import { existsSync } from "fs"
 import { Bus } from "@/bus"
 import { GlobalBus } from "@/bus/global"
@@ -29,7 +29,7 @@ import { Event } from "../server/event"
 import { Glob } from "@opencode-ai/shared/util/glob"
 import { Account } from "@/account"
 import { isRecord } from "@/util/record"
-import { ConfigPaths } from "./paths"
+import { ConfigPaths } from "."
 import type { ConsoleState } from "./console-state"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { InstanceState } from "@/effect"

packages/opencode/src/config/index.ts

@@ -1 +1,4 @@
 export * as Config from "./config"
+export * as ConfigMarkdown from "./markdown"
+export * as ConfigPaths from "./paths"
+export * as TuiConfig from "./tui"

packages/opencode/src/config/markdown.ts

@@ -3,21 +3,20 @@ import matter from "gray-matter"
 import { z } from "zod"
 import { Filesystem } from "../util"
 
-export namespace ConfigMarkdown {
+export const FILE_REGEX = /(?<![\w`])@(\.?[^\s`,.]*(?:\.[^\s`,.]+)*)/g
-  export const FILE_REGEX = /(?<![\w`])@(\.?[^\s`,.]*(?:\.[^\s`,.]+)*)/g
+export const SHELL_REGEX = /!`([^`]+)`/g
-  export const SHELL_REGEX = /!`([^`]+)`/g
 
-  export function files(template: string) {
+export function files(template: string) {
   return Array.from(template.matchAll(FILE_REGEX))
-  }
+}
 
-  export function shell(template: string) {
+export function shell(template: string) {
   return Array.from(template.matchAll(SHELL_REGEX))
-  }
+}
 
-  // other coding agents like claude code allow invalid yaml in their
+// other coding agents like claude code allow invalid yaml in their
-  // frontmatter, we need to fallback to a more permissive parser for those cases
+// frontmatter, we need to fallback to a more permissive parser for those cases
-  export function fallbackSanitization(content: string): string {
+export function fallbackSanitization(content: string): string {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/)
   if (!match) return content
 
@@ -66,9 +65,9 @@ export namespace ConfigMarkdown {
 
   const processed = result.join("\n")
   return content.replace(frontmatter, () => processed)
-  }
+}
 
-  export async function parse(filePath: string) {
+export async function parse(filePath: string) {
   const template = await Filesystem.readText(filePath)
 
   try {
@@ -87,13 +86,12 @@ export namespace ConfigMarkdown {
       )
     }
   }
-  }
+}
 
-  export const FrontmatterError = NamedError.create(
+export const FrontmatterError = NamedError.create(
   "ConfigFrontmatterError",
   z.object({
     path: z.string(),
     message: z.string(),
   }),
-  )
+)
-}

packages/opencode/src/config/paths.ts

@@ -7,12 +7,11 @@ import { Filesystem } from "@/util"
 import { Flag } from "@/flag/flag"
 import { Global } from "@/global"
 
-export namespace ConfigPaths {
+export async function projectFiles(name: string, directory: string, worktree: string) {
-  export async function projectFiles(name: string, directory: string, worktree: string) {
   return Filesystem.findUp([`${name}.json`, `${name}.jsonc`], directory, worktree, { rootFirst: true })
-  }
+}
 
-  export async function directories(directory: string, worktree: string) {
+export async function directories(directory: string, worktree: string) {
   return [
     Global.Path.config,
     ...(!Flag.OPENCODE_DISABLE_PROJECT_CONFIG
@@ -33,49 +32,49 @@ export namespace ConfigPaths {
     )),
     ...(Flag.OPENCODE_CONFIG_DIR ? [Flag.OPENCODE_CONFIG_DIR] : []),
   ]
-  }
+}
 
-  export function fileInDirectory(dir: string, name: string) {
+export function fileInDirectory(dir: string, name: string) {
   return [path.join(dir, `${name}.json`), path.join(dir, `${name}.jsonc`)]
-  }
+}
 
-  export const JsonError = NamedError.create(
+export const JsonError = NamedError.create(
   "ConfigJsonError",
   z.object({
     path: z.string(),
     message: z.string().optional(),
   }),
-  )
+)
 
-  export const InvalidError = NamedError.create(
+export const InvalidError = NamedError.create(
   "ConfigInvalidError",
   z.object({
     path: z.string(),
     issues: z.custom<z.core.$ZodIssue[]>().optional(),
     message: z.string().optional(),
   }),
-  )
+)
 
-  /** Read a config file, returning undefined for missing files and throwing JsonError for other failures. */
+/** Read a config file, returning undefined for missing files and throwing JsonError for other failures. */
-  export async function readFile(filepath: string) {
+export async function readFile(filepath: string) {
   return Filesystem.readText(filepath).catch((err: NodeJS.ErrnoException) => {
     if (err.code === "ENOENT") return
     throw new JsonError({ path: filepath }, { cause: err })
   })
-  }
+}
 
-  type ParseSource = string | { source: string; dir: string }
+type ParseSource = string | { source: string; dir: string }
 
-  function source(input: ParseSource) {
+function source(input: ParseSource) {
   return typeof input === "string" ? input : input.source
-  }
+}
 
-  function dir(input: ParseSource) {
+function dir(input: ParseSource) {
   return typeof input === "string" ? path.dirname(input) : input.dir
-  }
+}
 
-  /** Apply {env:VAR} and {file:path} substitutions to config text. */
+/** Apply {env:VAR} and {file:path} substitutions to config text. */
-  async function substitute(text: string, input: ParseSource, missing: "error" | "empty" = "error") {
+async function substitute(text: string, input: ParseSource, missing: "error" | "empty" = "error") {
   text = text.replace(/\{env:([^}]+)\}/g, (_, varName) => {
     return process.env[varName] || ""
   })
@@ -131,10 +130,10 @@ export namespace ConfigPaths {
 
   out += text.slice(cursor)
   return out
-  }
+}
 
-  /** Substitute and parse JSONC text, throwing JsonError on syntax errors. */
+/** Substitute and parse JSONC text, throwing JsonError on syntax errors. */
-  export async function parseText(text: string, input: ParseSource, missing: "error" | "empty" = "error") {
+export async function parseText(text: string, input: ParseSource, missing: "error" | "empty" = "error") {
   const configSource = source(input)
   text = await substitute(text, input, missing)
 
@@ -163,5 +162,4 @@ export namespace ConfigPaths {
   }
 
   return data
-  }
 }

packages/opencode/src/config/tui-migrate.ts

@@ -2,7 +2,7 @@ import path from "path"
 import { type ParseError as JsoncParseError, applyEdits, modify, parse as parseJsonc } from "jsonc-parser"
 import { unique } from "remeda"
 import z from "zod"
-import { ConfigPaths } from "./paths"
+import { ConfigPaths } from "."
 import { TuiInfo, TuiOptions } from "./tui-schema"
 import { Instance } from "@/project/instance"
 import { Flag } from "@/flag/flag"

packages/opencode/src/config/tui.ts

@@ -3,7 +3,7 @@ import z from "zod"
 import { mergeDeep, unique } from "remeda"
 import { Context, Effect, Fiber, Layer } from "effect"
 import { Config } from "."
-import { ConfigPaths } from "./paths"
+import { ConfigPaths } from "."
 import { migrateTuiConfig } from "./tui-migrate"
 import { TuiInfo } from "./tui-schema"
 import { Flag } from "@/flag/flag"
@@ -14,43 +14,42 @@ import { InstanceState } from "@/effect"
 import { makeRuntime } from "@/effect/run-service"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 
-export namespace TuiConfig {
+const log = Log.create({ service: "tui.config" })
-  const log = Log.create({ service: "tui.config" })
 
-  export const Info = TuiInfo
+export const Info = TuiInfo
 
-  type Acc = {
+type Acc = {
   result: Info
-  }
+}
 
-  type State = {
+type State = {
   config: Info
   deps: Array<Fiber.Fiber<void, AppFileSystem.Error>>
-  }
+}
 
-  export type Info = z.output<typeof Info> & {
+export type Info = z.output<typeof Info> & {
   // Internal resolved plugin list used by runtime loading.
   plugin_origins?: Config.PluginOrigin[]
-  }
+}
 
-  export interface Interface {
+export interface Interface {
   readonly get: () => Effect.Effect<Info>
   readonly waitForDependencies: () => Effect.Effect<void, AppFileSystem.Error>
-  }
+}
 
-  export class Service extends Context.Service<Service, Interface>()("@opencode/TuiConfig") {}
+export class Service extends Context.Service<Service, Interface>()("@opencode/TuiConfig") {}
 
-  function pluginScope(file: string, ctx: { directory: string; worktree: string }): Config.PluginScope {
+function pluginScope(file: string, ctx: { directory: string; worktree: string }): Config.PluginScope {
   if (AppFileSystem.contains(ctx.directory, file)) return "local"
   if (ctx.worktree !== "/" && AppFileSystem.contains(ctx.worktree, file)) return "local"
   return "global"
-  }
+}
 
-  function customPath() {
+function customPath() {
   return Flag.OPENCODE_TUI_CONFIG
-  }
+}
 
-  function normalize(raw: Record<string, unknown>) {
+function normalize(raw: Record<string, unknown>) {
   const data = { ...raw }
   if (!("tui" in data)) return data
   if (!isRecord(data.tui)) {
@@ -64,9 +63,9 @@ export namespace TuiConfig {
     ...tui,
     ...data,
   }
-  }
+}
 
-  async function mergeFile(acc: Acc, file: string, ctx: { directory: string; worktree: string }) {
+async function mergeFile(acc: Acc, file: string, ctx: { directory: string; worktree: string }) {
   const data = await loadFile(file)
   acc.result = mergeDeep(acc.result, data)
   if (!data.plugin?.length) return
@@ -78,9 +77,9 @@ export namespace TuiConfig {
   ])
   acc.result.plugin = plugins.map((item) => item.spec)
   acc.result.plugin_origins = plugins
-  }
+}
 
-  async function loadState(ctx: { directory: string; worktree: string }) {
+async function loadState(ctx: { directory: string; worktree: string }) {
   let projectFiles = Flag.OPENCODE_DISABLE_PROJECT_CONFIG
     ? []
     : await ConfigPaths.projectFiles("tui", ctx.directory, ctx.worktree)
@@ -139,9 +138,9 @@ export namespace TuiConfig {
     config: acc.result,
     dirs: acc.result.plugin?.length ? dirs : [],
   }
-  }
+}
 
-  export const layer = Layer.effect(
+export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const cfg = yield* Config.Service
@@ -165,30 +164,30 @@ export namespace TuiConfig {
 
     return Service.of({ get, waitForDependencies })
   }),
-  )
+)
 
-  export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer))
+export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer))
 
-  const { runPromise } = makeRuntime(Service, defaultLayer)
+const { runPromise } = makeRuntime(Service, defaultLayer)
 
-  export async function get() {
+export async function get() {
   return runPromise((svc) => svc.get())
-  }
+}
 
-  export async function waitForDependencies() {
+export async function waitForDependencies() {
   await runPromise((svc) => svc.waitForDependencies())
-  }
+}
 
-  async function loadFile(filepath: string): Promise<Info> {
+async function loadFile(filepath: string): Promise<Info> {
   const text = await ConfigPaths.readFile(filepath)
   if (!text) return {}
   return load(text, filepath).catch((error) => {
     log.warn("failed to load tui config", { path: filepath, error })
     return {}
   })
-  }
+}
 
-  async function load(text: string, configFilepath: string): Promise<Info> {
+async function load(text: string, configFilepath: string): Promise<Info> {
   const raw = await ConfigPaths.parseText(text, configFilepath, "empty")
   if (!isRecord(raw)) return {}
 
@@ -210,5 +209,4 @@ export namespace TuiConfig {
   }
 
   return data
-  }
 }

packages/opencode/src/plugin/install.ts

@@ -7,7 +7,7 @@ import {
   printParseErrorCode,
 } from "jsonc-parser"
 
-import { ConfigPaths } from "@/config/paths"
+import { ConfigPaths } from "@/config"
 import { Global } from "@/global"
 import { Filesystem } from "@/util"
 import { Flock } from "@opencode-ai/shared/util/flock"

packages/opencode/src/session/prompt.ts

@@ -30,7 +30,7 @@ import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
 import * as Stream from "effect/Stream"
 import { Command } from "../command"
 import { pathToFileURL, fileURLToPath } from "url"
-import { ConfigMarkdown } from "../config/markdown"
+import { ConfigMarkdown } from "../config"
 import { SessionSummary } from "./summary"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { SessionProcessor } from "./processor"

packages/opencode/src/skill/skill.ts

@@ -12,7 +12,7 @@ import { Global } from "@/global"
 import { Permission } from "@/permission"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Config } from "../config"
-import { ConfigMarkdown } from "../config/markdown"
+import { ConfigMarkdown } from "../config"
 import { Glob } from "@opencode-ai/shared/util/glob"
 import { Log } from "../util"
 import { Discovery } from "./discovery"

packages/opencode/test/cli/tui/plugin-add.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 
 const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime")
 

packages/opencode/test/cli/tui/plugin-install.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 
 const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime")
 

packages/opencode/test/cli/tui/plugin-loader-entrypoint.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 import { Npm } from "../../../src/npm"
 
 const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime")

packages/opencode/test/cli/tui/plugin-loader-pure.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 
 const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime")
 

packages/opencode/test/cli/tui/plugin-loader.test.ts

@@ -5,7 +5,7 @@ import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
 import { Global } from "../../../src/global"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 import { Filesystem } from "../../../src/util"
 
 const { allThemes, addTheme } = await import("../../../src/cli/cmd/tui/context/theme")

packages/opencode/test/cli/tui/plugin-toggle.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { pathToFileURL } from "url"
 import { tmpdir } from "../../fixture/fixture"
 import { createTuiPluginApi } from "../../fixture/tui-plugin"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 
 const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime")
 

packages/opencode/test/cli/tui/thread.test.ts

@@ -8,7 +8,7 @@ import { UI } from "../../../src/cli/ui"
 import * as Timeout from "../../../src/util/timeout"
 import * as Network from "../../../src/cli/network"
 import * as Win32 from "../../../src/cli/cmd/tui/win32"
-import { TuiConfig } from "../../../src/config/tui"
+import { TuiConfig } from "../../../src/config"
 import { Instance } from "../../../src/project/instance"
 
 const stop = new Error("stop")

packages/opencode/test/config/markdown.test.ts

@@ -1,5 +1,5 @@
 import { expect, test, describe } from "bun:test"
-import { ConfigMarkdown } from "../../src/config/markdown"
+import { ConfigMarkdown } from "../../src/config"
 
 describe("ConfigMarkdown: normal template", () => {
   const template = `This is a @valid/path/to/a/file and it should also match at

packages/opencode/test/config/tui.test.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises"
 import { tmpdir } from "../fixture/fixture"
 import { Instance } from "../../src/project/instance"
 import { Config } from "../../src/config"
-import { TuiConfig } from "../../src/config/tui"
+import { TuiConfig } from "../../src/config"
 import { Global } from "../../src/global"
 import { Filesystem } from "../../src/util"
 import { AppRuntime } from "../../src/effect/app-runtime"

packages/opencode/test/fixture/tui-runtime.ts

@@ -1,6 +1,6 @@
 import { spyOn } from "bun:test"
 import path from "path"
-import { TuiConfig } from "../../src/config/tui"
+import { TuiConfig } from "../../src/config"
 
 type PluginSpec = string | [string, Record<string, unknown>]