Merge remote-tracking branch 'origin/main' into connor4312/ah-undo-redo

Author: connor4312

.agents/skills/launch/SKILL.md

@@ -111,19 +111,19 @@ agent-browser snapshot -i
 - Code OSS uses the default user data directory. Unlike VS Code Insiders, you don't typically need `--user-data-dir` since there's usually only one Code OSS instance running.
 - If you see "Sent env to running instance. Terminating..." it means Code OSS is already running and forwarded your args to the existing instance. Quit Code OSS and relaunch with the flag, or use `--user-data-dir=/tmp/code-oss-debug` to force a new instance.
 
-## Launching the Sessions App (Agent Sessions Window)
+## Launching the Agents App (Agents Window)
 
-The Sessions app is a separate workbench mode launched with the `--sessions` flag. It uses a dedicated user data directory to avoid conflicts with the main Code OSS instance.
+The Agents app is a separate workbench mode launched with the `--agents` flag. It uses a dedicated user data directory to avoid conflicts with the main Code OSS instance.
 
 ```bash
 cd <repo-root>  # the root of your VS Code checkout
-./scripts/code.sh --sessions --remote-debugging-port=9224
+./scripts/code.sh --agents --remote-debugging-port=9224
 ```
 
 Wait for the window to fully initialize, then connect:
 
 ```bash
-# Wait for Sessions app to start, retry until connected
+# Wait for Agents app 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)
@@ -132,7 +132,7 @@ agent-browser snapshot -i
 ```
 
 **Tips:**
-- The `--sessions` flag launches the Agent Sessions workbench instead of the standard VS Code workbench.
+- The `--agents` flag launches the Agents workbench instead of the standard VS Code workbench.
 - Set `VSCODE_SKIP_PRELAUNCH=1` to skip the compile step if you've already built.
 
 ## Launching VS Code Extensions for Debugging

.eslint-plugin-local/code-no-unexternalized-strings.ts

@@ -62,6 +62,9 @@ export default new class NoUnexternalizedStrings implements eslint.Rule.RuleModu
 				doubleQuotedStringLiterals.delete(keyNode);
 				key = keyNode.value;
 
+			} else if (keyNode.type === AST_NODE_TYPES.TemplateLiteral && keyNode.expressions.length === 0 && keyNode.quasis.length === 1) {
+				key = keyNode.quasis[0].value.cooked ?? undefined;
+
 			} else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) {
 				for (const property of keyNode.properties) {
 					if (property.type === AST_NODE_TYPES.Property && !property.computed) {
@@ -70,6 +73,9 @@ export default new class NoUnexternalizedStrings implements eslint.Rule.RuleModu
 								doubleQuotedStringLiterals.delete(property.value);
 								key = property.value.value;
 								break;
+							} else if (property.value.type === AST_NODE_TYPES.TemplateLiteral && property.value.expressions.length === 0 && property.value.quasis.length === 1) {
+								key = property.value.quasis[0].value.cooked ?? undefined;
+								break;
 							}
 						}
 					}

.github/agents/sessions.md

@@ -1,15 +1,15 @@
 ---
-name: Sessions Window Developer
-description: Specialist in developing the Agent Sessions Window
+name: Agents Window Developer
+description: Specialist in developing the Agents 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.
+You are a developer working on the 'agents window'. Your goal is to make changes to the agents 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.
+3.  Avoid making changes to core VS Code files (`src/vs/workbench/`, `src/vs/platform/`, etc.) unless absolutely necessary for the agents window functionality.

.github/instructions/sessions.instructions.md

@@ -1,11 +1,11 @@
 ---
