chore(deadcode): share session model default check

vincentkoc · vincentkoc · commit 29ec5b331c11 · 2026-06-21T06:33:10.000+08:00
diff --git a/ui/src/ui/chat/session-controls.ts b/ui/src/ui/chat/session-controls.ts
@@ -29,6 +29,7 @@ import {
   normalizeAgentId,
   parseAgentSessionKey,
 } from "../session-key.ts";
+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../string-coerce.ts";
 import {
   formatInheritedThinkingLabel,
@@ -958,16 +959,6 @@ function resolveChatFastModeSelectState(
   };
 }
 
-function sessionModelMatchesDefaults(
-  row: SessionsListResult["sessions"][number] | undefined,
-  defaults: SessionsListResult["defaults"] | undefined,
-): boolean {
-  return (
-    (!row?.modelProvider || row.modelProvider === defaults?.modelProvider) &&
-    (!row?.model || row.model === defaults?.model)
-  );
-}
-
 function buildThinkingOptions(
   levels: readonly GatewayThinkingLevelOption[],
   currentOverride: string,
@@ -1006,18 +997,14 @@ function resolveThinkingLevelOptions(
   model: string | null,
   catalog: readonly ThinkingCatalogEntry[],
 ): GatewayThinkingLevelOption[] {
-  const sessionModelMatchesDefaultsLocal =
-    (!activeRow?.modelProvider || activeRow.modelProvider === defaults?.modelProvider) &&
-    (!activeRow?.model || activeRow.model === defaults?.model);
+  const modelMatchesDefaults = sessionModelMatchesDefaults(activeRow, defaults);
   const catalogEntry =
     provider && model
       ? catalog.find((entry) => entry.provider === provider && entry.id === model)
       : undefined;
   const explicitLevels =
     (activeRow?.thinkingLevels?.length ? activeRow.thinkingLevels : null) ??
-    (sessionModelMatchesDefaultsLocal && defaults?.thinkingLevels?.length
-      ? defaults.thinkingLevels
-      : null);
+    (modelMatchesDefaults && defaults?.thinkingLevels?.length ? defaults.thinkingLevels : null);
   if (explicitLevels) {
     if (catalogEntry?.reasoning === false && isOffOnlyThinkingLevels(explicitLevels)) {
       return [];
@@ -1026,9 +1013,7 @@ function resolveThinkingLevelOptions(
   }
   const explicitLabels =
     (activeRow?.thinkingOptions?.length ? activeRow.thinkingOptions : null) ??
-    (sessionModelMatchesDefaultsLocal && defaults?.thinkingOptions?.length
-      ? defaults.thinkingOptions
-      : null);
+    (modelMatchesDefaults && defaults?.thinkingOptions?.length ? defaults.thinkingOptions : null);
   if (catalogEntry?.reasoning === false) {
     if (!explicitLabels || explicitLabels.every(isOffThinkingOption)) {
       return [];
diff --git a/ui/src/ui/chat/slash-command-executor.ts b/ui/src/ui/chat/slash-command-executor.ts
@@ -9,6 +9,7 @@ import {
 } from "../chat-model-ref.ts";
 import type { GatewayBrowserClient } from "../gateway.ts";
 import { DEFAULT_AGENT_ID, DEFAULT_MAIN_KEY, parseAgentSessionKey } from "../session-key.ts";
+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";
 import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalLowercaseString,
@@ -594,16 +595,6 @@ function resolveThinkingLevelOptionsForSession(
   }));
 }
 
-function sessionModelMatchesDefaults(
-  session: GatewaySessionRow | undefined,
-  defaults: SessionsListResult["defaults"] | undefined,
-): boolean {
-  return (
-    (!session?.modelProvider || session.modelProvider === defaults?.modelProvider) &&
-    (!session?.model || session.model === defaults?.model)
-  );
-}
-
 async function loadCurrentSession(
   client: GatewayBrowserClient,
   sessionKey: string,
diff --git a/ui/src/ui/session-model-defaults.ts b/ui/src/ui/session-model-defaults.ts
@@ -0,0 +1,14 @@
+// Shared helpers for comparing session rows against list defaults.
+import type { GatewaySessionRow, SessionsListResult } from "./types.ts";
+
+type SessionModelFields = Pick<GatewaySessionRow, "model" | "modelProvider">;
+
+export function sessionModelMatchesDefaults(
+  session: SessionModelFields | null | undefined,
+  defaults: SessionsListResult["defaults"] | undefined,
+): boolean {
+  return (
+    (!session?.modelProvider || session.modelProvider === defaults?.modelProvider) &&
+    (!session?.model || session.model === defaults?.model)
+  );
+}
diff --git a/ui/src/ui/views/sessions.ts b/ui/src/ui/views/sessions.ts
@@ -6,6 +6,7 @@ import { icons } from "../icons.ts";
 import { pathForTab } from "../navigation.ts";
 import { formatSessionTokens } from "../presenter.ts";
 import { formatGoalDetail, formatGoalSummary } from "../session-goal.ts";
+import { sessionModelMatchesDefaults } from "../session-model-defaults.ts";
 import { isSessionRunActive } from "../session-run-state.ts";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../string-coerce.ts";
 import {
@@ -97,31 +98,21 @@ function getAgentIdentity(
   return Object.hasOwn(agentIdentityById, agentId) ? (agentIdentityById[agentId] ?? null) : null;
 }
 
-function rowMatchesSessionDefaults(
-  row: GatewaySessionRow,
-  defaults: SessionsListResult["defaults"] | undefined,
-): boolean {
-  return (
-    (!row.modelProvider || row.modelProvider === defaults?.modelProvider) &&
-    (!row.model || row.model === defaults?.model)
-  );
-}
-
 function resolveThinkLevelOptions(
   row: GatewaySessionRow,
   defaults?: SessionsListResult["defaults"],
 ): readonly { value: string; label: string }[] {
-  const sessionModelMatchesDefaults = rowMatchesSessionDefaults(row, defaults);
+  const modelMatchesDefaults = sessionModelMatchesDefaults(row, defaults);
   const defaultLabel = formatInheritedThinkingLabel(
-    row.thinkingDefault ?? (sessionModelMatchesDefaults ? defaults?.thinkingDefault : undefined),
+    row.thinkingDefault ?? (modelMatchesDefaults ? defaults?.thinkingDefault : undefined),
   );
   const options: readonly GatewayThinkingLevelOption[] = row.thinkingLevels?.length
     ? row.thinkingLevels
-    : sessionModelMatchesDefaults && defaults?.thinkingLevels?.length
+    : modelMatchesDefaults && defaults?.thinkingLevels?.length
       ? defaults.thinkingLevels
       : (row.thinkingOptions?.length
           ? row.thinkingOptions
-          : sessionModelMatchesDefaults && defaults?.thinkingOptions?.length
+          : modelMatchesDefaults && defaults?.thinkingOptions?.length
             ? defaults.thinkingOptions
             : DEFAULT_THINK_LEVELS
         ).map((label) => ({
