agent: Support remote archive thread git operations by Anthony-Eid · Pull Request #54001 · zed-industries/zed

Anthony-Eid · 2026-04-15T17:45:42Z

Summary

This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature.

I also made a shared backend between update_ref and delete_ref called edit_ref because they run the same git command and this allowed for some code unification.

Remote Git Operations

Repository::update_ref
Repository::delete_ref
Repository::repair_worktrees
Repository::create_archive_checkpoint
Repository::restore_archive_checkpoint

Follow up

agent_ui::thread_worktree_archive::find_or_create_repository needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems.

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:

N/A

### Summary Follow up to: #54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

…4001) ### Summary This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature. I also made a shared backend between `update_ref` and `delete_ref` called `edit_ref` because they run the same git command and this allowed for some code unification. #### Remote Git Operations - `Repository::update_ref` - `Repository::delete_ref` - `Repository::repair_worktrees` - `Repository::create_archive_checkpoint` - `Repository::restore_archive_checkpoint` #### Follow up `agent_ui::thread_worktree_archive::find_or_create_repository` needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems. 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: - N/A

…s#54074) ### Summary Follow up to: zed-industries#54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

Cherry picks for today's preview release, bringing the v0.233.x branch up to date with fixes for archive threads on remotes and sidebar thread time ordering. ### Cherry-picked PRs Requested for this release: - #54074 — agent: Fix `find_or_create` repository to support remote - #54173 — sidebar: Fix sidebar thread times Pulled in as dependencies so the requested PRs apply cleanly (preferring to carry over additional changes rather than modify the cherry-picked patches): - #53991 — Only archive worktrees that Zed created - #54001 — agent: Support remote archive thread git operations - #54014 — Avoid showing draft threads in the sidebar or storing them in the database - #54088 — Use Fs abstraction for worktree directory removal ### Conflict resolution notes - **#54014** — The previous omnibus cherry-pick (#54111) pulled in later refactors that extracted `LIST_QUERY` to a `const` without including #54014's `WHERE session_id IS NOT NULL` filter or its draft-cleanup migration. I applied the filter to the existing `const LIST_QUERY` and kept the branch's `run_thread_metadata_migrations` helper in the affected test, rather than reverting to #54014's inline forms. - **#54173** — On v0.233.x, `sidebar_tests.rs` still contains `test_search_finds_threads_hidden_behind_view_more` (removed from main by #53956, which isn't on this branch). That test calls `save_thread_metadata`, so #54173's signature change — adding an `interacted_at: Option<DateTime<Utc>>` parameter — required a mechanical `None,` argument added to this one additional call site beyond what the cherry-pick touched. No changes were made to the substance of any cherry-picked patch. Release Notes: - N/A --------- Co-authored-by: Richard Feldman <richard@zed.dev> Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> Co-authored-by: Cameron Mcloughlin <cameron.studdstreet@gmail.com> Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

…4001) ### Summary This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature. I also made a shared backend between `update_ref` and `delete_ref` called `edit_ref` because they run the same git command and this allowed for some code unification. #### Remote Git Operations - `Repository::update_ref` - `Repository::delete_ref` - `Repository::repair_worktrees` - `Repository::create_archive_checkpoint` - `Repository::restore_archive_checkpoint` #### Follow up `agent_ui::thread_worktree_archive::find_or_create_repository` needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems. 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: - N/A

…s#54074) ### Summary Follow up to: zed-industries#54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

### Summary Follow up to: zed-industries/zed#54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

…4001) ### Summary This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature. I also made a shared backend between `update_ref` and `delete_ref` called `edit_ref` because they run the same git command and this allowed for some code unification. #### Remote Git Operations - `Repository::update_ref` - `Repository::delete_ref` - `Repository::repair_worktrees` - `Repository::create_archive_checkpoint` - `Repository::restore_archive_checkpoint` #### Follow up `agent_ui::thread_worktree_archive::find_or_create_repository` needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems. 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: - N/A

…s#54074) ### Summary Follow up to: zed-industries#54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

…4001) ### Summary This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature. I also made a shared backend between `update_ref` and `delete_ref` called `edit_ref` because they run the same git command and this allowed for some code unification. #### Remote Git Operations - `Repository::update_ref` - `Repository::delete_ref` - `Repository::repair_worktrees` - `Repository::create_archive_checkpoint` - `Repository::restore_archive_checkpoint` #### Follow up `agent_ui::thread_worktree_archive::find_or_create_repository` needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems. 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: - N/A

…s#54074) ### Summary Follow up to: zed-industries#54001 This PR makes `agent_ui::thread_worktree_archive::find_or_create_repository` whether or not the repository it's searching for is on a remote machine. In the case where it's on a remote machine that has an active connection in Zed's connection pool, we return the repository; otherwise, we error out. I implemented it this way so archiving a thread on a remote machine that isn't connected deletes the metadata without showing a remote connection modal to a user. In the future, we can work around this by having better git worktree garbage collection, where remote machines remove git worktree's that were created by Zed and have no thread metadata on connection too. Finally, this PR gets archive threads working on remotes! #### Follow Ups 1. Replace instances of `std::fs` with Zed's Fs trait in the archive thread codepaths 2. Make archive thread work properly for workspace's that are not open (local and remote) 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: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

…4001) ### Summary This PR implements remote support for git store operations that the sidebar's archive thread checkpoint/restore featured relied on. This was the second to last blocker for remote usage of this feature. I also made a shared backend between `update_ref` and `delete_ref` called `edit_ref` because they run the same git command and this allowed for some code unification. #### Remote Git Operations - `Repository::update_ref` - `Repository::delete_ref` - `Repository::repair_worktrees` - `Repository::create_archive_checkpoint` - `Repository::restore_archive_checkpoint` #### Follow up `agent_ui::thread_worktree_archive::find_or_create_repository` needs to be made aware of the remote machine that the repository it's searching for is on. Once that is completed, we can get the correct repo when archiving a remote thread and the flow should work without any problems. 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: - N/A

Anthony-Eid added 6 commits April 15, 2026 11:22

Add remote git store test for ssh

f40ff7d

impl repair worktrees remote support

a1791f0

Implement edit_ref func

4457288

Get update/delete_ref working with proto

a525146

Add remote archive checkpoint/restore support

e5c6817

Pipe through collab rpc server

4719ede

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

zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Apr 15, 2026

Anthony-Eid added 2 commits April 15, 2026 13:46

Clean up

6bd2d7e

Fix merge conflicts

e484fce

maxbrunsfeld approved these changes Apr 15, 2026

View reviewed changes

Comment thread plan.md Outdated

Anthony-Eid changed the title ~~agent: Support remote archive thread usage~~ agent: Support remote archive thread git operations Apr 15, 2026

Delete plan.md

64df714

Anthony-Eid enabled auto-merge (squash) April 15, 2026 19:45

Anthony-Eid merged commit d60b556 into main Apr 15, 2026
31 checks passed

Anthony-Eid deleted the remote-thread-archive-support branch April 15, 2026 19:55

Anthony-Eid mentioned this pull request Apr 16, 2026

agent: Fix find_or_create repository to support remote #54074

Merged

5 tasks

eholk mentioned this pull request Apr 17, 2026

Cherry picks for v0.233.x preview release #54208

Merged

Navigation Menu

Uh oh!

agent: Support remote archive thread git operations - #54001

agent: Support remote archive thread git operations#54001
Anthony-Eid merged 9 commits into
mainfrom
remote-thread-archive-support

Anthony-Eid commented Apr 15, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

Anthony-Eid commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Remote Git Operations

Follow up

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Anthony-Eid commented Apr 15, 2026 •

edited

Loading