@lvce-editor/static-server 0.81.1 → 0.81.2

package/static/{d0836a7 → 7204a38}/packages/chat-view/dist/chatViewWorkerMain.js

@@ -2726,6 +2726,7 @@ const createDefaultState = () => {
     listItemHeight: 54,
     maxComposerRows: 5,
     maxToolCalls: defaultMaxToolCalls,
+    messages: [],
     messagesAutoScrollEnabled: true,
     messagesScrollTop: 0,
     mockAiResponseDelay: 0,
@@ -2926,6 +2927,24 @@ const saveChatSession = async session => {
   } : value;
   await invoke$8('ChatStorage.setSession', sessionValue);
 };
+const saveChatSessionPreservingMessages = async (session, messages) => {
+  if (messages) {
+    const completeSession = {
+      ...session,
+      messages
+    };
+    await saveChatSession(completeSession);
+    return completeSession;
+  }
+  const existingSession = await getChatSession(session.id);
+  const completeSession = {
+    ...(existingSession || session),
+    ...session,
+    messages: existingSession?.messages || session.messages
+  };
+  await saveChatSession(completeSession);
+  return completeSession;
+};
 const deleteChatSession = async id => {
   await deleteSession$1(id);
 };
@@ -3074,6 +3093,34 @@ const getNextSelectedSessionId = (sessions, deletedId) => {
   return sessions[nextIndex].id;
 };
 
