agent_ui: Add selection to terminal thread by rkiyanchuk · Pull Request #57301 · zed-industries/zed

rkiyanchuk · 2026-05-20T18:55:41Z

NOTE:

I'm new both to Rust and Zed, so it's a crudely vibecoded fix for #57295, just as a PoC of expected behavior that works on macOS. So please be critical and skeptical of the code, as it may not account for many nuances and behavior on other platforms.

Summary

Fixes "Add to Agent Thread" not working with Terminal Threads #57295: the Add to Agent Thread action (or cmd->) was a silent
no-op when a terminal thread was the active conversation in the agent panel.
The action's deferred handler only routed through active_conversation_view(),
which returns None for BaseView::Terminal, so the selection was dropped.
Extends the handler with an else if branch that, when a terminal thread is
active, formats the selection as @<rel-path>:<start>-<end> (matching the
mention syntax CLI agents already understand) and pastes it into the
terminal, then focuses the terminal so the user can edit/submit.

Test plan

Select a range of lines in a buffer, open a terminal thread in the agent
panel, invoke Add to Agent Thread from the context menu → the formatted
mention is pasted into the terminal.
Same flow via the cmd-> keybinding on macOS.
Multiple selections in one buffer produce space-separated mentions.
cargo check -p agent_ui and ./script/clippy -p agent_ui pass.

Demo

zed-selection-insert-agent-panel.mp4

Release Notes:

Fixed Add to Agent Thread being a no-op when a terminal thread is the active conversation in the agent panel

…minal thread When a terminal thread is active in the agent panel, AddSelectionToThread silently no-ops because the handler only routes through active_conversation_view. Extend the handler to format the editor selection as @<rel-path>:<start>-<end> and paste it into the terminal, mirroring the format CLI agents already accept.

cla-bot · 2026-05-20T18:55:44Z

We require contributors to sign our Contributor License Agreement, and we don't have @rkiyanchuk on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

rkiyanchuk · 2026-05-20T18:57:19Z

@cla-bot check

cla-bot · 2026-05-20T18:57:24Z

The cla-bot has been summoned, and re-checked this pull request!

linwanlong · 2026-05-25T03:41:59Z

I’m really looking forward to this feature. It’s so convenient!

…-add-selection-to-terminal-thread

The agent process inside a terminal thread resolves `@path` mentions relative to its own working directory, not the buffer's worktree root. Emit a path relative to the terminal's working directory when the selection lives under it, and fall back to an absolute path otherwise.

Detect the foreground program of a terminal thread and format the selection mention the way that agent expects. The codex CLI uses bare, cwd-relative paths (quoted when they contain whitespace) with no leading `@`, so emit that form when codex is running and fall back to the generic `@path:line` mention otherwise. Also append a trailing space so the mention doesn't fuse with subsequent input at the prompt.

Cover the terminal-thread branch of the AddSelectionToThread action: a no-op when nothing is highlighted, and the formatted @<rel-path>:<start>-<end> mention once a selection exists.

Drop the per-CLI mention formatting and foreground-process detection. Selections added to a terminal thread are now always pasted as <path>:<start>-<end>, with no provider-specific quoting or prefix.

MartinYe1234 · 2026-06-02T20:16:21Z

Thanks for your contribution @rkiyanchuk , I made a few fixes and added a test.

## **NOTE:** I'm new both to Rust and Zed, so it's mostly vibecoded alleged fix for zed-industries#57295, just as a PoC of expected behavior that works on macOS. So please be critical and skeptical of the code, as it may not account for many nuances and behavior on other platforms. ## Summary - Fixes zed-industries#57295: the `Add to Agent Thread` action (or `cmd->`) was a silent no-op when a terminal thread was the active conversation in the agent panel. - The action's deferred handler only routed through `active_conversation_view()`, which returns `None` for `BaseView::Terminal`, so the selection was dropped. - Extends the handler with an `else if` branch that, when a terminal thread is active, formats the selection as `@<rel-path>:<start>-<end>` (matching the mention syntax CLI agents already understand) and pastes it into the terminal, then focuses the terminal so the user can edit/submit. ## Test plan - [x] Select a range of lines in a buffer, open a terminal thread in the agent panel, invoke `Add to Agent Thread` from the context menu → the formatted mention is pasted into the terminal. - [x] Same flow via the `cmd->` keybinding on macOS. - [x] Multiple selections in one buffer produce space-separated mentions. - [x] `cargo check -p agent_ui` and `./script/clippy -p agent_ui` pass. ## Demo <img width="2928" height="1920" alt="ScreenShot 2026-05-20 at 21 03 27" src="https://github.com/user-attachments/assets/dc29f380-a864-4c12-b454-bdb4201f5b8d" /> https://github.com/user-attachments/assets/9d3914d8-8ba2-4bcb-be43-78efb342d8a8 ## Release Notes: - Fixed `Add to Agent Thread` being a no-op when a terminal thread is the active conversation in the agent panel --------- Co-authored-by: Martin Ye <martin@zed.dev>

