@lvce-editor/chat-view 6.70.0 → 7.0.0

package/dist/chatViewWorkerMain.js

@@ -1775,6 +1775,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 +1863,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 +1871,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 +1957,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 +2355,6 @@ const createDefaultState = () => {
     authAccessToken: '',
     authEnabled: false,
     authErrorMessage: '',
-    authRefreshToken: '',
-    authStatus: 'signed-out',
     backendUrl: '',
     chatFocusContentMaxWidth: 700,
     chatHistoryEnabled: true,
@@ -2357,6 +2386,10 @@ const createDefaultState = () => {
     errorCount: 0,
     focus: 'composer',
     focused: false,
+    gitBranches: [],
+    gitBranchPickerErrorMessage: '',
+    gitBranchPickerOpen: false,
+    gitBranchPickerVisible: false,
     headerHeight: 50,
     height: 0,
     ...responsivePickerState,
@@ -2443,6 +2476,7 @@ const createDefaultState = () => {
     useChatToolWorker: true,
     useMockApi: false,
     userName: '',
+    userState: 'loggedOut',
     userSubscriptionPlan: '',
     userUsedTokens: 0,
     viewMode: 'list',
@@ -2829,7 +2863,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 +2891,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 +2921,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 +2942,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 +2978,9 @@ const getAuthState = state => {
     authAccessToken,
     authEnabled,
     authErrorMessage,
-    authRefreshToken,
-    authStatus,
     backendUrl,
     userName,
+    userState,
     userSubscriptionPlan,
     userUsedTokens
   } = state;
@@ -2918,10 +2988,9 @@ const getAuthState = state => {
     authAccessToken,
     authEnabled,
     authErrorMessage,
-    authRefreshToken,
-    authStatus,
     backendUrl,
     userName,
+    userState,
     userSubscriptionPlan,
     userUsedTokens
   };
@@ -3387,9 +3456,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';
@@ -3458,6 +3529,15 @@ const getRenameIdFromInputName = name => {
 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 +3898,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 +4141,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 +4160,7 @@ const selectProject = async (state, projectId) => {
     }
     return loadedSession;
   });
-  return {
+  return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
@@ -3858,7 +4168,7 @@ const selectProject = async (state, projectId) => {
     selectedSessionId: nextSelectedSessionId,
     sessions: hydratedSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
-  };
+  });
 };
 
 const fileSchemeRegex = /^file:\/\//;
@@ -3993,6 +4303,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 +4468,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 +4506,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()
   };
 };
 
@@ -4440,10 +4877,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}".`;
@@ -6830,7 +7263,12 @@ 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';
@@ -6844,6 +7282,7 @@ const ChatListItemStatusInProgress = 'ChatListItemStatusInProgress';
 const ChatListItemStatusRow = 'ChatListItemStatusRow';
 const ChatListItemStatusStopped = 'ChatListItemStatusStopped';
 const ChatMessageContent = 'ChatMessageContent';
+const ChatImageMessageContent = 'ChatImageMessageContent';
 const ChatMessageLink = 'ChatMessageLink';
 const ChatModelPicker = 'ChatModelPicker';
 const ChatModelPickerContainer = 'ChatModelPickerContainer';
@@ -6878,6 +7317,7 @@ const ChatAttachmentLabel = 'ChatAttachmentLabel';
 const ChatAttachmentPreview = 'ChatAttachmentPreview';
 const ChatAttachments = 'ChatAttachments';
 const ChatAttachmentTextFile = 'ChatAttachmentTextFile';
+const ChatMessageImage = 'ChatMessageImage';
 const ChatSendArea = 'ChatSendArea';
 const ChatSendAreaBottom = 'ChatSendAreaBottom';
 const ChatSendAreaContent = 'ChatSendAreaContent';
@@ -6915,6 +7355,7 @@ const IconButtonDisabled = 'IconButtonDisabled';
 const ImageElement = 'ImageElement';
 const ImageErrorMessage = 'ImageErrorMessage';
 const InputBox = 'InputBox';
