session: clear auto-sourced model/auth overrides on /new and /reset by sk7n4k3d · Pull Request #69419 · openclaw/openclaw

sk7n4k3d · 2026-04-20T17:59:39Z

Summary

/new and /reset in channel-bound auto-reply sessions (Telegram DM, group chats, etc.) currently carry over every persisted override — including auto-created ones from runtime fallbacks (rate-limit auth rotation, auto model pin). That left sessions stuck on e.g. openai-codex / gpt-5.4 even after the user reset and the default was something else entirely.

The Gateway performGatewaySessionReset path already had the right logic — it only preserves overrides sourced as "user" (plus legacy entries where the source field predates tracking). The auto-reply reset path in src/auto-reply/reply/session.ts was doing a blind copy and never wired that logic through.

This PR:

Extracts resolveResetPreservedSelection into src/config/sessions/reset-preserved-selection.ts so both reset paths share one source of truth.
Updates the auto-reply reset branch to use that helper; auto-sourced overrides now clear on /new / /reset, user-set overrides still carry across.
Threads modelOverrideSource through the persisted* locals so the field actually round-trips (it was being dropped silently before, which was part of the same class of bug).
Adds a regression test seeded with the exact shape from the issue (providerOverride: openai-codex, modelOverride: gpt-5.4, modelOverrideSource: auto, authProfileOverrideSource: auto) and asserts all four clear after /new and /reset, while unrelated behavior overrides (verboseLevel) still carry.

Test plan

pnpm test src/auto-reply/reply/session.test.ts — 68 passed (including new regression case).
pnpm check:changed — typecheck / lint / import-cycles clean; only pre-existing failures remain (missing Chrome in CI env, locale-dependent formatNextRun).
Existing "preserves selected auth profile overrides" test (authProfileOverrideSource: "user") still passes — user-set overrides are correctly preserved via the shared helper's legacy backfill.

Developed with AI (Claude Code) assistance; reviewed and validated end-to-end against the issue's evidence (~/.openclaw/agents/main/sessions/sessions.json sample).

greptile-apps · 2026-04-20T18:02:26Z

Greptile Summary

This PR fixes a bug (#69301) where /new and /reset in auto-reply sessions carried over auto-sourced model and auth overrides (e.g. runtime rate-limit fallbacks, auto model pins), leaving users stuck on the wrong model/auth after a reset. The fix extracts resolveResetPreservedSelection into a shared helper and wires it into the auto-reply reset path, mirroring the existing gateway path behavior. It also correctly threads modelOverrideSource through the persisted* locals in session.ts (it was silently dropped before), and adds a regression test for the exact issue scenario.

Confidence Score: 5/5

Safe to merge — the fix is well-scoped, mirrors existing gateway behavior, and the regression test is seeded with the exact issue scenario.

All findings are P2 or informational. The core logic in resolveResetPreservedSelection is correct: it preserves user-sourced overrides and legacy undefined-source model overrides while clearing auto-sourced ones, which exactly matches the gateway path that was already in production. The new modelOverrideSource threading is additive and tested.

No files require special attention — the asymmetry between model and auth legacy-source handling is intentional and matches the pre-existing gateway path.

_{Reviews (1): Last reviewed commit: "session: clear auto-sourced model/auth o..." | Re-trigger Greptile}

elarocca-io · 2026-04-20T19:19:34Z

Carrying auto-created model/auth overrides across /reset is the kind of thing that makes sessions hard to reason about — you think you're getting a clean slate but the auto-sourced config is still active. The distinction between user-set and auto-sourced overrides is the right level to track. One edge case to verify: if a user manually sets an override that happens to match what auto-source would set, does /reset clear it or preserve it?

…7n4k3d

…7n4k3d)

steipete · 2026-04-21T02:36:34Z

Landed via rebase. Thanks @sk7n4k3d.

Validation:

pnpm test src/auto-reply/reply/session.test.ts src/auto-reply/reply/session-reset-model.test.ts src/auto-reply/reply/agent-runner-session-reset.test.ts (3 files, 72 tests)
pnpm check:changed (lint/typecheck/guards + gateway/runtime-config/auto-reply changed tests: 339 files, 3713 tests)
CI green after push, including check/check-additional/build/checks-node/checks-fast/parity gate
Direct OpenAI live smoke using .profile OPENAI_API_KEY: gpt-5.4-nano Responses API returned OK

Source head before merge: 00b8a2f7d9b37a372f6656a15275d4d383359f9d
Landed on main: 5bc9d9cc5c1c863f25dc59ca494dfb155dc0c866

