@lvce-editor/static-server 0.75.9 → 0.75.10

package/static/{52a862f → 3db9eb3}/packages/chat-view/dist/chatViewWorkerMain.js

@@ -1192,6 +1192,9 @@ const getComposerWidth = width => {
 const getMinComposerHeight = lineHeight => {
   return lineHeight + 8;
 };
+const getMaxComposerHeight = (lineHeight, maxComposerRows) => {
+  return lineHeight * Math.max(1, maxComposerRows) + 8;
+};
 const estimateComposerHeight = (value, lineHeight) => {
   const lineCount = value.split('\n').length;
   return lineCount * lineHeight + 8;
@@ -1200,17 +1203,19 @@ const getComposerHeight = async (state, value, width = state.width) => {
   const {
     composerFontFamily,
     composerFontSize,
-    composerLineHeight
+    composerLineHeight,
+    maxComposerRows
   } = state;
   const minimumHeight = getMinComposerHeight(composerLineHeight);
+  const maximumHeight = getMaxComposerHeight(composerLineHeight, maxComposerRows);
   const content = value || ' ';
   const composerWidth = getComposerWidth(width);
   try {
     const measuredHeight = await measureTextBlockHeight(content, composerFontFamily, composerFontSize, composerLineHeight, composerWidth);
     const height = Math.ceil(measuredHeight) + 8;
-    return Math.max(minimumHeight, height);
+    return Math.max(minimumHeight, Math.min(maximumHeight, height));
   } catch {
-    return Math.max(minimumHeight, estimateComposerHeight(value, composerLineHeight));
+    return Math.max(minimumHeight, Math.min(maximumHeight, estimateComposerHeight(value, composerLineHeight)));
   }
 };
 const getMinComposerHeightForState = state => {
@@ -1385,6 +1390,7 @@ const createDefaultState = () => {
   const composerLineHeight = 20;
   return {
     assetDir: '',
+    chatListScrollTop: 0,
     composerFontFamily: 'system-ui',
     composerFontSize,
     composerHeight: composerLineHeight + 8,
@@ -1399,6 +1405,8 @@ const createDefaultState = () => {
     inputSource: 'script',
     lastSubmittedSessionId: '',
     listItemHeight: 40,
+    maxComposerRows: 5,
+    messagesScrollTop: 0,
     mockApiCommandId: '',
     models: getDefaultModels(),
     nextMessageId: 1,
@@ -1420,6 +1428,7 @@ const createDefaultState = () => {
       messages: [],
       title: defaultSessionTitle()
     }],
+    streamingEnabled: false,
     tokensMax: 0,
     tokensUsed: 0,
     uid: 0,
@@ -1457,7 +1466,7 @@ const create = (uid, x, y, width, height, platform, assetDir) => {
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.initial === newState.initial;
+  return oldState.initial === newState.initial && oldState.composerHeight === newState.composerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize;
 };
 
 const diffFocus = (oldState, newState) => {
@@ -1471,12 +1480,17 @@ const isEqual = (oldState, newState) => {
   return oldState.composerValue === newState.composerValue && oldState.initial === newState.initial && oldState.renamingSessionId === newState.renamingSessionId && oldState.selectedModelId === newState.selectedModelId && oldState.selectedSessionId === newState.selectedSessionId && oldState.sessions === newState.sessions && oldState.tokensMax === newState.tokensMax && oldState.tokensUsed === newState.tokensUsed && oldState.usageOverviewEnabled === newState.usageOverviewEnabled && oldState.viewMode === newState.viewMode;
 };
 
+const diffScrollTop = (oldState, newState) => {
+  return oldState.chatListScrollTop === newState.chatListScrollTop && oldState.messagesScrollTop === newState.messagesScrollTop;
+};
+
 const RenderItems = 4;
 const RenderFocus = 6;
 const RenderFocusContext = 7;
 const RenderValue = 8;
 const RenderCss = 10;
 const RenderIncremental = 11;
+const RenderScrollTop = 12;
 
 const diffValue = (oldState, newState) => {
   if (oldState.composerValue === newState.composerValue) {
@@ -1485,8 +1499,8 @@ const diffValue = (oldState, newState) => {
   return newState.inputSource !== 'script';
 };
 
-const modules = [isEqual, diffValue, diffFocus, isEqual$1, diffFocus];
-const numbers = [RenderIncremental, RenderValue, RenderFocus, RenderCss, RenderFocusContext];
+const modules = [isEqual, diffValue, diffFocus, isEqual$1, diffFocus, diffScrollTop];
+const numbers = [RenderIncremental, RenderValue, RenderFocus, RenderCss, RenderFocusContext, RenderScrollTop];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1519,6 +1533,7 @@ const FocusSelector = 'Viewlet.focusSelector';
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
+const SetProperty = 'Viewlet.setProperty';
 const SetValueByName = 'Viewlet.setValueByName';
 const SetPatches = 'Viewlet.setPatches';
 
@@ -2495,7 +2510,16 @@ const executeChatTool = async (name, rawArguments, options) => {
   });
 };
 
-const getOpenApiApiEndpoint = openApiApiBaseUrl => {
+const getClientRequestIdHeader = () => {
+  return {
+    'x-client-request-id': crypto.randomUUID()
+  };
+};
+
+const getOpenApiApiEndpoint = (openApiApiBaseUrl, stream) => {
+  if (stream) {
+    return `${openApiApiBaseUrl}/chat/completions?stream=true`;
+  }
   return `${openApiApiBaseUrl}/chat/completions`;
 };
 
@@ -2520,6 +2544,148 @@ const getTextContent = content => {
   return textParts.join('\n');
 };
 
+const getStreamChunkText = content => {
+  if (typeof content === 'string') {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return '';
+  }
+  return content.map(part => {
+    if (!part || typeof part !== 'object') {
+      return '';
+    }
+    const text = Reflect.get(part, 'text');
+    return typeof text === 'string' ? text : '';
+  }).join('');
+};
+const parseSseEvent = eventChunk => {
+  const lines = eventChunk.split('\n');
+  const dataLines = [];
+  for (const line of lines) {
+    if (!line.startsWith('data:')) {
+      continue;
+    }
+    dataLines.push(line.slice(5).trimStart());
+  }
+  return dataLines;
+};
+const parseOpenApiStream = async (response, onTextChunk) => {
+  if (!response.body) {
+    return {
+      details: 'request-failed',
+      type: 'error'
+    };
+  }
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let remainder = '';
+  let text = '';
+  let done = false;
+  while (!done) {
+    const {
+      done: streamDone,
+      value
+    } = await reader.read();
+    if (streamDone) {
+      done = true;
+    } else if (value) {
+      remainder += decoder.decode(value, {
+        stream: true
+      });
+    }
+    while (true) {
+      const separatorIndex = remainder.indexOf('\n\n');
+      if (separatorIndex === -1) {
+        break;
+      }
+      const rawEvent = remainder.slice(0, separatorIndex);
+      remainder = remainder.slice(separatorIndex + 2);
+      const dataLines = parseSseEvent(rawEvent);
+      if (dataLines.length === 0) {
+        continue;
+      }
+      for (const line of dataLines) {
+        if (line === '[DONE]') {
+          done = true;
+          break;
+        }
+        let parsed;
+        try {
+          parsed = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (!parsed || typeof parsed !== 'object') {
+          continue;
+        }
+        const choices = Reflect.get(parsed, 'choices');
+        if (!Array.isArray(choices)) {
+          continue;
+        }
+        const firstChoice = choices[0];
+        if (!firstChoice || typeof firstChoice !== 'object') {
+          continue;
+        }
+        const delta = Reflect.get(firstChoice, 'delta');
+        if (!delta || typeof delta !== 'object') {
+          continue;
+        }
+        const content = Reflect.get(delta, 'content');
+        const chunkText = getStreamChunkText(content);
+        if (!chunkText) {
+          continue;
+        }
+        text += chunkText;
+        if (onTextChunk) {
+          await onTextChunk(chunkText);
+        }
+      }
+    }
+  }
+  if (remainder) {
+    const dataLines = parseSseEvent(remainder);
+    for (const line of dataLines) {
+      if (line === '[DONE]') {
+        continue;
+      }
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!parsed || typeof parsed !== 'object') {
+        continue;
+      }
+      const choices = Reflect.get(parsed, 'choices');
+      if (!Array.isArray(choices)) {
+        continue;
+      }
+      const firstChoice = choices[0];
+      if (!firstChoice || typeof firstChoice !== 'object') {
+        continue;
+      }
+      const delta = Reflect.get(firstChoice, 'delta');
+      if (!delta || typeof delta !== 'object') {
+        continue;
+      }
+      const content = Reflect.get(delta, 'content');
+      const chunkText = getStreamChunkText(content);
+      if (!chunkText) {
+        continue;
+      }
+      text += chunkText;
+      if (onTextChunk) {
+        await onTextChunk(chunkText);
+      }
+    }
+  }
+  return {
+    text,
+    type: 'success'
+  };
+};
 const getOpenApiErrorDetails = async response => {
   let parsed;
   try {
@@ -2543,7 +2709,13 @@ const getOpenApiErrorDetails = async response => {
     errorType: typeof errorType === 'string' ? errorType : undefined
   };
 };
-const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApiApiBaseUrl, assetDir, platform) => {
+const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApiApiBaseUrl, assetDir, platform, options) => {
+  const {
+    onTextChunk,
+    stream
+  } = options ?? {
+    stream: false
+  };
   const completionMessages = messages.map(message => ({
     content: message.text,
     role: message.role
@@ -2553,16 +2725,20 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
   for (let i = 0; i <= maxToolIterations; i++) {
     let response;
     try {
-      response = await fetch(getOpenApiApiEndpoint(openApiApiBaseUrl), {
+      response = await fetch(getOpenApiApiEndpoint(openApiApiBaseUrl, stream), {
         body: JSON.stringify({
           messages: completionMessages,
           model: modelId,
+          ...(stream ? {
+            stream: true
+          } : {}),
           tool_choice: 'auto',
           tools
         }),
         headers: {
           Authorization: `Bearer ${openApiApiKey}`,
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...getClientRequestIdHeader()
         },
         method: 'POST'
       });
@@ -2587,6 +2763,9 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
         type: 'error'
       };
     }
+    if (stream) {
+      return parseOpenApiStream(response, onTextChunk);
+    }
     let parsed;
     try {
       parsed = await response.json();
@@ -2758,7 +2937,8 @@ const getOpenRouterLimitInfo = async (openRouterApiKey, openRouterApiBaseUrl) =>
   try {
     response = await fetch(getOpenRouterKeyEndpoint(openRouterApiBaseUrl), {
       headers: {
-        Authorization: `Bearer ${openRouterApiKey}`
+        Authorization: `Bearer ${openRouterApiKey}`,
+        ...getClientRequestIdHeader()
       },
       method: 'GET'
     });
@@ -2816,7 +2996,8 @@ const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, o
         }),
         headers: {
           Authorization: `Bearer ${openRouterApiKey}`,
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...getClientRequestIdHeader()
         },
         method: 'POST'
       });
@@ -2965,7 +3146,7 @@ const getOpenRouterErrorMessage = errorResult => {
   }
 };
 
-/* eslint-disable @cspell/spellchecker */
+// cspell:ignore openrouter
 const getOpenRouterModelId = selectedModelId => {
   const openRouterPrefix = 'openrouter/';
   if (selectedModelId.toLowerCase().startsWith(openRouterPrefix)) {
@@ -2984,7 +3165,7 @@ const isOpenApiModel = (selectedModelId, models) => {
   return normalizedModelId.startsWith('openapi/') || normalizedModelId.startsWith('openai/');
 };
 
-/* eslint-disable @cspell/spellchecker */
+// cspell:ignore openrouter
 
 const isOpenRouterModel = (selectedModelId, models) => {
   const selectedModel = models.find(model => model.id === selectedModelId);
@@ -3001,12 +3182,14 @@ const getAiResponse = async ({
   mockApiCommandId,
   models,
   nextMessageId,
+  onTextChunk,
   openApiApiBaseUrl,
   openApiApiKey,
   openRouterApiBaseUrl,
   openRouterApiKey,
   platform,
   selectedModelId,
+  streamingEnabled = false,
   useMockApi,
   userText
 }) => {
@@ -3015,7 +3198,10 @@ const getAiResponse = async ({
   const usesOpenRouterModel = isOpenRouterModel(selectedModelId, models);
   if (usesOpenApiModel) {
     if (openApiApiKey) {
-      const result = await getOpenApiAssistantText(messages, getOpenApiModelId(selectedModelId), openApiApiKey, openApiApiBaseUrl, assetDir, platform);
+      const result = await getOpenApiAssistantText(messages, getOpenApiModelId(selectedModelId), openApiApiKey, openApiApiBaseUrl, assetDir, platform, {
+        onTextChunk,
+        stream: streamingEnabled
+      });
       if (result.type === 'success') {
         const {
           text: assistantText
@@ -3233,6 +3419,37 @@ const focusInput = state => {
   };
 };
 
+const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
+  return sessions.map(session => {
+    if (session.id !== selectedSessionId) {
+      return session;
+    }
+    return {
+      ...session,
+      messages: [...session.messages, message]
+    };
+  });
+};
+const updateMessageTextInSelectedSession = (sessions, selectedSessionId, messageId, text, inProgress) => {
+  return sessions.map(session => {
+    if (session.id !== selectedSessionId) {
+      return session;
+    }
+    return {
+      ...session,
+      messages: session.messages.map(message => {
+        if (message.id !== messageId) {
+          return message;
+        }
+        return {
+          ...message,
+          inProgress,
+          text
+        };
+      })
+    };
+  });
+};
 const handleSubmit = async state => {
   const {
     assetDir,
@@ -3248,6 +3465,7 @@ const handleSubmit = async state => {
     selectedModelId,
     selectedSessionId,
     sessions,
+    streamingEnabled,
     useMockApi,
     viewMode
   } = state;
@@ -3265,6 +3483,18 @@ const handleSubmit = async state => {
     text: userText,
     time: userTime
   };
+  const assistantMessageId = `message-${nextMessageId + 1}`;
+  const assistantTime = new Date().toLocaleTimeString([], {
+    hour: '2-digit',
+    minute: '2-digit'
+  });
+  const inProgressAssistantMessage = {
+    id: assistantMessageId,
+    inProgress: true,
+    role: 'assistant',
+    text: '',
+    time: assistantTime
+  };
   let workingSessions = sessions;
   if (viewMode === 'detail') {
     const loadedSession = await getChatSession(selectedSessionId);
@@ -3282,7 +3512,7 @@ const handleSubmit = async state => {
     const newSessionId = generateSessionId();
     const newSession = {
       id: newSessionId,
-      messages: [userMessage],
+      messages: streamingEnabled ? [userMessage, inProgressAssistantMessage] : [userMessage],
       title: `Chat ${workingSessions.length + 1}`
     };
     await saveChatSession(newSession);
@@ -3298,15 +3528,8 @@ const handleSubmit = async state => {
       viewMode: 'detail'
     });
   } else {
-    const updatedSessions = workingSessions.map(session => {
-      if (session.id !== selectedSessionId) {
-        return session;
-      }
-      return {
-        ...session,
-        messages: [...session.messages, userMessage]
-      };
-    });
+    const updatedWithUser = appendMessageToSelectedSession(workingSessions, selectedSessionId, userMessage);
+    const updatedSessions = streamingEnabled ? appendMessageToSelectedSession(updatedWithUser, selectedSessionId, inProgressAssistantMessage) : updatedWithUser;
     const selectedSession = updatedSessions.find(session => session.id === selectedSessionId);
     if (selectedSession) {
       await saveChatSession(selectedSession);
@@ -3324,39 +3547,56 @@ const handleSubmit = async state => {
   set(state.uid, state, optimisticState);
   // @ts-ignore
   await invoke('Chat.rerender');
-  const selectedOptimisticSession = optimisticState.sessions.find(session => session.id === optimisticState.selectedSessionId);
-  const messages = selectedOptimisticSession?.messages ?? [];
+  let latestState = optimisticState;
+  let previousState = optimisticState;
+  const selectedOptimisticSession = latestState.sessions.find(session => session.id === latestState.selectedSessionId);
+  const messages = (selectedOptimisticSession?.messages ?? []).filter(message => !message.inProgress);
+  const onTextChunk = streamingEnabled ? async chunk => {
+    const selectedSession = latestState.sessions.find(session => session.id === latestState.selectedSessionId);
+    if (!selectedSession) {
+      return;
+    }
+    const assistantMessage = selectedSession.messages.find(message => message.id === assistantMessageId);
+    if (!assistantMessage) {
+      return;
+    }
+    const updatedText = assistantMessage.text + chunk;
+    const updatedSessions = updateMessageTextInSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessageId, updatedText, true);
+    const nextState = {
+      ...latestState,
+      sessions: updatedSessions
+    };
+    set(state.uid, previousState, nextState);
+    previousState = nextState;
+    latestState = nextState;
+    // @ts-ignore
+    await invoke('Chat.rerender');
+  } : undefined;
   const assistantMessage = await getAiResponse({
     assetDir,
     messages,
     mockApiCommandId,
     models,
     nextMessageId: optimisticState.nextMessageId,
+    onTextChunk,
     openApiApiBaseUrl,
     openApiApiKey,
     openRouterApiBaseUrl,
     openRouterApiKey,
     platform,
     selectedModelId,
+    streamingEnabled,
     useMockApi,
     userText
   });
-  const updatedSessions = optimisticState.sessions.map(session => {
-    if (session.id !== optimisticState.selectedSessionId) {
-      return session;
-    }
-    return {
-      ...session,
-      messages: [...session.messages, assistantMessage]
-    };
-  });
-  const selectedSession = updatedSessions.find(session => session.id === optimisticState.selectedSessionId);
+  const updatedSessions = streamingEnabled ? updateMessageTextInSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessageId, assistantMessage.text, false) : appendMessageToSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessage);
+  const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
   if (selectedSession) {
     await saveChatSession(selectedSession);
   }
   return focusInput({
-    ...optimisticState,
-    nextMessageId: optimisticState.nextMessageId + 1,
+    ...latestState,
+    nextMessageId: latestState.nextMessageId + 1,
     sessions: updatedSessions
   });
 };
@@ -3405,7 +3645,7 @@ const OpenApiApiKeyInput = 'open-api-api-key';
 const SaveOpenApiApiKey = 'save-openapi-api-key';
 const OpenOpenApiApiKeySettings = 'open-openapi-api-key-settings';
 
-/* eslint-disable @cspell/spellchecker */
+// cspell:ignore openrouter
 const OpenRouterApiKeyInput = 'open-router-api-key';
 const SaveOpenRouterApiKey = 'save-openrouter-api-key';
 const OpenOpenRouterApiKeySettings = 'open-openrouter-api-key-settings';
@@ -3652,7 +3892,29 @@ const handleModelChange = async (state, value) => {
 };
 
 const handleNewline = async state => {
-  return handleInput(state, Composer, `${state.composerValue}\n`);
+  const {
+    composerValue
+  } = state;
+  return handleInput(state, Composer, `${composerValue}\n`);
+};
+
+const handleChatListScroll = async (state, chatListScrollTop) => {
+  if (state.chatListScrollTop === chatListScrollTop) {
+    return state;
+  }
+  return {
+    ...state,
+    chatListScrollTop
+  };
+};
+const handleMessagesScroll = async (state, messagesScrollTop) => {
+  if (state.messagesScrollTop === messagesScrollTop) {
+    return state;
+  }
+  return {
+    ...state,
+    messagesScrollTop
+  };
 };
 
 const id = 7201;
@@ -3681,6 +3943,32 @@ const isObject = value => {
   return typeof value === 'object' && value !== null;
 };
 
+const getSavedChatListScrollTop = savedState => {
+  if (!isObject(savedState)) {
+    return undefined;
+  }
+  const {
+    chatListScrollTop
+  } = savedState;
+  if (typeof chatListScrollTop !== 'number') {
+    return undefined;
+  }
+  return chatListScrollTop;
+};
+
+const getSavedMessagesScrollTop = savedState => {
+  if (!isObject(savedState)) {
+    return undefined;
+  }
+  const {
+    messagesScrollTop
+  } = savedState;
+  if (typeof messagesScrollTop !== 'number') {
+    return undefined;
+  }
+  return messagesScrollTop;
+};
+
 const getSavedSelectedModelId = savedState => {
   if (!isObject(savedState)) {
     return undefined;
@@ -3733,6 +4021,39 @@ const getSavedViewMode = savedState => {
   return viewMode;
 };
 
+const loadOpenApiApiKey = async () => {
+  try {
+    const savedOpenApiKey = await get('secrets.openApiKey');
+    if (typeof savedOpenApiKey === 'string' && savedOpenApiKey) {
+      return savedOpenApiKey;
+    }
+    const legacySavedOpenApiApiKey = await get('secrets.openApiApiKey');
+    if (typeof legacySavedOpenApiApiKey === 'string' && legacySavedOpenApiApiKey) {
+      return legacySavedOpenApiApiKey;
+    }
+    const legacySavedOpenAiApiKey = await get('secrets.openAiApiKey');
+    return typeof legacySavedOpenAiApiKey === 'string' ? legacySavedOpenAiApiKey : '';
+  } catch {
+    return '';
+  }
+};
+const loadOpenRouterApiKey = async () => {
+  try {
+    const savedOpenRouterApiKey = await get('secrets.openRouterApiKey');
+    return typeof savedOpenRouterApiKey === 'string' ? savedOpenRouterApiKey : '';
+  } catch {
+    return '';
+  }
+};
+const loadPreferences = async () => {
+  const openApiApiKey = await loadOpenApiApiKey();
+  const openRouterApiKey = await loadOpenRouterApiKey();
+  return {
+    openApiApiKey,
+    openRouterApiKey
+  };
+};
+
 const toSummarySession = session => {
   return {
     id: session.id,
@@ -3758,30 +4079,10 @@ const loadSelectedSessionMessages = async (sessions, selectedSessionId) => {
 const loadContent = async (state, savedState) => {
   const savedSelectedModelId = getSavedSelectedModelId(savedState);
   const savedViewMode = getSavedViewMode(savedState);
-  let openApiApiKey = '';
-  try {
-    const savedOpenApiKey = await get('secrets.openApiKey');
-    if (typeof savedOpenApiKey === 'string' && savedOpenApiKey) {
-      openApiApiKey = savedOpenApiKey;
-    } else {
-      const legacySavedOpenApiApiKey = await get('secrets.openApiApiKey');
-      if (typeof legacySavedOpenApiApiKey === 'string' && legacySavedOpenApiApiKey) {
-        openApiApiKey = legacySavedOpenApiApiKey;
-      } else {
-        const legacySavedOpenAiApiKey = await get('secrets.openAiApiKey');
-        openApiApiKey = typeof legacySavedOpenAiApiKey === 'string' ? legacySavedOpenAiApiKey : '';
-      }
-    }
-  } catch {
-    openApiApiKey = '';
-  }
-  let openRouterApiKey = '';
-  try {
-    const savedOpenRouterApiKey = await get('secrets.openRouterApiKey');
-    openRouterApiKey = typeof savedOpenRouterApiKey === 'string' ? savedOpenRouterApiKey : '';
-  } catch {
-    openRouterApiKey = '';
-  }
+  const {
+    openApiApiKey,
+    openRouterApiKey
+  } = await loadPreferences();
   const legacySavedSessions = getSavedSessions(savedState);
   const storedSessions = await listChatSessions();
   let sessions = storedSessions;
@@ -3799,6 +4100,8 @@ const loadContent = async (state, savedState) => {
   }
   const preferredSessionId = getSavedSelectedSessionId(savedState) || state.selectedSessionId;
   const preferredModelId = savedSelectedModelId || state.selectedModelId;
+  const chatListScrollTop = getSavedChatListScrollTop(savedState) ?? state.chatListScrollTop;
+  const messagesScrollTop = getSavedMessagesScrollTop(savedState) ?? state.messagesScrollTop;
   const selectedModelId = state.models.some(model => model.id === preferredModelId) ? preferredModelId : state.models[0]?.id || '';
   const selectedSessionId = sessions.some(session => session.id === preferredSessionId) ? preferredSessionId : sessions[0]?.id || '';
   sessions = await loadSelectedSessionMessages(sessions, selectedSessionId);
@@ -3806,7 +4109,9 @@ const loadContent = async (state, savedState) => {
   const viewMode = sessions.length === 0 || !selectedSessionId ? 'list' : preferredViewMode === 'detail' ? 'detail' : 'list';
   return {
     ...state,
+    chatListScrollTop,
     initial: false,
+    messagesScrollTop,
     openApiApiKey,
     openApiApiKeyInput: openApiApiKey,
     openRouterApiKey,
@@ -3852,12 +4157,22 @@ const openMockSession = async (state, mockSessionId, mockChatMessages) => {
   };
 };
 
+const getCss = composerHeight => {
+  return `:root {
+  --ChatInputBoxHeight: ${composerHeight}px;
+}`;
+};
+
 // TODO render things like scrollbar height,scrollbar offset, textarea height,
 // list height
-const css = `
-`;
+
 const renderCss = (oldState, newState) => {
-  return [SetCss, newState.uid, css];
+  const {
+    composerHeight,
+    uid
+  } = newState;
+  const css = getCss(composerHeight);
+  return [SetCss, uid, css];
 };
 
 const getFocusSelector = focus => {
@@ -3933,6 +4248,8 @@ const HandleClickList = 17;
 const HandleClickDelete = 18;
 const HandleSubmit = 19;
 const HandleModelChange = 20;
+const HandleChatListScroll = 21;
+const HandleMessagesScroll = 22;
 
 const getModelLabel = model => {
   if (model.provider === 'openRouter') {
@@ -4029,7 +4346,7 @@ const getChatSendAreaDom = (composerValue, models, selectedModelId, usageOvervie
     onFocus: HandleFocus,
     onInput: HandleInput,
     placeholder: composePlaceholder(),
-    style: `height:${composerHeight}px;font-size:${composerFontSize}px;font-family:${composerFontFamily};line-height:${composerLineHeight}px;`,
+    // style: `height:${composerHeight}px;font-size:${composerFontSize}px;font-family:${composerFontFamily};line-height:${composerLineHeight}px;`,
     type: TextArea,
     value: composerValue
   }, {
@@ -4240,18 +4557,20 @@ const getEmptyMessagesDom = () => {
   }, text(startConversation())];
 };
 
-const getMessagesDom = (messages, openRouterApiKeyInput, openApiApiKeyInput = '', openRouterApiKeyState = 'idle') => {
+const getMessagesDom = (messages, openRouterApiKeyInput, openApiApiKeyInput = '', openRouterApiKeyState = 'idle', messagesScrollTop = 0) => {
   if (messages.length === 0) {
     return getEmptyMessagesDom();
   }
   return [{
     childCount: messages.length,
     className: 'ChatMessages',
+    onScroll: HandleMessagesScroll,
+    scrollTop: messagesScrollTop,
     type: Div
   }, ...messages.flatMap(message => getChatMessageDom(message, openRouterApiKeyInput, openApiApiKeyInput, openRouterApiKeyState))];
 };
 
-const getChatModeDetailVirtualDom = (sessions, selectedSessionId, composerValue, openRouterApiKeyInput, openApiApiKeyInput, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openRouterApiKeyState = 'idle', composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20) => {
+const getChatModeDetailVirtualDom = (sessions, selectedSessionId, composerValue, openRouterApiKeyInput, openApiApiKeyInput, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openRouterApiKeyState = 'idle', composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20, messagesScrollTop = 0) => {
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
   const selectedSessionTitle = selectedSession?.title || chatTitle();
   const messages = selectedSession ? selectedSession.messages : [];
@@ -4259,7 +4578,7 @@ const getChatModeDetailVirtualDom = (sessions, selectedSessionId, composerValue,
     childCount: 3,
     className: mergeClassNames(Viewlet, Chat),
     type: Div
-  }, ...getChatHeaderDomDetailMode(selectedSessionTitle), ...getMessagesDom(messages, openRouterApiKeyInput, openApiApiKeyInput, openRouterApiKeyState), ...getChatSendAreaDom(composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight)];
+  }, ...getChatHeaderDomDetailMode(selectedSessionTitle), ...getMessagesDom(messages, openRouterApiKeyInput, openApiApiKeyInput, openRouterApiKeyState, messagesScrollTop), ...getChatSendAreaDom(composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight)];
 };
 
 const getChatHeaderListModeDom = () => {
@@ -4316,7 +4635,7 @@ const getSessionDom = session => {
   }, text('🗑')];
 };
 
-const getChatListDom = (sessions, selectedSessionId) => {
+const getChatListDom = (sessions, selectedSessionId, chatListScrollTop = 0) => {
   if (sessions.length === 0) {
     return getEmptyChatSessionsDom();
   }
@@ -4324,16 +4643,18 @@ const getChatListDom = (sessions, selectedSessionId) => {
     childCount: sessions.length,
     className: ChatList,
     onClick: HandleClickList,
+    onScroll: HandleChatListScroll,
+    scrollTop: chatListScrollTop,
     type: Div
   }, ...sessions.flatMap(getSessionDom)];
 };
 
-const getChatModeListVirtualDom = (sessions, selectedSessionId, composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20) => {
+const getChatModeListVirtualDom = (sessions, selectedSessionId, composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20, chatListScrollTop = 0) => {
   return [{
     childCount: 3,
     className: mergeClassNames(Viewlet, Chat),
     type: Div
-  }, ...getChatHeaderListModeDom(), ...getChatListDom(sessions), ...getChatSendAreaDom(composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight)];
+  }, ...getChatHeaderListModeDom(), ...getChatListDom(sessions, selectedSessionId, chatListScrollTop), ...getChatSendAreaDom(composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight)];
 };
 
 const getChatModeUnsupportedVirtualDom = () => {
@@ -4343,12 +4664,12 @@ const getChatModeUnsupportedVirtualDom = () => {
   }, text(unknownViewMode())];
 };
 
-const getChatVirtualDom = (sessions, selectedSessionId, composerValue, openRouterApiKeyInput, viewMode, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openApiApiKeyInput = '', openRouterApiKeyState = 'idle', composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20) => {
+const getChatVirtualDom = (sessions, selectedSessionId, composerValue, openRouterApiKeyInput, viewMode, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openApiApiKeyInput = '', openRouterApiKeyState = 'idle', composerHeight = 28, composerFontSize = 13, composerFontFamily = 'system-ui', composerLineHeight = 20, chatListScrollTop = 0, messagesScrollTop = 0) => {
   switch (viewMode) {
     case 'detail':
-      return getChatModeDetailVirtualDom(sessions, selectedSessionId, composerValue, openRouterApiKeyInput, openApiApiKeyInput, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openRouterApiKeyState, composerHeight, composerFontSize, composerFontFamily, composerLineHeight);
+      return getChatModeDetailVirtualDom(sessions, selectedSessionId, composerValue, openRouterApiKeyInput, openApiApiKeyInput, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openRouterApiKeyState, composerHeight, composerFontSize, composerFontFamily, composerLineHeight, messagesScrollTop);
     case 'list':
-      return getChatModeListVirtualDom(sessions, selectedSessionId, composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight);
+      return getChatModeListVirtualDom(sessions, selectedSessionId, composerValue, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, composerHeight, composerFontSize, composerFontFamily, composerLineHeight, chatListScrollTop);
     default:
       return getChatModeUnsupportedVirtualDom();
   }
@@ -4356,12 +4677,14 @@ const getChatVirtualDom = (sessions, selectedSessionId, composerValue, openRoute
 
 const renderItems = (oldState, newState) => {
   const {
+    chatListScrollTop,
     composerFontFamily,
     composerFontSize,
     composerHeight,
     composerLineHeight,
     composerValue,
     initial,
+    messagesScrollTop,
     models,
     openApiApiKeyInput,
     openRouterApiKeyInput,
@@ -4378,7 +4701,7 @@ const renderItems = (oldState, newState) => {
   if (initial) {
     return [SetDom2, uid, []];
   }
-  const dom = getChatVirtualDom(sessions, selectedSessionId, composerValue, openRouterApiKeyInput, viewMode, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openApiApiKeyInput, openRouterApiKeyState, composerHeight, composerFontSize, composerFontFamily, composerLineHeight);
+  const dom = getChatVirtualDom(sessions, selectedSessionId, composerValue, openRouterApiKeyInput, viewMode, models, selectedModelId, usageOverviewEnabled, tokensUsed, tokensMax, openApiApiKeyInput, openRouterApiKeyState, composerHeight, composerFontSize, composerFontFamily, composerLineHeight, chatListScrollTop, messagesScrollTop);
   return [SetDom2, uid, dom];
 };
 
@@ -4389,6 +4712,14 @@ const renderIncremental = (oldState, newState) => {
   return [SetPatches, newState.uid, patches];
 };
 
+const renderScrollTop = (oldState, newState) => {
+  const {
+    messagesScrollTop,
+    uid
+  } = newState;
+  return [SetProperty, uid, '.ChatMessages', 'scrollTop', messagesScrollTop];
+};
+
 const renderValue = (oldState, newState) => {
   const {
     composerValue
@@ -4408,6 +4739,8 @@ const getRenderer = diffType => {
       return renderIncremental;
     case RenderItems:
       return renderItems;
+    case RenderScrollTop:
+      return renderScrollTop;
     case RenderValue:
       return renderValue;
     default:
@@ -4469,6 +4802,12 @@ const renderEventListeners = () => {
   }, {
     name: HandleModelChange,
     params: ['handleModelChange', TargetValue]
+  }, {
+    name: HandleChatListScroll,
+    params: ['handleChatListScroll', 'event.target.scrollTop']
+  }, {
+    name: HandleMessagesScroll,
+    params: ['handleMessagesScroll', 'event.target.scrollTop']
   }, {
     name: HandleFocus,
     params: ['handleInputFocus', TargetName]
@@ -4507,8 +4846,10 @@ const resize = (state, dimensions) => {
 
 const saveState = state => {
   const {
+    chatListScrollTop,
     composerValue,
     height,
+    messagesScrollTop,
     nextMessageId,
     renamingSessionId,
     selectedModelId,
@@ -4519,8 +4860,10 @@ const saveState = state => {
     y
   } = state;
   return {
+    chatListScrollTop,
     composerValue,
     height,
+    messagesScrollTop,
     nextMessageId,
     renamingSessionId,
     selectedModelId,
@@ -4578,6 +4921,7 @@ const commandMap = {
   'Chat.getKeyBindings': getKeyBindings,
   'Chat.getSelectedSessionId': wrapGetter(getSelectedSessionId),
   'Chat.handleChatListContextMenu': handleChatListContextMenu,
+  'Chat.handleChatListScroll': wrapCommand(handleChatListScroll),
   'Chat.handleClick': wrapCommand(handleClick),
   'Chat.handleClickBack': wrapCommand(handleClickBack),
   'Chat.handleClickClose': handleClickClose,
@@ -4588,6 +4932,7 @@ const commandMap = {
   'Chat.handleInput': wrapCommand(handleInput),
   'Chat.handleInputFocus': wrapCommand(handleInputFocus),
   'Chat.handleKeyDown': wrapCommand(handleKeyDown),
+  'Chat.handleMessagesScroll': wrapCommand(handleMessagesScroll),
   'Chat.handleModelChange': wrapCommand(handleModelChange),
   'Chat.handleSubmit': wrapCommand(handleSubmit),
   'Chat.initialize': initialize,