Skip to content

acp: Support raw agent registry binaries#58579

Merged
benbrandt merged 5 commits into
mainfrom
acp-no-ext-binary
Jun 5, 2026
Merged

acp: Support raw agent registry binaries#58579
benbrandt merged 5 commits into
mainfrom
acp-no-ext-binary

Conversation

@benbrandt

@benbrandt benbrandt commented Jun 4, 2026

Copy link
Copy Markdown
Member

It is valid to have raw binary paths in the registry but we didn't
handle them.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • acp: Fix for certain ACP Registry agent downloads not starting

It is valid to have raw binary paths in the registry but we didn't
handle them.
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 4, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Jun 4, 2026
@benbrandt

Copy link
Copy Markdown
Member Author

/cherry-pick preview
/cherry-pick stable

@benbrandt benbrandt added this pull request to the merge queue Jun 5, 2026
Merged via the queue into main with commit 8ce658f Jun 5, 2026
32 checks passed
@benbrandt benbrandt deleted the acp-no-ext-binary branch June 5, 2026 09:29
zed-zippy Bot added a commit that referenced this pull request Jun 5, 2026
…view) (#58632)

Cherry-pick of #58579 to preview

----
It is valid to have raw binary paths in the registry but we didn't
handle them.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- acp: Fix for certain ACP Registry agent downloads not starting

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
zed-zippy Bot added a commit that referenced this pull request Jun 5, 2026
…ble) (#58633)

Cherry-pick of #58579 to stable

----
It is valid to have raw binary paths in the registry but we didn't
handle them.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- acp: Fix for certain ACP Registry agent downloads not starting

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
kylekz pushed a commit to kylekz/zed that referenced this pull request Jun 5, 2026
Sync fork up to the latest zed-industries/zed upstream (8ce658f, zed-industries#58579),
on top of the previous sync that reached 6bca213 (zed-industries#58037).

Resolved conflicts:
- crates/zed/src/main.rs: dropped the standalone `git_graph::init(cx)` call
  because upstream folded the `git_graph` crate into `git_ui` (the
  `git_ui::init` on the preceding line now invokes `git_graph::init`
  internally). Kept the fork-only `claude_code_ide::init(cx)` call.

Other fork-specific touch points (workspace `Cargo.toml`, `.gitignore`
`/claude-code-ext/` entry, `crates/proto/proto/zed.proto` reserved range
10000-10004, `crates/proto/src/proto.rs`, `crates/project/src/project.rs`,
`crates/project/src/terminals.rs`, `crates/remote_server/src/headless_project.rs`,
`crates/zed/Cargo.toml`, etc.) auto-merged cleanly against upstream's
changes; verified the fork additions (claude_code_ide crates,
claude_code_ide_dispatcher modules, script/build-fork.ps1, README header,
gpui_tokio shim) are intact.

Cargo.lock auto-merged; verified with `cargo metadata --locked`.
TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 8, 2026
It is valid to have raw binary paths in the registry but we didn't
handle them.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- acp: Fix for certain ACP Registry agent downloads not starting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants