@lvce-editor/static-server 0.77.6 → 0.77.7

package/static/{101c327 → fd1a2e0}/packages/chat-view/dist/chatViewWorkerMain.js

@@ -1118,20 +1118,13 @@ const create$2 = rpcId => {
 };
 
 const {
-  invoke: invoke$9,
+  invoke: invoke$8,
   set: set$c
 } = create$2(6008);
 
 const {
-  invoke: invoke$8,
   set: set$b
 } = create$2(6007);
-const getMathBlockDom = async node => {
-  return invoke$8('ChatMath.getMathBlockDom', node);
-};
-const getMathInlineDom = async node => {
-  return invoke$8('ChatMath.getMathInlineDom', node);
-};
 
 const {
   invoke: invoke$7,
@@ -1185,7 +1178,7 @@ const Br = 55;
 const Tfoot = 59;
 const Ul = 60;
 const TextArea = 62;
-const Select$1 = 63;
+const Select = 63;
 const Option = 64;
 const Code = 65;
 const Label$1 = 66;
@@ -1214,7 +1207,6 @@ const Home = 12;
 const UpArrow = 14;
 const DownArrow = 16;
 const KeyN = 42;
-const KeyV = 50;
 
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
@@ -1775,6 +1767,17 @@ const clearInput = async state => {
   };
 };
 
