@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task/taskHelpers.d.ts

@@ -0,0 +1,22 @@
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { Task } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks";
+import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
+export declare function getTaskDefinition(id: string): {
+    taskLabel: string;
+    taskType: string;
+};
+export declare function getTaskRepresentation(task: IConfiguredTask | Task): string;
+export declare function getTaskForTool(id: string | undefined, taskDefinition: {
+    taskLabel?: string;
+    taskType?: string;
+}, workspaceFolder: string, configurationService: IConfigurationService, taskService: ITaskService): Promise<Task | undefined>;
+export interface IConfiguredTask {
+    label?: string;
+    type?: string;
+    script?: string;
+    command?: string;
+    args?: string[];
+    isBackground?: boolean;
+    problemMatcher?: string[];
+    group?: string;
+}

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task/taskHelpers.js

@@ -0,0 +1,80 @@
+
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+
+function getTaskDefinition(id) {
+    const idx = id.indexOf(': ');
+    const taskType = id.substring(0, idx);
+    let taskLabel = idx > 0 ? id.substring(idx + 2) : id;
+    if (/^\d+$/.test(taskLabel)) {
+        taskLabel = id;
+    }
+    return { taskLabel, taskType };
+}
+function getTaskRepresentation(task) {
+    if ('label' in task && task.label) {
+        return task.label;
+    }
+    else if ('script' in task && task.script) {
+        return task.script;
+    }
+    else if ('command' in task && task.command) {
+        return typeof task.command === 'string' ? task.command : task.command.name?.toString() || '';
+    }
+    return '';
+}
+async function getTaskForTool(id, taskDefinition, workspaceFolder, configurationService, taskService) {
+    let index = 0;
+    let task;
+    const workspaceFolderToTaskMap = await taskService.getWorkspaceTasks();
+    let configTasks = [];
+    for (const folder of ( workspaceFolderToTaskMap.keys())) {
+        const tasksConfig = configurationService.getValue('tasks', { resource: ( URI.parse(folder)) });
+        if (tasksConfig?.tasks) {
+            configTasks = configTasks.concat(tasksConfig.tasks);
+        }
+    }
+    for (const configTask of configTasks) {
+        if (!configTask.type || 'hide' in configTask && configTask.hide) {
+            continue;
+        }
+        if ((configTask.type && taskDefinition.taskType ? configTask.type === taskDefinition.taskType : true) &&
+            ((getTaskRepresentation(configTask) === taskDefinition?.taskLabel) || (id === configTask.label))) {
+            task = configTask;
+            break;
+        }
+        else if (!configTask.label && id === `${configTask.type}: ${index}`) {
+            task = configTask;
+            break;
+        }
+        index++;
+    }
+    if (!task) {
+        return;
+    }
+    let tasksForWorkspace;
+    const workspaceFolderPath = URI.file(workspaceFolder).path;
+    for (const [folder, tasks] of workspaceFolderToTaskMap) {
+        if (( URI.parse(folder)).path === workspaceFolderPath) {
+            tasksForWorkspace = tasks;
+            break;
+        }
+    }
+    if (!tasksForWorkspace) {
+        return;
+    }
+    const configuringTasks = tasksForWorkspace.configurations?.byIdentifier;
+    const configuredTask = ( Object.values(configuringTasks ?? {})).find(t => {
+        return t.type === task.type && (t._label === task.label || t._label === `${task.type}: ${getTaskRepresentation(task)}` || t._label === getTaskRepresentation(task));
+    });
+    let resolvedTask;
+    if (configuredTask) {
+        resolvedTask = await taskService.tryResolveTask(configuredTask);
+    }
+    if (!resolvedTask) {
+        const customTasks = tasksForWorkspace.set?.tasks;
+        resolvedTask = customTasks?.find(t => task.label === t._label || task.label === t._label);
+    }
+    return resolvedTask;
+}
+
+export { getTaskDefinition, getTaskForTool, getTaskRepresentation };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task.chatAgentTools.contribution.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task.chatAgentTools.contribution.js

@@ -0,0 +1,40 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { 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';
+import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './task/createAndRunTaskTool.js';
+import { GetTaskOutputTool, GetTaskOutputToolData } from './task/getTaskOutputTool.js';
+import { RunTaskTool, RunTaskToolData } from './task/runTaskTool.js';
+
+let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Disposable {
+    static { this.ID = 'task.chatAgentTools'; }
+    constructor(configurationService, instantiationService, toolsService) {
+        super();
+        const runTaskTool = instantiationService.createInstance(RunTaskTool);
+        this._register(toolsService.registerToolData(RunTaskToolData));
+        this._register(toolsService.registerToolImplementation(RunTaskToolData.id, runTaskTool));
+        const getTaskOutputTool = instantiationService.createInstance(GetTaskOutputTool);
+        this._register(toolsService.registerToolData(GetTaskOutputToolData));
+        this._register(toolsService.registerToolImplementation(GetTaskOutputToolData.id, getTaskOutputTool));
+        const createAndRunTaskTool = instantiationService.createInstance(CreateAndRunTaskTool);
+        this._register(toolsService.registerToolData(CreateAndRunTaskToolData));
+        this._register(toolsService.registerToolImplementation(CreateAndRunTaskToolData.id, createAndRunTaskTool));
+        const toolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runTasks', 'runTasks', {
+            description: ( localize(11265, 'Runs tasks and gets their output for your workspace'))
+        }));
+        toolSet.addTool(RunTaskToolData);
+        toolSet.addTool(GetTaskOutputToolData);
+        toolSet.addTool(CreateAndRunTaskToolData);
+    }
+};
+ChatAgentToolsContribution = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IInstantiationService)),
+    ( __param(2, ILanguageModelToolsService))
+], ChatAgentToolsContribution));
+registerWorkbenchContribution2(ChatAgentToolsContribution.ID, ChatAgentToolsContribution, WorkbenchPhase.AfterRestored);

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js