-description: Architecture documentation for the Agent Sessions window — a sessions-first app built as a new top-level layer alongside vs/workbench. Covers layout, parts, chat widget, contributions, entry points, and development guidelines. Use when working in `src/vs/sessions`
+description: Architecture documentation for the Agents window — an agents-first app built as a new top-level layer alongside vs/workbench. Covers layout, parts, chat widget, contributions, entry points, and development guidelines. Use when working in `src/vs/sessions`
 applyTo: src/vs/sessions/**
 ---
 
-# Agent Sessions Window
+# Agents Window
 
-The Agent Sessions window is a **standalone application** built as a new top-level layer (`vs/sessions`) in the VS Code architecture. It provides a sessions-first experience optimized for agent workflows — a simplified, fixed-layout workbench where chat is the primary interaction surface and editors appear as modal overlays.
+The Agents window is a **standalone application** built as a new top-level layer (`vs/sessions`) in the VS Code architecture. It provides an agents-first experience optimized for agent workflows — a simplified, fixed-layout workbench where chat is the primary interaction surface and editors appear as modal overlays.
 
 When working on files under `src/vs/sessions/`, use these skills for detailed guidance:
 

.github/skills/add-policy/SKILL.md

@@ -124,15 +124,62 @@ npm run compile-check-ts-native
 Regenerate the auto-generated policy catalog:
 
 ```bash
-npm run transpile-client && ./scripts/code.sh --export-policy-data
+npm run export-policy-data
 ```
 
+This script handles transpilation, sets up `GITHUB_TOKEN` (via `gh` CLI or GitHub OAuth device flow), and runs `--export-policy-data`. The export command reads extension configuration policies from the distro's `product.json` via the GitHub API and merges them into the output.
+
 This updates `build/lib/policies/policyData.jsonc`. **Never edit this file manually.** Verify your new policy appears in the output.  You will need code review from a codeowner to merge the change to main.
 
 
 ## Policy for extension-provided settings
 
-For an extension author to provide policies for their extension's settings, a change must be made in `vscode-distro` to the `product.json`.
+Extension authors cannot add `policy:` fields directly—their settings are defined in the extension's `package.json`, not in VS Code core. Instead, policies for extension settings are defined in `vscode-distro`'s `product.json` under the `extensionConfigurationPolicy` key.
+
+### How it works
+
+1. **Source of truth**: The `extensionConfigurationPolicy` map lives in `vscode-distro` under `mixin/{quality}/product.json` (stable, insider, exploration).
+2. **Runtime**: When VS Code starts with a distro-mixed `product.json`, `configurationExtensionPoint.ts` reads `extensionConfigurationPolicy` and attaches matching `policy` objects to extension-contributed configuration properties.
+3. **Export/build**: The `--export-policy-data` command fetches the distro's `product.json` at the commit pinned in `package.json` and merges extension policies into the output. Use `npm run export-policy-data` which sets up authentication automatically.
+
+### Distro format
+
+Each entry in `extensionConfigurationPolicy` must include:
+
+```json
+"extensionConfigurationPolicy": {
+    "publisher.extension.settingName": {
+        "name": "PolicyName",
+        "category": "InteractiveSession",
+        "minimumVersion": "1.99",
+        "description": "Human-readable description."
+    }
+}
+```
+
+- `name`: PascalCase policy name, unique across all policies
+- `category`: Must be a valid `PolicyCategory` enum value (e.g., `InteractiveSession`, `Extensions`)
+- `minimumVersion`: The VS Code version that first shipped this policy
+- `description`: Human-readable description string used to generate localization key/value pairs for ADMX/ADML/macOS/Linux policy artifacts
+
+### Adding a new extension policy
+
+1. Add the entry to `extensionConfigurationPolicy` in **all three** quality `product.json` files in `vscode-distro` (`mixin/stable/`, `mixin/insider/`, `mixin/exploration/`)
+2. Update the `distro` commit hash in `package.json` to point to the distro commit that includes your new entry — the export command fetches extension policies from the pinned distro commit
+3. Regenerate `policyData.jsonc` by running `npm run export-policy-data` (see Step 4 above)
+4. Update the test fixture at `src/vs/workbench/contrib/policyExport/test/node/extensionPolicyFixture.json` with the new entry
+
+### Test fixtures
+
+The file `src/vs/workbench/contrib/policyExport/test/node/extensionPolicyFixture.json` is a test fixture that must stay in sync with the extension policies in the checked-in `policyData.jsonc`. When extension policies are added or changed in the distro, this fixture must be updated to match — otherwise the integration test will fail because the test output (generated from the fixture) won't match the checked-in file (generated from the real distro).
+
+### Downstream consumers
+
+| Consumer | What it reads | Output |
+|----------|--------------|--------|
+| `policyGenerator.ts` | `policyData.jsonc` | ADMX/ADML (Windows GP), `.mobileconfig` (macOS), `policy.json` (Linux) |
+| `vscode-website` (`gulpfile.policies.js`) | `policyData.jsonc` | Enterprise policy reference table at code.visualstudio.com/docs/enterprise/policies |
+| `vscode-docs` | Generated from website build | `docs/enterprise/policies.md` |
 
 ## Examples
 

.github/skills/agent-sessions-layout/SKILL.md

@@ -1,13 +1,13 @@
 ---
 name: agent-sessions-layout
-description: Agent Sessions workbench layout — covers the fixed layout structure, grid configuration, part visibility, editor modal, titlebar, sidebar footer, and implementation requirements. Use when implementing features or fixing issues in the Agent Sessions workbench layout.
+description: Agents workbench layout — covers the fixed layout structure, grid configuration, part visibility, editor modal, titlebar, sidebar footer, and implementation requirements. Use when implementing features or fixing issues in the Agents workbench layout.
 ---
 
-When working on the Agent Sessions workbench layout, always follow these guidelines:
+When working on the Agents workbench layout, always follow these guidelines:
 
 ## 1. Read the Specification First
 
-The authoritative specification for the Agent Sessions layout lives at:
+The authoritative specification for the Agents layout lives at:
 
 **`src/vs/sessions/LAYOUT.md`**
 
@@ -55,7 +55,7 @@ When proposing or implementing changes, follow these rules from the spec:
 |------|---------|
 | `sessions/LAYOUT.md` | Authoritative layout specification |
 | `sessions/browser/workbench.ts` | Main layout implementation (`Workbench` class) |
-| `sessions/browser/menus.ts` | Agent sessions menu IDs (`Menus` export) |
+| `sessions/browser/menus.ts` | Agents menu IDs (`Menus` export) |
 | `sessions/browser/layoutActions.ts` | Layout actions (toggle sidebar, panel, secondary sidebar) |
 | `sessions/browser/paneCompositePartService.ts` | `AgenticPaneCompositePartService` |
 | `sessions/browser/media/style.css` | Layout-specific styles |
@@ -67,7 +67,7 @@ When proposing or implementing changes, follow these rules from the spec:
 | `sessions/browser/parts/panelPart.ts` | Panel part |
 | `sessions/browser/parts/projectBarPart.ts` | Project Bar part (folder entries, icon customization) |
 | `sessions/contrib/configuration/browser/configuration.contribution.ts` | Sets `workbench.editor.useModal` to `'all'` for modal editor overlay |
-| `sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts` | Title bar widget and session picker |
+| `sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts` | Title bar widget and agent picker |
 | `sessions/contrib/chat/browser/runScriptAction.ts` | Run script split button for titlebar |
 | `sessions/contrib/accountMenu/browser/account.contribution.ts` | Account widget for sidebar footer |
 | `sessions/electron-browser/parts/titlebarPart.ts` | Desktop (Electron) titlebar part |

.github/skills/component-fixtures/SKILL.md

@@ -11,7 +11,7 @@ Use tools `mcp_component-exp_`* to list and screenshot fixtures. If you cannot s
 
 ## Running Fixtures Locally
 
-1. Start the component explorer daemon: run the **Launch Component Explorer** task
+1. Start the component explorer server: run the **Component Explorer Server** task
 2. Use the `mcp_component-exp_list_fixtures` tool to see all available fixtures and their URLs
 3. Use the `mcp_component-exp_screenshot` tool to capture screenshots programmatically
 

.github/skills/sessions/SKILL.md

@@ -1,9 +1,9 @@
 ---
 name: sessions
-description: Agent Sessions window architecture — covers the sessions-first app, layering, folder structure, chat widget, menus, contributions, entry points, and development guidelines. Use when implementing features or fixing issues in the Agent Sessions window.
+description: Agents window architecture — covers the agents-first app, layering, folder structure, chat widget, menus, contributions, entry points, and development guidelines. Use when implementing features or fixing issues in the Agents window.
 ---
 
-When working on the Agent Sessions window (`src/vs/sessions/`), always follow these guidelines:
+When working on the Agents window (`src/vs/sessions/`), always follow these guidelines:
 
 ## 1. Read the Specification Documents First
 
@@ -41,13 +41,13 @@ vs/sessions      ← Agent Sessions window (this layer)
 
 ### 2.3 How It Differs from VS Code
 
-| Aspect | VS Code Workbench | Agent Sessions Window |
+| Aspect | VS Code Workbench | Agents Window |
 |--------|-------------------|----------------------|
 | Layout | Configurable part positions | Fixed layout, no settings customization |
 | Chrome | Activity bar, status bar, banner | Simplified — none of these |
 | Primary UX | Editor-centric | Chat-first (Chat Bar is a primary part) |
 | Editors | In the grid layout | Modal overlay above the workbench |
-| Titlebar | Menubar, editor actions, layout controls | Session picker, run script, toggle sidebar/panel |
+| Titlebar | Menubar, editor actions, layout controls | Agent picker, run script, toggle sidebar/panel |
 | Navigation | Activity bar with viewlets | Sidebar (views) + sidebar footer (account) |
 | Entry point | `vs/workbench` workbench class | `vs/sessions/browser/workbench.ts` `Workbench` class |
 
@@ -154,7 +154,7 @@ The main editor part is hidden (`display:none`). All editors open via `MODAL_GRO
 
 ## 5. Chat Widget
 
-The Agent Sessions chat experience is built around `AgentSessionsChatWidget` — a wrapper around the core `ChatWidget` that adds:
+The Agents chat experience is built around `AgentSessionsChatWidget` — a wrapper around the core `ChatWidget` that adds:
 
 - **Deferred session creation** — the UI is interactive before any session resource exists; sessions are created on first message send
 - **Target configuration** — observable state tracking which agent provider (Local, Cloud) is selected
@@ -172,17 +172,17 @@ Read `browser/widget/AGENTS_CHAT_WIDGET.md` for the full architecture.
 
 ## 6. Menus
 
-The agent sessions window uses **its own menu IDs** defined in `browser/menus.ts` via the `Menus` export. **Never use shared `MenuId.*` constants** from `vs/platform/actions` for agent sessions UI — use the `Menus.*` equivalents instead.
+The agents window uses **its own menu IDs** defined in `browser/menus.ts` via the `Menus` export. **Never use shared `MenuId.*` constants** from `vs/platform/actions` for agents window UI — use the `Menus.*` equivalents instead.
 
 | Menu ID | Purpose |
 |---------|---------|
 | `Menus.ChatBarTitle` | Chat bar title actions |
-| `Menus.CommandCenter` | Center toolbar with session picker widget |
+| `Menus.CommandCenter` | Center toolbar with agent picker widget |
 | `Menus.CommandCenterCenter` | Center section of command center |
 | `Menus.TitleBarContext` | Titlebar context menu |
 | `Menus.TitleBarLeftLayout` | Left layout toolbar |
-| `Menus.TitleBarSessionTitle` | Session title in titlebar |
-| `Menus.TitleBarSessionMenu` | Session menu in titlebar |
+| `Menus.TitleBarSessionTitle` | Agent title in titlebar |
+| `Menus.TitleBarSessionMenu` | Agent menu in titlebar |
 | `Menus.TitleBarRightLayout` | Right layout toolbar |
 | `Menus.PanelTitle` | Panel title bar actions |
 | `Menus.SidebarTitle` | Sidebar title bar actions |
@@ -201,7 +201,7 @@ Defined in `common/contextkeys.ts`:
 | `activeChatBar` | `string` | ID of the active chat bar panel |
 | `chatBarFocus` | `boolean` | Whether chat bar has keyboard focus |
 | `chatBarVisible` | `boolean` | Whether chat bar is visible |
-| `sessionsWelcomeVisible` | `boolean` | Whether the sessions welcome overlay is visible |
+| `sessionsWelcomeVisible` | `boolean` | Whether the agents welcome overlay is visible |
 ## 8. Contributions
 
 Feature contributions live under `contrib/<featureName>/browser/` and are registered via imports in `sessions.desktop.main.ts` (desktop) or `sessions.common.main.ts` (browser-compatible).
@@ -210,8 +210,8 @@ Feature contributions live under `contrib/<featureName>/browser/` and are regist
 
 | Contribution | Location | Purpose |
 |-------------|----------|---------|
-| **Sessions View** | `contrib/sessions/browser/` | Sessions list in sidebar, session picker, active session service |
-| **Title Bar Widget** | `contrib/sessions/browser/sessionsTitleBarWidget.ts` | Session picker in titlebar center |
+| **Sessions View** | `contrib/sessions/browser/` | Agents list in sidebar, agent picker, active session service |
+| **Title Bar Widget** | `contrib/sessions/browser/sessionsTitleBarWidget.ts` | Agent picker in titlebar center |
 | **Account Widget** | `contrib/accountMenu/browser/` | Account button in sidebar footer |
 | **Chat Actions** | `contrib/chat/browser/` | Chat actions (run script, branch, prompts, customizations debug log) |
 | **Changes View** | `contrib/changesView/browser/` | File changes in auxiliary bar |
@@ -229,7 +229,7 @@ Feature contributions live under `contrib/<featureName>/browser/` and are regist
 
 ### 8.2 Service Overrides
 
-The agent sessions window registers its own implementations for:
+The agents window registers its own implementations for:
 
 - `IPaneCompositePartService` → `AgenticPaneCompositePartService` (creates agent-specific parts)
 - `IPromptsService` → `AgenticPromptsService` (scopes prompt discovery to active session worktree)
@@ -241,7 +241,7 @@ Service overrides also live under `services/`:
 
 ### 8.3 `WindowVisibility.Sessions`
 
-Views and contributions that should only appear in the agent sessions window (not in regular VS Code) use `WindowVisibility.Sessions` in their registration.
+Views and contributions that should only appear in the agents window (not in regular VS Code) use `WindowVisibility.Sessions` in their registration.
 
 ## 9. Entry Points