fix(tui): resolve wrong provider prefix when session has model without modelProvider by byungsker · Pull Request #25874 · openclaw/openclaw

byungsker · 2026-02-24T22:59:39Z

Problem

When a session was reset (via /new or /reset), the TUI status bar could display a wrong provider prefix — e.g. google-gemini-cli/claude-sonnet-4-6 instead of anthropic/claude-sonnet-4-6.

Root cause (two-part):

Missing modelProvider copy on session reset (src/gateway/server-methods/sessions.ts): sessions.reset copied the previous entry's model field to the new entry but did not copy modelProvider. This left the new entry with modelProvider = null.
Wrong fallback in resolveSessionModelRef (src/gateway/session-utils.ts): When runtimeProvider is null and the stored runtimeModel has no / separator (e.g. "claude-sonnet-4-6"), the code used provider || DEFAULT_PROVIDER as the fallback. Here provider was resolved from the config's default_model (e.g. google-gemini-cli), producing the wrong prefix.

Fix

1. Copy `modelProvider` on session reset

// src/gateway/server-methods/sessions.ts
entry: { ...existing, model: existing.model, modelProvider: existing.modelProvider },

2. Defensive fallback in `resolveSessionModelRef`

When the stored model string contains no provider prefix (/), fall back to DEFAULT_PROVIDER ("anthropic") rather than the config default_model's provider — a bare model name like claude-sonnet-4-6 is always an Anthropic model:

// Before
const parsedRuntime = parseModelRef(runtimeModel, provider || DEFAULT_PROVIDER);

// After
const fallbackProvider = runtimeModel.includes("/")
  ? provider || DEFAULT_PROVIDER
  : DEFAULT_PROVIDER;
const parsedRuntime = parseModelRef(runtimeModel, fallbackProvider);

Testing

Two new tests added to src/gateway/session-utils.test.ts:

bare model string (no /) with a non-Anthropic config default → uses DEFAULT_PROVIDER
fully-qualified model string (anthropic/claude-sonnet-4-6) → provider parsed from the string itself

All 97 test files pass.

Greptile Summary

Fixed TUI status bar displaying wrong provider prefix after session reset by ensuring modelProvider is preserved during reset and implementing defensive fallback logic for legacy sessions. The changes prevent cross-contamination between config defaults and session state (e.g., preventing google-gemini-cli/claude-sonnet-4-6 when it should be anthropic/claude-sonnet-4-6).

Confidence Score: 5/5

This PR is safe to merge with minimal risk
The fix is focused, well-tested, and addresses a clear bug with comprehensive test coverage. The changes are minimal and defensive, with no breaking changes or risky refactoring.
No files require special attention

_{Last reviewed commit: 86bbc93}

…t modelProvider

…rovider cross-contamination When a session is reset (via /new or /reset), the previous entry's model field was copied to the new entry but modelProvider was not. This left the new entry in a state where resolveSessionModelRef would fall back to the config default_model provider (e.g. google-gemini-cli) when the stored model string has no provider prefix — producing a wrong display like 'google-gemini-cli/claude-sonnet-4-6' in the TUI status bar. Fixes the root cause for issue openclaw#25408 alongside the defensive fix in session-utils.ts.

This reverts commit 0da3cd2f18c70fbb1ff045f183cae1beeb291bbb.

gumadeiras · 2026-02-25T05:37:04Z

Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: f0953a7
Merge commit: 177386e

Thanks @lbo728!

@gumadeiras