chore(deadcode): share session model default check · open...

Recent Commits to openclaw:main

vincentkoc · 2026-06-21 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import {`
`29`	`29`	`normalizeAgentId,`
`30`	`30`	`parseAgentSessionKey,`
`31`	`31`	`} from "../session-key.ts";`
	`32`	`+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";`
`32`	`33`	`import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../string-coerce.ts";`
`33`	`34`	`import {`
`34`	`35`	`formatInheritedThinkingLabel,`
`@@ -958,16 +959,6 @@ function resolveChatFastModeSelectState(`
`958`	`959`	`};`
`959`	`960`	`}`
`960`	`961`
`961`		`-function sessionModelMatchesDefaults(`
`962`		`-row: SessionsListResult["sessions"][number] \| undefined,`
`963`		`-defaults: SessionsListResult["defaults"] \| undefined,`
`964`		`-): boolean {`
`965`		`-return (`
`966`		`-(!row?.modelProvider \|\| row.modelProvider === defaults?.modelProvider) &&`
`967`		`-(!row?.model \|\| row.model === defaults?.model)`
`968`		`-);`
`969`		`-}`
`970`		`-`
`971`	`962`	`function buildThinkingOptions(`
`972`	`963`	`levels: readonly GatewayThinkingLevelOption[],`
`973`	`964`	`currentOverride: string,`
`@@ -1006,18 +997,14 @@ function resolveThinkingLevelOptions(`
`1006`	`997`	`model: string \| null,`
`1007`	`998`	`catalog: readonly ThinkingCatalogEntry[],`
`1008`	`999`	`): GatewayThinkingLevelOption[] {`
`1009`		`-const sessionModelMatchesDefaultsLocal =`
`1010`		`-(!activeRow?.modelProvider \|\| activeRow.modelProvider === defaults?.modelProvider) &&`
`1011`		`-(!activeRow?.model \|\| activeRow.model === defaults?.model);`
	`1000`	`+const modelMatchesDefaults = sessionModelMatchesDefaults(activeRow, defaults);`
`1012`	`1001`	`const catalogEntry =`
`1013`	`1002`	`provider && model`
`1014`	`1003`	`? catalog.find((entry) => entry.provider === provider && entry.id === model)`
`1015`	`1004`	`: undefined;`
`1016`	`1005`	`const explicitLevels =`
`1017`	`1006`	`(activeRow?.thinkingLevels?.length ? activeRow.thinkingLevels : null) ??`
`1018`		`-(sessionModelMatchesDefaultsLocal && defaults?.thinkingLevels?.length`
`1019`		`- ? defaults.thinkingLevels`
`1020`		`- : null);`
	`1007`	`+(modelMatchesDefaults && defaults?.thinkingLevels?.length ? defaults.thinkingLevels : null);`
`1021`	`1008`	`if (explicitLevels) {`
`1022`	`1009`	`if (catalogEntry?.reasoning === false && isOffOnlyThinkingLevels(explicitLevels)) {`
`1023`	`1010`	`return [];`
`@@ -1026,9 +1013,7 @@ function resolveThinkingLevelOptions(`
`1026`	`1013`	`}`
`1027`	`1014`	`const explicitLabels =`
`1028`	`1015`	`(activeRow?.thinkingOptions?.length ? activeRow.thinkingOptions : null) ??`
`1029`		`-(sessionModelMatchesDefaultsLocal && defaults?.thinkingOptions?.length`
`1030`		`- ? defaults.thinkingOptions`
`1031`		`- : null);`
	`1016`	`+(modelMatchesDefaults && defaults?.thinkingOptions?.length ? defaults.thinkingOptions : null);`
`1032`	`1017`	`if (catalogEntry?.reasoning === false) {`
`1033`	`1018`	`if (!explicitLabels \|\| explicitLabels.every(isOffThinkingOption)) {`
`1034`	`1019`	`return [];`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import {`
`9`	`9`	`} from "../chat-model-ref.ts";`
`10`	`10`	`import type { GatewayBrowserClient } from "../gateway.ts";`
`11`	`11`	`import { DEFAULT_AGENT_ID, DEFAULT_MAIN_KEY, parseAgentSessionKey } from "../session-key.ts";`
	`12`	`+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";`
