@codingame/monaco-vscode-chat-service-override 17.2.0 → 18.0.0

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

@@ -1,6 +1,9 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
@@ -9,7 +12,7 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolSet, ToolDataSource } 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 class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
     private readonly _instantiationService;
@@ -21,6 +24,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private readonly _logService;
     private readonly _configurationService;
     private readonly _accessibilityService;
+    private readonly _accessibilitySignalService;
     _serviceBrand: undefined;
     private _onDidChangeTools;
     readonly onDidChangeTools: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
@@ -32,23 +36,32 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private _workspaceToolConfirmStore;
     private _profileToolConfirmStore;
     private _memoryToolConfirmStore;
-    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService);
+    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService);
+    dispose(): void;
     registerToolData(toolData: IToolData): IDisposable;
     private _refreshAllToolContextKeys;
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
-    getTools(): Iterable<Readonly<IToolData>>;
+    getTools(includeDisabled?: boolean): Iterable<Readonly<IToolData>>;
     getTool(id: string): IToolData | undefined;
     private _getToolEntry;
-    getToolByName(name: string): IToolData | undefined;
+    getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined;
     setToolAutoConfirmation(toolId: string, scope: "workspace" | "profile" | "memory", autoConfirm?: boolean): void;
     resetToolAutoConfirmation(): void;
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
     private prepareToolInvocation;
+    private playAccessibilitySignal;
     private ensureToolDetails;
     private formatToolInput;
     private toolResultToIO;
     private shouldAutoConfirm;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;
-    dispose(): void;
+    toEnablementMap(toolOrToolsetNames: Iterable<string>): Record<string, boolean>;
+    private readonly _toolSets;
+    readonly toolSets: IObservable<Iterable<ToolSet>>;
+    getToolSetByName(name: string): ToolSet | undefined;
+    createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: {
+        icon?: ThemeIcon;
+        description?: string;
+    }): ToolSet & IDisposable;
 }

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

@@ -1,10 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { getActiveDocument } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 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';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { CancellationError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -12,7 +14,10 @@ import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ite
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -28,13 +33,14 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { createToolSchemaUri, stringifyPromptTsxPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { createToolSchemaUri, stringifyPromptTsxPart, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { getToolConfirmationAlert } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAccessibilityProvider';
+import { ObservableSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/set';
 
 var ToolConfirmStore_1;
 const jsonSchemaRegistry = ( Registry.as(Extensions.JSONContribution));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
-    constructor(_instantiationService, _extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService, _configurationService, _accessibilityService) {
+    constructor(_instantiationService, _extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService, _configurationService, _accessibilityService, _accessibilitySignalService) {
         super();
         this._instantiationService = _instantiationService;
         this._extensionService = _extensionService;
@@ -45,6 +51,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._logService = _logService;
         this._configurationService = _configurationService;
         this._accessibilityService = _accessibilityService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._onDidChangeTools = ( new Emitter());
         this.onDidChangeTools = this._onDidChangeTools.event;
         this._onDidChangeToolsScheduler = ( new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750));
@@ -52,6 +59,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._toolContextKeys = ( new Set());
         this._callsByRequestId = ( new Map());
         this._memoryToolConfirmStore = ( new Set());
+        this._toolSets = ( new ObservableSet());
+        this.toolSets = this._toolSets.observable;
         this._workspaceToolConfirmStore = ( new Lazy(
             () => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.WORKSPACE))
         ));
@@ -70,6 +79,11 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }));
         this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
     }
+    dispose() {
+        super.dispose();
+        this._callsByRequestId.forEach(calls => calls.forEach(call => call.store.dispose()));
+        this._ctxToolsCount.reset();
+    }
     registerToolData(toolData) {
         if (( this._tools.has(toolData.id))) {
             throw ( new Error(`Tool "${toolData.id}" is already registered.`));
@@ -112,14 +126,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             entry.impl = undefined;
         });
     }
-    getTools() {
+    getTools(includeDisabled) {
         const toolDatas = ( Iterable.map(( this._tools.values()), i => i.data));
         const extensionToolsEnabled = this._configurationService.getValue(ChatConfiguration.ExtensionToolsEnabled);
         return Iterable.filter(toolDatas, toolData => {
-            const satisfiesWhenClause = !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
-            const satisfiesExternalToolCheck = toolData.source.type === 'extension' && !extensionToolsEnabled ?
-                !toolData.source.isExternalTool :
-                true;
+            const satisfiesWhenClause = includeDisabled || !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
+            const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
             return satisfiesWhenClause && satisfiesExternalToolCheck;
         });
     }
@@ -135,10 +147,10 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             return undefined;
         }
     }