@@ -0,0 +1,36 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { 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';
+import { GetTerminalOutputTool, GetTerminalOutputToolData } from './getTerminalOutputTool.js';
+import { RunInTerminalTool, RunInTerminalToolData } from './runInTerminalTool.js';
+
+let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Disposable {
+    static { this.ID = 'terminal.chatAgentTools'; }
+    constructor(instantiationService, toolsService) {
+        super();
+        const runInTerminalTool = instantiationService.createInstance(RunInTerminalTool);
+        this._register(toolsService.registerToolData(RunInTerminalToolData));
+        this._register(toolsService.registerToolImplementation(RunInTerminalToolData.id, runInTerminalTool));
+        const getTerminalOutputTool = instantiationService.createInstance(GetTerminalOutputTool);
+        this._register(toolsService.registerToolData(GetTerminalOutputToolData));
+        this._register(toolsService.registerToolImplementation(GetTerminalOutputToolData.id, getTerminalOutputTool));
+        const toolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runCommands', 'runCommands', {
+            icon: ThemeIcon.fromId(Codicon.terminal.id),
+            description: ( localize(11301, 'Runs commands in the terminal'))
+        }));
+        toolSet.addTool(RunInTerminalToolData);
+        toolSet.addTool(GetTerminalOutputToolData);
+    }
+};
+ChatAgentToolsContribution = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, ILanguageModelToolsService))
+], ChatAgentToolsContribution));
+registerWorkbenchContribution2(ChatAgentToolsContribution.ID, ChatAgentToolsContribution, WorkbenchPhase.AfterRestored);

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.d.ts

