@lvce-editor/static-server 0.79.1 → 0.79.3

package/static/{8ffab12 → 62bf877}/packages/chat-view/dist/chatViewWorkerMain.js

@@ -1699,14 +1699,16 @@ const chatListFocusFirst = async state => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   return {
     ...state,
     focus: 'list',
     focused: true,
-    listFocusedIndex: 0
+    listFocusedIndex: 0,
+    listFocusOutline: false
   };
 };
 
@@ -1717,14 +1719,16 @@ const chatListFocusLast = async state => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   return {
     ...state,
     focus: 'list',
     focused: true,
-    listFocusedIndex: visibleSessions.length - 1
+    listFocusedIndex: visibleSessions.length - 1,
+    listFocusOutline: false
   };
 };
 
@@ -1746,7 +1750,8 @@ const chatListFocusNext = async state => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   const currentIndex = getListFocusIndex(state);
@@ -1755,7 +1760,8 @@ const chatListFocusNext = async state => {
     ...state,
     focus: 'list',
     focused: true,
-    listFocusedIndex: nextIndex
+    listFocusedIndex: nextIndex,
+    listFocusOutline: false
   };
 };
 
@@ -1766,7 +1772,8 @@ const chatListFocusPrevious = async state => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   const currentIndex = getListFocusIndex(state);
@@ -1775,7 +1782,8 @@ const chatListFocusPrevious = async state => {
     ...state,
     focus: 'list',
     focused: true,
-    listFocusedIndex: previousIndex
+    listFocusedIndex: previousIndex,
+    listFocusOutline: false
   };
 };
 
@@ -1913,6 +1921,7 @@ const Commit = 'Commit';
 const OpenTerminal = 'Open Terminal';
 const ShowDiff = 'Show Diff';
 const CreatePullRequest$2 = 'Create PR';
+const Implement = 'Implement';
 const Stop$1 = 'stop';
 const Save = 'Save';
 const Saving = 'Saving...';
