Skip to content

Commit 2128cda

Browse files
npub1g8493u0xfsjrvflg4n08ezd7vec99mnwzlv0qgwpr9d7gvjwhuzqx59rhwwpfleger96
andcommitted
fix(desktop): canonicalize openai-compat → openai in PROVIDER_ALIASES
Rust accepts 'openai-compat' as Provider::OpenAi (config.rs:1218) but the TS canonicalizer had no corresponding alias. A selectable desktop provider therefore showed the unknown-provider fallback (all 7 efforts, default medium) while the Rust request path applied the openai table ([high] for gpt-5-pro, etc.) — a visible UI/behavior mismatch. Add 'openai-compat' → 'openai' to PROVIDER_ALIASES so canonicalizeProvider() resolves it identically on both sides. Update buzzAgentConfig.test.mjs and effortTable.fixture.json to reflect the corrected behavior and add concrete alias vectors (gpt-5-pro, gpt-5.5, gpt-5 base) plus trim/case variants consistent with the existing databricks-v2 alias handling. Co-authored-by: Will Pfleger <[email protected]> Signed-off-by: Will Pfleger <[email protected]>
1 parent 0b97bfc commit 2128cda

3 files changed

Lines changed: 78 additions & 10 deletions

File tree

‎desktop/src/features/agents/lib/formatAgentModelLabel.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ import {
55

66
/**
77
* Known provider-id aliases that must be normalized before generated lookups.
8-
* The UI and Rust persist "databricks-v2" (hyphen form) but the manifest
9-
* registers records under "databricks_v2" (underscore form).
8+
*
9+
* - "databricks-v2" (hyphen form) → "databricks_v2" (underscore form used in manifest).
10+
* - "openai-compat" → "openai": Rust already accepts "openai-compat" as Provider::OpenAi
11+
* (crates/buzz-agent/src/config.rs); TS must canonicalize identically so the UI shows
12+
* the same effort table that the Rust request path will apply.
1013
*/
1114
const PROVIDER_ALIASES: Readonly<Record<string, string>> = {
1215
"databricks-v2": "databricks_v2",
16+
"openai-compat": "openai",
1317
};
1418

1519
/**

‎desktop/src/features/agents/ui/buzzAgentConfig.test.mjs‎

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,19 @@ test("databricks v1 routes like openai unknown (no gpt-5 model)", () => {
541541
assert.equal(defaultValue, "medium");
542542
});
543543

544-
test("openai-compat returns all-7 with medium default", () => {
545-
const { validValues, defaultValue } = getProviderEffortConfig(
546-
"openai-compat",
547-
"",
544+
test("openai-compat canonicalizes to openai: empty model returns all-except-max with medium default", () => {
545+
// Regression: without canonicalization, openai-compat hit the unknown-provider fallback
546+
// (all 7 values, default medium). After alias, it must resolve identically to openai.
547+
const compat = getProviderEffortConfig("openai-compat", "");
548+
const openai = getProviderEffortConfig("openai", "");
549+
assert.deepEqual([...compat.validValues], [...openai.validValues]);
550+
assert.equal(compat.defaultValue, openai.defaultValue);
551+
// Concrete assertion: same as openai unknown model, not the all-7 fallback.
552+
assert.deepEqual(
553+
[...compat.validValues],
554+
["none", "minimal", "low", "medium", "high", "xhigh"],
548555
);
549-
assert.equal(validValues.length, 7);
550-
assert.equal(defaultValue, "medium");
556+
assert.equal(compat.defaultValue, "medium");
551557
});
552558

553559
test("empty provider returns all-7 with medium default", () => {
@@ -646,3 +652,54 @@ test("databricks-v2 hyphen alias with databricks-gpt-5-5 returns [low,medium,hig
646652
assert.deepEqual([...validValues], ["low", "medium", "high"]);
647653
assert.equal(defaultValue, "medium");
648654
});
655+
656+
// ---------------------------------------------------------------------------
657+
// getProviderEffortConfig — openai-compat alias (Thufir P3 corrective action 1)
658+
// ---------------------------------------------------------------------------
659+
// Rust normalizes "openai-compat" → Provider::OpenAi at config.rs:1218.
660+
// TS PROVIDER_ALIASES must match so UI effort table = Rust request behavior.
661+
662+
test("openai-compat/gpt-5-pro resolves identically to openai/gpt-5-pro", () => {
663+
const compat = getProviderEffortConfig("openai-compat", "gpt-5-pro");
664+
const openai = getProviderEffortConfig("openai", "gpt-5-pro");
665+
assert.deepEqual([...compat.validValues], [...openai.validValues]);
666+
assert.equal(compat.defaultValue, openai.defaultValue);
667+
// Concrete: gpt-5-pro is [high] only.
668+
assert.deepEqual([...compat.validValues], ["high"]);
669+
assert.equal(compat.defaultValue, "high");
670+
});
671+
672+
test("openai-compat/gpt-5.5 resolves identically to openai/gpt-5.5", () => {
673+
const compat = getProviderEffortConfig("openai-compat", "gpt-5.5");
674+
const openai = getProviderEffortConfig("openai", "gpt-5.5");
675+
assert.deepEqual([...compat.validValues], [...openai.validValues]);
676+
assert.equal(compat.defaultValue, openai.defaultValue);
677+
});
678+
679+
test("openai-compat/gpt-5 base resolves identically to openai/gpt-5", () => {
680+
const compat = getProviderEffortConfig("openai-compat", "gpt-5");
681+
const openai = getProviderEffortConfig("openai", "gpt-5");
682+
assert.deepEqual([...compat.validValues], [...openai.validValues]);
683+
assert.equal(compat.defaultValue, openai.defaultValue);
684+
});
685+
686+
test("openai-compat alias is case-insensitive: OpenAI-Compat canonicalizes correctly", () => {
687+
const mixed = getProviderEffortConfig("OpenAI-Compat", "gpt-5-pro");
688+
const lower = getProviderEffortConfig("openai-compat", "gpt-5-pro");
689+
assert.deepEqual([...mixed.validValues], [...lower.validValues]);
690+
assert.equal(mixed.defaultValue, lower.defaultValue);
691+
});
692+
693+
test("openai-compat alias handles surrounding whitespace: ' openai-compat ' canonicalizes correctly", () => {
694+
const padded = getProviderEffortConfig(" openai-compat ", "gpt-5-pro");
695+
const clean = getProviderEffortConfig("openai-compat", "gpt-5-pro");
696+
assert.deepEqual([...padded.validValues], [...clean.validValues]);
697+
assert.equal(padded.defaultValue, clean.defaultValue);
698+
});
699+
700+
test("openai-compat alias handles mixed case + whitespace: ' OpenAI-Compat ' canonicalizes correctly", () => {
701+
const messy = getProviderEffortConfig(" OpenAI-Compat ", "gpt-5");
702+
const canonical = getProviderEffortConfig("openai", "gpt-5");
703+
assert.deepEqual([...messy.validValues], [...canonical.validValues]);
704+
assert.equal(messy.defaultValue, canonical.defaultValue);
705+
});

‎desktop/src/features/agents/ui/effortTable.fixture.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,19 @@
203203
"defaultValue": "medium"
204204
},
205205
{
206-
"note": "openai-compat: all-7 with medium default",
206+
"note": "openai-compat: canonicalizes to openai, empty model → all-except-max with medium default",
207207
"provider": "openai-compat",
208208
"model": "",
209-
"validValues": ["none", "minimal", "low", "medium", "high", "xhigh", "max"],
209+
"validValues": ["none", "minimal", "low", "medium", "high", "xhigh"],
210210
"defaultValue": "medium"
211211
},
212+
{
213+
"note": "openai-compat/gpt-5-pro: canonicalizes to openai, gpt-5-pro → [high] only",
214+
"provider": "openai-compat",
215+
"model": "gpt-5-pro",
216+
"validValues": ["high"],
217+
"defaultValue": "high"
218+
},
212219
{
213220
"note": "openrouter: all-7 with medium default",
214221
"provider": "openrouter",

0 commit comments

Comments
 (0)