Fix model picker missing selected model and restore reset button

Pass selectedModel (scoped to the active provider) through to
getAppModelOptions so non-built-in models appear in the dropdown.
Restore the per-setting reset button on the git writing model row.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: keyzou

apps/web/src/appSettings.ts

@@ -221,11 +221,13 @@ export function resolveAppModelSelection(
 
 export function getCustomModelOptionsByProvider(
   settings: Pick<AppSettings, CustomModelSettingsKey>,
+  selectedProvider?: ProviderKind | null,
+  selectedModel?: string | null,
 ): Record<ProviderKind, ReadonlyArray<{ slug: string; name: string }>> {
   const customModelsByProvider = getCustomModelsByProvider(settings);
   return {
-    codex: getAppModelOptions("codex", customModelsByProvider.codex),
-    claudeAgent: getAppModelOptions("claudeAgent", customModelsByProvider.claudeAgent),
+    codex: getAppModelOptions("codex", customModelsByProvider.codex, selectedProvider === "codex" ? selectedModel : undefined),
+    claudeAgent: getAppModelOptions("claudeAgent", customModelsByProvider.claudeAgent, selectedProvider === "claudeAgent" ? selectedModel : undefined),
   };
 }
 

apps/web/src/components/ChatView.tsx

@@ -623,8 +623,8 @@ export default function ChatView({ threadId }: ChatViewProps) {
   const providerOptionsForDispatch = useMemo(() => getProviderStartOptions(settings), [settings]);
   const selectedModelForPicker = selectedModel;
   const modelOptionsByProvider = useMemo(
-    () => getCustomModelOptionsByProvider(settings),
-    [settings],
+    () => getCustomModelOptionsByProvider(settings, selectedProvider, selectedModel),
+    [settings, selectedProvider, selectedModel],
   );
   const selectedModelForPickerWithCustomFallback = useMemo(() => {
     const currentOptions = modelOptionsByProvider[selectedProvider];

apps/web/src/routes/_chat.settings.tsx

@@ -222,7 +222,7 @@ function SettingsRouteView() {
   const textGenProvider = settings.textGenerationProvider;
   const textGenDefaultModel = DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER[textGenProvider];
   const textGenModel = (settings.textGenerationModel ?? textGenDefaultModel) as ModelSlug;
-  const gitModelOptionsByProvider = getCustomModelOptionsByProvider(settings);
+  const gitModelOptionsByProvider = getCustomModelOptionsByProvider(settings, textGenProvider, textGenModel);
   const selectedCustomModelProviderSettings = MODEL_PROVIDER_SETTINGS.find(
     (providerSettings) => providerSettings.provider === selectedCustomModelProvider,
   )!;
@@ -603,6 +603,20 @@ function SettingsRouteView() {
               <SettingsRow
                 title="Git writing model"
                 description="Provider and model used for auto-generated git content."
+                resetAction={
+                  settings.textGenerationProvider !== defaults.textGenerationProvider ||
+                  settings.textGenerationModel !== defaults.textGenerationModel ? (
+                    <SettingResetButton
+                      label="git writing model"
+                      onClick={() => {
+                        updateSettings({
+                          textGenerationProvider: defaults.textGenerationProvider,
+                          textGenerationModel: defaults.textGenerationModel,
+                        });
+                      }}
+                    />
+                  ) : null
+                }
                 control={
                   <ProviderModelPicker
                     provider={textGenProvider}