feat: unwrap ACP, Agent, Workspace, Identifier, Shell namespaces

packages/opencode/src/acp/agent.ts

@@ -39,7 +39,7 @@ import { ACPSessionManager } from "./session"
 import type { ACPConfig } from "./types"
 import { Provider } from "../provider"
 import { ModelID, ProviderID } from "../provider/schema"
-import { Agent as AgentModule } from "../agent/agent"
+import { Agent as AgentModule } from "../agent"
 import { AppRuntime } from "@/effect/app-runtime"
 import { Installation } from "@/installation"
 import { MessageV2 } from "@/session/message-v2"
@@ -56,15 +56,14 @@ type ModelOption = { modelId: string; name: string }
 
 const DEFAULT_VARIANT_VALUE = "default"
 
-export namespace ACP {
+const log = Log.create({ service: "acp-agent" })
-  const log = Log.create({ service: "acp-agent" })
 
-  async function getContextLimit(
+async function getContextLimit(
   sdk: OpencodeClient,
   providerID: ProviderID,
   modelID: ModelID,
   directory: string,
-  ): Promise<number | null> {
+): Promise<number | null> {
   const providers = await sdk.config
     .providers({ directory })
     .then((x) => x.data?.providers ?? [])
@@ -76,14 +75,14 @@ export namespace ACP {
   const provider = providers.find((p) => p.id === providerID)
   const model = provider?.models[modelID]
   return model?.limit.context ?? null
-  }
+}
 
-  async function sendUsageUpdate(
+async function sendUsageUpdate(
   connection: AgentSideConnection,
   sdk: OpencodeClient,
   sessionID: string,
   directory: string,
-  ): Promise<void> {
+): Promise<void> {
   const messages = await sdk.session
     .messages({ sessionID, directory }, { throwOnError: true })
     .then((x) => x.data)
@@ -126,17 +125,17 @@ export namespace ACP {
     .catch((error) => {
       log.error("failed to send usage update", { error })
     })
-  }
+}
 
-  export async function init({ sdk: _sdk }: { sdk: OpencodeClient }) {
+export async function init({ sdk: _sdk }: { sdk: OpencodeClient }) {
   return {
     create: (connection: AgentSideConnection, fullConfig: ACPConfig) => {
       return new Agent(connection, fullConfig)
     },
   }
-  }
+}
 
-  export class Agent implements ACPAgent {
+export class Agent implements ACPAgent {
   private connection: AgentSideConnection
   private config: ACPConfig
   private sdk: OpencodeClient
@@ -1546,9 +1545,9 @@ export namespace ACP {
       { throwOnError: true },
     )
   }
-  }
+}
 
-  function toToolKind(toolName: string): ToolKind {
+function toToolKind(toolName: string): ToolKind {
   const tool = toolName.toLocaleLowerCase()
   switch (tool) {
     case "bash":
@@ -1573,9 +1572,9 @@ export namespace ACP {
     default:
       return "other"
   }
-  }
+}
 
-  function toLocations(toolName: string, input: Record<string, any>): { path: string }[] {
+function toLocations(toolName: string, input: Record<string, any>): { path: string }[] {
   const tool = toolName.toLocaleLowerCase()
   switch (tool) {
     case "read":
@@ -1590,9 +1589,9 @@ export namespace ACP {
     default:
       return []
   }
-  }
+}
 
-  async function defaultModel(config: ACPConfig, cwd?: string): Promise<{ providerID: ProviderID; modelID: ModelID }> {
+async function defaultModel(config: ACPConfig, cwd?: string): Promise<{ providerID: ProviderID; modelID: ModelID }> {
   const sdk = config.sdk
   const configured = config.defaultModel
   if (configured) return configured
@@ -1652,11 +1651,11 @@ export namespace ACP {
   if (specified) return specified
 
   return { providerID: ProviderID.opencode, modelID: ModelID.make("big-pickle") }
-  }
+}
 
-  function parseUri(
+function parseUri(
   uri: string,
-  ): { type: "file"; url: string; filename: string; mime: string } | { type: "text"; text: string } {
+): { type: "file"; url: string; filename: string; mime: string } | { type: "text"; text: string } {
   try {
     if (uri.startsWith("file://")) {
       const path = uri.slice(7)
@@ -1691,18 +1690,18 @@ export namespace ACP {
       text: uri,
     }
   }
-  }
+}
 
-  function getNewContent(fileOriginal: string, unifiedDiff: string): string | undefined {
+function getNewContent(fileOriginal: string, unifiedDiff: string): string | undefined {
   const result = applyPatch(fileOriginal, unifiedDiff)
   if (result === false) {
     log.error("Failed to apply unified diff (context mismatch)")
     return undefined
   }
   return result
-  }
+}
 
-  function sortProvidersByName<T extends { name: string }>(providers: T[]): T[] {
+function sortProvidersByName<T extends { name: string }>(providers: T[]): T[] {
   return [...providers].sort((a, b) => {
     const nameA = a.name.toLowerCase()
     const nameB = b.name.toLowerCase()
@@ -1710,23 +1709,23 @@ export namespace ACP {
     if (nameA > nameB) return 1
     return 0
   })
-  }
+}
 
-  function modelVariantsFromProviders(
+function modelVariantsFromProviders(
   providers: Array<{ id: string; models: Record<string, { variants?: Record<string, any> }> }>,
   model: { providerID: ProviderID; modelID: ModelID },
-  ): string[] {
+): string[] {
   const provider = providers.find((entry) => entry.id === model.providerID)
   if (!provider) return []
   const modelInfo = provider.models[model.modelID]
   if (!modelInfo?.variants) return []
   return Object.keys(modelInfo.variants)
-  }
+}
 
-  function buildAvailableModels(
+function buildAvailableModels(
   providers: Array<{ id: string; name: string; models: Record<string, any> }>,
   options: { includeVariants?: boolean } = {},
-  ): ModelOption[] {
+): ModelOption[] {
   const includeVariants = options.includeVariants ?? false
   return providers.flatMap((provider) => {
     const unsorted: Array<{ id: string; name: string; variants?: Record<string, any> }> = Object.values(
@@ -1747,24 +1746,24 @@ export namespace ACP {
       return [base, ...variantOptions]
     })
   })
-  }
+}
 
-  function formatModelIdWithVariant(
+function formatModelIdWithVariant(
   model: { providerID: ProviderID; modelID: ModelID },
   variant: string | undefined,
   availableVariants: string[],
   includeVariant: boolean,
-  ) {
+) {
   const base = `${model.providerID}/${model.modelID}`
   if (!includeVariant || !variant || !availableVariants.includes(variant)) return base
   return `${base}/${variant}`
-  }
+}
 
-  function buildVariantMeta(input: {
+function buildVariantMeta(input: {
   model: { providerID: ProviderID; modelID: ModelID }
   variant?: string
   availableVariants: string[]
-  }) {
+}) {
   return {
     opencode: {
       modelId: `${input.model.providerID}/${input.model.modelID}`,
@@ -1772,12 +1771,12 @@ export namespace ACP {
       availableVariants: input.availableVariants,
     },
   }
-  }
+}
 
-  function parseModelSelection(
+function parseModelSelection(
   modelId: string,
   providers: Array<{ id: string; models: Record<string, { variants?: Record<string, any> }> }>,
-  ): { model: { providerID: ProviderID; modelID: ModelID }; variant?: string } {
+): { model: { providerID: ProviderID; modelID: ModelID }; variant?: string } {
   const parsed = Provider.parseModel(modelId)
   const provider = providers.find((p) => p.id === parsed.providerID)
   if (!provider) {
@@ -1804,13 +1803,13 @@ export namespace ACP {
   }
 
   return { model: parsed, variant: undefined }
-  }
+}
 
-  function buildConfigOptions(input: {
+function buildConfigOptions(input: {
   currentModelId: string
   availableModels: ModelOption[]
   modes?: { availableModes: ModeOption[]; currentModeId: string } | undefined
-  }): SessionConfigOption[] {
+}): SessionConfigOption[] {
   const options: SessionConfigOption[] = [
     {
       id: "model",
@@ -1836,5 +1835,4 @@ export namespace ACP {
     })
   }
   return options
-  }
 }

packages/opencode/src/acp/index.ts

@@ -0,0 +1 @@
+export * as ACP from "./agent"

packages/opencode/src/agent/agent.ts

@@ -24,8 +24,7 @@ import { InstanceState } from "@/effect"
 import * as Option from "effect/Option"
 import * as OtelTracer from "@effect/opentelemetry/Tracer"
 
-export namespace Agent {
+export const Info = z
-  export const Info = z
   .object({
     name: z.string(),
     description: z.string().optional(),
@@ -50,11 +49,11 @@ export namespace Agent {
   .meta({
     ref: "Agent",
   })
-  export type Info = z.infer<typeof Info>
+export type Info = z.infer<typeof Info>
 
-  export interface Interface {
+export interface Interface {
-    readonly get: (agent: string) => Effect.Effect<Agent.Info>
+  readonly get: (agent: string) => Effect.Effect<Info>
-    readonly list: () => Effect.Effect<Agent.Info[]>
+  readonly list: () => Effect.Effect<Info[]>
   readonly defaultAgent: () => Effect.Effect<string>
   readonly generate: (input: {
     description: string
@@ -64,13 +63,13 @@ export namespace Agent {
     whenToUse: string
     systemPrompt: string
   }>
-  }
+}
 
-  type State = Omit<Interface, "generate">
+type State = Omit<Interface, "generate">
 
-  export class Service extends Context.Service<Service, Interface>()("@opencode/Agent") {}
+export class Service extends Context.Service<Service, Interface>()("@opencode/Agent") {}
 
-  export const layer = Layer.effect(
+export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const config = yield* Config.Service
@@ -400,13 +399,12 @@ export namespace Agent {
       }),
     })
   }),
-  )
+)
 
-  export const defaultLayer = layer.pipe(
+export const defaultLayer = layer.pipe(
   Layer.provide(Plugin.defaultLayer),
   Layer.provide(Provider.defaultLayer),
   Layer.provide(Auth.defaultLayer),
   Layer.provide(Config.defaultLayer),
   Layer.provide(Skill.defaultLayer),
-  )
+)
-}

packages/opencode/src/agent/index.ts

@@ -0,0 +1 @@
+export * as Agent from "./agent"

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

@@ -2,7 +2,7 @@ import { Log } from "@/util"
 import { bootstrap } from "../bootstrap"
 import { cmd } from "./cmd"
 import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk"
-import { ACP } from "@/acp/agent"
+import { ACP } from "@/acp"
 import { Server } from "@/server/server"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"

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

@@ -3,7 +3,7 @@ import * as prompts from "@clack/prompts"
 import { AppRuntime } from "@/effect/app-runtime"
 import { UI } from "../ui"
 import { Global } from "../../global"
-import { Agent } from "../../agent/agent"
+import { Agent } from "../../agent"
 import { Provider } from "../../provider"
 import path from "path"
 import fs from "fs/promises"

packages/opencode/src/cli/cmd/debug/agent.ts

@@ -1,7 +1,7 @@
 import { EOL } from "os"
 import { basename } from "path"
 import { Effect } from "effect"
-import { Agent } from "../../../agent/agent"
+import { Agent } from "../../../agent"
 import { Provider } from "../../../provider"
 import { Session } from "../../../session"
 import type { MessageV2 } from "../../../session/message-v2"

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

@@ -10,7 +10,7 @@ import { Filesystem } from "../../util"
 import { createOpencodeClient, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
 import { Server } from "../../server/server"
 import { Provider } from "../../provider"
-import { Agent } from "../../agent/agent"
+import { Agent } from "../../agent"
 import { Permission } from "../../permission"
 import { Tool } from "../../tool"
 import { GlobTool } from "../../tool/glob"

packages/opencode/src/control-plane/index.ts

@@ -0,0 +1 @@
+export * as Workspace from "./workspace"

packages/opencode/src/control-plane/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 

packages/opencode/src/control-plane/workspace.ts

@@ -25,27 +25,26 @@ import { AppRuntime } from "@/effect/app-runtime"
 import { EventSequenceTable } from "@/sync/event.sql"
 import { waitEvent } from "./util"
 
-export namespace Workspace {
+export const Info = WorkspaceInfo.meta({
-  export const Info = WorkspaceInfo.meta({
   ref: "Workspace",
-  })
+})
-  export type Info = z.infer<typeof Info>
+export type Info = z.infer<typeof Info>
 
-  export const ConnectionStatus = z.object({
+export const ConnectionStatus = z.object({
   workspaceID: WorkspaceID.zod,
   status: z.enum(["connected", "connecting", "disconnected", "error"]),
   error: z.string().optional(),
-  })
+})
-  export type ConnectionStatus = z.infer<typeof ConnectionStatus>
+export type ConnectionStatus = z.infer<typeof ConnectionStatus>
 
-  const Restore = z.object({
+const Restore = z.object({
   workspaceID: WorkspaceID.zod,
   sessionID: SessionID.zod,
   total: z.number().int().min(0),
   step: z.number().int().min(0),
-  })
+})
 
-  export const Event = {
+export const Event = {
   Ready: BusEvent.define(
     "workspace.ready",
     z.object({
@@ -60,9 +59,9 @@ export namespace Workspace {
   ),
   Restore: BusEvent.define("workspace.restore", Restore),
   Status: BusEvent.define("workspace.status", ConnectionStatus),
-  }
+}
 
-  function fromRow(row: typeof WorkspaceTable.$inferSelect): Info {
+function fromRow(row: typeof WorkspaceTable.$inferSelect): Info {
   return {
     id: row.id,
     type: row.type,
@@ -72,17 +71,17 @@ export namespace Workspace {
     extra: row.extra,
     projectID: row.project_id,
   }
-  }
+}
 
-  const CreateInput = z.object({
+const CreateInput = z.object({
   id: WorkspaceID.zod.optional(),
   type: Info.shape.type,
   branch: Info.shape.branch,
   projectID: ProjectID.zod,
   extra: Info.shape.extra,
-  })
+})
 
-  export const create = fn(CreateInput, async (input) => {
+export const create = fn(CreateInput, async (input) => {
   const id = WorkspaceID.ascending(input.id)
   const adaptor = await getAdaptor(input.projectID, input.type)
 
@@ -128,14 +127,14 @@ export namespace Workspace {
   })
 
   return info
-  })
+})
 
-  const SessionRestoreInput = z.object({
+const SessionRestoreInput = z.object({
   workspaceID: WorkspaceID.zod,
   sessionID: SessionID.zod,
-  })
+})
 
-  export const sessionRestore = fn(SessionRestoreInput, async (input) => {
+export const sessionRestore = fn(SessionRestoreInput, async (input) => {
   log.info("session restore requested", {
     workspaceID: input.workspaceID,
     sessionID: input.sessionID,
@@ -286,9 +285,9 @@ export namespace Workspace {
     })
     throw err
   }
-  })
+})
 
-  export function list(project: Project.Info) {
+export function list(project: Project.Info) {
   const rows = Database.use((db) =>
     db.select().from(WorkspaceTable).where(eq(WorkspaceTable.project_id, project.id)).all(),
   )
@@ -296,22 +295,22 @@ export namespace Workspace {
 
   for (const space of spaces) startSync(space)
   return spaces
-  }
+}
 
-  function lookup(id: WorkspaceID) {
+function lookup(id: WorkspaceID) {
   const row = Database.use((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
   if (!row) return
   return fromRow(row)
-  }
+}
 
-  export const get = fn(WorkspaceID.zod, async (id) => {
+export const get = fn(WorkspaceID.zod, async (id) => {
   const space = lookup(id)
   if (!space) return
   startSync(space)
   return space
-  })
+})
 
-  export const remove = fn(WorkspaceID.zod, async (id) => {
+export const remove = fn(WorkspaceID.zod, async (id) => {
   const sessions = Database.use((db) =>
     db.select({ id: SessionTable.id }).from(SessionTable).where(eq(SessionTable.workspace_id, id)).all(),
   )
@@ -334,13 +333,13 @@ export namespace Workspace {
     Database.use((db) => db.delete(WorkspaceTable).where(eq(WorkspaceTable.id, id)).run())
     return info
   }
-  })
+})
 
-  const connections = new Map<WorkspaceID, ConnectionStatus>()
+const connections = new Map<WorkspaceID, ConnectionStatus>()
-  const aborts = new Map<WorkspaceID, AbortController>()
+const aborts = new Map<WorkspaceID, AbortController>()
-  const TIMEOUT = 5000
+const TIMEOUT = 5000
 
-  function setStatus(id: WorkspaceID, status: ConnectionStatus["status"], error?: string) {
+function setStatus(id: WorkspaceID, status: ConnectionStatus["status"], error?: string) {
   const prev = connections.get(id)
   if (prev?.status === status && prev?.error === error) return
   const next = { workspaceID: id, status, error }
@@ -358,13 +357,13 @@ export namespace Workspace {
       properties: next,
     },
   })
-  }
+}
 
-  export function status(): ConnectionStatus[] {
+export function status(): ConnectionStatus[] {
   return [...connections.values()]
-  }
+}
 
-  function synced(state: Record<string, number>) {
+function synced(state: Record<string, number>) {
   const ids = Object.keys(state)
   if (ids.length === 0) return true
 
@@ -384,13 +383,13 @@ export namespace Workspace {
   return ids.every((id) => {
     return (done[id] ?? -1) >= state[id]
   })
-  }
+}
 
-  export async function isSyncing(workspaceID: WorkspaceID) {
+export async function isSyncing(workspaceID: WorkspaceID) {
   return aborts.has(workspaceID)
-  }
+}
 
-  export async function waitForSync(workspaceID: WorkspaceID, state: Record<string, number>, signal?: AbortSignal) {
+export async function waitForSync(workspaceID: WorkspaceID, state: Record<string, number>, signal?: AbortSignal) {
   if (synced(state)) return
 
   try {
@@ -408,19 +407,19 @@ export namespace Workspace {
     if (signal?.aborted) throw signal.reason ?? new Error("Request aborted")
     throw new Error(`Timed out waiting for sync fence: ${JSON.stringify(state)}`)
   }
-  }
+}
 
-  const log = Log.create({ service: "workspace-sync" })
+const log = Log.create({ service: "workspace-sync" })
 
-  function route(url: string | URL, path: string) {
+function route(url: string | URL, path: string) {
   const next = new URL(url)
   next.pathname = `${next.pathname.replace(/\/$/, "")}${path}`
   next.search = ""
   next.hash = ""
   return next
-  }
+}
 
-  async function syncWorkspace(space: Info, signal: AbortSignal) {
+async function syncWorkspace(space: Info, signal: AbortSignal) {
   while (!signal.aborted) {
     log.info("connecting to global sync", { workspace: space.name })
     setStatus(space.id, "connecting")
@@ -484,9 +483,9 @@ export namespace Workspace {
     // TODO: Implement exponential backoff
     await sleep(1000)
   }
-  }
+}
 
-  async function startSync(space: Info) {
+async function startSync(space: Info) {
   if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) return
 
   const adaptor = await getAdaptor(space.projectID, space.type)
@@ -515,11 +514,10 @@ export namespace Workspace {
       error,
     })
   })
-  }
+}
 
-  function stopSync(id: WorkspaceID) {
+function stopSync(id: WorkspaceID) {
   aborts.get(id)?.abort()
   aborts.delete(id)
   connections.delete(id)
-  }
 }

packages/opencode/src/effect/app-runtime.ts

@@ -17,7 +17,7 @@ import { Snapshot } from "@/snapshot"
 import { Plugin } from "@/plugin"
 import { Provider } from "@/provider"
 import { ProviderAuth } from "@/provider"
-import { Agent } from "@/agent/agent"
+import { Agent } from "@/agent"
 import { Skill } from "@/skill"
 import { Discovery } from "@/skill/discovery"
 import { Question } from "@/question"

packages/opencode/src/id/id.ts

@@ -1,8 +1,7 @@
 import z from "zod"
 import { randomBytes } from "crypto"
 
-export namespace Identifier {
+const prefixes = {
-  const prefixes = {
   event: "evt",
   session: "ses",
   message: "msg",
@@ -14,27 +13,27 @@ export namespace Identifier {
   tool: "tool",
   workspace: "wrk",
   entry: "ent",
-  } as const
+} as const
 
-  export function schema(prefix: keyof typeof prefixes) {
+export function schema(prefix: keyof typeof prefixes) {
   return z.string().startsWith(prefixes[prefix])
-  }
+}
 
-  const LENGTH = 26
+const LENGTH = 26
 
-  // State for monotonic ID generation
+// State for monotonic ID generation
-  let lastTimestamp = 0
+let lastTimestamp = 0
-  let counter = 0
+let counter = 0
 
-  export function ascending(prefix: keyof typeof prefixes, given?: string) {
+export function ascending(prefix: keyof typeof prefixes, given?: string) {
   return generateID(prefix, "ascending", given)
-  }
+}
 
-  export function descending(prefix: keyof typeof prefixes, given?: string) {
+export function descending(prefix: keyof typeof prefixes, given?: string) {
   return generateID(prefix, "descending", given)
-  }
+}
 
-  function generateID(prefix: keyof typeof prefixes, direction: "descending" | "ascending", given?: string): string {
+function generateID(prefix: keyof typeof prefixes, direction: "descending" | "ascending", given?: string): string {
   if (!given) {
     return create(prefixes[prefix], direction)
   }
@@ -43,9 +42,9 @@ export namespace Identifier {
     throw new Error(`ID ${given} does not start with ${prefixes[prefix]}`)
   }
   return given
-  }
+}
 
-  function randomBase62(length: number): string {
+function randomBase62(length: number): string {
   const chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
   let result = ""
   const bytes = randomBytes(length)
@@ -53,9 +52,9 @@ export namespace Identifier {
     result += chars[bytes[i] % 62]
   }
   return result
-  }
+}
 
-  export function create(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
+export function create(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
   const currentTimestamp = timestamp ?? Date.now()
 
   if (currentTimestamp !== lastTimestamp) {
@@ -74,13 +73,12 @@ export namespace Identifier {
   }
 
   return prefix + "_" + timeBytes.toString("hex") + randomBase62(LENGTH - 12)
-  }
+}
 
-  /** Extract timestamp from an ascending ID. Does not work with descending IDs. */
+/** Extract timestamp from an ascending ID. Does not work with descending IDs. */
-  export function timestamp(id: string): number {
+export function timestamp(id: string): number {
   const prefix = id.split("_")[0]
   const hex = id.slice(prefix.length + 1, prefix.length + 13)
   const encoded = BigInt("0x" + hex)
   return Number(encoded / BigInt(0x1000))
-  }
 }

packages/opencode/src/id/index.ts

@@ -0,0 +1 @@
+export * as Identifier from "./id"

packages/opencode/src/permission/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { Newtype } from "@/util/schema"
 

packages/opencode/src/pty/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 

packages/opencode/src/pty/service.ts

@@ -6,7 +6,7 @@ import type { Proc } from "#pty"
 import z from "zod"
 import { Log } from "../util"
 import { lazy } from "@opencode-ai/shared/util/lazy"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@/shell"
 import { Plugin } from "@/plugin"
 import { PtyID } from "./schema"
 import { Effect, Layer, Context } from "effect"

packages/opencode/src/question/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { Newtype } from "@/util/schema"
 

packages/opencode/src/server/fence.ts

@@ -1,7 +1,7 @@
 import type { MiddlewareHandler } from "hono"
 import { Database, inArray } from "@/storage"
 import { EventSequenceTable } from "@/sync/event.sql"
-import { Workspace } from "@/control-plane/workspace"
+import { Workspace } from "@/control-plane"
 import type { WorkspaceID } from "@/control-plane/schema"
 import { Log } from "@/util"
 

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

@@ -17,7 +17,7 @@ import { errors } from "../error"
 import { lazy } from "../../util/lazy"
 import { Effect, Option } from "effect"
 import { WorkspaceRoutes } from "./workspace"
-import { Agent } from "@/agent/agent"
+import { Agent } from "@/agent"
 
 const ConsoleOrgOption = z.object({
   accountID: z.string(),

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

@@ -7,7 +7,7 @@ import { Format } from "../../format"
 import { TuiRoutes } from "./tui"
 import { Instance } from "../../project/instance"
 import { Vcs } from "../../project"
-import { Agent } from "../../agent/agent"
+import { Agent } from "../../agent"
 import { Skill } from "../../skill"
 import { Global } from "../../global"
 import { LSP } from "../../lsp"

packages/opencode/src/server/instance/middleware.ts

@@ -2,7 +2,7 @@ import type { MiddlewareHandler } from "hono"
 import type { UpgradeWebSocket } from "hono/ws"
 import { getAdaptor } from "@/control-plane/adaptors"
 import { WorkspaceID } from "@/control-plane/schema"
-import { Workspace } from "@/control-plane/workspace"
+import { Workspace } from "@/control-plane"
 import { ServerProxy } from "../proxy"
 import { Instance } from "@/project/instance"
 import { InstanceBootstrap } from "@/project/bootstrap"

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

@@ -15,7 +15,7 @@ import { SessionSummary } from "@/session/summary"
 import { Todo } from "../../session/todo"
 import { Effect } from "effect"
 import { AppRuntime } from "../../effect/app-runtime"
-import { Agent } from "../../agent/agent"
+import { Agent } from "../../agent"
 import { Snapshot } from "@/snapshot"
 import { Command } from "../../command"
 import { Log } from "../../util"

packages/opencode/src/server/instance/workspace.ts

@@ -2,7 +2,7 @@ import { Hono } from "hono"
 import { describeRoute, resolver, validator } from "hono-openapi"
 import z from "zod"
 import { listAdaptors } from "../../control-plane/adaptors"
-import { Workspace } from "../../control-plane/workspace"
+import { Workspace } from "../../control-plane"
 import { Instance } from "../../project/instance"
 import { errors } from "../error"
 import { lazy } from "../../util/lazy"

packages/opencode/src/server/proxy.ts

@@ -3,7 +3,7 @@ import type { UpgradeWebSocket } from "hono/ws"
 import { Log } from "@/util"
 import * as Fence from "./fence"
 import type { WorkspaceID } from "@/control-plane/schema"
-import { Workspace } from "@/control-plane/workspace"
+import { Workspace } from "@/control-plane"
 
 const hop = new Set([
   "connection",

packages/opencode/src/session/compaction.ts

@@ -8,7 +8,7 @@ import z from "zod"
 import { Token } from "../util"
 import { Log } from "../util"
 import { SessionProcessor } from "./processor"
-import { Agent } from "@/agent/agent"
+import { Agent } from "@/agent"
 import { Plugin } from "@/plugin"
 import { Config } from "@/config"
 import { NotFoundError } from "@/storage"

packages/opencode/src/session/llm.ts

@@ -8,7 +8,7 @@ import { GitLabWorkflowLanguageModel } from "gitlab-ai-provider"
 import { ProviderTransform } from "@/provider"
 import { Config } from "@/config"
 import { Instance } from "@/project/instance"
-import type { Agent } from "@/agent/agent"
+import type { Agent } from "@/agent"
 import type { MessageV2 } from "./message-v2"
 import { Plugin } from "@/plugin"
 import { SystemPrompt } from "./system"

packages/opencode/src/session/processor.ts

@@ -1,6 +1,6 @@
 import { Cause, Deferred, Effect, Layer, Context, Scope } from "effect"
 import * as Stream from "effect/Stream"
-import { Agent } from "@/agent/agent"
+import { Agent } from "@/agent"
 import { Bus } from "@/bus"
 import { Config } from "@/config"
 import { Permission } from "@/permission"

packages/opencode/src/session/prompt.ts

@@ -6,7 +6,7 @@ import { MessageV2 } from "./message-v2"
 import { Log } from "../util"
 import { SessionRevert } from "./revert"
 import * as Session from "./session"
-import { Agent } from "../agent/agent"
+import { Agent } from "../agent"
 import { Provider } from "../provider"
 import { ModelID, ProviderID } from "../provider/schema"
 import { type Tool as AITool, tool, jsonSchema, type ToolExecutionOptions, asSchema } from "ai"
@@ -38,7 +38,7 @@ import { Tool } from "@/tool"
 import { Permission } from "@/permission"
 import { SessionStatus } from "./status"
 import { LLM } from "./llm"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@/shell"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Truncate } from "@/tool"
 import { decodeDataUrl } from "@/util/data-url"

packages/opencode/src/session/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 

packages/opencode/src/session/system.ts

@@ -12,7 +12,7 @@ import PROMPT_KIMI from "./prompt/kimi.txt"
 import PROMPT_CODEX from "./prompt/codex.txt"
 import PROMPT_TRINITY from "./prompt/trinity.txt"
 import type { Provider } from "@/provider"
-import type { Agent } from "@/agent/agent"
+import type { Agent } from "@/agent"
 import { Permission } from "@/permission"
 import { Skill } from "@/skill"
 

packages/opencode/src/shell/index.ts

@@ -0,0 +1 @@
+export * as Shell from "./shell"

packages/opencode/src/shell/shell.ts

@@ -8,12 +8,11 @@ import { setTimeout as sleep } from "node:timers/promises"
 
 const SIGKILL_TIMEOUT_MS = 200
 
-export namespace Shell {
+const BLACKLIST = new Set(["fish", "nu"])
-  const BLACKLIST = new Set(["fish", "nu"])
+const LOGIN = new Set(["bash", "dash", "fish", "ksh", "sh", "zsh"])
-  const LOGIN = new Set(["bash", "dash", "fish", "ksh", "sh", "zsh"])
+const POSIX = new Set(["bash", "dash", "ksh", "sh", "zsh"])
-  const POSIX = new Set(["bash", "dash", "ksh", "sh", "zsh"])
 
-  export async function killTree(proc: ChildProcess, opts?: { exited?: () => boolean }): Promise<void> {
+export async function killTree(proc: ChildProcess, opts?: { exited?: () => boolean }): Promise<void> {
   const pid = proc.pid
   if (!pid || opts?.exited?.()) return
 
@@ -42,9 +41,9 @@ export namespace Shell {
       proc.kill("SIGKILL")
     }
   }
-  }
+}
 
-  function full(file: string) {
+function full(file: string) {
   if (process.platform !== "win32") return file
   const shell = Filesystem.windowsPath(file)
   if (path.win32.dirname(shell) !== ".") {
@@ -52,34 +51,34 @@ export namespace Shell {
     return shell
   }
   return which(shell) || shell
-  }
+}
 
-  function pick() {
+function pick() {
   const pwsh = which("pwsh.exe")
   if (pwsh) return pwsh
   const powershell = which("powershell.exe")
   if (powershell) return powershell
-  }
+}
 
-  function select(file: string | undefined, opts?: { acceptable?: boolean }) {
+function select(file: string | undefined, opts?: { acceptable?: boolean }) {
   if (file && (!opts?.acceptable || !BLACKLIST.has(name(file)))) return full(file)
   if (process.platform === "win32") {
     const shell = pick()
     if (shell) return shell
   }
   return fallback()
-  }
+}
 
-  export function gitbash() {
+export function gitbash() {
   if (process.platform !== "win32") return
   if (Flag.OPENCODE_GIT_BASH_PATH) return Flag.OPENCODE_GIT_BASH_PATH
   const git = which("git")
   if (!git) return
   const file = path.join(git, "..", "..", "bin", "bash.exe")
   if (Filesystem.stat(file)?.size) return file
-  }
+}
 
-  function fallback() {
+function fallback() {
   if (process.platform === "win32") {
     const file = gitbash()
     if (file) return file
@@ -89,22 +88,21 @@ export namespace Shell {
   const bash = which("bash")
   if (bash) return bash
   return "/bin/sh"
-  }
+}
 
-  export function name(file: string) {
+export function name(file: string) {
   if (process.platform === "win32") return path.win32.parse(Filesystem.windowsPath(file)).name.toLowerCase()
   return path.basename(file).toLowerCase()
-  }
-
-  export function login(file: string) {
-    return LOGIN.has(name(file))
-  }
-
-  export function posix(file: string) {
-    return POSIX.has(name(file))
-  }
-
-  export const preferred = lazy(() => select(process.env.SHELL))
-
-  export const acceptable = lazy(() => select(process.env.SHELL, { acceptable: true }))
 }
+
+export function login(file: string) {
+  return LOGIN.has(name(file))
+}
+
+export function posix(file: string) {
+  return POSIX.has(name(file))
+}
+
+export const preferred = lazy(() => select(process.env.SHELL))
+
+export const acceptable = lazy(() => select(process.env.SHELL, { acceptable: true }))

packages/opencode/src/skill/skill.ts

@@ -4,7 +4,7 @@ import { pathToFileURL } from "url"
 import z from "zod"
 import { Effect, Layer, Context } from "effect"
 import { NamedError } from "@opencode-ai/shared/util/error"
-import type { Agent } from "@/agent/agent"
+import type { Agent } from "@/agent"
 import { Bus } from "@/bus"
 import { InstanceState } from "@/effect"
 import { Flag } from "@/flag/flag"

packages/opencode/src/sync/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 

packages/opencode/src/tool/bash.ts

@@ -12,7 +12,7 @@ import { Language, type Node } from "web-tree-sitter"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { fileURLToPath } from "url"
 import { Flag } from "@/flag/flag"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@/shell"
 
 import { BashArity } from "@/permission/arity"
 import * as Truncate from "./truncate"

packages/opencode/src/tool/registry.ts

@@ -43,7 +43,7 @@ import { FileTime } from "../file/time"
 import { Instruction } from "../session/instruction"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Bus } from "../bus"
-import { Agent } from "../agent/agent"
+import { Agent } from "../agent"
 import { Skill } from "../skill"
 import { Permission } from "@/permission"
 

packages/opencode/src/tool/schema.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect"
 import z from "zod"
 
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { ZodOverride } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
 

packages/opencode/src/tool/task.ts

@@ -4,7 +4,7 @@ import z from "zod"
 import { Session } from "../session"
 import { SessionID, MessageID } from "../session/schema"
 import { MessageV2 } from "../session/message-v2"
-import { Agent } from "../agent/agent"
+import { Agent } from "../agent"
 import type { SessionPrompt } from "../session/prompt"
 import { Config } from "../config"
 import { Effect } from "effect"

packages/opencode/src/tool/tool.ts

@@ -4,7 +4,7 @@ import type { MessageV2 } from "../session/message-v2"
 import type { Permission } from "../permission"
 import type { SessionID, MessageID } from "../session/schema"
 import * as Truncate from "./truncate"
-import { Agent } from "@/agent/agent"
+import { Agent } from "@/agent"
 
 interface Metadata {
   [key: string]: any

packages/opencode/src/tool/truncate.ts

@@ -1,10 +1,10 @@
 import { NodePath } from "@effect/platform-node"
 import { Cause, Duration, Effect, Layer, Schedule, Context } from "effect"
 import path from "path"
-import type { Agent } from "../agent/agent"
+import type { Agent } from "../agent"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { evaluate } from "@/permission/evaluate"
-import { Identifier } from "../id/id"
+import { Identifier } from "../id"
 import { Log } from "../util"
 import { ToolID } from "./schema"
 import { TRUNCATION_DIR } from "./truncation-dir"

packages/opencode/src/v2/session-event.ts

@@ -1,4 +1,4 @@
-import { Identifier } from "@/id/id"
+import { Identifier } from "@/id"
 import { withStatics } from "@/util/schema"
 import * as DateTime from "effect/DateTime"
 import { Schema } from "effect"

packages/opencode/test/acp/agent-interface.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { ACP } from "../../src/acp/agent"
+import { ACP } from "../../src/acp"
 import type { Agent as ACPAgent } from "@agentclientprotocol/sdk"
 
 /**

packages/opencode/test/acp/event-subscription.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { ACP } from "../../src/acp/agent"
+import { ACP } from "../../src/acp"
 import type { AgentSideConnection } from "@agentclientprotocol/sdk"
 import type { Event, EventMessagePartUpdated, ToolStatePending, ToolStateRunning } from "@opencode-ai/sdk/v2"
 import { Instance } from "../../src/project/instance"

packages/opencode/test/agent/agent.test.ts

@@ -3,7 +3,7 @@ import { Effect } from "effect"
 import path from "path"
 import { provideInstance, tmpdir } from "../fixture/fixture"
 import { Instance } from "../../src/project/instance"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Permission } from "../../src/permission"
 
 // Helper to evaluate permission for a tool with wildcard pattern

packages/opencode/test/config/agent-color.test.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { provideInstance, tmpdir } from "../fixture/fixture"
 import { Instance } from "../../src/project/instance"
 import { Config } from "../../src/config"
-import { Agent as AgentSvc } from "../../src/agent/agent"
+import { Agent as AgentSvc } from "../../src/agent"
 import { Color } from "../../src/util"
 import { AppRuntime } from "../../src/effect/app-runtime"
 

packages/opencode/test/plugin/workspace-adaptor.test.ts

@@ -9,7 +9,7 @@ process.env.OPENCODE_DISABLE_DEFAULT_PLUGINS = "1"
 
 const { Flag } = await import("../../src/flag/flag")
 const { Plugin } = await import("../../src/plugin/index")
-const { Workspace } = await import("../../src/control-plane/workspace")
+const { Workspace } = await import("../../src/control-plane")
 const { Instance } = await import("../../src/project/instance")
 
 const experimental = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES

packages/opencode/test/pty/pty-shell.test.ts

@@ -3,7 +3,7 @@ import { AppRuntime } from "../../src/effect/app-runtime"
 import { Effect } from "effect"
 import { Instance } from "../../src/project/instance"
 import { Pty } from "../../src/pty"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "../../src/shell"
 import { tmpdir } from "../fixture/fixture"
 
 Shell.preferred.reset()

packages/opencode/test/session/compaction.test.ts

@@ -5,7 +5,7 @@ import * as Stream from "effect/Stream"
 import z from "zod"
 import { Bus } from "../../src/bus"
 import { Config } from "../../src/config"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { LLM } from "../../src/session/llm"
 import { SessionCompaction } from "../../src/session/compaction"
 import { Token } from "../../src/util"

packages/opencode/test/session/llm.test.ts

@@ -12,7 +12,7 @@ import { ModelsDev } from "../../src/provider"
 import { ProviderID, ModelID } from "../../src/provider/schema"
 import { Filesystem } from "../../src/util"
 import { tmpdir } from "../fixture/fixture"
-import type { Agent } from "../../src/agent/agent"
+import type { Agent } from "../../src/agent"
 import { MessageV2 } from "../../src/session/message-v2"
 import { SessionID, MessageID } from "../../src/session/schema"
 import { AppRuntime } from "../../src/effect/app-runtime"

packages/opencode/test/session/processor-effect.test.ts

@@ -2,8 +2,8 @@ import { NodeFileSystem } from "@effect/platform-node"
 import { expect } from "bun:test"
 import { Cause, Effect, Exit, Fiber, Layer } from "effect"
 import path from "path"
-import type { Agent } from "../../src/agent/agent"
+import type { Agent } from "../../src/agent"
-import { Agent as AgentSvc } from "../../src/agent/agent"
+import { Agent as AgentSvc } from "../../src/agent"
 import { Bus } from "../../src/bus"
 import { Config } from "../../src/config"
 import { Permission } from "../../src/permission"

packages/opencode/test/session/prompt-effect.test.ts

@@ -3,7 +3,7 @@ import { FetchHttpClient } from "effect/unstable/http"
 import { expect } from "bun:test"
 import { Cause, Effect, Exit, Fiber, Layer } from "effect"
 import path from "path"
-import { Agent as AgentSvc } from "../../src/agent/agent"
+import { Agent as AgentSvc } from "../../src/agent"
 import { Bus } from "../../src/bus"
 import { Command } from "../../src/command"
 import { Config } from "../../src/config"
@@ -32,7 +32,7 @@ import { MessageID, PartID, SessionID } from "../../src/session/schema"
 import { SessionStatus } from "../../src/session/status"
 import { Skill } from "../../src/skill"
 import { SystemPrompt } from "../../src/session/system"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "../../src/shell"
 import { Snapshot } from "../../src/snapshot"
 import { ToolRegistry } from "../../src/tool"
 import { Truncate } from "../../src/tool"

packages/opencode/test/session/snapshot-tool-race.test.ts

@@ -29,7 +29,7 @@ import { TestLLMServer } from "../lib/llm-server"
 
 // Same layer setup as prompt-effect.test.ts
 import { NodeFileSystem } from "@effect/platform-node"
-import { Agent as AgentSvc } from "../../src/agent/agent"
+import { Agent as AgentSvc } from "../../src/agent"
 import { Bus } from "../../src/bus"
 import { Command } from "../../src/command"
 import { Config } from "../../src/config"

packages/opencode/test/session/system.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import path from "path"
 import { Effect } from "effect"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Instance } from "../../src/project/instance"
 import { SystemPrompt } from "../../src/session/system"
 import { provideInstance, tmpdir } from "../fixture/fixture"

packages/opencode/test/shell/shell.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import path from "path"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "../../src/shell"
 import { Filesystem } from "../../src/util"
 
 const withShell = async (shell: string | undefined, fn: () => void | Promise<void>) => {

packages/opencode/test/sync/index.test.ts

@@ -6,7 +6,7 @@ import { Instance } from "../../src/project/instance"
 import { SyncEvent } from "../../src/sync"
 import { Database } from "../../src/storage"
 import { EventTable } from "../../src/sync/event.sql"
-import { Identifier } from "../../src/id/id"
+import { Identifier } from "../../src/id"
 import { Flag } from "../../src/flag/flag"
 import { initProjectors } from "../../src/server/projectors"
 

packages/opencode/test/tool/apply_patch.test.ts

@@ -7,7 +7,7 @@ import { Instance } from "../../src/project/instance"
 import { LSP } from "../../src/lsp"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Format } from "../../src/format"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Bus } from "../../src/bus"
 import { Truncate } from "../../src/tool"
 import { tmpdir } from "../fixture/fixture"

packages/opencode/test/tool/bash.test.ts

@@ -2,13 +2,13 @@ import { describe, expect, test } from "bun:test"
 import { Effect, Layer, ManagedRuntime } from "effect"
 import os from "os"
 import path from "path"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "../../src/shell"
 import { BashTool } from "../../src/tool/bash"
 import { Instance } from "../../src/project/instance"
 import { Filesystem } from "../../src/util"
 import { tmpdir } from "../fixture/fixture"
 import type { Permission } from "../../src/permission"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Truncate } from "../../src/tool"
 import { SessionID, MessageID } from "../../src/session/schema"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"

packages/opencode/test/tool/edit.test.ts

@@ -9,7 +9,7 @@ import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Format } from "../../src/format"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Bus } from "../../src/bus"
 import { BusEvent } from "../../src/bus/bus-event"
 import { Truncate } from "../../src/tool"

packages/opencode/test/tool/glob.test.ts

@@ -7,7 +7,7 @@ import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { Ripgrep } from "../../src/file/ripgrep"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Truncate } from "../../src/tool"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { provideTmpdirInstance } from "../fixture/fixture"
 import { testEffect } from "../lib/effect"
 

packages/opencode/test/tool/grep.test.ts

@@ -6,7 +6,7 @@ import { provideInstance, provideTmpdirInstance } from "../fixture/fixture"
 import { SessionID, MessageID } from "../../src/session/schema"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { Truncate } from "../../src/tool"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Ripgrep } from "../../src/file/ripgrep"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { testEffect } from "../lib/effect"

packages/opencode/test/tool/question.test.ts

@@ -3,7 +3,7 @@ import { Effect, Fiber, Layer } from "effect"
 import { QuestionTool } from "../../src/tool/question"
 import { Question } from "../../src/question"
 import { SessionID, MessageID } from "../../src/session/schema"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { Truncate } from "../../src/tool"
 import { provideTmpdirInstance } from "../fixture/fixture"

packages/opencode/test/tool/read.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect } from "bun:test"
 import { Cause, Effect, Exit, Layer } from "effect"
 import path from "path"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { FileTime } from "../../src/file/time"

packages/opencode/test/tool/task.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect } from "bun:test"
 import { Effect, Layer } from "effect"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Config } from "../../src/config"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { Instance } from "../../src/project/instance"

packages/opencode/test/tool/tool-define.test.ts

@@ -1,7 +1,7 @@
 import { describe, test, expect } from "bun:test"
 import { Effect, Layer, ManagedRuntime } from "effect"
 import z from "zod"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Tool } from "../../src/tool"
 import { Truncate } from "../../src/tool"
 

packages/opencode/test/tool/truncation.test.ts

@@ -2,7 +2,7 @@ import { describe, test, expect } from "bun:test"
 import { NodeFileSystem } from "@effect/platform-node"
 import { Effect, FileSystem, Layer } from "effect"
 import { Truncate } from "../../src/tool"
-import { Identifier } from "../../src/id/id"
+import { Identifier } from "../../src/id"
 import { Process } from "../../src/util"
 import { Filesystem } from "../../src/util"
 import path from "path"

packages/opencode/test/tool/webfetch.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
 import path from "path"
 import { Effect, Layer } from "effect"
 import { FetchHttpClient } from "effect/unstable/http"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { Truncate } from "../../src/tool"
 import { Instance } from "../../src/project/instance"
 import { WebFetchTool } from "../../src/tool/webfetch"

packages/opencode/test/tool/write.test.ts

@@ -11,7 +11,7 @@ import { Bus } from "../../src/bus"
 import { Format } from "../../src/format"
 import { Truncate } from "../../src/tool"
 import { Tool } from "../../src/tool"
-import { Agent } from "../../src/agent/agent"
+import { Agent } from "../../src/agent"
 import { SessionID, MessageID } from "../../src/session/schema"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { provideTmpdirInstance } from "../fixture/fixture"