@@ -2061,6 +2070,9 @@ const showDiff = () => {
 const createPullRequest = () => {
   return i18nString(CreatePullRequest$2);
 };
+const implement = () => {
+  return i18nString(Implement);
+};
 const stop = () => {
   return i18nString(Stop$1);
 };
@@ -2422,7 +2434,8 @@ const createDefaultState = () => {
     lastNormalViewMode: 'list',
     lastSubmittedSessionId: '',
     listFocusedIndex: -1,
-    listItemHeight: 40,
+    listFocusOutline: false,
+    listItemHeight: 54,
     maxComposerRows: 5,
     maxToolCalls: defaultMaxToolCalls,
     messagesAutoScrollEnabled: true,
@@ -2473,6 +2486,7 @@ const createDefaultState = () => {
     searchEnabled: false,
     searchFieldVisible: false,
     searchValue: '',
+    selectChevronEnabled: true,
     selectedModelId: defaultModelId,
     selectedProjectId: defaultProjectId,
     selectedSessionId: defaultSessionId,
@@ -2483,6 +2497,7 @@ const createDefaultState = () => {
       status: 'idle',
       title: defaultSessionTitle()
     }],
+    showChatListTime: true,
     showRunMode: true,
     streamingEnabled: true,
     systemPrompt: getDefaultSystemPrompt(),
@@ -2544,14 +2559,25 @@ const cutInput = async state => {
   return clearInput(state);
 };
 
+const getSessionLastActiveTime = session => {
+  if (session.lastActiveTime) {
+    return session.lastActiveTime;
+  }
+  return session.messages.at(-1)?.time;
+};
+
 const listChatSessions = async () => {
   const sessions = await invoke$5('ChatStorage.listSessions');
   return sessions.map(session => {
+    const lastActiveTime = getSessionLastActiveTime(session);
     const summary = {
       ...(session.branchName ? {
         branchName: session.branchName
       } : {}),
       id: session.id,
+      ...(lastActiveTime ? {
+        lastActiveTime
+      } : {}),
       messages: [],
       ...(session.pullRequestUrl ? {
         pullRequestUrl: session.pullRequestUrl
@@ -2578,11 +2604,15 @@ const getChatSession = async id => {
   if (!session) {
     return undefined;
   }
+  const lastActiveTime = getSessionLastActiveTime(session);
   const resultBase = {
     ...(session.branchName ? {
       branchName: session.branchName
     } : {}),
     id: session.id,
+    ...(lastActiveTime ? {
+      lastActiveTime
+    } : {}),
     messages: [...session.messages],
     ...(session.pullRequestUrl ? {
       pullRequestUrl: session.pullRequestUrl
@@ -2602,11 +2632,15 @@ const getChatSession = async id => {
   return result;
 };
 const saveChatSession = async session => {
+  const lastActiveTime = getSessionLastActiveTime(session);
   const value = {
     ...(session.branchName ? {
       branchName: session.branchName
     } : {}),
     id: session.id,
+    ...(lastActiveTime ? {
+      lastActiveTime
+    } : {}),
     messages: [...session.messages],
     ...(session.pullRequestUrl ? {
       pullRequestUrl: session.pullRequestUrl
@@ -2960,7 +2994,7 @@ const isEqualVisibleModels = (a, b) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.addContextButtonEnabled === newState.addContextButtonEnabled && oldState.agentMode === newState.agentMode && oldState.agentModePickerOpen === newState.agentModePickerOpen && oldState.authEnabled === newState.authEnabled && oldState.authErrorMessage === newState.authErrorMessage && isEqualComposerAttachments(oldState.composerAttachments, newState.composerAttachments) && oldState.composerDropActive === newState.composerDropActive && oldState.composerDropEnabled === newState.composerDropEnabled && oldState.composerValue === newState.composerValue && oldState.gitBranchPickerErrorMessage === newState.gitBranchPickerErrorMessage && oldState.gitBranchPickerOpen === newState.gitBranchPickerOpen && oldState.gitBranchPickerVisible === newState.gitBranchPickerVisible && isEqualGitBranches(oldState.gitBranches, newState.gitBranches) && oldState.hasSpaceForAgentModePicker === newState.hasSpaceForAgentModePicker && oldState.hasSpaceForRunModePicker === newState.hasSpaceForRunModePicker && oldState.initial === newState.initial && oldState.modelPickerOpen === newState.modelPickerOpen && oldState.modelPickerSearchValue === newState.modelPickerSearchValue && isEqualVisibleModels(oldState.visibleModels, newState.visibleModels) && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.openApiApiKeyInput === newState.openApiApiKeyInput && oldState.openRouterApiKeyInput === newState.openRouterApiKeyInput && isEqualProjectExpandedIds(oldState.projectExpandedIds, newState.projectExpandedIds) && isEqualProjects(oldState.projects, newState.projects) && oldState.reasoningEffort === newState.reasoningEffort && oldState.reasoningEffortPickerOpen === newState.reasoningEffortPickerOpen && oldState.reasoningPickerEnabled === newState.reasoningPickerEnabled && oldState.renamingSessionId === newState.renamingSessionId && oldState.selectedModelId === newState.selectedModelId && oldState.selectedProjectId === newState.selectedProjectId && oldState.selectedSessionId === newState.selectedSessionId && oldState.searchEnabled === newState.searchEnabled && oldState.searchFieldVisible === newState.searchFieldVisible && oldState.searchValue === newState.searchValue && oldState.showRunMode === newState.showRunMode && oldState.runMode === newState.runMode && oldState.runModePickerOpen === newState.runModePickerOpen && oldState.sessions === newState.sessions && oldState.tokensMax === newState.tokensMax && oldState.tokensUsed === newState.tokensUsed && oldState.usageOverviewEnabled === newState.usageOverviewEnabled && oldState.useChatMathWorker === newState.useChatMathWorker && oldState.userName === newState.userName && oldState.userState === newState.userState && oldState.viewMode === newState.viewMode && oldState.voiceDictationEnabled === newState.voiceDictationEnabled;
+  return oldState.addContextButtonEnabled === newState.addContextButtonEnabled && oldState.agentMode === newState.agentMode && oldState.agentModePickerOpen === newState.agentModePickerOpen && oldState.authEnabled === newState.authEnabled && oldState.authErrorMessage === newState.authErrorMessage && isEqualComposerAttachments(oldState.composerAttachments, newState.composerAttachments) && oldState.composerDropActive === newState.composerDropActive && oldState.composerDropEnabled === newState.composerDropEnabled && oldState.composerValue === newState.composerValue && oldState.gitBranchPickerErrorMessage === newState.gitBranchPickerErrorMessage && oldState.gitBranchPickerOpen === newState.gitBranchPickerOpen && oldState.gitBranchPickerVisible === newState.gitBranchPickerVisible && isEqualGitBranches(oldState.gitBranches, newState.gitBranches) && oldState.hasSpaceForAgentModePicker === newState.hasSpaceForAgentModePicker && oldState.hasSpaceForRunModePicker === newState.hasSpaceForRunModePicker && oldState.initial === newState.initial && oldState.listFocusOutline === newState.listFocusOutline && oldState.modelPickerOpen === newState.modelPickerOpen && oldState.modelPickerSearchValue === newState.modelPickerSearchValue && isEqualVisibleModels(oldState.visibleModels, newState.visibleModels) && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.openApiApiKeyInput === newState.openApiApiKeyInput && oldState.openRouterApiKeyInput === newState.openRouterApiKeyInput && isEqualProjectExpandedIds(oldState.projectExpandedIds, newState.projectExpandedIds) && isEqualProjects(oldState.projects, newState.projects) && oldState.reasoningEffort === newState.reasoningEffort && oldState.reasoningEffortPickerOpen === newState.reasoningEffortPickerOpen && oldState.reasoningPickerEnabled === newState.reasoningPickerEnabled && oldState.renamingSessionId === newState.renamingSessionId && oldState.selectedModelId === newState.selectedModelId && oldState.selectedProjectId === newState.selectedProjectId && oldState.selectedSessionId === newState.selectedSessionId && oldState.searchEnabled === newState.searchEnabled && oldState.searchFieldVisible === newState.searchFieldVisible && oldState.searchValue === newState.searchValue && oldState.showChatListTime === newState.showChatListTime && oldState.showRunMode === newState.showRunMode && oldState.runMode === newState.runMode && oldState.runModePickerOpen === newState.runModePickerOpen && oldState.sessions === newState.sessions && oldState.selectChevronEnabled === newState.selectChevronEnabled && oldState.tokensMax === newState.tokensMax && oldState.tokensUsed === newState.tokensUsed && oldState.usageOverviewEnabled === newState.usageOverviewEnabled && oldState.useChatMathWorker === newState.useChatMathWorker && oldState.userName === newState.userName && oldState.userState === newState.userState && oldState.viewMode === newState.viewMode && oldState.voiceDictationEnabled === newState.voiceDictationEnabled;
 };
 
 const diffScrollTop = (oldState, newState) => {
@@ -3491,6 +3525,7 @@ const ComposerAttachmentPreviewOverlay = 'composer-attachment-preview-overlay';
 const AddContext = 'add-context';
 const Dictate = 'dictate';
 const CreatePullRequest$1 = 'create-pull-request';
+const ImplementPlan = 'implement-plan';
 const GitBranchPickerToggle = 'git-branch-picker-toggle';
 const GitBranchPickerItemPrefix = 'git-branch-picker-item:';
 const FocusAddAction = 'focus-add-action';
@@ -3790,7 +3825,8 @@ const handleChatListContextMenu = async (state, eventX, eventY) => {
     ...state,
     focus: 'list',
     focused: true,
-    listFocusedIndex: index
+    listFocusedIndex: index,
+    listFocusOutline: true
   };
 };
 
@@ -3799,7 +3835,8 @@ const focusInput = state => {
     ...state,
     focus: 'composer',
     focused: true,
-    listFocusedIndex: -1
+    listFocusedIndex: -1,
+    listFocusOutline: false
   };
 };
 
@@ -4366,6 +4403,45 @@ const handleClickCreatePullRequest = async state => {
   };
 };
 
+const getImplementationPrompt = planText => {
+  return `Execute this implementation plan in the current workspace. Inspect files as needed, make the required changes, and then summarize the result.
+
+Plan:
+${planText}`;
+};
+
+const hasFailedToolCall = message => {
+  return (message.toolCalls || []).some(toolCall => toolCall.status === 'error' || toolCall.status === 'not-found');
+};
+const isExecutablePlanMessage = message => {
+  return message.role === 'assistant' && message.agentMode === 'plan' && !message.inProgress && message.text.trim() !== '' && !hasFailedToolCall(message);
+};
+const getLatestExecutablePlanMessage = session => {
+  if (!session) {
+    return undefined;
+  }
+  for (let index = session.messages.length - 1; index >= 0; index--) {
+    const message = session.messages[index];
+    if (message.role !== 'assistant') {
+      continue;
+    }
+    return isExecutablePlanMessage(message) ? message : undefined;
+  }
+  return undefined;
+};
+
+const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
+  return sessions.map(session => {
+    if (session.id !== selectedSessionId) {
+      return session;
+    }
+    return {
+      ...session,
+      messages: [...session.messages, message]
+    };
+  });
+};
+
 const trailingSlashesRegex$3 = /\/+$/;
 const trimTrailingSlashes = value => {
   return value.replace(trailingSlashesRegex$3, '');
@@ -4636,166 +4712,62 @@ const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, timeout
   return getLoggedOutBackendAuthState('Timed out waiting for backend login.');
 };
 
-const PlatformTypeElectron = 2;
-const isLoginResponse = value => {
-  if (!value || typeof value !== 'object') {
-    return false;
-  }
-  return true;
-};
-const getLoggedInState = (state, response) => {
-  const {
-    userName,
-    userSubscriptionPlan,
-    userUsedTokens
-  } = state;
-  const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
-  return {
-    ...state,
-    authAccessToken: accessToken,
-    authErrorMessage: '',
-    userName: typeof response.userName === 'string' ? response.userName : userName,
-    userState: accessToken ? 'loggedIn' : 'loggedOut',
-    userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : userSubscriptionPlan,
-    userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : userUsedTokens
-  };
-};
-const handleClickLogin = async state => {
-  const {
-    authUseRedirect,
-    backendUrl,
-    platform,
-    uid,
-    useAuthWorker
-  } = state;
-  if (!backendUrl) {
-    return {
-      ...state,
-      authErrorMessage: 'Backend URL is missing.',
-      userState: 'loggedOut'
-    };
-  }
-  const signingInState = {
-    ...state,
-    authErrorMessage: '',
-    userState: 'loggingIn'
-  };
-  if (uid) {
-    set(uid, state, signingInState);
-  }
-  try {
-    if (useAuthWorker) {
-      const authState = await login$1({
-        authUseRedirect,
-        backendUrl,
-        platform,
-        uid
-      });
-      return {
-        ...signingInState,
-        ...authState
-      };
-    }
-    if (uid) {
-      await invoke('Chat.rerender');
-    }
-    if (hasPendingMockLoginResponse()) {
-      const response = await consumeNextLoginResponse();
-      if (!isLoginResponse(response)) {
-        return {
-          ...signingInState,
-          authErrorMessage: 'Backend returned an invalid login response.',
-          userState: 'loggedOut'
-        };
-      }
-      if (typeof response.error === 'string' && response.error) {
-        return {
-          ...signingInState,
-          authErrorMessage: response.error,
-          userState: 'loggedOut'
-        };
-      }
-      return getLoggedInState(signingInState, response);
-    }
-    const {
-      loginUrl,
-      redirectUri
-    } = await getBackendLoginRequest(backendUrl, platform, uid);
-    await invoke$1('Open.openUrl', loginUrl, platform, authUseRedirect);
-    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri) : await waitForBackendLogin(backendUrl);
-    return {
-      ...signingInState,
-      ...authState
-    };
-  } catch (error) {
-    const errorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
-    return {
-      ...signingInState,
-      ...getLoggedOutBackendAuthState(errorMessage)
-    };
-  }
-};
+/* cspell:words worktree */
 
-const handleClickLogout = async state => {
-  const loggingOutState = {
-    ...state,
-    authErrorMessage: '',
-    userState: 'loggingOut'
-  };
-  if (state.uid) {
-    set(state.uid, state, loggingOutState);
-    await invoke('Chat.rerender');
-  }
-  if (state.useAuthWorker) {
-    await logout$1({
-      backendUrl: state.backendUrl
-    });
-  } else {
-    await logoutFromBackend(state.backendUrl);
-  }
-  return {
-    ...loggingOutState,
-    ...getLoggedOutBackendAuthState()
-  };
+const createBackgroundChatWorktree = async ({
+  assetDir,
+  platform,
+  projectUri,
+  sessionId,
+  title
+}) => {
+  return executeProvider({
+    assetDir,
+    event: `onCommand:${CreateBackgroundWorktree}`,
+    method: CommandExecute,
+    noProviderFoundMessage: 'No background worktree command found',
+    params: [CreateBackgroundWorktree, {
+      projectUri,
+      sessionId,
+      title
+    }],
+    platform
+  });
 };
 
-const handleClickModelPickerListIndex = async (state, index) => {
-  const {
-    models,
-    visibleModels
-  } = state;
-  if (index < 0 || index >= visibleModels.length) {
-    return state;
+const slashCommandRegistry = Object.create(null);
+const registerSlashCommand = (command, handler) => {
+  slashCommandRegistry[command] = handler;
+};
+const clearSlashCommands = () => {
+  for (const command of Object.keys(slashCommandRegistry)) {
+    delete slashCommandRegistry[command];
   }
-  return {
-    ...state,
-    modelPickerHeight: getModelPickerHeight(state.modelPickerHeaderHeight, models.length),
-    modelPickerListScrollTop: 0,
-    modelPickerOpen: false,
-    modelPickerSearchValue: '',
-    selectedModelId: visibleModels[index].id,
-    visibleModels: models
-  };
 };
-
-const handleClickOpenApiApiKeySettings = async state => {
-  await invoke('Main.openUri', 'app://settings.json');
-  return state;
+const hasSlashCommand = command => {
+  return command in slashCommandRegistry;
 };
-
-const handleClickOpenApiApiKeyWebsite = async state => {
-  await openExternal(state.openApiApiKeysSettingsUrl);
-  return state;
+const getSlashCommandHandler = command => {
+  return slashCommandRegistry[command];
 };
 
-const handleClickOpenRouterApiKeySettings = async state => {
-  await invoke('Main.openUri', 'app://settings.json');
-  return state;
+const withClearedComposer = state => {
+  return focusInput({
+    ...state,
+    composerHeight: getMinComposerHeightForState(state),
+    composerSelectionEnd: 0,
+    composerSelectionStart: 0,
+    composerValue: '',
+    inputSource: 'script'
+  });
 };
 
-const handleClickOpenRouterApiKeyWebsite = async state => {
-  await openExternal(state.openRouterApiKeysSettingsUrl);
-  return state;
+const executeSlashCommand = async (state, command) => {
+  const slashCommandHandler = getSlashCommandHandler(command);
+  if (!slashCommandHandler) {
+    return withClearedComposer(state);
+  }
+  return slashCommandHandler(state);
 };
 
 const getAiResponse$1 = async options => {
@@ -5873,8 +5845,8 @@ const getToolCallResult = (name, content) => {
     if (!parsed || typeof parsed !== 'object') {
       return undefined;
     }
-    const linesAdded = Reflect.get(parsed, 'linesAdded');
-    const linesDeleted = Reflect.get(parsed, 'linesDeleted');
+    const linesAdded = Reflect.get(parsed, 'addedLines') ?? Reflect.get(parsed, 'linesAdded');
+    const linesDeleted = Reflect.get(parsed, 'removedLines') ?? Reflect.get(parsed, 'linesDeleted');
     if (typeof linesAdded !== 'number' && typeof linesDeleted !== 'number') {
       return undefined;
     }
@@ -7986,27 +7958,260 @@ const getAiResponse = async ({
   return message;
 };
 
-const parseMessageContents = async rawMessages => {
-  return invoke$7('ChatMessageParsing.parseMessageContents', rawMessages);
+const defaultSessionTitleRegex = /^Chat \d+$/;
+const isDefaultSessionTitle = title => {
+  return defaultSessionTitleRegex.test(title);
 };
 
-const emptyMessageContent = [{
-  children: [{
-    text: '',
-    type: 'text'
-  }],
-  type: 'text'
-}];
-const getParsedMessageContent = (parsedMessages, messageId) => {
-  const parsedMessage = parsedMessages.find(item => item.id === messageId);
-  return parsedMessage?.parsedContent;
+const titlePrefixRegex = /^title:\s*/i;
+const wrappedQuotesAndWhitespaceRegex = /^['"`\s]+|['"`\s]+$/g;
+const consecutiveWhitespaceRegex = /\s+/g;
+const sanitizeGeneratedTitle = value => {
+  return value.replace(titlePrefixRegex, '').replaceAll(wrappedQuotesAndWhitespaceRegex, '').replaceAll(consecutiveWhitespaceRegex, ' ').trim().slice(0, 80);
 };
-const setParsedMessageContent = (parsedMessages, messageId, text, parsedContent) => {
-  const index = parsedMessages.findIndex(item => item.id === messageId);
-  if (index === -1) {
-    return [...parsedMessages, {
-      id: messageId,
-      parsedContent,
+
+const getTitlePrompt = (userText, assistantText) => `Create a concise title (max 6 words) for this conversation. Respond only with the title, no punctuation at the end.
+User: ${userText}
+Assistant: ${assistantText}`;
+const getAiSessionTitle = async (state, userText, assistantText) => {
+  const {
+    authAccessToken,
+    backendUrl,
+    models,
+    openApiApiBaseUrl,
+    openApiApiKey,
+    openRouterApiBaseUrl,
+    openRouterApiKey,
+    selectedModelId,
+    useMockApi,
+    useOwnBackend
+  } = state;
+  if (useMockApi) {
+    return '';
+  }
+  const usesOpenApiModel = isOpenApiModel(selectedModelId, models);
+  const usesOpenRouterModel = isOpenRouterModel(selectedModelId, models);
+  if (useOwnBackend) {
+    if (!backendUrl || !authAccessToken) {
+      return '';
+    }
+  } else {
+    if (usesOpenApiModel && !openApiApiKey) {
+      return '';
+    }
+    if (usesOpenRouterModel && !openRouterApiKey) {
+      return '';
+    }
+    if (!usesOpenApiModel && !usesOpenRouterModel) {
+      return '';
+    }
+  }
+  const titlePrompt = getTitlePrompt(userText, assistantText);
+  const promptMessage = {
+    id: crypto.randomUUID(),
+    role: 'user',
+    text: titlePrompt,
+    time: new Date().toLocaleTimeString([], {
+      hour: '2-digit',
+      minute: '2-digit'
+    })
+  };
+  const titleResponse = await getAiResponse({
+    assetDir: state.assetDir,
+    authAccessToken,
+    backendUrl,
+    maxToolCalls: state.maxToolCalls,
+    messages: [promptMessage],
+    mockAiResponseDelay: state.mockAiResponseDelay,
+    mockApiCommandId: state.mockApiCommandId,
+    models,
+    nextMessageId: state.nextMessageId,
+    openApiApiBaseUrl,
+    openApiApiKey,
+    openRouterApiBaseUrl,
+    openRouterApiKey,
+    passIncludeObfuscation: state.passIncludeObfuscation,
+    platform: state.platform,
+    selectedModelId,
+    streamingEnabled: false,
+    systemPrompt: state.systemPrompt,
+    useChatCoordinatorWorker: state.useChatCoordinatorWorker,
+    useChatNetworkWorkerForRequests: state.useChatNetworkWorkerForRequests,
+    useChatToolWorker: state.useChatToolWorker,
+    useMockApi,
+    useOwnBackend,
+    userText: titlePrompt,
+    webSearchEnabled: false
+  });
+  const title = sanitizeGeneratedTitle(titleResponse.text);
+  return title && !isDefaultSessionTitle(title) ? title : '';
+};
+
+const mentionRegex = /(^|\s)@([^\s]+)/g;
+const trailingPunctuationRegex = /[),.;:!?]+$/g;
+const maxMentionCount = 5;
+const parseMentionedPaths = value => {
+  const matches = value.matchAll(mentionRegex);
+  const paths = [];
+  for (const match of matches) {
+    const rawPath = match[2] || '';
+    const cleanedPath = rawPath.replaceAll(trailingPunctuationRegex, '');
+    if (!cleanedPath || isPathTraversalAttempt(cleanedPath)) {
+      continue;
+    }
+    const normalizedPath = normalizeRelativePath(cleanedPath);
+    if (paths.includes(normalizedPath)) {
+      continue;
+    }
+    paths.push(normalizedPath);
+    if (paths.length >= maxMentionCount) {
+      break;
+    }
+  }
+  return paths;
+};
+
+const maxMentionTextLength = 8000;
+const getMentionContextMessage = async value => {
+  const paths = parseMentionedPaths(value);
+  if (paths.length === 0) {
+    return undefined;
+  }
+  const sections = [];
+  for (const path of paths) {
+    try {
+      const fileContent = await readFile(path);
+      const truncatedContent = fileContent.length > maxMentionTextLength ? `${fileContent.slice(0, maxMentionTextLength)}\n... [truncated]` : fileContent;
+      sections.push([`File: ${path}`, '```text', truncatedContent, '```'].join('\n'));
+    } catch (error) {
+      sections.push([`File: ${path}`, `Error: ${String(error)}`].join('\n'));
+    }
+  }
+  return {
+    id: crypto.randomUUID(),
+    role: 'user',
+    text: ['Referenced file context:', ...sections].join('\n\n'),
+    time: new Date().toLocaleTimeString([], {
+      hour: '2-digit',
+      minute: '2-digit'
+    })
+  };
+};
+
+const slashCommandRegex = /^\/([a-z][a-z0-9-]*)(?:\s+.*)?$/i;
+const getSlashCommand = value => {
+  const trimmed = value.trim();
+  const match = trimmed.match(slashCommandRegex);
+  if (!match) {
+    return undefined;
+  }
+  const command = match[1].toLowerCase();
+  if (!hasSlashCommand(command)) {
+    return undefined;
+  }
+  return command;
+};
+
+const getSseEventType = value => {
+  return value && typeof value === 'object' && Reflect.get(value, 'type') === 'response.completed' ? 'sse-response-completed' : 'sse-response-part';
+};
+
+const getPlanModePromptAddendum = () => {
+  return `Plan mode instructions:
+
+- You are in plan mode.
+- Do not make code changes, write files, or claim that you have implemented anything.
+- Use read-only investigation only.
+- Produce an implementation plan for the user's request.
+- Structure the answer as a practical implementation plan with concrete steps, risks, and validation when appropriate.
+- If the request is not actually an implementation task, respond briefly in a planning-oriented way and explain that plan mode is for planning work.
+- If you cannot inspect required files or gather the necessary context, clearly say that you cannot make a reliable plan, explain what failed, and do not pretend the plan is complete.`;
+};
+
+const workspaceUriPlaceholder = '{{workspaceUri}}';
+const getCurrentDate = () => {
+  return new Date().toISOString().slice(0, 10);
+};
+const getSystemPromptForAgentMode = (systemPrompt, workspaceUri, agentMode) => {
+  const resolvedSystemPrompt = systemPrompt.replaceAll(workspaceUriPlaceholder, workspaceUri || 'unknown');
+  const modeInstructions = agentMode === 'plan' ? getPlanModePromptAddendum() : '';
+  const currentDateInstructions = `Current date: ${getCurrentDate()}.
+
+Do not assume your knowledge cutoff is the same as the current date.`;
+  return [resolvedSystemPrompt, modeInstructions, currentDateInstructions].filter(Boolean).join('\n\n');
+};
+
+const getMessageById = (messages, messageId) => {
+  return messages.find(message => message.id === messageId);
+};
+
+const getNextHandleTextChunkState = (latestState, parsedMessages, sessions) => {
+  return {
+    ...latestState,
+    ...(latestState.messagesAutoScrollEnabled ? {
+      messagesScrollTop: getNextAutoScrollTop(latestState.messagesScrollTop)
+    } : {}),
+    parsedMessages,
+    sessions
+  };
+};
+
+const setAndRerenderHandleTextChunkState = async (uid, previousState, nextState) => {
+  set(uid, previousState, nextState);
+  // @ts-ignore
+  await invoke('Chat.rerender');
+};
+
+const getToolCallMergeKey = toolCall => {
+  if (toolCall.id) {
+    return `id:${toolCall.id}`;
+  }
+  return `value:${toolCall.name}:${toolCall.arguments}`;
+};
+
+const mergeToolCalls = (existing = [], incoming) => {
+  if (incoming.length === 0) {
+    return existing;
+  }
+  const merged = [...existing];
+  const indexByKey = new Map();
+  for (let i = 0; i < merged.length; i++) {
+    indexByKey.set(getToolCallMergeKey(merged[i]), i);
+  }
+  for (const toolCall of incoming) {
+    const key = getToolCallMergeKey(toolCall);
+    const existingIndex = indexByKey.get(key);
+    if (existingIndex === undefined) {
+      indexByKey.set(key, merged.length);
+      merged.push(toolCall);
+      continue;
+    }
+    merged[existingIndex] = toolCall;
+  }
+  return merged;
+};
+
+const parseMessageContents = async rawMessages => {
+  return invoke$7('ChatMessageParsing.parseMessageContents', rawMessages);
+};
+
+const emptyMessageContent = [{
+  children: [{
+    text: '',
+    type: 'text'
+  }],
+  type: 'text'
+}];
+const getParsedMessageContent = (parsedMessages, messageId) => {
+  const parsedMessage = parsedMessages.find(item => item.id === messageId);
+  return parsedMessage?.parsedContent;
+};
+const setParsedMessageContent = (parsedMessages, messageId, text, parsedContent) => {
+  const index = parsedMessages.findIndex(item => item.id === messageId);
+  if (index === -1) {
+    return [...parsedMessages, {
+      id: messageId,
+      parsedContent,
       text
     }];
   }
@@ -8056,498 +8261,95 @@ const getEmptyMessageContent = () => {
   return emptyMessageContent;
 };
 
-const get = async key => {
-  return getPreference(key);
-};
-const update = async settings => {
-  await invoke('Preferences.update', settings);
-};
-
-const setOpenApiApiKey = async (state, openApiApiKey, persist = true) => {
-  if (persist) {
-    await update({
-      'secrets.openApiKey': openApiApiKey
-    });
-  }
-  return {
-    ...state,
-    openApiApiKey,
-    openApiApiKeyInput: openApiApiKey
-  };
-};
-
-const handleClickSaveOpenApiApiKey = async state => {
-  const {
-    openApiApiKeyInput
-  } = state;
-  const openApiApiKey = openApiApiKeyInput.trim();
-  if (!openApiApiKey) {
-    return state;
-  }
-  const optimisticState = {
-    ...state,
-    openApiApiKeyState: 'saving'
-  };
-  set(state.uid, state, optimisticState);
-  await invoke('Chat.rerender');
-  const persistedState = await setOpenApiApiKey(optimisticState, openApiApiKey);
-  const updatedState = {
-    ...persistedState,
-    openApiApiKeyState: 'idle'
-  };
-  const session = updatedState.sessions.find(item => item.id === updatedState.selectedSessionId);
-  if (!session) {
-    return updatedState;
-  }
-  const lastMessage = session.messages.at(-1);
-  const shouldRetryOpenApi = lastMessage?.role === 'assistant' && lastMessage.text === openApiApiKeyRequiredMessage;
-  if (!shouldRetryOpenApi) {
-    return updatedState;
-  }
-  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
-  if (!previousUserMessage) {
-    return updatedState;
-  }
-  const retryMessages = session.messages.slice(0, -1);
-  const assistantMessage = await getAiResponse({
-    agentMode: updatedState.agentMode,
-    assetDir: updatedState.assetDir,
-    maxToolCalls: updatedState.maxToolCalls,
-    messages: retryMessages,
-    mockAiResponseDelay: updatedState.mockAiResponseDelay,
-    mockApiCommandId: updatedState.mockApiCommandId,
-    models: updatedState.models,
-    nextMessageId: updatedState.nextMessageId,
-    openApiApiBaseUrl: updatedState.openApiApiBaseUrl,
-    openApiApiKey: updatedState.openApiApiKey,
-    openRouterApiBaseUrl: updatedState.openRouterApiBaseUrl,
-    openRouterApiKey: updatedState.openRouterApiKey,
-    platform: updatedState.platform,
-    selectedModelId: updatedState.selectedModelId,
-    streamingEnabled: updatedState.streamingEnabled,
-    systemPrompt: updatedState.systemPrompt,
-    useChatCoordinatorWorker: updatedState.useChatCoordinatorWorker,
-    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
-    useMockApi: updatedState.useMockApi,
-    useOwnBackend: updatedState.useOwnBackend,
-    userText: previousUserMessage.text
-  });
-  const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
-  const updatedSession = {
-    ...session,
-    messages: [...session.messages.slice(0, -1), assistantMessage]
-  };
-  await saveChatSession(updatedSession);
-  const updatedSessions = updatedState.sessions.map(item => {
-    if (item.id !== updatedState.selectedSessionId) {
-      return item;
+const updateMessageToolCallsInSelectedSession = (sessions, parsedMessages, selectedSessionId, messageId, toolCalls) => {
+  let nextParsedMessages = parsedMessages;
+  const updatedSessions = sessions.map(session => {
+    if (session.id !== selectedSessionId) {
+      return session;
     }
-    return updatedSession;
+    return {
+      ...session,
+      messages: session.messages.map(message => {
+        if (message.id !== messageId) {
+          return message;
+        }
+        const updatedMessage = {
+          ...message,
+          toolCalls: mergeToolCalls(message.toolCalls, toolCalls)
+        };
+        nextParsedMessages = copyParsedMessageContent(nextParsedMessages, message.id, updatedMessage.id);
+        return updatedMessage;
+      })
+    };
   });
   return {
-    ...updatedState,
-    nextMessageId: updatedState.nextMessageId + 1,
-    openApiApiKeyState: 'idle',
-    parsedMessages,
+    parsedMessages: nextParsedMessages,
     sessions: updatedSessions
   };
 };
 
-const setOpenRouterApiKey = async (state, openRouterApiKey, persist = true) => {
-  if (persist) {
-    await update({
-      'secrets.openRouterApiKey': openRouterApiKey
-    });
-  }
-  return {
-    ...state,
-    openRouterApiKey,
-    openRouterApiKeyInput: openRouterApiKey
-  };
-};
-
-const handleClickSaveOpenRouterApiKey = async state => {
-  const {
-    openRouterApiKeyInput
-  } = state;
-  const openRouterApiKey = openRouterApiKeyInput.trim();
-  if (!openRouterApiKey) {
-    return state;
-  }
-  const optimisticState = {
-    ...state,
-    openRouterApiKeyState: 'saving'
-  };
-  set(state.uid, state, optimisticState);
-  await invoke('Chat.rerender');
-  const persistedState = await setOpenRouterApiKey(optimisticState, openRouterApiKey);
-  const updatedState = {
-    ...persistedState,
-    openRouterApiKeyState: 'idle'
-  };
-  const session = updatedState.sessions.find(item => item.id === updatedState.selectedSessionId);
-  if (!session) {
-    return updatedState;
+const handleToolCallsChunkFunction = async (uid, sessionId, assistantMessageId, toolCalls, handleTextChunkState) => {
+  const liveState = get$1(uid)?.newState || handleTextChunkState.latestState;
+  const selectedSession = liveState.sessions.find(session => session.id === sessionId);
+  if (!selectedSession) {
+    return {
+      latestState: liveState,
+      previousState: liveState
+    };
   }
-  const lastMessage = session.messages.at(-1);
-  const shouldRetryOpenRouter = lastMessage?.role === 'assistant' && lastMessage.text === openRouterApiKeyRequiredMessage;
-  if (!shouldRetryOpenRouter) {
-    return updatedState;
+  if (getChatSessionStatus(selectedSession) === 'stopped') {
+    return {
+      latestState: liveState,
+      previousState: liveState
+    };
   }
-  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
-  if (!previousUserMessage) {
-    return updatedState;
+  const assistantMessage = getMessageById(selectedSession.messages, assistantMessageId);
+  if (!assistantMessage) {
+    return {
+      latestState: liveState,
+      previousState: liveState
+    };
   }
-  const retryMessages = session.messages.slice(0, -1);
-  const assistantMessage = await getAiResponse({
-    agentMode: updatedState.agentMode,
-    assetDir: updatedState.assetDir,
-    maxToolCalls: updatedState.maxToolCalls,
-    messages: retryMessages,
-    mockAiResponseDelay: updatedState.mockAiResponseDelay,
-    mockApiCommandId: updatedState.mockApiCommandId,
-    models: updatedState.models,
-    nextMessageId: updatedState.nextMessageId,
-    openApiApiBaseUrl: updatedState.openApiApiBaseUrl,
-    openApiApiKey: updatedState.openApiApiKey,
-    openRouterApiBaseUrl: updatedState.openRouterApiBaseUrl,
-    openRouterApiKey,
-    platform: updatedState.platform,
-    selectedModelId: updatedState.selectedModelId,
-    systemPrompt: updatedState.systemPrompt,
-    useChatCoordinatorWorker: updatedState.useChatCoordinatorWorker,
-    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
-    useMockApi: updatedState.useMockApi,
-    useOwnBackend: updatedState.useOwnBackend,
-    userText: previousUserMessage.text
-  });
-  const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
-  const updatedSession = {
-    ...session,
-    messages: [...session.messages.slice(0, -1), assistantMessage]
-  };
-  await saveChatSession(updatedSession);
-  const updatedSessions = updatedState.sessions.map(item => {
-    if (item.id !== updatedState.selectedSessionId) {
-      return item;
-    }
-    return updatedSession;
-  });
+  const updated = updateMessageToolCallsInSelectedSession(liveState.sessions, liveState.parsedMessages, sessionId, assistantMessageId, toolCalls);
+  const nextState = getNextHandleTextChunkState(liveState, updated.parsedMessages, updated.sessions);
+  await setAndRerenderHandleTextChunkState(uid, liveState, nextState);
   return {
-    ...updatedState,
-    nextMessageId: updatedState.nextMessageId + 1,
-    openRouterApiKeyState: 'idle',
-    parsedMessages,
-    sessions: updatedSessions
+    latestState: nextState,
+    previousState: nextState
   };
 };
 
-const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
-  return sessions.map(session => {
+const updateMessageTextInSelectedSession = async (sessions, parsedMessages, selectedSessionId, messageId, text, inProgress) => {
+  let updatedMessage;
+  const updatedSessions = sessions.map(session => {
     if (session.id !== selectedSessionId) {
       return session;
     }
     return {
       ...session,
-      messages: [...session.messages, message]
+      messages: session.messages.map(message => {
+        if (message.id !== messageId) {
+          return message;
+        }
+        updatedMessage = {
+          ...message,
+          inProgress,
+          text
+        };
+        return updatedMessage;
+      })
     };
   });
-};
-
-/* cspell:words worktree */
-
-const createBackgroundChatWorktree = async ({
-  assetDir,
-  platform,
-  projectUri,
-  sessionId,
-  title
-}) => {
-  return executeProvider({
-    assetDir,
-    event: `onCommand:${CreateBackgroundWorktree}`,
-    method: CommandExecute,
-    noProviderFoundMessage: 'No background worktree command found',
-    params: [CreateBackgroundWorktree, {
-      projectUri,
-      sessionId,
-      title
-    }],
-    platform
-  });
-};
-
-const slashCommandRegistry = Object.create(null);
-const registerSlashCommand = (command, handler) => {
-  slashCommandRegistry[command] = handler;
-};
-const clearSlashCommands = () => {
-  for (const command of Object.keys(slashCommandRegistry)) {
-    delete slashCommandRegistry[command];
+  let nextParsedMessages = parsedMessages;
+  if (updatedMessage) {
+    nextParsedMessages = await parseAndStoreMessageContent(parsedMessages, updatedMessage);
   }
+  return {
+    parsedMessages: nextParsedMessages,
+    sessions: updatedSessions
+  };
 };
-const hasSlashCommand = command => {
-  return command in slashCommandRegistry;
-};
-const getSlashCommandHandler = command => {
-  return slashCommandRegistry[command];
-};
-
-const withClearedComposer = state => {
-  return focusInput({
-    ...state,
-    composerHeight: getMinComposerHeightForState(state),
-    composerSelectionEnd: 0,
-    composerSelectionStart: 0,
-    composerValue: '',
-    inputSource: 'script'
-  });
-};
-
-const executeSlashCommand = async (state, command) => {
-  const slashCommandHandler = getSlashCommandHandler(command);
-  if (!slashCommandHandler) {
-    return withClearedComposer(state);
-  }
-  return slashCommandHandler(state);
-};
-
-const defaultSessionTitleRegex = /^Chat \d+$/;
-const isDefaultSessionTitle = title => {
-  return defaultSessionTitleRegex.test(title);
-};
-
-const titlePrefixRegex = /^title:\s*/i;
-const wrappedQuotesAndWhitespaceRegex = /^['"`\s]+|['"`\s]+$/g;
-const consecutiveWhitespaceRegex = /\s+/g;
-const sanitizeGeneratedTitle = value => {
-  return value.replace(titlePrefixRegex, '').replaceAll(wrappedQuotesAndWhitespaceRegex, '').replaceAll(consecutiveWhitespaceRegex, ' ').trim().slice(0, 80);
-};
-
-const getTitlePrompt = (userText, assistantText) => `Create a concise title (max 6 words) for this conversation. Respond only with the title, no punctuation at the end.
-User: ${userText}
-Assistant: ${assistantText}`;
-const getAiSessionTitle = async (state, userText, assistantText) => {
-  const {
-    authAccessToken,
-    backendUrl,
-    models,
-    openApiApiBaseUrl,
-    openApiApiKey,
-    openRouterApiBaseUrl,
-    openRouterApiKey,
-    selectedModelId,
-    useMockApi,
-    useOwnBackend
-  } = state;
-  if (useMockApi) {
-    return '';
-  }
-  const usesOpenApiModel = isOpenApiModel(selectedModelId, models);
-  const usesOpenRouterModel = isOpenRouterModel(selectedModelId, models);
-  if (useOwnBackend) {
-    if (!backendUrl || !authAccessToken) {
-      return '';
-    }
-  } else {
-    if (usesOpenApiModel && !openApiApiKey) {
-      return '';
-    }
-    if (usesOpenRouterModel && !openRouterApiKey) {
-      return '';
-    }
-    if (!usesOpenApiModel && !usesOpenRouterModel) {
-      return '';
-    }
-  }
-  const titlePrompt = getTitlePrompt(userText, assistantText);
-  const promptMessage = {
-    id: crypto.randomUUID(),
-    role: 'user',
-    text: titlePrompt,
-    time: new Date().toLocaleTimeString([], {
-      hour: '2-digit',
-      minute: '2-digit'
-    })
-  };
-  const titleResponse = await getAiResponse({
-    assetDir: state.assetDir,
-    authAccessToken,
-    backendUrl,
-    maxToolCalls: state.maxToolCalls,
-    messages: [promptMessage],
-    mockAiResponseDelay: state.mockAiResponseDelay,
-    mockApiCommandId: state.mockApiCommandId,
-    models,
-    nextMessageId: state.nextMessageId,
-    openApiApiBaseUrl,
-    openApiApiKey,
-    openRouterApiBaseUrl,
-    openRouterApiKey,
-    passIncludeObfuscation: state.passIncludeObfuscation,
-    platform: state.platform,
-    selectedModelId,
-    streamingEnabled: false,
-    systemPrompt: state.systemPrompt,
-    useChatCoordinatorWorker: state.useChatCoordinatorWorker,
-    useChatNetworkWorkerForRequests: state.useChatNetworkWorkerForRequests,
-    useChatToolWorker: state.useChatToolWorker,
-    useMockApi,
-    useOwnBackend,
-    userText: titlePrompt,
-    webSearchEnabled: false
-  });
-  const title = sanitizeGeneratedTitle(titleResponse.text);
-  return title && !isDefaultSessionTitle(title) ? title : '';
-};
-
-const mentionRegex = /(^|\s)@([^\s]+)/g;
-const trailingPunctuationRegex = /[),.;:!?]+$/g;
-const maxMentionCount = 5;
-const parseMentionedPaths = value => {
-  const matches = value.matchAll(mentionRegex);
-  const paths = [];
-  for (const match of matches) {
-    const rawPath = match[2] || '';
-    const cleanedPath = rawPath.replaceAll(trailingPunctuationRegex, '');
-    if (!cleanedPath || isPathTraversalAttempt(cleanedPath)) {
-      continue;
-    }
-    const normalizedPath = normalizeRelativePath(cleanedPath);
-    if (paths.includes(normalizedPath)) {
-      continue;
-    }
-    paths.push(normalizedPath);
-    if (paths.length >= maxMentionCount) {
-      break;
-    }
-  }
-  return paths;
-};
-
-const maxMentionTextLength = 8000;
-const getMentionContextMessage = async value => {
-  const paths = parseMentionedPaths(value);
-  if (paths.length === 0) {
-    return undefined;
-  }
-  const sections = [];
-  for (const path of paths) {
-    try {
-      const fileContent = await readFile(path);
-      const truncatedContent = fileContent.length > maxMentionTextLength ? `${fileContent.slice(0, maxMentionTextLength)}\n... [truncated]` : fileContent;
-      sections.push([`File: ${path}`, '```text', truncatedContent, '```'].join('\n'));
-    } catch (error) {
-      sections.push([`File: ${path}`, `Error: ${String(error)}`].join('\n'));
-    }
-  }
-  return {
-    id: crypto.randomUUID(),
-    role: 'user',
-    text: ['Referenced file context:', ...sections].join('\n\n'),
-    time: new Date().toLocaleTimeString([], {
-      hour: '2-digit',
-      minute: '2-digit'
-    })
-  };
-};
-
-const slashCommandRegex = /^\/([a-z][a-z0-9-]*)(?:\s+.*)?$/i;
-const getSlashCommand = value => {
-  const trimmed = value.trim();
-  const match = trimmed.match(slashCommandRegex);
-  if (!match) {
-    return undefined;
-  }
-  const command = match[1].toLowerCase();
-  if (!hasSlashCommand(command)) {
-    return undefined;
-  }
-  return command;
-};
-
-const getSseEventType = value => {
-  return value && typeof value === 'object' && Reflect.get(value, 'type') === 'response.completed' ? 'sse-response-completed' : 'sse-response-part';
-};
-
-const getMessageById = (messages, messageId) => {
-  return messages.find(message => message.id === messageId);
-};
-
-const getNextHandleTextChunkState = (latestState, parsedMessages, sessions) => {
-  return {
-    ...latestState,
-    ...(latestState.messagesAutoScrollEnabled ? {
-      messagesScrollTop: getNextAutoScrollTop(latestState.messagesScrollTop)
-    } : {}),
-    parsedMessages,
-    sessions
-  };
-};
-
-const setAndRerenderHandleTextChunkState = async (uid, previousState, nextState) => {
-  set(uid, previousState, nextState);
-  // @ts-ignore
-  await invoke('Chat.rerender');
-};
-
-const getToolCallMergeKey = toolCall => {
-  if (toolCall.id) {
-    return `id:${toolCall.id}`;
-  }
-  return `value:${toolCall.name}:${toolCall.arguments}`;
-};
-
-const mergeToolCalls = (existing = [], incoming) => {
-  if (incoming.length === 0) {
-    return existing;
-  }
-  const merged = [...existing];
-  const indexByKey = new Map();
-  for (let i = 0; i < merged.length; i++) {
-    indexByKey.set(getToolCallMergeKey(merged[i]), i);
-  }
-  for (const toolCall of incoming) {
-    const key = getToolCallMergeKey(toolCall);
-    const existingIndex = indexByKey.get(key);
-    if (existingIndex === undefined) {
-      indexByKey.set(key, merged.length);
-      merged.push(toolCall);
-      continue;
-    }
-    merged[existingIndex] = toolCall;
-  }
-  return merged;
-};
-
-const updateMessageToolCallsInSelectedSession = (sessions, parsedMessages, selectedSessionId, messageId, toolCalls) => {
-  let nextParsedMessages = parsedMessages;
-  const updatedSessions = sessions.map(session => {
-    if (session.id !== selectedSessionId) {
-      return session;
-    }
-    return {
-      ...session,
-      messages: session.messages.map(message => {
-        if (message.id !== messageId) {
-          return message;
-        }
-        const updatedMessage = {
-          ...message,
-          toolCalls: mergeToolCalls(message.toolCalls, toolCalls)
-        };
-        nextParsedMessages = copyParsedMessageContent(nextParsedMessages, message.id, updatedMessage.id);
-        return updatedMessage;
-      })
-    };
-  });
-  return {
-    parsedMessages: nextParsedMessages,
-    sessions: updatedSessions
-  };
-};
-
-const handleToolCallsChunkFunction = async (uid, sessionId, assistantMessageId, toolCalls, handleTextChunkState) => {
+const handleTextChunkFunction = async (uid, sessionId, assistantMessageId, chunk, handleTextChunkState) => {
   const liveState = get$1(uid)?.newState || handleTextChunkState.latestState;
   const selectedSession = liveState.sessions.find(session => session.id === sessionId);
   if (!selectedSession) {
@@ -8562,68 +8364,7 @@ const handleToolCallsChunkFunction = async (uid, sessionId, assistantMessageId,
       previousState: liveState
     };
   }
-  const assistantMessage = getMessageById(selectedSession.messages, assistantMessageId);
-  if (!assistantMessage) {
-    return {
-      latestState: liveState,
-      previousState: liveState
-    };
-  }
-  const updated = updateMessageToolCallsInSelectedSession(liveState.sessions, liveState.parsedMessages, sessionId, assistantMessageId, toolCalls);
-  const nextState = getNextHandleTextChunkState(liveState, updated.parsedMessages, updated.sessions);
-  await setAndRerenderHandleTextChunkState(uid, liveState, nextState);
-  return {
-    latestState: nextState,
-    previousState: nextState
-  };
-};
-
-const updateMessageTextInSelectedSession = async (sessions, parsedMessages, selectedSessionId, messageId, text, inProgress) => {
-  let updatedMessage;
-  const updatedSessions = sessions.map(session => {
-    if (session.id !== selectedSessionId) {
-      return session;
-    }
-    return {
-      ...session,
-      messages: session.messages.map(message => {
-        if (message.id !== messageId) {
-          return message;
-        }
-        updatedMessage = {
-          ...message,
-          inProgress,
-          text
-        };
-        return updatedMessage;
-      })
-    };
-  });
-  let nextParsedMessages = parsedMessages;
-  if (updatedMessage) {
-    nextParsedMessages = await parseAndStoreMessageContent(parsedMessages, updatedMessage);
-  }
-  return {
-    parsedMessages: nextParsedMessages,
-    sessions: updatedSessions
-  };
-};
-const handleTextChunkFunction = async (uid, sessionId, assistantMessageId, chunk, handleTextChunkState) => {
-  const liveState = get$1(uid)?.newState || handleTextChunkState.latestState;
-  const selectedSession = liveState.sessions.find(session => session.id === sessionId);
-  if (!selectedSession) {
-    return {
-      latestState: liveState,
-      previousState: liveState
-    };
-  }
-  if (getChatSessionStatus(selectedSession) === 'stopped') {
-    return {
-      latestState: liveState,
-      previousState: liveState
-    };
-  }
-  const assistantMessage = selectedSession.messages.find(message => message.id === assistantMessageId);
+  const assistantMessage = selectedSession.messages.find(message => message.id === assistantMessageId);
   if (!assistantMessage) {
     return {
       latestState: liveState,
@@ -8738,7 +8479,6 @@ const withUpdatedMessageScrollTop = state => {
     messagesScrollTop: getNextAutoScrollTop(state.messagesScrollTop)
   };
 };
-const workspaceUriPlaceholder = '{{workspaceUri}}';
 const getLiveState = uid => {
   const entry = get$1(uid);
   return entry?.newState;
@@ -8778,9 +8518,6 @@ const clearComposerAttachments = async (sessionId, attachmentIds) => {
     });
   }
 };
-const getCurrentDate = () => {
-  return new Date().toISOString().slice(0, 10);
-};
 const getProjectUri = (state, projectId) => {
   return state.projects.find(project => project.id === projectId)?.uri || '';
 };
@@ -8801,18 +8538,6 @@ const resolveWorkspaceUri = async (state, session) => {
     return '';
   }
 };
-const getEffectiveSystemPrompt = (state, workspaceUri) => {
-  const resolvedSystemPrompt = state.systemPrompt.replaceAll(workspaceUriPlaceholder, workspaceUri || 'unknown');
-  const currentDateInstructions = `Current date: ${getCurrentDate()}.
-
-Do not assume your knowledge cutoff is the same as the current date.`;
-  if (!resolvedSystemPrompt) {
-    return currentDateInstructions;
-  }
-  return `${resolvedSystemPrompt}
-
-${currentDateInstructions}`;
-};
 const withProvisionedBackgroundSession = async (state, session) => {
   if (state.runMode !== 'background' || session.workspaceUri) {
     return session;
@@ -8905,6 +8630,9 @@ const handleSubmit = async state => {
     minute: '2-digit'
   });
   const inProgressAssistantMessage = {
+    ...(agentMode === 'plan' ? {
+      agentMode
+    } : {}),
     id: assistantMessageId,
     inProgress: true,
     role: 'assistant',
@@ -9015,14 +8743,14 @@ const handleSubmit = async state => {
   } = optimisticState;
   const selectedOptimisticSession = optimisticState.sessions.find(session => session.id === optimisticState.selectedSessionId);
   const workspaceUri = useMockApi ? getWorkspaceUri(optimisticState, selectedOptimisticSession) : await resolveWorkspaceUri(optimisticState, selectedOptimisticSession);
-  const systemPrompt = getEffectiveSystemPrompt(optimisticState, workspaceUri);
+  const systemPrompt = getSystemPromptForAgentMode(optimisticState.systemPrompt, workspaceUri, agentMode);
   const messages = (selectedOptimisticSession?.messages ?? []).filter(message => !message.inProgress);
   const mentionContextMessage = await getMentionContextMessage(userText);
   const messagesWithMentionContext = mentionContextMessage ? [...messages, mentionContextMessage] : messages;
   const handleTextChunkFunctionRef = streamingEnabled ? async chunk => {
     handleTextChunkState = await handleTextChunkFunction(state.uid, optimisticState.selectedSessionId, assistantMessageId, chunk, handleTextChunkState);
   } : undefined;
-  const assistantMessage = await getAiResponse({
+  const assistantMessageResponse = await getAiResponse({
     agentMode,
     assetDir,
     authAccessToken,
@@ -9094,6 +8822,10 @@ const handleSubmit = async state => {
     webSearchEnabled,
     workspaceUri
   });
+  const assistantMessage = agentMode === 'plan' ? {
+    ...assistantMessageResponse,
+    agentMode
+  } : assistantMessageResponse;
   if (isSessionStopped(state.uid, optimisticState.selectedSessionId)) {
     return getLiveState(state.uid) || handleTextChunkState.latestState;
   }
@@ -9110,27 +8842,396 @@ const handleSubmit = async state => {
     finalParsedMessages = await parseAndStoreMessageContent(finalParsedMessages, assistantMessage);
     updatedSessions = appendMessageToSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessage);
   }
-  if (aiSessionTitleGenerationEnabled && createsNewSession) {
-    const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
-    if (selectedSession && isDefaultSessionTitle(selectedSession.title)) {
-      const generatedTitle = await getAiSessionTitle(latestState, userText, assistantMessage.text);
-      if (generatedTitle) {
-        updatedSessions = updateSessionTitle(updatedSessions, latestState.selectedSessionId, generatedTitle);
-      }
-    }
+  if (aiSessionTitleGenerationEnabled && createsNewSession) {
+    const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
+    if (selectedSession && isDefaultSessionTitle(selectedSession.title)) {
+      const generatedTitle = await getAiSessionTitle(latestState, userText, assistantMessage.text);
+      if (generatedTitle) {
+        updatedSessions = updateSessionTitle(updatedSessions, latestState.selectedSessionId, generatedTitle);
+      }
+    }
+  }
+  updatedSessions = updateSessionStatus(updatedSessions, latestState.selectedSessionId, 'finished');
+  const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
+  if (selectedSession) {
+    await saveChatSession(selectedSession);
+  }
+  return withUpdatedMessageScrollTop(focusInput({
+    ...latestState,
+    mockOpenApiRequests,
+    nextMessageId: latestState.nextMessageId + 1,
+    parsedMessages: finalParsedMessages,
+    sessions: updatedSessions
+  }));
+};
+
+const handleClickImplementPlan = async state => {
+  const selectedSession = state.sessions.find(session => session.id === state.selectedSessionId);
+  if (!selectedSession || getChatSessionStatus(selectedSession) === 'in-progress') {
+    return state;
+  }
+  const latestPlanMessage = getLatestExecutablePlanMessage(selectedSession);
+  if (!latestPlanMessage) {
+    return state;
+  }
+  const implementationPrompt = getImplementationPrompt(latestPlanMessage.text);
+  const preparedState = {
+    ...state,
+    agentMode: 'agent',
+    composerSelectionEnd: implementationPrompt.length,
+    composerSelectionStart: implementationPrompt.length,
+    composerValue: implementationPrompt,
+    inputSource: 'script'
+  };
+  return handleSubmit(preparedState);
+};
+
+const PlatformTypeElectron = 2;
+const isLoginResponse = value => {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+  return true;
+};
+const getLoggedInState = (state, response) => {
+  const {
+    userName,
+    userSubscriptionPlan,
+    userUsedTokens
+  } = state;
+  const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
+  return {
+    ...state,
+    authAccessToken: accessToken,
+    authErrorMessage: '',
+    userName: typeof response.userName === 'string' ? response.userName : userName,
+    userState: accessToken ? 'loggedIn' : 'loggedOut',
+    userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : userSubscriptionPlan,
+    userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : userUsedTokens
+  };
+};
+const handleClickLogin = async state => {
+  const {
+    authUseRedirect,
+    backendUrl,
+    platform,
+    uid,
+    useAuthWorker
+  } = state;
+  if (!backendUrl) {
+    return {
+      ...state,
+      authErrorMessage: 'Backend URL is missing.',
+      userState: 'loggedOut'
+    };
+  }
+  const signingInState = {
+    ...state,
+    authErrorMessage: '',
+    userState: 'loggingIn'
+  };
+  if (uid) {
+    set(uid, state, signingInState);
+  }
+  try {
+    if (useAuthWorker) {
+      const authState = await login$1({
+        authUseRedirect,
+        backendUrl,
+        platform,
+        uid
+      });
+      return {
+        ...signingInState,
+        ...authState
+      };
+    }
+    if (uid) {
+      await invoke('Chat.rerender');
+    }
+    if (hasPendingMockLoginResponse()) {
+      const response = await consumeNextLoginResponse();
+      if (!isLoginResponse(response)) {
+        return {
+          ...signingInState,
+          authErrorMessage: 'Backend returned an invalid login response.',
+          userState: 'loggedOut'
+        };
+      }
+      if (typeof response.error === 'string' && response.error) {
+        return {
+          ...signingInState,
+          authErrorMessage: response.error,
+          userState: 'loggedOut'
+        };
+      }
+      return getLoggedInState(signingInState, response);
+    }
+    const {
+      loginUrl,
+      redirectUri
+    } = await getBackendLoginRequest(backendUrl, platform, uid);
+    await invoke$1('Open.openUrl', loginUrl, platform, authUseRedirect);
+    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri) : await waitForBackendLogin(backendUrl);
+    return {
+      ...signingInState,
+      ...authState
+    };
+  } catch (error) {
+    const errorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
+    return {
+      ...signingInState,
+      ...getLoggedOutBackendAuthState(errorMessage)
+    };
+  }
+};
+
+const handleClickLogout = async state => {
+  const loggingOutState = {
+    ...state,
+    authErrorMessage: '',
+    userState: 'loggingOut'
+  };
+  if (state.uid) {
+    set(state.uid, state, loggingOutState);
+    await invoke('Chat.rerender');
+  }
+  if (state.useAuthWorker) {
+    await logout$1({
+      backendUrl: state.backendUrl
+    });
+  } else {
+    await logoutFromBackend(state.backendUrl);
+  }
+  return {
+    ...loggingOutState,
+    ...getLoggedOutBackendAuthState()
+  };
+};
+
+const handleClickModelPickerListIndex = async (state, index) => {
+  const {
+    models,
+    visibleModels
+  } = state;
+  if (index < 0 || index >= visibleModels.length) {
+    return state;
+  }
+  return {
+    ...state,
+    modelPickerHeight: getModelPickerHeight(state.modelPickerHeaderHeight, models.length),
+    modelPickerListScrollTop: 0,
+    modelPickerOpen: false,
+    modelPickerSearchValue: '',
+    selectedModelId: visibleModels[index].id,
+    visibleModels: models
+  };
+};
+
+const handleClickOpenApiApiKeySettings = async state => {
+  await invoke('Main.openUri', 'app://settings.json');
+  return state;
+};
+
+const handleClickOpenApiApiKeyWebsite = async state => {
+  await openExternal(state.openApiApiKeysSettingsUrl);
+  return state;
+};
+
+const handleClickOpenRouterApiKeySettings = async state => {
+  await invoke('Main.openUri', 'app://settings.json');
+  return state;
+};
+
+const handleClickOpenRouterApiKeyWebsite = async state => {
+  await openExternal(state.openRouterApiKeysSettingsUrl);
+  return state;
+};
+
+const get = async key => {
+  return getPreference(key);
+};
+const update = async settings => {
+  await invoke('Preferences.update', settings);
+};
+
+const setOpenApiApiKey = async (state, openApiApiKey, persist = true) => {
+  if (persist) {
+    await update({
+      'secrets.openApiKey': openApiApiKey
+    });
+  }
+  return {
+    ...state,
+    openApiApiKey,
+    openApiApiKeyInput: openApiApiKey
+  };
+};
+
+const handleClickSaveOpenApiApiKey = async state => {
+  const {
+    openApiApiKeyInput
+  } = state;
+  const openApiApiKey = openApiApiKeyInput.trim();
+  if (!openApiApiKey) {
+    return state;
+  }
+  const optimisticState = {
+    ...state,
+    openApiApiKeyState: 'saving'
+  };
+  set(state.uid, state, optimisticState);
+  await invoke('Chat.rerender');
+  const persistedState = await setOpenApiApiKey(optimisticState, openApiApiKey);
+  const updatedState = {
+    ...persistedState,
+    openApiApiKeyState: 'idle'
+  };
+  const session = updatedState.sessions.find(item => item.id === updatedState.selectedSessionId);
+  if (!session) {
+    return updatedState;
+  }
+  const lastMessage = session.messages.at(-1);
+  const shouldRetryOpenApi = lastMessage?.role === 'assistant' && lastMessage.text === openApiApiKeyRequiredMessage;
+  if (!shouldRetryOpenApi) {
+    return updatedState;
+  }
+  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
+  if (!previousUserMessage) {
+    return updatedState;
+  }
+  const retryMessages = session.messages.slice(0, -1);
+  const assistantMessage = await getAiResponse({
+    agentMode: updatedState.agentMode,
+    assetDir: updatedState.assetDir,
+    maxToolCalls: updatedState.maxToolCalls,
+    messages: retryMessages,
+    mockAiResponseDelay: updatedState.mockAiResponseDelay,
+    mockApiCommandId: updatedState.mockApiCommandId,
+    models: updatedState.models,
+    nextMessageId: updatedState.nextMessageId,
+    openApiApiBaseUrl: updatedState.openApiApiBaseUrl,
+    openApiApiKey: updatedState.openApiApiKey,
+    openRouterApiBaseUrl: updatedState.openRouterApiBaseUrl,
+    openRouterApiKey: updatedState.openRouterApiKey,
+    platform: updatedState.platform,
+    selectedModelId: updatedState.selectedModelId,
+    streamingEnabled: updatedState.streamingEnabled,
+    systemPrompt: updatedState.systemPrompt,
+    useChatCoordinatorWorker: updatedState.useChatCoordinatorWorker,
+    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
+    useMockApi: updatedState.useMockApi,
+    useOwnBackend: updatedState.useOwnBackend,
+    userText: previousUserMessage.text
+  });
+  const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
+  const updatedSession = {
+    ...session,
+    messages: [...session.messages.slice(0, -1), assistantMessage]
+  };
+  await saveChatSession(updatedSession);
+  const updatedSessions = updatedState.sessions.map(item => {
+    if (item.id !== updatedState.selectedSessionId) {
+      return item;
+    }
+    return updatedSession;
+  });
+  return {
+    ...updatedState,
+    nextMessageId: updatedState.nextMessageId + 1,
+    openApiApiKeyState: 'idle',
+    parsedMessages,
+    sessions: updatedSessions
+  };
+};
+
+const setOpenRouterApiKey = async (state, openRouterApiKey, persist = true) => {
+  if (persist) {
+    await update({
+      'secrets.openRouterApiKey': openRouterApiKey
+    });
+  }
+  return {
+    ...state,
+    openRouterApiKey,
+    openRouterApiKeyInput: openRouterApiKey
+  };
+};
+
+const handleClickSaveOpenRouterApiKey = async state => {
+  const {
+    openRouterApiKeyInput
+  } = state;
+  const openRouterApiKey = openRouterApiKeyInput.trim();
+  if (!openRouterApiKey) {
+    return state;
+  }
+  const optimisticState = {
+    ...state,
+    openRouterApiKeyState: 'saving'
+  };
+  set(state.uid, state, optimisticState);
+  await invoke('Chat.rerender');
+  const persistedState = await setOpenRouterApiKey(optimisticState, openRouterApiKey);
+  const updatedState = {
+    ...persistedState,
+    openRouterApiKeyState: 'idle'
+  };
+  const session = updatedState.sessions.find(item => item.id === updatedState.selectedSessionId);
+  if (!session) {
+    return updatedState;
+  }
+  const lastMessage = session.messages.at(-1);
+  const shouldRetryOpenRouter = lastMessage?.role === 'assistant' && lastMessage.text === openRouterApiKeyRequiredMessage;
+  if (!shouldRetryOpenRouter) {
+    return updatedState;
   }
-  updatedSessions = updateSessionStatus(updatedSessions, latestState.selectedSessionId, 'finished');
-  const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
-  if (selectedSession) {
-    await saveChatSession(selectedSession);
+  const previousUserMessage = session.messages.toReversed().find(item => item.role === 'user');
+  if (!previousUserMessage) {
+    return updatedState;
   }
-  return withUpdatedMessageScrollTop(focusInput({
-    ...latestState,
-    mockOpenApiRequests,
-    nextMessageId: latestState.nextMessageId + 1,
-    parsedMessages: finalParsedMessages,
+  const retryMessages = session.messages.slice(0, -1);
+  const assistantMessage = await getAiResponse({
+    agentMode: updatedState.agentMode,
+    assetDir: updatedState.assetDir,
+    maxToolCalls: updatedState.maxToolCalls,
+    messages: retryMessages,
+    mockAiResponseDelay: updatedState.mockAiResponseDelay,
+    mockApiCommandId: updatedState.mockApiCommandId,
+    models: updatedState.models,
+    nextMessageId: updatedState.nextMessageId,
+    openApiApiBaseUrl: updatedState.openApiApiBaseUrl,
+    openApiApiKey: updatedState.openApiApiKey,
+    openRouterApiBaseUrl: updatedState.openRouterApiBaseUrl,
+    openRouterApiKey,
+    platform: updatedState.platform,
+    selectedModelId: updatedState.selectedModelId,
+    systemPrompt: updatedState.systemPrompt,
+    useChatCoordinatorWorker: updatedState.useChatCoordinatorWorker,
+    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
+    useMockApi: updatedState.useMockApi,
+    useOwnBackend: updatedState.useOwnBackend,
+    userText: previousUserMessage.text
+  });
+  const parsedMessages = await parseAndStoreMessageContent(updatedState.parsedMessages, assistantMessage);
+  const updatedSession = {
+    ...session,
+    messages: [...session.messages.slice(0, -1), assistantMessage]
+  };
+  await saveChatSession(updatedSession);
+  const updatedSessions = updatedState.sessions.map(item => {
+    if (item.id !== updatedState.selectedSessionId) {
+      return item;
+    }
+    return updatedSession;
+  });
+  return {
+    ...updatedState,
+    nextMessageId: updatedState.nextMessageId + 1,
+    openRouterApiKeyState: 'idle',
+    parsedMessages,
     sessions: updatedSessions
-  }));
+  };
 };
 
 const handleClickSend = async state => {
@@ -9375,11 +9476,16 @@ const selectSession = async (state, id) => {
     }
     return loadedSession;
   });
+  const selectedSession = hydratedSessions.find(session => session.id === id);
+  const parsedMessages = selectedSession ? await parseAndStoreMessagesContent(state.parsedMessages, selectedSession.messages) : state.parsedMessages;
   return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
     lastNormalViewMode: viewMode === 'chat-focus' ? lastNormalViewMode : 'detail',
+    messagesAutoScrollEnabled: true,
+    messagesScrollTop: getNextAutoScrollTop(state.messagesScrollTop),
+    parsedMessages,
     renamingSessionId: '',
     selectedSessionId: id,
     sessions: hydratedSessions,
@@ -9483,7 +9589,8 @@ const selectListIndex = async (state, index) => {
     ...nextState,
     focus: 'list',
     focused: true,
-    listFocusedIndex: index
+    listFocusedIndex: index,
+    listFocusOutline: false
   };
 };
 
@@ -9494,7 +9601,8 @@ const handleClickList = async (state, eventX, eventY) => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   const visibleSessions = getVisibleSessions(state.sessions, state.selectedProjectId);
@@ -9503,7 +9611,8 @@ const handleClickList = async (state, eventX, eventY) => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   return selectListIndex(state, index);
@@ -9520,6 +9629,8 @@ const handleClick = async (state, name, id = '', eventX = 0, eventY = 0) => {
       return handleClickCreateProject(state);
     case name === CreatePullRequest$1:
       return handleClickCreatePullRequest(state);
+    case name === ImplementPlan:
+      return handleClickImplementPlan(state);
     case isCreateSessionInProjectInputName(name):
       {
         const projectId = getProjectIdFromCreateSessionInProjectInputName(name);
@@ -9785,6 +9896,7 @@ const handleModelInputBlur = async state => {
     focus: 'composer',
     focused: true,
     listFocusedIndex: -1,
+    listFocusOutline: false,
     modelPickerHeight: getModelPickerHeight(state.modelPickerHeaderHeight, state.models.length),
     modelPickerListScrollTop: 0,
     modelPickerOpen: false,
@@ -10070,7 +10182,8 @@ const handleInputFocus = async (state, name) => {
       ...state,
       focus: 'send-button',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   if (name === ChatList$1) {
@@ -10078,7 +10191,8 @@ const handleInputFocus = async (state, name) => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   if (isSessionInputName(name) || name === SessionDelete) {
@@ -10091,7 +10205,8 @@ const handleInputFocus = async (state, name) => {
       ...state,
       focus: 'list',
       focused: true,
-      listFocusedIndex: focusedIndex
+      listFocusedIndex: focusedIndex,
+      listFocusOutline: false
     };
   }
   if (name === CreateSession || name === SessionDebug || name === Settings || name === CloseChat || name === Back) {
@@ -10099,12 +10214,14 @@ const handleInputFocus = async (state, name) => {
       ...state,
       focus: 'header',
       focused: true,
-      listFocusedIndex: -1
+      listFocusedIndex: -1,
+      listFocusOutline: false
     };
   }
   return {
     ...state,
-    focused: false
+    focused: false,
+    listFocusOutline: false
   };
 };
 
@@ -10804,6 +10921,15 @@ const loadReasoningPickerEnabled = async () => {
   }
 };
 
+const loadRunModePickerEnabled = async () => {
+  try {
+    const savedRunModePickerEnabled = await get('chatView.runModePickerEnabled');
+    return typeof savedRunModePickerEnabled === 'boolean' ? savedRunModePickerEnabled : true;
+  } catch {
+    return true;
+  }
+};
+
 const loadScrollDownButtonEnabled = async () => {
   try {
     const savedScrollDownButtonEnabled = await get('chatView.scrollDownButtonEnabled');
@@ -10822,6 +10948,15 @@ const loadSearchEnabled = async () => {
   }
 };
 
+const loadShowChatListTime = async () => {
+  try {
+    const savedShowChatListTime = await get('chatView.showChatListTime');
+    return typeof savedShowChatListTime === 'boolean' ? savedShowChatListTime : true;
+  } catch {
+    return true;
+  }
+};
+
 const loadStreamingEnabled = async () => {
   try {
     const savedStreamingEnabled = await get('chatView.streamingEnabled');
@@ -10913,7 +11048,7 @@ const loadVoiceDictationEnabled = async () => {
 };
 
 const loadPreferences = async () => {
-  const [aiSessionTitleGenerationEnabled, authEnabled, authUseRedirect, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useAuthWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadAuthUseRedirect(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseAuthWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
+  const [aiSessionTitleGenerationEnabled, authEnabled, authUseRedirect, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, runModePickerEnabled, scrollDownButtonEnabled, searchEnabled, showChatListTime, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useAuthWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadAuthUseRedirect(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadRunModePickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadShowChatListTime(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseAuthWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
   return {
     aiSessionTitleGenerationEnabled,
     authEnabled,
@@ -10926,8 +11061,10 @@ const loadPreferences = async () => {
     openRouterApiKey,
     passIncludeObfuscation,
     reasoningPickerEnabled,
+    runModePickerEnabled,
     scrollDownButtonEnabled,
     searchEnabled,
+    showChatListTime,
     streamingEnabled,
     todoListToolEnabled,
     toolEnablement,
@@ -10958,11 +11095,15 @@ const loadSelectedSessionMessages = async (sessions, selectedSessionId) => {
 };
 
 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
@@ -11000,8 +11141,10 @@ const loadContent = async (state, savedState) => {
     openRouterApiKey,
     passIncludeObfuscation,
     reasoningPickerEnabled,
+    runModePickerEnabled,
     scrollDownButtonEnabled,
     searchEnabled,
+    showChatListTime,
     streamingEnabled,
     todoListToolEnabled,
     toolEnablement,
@@ -11115,6 +11258,8 @@ const loadContent = async (state, savedState) => {
     selectedProjectId,
     selectedSessionId,
     sessions,
+    showChatListTime,
+    showRunMode: runModePickerEnabled,
     streamingEnabled,
     todoListToolEnabled,
     toolEnablement,
@@ -11245,6 +11390,9 @@ const applySessionOptions = (session, options) => {
     ...(options.branchName ? {
       branchName: options.branchName
     } : {}),
+    ...(options.lastActiveTime ? {
+      lastActiveTime: options.lastActiveTime
+    } : {}),
     ...(options.projectId ? {
       projectId: options.projectId
     } : {}),
@@ -11369,6 +11517,24 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
  --WidgetBorder: white;
 }
 
+.ChatHeaderAuth{
+  align-items: center;
+  display: flex;
+  gap: 8px;
+  min-width: 0;
+}
+
+.ChatHeaderAuthName{
+  max-width: 180px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ChatHeaderAuth .Button{
+  white-space: nowrap;
+}
+
 .ChatSendAreaBottom{
   height: ${buttonsHeight}px;
 }
@@ -11491,8 +11657,12 @@ const ChatInputBox = 'ChatInputBox';
 const ChatList = 'ChatList';
 const ChatListEmpty = 'ChatListEmpty';
 const ChatListItem = 'ChatListItem';
+const ChatListItemContent = 'ChatListItemContent';
+const ChatListItemFocusOutline = 'ChatListItemFocusOutline';
 const ChatListItemFocused = 'ChatListItemFocused';
 const ChatListItemLabel = 'ChatListItemLabel';
+const ChatListItemTime = 'ChatListItemTime';
+const ChatListItemTitle = 'ChatListItemTitle';
 const ChatListItemStatusFinished = 'ChatListItemStatusFinished';
 const ChatListItemStatusIcon = 'ChatListItemStatusIcon';
 const ChatListItemStatusInProgress = 'ChatListItemStatusInProgress';
@@ -11567,6 +11737,7 @@ const CustomSelectPopOver = 'CustomSelectPopOver';
 const Deletion = 'Deletion';
 const Empty = '';
 const FileIcon = 'FileIcon';
+const FocusOutline = 'FocusOutline';
 const IconButton = 'IconButton';
 const IconButtonDisabled = 'IconButtonDisabled';
 const ImageElement = 'ImageElement';
@@ -11582,6 +11753,7 @@ const MarkdownQuote = 'MarkdownQuote';
 const MarkdownTable = 'MarkdownTable';
 const MaskIcon = 'MaskIcon';
 const MaskIconAdd = 'MaskIconAdd';
+const MaskIconArchive = 'MaskIconArchive';
 const MaskIconArrowLeft = 'MaskIconArrowLeft';
 const MaskIconChevronDown = 'MaskIconChevronDown';
 const MaskIconChevronRight = 'MaskIconChevronRight';
@@ -11700,7 +11872,7 @@ const getAddContextButtonDom = () => {
   }];
 };
 
-const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '') => {
+const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '', selectChevronEnabled = true) => {
   const getChevronDom = expanded => {
     return {
       childCount: 0,
@@ -11718,7 +11890,7 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
     'aria-haspopup': 'true',
     'aria-label': ariaLabel,
     ariaLabel,
-    childCount: 2,
+    childCount: selectChevronEnabled ? 2 : 1,
     className: ChatSelect,
     inputType: 'button',
     name,
@@ -11731,22 +11903,22 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
     name,
     role: None$1,
     type: Span
-  }, text(label), getChevronDom(open)];
+  }, text(label), ...(selectChevronEnabled ? [getChevronDom(open)] : [])];
 };
 
-const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '') => {
-  return getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel, ariaControls);
+const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '', selectChevronEnabled = true) => {
+  return getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel, ariaControls, selectChevronEnabled);
 };
 
-const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen) => {
-  return getCustomSelectPickerToggleVirtualDom(getAgentModeLabel(selectedAgentMode), AgentModePickerToggle, agentModePickerOpen, HandleClickAgentModePickerToggle);
+const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen, selectChevronEnabled = true) => {
+  return getCustomSelectPickerToggleVirtualDom(getAgentModeLabel(selectedAgentMode), AgentModePickerToggle, agentModePickerOpen, HandleClickAgentModePickerToggle, undefined, undefined, undefined, selectChevronEnabled);
 };
 
-const getChatModelPickerToggleVirtualDom = (models, selectedModelId, modelPickerOpen) => {
+const getChatModelPickerToggleVirtualDom = (models, selectedModelId, modelPickerOpen, selectChevronEnabled = true) => {
   const selectedModel = models.find(model => model.id === selectedModelId);
   const selectedModelLabel = selectedModel ? selectedModel.name : selectedModelId;
   const pickModelLabel = pickModel(selectedModelLabel);
-  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle, pickModelLabel, pickModelLabel, ModelPickerList);
+  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle, pickModelLabel, pickModelLabel, ModelPickerList, selectChevronEnabled);
 };
 
 const getCreatePullRequestButtonDom = () => {
@@ -11768,24 +11940,20 @@ const getCustomSelectOptionVirtualDom = (name, label, selected, detail = '') =>
   const className = mergeClassNames(ChatModelPickerItem, selected ? ChatModelPickerItemSelected : '');
   const hasDetail = detail !== '';
   return [{
-    childCount: 1,
-    type: Li
-  }, {
+    'aria-selected': selected ? 'true' : 'false',
     childCount: hasDetail ? 2 : 1,
     className,
-    inputType: 'button',
     name,
     onClick: HandleClick,
-    type: Button$1
+    role: 'option',
+    type: Li
   }, {
     childCount: 1,
     className: ChatModelPickerItemLabel,
-    name,
     type: Span
   }, text(label), ...(hasDetail ? [{
     childCount: 1,
     className: ChatModelPickerItemUsageCost,
-    name,
     type: Span
   }, text(detail)] : [])];
 };
@@ -11821,13 +11989,13 @@ const getBranchPickerMessageDom = (gitBranches, errorMessage) => {
     type: Text
   }];
 };
-const getGitBranchPickerVirtualDom = (gitBranches, gitBranchPickerOpen, gitBranchPickerErrorMessage, fallbackBranchName) => {
+const getGitBranchPickerVirtualDom = (gitBranches, gitBranchPickerOpen, gitBranchPickerErrorMessage, fallbackBranchName, selectChevronEnabled = true) => {
   const label = getCurrentBranchLabel(gitBranches, fallbackBranchName);
   const branchOptions = getBranchOptionsVirtualDom(gitBranches);
   const messageDom = getBranchPickerMessageDom(gitBranches, gitBranchPickerErrorMessage);
   const showMessage = messageDom.length > 0;
   const popOverHeight = gitBranches.length * itemHeight + (showMessage ? messageHeight : 0);
-  return [...getCustomSelectPickerToggleVirtualDom(label, GitBranchPickerToggle, gitBranchPickerOpen, HandleClickGitBranchPickerToggle, 'Switch branch', 'Switch branch'), ...(gitBranchPickerOpen ? [{
+  return [...getCustomSelectPickerToggleVirtualDom(label, GitBranchPickerToggle, gitBranchPickerOpen, HandleClickGitBranchPickerToggle, 'Switch branch', 'Switch branch', undefined, selectChevronEnabled), ...(gitBranchPickerOpen ? [{
     childCount: 1,
     className: ChatModelPickerContainer,
     onClick: HandleClickCustomSelectOverlay,
@@ -11840,10 +12008,26 @@ const getGitBranchPickerVirtualDom = (gitBranches, gitBranchPickerOpen, gitBranc
   }, ...messageDom, {
     childCount: branchOptions.length / 4,
     className: ChatModelPickerList,
+    role: 'listbox',
     type: Ul
   }, ...branchOptions] : [])];
 };
 
+const getImplementPlanButtonDom = () => {
+  return [{
+    childCount: 1,
+    className: mergeClassNames(Button, ButtonSecondary),
+    inputType: 'button',
+    name: ImplementPlan,
+    onClick: HandleClick,
+    title: implement(),
+    type: Button$1
+  }, {
+    text: implement(),
+    type: Text
+  }];
+};
+
 const reasoningEffortPickerHeight = reasoningEfforts.length * 28;
 const getReasoningEffortOptionsVirtualDom = selectedReasoningEffort => {
   return reasoningEfforts.flatMap(reasoningEffort => {
@@ -11852,8 +12036,8 @@ const getReasoningEffortOptionsVirtualDom = selectedReasoningEffort => {
     return getCustomSelectOptionVirtualDom(getReasoningEffortPickerItemInputName(reasoningEffort), displayLabel, reasoningEffort === selectedReasoningEffort);
   });
 };
-const getReasoningEffortPickerVirtualDom = (selectedReasoningEffort, reasoningEffortPickerOpen) => {
-  return [...getCustomSelectPickerToggleVirtualDom(getReasoningEffortLabel(selectedReasoningEffort), ReasoningEffortPickerToggle, reasoningEffortPickerOpen, HandleClickReasoningEffortPickerToggle, 'Reasoning', 'Reasoning'), ...(reasoningEffortPickerOpen ? [{
+const getReasoningEffortPickerVirtualDom = (selectedReasoningEffort, reasoningEffortPickerOpen, selectChevronEnabled = true) => {
+  return [...getCustomSelectPickerToggleVirtualDom(getReasoningEffortLabel(selectedReasoningEffort), ReasoningEffortPickerToggle, reasoningEffortPickerOpen, HandleClickReasoningEffortPickerToggle, 'Reasoning', 'Reasoning', undefined, selectChevronEnabled), ...(reasoningEffortPickerOpen ? [{
     childCount: 1,
     className: ChatModelPickerContainer,
     onClick: HandleClickCustomSelectOverlay,
@@ -11867,13 +12051,14 @@ const getReasoningEffortPickerVirtualDom = (selectedReasoningEffort, reasoningEf
     childCount: reasoningEfforts.length,
     className: ChatModelPickerList,
     name: PickerList,
+    role: 'listbox',
     tabIndex: -1,
     type: Ul
   }, ...getReasoningEffortOptionsVirtualDom(selectedReasoningEffort)] : [])];
 };
 
-const getRunModePickerVirtualDom = (selectedRunMode, runModePickerOpen) => {
-  return getCustomSelectPickerToggleVirtualDom(selectedRunMode, RunModePickerToggle, runModePickerOpen, HandleClickRunModePickerToggle);
+const getRunModePickerVirtualDom = (selectedRunMode, runModePickerOpen, selectChevronEnabled = true) => {
+  return getCustomSelectPickerToggleVirtualDom(selectedRunMode, RunModePickerToggle, runModePickerOpen, HandleClickRunModePickerToggle, undefined, undefined, undefined, selectChevronEnabled);
 };
 
 const getScrollDownButtonDom = () => {
@@ -11891,13 +12076,8 @@ const getScrollDownButtonDom = () => {
   }];
 };
 
-const getSendButtonClassName = isSendDisabled => {
-  return mergeClassNames(IconButton, isSendDisabled ? SendButtonDisabled : '');
-};
-
-const getSendButtonDom = (isSendDisabled, voiceDictationEnabled, isSessionInProgress) => {
-  const sendButtonClassName = getSendButtonClassName(isSendDisabled);
-  return [...(voiceDictationEnabled ? [{
+const getDictationButtonDom = () => {
+  return [{
     childCount: 1,
     className: IconButton,
     name: Dictate,
@@ -11908,7 +12088,11 @@ const getSendButtonDom = (isSendDisabled, voiceDictationEnabled, isSessionInProg
     childCount: 0,
     className: 'MaskIcon MaskIconMic',
     type: Div
-  }] : []), ...(isSessionInProgress ? [{
+  }];
+};
+
+const getStopButtonDom = () => {
+  return [{
     buttonType: 'button',
     childCount: 1,
     className: Button,
@@ -11916,7 +12100,16 @@ const getSendButtonDom = (isSendDisabled, voiceDictationEnabled, isSessionInProg
     onClick: HandleClick,
     title: stop(),
     type: Button$1
-  }, text(stop())] : [{
+  }, text(stop())];
+};
+
+const getSendButtonClassName = isSendDisabled => {
+  return mergeClassNames(IconButton, isSendDisabled ? SendButtonDisabled : '');
+};
+
+const getSubmitButtonDom = isSendDisabled => {
+  const sendButtonClassName = getSendButtonClassName(isSendDisabled);
+  return [{
     buttonType: 'submit',
     childCount: 1,
     className: sendButtonClassName,
@@ -11929,7 +12122,11 @@ const getSendButtonDom = (isSendDisabled, voiceDictationEnabled, isSessionInProg
     className: 'MaskIcon MaskIconArrowUp',
     role: 'none',
     type: Div
-  }])];
+  }];
+};
+
+const getSendButtonDom = (isSendDisabled, voiceDictationEnabled, isSessionInProgress) => {
+  return [...(voiceDictationEnabled ? getDictationButtonDom() : []), ...(isSessionInProgress ? getStopButtonDom() : getSubmitButtonDom(isSendDisabled))];
 };
 
 const getTodoItemClassName = status => {
@@ -12111,13 +12308,13 @@ const getComposerTextAreaDom = () => {
   };
 };
 
-const getChatSendAreaDom = (composerValue, composerAttachments, agentMode, agentModePickerOpen, gitBranchPickerVisible, gitBranchPickerOpen, gitBranchPickerErrorMessage, gitBranches, fallbackBranchName, hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton = false, voiceDictationEnabled = false, isSessionInProgress = false, scrollDownButtonEnabled = false, messagesAutoScrollEnabled = true) => {
+const getChatSendAreaDom = (composerValue, composerAttachments, agentMode, agentModePickerOpen, gitBranchPickerVisible, gitBranchPickerOpen, gitBranchPickerErrorMessage, gitBranches, fallbackBranchName, hasSpaceForAgentModePicker, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton = false, showImplementPlanButton = false, voiceDictationEnabled = false, isSessionInProgress = false, scrollDownButtonEnabled = false, messagesAutoScrollEnabled = true) => {
   const isSendDisabled = composerValue.trim() === '';
   const showAgentModePicker = hasSpaceForAgentModePicker;
   const showGitBranchPicker = gitBranchPickerVisible || Boolean(fallbackBranchName);
   const showResponsiveRunModePicker = showRunMode && hasSpaceForRunModePicker;
   const showScrollDownButton = scrollDownButtonEnabled && !messagesAutoScrollEnabled;
-  const bottomControlsCount = 2 + (usageOverviewEnabled ? 1 : 0) + (addContextButtonEnabled ? 1 : 0) + (showCreatePullRequestButton ? 1 : 0) + (showGitBranchPicker ? 1 : 0) + (voiceDictationEnabled ? 1 : 0) + (showScrollDownButton ? 1 : 0);
+  const bottomControlsCount = 2 + (usageOverviewEnabled ? 1 : 0) + (addContextButtonEnabled ? 1 : 0) + (showCreatePullRequestButton ? 1 : 0) + (showImplementPlanButton ? 1 : 0) + (showGitBranchPicker ? 1 : 0) + (voiceDictationEnabled ? 1 : 0) + (showScrollDownButton ? 1 : 0);
   const primaryControlsCount = 1 + (showAgentModePicker ? 1 : 0) + (reasoningPickerEnabled ? 1 : 0) + (showResponsiveRunModePicker ? 1 : 0);
   const hasTodoList = todoListToolEnabled && todoListItems.length > 0;
   const hasComposerAttachments = composerAttachments.length > 0;
@@ -12141,12 +12338,9 @@ const getChatSendAreaDom = (composerValue, composerAttachments, agentMode, agent
     className: ChatSendAreaPrimaryControls,
     role: 'toolbar',
     type: Div
-  }, ...(showAgentModePicker ? getAgentModePickerVirtualDom(agentMode, agentModePickerOpen) : []), ...getChatModelPickerToggleVirtualDom(models, selectedModelId, modelPickerOpen), ...(reasoningPickerEnabled ? getReasoningEffortPickerVirtualDom(reasoningEffort, reasoningEffortPickerOpen) : []), ...(showResponsiveRunModePicker ? getRunModePickerVirtualDom(runMode, runModePickerOpen) : []), ...(usageOverviewEnabled ? getUsageOverviewDom(tokensUsed, tokensMax) : []), ...(addContextButtonEnabled ? getAddContextButtonDom() : []), ...(showCreatePullRequestButton ? getCreatePullRequestButtonDom() : []), ...(showGitBranchPicker ? getGitBranchPickerVirtualDom(gitBranches, gitBranchPickerOpen, gitBranchPickerErrorMessage, fallbackBranchName) : []), ...(showScrollDownButton ? getScrollDownButtonDom() : []), ...getSendButtonDom(isSendDisabled, voiceDictationEnabled, isSessionInProgress)];
+  }, ...(showAgentModePicker ? getAgentModePickerVirtualDom(agentMode, agentModePickerOpen, selectChevronEnabled) : []), ...getChatModelPickerToggleVirtualDom(models, selectedModelId, modelPickerOpen, selectChevronEnabled), ...(reasoningPickerEnabled ? getReasoningEffortPickerVirtualDom(reasoningEffort, reasoningEffortPickerOpen, selectChevronEnabled) : []), ...(showResponsiveRunModePicker ? getRunModePickerVirtualDom(runMode, runModePickerOpen, selectChevronEnabled) : []), ...(usageOverviewEnabled ? getUsageOverviewDom(tokensUsed, tokensMax) : []), ...(addContextButtonEnabled ? getAddContextButtonDom() : []), ...(showCreatePullRequestButton ? getCreatePullRequestButtonDom() : []), ...(showImplementPlanButton ? getImplementPlanButtonDom() : []), ...(showGitBranchPicker ? getGitBranchPickerVirtualDom(gitBranches, gitBranchPickerOpen, gitBranchPickerErrorMessage, fallbackBranchName, selectChevronEnabled) : []), ...(showScrollDownButton ? getScrollDownButtonDom() : []), ...getSendButtonDom(isSendDisabled, voiceDictationEnabled, isSessionInProgress)];
 };
 
-const authContainerStyle = 'align-items:center;display:flex;gap:8px;min-width:0;';
-const authNameStyle = 'max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;';
-const authButtonStyle = 'white-space:nowrap;';
 const getButtonLabel = (userState, isAuthenticated) => {
   if (userState === 'loggingOut') {
     return loggingOutFromBackend();
@@ -12172,12 +12366,10 @@ const getChatHeaderAuthDom = (authEnabled = false, userState = 'loggedOut', user
   return [{
     childCount: isAuthenticated ? 2 : 1,
     className: ChatHeaderAuth,
-    style: authContainerStyle,
     type: Div
   }, ...(isAuthenticated ? [{
     childCount: 1,
     className: ChatHeaderAuthName,
-    style: authNameStyle,
     title: displayName,
     type: Span
   }, text(displayName)] : []), {
@@ -12187,7 +12379,6 @@ const getChatHeaderAuthDom = (authEnabled = false, userState = 'loggedOut', user
     inputType: 'button',
     name: buttonName,
     onClick: HandleClick,
-    style: authButtonStyle,
     title: buttonTitle,
     type: Button$1
   }, text(buttonLabel)];
@@ -12298,6 +12489,7 @@ const getCustomSelectPopOverVirtualDom = (optionCount, height, optionNodes, cont
     childCount: optionCount,
     className: ChatModelPickerList,
     name: PickerList,
+    role: 'listbox',
     tabIndex: -1,
     type: Ul
   }, ...optionNodes];
@@ -12464,7 +12656,7 @@ const getRunModeOptionsVirtualDom = selectedRunMode => {
   return runModes.flatMap(runMode => getCustomSelectOptionVirtualDom(getRunModePickerItemInputName(runMode), runMode, runMode === selectedRunMode));
 };
 const getRunModePickerPopOverVirtualDom = selectedRunMode => {
-  return getCustomSelectPopOverVirtualDom(runModes.length, runModePickerHeight, getRunModeOptionsVirtualDom(selectedRunMode), RunModePickerContainer, RunModePickerPopOver, false);
+  return getCustomSelectPopOverVirtualDom(runModes.length, runModePickerHeight, getRunModeOptionsVirtualDom(selectedRunMode), RunModePickerContainer, RunModePickerPopOver);
 };
 
 const getChatOverlaysVirtualDom = ({
@@ -13170,6 +13362,33 @@ const getToolCallCreateDirectoryVirtualDom = toolCall => {
   }), ...(statusLabel ? [text(statusLabel)] : [])];
 };
 
+const getRenameTargets = rawArguments => {
+  let parsed;
+  try {
+    parsed = JSON.parse(rawArguments);
+  } catch {
+    return undefined;
+  }
+  if (!parsed || typeof parsed !== 'object') {
+    return undefined;
+  }
+  const oldUri = Reflect.get(parsed, 'oldUri');
+  const newUri = Reflect.get(parsed, 'newUri');
+  if (typeof oldUri !== 'string' || !oldUri || typeof newUri !== 'string' || !newUri) {
+    return undefined;
+  }
+  return {
+    from: {
+      clickableUri: oldUri,
+      title: oldUri
+    },
+    to: {
+      clickableUri: newUri,
+      title: newUri
+    }
+  };
+};
+
 const getToolCallArgumentPreview = rawArguments => {
   if (!rawArguments.trim()) {
     return '""';
@@ -13198,6 +13417,13 @@ const getToolCallArgumentPreview = rawArguments => {
   if (typeof query === 'string') {
     return `"${query}"`;
   }
+  const nestedArguments = Reflect.get(parsed, 'arguments');
+  if (nestedArguments && typeof nestedArguments === 'object' && !Array.isArray(nestedArguments)) {
+    const nestedQuery = Reflect.get(nestedArguments, 'query');
+    if (typeof nestedQuery === 'string') {
+      return `"${nestedQuery}"`;
+    }
+  }
   const path = Reflect.get(parsed, 'path');
   if (typeof path === 'string') {
     return `"${path}"`;
@@ -13233,9 +13459,18 @@ const getToolCallLabel = toolCall => {
   if (toolCall.name === 'write_file' && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
     return `${displayName} (in progress)`;
   }
-  if ((toolCall.name === 'list_files' || toolCall.name === 'grep_search' || toolCall.name === 'glob') && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
+  if ((toolCall.name === 'list_files' || toolCall.name === 'grep_search' || toolCall.name === 'glob' || toolCall.name === 'rename') && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
     return displayName;
   }
+  if (toolCall.name === 'rename') {
+    const renameTargets = getRenameTargets(toolCall.arguments);
+    if (renameTargets) {
+      const fromFileName = getFileNameFromUri(renameTargets.from.title);
+      const toFileName = getFileNameFromUri(renameTargets.to.title);
+      const statusLabel = getToolCallStatusLabel(toolCall);
+      return `${displayName} ${fromFileName} -> ${toFileName}${statusLabel}`;
+    }
+  }
   const argumentPreview = getToolCallArgumentPreview(toolCall.arguments);
   const statusLabel = getToolCallStatusLabel(toolCall);
   if (argumentPreview === '{}') {
@@ -13245,13 +13480,63 @@ const getToolCallLabel = toolCall => {
 };
 
 const RE_TOOL_NAME_PREFIX = /^([^ :]+)/;
+const getGrepSearchPreviewText = result => {
+  if (!result.trim()) {
+    return result;
+  }
+  try {
+    const parsed = JSON.parse(result);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      return typeof parsed === 'string' ? parsed : JSON.stringify(parsed);
+    }
+    const nestedResult = Reflect.get(parsed, 'result');
+    if (nestedResult === undefined) {
+      return JSON.stringify(parsed);
+    }
+    return typeof nestedResult === 'string' ? nestedResult : JSON.stringify(nestedResult);
+  } catch {
+    return result;
+  }
+};
+const getHoverTitle = toolCall => {
+  const trimmedArguments = toolCall.arguments.trim();
+  if (!trimmedArguments) {
+    return undefined;
+  }
+  if (toolCall.name !== 'grep_search') {
+    return toolCall.arguments;
+  }
+  try {
+    const parsed = JSON.parse(toolCall.arguments);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      return toolCall.arguments;
+    }
+    const nestedArguments = Reflect.get(parsed, 'arguments');
+    if (nestedArguments === undefined) {
+      return toolCall.arguments;
+    }
+    if (typeof nestedArguments === 'string') {
+      return nestedArguments;
+    }
+    return JSON.stringify(nestedArguments);
+  } catch {
+    return toolCall.arguments;
+  }
+};
 const getToolCallDefaultDom = toolCall => {
+  if (toolCall.name === 'grep_search' && toolCall.result) {
+    return [{
+      childCount: 1,
+      className: ChatOrderedListItem,
+      type: Li
+    }, text(getGrepSearchPreviewText(toolCall.result))];
+  }
   const label = getToolCallLabel(toolCall);
   const match = RE_TOOL_NAME_PREFIX.exec(label);
   const toolNamePrefix = match ? match[1] : label;
   const suffix = label.slice(toolNamePrefix.length);
   const hasSuffix = suffix.length > 0;
-  const hoverTitle = hasSuffix && toolCall.arguments.trim() ? toolCall.arguments : undefined;
+  const hoverTitle = hasSuffix ? getHoverTitle(toolCall) : undefined;
   return [{
     childCount: hasSuffix ? 2 : 1,
     className: ChatOrderedListItem,
@@ -13369,6 +13654,44 @@ const getToolCallReadFileVirtualDom = toolCall => {
   }), ...(globPatternLabel ? [text(globPatternLabel)] : []), ...(globMatchLabel ? [text(globMatchLabel)] : []), ...(statusLabel ? [text(statusLabel)] : [])];
 };
 
+const getToolCallRenameVirtualDom = toolCall => {
+  const targets = getRenameTargets(toolCall.arguments);
+  if (!targets) {
+    return [];
+  }
+  const fromFileName = getFileNameFromUri(targets.from.title);
+  const toFileName = getFileNameFromUri(targets.to.title);
+  const fromClickableProps = {
+    'data-uri': targets.from.clickableUri,
+    onClick: HandleClickFileName
+  };
+  const toClickableProps = {
+    'data-uri': targets.to.clickableUri,
+    onClick: HandleClickFileName
+  };
+  const statusLabel = getToolCallStatusLabel(toolCall);
+  return [{
+    childCount: statusLabel ? 6 : 5,
+    className: ChatOrderedListItem,
+    title: `${targets.from.title} -> ${targets.to.title}`,
+    type: Li
+  }, {
+    childCount: 0,
+    className: FileIcon,
+    type: Div
+  }, {
+    childCount: 1,
+    className: ToolCallName,
+    type: Span
+  }, text('rename '), ...getToolCallFileNameDom(fromFileName, {
+    clickableProps: fromClickableProps,
+    title: targets.from.title
+  }), text(' -> '), ...getToolCallFileNameDom(toFileName, {
+    clickableProps: toClickableProps,
+    title: targets.to.title
+  }), ...(statusLabel ? [text(statusLabel)] : [])];
+};
+
 const maxHtmlLength = 40_000;
 const tokenRegex = /<!--[\s\S]*?-->|<\/?[a-zA-Z][\w:-]*(?:\s[^<>]*?)?>|[^<]+/g;
 const attributeRegex = /([^\s=/>]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
@@ -13706,8 +14029,8 @@ const parseWriteFileLineCounts = rawResult => {
       linesDeleted: 0
     };
   }
-  const linesAdded = Reflect.get(parsed, 'linesAdded');
-  const linesDeleted = Reflect.get(parsed, 'linesDeleted');
+  const linesAdded = Reflect.get(parsed, 'addedLines') ?? Reflect.get(parsed, 'linesAdded');
+  const linesDeleted = Reflect.get(parsed, 'removedLines') ?? Reflect.get(parsed, 'linesDeleted');
   return {
     linesAdded: typeof linesAdded === 'number' ? Math.max(0, linesAdded) : 0,
     linesDeleted: typeof linesDeleted === 'number' ? Math.max(0, linesDeleted) : 0
@@ -13786,6 +14109,12 @@ const getToolCallDom = toolCall => {
       return virtualDom;
     }
   }
+  if (toolCall.name === 'rename') {
+    const virtualDom = getToolCallRenameVirtualDom(toolCall);
+    if (virtualDom.length > 0) {
+      return virtualDom;
+    }
+  }
   if (toolCall.name === 'render_html') {
     const virtualDom = getToolCallRenderHtmlVirtualDom(toolCall);
     if (virtualDom.length > 0) {
@@ -14223,6 +14552,7 @@ const getChatModeChatFocusVirtualDom = ({
   runMode,
   runModePickerOpen = false,
   scrollDownButtonEnabled,
+  selectChevronEnabled,
   selectedModelId,
   selectedProjectId = '',
   selectedSessionId,
@@ -14244,6 +14574,8 @@ const getChatModeChatFocusVirtualDom = ({
   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 isDropOverlayVisible = composerDropEnabled && composerDropActive;
   const isComposerAttachmentPreviewOverlayVisible = !!composerAttachmentPreviewOverlayAttachmentId;
   const isAgentModePickerVisible = hasSpaceForAgentModePicker && agentModePickerOpen;
@@ -14251,7 +14583,6 @@ const getChatModeChatFocusVirtualDom = ({
   const isRunModePickerVisible = showRunMode && hasSpaceForRunModePicker && runModePickerOpen;
   const hasVisibleOverlays = isDropOverlayVisible || isComposerAttachmentPreviewOverlayVisible || isAgentModePickerVisible || isNewModelPickerVisible || isRunModePickerVisible;
   const chatRootChildCount = 2 + (hasVisibleOverlays ? 1 : 0);
-  const isSelectedSessionInProgress = selectedSession ? getChatSessionStatus(selectedSession) === 'in-progress' : false;
   return [{
     childCount: chatRootChildCount + 1,
     className: mergeClassNames(Viewlet, Chat, ChatFocus),
@@ -14271,7 +14602,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 || '', hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
+  }, ...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 || '', hasSpaceForAgentModePicker, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14411,6 +14742,7 @@ const getChatModeDetailVirtualDom = ({
   runMode,
   runModePickerOpen = false,
   scrollDownButtonEnabled,
+  selectChevronEnabled,
   selectedModelId,
   selectedSessionId,
   sessions,
@@ -14431,6 +14763,7 @@ const getChatModeDetailVirtualDom = ({
   const selectedSessionTitle = selectedSession?.title || chatTitle();
   const messages = selectedSession ? selectedSession.messages : [];
   const showCreatePullRequestButton = canCreatePullRequest(selectedSession);
+  const showImplementPlanButton = agentMode === 'plan' && !!getLatestExecutablePlanMessage(selectedSession) && !isSelectedSessionInProgress;
   const isDropOverlayVisible = composerDropEnabled && composerDropActive;
   const isComposerAttachmentPreviewOverlayVisible = !!composerAttachmentPreviewOverlayAttachmentId;
   const isAgentModePickerVisible = hasSpaceForAgentModePicker && agentModePickerOpen;
@@ -14444,7 +14777,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, '', [], '', hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
+  }, ...getChatHeaderDomDetailMode(selectedSessionTitle, authEnabled, userState, userName, authErrorMessage), ...getMessagesDom(messages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, false, false, '', [], '', hasSpaceForAgentModePicker, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, showImplementPlanButton, voiceDictationEnabled, isSelectedSessionInProgress, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14515,6 +14848,61 @@ const getEmptyChatSessionsDom = () => {
   return [parentNode, labelNode, text(clickToOpenNewChat())];
 };
 
+let relativeTimeNow;
+const getRelativeTimeNow = () => {
+  return relativeTimeNow ?? Date.now();
+};
+const setRelativeTimeNowForTest = value => {
+  relativeTimeNow = value;
+};
+const resetRelativeTimeNowForTest = () => {
+  relativeTimeNow = undefined;
+};
+
+const minute = 60;
+const hour = minute * 60;
+const day = hour * 24;
+const month = day * 30;
+const year = day * 365;
+const isoDateTimeRegex = /^\d{4}-\d{2}-\d{2}T/;
+const formatAgo = (value, singular, plural) => {
+  return value === 1 ? `${value} ${singular} ago` : `${value} ${plural} ago`;
+};
+const isIsoDateTime = value => {
+  return isoDateTimeRegex.test(value);
+};
+const formatChatListTime = value => {
+  if (!isIsoDateTime(value)) {
+    return value;
+  }
+  const timestamp = Date.parse(value);
+  if (Number.isNaN(timestamp)) {
+    return value;
+  }
+  const seconds = Math.max(1, Math.round((getRelativeTimeNow() - timestamp) / 1000));
+  if (seconds < minute) {
+    return formatAgo(seconds, 'sec', 'secs');
+  }
+  if (seconds < hour) {
+    const minutes = Math.round(seconds / minute);
+    return formatAgo(minutes, 'min', 'mins');
+  }
+  if (seconds < day) {
+    const hours = Math.round(seconds / hour);
+    return formatAgo(hours, 'hr', 'hrs');
+  }
+  if (seconds < month) {
+    const days = Math.round(seconds / day);
+    return formatAgo(days, 'day', 'days');
+  }
+  if (seconds < year) {
+    const months = Math.round(seconds / month);
+    return formatAgo(months, 'mo', 'mos');
+  }
+  const years = Math.round(seconds / year);
+  return formatAgo(years, 'yr', 'yrs');
+};
+
 const getSessionStatusClassName = session => {
   const status = getChatSessionStatus(session);
   if (status === 'in-progress') {
@@ -14526,9 +14914,11 @@ const getSessionStatusClassName = session => {
   return ChatListItemStatusStopped;
 };
 
-const getSessionDom = (session, focused = false) => {
-  const sessionClassName = focused ? mergeClassNames(ChatListItem, ChatListItemFocused) : ChatListItem;
+const getSessionDom = (session, focused = false, showChatListTime = true, showFocusOutline = false) => {
+  const sessionClassName = showFocusOutline ? mergeClassNames(ChatListItem, ChatListItemFocused, ChatListItemFocusOutline, FocusOutline) : focused ? mergeClassNames(ChatListItem, ChatListItemFocused) : ChatListItem;
   const sessionStatusClassName = getSessionStatusClassName(session);
+  const lastActiveTime = getSessionLastActiveTime(session);
+  const formattedLastActiveTime = lastActiveTime ? formatChatListTime(lastActiveTime) : 'n/a';
   return [{
     childCount: 3,
     className: sessionClassName,
@@ -14541,6 +14931,10 @@ const getSessionDom = (session, focused = false) => {
     childCount: 0,
     className: `${ChatListItemStatusIcon} ${sessionStatusClassName}`,
     type: Div
+  }, {
+    childCount: showChatListTime ? 2 : 1,
+    className: ChatListItemContent,
+    type: Div
   }, {
     childCount: 1,
     className: ChatListItemLabel,
@@ -14549,9 +14943,18 @@ const getSessionDom = (session, focused = false) => {
     onFocus: HandleFocus,
     tabIndex: 0,
     type: Div
-  }, text(session.title), {
+  }, {
+    childCount: 1,
+    className: ChatListItemTitle,
+    type: Div
+  }, text(session.title), ...(showChatListTime ? [{
+    childCount: 1,
+    className: ChatListItemTime,
+    type: Div
+  }, text(formattedLastActiveTime)] : []), {
     childCount: 1,
     className: ChatActions,
+    role: ToolBar,
     type: Div
   }, {
     childCount: 1,
@@ -14564,12 +14967,12 @@ const getSessionDom = (session, focused = false) => {
     type: Button$1
   }, {
     childCount: 0,
-    className: 'MaskIcon MaskIconTrash',
+    className: mergeClassNames(MaskIcon, MaskIconArchive),
     type: Div
   }];
 };
 
-const getChatListDom = (sessions, selectedSessionId, listFocusedIndex, chatListScrollTop = 0) => {
+const getChatListDom = (sessions, selectedSessionId, listFocusOutline, listFocusedIndex, showChatListTime, chatListScrollTop = 0) => {
   if (sessions.length === 0) {
     return getEmptyChatSessionsDom();
   }
@@ -14584,7 +14987,7 @@ const getChatListDom = (sessions, selectedSessionId, listFocusedIndex, chatListS
     scrollTop: chatListScrollTop,
     tabIndex: 0,
     type: Ul
-  }, ...sessions.flatMap((session, index) => getSessionDom(session, index === listFocusedIndex))];
+  }, ...sessions.flatMap((session, index) => getSessionDom(session, index === listFocusedIndex, showChatListTime, listFocusOutline && index === listFocusedIndex))];
 };
 
 const getChatModeListVirtualDom = ({
@@ -14607,6 +15010,7 @@ const getChatModeListVirtualDom = ({
   hasSpaceForAgentModePicker,
   hasSpaceForRunModePicker,
   listFocusedIndex = -1,
+  listFocusOutline = false,
   modelPickerOpen = false,
   modelPickerSearchValue = '',
   models,
@@ -14618,9 +15022,11 @@ const getChatModeListVirtualDom = ({
   searchEnabled = false,
   searchFieldVisible = false,
   searchValue = '',
+  selectChevronEnabled,
   selectedModelId,
   selectedSessionId,
   sessions,
+  showChatListTime,
   showRunMode,
   todoListItems,
   todoListToolEnabled,
@@ -14647,7 +15053,7 @@ const getChatModeListVirtualDom = ({
     onDragEnter: HandleDragEnterChatView,
     onDragOver: HandleDragOverChatView,
     type: Div
-  }, ...getChatHeaderListModeDom(authEnabled, userState, userName, authErrorMessage, searchEnabled, searchFieldVisible, searchValue), ...getChatListDom(visibleSessions, selectedSessionId, listFocusedIndex, chatListScrollTop), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, false, false, '', [], '', hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, false, voiceDictationEnabled, false), ...getChatOverlaysVirtualDom({
+  }, ...getChatHeaderListModeDom(authEnabled, userState, userName, authErrorMessage, searchEnabled, searchFieldVisible, searchValue), ...getChatListDom(visibleSessions, selectedSessionId, listFocusOutline, listFocusedIndex, showChatListTime, chatListScrollTop), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, false, false, '', [], '', hasSpaceForAgentModePicker, selectChevronEnabled, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, false, false, voiceDictationEnabled, false), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14768,6 +15174,7 @@ const getChatVirtualDom = options => {
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex = -1,
+    listFocusOutline = false,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen = false,
@@ -14792,10 +15199,12 @@ const getChatVirtualDom = options => {
     searchEnabled = false,
     searchFieldVisible = false,
     searchValue = '',
+    selectChevronEnabled,
     selectedModelId,
     selectedProjectId = '',
     selectedSessionId,
     sessions,
+    showChatListTime,
     showRunMode,
     todoListToolEnabled,
     tokensMax,
@@ -14855,6 +15264,7 @@ const getChatVirtualDom = options => {
         runMode,
         runModePickerOpen,
         scrollDownButtonEnabled,
+        selectChevronEnabled,
         selectedModelId,
         selectedProjectId,
         selectedSessionId,
@@ -14908,6 +15318,7 @@ const getChatVirtualDom = options => {
         runMode,
         runModePickerOpen,
         scrollDownButtonEnabled,
+        selectChevronEnabled,
         selectedModelId,
         selectedSessionId,
         sessions,
@@ -14944,6 +15355,7 @@ const getChatVirtualDom = options => {
         hasSpaceForAgentModePicker,
         hasSpaceForRunModePicker,
         listFocusedIndex,
+        listFocusOutline,
         modelPickerOpen,
         modelPickerSearchValue,
         models,
@@ -14955,9 +15367,11 @@ const getChatVirtualDom = options => {
         searchEnabled,
         searchFieldVisible,
         searchValue,
+        selectChevronEnabled,
         selectedModelId,
         selectedSessionId,
         sessions,
+        showChatListTime,
         showRunMode,
         todoListItems,
         todoListToolEnabled,
@@ -15000,6 +15414,7 @@ const renderItems = (oldState, newState) => {
     hasSpaceForRunModePicker,
     initial,
     listFocusedIndex,
+    listFocusOutline,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen,
@@ -15024,10 +15439,12 @@ const renderItems = (oldState, newState) => {
     searchEnabled,
     searchFieldVisible,
     searchValue,
+    selectChevronEnabled,
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
     sessions,
+    showChatListTime,
     showRunMode,
     todoListToolEnabled,
     tokensMax,
@@ -15068,6 +15485,7 @@ const renderItems = (oldState, newState) => {
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex,
+    listFocusOutline,
     messagesAutoScrollEnabled,
     messagesScrollTop,
     modelPickerOpen,
@@ -15092,10 +15510,12 @@ const renderItems = (oldState, newState) => {
     searchEnabled,
     searchFieldVisible,
     searchValue,
+    selectChevronEnabled,
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
     sessions,
+    showChatListTime,
     showRunMode,
     todoListToolEnabled,
     tokensMax,
@@ -15417,6 +15837,7 @@ const rerender = state => {
 
 const reset = async state => {
   await clearChatSessions();
+  resetRelativeTimeNowForTest();
   return {
     ...state,
     agentMode: defaultAgentMode,
@@ -15594,6 +16015,11 @@ const setEmitStreamingFunctionCallEvents = (state, emitStreamingFunctionCallEven
   };
 };
 
+const setNowForTest = (state, value) => {
+  setRelativeTimeNowForTest(value);
+  return state;
+};
+
 const setQuestionToolEnabled = (state, questionToolEnabled) => {
   return {
     ...state,
@@ -15636,9 +16062,24 @@ const setSearchEnabled = (state, searchEnabled) => {
   };
 };
 
+const setSelectChevronEnabled = (state, selectChevronEnabled) => {
+  return {
+    ...state,
+    selectChevronEnabled
+  };
+};
+
+const setShowChatListTime = (state, showChatListTime) => {
+  return {
+    ...state,
+    showChatListTime
+  };
+};
+
 const setShowRunMode = (state, showRunMode) => {
   return {
     ...state,
+    runModePickerOpen: showRunMode ? state.runModePickerOpen : false,
     showRunMode
   };
 };
@@ -15869,6 +16310,7 @@ const commandMap = {
   'Chat.setChatHistoryEnabled': wrapCommand(setChatHistoryEnabled),
   'Chat.setComposerSelection': wrapCommand(setComposerSelection),
   'Chat.setEmitStreamingFunctionCallEvents': wrapCommand(setEmitStreamingFunctionCallEvents),
+  'Chat.setNowForTest': wrapCommand(setNowForTest),
   'Chat.setOpenRouterApiKey': wrapCommand(setOpenRouterApiKey),
   'Chat.setQuestionToolEnabled': wrapCommand(setQuestionToolEnabled),
   'Chat.setReasoningEffort': wrapCommand(setReasoningEffort),
@@ -15876,6 +16318,8 @@ const commandMap = {
   'Chat.setResponsivePickerVisibilityEnabled': wrapCommand(setResponsivePickerVisibilityEnabled),
   'Chat.setScrollDownButtonEnabled': wrapCommand(setScrollDownButtonEnabled),
   'Chat.setSearchEnabled': wrapCommand(setSearchEnabled),
+  'Chat.setSelectChevronEnabled': wrapCommand(setSelectChevronEnabled),
+  'Chat.setShowChatListTime': wrapCommand(setShowChatListTime),
   'Chat.setShowRunMode': wrapCommand(setShowRunMode),
   'Chat.setStreamingEnabled': wrapCommand(setStreamingEnabled),
   'Chat.setSystemPrompt': wrapCommand(setSystemPrompt),