Avoid showing draft threads in the sidebar or storing them in the database#54014
Merged
maxbrunsfeld merged 1 commit intomainfrom Apr 15, 2026
Merged
Avoid showing draft threads in the sidebar or storing them in the database#54014maxbrunsfeld merged 1 commit intomainfrom
maxbrunsfeld merged 1 commit intomainfrom
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
zed-zippy
Bot
added
the
PR state:needs review
Member
|
@zed-industries/approved |
zed-zippy
Bot
removed
the
PR state:needs review
eholk
added a commit
that referenced
this pull request
Apr 16, 2026
…#54021) Cherry-pick of #54002 to the v0.233.x preview branch. Conflict resolution notes: - Removed `WHERE session_id IS NOT NULL` from `LIST_QUERY` since the draft threads cleanup PR (#54014) is not on this branch yet. - Updated tests to use foreign channels so they pass on all of Dev, Nightly, Preview, and Stable. See #54022 for cherry picking back to main. Release Notes: - N/A Co-authored-by: Danilo Leal <[email protected]>
18 tasks
eholk
added a commit
that referenced
this pull request
Apr 16, 2026
We're doing another preview release today to get our latest parallel agents features out there. This PR is a rollup of all the changes we need to cherry pick. - [x] 7a26e48 from #54081 - [x] #54066 - [x] #53992 - [x] #54079 - [x] #54057 - [x] #54056 - [x] #54052 - [x] #53999 - [x] #54009 - [x] #53539 (already cherry picked as 25e02cb) - [x] #54070 - [x] #54053 - fix `run_tests.yml`: 67e92b5 - [x] #53979 - [x] #53884 - [x] #54067 - [x] #54014 (already on branch) - [x] #54030 (already on branch) - [x] #54094 Release Notes: - N/A --------- Co-authored-by: Lukas Wirth <[email protected]> Co-authored-by: Bennet Bo Fenner <[email protected]> Co-authored-by: Nathan Sobo <[email protected]> Co-authored-by: Ben Brandt <[email protected]> Co-authored-by: Bennet Bo Fenner <[email protected]> Co-authored-by: Danilo Leal <[email protected]> Co-authored-by: Neel <[email protected]> Co-authored-by: Richard Feldman <[email protected]>
eholk
pushed a commit
to eholk/zed
that referenced
this pull request
Apr 17, 2026
…abase (zed-industries#54014) Release Notes: - N/A
eholk
added a commit
that referenced
this pull request
Apr 17, 2026
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 <[email protected]> Co-authored-by: Anthony Eid <[email protected]> Co-authored-by: Max Brunsfeld <[email protected]> Co-authored-by: Smit Barmase <[email protected]> Co-authored-by: Cameron Mcloughlin <[email protected]> Co-authored-by: Ben Brandt <[email protected]>
G36maid
pushed a commit
to G36maid/zed
that referenced
this pull request
Apr 29, 2026
…abase (zed-industries#54014) Release Notes: - N/A
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now that we don't intend to show drafts in the sidebar, we just need this to protect against drafts that were stored by an older version of Zed.
Release Notes: