Merge branch 'main' into tyriar/node-pty-39

Author: anthonykim1

.github/CODENOTIFY

@@ -104,6 +104,9 @@ src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @roblourens
 src/vs/workbench/contrib/chat/browser/chatSetup/** @bpasero
 src/vs/workbench/contrib/chat/browser/chatStatus/** @bpasero
 src/vs/workbench/contrib/chat/browser/chatViewPane.ts @bpasero
+src/vs/workbench/contrib/chat/browser/media/chatViewPane.css @bpasero
+src/vs/workbench/contrib/chat/browser/chatViewTitleControl.ts @bpasero
+src/vs/workbench/contrib/chat/browser/media/chatViewTitleControl.css @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.ts @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/media/chatUsageWidget.css @bpasero
 src/vs/workbench/contrib/chat/browser/agentSessions/** @bpasero

.github/prompts/find-duplicates.prompt.md

@@ -1,7 +1,8 @@
 ---
 # NOTE: This prompt is intended for internal use only for now.
 agent: Engineering
-argument-hint: "Provide an issue number to find duplicates"
+argument-hint: Provide a link or issue number to find duplicates for
+description: Find duplicates for a VS Code GitHub issue
 model: Claude Sonnet 4.5 (copilot)
 tools:
   - execute/getTerminalOutput

.github/prompts/find-issue.prompt.md

@@ -2,7 +2,8 @@
 # ⚠️: Internal use only. To onboard, follow instructions at https://github.com/microsoft/vscode-engineering/blob/main/docs/gh-mcp-onboarding.md
 agent: Engineering
 model: Claude Sonnet 4.5 (copilot)
-argument-hint: "Describe your issue..."
+argument-hint: Describe your issue. Include relevant keywords or phrases.
+description: Search for an existing VS Code GitHub issue
 tools:
   - github/*
   - agent/runSubagent

.github/workflows/no-yarn-lock-changes.yml

@@ -175,6 +175,7 @@ steps:
       exec { npm run gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
       mv ..\vscode-reh-web-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH)-web # TODO@joaomoreno
       echo "##vso[task.setvariable variable=BUILT_WEB]true"
+      echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)-web"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build server (web)

build/azure-pipelines/win32/steps/product-build-win32-compile.yml

@@ -2015,11 +2015,6 @@
           "group": "inline@1",
           "when": "scmProvider == git && scmArtifactGroupId == stashes"
         },
-        {
-          "command": "git.repositories.stashView",
-          "group": "inline@2",
-          "when": "scmProvider == git && scmArtifactGroupId == stashes"
-        },
         {
           "command": "git.repositories.stashView",
           "group": "1_view@1",
@@ -2671,7 +2666,7 @@
         {
           "command": "git.openMergeEditor",
           "group": "navigation@-10",
-          "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && git.activeResourceHasMergeConflicts"
+          "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
         }
       ],
       "multiDiffEditor/resource/title": [

extensions/git/package.json

@@ -200,7 +200,7 @@ export interface RefQuery {
 	readonly contains?: string;
 	readonly count?: number;
 	readonly pattern?: string | string[];
-	readonly sort?: 'alphabetically' | 'committerdate';
+	readonly sort?: 'alphabetically' | 'committerdate' | 'creatordate';
 }
 
 export interface BranchQuery extends RefQuery {

extensions/git/src/api/git.d.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LogOutputChannel, SourceControlArtifactProvider, SourceControlArtifactGroup, SourceControlArtifact, Event, EventEmitter, ThemeIcon, l10n, workspace, Uri, Disposable } from 'vscode';
+import { LogOutputChannel, SourceControlArtifactProvider, SourceControlArtifactGroup, SourceControlArtifact, Event, EventEmitter, ThemeIcon, l10n, workspace, Uri, Disposable, Command } from 'vscode';
 import { dispose, filterEvent, IDisposable } from './util';
 import { Repository } from './repository';
 import { Ref, RefType } from './api/git';
@@ -119,7 +119,7 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 		try {
 			if (group === 'branches') {
 				const refs = await this.repository
-					.getRefs({ pattern: 'refs/heads', includeCommitDetails: true });
+					.getRefs({ pattern: 'refs/heads', includeCommitDetails: true, sort: 'creatordate' });
 
 				return refs.sort(sortRefByName).map(r => ({
 					id: `refs/heads/${r.name}`,
@@ -132,7 +132,7 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 				}));
 			} else if (group === 'tags') {
 				const refs = await this.repository
-					.getRefs({ pattern: 'refs/tags', includeCommitDetails: true });
+					.getRefs({ pattern: 'refs/tags', includeCommitDetails: true, sort: 'creatordate' });
 
 				return refs.sort(sortRefByName).map(r => ({
 					id: `refs/tags/${r.name}`,
@@ -151,7 +151,11 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 					name: s.description,
 					description: s.branchName,
 					icon: new ThemeIcon('git-stash'),
-					timestamp: s.commitDate?.getTime()
+					timestamp: s.commitDate?.getTime(),
+					command: {
+						title: l10n.t('View Stash'),
+						command: 'git.repositories.stashView'
+					} satisfies Command
 				}));
 			}
 		} catch (err) {