+const closeGitBranchPicker = state => {
+  if (!state.gitBranchPickerOpen && !state.gitBranchPickerErrorMessage) {
+    return state;
+  }
+  return {
+    ...state,
+    gitBranchPickerErrorMessage: '',
+    gitBranchPickerOpen: false
+  };
+};
+
 const clampSelectionIndex = (value, max) => {
   if (!Number.isFinite(value)) {
     return 0;
@@ -1852,6 +1855,7 @@ const BackToChatList = 'Back to chat list';
 const Search$1 = 'Search';
 const ScrollDown$1 = 'Scroll down';
 const SearchModels = 'Search models';
+const PickModel = 'Pick Model';
 const SearchChats = 'Search chats';
 const Paste = 'Paste';
 const Rename = 'Rename';
@@ -1859,9 +1863,13 @@ const Archive = 'Archive';
 const AddProjectChat = 'Add Project';
 const RemoveProject = 'Remove Project';
 const Settings$1 = 'Settings';
+const Login$1 = 'Login';
+const Logout$1 = 'Logout';
 const LoginToBackend = 'Login to backend';
 const LogoutFromBackend = 'Logout from backend';
 const LoggingInToBackend = 'Logging in to backend';
+const LoggingOutFromBackend = 'Logging out from backend';
+const SignedIn = 'Signed in';
 const SwitchToChatFocusMode = 'Switch to chat focus mode';
 const SwitchToNormalChatMode = 'Switch to normal chat mode';
 const CloseChat$1 = 'Close Chat';
@@ -1941,18 +1949,33 @@ const scrollDown = () => {
 const searchModels = () => {
   return i18nString(SearchModels);
 };
+const pickModel = modelName => {
+  return `${i18nString(PickModel)}, ${modelName}`;
+};
 const searchChats = () => {
   return i18nString(SearchChats);
 };
+const login = () => {
+  return i18nString(Login$1);
+};
+const logout = () => {
+  return i18nString(Logout$1);
+};
 const loginToBackend = () => {
   return i18nString(LoginToBackend);
 };
-const logoutFromBackend = () => {
+const logoutFromBackend$1 = () => {
   return i18nString(LogoutFromBackend);
 };
 const loggingInToBackend = () => {
   return i18nString(LoggingInToBackend);
 };
+const loggingOutFromBackend = () => {
+  return i18nString(LoggingOutFromBackend);
+};
+const signedIn = () => {
+  return i18nString(SignedIn);
+};
 const chatFocusMode = () => {
   return i18nString(SwitchToChatFocusMode);
 };
@@ -2324,8 +2347,6 @@ const createDefaultState = () => {
     authAccessToken: '',
     authEnabled: false,
     authErrorMessage: '',
-    authRefreshToken: '',
-    authStatus: 'signed-out',
     backendUrl: '',
     chatFocusContentMaxWidth: 700,
     chatHistoryEnabled: true,
@@ -2357,6 +2378,10 @@ const createDefaultState = () => {
     errorCount: 0,
     focus: 'composer',
     focused: false,
+    gitBranches: [],
+    gitBranchPickerErrorMessage: '',
+    gitBranchPickerOpen: false,
+    gitBranchPickerVisible: false,
     headerHeight: 50,
     height: 0,
     ...responsivePickerState,
@@ -2438,11 +2463,11 @@ const createDefaultState = () => {
     usageOverviewEnabled: false,
     useChatCoordinatorWorker: false,
     useChatMathWorker: true,
-    useChatMessageParsingWorker: false,
     useChatNetworkWorkerForRequests: false,
     useChatToolWorker: true,
     useMockApi: false,
     userName: '',
+    userState: 'loggedOut',
     userSubscriptionPlan: '',
     userUsedTokens: 0,
     viewMode: 'list',
@@ -2829,7 +2854,24 @@ const isEqualComposerAttachments = (a, b) => {
   }
   return true;
 };
+const isEqualGitBranches = (a, b) => {
+  if (a === b) {
+    return true;
+  }
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    if (a[i].current !== b[i].current || a[i].name !== b[i].name) {
+      return false;
+    }
+  }
+  return true;
+};
 const isEqualProjectExpandedIds = (a, b) => {
+  if (a === b) {
+    return true;
+  }
   if (a.length !== b.length) {
     return false;
   }
@@ -2840,6 +2882,20 @@ const isEqualProjectExpandedIds = (a, b) => {
   }
   return true;
 };
+const isEqualProjects = (a, b) => {
+  if (a === b) {
+    return true;
+  }
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    if (a[i].id !== b[i].id || a[i].name !== b[i].name || a[i].uri !== b[i].uri) {
+      return false;
+    }
+  }
+  return true;
+};
 const isEqualVisibleModels = (a, b) => {
   if (a === b) {
     return true;
@@ -2856,7 +2912,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 && oldState.authStatus === newState.authStatus && isEqualComposerAttachments(oldState.composerAttachments, newState.composerAttachments) && oldState.composerDropActive === newState.composerDropActive && oldState.composerDropEnabled === newState.composerDropEnabled && oldState.composerValue === newState.composerValue && 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 && isEqualProjectExpandedIds(oldState.projectExpandedIds, newState.projectExpandedIds) && oldState.projectListScrollTop === newState.projectListScrollTop && 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.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.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.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;
 };
 
 const diffScrollTop = (oldState, newState) => {
@@ -2877,6 +2933,12 @@ const RenderIncremental = 11;
 const RenderScrollTop = 12;
 
 const diffValue = (oldState, newState) => {
+  if (oldState.openApiApiKeyInput !== newState.openApiApiKeyInput) {
+    return false;
+  }
+  if (oldState.openRouterApiKeyInput !== newState.openRouterApiKeyInput) {
+    return false;
+  }
   return oldState.composerValue === newState.composerValue || newState.inputSource !== 'script';
 };
 
@@ -2907,10 +2969,9 @@ const getAuthState = state => {
     authAccessToken,
     authEnabled,
     authErrorMessage,
-    authRefreshToken,
-    authStatus,
     backendUrl,
     userName,
+    userState,
     userSubscriptionPlan,
     userUsedTokens
   } = state;
@@ -2918,10 +2979,9 @@ const getAuthState = state => {
     authAccessToken,
     authEnabled,
     authErrorMessage,
-    authRefreshToken,
-    authStatus,
     backendUrl,
     userName,
+    userState,
     userSubscriptionPlan,
     userUsedTokens
   };
@@ -3257,10 +3317,6 @@ const getKeyBindings = () => {
     command: 'Chat.chatInputHistoryDown',
     key: DownArrow,
     when: FocusChatInput
-  }, {
-    command: 'Chat.pasteInput',
-    key: CtrlCmd | KeyV,
-    when: FocusChatInput
   }, {
     command: 'Chat.chatInputHistoryUp',
     key: UpArrow,
@@ -3387,9 +3443,11 @@ const ComposerAttachmentPreviewOverlay = 'composer-attachment-preview-overlay';
 const AddContext = 'add-context';
 const Dictate = 'dictate';
 const CreatePullRequest$1 = 'create-pull-request';
+const GitBranchPickerToggle = 'git-branch-picker-toggle';
+const GitBranchPickerItemPrefix = 'git-branch-picker-item:';
 const FocusAddAction = 'focus-add-action';
-const FocusOpenInVsCode = 'focus-open-in-vscode';
 const FocusCommit = 'focus-commit';
+const FocusOpenInVsCode = 'focus-open-in-vscode';
 const FocusOpenTerminal = 'focus-open-terminal';
 const FocusShowDiff = 'focus-show-diff';
 const Send = 'send';
@@ -3455,8 +3513,14 @@ const isRenameInputName = name => {
 const getRenameIdFromInputName = name => {
   return name.slice(RenamePrefix.length);
 };
-const getModelPickerItemInputName = modelId => {
-  return `${ModelPickerItemPrefix}${modelId}`;
+const getGitBranchPickerItemInputName = branchName => {
+  return `${GitBranchPickerItemPrefix}${branchName}`;
+};
+const isGitBranchPickerItemInputName = name => {
+  return name.startsWith(GitBranchPickerItemPrefix);
+};
+const getGitBranchFromGitBranchPickerItemInputName = name => {
+  return name.slice(GitBranchPickerItemPrefix.length);
 };
 const getComposerAttachmentInputName = attachmentId => {
   return `${ComposerAttachmentPrefix}${attachmentId}`;
@@ -3818,6 +3882,236 @@ const openFolder = async () => {
   }
 };
 
+// cspell:ignore gitdir worktrees
+const FileTypeFile = 1;
+const FileTypeDirectory = 2;
+const slashAtEndRegex = /\/$/;
+const gitDirPointerRegex = /^gitdir:\s*(.+)$/m;
+const headRefRegex = /^ref:\s+refs\/heads\/(.+)$/m;
+const toGitUri = (baseUri, ...segments) => {
+  const url = new URL(baseUri.endsWith('/') ? baseUri : `${baseUri}/`);
+  for (const segment of segments) {
+    url.pathname = `${url.pathname.replace(slashAtEndRegex, '')}/${segment.split('/').map(part => encodeURIComponent(part)).join('/')}`;
+  }
+  return url.toString();
+};
+const decodeFileContent = content => {
+  if (typeof content === 'string') {
+    return content;
+  }
+  if (content instanceof Uint8Array) {
+    return new TextDecoder().decode(content);
+  }
+  if (Array.isArray(content)) {
+    return new TextDecoder().decode(new Uint8Array(content));
+  }
+  return '';
+};
+const toFileSystemPath = uri => {
+  if (!uri.startsWith('file://')) {
+    return uri;
+  }
+  return decodeURIComponent(new URL(uri).pathname);
+};
+const getRelativePath = (fromPath, toPath) => {
+  if (!fromPath.startsWith('/') || !toPath.startsWith('/')) {
+    return toPath;
+  }
+  const fromParts = fromPath.split('/').filter(Boolean);
+  const toParts = toPath.split('/').filter(Boolean);
+  let commonPrefixLength = 0;
+  while (commonPrefixLength < fromParts.length && commonPrefixLength < toParts.length && fromParts[commonPrefixLength] === toParts[commonPrefixLength]) {
+    commonPrefixLength++;
+  }
+  const parentSegments = fromParts.slice(commonPrefixLength).map(() => '..');
+  const childSegments = toParts.slice(commonPrefixLength);
+  return [...parentSegments, ...childSegments].join('/') || '.';
+};
+const toFileSystemTarget = (workspaceUri, uri) => {
+  const workspacePath = toFileSystemPath(workspaceUri);
+  const fileSystemPath = toFileSystemPath(uri);
+  if (!workspaceUri.startsWith('file://') || !uri.startsWith('file://')) {
+    return fileSystemPath;
+  }
+  return getRelativePath(workspacePath, fileSystemPath);
+};
+const parseEntries = value => {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  return value.map(entry => {
+    if (Array.isArray(entry) && typeof entry[0] === 'string' && typeof entry[1] === 'number') {
+      return {
+        name: entry[0],
+        type: entry[1]
+      };
+    }
+    if (entry && typeof entry === 'object' && typeof Reflect.get(entry, 'name') === 'string' && typeof Reflect.get(entry, 'type') === 'number') {
+      return {
+        name: Reflect.get(entry, 'name'),
+        type: Reflect.get(entry, 'type')
+      };
+    }
+    return undefined;
+  }).filter(entry => !!entry);
+};
+const readDir = async (workspaceUri, uri) => {
+  const result = await invoke('FileSystem.readDirWithFileTypes', toFileSystemTarget(workspaceUri, uri));
+  return parseEntries(result);
+};
+const readTextFile = async (workspaceUri, uri) => {
+  const result = await invoke('FileSystem.readFile', toFileSystemTarget(workspaceUri, uri));
+  return decodeFileContent(result);
+};
+const getGitDirUri = async workspaceUri => {
+  const gitUri = toGitUri(workspaceUri, '.git');
+  try {
+    await readTextFile(workspaceUri, toGitUri(gitUri, 'HEAD'));
+    return gitUri;
+  } catch {
+    // Fall through to support worktrees/submodules where .git is a pointer file.
+  }
+  const gitPointer = await readTextFile(workspaceUri, gitUri);
+  const match = gitDirPointerRegex.exec(gitPointer);
+  if (!match) {
+    return '';
+  }
+  return new URL(match[1].trim(), workspaceUri.endsWith('/') ? workspaceUri : `${workspaceUri}/`).toString();
+};
+const collectBranchNames = async (workspaceUri, refsHeadsUri, prefix, branches) => {
+  const entries = await readDir(workspaceUri, refsHeadsUri);
+  for (const entry of entries) {
+    if (entry.type === FileTypeDirectory) {
+      await collectBranchNames(workspaceUri, toGitUri(refsHeadsUri, entry.name), `${prefix}${entry.name}/`, branches);
+      continue;
+    }
+    if (entry.type === FileTypeFile) {
+      branches.add(`${prefix}${entry.name}`);
+    }
+  }
+};
+const parseCurrentBranch = headContent => {
+  const match = headRefRegex.exec(headContent.trim());
+  if (match) {
+    return match[1].trim();
+  }
+  return '';
+};
+const hasGitRepository = async workspaceUri => {
+  try {
+    return Boolean(await getGitDirUri(workspaceUri));
+  } catch {
+    return false;
+  }
+};
+const getGitBranches = async workspaceUri => {
+  const gitDirUri = await getGitDirUri(workspaceUri);
+  if (!gitDirUri) {
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
+    throw new globalThis.Error('Git repository not found.');
+  }
+  const branches = new Set();
+  let currentBranch = '';
+  try {
+    const headContent = await readTextFile(workspaceUri, toGitUri(gitDirUri, 'HEAD'));
+    currentBranch = parseCurrentBranch(headContent);
+    if (currentBranch) {
+      branches.add(currentBranch);
+    }
+  } catch {
+    // Keep trying to discover branches from refs even if HEAD cannot be read.
+  }
+  try {
+    await collectBranchNames(workspaceUri, toGitUri(gitDirUri, 'refs', 'heads'), '', branches);
+  } catch {
+    // Repositories without local refs should still open and surface any current branch we found.
+  }
+  if (branches.size === 0) {
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
+    throw new globalThis.Error('No local git branches found.');
+  }
+  return [...branches].toSorted((a, b) => a.localeCompare(b)).map(name => ({
+    current: name === currentBranch,
+    name
+  }));
+};
+
+const getSelectedSession = (sessions, selectedSessionId) => {
+  return sessions.find(session => session.id === selectedSessionId);
+};
+
+const getProjectUri$1 = (state, projectId) => {
+  return state.projects.find(project => project.id === projectId)?.uri || '';
+};
+const getWorkspaceUri$1 = (state, session) => {
+  if (session?.workspaceUri) {
+    return session.workspaceUri;
+  }
+  return getProjectUri$1(state, session?.projectId || state.selectedProjectId);
+};
+
+const withHiddenBranchPicker = state => {
+  return {
+    ...state,
+    gitBranches: [],
+    gitBranchPickerErrorMessage: '',
+    gitBranchPickerOpen: false,
+    gitBranchPickerVisible: false
+  };
+};
+const refreshGitBranchPickerVisibility = async state => {
+  if (state.viewMode !== 'chat-focus') {
+    return {
+      ...state,
+      gitBranchPickerErrorMessage: '',
+      gitBranchPickerOpen: false
+    };
+  }
+  const selectedSession = getSelectedSession(state.sessions, state.selectedSessionId);
+  const fallbackBranchName = selectedSession?.branchName || '';
+  const workspaceUri = getWorkspaceUri$1(state, selectedSession);
+  if (!workspaceUri) {
+    return withHiddenBranchPicker(state);
+  }
+  const visible = await hasGitRepository(workspaceUri);
+  if (!visible) {
+    if (fallbackBranchName) {
+      return {
+        ...state,
+        gitBranches: [{
+          current: true,
+          name: fallbackBranchName
+        }],
+        gitBranchPickerVisible: true
+      };
+    }
+    return withHiddenBranchPicker(state);
+  }
+  try {
+    const gitBranches = await getGitBranches(workspaceUri);
+    return {
+      ...state,
+      gitBranches,
+      gitBranchPickerVisible: true
+    };
+  } catch {
+    if (fallbackBranchName) {
+      return {
+        ...state,
+        gitBranches: [{
+          current: true,
+          name: fallbackBranchName
+        }],
+        gitBranchPickerVisible: true
+      };
+    }
+    return {
+      ...state,
+      gitBranchPickerVisible: true
+    };
+  }
+};
+
 const selectProject = async (state, projectId) => {
   const {
     selectedProjectId,
@@ -3831,14 +4125,14 @@ const selectProject = async (state, projectId) => {
   }
   const visibleSessions = getVisibleSessions(sessions, projectId);
   if (visibleSessions.length === 0) {
-    return {
+    return refreshGitBranchPickerVisibility({
       ...state,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
       selectedProjectId: projectId,
       selectedSessionId: '',
       viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'list'
-    };
+    });
   }
   const currentSessionVisible = visibleSessions.some(session => session.id === selectedSessionId);
   const nextSelectedSessionId = currentSessionVisible ? selectedSessionId : visibleSessions[0].id;
@@ -3850,7 +4144,7 @@ const selectProject = async (state, projectId) => {
     }
     return loadedSession;
   });
-  return {
+  return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
@@ -3858,7 +4152,7 @@ const selectProject = async (state, projectId) => {
     selectedSessionId: nextSelectedSessionId,
     sessions: hydratedSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
-  };
+  });
 };
 
 const fileSchemeRegex = /^file:\/\//;
@@ -3993,6 +4287,148 @@ const handleClickCreatePullRequest = async state => {
   };
 };
 
+const trailingSlashesRegex$3 = /\/+$/;
+const trimTrailingSlashes = value => {
+  return value.replace(trailingSlashesRegex$3, '');
+};
+
+const getBackendAuthUrl = (backendUrl, path) => {
+  return `${trimTrailingSlashes(backendUrl)}${path}`;
+};
+
+const getBackendLoginUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/login');
+};
+
+const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
+  return {
+    authAccessToken: '',
+    authErrorMessage,
+    userName: '',
+    userState: 'loggedOut',
+    userSubscriptionPlan: '',
+    userUsedTokens: 0
+  };
+};
+
+const getBackendLogoutUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/logout');
+};
+
+const logoutFromBackend = async backendUrl => {
+  if (!backendUrl) {
+    return;
+  }
+  try {
+    await fetch(getBackendLogoutUrl(backendUrl), {
+      credentials: 'include',
+      headers: {
+        Accept: 'application/json'
+      },
+      method: 'POST'
+    });
+  } catch {
+    // Ignore logout failures and still clear local auth state.
+  }
+};
+
+const getBackendRefreshUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/refresh');
+};
+
+const isObject$2 = value => {
+  return !!value && typeof value === 'object';
+};
+
+const isBackendAuthResponse = value => {
+  return isObject$2(value);
+};
+
+const getNumber = (value, fallback = 0) => {
+  return typeof value === 'number' ? value : fallback;
+};
+
+const getString = (value, fallback = '') => {
+  return typeof value === 'string' ? value : fallback;
+};
+
+const toBackendAuthState = value => {
+  return {
+    authAccessToken: getString(value.accessToken),
+    authErrorMessage: getString(value.error),
+    userName: getString(value.userName),
+    userState: value.accessToken ? 'loggedIn' : 'loggedOut',
+    userSubscriptionPlan: getString(value.subscriptionPlan),
+    userUsedTokens: getNumber(value.usedTokens)
+  };
+};
+
+const parseBackendAuthResponse = value => {
+  if (!isBackendAuthResponse(value)) {
+    return getLoggedOutBackendAuthState('Backend returned an invalid authentication response.');
+  }
+  return toBackendAuthState(value);
+};
+
+const syncBackendAuth = async backendUrl => {
+  if (!backendUrl) {
+    return getLoggedOutBackendAuthState('Backend URL is missing.');
+  }
+  try {
+    const response = await fetch(getBackendRefreshUrl(backendUrl), {
+      credentials: 'include',
+      headers: {
+        Accept: 'application/json'
+      },
+      method: 'POST'
+    });
+    if (response.status === 401 || response.status === 403) {
+      return getLoggedOutBackendAuthState();
+    }
+    let payload = undefined;
+    try {
+      payload = await response.json();
+    } catch {
+      payload = undefined;
+    }
+    if (!response.ok) {
+      const parsed = parseBackendAuthResponse(payload);
+      return getLoggedOutBackendAuthState(parsed.authErrorMessage || 'Backend authentication failed.');
+    }
+    const parsed = parseBackendAuthResponse(payload);
+    if (parsed.authErrorMessage) {
+      return getLoggedOutBackendAuthState(parsed.authErrorMessage);
+    }
+    if (!parsed.authAccessToken) {
+      return getLoggedOutBackendAuthState();
+    }
+    return parsed;
+  } catch (error) {
+    const authErrorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
+    return getLoggedOutBackendAuthState(authErrorMessage);
+  }
+};
+
+const delay = async ms => {
+  await new Promise(resolve => setTimeout(resolve, ms));
+};
+
+const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalMs = 1000) => {
+  const deadline = Date.now() + timeoutMs;
+  let lastErrorMessage = '';
+  while (Date.now() < deadline) {
+    const authState = await syncBackendAuth(backendUrl);
+    if (authState.userState === 'loggedIn') {
+      return authState;
+    }
+    if (authState.authErrorMessage) {
+      lastErrorMessage = authState.authErrorMessage;
+    }
+    await delay(pollIntervalMs);
+  }
+  return getLoggedOutBackendAuthState(lastErrorMessage);
+};
+
 let nextLoginResponse;
 const setNextLoginResponse = response => {
   nextLoginResponse = response;
@@ -4016,35 +4452,36 @@ const consumeNextLoginResponse = async () => {
   return response.response;
 };
 
-const get = async key => {
-  return getPreference(key);
-};
-const update = async settings => {
-  await invoke('Preferences.update', settings);
-};
-
-const trailingSlashesRegex$3 = /\/+$/;
 const isLoginResponse = value => {
   if (!value || typeof value !== 'object') {
     return false;
   }
   return true;
 };
-const trimTrailingSlashes = value => {
-  return value.replace(trailingSlashesRegex$3, '');
+const getLoggedInState = (state, response) => {
+  const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
+  return {
+    ...state,
+    authAccessToken: accessToken,
+    authErrorMessage: '',
+    userName: typeof response.userName === 'string' ? response.userName : state.userName,
+    userState: accessToken ? 'loggedIn' : 'loggedOut',
+    userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : state.userSubscriptionPlan,
+    userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : state.userUsedTokens
+  };
 };
 const handleClickLogin = async state => {
   if (!state.backendUrl) {
     return {
       ...state,
       authErrorMessage: 'Backend URL is missing.',
-      authStatus: 'signed-out'
+      userState: 'loggedOut'
     };
   }
   const signingInState = {
     ...state,
     authErrorMessage: '',
-    authStatus: 'signing-in'
+    userState: 'loggingIn'
   };
   if (state.uid) {
     set(state.uid, state, signingInState);
@@ -4053,69 +4490,53 @@ const handleClickLogin = async state => {
   let usedMockResponse = false;
   try {
     usedMockResponse = hasPendingMockLoginResponse();
-    const response = usedMockResponse ? await consumeNextLoginResponse() : await invoke('Auth.login', state.backendUrl);
-    if (!isLoginResponse(response)) {
-      return {
-        ...signingInState,
-        authErrorMessage: 'Backend returned an invalid login response.',
-        authStatus: 'signed-out'
-      };
-    }
-    if (typeof response.error === 'string' && response.error) {
-      return {
-        ...signingInState,
-        authErrorMessage: response.error,
-        authStatus: 'signed-out'
-      };
+    if (usedMockResponse) {
+      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 accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
-    const refreshToken = typeof response.refreshToken === 'string' ? response.refreshToken : '';
-    await update({
-      'secrets.chatBackendAccessToken': accessToken,
-      'secrets.chatBackendRefreshToken': refreshToken
-    });
+    await invoke('Main.openUri', getBackendLoginUrl(state.backendUrl));
+    const authState = await waitForBackendLogin(state.backendUrl);
     return {
       ...signingInState,
-      authAccessToken: accessToken,
-      authErrorMessage: '',
-      authRefreshToken: refreshToken,
-      authStatus: accessToken ? 'signed-in' : 'signed-out',
-      userName: typeof response.userName === 'string' ? response.userName : state.userName,
-      userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : state.userSubscriptionPlan,
-      userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : state.userUsedTokens
+      ...authState
     };
   } catch (error) {
     const errorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
-    if (!usedMockResponse) {
-      await invoke('Main.openUri', `${trimTrailingSlashes(state.backendUrl)}/auth/login`);
-    }
     return {
       ...signingInState,
-      authErrorMessage: errorMessage,
-      authStatus: 'signed-out'
+      ...getLoggedOutBackendAuthState(errorMessage)
     };
   }
 };
 
 const handleClickLogout = async state => {
-  try {
-    await invoke('Auth.logout', state.backendUrl);
-  } catch {
-    // Ignore logout bridge errors and still clear local auth state.
-  }
-  await update({
-    'secrets.chatBackendAccessToken': '',
-    'secrets.chatBackendRefreshToken': ''
-  });
-  return {
+  const loggingOutState = {
     ...state,
-    authAccessToken: '',
     authErrorMessage: '',
-    authRefreshToken: '',
-    authStatus: 'signed-out',
-    userName: '',
-    userSubscriptionPlan: '',
-    userUsedTokens: 0
+    userState: 'loggingOut'
+  };
+  if (state.uid) {
+    set(state.uid, state, loggingOutState);
+    await invoke('Chat.rerender');
+  }
+  await logoutFromBackend(state.backendUrl);
+  return {
+    ...loggingOutState,
+    ...getLoggedOutBackendAuthState()
   };
 };
 
@@ -4159,7 +4580,7 @@ const handleClickOpenRouterApiKeyWebsite = async state => {
 };
 
 const getAiResponse$1 = async options => {
-  return invoke$9('ChatCoordinator.getAiResponse', options);
+  return invoke$8('ChatCoordinator.getAiResponse', options);
 };
 
 const execute = async (name, rawArguments, options) => {
@@ -4440,10 +4861,6 @@ const getClientRequestIdHeader = () => {
   };
 };
 
-const delay = async ms => {
-  await new Promise(resolve => setTimeout(resolve, ms));
-};
-
 const getMockAiResponse = async (userMessage, delayInMs) => {
   await delay(delayInMs);
   return `Mock AI response: I received "${userMessage}".`;
@@ -6815,1440 +7232,16 @@ const getAiResponse = async ({
 };
 
 const parseMessageContents = async rawMessages => {
-  return invoke$7('ChatMessageParsing.parseMessageContents', rawMessages);
-};
-
-const Actions = 'Actions';
-const Button = 'Button';
-const ButtonPrimary = 'ButtonPrimary';
-const ButtonSecondary = 'ButtonSecondary';
-const Chat = 'Chat';
-const ChatActions = 'ChatActions';
-const ChatAuthError = 'ChatAuthError';
-const ChatFocus = 'ChatFocus';
-const ChatFocusActions = 'ChatFocusActions';
-const ChatFocusHeader = 'ChatFocusHeader';
-const ChatFocusMainArea = 'ChatFocusMainArea';
-const ChatFocusProject = 'ChatFocusProject';
-const ChatHeader = 'ChatHeader';
-const ChatHeaderLabel = 'ChatHeaderLabel';
-const ChatInputBox = 'ChatInputBox';
-const ChatList = 'ChatList';
-const ChatListEmpty = 'ChatListEmpty';
-const ChatListItem = 'ChatListItem';
-const ChatListItemFocused = 'ChatListItemFocused';
-const ChatListItemLabel = 'ChatListItemLabel';
-const ChatListItemStatusFinished = 'ChatListItemStatusFinished';
-const ChatListItemStatusIcon = 'ChatListItemStatusIcon';
-const ChatListItemStatusInProgress = 'ChatListItemStatusInProgress';
-const ChatListItemStatusRow = 'ChatListItemStatusRow';
-const ChatListItemStatusStopped = 'ChatListItemStatusStopped';
-const ChatMessageContent = 'ChatMessageContent';
-const ChatMessageLink = 'ChatMessageLink';
-const ChatModelPicker = 'ChatModelPicker';
-const ChatModelPickerContainer = 'ChatModelPickerContainer';
-const ChatModelPickerHeader = 'ChatModelPickerHeader';
-const ChatModelPickerItem = 'ChatModelPickerItem';
-const ChatModelPickerItemLabel = 'ChatModelPickerItemLabel';
-const ChatModelPickerItemSelected = 'ChatModelPickerItemSelected';
-const ChatModelPickerItemUsageCost = 'ChatModelPickerItemUsageCost';
-const ChatModelPickerList = 'ChatModelPickerList';
-const ChatName = 'ChatName';
-const ChatOverlays = 'ChatOverlays';
-const ChatOrderedList = 'ChatOrderedList';
-const ChatOrderedListItem = 'ChatOrderedListItem';
-const ChatOrderedListItemContent = 'ChatOrderedListItemContent';
-const ChatOrderedListItemPrefix = 'ChatOrderedListItemPrefix';
-const ChatOrderedListMarker = 'ChatOrderedListMarker';
-const ChatComposerAttachment = 'ChatComposerAttachment';
-const ChatComposerAttachmentImage = 'ChatComposerAttachmentImage';
-const ChatComposerAttachmentInvalidImage = 'ChatComposerAttachmentInvalidImage';
-const ChatComposerAttachmentLabel = 'ChatComposerAttachmentLabel';
-const ChatComposerAttachmentPreview = 'ChatComposerAttachmentPreview';
-const ChatComposerAttachmentPreviewOverlay = 'ChatComposerAttachmentPreviewOverlay';
-const ChatComposerAttachmentPreviewOverlayError = 'ChatComposerAttachmentPreviewOverlayError';
-const ChatComposerAttachmentPreviewOverlayImage = 'ChatComposerAttachmentPreviewOverlayImage';
-const ChatComposerAttachmentRemoveButton = 'ChatComposerAttachmentRemoveButton';
-const ChatComposerAttachments = 'ChatComposerAttachments';
-const ChatComposerAttachmentTextFile = 'ChatComposerAttachmentTextFile';
-const ChatAttachment = 'ChatAttachment';
-const ChatAttachmentImage = 'ChatAttachmentImage';
-const ChatAttachmentInvalidImage = 'ChatAttachmentInvalidImage';
-const ChatAttachmentLabel = 'ChatAttachmentLabel';
-const ChatAttachmentPreview = 'ChatAttachmentPreview';
-const ChatAttachments = 'ChatAttachments';
-const ChatAttachmentTextFile = 'ChatAttachmentTextFile';
-const ChatSendArea = 'ChatSendArea';
-const ChatSendAreaBottom = 'ChatSendAreaBottom';
-const ChatSendAreaContent = 'ChatSendAreaContent';
-const ChatSendAreaPrimaryControls = 'ChatSendAreaPrimaryControls';
-const ChatTableWrapper = 'ChatTableWrapper';
-const ChatTodoList = 'ChatTodoList';
-const ChatTodoListHeader = 'ChatTodoListHeader';
-const ChatTodoListItem = 'ChatTodoListItem';
-const ChatTodoListItemCompleted = 'ChatTodoListItemCompleted';
-const ChatTodoListItemInProgress = 'ChatTodoListItemInProgress';
-const ChatTodoListItems = 'ChatTodoListItems';
-const ChatTodoListItemTodo = 'ChatTodoListItemTodo';
-const ChatToolCallFileName = 'ChatToolCallFileName';
-const ChatToolCallQuestionOption = 'ChatToolCallQuestionOption';
-const ChatToolCallQuestionOptions = 'ChatToolCallQuestionOptions';
-const ChatToolCallQuestionText = 'ChatToolCallQuestionText';
-const ChatToolCallReadFileLink = 'ChatToolCallReadFileLink';
-const ChatToolCallRenderHtmlBody = 'ChatToolCallRenderHtmlBody';
-const ChatToolCallRenderHtmlContent = 'ChatToolCallRenderHtmlContent';
-const ChatToolCallRenderHtmlLabel = 'ChatToolCallRenderHtmlLabel';
-const ChatToolCalls = 'ChatToolCalls';
-const ChatToolCallsLabel = 'ChatToolCallsLabel';
-const ChatUnorderedList = 'ChatUnorderedList';
-const ChatUnorderedListItem = 'ChatUnorderedListItem';
-const ChatViewDropOverlay = 'ChatViewDropOverlay';
-const ChatViewDropOverlayActive = 'ChatViewDropOverlayActive';
-const ChatWelcomeMessage = 'ChatWelcomeMessage';
-const CustomSelectContainer = 'CustomSelectContainer';
-const CustomSelectPopOver = 'CustomSelectPopOver';
-const Deletion = 'Deletion';
-const Empty = '';
-const FileIcon = 'FileIcon';
-const IconButton = 'IconButton';
-const IconButtonDisabled = 'IconButtonDisabled';
-const ImageElement = 'ImageElement';
-const ImageErrorMessage = 'ImageErrorMessage';
-const InputBox = 'InputBox';
-const Insertion = 'Insertion';
-const Label = 'Label';
-const LabelDetail = 'LabelDetail';
-const Markdown = 'Markdown';
-const MarkdownMathBlock = 'MarkdownMathBlock';
-const MarkdownQuote = 'MarkdownQuote';
-const MarkdownTable = 'MarkdownTable';
-const MaskIcon = 'MaskIcon';
-const MaskIconAccount = 'MaskIconAccount';
-const MaskIconAdd = 'MaskIconAdd';
-const MaskIconArrowLeft = 'MaskIconArrowLeft';
-const MaskIconChevronDown = 'MaskIconChevronDown';
-const MaskIconChevronRight = 'MaskIconChevronRight';
-const MaskIconChevronUp = 'MaskIconChevronUp';
-const MaskIconClose = 'MaskIconClose';
-const MaskIconDebugPause = 'MaskIconDebugPause';
-const MaskIconLayoutPanelLeft = 'MaskIconLayoutPanelLeft';
-const MaskIconSearch = 'MaskIconSearch';
-const MaskIconSettingsGear = 'MaskIconSettingsGear';
-const MaskIconSignOut = 'MaskIconSignOut';
-const Message = 'Message';
-const MessageAssistant = 'MessageAssistant';
-const MessageUser = 'MessageUser';
-const MissingApiKeyForm = 'MissingApiKeyForm';
-const MultiLineInputBox = 'MultilineInputBox';
-const ProjectAddButton = 'ProjectAddButton';
-const ProjectList = 'ProjectList';
-const ProjectListChevron = 'ProjectListChevron';
-const ProjectListGroup = 'ProjectListGroup';
-const ProjectListItem = 'ProjectListItem';
-const ProjectListItemActions = 'ProjectListItemActions';
-const ProjectListItemAddChatButton = 'ProjectListItemAddChatButton';
-const ProjectListItemLabel = 'ProjectListItemLabel';
-const ProjectListItemSelected = 'ProjectListItemSelected';
-const ProjectSessionItem = 'ProjectSessionItem';
-const ProjectSessionItemLabel = 'ProjectSessionItemLabel';
-const ProjectSessionItemSelected = 'ProjectSessionItemSelected';
-const ProjectSidebar = 'ProjectSidebar';
-const SearchFieldContainer = 'SearchFieldContainer';
-const RunModePickerContainer = 'RunModePickerContainer';
-const RunModePickerPopOver = 'RunModePickerPopOver';
-const Select = 'Select';
-const SelectLabel = 'SelectLabel';
-const SendButtonDisabled = 'SendButtonDisabled';
-const SessionArchiveButton = 'SessionArchiveButton';
-const StrikeThrough = 'StrikeThrough';
-const TokenAttribute = 'TokenAttribute';
-const TokenComment = 'TokenComment';
-const TokenKeyword = 'TokenKeyword';
-const TokenNumber = 'TokenNumber';
-const TokenProperty = 'TokenProperty';
-const TokenString = 'TokenString';
-const TokenTag = 'TokenTag';
-const TokenUsageOverview = 'TokenUsageOverview';
-const TokenUsageRing = 'TokenUsageRing';
-const TokenUsageRingInner = 'TokenUsageRingInner';
-const TokenValue = 'TokenValue';
-const ToolCallName = 'ToolCallName';
-const Viewlet = 'Viewlet';
-
-const jsRules = [{
-  className: TokenComment,
-  regex: /\/\/[^\n]*/
-}, {
-  className: TokenComment,
-  regex: /\/\*[\s\S]*?\*\//
-}, {
-  className: TokenString,
-  regex: /"[^"\\]*(?:\\.[^"\\]*)*"/
-}, {
-  className: TokenString,
-  regex: /'[^'\\]*(?:\\.[^'\\]*)*'/
-}, {
-  className: TokenString,
-  regex: /`[^`\\]*(?:\\.[^`\\]*)*`/
-}, {
-  className: TokenNumber,
-  regex: /\b\d+\.?\d*\b/
-}, {
-  className: TokenKeyword,
-  regex: /\b(?:const|let|var|function|return|if|else|for|while|class|new|typeof|instanceof|import|export|from|default|async|await|try|catch|finally|throw|this|true|false|null|undefined)\b/
-}];
-const tsRules = [{
-  className: TokenComment,
-  regex: /\/\/[^\n]*/
-}, {
-  className: TokenComment,
-  regex: /\/\*[\s\S]*?\*\//
-}, {
-  className: TokenString,
-  regex: /"[^"\\]*(?:\\.[^"\\]*)*"/
-}, {
-  className: TokenString,
-  regex: /'[^'\\]*(?:\\.[^'\\]*)*'/
-}, {
-  className: TokenString,
-  regex: /`[^`\\]*(?:\\.[^`\\]*)*`/
-}, {
-  className: TokenNumber,
-  regex: /\b\d+\.?\d*\b/
-}, {
-  className: TokenKeyword,
-  regex: /\b(?:abstract|any|as|asserts|async|await|boolean|class|const|constructor|declare|default|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|infer|instanceof|interface|is|keyof|let|module|namespace|never|new|null|number|object|override|private|protected|public|readonly|return|satisfies|set|static|string|super|switch|symbol|this|throw|true|try|type|typeof|undefined|unknown|var|void|while)\b/
-}];
-const htmlRules = [{
-  className: TokenComment,
-  regex: /<!--[\s\S]*?-->/
-}, {
-  className: TokenTag,
-  regex: /<\/[a-zA-Z][a-zA-Z0-9-]*\s*>/
-}, {
-  className: TokenTag,
-  regex: /<[a-zA-Z][a-zA-Z0-9-]*/
-}, {
-  className: TokenTag,
-  regex: /\/?>/
-}, {
-  className: TokenString,
-  regex: /"[^"]*"/
-}, {
-  className: TokenString,
-  regex: /'[^']*'/
-}, {
-  className: TokenAttribute,
-  regex: /[a-zA-Z-]+(?=\s*=)/
-}];
-const cssRules = [{
-  className: TokenComment,
-  regex: /\/\*[\s\S]*?\*\//
-}, {
-  className: TokenString,
-  regex: /"[^"]*"/
-}, {
-  className: TokenString,
-  regex: /'[^']*'/
-}, {
-  className: TokenValue,
-  regex: /#[0-9a-fA-F]{3,8}/
-}, {
-  className: TokenValue,
-  regex: /\b\d+(?:\.\d+)?(?:px|em|rem|%|vh|vw|pt|s|ms|fr)?\b/
-}, {
-  className: TokenProperty,
-  regex: /[a-zA-Z-]+(?=\s*:)/
-}];
-const pythonRules = [{
-  className: TokenComment,
-  regex: /#[^\n]*/
-}, {
-  className: TokenString,
-  regex: /"[^"\\]*(?:\\.[^"\\]*)*"/
-}, {
-  className: TokenString,
-  regex: /'[^'\\]*(?:\\.[^'\\]*)*'/
-}, {
-  className: TokenNumber,
-  regex: /\b\d+\.?\d*\b/
-}, {
-  className: TokenKeyword,
-  regex: /\b(?:def|class|return|if|elif|else|for|while|in|import|from|as|with|try|except|finally|raise|lambda|yield|pass|break|continue|True|False|None|and|or|not|is)\b/
-}];
-const jsonRules = [{
-  className: TokenProperty,
-  regex: /"[^"\\]*(?:\\.[^"\\]*)*"(?=\s*:)/
-}, {
-  className: TokenString,
-  regex: /"[^"\\]*(?:\\.[^"\\]*)*"/
-}, {
-  className: TokenNumber,
-  regex: /-?\b\d+\.?\d*(?:[eE][+-]?\d+)?\b/
-}, {
-  className: TokenKeyword,
-  regex: /\b(?:true|false|null)\b/
-}];
-const tokenize = (code, rules) => {
-  const tokens = [];
-  let pos = 0;
-  while (pos < code.length) {
-    let matched = false;
-    for (const rule of rules) {
-      const match = rule.regex.exec(code.slice(pos));
-      if (match && match.index === 0) {
-        tokens.push({
-          className: rule.className,
-          text: match[0]
-        });
-        pos += match[0].length;
-        matched = true;
-        break;
-      }
-    }
-    if (!matched) {
-      const last = tokens.at(-1);
-      if (last && last.className === '') {
-        tokens.pop();
-        tokens.push({
-          className: '',
-          text: last.text + code[pos]
-        });
-      } else {
-        tokens.push({
-          className: '',
-          text: code[pos]
-        });
-      }
-      pos++;
-    }
-  }
-  return tokens;
-};
-const highlightCode = (code, language) => {
-  if (!language) {
-    return [{
-      className: '',
-      text: code
-    }];
-  }
-  const normalized = language.toLowerCase();
-  if (normalized === 'html') {
-    return tokenize(code, htmlRules);
-  }
-  if (normalized === 'css') {
-    return tokenize(code, cssRules);
-  }
-  if (normalized === 'js' || normalized === 'javascript') {
-    return tokenize(code, jsRules);
-  }
-  if (normalized === 'ts' || normalized === 'typescript') {
-    return tokenize(code, tsRules);
-  }
-  if (normalized === 'py' || normalized === 'python') {
-    return tokenize(code, pythonRules);
-  }
-  if (normalized === 'json') {
-    return tokenize(code, jsonRules);
-  }
-  return [{
-    className: '',
-    text: code
-  }];
-};
-
-const isAlphaNumeric = value => {
-  if (!value) {
-    return false;
-  }
-  const code = value.codePointAt(0) ?? 0;
-  if (code >= 48 && code <= 57) {
-    return true;
-  }
-  if (code >= 65 && code <= 90) {
-    return true;
-  }
-  return code >= 97 && code <= 122;
-};
-const sanitizeLinkUrl = url => {
-  const trimmedUrl = url.trim();
-  const normalized = url.trim().toLowerCase();
-  if (normalized.startsWith('http://') || normalized.startsWith('https://') || normalized.startsWith('file://') || normalized.startsWith('vscode-references://')) {
-    return trimmedUrl;
-  }
-  if (!trimmedUrl || trimmedUrl.startsWith('#') || trimmedUrl.startsWith('?') || trimmedUrl.startsWith('/') || trimmedUrl.startsWith('\\')) {
-    return '#';
-  }
-  if (trimmedUrl.includes('://') || trimmedUrl.includes(':')) {
-    return '#';
-  }
-  if (isPathTraversalAttempt(trimmedUrl)) {
-    return '#';
-  }
-  const normalizedPath = normalizeRelativePath(trimmedUrl);
-  if (normalizedPath === '.') {
-    return '#';
-  }
-  return `file:///workspace/${normalizedPath}`;
-};
-const sanitizeImageUrl = url => {
-  const normalized = url.trim().toLowerCase();
-  if (normalized.startsWith('http://') || normalized.startsWith('https://')) {
-    return url;
-  }
-  return '#';
-};
-const isOpenBracket = value => {
-  return value === '(' || value === '[' || value === '{';
-};
-const isCloseBracket = value => {
-  return value === ')' || value === ']' || value === '}';
-};
-const findRawUrlEnd = (value, start) => {
-  let index = start;
-  while (index < value.length) {
-    const current = value[index];
-    if (current === ' ' || current === '\n' || current === '\r' || current === '\t' || current === '"' || current === "'" || current === '`' || current === '<' || current === '>') {
-      break;
-    }
-    index++;
-  }
-  return index;
-};
-const trimRawUrlEnd = url => {
-  let end = url.length;
-  while (end > 0) {
-    const current = url[end - 1];
-    if (current === '.' || current === ',' || current === ':' || current === ';' || current === '!' || current === '?') {
-      end--;
-      continue;
-    }
-    if (isCloseBracket(current)) {
-      const inner = url.slice(0, end - 1);
-      let openCount = 0;
-      let closeCount = 0;
-      for (let i = 0; i < inner.length; i++) {
-        if (isOpenBracket(inner[i])) {
-          openCount++;
-        } else if (isCloseBracket(inner[i])) {
-          closeCount++;
-        }
-      }
-      if (closeCount >= openCount) {
-        end--;
-        continue;
-      }
-    }
-    break;
-  }
-  return url.slice(0, end);
-};
-const parseRawLinkToken = (value, start) => {
-  if (!value.startsWith('https://', start) && !value.startsWith('http://', start)) {
-    return undefined;
-  }
-  if (start >= 2 && value[start - 1] === '(' && value[start - 2] === ']') {
-    return undefined;
-  }
-  const end = findRawUrlEnd(value, start);
-  const rawUrl = value.slice(start, end);
-  const href = trimRawUrlEnd(rawUrl);
-  if (!href) {
-    return undefined;
-  }
-  return {
-    length: href.length,
-    node: {
-      href: sanitizeLinkUrl(href),
-      text: href,
-      type: 'link'
-    }
-  };
-};
-const parseLinkToken = (value, start) => {
-  if (value[start] !== '[') {
-    return undefined;
-  }
-  const textEnd = value.indexOf(']', start + 1);
-  if (textEnd === -1) {
-    return undefined;
-  }
-  if (value[textEnd + 1] !== '(') {
-    return undefined;
-  }
-  let depth = 1;
-  let index = textEnd + 2;
-  while (index < value.length) {
-    const current = value[index];
-    if (current === '\n') {
-      return undefined;
-    }
-    if (current === '(') {
-      depth++;
-    } else if (current === ')') {
-      depth--;
-      if (depth === 0) {
-        const text = value.slice(start + 1, textEnd);
-        const href = value.slice(textEnd + 2, index);
-        if (!text || !href) {
-          return undefined;
-        }
-        return {
-          length: index - start + 1,
-          node: {
-            href: sanitizeLinkUrl(href),
-            text,
-            type: 'link'
-          }
-        };
-      }
-    }
-    index++;
-  }
-  return undefined;
-};
-const parseImageToken = (value, start) => {
-  if (value[start] !== '!' || value[start + 1] !== '[') {
-    return undefined;
-  }
-  const textEnd = value.indexOf(']', start + 2);
-  if (textEnd === -1) {
-    return undefined;
-  }
-  if (value[textEnd + 1] !== '(') {
-    return undefined;
-  }
-  let depth = 1;
-  let index = textEnd + 2;
-  while (index < value.length) {
-    const current = value[index];
-    if (current === '\n') {
-      return undefined;
-    }
-    if (current === '(') {
-      depth++;
-    } else if (current === ')') {
-      depth--;
-      if (depth === 0) {
-        const alt = value.slice(start + 2, textEnd);
-        const src = value.slice(textEnd + 2, index);
-        if (!src) {
-          return undefined;
-        }
-        return {
-          length: index - start + 1,
-          node: {
-            alt,
-            src: sanitizeImageUrl(src),
-            type: 'image'
-          }
-        };
-      }
-    }
-    index++;
-  }
-  return undefined;
-};
-const parseBoldToken = (value, start) => {
-  if (value[start] !== '*' || value[start + 1] !== '*') {
-    return undefined;
-  }
-  const end = value.indexOf('**', start + 2);
-  if (end === -1) {
-    return undefined;
-  }
-  const text = value.slice(start + 2, end);
-  if (!text || text.includes('\n')) {
-    return undefined;
-  }
-  return {
-    length: end - start + 2,
-    node: {
-      children: parseInlineNodes(text),
-      type: 'bold'
-    }
-  };
-};
-const parseBoldItalicToken = (value, start) => {
-  if (value[start] !== '*' || value[start + 1] !== '*' || value[start + 2] !== '*') {
-    return undefined;
-  }
-  const end = value.indexOf('***', start + 3);
-  if (end === -1) {
-    return undefined;
-  }
-  const text = value.slice(start + 3, end);
-  if (!text || text.includes('\n')) {
-    return undefined;
-  }
-  return {
-    length: end - start + 3,
-    node: {
-      children: [{
-        children: parseInlineNodes(text),
-        type: 'italic'
-      }],
-      type: 'bold'
-    }
-  };
-};
-const findItalicEnd = (value, start) => {
-  let index = start + 1;
-  while (index < value.length) {
-    if (value[index] !== '*') {
-      index++;
-      continue;
-    }
-    if (value[index + 1] !== '*') {
-      return index;
-    }
-    const boldEnd = value.indexOf('**', index + 2);
-    if (boldEnd === -1) {
-      return -1;
-    }
-    index = boldEnd + 2;
-  }
-  return -1;
-};
-const parseItalicToken = (value, start) => {
-  if (value[start] !== '*' || value[start + 1] === '*') {
-    return undefined;
-  }
-  const end = findItalicEnd(value, start);
-  if (end === -1) {
-    return undefined;
-  }
-  const text = value.slice(start + 1, end);
-  if (!text) {
-    return undefined;
-  }
-  return {
-    length: end - start + 1,
-    node: {
-      children: parseInlineNodes(text),
-      type: 'italic'
-    }
-  };
-};
-const parseStrikethroughToken = (value, start) => {
-  if (value[start] !== '~' || value[start + 1] !== '~') {
-    return undefined;
-  }
-  const end = value.indexOf('~~', start + 2);
-  if (end === -1) {
-    return undefined;
-  }
-  const text = value.slice(start + 2, end);
-  if (!text || text.includes('\n')) {
-    return undefined;
-  }
-  return {
-    length: end - start + 2,
-    node: {
-      children: parseInlineNodes(text),
-      type: 'strikethrough'
-    }
-  };
-};
-const parseInlineCodeToken = (value, start) => {
-  if (value[start] !== '`') {
-    return undefined;
-  }
-  const end = value.indexOf('`', start + 1);
-  if (end === -1) {
-    return undefined;
-  }
-  const codeText = value.slice(start + 1, end);
-  if (!codeText || codeText.includes('\n')) {
-    return undefined;
-  }
-  return {
-    length: end - start + 1,
-    node: {
-      text: codeText,
-      type: 'inline-code'
-    }
-  };
-};
-const parseMathToken = (value, start) => {
-  if (value[start] !== '$') {
-    return undefined;
-  }
-  const delimiterLength = value[start + 1] === '$' ? 2 : 1;
-  const previous = value[start - 1];
-  if (isAlphaNumeric(previous)) {
-    return undefined;
-  }
-  const next = value[start + delimiterLength];
-  if (!next || next === '.') {
-    return undefined;
-  }
-  if (next === '(' && (value[start + delimiterLength + 1] === '"' || value[start + delimiterLength + 1] === "'")) {
-    return undefined;
-  }
-  let index = start + delimiterLength;
-  while (index < value.length) {
-    if (value[index] === '\n') {
-      return undefined;
-    }
-    const isClosed = delimiterLength === 2 ? value.startsWith('$$', index) : value[index] === '$';
-    if (isClosed) {
-      const body = value.slice(start + delimiterLength, index);
-      const following = value[index + delimiterLength];
-      if (!body || isAlphaNumeric(following)) {
-        return undefined;
-      }
-      return {
-        length: index - start + delimiterLength,
-        node: {
-          displayMode: delimiterLength === 2,
-          text: body.trim(),
-          type: 'math-inline'
-        }
-      };
-    }
-    if (value[index] === '\\') {
-      index += 2;
-      continue;
-    }
-    index++;
-  }
-  return undefined;
-};
-const parseInlineToken = (value, start) => {
-  return parseImageToken(value, start) || parseLinkToken(value, start) || parseRawLinkToken(value, start) || parseBoldItalicToken(value, start) || parseBoldToken(value, start) || parseItalicToken(value, start) || parseLinkToken(value, start) || parseBoldItalicToken(value, start) || parseBoldToken(value, start) || parseItalicToken(value, start) || parseStrikethroughToken(value, start) || parseInlineCodeToken(value, start) || parseMathToken(value, start);
-};
-const parseInlineNodes = value => {
-  const nodes = [];
-  let textStart = 0;
-  let index = 0;
-  const pushText = end => {
-    if (end <= textStart) {
-      return;
-    }
-    nodes.push({
-      text: value.slice(textStart, end),
-      type: 'text'
-    });
-  };
-  while (index < value.length) {
-    const parsed = parseInlineToken(value, index);
-    if (!parsed) {
-      index++;
-      continue;
-    }
-    pushText(index);
-    nodes.push(parsed.node);
-    index += parsed.length;
-    textStart = index;
-  }
-  pushText(value.length);
-  if (nodes.length === 0) {
-    return [{
-      text: value,
-      type: 'text'
-    }];
-  }
-  return nodes;
-};
-
-const markdownMathBlockDelimiter = '$$';
-const escapedNewlineRegex = /\\r\\n|\\n/g;
-const lineBreakRegex = /\r?\n/;
-const tableDelimiterRegex = /\|\s*[-:]{3,}/;
-const inlineTableCellRegex = /\|\s+\|/g;
-const normalizeEscapedNewlines = value => {
-  if (value.includes('\\n')) {
-    return value.replaceAll(escapedNewlineRegex, '\n');
-  }
-  return value;
-};
-const normalizeInlineTables = value => {
-  return value.split(lineBreakRegex).map(line => {
-    if (!line.includes('|')) {
-      return line;
-    }
-    if (!tableDelimiterRegex.test(line)) {
-      return line;
-    }
-    return line.replaceAll(inlineTableCellRegex, '|\n|');
-  }).join('\n');
-};
-const parseHeadingLine = line => {
-  const trimmedStart = line.trimStart();
-  let index = 0;
-  while (index < trimmedStart.length && trimmedStart[index] === '#') {
-    index++;
-  }
-  if (index === 0 || index > 6) {
-    return undefined;
-  }
-  if (trimmedStart[index] !== ' ') {
-    return undefined;
-  }
-  const text = trimmedStart.slice(index).trimStart();
-  return {
-    level: index,
-    text
-  };
-};
-const parseOrderedListItemLine = line => {
-  let indentation = 0;
-  while (indentation < line.length && line[indentation] === ' ') {
-    indentation++;
-  }
-  let index = indentation;
-  const firstDigit = index;
-  while (index < line.length && line[index] >= '0' && line[index] <= '9') {
-    index++;
-  }
-  if (index === firstDigit || line[index] !== '.') {
-    return undefined;
-  }
-  index++;
-  if (line[index] !== ' ') {
-    return undefined;
-  }
-  while (index < line.length && line[index] === ' ') {
-    index++;
-  }
-  return {
-    indentation,
-    text: line.slice(index)
-  };
-};
-const parseUnorderedListItemLine = line => {
-  let indentation = 0;
-  while (indentation < line.length && line[indentation] === ' ') {
-    indentation++;
-  }
-  const marker = line[indentation];
-  if (marker !== '-' && marker !== '*') {
-    return undefined;
-  }
-  let index = indentation + 1;
-  if (line[index] !== ' ') {
-    return undefined;
-  }
-  while (index < line.length && line[index] === ' ') {
-    index++;
-  }
-  return {
-    indentation,
-    text: line.slice(index)
-  };
-};
-const parseBlockQuoteLine = line => {
-  const trimmedStart = line.trimStart();
-  if (!trimmedStart.startsWith('>')) {
-    return undefined;
-  }
-  const content = trimmedStart.slice(1);
-  if (!content) {
-    return '';
-  }
-  if (content.startsWith(' ')) {
-    return content.slice(1);
-  }
-  return content;
-};
-const isThematicBreakLine = line => {
-  const trimmedStart = line.trimStart();
-  const leadingSpaces = line.length - trimmedStart.length;
-  if (leadingSpaces > 3) {
-    return false;
-  }
-  const trimmed = trimmedStart.trimEnd();
-  if (!trimmed) {
-    return false;
-  }
-  const marker = trimmed[0];
-  if (marker !== '-' && marker !== '_' && marker !== '*') {
-    return false;
-  }
-  let markerCount = 0;
-  for (let i = 0; i < trimmed.length; i++) {
-    const char = trimmed[i];
-    if (char === marker) {
-      markerCount++;
-      continue;
-    }
-    if (char !== ' ') {
-      return false;
-    }
-  }
-  return markerCount >= 3;
-};
-const isTableRow = line => {
-  const trimmed = line.trim();
-  if (!trimmed.startsWith('|') || !trimmed.endsWith('|')) {
-    return false;
-  }
-  return trimmed.length > 2;
-};
-const getTableCells = line => {
-  const trimmed = line.trim();
-  return trimmed.slice(1, -1).split('|').map(part => part.trim());
-};
-const scanBlockTokens = rawMessage => {
-  const normalizedMessage = normalizeInlineTables(normalizeEscapedNewlines(rawMessage));
-  const lines = normalizedMessage.split(lineBreakRegex);
-  const tokens = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const trimmed = line.trim();
-    if (!trimmed) {
-      tokens.push({
-        type: 'blank-line'
-      });
-      continue;
-    }
-    const blockQuoteLine = parseBlockQuoteLine(line);
-    if (blockQuoteLine !== undefined) {
-      tokens.push({
-        text: blockQuoteLine,
-        type: 'blockquote-line'
-      });
-      continue;
-    }
-    if (trimmed.startsWith('```')) {
-      const language = trimmed.slice(3).trim();
-      const codeLines = [];
-      i++;
-      while (i < lines.length && !lines[i].trim().startsWith('```')) {
-        codeLines.push(lines[i]);
-        i++;
-      }
-      if (language) {
-        tokens.push({
-          language,
-          text: codeLines.join('\n'),
-          type: 'code-block'
-        });
-      } else {
-        tokens.push({
-          text: codeLines.join('\n'),
-          type: 'code-block'
-        });
-      }
-      continue;
-    }
-    if (trimmed === markdownMathBlockDelimiter) {
-      const endIndex = lines.findIndex((candidate, index) => {
-        if (index <= i) {
-          return false;
-        }
-        return candidate.trim() === markdownMathBlockDelimiter;
-      });
-      if (endIndex !== -1) {
-        tokens.push({
-          text: lines.slice(i + 1, endIndex).join('\n').trim(),
-          type: 'math-block'
-        });
-        i = endIndex;
-        continue;
-      }
-    }
-    const heading = parseHeadingLine(line);
-    if (heading) {
-      tokens.push({
-        level: heading.level,
-        text: heading.text,
-        type: 'heading-line'
-      });
-      continue;
-    }
-    if (isThematicBreakLine(line)) {
-      tokens.push({
-        type: 'thematic-break'
-      });
-      continue;
-    }
-    const ordered = parseOrderedListItemLine(line);
-    if (ordered) {
-      tokens.push({
-        indentation: ordered.indentation,
-        text: ordered.text,
-        type: 'ordered-list-item-line'
-      });
-      continue;
-    }
-    const unordered = parseUnorderedListItemLine(line);
-    if (unordered) {
-      tokens.push({
-        indentation: unordered.indentation,
-        text: unordered.text,
-        type: 'unordered-list-item-line'
-      });
-      continue;
-    }
-    if (isTableRow(line)) {
-      tokens.push({
-        cells: getTableCells(line),
-        line,
-        type: 'table-row-line'
-      });
-      continue;
-    }
-    tokens.push({
-      text: line,
-      type: 'paragraph-line'
-    });
-  }
-  return tokens;
-};
-
-const isTableSeparatorCell = value => {
-  if (!value) {
-    return false;
-  }
-  let index = 0;
-  if (value[index] === ':') {
-    index++;
-  }
-  let dashCount = 0;
-  while (index < value.length && value[index] === '-') {
-    dashCount++;
-    index++;
-  }
-  if (dashCount < 3) {
-    return false;
-  }
-  if (index < value.length && value[index] === ':') {
-    index++;
-  }
-  return index === value.length;
-};
-const isTableSeparatorToken = (token, expectedColumns) => {
-  if (!token || token.type !== 'table-row-line') {
-    return false;
-  }
-  if (token.cells.length !== expectedColumns) {
-    return false;
-  }
-  return token.cells.every(isTableSeparatorCell);
-};
-const toTableCell = value => {
-  return {
-    children: parseInlineNodes(value),
-    type: 'table-cell'
-  };
-};
-const toTableRow = token => {
-  return {
-    cells: token.cells.map(toTableCell),
-    type: 'table-row'
-  };
-};
-const getEmptyTextNode = () => {
-  return [{
-    children: [{
-      text: '',
-      type: 'text'
-    }],
-    type: 'text'
-  }];
-};
-const parseBlockTokens = tokens => {
-  if (tokens.length === 0) {
-    return getEmptyTextNode();
-  }
-  const nodes = [];
-  let paragraphLines = [];
-  let listItems = [];
-  let listType = '';
-  let orderedListPathStack = [];
-  let canContinueOrderedListItemParagraph = false;
-  const createListItem = (text, index) => {
-    return {
-      children: parseInlineNodes(text),
-      ...(index === undefined ? {} : {
-        index
-      }),
-      type: 'list-item'
-    };
-  };
-  const getListItemAtPath = (items, path) => {
-    let currentItems = items;
-    let currentItem;
-    for (const index of path) {
-      currentItem = currentItems[index];
-      if (!currentItem) {
-        return undefined;
-      }
-      currentItems = currentItem.nestedItems || [];
-    }
-    return currentItem;
-  };
-  const appendNestedItemAtPath = (items, path, item, nestedListType) => {
-    if (path.length === 0) {
-      return [...items, item];
-    }
-    const [index, ...rest] = path;
-    const current = items[index];
-    if (!current) {
-      return [...items];
-    }
-    const nextNestedItems = rest.length > 0 ? appendNestedItemAtPath(current.nestedItems || [], rest, item, nestedListType) : [...(current.nestedItems || []), item];
-    const nextItem = {
-      ...current,
-      nestedItems: nextNestedItems,
-      nestedListType
-    };
-    return [...items.slice(0, index), nextItem, ...items.slice(index + 1)];
-  };
-  const appendInlineChildrenAtPath = (items, path, children) => {
-    if (path.length === 0) {
-      return [...items];
-    }
-    const [index, ...rest] = path;
-    const current = items[index];
-    if (!current) {
-      return [...items];
-    }
-    const lineBreakNode = {
-      text: '\n',
-      type: 'text'
-    };
-    const nextChildren = [...current.children, lineBreakNode, ...children];
-    const nextItem = rest.length > 0 ? {
-      ...current,
-      nestedItems: appendInlineChildrenAtPath(current.nestedItems || [], rest, children)
-    } : {
-      ...current,
-      children: nextChildren
-    };
-    return [...items.slice(0, index), nextItem, ...items.slice(index + 1)];
-  };
-  const flushParagraph = () => {
-    if (paragraphLines.length === 0) {
-      return;
-    }
-    nodes.push({
-      children: parseInlineNodes(paragraphLines.join('\n')),
-      type: 'text'
-    });
-    paragraphLines = [];
-  };
-  const flushList = () => {
-    if (listItems.length === 0) {
-      return;
-    }
-    nodes.push({
-      items: listItems,
-      type: listType || 'ordered-list'
-    });
-    listItems = [];
-    listType = '';
-    orderedListPathStack = [];
-    canContinueOrderedListItemParagraph = false;
-  };
-  for (let i = 0; i < tokens.length; i++) {
-    const token = tokens[i];
-    if (token.type === 'blank-line') {
-      flushParagraph();
-      canContinueOrderedListItemParagraph = false;
-      continue;
-    }
-    if (token.type === 'code-block') {
-      flushList();
-      flushParagraph();
-      if (token.language) {
-        nodes.push({
-          codeTokens: highlightCode(token.text, token.language),
-          language: token.language,
-          text: token.text,
-          type: 'code-block'
-        });
-      } else {
-        nodes.push({
-          codeTokens: highlightCode(token.text, undefined),
-          text: token.text,
-          type: 'code-block'
-        });
-      }
-      continue;
-    }
-    if (token.type === 'math-block') {
-      flushList();
-      flushParagraph();
-      nodes.push({
-        text: token.text,
-        type: 'math-block'
-      });
-      continue;
-    }
-    if (token.type === 'thematic-break') {
-      flushList();
-      flushParagraph();
-      nodes.push({
-        type: 'thematic-break'
-      });
-      continue;
-    }
-    if (token.type === 'blockquote-line') {
-      flushList();
-      flushParagraph();
-      const lines = [];
-      while (i < tokens.length && tokens[i].type === 'blockquote-line') {
-        const quoteToken = tokens[i];
-        if (quoteToken.type === 'blockquote-line') {
-          lines.push(quoteToken.text);
-        }
-        i++;
-      }
-      i--;
-      nodes.push({
-        children: parseBlockTokens(scanBlockTokens(lines.join('\n'))),
-        type: 'blockquote'
-      });
-      continue;
-    }
-    if (token.type === 'table-row-line') {
-      const expectedColumns = token.cells.length;
-      if (isTableSeparatorToken(tokens[i + 1], expectedColumns)) {
-        flushList();
-        flushParagraph();
-        const rows = [];
-        i += 2;
-        while (i < tokens.length && tokens[i].type === 'table-row-line') {
-          const rowToken = tokens[i];
-          if (rowToken.type !== 'table-row-line') {
-            break;
-          }
-          if (rowToken.cells.length === expectedColumns) {
-            rows.push(toTableRow(rowToken));
-          }
-          i++;
-        }
-        i--;
-        nodes.push({
-          headers: token.cells.map(toTableCell),
-          rows,
-          type: 'table'
-        });
-        continue;
-      }
-      flushList();
-      paragraphLines.push(token.line);
-      continue;
-    }
-    if (token.type === 'ordered-list-item-line') {
-      if (listType === 'ordered-list' && listItems.length > 0 && token.indentation > 0 && orderedListPathStack.length > 0) {
-        const parentEntry = orderedListPathStack.toReversed().find(entry => entry.indentation < token.indentation);
-        if (parentEntry) {
-          const parentItem = getListItemAtPath(listItems, parentEntry.path);
-          if (parentItem) {
-            const nextIndex = parentItem.nestedItems?.length || 0;
-            const nextItem = createListItem(token.text, nextIndex + 1);
-            listItems = appendNestedItemAtPath(listItems, parentEntry.path, nextItem, 'ordered-list');
-            const nextPath = [...parentEntry.path, nextIndex];
-            orderedListPathStack = [...orderedListPathStack.filter(entry => entry.indentation < token.indentation), {
-              indentation: token.indentation,
-              path: nextPath
-            }];
-            canContinueOrderedListItemParagraph = true;
-            continue;
-          }
-        }
-      }
-      if (listType && listType !== 'ordered-list') {
-        flushList();
-      }
-      flushParagraph();
-      listType = 'ordered-list';
-      const nextIndex = listItems.length;
-      const nextItem = createListItem(token.text, nextIndex + 1);
-      listItems.push(nextItem);
-      orderedListPathStack = [...orderedListPathStack.filter(entry => entry.indentation < token.indentation), {
-        indentation: token.indentation,
-        path: [nextIndex]
-      }];
-      canContinueOrderedListItemParagraph = true;
-      continue;
-    }
-    if (token.type === 'unordered-list-item-line') {
-      if (listType === 'ordered-list' && listItems.length > 0 && token.indentation > 0 && orderedListPathStack.length > 0) {
-        const parentEntry = orderedListPathStack.toReversed().find(entry => entry.indentation < token.indentation);
-        if (parentEntry) {
-          const nextItem = createListItem(token.text);
-          listItems = appendNestedItemAtPath(listItems, parentEntry.path, nextItem, 'unordered-list');
-          canContinueOrderedListItemParagraph = false;
-          continue;
-        }
-      }
-      if (listType && listType !== 'unordered-list') {
-        flushList();
-      }
-      flushParagraph();
-      listType = 'unordered-list';
-      listItems.push(createListItem(token.text));
-      canContinueOrderedListItemParagraph = false;
-      continue;
-    }
-    if (token.type === 'heading-line') {
-      flushList();
-      flushParagraph();
-      nodes.push({
-        children: parseInlineNodes(token.text),
-        level: token.level,
-        type: 'heading'
-      });
-      continue;
-    }
-    if (token.type === 'paragraph-line' && listType === 'ordered-list' && listItems.length > 0 && canContinueOrderedListItemParagraph) {
-      const currentPath = orderedListPathStack.at(-1)?.path;
-      if (currentPath) {
-        listItems = appendInlineChildrenAtPath(listItems, currentPath, parseInlineNodes(token.text));
-        continue;
-      }
-    }
-    flushList();
-    paragraphLines.push(token.text);
-    canContinueOrderedListItemParagraph = false;
-  }
-  flushList();
-  flushParagraph();
-  return nodes.length === 0 ? getEmptyTextNode() : nodes;
-};
-
-const parseMessageContent = async rawMessage => {
-  return parseBlockTokens(scanBlockTokens(rawMessage));
-};
-
-const emptyMessageContent = [{
-  children: [{
-    text: '',
-    type: 'text'
-  }],
-  type: 'text'
-}];
-const parseMathInline = async children => {
-  const nextChildren = [];
-  for (const child of children) {
-    if (child.type === 'math-inline') {
-      const dom = await getMathInlineDom(child);
-      nextChildren.push({
-        dom,
-        type: 'math-inline-dom'
-      });
-      continue;
-    }
-    if (child.type === 'bold') {
-      nextChildren.push({
-        ...child,
-        children: await parseMathInline(child.children)
-      });
-      continue;
-    }
-    if (child.type === 'italic') {
-      nextChildren.push({
-        ...child,
-        children: await parseMathInline(child.children)
-      });
-      continue;
-    }
-    if (child.type === 'strikethrough') {
-      nextChildren.push({
-        ...child,
-        children: await parseMathInline(child.children)
-      });
-      continue;
-    }
-    nextChildren.push(child);
-  }
-  return nextChildren;
-};
-const parseMathListItem = async item => {
-  const children = await parseMathInline(item.children);
-  if (!item.nestedItems) {
-    return {
-      ...item,
-      children
-    };
-  }
-  const nestedItems = [];
-  for (const nestedItem of item.nestedItems) {
-    nestedItems.push(await parseMathListItem(nestedItem));
-  }
-  return {
-    ...item,
-    children,
-    nestedItems
-  };
-};
-const parseMathTableCell = async cell => {
-  return {
-    ...cell,
-    children: await parseMathInline(cell.children)
-  };
-};
-const parseMathNode = async node => {
-  if (node.type === 'math-block') {
-    const dom = await getMathBlockDom(node);
-    return {
-      dom,
-      type: 'math-block-dom'
-    };
-  }
-  if (node.type === 'text' || node.type === 'heading') {
-    return {
-      ...node,
-      children: await parseMathInline(node.children)
-    };
-  }
-  if (node.type === 'blockquote') {
-    const children = [];
-    for (const child of node.children) {
-      children.push(await parseMathNode(child));
-    }
-    return {
-      ...node,
-      children
-    };
-  }
-  if (node.type === 'ordered-list' || node.type === 'unordered-list') {
-    const items = [];
-    for (const item of node.items) {
-      items.push(await parseMathListItem(item));
-    }
-    return {
-      ...node,
-      items
-    };
-  }
-  if (node.type === 'table') {
-    const headers = [];
-    for (const header of node.headers) {
-      headers.push(await parseMathTableCell(header));
-    }
-    const rows = [];
-    for (const row of node.rows) {
-      const cells = [];
-      for (const cell of row.cells) {
-        cells.push(await parseMathTableCell(cell));
-      }
-      rows.push({
-        ...row,
-        cells
-      });
-    }
-    return {
-      ...node,
-      headers,
-      rows
-    };
-  }
-  return node;
-};
-const parseMessage = async rawMessage => {
-  const parsedContent = await parseMessageContent(rawMessage);
-  const nextParsedContent = [];
-  for (const node of parsedContent) {
-    nextParsedContent.push(await parseMathNode(node));
-  }
-  return nextParsedContent;
+  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;
@@ -8280,20 +7273,10 @@ const copyParsedMessageContent = (parsedMessages, sourceMessageId, targetMessage
   return setParsedMessageContent(parsedMessages, targetMessageId, parsedMessage.text, parsedMessage.parsedContent);
 };
 const parseAndStoreMessageContent = async (parsedMessages, message) => {
-  const existingParsedMessage = parsedMessages.find(item => item.id === message.id);
-  if (existingParsedMessage && existingParsedMessage.text === message.text) {
-    return parsedMessages;
-  }
-  await Promise.resolve();
-  const parsedContent = message.text === '' ? emptyMessageContent : await parseMessage(message.text);
-  return setParsedMessageContent(parsedMessages, message.id, message.text, parsedContent);
+  return parseAndStoreMessagesContentInWorker(parsedMessages, [message]);
 };
 const parseAndStoreMessagesContent = async (parsedMessages, messages) => {
-  let nextParsedMessages = parsedMessages;
-  for (const message of messages) {
-    nextParsedMessages = await parseAndStoreMessageContent(nextParsedMessages, message);
-  }
-  return nextParsedMessages;
+  return parseAndStoreMessagesContentInWorker(parsedMessages, messages);
 };
 const getMessagesNeedingParsing = (parsedMessages, messages) => {
   return messages.filter(message => {
@@ -8314,16 +7297,17 @@ const parseAndStoreMessagesContentInWorker = async (parsedMessages, messages) =>
   }
   return nextParsedMessages;
 };
-const parseAndStoreMessagesContentWithWorkerPreference = async (parsedMessages, messages, useChatMessageParsingWorker) => {
-  if (useChatMessageParsingWorker) {
-    return parseAndStoreMessagesContentInWorker(parsedMessages, messages);
-  }
-  return parseAndStoreMessagesContent(parsedMessages, messages);
-};
 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({
@@ -8738,10 +7722,6 @@ const getNextHandleTextChunkState = (latestState, parsedMessages, sessions) => {
   };
 };
 
-const getSelectedSession = (sessions, selectedSessionId) => {
-  return sessions.find(session => session.id === selectedSessionId);
-};
-
 const setAndRerenderHandleTextChunkState = async (uid, previousState, nextState) => {
   set(uid, previousState, nextState);
   // @ts-ignore
@@ -9040,6 +8020,11 @@ const withProvisionedBackgroundSession = async (state, session) => {
   };
 };
 const handleSubmit = async state => {
+  const authState = state.authEnabled && state.backendUrl ? await syncBackendAuth(state.backendUrl) : undefined;
+  const effectiveState = authState ? {
+    ...state,
+    ...authState
+  } : state;
   const {
     agentMode,
     aiSessionTitleGenerationEnabled,
@@ -9073,22 +8058,22 @@ const handleSubmit = async state => {
     useMockApi,
     viewMode,
     webSearchEnabled
-  } = state;
+  } = effectiveState;
   const userText = composerValue.trim();
   if (!userText) {
-    return state;
+    return effectiveState;
   }
   const slashCommand = getSlashCommand(userText);
   if (slashCommand) {
-    return executeSlashCommand(state, slashCommand);
+    return executeSlashCommand(effectiveState, slashCommand);
   }
   const userTime = new Date().toLocaleTimeString([], {
     hour: '2-digit',
     minute: '2-digit'
   });
   const userMessageId = crypto.randomUUID();
-  const composerAttachments = state.composerAttachments.length > 0 ? state.composerAttachments : await getComposerAttachments(state.selectedSessionId);
-  await clearComposerAttachments(state.selectedSessionId, composerAttachments.map(attachment => attachment.attachmentId));
+  const composerAttachments = effectiveState.composerAttachments.length > 0 ? effectiveState.composerAttachments : await getComposerAttachments(effectiveState.selectedSessionId);
+  await clearComposerAttachments(effectiveState.selectedSessionId, composerAttachments.map(attachment => attachment.attachmentId));
   const userMessage = {
     ...(composerAttachments.length > 0 ? {
       attachments: composerAttachments
@@ -9112,7 +8097,7 @@ const handleSubmit = async state => {
   };
   let {
     parsedMessages
-  } = state;
+  } = effectiveState;
   parsedMessages = await parseAndStoreMessageContent(parsedMessages, userMessage);
   parsedMessages = await parseAndStoreMessageContent(parsedMessages, inProgressAssistantMessage);
   let workingSessions = sessions;
@@ -9146,10 +8131,10 @@ const handleSubmit = async state => {
     const provisionedSession = await withProvisionedBackgroundSession(state, newSession);
     await saveChatSession(provisionedSession);
     optimisticState = withUpdatedMessageScrollTop(focusInput({
-      ...state,
+      ...effectiveState,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
-      composerHeight: getMinComposerHeightForState(state),
+      composerHeight: getMinComposerHeightForState(effectiveState),
       composerSelectionEnd: 0,
       composerSelectionStart: 0,
       composerValue: '',
@@ -9185,10 +8170,10 @@ const handleSubmit = async state => {
       await saveChatSession(selectedSession);
     }
     optimisticState = withUpdatedMessageScrollTop(focusInput({
-      ...state,
+      ...effectiveState,
       composerAttachments: [],
       composerAttachmentsHeight: 0,
-      composerHeight: getMinComposerHeightForState(state),
+      composerHeight: getMinComposerHeightForState(effectiveState),
       composerSelectionEnd: 0,
       composerSelectionStart: 0,
       composerValue: '',
@@ -9200,7 +8185,7 @@ const handleSubmit = async state => {
     }));
     optimisticState = withUpdatedChatInputHistory(optimisticState, userText);
   }
-  set(state.uid, state, optimisticState);
+  set(effectiveState.uid, effectiveState, optimisticState);
   // @ts-ignore
   await invoke('Chat.rerender');
   let handleTextChunkState = {
@@ -9322,6 +8307,84 @@ const handleClickSend = async state => {
   return handleSubmit(state);
 };
 
+const SwitchGitBranch = 'Chat.switchGitBranch';
+const switchGitBranch = async ({
+  assetDir,
+  branchName,
+  platform,
+  workspaceUri
+}) => {
+  await executeProvider({
+    assetDir,
+    event: `onCommand:${SwitchGitBranch}`,
+    method: CommandExecute,
+    noProviderFoundMessage: 'No git branch switch command found',
+    params: [SwitchGitBranch, {
+      branchName,
+      workspaceUri
+    }],
+    platform
+  });
+};
+
+const getGitBranchSwitchErrorMessage = (branchName, error) => {
+  if (error instanceof Error && error.message) {
+    return `Failed to switch to branch "${branchName}". ${error.message}`;
+  }
+  return `Failed to switch to branch "${branchName}".`;
+};
+const handleGitBranchChange = async (state, branchName) => {
+  if (!branchName) {
+    return state;
+  }
+  const selectedSession = getSelectedSession(state.sessions, state.selectedSessionId);
+  const workspaceUri = getWorkspaceUri$1(state, selectedSession);
+  if (!workspaceUri) {
+    return {
+      ...state,
+      gitBranchPickerErrorMessage: 'No workspace is selected.',
+      gitBranchPickerOpen: true
+    };
+  }
+  try {
+    await switchGitBranch({
+      assetDir: state.assetDir,
+      branchName,
+      platform: state.platform,
+      workspaceUri
+    });
+    const updatedSessions = state.sessions.map(session => {
+      if (session.id !== state.selectedSessionId) {
+        return session;
+      }
+      return {
+        ...session,
+        branchName
+      };
+    });
+    const updatedSelectedSession = updatedSessions.find(session => session.id === state.selectedSessionId);
+    if (updatedSelectedSession) {
+      await saveChatSession(updatedSelectedSession);
+    }
+    return {
+      ...state,
+      gitBranches: state.gitBranches.map(branch => ({
+        ...branch,
+        current: branch.name === branchName
+      })),
+      gitBranchPickerErrorMessage: '',
+      gitBranchPickerOpen: false,
+      sessions: updatedSessions
+    };
+  } catch (error) {
+    return {
+      ...state,
+      gitBranchPickerErrorMessage: getGitBranchSwitchErrorMessage(branchName, error),
+      gitBranchPickerOpen: true
+    };
+  }
+};
+
 const setReasoningEffort = (state, reasoningEffort) => {
   return {
     ...state,
@@ -9452,7 +8515,7 @@ const selectSession = async (state, id) => {
     }
     return loadedSession;
   });
-  return {
+  return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
@@ -9461,7 +8524,7 @@ const selectSession = async (state, id) => {
     selectedSessionId: id,
     sessions: hydratedSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
-  };
+  });
 };
 
 const startRename = (state, id) => {
@@ -9491,15 +8554,17 @@ const toggleChatFocusMode = async state => {
   if (viewMode === 'chat-focus') {
     return {
       ...state,
+      gitBranchPickerErrorMessage: '',
+      gitBranchPickerOpen: false,
       viewMode: lastNormalViewMode
     };
   }
   if (viewMode === 'list' || viewMode === 'detail') {
-    return {
+    return refreshGitBranchPickerVisibility({
       ...state,
       lastNormalViewMode: viewMode,
       viewMode: 'chat-focus'
-    };
+    });
   }
   return state;
 };
@@ -9629,6 +8694,11 @@ const handleClick = async (state, name, id = '', eventX = 0, eventY = 0) => {
           visibleModels: state.models
         };
       }
+    case isGitBranchPickerItemInputName(name):
+      {
+        const branchName = getGitBranchFromGitBranchPickerItemInputName(name);
+        return handleGitBranchChange(state, branchName);
+      }
     case isAgentModePickerItemInputName(name):
       {
         const agentMode = getAgentModeFromAgentModePickerItemInputName(name);
@@ -9753,6 +8823,71 @@ const handleClickFileName = async (state, uri) => {
   return state;
 };
 
+const getBranchPickerErrorMessage = error => {
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  return 'Failed to load git branches.';
+};
+const openGitBranchPicker = async state => {
+  const visibleState = await refreshGitBranchPickerVisibility(state);
+  const selectedSession = getSelectedSession(visibleState.sessions, visibleState.selectedSessionId);
+  const fallbackBranchName = selectedSession?.branchName || '';
+  if (visibleState.viewMode !== 'chat-focus' || !visibleState.gitBranchPickerVisible && !fallbackBranchName) {
+    return {
+      ...visibleState,
+      gitBranchPickerOpen: false
+    };
+  }
+  const workspaceUri = getWorkspaceUri$1(visibleState, selectedSession);
+  if (!workspaceUri) {
+    return {
+      ...visibleState,
+      gitBranches: [],
+      gitBranchPickerErrorMessage: 'No workspace is selected.',
+      gitBranchPickerOpen: true
+    };
+  }
+  try {
+    const gitBranches = await getGitBranches(workspaceUri);
+    return {
+      ...visibleState,
+      agentModePickerOpen: false,
+      gitBranches,
+      gitBranchPickerErrorMessage: '',
+      gitBranchPickerOpen: true,
+      modelPickerOpen: false,
+      modelPickerSearchValue: '',
+      reasoningEffortPickerOpen: false,
+      runModePickerOpen: false,
+      visibleModels: visibleState.models
+    };
+  } catch (error) {
+    return {
+      ...visibleState,
+      agentModePickerOpen: false,
+      gitBranches: fallbackBranchName ? [{
+        current: true,
+        name: fallbackBranchName
+      }] : [],
+      gitBranchPickerErrorMessage: getBranchPickerErrorMessage(error),
+      gitBranchPickerOpen: true,
+      modelPickerOpen: false,
+      modelPickerSearchValue: '',
+      reasoningEffortPickerOpen: false,
+      runModePickerOpen: false,
+      visibleModels: visibleState.models
+    };
+  }
+};
+
+const handleClickGitBranchPickerToggle = async state => {
+  if (state.gitBranchPickerOpen) {
+    return closeGitBranchPicker(state);
+  }
+  return openGitBranchPicker(state);
+};
+
 const handleClickModelPickerList = async (state, eventY) => {
   const {
     height,
@@ -10615,19 +9750,6 @@ const getSavedSessions = savedState => {
   return sessions;
 };
 
-const getSavedSystemPrompt = savedState => {
-  if (!isObject$1(savedState)) {
-    return undefined;
-  }
-  const {
-    systemPrompt
-  } = savedState;
-  if (typeof systemPrompt !== 'string') {
-    return undefined;
-  }
-  return systemPrompt;
-};
-
 const getSavedViewMode = savedState => {
   if (!isObject$1(savedState)) {
     return undefined;
@@ -10659,24 +9781,6 @@ const loadAuthEnabled = async () => {
   }
 };
 
-const loadBackendAccessToken = async () => {
-  try {
-    const savedAccessToken = await get('secrets.chatBackendAccessToken');
-    return typeof savedAccessToken === 'string' ? savedAccessToken : '';
-  } catch {
-    return '';
-  }
-};
-
-const loadBackendRefreshToken = async () => {
-  try {
-    const savedRefreshToken = await get('secrets.chatBackendRefreshToken');
-    return typeof savedRefreshToken === 'string' ? savedRefreshToken : '';
-  } catch {
-    return '';
-  }
-};
-
 const loadBackendUrl = async () => {
   try {
     const savedBackendUrl = await get('chat.backendUrl');
@@ -10820,15 +9924,6 @@ const loadUseChatMathWorker = async () => {
   }
 };
 
-const loadUseChatMessageParsingWorker = async () => {
-  try {
-    const savedUseChatMessageParsingWorker = await get('chatView.useChatMessageParsingWorker');
-    return typeof savedUseChatMessageParsingWorker === 'boolean' ? savedUseChatMessageParsingWorker : false;
-  } catch {
-    return false;
-  }
-};
-
 const loadUseChatNetworkWorkerForRequests = async () => {
   try {
     const savedUseChatNetworkWorkerForRequests = await get('chatView.useChatNetworkWorkerForRequests');
@@ -10857,12 +9952,10 @@ const loadVoiceDictationEnabled = async () => {
 };
 
 const loadPreferences = async () => {
-  const [aiSessionTitleGenerationEnabled, authAccessToken, authEnabled, authRefreshToken, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatMessageParsingWorker, useChatNetworkWorkerForRequests, useChatToolWorker, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadBackendAccessToken(), loadAuthEnabled(), loadBackendRefreshToken(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatMessageParsingWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadVoiceDictationEnabled()]);
+  const [aiSessionTitleGenerationEnabled, authEnabled, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadVoiceDictationEnabled()]);
   return {
     aiSessionTitleGenerationEnabled,
-    authAccessToken,
     authEnabled,
-    authRefreshToken,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10878,7 +9971,6 @@ const loadPreferences = async () => {
     toolEnablement,
     useChatCoordinatorWorker,
     useChatMathWorker,
-    useChatMessageParsingWorker,
     useChatNetworkWorkerForRequests,
     useChatToolWorker,
     voiceDictationEnabled
@@ -10934,9 +10026,7 @@ const loadContent = async (state, savedState) => {
   const [composerSelectionStart, composerSelectionEnd] = savedComposerSelection ?? [state.composerSelectionStart, state.composerSelectionEnd];
   const {
     aiSessionTitleGenerationEnabled,
-    authAccessToken,
     authEnabled,
-    authRefreshToken,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10952,11 +10042,11 @@ const loadContent = async (state, savedState) => {
     toolEnablement,
     useChatCoordinatorWorker,
     useChatMathWorker,
-    useChatMessageParsingWorker,
     useChatNetworkWorkerForRequests,
     useChatToolWorker,
     voiceDictationEnabled
   } = await loadPreferences();
+  const authState = authEnabled && backendUrl ? await syncBackendAuth(backendUrl) : getLoggedOutBackendAuthState();
   const legacySavedSessions = getSavedSessions(savedState);
   const storedSessions = await listChatSessions();
   let sessions = storedSessions;
@@ -10992,7 +10082,6 @@ const loadContent = async (state, savedState) => {
   const projectExpandedIds = (savedProjectExpandedIds || state.projectExpandedIds).filter(id => projects.some(project => project.id === id));
   const reasoningEffort = getSavedReasoningEffort(savedState) ?? state.reasoningEffort;
   const selectedModelId = state.models.some(model => model.id === preferredModelId) ? preferredModelId : state.models[0]?.id || '';
-  const systemPrompt = getSavedSystemPrompt(savedState) ?? state.systemPrompt;
   const visibleModels = getVisibleModels(state.models, '');
   const visibleSessions = getVisibleSessions(sessions, selectedProjectId);
   const selectedSessionId = visibleSessions.some(session => session.id === preferredSessionId) ? preferredSessionId : visibleSessions[0]?.id || '';
@@ -11002,21 +10091,20 @@ const loadContent = async (state, savedState) => {
     parsedMessages
   } = state;
   for (const session of sessions) {
-    parsedMessages = await parseAndStoreMessagesContentWithWorkerPreference(parsedMessages, session.messages, useChatMessageParsingWorker);
+    parsedMessages = await parseAndStoreMessagesContent(parsedMessages, session.messages);
   }
   const preferredViewMode = savedViewMode || state.viewMode;
   const savedLastNormalViewMode = getSavedLastNormalViewMode(savedState);
   const lastNormalViewMode = savedLastNormalViewMode || (preferredViewMode === 'detail' ? 'detail' : state.lastNormalViewMode);
   const viewMode = sessions.length === 0 || !selectedSessionId ? 'list' : preferredViewMode;
-  return {
+  const nextState = {
     ...state,
     agentMode,
     agentModePickerOpen: false,
     aiSessionTitleGenerationEnabled,
-    authAccessToken,
+    authAccessToken: authState.authAccessToken,
     authEnabled,
-    authRefreshToken,
-    authStatus: authAccessToken ? 'signed-in' : 'signed-out',
+    authErrorMessage: authState.authErrorMessage,
     backendUrl,
     chatHistoryEnabled,
     chatListScrollTop,
@@ -11057,18 +10145,21 @@ const loadContent = async (state, savedState) => {
     selectedSessionId,
     sessions,
     streamingEnabled,
-    systemPrompt,
     todoListToolEnabled,
     toolEnablement,
     useChatCoordinatorWorker,
     useChatMathWorker,
-    useChatMessageParsingWorker,
     useChatNetworkWorkerForRequests,
     useChatToolWorker,
+    userName: authState.userName,
+    userState: authState.userState,
+    userSubscriptionPlan: authState.userSubscriptionPlan,
+    userUsedTokens: authState.userUsedTokens,
     viewMode,
     visibleModels,
     voiceDictationEnabled
   };
+  return refreshGitBranchPickerVisibility(nextState);
 };
 
 const isObject = value => {
@@ -11158,33 +10249,50 @@ const openMockProject = async (state, projectId, projectName, projectUri) => {
   };
 };
 
-const openMockSession = async (state, mockSessionId, mockChatMessages) => {
+const applySessionOptions = (session, options) => {
+  if (!options) {
+    return session;
+  }
+  return {
+    ...session,
+    ...(options.branchName ? {
+      branchName: options.branchName
+    } : {}),
+    ...(options.projectId ? {
+      projectId: options.projectId
+    } : {}),
+    ...(options.workspaceUri ? {
+      workspaceUri: options.workspaceUri
+    } : {})
+  };
+};
+const openMockSession = async (state, mockSessionId, mockChatMessages, options) => {
   const {
     sessions: currentSessions
   } = state;
   if (!mockSessionId) {
     return state;
   }
-  const parsedMessages = await parseAndStoreMessagesContentWithWorkerPreference(state.parsedMessages, mockChatMessages, state.useChatMessageParsingWorker);
+  const parsedMessages = await parseAndStoreMessagesContent(state.parsedMessages, mockChatMessages);
   const existingSession = currentSessions.find(session => session.id === mockSessionId);
   const sessions = existingSession ? currentSessions.map(session => {
     if (session.id !== mockSessionId) {
       return session;
     }
-    return {
+    return applySessionOptions({
       ...session,
       messages: mockChatMessages
-    };
-  }) : [...currentSessions, {
+    }, options);
+  }) : [...currentSessions, applySessionOptions({
     id: mockSessionId,
     messages: mockChatMessages,
     title: mockSessionId
-  }];
+  }, options)];
   const selectedSession = sessions.find(session => session.id === mockSessionId);
   if (selectedSession) {
     await saveChatSession(selectedSession);
   }
-  return {
+  return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments: [],
     composerAttachmentsHeight: 0,
@@ -11193,7 +10301,7 @@ const openMockSession = async (state, mockSessionId, mockChatMessages) => {
     selectedSessionId: mockSessionId,
     sessions,
     viewMode: 'detail'
-  };
+  });
 };
 
 const pasteInput = async state => {
@@ -11306,6 +10414,10 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   color: var(--vscode-errorForeground, var(--vscode-foreground));
 }
 
+.InputInvalid{
+  border-color: var(--InputValidationErrorBorder, red);
+}
+
 .ChatComposerAttachmentTextFile{
   border-color: var(--vscode-charts-green, var(--vscode-widget-border, var(--vscode-panel-border)));
 }
@@ -11360,6 +10472,23 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   border-color: var(--vscode-charts-green, var(--vscode-widget-border, var(--vscode-panel-border)));
 }
 
+.ChatImageMessageContent{
+  padding: 6px;
+  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border-radius: 12px;
+  background: var(--vscode-editorWidget-background, var(--vscode-editor-background));
+  overflow: hidden;
+}
+
+.ChatMessageImage{
+  display: block;
+  max-width: min(320px, 100%);
+  max-height: min(320px, calc(100vh - 220px));
+  border-radius: 8px;
+  object-fit: contain;
+  background: color-mix(in srgb, var(--vscode-editor-background) 88%, black);
+}
+
 .Chat{
   position: relative;
 }
@@ -11397,12 +10526,24 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   color: var(--vscode-errorForeground, var(--vscode-foreground));
 }
 
-.CustomSelectContainer{
+.ChatSelect{
   position: relative;
   min-width: 0;
 
 }
 
+.ChatModelPickerItem{
+  display: flex;
+}
+
+.ChatGitBranchPickerMessage{
+  padding: 6px 8px;
+}
+
+.ChatGitBranchPickerErrorMessage{
+  color: var(--vscode-errorForeground, var(--vscode-foreground));
+}
+
 .RunModePickerContainer{
   display: flex;
   justify-content: flex-end;
@@ -11507,13 +10648,10 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 .ChatFocus .ChatMessages > .Message > .ChatMessageContent{
   max-inline-size: 100%;
 }
-
-
 .Viewlet.Chat.ChatFocus{
   display: flex !important;
   min-width: 0;
 }
-
 .ChatFocusMainArea{
   display: flex;
   flex: 1;
@@ -11526,6 +10664,84 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   min-height: 0;
 }
 
+.ChatModelPickerList {
+  display: flex;
+  contain: content;
+}
+
+
+.ChatSelect:hover{
+  background: var(--vscode-toolbar-hoverBackground, color-mix(in srgb, var(--vscode-editor-background) 80%, white));
+  color: var(--vscode-foreground);
+}
+
+.SelectLabel {
+  width: auto;
+  max-width: 100%;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+
+.ChatSelect {
+display: flex;
+    gap: 4px;
+    border: none;
+    border-radius: 4px;
+    background: transparent;
+    color: var(--vscode-descriptionForeground, var(--vscode-disabledForeground));
+    padding: 0 !important;
+}
+
+
+
+
+
+
+
+
+
+.SelectLabel {
+      width: auto;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+}
+
+
+.ChatSelect .MaskIcon {
+
+    width: 10px;
+    height: 10px;
+    pointer-events: none;
+}
+
+
+.ChatModelPickerList {
+  flex-direction: column;
+  flex: 1;
+  display: flex;
+  contain: strict;
+
+}
+
+
+.ChatModelPickerItem  {
+  contain: strict;
+  flex-shrink:0; /* TODO why?? */
+}
+
+
+.ChatModelPickerHeader {
+  height: 40px;
+  contain: strict;
+
+}
+
+
 `;
   return `${baseCss}
 
@@ -11618,6 +10834,160 @@ const renderFocusContext = (oldState, newState) => {
   return [SetFocusContext, newState.uid, FocusChatInput];
 };
 
+const Actions = 'Actions';
+const Button = 'Button';
+const ButtonPrimary = 'ButtonPrimary';
+const ButtonSecondary = 'ButtonSecondary';
+const Chat = 'Chat';
+const ChatActions = 'ChatActions';
+const ChatAuthError = 'ChatAuthError';
+const ChatFocus = 'ChatFocus';
+const ChatFocusActions = 'ChatFocusActions';
+const ChatFocusHeader = 'ChatFocusHeader';
+const ChatFocusMainArea = 'ChatFocusMainArea';
+const ChatFocusProject = 'ChatFocusProject';
+const ChatGitBranchPicker = 'ChatGitBranchPicker';
+const ChatGitBranchPickerErrorMessage = 'ChatGitBranchPickerErrorMessage';
+const ChatGitBranchPickerMessage = 'ChatGitBranchPickerMessage';
+const ChatHeader = 'ChatHeader';
+const ChatHeaderAuth = 'ChatHeaderAuth';
+const ChatHeaderAuthName = 'ChatHeaderAuthName';
+const ChatHeaderLabel = 'ChatHeaderLabel';
+const ChatInputBox = 'ChatInputBox';
+const ChatList = 'ChatList';
+const ChatListEmpty = 'ChatListEmpty';
+const ChatListItem = 'ChatListItem';
+const ChatListItemFocused = 'ChatListItemFocused';
+const ChatListItemLabel = 'ChatListItemLabel';
+const ChatListItemStatusFinished = 'ChatListItemStatusFinished';
+const ChatListItemStatusIcon = 'ChatListItemStatusIcon';
+const ChatListItemStatusInProgress = 'ChatListItemStatusInProgress';
+const ChatListItemStatusRow = 'ChatListItemStatusRow';
+const ChatListItemStatusStopped = 'ChatListItemStatusStopped';
+const ChatMessageContent = 'ChatMessageContent';
+const ChatImageMessageContent = 'ChatImageMessageContent';
+const ChatMessageLink = 'ChatMessageLink';
+const ChatModelPicker = 'ChatModelPicker';
+const ChatModelPickerContainer = 'ChatModelPickerContainer';
+const ChatModelPickerHeader = 'ChatModelPickerHeader';
+const ChatModelPickerItem = 'ChatModelPickerItem';
+const ChatModelPickerItemLabel = 'ChatModelPickerItemLabel';
+const ChatModelPickerItemSelected = 'ChatModelPickerItemSelected';
+const ChatModelPickerItemUsageCost = 'ChatModelPickerItemUsageCost';
+const ChatModelPickerList = 'ChatModelPickerList';
+const ChatName = 'ChatName';
+const ChatOverlays = 'ChatOverlays';
+const ChatOrderedList = 'ChatOrderedList';
+const ChatOrderedListItem = 'ChatOrderedListItem';
+const ChatOrderedListItemContent = 'ChatOrderedListItemContent';
+const ChatOrderedListItemPrefix = 'ChatOrderedListItemPrefix';
+const ChatOrderedListMarker = 'ChatOrderedListMarker';
+const ChatComposerAttachment = 'ChatComposerAttachment';
+const ChatComposerAttachmentImage = 'ChatComposerAttachmentImage';
+const ChatComposerAttachmentInvalidImage = 'ChatComposerAttachmentInvalidImage';
+const ChatComposerAttachmentLabel = 'ChatComposerAttachmentLabel';
+const ChatComposerAttachmentPreview = 'ChatComposerAttachmentPreview';
+const ChatComposerAttachmentPreviewOverlay = 'ChatComposerAttachmentPreviewOverlay';
+const ChatComposerAttachmentPreviewOverlayError = 'ChatComposerAttachmentPreviewOverlayError';
+const ChatComposerAttachmentPreviewOverlayImage = 'ChatComposerAttachmentPreviewOverlayImage';
+const ChatComposerAttachmentRemoveButton = 'ChatComposerAttachmentRemoveButton';
+const ChatComposerAttachments = 'ChatComposerAttachments';
+const ChatComposerAttachmentTextFile = 'ChatComposerAttachmentTextFile';
+const ChatAttachment = 'ChatAttachment';
+const ChatAttachmentImage = 'ChatAttachmentImage';
+const ChatAttachmentInvalidImage = 'ChatAttachmentInvalidImage';
+const ChatAttachmentLabel = 'ChatAttachmentLabel';
+const ChatAttachmentPreview = 'ChatAttachmentPreview';
+const ChatAttachments = 'ChatAttachments';
+const ChatAttachmentTextFile = 'ChatAttachmentTextFile';
+const ChatMessageImage = 'ChatMessageImage';
+const ChatSendArea = 'ChatSendArea';
+const ChatSendAreaBottom = 'ChatSendAreaBottom';
+const ChatSendAreaContent = 'ChatSendAreaContent';
+const ChatSendAreaPrimaryControls = 'ChatSendAreaPrimaryControls';
+const ChatSelect = 'ChatSelect';
+const ChatTableWrapper = 'ChatTableWrapper';
+const ChatTodoList = 'ChatTodoList';
+const ChatTodoListHeader = 'ChatTodoListHeader';
+const ChatTodoListItem = 'ChatTodoListItem';
+const ChatTodoListItemCompleted = 'ChatTodoListItemCompleted';
+const ChatTodoListItemInProgress = 'ChatTodoListItemInProgress';
+const ChatTodoListItems = 'ChatTodoListItems';
+const ChatTodoListItemTodo = 'ChatTodoListItemTodo';
+const ChatToolCallFileName = 'ChatToolCallFileName';
+const ChatToolCallQuestionOption = 'ChatToolCallQuestionOption';
+const ChatToolCallQuestionOptions = 'ChatToolCallQuestionOptions';
+const ChatToolCallQuestionText = 'ChatToolCallQuestionText';
+const ChatToolCallReadFileLink = 'ChatToolCallReadFileLink';
+const ChatToolCallRenderHtmlBody = 'ChatToolCallRenderHtmlBody';
+const ChatToolCallRenderHtmlContent = 'ChatToolCallRenderHtmlContent';
+const ChatToolCallRenderHtmlLabel = 'ChatToolCallRenderHtmlLabel';
+const ChatToolCalls = 'ChatToolCalls';
+const ChatToolCallsLabel = 'ChatToolCallsLabel';
+const ChatUnorderedList = 'ChatUnorderedList';
+const ChatUnorderedListItem = 'ChatUnorderedListItem';
+const ChatViewDropOverlay = 'ChatViewDropOverlay';
+const ChatViewDropOverlayActive = 'ChatViewDropOverlayActive';
+const ChatWelcomeMessage = 'ChatWelcomeMessage';
+const CustomSelectPopOver = 'CustomSelectPopOver';
+const Deletion = 'Deletion';
+const Empty = '';
+const FileIcon = 'FileIcon';
+const IconButton = 'IconButton';
+const IconButtonDisabled = 'IconButtonDisabled';
+const ImageElement = 'ImageElement';
+const ImageErrorMessage = 'ImageErrorMessage';
+const InputBox = 'InputBox';
+const InputInvalid = 'InputInvalid';
+const Insertion = 'Insertion';
+const Label = 'Label';
+const LabelDetail = 'LabelDetail';
+const Markdown = 'Markdown';
+const MarkdownMathBlock = 'MarkdownMathBlock';
+const MarkdownQuote = 'MarkdownQuote';
+const MarkdownTable = 'MarkdownTable';
+const MaskIcon = 'MaskIcon';
+const MaskIconAdd = 'MaskIconAdd';
+const MaskIconArrowLeft = 'MaskIconArrowLeft';
+const MaskIconChevronDown = 'MaskIconChevronDown';
+const MaskIconChevronRight = 'MaskIconChevronRight';
+const MaskIconChevronUp = 'MaskIconChevronUp';
+const MaskIconClose = 'MaskIconClose';
+const MaskIconDebugPause = 'MaskIconDebugPause';
+const MaskIconLayoutPanelLeft = 'MaskIconLayoutPanelLeft';
+const MaskIconSearch = 'MaskIconSearch';
+const MaskIconSettingsGear = 'MaskIconSettingsGear';
+const Message = 'Message';
+const MessageAssistant = 'MessageAssistant';
+const MessageUser = 'MessageUser';
+const MissingApiKeyForm = 'MissingApiKeyForm';
+const MultiLineInputBox = 'MultilineInputBox';
+const ProjectAddButton = 'ProjectAddButton';
+const ProjectList = 'ProjectList';
+const ProjectListChevron = 'ProjectListChevron';
+const ProjectListGroup = 'ProjectListGroup';
+const ProjectListItem = 'ProjectListItem';
+const ProjectListItemActions = 'ProjectListItemActions';
+const ProjectListItemAddChatButton = 'ProjectListItemAddChatButton';
+const ProjectListItemLabel = 'ProjectListItemLabel';
+const ProjectListItemSelected = 'ProjectListItemSelected';
+const ProjectSessionItem = 'ProjectSessionItem';
+const ProjectSessionItemLabel = 'ProjectSessionItemLabel';
+const ProjectSessionItemSelected = 'ProjectSessionItemSelected';
+const ProjectSidebar = 'ProjectSidebar';
+const SearchFieldContainer = 'SearchFieldContainer';
+const RunModePickerContainer = 'RunModePickerContainer';
+const RunModePickerPopOver = 'RunModePickerPopOver';
+const SelectLabel = 'SelectLabel';
+const SendButtonDisabled = 'SendButtonDisabled';
+const SessionArchiveButton = 'SessionArchiveButton';
+const StrikeThrough = 'StrikeThrough';
+const TokenUsageOverview = 'TokenUsageOverview';
+const TokenUsageRing = 'TokenUsageRing';
+const TokenUsageRingInner = 'TokenUsageRingInner';
+const ToolCallName = 'ToolCallName';
+const Viewlet = 'Viewlet';
+
 const HandleListContextMenu = 2;
 const HandleFocus = 3;
 const HandleInput = 4;
@@ -11670,7 +11040,8 @@ const HandlePointerUpModelPickerList = 55;
 const HandleClickReasoningEffortPickerToggle = 56;
 const HandleClickAgentModePickerToggle = 57;
 const HandleContextMenuChatImageAttachment = 58;
-const HandleErrorComposerAttachmentPreviewOverlay = 59;
+const HandleClickGitBranchPickerToggle = 59;
+const HandleErrorComposerAttachmentPreviewOverlay = 60;
 
 const getAddContextButtonDom = () => {
   return [{
@@ -11685,12 +11056,23 @@ const getAddContextButtonDom = () => {
   }];
 };
 
-const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label) => {
+const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title) => {
+  const getChevronDom = expanded => {
+    return {
+      childCount: 0,
+      className: mergeClassNames(MaskIcon, expanded ? MaskIconChevronUp : MaskIconChevronDown),
+      name,
+      role: None$1,
+      type: Div
+    };
+  };
   return [{
     'aria-expanded': open ? 'true' : 'false',
     'aria-haspopup': 'true',
+    'aria-label': ariaLabel,
+    ariaLabel,
     childCount: 2,
-    className: Select,
+    className: ChatSelect,
     inputType: 'button',
     name,
     onClick,
@@ -11702,21 +11084,11 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
     name,
     role: None$1,
     type: Span
-  }, text(label), {
-    childCount: 0,
-    className: mergeClassNames(MaskIcon, open ? MaskIconChevronUp : MaskIconChevronDown),
-    name,
-    role: None$1,
-    type: Div
-  }];
+  }, text(label), getChevronDom(open)];
 };
 
-const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, containerChildCount = 1) => {
-  return [{
-    childCount: containerChildCount,
-    className: CustomSelectContainer,
-    type: Div
-  }, ...getCustomSelectToggleVirtualDom(label, name, open, onClick, title)];
+const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title) => {
+  return getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel);
 };
 
 const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen) => {
@@ -11726,7 +11098,8 @@ const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen) =>
 const getChatModelPickerToggleVirtualDom = (models, selectedModelId, modelPickerOpen) => {
   const selectedModel = models.find(model => model.id === selectedModelId);
   const selectedModelLabel = selectedModel ? selectedModel.name : selectedModelId;
-  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle);
+  const pickModelLabel = pickModel(selectedModelLabel);
+  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle, pickModelLabel, pickModelLabel);
 };
 
 const getCreatePullRequestButtonDom = () => {
@@ -11770,6 +11143,55 @@ const getCustomSelectOptionVirtualDom = (name, label, selected, detail = '') =>
   }, text(detail)] : [])];
 };
 
+const itemHeight = 28;
+const messageHeight = 32;
+const getCurrentBranchLabel = (gitBranches, fallbackBranchName) => {
+  const currentBranch = gitBranches.find(branch => branch.current);
+  if (currentBranch) {
+    return currentBranch.name;
+  }
+  if (fallbackBranchName) {
+    return fallbackBranchName;
+  }
+  return 'Branch';
+};
+const getBranchOptionsVirtualDom = gitBranches => {
+  return gitBranches.flatMap(branch => {
+    return getCustomSelectOptionVirtualDom(getGitBranchPickerItemInputName(branch.name), branch.name, branch.current, branch.current ? 'current' : '');
+  });
+};
+const getBranchPickerMessageDom = (gitBranches, errorMessage) => {
+  const message = errorMessage || (gitBranches.length === 0 ? 'No local git branches found.' : '');
+  if (!message) {
+    return [];
+  }
+  return [{
+    childCount: 1,
+    className: mergeClassNames(ChatGitBranchPickerMessage, errorMessage ? ChatGitBranchPickerErrorMessage : Empty),
+    type: Div
+  }, {
+    text: message,
+    type: Text
+  }];
+};
+const getGitBranchPickerVirtualDom = (gitBranches, gitBranchPickerOpen, gitBranchPickerErrorMessage, fallbackBranchName) => {
+  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 ? [{
+    childCount: (showMessage ? 1 : 0) + 1,
+    className: mergeClassNames(ChatModelPicker, CustomSelectPopOver, ChatGitBranchPicker),
+    style: `height: ${popOverHeight}px;`,
+    type: Div
+  }, ...messageDom, {
+    childCount: branchOptions.length / 4,
+    className: ChatModelPickerList,
+    type: Ul
+  }, ...branchOptions] : [])];
+};
+
 const reasoningEffortPickerHeight = reasoningEfforts.length * 28;
 const getReasoningEffortOptionsVirtualDom = selectedReasoningEffort => {
   return reasoningEfforts.flatMap(reasoningEffort => {
@@ -11779,7 +11201,7 @@ const getReasoningEffortOptionsVirtualDom = selectedReasoningEffort => {
   });
 };
 const getReasoningEffortPickerVirtualDom = (selectedReasoningEffort, reasoningEffortPickerOpen) => {
-  return [...getCustomSelectPickerToggleVirtualDom(getReasoningEffortLabel(selectedReasoningEffort), ReasoningEffortPickerToggle, reasoningEffortPickerOpen, HandleClickReasoningEffortPickerToggle, 'Reasoning', reasoningEffortPickerOpen ? 2 : 1), ...(reasoningEffortPickerOpen ? [{
+  return [...getCustomSelectPickerToggleVirtualDom(getReasoningEffortLabel(selectedReasoningEffort), ReasoningEffortPickerToggle, reasoningEffortPickerOpen, HandleClickReasoningEffortPickerToggle, 'Reasoning', 'Reasoning'), ...(reasoningEffortPickerOpen ? [{
     childCount: 1,
     className: mergeClassNames(ChatModelPicker, CustomSelectPopOver),
     style: `height: ${reasoningEffortPickerHeight}px;`,
@@ -11946,6 +11368,7 @@ const getComposerAttachmentClassName = displayType => {
 };
 const getComposerAttachmentRemoveButtonDom = attachment => {
   return [{
+    'aria-label': removeAttachment(),
     buttonType: 'button',
     childCount: 1,
     className: ChatComposerAttachmentRemoveButton,
@@ -12017,12 +11440,13 @@ const getComposerTextAreaDom = () => {
     type: TextArea
   };
 };
-const getChatSendAreaDom = (composerValue, composerAttachments, agentMode, agentModePickerOpen, hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton = false, voiceDictationEnabled = false, scrollDownButtonEnabled = false, messagesAutoScrollEnabled = true) => {
+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, 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) + (voiceDictationEnabled ? 1 : 0) + (showScrollDownButton ? 1 : 0);
+  const bottomControlsCount = 2 + (usageOverviewEnabled ? 1 : 0) + (addContextButtonEnabled ? 1 : 0) + (showCreatePullRequestButton ? 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;
@@ -12046,7 +11470,62 @@ 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() : []), ...(showScrollDownButton ? getScrollDownButtonDom() : []), ...getSendButtonDom(isSendDisabled, voiceDictationEnabled)];
+  }, ...(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)];
+};
+
+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 === 'loggingIn') {
+    return loggingInToBackend();
+  }
+  if (userState === 'loggingOut') {
+    return loggingOutFromBackend();
+  }
+  return isAuthenticated ? logout() : login();
+};
+const getButtonTitle = (userState, isAuthenticated) => {
+  if (userState === 'loggingIn') {
+    return loggingInToBackend();
+  }
+  if (userState === 'loggingOut') {
+    return loggingOutFromBackend();
+  }
+  return isAuthenticated ? logoutFromBackend$1() : loginToBackend();
+};
+const getChatHeaderAuthDom = (authEnabled = false, userState = 'loggedOut', userName = '') => {
+  if (!authEnabled) {
+    return [];
+  }
+  const isAuthenticated = userState === 'loggedIn' || userState === 'loggingOut';
+  const buttonName = isAuthenticated ? Logout : Login;
+  const buttonLabel = getButtonLabel(userState, isAuthenticated);
+  const buttonTitle = getButtonTitle(userState, isAuthenticated);
+  const isPending = userState === 'loggingIn' || userState === 'loggingOut';
+  const displayName = userName || signedIn();
+  return [{
+    childCount: isAuthenticated ? 2 : 1,
+    className: ChatHeaderAuth,
+    style: authContainerStyle,
+    type: Div
+  }, ...(isAuthenticated ? [{
+    childCount: 1,
+    className: ChatHeaderAuthName,
+    style: authNameStyle,
+    title: displayName,
+    type: Span
+  }, text(displayName)] : []), {
+    childCount: 1,
+    className: mergeClassNames(Button, ButtonSecondary),
+    disabled: isPending,
+    inputType: 'button',
+    name: buttonName,
+    onClick: HandleClick,
+    style: authButtonStyle,
+    title: buttonTitle,
+    type: Button$1
+  }, text(buttonLabel)];
 };
 
 const focusHeaderStyle = 'align-items:center;border-bottom:1px solid var(--vscode-panel-border, transparent);display:flex;gap:12px;justify-content:space-between;padding:8px 12px;';
@@ -12067,15 +11546,15 @@ const getFocusHeaderActionButtonDom = (label, name) => {
     type: Button$1
   }, text(label)];
 };
-const getChatHeaderDomFocusMode = (selectedSessionTitle, selectedProjectName) => {
+const getChatHeaderDomFocusMode = (selectedSessionTitle, selectedProjectName, authEnabled = false, userState = 'loggedOut', userName = '') => {
   const items = [[addAction(), FocusAddAction], [openInVsCode(), FocusOpenInVsCode], [commit(), FocusCommit], [openTerminal(), FocusOpenTerminal], [showDiff(), FocusShowDiff]];
   const hasProjectName = !!selectedProjectName;
   return [{
-    childCount: 2,
+    childCount: 2 + (authEnabled ? 1 : 0),
     className: ChatFocusHeader,
     style: focusHeaderStyle,
     type: Header
-  }, {
+  }, ...getChatHeaderAuthDom(authEnabled, userState, userName), {
     childCount: hasProjectName ? 2 : 1,
     className: ChatName,
     style: focusHeaderMetaStyle,
@@ -12133,7 +11612,25 @@ const getUsageCostLabel = model => {
 };
 
 const getChatModelListItemVirtualDom = (model, selectedModelId) => {
-  return getCustomSelectOptionVirtualDom(getModelPickerItemInputName(model.id), getModelLabel(model), model.id === selectedModelId, getUsageCostLabel(model));
+  const detail = getUsageCostLabel(model);
+  const hasDetail = detail !== '';
+  const selected = model.id === selectedModelId;
+  const className = mergeClassNames(ChatModelPickerItem, selected ? ChatModelPickerItemSelected : '');
+  return [{
+    childCount: hasDetail ? 2 : 1,
+    className,
+    'data-id': model.id,
+    role: 'option',
+    type: Li
+  }, {
+    childCount: 1,
+    className: ChatModelPickerItemLabel,
+    type: Span
+  }, text(getModelLabel(model)), ...(hasDetail ? [{
+    childCount: 1,
+    className: ChatModelPickerItemUsageCost,
+    type: Span
+  }, text(detail)] : [])];
 };
 
 const parentNode$2 = {
@@ -12156,6 +11653,7 @@ const getChatModelListVirtualDom = (visibleModels, selectedModelId) => {
     onPointerDown: HandlePointerDownModelPickerList,
     onPointerUp: HandlePointerUpModelPickerList,
     onScroll: HandleModelPickerListScroll,
+    role: 'listbox',
     type: Ul
   }, ...visibleModels.flatMap(model => getChatModelListItemVirtualDom(model, selectedModelId))];
 };
@@ -12396,19 +11894,7 @@ const getBlockQuoteDom = (node, useChatMathWorker, getMessageNodeDom) => {
   }, ...node.children.flatMap(child => getMessageNodeDom(child, useChatMathWorker))];
 };
 
-const getTokenDom = token => {
-  if (!token.className) {
-    return [text(token.text)];
-  }
-  return [{
-    childCount: 1,
-    className: token.className,
-    type: Span
-  }, text(token.text)];
-};
-
 const getCodeBlockDom = node => {
-  const tokenDom = node.codeTokens.flatMap(getTokenDom);
   const languageAttribute = node.language ? {
     'data-lang': node.language
   } : {};
@@ -12417,10 +11903,10 @@ const getCodeBlockDom = node => {
     type: Pre,
     ...languageAttribute
   }, {
-    childCount: node.codeTokens.length,
+    childCount: 1,
     type: Code,
     ...languageAttribute
-  }, ...tokenDom];
+  }, text(node.text)];
 };
 
 const getHeadingElementType = level => {
@@ -12658,6 +12144,7 @@ const getMissingApiActionsDom = ({
 };
 const getMissingApiKeyDom = ({
   getApiKeyText,
+  inputClassName,
   inputName,
   inputPattern,
   inputRequired = false,
@@ -12680,7 +12167,7 @@ const getMissingApiKeyDom = ({
     autocomplete: 'off',
     autocorrect: 'off',
     childCount: 0,
-    className: InputBox,
+    className: inputClassName ? mergeClassNames(InputBox, inputClassName) : InputBox,
     name: inputName,
     onInput: HandleInput,
     ...(inputPattern ? {
@@ -12700,13 +12187,17 @@ const getMissingApiKeyDom = ({
   })];
 };
 
-const getMissingOpenApiApiKeyDom = (openApiApiKeyState = 'idle', openSettingsUrl = 'https://platform.openai.com/api-keys', inputPattern = '^sk-.+') => {
+const getMissingOpenApiApiKeyDom = (openApiApiKeyInput = '', openApiApiKeyState = 'idle', openSettingsUrl = 'https://platform.openai.com/api-keys', inputPattern = '^sk-.+') => {
   const isSaving = openApiApiKeyState === 'saving';
+  const isInvalid = openApiApiKeyInput !== '' && !new RegExp(inputPattern).test(openApiApiKeyInput);
   return getMissingApiKeyDom({
     getApiKeyText: getOpenApiApiKey(),
+    ...(isInvalid ? {
+      inputClassName: InputInvalid
+    } : {}),
     inputName: OpenApiApiKeyInput,
     inputPattern,
-    inputRequired: true,
+    inputRequired: false,
     onSubmit: HandleMissingOpenAiApiKeyFormSubmit,
     openSettingsButtonName: OpenOpenApiApiKeyWebsite,
     openSettingsUrl,
@@ -13325,7 +12816,7 @@ const getElementType = tagName => {
     case 'section':
       return Section;
     case 'select':
-      return Select$1;
+      return Select;
     case 'span':
       return Span;
     case 'strong':
@@ -13696,14 +13187,27 @@ const getChatAttachmentsDom = attachments => {
     }];
   })];
 };
-const getChatMessageDom = (message, parsedMessageContent, _openRouterApiKeyInput, _openApiApiKeyInput = '', openApiApiKeyState = 'idle', openApiApiKeysSettingsUrl = 'https://platform.openai.com/api-keys', openApiApiKeyInputPattern = '^sk-.+', openRouterApiKeyState = 'idle', useChatMathWorker = false) => {
+const getStandaloneImageAttachmentDom = attachment => {
+  if (!attachment.previewSrc) {
+    return getChatAttachmentsDom([attachment]);
+  }
+  return [{
+    alt: attachment.name,
+    childCount: 0,
+    className: ChatMessageImage,
+    src: attachment.previewSrc,
+    type: Img
+  }];
+};
+const getChatMessageDom = (message, parsedMessageContent, _openRouterApiKeyInput, openApiApiKeyInput = '', openApiApiKeyState = 'idle', openApiApiKeysSettingsUrl = 'https://platform.openai.com/api-keys', openApiApiKeyInputPattern = '^sk-.+', openRouterApiKeyState = 'idle', useChatMathWorker = false, standaloneImageAttachment) => {
   const roleClassName = message.role === 'user' ? MessageUser : MessageAssistant;
   const isOpenApiApiKeyMissingMessage = message.role === 'assistant' && message.text === openApiApiKeyRequiredMessage;
   const isOpenRouterApiKeyMissingMessage = message.role === 'assistant' && message.text === openRouterApiKeyRequiredMessage;
   const isOpenRouterRequestFailedMessage = message.role === 'assistant' && message.text === openRouterRequestFailedMessage;
   const isOpenRouterTooManyRequestsMessage = message.role === 'assistant' && message.text.startsWith(openRouterTooManyRequestsMessage);
-  const messageDom = getMessageContentDom(parsedMessageContent, useChatMathWorker);
-  const attachmentsDom = message.role === 'user' ? getChatAttachmentsDom(message.attachments ?? []) : [];
+  const isStandaloneImageMessage = !!standaloneImageAttachment;
+  const messageDom = isStandaloneImageMessage ? getStandaloneImageAttachmentDom(standaloneImageAttachment) : getMessageContentDom(parsedMessageContent, useChatMathWorker);
+  const attachmentsDom = !isStandaloneImageMessage && message.role === 'user' ? getChatAttachmentsDom(message.attachments ?? []) : [];
   const toolCallsDom = getToolCallsDom(message);
   const toolCallsChildCount = toolCallsDom.length > 0 ? 1 : 0;
   const messageDomChildCount = getTopLevelNodeCount(messageDom);
@@ -13715,9 +13219,9 @@ const getChatMessageDom = (message, parsedMessageContent, _openRouterApiKeyInput
     type: Div
   }, {
     childCount: extraChildCount,
-    className: ChatMessageContent,
+    className: isStandaloneImageMessage ? mergeClassNames(ChatMessageContent, ChatImageMessageContent) : ChatMessageContent,
     type: Div
-  }, ...toolCallsDom, ...messageDom, ...attachmentsDom, ...(isOpenApiApiKeyMissingMessage ? getMissingOpenApiApiKeyDom(openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern) : []), ...(isOpenRouterApiKeyMissingMessage ? getMissingOpenRouterApiKeyDom(openRouterApiKeyState) : []), ...(isOpenRouterRequestFailedMessage ? getOpenRouterRequestFailedDom() : []), ...(isOpenRouterTooManyRequestsMessage ? getOpenRouterTooManyRequestsDom() : [])];
+  }, ...toolCallsDom, ...messageDom, ...attachmentsDom, ...(isOpenApiApiKeyMissingMessage ? getMissingOpenApiApiKeyDom(openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern) : []), ...(isOpenRouterApiKeyMissingMessage ? getMissingOpenRouterApiKeyDom(openRouterApiKeyState) : []), ...(isOpenRouterRequestFailedMessage ? getOpenRouterRequestFailedDom() : []), ...(isOpenRouterTooManyRequestsMessage ? getOpenRouterTooManyRequestsDom() : [])];
 };
 
 const parentNode$1 = {
@@ -13733,6 +13237,22 @@ const getEmptyMessagesDom = () => {
 const hasMessageText = message => {
   return message.text.trim().length > 0;
 };
+const isImageAttachment = attachment => {
+  return attachment.displayType === 'image';
+};
+const withAttachments = (message, attachments) => {
+  const {
+    attachments: _attachments,
+    ...messageWithoutAttachments
+  } = message;
+  if (attachments.length === 0) {
+    return messageWithoutAttachments;
+  }
+  return {
+    ...messageWithoutAttachments,
+    attachments
+  };
+};
 const getDisplayMessages = (messages, parsedMessages) => {
   const displayMessages = [];
   for (const message of messages) {
@@ -13740,6 +13260,30 @@ const getDisplayMessages = (messages, parsedMessages) => {
     if (!parsedContent) {
       continue;
     }
+    if (message.role === 'user') {
+      const attachments = message.attachments ?? [];
+      const imageAttachments = attachments.filter(isImageAttachment);
+      if (imageAttachments.length > 0) {
+        const nonImageAttachments = attachments.filter(attachment => !isImageAttachment(attachment));
+        if (hasMessageText(message) || nonImageAttachments.length > 0) {
+          displayMessages.push({
+            message: withAttachments(message, nonImageAttachments),
+            parsedContent: hasMessageText(message) ? parsedContent : getEmptyMessageContent()
+          });
+        }
+        for (const attachment of imageAttachments) {
+          displayMessages.push({
+            message: {
+              ...withAttachments(message, [attachment]),
+              text: ''
+            },
+            parsedContent: getEmptyMessageContent(),
+            standaloneImageAttachment: attachment
+          });
+        }
+        continue;
+      }
+    }
     if (message.role !== 'assistant' || !message.toolCalls || message.toolCalls.length === 0) {
       displayMessages.push({
         message,
@@ -13795,7 +13339,7 @@ const getMessagesDom = (messages, parsedMessages, openRouterApiKeyInput, openApi
     role: 'log',
     scrollTop: messagesScrollTop,
     type: Div
-  }, ...displayMessages.flatMap(item => getChatMessageDom(item.message, item.parsedContent, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, useChatMathWorker))];
+  }, ...displayMessages.flatMap(item => getChatMessageDom(item.message, item.parsedContent, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, useChatMathWorker, item.standaloneImageAttachment))];
 };
 
 const arrowLeft$1 = {
@@ -13909,7 +13453,6 @@ const getChatModeChatFocusVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
   composerAttachments,
@@ -13920,6 +13463,10 @@ const getChatModeChatFocusVirtualDom = ({
   composerHeight = 28,
   composerLineHeight = 20,
   composerValue,
+  gitBranches,
+  gitBranchPickerErrorMessage,
+  gitBranchPickerOpen,
+  gitBranchPickerVisible,
   hasSpaceForAgentModePicker,
   hasSpaceForRunModePicker,
   messagesAutoScrollEnabled,
@@ -13954,14 +13501,15 @@ const getChatModeChatFocusVirtualDom = ({
   tokensUsed,
   usageOverviewEnabled,
   useChatMathWorker = false,
+  userName = '',
+  userState = 'loggedOut',
   visibleModels = models,
   voiceDictationEnabled = false
 }) => {
   const selectedSession = sessions.find(session => session.id === selectedSessionId);
-  const selectedProject = projects.find(project => project.id === selectedProjectId);
-  const messages = selectedSession ? selectedSession.messages : [];
   const selectedSessionTitle = selectedSession?.title || chatTitle();
-  const selectedProjectName = selectedProject?.name || '';
+  const selectedProjectName = projects.find(project => project.id === selectedProjectId)?.name || '';
+  const messages = selectedSession ? selectedSession.messages : [];
   const showCreatePullRequestButton = canCreatePullRequest(selectedSession);
   const isDropOverlayVisible = composerDropEnabled && composerDropActive;
   const isComposerAttachmentPreviewOverlayVisible = !!composerAttachmentPreviewOverlayAttachmentId;
@@ -13980,7 +13528,7 @@ const getChatModeChatFocusVirtualDom = ({
     childCount: 3,
     className: ChatFocusMainArea,
     type: Div
-  }, ...getChatHeaderDomFocusMode(selectedSessionTitle, selectedProjectName), ...getMessagesDom(messages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker, true), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, 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, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14033,31 +13581,8 @@ const getHeaderActionVirtualDom = item => {
   }];
 };
 
-const getAuthAction = (authEnabled, authStatus) => {
-  const isSigningIn = authStatus === 'signing-in';
-  if (!authEnabled) {
-    return undefined;
-  }
-  if (authStatus !== 'signed-in') {
-    return {
-      disabled: isSigningIn,
-      icon: mergeClassNames(MaskIcon, MaskIconAccount),
-      name: Login,
-      onClick: HandleClick,
-      title: isSigningIn ? loggingInToBackend() : loginToBackend()
-    };
-  }
-  return {
-    disabled: false,
-    icon: mergeClassNames(MaskIcon, MaskIconSignOut),
-    name: Logout,
-    onClick: HandleClick,
-    title: logoutFromBackend()
-  };
-};
-const getChatHeaderActionsDom = (viewMode, authEnabled = false, authStatus = 'signed-out', searchEnabled = false) => {
+const getChatHeaderActionsDom = (viewMode, searchEnabled = false) => {
   const toggleTitle = viewMode === 'chat-focus' ? normalChatMode() : chatFocusMode();
-  const authAction = getAuthAction(authEnabled, authStatus);
   const items = [{
     icon: mergeClassNames(MaskIcon, MaskIconLayoutPanelLeft),
     name: ToggleChatFocus,
@@ -14083,7 +13608,7 @@ const getChatHeaderActionsDom = (viewMode, authEnabled = false, authStatus = 'si
     name: Settings,
     onClick: HandleClickSettings,
     title: settings()
-  }, ...(authAction ? [authAction] : []), {
+  }, {
     icon: mergeClassNames(MaskIcon, MaskIconClose),
     name: CloseChat,
     onClick: HandleClickClose,
@@ -14108,14 +13633,14 @@ const getAuthErrorDom = (hasAuthError, authErrorMessage) => {
     type: Span
   }, text(authErrorMessage)];
 };
-const getChatHeaderDomDetailMode = (selectedSessionTitle, authEnabled = false, authStatus = 'signed-out', authErrorMessage = '') => {
+const getChatHeaderDomDetailMode = (selectedSessionTitle, authEnabled = false, userState = 'loggedOut', userName = '', authErrorMessage = '') => {
   const hasAuthError = authEnabled && !!authErrorMessage;
   return [{
-    childCount: hasAuthError ? 3 : 2,
+    childCount: 2 + (authEnabled ? 1 : 0) + (hasAuthError ? 1 : 0),
     className: ChatHeader,
     onContextMenu: HandleChatHeaderContextMenu,
     type: Header
-  }, {
+  }, ...getChatHeaderAuthDom(authEnabled, userState, userName), {
     childCount: 2,
     className: ChatName,
     type: Div
@@ -14123,7 +13648,7 @@ const getChatHeaderDomDetailMode = (selectedSessionTitle, authEnabled = false, a
     childCount: 1,
     className: ChatHeaderLabel,
     type: H2
-  }, text(selectedSessionTitle), ...getChatHeaderActionsDom('detail', authEnabled, authStatus), ...getAuthErrorDom(hasAuthError, authErrorMessage)];
+  }, text(selectedSessionTitle), ...getChatHeaderActionsDom('detail'), ...getAuthErrorDom(hasAuthError, authErrorMessage)];
 };
 
 const getChatModeDetailVirtualDom = ({
@@ -14132,7 +13657,6 @@ const getChatModeDetailVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
   composerAttachments,
@@ -14173,6 +13697,8 @@ const getChatModeDetailVirtualDom = ({
   tokensUsed,
   usageOverviewEnabled,
   useChatMathWorker = false,
+  userName = '',
+  userState = 'loggedOut',
   visibleModels = models,
   voiceDictationEnabled = false
 }) => {
@@ -14193,7 +13719,7 @@ const getChatModeDetailVirtualDom = ({
     onDragEnter: HandleDragEnterChatView,
     onDragOver: HandleDragOverChatView,
     type: Div
-  }, ...getChatHeaderDomDetailMode(selectedSessionTitle, authEnabled, authStatus, authErrorMessage), ...getMessagesDom(messages, parsedMessages, openRouterApiKeyInput, openApiApiKeyInput, openApiApiKeyState, openApiApiKeysSettingsUrl, openApiApiKeyInputPattern, openRouterApiKeyState, messagesScrollTop, useChatMathWorker), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, 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, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, showCreatePullRequestButton, voiceDictationEnabled, scrollDownButtonEnabled, messagesAutoScrollEnabled), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14229,20 +13755,20 @@ const getChatSearchDom = (hasSearchField, searchValue) => {
     value: searchValue
   }];
 };
-const getChatHeaderListModeDom = (authEnabled = false, authStatus = 'signed-out', authErrorMessage = '', searchEnabled = false, searchFieldVisible = false, searchValue = '') => {
+const getChatHeaderListModeDom = (authEnabled = false, userState = 'loggedOut', userName = '', authErrorMessage = '', searchEnabled = false, searchFieldVisible = false, searchValue = '') => {
   const hasAuthError = authEnabled && !!authErrorMessage;
   const hasSearchField = searchEnabled && searchFieldVisible;
-  const headerChildCount = 2 + (hasAuthError ? 1 : 0) + (hasSearchField ? 1 : 0);
+  const headerChildCount = 2 + (authEnabled ? 1 : 0) + (hasAuthError ? 1 : 0) + (hasSearchField ? 1 : 0);
   return [{
     childCount: headerChildCount,
     className: ChatHeader,
     onContextMenu: HandleChatHeaderContextMenu,
     type: Header
-  }, {
+  }, ...getChatHeaderAuthDom(authEnabled, userState, userName), {
     childCount: 1,
     className: ChatHeaderLabel,
     type: H2
-  }, text(chats()), ...getChatHeaderActionsDom('list', authEnabled, authStatus, searchEnabled), ...getChatSearchDom(hasSearchField, searchValue), ...(hasAuthError ? [{
+  }, text(chats()), ...getChatHeaderActionsDom('list', searchEnabled), ...getChatSearchDom(hasSearchField, searchValue), ...(hasAuthError ? [{
     childCount: 1,
     className: ChatAuthError,
     type: Span
@@ -14288,7 +13814,7 @@ const getSessionDom = (session, focused = false) => {
     type: Div
   }, {
     childCount: 0,
-    className: `${ChatListItemStatusIcon} codicon codicon-circle-filled ${sessionStatusClassName}`,
+    className: `${ChatListItemStatusIcon} ${sessionStatusClassName}`,
     type: Div
   }, {
     childCount: 1,
@@ -14342,7 +13868,6 @@ const getChatModeListVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   chatListScrollTop = 0,
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
@@ -14377,6 +13902,8 @@ const getChatModeListVirtualDom = ({
   tokensMax,
   tokensUsed,
   usageOverviewEnabled,
+  userName = '',
+  userState = 'loggedOut',
   visibleModels = models,
   voiceDictationEnabled = false
 }) => {
@@ -14395,7 +13922,7 @@ const getChatModeListVirtualDom = ({
     onDragEnter: HandleDragEnterChatView,
     onDragOver: HandleDragOverChatView,
     type: Div
-  }, ...getChatHeaderListModeDom(authEnabled, authStatus, authErrorMessage, searchEnabled, searchFieldVisible, searchValue), ...getChatListDom(visibleSessions, selectedSessionId, listFocusedIndex, chatListScrollTop), ...getChatSendAreaDom(composerValue, composerAttachments, agentMode, agentModePickerOpen, hasSpaceForAgentModePicker, modelPickerOpen, models, selectedModelId, reasoningPickerEnabled, reasoningEffort, reasoningEffortPickerOpen, usageOverviewEnabled, tokensUsed, tokensMax, addContextButtonEnabled, showRunMode, hasSpaceForRunModePicker, runMode, runModePickerOpen, todoListToolEnabled, todoListItems, false, voiceDictationEnabled), ...getChatOverlaysVirtualDom({
+  }, ...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), ...getChatOverlaysVirtualDom({
     agentMode,
     agentModePickerVisible: isAgentModePickerVisible,
     composerAttachmentPreviewOverlayAttachmentId,
@@ -14498,7 +14025,6 @@ const getChatVirtualDom = options => {
     agentModePickerOpen = false,
     authEnabled = false,
     authErrorMessage = '',
-    authStatus = 'signed-out',
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError = false,
@@ -14510,6 +14036,10 @@ const getChatVirtualDom = options => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches = [],
+    gitBranchPickerErrorMessage = '',
+    gitBranchPickerOpen = false,
+    gitBranchPickerVisible = false,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex = -1,
@@ -14547,6 +14077,8 @@ const getChatVirtualDom = options => {
     tokensUsed,
     usageOverviewEnabled,
     useChatMathWorker = false,
+    userName = '',
+    userState = 'loggedOut',
     viewMode,
     visibleModels = models,
     voiceDictationEnabled = false
@@ -14561,7 +14093,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
         composerAttachments,
@@ -14572,6 +14103,10 @@ const getChatVirtualDom = options => {
         composerHeight,
         composerLineHeight,
         composerValue,
+        gitBranches,
+        gitBranchPickerErrorMessage,
+        gitBranchPickerOpen,
+        gitBranchPickerVisible,
         hasSpaceForAgentModePicker,
         hasSpaceForRunModePicker,
         messagesAutoScrollEnabled,
@@ -14606,6 +14141,8 @@ const getChatVirtualDom = options => {
         tokensUsed,
         usageOverviewEnabled,
         useChatMathWorker,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14616,7 +14153,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
         composerAttachments,
@@ -14657,6 +14193,8 @@ const getChatVirtualDom = options => {
         tokensUsed,
         usageOverviewEnabled,
         useChatMathWorker,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14667,7 +14205,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         chatListScrollTop,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
@@ -14702,6 +14239,8 @@ const getChatVirtualDom = options => {
         tokensMax,
         tokensUsed,
         usageOverviewEnabled,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14717,7 +14256,6 @@ const renderItems = (oldState, newState) => {
     agentModePickerOpen,
     authEnabled,
     authErrorMessage,
-    authStatus,
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError,
@@ -14729,6 +14267,10 @@ const renderItems = (oldState, newState) => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches,
+    gitBranchPickerErrorMessage,
+    gitBranchPickerOpen,
+    gitBranchPickerVisible,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     initial,
@@ -14768,6 +14310,8 @@ const renderItems = (oldState, newState) => {
     uid,
     usageOverviewEnabled,
     useChatMathWorker,
+    userName,
+    userState,
     viewMode,
     visibleModels,
     voiceDictationEnabled
@@ -14781,7 +14325,6 @@ const renderItems = (oldState, newState) => {
     agentModePickerOpen,
     authEnabled,
     authErrorMessage,
-    authStatus,
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError,
@@ -14793,6 +14336,10 @@ const renderItems = (oldState, newState) => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches,
+    gitBranchPickerErrorMessage,
+    gitBranchPickerOpen,
+    gitBranchPickerVisible,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex,
@@ -14830,6 +14377,8 @@ const renderItems = (oldState, newState) => {
     tokensUsed,
     usageOverviewEnabled,
     useChatMathWorker,
+    userName,
+    userState,
     viewMode,
     visibleModels,
     voiceDictationEnabled
@@ -14876,8 +14425,16 @@ const renderSelection = (oldState, newState) => {
 const renderValue = (oldState, newState) => {
   const {
     composerValue,
+    openApiApiKeyInput,
+    openRouterApiKeyInput,
     uid
   } = newState;
+  if (oldState.openApiApiKeyInput !== openApiApiKeyInput) {
+    return [SetValueByName, uid, OpenApiApiKeyInput, openApiApiKeyInput];
+  }
+  if (oldState.openRouterApiKeyInput !== openRouterApiKeyInput) {
+    return [SetValueByName, uid, OpenRouterApiKeyInput, openRouterApiKeyInput];
+  }
   return [SetValueByName, uid, Composer, composerValue];
 };
 
@@ -14971,6 +14528,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickAgentModePickerToggle,
     params: ['openAgentModePicker']
+  }, {
+    name: HandleClickGitBranchPickerToggle,
+    params: ['handleClickGitBranchPickerToggle']
   }, {
     name: HandleClickModelPickerOverlay,
     params: ['handleClickModelPickerOverlay', DefaultPrevented]
@@ -15129,6 +14689,10 @@ const reset = async state => {
     composerSelectionEnd: 0,
     composerSelectionStart: 0,
     composerValue: '',
+    gitBranches: [],
+    gitBranchPickerErrorMessage: '',
+    gitBranchPickerOpen: false,
+    gitBranchPickerVisible: false,
     mockAiResponseDelay: 0,
     modelPickerHeight: getModelPickerHeight(state.modelPickerHeaderHeight, state.models.length),
     modelPickerListScrollTop: 0,
@@ -15208,7 +14772,6 @@ const saveState = state => {
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
-    systemPrompt,
     viewMode
   } = state;
   return {
@@ -15231,7 +14794,6 @@ const saveState = state => {
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
-    systemPrompt,
     viewMode
   };
 };
@@ -15246,7 +14808,13 @@ const setAddContextButtonEnabled = (state, addContextButtonEnabled) => {
 const setAuthEnabled = (state, authEnabled) => {
   return {
     ...state,
-    authEnabled
+    authAccessToken: authEnabled ? state.authAccessToken : '',
+    authEnabled,
+    authErrorMessage: authEnabled ? state.authErrorMessage : '',
+    userName: authEnabled ? state.userName : '',
+    userState: authEnabled ? state.userState : 'loggedOut',
+    userSubscriptionPlan: authEnabled ? state.userSubscriptionPlan : '',
+    userUsedTokens: authEnabled ? state.userUsedTokens : 0
   };
 };
 
@@ -15393,18 +14961,6 @@ const setUseChatMathWorker = async (state, useChatMathWorker, persist = true) =>
   };
 };
 
-const setUseChatMessageParsingWorker = async (state, useChatMessageParsingWorker, persist = true) => {
-  if (persist) {
-    await update({
-      'chatView.useChatMessageParsingWorker': useChatMessageParsingWorker
-    });
-  }
-  return {
-    ...state,
-    useChatMessageParsingWorker
-  };
-};
-
 const setUseChatNetworkWorkerForRequests = async (state, useChatNetworkWorkerForRequests, persist = true) => {
   if (persist) {
     await update({
@@ -15440,6 +14996,7 @@ const commandMap = {
   'Chat.chatListFocusNext': wrapCommand(chatListFocusNext),
   'Chat.chatListFocusPrevious': wrapCommand(chatListFocusPrevious),
   'Chat.clearInput': wrapCommand(clearInput),
+  'Chat.closeGitBranchPicker': wrapCommand(closeGitBranchPicker),
   'Chat.copyInput': wrapCommand(copyInput),
   'Chat.create': create,
   'Chat.cutInput': wrapCommand(cutInput),
@@ -15468,6 +15025,7 @@ const commandMap = {
   'Chat.handleClickDelete': wrapCommand(handleClickDelete),
   'Chat.handleClickDictationButton': wrapCommand(handleClickDictationButton),
   'Chat.handleClickFileName': wrapCommand(handleClickFileName),
+  'Chat.handleClickGitBranchPickerToggle': wrapCommand(handleClickGitBranchPickerToggle),
   'Chat.handleClickList': wrapCommand(handleClickList),
   'Chat.handleClickModelPickerList': wrapCommand(handleClickModelPickerList),
   'Chat.handleClickModelPickerListIndex': wrapCommand(handleClickModelPickerListIndex),
@@ -15519,6 +15077,7 @@ const commandMap = {
   'Chat.mockOpenApiStreamPushChunk': wrapCommand(mockOpenApiStreamPushChunk),
   'Chat.mockOpenApiStreamReset': wrapCommand(mockOpenApiStreamReset),
   'Chat.openAgentModePicker': wrapCommand(openAgentModePicker),
+  'Chat.openGitBranchPicker': wrapCommand(openGitBranchPicker),
   'Chat.openMockProject': wrapCommand(openMockProject),
   'Chat.openMockSession': wrapCommand(openMockSession),
   'Chat.openModelPicker': wrapCommand(openModelPicker),
@@ -15553,7 +15112,6 @@ const commandMap = {
   'Chat.setToolEnablement': wrapCommand(setToolEnablement),
   'Chat.setUseChatCoordinatorWorker': wrapCommand(setUseChatCoordinatorWorker),
   'Chat.setUseChatMathWorker': wrapCommand(setUseChatMathWorker),
-  'Chat.setUseChatMessageParsingWorker': wrapCommand(setUseChatMessageParsingWorker),
   'Chat.setUseChatNetworkWorkerForRequests': wrapCommand(setUseChatNetworkWorkerForRequests),
   'Chat.showComposerAttachmentPreviewOverlay': wrapCommand(showComposerAttachmentPreviewOverlay),
   'Chat.terminate': terminate,