[pull] main from microsoft:main

.github/skills/chat-customizations-editor/SKILL.md

@@ -34,6 +34,53 @@ Principle: the UI widgets read everything from the descriptor — no harness-spe
 
 Component explorer fixtures (see `component-fixtures` skill): `aiCustomizationListWidget.fixture.ts`, `aiCustomizationManagementEditor.fixture.ts` under `src/vs/workbench/test/browser/componentFixtures/`.
 
+### Screenshotting specific tabs
+
+The management editor fixture supports a `selectedSection` option to render any tab. Each tab has Dark/Light variants auto-generated by `defineThemedFixtureGroup`.
+
+**Available fixture IDs** (use with `mcp_component-exp_screenshot`):
+
+| Fixture ID pattern | Tab shown |
+|---|---|
+| `chat/aiCustomizations/aiCustomizationManagementEditor/AgentsTab/{Dark,Light}` | Agents |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/SkillsTab/{Dark,Light}` | Skills |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/InstructionsTab/{Dark,Light}` | Instructions |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/HooksTab/{Dark,Light}` | Hooks |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/PromptsTab/{Dark,Light}` | Prompts |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/McpServersTab/{Dark,Light}` | MCP Servers |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/PluginsTab/{Dark,Light}` | Plugins |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/LocalHarness/{Dark,Light}` | Default (Agents, Local harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/CliHarness/{Dark,Light}` | Default (Agents, CLI harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/ClaudeHarness/{Dark,Light}` | Default (Agents, Claude harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/Sessions/{Dark,Light}` | Sessions window variant |
+
+**Adding a new tab fixture:** Add a variant to the `defineThemedFixtureGroup` in `aiCustomizationManagementEditor.fixture.ts`:
+```typescript
+MyNewTab: defineComponentFixture({
+    labels: { kind: 'screenshot' },
+    render: ctx => renderEditor(ctx, {
+        harness: CustomizationHarness.VSCode,
+        selectedSection: AICustomizationManagementSection.MySection,
+    }),
+}),
+```
+
+The `selectedSection` calls `editor.selectSectionById()` after `setInput`, which navigates to the specified tab and re-layouts.
+
+### Populating test data
+
+Each customization type requires its own mock path in `createMockPromptsService`:
+- **Agents** — `getCustomAgents()` returns agent objects
+- **Skills** — `findAgentSkills()` returns `IAgentSkill[]`
+- **Prompts** — `getPromptSlashCommands()` returns `IChatPromptSlashCommand[]`
+- **Instructions/Hooks** — `listPromptFiles()` filtered by `PromptsType`
+- **MCP Servers** — `mcpWorkspaceServers`/`mcpUserServers` arrays passed to `IMcpWorkbenchService` mock
+- **Plugins** — `IPluginMarketplaceService.installedPlugins` and `IAgentPluginService.plugins` observables
+
+All test data lives in `allFiles` (prompt-based items) and the `mcpWorkspace/UserServers` arrays. Add enough items per category (8+) to invoke scrolling.
+
+### Running unit tests
+
 ```bash
 ./scripts/test.sh --grep "applyStorageSourceFilter|customizationCounts"
 npm run compile-check-ts-native && npm run valid-layers-check

cli/src/commands/agent_host.rs

@@ -104,7 +104,8 @@ pub async fn agent_host(ctx: CommandContext, mut args: AgentHostArgs) -> Result<
 	if let Some(ct) = &args.connection_token {
 		url.push_str(&format!("?tkn={ct}"));
 	}
-	ctx.log.result(format!("Listening on {url}"));
+	ctx.log
+		.result(format!("Agent host proxy listening on {url}"));
 
 	let manager_for_svc = manager.clone();
 	let make_svc = move || {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.114.0",
-  "distro": "a981e7362565b4058f3bfd7604f8ab8c4f85101b",
+  "distro": "6c98cfe8dd3b4c159d8c9c331006a2d7c41872f0",
   "author": {
     "name": "Microsoft Corporation"
   },

src/bootstrap-import.ts

@@ -30,14 +30,29 @@ export async function initialize(injectPath: string): Promise<void> {
 			const path = join(injectPackageJSONPath, `../node_modules/${name}/package.json`);
 			const pkgJson = JSON.parse(String(await promises.readFile(path)));
 
-			// Determine the entry point: prefer exports["."].import for ESM, then main
+			// Determine the entry point: prefer exports["."].import for ESM, then main.
+			// Handle conditional export targets where exports["."].import/default
+			// can be a string or an object with a string `default` field.
+			// (Added for copilot-sdk)
 			let main: string | undefined;
 			if (pkgJson.exports?.['.']) {
 				const dotExport = pkgJson.exports['.'];
 				if (typeof dotExport === 'string') {
 					main = dotExport;
 				} else if (typeof dotExport === 'object' && dotExport !== null) {
-					main = dotExport.import ?? dotExport.default;
+					const resolveCondition = (v: unknown): string | undefined => {
+						if (typeof v === 'string') {
+							return v;
+						}
+						if (typeof v === 'object' && v !== null) {
+							const d = (v as { default?: unknown }).default;
+							if (typeof d === 'string') {
+								return d;
+							}
+						}
+						return undefined;
+					};
+					main = resolveCondition(dotExport.import) ?? resolveCondition(dotExport.default);
 				}
 			}
 			if (typeof main !== 'string') {

src/vs/base/node/crypto.ts

@@ -16,6 +16,7 @@ export async function checksum(path: string, sha256hash: string | undefined): Pr
 		const done = createSingleCallFunction((err?: Error, result?: string) => {
 			input.removeAllListeners();
 			hash.removeAllListeners();
+			input.destroy();
 
 			if (err) {
 				reject(err);

src/vs/base/test/node/crypto.test.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as assert from 'assert';
 import * as fs from 'fs';
 import { tmpdir } from 'os';
 import { join } from '../../common/path.js';
@@ -33,4 +34,14 @@ flakySuite('Crypto', () => {
 
 		await checksum(testFile, 'a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e');
 	});
+
+	test('checksum mismatch rejects', async () => {
+		const testFile = join(testDir, 'checksum-mismatch.txt');
+		await Promises.writeFile(testFile, 'Hello World');
+
+		await assert.rejects(
+			() => checksum(testFile, 'wrong-hash'),
+			/Hash mismatch/
+		);
+	});
 });