fix duplicate config issue

Author: betaHi

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">copilot-bridge</h1>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/betahi-copilot-bridge"><img src="https://img.shields.io/npm/v/betahi-copilot-bridge.svg?v=0.20.9" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/betahi-copilot-bridge"><img src="https://img.shields.io/npm/v/betahi-copilot-bridge.svg?v=0.20.10" alt="npm version"></a>
   <a href="https://github.com/betahi/copilot-bridge/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/betahi-copilot-bridge.svg" alt="license"></a>
 </p>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "betahi-copilot-bridge",
-  "version": "0.20.9",
+  "version": "0.20.10",
   "description": "Model-layer bridge for routing Codex CLI, Claude Code, and similar clients to GitHub Copilot.",
   "keywords": [
     "github-copilot",

src/lib/codex-config.ts

@@ -12,6 +12,12 @@ const END_MARK =
 // upgrading users do not end up with duplicate managed blocks.
 const LEGACY_BEGIN_MARK = "# >>> copilot-bridge managed (do not edit) >>>"
 const LEGACY_END_MARK = "# <<< copilot-bridge managed (do not edit) <<<"
+const MANAGED_MARKERS = new Set([
+  BEGIN_MARK,
+  END_MARK,
+  LEGACY_BEGIN_MARK,
+  LEGACY_END_MARK,
+])
 
 // Top-level keys that the user (or codex itself) is the owner of.
 // We never put these in our managed block to avoid TOML duplicate-key errors.
@@ -129,6 +135,37 @@ function stripManagedBlock(content: string): string {
   return next
 }
 
+function removeStrayManagedMarkerLines(content: string): string {
+  return content
+    .split("\n")
+    .filter((line) => !MANAGED_MARKERS.has(line.trim()))
+    .join("\n")
+}
+
+function removeManagedProviderTables(
+  content: string,
+  providerId: string,
+): string {
+  const lines = content.split("\n")
+  const out: Array<string> = []
+  const tableHeader = `[model_providers.${providerId}]`
+
+  for (let i = 0; i < lines.length;) {
+    if (lines[i].trim() === tableHeader) {
+      i += 1
+      while (i < lines.length && !/^\s*\[/.test(lines[i])) {
+        i += 1
+      }
+      continue
+    }
+
+    out.push(lines[i])
+    i += 1
+  }
+
+  return out.join("\n").replace(/\n{3,}/g, "\n\n")
+}
+
 // Lines belonging to the first (top-level) TOML section: from the start of
 // the file up to the first line that begins with `[`. This is where
 // codex's own `model = ...` and `model_reasoning_effort = ...` live.
@@ -203,16 +240,23 @@ function normalizeModelContextWindow(
   return normalized > 0 ? normalized : undefined
 }
 
-function removeTopLevelContextWindowWhenManaged(
+function removeManagedTopLevelKeys(
   content: string,
   input: ApplyCodexConfigInput,
 ): string {
-  if (normalizeModelContextWindow(input.modelContextWindow) === undefined) {
-    return content
+  const { top, rest } = splitTopSection(content)
+  let nextTop = top
+
+  if (input.settings.setAsDefault) {
+    nextTop = removeTopKey(nextTop, "model_provider")
   }
 
-  const { top, rest } = splitTopSection(content)
-  const nextTop = removeTopKey(top, "model_context_window")
+  if (normalizeModelContextWindow(input.modelContextWindow) !== undefined) {
+    nextTop = removeTopKey(nextTop, "model_context_window")
+  }
+
+  nextTop = removeTopKey(nextTop, "model_supports_reasoning_summaries")
+
   if (nextTop === top) return content
   if (rest.length === 0) {
     return nextTop.endsWith("\n") ? nextTop : `${nextTop}\n`
@@ -272,8 +316,10 @@ export async function applyCodexConfig(
   }
 
   let stripped = stripManagedBlock(existing)
+  stripped = removeStrayManagedMarkerLines(stripped)
+  stripped = removeManagedProviderTables(stripped, input.settings.providerId)
   stripped = applyUserScalars(stripped, input)
-  stripped = removeTopLevelContextWindowWhenManaged(stripped, input)
+  stripped = removeManagedTopLevelKeys(stripped, input)
   const block = buildManagedBlock(input)
   const { top, rest } = splitTopSection(stripped)
   const parts = [top, block, rest]

tests/codex-config.test.ts

@@ -366,4 +366,100 @@ trust_level = "trusted"
       "[projects.",
     )
   })
+
+  test("recovers from orphan managed block and stale provider table", async () => {
+    const p = await makeConfigPath()
+    await writeFile(
+      p,
+      `model = "gpt-5.5"
+model_reasoning_effort = "xhigh"
+model_auto_compact_token_limit = 200000
+
+# >>> copilot-bridge managed block — auto-generated, do not edit between markers >>>
+model_provider = "bridge"
+
+# >>> copilot-bridge managed block — auto-generated, do not edit between markers >>>
+model_provider = "bridge"
+model_context_window = 1050000
+model_supports_reasoning_summaries = true
+
+[model_providers.bridge]
+name = "Copilot Bridge"
+base_url = "http://old/v1"
+wire_api = "responses"
+prefer_websockets = false
+requires_openai_auth = false
+# <<< copilot-bridge managed block — edits outside this block are preserved <<<
+
+[model_providers.bridge]
+name = "Copilot Bridge"
+base_url = "http://old/v1"
+wire_api = "responses"
+prefer_websockets = false
+requires_openai_auth = false
+
+[tui.model_availability_nux]
+"gpt-5.5" = 4
+
+[projects."/Users/z/ai_run"]
+trust_level = "trusted"
+`,
+    )
+    await applyCodexConfig({
+      configPath: p,
+      baseUrl: "http://127.0.0.1:4242/v1",
+      settings: baseSettings,
+      modelContextWindow: 1050000,
+    })
+    const content = await readFile(p, "utf8")
+
+    expect(content.match(/^model_provider = /gm)).toHaveLength(1)
+    expect(content.match(/^model_context_window = /gm)).toHaveLength(1)
+    expect(content.match(/^model_supports_reasoning_summaries = /gm)).toHaveLength(1)
+    expect(content.match(/^\[model_providers\.bridge\]$/gm)).toHaveLength(1)
+    expect(content.match(/copilot-bridge managed block — auto-generated/g)).toHaveLength(1)
+    expect(content.match(/copilot-bridge managed block — edits outside/g)).toHaveLength(1)
+    expect(content).toContain("model_auto_compact_token_limit = 200000")
+    expect(content).toContain('[projects."/Users/z/ai_run"]')
+    expect(content).toContain('[tui.model_availability_nux]')
+    expect(content).toContain('base_url = "http://127.0.0.1:4242/v1"')
+  })
+
+  test("preserves non-bridge provider tables while replacing bridge provider", async () => {
+    const p = await makeConfigPath()
+    await writeFile(
+      p,
+      `model = "gpt-5.5"
+
+[model_providers.openai]
+name = "OpenAI"
+base_url = "https://api.openai.com/v1"
+wire_api = "responses"
+
+[model_providers.bridge]
+name = "Old Bridge"
+base_url = "http://old/v1"
+wire_api = "responses"
+
+[profiles.work]
+model_provider = "openai"
+`,
+    )
+    await applyCodexConfig({
+      configPath: p,
+      baseUrl: "http://127.0.0.1:4242/v1",
+      settings: baseSettings,
+      modelContextWindow: 1050000,
+    })
+    const content = await readFile(p, "utf8")
+
+    expect(content).toContain("[model_providers.openai]")
+    expect(content).toContain('base_url = "https://api.openai.com/v1"')
+    expect(content).toContain("[profiles.work]")
+    expect(content).toContain('model_provider = "openai"')
+    expect(content.match(/^\[model_providers\.bridge\]$/gm)).toHaveLength(1)
+    expect(content).toContain('name = "Copilot Bridge"')
+    expect(content).toContain('base_url = "http://127.0.0.1:4242/v1"')
+    expect(content).not.toContain('name = "Old Bridge"')
+  })
 })