@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.d.ts

@@ -13,8 +13,10 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IVariableReference } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolSet, IToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { ChatRequestToolReferenceEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { CountTokensCallback, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
 export declare const globalAutoApproveDescription: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
 export declare class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
@@ -56,6 +58,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     resetToolAutoConfirmation(): void;
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
     private prepareToolInvocation;
+    private informScreenReader;
     private playAccessibilitySignal;
     private ensureToolDetails;
     private formatToolInput;
@@ -64,13 +67,14 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private _checkGlobalAutoApprove;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;
-    toToolEnablementMap(toolOrToolsetNames: Set<string>): Record<string, boolean>;
     /**
      * Create a map that contains all tools and toolsets with their enablement state.
      * @param toolOrToolSetNames A list of tool or toolset names that are enabled.
      * @returns A map of tool or toolset instances to their enablement state.
      */
-    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap;
+    toToolAndToolSetEnablementMap(enabledQualifiedToolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap;
+    toQualifiedToolNames(map: IToolAndToolSetEnablementMap): string[];
+    toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[];
     private readonly _toolSets;
     readonly toolSets: IObservable<Iterable<ToolSet>>;
     getToolSet(id: string): ToolSet | undefined;
@@ -79,4 +83,9 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
         icon?: ThemeIcon;
         description?: string;
     }): ToolSet & IDisposable;
+    private getPromptReferencableTools;
+    getQualifiedToolNames(): Iterable<string>;
+    getDeprecatedQualifiedToolNames(): Map<string, string>;
+    getToolByQualifiedName(qualifiedName: string): IToolData | ToolSet | undefined;
+    getQualifiedToolName(tool: IToolData | ToolSet, toolSet?: ToolSet): string;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
@@ -31,10 +32,12 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { toToolSetVariableEntry, toToolVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { createToolSchemaUri, stringifyPromptTsxPart, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { getToolConfirmationAlert } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatAccessibilityProvider';
@@ -46,8 +49,9 @@ var AutoApproveStorageKeys;
 (function (AutoApproveStorageKeys) {
     AutoApproveStorageKeys["GlobalAutoApproveOptIn"] = "chat.tools.global.autoApprove.optIn";
 })(AutoApproveStorageKeys || (AutoApproveStorageKeys = {}));
+const SkipAutoApproveConfirmationKey = 'vscode.chat.tools.global.autoApprove.testMode';
 const globalAutoApproveDescription = ( localize2(
-    5356,
+    5416,
     'Global auto approve also known as "YOLO mode" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**'
 ));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
@@ -249,7 +253,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 }));
                 token = source.token;
                 const prepared = await this.prepareToolInvocation(tool, dto, token);
-                toolInvocation = ( new ChatToolInvocation(prepared, tool.data, dto.callId));
+                toolInvocation = ( new ChatToolInvocation(prepared, tool.data, dto.callId, dto.fromSubAgent));
                 trackedCall.invocation = toolInvocation;
                 const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace);
                 if (autoConfirmed) {
@@ -257,6 +261,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 }
                 model.acceptResponseProgress(request, toolInvocation);
                 dto.toolSpecificData = toolInvocation?.toolSpecificData;
+                this.informScreenReader(prepared?.invocationMessage ?? `${tool.data.displayName} started`);
                 if (prepared?.confirmationMessages) {
                     if (!toolInvocation.isConfirmed?.type && !autoConfirmed) {
                         this.playAccessibilitySignal([toolInvocation]);
@@ -327,6 +332,9 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         finally {
             toolInvocation?.complete(toolResult);
+            if (ChatContextKeys.requestInProgress.getValue(this._contextKeyService)) {
+                this.informScreenReader(toolInvocation?.pastTenseMessage ?? `${tool.data.displayName} finished`);
+            }
             if (store) {
                 this.cleanupCallDisposables(requestId, store);
             }
@@ -354,6 +362,11 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         return prepared;
     }
+    informScreenReader(msg) {
+        if (this._configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+            alert(typeof msg === 'string' ? msg : msg.value);
+        }
+    }
     playAccessibilitySignal(toolInvocations) {
         const autoApproved = this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove);
         if (autoApproved) {
@@ -427,16 +440,19 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (optedIn) {
             return true;
         }
+        if (this._contextKeyService.getContextKeyValue(SkipAutoApproveConfirmationKey) === true) {
+            return true;
+        }
         const promptResult = await this._dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(5357, 'Enable global auto approve?')),
+            message: ( localize(5417, 'Enable global auto approve?')),
             buttons: [
                 {
-                    label: ( localize(5358, 'Enable')),
+                    label: ( localize(5418, 'Enable')),
                     run: () => true
                 },
                 {
-                    label: ( localize(5359, 'Disable')),
+                    label: ( localize(5419, 'Disable')),
                     run: () => false
                 },
             ],
@@ -477,38 +493,69 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             this._callsByRequestId.delete(requestId);
         }
     }
