Move terminal selection/command tools to core (#545)

* Move terminal selection/command tools to core

Part of microsoft/vscode#259260

* Update baseline

Author: Tyriar

package-lock.json

@@ -22,7 +22,7 @@
 	"icon": "assets/copilot.png",
 	"pricing": "Trial",
 	"engines": {
-		"vscode": "^1.104.0",
+		"vscode": "^1.104.0-20250811",
 		"npm": ">=9.0.0",
 		"node": ">=22.14.0"
 	},
@@ -495,24 +495,6 @@
 				},
 				"when": "config.github.copilot.chat.enableUserPreferences"
 			},
-			{
-				"name": "copilot_getTerminalSelection",
-				"toolReferenceName": "terminalSelection",
-				"displayName": "%github.copilot.tools.terminalSelection.name%",
-				"modelDescription": "Get the user's current selection in the active terminal.",
-				"userDescription": "%github.copilot.tools.terminalSelection.description%",
-				"canBeReferencedInPrompt": true,
-				"icon": "$(terminal)"
-			},
-			{
-				"name": "copilot_getTerminalLastCommand",
-				"toolReferenceName": "terminalLastCommand",
-				"displayName": "%github.copilot.tools.terminalLastCommand.name%",
-				"modelDescription": "Get the active terminal's last run command.",
-				"userDescription": "%github.copilot.tools.terminalLastCommand.description%",
-				"canBeReferencedInPrompt": true,
-				"icon": "$(terminal)"
-			},
 			{
 				"name": "copilot_createNewWorkspace",
 				"displayName": "%github.copilot.tools.createNewWorkspace.name%",
@@ -1834,26 +1816,11 @@
 				"icon": "$(inspect)",
 				"category": "Developer"
 			},
-			{
-				"command": "github.copilot.terminal.explainTerminalSelection",
-				"title": "%github.copilot.command.explainTerminalSelection%",
-				"category": "GitHub Copilot"
-			},
-			{
-				"command": "github.copilot.terminal.explainTerminalSelectionContextMenu",
-				"title": "%github.copilot.command.explainTerminalSelectionContextMenu%",
-				"category": "GitHub Copilot"
-			},
 			{
 				"command": "github.copilot.terminal.explainTerminalLastCommand",
 				"title": "%github.copilot.command.explainTerminalLastCommand%",
 				"category": "GitHub Copilot"
 			},
-			{
-				"command": "github.copilot.terminal.attachTerminalSelection",
-				"title": "%github.copilot.command.attachTerminalSelection%",
-				"category": "GitHub Copilot"
-			},
 			{
 				"command": "github.copilot.git.generateCommitMessage",
 				"title": "%github.copilot.git.generateCommitMessage%",
@@ -2847,16 +2814,6 @@
 					"group": "copilotAction@5"
 				}
 			],
