@@ -73,6 +73,7 @@ import { AgentAiDefaultsNotice } from "./AgentAiDefaults";
7373import { AgentAiDefaultsDialog } from "./AgentAiDefaultsDialog" ;
7474import {
7575 AgentAiConfigurationModeField ,
76+ HarnessModelDefaultNotice ,
7677 type AgentAiConfigurationMode ,
7778} from "./AgentAiConfigurationMode" ;
7879import {
@@ -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
0 commit comments