-    toToolEnablementMap(toolOrToolsetNames) {
-        const result = {};
-        for (const tool of ( this._tools.values())) {
-            if (tool.data.toolReferenceName && ( toolOrToolsetNames.has(tool.data.toolReferenceName))) {
-                result[tool.data.id] = true;
+    toToolAndToolSetEnablementMap(enabledQualifiedToolOrToolSetNames) {
+        const toolOrToolSetNames = ( new Set(enabledQualifiedToolOrToolSetNames));
+        const result = ( new Map());
+        for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
+            if (tool instanceof ToolSet) {
+                const enabled = ( toolOrToolSetNames.has(toolReferenceName)) || ( toolOrToolSetNames.has(tool.referenceName));
+                result.set(tool, enabled);
+                if (enabled) {
+                    for (const memberTool of tool.getTools()) {
+                        result.set(memberTool, true);
+                    }
+                }
             }
             else {
-                result[tool.data.id] = false;
+                if (!( result.has(tool))) {
+                    const enabled = ( toolOrToolSetNames.has(toolReferenceName)) || ( toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName));
+                    result.set(tool, enabled);
+                }
             }
         }
         for (const toolSet of this._toolSets) {
-            if (( toolOrToolsetNames.has(toolSet.referenceName))) {
-                for (const tool of toolSet.getTools()) {
-                    result[tool.id] = true;
-                }
+            if (toolSet.source.type === 'user') {
+                const enabled = Iterable.every(toolSet.getTools(), t => result.get(t) === true);
+                result.set(toolSet, enabled);
             }
         }
         return result;
     }
-    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames) {
-        const toolOrToolSetNames = ( new Set(enabledToolOrToolSetNames));
-        const result = ( new Map());
-        for (const tool of this.getTools()) {
-            if (tool.canBeReferencedInPrompt) {
-                result.set(tool, ( toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName)));
+    toQualifiedToolNames(map) {
+        const result = [];
+        const toolsCoveredByEnabledToolSet = ( new Set());
+        for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
+            if (tool instanceof ToolSet) {
+                if (map.get(tool)) {
+                    result.push(toolReferenceName);
+                    for (const memberTool of tool.getTools()) {
+                        toolsCoveredByEnabledToolSet.add(memberTool);
+                    }
+                }
+            }
+            else {
+                if (map.get(tool) && !( toolsCoveredByEnabledToolSet.has(tool))) {
+                    result.push(toolReferenceName);
+                }
             }
         }
-        for (const toolSet of this._toolSets) {
-            const enabled = ( toolOrToolSetNames.has(toolSet.referenceName));
-            result.set(toolSet, enabled);
-            for (const tool of toolSet.getTools()) {
-                result.set(tool, enabled || toolOrToolSetNames?.has(tool.toolReferenceName ?? tool.displayName));
+        return result;
+    }
+    toToolReferences(variableReferences) {
+        const toolsOrToolSetByName = ( new Map());
+        for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
+            toolsOrToolSetByName.set(toolReferenceName, tool);
+        }
+        const result = [];
+        for (const ref of variableReferences) {
+            const toolOrToolSet = toolsOrToolSetByName.get(ref.name);
+            if (toolOrToolSet) {
+                if (toolOrToolSet instanceof ToolSet) {
+                    result.push(toToolSetVariableEntry(toolOrToolSet, ref.range));
+                }
+                else {
+                    result.push(toToolVariableEntry(toolOrToolSet, ref.range));
+                }
             }
         }
         return result;
@@ -542,6 +589,62 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._toolSets.add(result);
         return result;
     }
+    *getPromptReferencableTools() {
+        const coveredByToolSets = ( new Set());
+        for (const toolSet of this.toolSets.get()) {
+            if (toolSet.source.type !== 'user') {
+                yield [toolSet, getToolSetReferenceName(toolSet)];
+                for (const tool of toolSet.getTools()) {
+                    yield [tool, getToolReferenceName(tool, toolSet)];
+                    coveredByToolSets.add(tool);
+                }
+            }
+        }
+        for (const tool of this.getTools()) {
+            if (tool.canBeReferencedInPrompt && !( coveredByToolSets.has(tool))) {
+                yield [tool, getToolReferenceName(tool)];
+            }
+        }
+    }
+    *getQualifiedToolNames() {
+        for (const [, toolReferenceName] of this.getPromptReferencableTools()) {
+            yield toolReferenceName;
+        }
+    }
+    getDeprecatedQualifiedToolNames() {
+        const result = ( new Map());
+        const add = (name, toolReferenceName) => {
+            if (name !== toolReferenceName) {
+                result.set(name, toolReferenceName);
+            }
+        };
+        for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
+            if (tool instanceof ToolSet) {
+                add(tool.referenceName, toolReferenceName);
+            }
+            else {
+                add(tool.toolReferenceName ?? tool.displayName, toolReferenceName);
+            }
+        }
+        return result;
+    }
+    getToolByQualifiedName(qualifiedName) {
+        for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
+            if (qualifiedName === toolReferenceName) {
+                return tool;
+            }
+            if (qualifiedName === (tool instanceof ToolSet ? tool.referenceName : tool.toolReferenceName ?? tool.displayName)) {
+                return tool;
+            }
+        }
+        return undefined;
+    }
+    getQualifiedToolName(tool, toolSet) {
+        if (tool instanceof ToolSet) {
+            return getToolSetReferenceName(tool);
+        }
+        return getToolReferenceName(tool, toolSet);
+    }
 };
 LanguageModelToolsService = ( __decorate([
     ( __param(0, IInstantiationService)),
@@ -556,6 +659,22 @@ LanguageModelToolsService = ( __decorate([
     ( __param(9, IAccessibilitySignalService)),
     ( __param(10, IStorageService))
 ], LanguageModelToolsService));
+function getToolReferenceName(tool, toolSet) {
+    const toolName = tool.toolReferenceName ?? tool.displayName;
+    if (toolSet) {
+        return `${toolSet.referenceName}/${toolName}`;
+    }
+    else if (tool.source.type === 'extension') {
+        return `${tool.source.extensionId.value.toLowerCase()}/${toolName}`;
+    }
+    return toolName;
+}
+function getToolSetReferenceName(toolSet) {
+    if (toolSet.source.type === 'mcp') {
+        return `${toolSet.referenceName}/*`;
+    }
+    return toolSet.referenceName;
+}
 let ToolConfirmStore = class ToolConfirmStore extends Disposable {
     static { ToolConfirmStore_1 = this; }
     static { this.STORED_KEY = 'chat/autoconfirm'; }

package/vscode/src/vs/workbench/contrib/chat/browser/media/apple-dark.svg

@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.19299 3.69231C8.91408 3.69231 9.818 3.20407 10.3563 2.55308C10.8437 1.96313 11.1993 1.13922 11.1993 0.315322C11.1993 0.203433 11.1891 0.0915449 11.1688 0C10.3664 0.030515 9.40159 0.539098 8.82268 1.2206C8.36564 1.73935 7.94924 2.55308 7.94924 3.38716C7.94924 3.50922 7.96955 3.63127 7.9797 3.67196C8.0305 3.68214 8.11174 3.69231 8.19299 3.69231ZM5.65392 16C6.63907 16 7.0758 15.3388 8.30472 15.3388C9.55394 15.3388 9.82816 15.9797 10.925 15.9797C12.0016 15.9797 12.7227 14.9829 13.4032 14.0064C14.1649 12.8875 14.4797 11.7889 14.5 11.7381C14.429 11.7177 12.3672 10.8735 12.3672 8.5035C12.3672 6.44883 13.9922 5.5232 14.0836 5.452C13.0071 3.90591 11.3719 3.86523 10.925 3.86523C9.71644 3.86523 8.73127 4.59759 8.11174 4.59759C7.44143 4.59759 6.55783 3.90591 5.51173 3.90591C3.52109 3.90591 1.5 5.55372 1.5 8.66624C1.5 10.5989 2.25157 12.6433 3.17578 13.9657C3.96797 15.0846 4.6586 16 5.65392 16Z" fill="white"/>
+<svg width="18" height="20" viewBox="0 0 18 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.20784 4.15385C9.98439 4.15385 10.9578 3.60458 11.5376 2.87222C12.0624 2.20852 12.4454 1.28162 12.4454 0.354737C12.4454 0.228862 12.4344 0.102988 12.4126 0C11.5484 0.0343294 10.5094 0.606485 9.88596 1.37318C9.39377 1.95677 8.94534 2.87222 8.94534 3.81056C8.94534 3.94787 8.96721 4.08518 8.97814 4.13096C9.03285 4.14241 9.12034 4.15385 9.20784 4.15385ZM6.47345 18C7.53438 18 8.00471 17.2562 9.32816 17.2562C10.6735 17.2562 10.9688 17.9772 12.15 17.9772C13.3094 17.9772 14.086 16.8558 14.8188 15.7572C15.6391 14.4984 15.9781 13.2625 16 13.2054C15.9235 13.1824 13.7031 12.2327 13.7031 9.56644C13.7031 7.25493 15.4531 6.2136 15.5516 6.1335C14.3923 4.39415 12.6313 4.34838 12.15 4.34838C10.8485 4.34838 9.78752 5.17229 9.12034 5.17229C8.39846 5.17229 7.44689 4.39415 6.32033 4.39415C4.17656 4.39415 2 6.24793 2 9.74952C2 11.9238 2.80938 14.2237 3.80469 15.7114C4.65781 16.9702 5.40157 18 6.47345 18Z" fill="white"/>
 </svg>

package/vscode/src/vs/workbench/contrib/chat/browser/media/apple-light.svg

@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.19299 3.69231C8.91408 3.69231 9.818 3.20407 10.3563 2.55308C10.8437 1.96313 11.1993 1.13922 11.1993 0.315322C11.1993 0.203433 11.1891 0.0915449 11.1688 0C10.3664 0.030515 9.40159 0.539098 8.82268 1.2206C8.36564 1.73935 7.94924 2.55308 7.94924 3.38716C7.94924 3.50922 7.96955 3.63127 7.9797 3.67196C8.0305 3.68214 8.11174 3.69231 8.19299 3.69231ZM5.65392 16C6.63907 16 7.0758 15.3388 8.30472 15.3388C9.55394 15.3388 9.82816 15.9797 10.925 15.9797C12.0016 15.9797 12.7227 14.9829 13.4032 14.0064C14.1649 12.8875 14.4797 11.7889 14.5 11.7381C14.429 11.7177 12.3672 10.8735 12.3672 8.5035C12.3672 6.44883 13.9922 5.5232 14.0836 5.452C13.0071 3.90591 11.3719 3.86523 10.925 3.86523C9.71644 3.86523 8.73127 4.59759 8.11174 4.59759C7.44143 4.59759 6.55783 3.90591 5.51173 3.90591C3.52109 3.90591 1.5 5.55372 1.5 8.66624C1.5 10.5989 2.25157 12.6433 3.17578 13.9657C3.96797 15.0846 4.6586 16 5.65392 16Z" fill="black"/>
+<svg width="18" height="20" viewBox="0 0 18 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.20784 4.15385C9.98439 4.15385 10.9578 3.60458 11.5376 2.87222C12.0624 2.20852 12.4454 1.28162 12.4454 0.354737C12.4454 0.228862 12.4344 0.102988 12.4126 0C11.5484 0.0343294 10.5094 0.606485 9.88596 1.37318C9.39377 1.95677 8.94534 2.87222 8.94534 3.81056C8.94534 3.94787 8.96721 4.08518 8.97814 4.13096C9.03285 4.14241 9.12034 4.15385 9.20784 4.15385ZM6.47345 18C7.53438 18 8.00471 17.2562 9.32816 17.2562C10.6735 17.2562 10.9688 17.9772 12.15 17.9772C13.3094 17.9772 14.086 16.8558 14.8188 15.7572C15.6391 14.4984 15.9781 13.2625 16 13.2054C15.9235 13.1824 13.7031 12.2327 13.7031 9.56644C13.7031 7.25493 15.4531 6.2136 15.5516 6.1335C14.3923 4.39415 12.6313 4.34838 12.15 4.34838C10.8485 4.34838 9.78752 5.17229 9.12034 5.17229C8.39846 5.17229 7.44689 4.39415 6.32033 4.39415C4.17656 4.39415 2 6.24793 2 9.74952C2 11.9238 2.80938 14.2237 3.80469 15.7114C4.65781 16.9702 5.40157 18 6.47345 18Z" fill="black"/>
 </svg>

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css

@@ -81,8 +81,6 @@
 	> .action-label:hover {
 		color: var(--vscode-button-separator);
 		opacity: 1;
-		height: 18px;
-		margin: 0px 4px !important;
 	}
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatEditorController.css

@@ -15,7 +15,7 @@
 }
 
 .chat-diff-change-content-widget .monaco-action-bar {
-	padding: 0;
+	padding: 2px;
 	border-radius: 2px;
 	background-color: var(--vscode-button-background);
 	color: var(--vscode-button-foreground);
@@ -30,11 +30,11 @@
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon {
 	width: unset;
 	padding: 2px;
-	font-size: 12px;
-	line-height: 14px;
+	font-size: 16px;
+	line-height: 16px;
 	color: var(--vscode-button-foreground);
 }
 
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {
-	font-size: 12px;
+	font-size: 16px;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatSessions.css

@@ -0,0 +1,262 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Ensure consistent title background regardless of number of views */
+.composite.viewlet[id="workbench.view.chat.sessions"] .pane-header.expanded.not-collapsible {
+	background-color: var(--vscode-sideBarSectionHeader-background) !important;
+}
+
+.chat-sessions-view {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.chat-sessions-tree-container,
+.getting-started-list-container {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	min-height: 0;
+}
+
+.chat-sessions-tree-container > .monaco-list,
+.getting-started-list-container > .monaco-list {
+	flex: 1;
+}
+
+/* Style for empty state message */
+.chat-sessions-message {
+	padding: 20px;
+	text-align: center;
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-sessions-message .no-sessions-message {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8px;
+	font-style: italic;
+}
+
+/* Simple approach - directly style the edit container for chat sessions */
+.chat-sessions-tree-container .explorer-item.explorer-item-edited {
+	display: flex;
+	align-items: center;
+	height: 22px;
+	padding: 0;
+}
+
+.chat-sessions-tree-container .explorer-item.explorer-item-edited .codicon {
+	margin-right: 6px;
+	flex-shrink: 0;
+}
+
+.chat-sessions-tree-container .explorer-item.explorer-item-edited .monaco-inputbox {
+	flex: 1;
+	width: 100%;
+	line-height: normal;
+	border: none !important;
+	background: transparent !important;
+}
+
+/* Add the complete outline border that file explorer uses (this replaces the border) */
+.chat-sessions-tree-container .explorer-item.explorer-item-edited .monaco-inputbox input[type="text"] {
+	outline-width: 1px;
+	outline-style: solid;
+	outline-offset: -1px;
+	outline-color: var(--vscode-focusBorder);
+	opacity: 1;
+	border: none !important; /* Remove any default border */
+}
+
+.chat-sessions-tree-container .chat-session-item.multiline {
+	padding: 2px 0;
+}
+
+/* Position session content and actions inline */
+.chat-sessions-tree-container .chat-session-item .session-content {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	min-height: 22px;
+	line-height: 22px;
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row {
+	display: none;
+	align-items: center;
+	font-size: 0.9em;
+	line-height: 1em;
+	margin: 2px 22px 0 22px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row p {
+	padding: 2px;
+	margin: 0px;
+	border-radius: 4px;
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row a {
+	color: var(--vscode-foreground);
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row .description:hover p {
+	background: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row .description {
+	opacity: 0.5;
+}
+.chat-sessions-tree-container .chat-session-item .description-row .statistics {
+	margin-left: 8px;
+}
+
+.getting-started-list-container .monaco-list-row {
+	padding-left: 8px;
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row .statistics .insertions {
+	color: var(--vscode-chat-linesAddedForeground);
+	padding-left: 4px;
+}
+
+.chat-sessions-tree-container .chat-session-item .description-row .statistics .deletions {
+	color: var(--vscode-chat-linesRemovedForeground);
+	padding-left: 4px;
+}
+
+.chat-sessions-tree-container .chat-session-item .actions {
+	display: flex;
+	align-items: center;
+	flex-shrink: 0;
+}
+
+/* Hide actions by default, show on hover and focus */
+.chat-sessions-tree-container .chat-session-item .actions .monaco-action-bar .action-label {
+	opacity: 0;
+}
+
+.chat-sessions-tree-container .chat-session-item:hover .actions .monaco-action-bar .action-label,
+.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .actions .monaco-action-bar .action-label,
+.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .actions .monaco-action-bar .action-label {
+	opacity: 1;
+}
+
+/* For items with descriptions, keep the structure but adjust alignment */
+.chat-sessions-tree-container .chat-session-item .session-content {
+	align-items: center;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+/* Ensure resource label takes up available space */
+.chat-sessions-tree-container .chat-session-item .monaco-icon-label {
+	flex: 1;
+	min-width: 0; /* Allow text to truncate */
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.chat-sessions-tree-container .chat-session-item .monaco-icon-label::before {
+	text-align: center;
+}
+
+/* Chat session icon */
+.chat-sessions-tree-container .chat-session-item .chat-session-custom-icon {
+	flex-shrink: 0;
+	width: 16px;
+	height: 16px;
+	margin-right: 6px;
+	font-size: 16px;
+	display: flex;
+}
+
+/* Timestamp styling - similar to timeline pane */
+.chat-sessions-tree-container .chat-session-item .timestamp-container {
+	margin-left: auto;
+	margin-right: 4px;
+	opacity: 0.5;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	flex-shrink: 0;
+	font-size: 0.9em;
+	min-width: 10px;
+}
+
+.chat-sessions-tree-container .chat-session-item .timestamp-container.timestamp-duplicate::before {
+	content: ' ';
+	position: absolute;
+	top: 0px;
+	right: 10px;
+	border-right: 1px solid currentColor;
+	display: block;
+	height: 100%;
+	width: 1px;
+	opacity: 0.25;
+}
+
+.chat-sessions-tree-container .monaco-list-row:hover .chat-session-item .timestamp-container.timestamp-duplicate::before,
+.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .timestamp-container.timestamp-duplicate::before,
+.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .timestamp-container.timestamp-duplicate::before {
+	display: none;
+}
+
+.chat-sessions-tree-container .chat-session-item .timestamp-container .timestamp {
+	display: inline-block;
+}
+
+.chat-sessions-tree-container .chat-session-item .timestamp-container.timestamp-duplicate .timestamp {
+	visibility: hidden;
+	width: 10px;
+}
+
+.chat-sessions-tree-container .monaco-list-row:hover .chat-session-item .timestamp-container.timestamp-duplicate .timestamp,
+.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .timestamp-container.timestamp-duplicate .timestamp,
+.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .timestamp-container.timestamp-duplicate .timestamp {
+	visibility: visible !important;
+	width: initial;
+}
+
+.chat-sessions-tree-container .monaco-list-row .actions {
+	display: none;
+}
+
+.chat-sessions-tree-container .monaco-list-row:hover .actions {
+	display: block;
+}
+
+/* Hide twisties for elements that don't have children */
+.chat-sessions-tree-container .monaco-list-row .monaco-tl-twistie {
+	/* Ultra-small indent to separate parent/child without large gutter */
+	visibility: hidden; /* keep layout space */
+	width: 3px;
+	min-width: 3px;
+	padding: 0;
+	margin: 0;
+}
+
+/* Show twistie only for collapsible items (like "Show history...") */
+.chat-sessions-tree-container .monaco-list-row[aria-expanded] .monaco-tl-twistie {
+	visibility: visible;
+	width: auto;
+	padding-left: 0px;
+	padding-right: 6px;
+	margin: initial;
+}
+
+/* History items styling */
+.chat-sessions-tree-container .chat-session-item[data-history-item="true"] {
+	opacity: 0.9;
+}
+
+.chat-sessions-tree-container .chat-session-item[data-history-item="true"]:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatStatus.css

@@ -30,6 +30,13 @@
 .chat-status-bar-entry-tooltip div.description {
 	font-size: 11px;
 	color: var(--vscode-descriptionForeground);
+	display: flex;
+	align-items: center;
+	gap: 3px;
+}
+
+.chat-status-bar-entry-tooltip div.description.terms {
+	max-width: 250px;
 }
 
 .chat-status-bar-entry-tooltip .monaco-button {