+const InputInvalid = 'InputInvalid';
 const Insertion = 'Insertion';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
@@ -6923,7 +7364,6 @@ const MarkdownMathBlock = 'MarkdownMathBlock';
 const MarkdownQuote = 'MarkdownQuote';
 const MarkdownTable = 'MarkdownTable';
 const MaskIcon = 'MaskIcon';
-const MaskIconAccount = 'MaskIconAccount';
 const MaskIconAdd = 'MaskIconAdd';
 const MaskIconArrowLeft = 'MaskIconArrowLeft';
 const MaskIconChevronDown = 'MaskIconChevronDown';
@@ -6934,7 +7374,6 @@ const MaskIconDebugPause = 'MaskIconDebugPause';
 const MaskIconLayoutPanelLeft = 'MaskIconLayoutPanelLeft';
 const MaskIconSearch = 'MaskIconSearch';
 const MaskIconSettingsGear = 'MaskIconSettingsGear';
-const MaskIconSignOut = 'MaskIconSignOut';
 const Message = 'Message';
 const MessageAssistant = 'MessageAssistant';
 const MessageUser = 'MessageUser';
@@ -8288,6 +8727,12 @@ const parseAndStoreMessageContent = async (parsedMessages, message) => {
   const parsedContent = message.text === '' ? emptyMessageContent : await parseMessage(message.text);
   return setParsedMessageContent(parsedMessages, message.id, message.text, parsedContent);
 };
