Commit log

ab8c9b7 Coalesce acp thinking chunks and improve thinking styling

Click to expand commit body 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Nathan Sobo and Conrad Irwin created

fb1b761 Render thinking blocks

Click to expand commit body 
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>

Nathan Sobo and Conrad Irwin created

733e5dd Add path to the top of the diff

Ben Brandt created

fdc365e Fix clippy lints

Ben Brandt created

0770ae2 ToolCallContent is always available on the ToolCall

Click to expand commit body 
Co-authored-by: Antonio Scandurra <me@as-cii.com>

Ben Brandt and Antonio Scandurra created

a1ad858 Initialize Gemini CLI in tests

Click to expand commit body 
Co-authored-by: Antonio Scandurra <me@as-cii.com>

Ben Brandt and Antonio Scandurra created

ea197d4 Remove unused ACP methods

Click to expand commit body 
Co-authored-by: Antonio Scandurra <me@as-cii.com>

Ben Brandt and Antonio Scandurra created

1ab78a7 Send size for entry as well

Ben Brandt created

df3d956 Only show hunk ranges

Agus Zubiaga created

4e3f66c Merge commit 'd6c76d8d33' into acp

Mikayla Maki created

d6c76d8 Resolve merge conflicts

Mikayla Maki created

f1613af Render confirmation diffs and description as markdown

Agus Zubiaga created

405f7cf Hack in authentication

Click to expand commit body 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>

Conrad Irwin and Mikayla Maki created

73ac553 Show errors from ACP when requests error

Click to expand commit body 
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>

Conrad Irwin and Mikayla Maki created

136423d Remove some todo!

Agus Zubiaga created

28baedd Show tool output diffs

Agus Zubiaga created

756358b Handle loading outside of a project

Conrad Irwin created

5404018 Show a bit of a better error if gemini cli exits

Click to expand commit body 
I considered dumping stderr to the screen, but for now it's useful to
see stderr when developing...

Conrad Irwin created

4755d6f Display tool icons

Click to expand commit body 
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>

Agus Zubiaga , Mikayla Maki , Antonio Scandurra , and Nathan Sobo created

135143d Rename display_name to label

Click to expand commit body 
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>

Agus Zubiaga , Antonio Scandurra , Nathan Sobo , and Conrad Irwin created

450604b Add tool call with confirmation test

Agus Zubiaga created

348bc52 Merge branch 'acp' of github.com:zed-industries/zed into acp

Agus Zubiaga created

d16c595 Fix always allow, and update acp confirmation types

Agus Zubiaga created

975a7e6 Fix clicking on tool confirmation buttons

Click to expand commit body 
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

Antonio Scandurra and Ben Brandt created

7d2f7cb Replace title with display_name for tool calls

Click to expand commit body 
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

Antonio Scandurra and Ben Brandt created

5f9afdf Add buttons for more outcomes and handle tools that don't need

Click to expand commit body 
authorization

Co-authored-by: Antonio Scandurra <me@as-cii.com>

Ben Brandt and Antonio Scandurra created

7a3105b Wire up push_tool_call

Click to expand commit body 
Co-authored-by: Antonio Scandurra <me@as-cii.com>

Ben Brandt and Antonio Scandurra created

ab0b169 Update tool call confirmation

Ben Brandt created

28d9924 Better temporary title

Agus Zubiaga created

fde15a5 Update tool calls via ACP

Agus Zubiaga created

780db30 Handle waiting for tool confirmation in UI

Agus Zubiaga created

7c992ad Improve spacing even more

Agus Zubiaga created

825aecf Fix spacing and list scrolling

Agus Zubiaga created

f2f32fb Proper allow/reject UI

Agus Zubiaga created

d9fd8d5 Improve spacing

Agus Zubiaga created

8137b33 Remove ReadFile entry and test tool call

Agus Zubiaga created

3ceeefe Tool authorization

Agus Zubiaga created

6f768ae Copy

Click to expand commit body 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Agus Zubiaga and Conrad Irwin created

28ac84e Jump to gemini thread view immediately

Click to expand commit body 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Agus Zubiaga and Conrad Irwin created

4d803fa message markdown

Click to expand commit body 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Agus Zubiaga and Conrad Irwin created

17b2dd9 Update list incrementally

Click to expand commit body 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Agus Zubiaga and Conrad Irwin created

7abf635 Use a list to render items

Click to expand commit body 
Co-authored-by: Agus Zubiaga <agus@zed.dev>

Mikayla Maki and Agus Zubiaga created

92adcb6 WIP

Antonio Scandurra created

5ed001e Merge remote-tracking branch 'origin/main' into agent2

Click to expand commit body 
# Conflicts:
#	Cargo.lock

Antonio Scandurra created

f12fffd WIP

Antonio Scandurra created

0068de0 debugger: Handle the `envFile` setting for Go (#33666)

Click to expand commit body 
Fixes #32984

Release Notes:

- The Go debugger now respects the `envFile` setting.

Julia Ryan created

a11647d ci: Block PRs on Nix build failures (#33688)

Click to expand commit body 
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

Julia Ryan created

274f2e9 Add support for more python operators (#33720)

Click to expand commit body 
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 "|=")

Peter Tripp created

31b7786 Fix IndentGuides story (#32781)

Click to expand commit body 
This PR updates the `Model` to `Entity` also fixes the
`IndentGuidesStory`. In this
[commit](https://github.com/zed-industries/zed/commit/6fca1d2b0ba93cdbc3255657a990828a0f22b199),
`Entity<T>` replaces `View<T>`/`Model<T>`.

Other than this, I noticed the storybook fails on my MacOS and Ubuntu,
see error below

```
thread 'main' panicked at crates/gpui/src/colors.rs:99:15:
called `Result::unwrap()` on an `Err` value: no state of type gpui::colors::GlobalColors exists
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```

This was resolved by explicitly specifying `GlobalColors` in Storybook.

Release Notes:

- N/A

Alex Shi created

351ba50 docs: Add FreeBSD build instructions and current status (#33617)

Click to expand commit body 
This adds documentation for building Zed on FreeBSD.
Notice WebRTC/LiveKit remains unsupported on this platform for now.

Follow-up to:
- #33162
- #30981

Release Notes:

- N/A

---------

Co-authored-by: Peter Tripp <peter@zed.dev>

G36maid and Peter Tripp created