Merge pull request #2080 from Firstbober/dev

fix: model format normalization and explicit config cache bypass

src/shared/model-format-normalizer.test.ts

@@ -0,0 +1,46 @@
+import { describe, it, expect } from "bun:test"
+import { normalizeModelFormat } from "./model-format-normalizer"
+
+describe("normalizeModelFormat", () => {
+  describe("string format input", () => {
+    it("splits provider/model format correctly", () => {
+      const result = normalizeModelFormat("opencode/glm-5-free")
+      expect(result).toEqual({ providerID: "opencode", modelID: "glm-5-free" })
+    })
+
+    it("handles provider with multiple slashes", () => {
+      const result = normalizeModelFormat("anthropic/claude-opus-4-6/max")
+      expect(result).toEqual({ providerID: "anthropic", modelID: "claude-opus-4-6/max" })
+    })
+
+    it("returns undefined for malformed string without separator", () => {
+      const result = normalizeModelFormat("invalid")
+      expect(result).toBeUndefined()
+    })
+
+    it("returns undefined for empty string", () => {
+      const result = normalizeModelFormat("")
+      expect(result).toBeUndefined()
+    })
+  })
+
+  describe("object format input", () => {
+    it("passthroughs object format unchanged", () => {
+      const input = { providerID: "opencode", modelID: "glm-5-free" }
+      const result = normalizeModelFormat(input)
+      expect(result).toEqual(input)
+    })
+  })
+
+  describe("edge cases", () => {
+    it("returns undefined for null", () => {
+      const result = normalizeModelFormat(null)
+      expect(result).toBeUndefined()
+    })
+
+    it("returns undefined for undefined", () => {
+      const result = normalizeModelFormat(undefined)
+      expect(result).toBeUndefined()
+    })
+  })
+})

src/shared/model-format-normalizer.ts

@@ -0,0 +1,20 @@
+export function normalizeModelFormat(
+  model: string | { providerID: string; modelID: string }
+): { providerID: string; modelID: string } | undefined {
+  if (!model) {
+    return undefined
+  }
+
+  if (typeof model === "object" && "providerID" in model && "modelID" in model) {
+    return { providerID: model.providerID, modelID: model.modelID }
+  }
+
+  if (typeof model === "string") {
+    const parts = model.split("/")
+    if (parts.length >= 2) {
+      return { providerID: parts[0], modelID: parts.slice(1).join("/") }
+    }
+  }
+
+  return undefined
+}

src/shared/model-resolution-pipeline.ts

@@ -34,6 +34,7 @@ export type ModelResolutionResult = {
   variant?: string
   attempted?: string[]
   reason?: string
+  explicitUserConfig?: boolean
 }
 
 
@@ -55,7 +56,7 @@ export function resolveModelPipeline(
   const normalizedUserModel = normalizeModel(intent?.userModel)
   if (normalizedUserModel) {
     log("Model resolved via config override", { model: normalizedUserModel })
-    return { model: normalizedUserModel, provenance: "override" }
+    return { model: normalizedUserModel, provenance: "override", explicitUserConfig: true }
   }
 
   const normalizedCategoryDefault = normalizeModel(intent?.categoryDefaultModel)