@code-yeongyu/senpi 2026.9.3 → 2026.9.4

package/dist/core/session-manager.js

@@ -178,6 +178,13 @@ function getSessionContextSettings(path) {
     let thinkingLevel = "off";
     let thinkingSelection;
     let model = null;
+    // An explicit selection (a manual `model_change`, or the primary restored from a fallback
+    // window) outranks the model id echoed by later assistant messages from the SAME provider:
+    // the persisted message id is the wire id, which differs from the catalog id whenever the
+    // catalog entry maps to an `upstreamModelId` (a `-fast` priority variant is the common case),
+    // so trusting the echo would resume the base model and silently drop the tier. A message
+    // from another provider still wins, since no `model_change` recorded that hop.
+    let isModelSelectionExplicit = false;
     let isInFallbackWindow = false;
     // A fallback switch applies an ephemeral thinking level to the fallback model, so
     // the level recorded inside the window must not outlive it: restoring the primary
@@ -197,6 +204,7 @@ function getSessionContextSettings(path) {
                     preFallbackThinkingSelection = thinkingSelection;
                     if (entry.originalProvider && entry.originalModelId) {
                         model = { provider: entry.originalProvider, modelId: entry.originalModelId };
+                        isModelSelectionExplicit = true;
                     }
                 }
                 isInFallbackWindow = true;
@@ -212,11 +220,20 @@ function getSessionContextSettings(path) {
                 // A manual model switch abandons the window: the level the user set inside
                 // it is a deliberate choice and carries over to the newly selected model.
                 isInFallbackWindow = false;
-                model = { provider: entry.provider, modelId: entry.modelId };
+                // Session files are parsed without validation, so an entry missing its provider or
+                // model id must not become an authoritative selection; the fallback-original restore
+                // above guards the same way, and a later assistant message still restores the model.
+                if (entry.provider && entry.modelId) {
+                    model = { provider: entry.provider, modelId: entry.modelId };
+                    isModelSelectionExplicit = true;
+                }
             }
         }
         else if (entry.type === "message" && entry.message.role === "assistant" && !isInFallbackWindow) {
+            if (isModelSelectionExplicit && model?.provider === entry.message.provider)
+                continue;
             model = { provider: entry.message.provider, modelId: entry.message.model };
+            isModelSelectionExplicit = false;
         }
     }
     // The process can exit inside a fallback window; the primary model is already