store model per session, set default as last selected

Author: joshsny

apps/array/src/renderer/features/sessions/components/ModelSelector.tsx

@@ -19,15 +19,19 @@ export function ModelSelector({
   disabled,
   onModelChange,
 }: ModelSelectorProps) {
-  const selectedModel = useSettingsStore((state) => state.selectedModel);
-  const setSelectedModel = useSettingsStore((state) => state.setSelectedModel);
+  const defaultModel = useSettingsStore((state) => state.defaultModel);
+  const setDefaultModel = useSettingsStore((state) => state.setDefaultModel);
   const setSessionModel = useSessionStore((state) => state.setSessionModel);
   const session = useSessionStore((state) =>
     taskId ? state.getSessionForTask(taskId) : undefined,
   );
 
+  // Use session model if available, otherwise fall back to default
+  const activeModel = session?.model ?? defaultModel;
+
   const handleChange = (value: string) => {
-    setSelectedModel(value);
+    // Always update the default
+    setDefaultModel(value);
     onModelChange?.(value);
 
     // If there's an active session, update the model mid-session
@@ -41,12 +45,12 @@ export function ModelSelector({
     (provider) => modelsByProvider[provider].models.length > 0,
   );
 
-  const currentModel = AVAILABLE_MODELS.find((m) => m.id === selectedModel);
-  const displayName = currentModel?.name ?? selectedModel;
+  const currentModel = AVAILABLE_MODELS.find((m) => m.id === activeModel);
+  const displayName = currentModel?.name ?? activeModel;
 
   return (
     <Select.Root
-      value={selectedModel}
+      value={activeModel}
       onValueChange={handleChange}
       disabled={disabled}
       size="1"

apps/array/src/renderer/features/sessions/stores/sessionStore.ts

@@ -96,6 +96,7 @@ export interface AgentSession {
   isCloud: boolean;
   logUrl?: string;
   processedLineCount?: number;
+  model?: string;
 }
 
 interface ConnectParams {
@@ -321,15 +322,15 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
           return;
         }
 
-        const selectedModel = useSettingsStore.getState().selectedModel;
+        const defaultModel = useSettingsStore.getState().defaultModel;
         const result = await window.electronAPI.agentStart({
           taskId,
           taskRunId: taskRun.id,
           repoPath,
           apiKey,
           apiHost,
           projectId,
-          model: selectedModel,
+          model: defaultModel,
         });
 
         set((state) => ({
@@ -344,6 +345,7 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
               status: "connected",
               isPromptPending: false,
               isCloud: false,
+              model: defaultModel,
             },
           },
         }));
@@ -510,6 +512,15 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
 
     try {
       await window.electronAPI.agentSetModel(session.taskRunId, modelId);
+      set((state) => ({
+        sessions: {
+          ...state.sessions,
+          [session.taskRunId]: {
+            ...state.sessions[session.taskRunId],
+            model: modelId,
+          },
+        },
+      }));
       log.info("Session model changed", { taskId, modelId });
     } catch (error) {
       log.error("Failed to change session model", { taskId, modelId, error });

apps/array/src/renderer/features/settings/stores/settingsStore.ts

@@ -13,15 +13,15 @@ interface SettingsStore {
   lastUsedLocalWorkspaceMode: LocalWorkspaceMode;
   lastUsedWorkspaceMode: WorkspaceMode;
   createPR: boolean;
-  selectedModel: string;
+  defaultModel: string;
 
   setAutoRunTasks: (autoRun: boolean) => void;
   setDefaultRunMode: (mode: DefaultRunMode) => void;
   setLastUsedRunMode: (mode: "local" | "cloud") => void;
   setLastUsedLocalWorkspaceMode: (mode: LocalWorkspaceMode) => void;
   setLastUsedWorkspaceMode: (mode: WorkspaceMode) => void;
   setCreatePR: (createPR: boolean) => void;
-  setSelectedModel: (model: string) => void;
+  setDefaultModel: (model: string) => void;
 }
 
 export const useSettingsStore = create<SettingsStore>()(
@@ -33,7 +33,7 @@ export const useSettingsStore = create<SettingsStore>()(
       lastUsedLocalWorkspaceMode: "worktree",
       lastUsedWorkspaceMode: "worktree",
       createPR: true,
-      selectedModel: DEFAULT_MODEL,
+      defaultModel: DEFAULT_MODEL,
 
       setAutoRunTasks: (autoRun) => set({ autoRunTasks: autoRun }),
       setDefaultRunMode: (mode) => set({ defaultRunMode: mode }),
@@ -42,7 +42,7 @@ export const useSettingsStore = create<SettingsStore>()(
         set({ lastUsedLocalWorkspaceMode: mode }),
       setLastUsedWorkspaceMode: (mode) => set({ lastUsedWorkspaceMode: mode }),
       setCreatePR: (createPR) => set({ createPR }),
-      setSelectedModel: (model) => set({ selectedModel: model }),
+      setDefaultModel: (model) => set({ defaultModel: model }),
     }),
     {
       name: "settings-storage",