@@ -125,6 +125,41 @@ export function shouldShowModelStatusMessage(
125125 return showDescriptions || status !== null ;
126126}
127127
128+ /**
129+ * Whether the Model control should render given discovery state.
130+ *
131+ * Optional-model harnesses (Claude Code / Codex, `acpNative`) omit the control
132+ * while discovery is in flight and after a **confirmed successful empty**
133+ * catalog (IPC resolved, no usable options) — there is nothing useful to pick.
134+ * Discovery failures / unavailable runtimes keep the control so #2246 failure
135+ * UI can render. Full disclosure still shows the control when Custom model is
136+ * available. Required-model harnesses always render the control.
137+ */
138+ export function shouldRenderModelControl ( {
139+ discoveredModelOptions,
140+ modelDiscoveryLoading,
141+ modelDiscoverySuccessfulEmpty,
142+ modelIsOptional,
143+ showCustomModelOption,
144+ } : {
145+ discoveredModelOptions : readonly { id : string } [ ] | null ;
146+ modelDiscoveryLoading : boolean ;
147+ /** True only when discovery IPC resolved with a response that yielded no options. */
148+ modelDiscoverySuccessfulEmpty : boolean ;
149+ modelIsOptional : boolean ;
150+ showCustomModelOption : boolean ;
151+ } ) : boolean {
152+ if ( ! modelIsOptional ) return true ;
153+ if ( modelDiscoveryLoading ) return false ;
154+ const hasExplicitModel = ( discoveredModelOptions ?? [ ] ) . some (
155+ ( option ) => option . id . trim ( ) . length > 0 ,
156+ ) ;
157+ if ( hasExplicitModel ) return true ;
158+ if ( showCustomModelOption ) return true ;
159+ // Omit only on confirmed successful empty — not on failure/unavailable.
160+ return ! modelDiscoverySuccessfulEmpty ;
161+ }
162+
128163export type AgentConfigFieldsProps = {
129164 bakedEnv : BakedEnvEntry [ ] ;
130165 selectedRuntime : AcpRuntimeCatalogEntry | undefined ;
@@ -277,6 +312,7 @@ export function AgentConfigFields({
277312 discoveredModelOptions,
278313 modelDiscoveryLoading,
279314 modelDiscoveryStatus,
315+ modelDiscoverySuccessfulEmpty,
280316 } = usePersonaModelDiscovery ( {
281317 envVars : config . env_vars ,
282318 isCustomProviderEditing : isCustomProvider ,
@@ -285,6 +321,18 @@ export function AgentConfigFields({
285321 provider : providerForDiscovery ,
286322 selectedRuntime,
287323 } ) ;
324+ const modelControlVisible = shouldRenderModelControl ( {
325+ discoveredModelOptions : dependentFieldsDisabled
326+ ? null
327+ : discoveredModelOptions ,
328+ modelDiscoveryLoading : dependentFieldsDisabled
329+ ? false
330+ : modelDiscoveryLoading ,
331+ modelDiscoverySuccessfulEmpty :
332+ ! dependentFieldsDisabled && modelDiscoverySuccessfulEmpty ,
333+ modelIsOptional,
334+ showCustomModelOption,
335+ } ) ;
288336
289337 // Mount-time healing policy: onboarding page 4 edits the root config during
290338 // first-run (no higher layers to inherit from), so acting on open is safe
@@ -353,16 +401,23 @@ export function AgentConfigFields({
353401 // the old harness. In onboarding, heal that stale value as soon as the new
354402 // harness catalog proves it is unsupported; otherwise a Codex id like
355403 // `gpt-5.5[low]` appears as a Claude Code custom model.
404+ // Also clear when the Model control is omitted after a confirmed successful
405+ // empty catalog — never while discovery failed/unavailable (transient
406+ // failures must not erase saved model/effort).
356407 React . useEffect ( ( ) => {
357408 if ( ! healOnMount ) return ;
358409 const currentModel = ( config . model ?? "" ) . trim ( ) ;
359410 if ( currentModel . length === 0 ) return ;
360- if ( modelDiscoveryLoading || discoveredModelOptions === null ) return ;
361- if (
362- discoveredModelOptions . some ( ( option ) => option . id . trim ( ) === currentModel )
363- ) {
364- return ;
365- }
411+ if ( modelDiscoveryLoading ) return ;
412+
413+ const catalogMiss =
414+ discoveredModelOptions !== null &&
415+ ! discoveredModelOptions . some (
416+ ( option ) => option . id . trim ( ) === currentModel ,
417+ ) ;
418+ const omittedAfterSuccessfulEmpty =
419+ modelIsOptional && ! modelControlVisible && modelDiscoverySuccessfulEmpty ;
420+ if ( ! catalogMiss && ! omittedAfterSuccessfulEmpty ) return ;
366421
367422 const nextEnvVars = { ...config . env_vars } ;
368423 if ( effortPersistenceKey ) delete nextEnvVars [ effortPersistenceKey ] ;
@@ -371,7 +426,10 @@ export function AgentConfigFields({
371426 } , [
372427 config ,
373428 discoveredModelOptions ,
429+ modelControlVisible ,
374430 modelDiscoveryLoading ,
431+ modelDiscoverySuccessfulEmpty ,
432+ modelIsOptional ,
375433 onConfigChange ,
376434 onCustomModelEditingChange ,
377435 healOnMount ,
@@ -659,53 +717,55 @@ export function AgentConfigFields({
659717 </ div >
660718 ) : null }
661719
662- { /* Model field */ }
663- < div className = { showDescriptions ? fieldClassName : undefined } >
664- < AgentModelField
665- allowDefaultModel = { fallbackModel !== null }
666- defaultModelLabel = {
667- fallbackModel ? `Default model (${ fallbackModel } )` : undefined
668- }
669- disableSelectDuringDiscovery = { disableModelSelectDuringDiscovery }
670- disabled = { dependentFieldsDisabled }
671- discoveredModelOptions = {
672- dependentFieldsDisabled ? null : discoveredModelOptions
673- }
674- globalModel = { fallbackModel ?? undefined }
675- id = "global-agent-model"
676- isCustomModelEditing = { isCustomModelEditing }
677- isRequired = {
678- showRequiredIndicators &&
679- ! modelIsOptional &&
680- fallbackModel === null &&
681- ! dependentFieldsDisabled
682- }
683- keepSelectedModelValueLabel
684- model = { dependentFieldsDisabled ? "" : ( config . model ?? "" ) }
685- modelDiscoveryLoading = {
686- dependentFieldsDisabled ? false : modelDiscoveryLoading
687- }
688- modelDiscoveryStatus = {
689- dependentFieldsDisabled ? null : modelDiscoveryStatus
690- }
691- onIsCustomModelEditingChange = { onCustomModelEditingChange }
692- onModelChange = { handleModelChange }
693- placeholderClassName = { placeholderClassName }
694- placeholder = "Select a model"
695- provider = { providerForDiscovery }
696- fieldClassName = { unstyled ? fieldClassName : undefined }
697- labelClassName = { fieldLabelClassName }
698- selectClassName = { selectClassName }
699- showCustomModelOption = { showCustomModelOption }
700- showStatusMessage = { shouldShowModelStatusMessage (
701- showDescriptions ,
702- modelDiscoveryStatus ,
703- ) }
704- testId = "global-agent-model"
705- useCustomSelect = { useCustomSelect }
706- useChevronIcon = { useChevronSelectIcon }
707- />
708- </ div >
720+ { /* Model field — omitted only after confirmed successful empty discovery */ }
721+ { modelControlVisible ? (
722+ < div className = { showDescriptions ? fieldClassName : undefined } >
723+ < AgentModelField
724+ allowDefaultModel = { fallbackModel !== null }
725+ defaultModelLabel = {
726+ fallbackModel ? `Default model (${ fallbackModel } )` : undefined
727+ }
728+ disableSelectDuringDiscovery = { disableModelSelectDuringDiscovery }
729+ disabled = { dependentFieldsDisabled }
730+ discoveredModelOptions = {
731+ dependentFieldsDisabled ? null : discoveredModelOptions
732+ }
733+ globalModel = { fallbackModel ?? undefined }
734+ id = "global-agent-model"
735+ isCustomModelEditing = { isCustomModelEditing }
736+ isRequired = {
737+ showRequiredIndicators &&
738+ ! modelIsOptional &&
739+ fallbackModel === null &&
740+ ! dependentFieldsDisabled
741+ }
742+ keepSelectedModelValueLabel
743+ model = { dependentFieldsDisabled ? "" : ( config . model ?? "" ) }
744+ modelDiscoveryLoading = {
745+ dependentFieldsDisabled ? false : modelDiscoveryLoading
746+ }
747+ modelDiscoveryStatus = {
748+ dependentFieldsDisabled ? null : modelDiscoveryStatus
749+ }
750+ onIsCustomModelEditingChange = { onCustomModelEditingChange }
751+ onModelChange = { handleModelChange }
752+ placeholderClassName = { placeholderClassName }
753+ placeholder = "Select a model"
754+ provider = { providerForDiscovery }
755+ fieldClassName = { unstyled ? fieldClassName : undefined }
756+ labelClassName = { fieldLabelClassName }
757+ selectClassName = { selectClassName }
758+ showCustomModelOption = { showCustomModelOption }
759+ showStatusMessage = { shouldShowModelStatusMessage (
760+ showDescriptions ,
761+ dependentFieldsDisabled ? null : modelDiscoveryStatus ,
762+ ) }
763+ testId = "global-agent-model"
764+ useCustomSelect = { useCustomSelect }
765+ useChevronIcon = { useChevronSelectIcon }
766+ />
767+ </ div >
768+ ) : null }
709769
710770 { /* Thinking / Effort */ }
711771 { effortFieldVisible ? (
0 commit comments