@codingame/monaco-vscode-chat-service-override 22.1.9 → 23.0.0

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

@@ -0,0 +1,71 @@
+
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { RunInTerminalTool } from './runInTerminalTool.js';
+
+const ConfirmTerminalCommandToolData = {
+    id: 'vscode_get_terminal_confirmation',
+    displayName: ( localize(11865, 'Confirm Terminal Command')),
+    modelDescription: [
+        'This tool allows you to get explicit user confirmation for a terminal command without executing it.',
+        '',
+        'When to use:',
+        '- When you need to verify user approval before executing a command',
+        '- When you want to show command details, auto-approval status, and simplified versions to the user',
+        '- When you need the user to review a potentially risky command',
+        '',
+        'The tool will:',
+        '- Show the command with syntax highlighting',
+        '- Display auto-approval status if enabled',
+        '- Show simplified version of the command if applicable',
+        '- Provide custom actions for creating auto-approval rules',
+        '- Return approval/rejection status',
+        '',
+        'After confirmation, use a tool to actually execute the command.'
+    ].join('\n'),
+    userDescription: ( localize(11866, 'Tool for confirming terminal commands')),
+    source: ToolDataSource.Internal,
+    icon: Codicon.shield,
+    inputSchema: {
+        type: 'object',
+        properties: {
+            command: {
+                type: 'string',
+                description: 'The command to confirm with the user.'
+            },
+            explanation: {
+                type: 'string',
+                description: 'A one-sentence description of what the command does. This will be shown to the user in the confirmation dialog.'
+            },
+            isBackground: {
+                type: 'boolean',
+                description: 'Whether the command would start a background process. This provides context for the confirmation.'
+            },
+        },
+        required: [
+            'command',
+            'explanation',
+            'isBackground',
+        ]
+    }
+};
+class ConfirmTerminalCommandTool extends RunInTerminalTool {
+    async prepareToolInvocation(context, token) {
+        const preparedInvocation = await super.prepareToolInvocation(context, token);
+        if (preparedInvocation) {
+            preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
+        }
+        return preparedInvocation;
+    }
+    async invoke(invocation, countTokens, progress, token) {
+        return {
+            content: [{
+                    kind: 'text',
+                    value: 'yes'
+                }]
+        };
+    }
+}
+
+export { ConfirmTerminalCommandTool, ConfirmTerminalCommandToolData };

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 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 { IInstantiationService, type ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITerminalProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
@@ -10,41 +10,44 @@ import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } 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 { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
-import { CommandLineAutoApprover } from "../commandLineAutoApprover.js";
 import { type IToolTerminal } from "../toolTerminalCreator.js";
-export declare const RunInTerminalToolData: IToolData;
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service";
+export declare function createRunInTerminalToolData(accessor: ServicesAccessor): Promise<IToolData>;
 export interface IRunInTerminalInputParams {
     command: string;
     explanation: string;
     isBackground: boolean;
 }
 export declare class RunInTerminalTool extends Disposable implements IToolImpl {
-    private readonly _instantiationService;
+    private readonly _chatService;
     private readonly _configurationService;
+    private readonly _historyService;
+    private readonly _instantiationService;
     private readonly _languageModelToolsService;
+    private readonly _remoteAgentService;
     private readonly _storageService;
+    private readonly _terminalChatService;
     private readonly _logService;
-    private readonly _terminalProfileResolverService;
     private readonly _terminalService;
-    private readonly _remoteAgentService;
-    private readonly _chatService;
+    private readonly _workspaceContextService;
     private readonly _terminalToolCreator;
-    private readonly _commandSimplifier;
+    private readonly _treeSitterCommandParser;
     private readonly _telemetry;
-    protected readonly _commandLineAutoApprover: CommandLineAutoApprover;
+    protected readonly _profileFetcher: TerminalProfileFetcher;
+    private readonly _commandLineRewriters;
+    private readonly _commandLineAnalyzers;
     protected readonly _sessionTerminalAssociations: Map<string, IToolTerminal>;
     protected readonly _osBackend: Promise<OperatingSystem>;
     private static readonly _backgroundExecutions;
     static getBackgroundOutput(id: string): string;
-    constructor(_instantiationService: IInstantiationService, _configurationService: IConfigurationService, _languageModelToolsService: ILanguageModelToolsService, _storageService: IStorageService, _logService: ITerminalLogService, _terminalProfileResolverService: ITerminalProfileResolverService, _terminalService: ITerminalService, _remoteAgentService: IRemoteAgentService, _chatService: IChatService);
+    constructor(_chatService: IChatService, _configurationService: IConfigurationService, _historyService: IHistoryService, _instantiationService: IInstantiationService, _languageModelToolsService: ILanguageModelToolsService, _remoteAgentService: IRemoteAgentService, _storageService: IStorageService, _terminalChatService: ITerminalChatService, _logService: ITerminalLogService, _terminalService: ITerminalService, _workspaceContextService: IWorkspaceContextService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
-    protected _getCopilotShellOrProfile(): Promise<string | ITerminalProfile>;
-    private _getCopilotShell;
-    private _getChatTerminalProfile;
-    private _isValidChatAgentTerminalProfile;
+    private _handleTerminalVisibility;
     private _initBackgroundTerminal;
     private _initForegroundTerminal;
     private _registerInputListener;
@@ -53,5 +56,15 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     private _associateProcessIdWithSession;
     private _removeProcessIdAssociation;
     private _cleanupSessionTerminals;
-    private _createAutoApproveInfo;
+}
+export declare class TerminalProfileFetcher {
+    private readonly _configurationService;
+    private readonly _terminalProfileResolverService;
+    private readonly _remoteAgentService;
+    readonly osBackend: Promise<OperatingSystem>;
+    constructor(_configurationService: IConfigurationService, _terminalProfileResolverService: ITerminalProfileResolverService, _remoteAgentService: IRemoteAgentService);
+    getCopilotProfile(): Promise<ITerminalProfile>;
+    getCopilotShell(): Promise<string>;
+    private _getChatTerminalProfile;
+    private _isValidChatAgentTerminalProfile;
 }