Marshall Bowers
2c2ca9e370
assistant2: Wire up the directory context picker ( #22582 )
...
This PR wires up the functionality of the directory context picker.
Release Notes:
- N/A
---------
Co-authored-by: Agus <agus@zed.dev>
2025-01-02 19:42:59 +00:00
Agus Zubiaga
59b5b9af90
assistant2: Suggest current file as context ( #22526 )
...
CI / check_docs_only (push) Waiting to run
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Build Remote Server (push) Blocked by required conditions
CI / (Windows) Run Clippy and tests (push) Blocked by required conditions
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
CI / Auto release preview (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Docs / Check formatting (push) Waiting to run
Script / ShellCheck Scripts (push) Waiting to run
Suggest adding the current file as context in the new assistant panel.
https://github.com/user-attachments/assets/62bc267b-3dfe-4a3b-a6af-c89af2c779a8
Note: This doesn't include suggesting the current thread in the inline
assistant.
Release Notes:
- N/A
2025-01-02 13:33:47 +00:00
Danilo Leal
28d1d2d939
assistant2: Add link styles for thread messages ( #22560 )
...
<img width="700" alt="Screenshot 2025-01-02 at 1 52 30 AM"
src="https://github.com/user-attachments/assets/8d2308c8-cdea-421f-b9ff-7893479dba3c "
/>
Release Notes:
- N/A
2025-01-02 05:09:33 +00:00
Cole Miller
dcbff982ad
Decide which panel should be active for a dock based on ordering panels ( #22346 )
...
This means that `workspace::ToggleRightDock` will open the assistant if
no right-dock panel has been manually activated, instead of the chat as
before. Also cleans up the `active_panel_index` logic a bit.
cc @nathansobo
Release Notes:
- Make `workspace::ToggleRightDock` open the assistant panel if no
right-dock panel has yet been activated
2024-12-30 14:43:17 +00:00
Michael Sloan
9815358bdd
Dequalify WindowContext and AsyncWindowContext identifiers ( #22444 )
...
This makes a WIP automated refactoring a bit easier to write
Release Notes:
- N/A
2024-12-28 21:21:32 +00:00
Danilo Leal
34f8bb246a
assistant2: Scroll to the bottom when you submit a new message ( #22451 )
...
Up until now, in the assistant 2, if you scrolled up either while a
message was being generated or after it's been generated, then submitted
a new message, you'd keep your scroll position. Now, with this PR, if
your scroll position is somewhere else that's not the bottom, as you
submit a new message, you'll be back at the bottom.
https://github.com/user-attachments/assets/8b111c10-27ff-4d7b-9b10-4c31093c6457
Release Notes:
- N/A
Co-authored-by: Agus Zubiaga <hi@aguz.me>
2024-12-27 16:54:35 +00:00
Danilo Leal
56b425fced
assistant2: Show the popover keybinding when context is empty ( #22452 )
...
This PR makes it so we always show the "Add Context {keybinding}" text
when there's no context pills attached. Also, while we haven't fully
implemented the mention system (triggered by typing `@`), we removed the
instruction on the message editor placeholder. Once that's fully in
place, we should return with it!
<img width="800" alt="Screenshot 2024-12-27 at 1 35 56 PM"
src="https://github.com/user-attachments/assets/201cf784-e7ac-420a-adf2-51b6e075c2b6 "
/>
Release Notes:
- N/A
---------
Co-authored-by: Agus Zubiaga <hi@aguz.me>
2024-12-27 16:54:31 +00:00
Marshall Bowers
4c84600630
assistant2: Derive the Context icon at render time instead of storing ( #22397 )
...
CI / check_docs_only (push) Waiting to run
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Build Remote Server (push) Blocked by required conditions
CI / (Windows) Run Clippy and tests (push) Blocked by required conditions
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
CI / Auto release preview (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Docs / Check formatting (push) Waiting to run
Script / ShellCheck Scripts (push) Waiting to run
This PR is a follow up to #22385 that makes it so we treat the icon as
derived state.
Release Notes:
- N/A
2024-12-24 16:13:35 +00:00
Danilo Leal
564936e1fe
assistant2: Add stray visual adjusments ( #22386 )
...
CI / check_docs_only (push) Waiting to run
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Build Remote Server (push) Blocked by required conditions
CI / (Windows) Run Clippy and tests (push) Blocked by required conditions
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
CI / Auto release preview (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Docs / Check formatting (push) Waiting to run
Script / ShellCheck Scripts (push) Waiting to run
This PR adds just some tiny visual clean ups to the assistant2 panel.
Nothing major, honestly.
<img width="800" alt="Screenshot 2024-12-24 at 12 19 46 AM"
src="https://github.com/user-attachments/assets/da22aa7f-8a42-4ff0-9e4c-5e8b60b28802 "
/>
Release Notes:
- N/A
2024-12-24 04:26:13 +00:00
Danilo Leal
3d4e0780c4
assistant2: Add icons to the context pill ( #22385 )
...
This PR adds an icon field to the `ContextKind` enum, which means that
icons will now display on context pills, both on the message editor and
on the active thread.
<img width="800" alt="Screenshot 2024-12-24 at 12 23 17 AM"
src="https://github.com/user-attachments/assets/f00e540b-30fe-49ac-b3df-7c7a5dc86d65 "
/>
Release Notes:
- N/A
2024-12-24 04:26:09 +00:00
Danilo Leal
44a46e3713
assistant2: Don't render the context space if there's none ( #22383 )
...
Note the extra bottom space on the before version. That was because,
previously, the container that holds the context pills in an active
thread was being rendered even if there was no attached context.
| Before | After |
|--------|--------|
| <img width="1577" alt="Screenshot 2024-12-23 at 8 42 00 PM"
src="https://github.com/user-attachments/assets/b74bdc67-0a08-4d59-b1ec-43a00a59a373 "
/> | <img width="1577" alt="Screenshot 2024-12-23 at 8 39 00 PM"
src="https://github.com/user-attachments/assets/1cbc340d-19df-4cce-8c0b-b671703a0ff5 "
/> |
Release Notes:
- N/A
2024-12-24 04:26:04 +00:00
Danilo Leal
7595d36943
assistant2: Refine buffer inline assistant styles ( #22377 )
...
A lot of spacing tweaks. But, most notably, using the buffer font for
the inline assistant.
<img width="800" alt="Screenshot 2024-12-23 at 12 46 16 PM"
src="https://github.com/user-attachments/assets/ee2908a7-7515-4244-83fc-791172b29364 "
/>
Release Notes:
- N/A
2024-12-23 21:29:39 +00:00
Danilo Leal
d25c2ff866
assistant2: Improve markdown rendering design ( #22321 )
...
This PR visually balances code blocks within thread messages a bit more.
<img width="800" alt="Screenshot 2024-12-23 at 11 26 14 AM"
src="https://github.com/user-attachments/assets/6d459aac-5d94-4021-8289-0125bc82e77c "
/>
Release Notes:
- N/A
2024-12-23 18:18:20 +00:00
Marshall Bowers
1449377278
assistant2: Fix panics when confirming nonexistent entries in the context picker ( #22332 )
...
This PR fixes a panic that could occur when confirming when the context
picker had no matching entries.
Release Notes:
- N/A
2024-12-21 16:11:29 +00:00
Danilo Leal
e82af55d64
assistant2: Adjust role info colors on the thread header ( #22318 )
...
CI / check_docs_only (push) Waiting to run
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Run Clippy and tests (push) Blocked by required conditions
CI / (Linux) Build Remote Server (push) Blocked by required conditions
CI / (Windows) Run Clippy and tests (push) Blocked by required conditions
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
CI / Auto release preview (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Docs / Check formatting (push) Waiting to run
Script / ShellCheck Scripts (push) Waiting to run
<img width="800" alt="Screenshot 2024-12-20 at 9 01 29 PM"
src="https://github.com/user-attachments/assets/5e9e9bf2-c84e-4215-b658-9b668dd151b2 "
/>
Release Notes:
- N/A
2024-12-21 00:19:50 +00:00
Danilo Leal
dcd21e6f23
assistant2: Use SwitchWithLabel for the tool toggle ( #22317 )
...
<img width="800" alt="Screenshot 2024-12-20 at 8 52 27 PM"
src="https://github.com/user-attachments/assets/4b4f62a3-eb23-489b-a459-2117baaa37b4 "
/>
Release Notes:
- N/A
2024-12-21 00:15:47 +00:00
Danilo Leal
9efa13116d
assistant2: Use a label to render the thread menu item ( #22316 )
...
The thread menu items were rendering with a larger font that the file &
directory counterparts. Now, they're consistent!
| Before | After | Reference |
|--------|--------|--------|
| <img width="800" alt="Screenshot 2024-12-20 at 8 39 47 PM"
src="https://github.com/user-attachments/assets/d196adcb-aea6-4399-8fb1-f5b771e76c1f "
/> | <img width="800" alt="Screenshot 2024-12-20 at 8 35 43 PM"
src="https://github.com/user-attachments/assets/a1e22c13-fd7e-4665-b09b-f3b583e7ce24 "
/> | <img width="800" alt="Screenshot 2024-12-20 at 8 40 38 PM"
src="https://github.com/user-attachments/assets/d509ac6f-1251-4240-a369-906faebed8c0 "
/> |
Release Notes:
- N/A
2024-12-20 23:53:51 +00:00
Richard Feldman
4ed0e5160f
Inline assistant v2 layout ( #22305 )
...
Makes the inline assistant look like @danilo-leal's prototype.
Also fixes the bug with indent guides that @maxdeviant found!
<img width="1059" alt="Screenshot 2024-12-20 at 4 24 56 PM"
src="https://github.com/user-attachments/assets/5e55a3c2-768a-4e9d-bad5-d4ebbe9db9ce "
/>
Release Notes:
- N/A
2024-12-20 22:00:52 +00:00
Marshall Bowers
7913b6a5a2
assistant2: Restrict directory context picker to development builds ( #22302 )
...
This PR temporarily restricts the directory context picker to
development builds until the implementation is finished.
Release Notes:
- N/A
2024-12-20 19:08:29 +00:00
Marshall Bowers
d566792ae1
assistant2: List directories in directory context picker ( #22300 )
...
This PR updates the directory context picker in Assistant2 to show the
available directories.
Release Notes:
- N/A
2024-12-20 18:42:36 +00:00
Agus Zubiaga
56d20fc0a3
Reuse prompt editor across buffer and terminal assist ( #22188 )
...
Builds on https://github.com/zed-industries/zed/pull/22160 and extracts
the rest of `PromptEditor` so it can be shared across terminal and
inline assistants. This will help avoid the UI drifting as we have
already observed.
Note: This is mostly a mechanical refactor. I imagine some things could
be factored in a better way by someone with more context, but I think
this is a good start.
Release Notes:
- N/A
---------
Co-authored-by: Richard Feldman <oss@rtfeldman.com>
2024-12-18 16:12:54 -05:00
Marshall Bowers
fc00eaa161
assistant2: Reduce message editor's maximum height ( #22205 )
...
This PR reduces the message editor's maximum height to 10 lines, after
which point it will scroll.
Release Notes:
- N/A
2024-12-18 16:11:31 -05:00
Marshall Bowers
8b2afab0d3
assistant2: Wire up basic @-mention interaction for context ( #22197 )
...
This PR adds an initial version of using `@` in the message editor to
add context to the thread.
We don't yet insert any sort of reference to it in the message body
itself.
Release Notes:
- N/A
2024-12-18 13:29:39 -05:00
Richard Feldman
4bfc107e3a
Fix inconsistencies in "Transform" vs "Generate" tooltips for assistant v2 ( #22160 )
...
Also makes the inline assistant and inline terminal assistant share a
bunch more code.
Release Notes:
- N/A
---------
Co-authored-by: Agus <agus@zed.dev>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
2024-12-18 07:10:55 -05:00
Marshall Bowers
6aad616165
assistant2: Fix focus issues with opening history ( #22169 )
...
This PR fixes some focus issues with opening the thread history, which
required that the Assistant2 panel be focused in order for the history
to open.
Release Notes:
- N/A
2024-12-17 18:07:28 -05:00
Marshall Bowers
918866b7de
assistant2: Allow creating a new thread via the command palette ( #22168 )
...
This PR allows a new thread to be created via the command palette when
the Assistant2 panel is not focused.
Release Notes:
- N/A
2024-12-17 17:51:47 -05:00
Danilo Leal
ce97e4ddc1
assistant2: Add temporary icon for the status bar item ( #22156 )
...
This is temporary and should be removed whenever we fully transition to
Assistant 2.
<img width="800" alt="Screenshot 2024-12-17 at 16 50 48"
src="https://github.com/user-attachments/assets/61137993-ec2c-4754-9f9a-7559d1b21d89 "
/>
Release Notes:
- N/A
2024-12-17 16:57:47 -05:00
Marshall Bowers
63d8a43f9d
assistant2: Fix file context picker ( #22163 )
...
This PR fixes an issue with the Assistant2 file context picker where
files weren't being attached properly.
We needed to retrieve the files from the worktree without the worktree
root name in the file path.
Release Notes:
- N/A
---------
Co-authored-by: Max <max@zed.dev>
2024-12-17 16:53:56 -05:00
Marshall Bowers
1c4868979d
Allow the use of both Assistants when in the assistant2 feature flag ( #22150 )
...
This PR makes it so both Assistant panels are visible when in the
`assistant2` feature flag.
This way folks can continue using Assistant1 if Assistant2 isn't meeting
their needs.
Right now they are shown as two different panels shown in the status bar
(although using the same icon), but this is just a temporary state until
we can surface the Assistant1 functionality in Assistant2 somehow.
Note that the inline assist will always use the Assistant2 panel.
Release Notes:
- N/A
2024-12-17 14:23:57 -05:00
Marshall Bowers
b17f2089a2
assistant2: Sketch in directory context picker ( #22148 )
...
This PR sketches in the structure for the directory context picker.
Waiting on implementing the actual behavior until we fix the issues with
the file context picker.
Release Notes:
- N/A
2024-12-17 13:02:46 -05:00
Marshall Bowers
68e3d79847
assistant2: Use ContextKind to match on ContextPicker entries ( #22143 )
...
This PR updates the `ContextPicker` entries to match on the
`ContextKind` instead of using strings.
Release Notes:
- N/A
2024-12-17 11:43:27 -05:00
Marshall Bowers
6fa5a17586
assistant2: Only add context if it is non-empty ( #22141 )
...
This PR fixes an issue where we were attaching empty message content
even if there was no context.
Release Notes:
- N/A
2024-12-17 11:09:10 -05:00
Marshall Bowers
a6b717b97b
assistant2: Add spacing between historical thread entries ( #22140 )
...
This PR adds spacing between entries in the historical threads view:
<img width="1371" alt="Screenshot 2024-12-17 at 10 51 26 AM"
src="https://github.com/user-attachments/assets/f66d69e9-eb59-4c76-b3b5-c4d60190c3cc "
/>
Release Notes:
- N/A
2024-12-17 11:03:09 -05:00
Michael Sloan
fc5a810408
Add Corner to geometry and make names of corner methods consistent ( #22119 )
...
Release Notes:
- N/A
2024-12-16 22:57:15 -07:00
Marshall Bowers
3052fc2565
Use the same InlineAssist action between both assistant and assistant2 ( #22126 )
...
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Waiting to run
CI / (Linux) Run Clippy and tests (push) Waiting to run
CI / (Linux) Build Remote Server (push) Waiting to run
CI / (Windows) Run Clippy and tests (push) Waiting to run
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
CI / Auto release preview (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Docs / Check formatting (push) Waiting to run
Script / ShellCheck Scripts (push) Waiting to run
This PR makes it so `assistant` and `assistant2` both use the same
action for inline assist (`zed_actions::InlineAssist`).
This makes it so the keybindings to deploy the inline assist seamlessly
swap based on the feature flag without needing to rebind them.
One minor caveat: if you're using `assistant2` the action name in the
command palette will be `assistant: inline assist`.
Release Notes:
- N/A
2024-12-16 23:57:07 -05:00
Marshall Bowers
80431e5518
assistant2: Add keybinding to toggle ContextPicker ( #22124 )
...
This PR adds an action and associated keybinding
(<kbd>Cmd+Shift+A</kbd>) to toggle the context picker.
This allows for adding context via the keyboard.
Release Notes:
- N/A
2024-12-16 20:20:32 -05:00
Danilo Leal
28087934d1
assistant2: Add text_ellipsis to the PastThread label ( #22117 )
...
To treat the case for whenever the assistant panel gets small.
<img width="360" alt="Screenshot 2024-12-16 at 20 12 34"
src="https://github.com/user-attachments/assets/5426a5b9-9baf-41e3-a2c6-2f997378c994 "
/>
Release Notes:
- N/A
2024-12-16 21:43:12 -03:00
Marshall Bowers
0ca0433912
assistant2: Add keybinding to toggle LanguageModelSelector ( #22122 )
...
This PR adds a keybinding to toggle the `LanguageModelSelector` in
Assistant2.
Release Notes:
- N/A
2024-12-16 19:19:24 -05:00
Marshall Bowers
ccf2a60039
assistant2: Persist model selector changes ( #22116 )
...
This PR makes the language model selector in the Assistant2 panel
persist the model changes to the settings.
Release Notes:
- N/A
2024-12-16 18:00:40 -05:00
Marshall Bowers
373854be46
assistant2: Uniquely identify remove buttons on ContextPills ( #22115 )
...
This PR ensures that the remove buttons on the `ContextPill`s are
uniquely identified.
Release Notes:
- N/A
2024-12-16 17:57:05 -05:00
Marshall Bowers
1932c04b84
assistant2: Add ability to resize the panel ( #22113 )
...
This PR adds the ability to resize the Assistant2 panel.
Release Notes:
- N/A
2024-12-16 17:35:56 -05:00
Danilo Leal
53c8b48647
assistant2: Add stray visual adjustments ( #22111 )
...
Mostly minor tweaks to make it closer to the prototype. More to come.
| With message | Empty state |
|--------|--------|
| <img width="1420" alt="Screenshot 2024-12-16 at 18 59 40"
src="https://github.com/user-attachments/assets/5df791bf-577a-4f01-9045-80568604099f "
/> | <img width="1420" alt="Screenshot 2024-12-16 at 18 59 33"
src="https://github.com/user-attachments/assets/adbf1673-3040-4b2b-8d65-f8b38a83c1d0 "
/> |
Release Notes:
- N/A
2024-12-16 19:23:42 -03:00
Marshall Bowers
92fb38acb6
assistant2: Wire up context for terminal inline assist ( #22108 )
...
This PR updates up the context picker for the terminal's inline assist.
Release Notes:
- N/A
Co-authored-by: Richard <richard@zed.dev>
Co-authored-by: Agus <agus@zed.dev>
2024-12-16 16:22:16 -05:00
Marshall Bowers
4bf005ef52
assistant2: Wire up context picker with inline assist ( #22106 )
...
This PR wire up the context picker with the inline assist.
UI is not finalized.
Release Notes:
- N/A
---------
Co-authored-by: Richard <richard@zed.dev>
Co-authored-by: Agus <agus@zed.dev>
2024-12-16 15:46:28 -05:00
Danilo Leal
ec741d61ed
assistant2: Adjust thread history list item visuals ( #21998 )
...
Most notably, adding the `outlined` property in the `ListItem`
component.
<img width="800" alt="Screenshot 2024-12-13 at 20 35 39"
src="https://github.com/user-attachments/assets/adac4463-66f9-4b5e-b1c0-93c34f068dc4 "
/>
Release Notes:
- N/A
2024-12-16 16:42:09 -03:00
Marshall Bowers
eff61ee764
assistant2: Remove WeakView<Workspace> optionality for inline assist ( #22099 )
...
This PR removes the optionality for the `WeakView<Workspace>` that we
pass to the inline assist.
This was always `Some` in practice, so it seems we don't need to have it
be an `Option`.
Release Notes:
- N/A
2024-12-16 13:26:11 -05:00
Marshall Bowers
caefdcd7f1
assistant2: Factor out ContextStrip ( #22096 )
...
This PR factors a `ContextStrip` view out of the `MessageEditor` so that
we can use it in other places.
Release Notes:
- N/A
2024-12-16 12:45:01 -05:00
Marshall Bowers
88f7942f11
assistant2: Add support for referencing other threads as context ( #22092 )
...
This PR adds the ability to reference other threads as context:
<img width="1159" alt="Screenshot 2024-12-16 at 11 29 54 AM"
src="https://github.com/user-attachments/assets/bb8a24ff-56d3-4406-ab8c-6657e65d8c70 "
/>
<img width="1159" alt="Screenshot 2024-12-16 at 11 29 35 AM"
src="https://github.com/user-attachments/assets/7a02ebda-a2f5-40e9-9dd4-1bb029cb1c43 "
/>
Release Notes:
- N/A
2024-12-16 11:50:57 -05:00
Michael Sloan
a94afbc062
Switch from Arc/RwLock to Rc/RefCell for CodeContextMenu ( #22035 )
...
`CodeContextMenu` is always accessed on one thread, so only `Rc`s and
`Rc<RefCell<_>>` are needed. There should be tiny performance benefits
from this. The main benefit of this is that when seeing code accessing a
`RwLock` it would be reasonable to wonder whether it will block. The
only potential downside is the potential for panics due to overlapping
borrows of the RefCells. I think this is an acceptable risk because most
errors of this nature will be local or will be caught by clippy via the
check for holding a RefCell reference over an `await`.
Release Notes:
- N/A
2024-12-16 01:50:21 -07:00
Marshall Bowers
901dbedf8d
assistant2: Refine context pickers ( #21996 )
...
This PR adds some visual refinements to the context pickers in
Assistant2.
<img width="1159" alt="Screenshot 2024-12-13 at 5 11 24 PM"
src="https://github.com/user-attachments/assets/f85ce87f-6800-4fc2-8a10-8ec3232d30e9 "
/>
<img width="1159" alt="Screenshot 2024-12-13 at 5 11 31 PM"
src="https://github.com/user-attachments/assets/9b13c76d-cb7c-4441-a855-1ec4de685e0c "
/>
Release Notes:
- N/A
2024-12-13 17:26:10 -05:00
