mixa/zed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,323 Commits 1,059 Branches 1,250 Tags
c74fc0bf43c79c52cb8560fc3172ec241c0bdaef
Commit Graph

29323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agus Zubiaga
c74fc0bf43 Merge branch 'acp' of github.com:zed-industries/zed into acp 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2025-07-03 13:01:24 -03:00
Agus Zubiaga
5cba826395 Properly cancel requests 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2025-07-03 12:59:43 -03:00
Nathan Sobo
ab8c9b7edc Coalesce acp thinking chunks and improve thinking styling 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-03 09:38:05 -06:00
Nathan Sobo
fb1b761021 Render thinking blocks 
For now, we style them the same as messages. Next up we'll improve the
styling.

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-03 09:22:30 -06:00
Ben Brandt
733e5dd8f2 Add path to the top of the diff 2025-07-03 14:34:33 +02:00
Ben Brandt
fdc365ecf1 Fix clippy lints 2025-07-03 12:16:29 +02:00
Ben Brandt
0770ae2612 ToolCallContent is always available on the ToolCall 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2025-07-03 11:50:30 +02:00
Ben Brandt
a1ad858fb6 Initialize Gemini CLI in tests 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2025-07-03 10:53:10 +02:00
Ben Brandt
ea197d4e6d Remove unused ACP methods 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2025-07-03 10:42:10 +02:00
Ben Brandt
1ab78a7544 Send size for entry as well 2025-07-03 10:07:29 +02:00
Agus Zubiaga
df3d956e63 Only show hunk ranges 2025-07-02 21:16:26 -03:00
Mikayla Maki
4e3f66c5c2 Merge commit 'd6c76d8d33' into acp 2025-07-02 16:53:14 -07:00
Mikayla Maki
d6c76d8d33 Resolve merge conflicts 2025-07-02 16:52:41 -07:00
Agus Zubiaga
f1613afb22 Render confirmation diffs and description as markdown 2025-07-02 19:56:18 -03:00
Conrad Irwin
405f7cf64f Hack in authentication 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2025-07-02 16:49:37 -06:00
Conrad Irwin
73ac553316 Show errors from ACP when requests error 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2025-07-02 16:48:22 -06:00
Agus Zubiaga
136423da94 Remove some todo! 2025-07-02 18:43:17 -03:00
Agus Zubiaga
28baedd935 Show tool output diffs 2025-07-02 18:39:43 -03:00
Conrad Irwin
756358b9c7 Handle loading outside of a project 2025-07-02 14:16:27 -06:00
Conrad Irwin
54040188bb Show a bit of a better error if gemini cli exits 
I considered dumping stderr to the screen, but for now it's useful to
see stderr when developing...
 2025-07-02 14:06:00 -06:00
Agus Zubiaga
4755d6fa9d Display tool icons 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2025-07-02 13:48:57 -03:00
Agus Zubiaga
135143d51b Rename display_name to label 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-02 13:16:30 -03:00
Agus Zubiaga
450604b4a1 Add tool call with confirmation test 2025-07-02 12:13:20 -03:00
Agus Zubiaga
348bc52a3f Merge branch 'acp' of github.com:zed-industries/zed into acp 2025-07-02 11:33:22 -03:00
Agus Zubiaga
d16c595d57 Fix always allow, and update acp confirmation types 2025-07-02 11:31:51 -03:00
Antonio Scandurra
975a7e6f7f Fix clicking on tool confirmation buttons 
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
 2025-07-02 14:54:24 +02:00
Antonio Scandurra
7d2f7cb70e Replace title with display_name for tool calls 
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
 2025-07-02 14:40:16 +02:00
Ben Brandt
5f9afdf7ba Add buttons for more outcomes and handle tools that don't need 
authorization

Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2025-07-02 12:56:03 +02:00
Ben Brandt
7a3105b0c6 Wire up push_tool_call 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2025-07-02 12:03:35 +02:00
Ben Brandt
ab0b16939d Update tool call confirmation 2025-07-02 11:32:03 +02:00
Agus Zubiaga
28d992487d Better temporary title 2025-07-02 00:58:05 -03:00
Agus Zubiaga
fde15a5a68 Update tool calls via ACP 2025-07-02 00:47:28 -03:00
Agus Zubiaga
780db30e0b Handle waiting for tool confirmation in UI 2025-07-01 23:48:09 -03:00
Agus Zubiaga
7c992adfe1 Improve spacing even more 2025-07-01 23:35:29 -03:00
Agus Zubiaga
825aecfd28 Fix spacing and list scrolling 2025-07-01 23:27:12 -03:00
Agus Zubiaga
f2f32fb3bd Proper allow/reject UI 2025-07-01 23:13:56 -03:00
Agus Zubiaga
d9fd8d5eee Improve spacing 2025-07-01 21:50:14 -03:00
Agus Zubiaga
8137b3318f Remove ReadFile entry and test tool call 2025-07-01 21:37:31 -03:00
Agus Zubiaga
3ceeefe460 Tool authorization 2025-07-01 20:32:21 -03:00
Agus Zubiaga
6f768aefa2 Copy 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-01 17:15:57 -03:00
Agus Zubiaga
28ac84ed01 Jump to gemini thread view immediately 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-01 17:15:20 -03:00
Agus Zubiaga
4d803fa628 message markdown 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-01 16:57:22 -03:00
Agus Zubiaga
17b2dd9a93 Update list incrementally 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-07-01 16:13:16 -03:00
Mikayla Maki
7abf635e20 Use a list to render items 
Co-authored-by: Agus Zubiaga <agus@zed.dev>
 2025-07-01 11:48:03 -07:00
Antonio Scandurra
92adcb6e63 WIP 2025-07-01 19:01:02 +02:00
Antonio Scandurra
5ed001e0df Merge remote-tracking branch 'origin/main' into agent2 
# Conflicts:
#	Cargo.lock
 2025-07-01 18:30:08 +02:00
Antonio Scandurra
f12fffd1ba WIP 2025-07-01 18:23:21 +02:00
Julia Ryan
0068de0386 debugger: Handle the envFile setting for Go (#33666) 
Fixes #32984

Release Notes:

- The Go debugger now respects the `envFile` setting.
 2025-07-01 09:14:59 -07:00
Julia Ryan
a11647d07f ci: Block PRs on Nix build failures (#33688) 
Closes #17458

For now we're being conservative and only running CI on changes to the
following files:
- `flake.{nix,lock}`
- `Cargo.{lock,toml}`
- `nix/*`
- `.cargo/config.toml`
- `rust-toolchain.toml`

Release Notes:

- N/A
 2025-07-01 09:14:25 -07:00
Peter Tripp
274f2e90da Add support for more python operators (#33720) 
Closes: https://github.com/zed-industries/zed/issues/33683

| Before | After |
| - | - |
| <img width="571" alt="Screenshot 2025-07-01 at 11 42 56"
src="https://github.com/user-attachments/assets/5ef79304-37bb-42a1-8891-d19a55a5095e"
/> | <img width="592" alt="Screenshot 2025-07-01 at 11 44 45"
src="https://github.com/user-attachments/assets/f28aa2a8-6306-4294-86e1-8f089f57b825"
/> |

Release Notes:

- python: Properly highlight additional operators ("&=", "<<=", ">>=",
"@=", "^=" and "|=")
 2025-07-01 12:12:46 -04:00