[pull] main from microsoft:main

.github/prompts/fix-error.prompt.md

@@ -25,12 +25,13 @@ After the fix is validated (compilation clean, tests pass):
 3. **Push**: `git push -u origin <branch-name>`.
 4. **Create a draft PR** with a description that includes:
    - A summary of the change.
+   - `Fixes #<issue-number>` so GitHub auto-closes the issue when the PR merges.
    - What scenarios may trigger the error.
    - The code flow explaining why the error gets thrown and goes unhandled.
    - Steps a user can follow to manually validate the fix.
    - How the fix addresses the issue, with a brief note per changed file.
 5. **Monitor the PR** for Copilot review comments. Wait 1-2 minutes after each push for Copilot to leave its review, then check for new comments. Evaluate each comment:
-   - If valid, apply the fix in a new commit, push, and **resolve the comment thread**.
+   - If valid, apply the fix in a new commit, push, and **resolve the comment thread** using the GitHub GraphQL API (`resolveReviewThread` mutation with the thread's node ID).
    - If not applicable, leave a reply explaining why.
    - After addressing comments, update the PR description if the changes affect the summary, code flow explanation, or per-file notes.
 6. **Repeat monitoring** after each push: wait 1-2 minutes, check for new Copilot comments, and address them. Continue this loop until no new comments appear.

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="39.8.2"
-ms_build_id="13563792"
+target="39.8.3"
+ms_build_id="13586709"
 runtime="electron"
 ignore-scripts=false
 build_from_source="true"

build/azure-pipelines/common/sanity-tests.yml

@@ -33,9 +33,9 @@ jobs:
       outputs:
         - output: pipelineArtifact
           targetPath: $(SCREENSHOTS_DIR)
-          artifactName: screenshots-${{ parameters.name }}
+          artifactName: screenshots-${{ parameters.name }}-$(System.JobAttempt)
           displayName: Publish Screenshots
-          condition: succeededOrFailed()
+          condition: and(succeededOrFailed(), eq(variables.HAS_SCREENSHOTS, 'true'))
           continueOnError: true
           sbomEnabled: false
     variables:
@@ -171,6 +171,25 @@ jobs:
           condition: and(succeeded(), ne(variables.DOCKER_CACHE_HIT, 'true'))
           displayName: Save Docker Image
 
+      - ${{ if eq(parameters.os, 'windows') }}:
+        - script: |
+            @echo off
+            dir /b "$(SCREENSHOTS_DIR)" 2>nul | findstr . >nul
+            if %errorlevel%==0 (
+              echo ##vso[task.setvariable variable=HAS_SCREENSHOTS]true
+            )
+            exit /b 0
+          displayName: Check Screenshots
+          condition: succeededOrFailed()
+
+      - ${{ else }}:
+        - bash: |
+            if [ -n "$(ls -A "$(SCREENSHOTS_DIR)" 2>/dev/null)" ]; then
+              echo "##vso[task.setvariable variable=HAS_SCREENSHOTS]true"
+            fi
+          displayName: Check Screenshots
+          condition: succeededOrFailed()
+
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: JUnit