mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 10:27:38 +00:00
fix(agents): honor heartbeat.model override instead of session model (#14181)
Merged via /review-pr -> /prepare-pr -> /merge-pr.
Prepared head SHA: f19b789057
Co-authored-by: 0xRaini <190923101+0xRaini@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
@@ -271,6 +271,9 @@ export async function createModelSelectionState(params: {
|
||||
provider: string;
|
||||
model: string;
|
||||
hasModelDirective: boolean;
|
||||
/** True when heartbeat.model was explicitly resolved for this run.
|
||||
* In that case, skip session-stored overrides so the heartbeat selection wins. */
|
||||
hasResolvedHeartbeatModelOverride?: boolean;
|
||||
}): Promise<ModelSelectionState> {
|
||||
const {
|
||||
cfg,
|
||||
@@ -343,7 +346,11 @@ export async function createModelSelectionState(params: {
|
||||
sessionKey,
|
||||
parentSessionKey,
|
||||
});
|
||||
if (storedOverride?.model) {
|
||||
// Skip stored session model override only when an explicit heartbeat.model
|
||||
// was resolved. Heartbeat runs without heartbeat.model should still inherit
|
||||
// the regular session/parent model override behavior.
|
||||
const skipStoredOverride = params.hasResolvedHeartbeatModelOverride === true;
|
||||
if (storedOverride?.model && !skipStoredOverride) {
|
||||
const candidateProvider = storedOverride.provider || defaultProvider;
|
||||
const key = modelKey(candidateProvider, storedOverride.model);
|
||||
if (allowedModelKeys.size === 0 || allowedModelKeys.has(key)) {
|
||||
|
||||
Reference in New Issue
Block a user