Merge branch 'main' into copilot/add-worktree-checkout-option

Author: alexr00

.github/skills/write-changelog/SKILL.md

@@ -0,0 +1,74 @@
+---
+name: write-changelog
+description: 'Write a CHANGELOG.md entry for a new extension release. Use when: writing changelog, updating changelog, adding release notes, preparing a release, documenting milestone changes. Requires a milestone name and extension version number.'
+argument-hint: 'Provide the extension version (e.g. 0.134.0) and the GitHub milestone name (e.g. 1.112.0)'
+---
+
+# Write Changelog Entry
+
+Generate a new entry in `CHANGELOG.md` for an extension release by gathering closed issues and merged PRs from a GitHub milestone.
+
+## Inputs
+
+The user must provide:
+1. **Extension version number** - the version for the changelog heading (e.g. `0.134.0`)
+2. **GitHub milestone name** - the milestone to query (e.g. `1.112.0`)
+
+## Procedure
+
+### 1. Gather Milestone Items
+
+Search for all closed items in the milestone scoped to `microsoft/vscode-pull-request-github`:
+
+- **Issues (bugs/features):** Search for closed issues with `milestone:"<name>" repo:microsoft/vscode-pull-request-github is:closed`
+- **Merged PRs:** Search for merged PRs with `milestone:"<name>" repo:microsoft/vscode-pull-request-github is:pr is:merged`
+
+### 2. Classify Items
+
+Sort every item into one of these buckets:
+
+| Bucket | Criteria |
+|--------|----------|
+| **Changes** | Feature requests, enhancements, new settings, new commands, infrastructure improvements (e.g. dependency upgrades, build system changes) |
+| **Fixes** | Items labeled `bug`, or PRs that fix a specific issue |
+| **Thank You** | Merged PRs authored by external contributors (user type is not `Bot`, and user is not a GitHub staff / `site_admin`) |
+| **Skip** | Version-bump PRs (title is just a version like "0.132.0"), test plan items, items from other repos |
+
+### 3. Write the Entry
+
+Insert the new section **at the top** of `CHANGELOG.md`, directly after the `# Changelog` heading and before the previous release section.
+
+Follow this format exactly:
+
+```markdown
+## <version>
+
+### Changes
+
+- Description of change one.
+- Description of change two with setting `"settingName"`.
+
+### Fixes
+
+- Short description of bug. https://github.com/microsoft/vscode-pull-request-github/issues/<number>
+- Another bug fix. https://github.com/microsoft/vscode-pull-request-github/issues/<number>
+
+**_Thank You_**
+
+* [@username (Display Name)](https://github.com/username): Short description of contribution [PR #1234](https://github.com/microsoft/vscode-pull-request-github/pull/1234)
+```
+
+### Format Rules
+
+- **Changes:** Write a concise, user-facing description. Do NOT link to issues. Use backticks for setting names and commands. Each entry is a single `- ` bullet.
+- **Fixes:** Use the issue title (cleaned up for readability) followed by a space and the full issue URL. Each entry is a single `- ` bullet. If a fix came from a PR without a linked issue, describe it without a URL.
+- **Thank You:** Use `* ` bullets (not `- `). Format: `[@login (Name)](profile-url): Description [PR #number](pr-url)`. Only include for external community contributors.
+- **Sections:** Omit any section (`### Changes`, `### Fixes`, `**_Thank You_**`) if there are no items for it.
+- **No blank lines** between bullets within a section.
+- **One blank line** between sections.
+
+### 4. Validate
+
+- Confirm the new section is positioned correctly (after `# Changelog`, before the previous version).
+- Verify all issue/PR links are correct and point to `microsoft/vscode-pull-request-github`.
+- Ensure no duplicate entries.

.github/workflows/copilot-setup-steps.yml

@@ -29,10 +29,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "20"
-          cache: "yarn"
+          cache: "npm"
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
         env:
           # Skip Playwright browser downloads to avoid installation failures
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -48,7 +48,7 @@ jobs:
         continue-on-error: true
 
       - name: Update VS Code type definitions
-        run: yarn update-dts
+        run: npm run update-dts
 
       - name: Basic build verification
         run: |

.gitignore

@@ -339,7 +339,6 @@ media
 .vscode-test-web
 .DS_Store
 *.vsix
-package-lock.json
 src/@types/vscode.d.ts
 src/@types/vscode.proposed.d.ts
 

.vscodeignore

@@ -11,6 +11,7 @@ documentation/**
 node_modules/**
 scripts/**
 src/**
+!src/lm/skills/**
 webviews/**
 **/test/**
 .eslintcache*
@@ -21,15 +22,15 @@ webviews/**
 .gitignore-revs
 .prettierignore
 .prettierrc
-.yarnrc
+package-lock.json
 azure-pipeline.*
 **/tsconfig*.json
 *.tsbuildinfo
 **/webpack.config*.js
-yarn.lock
+npm-debug.log
 **/*.map
 **/*.svg
