Skip to content

Commit 3ad180a

Browse files
wesbillmanPinky
andauthored
Expose model selection for provider-locked runtimes (#2071)
Signed-off-by: Wes <[email protected]> Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
1 parent 1fdb73e commit 3ad180a

7 files changed

Lines changed: 115 additions & 20 deletions

‎desktop/src/features/agents/ui/AgentAiConfigurationMode.tsx‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,28 @@ import type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy";
33

44
export type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy";
55

6+
export function HarnessModelDefaultNotice({
7+
model,
8+
}: {
9+
model?: string | null;
10+
}) {
11+
return (
12+
<div className="text-sm" data-testid="agent-harness-defaults-notice">
13+
<span className="text-muted-foreground">Model</span>{" "}
14+
<span className="text-foreground">
15+
{model?.trim() || "Harness default"}
16+
</span>
17+
</div>
18+
);
19+
}
20+
621
export function AgentAiConfigurationModeField({
722
mode,
23+
needsProviderSelection = true,
824
onModeChange,
925
}: {
1026
mode: AgentAiConfigurationMode;
27+
needsProviderSelection?: boolean;
1128
onModeChange: (mode: AgentAiConfigurationMode) => void;
1229
}) {
1330
return (
@@ -20,13 +37,19 @@ export function AgentAiConfigurationModeField({
2037
value={mode}
2138
>
2239
<TabsList>
23-
<TabsTrigger value="defaults">Use agent defaults</TabsTrigger>
40+
<TabsTrigger value="defaults">
41+
{needsProviderSelection
42+
? "Use agent defaults"
43+
: "Use harness defaults"}
44+
</TabsTrigger>
2445
<TabsTrigger value="custom">Customize for this agent</TabsTrigger>
2546
</TabsList>
2647
</Tabs>
2748
{mode === "custom" ? (
2849
<p className="text-xs text-muted-foreground">
29-
Provider and model changes apply only to this agent.
50+
{needsProviderSelection
51+
? "Provider and model changes apply only to this agent."
52+
: "Model changes apply only to this agent."}
3053
</p>
3154
) : null}
3255
</div>

‎desktop/src/features/agents/ui/AgentDefinitionDialog.tsx‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import { AgentAiDefaultsNotice } from "./AgentAiDefaults";
7373
import { AgentAiDefaultsDialog } from "./AgentAiDefaultsDialog";
7474
import {
7575
AgentAiConfigurationModeField,
76+
HarnessModelDefaultNotice,
7677
type AgentAiConfigurationMode,
7778
} from "./AgentAiConfigurationMode";
7879
import {
@@ -346,11 +347,14 @@ export function AgentDefinitionDialog({
346347
setIsCustomModelEditing(false);
347348
const nextPair = agentAiConfigurationPairForMode({
348349
current: { provider, model },
349-
inherited: {
350-
provider: inheritedProviderDefault.value,
351-
model: inheritedModelDefault.value,
352-
},
350+
inherited: runtimeCanChooseLlmProvider
351+
? {
352+
provider: inheritedProviderDefault.value,
353+
model: inheritedModelDefault.value,
354+
}
355+
: { provider: "", model: runtimeFileConfig?.model?.trim() ?? "" },
353356
mode: nextMode,
357+
needsProviderSelection: runtimeCanChooseLlmProvider,
354358
});
355359
setProvider(nextPair.provider);
356360
setModel(nextPair.model);
@@ -428,8 +432,6 @@ export function AgentDefinitionDialog({
428432
aiConfigurationMode === "custom" && runtimeCanChooseLlmProvider;
429433
const modelFieldVisible =
430434
runtime.trim().length > 0 || blankRuntimeModelProviderEditable;
431-
// Customize pins a complete provider/model pair. Shared compute's concrete
432-
// automatic-routing value is the only valid non-model-id choice.
433435
const isExplicitModelRequired = aiConfigurationMode === "custom";
434436
// Gate the provider requirement on the field's actual visibility, not the raw
435437
// runtime capability. Codex/Claude hide the provider picker (they drive their
@@ -852,9 +854,10 @@ export function AgentDefinitionDialog({
852854
{runtimeWarning}
853855
</div>
854856

855-
{llmProviderFieldVisible ? (
857+
{modelFieldVisible ? (
856858
<AgentAiConfigurationModeField
857859
mode={aiConfigurationMode}
860+
needsProviderSelection={runtimeCanChooseLlmProvider}
858861
onModeChange={handleAiConfigurationModeChange}
859862
/>
860863
) : null}
@@ -950,19 +953,23 @@ export function AgentDefinitionDialog({
950953
</AnimatePresence>
951954

952955
{aiConfigurationMode === "defaults" ? (
953-
<AgentAiDefaultsNotice
954-
onEditDefaults={() => setAiDefaultsOpen(true)}
955-
triggerRef={aiDefaultsTriggerRef}
956-
explicitModel=""
957-
explicitProvider=""
958-
inheritedModel={inheritedModelDefault}
959-
inheritedProvider={inheritedProviderDefault}
960-
/>
956+
runtimeCanChooseLlmProvider ? (
957+
<AgentAiDefaultsNotice
958+
onEditDefaults={() => setAiDefaultsOpen(true)}
959+
triggerRef={aiDefaultsTriggerRef}
960+
explicitModel=""
961+
explicitProvider=""
962+
inheritedModel={inheritedModelDefault}
963+
inheritedProvider={inheritedProviderDefault}
964+
/>
965+
) : (
966+
<HarnessModelDefaultNotice model={runtimeFileConfig?.model} />
967+
)
961968
) : null}
962969

963970
<AgentAiDefaultsDialog
964971
onOpenChange={setAiDefaultsOpen}
965-
open={aiDefaultsOpen}
972+
open={runtimeCanChooseLlmProvider && aiDefaultsOpen}
966973
returnFocusRef={aiDefaultsTriggerRef}
967974
/>
968975

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,20 @@ test("Defaults clears provider and model together", () => {
126126
);
127127
});
128128

129+
test("entering Customize pins only the harness model without a provider picker", () => {
130+
for (const model of ["claude-opus", "gpt-5.2-codex"]) {
131+
assert.deepEqual(
132+
agentAiConfigurationPairForMode({
133+
current: { provider: "", model: "" },
134+
inherited: { provider: "databricks_v2", model },
135+
mode: "custom",
136+
needsProviderSelection: false,
137+
}),
138+
{ provider: "", model },
139+
);
140+
}
141+
});
142+
129143
test("entering Customize pins unresolved fields from the inherited pair", () => {
130144
assert.deepEqual(
131145
agentAiConfigurationPairForMode({

‎desktop/src/features/agents/ui/agentAiConfigurationPolicy.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,21 @@ export function agentAiConfigurationPairForMode({
1515
current,
1616
inherited,
1717
mode,
18+
needsProviderSelection = true,
1819
}: {
1920
current: AgentAiConfigurationPair;
2021
inherited: AgentAiConfigurationPair;
2122
mode: AgentAiConfigurationMode;
23+
needsProviderSelection?: boolean;
2224
}): AgentAiConfigurationPair {
2325
if (mode === "defaults") {
2426
return { provider: "", model: "" };
2527
}
2628

2729
return {
28-
provider: current.provider.trim() || inherited.provider,
30+
provider: needsProviderSelection
31+
? current.provider.trim() || inherited.provider
32+
: "",
2933
model: current.model.trim() || inherited.model,
3034
};
3135
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ test("Customize on Codex/Claude asks only for a model, never a provider", () =>
129129
);
130130
assert.match(reason, /Select a model/);
131131
assert.doesNotMatch(reason, /provider/);
132+
assert.match(reason, /Use harness defaults/);
133+
assert.doesNotMatch(reason, /Use AI defaults/);
132134
});
133135

134136
test("precedence: a missing name outranks incomplete AI defaults", () => {

‎desktop/src/features/agents/ui/personaSubmitBlock.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ export function personaSubmitBlock(
128128
if (input.customModelEmpty) pieces.push("a model");
129129
const what =
130130
pieces.length > 0 ? joinWithAnd(pieces) : "the AI configuration";
131-
return `Select ${what} for this agent, or switch to Use AI defaults.`;
131+
const defaultsLabel = input.runtimeNeedsProviderSelection
132+
? "Use AI defaults"
133+
: "Use harness defaults";
134+
return `Select ${what} for this agent, or switch to ${defaultsLabel}.`;
132135
}
133136

134137
return null;

‎desktop/tests/e2e/agent-provider-dropdowns.spec.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,46 @@ test.describe("agent provider dropdown screenshots", () => {
197197
path: `${SHOTS}/03-builtin-edit-runtime-seeded.png`,
198198
});
199199
});
200+
201+
test("04-codex-definition-exposes-model-without-global-provider-defaults", async ({
202+
page,
203+
}) => {
204+
await installMockBridge(page, {
205+
globalAgentConfig: {
206+
provider: "databricks_v2",
207+
model: "global-databricks-model",
208+
env_vars: {},
209+
},
210+
personas: [
211+
{
212+
displayName: "Codex Definition",
213+
systemPrompt: "A Codex-backed definition.",
214+
runtime: "codex",
215+
},
216+
],
217+
});
218+
219+
await page.goto("/");
220+
await page.getByTestId("open-agents-view").click();
221+
await page
222+
.getByRole("button", { name: "Open actions for Codex Definition" })
223+
.click();
224+
await page.getByRole("menuitem", { name: "Edit" }).click();
225+
226+
const dialog = page.getByTestId("persona-dialog");
227+
await expect(dialog).toBeVisible({ timeout: 10_000 });
228+
await expect(
229+
dialog.getByRole("tab", { name: "Customize for this agent" }),
230+
).toBeVisible();
231+
await expect(
232+
dialog.getByText("Harness default", { exact: true }),
233+
).toBeVisible();
234+
await expect(dialog.getByText(/Databricks/i)).toHaveCount(0);
235+
236+
await dialog.getByRole("tab", { name: "Customize for this agent" }).click();
237+
await expect(
238+
dialog.getByRole("combobox", { name: /model/i }),
239+
).toBeVisible();
240+
await expect(dialog.getByText("Model changes apply only")).toBeVisible();
241+
});
200242
});

0 commit comments

Comments
 (0)