-    getToolByName(name) {
-        for (const toolData of this.getTools()) {
-            if (toolData.toolReferenceName === name) {
-                return toolData;
+    getToolByName(name, includeDisabled) {
+        for (const tool of this.getTools(!!includeDisabled)) {
+            if (tool.toolReferenceName === name) {
+                return tool;
             }
         }
         return undefined;
@@ -206,12 +218,15 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 const prepared = await this.prepareToolInvocation(tool, dto, token);
                 toolInvocation = ( new ChatToolInvocation(prepared, tool.data, dto.callId));
                 trackedCall.invocation = toolInvocation;
-                if (this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace)) {
+                const autoConfirmed = this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace);
+                if (autoConfirmed) {
                     toolInvocation.confirmed.complete(true);
                 }
                 model.acceptResponseProgress(request, toolInvocation);
                 if (prepared?.confirmationMessages) {
-                    this._accessibilityService.alert(this._instantiationService.invokeFunction(getToolConfirmationAlert, prepared.confirmationMessages.title));
+                    if (!toolInvocation.isConfirmed && !autoConfirmed) {
+                        this.playAccessibilitySignal([toolInvocation]);
+                    }
                     const userConfirmed = await toolInvocation.confirmed.p;
                     if (!userConfirmed) {
                         throw ( new CancellationError());
@@ -225,8 +240,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
             else {
                 const prepared = await this.prepareToolInvocation(tool, dto, token);
-                if (prepared?.confirmationMessages) {
-                    const result = await this._dialogService.confirm({ message: prepared.confirmationMessages.title, detail: renderStringAsPlaintext(prepared.confirmationMessages.message) });
+                if (prepared?.confirmationMessages && !this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace)) {
+                    const result = await this._dialogService.confirm({ message: renderStringAsPlaintext(prepared.confirmationMessages.title), detail: renderStringAsPlaintext(prepared.confirmationMessages.message) });
                     if (!result.confirmed) {
                         throw ( new CancellationError());
                     }
@@ -263,7 +278,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             toolResult ??= { content: [] };
             toolResult.toolResultError = err instanceof Error ? err.message : String(err);
             if (tool.data.alwaysDisplayInputOutput) {
-                toolResult.toolResultDetails = { input: this.formatToolInput(dto), output: [{ type: 'text', value: String(err) }], isError: true };
+                toolResult.toolResultDetails = { input: this.formatToolInput(dto), output: [{ isText: true, value: String(err) }], isError: true };
             }
             throw err;
         }
@@ -291,6 +306,22 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         return prepared;
     }
+    playAccessibilitySignal(toolInvocations) {
+        const hasFocusedWindow = getActiveDocument().hasFocus();
+        const autoApproved = this._configurationService.getValue('chat.tools.autoApprove');
+        if (autoApproved) {
+            return;
+        }
+        const setting = this._configurationService.getValue(AccessibilitySignal.chatUserActionRequired.settingsKey);
+        if (!setting) {
+            return;
+        }
+        const soundEnabled = setting.sound === 'on' || (setting.sound === 'auto' && (this._accessibilityService.isScreenReaderOptimized() || !hasFocusedWindow));
+        const announcementEnabled = this._accessibilityService.isScreenReaderOptimized() && setting.announcement === 'auto';
+        if (soundEnabled || announcementEnabled) {
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { customAlertMessage: this._instantiationService.invokeFunction(getToolConfirmationAlert, toolInvocations), userGesture: true, modality: !soundEnabled ? 'announcement' : undefined });
+        }
+    }
     ensureToolDetails(dto, toolResult, toolData) {
         if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
             toolResult.toolResultDetails = {
@@ -305,13 +336,13 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     toolResultToIO(toolResult) {
         return ( toolResult.content.map(part => {
             if (part.kind === 'text') {
-                return { type: 'text', value: part.value };
+                return { isText: true, value: part.value };
             }
             else if (part.kind === 'promptTsx') {
-                return { type: 'text', value: stringifyPromptTsxPart(part) };
+                return { isText: true, value: stringifyPromptTsxPart(part) };
             }
             else if (part.kind === 'data') {
-                return { type: 'data', value64: encodeBase64(part.value.data), mimeType: part.value.mimeType };
+                return { value: encodeBase64(part.value.data), mimeType: part.value.mimeType };
             }
             else {
                 assertNever();
@@ -352,10 +383,49 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             this._callsByRequestId.delete(requestId);
         }
     }
-    dispose() {
-        super.dispose();
-        this._callsByRequestId.forEach(calls => calls.forEach(call => call.store.dispose()));
-        this._ctxToolsCount.reset();
+    toEnablementMap(toolOrToolsetNames) {
+        const toolOrToolset = ( new Set(toolOrToolsetNames));
+        const result = {};
+        for (const tool of ( this._tools.values())) {
+            if (tool.data.toolReferenceName && ( toolOrToolset.has(tool.data.toolReferenceName)) || ( toolOrToolset.has(tool.data.id))) {
+                result[tool.data.id] = true;
+            }
+            else {
+                result[tool.data.id] = false;
+            }
+        }
+        for (const toolSet of this._toolSets) {
+            if (( toolOrToolset.has(toolSet.referenceName))) {
+                result[toolSet.referenceName] = true;
+            }
+            for (const tool of toolSet.getTools()) {
+                if (( toolOrToolset.has(tool.id))) {
+                    result[tool.id] = true;
+                }
+            }
+        }
+        return result;
+    }
+    getToolSetByName(name) {
+        for (const toolSet of this._toolSets) {
+            if (toolSet.referenceName === name) {
+                return toolSet;
+            }
+        }
+        return undefined;
+    }
+    createToolSet(source, id, referenceName, options) {
+        const that = this;
+        const result = new (class extends ToolSet {
+            dispose() {
+                if (( that._toolSets.has(result))) {
+                    this._tools.clear();
+                    that._toolSets.delete(result);
+                }
+            }
+        })(id, referenceName, options?.icon ?? Codicon.tools, source, options?.description);
+        this._toolSets.add(result);
+        return result;
     }
 };
 LanguageModelToolsService = ( __decorate([
@@ -367,7 +437,8 @@ LanguageModelToolsService = ( __decorate([
     ( __param(5, ITelemetryService)),
     ( __param(6, ILogService)),
     ( __param(7, IConfigurationService)),
-    ( __param(8, IAccessibilityService))
+    ( __param(8, IAccessibilityService)),
+    ( __param(9, IAccessibilitySignalService))
 ], LanguageModelToolsService));
 let ToolConfirmStore = class ToolConfirmStore extends Disposable {
     static { ToolConfirmStore_1 = this; }

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

@@ -1,14 +1,101 @@
+@property --chat-setup-dialog-glow-angle {
+	syntax: '<angle>';
+	initial-value: 0deg;
+	inherits: false;
+}
+@keyframes chat-setup-dialog-glow-angle-animation {
+	0% {
+		--chat-setup-dialog-glow-angle: 0deg;
+	}
+	100% {
+		--chat-setup-dialog-glow-angle: 360deg;
+	}
+}
+.chat-setup-dialog.chat-setup-glow {
+	border: 2px solid !important;
+	border-image: linear-gradient(var(--chat-setup-dialog-glow-angle), var(--vscode-button-background) 0, var(--vscode-editorGutter-addedBackground)) 1 !important;
+	animation: 3s chat-setup-dialog-glow-angle-animation linear infinite;
+}
 .chat-setup-dialog {
+	.dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button::before {
+		content: '';
+		background-size: 16px;
+		background-repeat: no-repeat;
+		background-position: left center;
+		padding-right: 6px;
+		width: 16px;
+		height: 22px;
+		line-height: inherit !important;
+		display: inline-block;
+	}
+	.dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.default::before {
+		background-image: url('./github.svg');
+	}
+	.dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.alternate::before {
+		background-image: url('./google.svg');
+	}
+	.dialog-buttons-row > .dialog-buttons > .monaco-button.link-button {
+		border: 0 !important;
+		background-color: unset !important;
+		color: var(--vscode-textLink-foreground) !important;
+		width: fit-content;
+		margin-left: auto;
+		margin-right: auto;
+	}
+	.dialog-buttons-row > .dialog-buttons > .monaco-button.link-button.skip-button {
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground) !important;
+	}
+	.chat-setup-dialog-footer {
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground);
+	}
+}
+.chat-setup-input-email {
+	.dialog-message-container,
+	.dialog-message-input {
+		width: 100% !important;
+	}
+	.buttons-separator {
+		display: flex;
+		width: 100%;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		height: 20px;
+		align-items: center;
+	}
+	.buttons-separator-left {
+		width: 100%;
+		margin-right: 5px;
+		border-top: 1px solid var(--vscode-descriptionForeground);
+	}
+	.buttons-separator-right {
+		width: 100%;
+		margin-left: 5px;
+		border-top: 1px solid var(--vscode-descriptionForeground);
+	}
+	.dialog-buttons-row {
+		padding: 5px 10px 10px !important;
+	}
+	.monaco-inputbox {
+		width: 100% !important;
+		margin-left: 5px !important;
+		margin-right: 5px !important;
+		height: 30px;
+	}
+	.monaco-inputbox .ibwrapper {
+		height: 30px;
+	}
+	.monaco-inputbox .input {
+		height: 30px;
+	}
+}
+.chat-setup-dialog-legacy {
 	p {
 		margin-top: 0;
 		margin-bottom: 0;
 		width: 100%;
 	}
-	p.setup-legal {
-		font-size: 12px;
-		color: var(--vscode-descriptionForeground);
-		margin-top: 2em;
-	}
 	p.setup-settings {
 		font-size: 12px;
 		color: var(--vscode-descriptionForeground);

package/vscode/src/vs/workbench/contrib/chat/browser/media/github.svg

@@ -0,0 +1 @@
+<svg width="98" height="96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg>

package/vscode/src/vs/workbench/contrib/chat/browser/media/google.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.68 8.18184C15.68 7.61456 15.6291 7.06912 15.5346 6.54544H8V9.64H12.3054C12.12 10.64 11.5564 11.4873 10.7091 12.0546V14.0618H13.2946C14.8073 12.6691 15.68 10.6182 15.68 8.18184Z" fill="#4285F4"/>
+<path d="M7.99995 16C10.16 16 11.9708 15.2836 13.2944 14.0618L10.709 12.0545C9.99267 12.5345 9.07627 12.8181 7.99995 12.8181C5.91627 12.8181 4.15267 11.4109 3.52355 9.51999H0.85083V11.5927C2.16723 14.2073 4.87267 16 7.99995 16Z" fill="#34A853"/>
+<path d="M3.5236 9.52001C3.3636 9.04001 3.27272 8.52729 3.27272 8.00001C3.27272 7.47273 3.3636 6.96001 3.5236 6.48001V4.40729H0.85088C0.30912 5.48729 0 6.70913 0 8.00001C0 9.29089 0.30912 10.5127 0.85088 11.5927L3.5236 9.52001Z" fill="#FBBC04"/>
+<path d="M7.99995 3.18184C9.17443 3.18184 10.229 3.58544 11.0581 4.37816L13.3527 2.0836C11.9672 0.79272 10.1563 0 7.99995 0C4.87267 0 2.16723 1.79272 0.85083 4.40728L3.52355 6.48C4.15267 4.58912 5.91627 3.18184 7.99995 3.18184Z" fill="#E94235"/>
+</svg>

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

@@ -1,5 +1,6 @@
 .element-selection-message,
-.element-expand-container {
+.element-expand-container,
+.connecting-webview-element {
 	position: absolute;
 	bottom: 10px;
 	right: 10px;
@@ -20,15 +21,20 @@
 	bottom: 10px;
 	right: 10px;
 }
-.element-expand-container {
+.element-expand-container,
+.connecting-webview-element {
 	bottom: 15px;
 	right: 15px;
 }
-.element-selection-cancel,
-.element-selection-start {
+.element-selection-cancel {
 	padding: 2px 8px;
 	width: fit-content;
 }
+.element-selection-message .monaco-button-dropdown > .monaco-button.monaco-text-button {
+	height: 24px;
+	align-content: center;
+	padding: 0px 5px;
+}
 .element-selection-message .monaco-button.codicon.codicon-close,
 .element-expand-container .monaco-button.codicon.codicon-layout,
 .element-selection-message .monaco-button.codicon.codicon-chevron-right,

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.d.ts

@@ -1,2 +1,3 @@
 export declare const NEW_PROMPT_COMMAND_ID = "workbench.command.new.prompt";
 export declare const NEW_INSTRUCTIONS_COMMAND_ID = "workbench.command.new.instructions";
+export declare const NEW_MODE_COMMAND_ID = "workbench.command.new.mode";