[pull] main from microsoft:main

.agents/skills/launch/SKILL.md

@@ -23,13 +23,31 @@ Automate VS Code (Code OSS) using agent-browser. VS Code is built on Electron/Ch
 4. **Interact** using element refs
 5. **Re-snapshot** after navigation or state changes
 
+> **📸 Take screenshots for a paper trail.** Use `agent-browser screenshot <path>` at key moments — after launch, before/after interactions, and when something goes wrong. Screenshots provide visual proof of what the UI looked like and are invaluable for debugging failures or documenting what was accomplished.
+>
+> Save screenshots inside a timestamped subfolder so each run is isolated and nothing gets overwritten:
+>
+> ```bash
+> # Create a timestamped folder for this run's screenshots
+> SCREENSHOT_DIR="/tmp/code-oss-screenshots/$(date +%Y-%m-%dT%H-%M-%S)"
+> mkdir -p "$SCREENSHOT_DIR"
+>
+> # Save a screenshot (path is a positional argument — use ./ or absolute paths)
+> # Bare filenames without ./ may be misinterpreted as CSS selectors
+> agent-browser screenshot "$SCREENSHOT_DIR/after-launch.png"
+> ```
+
 ```bash
 # Launch Code OSS with remote debugging
 ./scripts/code.sh --remote-debugging-port=9224
 
 # Wait for Code OSS to start, retry until connected
 for i in 1 2 3 4 5; do agent-browser connect 9224 2>/dev/null && break || sleep 3; done
 
+# Verify you're connected to the right target (not about:blank)
+# If `tab` shows the wrong target, run `agent-browser close` and reconnect
+agent-browser tab
+
 # Discover UI elements
 agent-browser snapshot -i
 
@@ -81,6 +99,10 @@ Wait for the window to fully initialize, then connect:
 ```bash
 # Wait for Code OSS to start, retry until connected
 for i in 1 2 3 4 5; do agent-browser connect 9224 2>/dev/null && break || sleep 3; done
+
+# Verify you're connected to the right target (not about:blank)
+# If `tab` shows the wrong target, run `agent-browser close` and reconnect
+agent-browser tab
 agent-browser snapshot -i
 ```
 
@@ -106,6 +128,10 @@ code-insiders \
 
 # Wait for VS Code to start, retry until connected
 for i in 1 2 3 4 5; do agent-browser connect 9223 2>/dev/null && break || sleep 3; done
+
+# Verify you're connected to the right target (not about:blank)
+# If `tab` shows the wrong target, run `agent-browser close` and reconnect
+agent-browser tab
 agent-browser snapshot -i
 ```
 
@@ -116,6 +142,38 @@ agent-browser snapshot -i
 
 **Without `--user-data-dir`**, VS Code detects the running instance, forwards the args to it, and exits immediately — you'll see "Sent env to running instance. Terminating..." and CDP never starts.
 
+## Restarting After Code Changes
+
+**After making changes to Code OSS source code, you must restart to pick up the new build.** The workbench loads the compiled JavaScript at startup — changes are not hot-reloaded.
+
+### Restart Workflow
+
+1. **Rebuild** the changed code
+2. **Kill** the running Code OSS instance
+3. **Relaunch** with the same flags
+
+```bash
+# 1. Ensure your build is up to date.
+#    Normally you can skip a manual step here and let ./scripts/code.sh in step 3
+#    trigger the build when needed (or run `npm run watch` in another terminal).
+
+# 2. Kill the Code OSS instance listening on the debug port (if running)
+pids=$(lsof -t -i :9224)
+if [ -n "$pids" ]; then
+	kill $pids
+fi
+
+# 3. Relaunch
+./scripts/code.sh --remote-debugging-port=9224
+
+# 4. Reconnect agent-browser
+for i in 1 2 3 4 5; do agent-browser connect 9224 2>/dev/null && break || sleep 3; done
+agent-browser tab
+agent-browser snapshot -i
+```
+
+> **Tip:** If you're iterating frequently, run `npm run watch` in a separate terminal so compilation happens automatically. You still need to kill and relaunch Code OSS to load the new build.
+
 ## Interacting with Monaco Editor (Chat Input, Code Editors)
 
 VS Code uses Monaco Editor for all text inputs including the Copilot Chat input. Monaco editors require specific agent-browser techniques — standard `click`, `fill`, and `keyboard type` commands may not work depending on the VS Code build.
