feat: persist composer model and reasoning effort selections

src-tauri/src/types.rs

@@ -200,6 +200,10 @@ pub(crate) struct AppSettings {
     pub(crate) remote_backend_token: Option<String>,
     #[serde(default = "default_access_mode", rename = "defaultAccessMode")]
     pub(crate) default_access_mode: String,
+    #[serde(default, rename = "lastComposerModelId")]
+    pub(crate) last_composer_model_id: Option<String>,
+    #[serde(default, rename = "lastComposerReasoningEffort")]
+    pub(crate) last_composer_reasoning_effort: Option<String>,
     #[serde(default = "default_ui_scale", rename = "uiScale")]
     pub(crate) ui_scale: f64,
     #[serde(
@@ -305,6 +309,8 @@ impl Default for AppSettings {
             remote_backend_host: default_remote_backend_host(),
             remote_backend_token: None,
             default_access_mode: "current".to_string(),
+            last_composer_model_id: None,
+            last_composer_reasoning_effort: None,
             ui_scale: 1.0,
             notification_sounds_enabled: true,
             experimental_collab_enabled: false,
@@ -331,6 +337,8 @@ mod tests {
         assert_eq!(settings.remote_backend_host, "127.0.0.1:4732");
         assert!(settings.remote_backend_token.is_none());
         assert_eq!(settings.default_access_mode, "current");
+        assert!(settings.last_composer_model_id.is_none());
+        assert!(settings.last_composer_reasoning_effort.is_none());
         assert!((settings.ui_scale - 1.0).abs() < f64::EPSILON);
         assert!(settings.notification_sounds_enabled);
         assert!(!settings.experimental_steer_enabled);

src/App.tsx

@@ -96,7 +96,8 @@ function MainApp() {
     settings: appSettings,
     setSettings: setAppSettings,
     saveSettings,
-    doctor
+    doctor,
+    isLoading: appSettingsLoading
   } = useAppSettings();
   const dictationModel = useDictationModel(appSettings.dictationModelId);
   const {
@@ -374,7 +375,12 @@ function MainApp() {
     reasoningOptions,
     selectedEffort,
     setSelectedEffort
-  } = useModels({ activeWorkspace, onDebug: addDebugEntry });
+  } = useModels({
+    activeWorkspace,
+    onDebug: addDebugEntry,
+    preferredModelId: appSettings.lastComposerModelId,
+    preferredEffort: appSettings.lastComposerReasoningEffort,
+  });
   const {
     collaborationModes,
     selectedCollaborationMode,
@@ -487,6 +493,36 @@ function MainApp() {
   const activeDiffError =
     diffSource === "pr" ? gitPullRequestDiffsError : diffError;
 
+  useEffect(() => {
+    if (appSettingsLoading) {
+      return;
+    }
+    if (!selectedModelId && selectedEffort === null) {
+      return;
+    }
+    setAppSettings((current) => {
+      if (
+        current.lastComposerModelId === selectedModelId &&
+        current.lastComposerReasoningEffort === selectedEffort
+      ) {
+        return current;
+      }
+      const nextSettings = {
+        ...current,
+        lastComposerModelId: selectedModelId,
+        lastComposerReasoningEffort: selectedEffort,
+      };
+      void queueSaveSettings(nextSettings);
+      return nextSettings;
+    });
+  }, [
+    appSettingsLoading,
+    queueSaveSettings,
+    selectedEffort,
+    selectedModelId,
+    setAppSettings,
+  ]);
+
   useEffect(() => {
     if (diffSource !== "pr" || centerMode !== "diff") {
       return;

src/features/models/hooks/useModels.ts

@@ -5,9 +5,16 @@ import { getModelList } from "../../../services/tauri";
 type UseModelsOptions = {
   activeWorkspace: WorkspaceInfo | null;
   onDebug?: (entry: DebugEntry) => void;
+  preferredModelId?: string | null;
+  preferredEffort?: string | null;
 };
 
-export function useModels({ activeWorkspace, onDebug }: UseModelsOptions) {
+export function useModels({
+  activeWorkspace,
+  onDebug,
+  preferredModelId = null,
+  preferredEffort = null,
+}: UseModelsOptions) {
   const [models, setModels] = useState<ModelOption[]>([]);
   const [selectedModelId, setSelectedModelId] = useState<string | null>(null);
   const [selectedEffort, setSelectedEffort] = useState<string | null>(null);
@@ -82,9 +89,24 @@ export function useModels({ activeWorkspace, onDebug }: UseModelsOptions) {
         data.find((model) => model.model === "gpt-5.2-codex") ?? null;
       const defaultModel =
         preferredModel ?? data.find((model) => model.isDefault) ?? data[0] ?? null;
-      if (defaultModel) {
-        setSelectedModelId(defaultModel.id);
-        setSelectedEffort(defaultModel.defaultReasoningEffort ?? null);
+      const existingSelection = data.find((model) => model.id === selectedModelId) ?? null;
+      const preferredSelection = data.find((model) => model.id === preferredModelId) ?? null;
+      const nextSelection = existingSelection ?? preferredSelection ?? defaultModel;
+      if (nextSelection) {
+        setSelectedModelId(nextSelection.id);
+        const nextEffort =
+          selectedEffort &&
+          nextSelection.supportedReasoningEfforts.some(
+            (effort) => effort.reasoningEffort === selectedEffort,
+          )
+            ? selectedEffort
+            : preferredEffort &&
+                nextSelection.supportedReasoningEfforts.some(
+                  (effort) => effort.reasoningEffort === preferredEffort,
+                )
+              ? preferredEffort
+              : nextSelection.defaultReasoningEffort ?? null;
+        setSelectedEffort(nextEffort);
       }
     } catch (error) {
       onDebug?.({
@@ -97,7 +119,15 @@ export function useModels({ activeWorkspace, onDebug }: UseModelsOptions) {
     } finally {
       inFlight.current = false;
     }
-  }, [isConnected, onDebug, workspaceId]);
+  }, [
+    isConnected,
+    onDebug,
+    preferredEffort,
+    preferredModelId,
+    selectedEffort,
+    selectedModelId,
+    workspaceId,
+  ]);
 
   useEffect(() => {
     if (!workspaceId || !isConnected) {
@@ -124,6 +154,52 @@ export function useModels({ activeWorkspace, onDebug }: UseModelsOptions) {
     setSelectedEffort(selectedModel.defaultReasoningEffort ?? null);
   }, [selectedEffort, selectedModel]);
 
+  useEffect(() => {
+    if (!models.length) {
+      return;
+    }
+    const preferredSelection = preferredModelId
+      ? models.find((model) => model.id === preferredModelId) ?? null
+      : null;
+    if (!preferredSelection) {
+      return;
+    }
+    const preferredCodex =
+      models.find((model) => model.model === "gpt-5.2-codex") ?? null;
+    const defaultModel =
+      preferredCodex ?? models.find((model) => model.isDefault) ?? models[0] ?? null;
+    const shouldApplyPreferredModel =
+      !selectedModelId ||
+      (defaultModel &&
+        selectedModelId === defaultModel.id &&
+        selectedModelId !== preferredSelection.id);
+    if (shouldApplyPreferredModel) {
+      setSelectedModelId(preferredSelection.id);
+      const nextEffort =
+        preferredEffort &&
+        preferredSelection.supportedReasoningEfforts.some(
+          (effort) => effort.reasoningEffort === preferredEffort,
+        )
+          ? preferredEffort
+          : preferredSelection.defaultReasoningEffort ?? null;
+      setSelectedEffort(nextEffort);
+      return;
+    }
+    if (selectedModelId !== preferredSelection.id || !preferredEffort) {
+      return;
+    }
+    const preferredEffortSupported = preferredSelection.supportedReasoningEfforts.some(
+      (effort) => effort.reasoningEffort === preferredEffort,
+    );
+    if (!preferredEffortSupported) {
+      return;
+    }
+    const defaultEffort = preferredSelection.defaultReasoningEffort ?? null;
+    if (!selectedEffort || selectedEffort === defaultEffort) {
+      setSelectedEffort(preferredEffort);
+    }
+  }, [models, preferredEffort, preferredModelId, selectedEffort, selectedModelId]);
+
   return {
     models,
     selectedModel,

src/features/settings/hooks/useAppSettings.ts

@@ -9,6 +9,8 @@ const defaultSettings: AppSettings = {
   remoteBackendHost: "127.0.0.1:4732",
   remoteBackendToken: null,
   defaultAccessMode: "current",
+  lastComposerModelId: null,
+  lastComposerReasoningEffort: null,
   uiScale: UI_SCALE_DEFAULT,
   notificationSoundsEnabled: true,
   experimentalCollabEnabled: false,

src/types.ts

@@ -77,6 +77,8 @@ export type AppSettings = {
   remoteBackendHost: string;
   remoteBackendToken: string | null;
   defaultAccessMode: AccessMode;
+  lastComposerModelId: string | null;
+  lastComposerReasoningEffort: string | null;
   uiScale: number;
   notificationSoundsEnabled: boolean;
   experimentalCollabEnabled: boolean;