@codingame/monaco-vscode-api 22.1.8 → 23.0.0

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -12,7 +12,7 @@ import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import { MarkdownString } from './extHostTypeConverters.js';
+import { MarkdownString, SourceControlInputBoxValidationType } from './extHostTypeConverters.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Schemas } from '../../../base/common/network.js';
 import { isLinux } from '../../../base/common/platform.js';
@@ -62,10 +62,11 @@ function getHistoryItemIconDto(icon) {
 }
 function toSCMHistoryItemDto(historyItem) {
     const authorIcon = getHistoryItemIconDto(historyItem.authorIcon);
+    const tooltip = MarkdownString.fromStrict(historyItem.tooltip);
     const references = historyItem.references?.map(r => ({
         ...r, icon: getHistoryItemIconDto(r.icon)
     }));
-    return { ...historyItem, authorIcon, references };
+    return { ...historyItem, authorIcon, references, tooltip };
 }
 function toSCMHistoryItemRefDto(historyItemRef) {
     return historyItemRef ? { ...historyItemRef, icon: getHistoryItemIconDto(historyItemRef.icon) } : undefined;
@@ -309,7 +310,7 @@ class ExtHostSCMInputBox {
     }
     showValidationMessage(message, type) {
         checkProposedApiEnabled(this._extension, 'scmValidation');
-        this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type);
+        this.#proxy.$showValidationMessage(this._sourceControlHandle, message, SourceControlInputBoxValidationType.from(type));
     }
     $onInputBoxValueChange(value) {
         this.updateValue(value);
@@ -524,6 +525,23 @@ class ExtHostSourceControl {
             }));
         }
     }
+    get artifactProvider() {
+        checkProposedApiEnabled(this._extension, 'scmArtifactProvider');
+        return this._artifactProvider;
+    }
+    set artifactProvider(artifactProvider) {
+        checkProposedApiEnabled(this._extension, 'scmArtifactProvider');
+        this._artifactProvider = artifactProvider;
+        this._artifactProviderDisposable.value = ( new DisposableStore());
+        this.#proxy.$updateSourceControl(this.handle, { hasArtifactProvider: !!artifactProvider });
+        if (artifactProvider) {
+            this._artifactProviderDisposable.value.add(artifactProvider.onDidChangeArtifacts((groups) => {
+                if (groups.length !== 0) {
+                    this.#proxy.$onDidChangeArtifacts(this.handle, groups);
+                }
+            }));
+        }
+    }
     get commitTemplate() {
         return this._commitTemplate;
     }
