Register terminal variables from vscode

src/vs/platform/extensions/common/extensionsApiProposals.ts

@@ -33,7 +33,7 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 2
+		version: 3
 	},
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -90,6 +90,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IPromptSyntaxService } from '../common/promptSyntax/service/types.js';
 import { PromptSyntaxService } from '../common/promptSyntax/service/promptSyntaxService.js';
+import { BuiltinVariablesContribution } from './variables/variables.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -391,6 +392,7 @@ registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingSta
 registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(BuiltinVariablesContribution.ID, BuiltinVariablesContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.BlockRestore);
 
 registerChatActions();

src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts

@@ -22,7 +22,6 @@ import { IOutlineModelService } from '../../../../../editor/contrib/documentSymb
 import { localize } from '../../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
@@ -835,7 +834,6 @@ class VariableCompletions extends Disposable {
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
-		@IConfigurationService configService: IConfigurationService,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService
 	) {
 		super();

src/vs/workbench/contrib/chat/browser/variables/variables.ts

@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ProviderResult } from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
+import { IChatModel } from '../../common/chatModel.js';
+import { IChatRequestVariableValue, IChatVariableResolverProgress, IChatVariablesService } from '../../common/chatVariables.js';
+
+export class BuiltinVariablesContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.builtinVariables';
+
+	constructor(
+		@IChatVariablesService varsService: IChatVariablesService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		const terminalSelectionVar = instantiationService.createInstance(TerminalSelectionVariable);
+		varsService.registerVariable({
+			id: 'copilot.terminalSelection',
+			name: 'terminalSelection',
+			fullName: localize('termSelection', "Terminal Selection"),
+			description: localize('termSelectionDescription', "The active terminal's selection"),
+			icon: Codicon.terminal,
+		}, async (messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined> => {
+			return await terminalSelectionVar.resolve(token);
+		});
+
+		const terminalLastCommandVar = instantiationService.createInstance(TerminalLastCommandVariable);
+		varsService.registerVariable({
+			id: 'copilot.terminalLastCommand',
+			name: 'terminalLastCommand',
+			fullName: localize('terminalLastCommand', "Terminal Last Command"),
+			description: localize('termLastCommandDesc', "The active terminal's last run command"),
+			icon: Codicon.terminal,
+		}, async (messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined> => {
+			return await terminalLastCommandVar.resolve(token);
+		});
+	}
+}
+
+class TerminalSelectionVariable {
+	constructor(
+		@ITerminalService private readonly terminalService: ITerminalService
+	) { }
+
+	resolve(token: CancellationToken): ProviderResult<IChatRequestVariableValue> {
+		const terminalSelection = this.terminalService.activeInstance?.selection;
+		return terminalSelection ? `The active terminal's selection:\n${terminalSelection}` : undefined;
+	}
+}
+
+class TerminalLastCommandVariable {
+	constructor(
+		@ITerminalService private readonly terminalService: ITerminalService
+	) { }
+
+	resolve(token: CancellationToken): ProviderResult<IChatRequestVariableValue> {
+		const lastCommand = this.terminalService.activeInstance?.capabilities.get(TerminalCapability.CommandDetection)?.commands.at(-1);
+		if (!lastCommand) {
+			return;
+		}
+
+		const userPrompt: string[] = [];
+		userPrompt.push(`The following is the last command run in the terminal:`);
+		userPrompt.push(lastCommand.command);
+		if (lastCommand.cwd) {
+			userPrompt.push(`It was run in the directory:`);
+			userPrompt.push(lastCommand.cwd);
+		}
+		const output = lastCommand.getOutput();
+		if (output) {
+			userPrompt.push(`It has the following output:`);
+			userPrompt.push(output);
+		}
+
+		const prompt = userPrompt.join('\n');
+		return `The active terminal's last run command:\n${prompt}`;
+	}
+}

src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 2
+// version: 3
 
 declare module 'vscode' {