From 7519167031d024512ad787d7c4e90f20072d25ec Mon Sep 17 00:00:00 2001
From: Iuliia Ivashko <yulia.ivashko@gmail.com>
Date: Fri, 4 Sep 2026 07:10:23 +0300
Subject: [PATCH] fix(ui): stop restoring inherited effort from history as an
 explicit choice

Message metadata records the effective effort, inherited defaults
included. The history-restore effect re-applied it as an explicit
override and re-pinned it per session one render after every send, so
the picker still jumped from Default to the settings default despite the
send-time fix. Only an effort deviating from what the model would
inherit is restored as a choice; the preserve-manual-override branch
follows the same rule.
---
 .../ui/src/components/chat/ModelControls.tsx  | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/chat/ModelControls.tsx b/packages/ui/src/components/chat/ModelControls.tsx
index d09b0004..d4b3a486 100644
--- a/packages/ui/src/components/chat/ModelControls.tsx
+++ b/packages/ui/src/components/chat/ModelControls.tsx
@@ -833,10 +833,19 @@ export const ModelControls: React.FC<ModelControlsProps> = ({
             candidate: latestLoadedUserChoice,
         })) {
             if (savedSessionModel) {
+                // Same rule as the history restore below: an effort equal to
+                // the inherited default is not evidence of a choice, so it is
+                // not recommitted as an explicit override.
+                const preservedVariant = resolveModelVariantSelection(savedSessionModel.providerId, savedSessionModel.modelId);
+                const inheritedForPreserved = resolveInheritedVariantForModel(
+                    savedSessionModel.providerId,
+                    savedSessionModel.modelId,
+                    currentAgentName || undefined,
+                );
                 applyModelSelectionWithVariant(
                     savedSessionModel.providerId,
                     savedSessionModel.modelId,
-                    resolveModelVariantSelection(savedSessionModel.providerId, savedSessionModel.modelId),
+                    preservedVariant === inheritedForPreserved ? undefined : preservedVariant,
                     currentAgentName || undefined,
                 );
             }
@@ -848,10 +857,23 @@ export const ModelControls: React.FC<ModelControlsProps> = ({
             setAgent(latestLoadedUserChoice.agent);
         }
 
-        const historicalVariant = latestLoadedUserChoice.variant
+        // Message metadata records the *effective* effort, inherited defaults
+        // included; only a deviation from what this model would inherit proves
+        // the user chose it. Restoring an inherited-equal effort as an explicit
+        // override would pin the default and move the picker off "Default"
+        // right after every send.
+        const validHistoricalVariant = latestLoadedUserChoice.variant
             && getModelVariantOptions(latestLoadedUserChoice.providerID, latestLoadedUserChoice.modelID).includes(latestLoadedUserChoice.variant)
             ? latestLoadedUserChoice.variant
             : undefined;
+        const inheritedForRestoredModel = resolveInheritedVariantForModel(
+            latestLoadedUserChoice.providerID,
+            latestLoadedUserChoice.modelID,
+            latestLoadedUserChoice.agent || currentAgentName || undefined,
+        );
+        const historicalVariant = validHistoricalVariant === inheritedForRestoredModel
+            ? undefined
+            : validHistoricalVariant;
         const applyResult = applyModelSelectionWithVariant(
             latestLoadedUserChoice.providerID,
             latestLoadedUserChoice.modelID,
@@ -886,6 +908,7 @@ export const ModelControls: React.FC<ModelControlsProps> = ({
         applyModelSelectionWithVariant,
         getModelVariantOptions,
         getSessionModelSelection,
+        resolveInheritedVariantForModel,
         resolveModelVariantSelection,
         saveSessionAgentSelection,
         saveAgentModelVariantForSession,