@@ -0,0 +1,20 @@
+import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { type ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+export declare enum ShellIntegrationQuality {
+    None = "none",
+    Basic = "basic",
+    Rich = "rich"
+}
+export interface IToolTerminal {
+    instance: ITerminalInstance;
+    shellIntegrationQuality: ShellIntegrationQuality;
+}
+export declare class ToolTerminalCreator {
+    private readonly _terminalService;
+    private static _lastSuccessfulShell;
+    constructor(_terminalService: ITerminalService);
+    createTerminal(token: CancellationToken): Promise<IToolTerminal>;
+    private _createCopilotTerminal;
+    private _waitForShellIntegration;
+}

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.js

@@ -0,0 +1,114 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { DeferredPromise, disposableTimeout, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+
+var ToolTerminalCreator_1;
+var ShellLaunchType;
+(function (ShellLaunchType) {
+    ShellLaunchType[ShellLaunchType["Unknown"] = 0] = "Unknown";
+    ShellLaunchType[ShellLaunchType["Default"] = 1] = "Default";
+    ShellLaunchType[ShellLaunchType["Fallback"] = 2] = "Fallback";
+})(ShellLaunchType || (ShellLaunchType = {}));
+var ShellIntegrationQuality;
+(function (ShellIntegrationQuality) {
+    ShellIntegrationQuality["None"] = "none";
+    ShellIntegrationQuality["Basic"] = "basic";
+    ShellIntegrationQuality["Rich"] = "rich";
+})(ShellIntegrationQuality || (ShellIntegrationQuality = {}));
+let ToolTerminalCreator = class ToolTerminalCreator {
+    static { ToolTerminalCreator_1 = this; }
+    static { this._lastSuccessfulShell = ShellLaunchType.Unknown; }
+    constructor(_terminalService) {
+        this._terminalService = _terminalService;
+    }
+    async createTerminal(token) {
+        const instance = await this._createCopilotTerminal();
+        const toolTerminal = {
+            instance,
+            shellIntegrationQuality: ShellIntegrationQuality.None,
+        };
+        if (ToolTerminalCreator_1._lastSuccessfulShell <= ShellLaunchType.Default) {
+            const shellIntegrationQuality = await this._waitForShellIntegration(instance, 5000);
+            if (token.isCancellationRequested) {
+                instance.dispose();
+                throw ( new CancellationError());
+            }
+            if (shellIntegrationQuality !== ShellIntegrationQuality.None) {
+                ToolTerminalCreator_1._lastSuccessfulShell = ShellLaunchType.Default;
+                toolTerminal.shellIntegrationQuality = shellIntegrationQuality;
+                return toolTerminal;
+            }
+        }
+        ToolTerminalCreator_1._lastSuccessfulShell = ShellLaunchType.Fallback;
+        return toolTerminal;
+    }
+    _createCopilotTerminal() {
+        return this._terminalService.createTerminal({
+            config: {
+                icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
+                hideFromUser: true,
+                env: {
+                    GIT_PAGER: 'cat',
+                },
+            },
+        });
+    }
+    _waitForShellIntegration(instance, timeoutMs) {
+        const dataFinished = ( new DeferredPromise());
+        const deferred = ( new DeferredPromise());
+        const timer = disposableTimeout(() => deferred.complete(ShellIntegrationQuality.None), timeoutMs);
+        if (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection) {
+            timer.dispose();
+            deferred.complete(ShellIntegrationQuality.Rich);
+        }
+        else {
+            const onSetRichCommandDetection = this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onSetRichCommandDetection);
+            const richCommandDetectionListener = onSetRichCommandDetection.event((e) => {
+                if (e.instance !== instance) {
+                    return;
+                }
+                deferred.complete(ShellIntegrationQuality.Rich);
+            });
+            const store = ( new DisposableStore());
+            const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+            if (commandDetection) {
+                timer.dispose();
+                Promise.race([
+                    dataFinished.p,
+                    timeout(200)
+                ]).then(() => {
+                    if (!deferred.isResolved) {
+                        deferred.complete(ShellIntegrationQuality.Basic);
+                    }
+                });
+            }
+            else {
+                store.add(instance.capabilities.onDidAddCapabilityType(e => {
+                    if (e === TerminalCapability.CommandDetection) {
+                        timer.dispose();
+                        Promise.race([
+                            dataFinished.p,
+                            timeout(200)
+                        ]).then(() => deferred.complete(ShellIntegrationQuality.Basic));
+                    }
+                }));
+            }
+            deferred.p.finally(() => {
+                store.dispose();
+                richCommandDetectionListener.dispose();
+            });
+        }
+        return deferred.p;
+    }
+};
+ToolTerminalCreator = ToolTerminalCreator_1 = ( __decorate([
+    ( __param(0, ITerminalService))
+], ToolTerminalCreator));
+
+export { ShellIntegrationQuality, ToolTerminalCreator };

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

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 0C10.1563 1.22707e-05 11.967 0.793114 13.3525 2.08398L11.0576 4.37793C10.2286 3.58545 9.17429 3.18165 8 3.18164C5.91632 3.18164 4.15256 4.58959 3.52344 6.48047L3.41699 6.8457C3.32391 7.21717 3.27246 7.60448 3.27246 8C3.27246 8.52711 3.36354 9.03967 3.52344 9.51953C4.15267 11.4102 5.91647 12.8184 8 12.8184C9.07626 12.8184 9.99268 12.5346 10.709 12.0547L10.8643 11.9453C11.6252 11.3811 12.1318 10.5773 12.3057 9.63965H8V6.5459H15.5342C15.6286 7.0694 15.6797 7.61457 15.6797 8.18164C15.6797 10.6178 14.8074 12.6688 13.2949 14.0615H13.2939C11.9704 15.2833 10.16 16 8 16C4.97035 16 2.33693 14.3173 0.978516 11.835L0.850586 11.5928L0.65918 11.1816C0.236933 10.2065 0 9.12972 0 8C1.14184e-06 6.70915 0.308848 5.48721 0.850586 4.40723C2.16699 1.79267 4.87272 0 8 0Z" fill="white"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 0C10.1563 1.22707e-05 11.967 0.793114 13.3525 2.08398L11.0576 4.37793C10.2286 3.58545 9.17429 3.18165 8 3.18164C5.91632 3.18164 4.15256 4.58959 3.52344 6.48047L3.41699 6.8457C3.32391 7.21717 3.27246 7.60448 3.27246 8C3.27246 8.52711 3.36354 9.03967 3.52344 9.51953V9.52051C4.15267 11.4112 5.91647 12.8184 8 12.8184C9.07626 12.8184 9.99268 12.5346 10.709 12.0547L10.8643 11.9453C11.6252 11.3811 12.1318 10.5773 12.3057 9.63965H8V6.5459H15.5342C15.6286 7.0694 15.6797 7.61457 15.6797 8.18164C15.6797 10.6178 14.8074 12.6688 13.2949 14.0615H13.2939C11.9704 15.2833 10.16 16 8 16C4.97035 16 2.33693 14.3173 0.978516 11.835L0.850586 11.5928L0.65918 11.1816C0.236933 10.2065 0 9.12972 0 8C1.14184e-06 6.70915 0.308848 5.48721 0.850586 4.40723C2.16699 1.79267 4.87272 0 8 0Z" fill="black"/>
-</svg>