Merge pull request #7 from posit-dev/merge/1.106.0

Merge 1.106.0 from upstream

Author: jmcphers

.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