Cherry-pick 6c9b49a10: fix stale contextTokens on model switch#1283
Merged
alexey-pelykh merged 1 commit intomainfrom Mar 14, 2026
Merged
Cherry-pick 6c9b49a10: fix stale contextTokens on model switch#1283alexey-pelykh merged 1 commit intomainfrom
alexey-pelykh merged 1 commit intomainfrom
Conversation
) Cherry-picked from openclaw/openclaw@6c9b49a10. Discarded gutted files: CHANGELOG.md, src/process/supervisor/adapters/child.test.ts, src/sessions/model-overrides.ts, src/sessions/model-overrides.test.ts. Co-authored-by: jalehman <[email protected]>
This was referenced Mar 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick from upstream
Upstream commit:
6c9b49a10Author: yuweuii, jalehman
Tier: AUTO-PARTIAL
Issue: #903
Depends on: #1282
Changes
Adds test cleanup (restoreAllMocks, doUnmock) to git-commit.test.ts afterEach and adds test-parallel.mjs isolation entries.
Adaptation
CHANGELOG.md,src/process/supervisor/adapters/child.test.ts(supervisor gutted),src/sessions/model-overrides.ts+ test (model management gutted)status.test.ts(kept fork's imports, discarded upstream test using guttedapplyModelOverrideToSessionEntry),lifecycle.test.ts(kept ours — gutted mock declarations)