Fix/sessions e2e concurrency by rupeshkumar-555 · Pull Request #310772 · microsoft/vscode

rupeshkumar-555 · 2026-04-16T15:43:21Z

No description provided.

Fixes microsoft#306605 When Copilot CLI provides inline references to code files or locations, it was only showing links to the files without the actual code snippets. This made the responses less useful as users had to manually navigate to the referenced files to see the code. Changes: 1. **Enhanced IChatContentInlineReference interface** (chatService.ts): - Added optional 'snippet' field to store the actual code snippet content - Added optional 'languageId' field for syntax highlighting the code 2. **Updated annotation logic** (annotations.ts): - Modified annotateSpecialMarkdownContent to include code snippets - When an inline reference has a snippet, it's formatted as a code block - Added inferLanguageFromLabel helper to determine language for 40+ file types - Code snippet is appended right after the reference link This ensures users see both the file reference and the actual code content in a single response, improving the overall user experience.

- Create new toolpipe-mcp-server extension providing easy integration - Support both remote (cloud-hosted) and local (npm-based) ToolPipe modes - Add configuration options for flexible deployment - Provide 120+ developer utilities via Model Context Protocol: * Code tools: JS/TS/Python/SQL/CSS/HTML formatting and review * Data tools: JSON/CSV/XML/YAML conversion and tools * Security: Hash generation, JWT decode, SSL checking * API tools: HTTP client, OpenAPI generation, webhooks * DevOps: Docker, GitHub Actions, Nginx, Kubernetes - Update MCP configuration with ToolPipe examples - Add comprehensive documentation and setup instructions - Support AI assistants: Claude Desktop, Cursor, Windsurf, Cline Benefits: - No browser switching needed for common developer tools - Zero configuration for cloud mode (HTTPS endpoint) - Local mode for privacy-conscious users - Seamless integration with existing MCP servers - MIT licensed open source implementation

