oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,284 Commits 1 Branch 0 Tags
7e39023ea5e71e7a54bfd66e869f9c66071b3ff3
Commit Graph
24 Commits
Author SHA1 Message Date
Marshall Bowers 7e39023ea5 assistant2: Push logic for adding thread context down into the ContextStore (#22855) 
This PR takes the logic for adding thread context out of the
`ThreadContextPicker` and pushes it down into the `ContextStore`.

Release Notes:

- N/A
 2025-01-08 19:54:54 +00:00
Marshall Bowers 69dde8e31d assistant2: Push logic for adding directory context down into the ContextStore (#22852) 
This PR takes the logic for adding file context out of the
`DirectoryContextPicker` and pushes it down into the `ContextStore`.

Release Notes:

- N/A
 2025-01-08 18:43:44 +00:00
Marshall Bowers 86f5bb1cc0 assistant2: Push logic for adding file context down into the ContextStore (#22846) 
This PR takes the logic for adding file context out of the
`FileContextPicker` and pushes it down into the `ContextStore`.

Release Notes:

- N/A
 2025-01-08 17:46:49 +00:00
Agus ZubiagaandDanilo 36301442dd assistant2: Handle non-text files in context pickers (#22795) 
We'll now show an error message if the user tries to add a directory
that contains no text files or when they try to add a single non-text
file.

Release Notes:

- N/A

---------

Co-authored-by: Danilo <danilo@zed.dev>
 2025-01-08 14:06:29 +00:00
Marshall Bowers c53615ff61 assistant2: Add intermediate bindings to improve conditional readability (#22790) 
This PR adds some intermediate bindings to the checks for if a
file/directory is already included to make the conditional a bit
clearer.

It wasn't immediately obvious what the boolean values corresponded to
when looking at it.

Release Notes:

- N/A
 2025-01-07 19:42:38 +00:00
Danilo Leal f439ee0d55 assistant2: Add check icon for included context (#22774) 
Quick follow-up to: https://github.com/zed-industries/zed/pull/22712 —
just to make it more visually easier to understand.

<img width="800" alt="Screenshot 2025-01-07 at 11 48 06 AM"
src="https://github.com/user-attachments/assets/92f0523b-eb85-4929-a825-2e1e524b3ad7"
/>

Release Notes:

- N/A
 2025-01-07 16:03:05 +00:00
Agus Zubiaga 3a061a91e7 assistant2: Do not allow a context entry to be added multiple times (#22712) 
https://github.com/user-attachments/assets/81674c88-031b-4d55-b362-43819492b93d


Release Notes:

- N/A
 2025-01-06 18:55:20 +00:00
Agus ZubiagaandMarshall 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
Marshall BowersandAgus 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) 
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
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
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 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
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
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
Marshall BowersandMax 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 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 BowersRichardAgus
 		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
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
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
Marshall Bowers c57cc35b03 assistant2: Add ability to fetch URLs as context (#21988) 
This PR adds the ability to fetch URLs as context in Assistant2.

In the picker we use the search area as an input for the user to enter
the URL they wish to fetch:

<img width="1159" alt="Screenshot 2024-12-13 at 2 45 41 PM"
src="https://github.com/user-attachments/assets/b3b20648-2c22-4509-b592-d0291d25b202"
/>

<img width="1159" alt="Screenshot 2024-12-13 at 2 45 47 PM"
src="https://github.com/user-attachments/assets/7e6bab2d-2731-467f-9781-130c6e4ea5cf"
/>

Release Notes:

- N/A
 2024-12-13 15:03:55 -05:00
Nate Butler 19d6e067af Toggle & Switch (#21979) 
![CleanShot 2024-12-13 at 11 27
39@2x](https://github.com/user-attachments/assets/7c7828c0-c5c7-4dc6-931e-722366d4f15a)

- Adds the Switch component
- Updates `Selected`, `Selectable` -> `ToggleState`, `Toggleable`
- Adds `checkbox` and `switch` functions to align better with other
elements in our layout system.

We decided not to merge Switch and Checkbox. However, in a followup I'll
introduce a Toggle or AnyToggle enum so we can update
`CheckboxWithLabel` -> `ToggleWithLabel` as this component will work
exactly the same with either a Checkbox or a Switch.

Release Notes:

- N/A
 2024-12-13 14:23:02 -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