fix: followup on persisted chat model pr

Author: RomneyDa

core/util/history.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 
-import { Session, BaseSessionMetadata } from "../index.js";
+import { BaseSessionMetadata, Session } from "../index.js";
 import { ListHistoryOptions } from "../protocol/core.js";
 
 import { NEW_SESSION_TITLE } from "./constants.js";
@@ -107,12 +107,14 @@ export class HistoryManager {
       title: session.title,
       workspaceDirectory: session.workspaceDirectory,
       history: session.history,
-      // Optional fields persisted when present
-      ...(session.mode ? { mode: session.mode } : {}),
-      ...(typeof session.chatModelTitle === "undefined"
-        ? {}
-        : { chatModelTitle: session.chatModelTitle }),
-    } as Session;
+    };
+    if (session.mode) {
+      orderedSession.mode = session.mode;
+    }
+    if (session.chatModelTitle !== undefined) {
+      orderedSession.chatModelTitle = session.chatModelTitle;
+    }
+
     fs.writeFileSync(
       getSessionFilePath(session.sessionId),
       JSON.stringify(orderedSession, undefined, 2),

gui/src/redux/slices/sessionSlice.ts

@@ -694,7 +694,7 @@ export const sessionSlice = createSlice({
         state.title = payload.title;
         state.id = payload.sessionId;
         if (payload.mode) {
-          state.mode = payload.mode as MessageModes;
+          state.mode = payload.mode;
         }
       } else {
         state.history = [];

gui/src/redux/thunks/session.ts

@@ -5,6 +5,7 @@ import { NEW_SESSION_TITLE } from "core/util/constants";
 import { renderChatMessage } from "core/util/messageContent";
 import { IIdeMessenger } from "../../context/IdeMessenger";
 import { selectSelectedChatModel } from "../slices/configSlice";
+import { selectSelectedProfile } from "../slices/profilesSlice";
 import {
   deleteSessionMetadata,
   newSession,
@@ -13,6 +14,7 @@ import {
   updateSessionMetadata,
 } from "../slices/sessionSlice";
 import { ThunkApiType } from "../store";
+import { updateSelectedModelByRole } from "../thunks/updateSelectedModelByRole";
 
 const MAX_TITLE_LENGTH = 100;
 
@@ -120,26 +122,8 @@ export const loadSession = createAsyncThunk<
     dispatch(newSession(session));
 
     // Restore selected chat model from session, if present
-    const chatModelTitle = session.chatModelTitle;
-    if (chatModelTitle) {
-      const state = getState();
-      const org = state.profiles.organizations.find(
-        (o) => o.id === state.profiles.selectedOrganizationId,
-      );
-      const selectedProfile =
-        org?.profiles.find((p) => p.id === state.profiles.selectedProfileId) ??
-        null;
-      if (selectedProfile) {
-        await dispatch(
-          (
-            await import("../thunks/updateSelectedModelByRole")
-          ).updateSelectedModelByRole({
-            role: "chat",
-            modelTitle: chatModelTitle,
-            selectedProfile,
-          }),
-        );
-      }
+    if (session.chatModelTitle) {
+      dispatch(selectChatModelForProfile(session.chatModelTitle));
     }
   },
 );
@@ -170,26 +154,32 @@ export const loadRemoteSession = createAsyncThunk<
     dispatch(newSession(session));
 
     // Restore selected chat model from session, if present
-    const chatModelTitle = session.chatModelTitle;
-    if (chatModelTitle) {
-      const state = getState();
-      const org = state.profiles.organizations.find(
-        (o) => o.id === state.profiles.selectedOrganizationId,
+    if (session.chatModelTitle) {
+      dispatch(selectChatModelForProfile(session.chatModelTitle));
+    }
+  },
+);
+
+export const selectChatModelForProfile = createAsyncThunk<
+  void,
+  string,
+  ThunkApiType
+>(
+  "session/selectModelForCurrentProfile",
+  async (modelTitle, { extra, dispatch, getState }) => {
+    const state = getState();
+    const modelMatch = state.config.config?.modelsByRole?.chat?.find(
+      (m) => m.title === modelTitle,
+    );
+    const selectedProfile = selectSelectedProfile(state);
+    if (selectedProfile && modelMatch) {
+      await dispatch(
+        updateSelectedModelByRole({
+          role: "chat",
+          modelTitle: modelTitle,
+          selectedProfile,
+        }),
       );
-      const selectedProfile =
-        org?.profiles.find((p) => p.id === state.profiles.selectedProfileId) ??
-        null;
-      if (selectedProfile) {
-        await dispatch(
-          (
-            await import("../thunks/updateSelectedModelByRole")
-          ).updateSelectedModelByRole({
-            role: "chat",
-            modelTitle: chatModelTitle,
-            selectedProfile,
-          }),
-        );
-      }
     }
   },
 );
@@ -220,28 +210,8 @@ export const loadLastSession = createAsyncThunk<void, void, ThunkApiType>(
       session = await getSession(extra.ideMessenger, lastSessionId);
     }
     dispatch(newSession(session));
-
-    // Restore selected chat model from session, if present
-    const chatModelTitle = session.chatModelTitle;
-    if (chatModelTitle) {
-      const state = getState();
-      const org = state.profiles.organizations.find(
-        (o) => o.id === state.profiles.selectedOrganizationId,
-      );
-      const selectedProfile =
-        org?.profiles.find((p) => p.id === state.profiles.selectedProfileId) ??
-        null;
-      if (selectedProfile) {
-        await dispatch(
-          (
-            await import("../thunks/updateSelectedModelByRole")
-          ).updateSelectedModelByRole({
-            role: "chat",
-            modelTitle: chatModelTitle,
-            selectedProfile,
-          }),
-        );
-      }
+    if (session.chatModelTitle) {
+      dispatch(selectChatModelForProfile(session.chatModelTitle));
     }
   },
 );