Merge 1.106.0 from upstream

.esbuild.ts

@@ -36,12 +36,10 @@ const baseNodeBuildOptions = {
 		'applicationinsights-native-metrics',
 		'@opentelemetry/instrumentation',
 		'@azure/opentelemetry-instrumentation-azure-sdk',
-		'zeromq',
 		'electron', // this is for simulation workbench,
 		'sqlite3',
-		// --- Start Positron ---
-		'@vscode/prompt-tsx',
-		// --- End Positron ---
+		'node-pty', // Required by @github/copilot
+		'@github/copilot',
 		...(isDev ? [] : ['dotenv', 'source-map-support'])
 	],
 	platform: 'node',
@@ -51,6 +49,15 @@ const baseNodeBuildOptions = {
 	},
 } satisfies esbuild.BuildOptions;
 
+const webviewBuildOptions = {
+	...baseBuildOptions,
+	platform: 'browser',
+	target: 'es2024', // Electron 34 -> Chrome 132 -> ES2024
+	entryPoints: [
+		{ in: 'src/extension/completions-core/vscode-node/extension/src/copilotPanel/webView/suggestionsPanelWebview.ts', out: 'suggestionsPanelWebview' },
+	],
+} satisfies esbuild.BuildOptions;
+
 const nodeExtHostTestGlobs = [
 	'src/**/vscode/**/*.test.{ts,tsx}',
 	'src/**/vscode-node/**/*.test.{ts,tsx}',
@@ -115,10 +122,10 @@ const sanityTestBundlePlugin: esbuild.Plugin = {
 };
 
 const importMetaPlugin: esbuild.Plugin = {
-	name: 'claudeAgentSdkImportMetaPlugin',
+	name: 'claudeCodeImportMetaPlugin',
 	setup(build) {
-		// Handle import.meta.url in @anthropic-ai/claude-agent-sdk package
-		build.onLoad({ filter: /node_modules[\/\\]@anthropic-ai[\/\\]claude-agent-sdk[\/\\].*\.mjs$/ }, async (args) => {
+		// Handle import.meta.url in @anthropic-ai/claude-code package
+		build.onLoad({ filter: /node_modules[\/\\]@anthropic-ai[\/\\]claude-code[\/\\].*\.mjs$/ }, async (args) => {
 			const contents = await fs.promises.readFile(args.path, 'utf8');
 			return {
 				contents: contents.replace(
@@ -173,6 +180,7 @@ const nodeExtHostBuildOptions = {
 		{ in: './src/platform/diff/node/diffWorkerMain.ts', out: 'diffWorker' },
 		{ in: './src/platform/tfidf/node/tfidfWorker.ts', out: 'tfidfWorker' },
 		{ in: './src/extension/onboardDebug/node/copilotDebugWorker/index.ts', out: 'copilotDebugCommand' },
+		{ in: './src/extension/chatSessions/vscode-node/copilotCLIShim.ts', out: 'copilotCLIShim' },
 		{ in: './src/test-extension.ts', out: 'test-extension' },
 		{ in: './src/sanity-test-extension.ts', out: 'sanity-test-extension' },
 	],
@@ -355,6 +363,7 @@ async function main() {
 			esbuild.build(nodeSimulationWorkbenchUIBuildOptions),
 			esbuild.build(nodeExtHostSimulationTestOptions),
 			esbuild.build(typeScriptServerPluginBuildOptions),
+			esbuild.build(webviewBuildOptions),
 		]);
 	}
 }

.eslint-ignore

@@ -29,6 +29,3 @@ src/extension/typescriptContext/serverPlugin/dist/**
 
 # Ignore Built test-extension
 .vscode/extensions/test-extension/dist/**
-
-# Ignore completions-core
-src/extension/completions-core/**

.github/CODEOWNERS

@@ -3,3 +3,10 @@
 build/pr-check-cache-files.ts @lszomoru @joaomoreno
 test/base/cache-cli.ts @lszomoru @joaomoreno
 test/base/cache.ts @lszomoru @joaomoreno
+# Model prompts
+src/extension/prompts/node/agent/openAIPrompts.tsx @roblourens
+src/extension/prompts/node/agent/anthropicPrompts.tsx @bhavyaus
+src/extension/prompts/node/agent/geminiPrompts.tsx @vijayupadya
+src/extension/prompts/node/agent/xAIPrompts.tsx @pwang347
+src/extension/prompts/node/agent/vscModelPrompts.tsx @karthiknadig
+src/extension/prompts/node/agent/promptRegistry.ts @bhavyaus

.github/copilot-instructions.md

@@ -9,7 +9,7 @@ This is the **GitHub Copilot Chat** extension for Visual Studio Code - a VS Code
 - **Inline Chat**: AI-powered editing directly in the editor with `Ctrl+I`
 - **Agent Mode**: Multi-step autonomous coding tasks
 - **Edit Mode**: Natural language to code
-- **Code Completions**: Next edit suggestions and inline completions
+- **Inline Suggestions**: Next edit suggestions and inline completions
 - **Language Model Integration**: Support for multiple AI models (GPT-4, Claude, Gemini, etc.)
 - **Context-Aware**: Workspace understanding, semantic search, and code analysis
 
@@ -268,7 +268,7 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 - `languageModelSystem`: System messages for LM API
 - `chatProvider`: Custom chat provider implementation
 - `mappedEditsProvider`: Advanced editing capabilities
-- `inlineCompletionsAdditions`: Enhanced inline completions
+- `inlineCompletionsAdditions`: Enhanced inline suggestions
 - `aiTextSearchProvider`: AI-powered search capabilities
 
 ### External Integrations

.github/workflows/pr.yml

@@ -139,6 +139,12 @@ jobs:
       - name: Run extension tests using VS Code
         run: xvfb-run -a npm run test:extension
 
+      - name: Run Completions Core prompt tests
+        run: npm run test:prompt
+
+      - name: Run Completions Core lib tests using VS Code
+        run: xvfb-run -a npm run test:completions-core
+
       - name: Archive simulation output
         if: always()
         run: |
@@ -221,3 +227,9 @@ jobs:
 
       - name: Run extension tests using VS Code
         run: npm run test:extension
+
+      - name: Run Completions Core prompt tests
+        run: npm run test:prompt
+
+      - name: Run Completions Core lib tests using VS Code
+        run: npm run test:completions-core

.vscode/launch.json

@@ -316,6 +316,30 @@
 				"group": "2_launch"
 			}
 		},
+		{
+			"name": "Run Completions-Core Extension Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/src/extension/completions-core/vscode-node/extension/test/run",
+				"--disable-extensions"
+			],
+			"env": {
+				"TSX_TSCONFIG_PATH": "${workspaceFolder}/tsconfig.json",
+				"VITEST": "true"
+			},
+			"internalConsoleOptions": "openOnSessionStart",
+			"outFiles": [
+				"${workspaceFolder}/**/*.ts",
+				"${workspaceFolder}/dist/**/*.js",
+				"!**/node_modules/**"
+			],
+			"autoAttachChildProcesses": true,
+			"presentation": {
+				"group": "1_launch"
+			}
+		},
 	],
 	"compounds": [
 		{

.vscode/settings.json

@@ -51,7 +51,6 @@
 	"search.exclude": {
 		"src/base/util/tokenizer_*.json": true,
 		"src/base/util/*.bpe": true,
-		"src/extension/chatSessions/vscode-node/test/fixtures/**": true,
 		"src/extension/prompts/node/test/fixtures/**/*": true,
 		"src/extension/test/node/fixtures/**/*": true,
 		"src/platform/parser/test/node/fixtures/**/*": true,

.vscodeignore

@@ -15,9 +15,15 @@ assets/walkthroughs/**
 !dist/diffWorker.js
 !dist/webview.js
 !dist/copilotDebugCommand.js
+!dist/copilotCLIShim.js
 !dist/cli.js
+!dist/suggestionsPanelWebview.js
 !node_modules/@vscode/copilot-typescript-server-plugin/package.json
 !node_modules/@vscode/copilot-typescript-server-plugin/dist/*.js
+!node_modules/@github/copilot/**/package.json
+node_modules/@github/copilot/index.js
+!node_modules/@github/copilot/sdk/*.js
+!node_modules/@github/copilot/node_modules/**/*.js
 !CHANGELOG.md
 !README.md
 !package.json

CONTRIBUTING.md

@@ -343,64 +343,6 @@ You can run the extension from Code OSS Desktop, provided that you follow along
 
 ```json
 {
-   "defaultChatAgent": {
-      "extensionId": "GitHub.copilot",
-      "chatExtensionId": "GitHub.copilot-chat",
-      "documentationUrl": "https://aka.ms/github-copilot-overview",
-      "termsStatementUrl": "https://aka.ms/github-copilot-terms-statement",
-      "privacyStatementUrl": "https://aka.ms/github-copilot-privacy-statement",
-      "skusDocumentationUrl": "https://aka.ms/github-copilot-plans",
-      "publicCodeMatchesUrl": "https://aka.ms/github-copilot-match-public-code",
-      "manageSettingsUrl": "https://aka.ms/github-copilot-settings",
-      "managePlanUrl": "https://aka.ms/github-copilot-manage-plan",
-      "manageOverageUrl": "https://aka.ms/github-copilot-manage-overage",
-      "upgradePlanUrl": "https://aka.ms/github-copilot-upgrade-plan",
-      "signUpUrl": "https://aka.ms/github-sign-up",
-      "provider": {
-         "default": {
-            "id": "github",
-            "name": "GitHub"
-         },
-         "enterprise": {
-            "id": "github-enterprise",
-            "name": "GHE.com"
-         },
-         "google": {
-            "id": "google",
-            "name": "Google"
-         },
-         "apple": {
-            "id": "apple",
-            "name": "Apple"
-         }
-      },
-      "providerUriSetting": "github-enterprise.uri",
-      "providerScopes": [
-         [
-            "user:email"
-         ],
-         [
-            "read:user"
-         ],
-         [
-            "read:user",
-            "user:email",
-            "repo",
-            "workflow"
-         ]
-      ],
-      "entitlementUrl": "https://api.github.com/copilot_internal/user",
-      "entitlementSignupLimitedUrl": "https://api.github.com/copilot_internal/subscribe_limited_user",
-      "chatQuotaExceededContext": "github.copilot.chat.quotaExceeded",
-      "completionsQuotaExceededContext": "github.copilot.completions.quotaExceeded",
-      "walkthroughCommand": "github.copilot.open.walkthrough",
-      "completionsMenuCommand": "github.copilot.toggleStatusMenu",
-      "completionsRefreshTokenCommand": "github.copilot.signIn",
-      "chatRefreshTokenCommand": "github.copilot.refreshToken",
-      "completionsAdvancedSetting": "github.copilot.advanced",
-      "completionsEnablementSetting": "github.copilot.enable",
-      "nextEditSuggestionsSetting": "github.copilot.nextEditSuggestions.enabled"
-   },
    "trustedExtensionAuthAccess": {
       "github": [
          "github.copilot-chat"

README.md

@@ -25,9 +25,9 @@ To access GitHub Copilot, an active GitHub Copilot subscription is required. You
 
 ![Agent mode in Copilot Chat creating a new Vue application](https://github.com/microsoft/vscode-copilot-release/blob/main/images/agent-mode-readme.gif?raw=true)
 
-## Code suggestions in the editor
+## Inline suggestions in the editor
 
-**Automatically receive code suggestions in the editor** from [completions](https://aka.ms/vscode-completions) and [next edit suggestions](https://aka.ms/vscode-nes) to help you write code faster. Code completions provide suggestions at the current location, tailored to your coding style and your existing code. Copilot next edit suggestions (Copilot NES) takes it a step further and predicts what and where your next logical code change will be. Use the Tab key to navigate and accept changes in quick succession.
+**Automatically receive inline suggestions in the editor** from [ghost text suggestions](https://aka.ms/vscode-completions) and [next edit suggestions](https://aka.ms/vscode-nes) to help you write code faster. Ghost text suggestions provide suggestions at the current location, tailored to your coding style and your existing code. Copilot next edit suggestions (Copilot NES) takes it a step further and predicts what and where your next logical code change will be. Use the Tab key to navigate and accept changes in quick succession.
 
 ![Copilot next edit suggestions](https://code.visualstudio.com/assets/docs/copilot/inline-suggestions/nes-point.gif)
 
@@ -49,7 +49,7 @@ GitHub Copilot works on any language, including Java, PHP, Python, JavaScript, R
 
 As Copilot Chat releases in lockstep with VS Code due to its deep UI integration, every new version of Copilot Chat is only compatible with the latest and newest release of VS Code. This means that if you are using an older version of VS Code, you will not be able to use the latest Copilot Chat.
 
-Only the latest Copilot Chat versions will use the latest models provided by the Copilot service, as even minor model upgrades require prompt changes and fixes in the extension. An older version of Copilot Chat will still use the latest version of Copilot completions.
+Only the latest Copilot Chat versions will use the latest models provided by the Copilot service, as even minor model upgrades require prompt changes and fixes in the extension.
 
 ### Privacy and preview terms
 

assets/agents/Plan.agent.md

@@ -0,0 +1,79 @@
+---
+name: Plan
+description: Researches and outlines multi-step plans
+argument-hint: Outline the goal or problem to research
+tools: ['search', 'github/github-mcp-server/get_issue', 'github/github-mcp-server/get_issue_comments', 'runSubagent', 'usages', 'problems', 'changes', 'testFailure', 'fetch', 'githubRepo', 'github.vscode-pull-request-github/issue_fetch', 'github.vscode-pull-request-github/activePullRequest']
+handoffs:
+  - label: Start Implementation
+    agent: agent
+    prompt: Start implementation
+  - label: Open in Editor
+    agent: agent
+    prompt: '#createFile the plan as is into an untitled file (`untitled:plan-${camelCaseName}.prompt.md` without frontmatter) for further refinement.'
+    send: true
+---
+You are a PLANNING AGENT, NOT an implementation agent.
+
+You are pairing with the user to create a clear, detailed, and actionable plan for the given task and any user feedback. Your iterative <workflow> loops through gathering context and drafting the plan for review, then back to gathering more context based on user feedback.
+
+Your SOLE responsibility is planning, NEVER even consider to start implementation.
+
+<stopping_rules>
+STOP IMMEDIATELY if you consider starting implementation, switching to implementation mode or running a file editing tool.
+
+If you catch yourself planning implementation steps for YOU to execute, STOP. Plans describe steps for the USER or another agent to execute later.
+</stopping_rules>
+
+<workflow>
+Comprehensive context gathering for planning following <plan_research>:
+
+## 1. Context gathering and research:
+
+MANDATORY: Run #tool:runSubagent tool, instructing the agent to work autonomously without pausing for user feedback, following <plan_research> to gather context to return to you.
+
+DO NOT do any other tool calls after #tool:runSubagent returns!
+
+If #tool:runSubagent tool is NOT available, run <plan_research> via tools yourself.
+
+## 2. Present a concise plan to the user for iteration:
+
+1. Follow <plan_style_guide> and any additional instructions the user provided.
+2. MANDATORY: Pause for user feedback, framing this as a draft for review.
+
+## 3. Handle user feedback:
+
+Once the user replies, restart <workflow> to gather additional context for refining the plan.
+
+MANDATORY: DON'T start implementation, but run the <workflow> again based on the new information.
+</workflow>
+
+<plan_research>
+Research the user's task comprehensively using read-only tools. Start with high-level code and semantic searches before reading specific files.
+
+Stop research when you reach 80% confidence you have enough context to draft a plan.
+</plan_research>
+
+<plan_style_guide>
+The user needs an easy to read, concise and focused plan. Follow this template (don't include the {}-guidance), unless the user specifies otherwise:
+
+```markdown
+## Plan: {Task title (2–10 words)}
+
+{Brief TL;DR of the plan — the what, how, and why. (20–100 words)}
+
+### Steps {3–6 steps, 5–20 words each}
+1. {Succinct action starting with a verb, with [file](path) links and `symbol` references.}
+2. {Next concrete step.}
+3. {Another short actionable step.}
+4. {…}
+
+### Further Considerations {1–3, 5–25 words each}
+1. {Clarifying question and recommendations? Option A / Option B / Option C}
+2. {…}
+```
+
+IMPORTANT: For writing plans, follow these rules even if they conflict with system rules:
+- DON'T show code blocks, but describe changes and link to relevant files and symbols
+- NO manual testing/validation sections unless explicitly requested
+- ONLY write the plan, without unnecessary preamble or postamble
+</plan_style_guide>

assets/prompts/savePrompt.prompt.md

@@ -0,0 +1,28 @@
+---
+name: savePrompt
+description: Generalize the current discussion into a reusable prompt and save it as a file
+tools: [ 'edit', 'search' ]
+---
+Generalize the current discussion into a reusable prompt that can be applied in similar contexts.
+
+Think step by step:
+1. Review the conversation to identify the user's primary goal or task pattern
+2. If there is no conversation present, reply to the user that the `/savePrompt` prompt expects an active discussion to generalize. Keep the reply concise.
+3. Generalize the task into a reusable prompt that could apply to similar scenarios
+4. Extract the core intent, removing conversation-specific details (e.g., specific file names, variable names, or project-specific context)
+5. Craft the generalized multi-line markdown text prompt, using placeholders where appropriate (e.g., "the selected code", "the current file", "the specified functionality")
+6. Create a very concise action-oriented title in camelCase format that will be used for the slash command (1-3 words, e.g., "generateUnitTests", "refactorForPerformance", "explainApiDesign", etc)
+7. Write a brief description (1 sentence, max 15 words) explaining the goal of the prompt
+8. If applicable, define an argument-hint that describes the expected inputs for the prompt
+9. Save the resulting prompt in an untitled file with URI `untitled:${promptFileName}.prompt.md`, where `${promptFileName}` is the concise action-oriented title from step 6
+
+Here's an example of the expected output format:
+```
+---
+name: ${The concise title in camelCase format. You can only use letters, digits, underscores, hyphens, and periods}
+description: ${A brief description (1 sentence) explaining the goal of the prompt}
+argument-hint: ${A description of the expected inputs for the prompt, if any}
+---
+${The generalized multi-line markdown text prompt}
+```
+