@@ -602,6 +620,7 @@ class ExtHostSourceControl {
         this._quickDiffProvider = undefined;
         this._secondaryQuickDiffProvider = undefined;
         this._historyProviderDisposable = ( new MutableDisposable());
+        this._artifactProviderDisposable = ( new MutableDisposable());
         this._commitTemplate = undefined;
         this._acceptInputDisposables = ( new MutableDisposable());
         this._acceptInputCommand = undefined;
@@ -696,6 +715,8 @@ class ExtHostSourceControl {
         this._acceptInputDisposables.dispose();
         this._actionButtonDisposables.dispose();
         this._statusBarDisposables.dispose();
+        this._historyProviderDisposable.dispose();
+        this._artifactProviderDisposable.dispose();
         this._groups.forEach(group => group.dispose());
         this.#proxy.$unregisterSourceControl(this.handle);
         this._onDidDispose.fire();
@@ -928,6 +949,34 @@ let ExtHostSCM = class ExtHostSCM {
             return undefined;
         }
     }
+    async $provideArtifactGroups(sourceControlHandle, token) {
+        try {
+            const artifactProvider = this._sourceControls.get(sourceControlHandle)?.artifactProvider;
+            const groups = await artifactProvider?.provideArtifactGroups(token);
+            return groups?.map(group => ({
+                ...group,
+                icon: getHistoryItemIconDto(group.icon)
+            }));
+        }
+        catch (err) {
+            this.logService.error('ExtHostSCM#$provideArtifactGroups', err);
+            return undefined;
+        }
+    }
+    async $provideArtifacts(sourceControlHandle, group, token) {
+        try {
+            const artifactProvider = this._sourceControls.get(sourceControlHandle)?.artifactProvider;
+            const artifacts = await artifactProvider?.provideArtifacts(group, token);
+            return artifacts?.map(artifact => ({
+                ...artifact,
+                icon: getHistoryItemIconDto(artifact.icon)
+            }));
+        }
+        catch (err) {
+            this.logService.error('ExtHostSCM#$provideArtifacts', err);
+            return undefined;
+        }
+    }
 };
 ExtHostSCM = ( __decorate([
     ( __param(3, ILogService))

package/vscode/src/vs/workbench/api/common/extHostStatusBar.js

@@ -188,7 +188,7 @@ class ExtHostStatusBarEntry {
             }
             else {
                 name = ( localize(
-                    2644,
+                    2664,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -221,7 +221,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localize(2645, "Extension Status"));
+        this._item.name = ( localize(2665, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

package/vscode/src/vs/workbench/api/common/extHostTask.d.ts

@@ -17,12 +17,12 @@ import { ITaskProblemMatcherStartedDto, ITaskProblemMatcherEndedDto } from "@cod
 export interface IExtHostTask extends ExtHostTaskShape {
     readonly _serviceBrand: undefined;
     taskExecutions: vscode.TaskExecution[];
-    onDidStartTask: Event<vscode.TaskStartEvent>;
-    onDidEndTask: Event<vscode.TaskEndEvent>;
-    onDidStartTaskProcess: Event<vscode.TaskProcessStartEvent>;
-    onDidEndTaskProcess: Event<vscode.TaskProcessEndEvent>;
-    onDidStartTaskProblemMatchers: Event<vscode.TaskProblemMatcherStartedEvent>;
-    onDidEndTaskProblemMatchers: Event<vscode.TaskProblemMatcherEndedEvent>;
+    readonly onDidStartTask: Event<vscode.TaskStartEvent>;
+    readonly onDidEndTask: Event<vscode.TaskEndEvent>;
+    readonly onDidStartTaskProcess: Event<vscode.TaskProcessStartEvent>;
+    readonly onDidEndTaskProcess: Event<vscode.TaskProcessEndEvent>;
+    readonly onDidStartTaskProblemMatchers: Event<vscode.TaskProblemMatcherStartedEvent>;
+    readonly onDidEndTaskProblemMatchers: Event<vscode.TaskProblemMatcherEndedEvent>;
     registerTaskProvider(extension: IExtensionDescription, type: string, provider: vscode.TaskProvider): vscode.Disposable;
     registerTaskSystem(scheme: string, info: tasks.ITaskSystemInfoDTO): void;
     fetchTasks(filter?: vscode.TaskFilter): Promise<vscode.Task[]>;

package/vscode/src/vs/workbench/api/common/extHostTelemetry.js

@@ -28,7 +28,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? 'remoteExtHostTelemetry' : isWorker ? 'workerExtHostTelemetry' : 'extHostTelemetry';
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2646,
+                2666,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? ' (Not Sent)' : ''
             )),
@@ -73,7 +73,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         commonProperties['common.vscodesessionid'] = this.initData.telemetryInfo.sessionId;
         commonProperties['common.vscodecommithash'] = this.initData.commit;
         commonProperties['common.sqmid'] = this.initData.telemetryInfo.sqmId;
-        commonProperties['common.devDeviceId'] = this.initData.telemetryInfo.devDeviceId;
+        commonProperties['common.devDeviceId'] = this.initData.telemetryInfo.devDeviceId ?? this.initData.telemetryInfo.machineId;
         commonProperties['common.vscodeversion'] = this.initData.version;
         commonProperties['common.vscodereleasedate'] = this.initData.date;
         commonProperties['common.isnewappinstall'] = isNewAppInstall(this.initData.telemetryInfo.firstSessionDate);

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -34,7 +34,7 @@ export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, ID
     getEnvironmentVariableCollection(extension: IExtensionDescription): IEnvironmentVariableCollection;
     getTerminalById(id: number): ExtHostTerminal | null;
     getTerminalIdByApiObject(apiTerminal: vscode.Terminal): number | null;
-    registerTerminalCompletionProvider(extension: IExtensionDescription, id: string, provider: vscode.TerminalCompletionProvider<vscode.TerminalCompletionItem>, ...triggerCharacters: string[]): vscode.Disposable;
+    registerTerminalCompletionProvider(extension: IExtensionDescription, provider: vscode.TerminalCompletionProvider<vscode.TerminalCompletionItem>, ...triggerCharacters: string[]): vscode.Disposable;
 }
 interface IEnvironmentVariableCollection extends vscode.EnvironmentVariableCollection {
     getScoped(scope: vscode.EnvironmentVariableScope): vscode.EnvironmentVariableCollection;
@@ -165,7 +165,7 @@ export declare abstract class BaseExtHostTerminalService extends Disposable impl
     $acceptProcessRequestCwd(id: number): void;
     $acceptProcessRequestLatency(id: number): Promise<number>;
     registerProfileProvider(extension: IExtensionDescription, id: string, provider: vscode.TerminalProfileProvider): vscode.Disposable;
-    registerTerminalCompletionProvider(extension: IExtensionDescription, id: string, provider: vscode.TerminalCompletionProvider<TerminalCompletionItem>, ...triggerCharacters: string[]): vscode.Disposable;
+    registerTerminalCompletionProvider(extension: IExtensionDescription, provider: vscode.TerminalCompletionProvider<TerminalCompletionItem>, ...triggerCharacters: string[]): vscode.Disposable;
     $provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto): Promise<TerminalCompletionListDto | undefined>;
     $acceptTerminalShellType(id: number, shellType: TerminalShellType | undefined): void;
     registerTerminalQuickFixProvider(id: string, extensionId: string, provider: vscode.TerminalQuickFixProvider): vscode.Disposable;

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -251,6 +251,8 @@ class ExtHostPseudoterminal {
     }
     async setUnicodeVersion(version) {
     }
+    async setNextCommandId(commandLine, commandId) {
+    }
     getInitialCwd() {
         return Promise.resolve('');
     }
@@ -487,7 +489,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2647, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2667, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {
@@ -570,15 +572,17 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             this._proxy.$unregisterProfileProvider(id);
         }));
     }
-    registerTerminalCompletionProvider(extension, id, provider, ...triggerCharacters) {
-        if (( this._completionProviders.has(id))) {
-            throw ( new Error(`Terminal completion provider "${id}" already registered`));
+    registerTerminalCompletionProvider(extension, provider, ...triggerCharacters) {
+        if (( this._completionProviders.has(extension.identifier.value))) {
+            throw ( new Error(
+                `Terminal completion provider "${extension.identifier.value}" already registered`
+            ));
         }
-        this._completionProviders.set(id, provider);
-        this._proxy.$registerCompletionProvider(id, extension.identifier.value, ...triggerCharacters);
+        this._completionProviders.set(extension.identifier.value, provider);
+        this._proxy.$registerCompletionProvider(extension.identifier.value, extension.identifier.value, ...triggerCharacters);
         return ( new Disposable$1(() => {
-            this._completionProviders.delete(id);
-            this._proxy.$unregisterCompletionProvider(id);
+            this._completionProviders.delete(extension.identifier.value);
+            this._proxy.$unregisterCompletionProvider(extension.identifier.value);
         }));
     }
     async $provideTerminalCompletions(id, options) {

package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.d.ts

@@ -25,8 +25,8 @@ export declare class ExtHostTerminalShellIntegration extends Disposable implemen
     protected readonly _onDidEndTerminalShellExecution: Emitter<vscode.TerminalShellExecutionEndEvent>;
     readonly onDidEndTerminalShellExecution: Event<vscode.TerminalShellExecutionEndEvent>;
     constructor(extHostRpc: IExtHostRpcService, _extHostTerminalService: IExtHostTerminalService);
-    $shellIntegrationChange(instanceId: number): void;
-    $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: string | undefined): void;
+    $shellIntegrationChange(instanceId: number, supportsExecuteCommandApi: boolean): void;
+    $shellExecutionStart(instanceId: number, supportsExecuteCommandApi: boolean, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: string | undefined): void;
     $shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void;
     $shellExecutionData(instanceId: number, data: string): void;
     $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
@@ -54,7 +54,7 @@ export declare class InternalTerminalShellIntegration extends Disposable {
     readonly onDidRequestEndExecution: Event<vscode.TerminalShellExecutionEndEvent>;
     protected readonly _onDidRequestNewExecution: Emitter<string>;
     readonly onDidRequestNewExecution: Event<string>;
-    constructor(_terminal: vscode.Terminal, _onDidStartTerminalShellExecution: Emitter<vscode.TerminalShellExecutionStartEvent>);
+    constructor(_terminal: vscode.Terminal, supportsExecuteCommandApi: boolean, _onDidStartTerminalShellExecution: Emitter<vscode.TerminalShellExecutionStartEvent>);
     requestNewShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): InternalTerminalShellExecution;
     startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): undefined;
     emitData(data: string): void;

package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js

@@ -30,7 +30,7 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
             this._activeShellIntegrations.clear();
         }));
     }
