@lvce-editor/chat-view 7.3.0 → 7.5.0

package/dist/chatViewWorkerMain.js

@@ -1350,6 +1350,9 @@ const sendMessagePortToChatStorageWorker$1 = async port => {
 const activateByEvent$1 = (event, assetDir, platform) => {
   return invoke('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
+const getWorkspacePath = () => {
+  return invoke('Workspace.getPath');
+};
 const sendMessagePortToTextMeasurementWorker$1 = async port => {
   const command = 'TextMeasurement.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
@@ -1485,10 +1488,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const getComposerWidth = width => {
-  return Math.max(1, width - 32);
-};
-
 const composerAttachmentGap = 8;
 const composerAttachmentMarginBottom = 8;
 const composerAttachmentFontSize = 12;
@@ -1497,6 +1496,18 @@ const composerAttachmentBorderWidth = 2;
 const composerAttachmentHeight = 26;
 const averageCharacterWidth = composerAttachmentFontSize * 0.6;
 const fallbackComposerWidth = 480;
+
+const getComposerWidth = width => {
+  return Math.max(1, width - 32);
+};
+
+const getAttachmentContainerWidth = width => {
+  if (width <= 0) {
+    return fallbackComposerWidth;
+  }
+  return Math.max(1, getComposerWidth(width));
+};
+
 const getComposerAttachmentLabel$1 = displayType => {
   switch (displayType) {
     case 'file':
@@ -1511,17 +1522,13 @@ const getComposerAttachmentLabel$1 = displayType => {
       return displayType;
   }
 };
-const getAttachmentContainerWidth = width => {
-  if (width <= 0) {
-    return fallbackComposerWidth;
-  }
-  return Math.max(1, getComposerWidth(width));
-};
+
 const getComposerAttachmentWidth = (attachment, containerWidth) => {
   const label = `${getComposerAttachmentLabel$1(attachment.displayType)} · ${attachment.name}`;
   const estimatedWidth = Math.ceil(label.length * averageCharacterWidth) + composerAttachmentHorizontalPadding + composerAttachmentBorderWidth;
   return Math.min(containerWidth, estimatedWidth);
 };
+
 const getComposerAttachmentsHeight = (composerAttachments, width) => {
   if (composerAttachments.length === 0) {
     return 0;
@@ -2218,6 +2225,7 @@ Use available project context to provide accurate, practical coding help.
 Prefer using available tools to inspect and modify files in the current workspace.
 When asked to create or update code, read relevant files first and apply changes directly in files instead of only pasting raw code in chat.
 Only provide raw code snippets when explicitly requested or when file editing tools are unavailable.
+When mentioning inline commands, file names, identifiers, or short code fragments in responses, wrap them in markdown backticks, for example \`nvm install 24.14.1\`.
 When displaying code blocks in responses, use markdown triple backticks (\`\`\`) fences.
 When referencing workspace files in responses (including "files added/changed" lists), use markdown links so users can click them.
 Prefer file links like [src/index.ts]({{workspaceUri}}/src/index.ts) and avoid plain text file paths when a link is appropriate.
@@ -2287,11 +2295,16 @@ const getReasoningEffortLabel = reasoningEffort => {
   }
 };
 
+const defaultToolEnablement = {
+  run_in_terminal: false
+};
 const parseToolEnablement = value => {
   if (!value || typeof value !== 'object' || Array.isArray(value)) {
-    return {};
+    return defaultToolEnablement;
   }
-  const toolEnablement = {};
+  const toolEnablement = {
+    ...defaultToolEnablement
+  };
   for (const [key, enabled] of Object.entries(value)) {
     if (typeof enabled === 'boolean') {
       toolEnablement[key] = enabled;
@@ -2316,10 +2329,13 @@ const validateToolEnablement = value => {
 };
 const isToolEnabled = (toolEnablement, toolName) => {
   if (!toolEnablement) {
-    return true;
+    return defaultToolEnablement[toolName] ?? true;
   }
   const enabled = toolEnablement[toolName];
-  return typeof enabled === 'boolean' ? enabled : true;
+  if (typeof enabled === 'boolean') {
+    return enabled;
+  }
+  return defaultToolEnablement[toolName] ?? true;
 };
 const filterEnabledTools = (tools, toolEnablement) => {
   return tools.filter(tool => isToolEnabled(toolEnablement, tool.function.name));
@@ -2395,7 +2411,7 @@ const createDefaultState = () => {
     maxToolCalls: defaultMaxToolCalls,
     messagesAutoScrollEnabled: true,
     messagesScrollTop: 0,
-    mockAiResponseDelay: 800,
+    mockAiResponseDelay: 0,
     mockApiCommandId: '',
     mockOpenApiRequests: [],
     modelPickerHeaderHeight,
@@ -2427,6 +2443,8 @@ const createDefaultState = () => {
       name: '_blank',
       uri: ''
     }],
+    projectSidebarResizing: false,
+    projectSidebarWidth: 280,
     questionToolEnabled: false,
     reasoningEffort: defaultReasoningEffort,
     reasoningEffortPickerOpen: false,
@@ -2595,14 +2613,21 @@ const getChatViewEvents = async sessionId => {
   return getEvents(sessionId);
 };
 
-const textFileRegex = /\.txt$/i;
-const pngSignature = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]);
 const isImageFile = mimeType => {
   return mimeType.startsWith('image/');
 };
+
+const textFileRegex = /\.txt$/i;
 const isTextFile = (name, mimeType) => {
   return mimeType === 'text/plain' || textFileRegex.test(name);
 };
+
+const isValidJpeg = async blob => {
+  const bytes = new Uint8Array(await blob.arrayBuffer());
+  return bytes.length >= 4 && bytes[0] === 0xff && bytes[1] === 0xd8 && bytes.at(-2) === 0xff && bytes.at(-1) === 0xd9;
+};
+
+const pngSignature = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]);
 const isValidPng = async blob => {
   const header = new Uint8Array(await blob.slice(0, pngSignature.length).arrayBuffer());
   if (header.length !== pngSignature.length) {
@@ -2610,10 +2635,7 @@ const isValidPng = async blob => {
   }
   return pngSignature.every((value, index) => header[index] === value);
 };
-const isValidJpeg = async blob => {
-  const bytes = new Uint8Array(await blob.arrayBuffer());
-  return bytes.length >= 4 && bytes[0] === 0xff && bytes[1] === 0xd8 && bytes.at(-2) === 0xff && bytes.at(-1) === 0xd9;
-};
+
 const isValidImage = async (blob, mimeType) => {
   if (mimeType.startsWith('image/') && mimeType !== 'image/png' && mimeType !== 'image/jpeg') {
     return true;
@@ -2635,6 +2657,7 @@ const isValidImage = async (blob, mimeType) => {
     return false;
   }
 };
+
 const getComposerAttachmentDisplayType = async (blob, name, mimeType) => {
   if (isImageFile(mimeType)) {
     return (await isValidImage(blob, mimeType)) ? 'image' : 'invalid-image';
@@ -2694,8 +2717,7 @@ const getComposerAttachments = async sessionId => {
       continue;
     }
     const displayType = await getComposerAttachmentDisplayType(event.blob, event.name, event.mimeType);
-    const previewSrc = await getComposerAttachmentPreviewSrc(event.blob, displayType, event.mimeType);
-    const textContent = await getComposerAttachmentTextContent(event.blob, displayType);
+    const [previewSrc, textContent] = await Promise.all([getComposerAttachmentPreviewSrc(event.blob, displayType, event.mimeType), getComposerAttachmentTextContent(event.blob, displayType)]);
     attachments.set(event.attachmentId, {
       attachmentId: event.attachmentId,
       displayType,
@@ -2827,7 +2849,7 @@ const getRenderHtmlCss = (sessions, selectedSessionId) => {
 const isEqual$1 = (oldState, newState) => {
   const oldRenderHtmlCss = getRenderHtmlCss(oldState.sessions, oldState.selectedSessionId);
   const newRenderHtmlCss = getRenderHtmlCss(newState.sessions, newState.selectedSessionId);
-  return oldState.initial === newState.initial && oldState.chatMessageFontFamily === newState.chatMessageFontFamily && oldState.chatMessageFontSize === newState.chatMessageFontSize && oldState.chatMessageLineHeight === newState.chatMessageLineHeight && oldState.chatFocusContentMaxWidth === newState.chatFocusContentMaxWidth && oldState.chatSendAreaPaddingTop === newState.chatSendAreaPaddingTop && oldState.chatSendAreaPaddingLeft === newState.chatSendAreaPaddingLeft && oldState.chatSendAreaPaddingRight === newState.chatSendAreaPaddingRight && oldState.chatSendAreaPaddingBottom === newState.chatSendAreaPaddingBottom && oldState.composerHeight === newState.composerHeight && oldState.composerAttachmentsHeight === newState.composerAttachmentsHeight && oldState.modelPickerHeight === newState.modelPickerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize && oldState.listItemHeight === newState.listItemHeight && oldState.textAreaPaddingTop === newState.textAreaPaddingTop && oldState.textAreaPaddingLeft === newState.textAreaPaddingLeft && oldState.textAreaPaddingRight === newState.textAreaPaddingRight && oldState.textAreaPaddingBottom === newState.textAreaPaddingBottom && oldRenderHtmlCss === newRenderHtmlCss;
+  return oldState.initial === newState.initial && oldState.chatMessageFontFamily === newState.chatMessageFontFamily && oldState.chatMessageFontSize === newState.chatMessageFontSize && oldState.chatMessageLineHeight === newState.chatMessageLineHeight && oldState.chatFocusContentMaxWidth === newState.chatFocusContentMaxWidth && oldState.projectSidebarWidth === newState.projectSidebarWidth && oldState.chatSendAreaPaddingTop === newState.chatSendAreaPaddingTop && oldState.chatSendAreaPaddingLeft === newState.chatSendAreaPaddingLeft && oldState.chatSendAreaPaddingRight === newState.chatSendAreaPaddingRight && oldState.chatSendAreaPaddingBottom === newState.chatSendAreaPaddingBottom && oldState.composerHeight === newState.composerHeight && oldState.composerAttachmentsHeight === newState.composerAttachmentsHeight && oldState.modelPickerHeight === newState.modelPickerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize && oldState.listItemHeight === newState.listItemHeight && oldState.textAreaPaddingTop === newState.textAreaPaddingTop && oldState.textAreaPaddingLeft === newState.textAreaPaddingLeft && oldState.textAreaPaddingRight === newState.textAreaPaddingRight && oldState.textAreaPaddingBottom === newState.textAreaPaddingBottom && oldRenderHtmlCss === newRenderHtmlCss;
 };
 
 const diffFocus = (oldState, newState) => {
@@ -3882,37 +3904,27 @@ 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;
+const parseEntries = value => {
+  if (!Array.isArray(value)) {
+    return [];
   }
-  return decodeURIComponent(new URL(uri).pathname);
+  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 getRelativePath = (fromPath, toPath) => {
   if (!fromPath.startsWith('/') || !toPath.startsWith('/')) {
     return toPath;
@@ -3927,6 +3939,14 @@ const getRelativePath = (fromPath, toPath) => {
   const childSegments = toParts.slice(commonPrefixLength);
   return [...parentSegments, ...childSegments].join('/') || '.';
 };
+
+const toFileSystemPath = uri => {
+  if (!uri.startsWith('file://')) {
+    return uri;
+  }
+  return decodeURIComponent(new URL(uri).pathname);
+};
+
 const toFileSystemTarget = (workspaceUri, uri) => {
   const workspacePath = toFileSystemPath(workspaceUri);
   const fileSystemPath = toFileSystemPath(uri);
@@ -3935,34 +3955,56 @@ const toFileSystemTarget = (workspaceUri, uri) => {
   }
   return getRelativePath(workspacePath, fileSystemPath);
 };
-const parseEntries = value => {
-  if (!Array.isArray(value)) {
-    return [];
+
+const readDir = async (workspaceUri, uri) => {
+  const result = await invoke('FileSystem.readDirWithFileTypes', toFileSystemTarget(workspaceUri, uri));
+  return parseEntries(result);
+};
+
+const slashAtEndRegex = /\/$/;
+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 value.map(entry => {
-    if (Array.isArray(entry) && typeof entry[0] === 'string' && typeof entry[1] === 'number') {
-      return {
-        name: entry[0],
-        type: entry[1]
-      };
+  return url.toString();
+};
+
+const FileTypeFile = 1;
+const FileTypeDirectory = 2;
+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 && 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')
-      };
+    if (entry.type === FileTypeFile) {
+      branches.add(`${prefix}${entry.name}`);
     }
-    return undefined;
-  }).filter(entry => !!entry);
+  }
 };
-const readDir = async (workspaceUri, uri) => {
-  const result = await invoke('FileSystem.readDirWithFileTypes', toFileSystemTarget(workspaceUri, uri));
-  return parseEntries(result);
+
+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 readTextFile = async (workspaceUri, uri) => {
   const result = await invoke('FileSystem.readFile', toFileSystemTarget(workspaceUri, uri));
   return decodeFileContent(result);
 };
+
+// cspell:ignore gitdir worktrees
+const gitDirPointerRegex = /^gitdir:\s*(.+)$/m;
 const getGitDirUri = async workspaceUri => {
   const gitUri = toGitUri(workspaceUri, '.git');
   try {
@@ -3978,18 +4020,8 @@ const getGitDirUri = async workspaceUri => {
   }
   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 headRefRegex = /^ref:\s+refs\/heads\/(.+)$/m;
 const parseCurrentBranch = headContent => {
   const match = headRefRegex.exec(headContent.trim());
   if (match) {
@@ -3997,13 +4029,7 @@ const parseCurrentBranch = headContent => {
   }
   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) {
@@ -4036,6 +4062,14 @@ const getGitBranches = async workspaceUri => {
   }));
 };
 
+const hasGitRepository = async workspaceUri => {
+  try {
+    return Boolean(await getGitDirUri(workspaceUri));
+  } catch {
+    return false;
+  }
+};
+
 const getSelectedSession = (sessions, selectedSessionId) => {
   return sessions.find(session => session.id === selectedSessionId);
 };
@@ -4634,6 +4668,30 @@ const hasToolError = value => {
   const error = Reflect.get(value, 'error');
   return typeof error === 'string' && error.trim().length > 0;
 };
+const getTrackedToolExecutionValue = value => {
+  if (typeof value !== 'string') {
+    return value;
+  }
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+};
+const getStoredToolExecutionStatus = result => {
+  let parsed = result;
+  if (typeof result === 'string') {
+    try {
+      parsed = JSON.parse(result);
+    } catch {
+      return 'error';
+    }
+  }
+  if (!parsed || typeof parsed !== 'object') {
+    return 'error';
+  }
+  return hasToolError(parsed) ? 'error' : 'success';
+};
 const parseWriteFileArguments = rawArguments => {
   let parsed = rawArguments;
   if (typeof rawArguments === 'string') {
@@ -4741,15 +4799,60 @@ const executeChatTool = async (name, rawArguments, options) => {
     // eslint-disable-next-line @typescript-eslint/only-throw-error
     throw new Error('Chat tools must be executed in a web worker environment. Please set useChatToolWorker to true in the options.');
   }
-  const workerOutput = await execute(name, rawArguments, {
+  const executionOptions = {
     assetDir: options.assetDir,
     platform: options.platform,
     ...(options.workspaceUri ? {
       workspaceUri: options.workspaceUri
     } : {})
-  });
-  const outputWithLineCounts = name === 'write_file' ? await withWriteFileLineCounts(workerOutput, rawArguments) : workerOutput;
-  return stringifyToolOutput(outputWithLineCounts);
+  };
+  const executionId = options.toolCallId || `${name}-${Date.now()}`;
+  const startedAt = new Date().toISOString();
+  if (options.sessionId) {
+    await appendChatViewEvent({
+      arguments: getTrackedToolExecutionValue(rawArguments),
+      id: executionId,
+      name,
+      options: executionOptions,
+      sessionId: options.sessionId,
+      time: startedAt,
+      timestamp: startedAt,
+      type: 'tool-execution-started'
+    });
+  }
+  try {
+    const workerOutput = await execute(name, rawArguments, executionOptions);
+    const outputWithLineCounts = name === 'write_file' ? await withWriteFileLineCounts(workerOutput, rawArguments) : workerOutput;
+    const result = stringifyToolOutput(outputWithLineCounts);
+    if (options.sessionId) {
+      await appendChatViewEvent({
+        id: executionId,
+        name,
+        result: outputWithLineCounts,
+        sessionId: options.sessionId,
+        status: getStoredToolExecutionStatus(outputWithLineCounts),
+        timestamp: new Date().toISOString(),
+        type: 'tool-execution-finished'
+      });
+    }
+    return result;
+  } catch (error) {
+    const errorResult = {
+      error: error instanceof Error ? error.message : String(error)
+    };
+    if (options.sessionId) {
+      await appendChatViewEvent({
+        id: executionId,
+        name,
+        result: errorResult,
+        sessionId: options.sessionId,
+        status: 'error',
+        timestamp: new Date().toISOString(),
+        type: 'tool-execution-finished'
+      });
+    }
+    throw error;
+  }
 };
 
 const getAskQuestionTool = () => {
@@ -4831,6 +4934,7 @@ const getAttachmentTextPart = attachment => {
       };
   }
 };
+
 const getChatMessageOpenAiContent = message => {
   if (!message.attachments || message.attachments.length === 0) {
     return message.text;
@@ -4862,7 +4966,9 @@ const getClientRequestIdHeader = () => {
 };
 
 const getMockAiResponse = async (userMessage, delayInMs) => {
-  await delay(delayInMs);
+  if (delayInMs > 0) {
+    await delay(delayInMs);
+  }
   return `Mock AI response: I received "${userMessage}".`;
 };
 
@@ -5346,6 +5452,51 @@ const makeStreamingApiRequest = async options => {
   return invoke$6('ChatNetwork.makeStreamingApiRequest', options);
 };
 
+const getNumericCount = parsed => {
+  const count = Reflect.get(parsed, 'count');
+  if (typeof count === 'number' && Number.isFinite(count)) {
+    return count;
+  }
+  const matchCount = Reflect.get(parsed, 'matchCount');
+  if (typeof matchCount === 'number' && Number.isFinite(matchCount)) {
+    return matchCount;
+  }
+  return undefined;
+};
+const getArrayCount = parsed => {
+  const matches = Reflect.get(parsed, 'matches');
+  if (Array.isArray(matches)) {
+    return matches.length;
+  }
+  const files = Reflect.get(parsed, 'files');
+  if (Array.isArray(files)) {
+    return files.length;
+  }
+  const results = Reflect.get(parsed, 'results');
+  if (Array.isArray(results)) {
+    return results.length;
+  }
+  return undefined;
+};
+const getGlobMatchCount = result => {
+  if (!result) {
+    return undefined;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(result);
+  } catch {
+    return undefined;
+  }
+  if (Array.isArray(parsed)) {
+    return parsed.length;
+  }
+  if (!parsed || typeof parsed !== 'object') {
+    return undefined;
+  }
+  return getNumericCount(parsed) ?? getArrayCount(parsed);
+};
+
 const getTextContent = content => {
   if (typeof content === 'string') {
     return content;
@@ -5510,6 +5661,9 @@ const getToolCallResult = (name, content) => {
     }
     return content;
   }
+  if (name === 'glob') {
+    return getGlobMatchCount(content) === undefined ? undefined : content;
+  }
   if (name !== 'getWorkspaceUri') {
     return undefined;
   }
@@ -6021,6 +6175,7 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
     onToolCallsChunk,
     questionToolEnabled = false,
     reasoningEffort,
+    sessionId,
     stream,
     supportsReasoningEffort = false,
     systemPrompt = '',
@@ -6137,6 +6292,10 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
           const content = await executeChatTool(toolCall.name, toolCall.arguments, {
             assetDir,
             platform,
+            ...(sessionId ? {
+              sessionId
+            } : {}),
+            toolCallId: toolCall.callId,
             ...(toolEnablement ? {
               toolEnablement
             } : {}),
@@ -6290,6 +6449,10 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
         const content = await executeChatTool(toolCall.name, toolCall.arguments, {
           assetDir,
           platform,
+          ...(sessionId ? {
+            sessionId
+          } : {}),
+          toolCallId: toolCall.callId,
           ...(toolEnablement ? {
             toolEnablement
           } : {}),
@@ -6370,6 +6533,10 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
           const content = typeof name === 'string' ? await executeChatTool(name, rawArguments, {
             assetDir,
             platform,
+            ...(sessionId ? {
+              sessionId
+            } : {}),
+            toolCallId: id,
             useChatToolWorker,
             workspaceUri
           }) : '{}';
@@ -6645,7 +6812,7 @@ const getOpenRouterLimitInfo = async (openRouterApiKey, openRouterApiBaseUrl, us
   }
   return normalizedLimitInfo;
 };
-const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests = false, useChatToolWorker = true, questionToolEnabled = false, systemPrompt = '', workspaceUri = '', agentMode = defaultAgentMode, toolEnablement) => {
+const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests = false, useChatToolWorker = true, questionToolEnabled = false, systemPrompt = '', workspaceUri = '', agentMode = defaultAgentMode, toolEnablement, sessionId) => {
   const effectiveAgentMode = typeof agentMode === 'boolean' ? defaultAgentMode : agentMode;
   const completionMessages = [...(systemPrompt ? [{
     content: systemPrompt,
@@ -6807,6 +6974,10 @@ const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, o
         const content = typeof name === 'string' ? await executeChatTool(name, rawArguments, {
           assetDir,
           platform,
+          ...(sessionId ? {
+            sessionId
+          } : {}),
+          toolCallId: id,
           ...(toolEnablement ? {
             toolEnablement
           } : {}),
@@ -6982,6 +7153,7 @@ const getAiResponse = async ({
   questionToolEnabled = false,
   reasoningEffort,
   selectedModelId,
+  sessionId,
   streamingEnabled = true,
   systemPrompt = '',
   toolEnablement,
@@ -6993,6 +7165,7 @@ const getAiResponse = async ({
   webSearchEnabled = false,
   workspaceUri
 }) => {
+  useChatCoordinatorWorker = false; // TODO enable this
   if (useChatCoordinatorWorker && !authEnabled) {
     try {
       const result = await getAiResponse$1({
@@ -7107,6 +7280,10 @@ const getAiResponse = async ({
           const content = await executeChatTool(toolCall.name, toolCall.arguments, {
             assetDir,
             platform,
+            ...(sessionId ? {
+              sessionId
+            } : {}),
+            toolCallId: toolCall.callId,
             ...(toolEnablement ? {
               toolEnablement
             } : {}),
@@ -7165,6 +7342,9 @@ const getAiResponse = async ({
         ...(reasoningEffort ? {
           reasoningEffort
         } : {}),
+        ...(sessionId ? {
+          sessionId
+        } : {}),
         stream: streamingEnabled,
         supportsReasoningEffort,
         systemPrompt,
@@ -7202,7 +7382,7 @@ const getAiResponse = async ({
         text = getOpenRouterErrorMessage(result);
       }
     } else if (openRouterApiKey) {
-      const result = await getOpenRouterAssistantText(messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests, useChatToolWorker, questionToolEnabled, systemPrompt, workspaceUri, agentMode, toolEnablement);
+      const result = await getOpenRouterAssistantText(messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests, useChatToolWorker, questionToolEnabled, systemPrompt, workspaceUri, agentMode, toolEnablement, sessionId);
       if (result.type === 'success') {
         const {
           text: assistantText
@@ -7987,8 +8167,19 @@ const getWorkspaceUri = (state, session) => {
   }
   return getProjectUri(state, session?.projectId || state.selectedProjectId);
 };
-const getEffectiveSystemPrompt = (state, session) => {
-  const resolvedSystemPrompt = state.systemPrompt.replaceAll(workspaceUriPlaceholder, getWorkspaceUri(state, session) || 'unknown');
+const resolveWorkspaceUri = async (state, session) => {
+  const workspaceUri = getWorkspaceUri(state, session);
+  if (workspaceUri) {
+    return workspaceUri;
+  }
+  try {
+    return await getWorkspacePath();
+  } catch {
+    return '';
+  }
+};
+const getEffectiveSystemPrompt = (state, workspaceUri) => {
+  const resolvedSystemPrompt = state.systemPrompt.replaceAll(workspaceUriPlaceholder, workspaceUri || 'unknown');
   const currentDateInstructions = `Current date: ${getCurrentDate()}.
 
 Do not assume your knowledge cutoff is the same as the current date.`;
@@ -8196,8 +8387,8 @@ const handleSubmit = async state => {
     mockOpenApiRequests
   } = optimisticState;
   const selectedOptimisticSession = optimisticState.sessions.find(session => session.id === optimisticState.selectedSessionId);
-  const systemPrompt = getEffectiveSystemPrompt(optimisticState, selectedOptimisticSession);
-  const workspaceUri = getWorkspaceUri(optimisticState, selectedOptimisticSession);
+  const workspaceUri = useMockApi ? getWorkspaceUri(optimisticState, selectedOptimisticSession) : await resolveWorkspaceUri(optimisticState, selectedOptimisticSession);
+  const systemPrompt = getEffectiveSystemPrompt(optimisticState, workspaceUri);
   const messages = (selectedOptimisticSession?.messages ?? []).filter(message => !message.inProgress);
   const mentionContextMessage = await getMentionContextMessage(userText);
   const messagesWithMentionContext = mentionContextMessage ? [...messages, mentionContextMessage] : messages;
@@ -8257,6 +8448,7 @@ const handleSubmit = async state => {
     } : {}),
     reasoningEffort,
     selectedModelId,
+    sessionId: optimisticState.selectedSessionId,
     streamingEnabled,
     systemPrompt,
     toolEnablement,
@@ -8800,6 +8992,18 @@ const handleClickClose = async () => {
   await invoke('Layout.hideSecondarySideBar');
 };
 
+const handleClickCustomSelectOverlay = async (state, defaultPrevented) => {
+  if (defaultPrevented) {
+    return state;
+  }
+  return closeGitBranchPicker({
+    ...state,
+    agentModePickerOpen: false,
+    reasoningEffortPickerOpen: false,
+    runModePickerOpen: false
+  });
+};
+
 const handleClickDelete = async (state, sessionId = '') => {
   return deleteSession(state, sessionId);
 };
@@ -9083,8 +9287,7 @@ const handleDropFiles = async (state, name, fileHandles = []) => {
     const file = await droppedFileHandle.getFile();
     const attachmentId = `attachment-${nextAttachmentId + nextAttachments.length}`;
     const displayType = await getComposerAttachmentDisplayType(file, file.name, file.type);
-    const previewSrc = await getComposerAttachmentPreviewSrc(file, displayType, file.type);
-    const textContent = await getComposerAttachmentTextContent(file, displayType);
+    const [previewSrc, textContent] = await Promise.all([getComposerAttachmentPreviewSrc(file, displayType, file.type), getComposerAttachmentTextContent(file, displayType)]);
     await appendChatViewEvent({
       attachmentId,
       blob: file,
@@ -9152,11 +9355,13 @@ const handleInput = async (state, name, value, inputSource = 'user') => {
   }
   if (name === ModelPickerSearch) {
     const visibleModels = getVisibleModels(state.models, value);
+    const selectedModelId = visibleModels.some(model => model.id === state.selectedModelId) ? state.selectedModelId : visibleModels[0]?.id || state.selectedModelId;
     return {
       ...state,
       modelPickerHeight: getModelPickerHeight(state.modelPickerHeaderHeight, visibleModels.length),
       modelPickerListScrollTop: 0,
       modelPickerSearchValue: value,
+      selectedModelId,
       visibleModels
     };
   }
@@ -9391,10 +9596,57 @@ const handlePointerDownModelPickerList = async state => {
   return state;
 };
 
+const handlePointerDownProjectSidebarSash = async state => {
+  if (state.projectSidebarResizing) {
+    return state;
+  }
+  return {
+    ...state,
+    projectSidebarResizing: true
+  };
+};
+
+const minimumProjectSidebarWidth = 180;
+const minimumChatAreaWidth = 320;
+const getProjectSidebarWidth = (state, clientX) => {
+  const availableWidth = state.width > 0 ? state.width : state.projectSidebarWidth + minimumChatAreaWidth;
+  const maximumProjectSidebarWidth = Math.max(minimumProjectSidebarWidth, availableWidth - minimumChatAreaWidth);
+  const nextWidth = Math.round(clientX - state.x);
+  return Math.min(Math.max(nextWidth, minimumProjectSidebarWidth), maximumProjectSidebarWidth);
+};
+const resizeProjectSidebar = (state, clientX) => {
+  const projectSidebarWidth = getProjectSidebarWidth(state, clientX);
+  if (projectSidebarWidth === state.projectSidebarWidth) {
+    return state;
+  }
+  return {
+    ...state,
+    projectSidebarWidth
+  };
+};
+
+const handlePointerMoveProjectSidebarSash = async (state, clientX) => {
+  if (!state.projectSidebarResizing) {
+    return state;
+  }
+  return resizeProjectSidebar(state, clientX);
+};
+
 const handlePointerUpModelPickerList = async (state, eventY = 0) => {
   return state;
 };
 
+const handlePointerUpProjectSidebarSash = async (state, clientX) => {
+  if (!state.projectSidebarResizing) {
+    return state;
+  }
+  const nextState = resizeProjectSidebar(state, clientX);
+  return {
+    ...nextState,
+    projectSidebarResizing: false
+  };
+};
+
 const handleProjectAddButtonContextMenu = async (state, button, x, y) => {
   const {
     uid
@@ -9682,6 +9934,19 @@ const getSavedProjects = savedState => {
   return validProjects;
 };
 
+const getSavedProjectSidebarWidth = savedState => {
+  if (!isObject$1(savedState)) {
+    return undefined;
+  }
+  const {
+    projectSidebarWidth
+  } = savedState;
+  if (typeof projectSidebarWidth !== 'number') {
+    return undefined;
+  }
+  return projectSidebarWidth;
+};
+
 const getSavedReasoningEffort = savedState => {
   if (!isObject$1(savedState)) {
     return undefined;
@@ -9902,7 +10167,7 @@ const loadToolEnablement = async () => {
     const savedToolEnablement = await get('chat.toolEnablement');
     return parseToolEnablement(savedToolEnablement);
   } catch {
-    return {};
+    return parseToolEnablement(undefined);
   }
 };
 
@@ -10078,6 +10343,7 @@ const loadContent = async (state, savedState) => {
   const chatListScrollTop = getSavedChatListScrollTop(savedState) ?? state.chatListScrollTop;
   const messagesScrollTop = getSavedMessagesScrollTop(savedState) ?? state.messagesScrollTop;
   const projectListScrollTop = getSavedProjectListScrollTop(savedState) ?? state.projectListScrollTop;
+  const projectSidebarWidth = getSavedProjectSidebarWidth(savedState) ?? state.projectSidebarWidth;
   const savedProjectExpandedIds = getSavedProjectExpandedIds(savedState);
   const projectExpandedIds = (savedProjectExpandedIds || state.projectExpandedIds).filter(id => projects.some(project => project.id === id));
   const reasoningEffort = getSavedReasoningEffort(savedState) ?? state.reasoningEffort;
@@ -10132,6 +10398,8 @@ const loadContent = async (state, savedState) => {
     projectExpandedIds,
     projectListScrollTop,
     projects,
+    projectSidebarResizing: false,
+    projectSidebarWidth,
     reasoningEffort,
     reasoningEffortPickerOpen: false,
     reasoningPickerEnabled,
@@ -10320,10 +10588,11 @@ const removeComposerAttachment = async (state, attachmentId) => {
   return handleRemoveComposerAttachment(state, attachmentId);
 };
 
-const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily, chatFocusContentMaxWidth, textAreaPaddingTop, textAreaPaddingLeft, textAreaPaddingRight, textAreaPaddingBottom, chatSendAreaPaddingTop, chatSendAreaPaddingLeft, chatSendAreaPaddingRight, chatSendAreaPaddingBottom, renderHtmlCss) => {
+const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily, chatFocusContentMaxWidth, projectSidebarWidth, textAreaPaddingTop, textAreaPaddingLeft, textAreaPaddingRight, textAreaPaddingBottom, chatSendAreaPaddingTop, chatSendAreaPaddingLeft, chatSendAreaPaddingRight, chatSendAreaPaddingBottom, renderHtmlCss) => {
   const buttonsHeight = 20;
   const gap = 10;
   const contentPadding = 10;
+  const runModePickerHeight = 84;
   const chatSendAreaHeight = composerHeight + composerAttachmentsHeight + chatSendAreaPaddingTop + chatSendAreaPaddingBottom + buttonsHeight + gap + contentPadding * 2;
   const baseCss = `:root {
   --ChatInputBoxHeight: ${composerHeight}px;
@@ -10344,6 +10613,12 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   --ChatMessageLineHeight: ${chatMessageLineHeight}px;
   --ChatMessageFontFamily: ${chatMessageFontFamily};
   --ChatFocusContentMaxWidth: ${chatFocusContentMaxWidth}px;
+  --ProjectSidebarWidth: ${projectSidebarWidth}px;
+  --RunModePickerHeight: ${runModePickerHeight}px;
+}
+
+:root{
+ --WidgetBorder: white;
 }
 
 .ChatSendAreaBottom{
@@ -10369,7 +10644,7 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   min-width: 0;
   overflow: hidden;
   border-radius: 999px;
-  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border: 1px solid var(--WidgetBorder, white);
   padding: 4px 10px;
   background: var(--vscode-badge-background, color-mix(in srgb, var(--vscode-editor-background) 88%, white));
   color: var(--vscode-badge-foreground, var(--vscode-foreground));
@@ -10419,7 +10694,7 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 }
 
 .ChatComposerAttachmentTextFile{
-  border-color: var(--vscode-charts-green, var(--vscode-widget-border, var(--vscode-panel-border)));
+  border-color: var(--vscode-charts-green, var(--WidgetBorder, white));
 }
 
 .ChatAttachments{
@@ -10437,7 +10712,7 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   min-width: 0;
   overflow: hidden;
   border-radius: 999px;
-  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border: 1px solid var(--WidgetBorder, white);
   padding: 4px 10px;
   background: var(--vscode-badge-background, color-mix(in srgb, var(--vscode-editor-background) 88%, white));
   color: var(--vscode-badge-foreground, var(--vscode-foreground));
@@ -10469,12 +10744,12 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 }
 
 .ChatAttachmentTextFile{
-  border-color: var(--vscode-charts-green, var(--vscode-widget-border, var(--vscode-panel-border)));
+  border-color: var(--vscode-charts-green, var(--WidgetBorder, white));
 }
 
 .ChatImageMessageContent{
   padding: 6px;
-  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border: 1px solid var(--WidgetBorder, white);
   border-radius: 12px;
   background: var(--vscode-editorWidget-background, var(--vscode-editor-background));
   overflow: hidden;
@@ -10505,7 +10780,7 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border: 1px solid var(--WidgetBorder, white);
   border-radius: 12px;
   background: var(--vscode-editorWidget-background, var(--vscode-editor-background));
   box-shadow: 0 12px 28px color-mix(in srgb, var(--vscode-editor-background) 45%, black);
@@ -10564,8 +10839,9 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 }
 
 .RunModePickerPopOver{
+  height: var(--RunModePickerHeight);
   overflow: hidden;
-  border: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
+  border: 1px solid var(--WidgetBorder, white);
   border-radius: 8px;
   background: var(--vscode-editorWidget-background, var(--vscode-editor-background));
   box-shadow: 0 8px 24px color-mix(in srgb, var(--vscode-editor-background) 50%, black);
@@ -10651,7 +10927,41 @@ const getCss = (composerHeight, composerAttachmentsHeight, modelPickerHeight, li
 .Viewlet.Chat.ChatFocus{
   display: flex !important;
   min-width: 0;
+  flex-direction: row !important;
+}
+
+.ChatFocus > .ProjectSidebar{
+  display: flex;
+  flex: none;
+  flex-direction: column;
+  inline-size: var(--ProjectSidebarWidth);
+  min-inline-size: 0;
+}
+
+.ChatFocus > .ProjectSidebar > .ProjectList{
+  flex: 1;
+  min-height: 0;
+}
+
+.ChatFocus > .Sash.SashVertical{
+  position: relative;
+  flex: none;
+  inline-size: 4px;
+  cursor: col-resize;
+  touch-action: none;
+}
+
+.ChatFocus > .Sash.SashVertical::before{
+  content: '';
+  position: absolute;
+  inset: 0;
+  background: color-mix(in srgb, var(--vscode-sideBar-border, var(--WidgetBorder, white)) 75%, transparent);
+}
+
+.ChatFocus > .Sash.SashVertical:hover::before{
+  background: var(--vscode-focusBorder, var(--vscode-button-background));
 }
+
 .ChatFocusMainArea{
   display: flex;
   flex: 1;
@@ -10766,6 +11076,7 @@ const renderCss = (oldState, newState) => {
     composerHeight,
     listItemHeight,
     modelPickerHeight,
+    projectSidebarWidth,
     selectedSessionId,
     sessions,
     textAreaPaddingBottom,
@@ -10775,7 +11086,7 @@ const renderCss = (oldState, newState) => {
     uid
   } = newState;
   const renderHtmlCss = getRenderHtmlCss(sessions, selectedSessionId);
-  const css = getCss(composerHeight, composerAttachmentsHeight, modelPickerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily, chatFocusContentMaxWidth, textAreaPaddingTop, textAreaPaddingLeft, textAreaPaddingRight, textAreaPaddingBottom, chatSendAreaPaddingTop, chatSendAreaPaddingLeft, chatSendAreaPaddingRight, chatSendAreaPaddingBottom, renderHtmlCss);
+  const css = getCss(composerHeight, composerAttachmentsHeight, modelPickerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily, chatFocusContentMaxWidth, projectSidebarWidth, textAreaPaddingTop, textAreaPaddingLeft, textAreaPaddingRight, textAreaPaddingBottom, chatSendAreaPaddingTop, chatSendAreaPaddingLeft, chatSendAreaPaddingRight, chatSendAreaPaddingBottom, renderHtmlCss);
   return [SetCss, uid, css];
 };
 
@@ -10954,9 +11265,13 @@ const MaskIconChevronRight = 'MaskIconChevronRight';
 const MaskIconChevronUp = 'MaskIconChevronUp';
 const MaskIconClose = 'MaskIconClose';
 const MaskIconDebugPause = 'MaskIconDebugPause';
+const MaskIconDiff = 'MaskIconDiff';
+const MaskIconFolder = 'MaskIconFolder';
+const MaskIconGitCommit = 'MaskIconGitCommit';
 const MaskIconLayoutPanelLeft = 'MaskIconLayoutPanelLeft';
 const MaskIconSearch = 'MaskIconSearch';
 const MaskIconSettingsGear = 'MaskIconSettingsGear';
+const MaskIconTerminal = 'MaskIconTerminal';
 const Message = 'Message';
 const MessageAssistant = 'MessageAssistant';
 const MessageUser = 'MessageUser';
@@ -10975,6 +11290,8 @@ const ProjectSessionItem = 'ProjectSessionItem';
 const ProjectSessionItemLabel = 'ProjectSessionItemLabel';
 const ProjectSessionItemSelected = 'ProjectSessionItemSelected';
 const ProjectSidebar = 'ProjectSidebar';
+const Sash = 'Sash';
+const SashVertical = 'SashVertical';
 const SearchFieldContainer = 'SearchFieldContainer';
 const RunModePickerContainer = 'RunModePickerContainer';
 const RunModePickerPopOver = 'RunModePickerPopOver';
@@ -11042,6 +11359,10 @@ const HandleClickAgentModePickerToggle = 57;
 const HandleContextMenuChatImageAttachment = 58;
 const HandleClickGitBranchPickerToggle = 59;
 const HandleErrorComposerAttachmentPreviewOverlay = 60;
+const HandleClickCustomSelectOverlay = 61;
+const HandlePointerDownProjectSidebarSash = 62;
+const HandlePointerMoveProjectSidebarSash = 63;
+const HandlePointerUpProjectSidebarSash = 64;
 
 const getAddContextButtonDom = () => {
   return [{
@@ -11056,7 +11377,7 @@ const getAddContextButtonDom = () => {
   }];
 };
 
-const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title) => {
+const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '') => {
   const getChevronDom = expanded => {
     return {
       childCount: 0,
@@ -11067,6 +11388,9 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
     };
   };
   return [{
+    ...(ariaControls ? {
+      'aria-controls': ariaControls
+    } : {}),
     'aria-expanded': open ? 'true' : 'false',
     'aria-haspopup': 'true',
     'aria-label': ariaLabel,
@@ -11087,8 +11411,8 @@ const getCustomSelectToggleVirtualDom = (label, name, open, onClick, title = lab
   }, text(label), getChevronDom(open)];
 };
 
-const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title) => {
-  return getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel);
+const getCustomSelectPickerToggleVirtualDom = (label, name, open, onClick, title = label, ariaLabel = title, ariaControls = '') => {
+  return getCustomSelectToggleVirtualDom(label, name, open, onClick, title, ariaLabel, ariaControls);
 };
 
 const getAgentModePickerVirtualDom = (selectedAgentMode, agentModePickerOpen) => {
@@ -11099,7 +11423,7 @@ const getChatModelPickerToggleVirtualDom = (models, selectedModelId, modelPicker
   const selectedModel = models.find(model => model.id === selectedModelId);
   const selectedModelLabel = selectedModel ? selectedModel.name : selectedModelId;
   const pickModelLabel = pickModel(selectedModelLabel);
-  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle, pickModelLabel, pickModelLabel);
+  return getCustomSelectPickerToggleVirtualDom(selectedModelLabel, ModelPickerToggle, modelPickerOpen, HandleClickModelPickerToggle, pickModelLabel, pickModelLabel, ModelPickerList);
 };
 
 const getCreatePullRequestButtonDom = () => {
@@ -11181,6 +11505,11 @@ const getGitBranchPickerVirtualDom = (gitBranches, gitBranchPickerOpen, gitBranc
   const showMessage = messageDom.length > 0;
   const popOverHeight = gitBranches.length * itemHeight + (showMessage ? messageHeight : 0);
   return [...getCustomSelectPickerToggleVirtualDom(label, GitBranchPickerToggle, gitBranchPickerOpen, HandleClickGitBranchPickerToggle, 'Switch branch', 'Switch branch'), ...(gitBranchPickerOpen ? [{
+    childCount: 1,
+    className: ChatModelPickerContainer,
+    onClick: HandleClickCustomSelectOverlay,
+    type: Div
+  }, {
     childCount: (showMessage ? 1 : 0) + 1,
     className: mergeClassNames(ChatModelPicker, CustomSelectPopOver, ChatGitBranchPicker),
     style: `height: ${popOverHeight}px;`,
@@ -11202,6 +11531,11 @@ const getReasoningEffortOptionsVirtualDom = selectedReasoningEffort => {
 };
 const getReasoningEffortPickerVirtualDom = (selectedReasoningEffort, reasoningEffortPickerOpen) => {
   return [...getCustomSelectPickerToggleVirtualDom(getReasoningEffortLabel(selectedReasoningEffort), ReasoningEffortPickerToggle, reasoningEffortPickerOpen, HandleClickReasoningEffortPickerToggle, 'Reasoning', 'Reasoning'), ...(reasoningEffortPickerOpen ? [{
+    childCount: 1,
+    className: ChatModelPickerContainer,
+    onClick: HandleClickCustomSelectOverlay,
+    type: Div
+  }, {
     childCount: 1,
     className: mergeClassNames(ChatModelPicker, CustomSelectPopOver),
     style: `height: ${reasoningEffortPickerHeight}px;`,
@@ -11338,34 +11672,51 @@ const getUsageOverviewDom = (tokensUsed, tokensMax) => {
   }, text(usageLabel)];
 };
 
-const getComposerAttachmentLabel = displayType => {
+const getComposerAttachmentClassName = displayType => {
   switch (displayType) {
     case 'file':
-      return 'File';
+      return ChatComposerAttachment;
     case 'image':
-      return 'Image';
+      return ChatComposerAttachmentImage;
     case 'invalid-image':
-      return 'Invalid image';
+      return ChatComposerAttachmentInvalidImage;
     case 'text-file':
-      return 'Text file';
+      return ChatComposerAttachmentTextFile;
     default:
-      return displayType;
+      return ChatComposerAttachment;
   }
 };
-const getComposerAttachmentClassName = displayType => {
+
+const getComposerAttachmentLabel = displayType => {
   switch (displayType) {
     case 'file':
-      return ChatComposerAttachment;
+      return 'File';
     case 'image':
-      return ChatComposerAttachmentImage;
+      return 'Image';
     case 'invalid-image':
-      return ChatComposerAttachmentInvalidImage;
+      return 'Invalid image';
     case 'text-file':
-      return ChatComposerAttachmentTextFile;
+      return 'Text file';
     default:
-      return ChatComposerAttachment;
+      return displayType;
   }
 };
+
+const getComposerAttachmentPreviewDom = attachment => {
+  if (!attachment.previewSrc) {
+    return [];
+  }
+  return [{
+    alt: `Image preview for ${attachment.name}`,
+    childCount: 0,
+    className: ChatComposerAttachmentPreview,
+    name: getComposerAttachmentInputName(attachment.attachmentId),
+    onContextMenu: HandleContextMenuChatImageAttachment,
+    src: attachment.previewSrc,
+    type: Img
+  }];
+};
+
 const getComposerAttachmentRemoveButtonDom = attachment => {
   return [{
     'aria-label': removeAttachment(),
@@ -11381,20 +11732,7 @@ const getComposerAttachmentRemoveButtonDom = attachment => {
     type: Text
   }];
 };
-const getComposerAttachmentPreviewDom = attachment => {
-  if (!attachment.previewSrc) {
-    return [];
-  }
-  return [{
-    alt: `Image preview for ${attachment.name}`,
-    childCount: 0,
-    className: ChatComposerAttachmentPreview,
-    name: getComposerAttachmentInputName(attachment.attachmentId),
-    onContextMenu: HandleContextMenuChatImageAttachment,
-    src: attachment.previewSrc,
-    type: Img
-  }];
-};
+
 const getComposerAttachmentsDom = composerAttachments => {
   if (composerAttachments.length === 0) {
     return [];
@@ -11426,6 +11764,7 @@ const getComposerAttachmentsDom = composerAttachments => {
     }];
   })];
 };
+
 const getComposerTextAreaDom = () => {
   return {
     childCount: 0,
@@ -11440,6 +11779,7 @@ const getComposerTextAreaDom = () => {
     type: TextArea
   };
 };
+
 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;
@@ -11528,26 +11868,57 @@ const getChatHeaderAuthDom = (authEnabled = false, userState = 'loggedOut', user
   }, text(buttonLabel)];
 };
 
+const getHeaderActionClassName = disabled => {
+  return mergeClassNames(IconButton, disabled ? IconButtonDisabled : '');
+};
+const getHeaderActionVirtualDom = item => {
+  return [{
+    childCount: 1,
+    className: getHeaderActionClassName(item.disabled),
+    disabled: item.disabled,
+    name: item.name,
+    onClick: item.onClick,
+    title: item.title,
+    type: Button$1
+  }, {
+    childCount: 0,
+    className: item.icon,
+    type: Div
+  }];
+};
+
 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;';
 const focusHeaderMetaStyle = 'align-items:baseline;display:flex;gap:8px;min-width:0;overflow:hidden;';
 const focusHeaderTitleStyle = 'margin:0;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;';
 const focusHeaderProjectStyle = 'overflow:hidden;text-overflow:ellipsis;white-space:nowrap;';
 const focusHeaderActionsStyle = 'display:flex;flex-wrap:wrap;gap:8px;justify-content:flex-end;';
-const focusHeaderButtonStyle = 'white-space:nowrap;';
-const getFocusHeaderActionButtonDom = (label, name) => {
-  return [{
-    childCount: 1,
-    className: mergeClassNames(Button, ButtonSecondary),
-    inputType: 'button',
-    name,
-    onClick: HandleClick,
-    style: focusHeaderButtonStyle,
-    title: label,
-    type: Button$1
-  }, text(label)];
-};
 const getChatHeaderDomFocusMode = (selectedSessionTitle, selectedProjectName, authEnabled = false, userState = 'loggedOut', userName = '') => {
-  const items = [[addAction(), FocusAddAction], [openInVsCode(), FocusOpenInVsCode], [commit(), FocusCommit], [openTerminal(), FocusOpenTerminal], [showDiff(), FocusShowDiff]];
+  const items = [{
+    icon: mergeClassNames(MaskIcon, MaskIconAdd),
+    name: FocusAddAction,
+    onClick: HandleClick,
+    title: addAction()
+  }, {
+    icon: mergeClassNames(MaskIcon, MaskIconFolder),
+    name: FocusOpenInVsCode,
+    onClick: HandleClick,
+    title: openInVsCode()
+  }, {
+    icon: mergeClassNames(MaskIcon, MaskIconGitCommit),
+    name: FocusCommit,
+    onClick: HandleClick,
+    title: commit()
+  }, {
+    icon: mergeClassNames(MaskIcon, MaskIconTerminal),
+    name: FocusOpenTerminal,
+    onClick: HandleClick,
+    title: openTerminal()
+  }, {
+    icon: mergeClassNames(MaskIcon, MaskIconDiff),
+    name: FocusShowDiff,
+    onClick: HandleClick,
+    title: showDiff()
+  }];
   const hasProjectName = !!selectedProjectName;
   return [{
     childCount: 2 + (authEnabled ? 1 : 0),
@@ -11576,23 +11947,28 @@ const getChatHeaderDomFocusMode = (selectedSessionTitle, selectedProjectName, au
     role: ToolBar,
     style: focusHeaderActionsStyle,
     type: Div
-  }, ...items.flatMap(([label, name]) => getFocusHeaderActionButtonDom(label, name))];
+  }, ...items.flatMap(getHeaderActionVirtualDom)];
 };
 
 const getAgentModeOptionsVirtualDom = selectedAgentMode => {
   return agentModes.flatMap(agentMode => getCustomSelectOptionVirtualDom(getAgentModePickerItemInputName(agentMode), getAgentModeLabel(agentMode), agentMode === selectedAgentMode));
 };
 
-const getCustomSelectPopOverVirtualDom = (optionCount, height, optionNodes, containerClassName = '', popOverClassName = '') => {
+const getCustomSelectPopOverVirtualDom = (optionCount, height, optionNodes, containerClassName = '', popOverClassName = '', useInlineHeight = true) => {
   return [{
     childCount: 1,
     className: mergeClassNames(ChatModelPickerContainer, containerClassName),
+    onClick: HandleClickCustomSelectOverlay,
     type: Div
-  }, {
+  }, useInlineHeight ? {
     childCount: 1,
     className: mergeClassNames(ChatModelPicker, popOverClassName),
     style: `height: ${height}px;`,
     type: Div
+  } : {
+    childCount: 1,
+    className: mergeClassNames(ChatModelPicker, popOverClassName),
+    type: Div
   }, {
     childCount: optionCount,
     className: ChatModelPickerList,
@@ -11607,6 +11983,17 @@ const getAgentModePickerPopOverVirtualDom = selectedAgentMode => {
   return getCustomSelectPopOverVirtualDom(agentModes.length, agentModePickerHeight, getAgentModeOptionsVirtualDom(selectedAgentMode));
 };
 
+const getUsageCostDom = detail => {
+  if (detail === '') {
+    return [];
+  }
+  return [{
+    childCount: 1,
+    className: ChatModelPickerItemUsageCost,
+    type: Span
+  }, text(detail)];
+};
+
 const getUsageCostLabel = model => {
   return `${model.usageCost ?? 1}x`;
 };
@@ -11614,9 +12001,11 @@ const getUsageCostLabel = model => {
 const getChatModelListItemVirtualDom = (model, selectedModelId) => {
   const detail = getUsageCostLabel(model);
   const hasDetail = detail !== '';
+  const usageCostDom = getUsageCostDom(detail);
   const selected = model.id === selectedModelId;
   const className = mergeClassNames(ChatModelPickerItem, selected ? ChatModelPickerItemSelected : '');
   return [{
+    'aria-selected': selected ? 'true' : 'false',
     childCount: hasDetail ? 2 : 1,
     className,
     'data-id': model.id,
@@ -11626,11 +12015,7 @@ const getChatModelListItemVirtualDom = (model, selectedModelId) => {
     childCount: 1,
     className: ChatModelPickerItemLabel,
     type: Span
-  }, text(getModelLabel(model)), ...(hasDetail ? [{
-    childCount: 1,
-    className: ChatModelPickerItemUsageCost,
-    type: Span
-  }, text(detail)] : [])];
+  }, text(getModelLabel(model)), ...usageCostDom];
 };
 
 const parentNode$2 = {
@@ -11649,6 +12034,7 @@ const getChatModelListVirtualDom = (visibleModels, selectedModelId) => {
   return [{
     childCount: visibleModels.length,
     className: ChatModelPickerList,
+    id: ModelPickerList,
     onClick: HandleClickModelPickerList,
     onPointerDown: HandlePointerDownModelPickerList,
     onPointerUp: HandlePointerUpModelPickerList,
@@ -11677,6 +12063,7 @@ const getModelPickerHeaderDom = modelPickerSearchValue => {
     value: modelPickerSearchValue
   }];
 };
+
 const getChatModelPickerPopOverVirtualDom = (models, selectedModelId, modelPickerSearchValue) => {
   const visibleModels = getVisibleModels(models, modelPickerSearchValue);
   return [{
@@ -11692,6 +12079,17 @@ const getChatModelPickerPopOverVirtualDom = (models, selectedModelId, modelPicke
   }, ...getModelPickerHeaderDom(modelPickerSearchValue), ...getChatModelListVirtualDom(visibleModels, selectedModelId)];
 };
 
+const getImageCouldNotBeLoadedDom = () => {
+  return [{
+    childCount: 1,
+    className: mergeClassNames(ChatComposerAttachmentPreviewOverlayError, ImageErrorMessage),
+    name: ComposerAttachmentPreviewOverlay,
+    type: Div
+  }, {
+    text: imageCouldNotBeLoaded(),
+    type: Text
+  }];
+};
 const getComposerAttachmentPreviewOverlayVirtualDom = (composerAttachments, attachmentId, hasError) => {
   if (!attachmentId) {
     return [];
@@ -11709,15 +12107,7 @@ const getComposerAttachmentPreviewOverlayVirtualDom = (composerAttachments, atta
     onPointerOut: HandleMouseOut,
     onPointerOver: HandleMouseOver,
     type: Div
-  }, ...(hasError ? [{
-    childCount: 1,
-    className: mergeClassNames(ChatComposerAttachmentPreviewOverlayError, ImageErrorMessage),
-    name: ComposerAttachmentPreviewOverlay,
-    type: Div
-  }, {
-    text: imageCouldNotBeLoaded(),
-    type: Text
-  }] : [{
+  }, ...(hasError ? getImageCouldNotBeLoadedDom() : [{
     alt: `Large image preview for ${attachment.name}`,
     childCount: 0,
     className: ChatComposerAttachmentPreviewOverlayImage,
@@ -11728,15 +12118,6 @@ const getComposerAttachmentPreviewOverlayVirtualDom = (composerAttachments, atta
   }])];
 };
 
-const runModes = ['local', 'background', 'cloud'];
-const runModePickerHeight = runModes.length * 28;
-const getRunModeOptionsVirtualDom = selectedRunMode => {
-  return runModes.flatMap(runMode => getCustomSelectOptionVirtualDom(getRunModePickerItemInputName(runMode), runMode, runMode === selectedRunMode));
-};
-const getRunModePickerPopOverVirtualDom = selectedRunMode => {
-  return getCustomSelectPopOverVirtualDom(runModes.length, runModePickerHeight, getRunModeOptionsVirtualDom(selectedRunMode), RunModePickerContainer, RunModePickerPopOver);
-};
-
 const getDropOverlayVirtualDom = () => {
   return [{
     childCount: 1,
@@ -11751,6 +12132,16 @@ const getDropOverlayVirtualDom = () => {
     type: Text
   }];
 };
+
+const runModes = ['local', 'background', 'cloud'];
+const runModePickerHeight = runModes.length * 28;
+const getRunModeOptionsVirtualDom = selectedRunMode => {
+  return runModes.flatMap(runMode => getCustomSelectOptionVirtualDom(getRunModePickerItemInputName(runMode), runMode, runMode === selectedRunMode));
+};
+const getRunModePickerPopOverVirtualDom = selectedRunMode => {
+  return getCustomSelectPopOverVirtualDom(runModes.length, runModePickerHeight, getRunModeOptionsVirtualDom(selectedRunMode), RunModePickerContainer, RunModePickerPopOver, false);
+};
+
 const getChatOverlaysVirtualDom = ({
   agentMode,
   agentModePickerVisible,
@@ -12389,14 +12780,16 @@ const getReadFileTarget = rawArguments => {
   }
   const uri = Reflect.get(parsed, 'uri');
   const path = Reflect.get(parsed, 'path');
+  const baseUri = Reflect.get(parsed, 'baseUri');
   const uriValue = typeof uri === 'string' ? uri : '';
   const pathValue = typeof path === 'string' ? path : '';
-  const title = uriValue || pathValue;
+  const baseUriValue = typeof baseUri === 'string' ? baseUri : '';
+  const title = uriValue || pathValue || baseUriValue;
   if (!title) {
     return undefined;
   }
-  // `read_file` tool calls now use absolute `uri`; keep `path` as a legacy fallback for old transcripts.
-  const clickableUri = uriValue || pathValue;
+  // File-like tool calls use absolute `uri` where available; keep `path` as a legacy fallback.
+  const clickableUri = uriValue || pathValue || baseUriValue;
   return {
     clickableUri,
     title
@@ -12407,11 +12800,12 @@ const getToolCallFileNameDom = (fileName, {
   clickableProps = {},
   title
 } = {}) => {
+  const resolvedTitle = title ?? clickableProps['data-uri'];
   return [{
     childCount: 1,
     className: ChatToolCallReadFileLink,
-    ...(title === undefined ? {} : {
-      title
+    ...(resolvedTitle === undefined ? {} : {
+      title: resolvedTitle
     }),
     ...clickableProps,
     type: Span
@@ -12437,7 +12831,6 @@ const getToolCallCreateDirectoryVirtualDom = toolCall => {
   return [{
     childCount: statusLabel ? 4 : 3,
     className: ChatOrderedListItem,
-    title: target.title,
     type: Li
   }, {
     childCount: 0,
@@ -12515,7 +12908,7 @@ const getToolCallLabel = toolCall => {
   if (toolCall.name === 'write_file' && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
     return `${displayName} (in progress)`;
   }
-  if ((toolCall.name === 'list_files' || toolCall.name === 'grep_search') && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
+  if ((toolCall.name === 'list_files' || toolCall.name === 'grep_search' || toolCall.name === 'glob') && !toolCall.status && hasIncompleteJsonArguments(toolCall.arguments)) {
     return displayName;
   }
   const argumentPreview = getToolCallArgumentPreview(toolCall.arguments);
@@ -12561,7 +12954,6 @@ const getToolCallEditFileVirtualDom = toolCall => {
   return [{
     childCount: 3,
     className: ChatOrderedListItem,
-    title: target.title,
     type: Li
   }, {
     childCount: 0,
@@ -12590,7 +12982,6 @@ const getToolCallGetWorkspaceUriVirtualDom = toolCall => {
   return [{
     childCount: statusLabel ? 4 : 3,
     className: ChatOrderedListItem,
-    title: toolCall.result,
     type: Li
   }, {
     childCount: 0,
@@ -12605,6 +12996,21 @@ const getToolCallGetWorkspaceUriVirtualDom = toolCall => {
   }), ...(statusLabel ? [text(statusLabel)] : [])];
 };
 
+const getGlobPatternLabel = toolCall => {
+  if (toolCall.name !== 'glob') {
+    return '';
+  }
+  try {
+    const parsed = JSON.parse(toolCall.arguments);
+    if (!parsed || typeof parsed !== 'object') {
+      return '';
+    }
+    const pattern = Reflect.get(parsed, 'pattern');
+    return typeof pattern === 'string' && pattern ? ` "${pattern}"` : '';
+  } catch {
+    return '';
+  }
+};
 const getToolCallReadFileVirtualDom = toolCall => {
   const target = getReadFileTarget(toolCall.arguments);
   if (!target) {
@@ -12613,14 +13019,16 @@ const getToolCallReadFileVirtualDom = toolCall => {
   const fileName = getFileNameFromUri(target.title);
   const toolNameLabel = `${toolCall.name} `;
   const statusLabel = getToolCallStatusLabel(toolCall);
+  const globPatternLabel = getGlobPatternLabel(toolCall);
+  const globMatchCount = toolCall.name === 'glob' && toolCall.status === 'success' ? getGlobMatchCount(toolCall.result) : undefined;
+  const globMatchLabel = typeof globMatchCount === 'number' ? `, ${globMatchCount} ${globMatchCount === 1 ? 'match' : 'matches'}` : '';
   const fileNameClickableProps = target.clickableUri ? {
     'data-uri': target.clickableUri,
     onClick: HandleClickFileName
   } : {};
   return [{
-    childCount: statusLabel ? 4 : 3,
+    childCount: 3 + (globPatternLabel ? 1 : 0) + (globMatchLabel ? 1 : 0) + (statusLabel ? 1 : 0),
     className: ChatOrderedListItem,
-    title: target.title,
     type: Li
   }, {
     childCount: 0,
@@ -12631,8 +13039,9 @@ const getToolCallReadFileVirtualDom = toolCall => {
     className: ToolCallName,
     type: Span
   }, text(toolNameLabel), ...getToolCallFileNameDom(fileName, {
-    clickableProps: fileNameClickableProps
-  }), ...(statusLabel ? [text(statusLabel)] : [])];
+    clickableProps: fileNameClickableProps,
+    title: target.title
+  }), ...(globPatternLabel ? [text(globPatternLabel)] : []), ...(globMatchLabel ? [text(globMatchLabel)] : []), ...(statusLabel ? [text(statusLabel)] : [])];
 };
 
 const maxHtmlLength = 40_000;
@@ -12999,7 +13408,6 @@ const getToolCallWriteFileVirtualDom = toolCall => {
   return [{
     childCount: showDiffStats ? statusLabel ? 6 : 5 : statusLabel ? 4 : 3,
     className: ChatOrderedListItem,
-    title: target.title,
     type: Li
   }, {
     childCount: 0,
@@ -13029,7 +13437,7 @@ const getToolCallDom = toolCall => {
       return virtualDom;
     }
   }
-  if (toolCall.name === 'read_file' || toolCall.name === 'list_files' || toolCall.name === 'list_file') {
+  if (toolCall.name === 'read_file' || toolCall.name === 'list_files' || toolCall.name === 'list_file' || toolCall.name === 'glob') {
     const virtualDom = getToolCallReadFileVirtualDom(toolCall);
     if (virtualDom.length > 0) {
       return virtualDom;
@@ -13519,12 +13927,21 @@ const getChatModeChatFocusVirtualDom = ({
   const hasVisibleOverlays = isDropOverlayVisible || isComposerAttachmentPreviewOverlayVisible || isAgentModePickerVisible || isNewModelPickerVisible || isRunModePickerVisible;
   const chatRootChildCount = 2 + (hasVisibleOverlays ? 1 : 0);
   return [{
-    childCount: chatRootChildCount,
+    childCount: chatRootChildCount + 1,
     className: mergeClassNames(Viewlet, Chat, ChatFocus),
     onDragEnter: HandleDragEnterChatView,
     onDragOver: HandleDragOverChatView,
+    onPointerMove: HandlePointerMoveProjectSidebarSash,
+    onPointerUp: HandlePointerUpProjectSidebarSash,
     type: Div
   }, ...getProjectListDom(projects, sessions, projectExpandedIds, selectedProjectId, selectedSessionId, projectListScrollTop, true), {
+    'aria-orientation': 'vertical',
+    childCount: 0,
+    className: mergeClassNames(Sash, SashVertical),
+    onPointerDown: HandlePointerDownProjectSidebarSash,
+    role: 'separator',
+    type: Div
+  }, {
     childCount: 3,
     className: ChatFocusMainArea,
     type: Div
@@ -13562,25 +13979,6 @@ const getBackButtonVirtualDom = () => {
   }, arrowLeft];
 };
 
-const getHeaderActionClassName = disabled => {
-  return mergeClassNames(IconButton, disabled ? IconButtonDisabled : '');
-};
-const getHeaderActionVirtualDom = item => {
-  return [{
-    childCount: 1,
-    className: getHeaderActionClassName(item.disabled),
-    disabled: item.disabled,
-    name: item.name,
-    onClick: item.onClick,
-    title: item.title,
-    type: Button$1
-  }, {
-    childCount: 0,
-    className: item.icon,
-    type: Div
-  }];
-};
-
 const getChatHeaderActionsDom = (viewMode, searchEnabled = false) => {
   const toggleTitle = viewMode === 'chat-focus' ? normalChatMode() : chatFocusMode();
   const items = [{
@@ -13755,6 +14153,7 @@ const getChatSearchDom = (hasSearchField, searchValue) => {
     value: searchValue
   }];
 };
+
 const getChatHeaderListModeDom = (authEnabled = false, userState = 'loggedOut', userName = '', authErrorMessage = '', searchEnabled = false, searchFieldVisible = false, searchValue = '') => {
   const hasAuthError = authEnabled && !!authErrorMessage;
   const hasSearchField = searchEnabled && searchFieldVisible;
@@ -14531,6 +14930,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickGitBranchPickerToggle,
     params: ['handleClickGitBranchPickerToggle']
+  }, {
+    name: HandleClickCustomSelectOverlay,
+    params: ['handleClickCustomSelectOverlay', DefaultPrevented]
   }, {
     name: HandleClickModelPickerOverlay,
     params: ['handleClickModelPickerOverlay', DefaultPrevented]
@@ -14652,6 +15054,17 @@ const renderEventListeners = () => {
     name: HandlePointerDownModelPickerList,
     params: ['handlePointerDownModelPickerList'],
     preventDefault: true
+  }, {
+    name: HandlePointerDownProjectSidebarSash,
+    params: ['handlePointerDownProjectSidebarSash'],
+    preventDefault: true
+  }, {
+    name: HandlePointerMoveProjectSidebarSash,
+    params: ['handlePointerMoveProjectSidebarSash', ClientX]
+  }, {
+    name: HandlePointerUpProjectSidebarSash,
+    params: ['handlePointerUpProjectSidebarSash', ClientX],
+    preventDefault: true
   }, {
     name: HandlePointerUpModelPickerList,
     params: ['handlePointerUpModelPickerList', ClientY],
@@ -14765,6 +15178,7 @@ const saveState = state => {
     projectExpandedIds,
     projectListScrollTop,
     projects,
+    projectSidebarWidth,
     reasoningEffort,
     renamingSessionId,
     searchFieldVisible,
@@ -14787,6 +15201,7 @@ const saveState = state => {
     projectExpandedIds,
     projectListScrollTop,
     projects,
+    projectSidebarWidth,
     reasoningEffort,
     renamingSessionId,
     searchFieldVisible,
@@ -15022,6 +15437,7 @@ const commandMap = {
   'Chat.handleClickBack': wrapCommand(handleClickBack),
   'Chat.handleClickClose': handleClickClose,
   'Chat.handleClickCreatePullRequest': wrapCommand(handleClickCreatePullRequest),
+  'Chat.handleClickCustomSelectOverlay': wrapCommand(handleClickCustomSelectOverlay),
   'Chat.handleClickDelete': wrapCommand(handleClickDelete),
   'Chat.handleClickDictationButton': wrapCommand(handleClickDictationButton),
   'Chat.handleClickFileName': wrapCommand(handleClickFileName),
@@ -15056,7 +15472,10 @@ const commandMap = {
   'Chat.handleMouseOut': wrapCommand(handleMouseOut),
   'Chat.handleMouseOver': wrapCommand(handleMouseOver),
   'Chat.handlePointerDownModelPickerList': wrapCommand(handlePointerDownModelPickerList),
+  'Chat.handlePointerDownProjectSidebarSash': wrapCommand(handlePointerDownProjectSidebarSash),
+  'Chat.handlePointerMoveProjectSidebarSash': wrapCommand(handlePointerMoveProjectSidebarSash),
   'Chat.handlePointerUpModelPickerList': wrapCommand(handlePointerUpModelPickerList),
+  'Chat.handlePointerUpProjectSidebarSash': wrapCommand(handlePointerUpProjectSidebarSash),
   'Chat.handleProjectAddButtonContextMenu': wrapCommand(handleProjectAddButtonContextMenu),
   'Chat.handleProjectListContextMenu': wrapCommand(handleProjectListContextMenu),
   'Chat.handleProjectListScroll': wrapCommand(handleProjectListScroll),