…7n4k3d

…7n4k3d)

prtags · 2026-04-23T18:49:36Z

Related work from PRtags group unique-heron-2zsc

Title: Open PR duplicate: MCP schema properties + auto-reset override self-heal composite

Number	Title
#58299	fix: normalize MCP tool schemas missing properties field for OpenAI Responses API
#60176	fix(tools): normalize truly empty MCP tool schemas for OpenAI
#69419*	session: clear auto-sourced model/auth overrides on /new and /reset
#69956	fix(mcp-http): ensure MCP tool schemas always include properties field

* This PR

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

…7n4k3d

…7n4k3d)

openclaw-barnacle Bot added gateway Gateway runtime size: S labels Apr 20, 2026

sk7n4k3d and others added 2 commits April 21, 2026 03:21

session: clear auto-sourced model/auth overrides on /new and /reset

0037b04

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

00b8a2f

…7n4k3d)

steipete force-pushed the feat/reset-clears-auto-session-overrides branch from 102492c to 00b8a2f Compare April 21, 2026 02:30

steipete merged commit 5bc9d9c into openclaw:main Apr 21, 2026
92 checks passed

loongfay pushed a commit to YuanbaoTeam/openclaw that referenced this pull request Apr 21, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

4c2fe6c

…7n4k3d)

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

📡 Upstream Digest — 2026-04-21 04:43 UTC curtismercier/openclaw-mods#631

Open

This was referenced Apr 21, 2026

[Bug]: Fallback model can stick to session after auto fallback, causing later runs to start from persisted override #68706

Closed

[Bug]: modelOverrideSource="auto" persists indefinitely after failover, never clears on primary recovery or /reset #66895

Closed

prtags Bot mentioned this pull request Apr 23, 2026

fix: normalize MCP tool schemas missing properties field for OpenAI Responses API #58299

Merged

This was referenced Apr 23, 2026

fix(tools): normalize truly empty MCP tool schemas for OpenAI #60176

Merged

fix(mcp-http): ensure MCP tool schemas always include properties field #69956

Closed

clawsweeper Bot mentioned this pull request Apr 27, 2026

fix: isolate auto-failover, split /new vs /reset LCM identity, add overflow circuit breaker #64656

Closed

7 tasks

lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

d845027

…7n4k3d)

clawsweeper Bot mentioned this pull request May 1, 2026

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

Open

ogt-redknie pushed a commit to ogt-redknie/OPENX that referenced this pull request May 2, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

fdf03c4

…7n4k3d)

clawsweeper Bot mentioned this pull request May 2, 2026

fix(auth): stop new sessions inheriting auto-selected auth profile overrides #62710

Open

29 tasks

ZaynL mentioned this pull request May 4, 2026

[Bug]: session.model cache survives /new and ignores agents.defaults.model.primary changes, scope distinct from PR #69419 #77322

Open

clawsweeper Bot mentioned this pull request May 4, 2026

fix(sessions): clear stale implicit model cache on /new (#77322) #77326

Closed

zhonghe0615 pushed a commit to zhonghe0615/openclaw that referenced this pull request May 7, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

10be10e

…7n4k3d)

github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

e38026a

…7n4k3d)

globalcaos pushed a commit to globalcaos/tinkerclaw that referenced this pull request May 13, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

e6c4deb

…7n4k3d)

github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 24, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

5412555

…7n4k3d)

jameslcowan pushed a commit to jameslcowan/openclaw that referenced this pull request Jun 2, 2026

fix: clear auto model overrides on reset (openclaw#69419) (thanks @sk…

56026e7

…7n4k3d)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

session: clear auto-sourced model/auth overrides on /new and /reset#69419

session: clear auto-sourced model/auth overrides on /new and /reset#69419
steipete merged 2 commits into
openclaw:mainfrom
sk7n4k3d:feat/reset-clears-auto-session-overrides

sk7n4k3d commented Apr 20, 2026

Uh oh!

greptile-apps Bot commented Apr 20, 2026

Uh oh!

elarocca-io commented Apr 20, 2026

Uh oh!

Uh oh!

steipete commented Apr 21, 2026

Uh oh!

prtags Bot commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

sk7n4k3d commented Apr 20, 2026

Summary

Test plan

Uh oh!

greptile-apps Bot commented Apr 20, 2026

Greptile Summary

Confidence Score: 5/5

Uh oh!

elarocca-io commented Apr 20, 2026

Uh oh!

Uh oh!

steipete commented Apr 21, 2026

Uh oh!

prtags Bot commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants