[pull] main from microsoft:main

.agents/skills/launch/SKILL.md

@@ -19,8 +19,10 @@ The clone is **slim**: workspace storage, browser caches, file history, cached V
 ## Prerequisites
 
 - macOS or Linux. The launcher is a bash script and depends on `rsync`, `curl`, `nohup`, and Node on `PATH`. The example caller snippets below also use `jq` (parse the JSON output) and `lsof` (kill-by-port fallback) — install those if you plan to use them, but the launcher itself does not require them.
-- A VS Code checkout with sources built. Run `npm run compile` once (one-shot) or `npm run watch` for incremental rebuilds. Both build the full client **and** the Copilot extension. The launcher also runs `node build/lib/preLaunch.ts` before starting Code OSS, which auto-runs `npm run compile` if `out/` is missing and downloads Electron + built-in extensions.
+- A VS Code checkout with `node_modules/` installed (`npm install` if missing — do **not** symlink from a sibling worktree; that breaks builds in subtle ways).
+- A VS Code checkout with sources built. Run `npm run compile` once (one-shot) or `npm run watch` for incremental rebuilds. Both build the full client **and** all built-in extensions under `extensions/`. You must build the full product to run successfully, building just the client is not enough.
 - An **authenticated** Code OSS profile to seed from. By default the launcher uses `~/.vscode-oss-dev`, which is the user-data-dir the repo's `launch.json` configs use - if the user has ever signed in to Copilot in a dev build, this should work. Only pass `--source-user-data-dir <path>` (or set `$CODE_OSS_DEV_AUTHED_USER_DATA_DIR`) when you specifically want to seed from a different profile (e.g. your regular `~/Library/Application Support/Code` install).
