ba9c033
language_models: Fix passing of `thread_id` and `prompt_id` (#29071)
Click to expand commit body
This PR is a follow-up to
https://github.com/zed-industries/zed/pull/29069 that fixes an issue
where the thread ID and prompt ID were not being sent up correctly.
Release Notes:
- N/A
Marshall Bowers
created
07ca5a6
agent: Attach thread ID and prompt ID to telemetry events (#29069)
Click to expand commit body
This PR attaches the thread ID and the new prompt ID to telemetry events
for completions in the Agent panel.
Release Notes:
- N/A
---------
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Marshall Bowers
and
Mikayla Maki
created
0c13b42
Add hidden `prompt_to_focus` field to `OpenPromptLibrary` action (#29062)
eefdcb3
agent: Simplify design of the settings view (#29041)
Click to expand commit body
Containing everything in boxes wasn't super necessary here. Want to
still improve the switch color contrast here, but will probably do that
in a separate PR.
<img
src="https://github.com/user-attachments/assets/f826a7a8-beaf-45d0-9dc2-36dc210c418e"
width="700"/>
Release Notes:
- N/A
Danilo Leal
created
2ac8a84
agent: Use default prompts from prompt library in system prompt (#28915)
Click to expand commit body
Related to #28490.
- Default prompts from the prompt library are now included as "user
rules" in the system prompt.
- Presence of these user rules is shown at the beginning of the thread
in the UI.
_ Now uses an `Entity<PromptStore>` instead of an `Arc<PromptStore>`.
Motivation for this is emitting a `PromptsUpdatedEvent`.
- Now disallows concurrent reloading of the system prompt. Before this
change it was possible for reloads to race.
Release Notes:
- agent: Added support for including default prompts from the Prompt
Library as "user rules" in the system prompt.
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Michael Sloan
and
Danilo Leal
created
d35ffc7
debugger: Fix gutter tasks display for users without the debugger feature flag (#29056)
21ff2bb
agent: Do not insert selection as context when selection is empty (#29031)
Click to expand commit body
Release Notes:
- N/A
Bennet Bo Fenner
created
843a621
agent: Remove selections as context once message is sent (#29030)
Click to expand commit body
Release Notes:
- N/A
Bennet Bo Fenner
created
bbe956f
Make Copy and Trim ignore empty lines, and fix vim line selections (cherry-pick #29019) (#29023)
Click to expand commit body
Cherry-picked Make Copy and Trim ignore empty lines, and fix vim line
selections (#29019)
Close #28519
Release Notes:
Update `editor: copy and trim` command:
1. Ignore empty lines in the middle:
```
Line 1
Line 2
```
Will copy text to clipboard:
```
Line 1
Line 2
```
Before this commit trim not performed
1. Fix select use vim line selections, trim not works
Co-authored-by: redforks <redforks@gmail.com>
gcp-cherry-pick-bot[bot]
and
redforks
created
0179e4c
agent: Report usage from thread summarization requests (#29012)
Click to expand commit body
This PR makes it so the thread summarization also reports the model
request usage, to prevent the case where the count would appear to jump
by 2 the next time a message was sent after summarization.
Release Notes:
- N/A
Marshall Bowers
created
df49cad
agent: Show request usage in the panel (#29006)
Click to expand commit body
This PR adds a banner showing request usage in the Agent panel:
<img width="640" alt="Screenshot 2025-04-17 at 5 51 46 PM"
src="https://github.com/user-attachments/assets/e0eb036c-57c1-441c-bbab-7dab1c6e56d9"
/>
Only visible to users on the new billing.
Note to Joseph: Doesn't need to be cherry-picked to Preview.
Release Notes:
- N/A
---------
Co-authored-by: Nate <nate@zed.dev>
Marshall Bowers
and
Nate
created
13b3beb
agent: Extract usage information from response headers (#29002)
Click to expand commit body
This PR updates the Agent to extract the usage information from the
response headers, if they are present.
For now we just log the information, but we'll be using this soon to
populate some UI.
Release Notes:
- N/A
Marshall Bowers
created
5f8efc9
zeta: Extract usage information from response headers (#28999)
Click to expand commit body
This PR updates the Zeta provider to extract the usage information from
the response headers, if they are present.
For now we just log the information, but we'll need to figure out where
this needs to get threaded through to in order to display it in the UI.
Release Notes:
- N/A
Marshall Bowers
created
a1d6431
Use more types/constants from `zed_llm_client` (#28909)
Click to expand commit body
This PR makes it so we use more types and constants from the
`zed_llm_client` crate to avoid duplicating information.
Also updates the current usage endpoint to use limits derived from the
`Plan`.
Release Notes:
- N/A
Marshall Bowers
created
220d853
rpc: Remove `llm` module in favor of `zed_llm_client` (#28900)
Click to expand commit body
This PR removes the `llm` module of the `rpc` crate in favor of using
the types from the `zed_llm_client`.
Release Notes:
- N/A
Marshall Bowers
created
911f329
collab: Add `plan` column to `subscription_usages` (#28889)
Click to expand commit body
This PR adds a `plan` column to the `subscription_usages` table.
These tables don't have any records in them yet, so it's fine to make
the column required without a default.
Release Notes:
- N/A
Marshall Bowers
created
1bdcf31
proto: Add `ZedProTrial` to `Plan` (#28885)
Click to expand commit body
This PR adds the `ZedProTrial` member to the `Plan` enum.
Release Notes:
- N/A
e0dc131
Fix multiline completions when surrounding text doesn't match completion text (cherry-pick #28995) (#28997)
Click to expand commit body
Cherry-picked Fix multiline completions when surroundings don't match
completion text (#28995)
Follow up to the scenarios I overlooked in
https://github.com/zed-industries/zed/pull/28586.
Release Notes:
- N/A
Co-authored-by: João Marcos <marcospb19@hotmail.com>
gcp-cherry-pick-bot[bot]
and
João Marcos
created
5054d07
Revert "git_panel: Pad end of list to avoid obscuring final entry with horizontal scrollbar (#28823)" (cherry-pick #28971) (#28985)
Click to expand commit body
Cherry-picked Revert "git_panel: Pad end of list to avoid obscuring
final entry with horizontal scrollbar (#28823)" (#28971)
This reverts commit 1d98b33ae07a72e9e26dc9b0b54a8baa4fd5f8c1.
Not sure why, but seems like this breaks the binary search used to
correlate items to each other in the lists.
Release Notes:
- N/A
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
and
Conrad Irwin
created
40add86
Escape all runnables' cargo extra arguments coming from rust-analyzer (cherry-pick #28977) (#28981)
Click to expand commit body
Cherry-picked Escape all runnables' cargo extra arguments coming from
rust-analyzer (#28977)
Closes https://github.com/zed-industries/zed/issues/28947
Release Notes:
- Fixed certain doctests not being run properly
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
gcp-cherry-pick-bot[bot]
and
Kirill Bulatov
created
One more batch of fine-tuning the agent panel's design.
Release Notes:
- N/A
Danilo Leal
created
6bfd259
agent: Support adding selection as context (#28964)
Click to expand commit body
https://github.com/user-attachments/assets/42ebe911-3392-48f7-8583-caab285aca09
Release Notes:
- agent: Support adding selections via @selection or `assistant: Quote
selection` as context
Bennet Bo Fenner
created
6db3b9c
Add support for OpenAI o3 and o4-mini models (#28881)
Click to expand commit body
Release Notes:
- Add support for OpenAI o3 and o4-mini models via OpenAI API and
Copilot Chat providers.
---------
Co-authored-by: Peter Tripp <peter@zed.dev>
Umesh Yadav
and
Peter Tripp
created
01daf6e
Fix snippets from extensions being listed twice (#28940)
Click to expand commit body
lookup_snippets() merges global snippets and extension snippets, but
global_snippets::lookup_snippets() also returns extension snippets, make
them double
Closes #28661
Release Notes:
- Fixed a bug where extension provided snippets were being displayed in
duplicate.
8b288aa
agent: Fix "open thread as markdown" button (#28962)
Click to expand commit body
Just now realized that the reason this button wasn't working reliably is
because we weren't passing the index to it. It's now fixed.
Release Notes:
- N/A
Danilo Leal
created
aa1d400
edit prediction: Assign providers when client status changes (#28919)
Click to expand commit body
There was recently a change that caused the Zed Edit Prediction provider
to only be assigned when the client was connected. However, this check
happened too early, resulting in restored buffers never getting
registered. We'll now subscribe to client status changes and reassign
providers accordingly.
Release Notes:
- edit prediction: Fixed bug disabling prediction in restored buffers
Agus Zubiaga
created
fd6e093
agent: Show context server name in incompatible tool warning (#28954)
7102d40
gemini: Fix invalid field name in request (cherry-pick #28949) (#28950)
Click to expand commit body
Cherry-picked agent: Fix system instructions typo (#28949)
See #28793, the name of the field is actually `systemInstruction` not
`systemInstructions`.
Release Notes:
- Fixed an issue where Gemini requests would fail
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
gcp-cherry-pick-bot[bot]
and
Bennet Bo Fenner
created
718e0a9
Fix panic when diagnostics first opens (cherry-pick #28935) (#28939)
Click to expand commit body
Cherry-picked Fix panic when diagnostics first opens (#28935)
Closes #ISSUE
Release Notes:
- N/A
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
The UI was mistakenly using the cumulative token usage for the token
counter. It will now display the last request token count, plus an
estimation of the tokens in the message editor and context entries that
haven't been sent yet.
https://github.com/user-attachments/assets/0438c501-b850-4397-9135-57214ca3c07a
Additionally, when the user edits a message, we'll display the actual
token count up to it and estimate the tokens in the new message.
Note: We don't currently estimate the delta when switching profiles. In
the future, we want to use the count tokens API to measure every part of
the request and display a breakdown.
Release Notes:
- agent: Made the token count more accurate and added back estimation of
used tokens as you type and add context.
---------
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Agus Zubiaga
,
Bennet Bo Fenner
, and
Danilo Leal
created
07a0d91
agent: Add git commit ID to the eval telemetry data (#28895)
Click to expand commit body
Release Notes:
- N/A
Thomas Mickley-Doyle
created
88ddd7b
agent: Allow quoting selection when text thread is active (#28887)
Click to expand commit body
This makes the `assistant: Quote selection` work again for text threads.
Next up is supporting this also in normal threads.
Release Notes:
- agent: Add support for inserting selections (assistant: Quote
selection) into text threads
Release Notes:
- Preview: Removed the layout button from the title bar. The
`bottom_dock_layout` setting still functions.
- Added a setting, `bottom_dock_layout`, for controlling the
relationship between the bottom dock and the left and right docks.
Mikayla Maki
created
c2ff375
agent: Improve fuzzy matching for @mentions (#28883)
Click to expand commit body
Make fuzzy search in @-mention match paths and context kinds as well
(e.g., typing "sym" should let me select the "Symbols" label, as opposed
to just paths)
Release Notes:
- agent: Improve fuzzy-matching when using @mentions
Bennet Bo Fenner
created
1a81946
agent: Add item to open Prompt Library in the panel's menu (#28877)
Click to expand commit body
Release Notes:
- agent: Added a menu item to open the Prompt Library from the panel's
dropdown menu on the top right.
Staff only for now. We'll work on making this usable for non zed.dev
users later
Release Notes:
- N/A
---------
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Bennet Bo Fenner
,
Antonio Scandurra
,
Danilo Leal
, and
Marshall Bowers
created
Some small adjustments to simplify the agent panel's design.
Release Notes:
- N/A
Danilo Leal
created
19b7c1a
Fix more panics when removing excerpts (cherry-pick #28836) (#28873)
Click to expand commit body
Cherry-picked Fix more panics when removing excerpts (#28836)
Release Notes:
- Fixed a panic when an excerpt removed has an edit suggestion inlay in
it
---------
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
,
Kirill Bulatov
, and
Conrad Irwin
created
9f8320f
agent: Show an error when the model requests limit has been reached (#28868)
Click to expand commit body
This PR adds an error message when the model requests limit has been
hit.
Release Notes:
- N/A
Co-authored-by: Oleksiy Syvokon <oleksiy.syvokon@gmail.com>