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

Author: anthonykim1

.github/CODENOTIFY

@@ -103,8 +103,6 @@ src/vs/workbench/contrib/files/** @bpasero
 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/chatInputPart.ts @bpasero
-src/vs/workbench/contrib/chat/browser/chatWidget.ts @bpasero
 src/vs/workbench/contrib/chat/browser/chatViewPane.ts @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.ts @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/media/chatUsageWidget.css @bpasero

.github/prompts/data.prompt.md renamed to .github/agents/data.md

@@ -1,14 +1,16 @@
 ---
-agent: agent
-description: 'Answer telemetry questions with data queries'
-tools: ['search', 'runCommands/runInTerminal', 'Azure MCP/kusto_query', 'githubRepo', 'extensions', 'todos']
+name: Data
+description: Answer telemetry questions with data queries using Kusto Query Language (KQL)
+tools:
+  ['vscode/extensions', 'execute/runInTerminal', 'read/readFile', 'search', 'web/githubRepo', 'azure-mcp/kusto_query', 'todo']
 ---
 
-<overview>
+# Role and Objective
+
 You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query Language (KQL) and data analysis. Your goal is to answer questions about VS Code telemetry events by running kusto queries (NOT just by looking at telemetry types).
-</overview>
 
-<workflow>
+# Workflow
+
 1. Read `vscode-telemetry-docs/.github/copilot-instructions.md` to understand how to access VS Code's telemetry
 	- If the `vscode-telemetry-docs` folder doesn't exist (just check your workspace_info, no extra tool call needed), run `npm run mixin-telemetry-docs` to clone the telemetry documentation.
 2. Analyze data using kusto queries: Don't just describe what could be queried - actually execute Kusto queries to provide real data and insights:
@@ -18,10 +20,10 @@ You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query
    - Default to a rolling 28-day window if no specific timeframe is requested
    - Format and present the query results clearly to answer the user's question
 	- Track progress of your kusto analysis using todos
-	- If kusto queries keep failing (up to 3 repeated attempts of fixing parametersor queries), stop and inform the user.
-</workflow>
+	- If kusto queries keep failing (up to 3 repeated attempts of fixing parameters or queries), stop and inform the user.
+
+# Kusto Best Practices
 
-<kusto-best-practices>
 When writing Kusto queries, follow these best practices:
 - **Explore data efficiently.** Use 1d (1-day) time window and `sample` operator to quickly understand data shape and volume
 - **Aggregate usage in proper time windows.** When no specific timeframe is provided:
@@ -30,13 +32,12 @@ When writing Kusto queries, follow these best practices:
    - Follow the time filtering patterns from the telemetry documentation
 - **Correctly map names and keys.** EventName is the prefix (`monacoworkbench/` for vscode) and lowercase event name. Properties/Measurements keys are lowercase. Any properties marked `isMeasurement` are in the Measurements bag.
 - **Parallelize queries when possible.** Run multiple independent queries as parallel tool calls to speed up analysis.
-</kusto-best-practices>
 
-<format>
+# Output Format
+
 Your response should include:
 - The actual Kusto query executed (formatted nicely)
 - Real query results with data to answer the user's question
 - Interpretation and analysis of the results
 - References to specific documentation files when applicable
 - Additional context or insights from the telemetry data
-</format>

.github/workflows/no-engineering-system-changes.yml

@@ -0,0 +1,50 @@
+name: Prevent engineering system changes in PRs
+
+on: pull_request
+permissions: {}
+
+jobs:
+  main:
+    name: Prevent engineering system changes in PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get file changes
+        uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b # v1.2.4
+        id: file_changes
+      - name: Check if engineering systems were modified
+        id: engineering_systems_check
+        run: |
+          if cat $HOME/files.json | jq -e 'any(test("^\\.github\\/workflows\\/|^build\\/|package\\.json$"))' > /dev/null; then
+            echo "engineering_systems_modified=true" >> $GITHUB_OUTPUT
+            echo "Engineering systems were modified in this PR"
+          else
+            echo "engineering_systems_modified=false" >> $GITHUB_OUTPUT
+            echo "No engineering systems were modified in this PR"
+          fi
+      - name: Prevent Copilot from modifying engineering systems
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login == 'Copilot' }}
+        run: |
+          echo "Copilot is not allowed to modify .github/workflows, build folder files, or package.json files."
+          echo "If you need to update engineering systems, please do so manually or through authorized means."
+          exit 1
+      - uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d # v2.4.0
+        id: get_permissions
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        with:
+          route: GET /repos/microsoft/vscode/collaborators/${{ github.event.pull_request.user.login }}/permission
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set control output variable
+        id: control
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        run: |
+          echo "user: ${{ github.event.pull_request.user.login }}"
+          echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
+          echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
+          echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
+          echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
+      - name: Check for engineering system changes
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.control.outputs.should_run == 'true' }}
+        run: |
+          echo "Changes to .github/workflows/, build/ folder files, or package.json files aren't allowed in PRs."
+          exit 1

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
 target="39.2.3"
-ms_build_id="12857560"
+ms_build_id="12869810"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

ThirdPartyNotices.txt

@@ -2675,6 +2675,10 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
+
+---
+
+Git Logo by [Jason Long](https://bsky.app/profile/jasonlong.me) is licensed under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).
 ---------------------------------------------------------
 
 ---------------------------------------------------------

build/azure-pipelines/win32/sdl-scan-win32.yml

@@ -115,6 +115,16 @@ steps:
       Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
     displayName: List files
 
+  - task: PublishSymbols@2
+    displayName: 'Publish Symbols to Artifacts'
+    inputs:
+      SymbolsFolder: '$(Agent.BuildDirectory)\scanbin'
+      SearchPattern: '**/*.pdb'
+      IndexSources: false
+      PublishSymbols: true
+      SymbolServerType: 'TeamServices'
+      SymbolsProduct: 'vscode-client'
+
   - task: CopyFiles@2
     displayName: 'Collect Symbols for API Scan'
     inputs:

cli/ThirdPartyNotices.txt

@@ -4422,7 +4422,7 @@ DEALINGS IN THE SOFTWARE.
 ---------------------------------------------------------
 
 keyring 2.3.3 - MIT OR Apache-2.0
-https://github.com/hwchen/keyring-rs
+https://github.com/open-source-cooperative/keyring-rs
 
 Copyright (c) 2016 keyring Developers
 

extensions/git/src/artifactProvider.ts

@@ -4,16 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { LogOutputChannel, SourceControlArtifactProvider, SourceControlArtifactGroup, SourceControlArtifact, Event, EventEmitter, ThemeIcon, l10n, workspace, Uri, Disposable } from 'vscode';
-import { dispose, filterEvent, fromNow, getStashDescription, IDisposable } from './util';
+import { dispose, filterEvent, IDisposable } from './util';
 import { Repository } from './repository';
 import { Ref, RefType } from './api/git';
 import { OperationKind } from './operation';
 
 function getArtifactDescription(ref: Ref, shortCommitLength: number): string {
 	const segments: string[] = [];
-	if (ref.commitDetails?.commitDate) {
-		segments.push(fromNow(ref.commitDetails.commitDate));
-	}
 	if (ref.commit) {
 		segments.push(ref.commit.substring(0, shortCommitLength));
 	}
@@ -130,7 +127,8 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 					description: getArtifactDescription(r, shortCommitLength),
 					icon: this.repository.HEAD?.type === RefType.Head && r.name === this.repository.HEAD?.name
 						? new ThemeIcon('target')
-						: new ThemeIcon('git-branch')
+						: new ThemeIcon('git-branch'),
+					timestamp: r.commitDetails?.commitDate?.getTime()
 				}));
 			} else if (group === 'tags') {
 				const refs = await this.repository
@@ -142,16 +140,18 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 					description: getArtifactDescription(r, shortCommitLength),
 					icon: this.repository.HEAD?.type === RefType.Tag && r.name === this.repository.HEAD?.name
 						? new ThemeIcon('target')
-						: new ThemeIcon('tag')
+						: new ThemeIcon('tag'),
+					timestamp: r.commitDetails?.commitDate?.getTime()
 				}));
 			} else if (group === 'stashes') {
 				const stashes = await this.repository.getStashes();
 
 				return stashes.map(s => ({
 					id: `stash@{${s.index}}`,
 					name: s.description,
-					description: getStashDescription(s),
-					icon: new ThemeIcon('git-stash')
+					description: s.branchName,
+					icon: new ThemeIcon('git-stash'),
+					timestamp: s.commitDate?.getTime()
 				}));
 			}
 		} catch (err) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.107.0",
-  "distro": "4c2f5059e83090f81ce2d12de556a3a6790dc24c",
+  "distro": "f7daaf68414ef6e47bec698f8babc297f0d90f0d",
   "author": {
     "name": "Microsoft Corporation"
   },

resources/linux/snap/snapcraft.yaml

@@ -78,8 +78,8 @@ parts:
 
 apps:
   @@NAME@@:
-    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox
+    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox --ozone-platform=x11
     common-id: @@NAME@@.desktop
 
   url-handler:
-    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox
+    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox --ozone-platform=x11