+const toSummarySession = session => {
+  const lastActiveTime = getSessionLastActiveTime(session);
+  const summary = {
+    ...(session.branchName ? {
+      branchName: session.branchName
+    } : {}),
+    id: session.id,
+    ...(lastActiveTime ? {
+      lastActiveTime
+    } : {}),
+    messages: [],
+    ...(session.pullRequestUrl ? {
+      pullRequestUrl: session.pullRequestUrl
+    } : {}),
+    title: session.title,
+    ...(session.workspaceUri ? {
+      workspaceUri: session.workspaceUri
+    } : {})
+  };
+  if (!session.projectId) {
+    return summary;
+  }
+  return {
+    ...summary,
+    projectId: session.projectId
+  };
+};
+
 const deleteSession = async (state, id) => {
   const {
     renamingSessionId,
@@ -3090,6 +3137,7 @@ const deleteSession = async (state, id) => {
       ...state,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
+      messages: [],
       renamingSessionId: '',
       selectedSessionId: '',
       sessions: [],
@@ -3099,22 +3147,20 @@ const deleteSession = async (state, id) => {
   const nextSelectedSessionId = getNextSelectedSessionId(filtered, id);
   const loadedSession = await getChatSession(nextSelectedSessionId);
   const composerAttachments = await getComposerAttachments(nextSelectedSessionId);
-  const hydratedSessions = filtered.map(session => {
+  const nextSessions = loadedSession ? filtered.map(session => {
     if (session.id !== nextSelectedSessionId) {
       return session;
     }
-    if (!loadedSession) {
-      return session;
-    }
-    return loadedSession;
-  });
+    return toSummarySession(loadedSession);
+  }) : filtered;
   return {
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
+    messages: loadedSession?.messages || [],
     renamingSessionId: renamingSessionId === id ? '' : renamingSessionId,
     selectedSessionId: nextSelectedSessionId,
-    sessions: hydratedSessions
+    sessions: nextSessions
   };
 };
 
@@ -3149,13 +3195,14 @@ const parseRenderHtmlArguments = rawArguments => {
   }
 };
 
-const getRenderHtmlCss = (sessions, selectedSessionId) => {
+const getRenderHtmlCss = (sessions, selectedSessionId, messages) => {
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
   if (!selectedSession) {
     return '';
   }
+  const selectedMessages = messages && messages.length > 0 ? messages : selectedSession.messages;
   const cssRules = new Set();
-  for (const message of selectedSession.messages) {
+  for (const message of selectedMessages) {
     if (message.role !== 'assistant' || !message.toolCalls) {
       continue;
     }
@@ -3174,8 +3221,8 @@ const getRenderHtmlCss = (sessions, selectedSessionId) => {
 };
 
 const isEqual$1 = (oldState, newState) => {
-  const oldRenderHtmlCss = getRenderHtmlCss(oldState.sessions, oldState.selectedSessionId);
-  const newRenderHtmlCss = getRenderHtmlCss(newState.sessions, newState.selectedSessionId);
+  const oldRenderHtmlCss = getRenderHtmlCss(oldState.sessions, oldState.selectedSessionId, oldState.messages);
+  const newRenderHtmlCss = getRenderHtmlCss(newState.sessions, newState.selectedSessionId, newState.messages);
   return oldState.initial === newState.initial && oldState.chatMessageFontFamily === newState.chatMessageFontFamily && oldState.chatMessageFontSize === newState.chatMessageFontSize && oldState.chatMessageLineHeight === newState.chatMessageLineHeight && oldState.chatFocusContentMaxWidth === newState.chatFocusContentMaxWidth && oldState.projectSidebarWidth === newState.projectSidebarWidth && oldState.chatSendAreaPaddingTop === newState.chatSendAreaPaddingTop && oldState.chatSendAreaPaddingLeft === newState.chatSendAreaPaddingLeft && oldState.chatSendAreaPaddingRight === newState.chatSendAreaPaddingRight && oldState.chatSendAreaPaddingBottom === newState.chatSendAreaPaddingBottom && oldState.composerHeight === newState.composerHeight && oldState.composerAttachmentsHeight === newState.composerAttachmentsHeight && oldState.modelPickerHeight === newState.modelPickerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize && oldState.listItemHeight === newState.listItemHeight && oldState.textAreaPaddingTop === newState.textAreaPaddingTop && oldState.textAreaPaddingLeft === newState.textAreaPaddingLeft && oldState.textAreaPaddingRight === newState.textAreaPaddingRight && oldState.textAreaPaddingBottom === newState.textAreaPaddingBottom && oldRenderHtmlCss === newRenderHtmlCss;
 };
 
@@ -4030,6 +4077,7 @@ const createSession = async (state, projectIdOverride = '') => {
     ...state,
     composerAttachments: [],
     composerAttachmentsHeight: 0,
+    messages: [],
     projectExpandedIds: state.projectExpandedIds.includes(projectId) ? state.projectExpandedIds : [...state.projectExpandedIds, projectId],
     renamingSessionId: '',
     selectedProjectId: projectId,
@@ -4072,9 +4120,10 @@ const deleteProject = async (state, projectId) => {
     }
     const updatedSession = {
       ...session,
+      messages: [],
       projectId: blankProjectId
     };
-    await saveChatSession(updatedSession);
+    await saveChatSessionPreservingMessages(updatedSession, session.id === state.selectedSessionId ? state.messages : undefined);
     return updatedSession;
   }));
   const selectedProjectId = !state.selectedProjectId || state.selectedProjectId === projectId || !projects.some(candidate => candidate.id === state.selectedProjectId) ? blankProjectId : state.selectedProjectId;
@@ -4086,6 +4135,7 @@ const deleteProject = async (state, projectId) => {
       ...state,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
+      messages: [],
       projectExpandedIds: nextProjectExpandedIds,
       projects,
       selectedProjectId,
@@ -4097,21 +4147,22 @@ const deleteProject = async (state, projectId) => {
   const selectedSessionId = visibleSessions.some(session => session.id === state.selectedSessionId) ? state.selectedSessionId : visibleSessions[0].id;
   const loadedSession = await getChatSession(selectedSessionId);
   const composerAttachments = await getComposerAttachments(selectedSessionId);
-  const hydratedSessions = sessions.map(session => {
-    if (session.id !== selectedSessionId || !loadedSession) {
+  const nextSessions = loadedSession ? sessions.map(session => {
+    if (session.id !== selectedSessionId) {
       return session;
     }
-    return loadedSession;
-  });
+    return toSummarySession(loadedSession);
+  }) : sessions;
   return {
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, state.width),
+    messages: loadedSession?.messages || [],
     projectExpandedIds: nextProjectExpandedIds,
     projects,
     selectedProjectId,
     selectedSessionId,
-    sessions: hydratedSessions,
+    sessions: nextSessions,
     viewMode: getNextViewMode(state, true)
   };
 };
@@ -4402,6 +4453,7 @@ const selectProject = async (state, projectId) => {
       ...state,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
+      messages: [],
       selectedProjectId: projectId,
       selectedSessionId: '',
       viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'list'
@@ -4411,19 +4463,20 @@ const selectProject = async (state, projectId) => {
   const nextSelectedSessionId = currentSessionVisible ? selectedSessionId : visibleSessions[0].id;
   const loadedSession = await getChatSession(nextSelectedSessionId);
   const composerAttachments = await getComposerAttachments(nextSelectedSessionId);
-  const hydratedSessions = sessions.map(session => {
-    if (session.id !== nextSelectedSessionId || !loadedSession) {
+  const nextSessions = loadedSession ? sessions.map(session => {
+    if (session.id !== nextSelectedSessionId) {
       return session;
     }
-    return loadedSession;
-  });
+    return toSummarySession(loadedSession);
+  }) : sessions;
   return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
+    messages: loadedSession?.messages || [],
     selectedProjectId: projectId,
     selectedSessionId: nextSelectedSessionId,
-    sessions: hydratedSessions,
+    sessions: nextSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
   });
 };
@@ -4471,29 +4524,29 @@ const handleClickCreateProject = async state => {
   };
 };
 
-const getChatSessionStatus = session => {
+const getChatSessionStatus = (session, messages = session.messages) => {
   if (session.status) {
     return session.status;
   }
-  const hasInProgressAssistantMessage = session.messages.some(message => message.role === 'assistant' && message.inProgress);
+  const hasInProgressAssistantMessage = messages.some(message => message.role === 'assistant' && message.inProgress);
   if (hasInProgressAssistantMessage) {
     return 'in-progress';
   }
-  const hasAssistantMessage = session.messages.some(message => message.role === 'assistant');
+  const hasAssistantMessage = messages.some(message => message.role === 'assistant');
   if (hasAssistantMessage) {
     return 'finished';
   }
   return 'idle';
 };
 
-const canCreatePullRequest = session => {
+const canCreatePullRequest = (session, messages = session?.messages || []) => {
   if (!session?.branchName || !session.workspaceUri || session.pullRequestUrl) {
     return false;
   }
-  if (getChatSessionStatus(session) !== 'finished') {
+  if (getChatSessionStatus(session, messages) !== 'finished') {
     return false;
   }
-  return session.messages.some(message => message.role === 'assistant');
+  return messages.some(message => message.role === 'assistant');
 };
 
 /* cspell:words worktree */
@@ -4546,7 +4599,8 @@ const createChatPullRequest = async ({
 
 const handleClickCreatePullRequest = async state => {
   const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
-  if (!canCreatePullRequest(selectedSession) || !selectedSession?.branchName || !selectedSession.workspaceUri) {
+  const selectedMessages = state.messages.length > 0 ? state.messages : selectedSession?.messages || [];
+  if (!canCreatePullRequest(selectedSession, selectedMessages) || !selectedSession?.branchName || !selectedSession.workspaceUri) {
     return state;
   }
   const {
@@ -4560,6 +4614,7 @@ const handleClickCreatePullRequest = async state => {
   });
   const updatedSession = {
     ...selectedSession,
+    messages: [],
     pullRequestUrl
   };
   const updatedSessions = state.sessions.map(session => {
@@ -4568,7 +4623,7 @@ const handleClickCreatePullRequest = async state => {
     }
     return updatedSession;
   });
-  await saveChatSession(updatedSession);
+  await saveChatSessionPreservingMessages(updatedSession, selectedMessages);
   await invoke$1('Main.openUri', pullRequestUrl);
   return {
     ...state,
@@ -4589,12 +4644,12 @@ const hasFailedToolCall = message => {
 const isExecutablePlanMessage = message => {
   return message.role === 'assistant' && message.agentMode === 'plan' && !message.inProgress && message.text.trim() !== '' && !hasFailedToolCall(message);
 };
-const getLatestExecutablePlanMessage = session => {
+const getLatestExecutablePlanMessage = (session, messages = session?.messages || []) => {
   if (!session) {
     return undefined;
   }
-  for (let index = session.messages.length - 1; index >= 0; index--) {
-    const message = session.messages[index];
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const message = messages[index];
     if (message.role !== 'assistant') {
       continue;
     }
@@ -4636,10 +4691,11 @@ const handleSubmit = async state => {
 
 const handleClickImplementPlan = async state => {
   const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
-  if (!selectedSession || getChatSessionStatus(selectedSession) === 'in-progress') {
+  const selectedMessages = state.messages.length > 0 ? state.messages : selectedSession?.messages || [];
+  if (!selectedSession || getChatSessionStatus(selectedSession, selectedMessages) === 'in-progress') {
     return state;
   }
-  const latestPlanMessage = getLatestExecutablePlanMessage(selectedSession);
+  const latestPlanMessage = getLatestExecutablePlanMessage(selectedSession, selectedMessages);
   if (!latestPlanMessage) {
     return state;
   }
@@ -8524,16 +8580,17 @@ const handleClickSaveOpenApiApiKey = async state => {
   if (!session) {
     return updatedState;
   }
-  const lastMessage = session.messages.at(-1);
+  const selectedMessages = updatedState.messages.length > 0 ? updatedState.messages : session.messages;
+  const lastMessage = selectedMessages.at(-1);
   const shouldRetryOpenApi = lastMessage?.role === 'assistant' && lastMessage.text === openApiApiKeyRequiredMessage;
   if (!shouldRetryOpenApi) {
     return updatedState;
   }
-  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
+  const previousUserMessage = selectedMessages.toReversed().find(item => item.role === 'user');
   if (!previousUserMessage) {
     return updatedState;
   }
-  const retryMessages = session.messages.slice(0, -1);
+  const retryMessages = selectedMessages.slice(0, -1);
   const assistantMessage = await getAiResponse({
     agentMode: updatedState.agentMode,
     assetDir: updatedState.assetDir,
@@ -8558,19 +8615,27 @@ const handleClickSaveOpenApiApiKey = async state => {
     userText: previousUserMessage.text
   });
   const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
+  const messages = [...selectedMessages.slice(0, -1), assistantMessage];
   const updatedSession = {
     ...session,
-    messages: [...session.messages.slice(0, -1), assistantMessage]
+    messages,
+    status: 'finished'
+  };
+  const updatedSessionSummary = {
+    ...session,
+    messages: [],
+    status: 'finished'
   };
-  await saveChatSession(updatedSession);
+  await saveChatSessionPreservingMessages(updatedSession, messages);
   const updatedSessions = updatedState.sessions.map(item => {
     if (item.id !== updatedState.selectedSessionId) {
       return item;
     }
-    return updatedSession;
+    return updatedSessionSummary;
   });
   return {
     ...updatedState,
+    messages,
     nextMessageId: updatedState.nextMessageId + 1,
     openApiApiKeyState: 'idle',
     parsedMessages,
@@ -8614,16 +8679,17 @@ const handleClickSaveOpenRouterApiKey = async state => {
   if (!session) {
     return updatedState;
   }
-  const lastMessage = session.messages.at(-1);
+  const selectedMessages = updatedState.messages.length > 0 ? updatedState.messages : session.messages;
+  const lastMessage = selectedMessages.at(-1);
   const shouldRetryOpenRouter = lastMessage?.role === 'assistant' && lastMessage.text === openRouterApiKeyRequiredMessage;
   if (!shouldRetryOpenRouter) {
     return updatedState;
   }
-  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
+  const previousUserMessage = selectedMessages.toReversed().find(item => item.role === 'user');
   if (!previousUserMessage) {
     return updatedState;
   }
-  const retryMessages = session.messages.slice(0, -1);
+  const retryMessages = selectedMessages.slice(0, -1);
   const assistantMessage = await getAiResponse({
     agentMode: updatedState.agentMode,
     assetDir: updatedState.assetDir,
@@ -8647,19 +8713,27 @@ const handleClickSaveOpenRouterApiKey = async state => {
     userText: previousUserMessage.text
   });
   const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
+  const messages = [...selectedMessages.slice(0, -1), assistantMessage];
   const updatedSession = {
     ...session,
-    messages: [...session.messages.slice(0, -1), assistantMessage]
+    messages,
+    status: 'finished'
+  };
+  const updatedSessionSummary = {
+    ...session,
+    messages: [],
+    status: 'finished'
   };
-  await saveChatSession(updatedSession);
+  await saveChatSessionPreservingMessages(updatedSession, messages);
   const updatedSessions = updatedState.sessions.map(item => {
     if (item.id !== updatedState.selectedSessionId) {
       return item;
     }
-    return updatedSession;
+    return updatedSessionSummary;
   });
   return {
     ...updatedState,
+    messages,
     nextMessageId: updatedState.nextMessageId + 1,
     openRouterApiKeyState: 'idle',
     parsedMessages,
@@ -8673,30 +8747,38 @@ const handleClickSend = async state => {
 
 const handleClickStop = async state => {
   const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
-  if (!selectedSession || getChatSessionStatus(selectedSession) !== 'in-progress') {
+  const selectedMessages = state.messages.length > 0 ? state.messages : selectedSession?.messages || [];
+  if (!selectedSession || getChatSessionStatus(selectedSession, selectedMessages) !== 'in-progress') {
     return state;
   }
+  const messages = selectedMessages.map(message => {
+    if (message.role !== 'assistant' || !message.inProgress) {
+      return message;
+    }
+    return {
+      ...message,
+      inProgress: false
+    };
+  });
   const updatedSelectedSession = {
     ...selectedSession,
-    messages: selectedSession.messages.map(message => {
-      if (message.role !== 'assistant' || !message.inProgress) {
-        return message;
-      }
-      return {
-        ...message,
-        inProgress: false
-      };
-    }),
+    messages,
+    status: 'stopped'
+  };
+  const updatedSelectedSessionSummary = {
+    ...selectedSession,
+    messages: [],
     status: 'stopped'
   };
-  await saveChatSession(updatedSelectedSession);
+  await saveChatSessionPreservingMessages(updatedSelectedSession, messages);
   return {
     ...state,
+    messages,
     sessions: state.sessions.map(session => {
       if (session.id !== updatedSelectedSession.id) {
         return session;
       }
-      return updatedSelectedSession;
+      return updatedSelectedSessionSummary;
     })
   };
 };
@@ -8753,12 +8835,13 @@ const handleGitBranchChange = async (state, branchName) => {
       }
       return {
         ...session,
-        branchName
+        branchName,
+        messages: []
       };
     });
     const updatedSelectedSession = updatedSessions.find(session => session.id === state.selectedSessionId);
     if (updatedSelectedSession) {
-      await saveChatSession(updatedSelectedSession);
+      await saveChatSessionPreservingMessages(updatedSelectedSession, state.messages);
     }
     return {
       ...state,
@@ -8894,28 +8977,26 @@ const selectSession = async (state, id) => {
   }
   const loadedSession = await getChatSession(id);
   const composerAttachments = await getComposerAttachments(id);
-  const hydratedSessions = sessions.map(session => {
+  const nextSessions = loadedSession ? sessions.map(session => {
     if (session.id !== id) {
       return session;
     }
-    if (!loadedSession) {
-      return session;
-    }
-    return loadedSession;
-  });
-  const selectedSession = hydratedSessions.find(session => session.id === id);
-  const parsedMessages = selectedSession ? await parseAndStoreMessagesContent(state.parsedMessages, selectedSession.messages) : state.parsedMessages;
+    return toSummarySession(loadedSession);
+  }) : sessions;
+  const messages = loadedSession?.messages || [];
+  const parsedMessages = await parseAndStoreMessagesContent(state.parsedMessages, messages);
   return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
     lastNormalViewMode: viewMode === 'chat-focus' ? lastNormalViewMode : 'detail',
+    messages,
     messagesAutoScrollEnabled: true,
     messagesScrollTop: getNextAutoScrollTop(state.messagesScrollTop),
     parsedMessages,
     renamingSessionId: '',
     selectedSessionId: id,
-    sessions: hydratedSessions,
+    sessions: nextSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
   });
 };
@@ -8949,6 +9030,7 @@ const renameSession = async (state, sessionId, currentTitle) => {
     }
     return {
       ...session,
+      messages: [],
       title: nextTitle
     };
   });
@@ -8956,7 +9038,7 @@ const renameSession = async (state, sessionId, currentTitle) => {
   if (!renamedSession) {
     return state;
   }
-  await saveChatSession(renamedSession);
+  await saveChatSessionPreservingMessages(renamedSession, sessionId === state.selectedSessionId ? state.messages : undefined);
   return {
     ...state,
     sessions: updatedSessions
@@ -9025,6 +9107,7 @@ const toggleProjectExpanded = async (state, projectId) => {
       ...state,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
+      messages: [],
       projectExpandedIds: nextProjectExpandedIds,
       selectedProjectId: projectId,
       selectedSessionId: '',
@@ -9035,20 +9118,21 @@ const toggleProjectExpanded = async (state, projectId) => {
   const nextSelectedSessionId = selectedSessionVisible ? selectedSessionId : visibleSessions[0].id;
   const loadedSession = await getChatSession(nextSelectedSessionId);
   const composerAttachments = await getComposerAttachments(nextSelectedSessionId);
-  const hydratedSessions = sessions.map(session => {
-    if (session.id !== nextSelectedSessionId || !loadedSession) {
+  const nextSessions = loadedSession ? sessions.map(session => {
+    if (session.id !== nextSelectedSessionId) {
       return session;
     }
-    return loadedSession;
-  });
+    return toSummarySession(loadedSession);
+  }) : sessions;
   return {
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
+    messages: loadedSession?.messages || [],
     projectExpandedIds: nextProjectExpandedIds,
     selectedProjectId: projectId,
     selectedSessionId: nextSelectedSessionId,
-    sessions: hydratedSessions,
+    sessions: nextSessions,
     viewMode: 'chat-focus'
   };
 };
@@ -9100,9 +9184,28 @@ const selectListIndex = async (state, index) => {
   };
 };
 
+const getSessionIndexFromListIndex = (listIndex, sessionCount, expanded) => {
+  if (listIndex < 0) {
+    return -1;
+  }
+  if (sessionCount <= 3) {
+    return listIndex < sessionCount ? listIndex : -1;
+  }
+  if (listIndex < 3) {
+    return listIndex;
+  }
+  if (listIndex === 3) {
+    return -1;
+  }
+  if (!expanded) {
+    return -1;
+  }
+  const sessionIndex = listIndex - 1;
+  return sessionIndex < sessionCount ? sessionIndex : -1;
+};
 const handleClickList = async (state, eventX, eventY) => {
-  const index = getListIndex(state, eventX, eventY);
-  if (index === -1) {
+  const listIndex = getListIndex(state, eventX, eventY);
+  if (listIndex === -1) {
     return {
       ...state,
       focus: 'list',
@@ -9112,7 +9215,8 @@ const handleClickList = async (state, eventX, eventY) => {
     };
   }
   const visibleSessions = getVisibleSessions(state.sessions, state.selectedProjectId);
-  if (index >= visibleSessions.length) {
+  const sessionIndex = getSessionIndexFromListIndex(listIndex, visibleSessions.length, state.chatListExpanded);
+  if (sessionIndex === -1) {
     return {
       ...state,
       focus: 'list',
@@ -9121,7 +9225,7 @@ const handleClickList = async (state, eventX, eventY) => {
       listFocusOutline: false
     };
   }
-  return selectListIndex(state, index);
+  return selectListIndex(state, sessionIndex);
 };
 
 /* cspell:ignore sonarjs */
@@ -10198,21 +10302,27 @@ const openMockSessionLocal = async (state, mockSessionId, mockChatMessages, opti
     }
     return applySessionOptions({
       ...session,
-      messages: mockChatMessages
+      messages: [],
+      status: mockChatMessages.some(message => message.role === 'assistant') ? 'finished' : 'idle'
     }, options);
   }) : [...currentSessions, applySessionOptions({
     id: mockSessionId,
-    messages: mockChatMessages,
+    messages: [],
+    status: mockChatMessages.some(message => message.role === 'assistant') ? 'finished' : 'idle',
     title: mockSessionId
   }, options)];
   const selectedSession = sessions.find(session => session.id === mockSessionId);
   if (selectedSession) {
-    await saveChatSession(selectedSession);
+    await saveChatSession({
+      ...selectedSession,
+      messages: mockChatMessages
+    });
   }
   return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments: [],
     composerAttachmentsHeight: 0,
+    messages: mockChatMessages,
     parsedMessages,
     renamingSessionId: '',
     selectedSessionId: mockSessionId,
@@ -10242,6 +10352,7 @@ const openMockSessions = async (state, count) => {
     composerAttachments: [],
     composerAttachmentsHeight: 0,
     listFocusedIndex: -1,
+    messages: [],
     parsedMessages: [],
     renamingSessionId: '',
     selectedSessionId: '',
@@ -13461,6 +13572,7 @@ const getChatModeChatFocusVirtualDom = ({
   hasSpaceForAgentModePicker: _hasSpaceForAgentModePicker,
   hasSpaceForRunModePicker: _hasSpaceForRunModePicker,
   hiddenPrimaryControls = [],
+  messages,
   messagesAutoScrollEnabled,
   messagesScrollTop = 0,
   modelPickerOpen = false,
@@ -13505,10 +13617,10 @@ const getChatModeChatFocusVirtualDom = ({
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
   const selectedSessionTitle = selectedSession?.title || chatTitle();
   const selectedProjectName = projects.find(project => project.id === selectedProjectId)?.name || '';
-  const messages = selectedSession ? selectedSession.messages : [];
-  const showCreatePullRequestButton = canCreatePullRequest(selectedSession);
-  const isSelectedSessionInProgress = selectedSession ? getChatSessionStatus(selectedSession) === 'in-progress' : false;
-  const showImplementPlanButton = agentMode === 'plan' && !!getLatestExecutablePlanMessage(selectedSession) && !isSelectedSessionInProgress;
+  const selectedMessages = messages || selectedSession?.messages || [];
+  const showCreatePullRequestButton = canCreatePullRequest(selectedSession, selectedMessages);
+  const isSelectedSessionInProgress = selectedSession ? getChatSessionStatus(selectedSession, selectedMessages) === 'in-progress' : false;
+  const showImplementPlanButton = agentMode === 'plan' && !!getLatestExecutablePlanMessage(selectedSession, selectedMessages) && !isSelectedSessionInProgress;
   const isDropOverlayVisible = composerDropEnabled && composerDropActive;
   const isComposerAttachmentPreviewOverlayVisible = !!composerAttachmentPreviewOverlayAttachmentId;
   const isAgentModePickerVisible = agentModePickerOpen;
@@ -13535,7 +13647,7 @@ const getChatModeChatFocusVirtualDom = ({
     childCount: 3,
     className: ChatFocusMainArea,
     type: Div
-  }, ...getChatHeaderDomFocusMode(selectedSessionTitle, selectedProjectName, authEnabled, userState, userName), ...getMessagesDom(messages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker, true), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, gitBranchPickerVisible, gitBranchPickerOpen, gitBranchPickerErrorMessage, gitBranches, selectedSession?.branchName || '', visiblePrimaryControls, hiddenPrimaryControls, primaryControlsOverflowButtonVisible, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
+  }, ...getChatHeaderDomFocusMode(selectedSessionTitle, selectedProjectName, authEnabled, userState, userName), ...getMessagesDom(selectedMessages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker, true), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, gitBranchPickerVisible, gitBranchPickerOpen, gitBranchPickerErrorMessage, gitBranches, selectedSession?.branchName || '', visiblePrimaryControls, hiddenPrimaryControls, primaryControlsOverflowButtonVisible, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -13648,6 +13760,7 @@ const getChatModeDetailVirtualDom = ({
   hasSpaceForAgentModePicker: _hasSpaceForAgentModePicker,
   hasSpaceForRunModePicker: _hasSpaceForRunModePicker,
   hiddenPrimaryControls = [],
+  messages,
   messagesAutoScrollEnabled,
   messagesScrollTop = 0,
   modelPickerOpen = false,
@@ -13686,11 +13799,11 @@ const getChatModeDetailVirtualDom = ({
   voiceDictationEnabled = false
 }) => {
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
-  const isSelectedSessionInProgress = selectedSession ? getChatSessionStatus(selectedSession) === 'in-progress' : false;
+  const selectedMessages = messages || selectedSession?.messages || [];
+  const isSelectedSessionInProgress = selectedSession ? getChatSessionStatus(selectedSession, selectedMessages) === 'in-progress' : false;
   const selectedSessionTitle = selectedSession?.title || chatTitle();
-  const messages = selectedSession ? selectedSession.messages : [];
-  const showCreatePullRequestButton = canCreatePullRequest(selectedSession);
-  const showImplementPlanButton = agentMode === 'plan' && !!getLatestExecutablePlanMessage(selectedSession) && !isSelectedSessionInProgress;
+  const showCreatePullRequestButton = canCreatePullRequest(selectedSession, selectedMessages);
+  const showImplementPlanButton = agentMode === 'plan' && !!getLatestExecutablePlanMessage(selectedSession, selectedMessages) && !isSelectedSessionInProgress;
   const isDropOverlayVisible = composerDropEnabled && composerDropActive;
   const isComposerAttachmentPreviewOverlayVisible = !!composerAttachmentPreviewOverlayAttachmentId;
   const isAgentModePickerVisible = agentModePickerOpen;
@@ -13704,7 +13817,7 @@ const getChatModeDetailVirtualDom = ({
     onDragEnter: HandleDragEnterChatView,
     onDragOver: HandleDragOverChatView,
     type: Div
-  }, ...getChatHeaderDomDetailMode(selectedSessionTitle, authEnabled, userState, userName, authErrorMessage), ...getMessagesDom(messages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, false, false, '', [], '', visiblePrimaryControls, hiddenPrimaryControls, primaryControlsOverflowButtonVisible, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
+  }, ...getChatHeaderDomDetailMode(selectedSessionTitle, authEnabled, userState, userName, authErrorMessage), ...getMessagesDom(selectedMessages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, false, false, '', [], '', visiblePrimaryControls, hiddenPrimaryControls, primaryControlsOverflowButtonVisible, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14090,13 +14203,14 @@ const parseTodoListArguments = rawArguments => {
   return todos;
 };
 
-const getTodoListItems = (sessions, selectedSessionId) => {
+const getTodoListItems = (sessions, selectedSessionId, messages) => {
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
   if (!selectedSession) {
     return [];
   }
+  const selectedMessages = messages || selectedSession.messages;
   let todoItems = [];
-  for (const message of selectedSession.messages) {
+  for (const message of selectedMessages) {
     if (message.role !== 'assistant' || !message.toolCalls) {
       continue;
     }
@@ -14111,23 +14225,22 @@ const getTodoListItems = (sessions, selectedSessionId) => {
   return todoItems;
 };
 
-const getFallbackParsedMessages = sessions => {
+const getFallbackParsedMessages = messages => {
   const parsedMessages = [];
-  for (const session of sessions) {
-    for (const message of session.messages) {
-      if (parsedMessages.some(item => item.id === message.id)) {
-        continue;
-      }
-      parsedMessages.push({
-        id: message.id,
-        parsedContent: getEmptyMessageContent(),
-        text: message.text
-      });
+  for (const message of messages) {
+    if (parsedMessages.some(item => item.id === message.id)) {
+      continue;
     }
+    parsedMessages.push({
+      id: message.id,
+      parsedContent: getEmptyMessageContent(),
+      text: message.text
+    });
   }
   return parsedMessages;
 };
 const getChatVirtualDom = options => {
+  const selectedSession = options.sessions.find(session => session.id === options.selectedSessionId);
   const {
     addContextButtonEnabled,
     agentMode,
@@ -14155,6 +14268,7 @@ const getChatVirtualDom = options => {
     hiddenPrimaryControls = [],
     listFocusedIndex = -1,
     listFocusOutline = false,
+    messages: messagesInput,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen = false,
@@ -14200,8 +14314,9 @@ const getChatVirtualDom = options => {
     visiblePrimaryControls = ['agent-mode-picker-toggle', 'model-picker-toggle', ...(reasoningPickerEnabled ? ['reasoning-effort-picker-toggle'] : []), ...(showRunMode ? ['run-mode-picker-toggle'] : [])],
     voiceDictationEnabled = false
   } = options;
-  const parsedMessages = parsedMessagesInput ?? getFallbackParsedMessages(sessions);
-  const todoListItems = getTodoListItems(sessions, selectedSessionId);
+  const messages = messagesInput && messagesInput.length > 0 ? messagesInput : selectedSession?.messages || messagesInput || [];
+  const parsedMessages = parsedMessagesInput ?? getFallbackParsedMessages(messages);
+  const todoListItems = getTodoListItems(sessions, selectedSessionId, messages);
   switch (viewMode) {
     case 'chat-focus':
       return getChatModeChatFocusVirtualDom({
@@ -14227,6 +14342,7 @@ const getChatVirtualDom = options => {
         hasSpaceForAgentModePicker,
         hasSpaceForRunModePicker,
         hiddenPrimaryControls,
+        messages,
         messagesAutoScrollEnabled,
         messagesScrollTop,
         modelPickerOpen,
@@ -14288,6 +14404,7 @@ const getChatVirtualDom = options => {
         hasSpaceForAgentModePicker,
         hasSpaceForRunModePicker,
         hiddenPrimaryControls,
+        messages,
         messagesAutoScrollEnabled,
         messagesScrollTop,
         modelPickerOpen,
@@ -14413,6 +14530,7 @@ const renderItems = (oldState, newState) => {
     initial,
     listFocusedIndex,
     listFocusOutline,
+    messages,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen,
@@ -14489,6 +14607,7 @@ const renderItems = (oldState, newState) => {
     hiddenPrimaryControls,
     listFocusedIndex,
     listFocusOutline,
+    messages,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen,
@@ -14538,11 +14657,12 @@ const renderItems = (oldState, newState) => {
 };
 
 const getSelectedSessionToolCallSignature = state => {
-  const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
-  if (!selectedSession) {
+  if (!state.selectedSessionId) {
     return '';
   }
-  return selectedSession.messages.map(message => `${message.id}:${JSON.stringify(message.toolCalls || [])}`).join('|');
+  const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
+  const selectedMessages = state.messages.length > 0 ? state.messages : selectedSession?.messages || [];
+  return selectedMessages.map(message => `${message.id}:${JSON.stringify(message.toolCalls || [])}`).join('|');
 };
 const renderIncremental = (oldState, newState) => {
   const oldToolCallSignature = getSelectedSessionToolCallSignature(oldState);
@@ -15036,11 +15156,11 @@ const setInProgress = async (state, inProgress) => {
   if (!selectedSession) {
     return state;
   }
-  const lastAssistantMessageIndex = selectedSession.messages.findLastIndex(message => message.role === 'assistant');
+  const lastAssistantMessageIndex = state.messages.findLastIndex(message => message.role === 'assistant');
   if (lastAssistantMessageIndex === -1) {
     return state;
   }
-  const messages = selectedSession.messages.map((message, index) => {
+  const messages = state.messages.map((message, index) => {
     if (index !== lastAssistantMessageIndex) {
       return message;
     }
@@ -15054,14 +15174,20 @@ const setInProgress = async (state, inProgress) => {
     messages,
     status: inProgress ? 'in-progress' : 'finished'
   };
-  await saveChatSession(updatedSelectedSession);
+  const updatedSelectedSessionSummary = {
+    ...selectedSession,
+    messages: [],
+    status: inProgress ? 'in-progress' : 'finished'
+  };
+  await saveChatSessionPreservingMessages(updatedSelectedSession, messages);
   return {
     ...state,
+    messages,
     sessions: state.sessions.map(session => {
       if (session.id !== selectedSession.id) {
         return session;
       }
-      return updatedSelectedSession;
+      return updatedSelectedSessionSummary;
     })
   };
 };
@@ -15540,18 +15666,6 @@ const initializeTextMeasurementWorker = async () => {
   set$1(rpc);
 };
 
-const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
-  return sessions.map(session => {
-    if (session.id !== selectedSessionId) {
-      return session;
-    }
-    return {
-      ...session,
-      messages: [...session.messages, message]
-    };
-  });
-};
-
 const getCommandHelpText = () => {
   return ['Available commands:', '/new - Create and switch to a new chat session.', '/clear - Clear messages in the selected chat session.', '/export - Export current chat session as Markdown.', '/help - Show this help.'].join('\n');
 };
@@ -15599,13 +15713,24 @@ const appendAssistantMessage = async (state, assistantText) => {
     })
   };
   const parsedMessages = await parseAndStoreMessageContent(state.parsedMessages, assistantMessage);
-  const updatedSessions = appendMessageToSelectedSession(state.sessions, state.selectedSessionId, assistantMessage);
+  const messages = [...state.messages, assistantMessage];
+  const updatedSessions = state.sessions.map(session => {
+    if (session.id !== state.selectedSessionId) {
+      return session;
+    }
+    return {
+      ...session,
+      messages: [],
+      status: 'finished'
+    };
+  });
   const updatedSelectedSession = updatedSessions.find(session => session.id === state.selectedSessionId);
   if (updatedSelectedSession) {
-    await saveChatSession(updatedSelectedSession);
+    await saveChatSessionPreservingMessages(updatedSelectedSession, messages);
   }
   return withClearedComposer({
     ...state,
+    messages,
     parsedMessages,
     sessions: updatedSessions
   });
@@ -15630,15 +15755,17 @@ const registerSlashCommands = () => {
       }
       return {
         ...session,
-        messages: []
+        messages: [],
+        status: 'idle'
       };
     });
     const updatedSelectedSession = updatedSessions.find(session => session.id === state.selectedSessionId);
     if (updatedSelectedSession) {
-      await saveChatSession(updatedSelectedSession);
+      await saveChatSessionPreservingMessages(updatedSelectedSession, []);
     }
     return withClearedComposer({
       ...state,
+      messages: [],
       sessions: updatedSessions
     });
   });
@@ -15650,7 +15777,10 @@ const registerSlashCommands = () => {
     if (!selectedSession) {
       return withClearedComposer(state);
     }
-    const assistantText = ['```md', toMarkdownTranscript(selectedSession), '```'].join('\n');
+    const assistantText = ['```md', toMarkdownTranscript({
+      ...selectedSession,
+      messages: state.messages
+    }), '```'].join('\n');
     return appendAssistantMessage(state, assistantText);
   });
 };