[pull] main from microsoft:main

.vscode/launch.json

@@ -660,7 +660,7 @@
 			"name": "Component Explorer (Edge)",
 			"type": "msedge",
 			"request": "launch",
-			"url": "http://localhost:5337/___explorer",
+			"url": "${taskVar:componentExplorerUrl}",
 			"preLaunchTask": "Launch Component Explorer",
 			"presentation": {
 				"group": "1_component_explorer",
@@ -671,7 +671,7 @@
 			"name": "Component Explorer (Chrome)",
 			"type": "chrome",
 			"request": "launch",
-			"url": "http://localhost:5337/___explorer",
+			"url": "${taskVar:componentExplorerUrl}",
 			"preLaunchTask": "Launch Component Explorer",
 			"presentation": {
 				"group": "1_component_explorer",

.vscode/tasks.json

@@ -410,7 +410,7 @@
 				"background": {
 					"activeOnStart": true,
 					"beginsPattern": ".*Setting up sessions.*",
-					"endsPattern": "Redirection server listening on.*"
+					"endsPattern": "  current: (?<componentExplorerUrl>.*) \\(current\\)"
 				}
 			}
 		},

src/vs/base/browser/ui/toolbar/toolbar.ts

@@ -251,7 +251,7 @@ export class ToolBar extends Disposable {
 			this.actionBar.push(action, { icon: this.options.icon ?? true, label: this.options.label ?? false, keybinding: this.getKeybindingLabel(action) });
 		});
 
-		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
+		this.updateOverflowClassName();
 
 		if (this.options.responsiveBehavior?.enabled) {
 			// Reset hidden actions
@@ -300,7 +300,8 @@ export class ToolBar extends Disposable {
 
 		// Ensure that the container width respects the minimum width of the
 		// element which is set based on the `responsiveBehavior.minItems` option
-		containerWidth = Math.max(containerWidth, parseInt(this.element.style.minWidth));
+		const parsedMinWidth = parseInt(this.element.style.minWidth);
+		containerWidth = Math.max(containerWidth, Number.isNaN(parsedMinWidth) ? 0 : parsedMinWidth);
 
 		// Each action is assumed to have a minimum width so that actions with a label
 		// can shrink to the action's minimum width. We do this so that action visibility
@@ -326,12 +327,14 @@ export class ToolBar extends Disposable {
 			}
 		};
 
+		const minimumWidth = actionBarWidth(false);
+
 		// Action bar fits and there are no hidden actions to show
-		if (actionBarWidth(false) <= containerWidth && this.hiddenActions.length === 0) {
+		if (minimumWidth <= containerWidth && this.hiddenActions.length === 0) {
 			return;
 		}
 
-		if (actionBarWidth(false) > containerWidth) {
+		if (minimumWidth > containerWidth) {
 			// Check for max items limit
 			if (this.options.responsiveBehavior?.minItems !== undefined) {
 				const primaryActionsCount = this.actionBar.hasAction(this.toggleMenuAction)
@@ -367,6 +370,7 @@ export class ToolBar extends Disposable {
 						label: this.options.label ?? false,
 						keybinding: this.getKeybindingLabel(this.toggleMenuAction),
 					});
+					this.updateOverflowClassName();
 				}
 			}
 		} else {
@@ -392,6 +396,7 @@ export class ToolBar extends Disposable {
 				if (this.originalSecondaryActions.length === 0 && this.hiddenActions.length === 0) {
 					this.toggleMenuAction.menuActions = [];
 					this.actionBar.pull(this.actionBar.length() - 1);
+					this.updateOverflowClassName();
 				}
 			}
 		}
@@ -403,6 +408,10 @@ export class ToolBar extends Disposable {
 			this.toggleMenuAction.menuActions = Separator.join(hiddenActions, secondaryActions);
 		}
 
+		this.updateOverflowClassName();
+	}
+
+	private updateOverflowClassName(): void {
 		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
 	}
 

src/vs/platform/actionWidget/browser/actionList.ts

@@ -1234,6 +1234,7 @@ export class ActionListWidget<T> extends Disposable {
 						description: child.tooltip || undefined,
 						group: { title: '', icon: ThemeIcon.fromId(child.checked ? Codicon.check.id : Codicon.blank.id) },
 						hideIcon: false,
+						hover: {},
 					});
 				}
 			}

src/vs/platform/keyboardLayout/common/keyboardLayout.ts

