Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24536 commits 1103 branches 1111 tags 398 MiB
Commit graph

78 commits

Author SHA1 Message Date
Danilo Leal
e338a177c5
assistant2: Adjust "generating" state design (#23299) 
To ensure message readability is not affected in any way.


https://github.com/user-attachments/assets/9a2ad949-1a8a-4c31-ad3c-db70f48e5d98

Release Notes:

- N/A
 2025-01-17 20:22:27 -03:00
Agus Zubiaga
938e28f871
assistant2: Thread history keyboard navigation (#23145) 
Open and delete threads via keyboard:


https://github.com/user-attachments/assets/79b402ad-a49d-4c52-9d46-28a7bf32ff1f



Note: this doesn't include navigation in the "recent threads" section of
the empty state

Release Notes:

- N/A
 2025-01-17 18:41:17 -03:00
Marshall Bowers
e215ca1d99
Dedupe AssistantSettings (#23190) 
This PR dedupes the `AssistantSettings` so we can use the same settings
for both Assistant1 and Assistant2.

We originally forked them so we could change the Assistant2 settings
freely, but given our rollout strategy for the new Assistant, I don't
think that makes sense.

This also fixes the issue where the JSON language server would show a
"Matches multiple schemas when only one must validate" warning in
`settings.json`.

Closes #23171.

Release Notes:

- Fixed the "Matches multiple schemas when only one must validate"
warning for the `assistant` setting.
 2025-01-15 18:52:54 +00:00
Agus Zubiaga
de5f023477
assistant2: Cancel generation button (#23137) 
Turns the "esc to cancel" label into a button so it can be dispatched
via click or keyboard. The keybinding isn't hardcoded anymore.

![CleanShot 2025-01-14 at 13 44
22@2x](https://github.com/user-attachments/assets/a947f58b-7de2-400b-b95a-384b78c79697)


Release Notes:

- N/A
 2025-01-14 19:22:48 +00:00
Marshall Bowers
c1c767a5bd
assistant2: Make Esc cancel current completion (#23076) 
This PR makes it so pressing `Esc` in Assistant2 will cancel the current
completion.

Release Notes:

- N/A
 2025-01-13 19:09:27 +00:00
Marshall Bowers
80cc1f174f
assistant2: Hide the status bar icon when disabled via the settings (#22981) 
This PR makes it so the status bar icon for Assistant2 is hidden when it
is disabled via the settings.

Release Notes:

- N/A
 2025-01-10 19:44:57 +00:00
Agus Zubiaga
a267911e83
assistant2: Suggest recent files and threads as context (#22959) 
The context picker will now display up to 6 recent files/threads to add
as a context:

<img
src="https://github.com/user-attachments/assets/80c87bf9-70ad-4e81-ba24-7a624378b991"
width=400>



Note: We decided to use a `ContextMenu` instead of `Picker` for the
initial one since the latter didn't quite fit the design for the
"Recent" section.

Release Notes:

- N/A

---------

Co-authored-by: Danilo <danilo@zed.dev>
Co-authored-by: Piotr <piotr@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
 2025-01-10 14:26:53 +00:00
Danilo Leal
6af9e8ded8
assistant2: Fix toolbar layout shift (#22770) 
Note how, previously, switching between the thread view and the history
caused a slightly reduction of the toolbar height. Super subtle stuff,
but doesn't happen anymore.

### Before


https://github.com/user-attachments/assets/712ff34e-a638-484d-8415-16011b10ae63

### After


https://github.com/user-attachments/assets/7ccff7a3-45a4-445c-9638-8445733e0ffc

Release Notes:

- N/A
 2025-01-07 16:04:54 +00:00
Danilo Leal
c74e5f5de2
assistant2: Render placeholder thread title until summary is generated (#22723) 
This PR ensures we render a "New Thread" placeholder title until a
message has been sent, and thus, a summary is generated.


https://github.com/user-attachments/assets/1c30e0ff-baaa-44ad-a1a2-42f1ce9fe0b0

Release Notes:

- N/A
 2025-01-06 18:53:38 +00:00
Agus Zubiaga
374c298bd5
assistant2: Suggest current thread in inline assistant (#22586) 
Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.com>
 2025-01-02 20:36:57 +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
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
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
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
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
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
Marshall Bowers
52c0d712a6
assistant2: Add initial support for attaching file context (#21934) 
This PR adds the initial support for attaching files as context to a
thread in Assistant2.

Release Notes:

- N/A
 2024-12-12 15:30:17 -05:00
Marshall Bowers
c80ea60860
assistant2: Update to match latest designs (#21818) 
This PR updates the Assistant2 panel to match the latest designs.

<img width="1159" alt="Screenshot 2024-12-10 at 11 49 14 AM"
src="https://github.com/user-attachments/assets/53739709-e7b9-4e35-8a5d-97b6560623ed">

Release Notes:

- N/A
 2024-12-10 12:05:30 -05:00
Marshall Bowers
c8b3c4c6cd
assistant2: Add ability to delete past threads (#21607) 
This PR adds the ability to delete past threads in Assistant2.

Release Notes:

- N/A
 2024-12-05 15:57:35 -05:00
Marshall Bowers
787c75cbda
assistant2: Add thread history (#21599) 
This PR adds support for thread history to the Assistant 2 panel.

We also now generate summaries for the threads.

<img width="986" alt="Screenshot 2024-12-05 at 12 56 53 PM"
src="https://github.com/user-attachments/assets/46cb1309-38a2-4ab9-9fcc-c1275d4b5f2c">

<img width="986" alt="Screenshot 2024-12-05 at 12 56 58 PM"
src="https://github.com/user-attachments/assets/8c91ba57-a6c5-4b88-be05-b22fb615ece5">

Release Notes:

- N/A

---------

Co-authored-by: Piotr <piotr@zed.dev>
 2024-12-05 13:22:25 -05:00
Marshall Bowers
a30ea2fc68
assistant2: Factor out ActiveThread view (#21555) 
This PR factors a new `ActiveThread` view out of the `AssistantPanel` to
group together the state that pertains solely to the active view.

There was a bunch of related state on the `AssistantPanel` pertaining to
the active thread that needed to be initialized/reset together and it
makes for a clearer narrative is this state is encapsulated in its own
view.

Release Notes:

- N/A
 2024-12-04 16:39:39 -05:00
Marshall Bowers
0bde0f8e2f
assistant2: Add ability to open past threads (#21548) 
This PR adds the ability to open past threads in Assistant 2.

There are also some mocked threads in the history for testing purposes.

Release Notes:

- N/A
 2024-12-04 14:35:44 -05:00
Marshall Bowers
7cfc972df6
assistant2: Add empty state for new threads (#21542) 
This PR adds an empty state for new threads in Assistant2:

<img width="1138" alt="Screenshot 2024-12-04 at 12 17 46 PM"
src="https://github.com/user-attachments/assets/ff7b4533-d3b8-4722-bd4b-43fac6d35a77">

This is mostly just a sketch in its current state.

Release Notes:

- N/A
 2024-12-04 12:44:03 -05:00
Marshall Bowers
207eb51df1
assistant2: Style inline code in Markdown (#21536) 
This PR adds some styling for inline code within the messages to
differentiate them from the surrounding text:

<img width="1138" alt="Screenshot 2024-12-04 at 10 58 14 AM"
src="https://github.com/user-attachments/assets/3bb92711-e2f7-454a-b4be-449c6a9bf591">


Release Notes:

- N/A
 2024-12-04 11:14:35 -05:00
Marshall Bowers
9f459ba573
assistant2: Render messages as Markdown (#21496) 
This PR updates Assistant 2 to render the messages in the thread as
Markdown:

<img width="1138" alt="Screenshot 2024-12-03 at 6 09 27 PM"
src="https://github.com/user-attachments/assets/c1c44fde-1efb-43cf-b9c9-768e6974c753">

Release Notes:

- N/A
 2024-12-03 18:32:13 -05:00
Marshall Bowers
aca23da971
assistant2: Render messages in the thread using a list (#21491) 
This PR updates the rendering of the messages in the current thread to
use a `gpui::list`.

Release Notes:

- N/A
 2024-12-03 16:25:09 -05:00
Marshall Bowers
f3140f54d8
assistant2: Wire up error messages (#21426) 
This PR wires up the error messages for Assistant 2 so that they are
shown to the user:

<img width="1138" alt="Screenshot 2024-12-02 at 4 28 02 PM"
src="https://github.com/user-attachments/assets/d8a5b9bd-0cef-4304-b561-b2edadbc70ef">
<img width="1138" alt="Screenshot 2024-12-02 at 4 29 09 PM"
src="https://github.com/user-attachments/assets/0dd70841-0d5a-4de6-bebe-82c563246b65">
<img width="1138" alt="Screenshot 2024-12-02 at 4 32 49 PM"
src="https://github.com/user-attachments/assets/a8838866-fad1-43a9-8935-490dc1936016">

@danilo-leal I kept the existing UX from Assistant 1, as I didn't see
any errors in the design prototype, but we can revisit if another
approach would work better.

Release Notes:

- N/A
 2024-12-02 16:54:46 -05:00
Marshall Bowers
b88daae67b
assistant2: Add support for using tools provided by context servers (#21418) 
This PR adds support to Assistant 2 for using tools provided by context
servers.

As part of this I introduced a new `ThreadStore`.

Release Notes:

- N/A

---------

Co-authored-by: Cole <cole@zed.dev>
 2024-12-02 15:01:18 -05:00
Marshall Bowers
968ffaa3fd
assistant2: Restructure storage of tool uses and results (#21194) 
This PR restructures the storage of the tool uses and results in
`assistant2` so that they don't live on the individual messages.

It also introduces a `LanguageModelToolUseId` newtype for better type
safety.

Release Notes:

- N/A
 2024-11-25 21:53:27 -05:00
Marshall Bowers
7e418cc8af
assistant2: Style messages (#21191) 
This PR styles the messages in `assistant2` so they don't look quite as
rough:

<img width="1138" alt="Screenshot 2024-11-25 at 8 36 32 PM"
src="https://github.com/user-attachments/assets/9cc423fa-feff-4c69-9d2b-d28970559547">

Release Notes:

- N/A
 2024-11-25 20:49:03 -05:00
Marshall Bowers
f059b6a24b
assistant2: Add support for using tools (#21190) 
This PR adds rudimentary support for using tools to `assistant2`. There
are currently no visual affordances for tool use.

This is gated behind the `assistant-tool-use` feature flag.

<img width="1079" alt="Screenshot 2024-11-25 at 7 21 31 PM"
src="https://github.com/user-attachments/assets/64d6ca29-c592-4474-8e9d-c344f855bc63">

Release Notes:

- N/A
 2024-11-25 19:44:34 -05:00
Marshall Bowers
321fd19763
assistant2: Wire up assistant2::NewThread action (#21187) 
This PR wires up the `assistant2::NewThread` action so that you can
create new threads.

Release Notes:

- N/A
 2024-11-25 17:24:25 -05:00
Marshall Bowers
2b9250843c
assistant2: Include previous messages in the thread in the completion request (#21184) 
This PR makes it so previous messages in the thread are included when
constructing the completion request, instead of only sending up the most
recent user message.

Release Notes:

- N/A
 2024-11-25 16:51:32 -05:00
Marshall Bowers
e7b0047562
assistant2: Remove unnecessary Pane (#21183) 
This PR removes an unnecessary `Pane` that was copied over from
`assistant::AssistantPanel` to `assistant2::AssistantPanel`.

Release Notes:

- N/A
 2024-11-25 16:28:38 -05:00
Marshall Bowers
9ee1aba80a
assistant2: Stream in completion text (#21182) 
This PR makes it so that the completion text streams into the message
list rather than being buffered until the end.

Release Notes:

- N/A
 2024-11-25 16:13:27 -05:00
Marshall Bowers
a02684b2f7
assistant2: Add rudimentary chat functionality (#21178) 
This PR adds in rudimentary functionality for sending messages to the
LLM in `assistant2`.

<img width="1079" alt="Screenshot 2024-11-25 at 1 49 11 PM"
src="https://github.com/user-attachments/assets/5accb749-c034-4fb2-bf55-3ae5bc9529ad">

Release Notes:

- N/A
 2024-11-25 14:08:40 -05:00
Nathan Sobo
08b214dfb9
Rename 'chat' to 'thread' in assistant2 (#21141) 
Release Notes:

- N/A
 2024-11-25 07:27:35 -05:00
Marshall Bowers
628b96f297
assistant2: Sketch in chat editor (#21116) 
This PR sketches in the chat editor for `assistant2`.

<img width="1136" alt="Screenshot 2024-11-23 at 1 56 23 PM"
src="https://github.com/user-attachments/assets/6e979995-c0cf-4a46-8694-fc4a8646336f">

Release Notes:

- N/A
 2024-11-23 14:09:15 -05:00
Marshall Bowers
2a23db6e05
assistant2: Sketch in toolbar (#21114) 
This PR sketches in the toolbar for `assistant2`.

<img width="1136" alt="Screenshot 2024-11-23 at 12 39 49 PM"
src="https://github.com/user-attachments/assets/ed56fc36-54c8-48d4-8446-6c1f182fcef2">

Release Notes:

- N/A
 2024-11-23 12:46:11 -05:00
Marshall Bowers
9adc3b4e82
Break ground on assistant2 (#21109) 
This PR breaks ground on a new `assistant2` crate.

In order to see this new version of the assistant, both of the following
must be true:
1. The `assistant2` feature flag is enabled for your user
   - It is **not** currently enabled for all staff.
2. You are running a development build of Zed

The intent here is to enable the folks working on `assistant2` to
incrementally land work onto `main` without breaking use of the current
Assistant for anyone.

<img width="1136" alt="Screenshot 2024-11-23 at 10 46 08 AM"
src="https://github.com/user-attachments/assets/5723a13f-5be1-4486-9460-ead7329ba78e">

Release Notes:

- N/A
 2024-11-23 11:24:52 -05:00
Max Brunsfeld
ecbd115542 Remove 2 suffix for assistant, journal 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:14:01 -08:00
Piotr Osiewicz
406edd279a Merge branch 'main' into refine-render-traits 2024-01-03 12:27:42 +01:00
Julia
14066c4f0e Add icon_tooltip for panel buttons rather than using persistent name 2024-01-02 17:56:19 -05:00
Nathan Sobo
1b5c8b2b4a Return impl IntoElement from Render::render trait 2024-01-02 10:09:05 -07:00
Nathan Sobo
db1cf8f6e1 Rename build_view to new_view and build_model to new_model 
The word "new" is shorter and blends in with `new` constructors that are common
in Rust. Been meaning to do this for a while.
 2024-01-01 17:42:01 -07:00
Nathan Sobo
51d1d92d66 Attempt to return impl Element from render. 3 errors. 2024-01-01 14:23:02 +01:00