Merge branch 'upstream_main'

Author: AlpSha

.github/ISSUE_TEMPLATE/1.bug-report.yml .github/ISSUE_TEMPLATE/10_bug_report.yml.github/ISSUE_TEMPLATE/1.bug-report.yml renamed to .github/ISSUE_TEMPLATE/10_bug_report.yml

@@ -1,38 +1,51 @@
-name: Report an issue
-description: Report an issue with Zed.
+name: Report a bug
+description: Report a problem with Zed.
 type: Bug
+labels: "state:needs triage"
 body:
   - type: markdown
     attributes:
       value: |
-        Feature requests should be opened in [discussions](https://github.com/zed-industries/zed/discussions/new/choose).
+        Is this bug already reported? Upvote to get it noticed faster. [Here's the search](https://github.com/zed-industries/zed/issues). Upvote means giving it a :+1: reaction.
 
-        Before opening a new issue, please do a [search](https://github.com/zed-industries/zed/issues) of existing issues and :+1: upvote the existing issue instead. This will help us maintain a proper signal-to-noise ratio.
+        Feature request? Please open in [discussions](https://github.com/zed-industries/zed/discussions/new/choose) instead.
 
-        If you need help with your own project, you can ask a question in our [Discord Support Forums](https://discord.com/invite/zedindustries).
+        Just have a question or need support? Welcome to [Discord Support Forums](https://discord.com/invite/zedindustries).
   - type: textarea
     attributes:
       label: Reproduction steps
-      description: A step-by-step description of how to reproduce the issue from a **clean Zed install**. Any code must be sufficient to reproduce (make sure to include context!). Include code as text, not just as a screenshot. **Issues with insufficient detail may be summarily closed**.
+      description: A step-by-step description of how to reproduce the bug from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
       placeholder: |
         1. Start Zed
         2. Click X
-        3. Y will happen
     validations:
       required: true
   - type: textarea
     attributes:
       label: Current vs. Expected behavior
       description: |
-        A clear and concise description of what is the current behavior (screenshots, videos), vs. what you expected the behavior to be.
+        Current behavior (screenshots, videos, etc. are appreciated), vs. what you expected the behavior to be.
 
-        **Skipping this/failure to provide complete information will result in the issue being closed.**
-      placeholder: "Based on my reproduction steps above, when I click X, I expect this to happen, but instead Y happens."
+      placeholder: |
+        Current behavior: <screenshot with an arrow> The icon is blue. Expected behavior: The icon should be red because this is what the setting is documented to do.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed version and system specs
+      description: |
+        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
+      placeholder: |
+        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
+        OS: macOS 15.1
+        Memory: 36 GiB
+        Architecture: aarch64
     validations:
       required: true
   - type: textarea
     attributes:
-      label: If applicable, attach your Zed log file to this issue.
+      label: Attach Zed log file
       description: |
         Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
       value: |
@@ -48,7 +61,7 @@ body:
       required: false
   - type: textarea
     attributes:
-      label: If applicable, attach your relevant Zed settings to this issue
+      label: Relevant Zed settings
       description: |
         Open the command palette in Zed, then type “zed: open settings file” and copy/paste any relevant (e.g., LSP-specific) settings.
       value: |
@@ -64,26 +77,14 @@ body:
       required: false
   - type: textarea
     attributes:
-      label: If applicable, provide details about your model provider
+      label: (for AI issues) Model provider details
       placeholder: |
         - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc.)
         - Model Name: (Claude Sonnet 4.5, Gemini 3 Pro, GPT-5)
         - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
         - Other details (ACPs, MCPs, other settings, etc.):
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: Zed version and system specs
-      description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”. **Skipping this/failure to provide complete information will result in the issue being closed**.
-      placeholder: |
-        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
-        OS: macOS 15.1
-        Memory: 36 GiB
-        Architecture: aarch64
-    validations:
-      required: true
   - type: dropdown
     attributes:
       label: If you are using WSL on Windows, what flavor of Linux are you using?
@@ -96,4 +97,3 @@ body:
         - Pop!_OS
         - NixOS
         - Other
-      default: 0

.github/ISSUE_TEMPLATE/2.crash-report.yml …ithub/ISSUE_TEMPLATE/11_crash_report.yml.github/ISSUE_TEMPLATE/2.crash-report.yml renamed to .github/ISSUE_TEMPLATE/11_crash_report.yml .github/ISSUE_TEMPLATE/2.crash-report.yml renamed to .github/ISSUE_TEMPLATE/11_crash_report.yml

@@ -1,32 +1,23 @@
 name: Report a crash
 description: Zed is crashing or freezing or hanging.
 type: Crash
+labels: "state:needs triage"
 body:
   - type: textarea
     attributes:
       label: Reproduction steps
-      description: A step-by-step description of how to reproduce the crash from a **clean Zed install**. **Be verbose**. **Issues with insufficient detail may be summarily closed**.
+      description: A step-by-step description of how to reproduce the crash from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
       placeholder: |
         1. Start Zed
         2. Perform an action
         3. Zed crashes
     validations:
       required: true
-  - type: textarea
-    attributes:
-      label: Current vs. Expected behavior
-      description: |
-        Go into depth about what actions you’re performing in Zed to trigger the crash. If Zed crashes before it loads any windows, make sure to mention that. Again, **be verbose**.
-
-        **Skipping this/failure to provide complete information will result in the issue being closed.**
-      placeholder: "Based on my reproduction steps above, when I perform said action, I expect this to happen, but instead Zed crashes."
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Zed version and system specs
       description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”. **Skipping this/failure to provide complete information will result in the issue being closed**.
+        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
       placeholder: |
         Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
         OS: macOS 15.1
@@ -36,7 +27,7 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: If applicable, attach your Zed log file to this issue
+      label: Attach Zed log file
       description: |
         Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
       value: |

.github/ISSUE_TEMPLATE/99_other.yml

@@ -23,20 +23,24 @@ jobs:
             AidanV
             akbxr
             AlvaroParker
+            amtoaer
             artemevsevev
             bajrangCoder
             bcomnes
             Be-ing
             blopker
+            bnjjj
             bobbymannino
             CharlesChen0823
             chbk
             cppcoffee
             davewa
             ddoemonn
             djsauble
+            errmayank
             fantacell
             findrakecil
+            FloppyDisco
             gko
             huacnlee
             imumesh18
@@ -51,19 +55,22 @@ jobs:
             marius851000
             mikebronner
             ognevny
+            playdohface
             RemcoSmitsDev
             romaninsh
             Simek
             someone13574
             sourcefrog
             suxiaoshao
             Takk8IS
+            thedadams
             tidely
             timvermeulen
             valentinegb
             versecafe
             vitallium
             warrenjokinen
+            WhySoBad
             ya7010
             Zertsov
         with:

.github/workflows/community_champion_auto_labeler.yml

@@ -13,6 +13,10 @@ on:
         description: bump-type
         type: string
         default: patch
+      force-bump:
+        description: force-bump
+        required: true
+        type: boolean
     secrets:
       app-id:
         description: The app ID used to create the PR
@@ -21,33 +25,6 @@ on:
         description: The app secret for the corresponding app ID
         required: true
 jobs:
-  check_extension:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: cache-zed-extension-cli
-      name: extension_tests::cache_zed_extension_cli
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-      with:
-        path: zed-extension
-        key: zed-extension-${{ env.ZED_EXTENSION_CLI_SHA }}
-    - name: extension_tests::download_zed_extension_cli
-      if: steps.cache-zed-extension-cli.outputs.cache-hit != 'true'
-      run: |
-        wget --quiet "https://zed-extension-cli.nyc3.digitaloceanspaces.com/$ZED_EXTENSION_CLI_SHA/x86_64-unknown-linux-gnu/zed-extension"
-        chmod +x zed-extension
-      shell: bash -euxo pipefail {0}
-    - name: extension_tests::check
-      run: |
-        mkdir -p /tmp/ext-scratch
-        mkdir -p /tmp/ext-output
-        ./zed-extension --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 1
   check_bump_needed:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
     runs-on: namespace-profile-2x4-ubuntu-2404
@@ -56,29 +33,39 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         clean: false
-        fetch-depth: 10
+        fetch-depth: 0
     - id: compare-versions-check
       name: extension_bump::compare_versions
-      run: |+
+      run: |
         CURRENT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
+        PR_PARENT_SHA="${{ github.event.pull_request.head.sha }}"
 
-        git checkout "$(git log -1 --format=%H)"~1
+        if [[ -n "$PR_PARENT_SHA" ]]; then
+            git checkout "$PR_PARENT_SHA"
+        elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
+            git checkout "$BRANCH_PARENT_SHA"
+        else
+            git checkout "$(git log -1 --format=%H)"~1
+        fi
 
-        PREV_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
+        PARENT_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
 
-        [[ "$CURRENT_VERSION" == "$PREV_COMMIT_VERSION" ]] && \
+        [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \
           echo "needs_bump=true" >> "$GITHUB_OUTPUT" || \
           echo "needs_bump=false" >> "$GITHUB_OUTPUT"
 
+        echo "current_version=${CURRENT_VERSION}" >> "$GITHUB_OUTPUT"
       shell: bash -euxo pipefail {0}
     outputs:
       needs_bump: ${{ steps.compare-versions-check.outputs.needs_bump }}
+      current_version: ${{ steps.compare-versions-check.outputs.current_version }}
     timeout-minutes: 1
   bump_extension_version:
     needs:
-    - check_extension
     - check_bump_needed
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && needs.check_bump_needed.outputs.needs_bump == 'true'
+    if: |-
+      (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') &&
+      (inputs.force-bump == 'true' || needs.check_bump_needed.outputs.needs_bump == 'true')
     runs-on: namespace-profile-8x16-ubuntu-2204
     steps:
     - id: generate-token
@@ -97,25 +84,21 @@ jobs:
     - id: bump-version
       name: extension_bump::bump_version
       run: |
-        OLD_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
+        OLD_VERSION="${{ needs.check_bump_needed.outputs.current_version }}"
 
-        cat <<EOF > .bumpversion.cfg
-        [bumpversion]
-        current_version = "$OLD_VERSION"
+        BUMP_FILES=("extension.toml")
+        if [[ -f "Cargo.toml" ]]; then
+            BUMP_FILES+=("Cargo.toml")
+        fi
 
-        [bumpversion:file:Cargo.toml]
+        bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"
 
-        [bumpversion:file:extension.toml]
+        if [[ -f "Cargo.toml" ]]; then
+            cargo update --workspace
+        fi
 
-        EOF
-
-        bump2version --verbose ${{ inputs.bump-type }}
         NEW_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-        cargo update --workspace
-
-        rm .bumpversion.cfg
 
-        echo "old_version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
         echo "new_version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
       shell: bash -euxo pipefail {0}
     - name: extension_bump::create_pull_request
@@ -124,13 +107,41 @@ jobs:
         title: Bump version to ${{ steps.bump-version.outputs.new_version }}
         body: This PR bumps the version of this extension to v${{ steps.bump-version.outputs.new_version }}
         commit-message: Bump version to v${{ steps.bump-version.outputs.new_version }}
-        branch: bump-from-${{ steps.bump-version.outputs.old_version }}
+        branch: zed-zippy-autobump
         committer: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
         base: main
         delete-branch: true
         token: ${{ steps.generate-token.outputs.token }}
         sign-commits: true
     timeout-minutes: 1
+  create_version_label:
+    needs:
+    - check_bump_needed
+    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.check_bump_needed.outputs.needs_bump == 'false'
+    runs-on: namespace-profile-8x16-ubuntu-2204
+    steps:
+    - id: generate-token
+      name: extension_bump::generate_token
+      uses: actions/create-github-app-token@v2
+      with:
+        app-id: ${{ secrets.app-id }}
+        private-key: ${{ secrets.app-secret }}
+    - name: steps::checkout_repo
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        clean: false
+    - name: extension_bump::create_version_tag
+      uses: actions/github-script@v7
+      with:
+        script: |-
+          github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/v${{ needs.check_bump_needed.outputs.current_version }}',
+              sha: context.sha
+          })
+        github-token: ${{ steps.generate-token.outputs.token }}
+    timeout-minutes: 1
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
   cancel-in-progress: true