@@ -132,13 +132,13 @@ export function parseKeyboardLayoutDescription(layout: IKeyboardLayoutInfo | nul
 
 		if (/^com\.apple\.keylayout\./.test(macLayout.id)) {
 			return {
-				label: macLayout.id.replace(/^com\.apple\.keylayout\./, '').replace(/-/, ' '),
+				label: macLayout.id.replace(/^com\.apple\.keylayout\./, '').replace(/-/g, ' '),
 				description: ''
 			};
 		}
 		if (/^.*inputmethod\./.test(macLayout.id)) {
 			return {
-				label: macLayout.id.replace(/^.*inputmethod\./, '').replace(/[-\.]/, ' '),
+				label: macLayout.id.replace(/^.*inputmethod\./, '').replace(/[-\.]/g, ' '),
 				description: `Input Method (${macLayout.lang})`
 			};
 		}

src/vs/sessions/browser/media/style.css

@@ -15,72 +15,36 @@
  *
  * Margin values (must match the constants in the Part classes):
  *   Sidebar:       no card (flush, spans full height)
+ *   Chat bar:       top=16, bottom=2, left=16, right=16
  *   Auxiliary bar:  top=16, bottom=18, right=16
  *   Panel:          bottom=18, left=16, right=16
  */
 
 .agent-sessions-workbench .part.sidebar {
 	background: var(--vscode-sideBar-background);
 	border-right: 1px solid var(--vscode-sideBar-border, transparent);
-	animation: sessions-card-enter-left 250ms cubic-bezier(0.0, 0.0, 0.2, 1) both;
+}
+
+.agent-sessions-workbench .part.chatbar {
+	margin: 0 16px 2px 16px;
+	background: var(--part-background);
+	border: 1px solid var(--part-border-color, transparent);
+	border-radius: 8px;
+	box-sizing: border-box;
 }
 
 .agent-sessions-workbench .part.auxiliarybar {
 	margin: 0 16px 2px 0;
 	background: var(--part-background);
 	border: 1px solid var(--part-border-color, transparent);
 	border-radius: 8px;
-	animation: sessions-card-enter-right 250ms cubic-bezier(0.0, 0.0, 0.2, 1) both;
 }
 
 .agent-sessions-workbench .part.panel {
 	margin: 0 16px 18px 16px;
 	background: var(--part-background);
 	border: 1px solid var(--part-border-color, transparent);
 	border-radius: 8px;
-	animation: sessions-card-enter-up 250ms cubic-bezier(0.0, 0.0, 0.2, 1) both;
-}
-
-/* Card entrance animations */
-@keyframes sessions-card-enter-left {
-	from {
-		opacity: 0;
-		transform: translateX(-12px) scale(0.97);
-	}
-	to {
-		opacity: 1;
-		transform: translateX(0) scale(1);
-	}
-}
-
-@keyframes sessions-card-enter-right {
-	from {
-		opacity: 0;
-		transform: translateX(12px) scale(0.97);
-	}
-	to {
-		opacity: 1;
-		transform: translateX(0) scale(1);
-	}
-}
-
-@keyframes sessions-card-enter-up {
-	from {
-		opacity: 0;
-		transform: translateY(12px) scale(0.97);
-	}
-	to {
-		opacity: 1;
-		transform: translateY(0) scale(1);
-	}
-}
-
-@media (prefers-reduced-motion: reduce) {
-	.agent-sessions-workbench .part.sidebar,
-	.agent-sessions-workbench .part.auxiliarybar,
-	.agent-sessions-workbench .part.panel {
-		animation: none;
-	}
 }
 
 /* Grid background matches the chat bar / sidebar background */
@@ -124,7 +88,7 @@
 	margin: 0 auto !important;
 	display: inherit !important;
 	/* Align with panel (terminal) card margin */
-	padding: 4px 16px 16px 16px !important;
+	padding: 4px 16px !important;
 	box-sizing: border-box;
 }
 

src/vs/sessions/browser/parts/chatBarPart.ts

@@ -12,13 +12,16 @@ import { INotificationService } from '../../../platform/notification/common/noti
 import { IStorageService } from '../../../platform/storage/common/storage.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
 import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../workbench/common/theme.js';