`12`	`13`	`import {`
`13`	`14`	`normalizeLowercaseStringOrEmpty,`
`14`	`15`	`normalizeOptionalLowercaseString,`
`@@ -594,16 +595,6 @@ function resolveThinkingLevelOptionsForSession(`
`594`	`595`	`}));`
`595`	`596`	`}`
`596`	`597`
`597`		`-function sessionModelMatchesDefaults(`
`598`		`-session: GatewaySessionRow \| undefined,`
`599`		`-defaults: SessionsListResult["defaults"] \| undefined,`
`600`		`-): boolean {`
`601`		`-return (`
`602`		`-(!session?.modelProvider \|\| session.modelProvider === defaults?.modelProvider) &&`
`603`		`-(!session?.model \|\| session.model === defaults?.model)`
`604`		`-);`
`605`		`-}`
`606`		`-`
`607`	`598`	`async function loadCurrentSession(`
`608`	`599`	`client: GatewayBrowserClient,`
`609`	`600`	`sessionKey: string,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+// Shared helpers for comparing session rows against list defaults.`
	`2`	`+import type { GatewaySessionRow, SessionsListResult } from "./types.ts";`
	`3`	`+`
	`4`	`+type SessionModelFields = Pick<GatewaySessionRow, "model" \| "modelProvider">;`
	`5`	`+`
	`6`	`+export function sessionModelMatchesDefaults(`
	`7`	`+session: SessionModelFields \| null \| undefined,`
	`8`	`+defaults: SessionsListResult["defaults"] \| undefined,`
	`9`	`+): boolean {`
	`10`	`+return (`
	`11`	`+(!session?.modelProvider \|\| session.modelProvider === defaults?.modelProvider) &&`
	`12`	`+(!session?.model \|\| session.model === defaults?.model)`
	`13`	`+);`
	`14`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import { icons } from "../icons.ts";`
`6`	`6`	`import { pathForTab } from "../navigation.ts";`
`7`	`7`	`import { formatSessionTokens } from "../presenter.ts";`
`8`	`8`	`import { formatGoalDetail, formatGoalSummary } from "../session-goal.ts";`
	`9`	`+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";`
`9`	`10`	`import { isSessionRunActive } from "../session-run-state.ts";`
`10`	`11`	`import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../string-coerce.ts";`
`11`	`12`	`import {`
`@@ -97,31 +98,21 @@ function getAgentIdentity(`
`97`	`98`	`return Object.hasOwn(agentIdentityById, agentId) ? (agentIdentityById[agentId] ?? null) : null;`
`98`	`99`	`}`
`99`	`100`
`100`		`-function rowMatchesSessionDefaults(`
`101`		`-row: GatewaySessionRow,`
`102`		`-defaults: SessionsListResult["defaults"] \| undefined,`
`103`		`-): boolean {`
`104`		`-return (`
`105`		`-(!row.modelProvider \|\| row.modelProvider === defaults?.modelProvider) &&`
`106`		`-(!row.model \|\| row.model === defaults?.model)`
`107`		`-);`
`108`		`-}`
`109`		`-`
`110`	`101`	`function resolveThinkLevelOptions(`
`111`	`102`	`row: GatewaySessionRow,`
`112`	`103`	`defaults?: SessionsListResult["defaults"],`
`113`	`104`	`): readonly { value: string; label: string }[] {`
`114`		`-const sessionModelMatchesDefaults = rowMatchesSessionDefaults(row, defaults);`
	`105`	`+const modelMatchesDefaults = sessionModelMatchesDefaults(row, defaults);`
`115`	`106`	`const defaultLabel = formatInheritedThinkingLabel(`
`116`		`-row.thinkingDefault ?? (sessionModelMatchesDefaults ? defaults?.thinkingDefault : undefined),`
	`107`	`+row.thinkingDefault ?? (modelMatchesDefaults ? defaults?.thinkingDefault : undefined),`
`117`	`108`	`);`
`118`	`109`	`const options: readonly GatewayThinkingLevelOption[] = row.thinkingLevels?.length`
`119`	`110`	`? row.thinkingLevels`
`120`		`- : sessionModelMatchesDefaults && defaults?.thinkingLevels?.length`
	`111`	`+ : modelMatchesDefaults && defaults?.thinkingLevels?.length`
`121`	`112`	`? defaults.thinkingLevels`
`122`	`113`	`: (row.thinkingOptions?.length`
`123`	`114`	`? row.thinkingOptions`
`124`		`- : sessionModelMatchesDefaults && defaults?.thinkingOptions?.length`
	`115`	`+ : modelMatchesDefaults && defaults?.thinkingOptions?.length`
`125`	`116`	`? defaults.thinkingOptions`
`126`	`117`	`: DEFAULT_THINK_LEVELS`
`127`	`118`	`).map((label) => ({`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main