Ensure current model is shown as selected in the picker when its first loaded

sjf · sjf · commit 8ce7db9fa41a · 2026-05-21T23:18:52.000-07:00
diff --git a/extensions/discord/src/monitor/model-picker.state.ts b/extensions/discord/src/monitor/model-picker.state.ts
@@ -363,3 +363,27 @@ export function getDiscordModelPickerModelPage(params: {
     provider,
   };
 }
+
+export function resolveDiscordModelPickerPageForModel(params: {
+  data: ModelsProviderData;
+  provider: string;
+  model: string;
+  pageSize?: number;
+}): number {
+  const provider = normalizeProviderId(params.provider);
+  const modelSet = params.data.byProvider.get(provider);
+  if (!modelSet) {
+    return 1;
+  }
+  const sorted = [...modelSet].toSorted();
+  const index = sorted.indexOf(params.model);
+  if (index < 0) {
+    return 1;
+  }
+  const pageSize = clampPageSize(
+    params.pageSize,
+    DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE,
+    DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE,
+  );
+  return Math.floor(index / pageSize) + 1;
+}
diff --git a/extensions/discord/src/monitor/model-picker.ts b/extensions/discord/src/monitor/model-picker.ts
@@ -14,6 +14,7 @@ export {
   loadDiscordModelPickerData,
   parseDiscordModelPickerCustomId,
   parseDiscordModelPickerData,
+  resolveDiscordModelPickerPageForModel,
 } from "./model-picker.state.js";
 export type {
   DiscordModelPickerAction,
diff --git a/extensions/discord/src/monitor/native-command-model-picker-ui.ts b/extensions/discord/src/monitor/native-command-model-picker-ui.ts
@@ -27,6 +27,7 @@ import {
 import {
   loadDiscordModelPickerData,
   renderDiscordModelPickerModelsView,
+  resolveDiscordModelPickerPageForModel,
   toDiscordModelPickerMessagePayload,
   type DiscordModelPickerCommandContext,
 } from "./model-picker.js";
@@ -311,18 +312,26 @@ export async function replyWithDiscordModelPickerProviders(params: {
     allowedModelRefs: buildDiscordModelPickerAllowedModelRefs(data),
     limit: 5,
   });
-  const currentProvider = splitDiscordModelRef(currentModel ?? "")?.provider;
+  const parsedCurrentRef = splitDiscordModelRef(currentModel ?? "");
   const initialProvider =
-    currentProvider && data.byProvider.has(currentProvider)
-      ? currentProvider
+    parsedCurrentRef && data.byProvider.has(parsedCurrentRef.provider)
+      ? parsedCurrentRef.provider
       : (data.providers[0] ?? data.resolvedDefault.provider);
+  const initialPage =
+    parsedCurrentRef && parsedCurrentRef.provider === initialProvider
+      ? resolveDiscordModelPickerPageForModel({
+          data,
+          provider: initialProvider,
+          model: parsedCurrentRef.model,
+        })
+      : 1;
 
   const rendered = renderDiscordModelPickerModelsView({
     command: params.command,
     userId: params.userId,
     data,
     provider: initialProvider,
-    page: 1,
+    page: initialPage,
     providerPage: 1,
     currentModel,
     currentRuntime,