@@ -173,8 +231,12 @@ agent-browser snapshot -i
 agent-browser type @e62 "Hello from George!"
 ```
 
+> **Tip:** If `type @ref` silently drops text (the editor stays empty), the ref may be stale or the editor not yet ready. Re-snapshot to get a fresh ref and try again. You can verify text was entered using the snippet in "Verifying Text and Clearing" below.
+
 However, **`type @ref` silently fails on Code OSS** — the command completes without error but no text appears. This also applies to `keyboard type` and `keyboard inserttext`. Always verify text appeared after typing, and fall back to the keyboard shortcut + `press` pattern if it didn't. The `press`-per-key approach works universally across all builds.
 
+> **⚠️ Warning:** `keyboard type` can hang indefinitely in some focus states (e.g., after JS mouse events). If it doesn't return within a few seconds, interrupt it and fall back to `press` for individual keystrokes.
+
 ### Compatibility Matrix
 
 | Method | VS Code Insiders | Code OSS |
@@ -261,30 +323,27 @@ On ultrawide monitors, the chat sidebar may be in the far-right corner of the CD
 - `type @ref`, `keyboard type`, and `keyboard inserttext` work on VS Code Insiders but **silently fail on Code OSS** — they complete without error but no text appears. The `press`-per-key approach works universally.
 - See the "Interacting with Monaco Editor" section above for the full compatibility matrix.
 
-## Cleanup / Disconnect
+## Cleanup
 
-> **⚠️ IMPORTANT: Always quit Code OSS when you're done.** Code OSS is a full Electron app that consumes significant memory (often 1–4 GB+). Leaving it running in the background will slow your machine considerably. Don't just disconnect agent-browser — **kill the Code OSS process too.**
+**Always kill the Code OSS instance when you're done.** Code OSS is a full Electron app that consumes significant memory (often 1–4 GB+). Leaving it running wastes resources and holds the CDP port.
 
 ```bash
-# 1. Disconnect agent-browser
+# Disconnect agent-browser
 agent-browser close
 
-# 2. QUIT Code OSS — do not leave it running!
-# macOS: Cmd+Q in the app window, or:
-# Find the process
-lsof -i :9224 | grep LISTEN
-# Kill it (replace <PID> with the actual PID)
-kill <PID>
-
-# Linux:
-# kill $(lsof -t -i :9224)
+# Kill the Code OSS instance listening on the debug port (if running)
+# macOS / Linux:
+pids=$(lsof -t -i :9224)
+if [ -n "$pids" ]; then
+	kill $pids
+fi
 
 # Windows:
 # taskkill /F /PID <PID>
 # Or use Task Manager to end "Code - OSS"
 ```
 
-If you launched with `./scripts/code.sh`, the process name is `Electron` or `Code - OSS`. Verify it's gone:
+Verify it's gone:
 ```bash
 # Confirm no process is listening on the debug port
 lsof -i :9224  # should return nothing

.github/agents/sessions.md

@@ -0,0 +1,15 @@
+---
+name: Sessions Window Developer
+description: Specialist in developing the Agent Sessions Window
+---
+
+# Role and Objective
+
+You are a developer working on the 'sessions window'. Your goal is to make changes to the sessions window (`src/vs/sessions`), minimally editing outside of that directory.
+
+# Instructions
+
+1.  **Always read the `sessions` skill first.** This is your primary source of truth for the sessions architecture.
+    -   Invoke `skill: "sessions"`.
+2.  Focus your work on `src/vs/sessions/`.
+3.  Avoid making changes to core VS Code files (`src/vs/workbench/`, `src/vs/platform/`, etc.) unless absolutely necessary for the sessions window functionality.