+  - If Code OSS launches and needs a sign-in, don't give up! Use the questions tool to ask the user to sign in.
 - `@playwright/cli` available (it's a devDependency in the vscode repo - `npm install` then use `npx @playwright/cli`).
 - For debugger work: `dap-cli` on `PATH`. If debugger support would be useful but the `dap-cli` skill is not present, prompt the user to install it from https://github.com/roblourens/dap-cli.
 - CSS selectors are internal implementation details. If a selector-based `eval` stops working, take a fresh `snapshot`, inspect the current DOM, and update the selector rather than assuming an old one still applies.
@@ -329,7 +331,7 @@ Code OSS is a full Electron app and easily eats 1-4 GB. Always clean up.
 
 - **"Sent env to running instance. Terminating..."** - The dynamic `--user-data-dir` should prevent this. If you see it, another Code OSS is using the same profile path; pass `--source-user-data-dir` to a different source or check that the temp copy actually happened (`ls "$(jq -r .userDataDir <<<"$INFO")"`).
 - **Renderer ESM errors / `import { Menu } from 'electron'`** - `ELECTRON_RUN_AS_NODE` is set in your env. The launcher unsets it for the child, but if you spawn `code.sh` yourself, do the same.
-- **Built-in extension fails to load (`Cannot find module .../extensions/.../out/extension.js`)** - extensions weren't compiled. Run `npm run compile` (one-shot, also rebuilds the Copilot extension) or `npm run watch` (incremental).
+- **Built-in extension fails to load (`Cannot find module .../extensions/.../out/extension.js`)** - extensions weren't compiled. Run `npm run compile` (one-shot, also rebuilds all built-in extensions) or `npm run watch` (incremental). A common cause: you ran `npm run transpile-client` to satisfy unit tests, which populated `out/` but not `extensions/*/out/`, so preLaunch's "is `out/` missing?" check skipped the compile.
 - **`launch.sh` exits non-zero with a log tail** - either pre-launch failed, `code.sh` died before CDP came up, or CDP never opened within 90s. The tail printed to stderr is from `runDir/code.log` - read it to diagnose.
 - **Snapshot shows the wrong page or no expected controls** - use `tab-list`, switch with `tab-select <index>` if needed, then re-snapshot before interacting.
 - **CLI typing commands complete but the input stays empty** - focus chat with the platform shortcut, use `press` or clipboard paste rather than `fill` / `type`, then verify the input state before sending.

build/lib/policies/policyData.jsonc

@@ -38,6 +38,21 @@
         }
     ],
     "policies": [
+        {
+            "key": "mcp.enterpriseManagedAuth.idp",
+            "name": "McpEnterpriseManagedAuthIdp",
+            "category": "InteractiveSession",
+            "minimumVersion": "1.122",
+            "localization": {
+                "description": {
+                    "key": "mcp.enterpriseManagedAuth.idp.policy",
+                    "value": "The OAuth/OIDC IdP configuration used for enterprise-managed Model Context Protocol (MCP) server authentication. Delivered through enterprise policy (Windows Group Policy, macOS managed preferences, Linux `/etc/vscode/policy.json`)."
+                }
+            },
+            "type": "object",
+            "default": {},
+            "included": false
+        },
         {
             "key": "chat.mcp.gallery.serviceUrl",
             "name": "McpGalleryServiceUrl",

build/lib/stylelint/vscode-known-variables.json

@@ -12,6 +12,8 @@
 		"--vscode-activityBarBadge-background",
 		"--vscode-activityBarBadge-foreground",
 		"--vscode-activityBarTop-activeBackground",
+		"--vscode-activeSessionView-background",
+		"--vscode-activeSessionView-foreground",
 		"--vscode-activityBarTop-activeBorder",
 		"--vscode-activityBarTop-background",
 		"--vscode-activityBarTop-dropBorder",
@@ -25,6 +27,8 @@
 		"--vscode-agentSessionReadIndicator-foreground",
 		"--vscode-agentSessionSelectedBadge-border",
 		"--vscode-agentSessionSelectedUnfocusedBadge-border",
+		"--vscode-inactiveSessionView-background",
+		"--vscode-inactiveSessionView-foreground",
 		"--vscode-agentStatusIndicator-background",
 		"--vscode-badge-background",
 		"--vscode-badge-foreground",
@@ -947,6 +951,8 @@
 		"--mobile-diff-tok-keyword",
 		"--mobile-diff-tok-number",
 		"--chat-editing-last-edit-shift",
+		"--session-view-background",
+		"--session-view-foreground",
 		"--chat-current-response-min-height",
 		"--chat-smooth-delay",
 		"--chat-smooth-duration",

build/vite/mobile-multi-diff-worker.ts

@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { computeUnifiedDiff } from '../../src/vs/sessions/browser/parts/mobile/contributions/mobileDiffHelpers.js';
+
+interface IComputeDiffRequest {
+	readonly id: number;
+	readonly originalText: string;
+	readonly modifiedText: string;
+}
+
+self.addEventListener('message', (event: MessageEvent<IComputeDiffRequest>) => {
+	const { id, originalText, modifiedText } = event.data;
+	try {
+		self.postMessage({ id, hunks: computeUnifiedDiff(originalText, modifiedText) });
+	} catch (error) {
+		self.postMessage({ id, error: error instanceof Error ? error.message : String(error) });
+	}
+});
+
+self.postMessage({ type: 'ready' });

build/vite/mobile-multi-diff.html

@@ -0,0 +1,103 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<link rel="stylesheet" href="../../node_modules/@vscode/codicons/dist/codicon.css">
+		<style>
+			html, body {
+				margin: 0;
+				padding: 0;
+				height: 100%;
+				overflow: hidden;
+				font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+				background: var(--page-bg);
+				color: var(--vscode-foreground);
+			}
+			body.vs-dark {
+				--page-bg: #0a0a0a;
+				--device-border: #3a3a3a;
+				--vscode-foreground: #cccccc;
+				--vscode-descriptionForeground: #9d9d9d;
+				--vscode-editor-background: #1f1f1f;
+				--vscode-editor-foreground: #cccccc;
+				--vscode-editorLineNumber-foreground: #6e7681;
+				--vscode-diffEditor-insertedTextBackground: rgba(155, 185, 85, 0.2);
+				--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, 0.2);
+				--vscode-multiDiffEditor-headerBackground: #262626;
+				--vscode-multiDiffEditor-border: #2b2b2b;
+				--vscode-sideBarSectionHeader-border: #2b2b2b;
+				--vscode-gitDecoration-addedResourceForeground: #81b88b;
+				--vscode-gitDecoration-deletedResourceForeground: #c74e39;
+				--vscode-toolbar-hoverBackground: rgba(90, 93, 94, 0.31);
+			}
+			body.vs-light {
+				--page-bg: #e4e4e4;
+				--device-border: #c0c4cc;
+				--vscode-foreground: #3b3b3b;
+				--vscode-descriptionForeground: #6e6e6e;
+				--vscode-editor-background: #ffffff;
+				--vscode-editor-foreground: #3b3b3b;
+				--vscode-editorLineNumber-foreground: #6e7681;
+				--vscode-diffEditor-insertedTextBackground: rgba(35, 134, 54, 0.15);
+				--vscode-diffEditor-removedTextBackground: rgba(255, 129, 130, 0.20);
+				--vscode-multiDiffEditor-headerBackground: #f3f3f3;
+				--vscode-multiDiffEditor-border: #e5e5e5;
+				--vscode-sideBarSectionHeader-border: #e5e5e5;
+				--vscode-gitDecoration-addedResourceForeground: #587c0c;
+				--vscode-gitDecoration-deletedResourceForeground: #ad0707;
+				--vscode-toolbar-hoverBackground: rgba(184, 184, 184, 0.31);
+			}
+			#stage {
+				position: fixed;
+				inset: 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding: 24px;
+				box-sizing: border-box;
+			}
+			#container {
+				width: 100%;
+				max-width: 430px;
+				height: 100%;
+				max-height: 932px;
+				position: relative;
+				background: var(--vscode-editor-background);
+				border: 1px solid var(--device-border);
+				border-radius: 18px;
+				overflow: hidden;
+				box-shadow: 0 12px 40px rgba(0, 0, 0, 0.35), 0 2px 8px rgba(0, 0, 0, 0.15);
+			}
+			/* The production overlay uses position: fixed to cover the viewport.
+			 * In this design playground we constrain it to the device frame. */
+			#container .mobile-overlay-view {
+				position: absolute;
+			}
+			body.vs-light #container {
+				box-shadow: 0 12px 32px rgba(0, 0, 0, 0.10), 0 2px 6px rgba(0, 0, 0, 0.06);
+			}
+			#theme-toggle {
+				position: fixed;
+				top: 12px;
+				right: 12px;
+				z-index: 100;
+				padding: 4px 10px;
+				border: 1px solid var(--device-border);
+				border-radius: 6px;
+				background: var(--vscode-editor-background);
+				color: var(--vscode-foreground);
+				cursor: pointer;
+				font-size: 12px;
+				font-family: inherit;
+			}
+		</style>
+	</head>
+	<body class="vs-dark">
+		<button id="theme-toggle" onclick="document.body.classList.toggle('vs-dark'); document.body.classList.toggle('vs-light'); this.textContent = document.body.classList.contains('vs-dark') ? 'Light' : 'Dark'">Light</button>
+		<div id="stage">
+			<div id="container"></div>
+		</div>
+		<script src="./mobile-multi-diff.ts" type="module"></script>
+	</body>
+</html>
+