-			"terminal/context/chat": [
-				{
-					"command": "github.copilot.terminal.explainTerminalSelectionContextMenu",
-					"group": "copilotAction@1"
-				},
-				{
-					"command": "github.copilot.terminal.attachTerminalSelection",
-					"group": "zEditContext@1"
-				}
-			],
 			"testing/item/result": [
 				{
 					"command": "github.copilot.tests.fixTestFailure.fromInline",
@@ -2888,10 +2845,6 @@
 					"command": "github.copilot.chat.startCopilotDebugCommand",
 					"when": "false"
 				},
-				{
-					"command": "github.copilot.terminal.explainTerminalSelectionContextMenu",
-					"when": "false"
-				},
 				{
 					"command": "github.copilot.git.generateCommitMessage",
 					"when": "false"

package.json

@@ -80,10 +80,7 @@
 	"github.copilot.command.showContextInspectorView": "Inspect Language Context",
 	"github.copilot.command.resetVirtualToolGroups": "Reset Virtual Tool Groups",
 	"github.copilot.command.applySuggestionWithCopilot": "Apply Suggestion",
-	"github.copilot.command.explainTerminalSelection": "Explain Terminal Selection",
-	"github.copilot.command.explainTerminalSelectionContextMenu": "Explain",
 	"github.copilot.command.explainTerminalLastCommand": "Explain Last Terminal Command",
-	"github.copilot.command.attachTerminalSelection": "Add Terminal Selection to Chat",
 	"github.copilot.command.collectWorkspaceIndexDiagnostics": "Collect Workspace Index Diagnostics",
 	"github.copilot.git.generateCommitMessage": "Generate Commit Message",
 	"github.copilot.devcontainer.generateDevContainerConfig": "Generate Dev Container Configuration",
@@ -225,10 +222,6 @@
 	"github.copilot.chat.languageContext.inline.typescript.enabled": "Enables the TypeScript language context provider for inline chats (both generate and edit)",
 	"github.copilot.command.rerunWithCopilotDebug": "Debug Last Terminal Command",
 	"github.copilot.config.enableUserPreferences": "Enable remembering user preferences in agent mode.",
-	"github.copilot.tools.terminalSelection.name": "Terminal Selection",
-	"github.copilot.tools.terminalSelection.description": "The active terminal's selection",
-	"github.copilot.tools.terminalLastCommand.name": "Terminal Last Command",
-	"github.copilot.tools.terminalLastCommand.description": "The active terminal's last run command",
 	"github.copilot.tools.createAndRunTask.name": "Create and Run Task",
 	"github.copilot.tools.createAndRunTask.description": "Create and run a task in the workspace",
 	"github.copilot.tools.createAndRunTask.userDescription": "Create and run a task in the workspace",

package.nls.json

@@ -34,7 +34,6 @@ import { InlineCodeSymbolLinkifier } from '../../linkify/vscode-node/inlineCodeS
 import { NotebookCellLinkifier } from '../../linkify/vscode-node/notebookCellLinkifier';
 import { SymbolLinkifier } from '../../linkify/vscode-node/symbolLinkifier';
 import { IntentDetector } from '../../prompt/node/intentDetector';
-import { ContributedToolName } from '../../tools/common/toolNames';
 import { SemanticSearchTextSearchProvider } from '../../workspaceSemanticSearch/node/semanticSearchTextSearchProvider';
 import { GitHubPullRequestProviders } from '../node/githubPullRequestProviders';
 import { startFeedbackCollection } from './feedbackCollection';
@@ -210,9 +209,6 @@ export class ConversationFeature implements IExtensionContribution {
 			vscode.commands.registerCommand('github.copilot.interactiveSession.feedback', async () => {
 				return vscode.env.openExternal(vscode.Uri.parse(FEEDBACK_URL));
 			}),
-			vscode.commands.registerCommand('github.copilot.terminal.explainTerminalSelection', async () => this.triggerTerminalChat({ query: `/${TerminalExplainIntent.intentName} #terminalSelection` })),
-			// This command is an alias to use a different title in the context menu
-			vscode.commands.registerCommand('github.copilot.terminal.explainTerminalSelectionContextMenu', () => vscode.commands.executeCommand('github.copilot.terminal.explainTerminalSelection')),
 			vscode.commands.registerCommand('github.copilot.terminal.explainTerminalLastCommand', async () => this.triggerTerminalChat({ query: `/${TerminalExplainIntent.intentName} #terminalLastCommand` })),
 			vscode.commands.registerCommand('github.copilot.terminal.fixTerminalLastCommand', async () => generateTerminalFixes(this.instantiationService)),
 			vscode.commands.registerCommand('github.copilot.terminal.generateCommitMessage', async () => {
@@ -239,12 +235,6 @@ export class ConversationFeature implements IExtensionContribution {
 					vscode.window.activeTerminal?.sendText(message, false);
 				}
 			}),
-			vscode.commands.registerCommand('github.copilot.terminal.attachTerminalSelection', async () => {
-				await vscode.commands.executeCommand('workbench.action.chat.open', {
-					toolIds: [ContributedToolName.TerminalSelection],
-					isPartialQuery: true
-				});
-			}),
 			vscode.commands.registerCommand('github.copilot.git.generateCommitMessage', async (rootUri: vscode.Uri | undefined, _: vscode.SourceControlInputBoxValueProviderContext[], cancellationToken: vscode.CancellationToken | undefined) => {
 				const repository = this.gitCommitMessageService.getRepository(rootUri);
 				if (!repository) {

src/extension/conversation/vscode-node/conversationFeature.ts

@@ -19,8 +19,6 @@ export const enum ToolName {
 	GetScmChanges = 'get_changed_files',
 	UpdateUserPreferences = 'update_user_preferences',
 	ReadProjectStructure = 'read_project_structure',
-	TerminalSelection = 'get_terminal_selection',
-	TerminalLastCommand = 'get_terminal_last_command',
 	CreateNewWorkspace = 'create_new_workspace',
 	CreateNewJupyterNotebook = 'create_new_jupyter_notebook',
 	SearchWorkspaceSymbols = 'search_workspace_symbols',
@@ -47,6 +45,8 @@ export const enum ToolName {
 	CoreManageTodoList = 'manage_todo_list',
 	CoreRunInTerminal = 'run_in_terminal',
 	CoreGetTerminalOutput = 'get_terminal_output',
+	CoreTerminalSelection = 'terminal_selection',
+	CoreTerminalLastCommand = 'terminal_last_command',
 	CoreCreateAndRunTask = 'create_and_run_task',
 	CoreRunTask = 'run_task',
 	CoreGetTaskOutput = 'get_task_output',
@@ -72,8 +72,6 @@ export const enum ContributedToolName {
 	DocInfo = 'copilot_getDocInfo',
 	GetScmChanges = 'copilot_getChangedFiles',
 	ReadProjectStructure = 'copilot_readProjectStructure',
-	TerminalSelection = 'copilot_getTerminalSelection',
-	TerminalLastCommand = 'copilot_getTerminalLastCommand',
 	CreateNewWorkspace = 'copilot_createNewWorkspace',
 	CreateNewJupyterNotebook = 'copilot_createNewJupyterNotebook',
 	EditFile = 'copilot_insertEdit',
@@ -113,8 +111,6 @@ const contributedToolNameToToolNames = new Map<ContributedToolName, ToolName>([
 	[ContributedToolName.ReadProjectStructure, ToolName.ReadProjectStructure],
 	[ContributedToolName.EditFile, ToolName.EditFile],
 	[ContributedToolName.UpdateUserPreferences, ToolName.UpdateUserPreferences],
-	[ContributedToolName.TerminalSelection, ToolName.TerminalSelection],
-	[ContributedToolName.TerminalLastCommand, ToolName.TerminalLastCommand],
 	[ContributedToolName.CreateNewWorkspace, ToolName.CreateNewWorkspace],
 	[ContributedToolName.CreateNewJupyterNotebook, ToolName.CreateNewJupyterNotebook],
 	[ContributedToolName.InstallExtension, ToolName.InstallExtension],

src/extension/tools/common/toolNames.ts

@@ -30,7 +30,6 @@ import './runNotebookCellTool';
 import './scmChangesTool';
 import './searchWorkspaceSymbolsTool';
 import './simpleBrowserTool';
-import './terminalStateTools';
 import './testFailureTool';
 import './thinkTool';
 import './usagesTool';

src/extension/tools/node/allTools.ts

@@ -205,6 +205,8 @@ export function getPackagejsonToolsForTest() {
 	// Since it can't get info like `canBeReferencedInPrompt` from the extension API, we have to hardcode tool names here.
 	tools.add(ToolName.CoreRunInTerminal);
 	tools.add(ToolName.CoreGetTerminalOutput);
+	tools.add(ToolName.CoreTerminalLastCommand);
+	tools.add(ToolName.CoreTerminalSelection);
 	tools.add(ToolName.CoreCreateAndRunTask);
 	tools.add(ToolName.CoreGetTaskOutput);
 	tools.add(ToolName.CoreRunTask);

src/extension/tools/node/terminalStateTools.tsx

@@ -2,7 +2,7 @@
 	{
 		"name": "explain (expanded context) [panel] [cpp] - includes and interprets variables",
 		"requests": [
-			"bc518d1c072f945e5811dc213f87414fa1674b7bca593789d3a9afc2c3b092d1"
+			"4db355fc22e8bdc2b7e9410ed48132224bc04db9097773d1a49c1c2974f668a5"
 		]
 	},
 	{

src/extension/tools/node/test/testToolsService.ts

@@ -8,7 +8,7 @@
 	{
 		"name": "variables [panel] [typescript] - Summarize #terminalSelection",
 		"requests": [
-			"1f86a4b500a352a69162c116252b2292057ae2265b23a084b79e53cd239c8c9c"
+			"1acb67b50e0fda04a5e2a32a1222503b581596a473bea4730186ac240aec432f"
 		]
 	}
 ]