.github/workflows/sessions-e2e.yml

@@ -0,0 +1,66 @@
+name: Sessions E2E Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+      - 'release/*'
+    paths:
+      - 'src/vs/sessions/**'
+      - 'scripts/code-sessions-web.*'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: sessions-e2e-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  sessions-e2e:
+    name: Sessions E2E Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - name: Install build tools
+        run: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libnotify-bin libkrb5-dev xvfb
+
+      - name: Install dependencies
+        run: npm ci
+        env:
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install build dependencies
+        run: npm ci
+        working-directory: build
+
+      - name: Transpile sources
+        run: npm run transpile-client
+
+      - name: Install E2E test dependencies
+        run: npm ci
+        working-directory: src/vs/sessions/test/e2e
+
+      - name: Install Playwright browsers
+        run: npx playwright install chromium
+
+      - name: Run Sessions E2E tests
+        run: xvfb-run npm test
+        working-directory: src/vs/sessions/test/e2e
+
+      - name: Upload failure screenshots
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: sessions-e2e-failures
+          path: src/vs/sessions/test/e2e/out/failure-*.png
+          retention-days: 7

.gitignore

@@ -29,6 +29,7 @@ test-output.json
 test/componentFixtures/.screenshots/*
 !test/componentFixtures/.screenshots/baseline/
 dist
+.playwright-cli
 .agents/agents/*.local.md
 .claude/agents/*.local.md
 .github/agents/*.local.md

build/azure-pipelines/win32/codesign.ts

@@ -19,7 +19,7 @@ async function main() {
 	// 2. Codesign Powershell scripts
 	// 3. Codesign context menu appx package (insiders only)
 	const codesignTask1 = spawnCodesignProcess(esrpCliDLLPath, 'sign-windows', codeSigningFolderPath, '*.dll,*.exe,*.node');
-	const codesignTask2 = spawnCodesignProcess(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.ps1');
+	const codesignTask2 = spawnCodesignProcess(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.ps1,*.psm1,*.psd1,*.ps1xml');
 	const codesignTask3 = process.env['VSCODE_QUALITY'] !== 'exploration'
 		? spawnCodesignProcess(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.appx')
 		: undefined;

build/gulpfile.extensions.ts

@@ -309,6 +309,13 @@ async function buildWebExtensions(isWatch: boolean): Promise<void> {
 		{ ignore: ['**/node_modules'] }
 	);
 
+	// Find all webpack configs, excluding those that will be esbuilt
+	const esbuildExtensionDirs = new Set(esbuildConfigLocations.map(p => path.dirname(p)));
+	const webpackConfigLocations = (await nodeUtil.promisify(glob)(
+		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
+		{ ignore: ['**/node_modules'] }
+	)).filter(configPath => !esbuildExtensionDirs.has(path.dirname(configPath)));
+
 	const promises: Promise<unknown>[] = [];
 
 	// Esbuild for extensions
@@ -323,5 +330,10 @@ async function buildWebExtensions(isWatch: boolean): Promise<void> {
 		);
 	}
 
+	// Run webpack for remaining extensions
+	if (webpackConfigLocations.length > 0) {
+		promises.push(ext.webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath }))));
+	}
+
 	await Promise.all(promises);
 }

build/gulpfile.reh.ts

@@ -83,6 +83,7 @@ const serverResourceIncludes = [
 	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh',
 	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh',
 	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
 
 ];
 

build/gulpfile.vscode.ts

@@ -91,6 +91,7 @@ const vscodeResourceIncludes = [
 	'out-build/vs/workbench/contrib/terminal/common/scripts/*.psm1',
 	'out-build/vs/workbench/contrib/terminal/common/scripts/*.sh',
 	'out-build/vs/workbench/contrib/terminal/common/scripts/*.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
 
 	// Accessibility Signals
 	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',