9c715b4
agent: Show actual file name and icon in context pill (#31813)
Click to expand commit body
Previously in the agent context pill if we added images it showed
generic Image tag on the image context pill. This PR make sure if we
have a path available for a image context show the filename which is in
line with other context pills.
Before | After
--- | ---

| 
Release Notes:
- N/A
---------
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Umesh Yadav
and
Bennet Bo Fenner
created
ae219e9
agent: Fix bug with double-counting tokens in Gemini (#31885)
Click to expand commit body
We report the total number of input tokens by summing the numbers of
1. Prompt tokens
2. Cached tokens
But Google API returns prompt tokens (1) that already include cached
tokens (2), so we were double counting tokens in some cases.
Release Notes:
- Fixed bug with double-counting tokens in Gemini
Closes #31166
Release Notes:
- Fixed an issue where copying and pasting an assistant response in text
threads would result in duplicate text
Bennet Bo Fenner
created
8fb7fa9
Suppress log blade_graphics -related logs by default (#31881)
Click to expand commit body
Release Notes:
- N/A
Kirill Bulatov
created
22d75b7
Notify when pinning a tab even if the tab isn't moved (#31880)
Click to expand commit body
The optimization to not move a tab being pinned (when the destination
index is the same as its index) in
https://github.com/zed-industries/zed/pull/31871 caused a regression, as
we were no longer calling `cx.notify()` indirectly through `move_item`.
Thanks for catching this, @smitbarmase.
Release Notes:
- N/A
Joseph T. Lyons
created
06a199d
editor: Fix completion accept for optional chaining in Typescript (#31878)
Click to expand commit body
Closes #31662
Currently, we assume `insert_range` will always end at the cursor and
`replace_range` will also always end after the cursor for calculating
range to replace. This is a particular case for the rust-analyzer, but
not widely true for other language servers.
This PR fixes this assumption, and now `insert_range` and
`replace_range` both can end before cursor.
In this particular case:
```ts
let x: string | undefined;
x.tostˇ // here insert as well as replace range is just "." while new_text is "?.toString()"
```
This change makes it such that if final range to replace ends before
cursor, we extend it till the cursor.
Bonus:
- Improves suffix and subsequence matching to use `label` over
`new_text` as `new_text` can contain end characters like `()` or `$`
which is not visible while accepting the completion.
- Make suffix and subsequence check case insensitive.
- Fixes broken subsequence matching which was not considering the order
of characters while matching subsequence.
Release Notes:
- Fixed an issue where autocompleting optional chaining methods in
TypeScript, such as `x.tostr`, would result in `x?.toString()tostr`
instead of `x?.toString()`.
Closes https://github.com/zed-industries/zed/issues/31870
Release Notes:
- Allowed opening 1 more item if `n` tabs are pinned, where `n` equals
`max_tabs` count.
- Fixed a bug where pinned tabs would eventually be closed out when
exceeding the `max_tabs` count.
- Fixed a bug where a tab could be lost when pinning a tab while at the
`max_tabs` count.
- Fixed a bug where pinning a tab when already at the `max_tabs` limit
could cause other tabs to be incorrectly closed.
Joseph T. Lyons
created
d3bc561
Disable close clean menu item when all are dirty (#31859)
Click to expand commit body
This PR disables the "Close Clean" tab context menu action if all items
are dirty.
<img width="595" alt="SCR-20250601-kaev"
src="https://github.com/user-attachments/assets/add30762-b483-4701-9053-141d2dfe9b05"
/>
<img width="573" alt="SCR-20250601-kahl"
src="https://github.com/user-attachments/assets/24f260e4-01d6-48d6-a6f4-a13ae59c246e"
/>
Also did a bit more general refactoring.
Release Notes:
- N/A
Joseph T. Lyons
created
f13f2df
Ensure item-closing actions do not panic when no items are present (#31845)
Click to expand commit body
This PR adds a comprehensive test that ensures that no item-closing
action will panic when no items are present. A test already existed
(`test_remove_active_empty `) that ensured `CloseActiveItem` didn't
panic, but the new test covers:
- `CloseActiveItem`
- `CloseInactiveItems`
- `CloseAllItems`
- `CloseCleanItems`
- `CloseItemsToTheRight`
- `CloseItemsToTheLeft`
I plan to do a bit more clean up in `pane.rs` and this feels like a good
thing to add before that.
Release Notes:
- N/A
While working on
- https://github.com/zed-industries/zed/pull/31783
- https://github.com/zed-industries/zed/pull/31786
... I noticed some areas that could be improved through refactoring. The
bug in https://github.com/zed-industries/zed/pull/31783 came from having
duplicate code. The fix had been applied to one version, but not the
duplicated code.
This PR attempts to do some initial clean up, through some refactoring.
Release Notes:
- N/A
Joseph T. Lyons
created
cc53665
Fix slowness in Terminal when vi-mode is enabled (#31824)
Click to expand commit body
It seems alacritty handles vi-mode motions in a special way and it is up
to the client to decide when redraw is necessary. With this change,
`TerminalView` notifies the context if a keystroke is processed and vi
mode is enabled.
Fixes #31447
Before:
https://github.com/user-attachments/assets/a78d4ba0-23a3-4660-a834-2f92948f586c
After:
https://github.com/user-attachments/assets/cabbb0f4-a1f9-4f1c-87d8-a56a10e35cc8
Release Notes:
- Fixed sluggish cursor motions in Terminal when Vi Mode is enabled
[#31447]
4f1728e
Do not unwrap when updating inline diagnostics (#31814)
Click to expand commit body
Also do not hold the strong editor reference while debounced.
Release Notes:
- N/A
Kirill Bulatov
created
40c91d5
gpui: Implement window_handle and display_handle for wayland platform (#28152)
Click to expand commit body
This PR implements the previously unimplemented window_handle and
display_handle methods in the wayland platform. It also exposes the
display_handle method through the Window struct.
Release Notes:
- N/A
Christian Bergschneider
created
fe1b366
Do not error on debugger server connection close (#31795)
Click to expand commit body
Start to show islands of logs in a successful debugger runs for Rust:
<img width="1728" alt="1"
src="https://github.com/user-attachments/assets/7400201b-b900-4b20-8adf-21850ae59671"
/>
<img width="1728" alt="2"
src="https://github.com/user-attachments/assets/e75cc5f1-1f74-41d6-b7aa-697a4b2f055b"
/>
Release Notes:
- N/A
https://github.com/zed-industries/zed/pull/31668 renamed
`CompletionMode::Max` to `CompletionMode::Burn` which is a good change,
but this broke the deserialization for threads whose completion mode was
stored in LMDB. This adds a deserialization alias so that both values
work.
We could make a full new `SerializedThread` version which migrates this
value, but that seems overkill for this single change, we can batch that
with more changes later. Also, people in nightly already have some v1
threads with `burn` stored, so it wouldn't quite work for everybody.
Release Notes:
- N/A
Agus Zubiaga
created
4f8d7f0
Disallow running Zed with root privileges (#31331)
Click to expand commit body
This will fix a lot of weird problems that are based on file access
issues.
As discussed in
https://github.com/zed-industries/zed/pull/31219#issuecomment-2905371710,
for now it's better to just prevent running Zed with root privileges.
Release Notes:
- Explicitly disallow running Zed with root privileges
---------
Co-authored-by: Peter Tripp <peter@zed.dev>
Just ensuring they're more harmonized in size, stroke width, and overall
dimensions. Adding here two new "play" icons, too, that will be used in
the context of the debugger.
<img
src="https://github.com/user-attachments/assets/79bcf0b0-e995-4c8e-9c78-0aba32f42f2d"
width="400" />
Release Notes:
- N/A
a305eda
debugger: Relax implementation of `validate_config` to not run validation (#31785)
Click to expand commit body
When we moved to schema-based debug configs, we've added validate_config
- a trait method
that is supposed to both validate the configuration and determine
whether it is a launch configuration
or an attach configuration.
The validation bit is a bit problematic though - we received reports on
Discords about
scenarios not starting up properly; it turned out that Javascript's
implementation was overly strict.
Thus, I got rid of any code that tries to validate the config - let's
let the debug adapter itself
decide whether it can digest the configuration or not. validate_config
is now left unimplemented for most
DebugAdapter implementations (except for PHP), because all adapters use
`request`: 'launch'/'attach' for that.
Let's leave the trait method in place though, as nothing guarantees this
to be true for all adapters.
cc @Anthony-Eid
Release Notes:
- debugger: Improved error messages when the debug scenario is not
valid.
- debugger: Fixed cases where valid configs were rejected.
Piotr Osiewicz
created
ba7b1db
Mark items as pinned via `!` in tests (#31786)
Click to expand commit body
Release Notes:
- N/A
Joseph T. Lyons
created
019c8de
Fix bug where pinned tabs were closed when closing others (#31783)
Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/28166
Release Notes:
- Fixed a bug where pinned tabs were closed when running `Close Others`
from the tab context menu
Joseph T. Lyons
created
1704dbe
keymap: Add subword navigation and selection to Sublime Text keymap (#30268)
Click to expand commit body
For reference, this is what is set in Sublime Text's default-keymap
files for both MacOS and Linux:
```json
{ "keys": ["ctrl+left"], "command": "move", "args": {"by": "words", "forward": false} },
{ "keys": ["ctrl+right"], "command": "move", "args": {"by": "word_ends", "forward": true} },
{ "keys": ["ctrl+shift+left"], "command": "move", "args": {"by": "words", "forward": false, "extend": true} },
{ "keys": ["ctrl+shift+right"], "command": "move", "args": {"by": "word_ends", "forward": true, "extend": true} },
```
Release Notes:
- Add subword navigation and selection to Sublime keymap
Co-authored-by: Peter Tripp <peter@zed.dev>
Fernando Carletti
and
Peter Tripp
created
eefa6c4
Icon theme selector: Don't select last list item when fuzzy searching (#29560)
Click to expand commit body
Adds manual icon-theme selection persistence
Store manually selected icon-themes to maintain selection when query
changes. This allows the theme selector to remember the user's choice
rather than resetting selection when filtering results.
mentioned in #28081 and #28278
Release Notes:
- Improved persistence when selecting themes and icon themes.
---------
Co-authored-by: Peter Tripp <peter@zed.dev>
Hendrik Sollich
and
Peter Tripp
created
1f17df7
debugger: Add support for go tests (#31772)
Click to expand commit body
In the https://github.com/zed-industries/zed/pull/31559 I did not
introduce ability to debug test invocations.
Adding it here. E.g:

Release Notes:
- Added support for debugging single tests written in go
Alex
created
6d687a2
ollama: Change default context size to 4096 (#31682)
Click to expand commit body
Ollama increased their default context size from 2048 to 4096 tokens in
version v0.6.7, which released over a month ago.
https://github.com/ollama/ollama/releases/tag/v0.6.7
Release Notes:
- ollama: Update default model context to 4096 (matching upstream)
a78563b
ci: Prevent "Tests Pass" job from running on forks (#31778)
Click to expand commit body
Example fork [actions run](https://github.com/alphaArgon/zed/actions/runs/15349715488/job/43194591563)
which would be suppressed in the future.
(Sorry @alphaArgon)
Release Notes:
- N/A
Peter Tripp
created
f881cac
Use both language and LSP icons for LSP tasks (#31773)
Click to expand commit body
Make more explicit which language LSP tasks are used.
Before:

After:


Release Notes:
- N/A
Reverts zed-industries/zed#31760
see this comment for context:
https://github.com/zed-industries/zed/pull/31760#issuecomment-2923158611.
Release Notes:
- N/A
Umesh Yadav
created
ca6fd10
debugger: Change console text color, add tooltips (#31765)
Click to expand commit body
- Improved legibility of console text:
| Theme | Dark | Light |
|--------|--------|--------|
| Before |

|

|
| After |

|

|
Release Notes:
- debugger: Improved legibility of console text
- debugger: Added tooltips to all debugger items.
Piotr Osiewicz
created
f8097c7
Improve compatibility with Wayland clipboard (#30251)
Click to expand commit body
Closes #26672, #20984
Release Notes:
- Fixed issue where some applications won't receive the clipboard
contents from Zed
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
With this, a semi-working debug session is possible from the JS/TS
gutter tasks:
https://github.com/user-attachments/assets/8db6ed29-b44a-4314-ae8b-a8213291bffc
For now, available in debug builds only as a base to improve on later on
the DAP front.
Release Notes:
- N/A
---------
Co-authored-by: Piotr Osiewicz <peterosiewicz@gmail.com>
Kirill Bulatov
and
Piotr Osiewicz
created
0ee900e
Support macOS Sequoia titlebar double-click action (#30468)
Click to expand commit body
Closes #16527
Release Notes:
- Added MacOS titlebar double-click action
---
Unfortunately, Apple doesn't seem to make the "Fill" API public or
documented anywhere.
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Chung Wei Leong
and
Mikayla Maki
created
f9f4be1
collab: Use `StripeClient` in `POST /billing/subscriptions/sync` endpoint (#31764)
Click to expand commit body
This PR updates the `POST /billing/subscriptions/sync` endpoint to use
the `StripeClient` trait instead of using `stripe::Client` directly.
Release Notes:
- N/A
Marshall Bowers
created
a00b073
copilot: Fix vision request detection for follow-up messages (#31760)
Click to expand commit body
Previously, the vision request header was only set if the last message
in a thread contained an image. This caused 400 errors from the Copilot
API when sending follow-up messages in a thread that contained images in
earlier messages.
Modified the `is_vision_request` check to scan all messages in a thread
for image content instead of just the last one, ensuring the proper
header is set for the entire conversation.
Added a unit test to verify all cases function correctly.
Release Notes:
- Fix GitHub Copilot chat provider error when sending follow-up messages
in threads containing images
Stephen Murray
created
f725b5e
collab: Use `StripeClient` in `sync_subscription` (#31761)
Click to expand commit body
This PR updates the `sync_subscription` function to use the
`StripeClient` trait instead of using `stripe::Client` directly.
Release Notes:
- N/A
---------
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Marshall Bowers
and
Ben Brandt
created
07436b4
breadcrumbs: Stylize filename in breadcrumbs when tab-bar is off and file is dirty (#30507)
Click to expand commit body
Closes [#18870](https://github.com/zed-industries/zed/issues/18870)
- I like to use Zed with tab_bar off
- when the file is modified there is no indicator when tab_bar is off
- this PR aims to fix that
Thanks to @Qkessler for initial PR - #22418
This is style decided in this discussion - #22418
@iamnbutler @mikayla-maki [subtle style
decided](https://github.com/zed-industries/zed/pull/22418#issuecomment-2605253667)
Release Notes:
- When tab_bar is off, filename in the breadcrumbs will be the indicator
when file is unsaved.
#### Changes
- when tab_bar is off and file is dirty (unsaved)
<img width="834" alt="image"
src="https://github.com/user-attachments/assets/f205731b-c8e3-4d7a-9214-cbe706e372bf"
/>
- when tab_bar is off and file is not dirty (saved)
<img width="846" alt="image"
src="https://github.com/user-attachments/assets/88ea96eb-16a2-48e8-900d-64a921f0b5c3"
/>
- when tab_bar is on
<img width="741" alt="image"
src="https://github.com/user-attachments/assets/cc543544-9949-46ed-8e09-cdcbe2f47ab8"
/>
<img width="740" alt="image"
src="https://github.com/user-attachments/assets/8d347258-26f7-4bd7-82d4-8f23dbe63d61"
/>
Release Notes:
- Changed the highlighting of the current file to represent the current
saved state, when the tab bar is turned off.
Another batch of allocation savings. Noteworthy ones are
`find_path_tool.rs` where one clone of *all* found matches was saved and
`web_tool_search.rs` where the tooltip no longer clones the entire url
on every hover.
I'd also like to propose using `std::borrow::Cow` a lot more around the
codebase instead of Strings. There are hundreds if not 1000+ clones that
can be saved pretty regularly simply by switching to Cow. ´Cow´'s are
likely not used because they aren't compatible with futures and because
it could cause lifetime bloat. However if we use `Cow<'static, str>`
(static lifetime) for when we need to pass them into futures, we could
save a TON of allocations for `&'static str`. Additionally I often see
structs being created using `String`'s just to be deserialized
afterwards, which only requires a reference.
Release Notes:
- N/A
tidely
created
047e7ea
gpui: Improve `window.prompt` to support ESC with non-English cancel text on macOS (#29538)
Click to expand commit body
Release Notes:
- N/A
----
The before version GPUI used `Cancel` for cancel text, if we use
non-English text (e.g.: "取消" in Chinese), then the press `Esc` to cancel
will not work.
So this PR to change it by use `PromptButton` to instead the `&str`,
then we can use `PromptButton::cancel("取消")` for the `Cancel` button.
Run `cargo run -p gpui --example window` to test.
---
Platform Test:
- [x] macOS
- [x] Windows
- [x] Linux (x11 and Wayland)
---------
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Jason Lee
,
Mikayla Maki
, and
Mikayla Maki
created
1d5d3de
gpui: Optimize the ordering update in the BoundsTree (#31025)
Click to expand commit body
Release Notes:
- N/A
laizy
created
c4dbaa9
gpui: Fix race condition when upgrading a weak reference (#30952)
Click to expand commit body
Release Notes:
- N/A
laizy
created
97c01c6
Fix model deduplication to use provider ID and model ID (#31750)
Click to expand commit body
Previously only used model ID for deduplication, which incorrectly
filtered models with the same name from different providers.
Release Notes:
- Fix to make sure all provider models are shown in the model picker
Ben Brandt
created
310ea43
danger: Check for changes in prompt files (#31744)
Click to expand commit body
This PR adds a Danger check to remind engineers that any changes to our
various prompts need to be verified against the LLM Worker.
When changes to the prompt files are detected, we will fail the PR with
a message:
<img width="929" alt="Screenshot 2025-05-30 at 8 40 58 AM"
src="https://github.com/user-attachments/assets/79afab4e-e799-45f1-a90e-0fd7c9a73706"
/>
Once the corresponding changes have been made (or no changes to the LLM
Worker have been determined to be necessary), including the indicated
attestation message will convert the errors into informational messages:
<img width="926" alt="Screenshot 2025-05-30 at 8 41 52 AM"
src="https://github.com/user-attachments/assets/ff51c17a-7a76-46a7-b468-a7d864d480c3"
/>
Release Notes:
- N/A
Marshall Bowers
created
6bb4b5f
Revert "debugger beta: Fix bug where debug Rust main running action f… (#31743)
Click to expand commit body
…ailed (#31291)"
This reverts commit aab76208b53334b85429486c7abd6f0bfcf58dc9.
Closes #31737
I cannot repro the original issue that this commit was trying to solve
anymore.
Release Notes:
- N/A
Piotr Osiewicz
created
e0fa303
docs: Properly nest the docs for the inline git blame settings (#31739)
Click to expand commit body
From a report on
[discord](https://discord.com/channels/869392257814519848/873292398204170290/1377943171320774656):
reorders the docs for the inline git blame feature so they are properly
nested.
<img width="1719" alt="Screenshot_2025-05-30_at_11 32 17"
src="https://github.com/user-attachments/assets/3c20bda3-de81-4ac3-b8e2-e1d4eac0ce88"
/>
Release Notes:
- N/A
5462e19
debugger: Fix wrong path to the downloaded delve-shim-dap (#31738)
Click to expand commit body
Closes #ISSUE
Release Notes:
- N/A
Piotr Osiewicz
created
3a60420
debugger: Fix delve-dap-shim path on Windows (#31735)
Click to expand commit body
Closes #ISSUE
Release Notes:
- debugger: Fixed wrong path being picked up for delve on Windows
- debugger: Fixed delve not respecting the user-provided binary path
from settings.