Commit log

ca90b85 docs: Remove local collaboration docs (#45301)

Click to expand commit body
This PR removes the docs for running Collab locally, as they are
outdated and don't reflect the current state of affairs.

Release Notes:

- N/A

Marshall Bowers created

8516d81 Fix display name for Ollama models (#45287)

Click to expand commit body
Closes #43646

Release Notes:

- Fixed display name for Ollama models

Richard Feldman created

af589ff agent_ui: Simplify timestamp display (#45296)

Click to expand commit body
This PR simplifies how we display thread timestamps in the agent panel's
history view. For threads that are older-than-yesterday, we just show
how many days ago that thread was had in. Hovering over the thread item
shows you both the title and the full date, if needed (time and date).

<img width="450" height="786" alt="Screenshot 2025-12-18 at 5  24@2x"
src="https://github.com/user-attachments/assets/11416e9b-f1b0-4307-9db0-988a95a316a1"
/>


Release Notes:

- N/A

Danilo Leal created

95b0930 Fix Prettier formatting issues

Katie Geer created

d839987 Merge branch 'main' into docs-reorganize

Katie Geer created

315b310 quick prettier

Katie Geer created

96ea57e updates for snippets and formatting

Katie Geer created

ec4acde Add new editing, finding, and code pages

Katie Geer created

791c879 Fix a few links

Katie Geer created

d2bbfbb lsp: Broadcast our capability for `MessageActionItem`s (#45047)

Click to expand commit body
Closes #37902

Release Notes:

- Enable LSP Message action items for more language servers. These are interactive prompts, often for things like downloading build inputs for a project.

Julia Ryan created

574db1d Update macos link Populate CLI reference doc

Katie Geer created

413f4ea Redact environment variables from language server spawn errors (#44783)

Click to expand commit body
Redact environment variables from zed logs when lsp fails to spawn.

Release Notes:

- N/A

Peter Tripp created

9b934f5 Update internal links

Katie Geer created

147de3e Dedupe configuring zed and appearances

Katie Geer created

7ea6b6a Add macos file Update settings & configuring zed

Katie Geer created

1b6d588 danger: Deny conventional commits in PR titles (#45283)

Click to expand commit body
This PR upgrades `danger-plugin-pr-hygiene` to v0.7.0 so that we can
have Danger deny conventional commits in PR titles.

Release Notes:

- N/A

Marshall Bowers created

abfd39e Add appearance to summary Add settings

Katie Geer created

bee6524 Add new 'appearance' page

Katie Geer created

aedd27d Nav tweaks again

Katie Geer created

5e17554 Fixing nav

Katie Geer created

13ae07e Add globs

Katie Geer created

bc0d86e Redoing all my old work

Katie Geer created

942669d Restore all previous work

Katie Geer created

334ca21 Truncate code actions with a long label and show full label aside (#45268)

Click to expand commit body
Closes #43355

Fixes the issue were code actions with long labels would get cut off
without being able to see the full description. We now properly truncate
those labels with an ellipsis and show the full description in an aside.

Release Notes:

- Added ellipsis to truncated code actions and an aside showing the full
action description.

Gaauwe Rombouts created

f58278a glossary: Fix grammar and typo (#45267)

Click to expand commit body
Fixes grammar and a typo in `Picker` description.

Release Notes:

- N/A

Emmanuel Amoah created

f9792d8 More reconciling?

Katie Geer created

2f5c2fa Reconcile branches

Katie Geer created

e10b9b7 git: Add global git integration enable/disable setting (#43326)

Click to expand commit body
Closes #13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
https://github.com/zed-industries/zed/pull/43173 to be merged, then
modify it to support both user and project levels.

Leo created

b5402d8 rearrange nav

Katie Geer created

098adf3 gpui: Enable direct-to-display optimization for metal (#44334)

Click to expand commit body
When profiling Zed with Instruments, a warning appears indicating that
surfaces cannot be pushed directly to the display as they are
non-opaque. This happens because the metal layer is currently marked as
non-opaque by default, even though the window itself is not transparent.

<img width="590" height="55" alt="image"
src="https://github.com/user-attachments/assets/2647733e-c75b-4aec-aa19-e8b2ffd6194b"
/>

Metal on macOS can bypass compositing and present frames directly to the
display when several conditions are met. One of those conditions is that
the backing layer must be declared opaque. Apple’s documentation notes
that marking layers as opaque allows the system to avoid unnecessary
compositing work, reducing GPU load and improving frame pacing

Ref:
https://developer.apple.com/documentation/metal/managing-your-game-window-for-metal-in-macos

This PR updates the Metal renderer to mark the layer as opaque whenever
the window does not use transparency. This makes Zed eligible for
macOS’s direct-to-display optimization in scenarios where the system can
apply it.

Release Notes:

- gpui: Mark metal layers opaque for non-transparent windows to allow
direct-to-display when supported

---------

Signed-off-by: Marco Mihai Condrache <52580954+marcocondrache@users.noreply.github.com>

Marco Mihai Condrache created

a85c508 Fix self-referential symbolic link (#45265)

Click to expand commit body
Release Notes:

- N/A

Jakub Konka created

2a713c5 gpui: Small tab group performance improvements (#41885)

Click to expand commit body
Closes #ISSUE

Removes a few eager container clones and iterations.

Added a todo to `get_prev_tab_group_window` and
`get_next_tab_group_window`. They seem to use `HashMap::keys()` for
choosing the previous tab group, however `.keys()` returns an arbitrary
order, so I'm not sure if previous actually means anything here. Conrad
seems to have worked on this part previously, maybe he has some
insights. That can possibly be a follow-up PR, but I'd be willing to
work on it here as well since the other changes are so simple.

Release Notes:

- N/A

tidely created

f937c19 rules_library: Only store built-in prompts when they are customized (#45112)

Click to expand commit body
Follow up to #45004

Release Notes:

- N/A

Bennet Bo Fenner created

7a62f01 agent_ui: Use display name for the message editor placeholder (#45264)

Click to expand commit body
Follow up to a regression that happened when we introduced agent servers
that made everywhere displaying agent names use the extension name
instead of the display name. This has been since fixed in other places
and this PR now updates the agent panel's message editor, too:

| Before | After |
|--------|--------|
| <img width="1154" height="254" alt="Screenshot 2025-12-18 at 12  54
2@2x"
src="https://github.com/user-attachments/assets/5f3de9f9-4e11-42f6-90c2-56fc8cdff32e"
/> | <img width="1154" height="254" alt="Screenshot 2025-12-18 at 12 
54@2x"
src="https://github.com/user-attachments/assets/46ed5c45-7e1d-4cc6-b219-b6cc19206d1b"
/> |

Release Notes:

- N/A

Danilo Leal created

2d071b0 editor: Fix git-hunk toggling for adjacent hunks (#43187)

Click to expand commit body
Closes #42934 

Release Notes:

- Fix toggling adjacent git-diff hunks based on the reported behaviour
in #42934

---------

Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>

Sean Hagstrom and Jakub Konka created

bd2b0de gpui: Add modal dialog window kind (#40291)

Click to expand commit body
Closes #ISSUE

A [modal dialog](https://en.wikipedia.org/wiki/Modal_window) window is a
window that demands the user's immediate attention and blocks
interaction with other parts of the application until it's closed.

- On Windows this is done by disabling the parent window when the dialog
window is created and re-enabling the parent window when closed.
- On Wayland this is done using the
[`XdgDialog`](https://wayland.app/protocols/xdg-dialog-v1) protocol,
which hints to the compositor that the dialog should be modal. While
compositors like GNOME and KDE block parent interaction automatically,
the XDG specification does not guarantee this behavior, compositors may
deliver events to the parent window unfiltered. Since the specification
explicitly requires clients to implement event filtering logic
themselves, this PR implements client-side blocking in GPUI to ensure
consistent modal behavior across all Wayland compositors, including
those like Hyprland that don't block parent interaction.
- On X11 this is done by enabling the application window property
[`_NET_WM_STATE_MODAL`](https://specifications.freedesktop.org/wm/latest/ar01s05.html#id-1.6.8)
state.

I'm unable to implement this on MacOS as I lack the experience and the
hardware to test it. If anyone is interested on implementing this let me
know.

|Window|Linux (wayland)| Linux (x11) |MacOS|
|-|-|-|-|
|<video
src="https://github.com/user-attachments/assets/bfd0733a-445d-4b63-ac6b-ebe098a7dc74"></video>|<video
src="https://github.com/user-attachments/assets/024cd6ec-ff81-4250-a5be-5d207a023f8c"></video>|
N/A | <video
src="https://github.com/user-attachments/assets/656e60a5-26b2-4ee2-8368-1fbbe872453c"></video>|

TODO:

- [x] Block parent interaction client-side on X11

Release Notes:

- Added modal dialog window kind on GPUI

---------

Co-authored-by: Jason Lee <huacnlee@gmail.com>
Co-authored-by: Anthony Eid <anthony@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>

Alvaro Parker , Jason Lee , Anthony Eid , and Anthony Eid created

886de8f agent_ui: Improve UX when pasting code into message editor (#45254)

Click to expand commit body
Follow up to #42982

Release Notes:

- agent: Allow pasting code without formatting via ctrl/cmd-shift-v.
- agent: Fixed an issue where pasting a single line of code would always
insert an @mention

Bennet Bo Fenner created

7a783a9 acp: Update to agent-client-protocol rust sdk v0.9.2 (#45255)

Click to expand commit body
Release Notes:

- N/A

Ben Brandt created

f9462da terminal: Fix pane re-entrancy panic when splitting terminal tabs (#45231)

Click to expand commit body
## Summary
Fix panic "cannot update workspace::pane::Pane while it is already being
updated" when dragging terminal tabs to split the pane.

## Problem
When dragging a terminal tab to create a split, the app panics due to
re-entrancy: the drop handler calls `terminal_panel.center.split()`
synchronously, which invokes `mark_positions()` that tries to update all
panes in the group. When the pane being updated is part of the terminal
panel's center group, this causes a re-entrancy panic.

## Solution
Defer the split operation using `cx.spawn_in()`, similar to how
`move_item` was already deferred in the same handler. This ensures the
split (and subsequent `mark_positions()` call) runs after the current
pane update completes.

## Test plan
- Open terminal panel
- Create a terminal tab
- Drag the terminal tab to split the pane
- Verify no panic occurs and split works correctly

Ahmed M. Ammar created

61dd6a8 agent_ui: Add some fixes to tool calling display (#45252)

Click to expand commit body
- Follow up to https://github.com/zed-industries/zed/pull/45097 — not
showing raw inputs for edit and terminal calls
- Removing the display of empty Markdown if the model outputs it

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <hi@aguz.me>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

Danilo Leal , Agus Zubiaga , and Ben Brandt created

abb199c thread_view: Clearer authentication states (#45230)

Click to expand commit body
Closes #44717

Sometimes, we show the user the agent's auth methods because we got an
AuthRequired error.

However, there are also several ways a user can choose to re-enter the
authentication flow even though they are still logged in.

This has caused some confusion with several users, where after logging
in, they type /login again to see if anything changed, and they saw an
"Authentication Required" warning.

So, I made a distinction in the UI if we go to this flow from a concrete
error, or if not, made the language less error-like to help avoid
confusion.

| Before | After |
|--------|--------|
| <img width="1154" height="446" alt="Screenshot 2025-12-18 at 10 
54@2x"
src="https://github.com/user-attachments/assets/9df0d59a-2d45-4bfc-ba85-359dd1a4c8ae"
/> | <img width="1154" height="446" alt="Screenshot 2025-12-18 at 10 
53@2x"
src="https://github.com/user-attachments/assets/73a9fb45-4e6f-4594-8795-aaade35b2a72"
/> |


Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Miguel Raz Guzmán Macedo <miguel@zed.dev>

Ben Brandt , Danilo Leal , and Miguel Raz Guzmán Macedo created

cebbf77 gpui(windows): Fix clicks to inactive windows not dispatching to the clicked window (#45237)

Click to expand commit body
Release Notes:

- Fixed an issue on windows where clicking buttons on windows in the
background would not register as being clicked on that window

Lukas Wirth created

0180f3e deepseek: Fix for max output tokens blocking completions (#45236)

Click to expand commit body
They count the requested max_output_tokens against the prompt total.
Seems like a bug on their end as most other providers don't do this, but
now we just default to None for the main models and let the API use its
default behavior which works just fine.

Closes: #45134

Release Notes:

- deepseek: Fix issue with Deepseek API that was causing the token limit
to be reached sooner than necessary

Ben Brandt created

5488a19 terminal: Respect RevealStrategy::NoFocus and Never focus settings (#45180)

Click to expand commit body
Closes #45179

## Summary

Fixes the focus behavior when creating terminals with
`RevealStrategy::NoFocus` or `RevealStrategy::Never`. Previously,
terminals would still receive focus if the terminal pane already had
focus, contradicting the documented behavior.

## Changes

- **`add_terminal_task()`**: Changed focus logic to only focus when
`RevealStrategy::Always`
- **`add_terminal_shell()`**: Same fix

The fix changes:
```rust
// Before
let focus = pane.has_focus(window, cx)
    || matches!(reveal_strategy, RevealStrategy::Always);

// After  
let focus = matches!(reveal_strategy, RevealStrategy::Always);
```

## Impact

This affects:
- Vim users running `:!command` (uses `NoFocus`)
- Debugger terminal spawning (uses `NoFocus`)
- Any programmatic terminal creation requesting background behavior

Release Notes:

- Fixed terminal focus behavior to respect `RevealStrategy::NoFocus` and
`RevealStrategy::Never` settings when the terminal pane already has
focus.

rabsef-bicrym created

bb1198e languages: Allow using locally installed `ty` for Python (#45193)

Click to expand commit body
Release Notes:

- Allow using locally installed `ty` for Python

Henry Chu created

69fe27f Keep tab stop-less snippets in completion list (#45227)

Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/45083

cc @agu-z 

Release Notes:

- Fixed certain rust-analyzer snippets not shown

Kirill Bulatov created

469da2f gpui: Fix Windows credential lookup returning error instead of `None` when credentials don't exist (#45228)

Click to expand commit body
This spams the log with amazon bedrock otherwise

Release Notes:

- N/A *or* Added/Fixed/Improved ...

Lukas Wirth created

4f87822 gpui: Persist window bounds and display when detaching a workspace session (#45201)

Click to expand commit body
Closes #41246 #45092

Release Notes:

- N/A

**Root Cause**:
Empty local workspaces returned `DetachFromSession` from 
`serialize_workspace_location()`, and the `DetachFromSession` handler
only cleared the session_id **without saving window bounds**.

**Fix Applied**:
Modified the `DetachFromSession` handler to save window bounds via
`set_window_open_status()`:
```rust
WorkspaceLocation::DetachFromSession => {
    let window_bounds = SerializedWindowBounds(window.window_bounds());
    let display = window.display(cx).and_then(|d| d.uuid().ok());
    window.spawn(cx, async move |_| {
        persistence::DB
            .set_window_open_status(database_id, window_bounds, display.unwrap_or_default())
            .await.log_err();
        persistence::DB.set_session_id(database_id, None).await.log_err();
    })
}
```

**Recording**:


https://github.com/user-attachments/assets/2b6564d4-4e1b-40fe-943b-147296340aa7

shibang created

9a69d89 thread_view: Remove unused acp auth method (#45221)

Click to expand commit body
This was from an early iteration and this code path isn't used anymore

Release Notes:

- N/A

Ben Brandt created

54f360a Add a test to ensure we invalidate brackets not only on edits (#45219)

Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/45187

Release Notes:

- N/A

Kirill Bulatov created