lcmen · 2026-06-05T12:11:58Z

Has this been released? It still does not work for me.

## **NOTE:** I'm new both to Rust and Zed, so it's mostly vibecoded alleged fix for zed-industries#57295, just as a PoC of expected behavior that works on macOS. So please be critical and skeptical of the code, as it may not account for many nuances and behavior on other platforms. ## Summary - Fixes zed-industries#57295: the `Add to Agent Thread` action (or `cmd->`) was a silent no-op when a terminal thread was the active conversation in the agent panel. - The action's deferred handler only routed through `active_conversation_view()`, which returns `None` for `BaseView::Terminal`, so the selection was dropped. - Extends the handler with an `else if` branch that, when a terminal thread is active, formats the selection as `@<rel-path>:<start>-<end>` (matching the mention syntax CLI agents already understand) and pastes it into the terminal, then focuses the terminal so the user can edit/submit. ## Test plan - [x] Select a range of lines in a buffer, open a terminal thread in the agent panel, invoke `Add to Agent Thread` from the context menu → the formatted mention is pasted into the terminal. - [x] Same flow via the `cmd->` keybinding on macOS. - [x] Multiple selections in one buffer produce space-separated mentions. - [x] `cargo check -p agent_ui` and `./script/clippy -p agent_ui` pass. ## Demo <img width="2928" height="1920" alt="ScreenShot 2026-05-20 at 21 03 27" src="https://github.com/user-attachments/assets/dc29f380-a864-4c12-b454-bdb4201f5b8d" /> https://github.com/user-attachments/assets/9d3914d8-8ba2-4bcb-be43-78efb342d8a8 ## Release Notes: - Fixed `Add to Agent Thread` being a no-op when a terminal thread is the active conversation in the agent panel --------- Co-authored-by: Martin Ye <martin@zed.dev>

Zed's `agent::AddSelectionToThread` (`cmd->`) has worked with Terminal Threads since zed-industries/zed#57301 (merged 2026-06-02, a565ab4): it formats the selection as `@<rel-path>:<start>-<end>` and pastes it into the active terminal thread. Feature 4 existed only to fill that gap. The removal reaches further than the feature itself. `ztx setup zed` installed nothing but the `ztx: send selection` task and its `cmd-alt-z` binding, so it loses its reason to exist along with `ztx send`. Four subcommands remain: run, export, notify, sessions. The IPC paste path had `ztx send` as its only caller. notify's control frames share the socket but not the code path, so the socket, `ipc::send` and one-session-per-project routing all stay. CONTROL_PREFIX (the leading NUL) stays even though every frame is now a control frame: a session started by an older ztx still pastes any non-NUL payload straight into the agent's prompt, so dropping the marker would make a new `ztx notify` spray JSON into it. Non-control frames are now logged and discarded. docs/*/getting-started/zed-setup.md shrinks rather than disappears -- its terminal_init_command section is onboarding content unrelated to selections. Verified manually with Claude Code: `cmd->` pastes the mention and the agent resolves the line range. antigravity-cli is left unverified by decision, not oversight; if it does not resolve `@path:start-end` the fix belongs upstream rather than in a restored `ztx send`. BREAKING CHANGE: the `ztx send` and `ztx setup zed` subcommands are removed. Zed's built-in `cmd->` replaces them. User request: zedのターミナルセッションでも AddSelectionToThread が使えるようになっていたようだ。 zed-industries/zed#57301 つまり、ztx の "Pull editor selections into the session" 機能は不要という事にならないか？ Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