+const parseAndStoreMessageContentWithWorkerPreference = async (parsedMessages, message, useChatMessageParsingWorker) => {
+  if (useChatMessageParsingWorker) {
+    return parseAndStoreMessagesContentInWorker(parsedMessages, [message]);
+  }
+  return parseAndStoreMessageContent(parsedMessages, message);
+};
 const parseAndStoreMessagesContent = async (parsedMessages, messages) => {
   let nextParsedMessages = parsedMessages;
   for (const message of messages) {
@@ -8320,8 +8765,15 @@ const parseAndStoreMessagesContentWithWorkerPreference = async (parsedMessages,
   }
   return parseAndStoreMessagesContent(parsedMessages, messages);
 };
-const getEmptyMessageContent = () => {
-  return emptyMessageContent;
+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) => {
@@ -8738,10 +9190,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
@@ -8828,7 +9276,7 @@ const handleToolCallsChunkFunction = async (uid, assistantMessageId, toolCalls,
   };
 };
 
-const updateMessageTextInSelectedSession = async (sessions, parsedMessages, selectedSessionId, messageId, text, inProgress) => {
+const updateMessageTextInSelectedSession = async (sessions, parsedMessages, selectedSessionId, messageId, text, inProgress, useChatMessageParsingWorker) => {
   let updatedMessage;
   const updatedSessions = sessions.map(session => {
     if (session.id !== selectedSessionId) {
@@ -8851,7 +9299,7 @@ const updateMessageTextInSelectedSession = async (sessions, parsedMessages, sele
   });
   let nextParsedMessages = parsedMessages;
   if (updatedMessage) {
-    nextParsedMessages = await parseAndStoreMessageContent(parsedMessages, updatedMessage);
+    nextParsedMessages = await parseAndStoreMessageContentWithWorkerPreference(parsedMessages, updatedMessage, useChatMessageParsingWorker);
   }
   return {
     parsedMessages: nextParsedMessages,
@@ -8874,7 +9322,7 @@ const handleTextChunkFunction = async (uid, assistantMessageId, chunk, handleTex
     };
   }
   const updatedText = assistantMessage.text + chunk;
-  const updated = await updateMessageTextInSelectedSession(handleTextChunkState.latestState.sessions, handleTextChunkState.latestState.parsedMessages, handleTextChunkState.latestState.selectedSessionId, assistantMessageId, updatedText, true);
+  const updated = await updateMessageTextInSelectedSession(handleTextChunkState.latestState.sessions, handleTextChunkState.latestState.parsedMessages, handleTextChunkState.latestState.selectedSessionId, assistantMessageId, updatedText, true, handleTextChunkState.latestState.useChatMessageParsingWorker);
   const nextState = {
     ...handleTextChunkState.latestState,
     ...(handleTextChunkState.latestState.messagesAutoScrollEnabled ? {
@@ -9040,6 +9488,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,
@@ -9068,27 +9521,28 @@ const handleSubmit = async state => {
     streamingEnabled,
     toolEnablement,
     useChatCoordinatorWorker,
+    useChatMessageParsingWorker,
     useChatNetworkWorkerForRequests,
     useChatToolWorker,
     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,9 +9566,9 @@ const handleSubmit = async state => {
   };
   let {
     parsedMessages
-  } = state;
-  parsedMessages = await parseAndStoreMessageContent(parsedMessages, userMessage);
-  parsedMessages = await parseAndStoreMessageContent(parsedMessages, inProgressAssistantMessage);
+  } = effectiveState;
+  parsedMessages = await parseAndStoreMessageContentWithWorkerPreference(parsedMessages, userMessage, useChatMessageParsingWorker);
+  parsedMessages = await parseAndStoreMessageContentWithWorkerPreference(parsedMessages, inProgressAssistantMessage, useChatMessageParsingWorker);
   let workingSessions = sessions;
   if (viewMode === 'detail') {
     const loadedSession = await getChatSession(selectedSessionId);
@@ -9146,10 +9600,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 +9639,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 +9654,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 = {
@@ -9289,11 +9743,11 @@ const handleSubmit = async state => {
   let finalParsedMessages = latestState.parsedMessages;
   let updatedSessions;
   if (streamingEnabled) {
-    const updated = await updateMessageTextInSelectedSession(latestState.sessions, finalParsedMessages, latestState.selectedSessionId, assistantMessageId, assistantMessage.text, false);
+    const updated = await updateMessageTextInSelectedSession(latestState.sessions, finalParsedMessages, latestState.selectedSessionId, assistantMessageId, assistantMessage.text, false, latestState.useChatMessageParsingWorker);
     updatedSessions = updated.sessions;
     finalParsedMessages = updated.parsedMessages;
   } else {
-    finalParsedMessages = await parseAndStoreMessageContent(finalParsedMessages, assistantMessage);
+    finalParsedMessages = await parseAndStoreMessageContentWithWorkerPreference(finalParsedMessages, assistantMessage, latestState.useChatMessageParsingWorker);
     updatedSessions = appendMessageToSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessage);
   }
   if (aiSessionTitleGenerationEnabled && createsNewSession) {
@@ -9322,6 +9776,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 +9984,7 @@ const selectSession = async (state, id) => {
     }
     return loadedSession;
   });
-  return {
+  return refreshGitBranchPickerVisibility({
     ...state,
     composerAttachments,
     composerAttachmentsHeight: getComposerAttachmentsHeight(composerAttachments, width),
@@ -9461,7 +9993,7 @@ const selectSession = async (state, id) => {
     selectedSessionId: id,
     sessions: hydratedSessions,
     viewMode: viewMode === 'chat-focus' ? 'chat-focus' : 'detail'
-  };
+  });
 };
 
 const startRename = (state, id) => {
@@ -9491,15 +10023,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 +10163,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 +10292,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 +11219,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 +11250,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');
@@ -10857,12 +11430,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, useChatMessageParsingWorker, useChatNetworkWorkerForRequests, useChatToolWorker, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatMessageParsingWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadVoiceDictationEnabled()]);
   return {
     aiSessionTitleGenerationEnabled,
-    authAccessToken,
     authEnabled,
-    authRefreshToken,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10934,9 +11505,7 @@ const loadContent = async (state, savedState) => {
   const [composerSelectionStart, composerSelectionEnd] = savedComposerSelection ?? [state.composerSelectionStart, state.composerSelectionEnd];
   const {
     aiSessionTitleGenerationEnabled,
-    authAccessToken,
     authEnabled,
-    authRefreshToken,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10952,11 +11521,13 @@ const loadContent = async (state, savedState) => {
     toolEnablement,
     useChatCoordinatorWorker,
     useChatMathWorker,
-    useChatMessageParsingWorker,
+    // useChatMessageParsingWorker,
     useChatNetworkWorkerForRequests,
     useChatToolWorker,
     voiceDictationEnabled
   } = await loadPreferences();
+  const useChatMessageParsingWorker = true;
+  const authState = authEnabled && backendUrl ? await syncBackendAuth(backendUrl) : getLoggedOutBackendAuthState();
   const legacySavedSessions = getSavedSessions(savedState);
   const storedSessions = await listChatSessions();
   let sessions = storedSessions;
@@ -10992,7 +11563,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 || '';
@@ -11008,15 +11578,14 @@ const loadContent = async (state, savedState) => {
   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,7 +11626,6 @@ const loadContent = async (state, savedState) => {
     selectedSessionId,
     sessions,
     streamingEnabled,
-    systemPrompt,
     todoListToolEnabled,
     toolEnablement,
     useChatCoordinatorWorker,
@@ -11065,10 +11633,15 @@ const loadContent = async (state, savedState) => {
     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,7 +11731,24 @@ 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;
@@ -11171,20 +11761,20 @@ const openMockSession = async (state, mockSessionId, mockChatMessages) => {
     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 +11783,7 @@ const openMockSession = async (state, mockSessionId, mockChatMessages) => {
     selectedSessionId: mockSessionId,
     sessions,
     viewMode: 'detail'
-  };
+  });
 };
 
 const pasteInput = async state => {
@@ -11306,6 +11896,10 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   color: var(--vscode-errorForeground, var(--vscode-foreground));
 }
 
+.InputInvalid{
+  border-color: var(--vscode-inputValidation-errorBorder, var(--vscode-errorForeground));
+}
+
 .ChatComposerAttachmentTextFile{
   border-color: var(--vscode-charts-green, var(--vscode-widget-border, var(--vscode-panel-border)));
 }
@@ -11360,6 +11954,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;
 }
@@ -11403,6 +12014,14 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 
 }
 
+.ChatGitBranchPickerMessage{
+  padding: 6px 8px;
+}
+
+.ChatGitBranchPickerErrorMessage{
+  color: var(--vscode-errorForeground, var(--vscode-foreground));
+}
+
 .RunModePickerContainer{
   display: flex;
   justify-content: flex-end;
@@ -11507,13 +12126,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;
@@ -11525,7 +12141,6 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   flex: 1;
   min-height: 0;
 }
-
 `;
   return `${baseCss}
 
@@ -11670,7 +12285,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,10 +12301,12 @@ const getAddContextButtonDom = () => {
   }];
 };
 
-const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label) => {
+const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title) => {
   return [{
     'aria-expanded': open ? 'true' : 'false',
     'aria-haspopup': 'true',
+    'aria-label': ariaLabel,
+    ariaLabel,
     childCount: 2,
     className: Select,
     inputType: 'button',
@@ -11711,12 +12329,12 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
   }];
 };
 
-const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, containerChildCount = 1) => {
+const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, containerChildCount = 1) => {
   return [{
     childCount: containerChildCount,
     className: CustomSelectContainer,
     type: Div
-  }, ...getCustomSelectToggleVirtualDom(label, name, open, onClick, title)];
+  }, ...getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel)];
 };
 
 const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen) => {
@@ -11726,7 +12344,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 +12389,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 ? 2 : 1), ...(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 +12447,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 ? 2 : 1), ...(reasoningEffortPickerOpen ? [{
     childCount: 1,
     className: mergeClassNames(ChatModelPicker, CustomSelectPopOver),
     style: `height: ${reasoningEffortPickerHeight}px;`,
@@ -11946,6 +12614,7 @@ const getComposerAttachmentClassName = displayType => {
 };
 const getComposerAttachmentRemoveButtonDom = attachment => {
   return [{
+    'aria-label': removeAttachment(),
     buttonType: 'button',
     childCount: 1,
     className: ChatComposerAttachmentRemoveButton,
@@ -12017,12 +12686,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 +12716,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 +12792,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,
@@ -12658,6 +13383,7 @@ const getMissingApiActionsDom = ({
 };
 const getMissingApiKeyDom = ({
   getApiKeyText,
+  inputClassName,
   inputName,
   inputPattern,
   inputRequired = false,
@@ -12680,7 +13406,7 @@ const getMissingApiKeyDom = ({
     autocomplete: 'off',
     autocorrect: 'off',
     childCount: 0,
-    className: InputBox,
+    className: inputClassName ? mergeClassNames(InputBox, inputClassName) : InputBox,
     name: inputName,
     onInput: HandleInput,
     ...(inputPattern ? {
@@ -12700,13 +13426,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,
@@ -13696,14 +14426,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 +14458,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 +14476,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 +14499,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 +14578,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 +14692,6 @@ const getChatModeChatFocusVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
   composerAttachments,
@@ -13920,6 +14702,10 @@ const getChatModeChatFocusVirtualDom = ({
   composerHeight = 28,
   composerLineHeight = 20,
   composerValue,
+  gitBranches,
+  gitBranchPickerErrorMessage,
+  gitBranchPickerOpen,
+  gitBranchPickerVisible,
   hasSpaceForAgentModePicker,
   hasSpaceForRunModePicker,
   messagesAutoScrollEnabled,
@@ -13954,14 +14740,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 +14767,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 +14820,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 +14847,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 +14872,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 +14887,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 +14896,6 @@ const getChatModeDetailVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
   composerAttachments,
@@ -14173,6 +14936,8 @@ const getChatModeDetailVirtualDom = ({
   tokensUsed,
   usageOverviewEnabled,
   useChatMathWorker = false,
+  userName = '',
+  userState = 'loggedOut',
   visibleModels = models,
   voiceDictationEnabled = false
 }) => {
@@ -14193,7 +14958,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 +14994,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
@@ -14342,7 +15107,6 @@ const getChatModeListVirtualDom = ({
   agentModePickerOpen = false,
   authEnabled = false,
   authErrorMessage = '',
-  authStatus = 'signed-out',
   chatListScrollTop = 0,
   composerAttachmentPreviewOverlayAttachmentId,
   composerAttachmentPreviewOverlayError = false,
@@ -14377,6 +15141,8 @@ const getChatModeListVirtualDom = ({
   tokensMax,
   tokensUsed,
   usageOverviewEnabled,
+  userName = '',
+  userState = 'loggedOut',
   visibleModels = models,
   voiceDictationEnabled = false
 }) => {
@@ -14395,7 +15161,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 +15264,6 @@ const getChatVirtualDom = options => {
     agentModePickerOpen = false,
     authEnabled = false,
     authErrorMessage = '',
-    authStatus = 'signed-out',
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError = false,
@@ -14510,6 +15275,10 @@ const getChatVirtualDom = options => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches = [],
+    gitBranchPickerErrorMessage = '',
+    gitBranchPickerOpen = false,
+    gitBranchPickerVisible = false,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex = -1,
@@ -14547,6 +15316,8 @@ const getChatVirtualDom = options => {
     tokensUsed,
     usageOverviewEnabled,
     useChatMathWorker = false,
+    userName = '',
+    userState = 'loggedOut',
     viewMode,
     visibleModels = models,
     voiceDictationEnabled = false
@@ -14561,7 +15332,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
         composerAttachments,
@@ -14572,6 +15342,10 @@ const getChatVirtualDom = options => {
         composerHeight,
         composerLineHeight,
         composerValue,
+        gitBranches,
+        gitBranchPickerErrorMessage,
+        gitBranchPickerOpen,
+        gitBranchPickerVisible,
         hasSpaceForAgentModePicker,
         hasSpaceForRunModePicker,
         messagesAutoScrollEnabled,
@@ -14606,6 +15380,8 @@ const getChatVirtualDom = options => {
         tokensUsed,
         usageOverviewEnabled,
         useChatMathWorker,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14616,7 +15392,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
         composerAttachments,
@@ -14657,6 +15432,8 @@ const getChatVirtualDom = options => {
         tokensUsed,
         usageOverviewEnabled,
         useChatMathWorker,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14667,7 +15444,6 @@ const getChatVirtualDom = options => {
         agentModePickerOpen,
         authEnabled,
         authErrorMessage,
-        authStatus,
         chatListScrollTop,
         composerAttachmentPreviewOverlayAttachmentId,
         composerAttachmentPreviewOverlayError,
@@ -14702,6 +15478,8 @@ const getChatVirtualDom = options => {
         tokensMax,
         tokensUsed,
         usageOverviewEnabled,
+        userName,
+        userState,
         visibleModels,
         voiceDictationEnabled
       });
@@ -14717,7 +15495,6 @@ const renderItems = (oldState, newState) => {
     agentModePickerOpen,
     authEnabled,
     authErrorMessage,
-    authStatus,
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError,
@@ -14729,6 +15506,10 @@ const renderItems = (oldState, newState) => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches,
+    gitBranchPickerErrorMessage,
+    gitBranchPickerOpen,
+    gitBranchPickerVisible,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     initial,
@@ -14768,6 +15549,8 @@ const renderItems = (oldState, newState) => {
     uid,
     usageOverviewEnabled,
     useChatMathWorker,
+    userName,
+    userState,
     viewMode,
     visibleModels,
     voiceDictationEnabled
@@ -14781,7 +15564,6 @@ const renderItems = (oldState, newState) => {
     agentModePickerOpen,
     authEnabled,
     authErrorMessage,
-    authStatus,
     chatListScrollTop,
     composerAttachmentPreviewOverlayAttachmentId,
     composerAttachmentPreviewOverlayError,
@@ -14793,6 +15575,10 @@ const renderItems = (oldState, newState) => {
     composerHeight,
     composerLineHeight,
     composerValue,
+    gitBranches,
+    gitBranchPickerErrorMessage,
+    gitBranchPickerOpen,
+    gitBranchPickerVisible,
     hasSpaceForAgentModePicker,
     hasSpaceForRunModePicker,
     listFocusedIndex,
@@ -14830,6 +15616,8 @@ const renderItems = (oldState, newState) => {
     tokensUsed,
     usageOverviewEnabled,
     useChatMathWorker,
+    userName,
+    userState,
     viewMode,
     visibleModels,
     voiceDictationEnabled
@@ -14876,8 +15664,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 +15767,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickAgentModePickerToggle,
     params: ['openAgentModePicker']
+  }, {
+    name: HandleClickGitBranchPickerToggle,
+    params: ['handleClickGitBranchPickerToggle']
   }, {
     name: HandleClickModelPickerOverlay,
     params: ['handleClickModelPickerOverlay', DefaultPrevented]
@@ -15129,6 +15928,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 +16011,6 @@ const saveState = state => {
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
-    systemPrompt,
     viewMode
   } = state;
   return {
@@ -15231,7 +16033,6 @@ const saveState = state => {
     selectedModelId,
     selectedProjectId,
     selectedSessionId,
-    systemPrompt,
     viewMode
   };
 };
@@ -15246,7 +16047,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
   };
 };
 
@@ -15440,6 +16247,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 +16276,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 +16328,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),