Remove duplicate code in config.ts

Author: ariane-emory

packages/opencode/src/config/config.ts

@@ -91,31 +91,10 @@ export const state = Instance.state(async () => {
       log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT")
     }
 
-    // Load remote/well-known config first as the base layer (lowest precedence)
-    // This allows organizations to provide default configs that users can override
-    let result: Info = {}
-    for (const [key, value] of Object.entries(auth)) {
-      if (value.type === "wellknown") {
-        process.env[value.key] = value.token
-        log.debug("fetching remote config", { url: `${key}/.well-known/opencode` })
-        const response = await fetch(`${key}/.well-known/opencode`)
-        if (!response.ok) {
-          throw new Error(`failed to fetch remote config from ${key}: ${response.status}`)
-        }
-        const wellknown = (await response.json()) as any
-        const remoteConfig = wellknown.config ?? {}
-        // Add $schema to prevent load() from trying to write back to a non-existent file
-        if (!remoteConfig.$schema) remoteConfig.$schema = "https://opencode.ai/config.json"
-        result = mergeConfigConcatArrays(
-          result,
-          await load(JSON.stringify(remoteConfig), `${key}/.well-known/opencode`),
-        )
-        log.debug("loaded remote config from well-known", { url: key })
-      }
-    }
-
     // Global user config overrides remote config
-    result = mergeConfigConcatArrays(result, await global())
+    const globalResult = await global()
+    result = mergeConfigConcatArrays(result, globalResult.config)
+    allUnknownKeybinds.push(...globalResult.unknownKeybinds)
 
     // Custom config path overrides global
     if (Flag.OPENCODE_CONFIG) {
@@ -140,20 +119,6 @@ export const state = Instance.state(async () => {
       result = mergeConfigConcatArrays(result, JSON.parse(Flag.OPENCODE_CONFIG_CONTENT))
       log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT")
     }
-
-<<<<<<< HEAD
-    for (const [key, value] of Object.entries(auth)) {
-      if (value.type === "wellknown") {
-        process.env[value.key] = value.token
-        const wellknown = (await fetch(`${key}/.well-known/opencode`).then((x) => x.json())) as any
-        const loaded = await load(JSON.stringify(wellknown.config ?? {}), process.cwd())
-        result = mergeConfigConcatArrays(result, loaded.config)
-        allUnknownKeybinds.push(...loaded.unknownKeybinds)
-      }
-    }
-
-=======
->>>>>>> dev
     result.agent = result.agent || {}
     result.mode = result.mode || {}
     result.plugin = result.plugin || []