Upstream merge (Feb 24) + streaming throttle + E2E test infra#8
Merged
lukemarsden merged 556 commits intomainfrom Feb 25, 2026
Merged
Upstream merge (Feb 24) + streaming throttle + E2E test infra#8lukemarsden merged 556 commits intomainfrom
lukemarsden merged 556 commits intomainfrom
Conversation
Release Notes: - Improved Bedrock error messages: region-locked models ask the user to try a different region, rate limits and access errors are reported cleanly instead of as raw API responses - Streamlined Bedrock model list to 39 curated models - Fixed API errors when using non-tool models in agent threads --------- Co-authored-by: Ona <no-reply@ona.com>
…ed-industries#49343) Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
Update based on https://platform.claude.com/docs/en/agent-sdk/overview#branding-guidelines ACP package will be updated shortly. Release Notes: - acp: Claude Code is now referred to as Claude Agent, per Anthropic branding guidelines.
Also fixes batches upload Release Notes: - N/A
Release Notes: - N/A
Release Notes: - N/A
…8024) Reverts the editor's paragraph navigation behavior that was changed in zed-industries#47734. Whitespace-only lines are now treated as paragraph boundaries again for non-vim mode users. Vim mode retains its own implementation where only truly empty lines are paragraph boundaries. Release Notes: - Fixed editor paragraph navigation to treat whitespace-only lines as paragraph boundaries again --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: dino <dinojoaocosta@gmail.com>
…stries#49349) This brings the runtime down to logarithmic scaling of excerpts / linear scaling of tokens. Release Notes: - N/A *or* Added/Fixed/Improved ...
Release Notes: - N/A
) Add Kanayago as an available Ruby language server in default settings. Disabled by default (prefixed with `!`), users can opt-in via their settings. This corresponds to the extension-side support added in zed-extensions/ruby#224. Release Notes: - ruby: Added Kanayago as an available language server.
…fer excerpt (zed-industries#49132) Switches `newline_below` from adding a newline to the start of the next line in a multibuffer, to appending a newline at the end of the selections current lines. This keeps the insertion within the excerpt of the selection rather than adding a newline to the excerpt below. Closes zed-industries#47965 Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed `editor::NewlineBelow` adding a newline to the next multibuffer excerpt when selection is at the end of an excerpt
…49295) Closes #ISSUE Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Improved the behavior of the `vim: join lines` and `editor: join lines`. Comment and other language specific line prefixes are now stripped from the join line
…9324) This PR updates the `Agent Thread Rated` event to be routed through Cloud instead of the normal telemetry pipeline. Closes CLO-223. Release Notes: - N/A
## Before <img width="1596" height="230" alt="repro" src="https://github.com/user-attachments/assets/d96d9bc4-cc46-4c11-8ac8-0051a1a51316" /> ## After <img width="1000" height="800" alt="error_message_wrapping" src="https://github.com/user-attachments/assets/7553607a-2cbf-414d-9794-dbd6f3b0f9eb" /> Previously, error message text was overflowing and getting clipped instead of wrapping when displaying long error messages (e.g. rate limit errors in the agent panel). Closes AI-38 Release Notes: - Fixed long error messages (e.g. rate limit errors) being clipped instead of wrapping in the agent panel.
Add `remove_worktree()` and `rename_worktree()` to the `GitRepository` trait with `RealGitRepository` implementations that shell out to `git worktree remove/move`. Implement all 4 worktree methods (`worktrees`, `create_worktree`, `remove_worktree`, `rename_worktree`) on `FakeGitRepository` backed by `FakeGitRepositoryState`, with `simulated_create_worktree_error` for test-time fault injection. Add `set_create_worktree_error()` helper on `FakeFs`. Add `parse_worktrees_from_str` helper and 7 new tests covering real git operations and fake worktree lifecycle. Closes AI-31 Release Notes: - N/A
…9372) Before this PR we wouldn't always serialize workspaces when a mutliworkspace adds/removes a workspace. This PR fixes this by adding a test and calling serialization in remove Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
Release Notes: - N/A
…es#49373) ## Summary - refresh git auth headers before each per-crash iteration in `background_agent_mvp` - add guarded `git fetch`/`git checkout` handling so one candidate auth failure doesn’t fail the entire run ## Context - fixes the auth failure seen in workflow run 22106378719 (`fatal: could not read Username for 'https://github.com'`) - related Linear issue: BIZOPS-853 ## Testing - ruby -e "require 'yaml'; YAML.load_file('.github/workflows/background_agent_mvp.yml')" Release Notes: - N/A
…stries#49385) This PR updates the `Edit Prediction Rated` event to be routed through Cloud instead of the normal telemetry pipeline. Closes CLO-224. Release Notes: - N/A --------- Co-authored-by: Tom <tom@zed.dev>
<img width="435" height="211" alt="Screenshot 2026-02-17 at 1 32 48 PM" src="https://github.com/user-attachments/assets/136c188d-5001-4526-961e-9f7faccc5f7a" /> Add support for the new Claude Sonnet 4.6 model across the anthropic, bedrock, and language_models crates. Includes base, thinking, and 1M context variants. Closes AI-39 Release Notes: - Added BYOK support for Claude Sonnet 4.6
We need more fetch depth here for the check, hence bumping this. Also does a drive-by cleanup of the checkout step within xtask to make this (hopefully) more intuitive to use. Release Notes: - N/A
) Closes zed-industries#49259 Release Notes: - This change ensures that when the last visible collapsed directory is selected, the selection remains on that directory.
…tries#49396) Release Notes: - N/A
Fixing a minor UI issue that regressed in zed-industries#49038. Release Notes: - N/A
This fixes an issue where some changes that should trigger more checks would go unnoticed. Release Notes: - N/A
This saves some time spent reallocating inside `Editor::on_buffer_event` for large multibuffers. Release Notes: - N/A
…ed-industries#49400) - Defer syncing block maps from `set_companion`, eliminating some redundant recomputations - Emit one large multibuffer edit from `set_show_deleted_hunks` instead of many small edits, to avoid bad case for block map This cuts hangs roughly in half when toggling between views in a large diff (1000 commits from the chromium repository). <!-- Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) --> Release Notes: - Improved performance with large diffs when toggling between diff views. --------- Co-authored-by: Jakub Konka <kubkon@jakubkonka.com> Co-authored-by: Lukas Wirth <lukas@zed.dev>
The cache isn't needed, now that we have a better way of reducing resource consumption (disabling worktree scanning), and it adds race conditions. Release Notes: - N/A
…ries#49411) This removes trailing whitespace when getting the current version of the extension, as we ran into some cases where a `\r` was added to that for some reason. Release Notes: - N/A
Some house-keeping on the UI crate; all of these were pretty much unused, so we can take them out for the time being. Release Notes: - N/A
Fixes a regression introduced in zed-industries#48545 (reasoning effort selector). We saw edit file tool calls taking a long time (loading animation was displayed, no diff) when using Opus 4.6. This was caused by Opus 4.6. emitting thinking tokens even when the user explicitly disabled thinking in the UI. <img width="289" height="67" alt="image" src="https://github.com/user-attachments/assets/090a99f8-9b07-4d25-9058-3706f9333396" /> In addition to the thinking tokens causing overhead, we were slowing down file editing even more. because changing between thinking/non-thinking between requests causes the cache to be invalidated ([docs](https://platform.claude.com/docs/en/build-with-claude/prompt-caching#what-invalidates-the-cache)). This PR ensures that we inherit the setting for enabling or disabling thinking from the thread from which the edit tool was called. Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed an issue where editing files was taking a long time when using Opus 4.6 --------- Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Makes it a bigger click target for the expanded preview. Release Notes: - N/A
When `ZDOTDIR` is set, `zsh` reads its configuration from that directory instead of the user’s `$HOME` directory. | Setup | `ZDOTDIR` set? | Script writes to | Zsh reads from | Match? | |---|---|---|---|---| | XDG + `ZDOTDIR` | ✅ | `$ZDOTDIR/.zshrc` | `$ZDOTDIR/.zshrc` | ✅ | | XDG without `ZDOTDIR` | ❌ | `$HOME/.zshrc` | `$HOME/.zshrc` | ✅ | | No XDG at all | ❌ | `$HOME/.zshrc` | `$HOME/.zshrc` | ✅ | Ref: https://zsh.sourceforge.io/Intro/intro_3.html Release Notes: - N/A
Closes zed-industries#49641 Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed panic when authentication failed to bind to lookback port
…d-industries#49557) Use `Workspace::for_window` instead of `window.root().flatten()`. https://github.com/user-attachments/assets/3ea6dae3-166d-49e4-9fff-8256e13cc2bf https://github.com/user-attachments/assets/eb8d9394-5f71-4df6-b0db-c1c8078f1b9a Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed certain context menu items not reacting to click events
fixes ZED-57B Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed a (rare) panic when a fold was created immediately following a tab character
…ed-industries#45428) Release Notes: - Improved Codex ACP install robustness by staging downloads --------- Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
… region (zed-industries#49921) This will not affect how Zeta 2 behaves in production until we update Cloud to pull in the changes to the `zeta_prompt` crate. But from some early testing, it seems to improve behavior, not worsen it, even though the editable region size differs from the currently-deployed model's training data. Release Notes: - N/A --------- Co-authored-by: Oleksiy Syvokon <oleksiy.syvokon@gmail.com> Co-authored-by: Ben Kunkle <ben@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
…against the wrong buffer (zed-industries#49893) Closes ZED-4HY Release Notes: - Fixed a crash when using breakpoints.
Closes #ISSUE Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Fixes https://zed-dev.sentry.io/issues/7286512714/?project=4509715135987712&query=is%3Aunresolved&referrer=issue-stream Release Notes: - Fix (rare) panic when breadcrumbs contain newlines
This was causing performance issues and is on its way out anyway. Release Notes: - N/A
…ff is empty (zed-industries#49884) Release Notes: - git: Fixed a bug where the buttons to toggle the split diff view would have no effect when the diff being viewed was empty.
Previously, we were not computing excerpt regions correctly for EP examples captured from prod. This PR fixes that, and also simplifies the data flow in the EP CLI. Examples either come from a concise spec (like the markdown evals), or are collected from prod. Either way, we compute from them a `ZetaPromptInput`, and the downstream steps like prompt-formatting and scoring are derived from that. Release Notes: - N/A --------- Co-authored-by: Ben Kunkle <ben@zed.dev>
…49938) - Increase hit area of both the preview expansion as well as the full screen expansion - Add the ability to stop a subagent from the full screen view - Fix subagent state display in the full screen view (e.g., we were showing the green check mark even when the subagent was cancelled) - Make card header font size consistent with the thread through a new enum value in `LabelSize` - Refine tooltip content and display - Fix slight layout shift happening between the "there is no thread" and "there is a thread" states --- Closes #ISSUE Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
…ed-industries#49850) Closes zed-industries#49848 Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) ## Summary Align right-side controls in settings rows when descriptions wrap to multiple lines, and relax the text-width cap for better balance. ## Changes - Top-aligned settings row containers in shared settings UI render paths by adding `items_start()` to: - Setting rows (`render_settings_item`) - Sub-page link rows - Action link rows - Updated the left text column width constraint in `render_settings_item` from `w_3_4` to `w_full + max_w_2_3 + min_w_0` to avoid overlap while reducing excess empty space. ## Validation - Built and ran Zed locally with `cargo run`. - Manual verification in Settings pages with multiline descriptions and right-side controls: - General - Appearance - Languages & Tools - Agent/Terminal-related sections - Confirmed improved control alignment and no right-column text overlap in the tested views. | Before | After | |---|---| |  |  | |  |  | ## Linked Issues - zed-industries#49848 Release Notes: - Fixed settings row layout so right-side controls align better with multiline setting descriptions. --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Closes zed-industries#48383 An alternative approach would be to use `min_w` instead of `w`, but that would result in inconsistent widths across the three tabs in the git picker, causing layout jumps when switching between them. It might be more appropriate to simply increase the width directly. |Before|After| |--|--| |<img width="932" height="290" alt="CleanShot 2026-02-22 at 02 01 20@2x" src="https://github.com/user-attachments/assets/a0868cf5-86a0-4375-9cf5-6728a6411ff1" />|<img width="970" height="274" alt="CleanShot 2026-02-22 at 02 03 50@2x" src="https://github.com/user-attachments/assets/acee111c-06ff-48d1-b1c7-c118bdddfcf9" />| Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [x] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed footer buttons clipped in stash picker when vim mode is enabled on macOS --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
## Summary Fork PRs don't have access to repository secrets (`FACTORY_API_KEY`), causing the docs suggestions workflow to fail when triggered by external contributor PRs. This adds a condition to skip the `batch-suggestions` job when the PR originates from a fork (`github.event.pull_request.head.repo.full_name != github.repository`). ## Context See failing job: https://github.com/zed-industries/zed/actions/runs/22323201362/job/64586740764 The `pull_request` trigger doesn't pass secrets to workflows running on fork PRs for security reasons. This is expected GitHub behavior. Release Notes: - N/A
…ouple of bugs (zed-industries#49907) This PR adds a more rigorous test for the excerpt syncing logic in `SplittableEditor`, in preparation for refactoring that code, since we've had some bugs there. The new test covers - edits within the RHS multibuffer - edits to the individual main buffers, not necessarily within the excerpt bounds of the split diff - excerpt expansion - excerpt removal - excerpt recalculation based on diff hunk ranges Bugs fixed: - incorrect edit merging logic in `patches_for_range` - `merge_excerpts` leaving stale excerpt IDs in `excerpts_by_path` Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
We see a number of crashes in Sentry that appear to be crashes in wasmtime. This shouldn't happen, as wasmtime is designed to run untrusted code "safely". Looking into this, it seems likely that the problem is that we race with wasmtime when installing signal handlers. If wasmtime's handlers are installed before ours, then any signals that it intends to handle (like out of bounds memory access) will reach our handlers before its; which causes us to assume the app has crashed. This changes fixes our crash handler initialization to ensure we always create our signal handler first, and reverts a previous attempt to fix this from zed-industries#40883 Closes #ISSUE Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Linux: Fixed crashes that could happen due to our crash handler erroneously catching signals intended for wasmtime.
Fixes the wrapper on linux/mac to not double-run cargo. Makes it work at all on windows Release Notes: - N/A
…dustries#49947) Release Notes: - N/A *or* Added/Fixed/Improved ...
…9926) Fixes ZED-54X Release Notes: - Linux: wait to request a graphics context until we have a window so we can (ideally) pick a better context or (less ideally) fail more gracefully. --------- Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
# Conflicts: # .rules # Cargo.lock # crates/agent_servers/src/acp.rs # crates/agent_ui/src/acp/thread_view.rs # crates/agent_ui/src/agent_panel.rs # crates/extensions_ui/src/extensions_ui.rs # crates/recent_projects/src/dev_container_suggest.rs # crates/settings_content/src/agent.rs # crates/title_bar/Cargo.toml # crates/title_bar/src/title_bar.rs # crates/zed/src/main.rs
- request_tool_call_authorization: removed auto-approve param (upstream migrated to tool_permissions system) - AgentConnection: new_thread -> new_session rename - supports_load_session: no longer takes cx param - AcpThreadView::new: added parent_id, conversation, agent_icon params - ConnectedServerState: updated to use active_id/threads/conversation - ActiveView::AgentThread: thread_view -> server_view field rename - as_active_thread() -> active_thread() rename - HeadlessConnection: updated for new_session trait method - Removed always_allow_tool_actions setting (migrated to tool_permissions upstream) - Fixed borrow-after-move in from_existing_thread and initial_state - Updated portingguide.md with new checklist items - Updated Cargo.lock for workspace crates Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Replace Python mock server with Go test server that imports real production Helix server code (HelixAPIServer + memorystore). 7-phase test covering thread creation, follow-ups, thread transitions, simulate_user_input, query_ui_state, and open_thread commands. Includes: - helix-ws-test-server: standalone Go binary using real handlers - Dockerfile.runtime: headless Xvfb + lavapipe for CI - run_docker_e2e.sh: one-command local test runner - Screenshot capture: periodic Xvfb screenshots during test Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…raffic Add time-based throttling to all three EntryUpdated subscription handlers. Instead of sending message_added on every token (~100+ events/sec), we now send at most 10 events/sec per entry. Pending content is flushed before message_completed to ensure no data is lost. Key changes: - STREAMING_THROTTLE static global tracks per-entry last-send time - throttled_send_message_added(): sends immediately if interval expired, otherwise stores content as pending - flush_streaming_throttle(): sends all pending content for a thread, called before every message_completed send point - All 3 subscription handlers (initial, follow-up, loaded thread) updated Impact: ~90% reduction in Zed→Go WebSocket traffic during streaming. For 1000 tokens at 100 tok/sec: 100 message_added events instead of 1000. Go side is fully compatible — it handles both throttled and unthrottled. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
lukemarsden
changed the title
The replace directive pointed to /prod/home/luke/pm/helix which only works on one machine. Use a relative path (../../../../../helix) that works when the zed and helix repos are sibling directories. CI sed updated in helix .drone.yml to match. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges latest upstream zed-industries/zed main (551 commits) into our Helix fork, plus two Helix-specific features.
Upstream merge
Streaming throttle (Phase 3 of WebSocket streaming optimization)
E2E test infrastructure
Test plan