-!**/git-pull-request_webview.svg
+!**/*_webview.svg
 **/*.ts
 *.vsix
 **/*.bak

.yarnrc

@@ -1,5 +1,95 @@
 # Changelog
 
+## 0.136.0
+
+### Changes
+
+- Add tool to create pull requests.
+- Add tool to resolve review comments.
+- Offer to delete worktrees from the clean up command.
+- Include line numbers in "Apply suggestion using AI" context for code review comments.
+
+### Fixes
+
+- Resolving comments doesn't update state on server. https://github.com/microsoft/vscode-pull-request-github/issues/8649
+- PR description filled differently than on github.com. https://github.com/microsoft/vscode-pull-request-github/issues/8630
+- Can't checkout PR locally when already on the same branch. https://github.com/microsoft/vscode-pull-request-github/issues/8624
+- Parent folder checkbox not auto-checked when all children are marked as viewed. https://github.com/microsoft/vscode-pull-request-github/issues/8584
+- Escape file names in processed links.
+
+## 0.134.0
+
+### Changes
+
+- Branch names in the create PR view are now cached for faster target branch loading.
+- GitHub permalink links in PR and issue overview webviews now open the corresponding local file when the file exists in the workspace.
+
+### Fixes
+
+- Selecting a target branch when creating a PR is sometimes broken. https://github.com/microsoft/vscode-pull-request-github/issues/8627
+- "Apply suggestion using AI" for code comment reviews results in a redundant disclaimer suffix. https://github.com/microsoft/vscode-pull-request-github/issues/8605
+
+**_Thank You_**
+
+* [@Daniel-Aaron-Bloom](https://github.com/Daniel-Aaron-Bloom): Link to local file for permalinks in webview [PR #8583](https://github.com/microsoft/vscode-pull-request-github/pull/8583)
+
+## 0.132.2
+
+### Fixes
+
+- Button missing rounded corners on one side. https://github.com/microsoft/vscode-pull-request-github/issues/8609
+
+## 0.132.1
+
+### Fixes
+
+- Can't add multiline GitHub PR Comment because Inline Chat button covers Comment button. https://github.com/microsoft/vscode-pull-request-github/issues/8504
+- Deleting a worktree after merging a PR mixes the main branch with the worktree. https://github.com/microsoft/vscode-pull-request-github/issues/8519
+- Missing issue webview icon.
+
+## 0.132.0
+
+### Changes
+
+- When `"githubPullRequests.pullRequestDescription"` is set to `"branchName"`, the branch name is now "title-ized" (dashes and underscores replaced with spaces, words capitalized) to match the behavior on github.com.
+- Pull requests in the sidebar views can now show icons representing their status (open, closed, merged, draft) with the setting `"githubPullRequests.pullRequestAvatarDisplay"`.
+
+### Fixes
+
+- Update with merge commit feature not working. https://github.com/microsoft/vscode-pull-request-github/issues/8553
+- Avatar doesn't show in comment widget with GitHub Enterprise. https://github.com/microsoft/vscode-pull-request-github/issues/8550
+- Can't easily open PR to the right. https://github.com/microsoft/vscode-pull-request-github/issues/8537
+- Stale worktree repo entry persists in PR sidebar after worktree removal. https://github.com/microsoft/vscode-pull-request-github/issues/8525
+- Wrong list of files when creating PR. https://github.com/microsoft/vscode-pull-request-github/issues/8457
+- Element with id All Open (URL) is already registered. https://github.com/microsoft/vscode-pull-request-github/issues/8073
+
+## 0.130.0
+
+### Changes
+
+- Multiple PR and issue descriptions can be open at once.
+- Repositories without matching issues are now hidden in the Issues view.
+- The setting `githubPullRequests.autoRepositoryDetection` can be set to `true` to include repositories that are outside of the workspace.
+
+### Fixes
+
+- GitHub Pull Requests: Refresh Chat Sessions command remains available with disableAIFeature set to true. https://github.com/microsoft/vscode-pull-request-github/issues/8376
+- Share permalink as markdown on tab should use filename for link text. https://github.com/microsoft/vscode-pull-request-github/issues/4663
+- "Branch does not exist locally" while rebasing. https://github.com/microsoft/vscode-pull-request-github/issues/8487
+- Coding Agent UI: Closed pull requests are not detected as closed. https://github.com/microsoft/vscode-pull-request-github/issues/8482
+- The "Refresh Pull Request Comments" command does not work. https://github.com/microsoft/vscode-pull-request-github/issues/8445
+- Popup "delegate to agent" unremovable. https://github.com/microsoft/vscode-pull-request-github/issues/8496
+- There is no indicator of what repository the PR relates to. https://github.com/microsoft/vscode-pull-request-github/issues/8174
+- PR titles cropped unnecessarily. https://github.com/microsoft/vscode-pull-request-github/issues/8453
+- PR tool descriptions are not user-oriented. https://github.com/microsoft/vscode-pull-request-github/issues/8510
+- New "check out PR by number" is confusing. https://github.com/microsoft/vscode-pull-request-github/issues/8455
+- Refreshing PR does not refresh rerun status checks. https://github.com/microsoft/vscode-pull-request-github/issues/8449
+- Improve commit line break unwrapping. https://github.com/microsoft/vscode-pull-request-github/issues/8345
+
+**_Thank You_**
+
+* [@gvilums (Georgijs)](https://github.com/gvilums): Fix PR tree reveal errors for flat file layout [PR #8522](https://github.com/microsoft/vscode-pull-request-github/pull/8522)
+
 ## 0.128.0
 
 ### Changes

CHANGELOG.md

@@ -34,11 +34,11 @@ extends:
     nodeVersion: "20.x"
 
     buildSteps:
-      - script: yarn install --frozen-lockfile --check-files
+      - script: npm ci
         displayName: Install dependencies
         retryCountOnTaskFailure: 3
 
-      - script: yarn run bundle
+      - script: npm run bundle
         displayName: Compile
 
       - script: >
@@ -51,35 +51,35 @@ extends:
         displayName: Override package.json
 
     testSteps:
-      - script: yarn install --frozen-lockfile --check-files
+      - script: npm ci
         displayName: Install dependencies
         retryCountOnTaskFailure: 3
 
-      - script: yarn run bundle
+      - script: npm run bundle
         displayName: Compile
 
       - bash: |
           /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
         displayName: Start xvfb
 
-      - script: yarn run test
+      - script: npm run test
         displayName: Run test suite
         env:
           DISPLAY: ':99.0'
           TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
 
-      # - script: yarn run browsertest --browserType=chromium
+      # - script: npm run browsertest --browserType=chromium
       #   displayName: Run test suite (chromium)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
 
-      # - script: yarn run browsertest --browserType=firefox
+      # - script: npm run browsertest --browserType=firefox
       #   displayName: Run test suite (firefox)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
 
-      # - script: yarn run browsertest --browserType=webkit
+      # - script: npm run browsertest --browserType=webkit
       #   displayName: Run test suite (webkit)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

azure-pipeline.nightly.yml

@@ -6,7 +6,7 @@ jobs:
     steps:
       - template: scripts/ci/common-setup.yml
 
-      - script: yarn run compile
+      - script: npm run compile
         displayName: Compile
 
       - script: npm run hygiene
@@ -15,25 +15,25 @@ jobs:
       - script: npm run lint
         displayName: Run lint
 
-      - script: yarn run check:commands
+      - script: npm run check:commands
         displayName: Verify command registrations
 
-      - script: yarn run test
+      - script: npm run test
         displayName: Run test suite
         env:
           TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
 
-      # - script: yarn run browsertest --browserType=chromium
+      # - script: npm run browsertest --browserType=chromium
       #   displayName: Run test suite (chromium)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
 
-      # - script: yarn run browsertest --browserType=firefox
+      # - script: npm run browsertest --browserType=firefox
       #   displayName: Run test suite (firefox)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
 
-      # - script: yarn run browsertest --browserType=webkit
+      # - script: npm run browsertest --browserType=webkit
       #   displayName: Run test suite (webkit)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

azure-pipeline.pr.yml

@@ -31,43 +31,43 @@ extends:
     nodeVersion: "20.x"
 
     buildSteps:
-      - script: yarn install --frozen-lockfile --check-files
+      - script: npm ci
         displayName: Install dependencies
         retryCountOnTaskFailure: 3
 
-      - script: yarn run bundle
+      - script: npm run bundle
         displayName: Compile
 
     testSteps:
-      - script: yarn install --frozen-lockfile --check-files
+      - script: npm ci
         displayName: Install dependencies
         retryCountOnTaskFailure: 3
 
-      - script: yarn run bundle
+      - script: npm run bundle
         displayName: Compile
 
       - bash: |
           /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
         displayName: Start xvfb
 
-      - script: yarn run test
+      - script: npm run test
         displayName: Run test suite
         env:
           DISPLAY: ':99.0'
           TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
 
-      # - script: yarn run browsertest --browserType=chromium
+      # - script: npm run browsertest --browserType=chromium
       #   displayName: Run test suite (chromium)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
 
-      # - script: yarn run browsertest --browserType=firefox
+      # - script: npm run browsertest --browserType=firefox
       #   displayName: Run test suite (firefox)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
 
-      # - script: yarn run browsertest --browserType=webkit
+      # - script: npm run browsertest --browserType=webkit
       #   displayName: Run test suite (webkit)
       #   env:
       #     TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

azure-pipeline.release.yml

@@ -47,6 +47,7 @@ module.exports.indentationFilter = [
 
 	// except multiple specific files
 	'!**/package.json',
+	'!**/package-lock.json',
 	'!**/yarn.lock',
 	'!**/yarn-error.log',
 	'!**/fixtures/**/*'
@@ -70,6 +71,7 @@ module.exports.copyrightFilter = [
 	'!**/*.yml',
 	'!**/*.md',
 	'!package.nls.json',
+	'!**/package-lock.json',
 	'!**/*.svg',
 	'!src/integrations/gitlens/gitlens.d.ts',
 	'!**/fixtures/**'