fix(gateway): clear auto-fallback model override on session reset by frankekn · Pull Request #63155 · openclaw/openclaw

frankekn · 2026-04-08T12:46:08Z

Summary

Fix sticky fallback model override surviving /reset and /new commands
Only preserve providerOverride/modelOverride/authProfileOverride across session reset when authProfileOverrideSource === "user" (explicit /model command)
System-driven overrides (authProfileOverrideSource: "auto", from fallback rotation) are now dropped on reset so the session picks up the current config default

Change Type (select all)

Scope (select all touched areas)

Linked Issue/PR

This PR fixes a bug or regression

Root Cause (if applicable)

Root cause: commit cb0a752 ("fix: preserve reset session behavior config", v2026.3.28) added providerOverride, modelOverride, authProfileOverride, authProfileOverrideSource, and authProfileOverrideCompactionCount to the fields unconditionally copied during session reset in performGatewaySessionReset(). This was correct for user-driven /model selections (authProfileOverrideSource: "user"), but it also preserved fallback-driven overrides (authProfileOverrideSource: "auto") written by persistFallbackCandidateSelection().
Precedence issue: the session store override takes precedence over the agent config default provider. When a fallback override survives reset, the new session uses the fallback provider instead of the configured primary, even if the user has since changed the agent config.
Repro sequence: (1) primary provider fails, fallback to secondary succeeds, (2) persistFallbackCandidateSelection() writes providerOverride with authProfileOverrideSource: "auto", (3) user updates agent config to a different primary provider, (4) /reset or /new copies the stale fallback override to the new session, (5) new session ignores the config change and keeps using the fallback provider.
Fix: make the override copy conditional on authProfileOverrideSource === "user" so only explicit user selections survive reset.

Regression Test Plan (if applicable)

Coverage level that should have caught this:
- Unit test
- Seam / integration test
- End-to-end test
- Existing coverage already sufficient
Scenario the test should lock in: session reset with authProfileOverrideSource: "auto" should not carry forward override fields; session reset with authProfileOverrideSource: "user" should preserve them.
If no new test is added, why not: the fix is a minimal conditional guard on existing field copying; adding a test would require extensive mocking of the session store and config infrastructure. The behavior is straightforward to verify by inspection.

User-visible / Behavior Changes

After a fallback rotation, /reset or /new now returns the session to the configured default model/provider instead of keeping the fallback override. Explicit /model selections continue to be preserved across reset as before.

Security Impact (required)

New permissions/capabilities? No
Secrets/tokens handling changed? No
New/changed network calls? No
Command/tool execution surface changed? No
Data access scope changed? No

greptile-apps · 2026-04-08T12:47:43Z

Greptile Summary

This PR fixes a regression introduced in cb0a752 where providerOverride, modelOverride, authProfileOverride, authProfileOverrideSource, and authProfileOverrideCompactionCount were unconditionally copied in performGatewaySessionReset(). The fix makes the copy conditional on authProfileOverrideSource === "user", so only explicit /model selections survive /reset or /new while system-driven fallback overrides are correctly discarded.

Confidence Score: 5/5

Safe to merge — targeted one-line conditional guard with no unintended side effects and existing integration test coverage for the preserved path.

The fix is minimal and correct. The authProfileOverrideSource type is a closed 'auto' | 'user' union, so the condition exhaustively handles every case. Existing tests in server.sessions.gateway-server-sessions-a.test.ts already cover the 'user' path. No P0 or P1 findings.

No files require special attention.

Vulnerabilities

No security concerns identified.

_{Reviews (1): Last reviewed commit: "fix(gateway): clear auto-fallback model ..." | Re-trigger Greptile}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2a054e197a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-08T12:49:07Z

