Merge upstream zed/main (2026-05-19)

.cloudflare/README.md

@@ -4,11 +4,11 @@ from Cloudflare.
 - `open-source-website-assets` is used for `install.sh`
 - `docs-proxy` is used for `https://zed.dev/docs`
 
-On push to `main`, both of these (and the files they depend on) are uploaded to Cloudflare.
+During docs deployments, both of these (and the files they depend on) are uploaded to Cloudflare.
 
 ### Deployment
 
-These functions are deployed on push to main by the deploy_cloudflare.yml workflow. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
+These functions are deployed by the docs deployment workflows. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
 
 ### Testing
 

.cloudflare/docs-proxy/src/worker.js

@@ -1,7 +1,22 @@
 export default {
   async fetch(request, _env, _ctx) {
     const url = new URL(request.url);
-    url.hostname = "docs-anw.pages.dev";
+
+    if (url.pathname === "/docs/nightly") {
+      url.hostname = "docs-nightly.pages.dev";
+      url.pathname = "/docs/";
+    } else if (url.pathname.startsWith("/docs/nightly/")) {
+      url.hostname = "docs-nightly.pages.dev";
+      url.pathname = url.pathname.replace("/docs/nightly/", "/docs/");
+    } else if (url.pathname === "/docs/preview") {
+      url.hostname = "docs-preview-5xd.pages.dev";
+      url.pathname = "/docs/";
+    } else if (url.pathname.startsWith("/docs/preview/")) {
+      url.hostname = "docs-preview-5xd.pages.dev";
+      url.pathname = url.pathname.replace("/docs/preview/", "/docs/");
+    } else {
+      url.hostname = "docs-anw.pages.dev";
+    }
 
     let res = await fetch(url, request);
 

.github/ISSUE_TEMPLATE/10_bug_report.yml

@@ -101,7 +101,7 @@ body:
       placeholder: |
         - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc.)
         - Model Name: (Claude Sonnet 4.5, Gemini 3.1 Pro, GPT-5)
-        - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
+        - Mode: (Agent Panel, Inline Assistant, or Terminal Assistant)
         - Other details (ACPs, MCPs, other settings, etc.):
     validations:
       required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Feature request
-    url: https://github.com/zed-industries/zed/discussions/new/choose
+    url: https://github.com/zed-industries/zed/discussions/new?category=feature-requests
     about: To request a feature, open a new discussion under one of the appropriate categories.
   - name: Our Discord community
     url: https://discord.com/invite/zedindustries

.github/actions/run_tests/action.yml

@@ -13,11 +13,8 @@ runs:
         node-version: "18"
 
     - name: Limit target directory size
-      env:
-        MAX_SIZE: ${{ runner.os == 'macOS' && 300 || 100 }}
       shell: bash -euxo pipefail {0}
-      # Use the variable in the run command
-      run: script/clear-target-dir-if-larger-than ${{ env.MAX_SIZE }}
+      run: script/clear-target-dir-if-larger-than 350 200
 
     - name: Run tests
       shell: bash -euxo pipefail {0}

.gitignore

@@ -1,6 +1,8 @@
 **/*.db
+**/*.proptest-regressions
 **/cargo-target
 **/target
+.webrtc-sys/
 **/venv
 **/.direnv
 *.wasm

.rules

@@ -63,8 +63,6 @@ Within the closures, the inner `cx` provided to the closure must be used instead
 
 Trying to update an entity while it's already being updated must be avoided as this will cause a panic.
 
-When  `read_with`, `update`, or `update_in` are used with an async context, the closure's return value is wrapped in an `anyhow::Result`.
-
 `WeakEntity<T>` is a weak handle. It has `read_with`, `update`, and `update_in` methods that work the same, but always return an `anyhow::Result` so that they can fail if the entity no longer exists. This can be useful to avoid memory leaks - if entities have mutually recursive handles to each other they will never be dropped.
 
 ## Concurrency

.zed/settings.json

@@ -57,7 +57,6 @@
   "remove_trailing_whitespace_on_save": true,
   "ensure_final_newline_on_save": true,
   "file_scan_exclusions": [
-    "crates/agent/src/edit_agent/evals/fixtures",
     "crates/agent/src/tools/evals/fixtures",
     "**/.git",
     "**/.svn",