Cherry-picked git_ui: Fix co-author tooltip message (#30426)
It should show "Remove co-authored-by" when hovering on co-author is
already added state. And should say
"Add co-authored-by" when it is at disabled state.
Release Notes:
- N/A
Co-authored-by: Ben Kunkle <ben@zed.dev>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
Co-authored-by: Ben Kunkle <ben@zed.dev>
gcp-cherry-pick-bot[bot]
,
Smit Barmase
, and
Ben Kunkle
created
71e4885
Fix agent panel scroll while editing a past message (cherry-pick #30394) (#30399)
Click to expand commit body
Cherry-picked Fix agent panel scroll while editing a past message
(#30394)
This is similar to the `block_mouse_down` method added in #20649 (which
has a very similar motivation), but is more comprehensive in stopping
mouse events. Since I want to cherry-pick this to the releases, keeping
this change just to the agent panel. In a follow-up will replace
existing use of `block_mouse_down` to instead use this.
Release Notes:
- N/A
Co-authored-by: Michael Sloan <michael@zed.dev>
gcp-cherry-pick-bot[bot]
and
Michael Sloan
created
ca9a1e5
assistant_context_editor: Register `ContextEditor` actions that were lost (#30428)
Click to expand commit body
This PR restores the `ContextEditor` actions that were lost in
https://github.com/zed-industries/zed/pull/30168.
Closes https://github.com/zed-industries/zed/issues/30356.
Release Notes:
- agent: Added back some missing actions, including `assistant: quote
selection`.
Marshall Bowers
created
4fc7849
Wait to locate system-installed Node until the shell environment is loaded (#30416)
Click to expand commit body
Release Notes:
- Fixed a race condition that sometimes prevented a system-installed
`node` binary from being detected.
- Fixed a bug where the `node.path` setting was not respected when
invoking npm.
Max Brunsfeld
created
2ae7e16
agent: Fix layout shift due to the "Generating" label (#30422)
Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/30238
Release Notes:
- agent: Fixed layout shift happening in the toolbar (both in the
singleton and multibuffers) due to the "Generating" label that appeared
while the agent is still generating a response.
Danilo Leal
created
b061f44
agent: Thread history update improvements (#30415)
Click to expand commit body
- Try to preserve previously selected item on update
- Do not clear list items while updating to avoid a frame with no items
rendered
Release Notes:
- agent: Preserve previously selected item in Thread History on update
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Agus Zubiaga
,
Danilo Leal
, and
Richard Feldman
created
5ba2869
Revert "Load Profile state from Thread and tie visibility to the thread's model" (#30413)
Click to expand commit body
This reverts commit 3615d6d96c5d1c8fd0ccb1ee0bc176e9c94ac730.
Ultimately, we want to restore the ability to store a profile
per-thread, but for now reverting this fixes a fairly disruptive bug.
Release Notes:
- Fixed a bug causing the agent to use the wrong profile in some cases.
Cole Miller
created
2c80aa1
agent: write latest profile change to default setting (#30408)
Click to expand commit body
Reverts back to previous behavior where we update your settings so we
can load a new thread from your last configuration.
Release Notes:
- agent: Persist profile changes for new threads
Ben Brandt
created
2423b6d
agent: Show delete thread icon buttons on hover/focus (#30370)
Click to expand commit body
This PR's main goal is to show the delete thread button when the list
item is either focused or hovered. In order to do that, we ended up
refactoring (i.e., merging) the `PastThread` and `PastContext` elements
into a single `HistoryElementEntry` that already matches to the entry
type (i.e., context or thread).
Release Notes:
- agent: Simplify the UI by showing the delete thread icon button only
on hover or focus.
---------
Co-authored-by: Agus Zubiaga <hi@aguz.me>
Danilo Leal
and
Agus Zubiaga
created
183912f
Fix agent panel scroll while editing a past message (#30394)
Click to expand commit body
This is similar to the `block_mouse_down` method added in #20649 (which
has a very similar motivation), but is more comprehensive in stopping
mouse events. Since I want to cherry-pick this to the releases, keeping
this change just to the agent panel. In a follow-up will replace
existing use of `block_mouse_down` to instead use this.
Release Notes:
- N/A
Michael Sloan
created
a21283b
Misc improvement of code for agent markdown codeblock (#30388)
Click to expand commit body
Release Notes:
- N/A
Michael Sloan
created
07868df
askpass: Remove attempt to surface friendly error if zed exe path is not executable before use in askpass script (cherry-pick #30396) (#30397)
Click to expand commit body
Cherry-picked askpass: Remove attempt to surface friendly error if zed
exe path is not executable before use in askpass script (#30396)
Closes #29819
Release Notes:
- Removed a faulty check in the askpass implementation causing
unintended "Failed to check metadata of Zed executable path for use in
askpass" errors when remoting via SSH or doing git operations that
require authentication.
Co-authored-by: Ben Kunkle <ben@zed.dev>
gcp-cherry-pick-bot[bot]
and
Ben Kunkle
created
4a0025d
Fix text overlap with markdown code block in list in agent response (cherry-pick #30377) (#30390)
Click to expand commit body
Cherry-picked Fix text overlap with markdown code block in list in agent
response (#30377)
Seems that `h_full` was causing it to use the height of the overall list
item for some reason.
Closes #30002
Release Notes:
- Agent Panel: Fixed text overlap for code blocks nested in lists in
agent response.
Co-authored-by: Michael Sloan <michael@zed.dev>
gcp-cherry-pick-bot[bot]
and
Michael Sloan
created
- Fix `ctrl-p` not working in the model selector
- Select first entry when opening the context picker
Release Notes:
- Fixed `menu::SelectPrevious` keybindings not working in the agent
panel's model selector.
2c5d8f9
editor: Use default gutter margin instead of `horizontal_padding` for horizontal content padding (#30138)
Click to expand commit body
This PR changes the way a horizontal margin is added in editors. It
removes the possibility to set a custom `horizontal_padding` for an
editor and utilizes the default `gutter_dimension` instead.
This change is made to ensure that no issues with soft-wrapping occurs
for any editor that has a `horizontal_margin` set (see #26893 for more
context on the implications here`. Furthermore, it ensures that the text
actually renders properly when scrolling horizontally and is not
cut-off.
### Horizontal padding:
| `main` | This PR |
| --- | --- |
| 
| 
|
### Editor horizontally scrolled:
| `main` | This PR |
| --- | --- |
| 
| 
|
Notice the difference at the horizontal borders.
The margin added for the `edit_file_tool` was 4 pixels. The `descent`,
whilst not exactly, is roughly the same here and also scales with the
font size nicely. Furthermore, it seems that the
`gutter_dimensions.margin` should be present anyway, given the following
comment
https://github.com/zed-industries/zed/blob/0b00256f5884fd17b4f834730b31f365613f3683/crates/editor/src/element.rs#L6887-L6889
so ensuring this property is actually set and not 0 seems to be
reasonable given the circumstances.
Please note though that this will apply to all editors in the app.
Again, this seems like it should be the case anyway, just wanted to
mention this again.
Should the fix like this not be wanted, I can change this here so that
the `horizontal_margin` is better accounted for when soft-wrapping in an
editor. Feel free to let me know in this case.
Release Notes:
- N/A
Finn Evers
created
49689ef
agent: Fuzzy search in model selector (#30281)
Click to expand commit body
This change enables fuzzy search on model providers and names. For
example, the query "z41" will match "zed/gpt-4.1".
Release Notes:
- Agent: Improved model selection with fuzzy search support
Oleksiy Syvokon
created
5e9d6f4
agent: Render edit tool error as markdown (#30325)
Click to expand commit body
Release Notes:
- agent: Render edit tool error as markdown and allow selecting it
Agus Zubiaga
created
b94b5e6
agent: Fix autoscrolling to history entry (#30321)
Click to expand commit body
We were still using entry indexes to scroll, but the list now includes
the separators as items, so the indexes need to be translated
Release Notes:
- agent: Fix autoscrolling to history entry when navigating via keyboard
Agus Zubiaga
created
65ada5c
agent: Fix message editor's button positions when expanded (#30311)
Click to expand commit body
Fixes an issue introduced by #29959 which caused the message editor to
overflow from the agent panel bounds, making the bottom buttons
invisible when the editor was expanded (cmd+esc).
Fixing this required changing the base structure of the agent panel, but
things seem to work as expected:
https://github.com/user-attachments/assets/fc4c97fb-f7cb-4f54-a268-c30fbcb1649f
Release Notes:
- agent: Fix message editor's button positions when expanded
Closes #29072, #28390,
Release Notes:
- AWS Bedrock: Fixed case where user couldn't delete manually added AWS
credentials.
---------
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Peter Tripp <peter@zed.dev>
Shardul Vaidya
,
Marshall Bowers
, and
Peter Tripp
created
af88bd4
Add a divider below "Usage" in the Edit Prediction menu (#30284)
Click to expand commit body
As it felt untidy without it.
Release Notes:
- N/A
Danilo Leal
created
3a73f7c
Fix error when Copilot calls tools without arguments (cherry-pick #30371) (#30374)
Click to expand commit body
Cherry-picked Fix error when Copilot calls tools without arguments
(#30371)
Fixes https://github.com/zed-industries/zed/issues/30346
The model can output an empty string to indicate the absence of
arguments, which can't be parsed as a `serde_json::Value`. When that
happens, we now create an empty object instead on behalf of the model.
Release Notes:
- Fixed a bug that prevented Copilot models from calling the
`diagnostic` tool.
Co-authored-by: Antonio Scandurra <me@as-cii.com>
gcp-cherry-pick-bot[bot]
and
Antonio Scandurra
created
f3d84f0
Include `EditAgent`'s raw output when inspecting thread (cherry-pick #30337) (#30341)
Click to expand commit body
Cherry-picked Include `EditAgent`'s raw output when inspecting thread
(#30337)
This allows us to debug the raw edits that were generated when people
report feedback, when running evals and when opening the thread as
Markdown.
Release Notes:
- Improved debug output for agent threads.
Co-authored-by: Antonio Scandurra <me@as-cii.com>
gcp-cherry-pick-bot[bot]
and
Antonio Scandurra
created
a230730
Make `copilot::SignIn` open sign-in modal when needed (cherry-pick #30239) (#30350)
Click to expand commit body
Cherry-picked Make `copilot::SignIn` open sign-in modal when needed
(#30239)
Also:
* Makes sign out show status notifications and errors.
* Reinstall now prompts for sign-in after start.
Addresses some of #29250, but not all of it.
Release Notes:
- N/A
Co-authored-by: Michael Sloan <michael@zed.dev>
gcp-cherry-pick-bot[bot]
and
Michael Sloan
created
5ae8072
agent: Show checkmark for current profile, not default profile (cherry-pick #30314) (#30334)
Click to expand commit body
Cherry-picked agent: Show checkmark for current profile, not default
profile (#30314)
Closes #ISSUE
Release Notes:
- agent: Fixed a bug that caused the profile selector to display a
checkmark next to the wrong profile.
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
and
Cole Miller
created
f9b46eb
Restyle notification close control (cherry-pick #30262) (#30266)
Click to expand commit body
Cherry-picked Restyle notification close control (#30262)
Follow-up of https://github.com/zed-industries/zed/pull/30015
Merges suppress and close buttons into one, with `shift` changing the
state and showing different tooltips.
Currently, there's no tooltip for notification suppress action, hence
none is displayed in the video:
https://github.com/user-attachments/assets/678c4d76-a86e-4fe9-8d7b-92996470a8a8
Release Notes:
- N/A
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
0490d25
language_models: Improve subscription states in the Agent configuration view (#30252)
Click to expand commit body
This PR improves the subscription states in the Agent configuration view
to the new billing system.
Zed Free (legacy):
<img width="638" alt="Screenshot 2025-05-08 at 8 42 59 AM"
src="https://github.com/user-attachments/assets/7b62d4c1-2a9c-4c6a-aa8f-060730b6d7b3"
/>
Zed Free (new):
<img width="640" alt="Screenshot 2025-05-08 at 8 43 56 AM"
src="https://github.com/user-attachments/assets/8a48448e-813e-4633-955d-623d3e6d603c"
/>
Zed Pro trial:
<img width="641" alt="Screenshot 2025-05-08 at 8 45 52 AM"
src="https://github.com/user-attachments/assets/1ec7ee62-e954-48e7-8447-4584527307c9"
/>
Zed Pro:
<img width="636" alt="Screenshot 2025-05-08 at 8 47 21 AM"
src="https://github.com/user-attachments/assets/f934b2e3-0943-4b78-b8dc-0a31e731d8fb"
/>
Release Notes:
- agent: Improved the subscription-related information in the
configuration view.
Marshall Bowers
created
1d9c2dd
Improve token counting for OpenAI models (#30242)
Click to expand commit body
tiktoken_rs is a bit behind (and even upstream tiktoken doesn't have all
of these models)
We were incorrectly using the cl100k tokenizer for some models that
actually use the o200k tokenizers. So that is updated.
I also made the match arms specific so that we do a better job of
catching whether or not tiktoken-rs accurately supports new models we
add in.
I will also do a PR upstream to see if we can move some of this logic
back out if tiktoken better supports the newer models.
Release Notes:
- Improved tokenizer support for openai models.
Ben Brandt
created
8594cef
Reuse conversation cache when streaming edits (#30245)
Click to expand commit body
Release Notes:
- Improved latency when the agent applies edits.
Antonio Scandurra
created
1afd186
debugger/extensions: Revert changes to extension store related to language config (cherry-pick #30225) (#30244)
Click to expand commit body
Cherry-picked debugger/extensions: Revert changes to extension store
related to language config (#30225)
Revert #29945
Release Notes:
- Fixed extension suggestions popping up over and over for recommended
extensions like Ruby or Nix.
---------
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Conrad <conrad@zed.dev>
gcp-cherry-pick-bot[bot]
,
Piotr Osiewicz
, and
Conrad
created
4aa38ce
agent: Rename a number of constructs from Assistant to Agent (#30196)
Click to expand commit body
This PR renames a number of constructs in the `agent` crate from the
"Assistant" terminology to "Agent".
Not comprehensive, but it's a start.
Release Notes:
- N/A
Closes #30056
Apparently the API supports the "default" field now, so we can remove
that transformation.
However, optional is not supported
See https://ai.google.dev/api/caching#Schema
Release Notes:
- agent: Improve tool schema compatibility for Gemini models
Bennet Bo Fenner
created
efbe678
mistral: Add new Mistral medium model (#30171)
Click to expand commit body
Release Notes:
- Added `mistral-medium` to the Mistral provider.
versecafe
created
0f96077
Load Profile state from Thread and tie visibility to the thread's model (#30090)
Click to expand commit body
When deciding if a model supports tools or not, we weren't reading from
the configured model in a given thread.
This also stores the profile on the thread, which matches the behavior
of the Model and Max Mode, which we also already store per thread.
Hopefully this helps alleviate some confusion.
Release Notes:
- agent: Save profile selection per-Agent thread
Ben Brandt
created
91b1f60
Fix workspace update notifications not being suppressed (cherry-pick #30180) (#30205)
Click to expand commit body
Cherry-picked Fix workspace update notifications not being suppressed
(#30180)
Follow-up of https://github.com/zed-industries/zed/pull/30015
Release Notes:
- N/A
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
29bb9aa
Better match path-like strings in terminal (cherry-pick #30087) (#30207)
Click to expand commit body
Cherry-picked Better match path-like strings in terminal (#30087)
Start to capture `foo/bar:20:in`-like strings as valid pointers to line
20 in a file
Closes https://github.com/zed-industries/zed/issues/28194
Release Notes:
- Fixed terminal cmd-click not registering `foo/bar:20:in`-like paths
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
9cd2806
Do not flicker when switching cmd-hovered words in terminal (cherry-pick #30098) (#30206)
Click to expand commit body
Cherry-picked Do not flicker when switching cmd-hovered words in
terminal (#30098)
Closes https://github.com/zed-industries/zed/issues/25110
https://github.com/user-attachments/assets/4624c256-8dfb-48eb-a726-6cf130d946da
Terminal may update its hovered word way before reporting it to the
terminal view, and that processing the file check later.
Hence, store the terminal hover data in the terminal view and avoid
highlights when it's different from what the terminal has (as the source
of truth here).
In addition, now only does hover refreshes when the terminal hover
actually changes, not on every event report.
Release Notes:
- Fixed underline flicker when switching cmd-hovered words in terminal
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
96b328d
Add a way to clear activity indicator (cherry-pick #30156) (#30204)
Click to expand commit body
Cherry-picked Add a way to clear activity indicator (#30156)
Follow-up of https://github.com/zed-industries/zed/pull/30015
* Restyles the dismiss and close buttons a bit: change the dismiss icon
and add tooltips with the bindings to both
* Allows ESC to clear any status that's in the activity indicator now,
if all notifications are cleared: this won't suppress any further status
additions though, so statuses may resurface later
Release Notes:
- Added a way to clear activity indicator
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
fb1ac6e
Allow opening the FS root dir as a remote project (#30190)
Click to expand commit body
### Todo
* [x] Allow opening `ssh://username@host:/` from the CLI
* [x] Allow selecting `/` in the `open path` picker
* [x] Allow selecting the home directory in the `open path` picker
Release Notes:
- Changed the initial state of the SSH project picker to show the full
path to your home directory on the remote machine, instead of `~`.
- Added the ability to open `/` as a project folder over SSH
---------
Co-authored-by: Agus Zubiaga <hi@aguz.me>
Max Brunsfeld
and
Agus Zubiaga
created
190d612
Use agent panel font size for all content in thread / history views and fix text thread font size adjust (#30041)
Click to expand commit body
Release Notes:
- N/A
Michael Sloan
created
a206c31
Avoid empty schema in copilot dummy tool (#30178)
Click to expand commit body
Copilot chat still returns a 400 if the dummy tool uses the `{}` schema.
This is a follow-up to https://github.com/zed-industries/zed/pull/30007.
Release Notes:
- Fixed a bug where agent edits would fail when using GitHub Copilot
Chat.
Co-authored-by: Agus Zubiaga <hi@aguz.me>