-    $shellIntegrationChange(instanceId) {
+    $shellIntegrationChange(instanceId, supportsExecuteCommandApi) {
         const terminal = this._extHostTerminalService.getTerminalById(instanceId);
         if (!terminal) {
             return;
@@ -38,7 +38,11 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
         const apiTerminal = terminal.value;
         let shellIntegration = this._activeShellIntegrations.get(instanceId);
         if (!shellIntegration) {
-            shellIntegration = ( new InternalTerminalShellIntegration(terminal.value, this._onDidStartTerminalShellExecution));
+            shellIntegration = ( new InternalTerminalShellIntegration(
+                terminal.value,
+                supportsExecuteCommandApi,
+                this._onDidStartTerminalShellExecution
+            ));
             this._activeShellIntegrations.set(instanceId, shellIntegration);
             shellIntegration.store.add(terminal.onWillDispose(() => this._activeShellIntegrations.get(instanceId)?.dispose()));
             shellIntegration.store.add(shellIntegration.onDidRequestShellExecution(commandLine => this._proxy.$executeCommand(instanceId, commandLine)));
@@ -51,9 +55,9 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
             shellIntegration: shellIntegration.value
         });
     }
-    $shellExecutionStart(instanceId, commandLineValue, commandLineConfidence, isTrusted, cwd) {
+    $shellExecutionStart(instanceId, supportsExecuteCommandApi, commandLineValue, commandLineConfidence, isTrusted, cwd) {
         if (!( this._activeShellIntegrations.has(instanceId))) {
-            this.$shellIntegrationChange(instanceId);
+            this.$shellIntegrationChange(instanceId, supportsExecuteCommandApi);
         }
         const commandLine = {
             value: commandLineValue,
@@ -93,7 +97,7 @@ ExtHostTerminalShellIntegration = ( __decorate([
 ], ExtHostTerminalShellIntegration));
 class InternalTerminalShellIntegration extends Disposable {
     get currentExecution() { return this._currentExecution; }
-    constructor(_terminal, _onDidStartTerminalShellExecution) {
+    constructor(_terminal, supportsExecuteCommandApi, _onDidStartTerminalShellExecution) {
         super();
         this._terminal = _terminal;
         this._onDidStartTerminalShellExecution = _onDidStartTerminalShellExecution;
@@ -122,6 +126,9 @@ class InternalTerminalShellIntegration extends Disposable {
                 }));
             },
             executeCommand(commandLineOrExecutable, args) {
+                if (!supportsExecuteCommandApi) {
+                    throw ( new Error('This terminal does not support the executeCommand API.'));
+                }
                 let commandLineValue = commandLineOrExecutable;
                 if (args) {
                     for (const arg of args) {

package/vscode/src/vs/workbench/api/common/extHostTreeViews.js

@@ -10,26 +10,30 @@ import { ViewBadge, DataTransfer as DataTransfer$1, TreeItemCheckboxState, TreeI
 import { isString, isUndefinedOrNull } from '../../../base/common/types.js';
 import { distinct, equals, coalesce } from '../../../base/common/arrays.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
-import { DataTransfer, MarkdownString, ViewBadge as ViewBadge$1 } from './extHostTypeConverters.js';
+import { MarkdownString as MarkdownString$1, DataTransfer, ViewBadge as ViewBadge$1 } from './extHostTypeConverters.js';
 import { isMarkdownString } from '../../../base/common/htmlContent.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { TreeViewsDnDService } from '../../../editor/common/services/treeViewsDnd.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { MarkdownString as MarkdownString$1 } from './extHostTypes/markdownString.js';
+import { MarkdownString } from './extHostTypes/markdownString.js';
 
 function toTreeItemLabel(label, extension) {
     if (isString(label)) {
         return { label };
     }
-    if (label
-        && typeof label === 'object'
-        && typeof label.label === 'string') {
+    if (label && typeof label === 'object' && label.label) {
         let highlights = undefined;
         if (Array.isArray(label.highlights)) {
             highlights = label.highlights.filter((highlight => highlight.length === 2 && typeof highlight[0] === 'number' && typeof highlight[1] === 'number'));
             highlights = highlights.length ? highlights : undefined;
         }
-        return { label: label.label, highlights };
+        if (isString(label.label)) {
+            return { label: label.label, highlights };
+        }
+        else if (MarkdownString.isMarkdownString(label.label)) {
+            checkProposedApiEnabled(extension, 'treeItemMarkdownLabel');
+            return { label: MarkdownString$1.from(label.label), highlights };
+        }
     }
     return undefined;
 }
@@ -369,7 +373,7 @@ class ExtHostTreeView extends Disposable {
                 });
             }
             if (message) {
-                this._proxy.$setMessage(this._viewId, MarkdownString.fromStrict(this._message) ?? '');
+                this._proxy.$setMessage(this._viewId, MarkdownString$1.fromStrict(this._message) ?? '');
             }
         }));
     }
@@ -728,15 +732,15 @@ class ExtHostTreeView extends Disposable {
     _createAndRegisterTreeNode(element, extTreeItem, parentNode) {
         const node = this._createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this._elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2648, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2668, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this._addNodeToCache(element, node);
         this._addNodeToParentCache(node, parentNode);
         return node;
     }
     _getTooltip(tooltip) {
-        if (MarkdownString$1.isMarkdownString(tooltip)) {
-            return MarkdownString.from(tooltip);
+        if (MarkdownString.isMarkdownString(tooltip)) {
+            return MarkdownString$1.from(tooltip);
         }
         return tooltip;
     }
@@ -775,7 +779,7 @@ class ExtHostTreeView extends Disposable {
         const item = {
             handle,
             parentHandle: parent ? parent.item.handle : undefined,
-            label: toTreeItemLabel(extensionTreeItem.label),
+            label: toTreeItemLabel(extensionTreeItem.label, this._extension),
             description: extensionTreeItem.description,
             resourceUri: extensionTreeItem.resourceUri,
             tooltip: this._getTooltip(extensionTreeItem.tooltip),
@@ -804,9 +808,18 @@ class ExtHostTreeView extends Disposable {
         if (id) {
             return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
         }
-        const treeItemLabel = toTreeItemLabel(label);
+        const treeItemLabel = toTreeItemLabel(label, this._extension);
         const prefix = parent ? parent.item.handle : ExtHostTreeView.LABEL_HANDLE_PREFIX;
-        let elementId = treeItemLabel ? treeItemLabel.label : resourceUri ? basename(resourceUri) : '';
+        let labelValue = '';
+        if (treeItemLabel) {
+            if (isMarkdownString(treeItemLabel.label)) {
+                labelValue = treeItemLabel.label.value;
+            }
+            else {
+                labelValue = treeItemLabel.label;
+            }
+        }
+        let elementId = labelValue || (resourceUri ? basename(resourceUri) : '');
         elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId;
         const existingHandle = ( this._nodes.has(element)) ? this._nodes.get(element).item.handle : undefined;
         const childrenNodes = (this._getChildrenNodes(parent) || []);

package/vscode/src/vs/workbench/api/common/extHostTunnelService.js

@@ -151,12 +151,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2649, "Private")),
+                            label: ( localize(2669, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2650, "Public")),
+                            label: ( localize(2670, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -20,9 +20,9 @@ import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from "../
 import { ProgressLocation as MainProgressLocation } from "../../../platform/progress/common/progress.js";
 import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
-import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatRequestModeInstructions } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatRequestModeInstructions } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffData, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/chatVariableEntries.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
@@ -31,11 +31,12 @@ import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
 import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 import * as notebooks from "../../contrib/notebook/common/notebookCommon.js";
-import { ICellRange } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
-import * as search from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search";
+import { ICellRange } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { InputValidationType } from "../../contrib/scm/common/scm.js";
+import * as search from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
 import { CoverageDetails, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestRunProfileBitset } from "../../contrib/testing/common/testTypes.js";
 import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
@@ -589,8 +590,8 @@ export declare namespace TerminalCompletionItemDto {
 export declare namespace TerminalCompletionList {
     function from(completions: vscode.TerminalCompletionList | vscode.TerminalCompletionItem[], pathSeparator: string): extHostProtocol.TerminalCompletionListDto;
 }
-export declare namespace TerminalResourceRequestConfig {
-    function from(resourceRequestConfig: vscode.TerminalResourceRequestConfig, pathSeparator: string): extHostProtocol.TerminalResourceRequestConfigDto;
+export declare namespace TerminalCompletionResourceOptions {
+    function from(resourceOptions: vscode.TerminalCompletionResourceOptions, pathSeparator: string): extHostProtocol.TerminalCompletionResourceOptionsDto;
 }
 export declare namespace PartialAcceptInfo {
     function to(info: languages.PartialAcceptInfo): types.PartialAcceptInfo;
@@ -601,9 +602,9 @@ export declare namespace PartialAcceptTriggerKind {
 export declare namespace InlineCompletionEndOfLifeReason {
     function to<T>(reason: languages.InlineCompletionEndOfLifeReason<T>, convertFn: (item: T) => vscode.InlineCompletionItem | undefined): vscode.InlineCompletionEndOfLifeReason;
 }
-export declare namespace InlineCompletionDisplayLocationKind {
-    function from(value: vscode.InlineCompletionDisplayLocationKind): types.InlineCompletionDisplayLocationKind;
-    function to(kind: languages.InlineCompletionDisplayLocationKind): types.InlineCompletionDisplayLocationKind;
+export declare namespace InlineCompletionHintStyle {
+    function from(value: vscode.InlineCompletionDisplayLocationKind): languages.InlineCompletionHintStyle;
+    function to(kind: languages.InlineCompletionHintStyle): types.InlineCompletionDisplayLocationKind;
 }
 export declare namespace DebugTreeItem {
     function from(item: vscode.DebugTreeItem, id: number): IDebugVisualizationTreeItem;
@@ -613,7 +614,7 @@ export declare namespace LanguageModelToolSource {
 }
 export declare namespace LanguageModelToolResult {
     function to(result: IToolResult): vscode.LanguageModelToolResult;
-    function from(result: vscode.ExtendedLanguageModelToolResult, extension: IExtensionDescription): Dto<IToolResult>;
+    function from(result: vscode.ExtendedLanguageModelToolResult, extension: IExtensionDescription): Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>;
 }
 export declare namespace LanguageModelToolResult2 {
     function to(result: IToolResult): vscode.LanguageModelToolResult2;
@@ -621,6 +622,22 @@ export declare namespace LanguageModelToolResult2 {
 }
 export declare namespace IconPath {
     function fromThemeIcon(iconPath: vscode.ThemeIcon): languages.IconPath;
+    /**
+     * Converts a {@link vscode.IconPath} to an {@link extHostProtocol.IconPathDto}.
+     * @note This function will tolerate strings specified instead of URIs in IconPath for historical reasons.
+     * Such strings are treated as file paths and converted using {@link URI.file} function, not {@link URI.from}.
+     * See https://github.com/microsoft/vscode/issues/110432#issuecomment-726144556 for context.
+     */
+    function from(value: undefined): undefined;
+    function from(value: vscode.IconPath): extHostProtocol.IconPathDto;
+    function from(value: vscode.IconPath | undefined): extHostProtocol.IconPathDto | undefined;
+    /**
+     * Converts a {@link extHostProtocol.IconPathDto} to a {@link vscode.IconPath}.
+     * @note This is a strict conversion and we assume types are correct in this case.
+     */
+    function to(value: undefined): undefined;
+    function to(value: extHostProtocol.IconPathDto): vscode.IconPath;
+    function to(value: extHostProtocol.IconPathDto | undefined): vscode.IconPath | undefined;
 }
 export declare namespace AiSettingsSearch {
     function fromSettingsSearchResult(result: vscode.SettingsSearchResult): AiSettingsSearchResult;
@@ -628,3 +645,6 @@ export declare namespace AiSettingsSearch {
 export declare namespace McpServerDefinition {
     function from(item: vscode.McpServerDefinition): McpServerLaunch.Serialized;
 }
+export declare namespace SourceControlInputBoxValidationType {
+    function from(type: number): InputValidationType;
+}