The workflow trigger was commented out, making the workflow invalid. GitHub Actions requires at least one trigger event to be configured. Uncomment the 'on:' section to enable the workflow to run on: - Pull requests to main and release branches - Changes in src/vs/sessions/** or scripts/code-sessions-web.* paths This fixes the workflow parse error that was preventing the PR from running tests.

- Fix MCP API types: use vscode.McpHttpServerDefinition and vscode.McpStdioServerDefinition - Remove unused dead code (promptConfigureToolPipe function) - Implement dynamic Markdown fence escaping to prevent backtick-related breakage - Replace ephemeral tunnel URLs with example placeholders - Change default remoteUrl to empty string with user guidance - Add extension to build compilation list (gulpfile.extensions.ts) - Update tsconfig.json with skipLibCheck and proper glob pattern - Update engine requirement to ^1.97.0 when MCP APIs were introduced - Remove trailing whitespace

- Create package.nls.json with localized strings for extension UI - Update package.json to use localization placeholders (%displayName%, %description%, etc.) - Add comprehensive test suite for inline reference snippet rendering - Tests cover: basic snippet rendering, backtick escaping, fence length calculation - Tests verify: code blocks with language IDs, empty snippets, multiple backtick sequences - All tests follow existing VS Code test patterns and conventions

…iew instead of hardcoded black - Replace hardcoded black background (#000) in .xterm .composition-view with CSS variable - Now uses var(--vscode-terminal-background) to respect terminal color theme - Fallback to panel background, then hardcoded black if variables unavailable - Fixes black background appearing after space character in terminal - Affects IME composition view and applies consistently across all terminal themes - Resolves issue on Windows PowerShell and other shells with IME input

…lution - Add resolveNodeExecutableFromPath() to resolve node via PATH/PATHEXT - Remove execFileSync usage from node path detection - Add helper functions for cross-platform support - Add comprehensive unit tests for all platforms - Maintain existing warning behavior when Node cannot be detected Fixes: microsoft#305740

Copilot

Pull request overview

This PR broadens a few areas across the workbench/extensions: it enables the Sessions E2E workflow on PRs, extends chat inline-reference rendering to optionally include code snippets, and introduces a new MCP server definition provider extension (“toolpipe”) along with related schema/examples and small UI/config updates.

Changes:

Enable the Sessions E2E GitHub Actions workflow for pull_request (plus manual dispatch) and keep concurrency cancellation.
Add optional snippet/languageId to chat inline references and render snippets as fenced code blocks (with new unit tests).
Update TypeScript extension Node path detection to resolve node from PATH without spawning a process; add new unit tests.
Add a new built-in extension toolpipe-mcp-server and include it in the extensions compilation pipeline; add MCP schema example entries.
Minor terminal CSS tweak to use themed background for composition view.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
src/vs/workbench/contrib/terminal/browser/media/xterm.css	Use theme variables for IME composition view background instead of hardcoded black.
src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts	Add ToolPipe entries to MCP server schema examples.
src/vs/workbench/contrib/chat/common/widget/annotations.ts	Render inline reference snippets as fenced code blocks; infer language when missing.
src/vs/workbench/contrib/chat/test/common/widget/annotations.test.ts	Add test coverage for snippet + backtick-fence escaping behavior.
src/vs/workbench/contrib/chat/common/chatService/chatService.ts	Extend `IChatContentInlineReference` with optional `snippet` and `languageId`.
extensions/typescript-language-features/src/configuration/configuration.electron.ts	Replace `execFileSync('node' …)` probing with PATH-based resolution.
extensions/typescript-language-features/src/test/unit/configuration.electron.test.ts	Add unit tests for PATH-based `node` resolution.
extensions/toolpipe-mcp-server/*	New built-in extension providing MCP server definitions for ToolPipe.
build/gulpfile.extensions.ts	Add ToolPipe extension tsconfig to the extensions compilation list.
.github/workflows/sessions-e2e.yml	Re-enable workflow triggers on PRs and manual runs.

Copilot · 2026-04-16T15:51:59Z

+				if (item.snippet) {
+					const languageId = item.languageId || inferLanguageFromLabel(label) || '';
+					// Use a fence length that exceeds any backtick run in the snippet
+					const fenceLength = Math.max(3, (item.snippet.match(/`+/g)?.reduce((max, run) => Math.max(max, run.length), 0) ?? 0) + 1);
+					const fence = '`'.repeat(fenceLength);
+					markdownText += `\n${fence}${languageId}\n${item.snippet}\n${fence}`;


Appending the snippet code block without a trailing newline after the closing fence can break Markdown rendering when more content is appended (the closing fence must be on its own line). Also, checking if (item.snippet) skips valid empty-string snippets; use an undefined/null check instead and ensure the generated block ends with a newline.

Suggested change

if (item.snippet) {

const languageId = item.languageId || inferLanguageFromLabel(label) || '';

// Use a fence length that exceeds any backtick run in the snippet

const fenceLength = Math.max(3, (item.snippet.match(/`+/g)?.reduce((max, run) => Math.max(max, run.length), 0) ?? 0) + 1);

const fence = '`'.repeat(fenceLength);

markdownText += `\n${fence}${languageId}\n${item.snippet}\n${fence}`;

if (item.snippet !== undefined && item.snippet !== null) {

const languageId = item.languageId || inferLanguageFromLabel(label) || '';

// Use a fence length that exceeds any backtick run in the snippet

const fenceLength = Math.max(3, (item.snippet.match(/`+/g)?.reduce((max, run) => Math.max(max, run.length), 0) ?? 0) + 1);

const fence = '`'.repeat(fenceLength);

markdownText += `\n${fence}${languageId}\n${item.snippet}\n${fence}\n`;

Copilot · 2026-04-16T15:52:00Z

+		'psm1': 'powershell',
+		'lua': 'lua',
+		'r': 'r',
+		'R': 'r',


inferLanguageFromLabel lowercases the extension, so the 'R' mapping is unreachable dead code. Remove it (the 'r' entry already covers this) or adjust the logic if case-sensitive handling is intended.

Suggested change

'R': 'r',

Copilot · 2026-04-16T15:52:00Z

+					name: 'value.js',
+					snippet: snippetWithBackticks
+					// Note: no languageId provided
+				},


This test asserts a 4-backtick fence even though the snippet only contains single backticks and the implementation's minimum fence length is 3. Align the assertion with the actual escaping behavior (or update the implementation if a longer fence is required for other reasons).

Copilot · 2026-04-16T15:52:00Z

+
+			assert.strictEqual(result.length, 1);
+			const md = result[0] as IChatMarkdownContent;
+			const value = md.content.value;
+			// Should use 4 backticks even without explicit language
+			assert.ok(value.includes('````'));
+			assert.ok(value.includes(snippetWithBackticks));
+		});
+
+		test('empty snippet still renders correctly', () => {
+			const result = annotateSpecialMarkdownContent([
+				content('Example: '),
+				{
+					kind: 'inlineReference',
+					inlineReference: URI.parse('file:///empty.ts'),
+					name: 'empty.ts',
+					snippet: '',
+					languageId: 'typescript'
+				},


The test covers an empty-string snippet, but the implementation currently guards with a truthy check (if (item.snippet)), so '' will not render a code block and this will fail. Either change the implementation to treat empty string as present, or update the test case to match the intended behavior.

Copilot · 2026-04-16T15:52:01Z

+					name: 'test.ts',
+					snippet: snippetWithBackticks,
+					languageId: 'typescript'
+				},
+			]);


This test expects a 4-backtick fence, but the snippet only contains single backticks. With the current fence-length logic (max run + 1, minimum 3), this should remain a standard 3-backtick fence. Update the expectation (or adjust the fence-length algorithm if you intentionally want 4 whenever any backtick appears).

Copilot · 2026-04-16T15:52:02Z

+on:
+  pull_request:
+    branches:
+      - main
+      - 'release/*'
+  workflow_dispatch:


Enabling this workflow for every pull request (without a paths filter) can significantly increase CI load/runtime, since Sessions E2E appears relatively heavy. If the intent is to run only when Sessions-related files change, consider restoring a paths: filter (similar to the commented-out block) or otherwise narrowing when it triggers.

- Fix snippet null/undefined checks in chat annotations (use !== null && !== undefined instead of truthy check) - Add trailing newline after code fence to fix Markdown rendering - Remove dead code 'R' mapping (already covered by lowercase 'r') - Add execute permission check for non-Windows platforms in Node resolver - Add paths filter to sessions-e2e workflow to prevent running on every PR - Fix ToolPipe MCP Server documentation to match actual logging behavior

…310772 - Fix README documentation: remoteUrl default is empty string, not demo URL - Fix test expectations: backtick fence calculations match max(3, max_run+1) - Single backtick: 3-fence (was expecting 4) - Multiple backticks up to 3: 4-fence (correct) - Empty snippets now render correctly with fence markers

…e.json Fixes mixed tabs/spaces in engines and oolpipeMcpServer.remoteUrl blocks as requested in Copilot review comment r3094528578.

rupeshkumar-555 · 2026-04-17T04:10:09Z

Copilot Review Feedback - All Changes Applied

All 10 inline review comments have been addressed:

annotations.ts

r3094528391: Changed if (item.snippet) to if (item.snippet !== undefined && item.snippet !== null) to handle empty-string snippets; added trailing newline after closing fence.
r3094528443: Removed unreachable 'R': 'r' entry from languageMap (extension is lowercased before lookup).

annotations.test.ts

r3094528467: Fixed 'snippet with backticks' test - snippet has only 1 backtick so max(3, 1+1)=3, test now asserts 3-backtick fence not 4.
r3094528498: Empty-string snippet test passes automatically via the !== undefined/null guard fix.
r3094528613: Fixed 'snippet without language ID' test - same single-backtick reasoning, changed from 4 to 3 backtick assertion.

configuration.electron.ts

r3094528537: defaultIsExecutableFile now calls fs.accessSync(candidate, fs.constants.X_OK) on non-Windows before treating a file as executable.

toolpipe-mcp-server/package.json

r3094528578: Reformatted to consistent 2-space indentation - engines block and toolpipeMcpServer.remoteUrl block were using tabs.

.github/workflows/sessions-e2e.yml

r3094528642 / r3094528676: Restored the paths filter under pull_request so E2E only triggers for changes under src/vs/sessions/** and scripts/code-sessions-web.*, not on every PR.

toolpipe-mcp-server/README.md

r3094528722: Corrected remoteUrl default from hardcoded Cloudflare URL to (empty) to match package.json.
r3094528748: Updated troubleshooting - replaced reference to non-existent 'Output -> ToolPipe MCP Server' channel with 'check the Extension Host or Developer Tools logs'.

rupeshkumar-555 · 2026-04-17T17:26:47Z

Re-verified PR #310772 against the Copilot review comments.

Resolved items confirmed on the branch:

inline reference snippet rendering uses undefined/null checks and closes fenced blocks with a trailing newline
dead 'R' language mapping removed
annotation fence-length tests aligned with actual escaping behavior
executable-node detection includes X_OK checks on non-Windows
toolpipe package.json indentation normalized to 2 spaces
sessions-e2e workflow restored to use a paths filter
troubleshooting docs updated to reference Extension Host / Developer Tools logs
transient ToolPipe MCP example URL replaced with a neutral placeholder

Current PR status:

Dependencies Check: SUCCESS
license/cla: SUCCESS
Community PR Approvals: IN_PROGRESS
reviewDecision: REVIEW_REQUIRED

There are no failing CI checks. Remaining blocker is maintainer approval / merge.

rupeshkumar-555 and others added 9 commits March 31, 2026 17:42

Merge branch 'main' into feat/307784-toolpipe-mcp-integration

bb28bfe

Fix: Restore concurrency configuration to sessions-e2e workflow

5b7f4b2

Copilot AI review requested due to automatic review settings April 16, 2026 15:43

Copilot started reviewing on behalf of rupeshkumar-555 April 16, 2026 15:44 View session

Merge branch 'main' into fix/sessions-e2e-concurrency

bb44685

Copilot AI reviewed Apr 16, 2026

View reviewed changes

rupeshkumar-555 and others added 3 commits April 16, 2026 21:24

Fix: Remove duplicate on key from sessions-e2e workflow

e9a0f07

Merge branch 'main' into fix/sessions-e2e-concurrency

5fec07e

vs-code-engineering bot assigned lszomoru Apr 16, 2026

rupeshkumar-555 and others added 5 commits April 16, 2026 22:39

Merge branch 'main' into fix/sessions-e2e-concurrency

f519142

Merge branch 'main' into fix/sessions-e2e-concurrency

d310bfc

Merge branch 'main' into fix/sessions-e2e-concurrency

b13a0bf

fix: Use consistent 2-space indentation in toolpipe-mcp-server/packag…

287d4e1

…e.json Fixes mixed tabs/spaces in engines and oolpipeMcpServer.remoteUrl blocks as requested in Copilot review comment r3094528578.

rupeshkumar-555 added 3 commits April 17, 2026 09:42

Merge branch 'main' into fix/sessions-e2e-concurrency

ee450dc

Merge branch 'main' into fix/sessions-e2e-concurrency

d731fa9

Merge branch 'main' into fix/sessions-e2e-concurrency

ac730f6

rupeshkumar-555 and others added 2 commits April 17, 2026 22:57

docs(toolpipe): replace transient MCP example URL

0baab7f

Merge branch 'main' into fix/sessions-e2e-concurrency

e17e41b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/sessions e2e concurrency#310772

Fix/sessions e2e concurrency#310772
rupeshkumar-555 wants to merge 23 commits intomicrosoft:mainfrom
rupeshkumar-555:fix/sessions-e2e-concurrency

rupeshkumar-555 commented Apr 16, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Copilot AI Apr 16, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rupeshkumar-555 commented Apr 17, 2026

Uh oh!

rupeshkumar-555 commented Apr 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

rupeshkumar-555 commented Apr 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rupeshkumar-555 commented Apr 17, 2026

Copilot Review Feedback - All Changes Applied

annotations.ts

annotations.test.ts

configuration.electron.ts

toolpipe-mcp-server/package.json

.github/workflows/sessions-e2e.yml

toolpipe-mcp-server/README.md

Uh oh!

rupeshkumar-555 commented Apr 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants