@vscode/chat-lib 0.0.3 → 0.0.5-0

package/dist/src/package.json

@@ -2,11 +2,11 @@
 	"name": "copilot-chat",
 	"displayName": "GitHub Copilot Chat",
 	"description": "AI chat features powered by Copilot",
-	"version": "0.32.0",
+	"version": "0.33.0",
 	"build": "1",
 	"internalAIKey": "1058ec22-3c95-4951-8443-f26c1f325911",
-	"completionsCore": "5074adaf497a498dec0dcdf1a468521c2c7be608",
-	"completionsCoreVersion": "1.367.1777",
+	"completionsCore": "b90dd24adc81d9d2d9b64817dd37638854201fc3",
+	"completionsCoreVersion": "1.378.1798",
 	"internalLargeStorageAriaKey": "ec712b3202c5462fb6877acae7f1f9d7-c19ad55e-3e3c-4f99-984b-827f6d95bd9e-6917",
 	"ariaKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
 	"buildType": "dev",
@@ -24,7 +24,7 @@
 	"icon": "assets/copilot.png",
 	"pricing": "Trial",
 	"engines": {
-		"vscode": "^1.104.0-20250905",
+		"vscode": "^1.106.0",
 		"npm": ">=9.0.0",
 		"node": ">=22.14.0"
 	},
@@ -117,7 +117,7 @@
 		"authLearnMore",
 		"testObserver",
 		"aiTextSearchProvider@2",
-		"chatParticipantPrivate@10",
+		"chatParticipantPrivate@11",
 		"chatProvider@4",
 		"contribDebugCreateConfiguration",
 		"chatReferenceDiagnostic",
@@ -126,7 +126,6 @@
 		"languageModelSystem",
 		"languageModelCapabilities",
 		"inlineCompletionsAdditions",
-		"languageModelDataPart@3",
 		"chatStatusItem",
 		"taskProblemMatcherStatus",
 		"contribLanguageModelToolSets",
@@ -135,7 +134,9 @@
 		"taskExecutionTerminal",
 		"dataChannels",
 		"languageModelThinkingPart",
-		"chatSessionsProvider"
+		"chatSessionsProvider@2",
+		"devDeviceId",
+		"contribEditorContentMenu"
 	],
 	"contributes": {
 		"languageModelTools": [
@@ -164,12 +165,12 @@
 				}
 			},
 			{
-				"name": "execute_task",
-				"toolReferenceName": "executeTask",
-				"displayName": "Execute Task",
-				"when": "config.github.copilot.chat.advanced.taskTools.enabled",
+				"name": "runSubagent",
+				"toolReferenceName": "runSubagent",
+				"displayName": "%copilot.tools.runSubagent.name%",
 				"canBeReferencedInPrompt": true,
-				"modelDescription": "Launch a new agent to handle complex, multi-step tasks autonomously. This tool is good at researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries, use this agent to perform the search for you.\n\n- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.\n - Each agent invocation is stateless. You will not be able to send additional messages to the agent, nor will the agent be able to communicate with you outside of its final report. Therefore, your prompt should contain a highly detailed task description for the agent to perform autonomously and you should specify exactly what information the agent should return back to you in its final and only message to you.\n - The agent's outputs should generally be trusted\n - Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user's intent",
+				"userDescription": "%copilot.tools.runSubagent.description%",
+				"modelDescription": "Launch a new agent to handle complex, multi-step tasks autonomously. This tool is good at researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries, use this agent to perform the search for you.\n\n- Agents do not run async or in the background, you will wait for the agent's result.\n- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.\n - Each agent invocation is stateless. You will not be able to send additional messages to the agent, nor will the agent be able to communicate with you outside of its final report. Therefore, your prompt should contain a highly detailed task description for the agent to perform autonomously and you should specify exactly what information the agent should return back to you in its final and only message to you.\n - The agent's outputs should generally be trusted\n - Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user's intent",
 				"tags": [],
 				"inputSchema": {
 					"type": "object",
@@ -189,27 +190,6 @@
 					]
 				}
 			},
-			{
-				"name": "execute_prompt",
-				"toolReferenceName": "executePrompt",
-				"displayName": "Execute Prompt",
-				"when": "config.github.copilot.chat.advanced.taskTools.enabled",
-				"canBeReferencedInPrompt": true,
-				"modelDescription": "This tool can take a path to a user's prompt file as input, and execute it autonomously. If the user's prompt includes multiple references to .prompt.md files, then you should use this tool to execute those prompts in sequence.\n\n- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.\n - The agent's outputs should generally be trusted",
-				"tags": [],
-				"inputSchema": {
-					"type": "object",
-					"properties": {
-						"filePath": {
-							"type": "string",
-							"description": "The absolute path to the prompt file to execute"
-						}
-					},
-					"required": [
-						"filePath"
-					]
-				}
-			},
 			{
 				"name": "copilot_searchWorkspaceSymbols",
 				"toolReferenceName": "symbols",
@@ -286,27 +266,6 @@
 				"tags": [],
 				"canBeReferencedInPrompt": true
 			},
-			{
-				"displayName": "%copilot.tools.think.name%",
-				"name": "copilot_think",
-				"tags": [],
-				"canBeReferencedInPrompt": true,
-				"toolReferenceName": "think",
-				"when": "config.github.copilot.chat.agent.thinkingTool",
-				"modelDescription": "Use this tool to think deeply about the user's request and organize your thoughts. This tool helps improve response quality by allowing the model to consider the request carefully, brainstorm solutions, and plan complex tasks. It's particularly useful for:\n\n1. Exploring repository issues and brainstorming bug fixes\n2. Analyzing test results and planning fixes\n3. Planning complex refactoring approaches\n4. Designing new features and architecture\n5. Organizing debugging hypotheses\n\nThe tool logs your thought process for transparency but doesn't execute any code or make changes.",
-				"inputSchema": {
-					"type": "object",
-					"properties": {
-						"thoughts": {
-							"type": "string",
-							"description": "Your thoughts about the current task or problem. This should be a clear, structured explanation of your reasoning, analysis, or planning process."
-						}
-					},
-					"required": [
-						"thoughts"
-					]
-				}
-			},
 			{
 				"name": "copilot_findFiles",
 				"toolReferenceName": "fileSearch",
@@ -455,7 +414,7 @@
 					"type": "object",
 					"properties": {
 						"filePaths": {
-							"description": "The absolute paths to the files to check for errors. Omit 'filePaths' when retrieving all errors.",
+							"description": "The absolute paths to the files or folders to check for errors. Omit 'filePaths' when retrieving all errors.",
 							"type": "array",
 							"items": {
 								"type": "string"
@@ -1233,8 +1192,7 @@
 				"isDefault": true,
 				"when": "config.inlineChat.enableV2 || config.github.copilot.chat.advanced.inlineChat2",
 				"locations": [
-					"editor",
-					"notebook"
+					"editor"
 				],
 				"commands": [
 					{
@@ -1435,7 +1393,7 @@
 				"locations": [
 					"notebook"
 				],
-				"when": "!config.inlineChat.enableV2 && !config.github.copilot.chat.advanced.inlineChat2",
+				"when": "!config.inlineChat.notebookAgent",
 				"commands": [
 					{
 						"name": "fix",
@@ -1456,7 +1414,7 @@
 				"locations": [
 					"notebook"
 				],
-				"when": "config.inlineChat.enableV2",
+				"when": "config.inlineChat.notebookAgent",
 				"commands": [
 					{
 						"name": "fix",
@@ -1617,12 +1575,6 @@
 						"name": "search",
 						"description": "%copilot.vscode.search.description%",
 						"sampleRequest": "%copilot.vscode.search.sampleRequest%"
-					},
-					{
-						"name": "startDebugging",
-						"description": "%copilot.vscode.startDebugging.description%",
-						"sampleRequest": "%copilot.vscode.startDebugging.sampleRequest%",
-						"when": "config.github.copilot.chat.startDebugging.enabled"
 					}
 				]
 			},
@@ -1794,14 +1746,39 @@
 		"commands": [
 			{
 				"command": "github.copilot.claude.sessions.refresh",
-				"title": "Refresh Claude Code Sessions",
+				"title": "%github.copilot.command.refreshClaudeCodeSessions%",
 				"icon": "$(refresh)",
 				"category": "Claude Code"
 			},
+			{
+				"command": "github.copilot.cli.sessions.refresh",
+				"title": "Refresh Copilot CLI Agent Sessions",
+				"icon": "$(refresh)",
+				"category": "Copilot CLI"
+			},
+			{
+				"command": "github.copilot.cli.sessions.delete",
+				"title": "Delete Copilot CLI Agent Session",
+				"icon": "$(close)",
+				"category": "Copilot CLI"
+			},
+			{
+				"command": "github.copilot.cli.sessions.resumeInTerminal",
+				"title": "Resume Agent Session in Terminal",
+				"icon": "$(terminal)",
+				"category": "Copilot CLI"
+			},
+			{
+				"command": "github.copilot.cli.sessions.newTerminalSession",
+				"title": "New Agent Session in Terminal",
+				"icon": "$(terminal)",
+				"category": "Copilot CLI"
+			},
 			{
 				"command": "github.copilot.chat.replay",
 				"title": "Start Chat Replay",
-				"icon": "$(debug-line-by-line)"
+				"icon": "$(debug-line-by-line)",
+				"enablement": "resourceLangId == chatReplay && !inDebugMode"
 			},
 			{
 				"command": "github.copilot.chat.replay.enableWorkspaceEditTracing",
@@ -1819,122 +1796,122 @@
 				"command": "github.copilot.chat.explain",
 				"title": "%github.copilot.command.explainThis%",
 				"enablement": "!github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.explain.palette",
 				"title": "%github.copilot.command.explainThis%",
 				"enablement": "!github.copilot.interactiveSession.disabled && !editorReadonly",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review",
 				"title": "%github.copilot.command.reviewAndComment%",
 				"enablement": "config.github.copilot.chat.reviewSelection.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.apply",
 				"title": "%github.copilot.command.applyReviewSuggestion%",
 				"icon": "$(sparkle)",
 				"enablement": "commentThread =~ /hasSuggestion/",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.applyAndNext",
 				"title": "%github.copilot.command.applyReviewSuggestionAndNext%",
 				"icon": "$(sparkle)",
 				"enablement": "commentThread =~ /hasSuggestion/",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.discard",
 				"title": "%github.copilot.command.discardReviewSuggestion%",
 				"icon": "$(close)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.discardAndNext",
 				"title": "%github.copilot.command.discardReviewSuggestionAndNext%",
 				"icon": "$(close)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.discardAll",
 				"title": "%github.copilot.command.discardAllReviewSuggestion%",
 				"icon": "$(close-all)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.stagedChanges",
 				"title": "%github.copilot.command.reviewStagedChanges%",
 				"icon": "$(code-review)",
 				"enablement": "github.copilot.chat.reviewDiff.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.unstagedChanges",
 				"title": "%github.copilot.command.reviewUnstagedChanges%",
 				"icon": "$(code-review)",
 				"enablement": "github.copilot.chat.reviewDiff.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.changes",
 				"title": "%github.copilot.command.reviewChanges%",
 				"icon": "$(code-review)",
 				"enablement": "github.copilot.chat.reviewDiff.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.stagedFileChange",
 				"title": "%github.copilot.command.reviewFileChange%",
 				"icon": "$(code-review)",
 				"enablement": "github.copilot.chat.reviewDiff.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.unstagedFileChange",
 				"title": "%github.copilot.command.reviewFileChange%",
 				"icon": "$(code-review)",
 				"enablement": "github.copilot.chat.reviewDiff.enabled && !github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.previous",
 				"title": "%github.copilot.command.gotoPreviousReviewSuggestion%",
 				"icon": "$(arrow-up)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.next",
 				"title": "%github.copilot.command.gotoNextReviewSuggestion%",
 				"icon": "$(arrow-down)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.continueInInlineChat",
 				"title": "%github.copilot.command.continueReviewInInlineChat%",
 				"icon": "$(comment-discussion)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.continueInChat",
 				"title": "%github.copilot.command.continueReviewInChat%",
 				"icon": "$(comment-discussion)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.review.markHelpful",
 				"title": "%github.copilot.command.helpfulReviewSuggestion%",
 				"icon": "$(thumbsup)",
 				"enablement": "!(commentThread =~ /markedAsHelpful/)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.openUserPreferences",
 				"title": "%github.copilot.command.openUserPreferences%",
-				"category": "GitHub Copilot",
+				"category": "Chat",
 				"enablement": "config.github.copilot.chat.enableUserPreferences"
 			},
 			{
@@ -1942,39 +1919,39 @@
 				"title": "%github.copilot.command.unhelpfulReviewSuggestion%",
 				"icon": "$(thumbsdown)",
 				"enablement": "!(commentThread =~ /markedAsUnhelpful/)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.generate",
 				"title": "%github.copilot.command.generateThis%",
 				"icon": "$(sparkle)",
 				"enablement": "!github.copilot.interactiveSession.disabled && !editorReadonly",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.generateDocs",
 				"title": "%github.copilot.command.generateDocs%",
 				"enablement": "!github.copilot.interactiveSession.disabled && !editorReadonly",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.generateTests",
 				"title": "%github.copilot.command.generateTests%",
 				"enablement": "!github.copilot.interactiveSession.disabled && !editorReadonly",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.fix",
 				"title": "%github.copilot.command.fixThis%",
 				"enablement": "!github.copilot.interactiveSession.disabled && !editorReadonly",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.interactiveSession.feedback",
 				"title": "%github.copilot.command.sendChatFeedback%",
 				"enablement": "github.copilot-chat.activated && !github.copilot.interactiveSession.disabled",
 				"icon": "$(feedback)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.debug.workbenchState",
@@ -1986,6 +1963,11 @@
 				"title": "%github.copilot.command.showChatLogView%",
 				"category": "Developer"
 			},
+			{
+				"command": "github.copilot.debug.showOutputChannel",
+				"title": "%github.copilot.command.showOutputChannel%",
+				"category": "Developer"
+			},
 			{
 				"command": "github.copilot.debug.showContextInspectorView",
 				"title": "%github.copilot.command.showContextInspectorView%",
@@ -2001,36 +1983,48 @@
 			{
 				"command": "github.copilot.terminal.explainTerminalLastCommand",
 				"title": "%github.copilot.command.explainTerminalLastCommand%",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.git.generateCommitMessage",
 				"title": "%github.copilot.git.generateCommitMessage%",
 				"icon": "$(sparkle)",
 				"enablement": "!github.copilot.interactiveSession.disabled",
-				"category": "GitHub Copilot"
+				"category": "Chat"
+			},
+			{
+				"command": "github.copilot.git.resolveMergeConflicts",
+				"title": "%github.copilot.git.resolveMergeConflicts%",
+				"icon": "$(chat-sparkle)",
+				"enablement": "!github.copilot.interactiveSession.disabled",
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.devcontainer.generateDevContainerConfig",
 				"title": "%github.copilot.devcontainer.generateDevContainerConfig%",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.tests.fixTestFailure",
 				"icon": "$(sparkle)",
 				"title": "%github.copilot.command.fixTestFailure%",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.tests.fixTestFailure.fromInline",
 				"icon": "$(sparkle)",
 				"title": "%github.copilot.command.fixTestFailure%"
 			},
+			{
+				"command": "github.copilot.chat.attachFile",
+				"title": "%github.copilot.chat.attachFile%",
+				"category": "Chat"
+			},
 			{
 				"command": "github.copilot.chat.attachSelection",
 				"title": "%github.copilot.chat.attachSelection%",
 				"icon": "$(comment-discussion)",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.debug.collectDiagnostics",
@@ -2046,55 +2040,46 @@
 				"command": "github.copilot.debug.inlineEdit.reportNotebookNESIssue",
 				"title": "%github.copilot.command.inlineEdit.reportNotebookNESIssue%",
 				"enablement": "config.github.copilot.chat.advanced.notebook.alternativeNESFormat.enabled || github.copilot.chat.enableEnhancedNotebookNES",
-				"category": "GitHub Copilot Developer"
+				"category": "Developer"
 			},
 			{
 				"command": "github.copilot.debug.generateSTest",
 				"title": "%github.copilot.command.generateSTest%",
 				"enablement": "github.copilot.debugReportFeedback",
-				"category": "GitHub Copilot Developer"
-			},
-			{
-				"command": "github.copilot.debug.generateConfiguration",
-				"title": "%github.copilot.command.generateConfiguration%",
-				"category": "GitHub Copilot",
-				"enablement": "config.github.copilot.chat.startDebugging.enabled",
-				"tags": [
-					"experimental"
-				]
+				"category": "Developer"
 			},
 			{
 				"command": "github.copilot.open.walkthrough",
 				"title": "%github.copilot.command.openWalkthrough%",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.debug.generateInlineEditTests",
 				"title": "Generate Inline Edit Tests",
-				"category": "GitHub Copilot",
+				"category": "Chat",
 				"enablement": "resourceScheme == 'ccreq'"
 			},
 			{
 				"command": "github.copilot.buildLocalWorkspaceIndex",
 				"title": "%github.copilot.command.buildLocalWorkspaceIndex%",
-				"category": "GitHub Copilot",
+				"category": "Chat",
 				"enablement": "github.copilot-chat.activated"
 			},
 			{
 				"command": "github.copilot.buildRemoteWorkspaceIndex",
 				"title": "%github.copilot.command.buildRemoteWorkspaceIndex%",
-				"category": "GitHub Copilot",
+				"category": "Chat",
 				"enablement": "github.copilot-chat.activated"
 			},
 			{
 				"command": "github.copilot.report",
 				"title": "Report Issue",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.rerunWithCopilotDebug",
 				"title": "%github.copilot.command.rerunWithCopilotDebug%",
-				"category": "GitHub Copilot"
+				"category": "Chat"
 			},
 			{
 				"command": "github.copilot.chat.startCopilotDebugCommand",
@@ -2103,7 +2088,7 @@
 			{
 				"command": "github.copilot.chat.clearTemporalContext",
 				"title": "Clear Temporal Context",
-				"category": "GitHub Copilot (Developer)"
+				"category": "Developer"
 			},
 			{
 				"command": "github.copilot.search.markHelpful",
@@ -2147,6 +2132,10 @@
 				"command": "github.copilot.chat.debug.hideNesRequests",
 				"title": "Hide NES Requests"
 			},
+			{
+				"command": "github.copilot.chat.debug.showRawRequestBody",
+				"title": "Show Raw Request Body"
+			},
 			{
 				"command": "github.copilot.chat.debug.exportLogItem",
 				"title": "Export as...",
@@ -2204,6 +2193,21 @@
 				"command": "github.copilot.chat.manageBYOK",
 				"title": "Manage Bring Your Own Key Vendor",
 				"enablement": "false"
+			},
+			{
+				"command": "github.copilot.chat.manageBYOKAPIKey",
+				"title": "Manage Bring Your Own Key API Key",
+				"enablement": "false"
+			},
+			{
+				"command": "github.copilot.cloud.sessions.refresh",
+				"title": "%github.copilot.command.refreshCopilotAgentSessions%",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "github.copilot.cloud.sessions.openInBrowser",
+				"title": "%github.copilot.command.openCopilotAgentSessionsInBrowser%",
+				"icon": "$(link-external)"
 			}
 		],
 		"configuration": [
@@ -2323,27 +2327,26 @@
 					"github.copilot.chat.agent.autoFix": {
 						"type": "boolean",
 						"default": true,
-						"description": "%github.copilot.config.autoFix%"
+						"description": "%github.copilot.config.autoFix%",
+						"tags": [
+							"onExp"
+						]
 					},
 					"github.copilot.chat.customInstructionsInSystemMessage": {
 						"type": "boolean",
 						"default": true,
 						"description": "%github.copilot.config.customInstructionsInSystemMessage%"
+					},
+					"github.copilot.chat.agent.currentEditorContext.enabled": {
+						"type": "boolean",
+						"default": true,
+						"description": "%github.copilot.config.agent.currentEditorContext.enabled%"
 					}
 				}
 			},
 			{
-				"title": "Preview",
 				"id": "preview",
 				"properties": {
-					"github.copilot.chat.startDebugging.enabled": {
-						"type": "boolean",
-						"default": true,
-						"markdownDescription": "%github.copilot.config.startDebugging.enabled%",
-						"tags": [
-							"preview"
-						]
-					},
 					"github.copilot.chat.reviewAgent.enabled": {
 						"type": "boolean",
 						"default": true,
@@ -2458,16 +2461,16 @@
 				}
 			},
 			{
-				"title": "Experimental",
 				"id": "experimental",
 				"properties": {
-					"github.copilot.chat.agent.thinkingTool": {
+					"github.copilot.chat.imageUpload.enabled": {
 						"type": "boolean",
-						"default": false,
+						"default": true,
 						"tags": [
-							"experimental"
+							"experimental",
+							"onExp"
 						],
-						"markdownDescription": "%github.copilot.config.agent.thinkingTool%"
+						"markdownDescription": "%github.copilot.config.imageUpload.enabled%"
 					},
 					"github.copilot.chat.edits.suggestRelatedFilesFromGitHistory": {
 						"type": "boolean",
@@ -2794,6 +2797,32 @@
 						],
 						"markdownDescription": "%github.copilot.chat.languageContext.typescript.enabled%"
 					},
+					"github.copilot.chat.languageContext.typescript.items": {
+						"type": "string",
+						"enum": [
+							"minimal",
+							"double",
+							"fillHalf",
+							"fill"
+						],
+						"default": "minimal",
+						"scope": "resource",
+						"tags": [
+							"experimental",
+							"onExP"
+						],
+						"markdownDescription": "%github.copilot.chat.languageContext.typescript.items%"
+					},
+					"github.copilot.chat.languageContext.typescript.includeDocumentation": {
+						"type": "boolean",
+						"default": false,
+						"scope": "resource",
+						"tags": [
+							"experimental",
+							"onExP"
+						],
+						"markdownDescription": "%github.copilot.chat.languageContext.typescript.includeDocumentation%"
+					},
 					"github.copilot.chat.languageContext.typescript.cacheTimeout": {
 						"type": "number",
 						"default": 500,
@@ -2840,14 +2869,6 @@
 						],
 						"markdownDescription": "%github.copilot.config.newWorkspace.useContext7%"
 					},
-					"github.copilot.chat.agent.currentEditorContext.enabled": {
-						"type": "boolean",
-						"default": true,
-						"tags": [
-							"experimental"
-						],
-						"description": "%github.copilot.config.agent.currentEditorContext.enabled%"
-					},
 					"github.copilot.chat.notebook.followCellExecution.enabled": {
 						"type": "boolean",
 						"default": false,
@@ -2869,8 +2890,7 @@
 						"type": "boolean",
 						"default": true,
 						"tags": [
-							"experimental",
-							"onExp"
+							"experimental"
 						],
 						"description": "%github.copilot.config.summarizeAgentConversationHistory.enabled%"
 					},
@@ -2921,6 +2941,13 @@
 									"type": "boolean",
 									"default": false,
 									"description": "Whether the model supports thinking capabilities"
+								},
+								"requestHeaders": {
+									"type": "object",
+									"description": "Additional HTTP headers to include with requests to this model. These reserved headers are not allowed and ignored if present: forbidden request headers (https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header), forwarding headers ('forwarded', 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto'), and others ('api-key', 'authorization', 'content-type', 'openai-intent', 'x-github-api-version', 'x-initiator', 'x-interaction-id', 'x-interaction-type', 'x-onbehalf-extension-id', 'x-request-id', 'x-vscode-user-agent-library-version'). Pattern-based forbidden headers ('proxy-*', 'sec-*', 'x-http-method*' with forbidden methods) are also blocked.",
+									"additionalProperties": {
+										"type": "string"
+									}
 								}
 							},
 							"required": [
@@ -2973,10 +3000,30 @@
 									"description": "Whether the model requires an API key for authentication",
 									"default": true
 								},
+								"editTools": {
+									"type": "array",
+									"description": "List of edit tools supported by the model. If this is not configured, the editor will try multiple edit tools and pick the best one.\n\n- 'find-replace': Find and replace text in a document.\n- 'multi-find-replace': Find and replace text in a document.\n- 'apply-patch': A file-oriented diff format used by some OpenAI models\n- 'code-rewrite': A general but slower editing tool that allows the model to rewrite and code snippet and provide only the replacement to the editor.",
+									"items": {
+										"type": "string",
+										"enum": [
+											"find-replace",
+											"multi-find-replace",
+											"apply-patch",
+											"code-rewrite"
+										]
+									}
+								},
 								"thinking": {
 									"type": "boolean",
 									"default": false,
 									"description": "Whether the model supports thinking capabilities"
+								},
+								"requestHeaders": {
+									"type": "object",
+									"description": "Additional HTTP headers to include with requests to this model. These reserved headers are not allowed and ignored if present: forbidden request headers (https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header), forwarding headers ('forwarded', 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto'), and others ('api-key', 'authorization', 'content-type', 'openai-intent', 'x-github-api-version', 'x-initiator', 'x-interaction-id', 'x-interaction-type', 'x-onbehalf-extension-id', 'x-request-id', 'x-vscode-user-agent-library-version'). Pattern-based forbidden headers ('proxy-*', 'sec-*', 'x-http-method*' with forbidden methods) are also blocked.",
+									"additionalProperties": {
+										"type": "string"
+									}
 								}
 							},
 							"required": [
@@ -3015,6 +3062,81 @@
 							"experimental"
 						],
 						"description": "%github.copilot.config.grokCodeAlternatePrompt%"
+					},
+					"github.copilot.chat.claudeSonnet45AlternatePrompt": {
+						"type": "string",
+						"default": "default",
+						"tags": [
+							"experimental"
+						],
+						"description": "%github.copilot.config.claudeSonnet45AlternatePrompt%"
+					},
+					"github.copilot.chat.useResponsesApi": {
+						"type": "boolean",
+						"default": true,
+						"markdownDescription": "%github.copilot.config.useResponsesApi%",
+						"tags": [
+							"experimental",
+							"onExp"
+						]
+					},
+					"github.copilot.chat.responsesApiReasoningEffort": {
+						"type": "string",
+						"default": "default",
+						"markdownDescription": "%github.copilot.config.responsesApiReasoningEffort%",
+						"tags": [
+							"experimental",
+							"onExp"
+						],
+						"enum": [
+							"low",
+							"medium",
+							"high",
+							"default"
+						]
+					},
+					"github.copilot.chat.responsesApiReasoningSummary": {
+						"type": "string",
+						"default": "detailed",
+						"markdownDescription": "%github.copilot.config.responsesApiReasoningSummary%",
+						"tags": [
+							"experimental",
+							"onExp"
+						],
+						"enum": [
+							"off",
+							"detailed"
+						]
+					},
+					"github.copilot.chat.completionsFetcher": {
+						"type": [
+							"string",
+							"null"
+						],
+						"markdownDescription": "%github.copilot.config.completionsFetcher%",
+						"tags": [
+							"experimental",
+							"onExp"
+						],
+						"enum": [
+							"electron-fetch",
+							"node-fetch"
+						]
+					},
+					"github.copilot.chat.nesFetcher": {
+						"type": [
+							"string",
+							"null"
+						],
+						"markdownDescription": "%github.copilot.config.nesFetcher%",
+						"tags": [
+							"experimental",
+							"onExp"
+						],
+						"enum": [
+							"electron-fetch",
+							"node-fetch"
+						]
 					}
 				}
 			}
@@ -3129,6 +3251,10 @@
 					"command": "github.copilot.git.generateCommitMessage",
 					"when": "false"
 				},
+				{
+					"command": "github.copilot.git.resolveMergeConflicts",
+					"when": "false"
+				},
 				{
 					"command": "github.copilot.chat.explain",
 					"when": "false"
@@ -3276,6 +3402,38 @@
 				{
 					"command": "github.copilot.chat.mcp.setup.flow",
 					"when": "false"
+				},
+				{
+					"command": "github.copilot.chat.debug.showRawRequestBody",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.debug.showOutputChannel",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cli.sessions.delete",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cli.sessions.refresh",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cli.sessions.resumeInTerminal",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cli.sessions.newTerminalSession",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cloud.sessions.refresh",
+					"when": "false"
+				},
+				{
+					"command": "github.copilot.cloud.sessions.openInBrowser",
+					"when": "false"
 				}
 			],
 			"view/title": [
@@ -3284,6 +3442,11 @@
 					"when": "view == workbench.view.chat.sessions.claude-code",
 					"group": "navigation@1"
 				},
+				{
+					"command": "github.copilot.cli.sessions.refresh",
+					"when": "view == workbench.view.chat.sessions.copilotcli",
+					"group": "navigation@1"
+				},
 				{
 					"submenu": "github.copilot.chat.debug.filter",
 					"when": "view == copilot-chat",
@@ -3294,13 +3457,28 @@
 					"when": "view == copilot-chat",
 					"group": "export@1"
 				},
+				{
+					"command": "github.copilot.debug.showOutputChannel",
+					"when": "view == copilot-chat",
+					"group": "3_show@1"
+				},
 				{
 					"command": "github.copilot.debug.showChatLogView",
 					"when": "view == workbench.panel.chat.view.copilot",
 					"group": "3_show"
+				},
+				{
+					"command": "github.copilot.cloud.sessions.refresh",
+					"when": "view == workbench.view.chat.sessions.copilot-cloud-agent",
+					"group": "navigation@1"
 				}
 			],
 			"view/item/context": [
+				{
+					"command": "github.copilot.chat.debug.showRawRequestBody",
+					"when": "view == copilot-chat && viewItem == request",
+					"group": "export@0"
+				},
 				{
 					"command": "github.copilot.chat.debug.exportLogItem",
 					"when": "view == copilot-chat && (viewItem == toolcall || viewItem == request)",
@@ -3468,6 +3646,11 @@
 				}
 			],
 			"scm/resourceState/context": [
+				{
+					"command": "github.copilot.git.resolveMergeConflicts",
+					"when": "scmProvider == git && scmResourceGroup == merge && git.activeResourceHasMergeConflicts",
+					"group": "z_chat@1"
+				},
 				{
 					"command": "github.copilot.chat.review.stagedFileChange",
 					"group": "3_copilot",
@@ -3492,13 +3675,6 @@
 					"group": "inline@1"
 				}
 			],
-			"debug/createConfiguration": [
-				{
-					"command": "github.copilot.debug.generateConfiguration",
-					"group": "z_commands",
-					"when": "config.github.copilot.chat.startDebugging.enabled"
-				}
-			],
 			"issue/reporter": [
 				{
 					"command": "github.copilot.report"
@@ -3547,6 +3723,40 @@
 					"when": "config.github.copilot.chat.notebook.followCellExecution.enabled && github.copilot.notebookFollowInSessionEnabled && github.copilot.notebookAgentModeUsage && config.notebook.globalToolbar",
 					"group": "navigation/execute@15"
 				}
+			],
+			"editor/content": [
+				{
+					"command": "github.copilot.git.resolveMergeConflicts",
+					"group": "z_chat@1",
+					"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
+				}
+			],
+			"chat/chatSessions": [
+				{
+					"command": "github.copilot.cli.sessions.resumeInTerminal",
+					"when": "chatSessionType == copilotcli",
+					"group": "inline@1"
+				},
+				{
+					"command": "github.copilot.cli.sessions.delete",
+					"when": "chatSessionType == copilotcli",
+					"group": "inline@2"
+				},
+				{
+					"command": "github.copilot.cli.sessions.newTerminalSession",
+					"when": "view == workbench.view.chat.sessions.copilotcli",
+					"group": "submenu"
+				},
+				{
+					"command": "github.copilot.cli.sessions.refresh",
+					"when": "view == workbench.view.chat.sessions.copilotcli",
+					"group": "navigation@1"
+				},
+				{
+					"command": "github.copilot.cloud.sessions.openInBrowser",
+					"when": "chatSessionType == copilot-cloud-agent",
+					"group": "context"
+				}
 			]
 		},
 		"icons": {
@@ -3663,7 +3873,7 @@
 			"copilot-chat": [
 				{
 					"id": "copilot-chat",
-					"name": "Copilot Chat Debug",
+					"name": "Chat Debug",
 					"icon": "assets/debug-icon.svg",
 					"when": "github.copilot.chat.showLogView"
 				}
@@ -3681,7 +3891,7 @@
 			"activitybar": [
 				{
 					"id": "copilot-chat",
-					"title": "Copilot Chat Debug",
+					"title": "Chat Debug",
 					"icon": "assets/debug-icon.svg"
 				},
 				{
@@ -3880,12 +4090,66 @@
 			{
 				"type": "claude-code",
 				"name": "claude",
-				"displayName": "Claude Code",
-				"description": "The Claude Code agent",
+				"displayName": "Claude Code CLI Agent",
+				"icon": "$(sparkle)",
+				"welcomeTitle": "Claude Code Agent",
+				"welcomeMessage": "Run local background tasks",
+				"inputPlaceholder": "Describe your task, type `#` for adding context",
+				"description": "The Claude Code Agent works on your local machine",
 				"when": "config.github.copilot.chat.advanced.claudeCode.enabled",
+				"capabilities": {
+					"supportsFileAttachments": true
+				},
+				"commands": [
+					{
+						"name": "init",
+						"description": "Initialize a new CLAUDE.md file with codebase documentation"
+					},
+					{
+						"name": "compact",
+						"description": "Clear conversation history but keep a summary in context. Optional: /compact [instructions for summarization]"
+					},
+					{
+						"name": "pr-comments",
+						"description": "Get comments from a GitHub pull request"
+					},
+					{
+						"name": "review",
+						"description": "Review a pull request"
+					},
+					{
+						"name": "security-review",
+						"description": "Complete a security review of the pending changes on the current branch"
+					}
+				]
+			},
+			{
+				"type": "copilotcli",
+				"name": "GitHub Copilot CLI Agent",
+				"displayName": "GitHub Copilot CLI Agent",
+				"icon": "$(copilot)",
+				"welcomeTitle": "GitHub Copilot CLI Agent",
+				"welcomeMessage": "Run local background tasks",
+				"inputPlaceholder": "Describe your task, type `#` for adding context",
+				"description": "The Copilot CLI Agent works on your local machine",
+				"when": "config.github.copilot.chat.advanced.copilotCLI.enabled",
 				"capabilities": {
 					"supportsFileAttachments": true,
-					"supportsToolAttachments": false
+					"supportsProblemAttachments": true
+				}
+			},
+			{
+				"type": "copilot-cloud-agent",
+				"name": "GitHub Copilot Cloud Agent",
+				"displayName": "GitHub Copilot Cloud Agent",
+				"icon": "$(cloud)",
+				"welcomeTitle": "GitHub Copilot Cloud Agent",
+				"welcomeMessage": "Delegate tasks to the cloud",
+				"inputPlaceholder": "Describe your task, type `#` for adding context",
+				"description": "Delegate tasks to the GitHub Copilot Cloud Agent. The agent works asynchronously in the cloud to implement changes, iterates via chat, and can create or update pull requests as needed.",
+				"when": "config.github.copilot.chat.advanced.copilotCodingAgent.enabled",
+				"capabilities": {
+					"supportsFileAttachments": true
 				}
 			}
 		],
@@ -3914,16 +4178,14 @@
 							"program"
 						]
 					}
-				},
-				"initialConfigurations": [
-					{
-						"type": "vscode-chat-replay",
-						"request": "launch",
-						"name": "Debug Chat Replay",
-						"program": "${file}",
-						"stopOnEntry": true
-					}
-				]
+				}
+			}
+		],
+		"chatAgents": [
+			{
+				"name": "Plan",
+				"path": "./assets/agents/Plan.vscode-agent.md",
+				"description": "Researches a task to create multi-step plans"
 			}
 		]
 	},
