refactor: unwrap ACP namespace + self-reexport (#22936)

packages/opencode/src/acp/agent.ts

@@ -57,15 +57,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 ?? [])
@@ -77,14 +76,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)
@@ -127,17 +126,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
@@ -1547,9 +1546,9 @@ export namespace ACP {
       { throwOnError: true },
     )
   }
-  }
+}
 
-  function toToolKind(toolName: string): ToolKind {
+function toToolKind(toolName: string): ToolKind {
   const tool = toolName.toLocaleLowerCase()
   switch (tool) {
     case "bash":
@@ -1574,9 +1573,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":
@@ -1591,9 +1590,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
@@ -1653,11 +1652,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)
@@ -1692,18 +1691,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()
@@ -1711,23 +1710,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(
@@ -1748,24 +1747,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}`,
@@ -1773,12 +1772,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) {
@@ -1805,13 +1804,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",
@@ -1837,5 +1836,6 @@ export namespace ACP {
     })
   }
   return options
-  }
 }
+
+export * as ACP from "./agent"