[pull] main from microsoft:main

.eslint-plugin-local/code-translation-remind.ts

@@ -26,18 +26,19 @@ export default new class TranslationRemind implements eslint.Rule.RuleModule {
 
 	private _checkImport(context: eslint.Rule.RuleContext, node: TSESTree.Node, path: string) {
 
-		if (path !== TranslationRemind.NLS_MODULE) {
+		if (path !== TranslationRemind.NLS_MODULE && !path.endsWith('/nls.js')) {
 			return;
 		}
 
 		const currentFile = context.getFilename();
 		const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
 		const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
-		if (!matchService && !matchPart) {
+		const matchSessionsPart = currentFile.match(/vs\/sessions\/contrib\/\w+/);
+		if (!matchService && !matchPart && !matchSessionsPart) {
 			return;
 		}
 
-		const resource = matchService ? matchService[0] : matchPart![0];
+		const resource = matchService ? matchService[0] : matchPart ? matchPart[0] : matchSessionsPart![0];
 		let resourceDefined = false;
 
 		let json;
@@ -47,9 +48,10 @@ export default new class TranslationRemind implements eslint.Rule.RuleModule {
 			console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
 			return;
 		}
-		const workbenchResources = JSON.parse(json).workbench;
+		const parsed = JSON.parse(json);
+		const resources = [...parsed.workbench, ...parsed.sessions];
 
-		workbenchResources.forEach((existingResource: any) => {
+		resources.forEach((existingResource: any) => {
 			if (existingResource.name === resource) {
 				resourceDefined = true;
 				return;

.github/hooks/hooks.json

@@ -4,8 +4,7 @@
 		"sessionStart": [
 			{
 				"type": "command",
-				"bash": "if [ -f ~/.vscode-worktree-setup ]; then nohup bash -c 'npm ci && npm run compile' > /tmp/worktree-setup-$(date +%Y-%m-%d_%H-%M-%S).log 2>&1 & fi",
-				"powershell": "if (Test-Path \"$env:USERPROFILE\\.vscode-worktree-setup\") { $log = \"$env:TEMP\\worktree-setup-$(Get-Date -Format 'yyyy-MM-dd_HH-mm-ss').log\"; $dir = $PWD.Path; Start-Job -ScriptBlock { param($d, $l) Set-Location $d; & { npm ci; if ($LASTEXITCODE -eq 0) { npm run compile } } *> $l } -ArgumentList $dir, $log | Out-Null }"
+				"bash": ""
 			}
 		],
 		"sessionEnd": [

.github/workflows/api-proposal-version-check.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       - name: Get PR info
         id: pr_info
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             let prNumber, headSha, baseSha;
@@ -62,7 +62,7 @@ jobs:
 
       - name: Check for override comment
         id: check_override
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};
@@ -130,7 +130,7 @@ jobs:
           (github.event.comment.author_association == 'OWNER' ||
            github.event.comment.author_association == 'MEMBER' ||
            github.event.comment.author_association == 'COLLABORATOR')
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const headSha = '${{ steps.pr_info.outputs.head_sha }}';
@@ -241,7 +241,7 @@ jobs:
 
       - name: Post warning comment
         if: steps.check_override.outputs.override_found != 'true' && steps.version_check.outputs.version_changed == 'true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};

.github/workflows/screenshot-test.yml

@@ -18,7 +18,6 @@ concurrency:
 
 jobs:
   screenshots:
-    if: false # temporarily disabled
     name: Checking Component Screenshots
     runs-on: ubuntu-latest
     steps:
@@ -55,12 +54,12 @@ jobs:
         run: npx playwright install chromium
 
       - name: Capture screenshots
-        run: npx component-explorer screenshot --project ./test/componentFixtures/component-explorer.json
+        run: ./node_modules/.bin/component-explorer screenshot --project ./test/componentFixtures/component-explorer.json
 
       - name: Compare screenshots
         id: compare
         run: |
-          npx component-explorer screenshot:compare \
+          ./node_modules/.bin/component-explorer screenshot:compare \
             --project ./test/componentFixtures \
             --report ./test/componentFixtures/.screenshots/report
         continue-on-error: true
@@ -93,19 +92,33 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           REPORT="test/componentFixtures/.screenshots/report/report.json"
+          STATE="success"
           if [ -f "$REPORT" ]; then
             CHANGED=$(node -e "const r = require('./$REPORT'); console.log(r.summary.added + r.summary.removed + r.summary.changed)")
             TITLE="⚠ ${CHANGED} screenshots changed"
+            BLOCKS_CI=$(node -e "
+              const r = require('./$REPORT');
+              const blocking = Object.entries(r.fixtures).filter(([, f]) =>
+                f.status !== 'unchanged' && (f.labels || []).includes('blocks-ci')
+              );
+              if (blocking.length > 0) {
+                console.log(blocking.map(([name]) => name).join(', '));
+              }
+            ")
+            if [ -n "$BLOCKS_CI" ]; then
+              STATE="failure"
+              TITLE="❌ ${CHANGED} screenshots changed (blocks CI: ${BLOCKS_CI})"
+            fi
           else
             TITLE="✅ Screenshots match"
           fi
 
           SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
+          DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json&search=changed"
 
           gh api "repos/${{ github.repository }}/statuses/$SHA" \
             --input - <<EOF || echo "::warning::Could not create commit status (expected for fork PRs)"
-          {"state":"success","target_url":"$DETAILS_URL","description":"$TITLE","context":"Component Screenshots"}
+          {"state":"$STATE","target_url":"$DETAILS_URL","description":"$TITLE","context":"Component Screenshots"}
           EOF
 
       # - name: Post PR comment

.github/workflows/sessions-e2e.yml

@@ -59,7 +59,7 @@ jobs:
 
       - name: Upload failure screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: sessions-e2e-failures
           path: src/vs/sessions/test/e2e/out/failure-*.png

.npmrc

@@ -6,4 +6,3 @@ ignore-scripts=false
 build_from_source="true"
 legacy-peer-deps="true"
 timeout=180000
-min-release-age="1"

.vscode/tasks.json

@@ -386,7 +386,7 @@
 		{
 			"label": "Launch Component Explorer",
 			"type": "shell",
-			"command": "npx component-explorer serve -c ./test/componentFixtures/component-explorer.json -vv",
+			"command": "npx component-explorer serve -c ./test/componentFixtures/component-explorer.json -vv --kill-if-running",
 			"isBackground": true,
 			"problemMatcher": {
 				"owner": "component-explorer",
@@ -403,6 +403,18 @@
 					"endsPattern": "Redirection server listening on.*"
 				}
 			}
+		},
+		{
+			"label": "Install & Compile",
+			"type": "shell",
+			"command": "npm install && npm run compile",
+			"windows": {
+				"command": "cmd /d /c \"npm install && npm run compile\""
+			},
+			"inSessions": true,
+			"runOptions": {
+				"runOn": "worktreeCreated"
+			}
 		}
 	]
 }

build/lib/i18n.resources.json

@@ -561,6 +561,120 @@
 		{
 			"name": "vs/workbench/contrib/list",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/browserView",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/dropOrPasteInto",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/editTelemetry",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/inlineCompletions",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/mcp",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/meteredConnection",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/processExplorer",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/remoteCodingAgents",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/telemetry",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/welcomeAgentSessions",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/accounts",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/chat",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/request",
+			"project": "vscode-workbench"
+		}
+	],
+	"sessions": [
+		{
+			"name": "vs/sessions",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/accountMenu",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/agentFeedback",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/aiCustomizationTreeView",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/applyCommitsToParentRepo",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/changes",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/chat",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/codeReview",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/fileTreeView",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/files",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/git",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/logs",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/sessions",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/terminal",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/welcome",
+			"project": "vscode-sessions"
 		}
 	]
 }

build/lib/i18n.ts

@@ -391,7 +391,8 @@ const editorProject: string = 'vscode-editor',
 	workbenchProject: string = 'vscode-workbench',
 	extensionsProject: string = 'vscode-extensions',
 	setupProject: string = 'vscode-setup',
-	serverProject: string = 'vscode-server';
+	serverProject: string = 'vscode-server',
+	sessionsProject: string = 'vscode-sessions';
 
 export function getResource(sourceFile: string): Resource {
 	let resource: string;
@@ -416,6 +417,11 @@ export function getResource(sourceFile: string): Resource {
 		return { name: resource, project: workbenchProject };
 	} else if (/^vs\/workbench/.test(sourceFile)) {
 		return { name: 'vs/workbench', project: workbenchProject };
+	} else if (/^vs\/sessions\/contrib/.test(sourceFile)) {
+		resource = sourceFile.split('/', 4).join('/');
+		return { name: resource, project: sessionsProject };
+	} else if (/^vs\/sessions/.test(sourceFile)) {
+		return { name: 'vs/sessions', project: sessionsProject };
 	}
 
 	throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
@@ -737,6 +743,11 @@ export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[
 		if (EXTERNAL_EXTENSIONS.find(e => e === resource)) {
 			project = extensionsProject;
 		}
+		// TODO(tyleonha): Support localization for the Sessions app (https://github.com/microsoft/vscode-internalbacklog/issues/7045)
+		// vscode-setup has its own import path via prepareIslFiles
+		if (project === sessionsProject || project === setupProject) {
+			return;
+		}
 		const contents = xlf.contents!.toString();
 		log(`Found ${project}: ${resource}`);
 		const parsePromise = getL10nFilesFromXlf(contents);

build/lib/test/i18n.test.ts

@@ -31,7 +31,8 @@ suite('XLF Parser Tests', () => {
 
 	test('JSON file source path to Transifex resource match', () => {
 		const editorProject: string = 'vscode-editor',
-			workbenchProject: string = 'vscode-workbench';
+			workbenchProject: string = 'vscode-workbench',
+			sessionsProject: string = 'vscode-sessions';
 
 		const platform: i18n.Resource = { name: 'vs/platform', project: editorProject },
 			editorContrib = { name: 'vs/editor/contrib', project: editorProject },
@@ -40,7 +41,9 @@ suite('XLF Parser Tests', () => {
 			code = { name: 'vs/code', project: workbenchProject },
 			workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject },
 			workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject },
-			workbench = { name: 'vs/workbench', project: workbenchProject };
+			workbench = { name: 'vs/workbench', project: workbenchProject },
+			sessionsContrib = { name: 'vs/sessions/contrib/chat', project: sessionsProject },
+			sessions = { name: 'vs/sessions', project: sessionsProject };
 
 		assert.deepStrictEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
 		assert.deepStrictEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
@@ -50,5 +53,7 @@ suite('XLF Parser Tests', () => {
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
+		assert.deepStrictEqual(i18n.getResource('vs/sessions/contrib/chat/browser/chatWidget'), sessionsContrib);
+		assert.deepStrictEqual(i18n.getResource('vs/sessions/browser/layoutActions'), sessions);
 	});
 });