## **NOTE:** I'm new both to Rust and Zed, so it's mostly vibecoded alleged fix for zed-industries#57295, just as a PoC of expected behavior that works on macOS. So please be critical and skeptical of the code, as it may not account for many nuances and behavior on other platforms. ## Summary - Fixes zed-industries#57295: the `Add to Agent Thread` action (or `cmd->`) was a silent no-op when a terminal thread was the active conversation in the agent panel. - The action's deferred handler only routed through `active_conversation_view()`, which returns `None` for `BaseView::Terminal`, so the selection was dropped. - Extends the handler with an `else if` branch that, when a terminal thread is active, formats the selection as `@<rel-path>:<start>-<end>` (matching the mention syntax CLI agents already understand) and pastes it into the terminal, then focuses the terminal so the user can edit/submit. ## Test plan - [x] Select a range of lines in a buffer, open a terminal thread in the agent panel, invoke `Add to Agent Thread` from the context menu → the formatted mention is pasted into the terminal. - [x] Same flow via the `cmd->` keybinding on macOS. - [x] Multiple selections in one buffer produce space-separated mentions. - [x] `cargo check -p agent_ui` and `./script/clippy -p agent_ui` pass. ## Demo <img width="2928" height="1920" alt="ScreenShot 2026-05-20 at 21 03 27" src="https://github.com/user-attachments/assets/dc29f380-a864-4c12-b454-bdb4201f5b8d" /> https://github.com/user-attachments/assets/9d3914d8-8ba2-4bcb-be43-78efb342d8a8 ## Release Notes: - Fixed `Add to Agent Thread` being a no-op when a terminal thread is the active conversation in the agent panel --------- Co-authored-by: Martin Ye <martin@zed.dev>

zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label May 20, 2026

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 20, 2026

smitbarmase added the area:ai/terminal threads Feedback for Zed's Terminal Threads label May 29, 2026

Merge branch 'main' of https://github.com/zed-industries/zed into fix…

a363bdc

…-add-selection-to-terminal-thread

MartinYe1234 self-assigned this Jun 2, 2026

MartinYe1234 added 7 commits June 2, 2026 08:52

fix merge conflicts

8482c57

Tighten terminal mention comments

20fb4ee

use utils and make logic centralized

4eab7d2

Test add-to-thread paste into terminal threads

b05924d

Cover the terminal-thread branch of the AddSelectionToThread action: a no-op when nothing is highlighted, and the formatted @<rel-path>:<start>-<end> mention once a selection exists.

Present terminal mentions as plain path:line for all agents

91e2590

Drop the per-CLI mention formatting and foreground-process detection. Selections added to a terminal thread are now always pasted as <path>:<start>-<end>, with no provider-specific quoting or prefix.

MartinYe1234 approved these changes Jun 2, 2026

View reviewed changes

MartinYe1234 added this pull request to the merge queue Jun 2, 2026

Merged via the queue into zed-industries:main with commit a565ab4 Jun 2, 2026
32 checks passed

This was referenced Jun 10, 2026

Review upstream Zed v1.6.3 neozed-industries/neo-zed#44

Open

Review upstream Zed v1.7.2 neozed-industries/neo-zed#45

Open

This was referenced Jun 18, 2026

fix/commit author #59516

Closed

fix/linked images clickable #59518

Closed

github-actions Bot mentioned this pull request Jun 24, 2026

Review upstream Zed v1.8.2 neozed-industries/neo-zed#46

Open

This was referenced Jul 1, 2026

Review upstream Zed v1.9.0 neozed-industries/neo-zed#47

Open

Review upstream Zed v1.10.0 neozed-industries/neo-zed#48

Open

This was referenced Jul 10, 2026

Review upstream Zed v1.10.2 neozed-industries/neo-zed#49

Open

Review upstream Zed v1.10.3 neozed-industries/neo-zed#50

Open

handlename mentioned this pull request Jul 26, 2026

feat!: drop ztx send in favour of Zed's cmd-> handlename/ztx#7

Merged

16 tasks

Navigation Menu

Uh oh!

Uh oh!

agent_ui: Add selection to terminal thread - #57301

agent_ui: Add selection to terminal thread#57301
MartinYe1234 merged 9 commits into
zed-industries:mainfrom
rkiyanchuk:fix-add-selection-to-terminal-thread

rkiyanchuk commented May 20, 2026 •

edited

Loading

Uh oh!

cla-bot Bot commented May 20, 2026

Uh oh!

rkiyanchuk commented May 20, 2026

Uh oh!

cla-bot Bot commented May 20, 2026

Uh oh!

linwanlong commented May 25, 2026

Uh oh!

MartinYe1234 commented Jun 2, 2026

Uh oh!

Uh oh!

lcmen commented Jun 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

rkiyanchuk commented May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

NOTE:

Summary

Test plan

Demo

Release Notes:

Uh oh!

cla-bot Bot commented May 20, 2026

Uh oh!

rkiyanchuk commented May 20, 2026

Uh oh!

cla-bot Bot commented May 20, 2026

Uh oh!

linwanlong commented May 25, 2026

Uh oh!

MartinYe1234 commented Jun 2, 2026

Uh oh!

Uh oh!

lcmen commented Jun 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rkiyanchuk commented May 20, 2026 •

edited

Loading