@@ -3969,12 +4231,13 @@
 		"setup:dotnet": "run-script-os",
 		"setup:dotnet:darwin:linux": "curl -O https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.sh && chmod u+x dotnet-install.sh && ./dotnet-install.sh --channel 10.0 && rm dotnet-install.sh",
 		"setup:dotnet:win32": "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.ps1 -OutFile dotnet-install.ps1; ./dotnet-install.ps1 -channel 10.0; Remove-Item dotnet-install.ps1\"",
+		"analyze-edits": "tsx script/analyzeEdits.ts",
 		"extract-chat-lib": "tsx script/build/extractChatLib.ts",
 		"create_venv": "tsx script/setup/createVenv.mts",
 		"package": "vsce package",
 		"web": "vscode-test-web --headless --extensionDevelopmentPath=. .",
 		"test:prompt": "mocha \"src/extension/completions-core/prompt/**/test/**/*.test.{ts,tsx}\"",
-		"test:lib": "mocha \"src/extension/completions-core/lib/src/**/*.test.{ts,tsx}\""
+		"test:completions-core": "tsx src/extension/completions-core/extension/test/runTest.ts"
 	},
 	"devDependencies": {
 		"@azure/identity": "4.9.1",
@@ -4004,6 +4267,7 @@
 		"@types/tar": "^6.1.13",
 		"@types/vinyl": "^2.0.12",
 		"@types/vscode": "^1.102.0",
+		"@types/yargs": "^17.0.24",
 		"@typescript-eslint/eslint-plugin": "^8.35.0",
 		"@typescript-eslint/parser": "^8.32.0",
 		"@typescript-eslint/typescript-estree": "^8.26.1",
@@ -4053,6 +4317,7 @@
 		"react-dom": "17.0.2",
 		"rimraf": "^6.0.1",
 		"run-script-os": "^1.1.6",
+		"shiki": "~1.15.0",
 		"sinon": "^21.0.0",
 		"source-map-support": "^0.5.21",
 		"tar": "^7.4.3",
@@ -4068,14 +4333,16 @@
 		"vscode-languageserver-textdocument": "^1.0.12",
 		"vscode-languageserver-types": "^3.17.5",
 		"yaml": "^2.8.0",
-		"zeromq": "github:rebornix/zeromq.js#a19e8e373b3abc677f91b936d3f00d49b1b61792"
+		"yargs": "^17.7.2"
 	},
 	"dependencies": {
-		"@anthropic-ai/claude-code": "1.0.93",
-		"@anthropic-ai/sdk": "^0.56.0",
+		"@anthropic-ai/claude-code": "^1.0.120",
+		"@anthropic-ai/sdk": "^0.63.0",
+		"@github/copilot": "^0.0.343",
+		"@google/genai": "^1.22.0",
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",
-		"@vscode/copilot-api": "^0.1.8",
+		"@vscode/copilot-api": "^0.1.12",
 		"@vscode/extension-telemetry": "^1.0.0",
 		"@vscode/l10n": "^0.0.18",
 		"@vscode/prompt-tsx": "^0.4.0-alpha.5",