+      ...(currentEntry?.authProfileOverrideSource === "user"
+        ? {
+            providerOverride: currentEntry?.providerOverride,


Preserve explicit model overrides without auth profile source

The new guard only carries providerOverride/modelOverride when authProfileOverrideSource === "user", but explicit user model picks often do not set that field. applyModelOverrideToSessionEntry() clears authProfileOverrideSource whenever no profile override is provided, while still persisting providerOverride and modelOverride (for example from /model or sessions.patch paths), so those user-selected overrides now get dropped on /reset//new and the session incorrectly reverts to defaults.

Useful? React with 👍 / 👎.

frankekn · 2026-04-08T13:39:03Z

@codex review

frankekn · 2026-04-08T13:39:44Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fd2e06b257

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-08T13:43:59Z

+  const explicitSelection = fallbackPinnedSelection ?? currentSelection;
+  if (explicitSelection && !sameProviderModelRef(explicitSelection, defaultRef)) {
+    preserved.providerOverride = explicitSelection.provider;
+    preserved.modelOverride = explicitSelection.model;
+  }


Avoid preserving stale fallback-selected model on reset

This logic can still pin a stale model after config changes: when currentSelection matches fallbackNoticeActiveModel, it rewrites to fallbackNoticeSelectedModel and preserves it if it differs from the current default. In the common sequence “default A falls back to B, user changes config default to C, then /reset”, this keeps an override to old A instead of returning to C, so reset still ignores updated agent config.

Useful? React with 👍 / 👎.

frankekn · 2026-04-08T14:27:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 25cfe71aec

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-08T14:32:04Z

+  }
+
+  const preserved: Partial<ResetPreservedSelectionState> = {};
+  if (entry.modelOverrideSource === "user" && entry.modelOverride) {


Preserve legacy user model overrides during reset

resolveResetPreservedSelection now keeps model overrides only when modelOverrideSource === "user", but this new field did not exist in previously persisted sessions, so existing user-selected overrides (modelOverride/providerOverride with no source) are treated like auto fallback and dropped on /reset//new. This creates an upgrade regression for users who had explicit model selections before this commit, because their next reset silently reverts to config defaults; please treat missing source as legacy-user (or backfill source before reset) when modelOverride is present.

Useful? React with 👍 / 👎.

frankekn · 2026-04-08T14:37:09Z

@codex review

chatgpt-codex-connector · 2026-04-08T14:46:04Z

Codex Review: Didn't find any major issues. Swish!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in cb0a752 ("fix: preserve reset session behavior config")

aisle-research-bot · 2026-04-08T16:35:50Z

🔒 Aisle Security Analysis

We found 1 potential security issue(s) in this PR:

#	Severity	Title
1	🟠 High	Policy bypass: legacy sessions without modelOverrideSource are treated as user model overrides during sessions.reset

1. 🟠 Policy bypass: legacy sessions without modelOverrideSource are treated as user model overrides during sessions.reset

Property	Value
Severity	High
CWE	CWE-285
Location	`src/gateway/session-reset-service.ts:83-93`

Description

sessions.reset backfills modelOverrideSource: "user" whenever modelOverrideSource is absent but modelOverride is present.

This is dangerous because older versions could persist providerOverride/modelOverride for non-user reasons (notably auto-fallback pinning). After this change:

Any legacy session entry with modelOverride set and no modelOverrideSource will be treated as an explicit user choice.
That selection is preserved across /sessions.reset and rewritten to disk as modelOverrideSource: "user".
The preserved override then flows into resolveSessionModelRef(...), which does not validate the override against the model allowlist (resolveAllowedModelRef is only applied on sessions.patch), enabling a stored/legacy override to keep using a model/provider that current policy would reject.

Impact depends on deployment, but in environments where model selection is restricted (allowlist, provider restrictions, cost controls), this can become a model/provider policy bypass.

Vulnerable code:

const preserveLegacyUserModelOverride =
  entry.modelOverrideSource === "user" ||
  (entry.modelOverrideSource === undefined && Boolean(entry.modelOverride));
if (preserveLegacyUserModelOverride && entry.modelOverride) {
  preserved.providerOverride = entry.providerOverride;
  preserved.modelOverride = entry.modelOverride;
  preserved.modelOverrideSource = "user";
}

Recommendation

Do not assume modelOverrideSource === undefined implies a user override.

Safer options:

Only preserve overrides explicitly marked as user:

const preserveUserModelOverride = entry.modelOverrideSource === "user";

If you must migrate legacy sessions, do it with an explicit heuristic that can distinguish auto-fallback from user choice (e.g., presence of fallback notice fields, or a separate legacy migration version):

const looksLikeAutoFallback = Boolean(
  entry.fallbackNoticeActiveModel ||
  entry.fallbackNoticeSelectedModel ||
  entry.fallbackNoticeReason
);
const preserveLegacy = entry.modelOverrideSource === undefined && entry.modelOverride && !looksLikeAutoFallback;

if ((entry.modelOverrideSource === "user" || preserveLegacy) && entry.modelOverride) {
  preserved.providerOverride = entry.providerOverride;
  preserved.modelOverride = entry.modelOverride;
  preserved.modelOverrideSource = "user";
}

Additionally, re-validate any preserved override against the same allowlist/policy used by sessions.patch before persisting it (e.g., call resolveAllowedModelRef with the model catalog during reset and drop/clear the override if not allowed).

Analyzed PR: #63155 at commit 69610fa

_{Last updated on: 2026-04-08T16:38:00Z}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 69610faf2f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-08T16:39:15Z

+    preserved.modelOverrideSource = "user";
+  }
+
+  if (entry.authProfileOverrideSource === "user" && entry.authProfileOverride) {


Preserve legacy auth profile overrides on reset

The new reset guard only keeps authProfileOverride when authProfileOverrideSource === "user", but older persisted sessions can have an explicit user profile override without the source field. In that upgrade scenario, /reset//new now drops the auth profile while still keeping the model override, which can silently switch credentials/account selection after reset. Please treat a missing source as legacy-user when authProfileOverride is present (or backfill it before reset), similar to how legacy modelOverrideSource is handled.

Useful? React with 👍 / 👎.

…3155) * fix(gateway): clear auto-fallback model override on session reset When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in cb0a752 ("fix: preserve reset session behavior config") * fix(gateway): preserve explicit reset model selection * fix(gateway): track reset model override source * fix(gateway): preserve legacy reset model overrides * docs(changelog): add session reset merge note --------- Co-authored-by: termtek <[email protected]>

…enclaw#63155) * fix(gateway): clear auto-fallback model override on session reset When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in d38868a ("fix: preserve reset session behavior config") * fix(gateway): preserve explicit reset model selection * fix(gateway): track reset model override source * fix(gateway): preserve legacy reset model overrides * docs(changelog): add session reset merge note --------- Co-authored-by: termtek <[email protected]>

…enclaw#63155) * fix(gateway): clear auto-fallback model override on session reset When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in 2ec7272 ("fix: preserve reset session behavior config") * fix(gateway): preserve explicit reset model selection * fix(gateway): track reset model override source * fix(gateway): preserve legacy reset model overrides * docs(changelog): add session reset merge note --------- Co-authored-by: termtek <[email protected]>

…enclaw#63155) * fix(gateway): clear auto-fallback model override on session reset When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in e848007 ("fix: preserve reset session behavior config") * fix(gateway): preserve explicit reset model selection * fix(gateway): track reset model override source * fix(gateway): preserve legacy reset model overrides * docs(changelog): add session reset merge note --------- Co-authored-by: termtek <[email protected]>

…enclaw#63155) * fix(gateway): clear auto-fallback model override on session reset When `persistFallbackCandidateSelection()` writes a fallback provider override with `authProfileOverrideSource: "auto"`, the override was incorrectly preserved across `/reset` and `/new` commands. This caused sessions to keep using the fallback provider even after the user changed the agent config primary provider, because the session store override takes precedence over the config default. Now the override fields (`providerOverride`, `modelOverride`, `authProfileOverride`, `authProfileOverrideSource`, `authProfileOverrideCompactionCount`) are only carried forward when `authProfileOverrideSource === "user"` (i.e. explicit `/model` command). System-driven overrides are dropped on reset so the session picks up the current config default. Introduced in f0e2431 ("fix: preserve reset session behavior config") * fix(gateway): preserve explicit reset model selection * fix(gateway): track reset model override source * fix(gateway): preserve legacy reset model overrides * docs(changelog): add session reset merge note --------- Co-authored-by: termtek <[email protected]>

openclaw-barnacle Bot added gateway Gateway runtime size: XS maintainer Maintainer-authored PR labels Apr 8, 2026

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

openclaw-barnacle Bot added size: M and removed size: XS labels Apr 8, 2026

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

frankekn force-pushed the fix/clear-auto-fallback-override-on-reset branch from e0c278b to 7560566 Compare April 8, 2026 16:30

termtek and others added 5 commits April 9, 2026 00:30

fix(gateway): preserve explicit reset model selection

c38209f

fix(gateway): track reset model override source

d3ee094

fix(gateway): preserve legacy reset model overrides

82f56e7

docs(changelog): add session reset merge note

69610fa

frankekn force-pushed the fix/clear-auto-fallback-override-on-reset branch from 7560566 to 69610fa Compare April 8, 2026 16:30

frankekn merged commit 5d46e4d into openclaw:main Apr 8, 2026
9 checks passed

frankekn self-assigned this Apr 8, 2026

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

github-actions Bot mentioned this pull request Apr 8, 2026

📡 Upstream Digest — 2026-04-08 16:52 UTC curtismercier/openclaw-mods#511

Open

clawsweeper Bot mentioned this pull request Apr 26, 2026

/new or /reset does not clear session-level authProfileOverride and modelOverride between sessions #62587

Closed

clawsweeper Bot mentioned this pull request May 3, 2026

fix(session): preserve model override across daily freshness resets #44523

Closed

clawsweeper Bot mentioned this pull request May 20, 2026

[codex] fix(reply): preserve queued replies across session resets #52234

Closed

clawsweeper Bot mentioned this pull request May 24, 2026

Session modelOverride persists across gateway restarts, silently overrides config default #51251

Closed

clawsweeper Bot mentioned this pull request Jun 15, 2026

fix(status): correct pinned model clear hint #93231

Merged

clawsweeper Bot mentioned this pull request Jun 28, 2026

Add per-session envelope to sessions.create / sessions.patch #74632

Closed

Uh oh!

Uh oh!

Conversation

frankekn commented Apr 8, 2026

Summary

Change Type (select all)

Scope (select all touched areas)

Linked Issue/PR

Root Cause (if applicable)

Regression Test Plan (if applicable)

User-visible / Behavior Changes

Security Impact (required)

Uh oh!

greptile-apps Bot commented Apr 8, 2026

Greptile Summary

Confidence Score: 5/5

Vulnerabilities

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

frankekn commented Apr 8, 2026

Uh oh!

frankekn commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

frankekn commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

frankekn commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 8, 2026

Uh oh!

Uh oh!

aisle-research-bot Bot commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔒 Aisle Security Analysis

Description

Recommendation

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

aisle-research-bot Bot commented Apr 8, 2026 •

edited

Loading