+import { contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
+import { sessionsSidebarBorder } from '../../common/theme.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../workbench/common/views.js';
 import { IExtensionService } from '../../../workbench/services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService, Parts } from '../../../workbench/services/layout/browser/layoutService.js';
 import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
 import { assertReturnsDefined } from '../../../base/common/types.js';
 import { LayoutPriority } from '../../../base/browser/ui/splitview/splitview.js';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../../../workbench/browser/parts/paneCompositePart.js';
+import { Part } from '../../../workbench/browser/part.js';
 import { ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { IPaneCompositeBarOptions } from '../../../workbench/browser/parts/paneCompositeBar.js';
 import { IMenuService } from '../../../platform/actions/common/actions.js';
@@ -39,6 +42,15 @@ export class ChatBarPart extends AbstractPaneCompositePart {
 	override readonly minimumHeight: number = 0;
 	override readonly maximumHeight: number = Number.POSITIVE_INFINITY;
 
+	/** Visual margin values for the card-like appearance */
+	static readonly MARGIN_TOP = 16;
+	static readonly MARGIN_LEFT = 16;
+	static readonly MARGIN_RIGHT = 16;
+	static readonly MARGIN_BOTTOM = 2;
+
+	/** Border width on the card (1px each side) */
+	static readonly BORDER_WIDTH = 1;
+
 	get preferredHeight(): number | undefined {
 		return this.layoutService.mainContainerDimension.height * 0.4;
 	}
@@ -96,10 +108,31 @@ export class ChatBarPart extends AbstractPaneCompositePart {
 		super.updateStyles();
 
 		const container = assertReturnsDefined(this.getContainer());
-		container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
+
+		// Store background and border as CSS variables for the card styling on .part
+		container.style.setProperty('--part-background', this.getColor(SIDE_BAR_BACKGROUND) || '');
+		container.style.setProperty('--part-border-color', this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder) || 'transparent');
+		container.style.backgroundColor = 'transparent';
 		container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
 	}
 
+	override layout(width: number, height: number, top: number, left: number): void {
+		if (!this.layoutService.isVisible(Parts.CHATBAR_PART)) {
+			return;
+		}
+
+		// Layout content with reduced dimensions to account for visual margins and border
+		const borderTotal = ChatBarPart.BORDER_WIDTH * 2;
+		super.layout(
+			width - ChatBarPart.MARGIN_LEFT - ChatBarPart.MARGIN_RIGHT - borderTotal,
+			height - ChatBarPart.MARGIN_TOP - ChatBarPart.MARGIN_BOTTOM - borderTotal,
+			top, left
+		);
+
+		// Restore the full grid-allocated dimensions so that Part.relayout() works correctly.
+		Part.prototype.layout.call(this, width, height, top, left);
+	}
+
 	protected getCompositeBarOptions(): IPaneCompositeBarOptions {
 		return {
 			partContainerClass: 'chatbar',

src/vs/sessions/browser/parts/media/titlebarpart.css

@@ -43,7 +43,7 @@
 	width: fit-content;
 	flex-grow: 0;
 	justify-content: flex-end;
-	margin-right: 10px;
+	margin-right: 12px;
 }
 
 /* Session Title Actions Container (before right toolbar) */

src/vs/sessions/contrib/changes/browser/changesView.ts

@@ -903,6 +903,7 @@ export class ChangesViewPane extends ViewPane {
 		// Bind CI status widget to active session's PR CI model
 		if (this.ciStatusWidget) {
 			const activeSessionResourceObs = derived(this, reader => this.sessionManagementService.activeSession.read(reader)?.resource);
+
 			const ciModelObs = derived(this, reader => {
 				const session = this.sessionManagementService.activeSession.read(reader);
 				if (!session) {
@@ -912,16 +913,18 @@ export class ChangesViewPane extends ViewPane {
 				if (!context || context.prNumber === undefined) {
 					return undefined;
 				}
-				// Use the PR's headRef from the PR model to get CI checks
 				const prModel = this.gitHubService.getPullRequest(context.owner, context.repo, context.prNumber);
 				const pr = prModel.pullRequest.read(reader);
 				if (!pr) {
-					// Trigger a refresh if PR data isn't loaded yet
-					prModel.refresh();
 					return undefined;
 				}
-				const ciModel = this.gitHubService.getPullRequestCI(context.owner, context.repo, pr.headRef);
+				// Use the PR's headSha (commit SHA) rather than the branch
+				// name so CI checks can still be fetched after branch deletion
+				// (e.g. after the PR is merged).
+				const ciModel = this.gitHubService.getPullRequestCI(context.owner, context.repo, pr.headSha);
 				ciModel.refresh();
+				ciModel.startPolling();
+				reader.store.add({ dispose: () => ciModel.stopPolling() });
 				return ciModel;
 			});
 			this.renderDisposables.add(this.ciStatusWidget.bind(ciModelObs, activeSessionResourceObs));