Skip to content

Re-add MultiWorkspace#48800

Merged
mikayla-maki merged 14 commits intomainfrom
re-add-multi-workspace
Feb 12, 2026
Merged

Re-add MultiWorkspace#48800
mikayla-maki merged 14 commits intomainfrom
re-add-multi-workspace

Conversation

@rtfeldman
Copy link
Contributor

@rtfeldman rtfeldman commented Feb 9, 2026

Release Notes:

  • Added agent panel restoration. Now restarting your editor won't cause your thread to be forgotten.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 9, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 9, 2026
@mikayla-maki mikayla-maki added the run-bundling Configures PR to run the bundle step label Feb 9, 2026
@mikayla-maki mikayla-maki force-pushed the re-add-multi-workspace branch from e3c7bf5 to 6776252 Compare February 10, 2026 19:10
@mikayla-maki mikayla-maki marked this pull request as ready for review February 10, 2026 19:13
rtfeldman and others added 8 commits February 10, 2026 12:03
…rywhere (#48813)

Makes `Workspace::test_new` `pub(crate)` so it can only be called from
within the workspace crate. All external test code now uses
`MultiWorkspace::test_new` instead, which reflects the actual runtime
reality where `MultiWorkspace` is the window root.

- `Workspace::test_new` visibility changed from `pub` to `pub(crate)`
- Added `MultiWorkspace::test_add_workspace` helper for tests that need
additional workspaces
- Migrated ~285 call sites across 33 external files to use
`MultiWorkspace::test_new`
- Updated helper functions that took `&WindowHandle<Workspace>` to take
`&Entity<Workspace>`

Release Notes:

- N/A
This should fix the test CICD and get all the tests passing

Co-authored-by: Eric Holk \<eric@zed.dev\>

Release Notes:

- N/A

---------

Co-authored-by: Eric Holk <eric@zed.dev>
Panic was cause by a double workspace lease because the action register
was on workspace and the agent panel got the workspace id from it's weak
workspace handle

Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Eric Holk <eric@zed.dev>
@mikayla-maki mikayla-maki force-pushed the re-add-multi-workspace branch from 4c329e3 to af4d23e Compare February 10, 2026 20:08
Anthony-Eid and others added 4 commits February 10, 2026 12:49
This is used instead of defer_in in NewTextThread action handler to
avoid a double lease panic with workspace.

Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Fix rounded-corner bug when workspace switcher open

Release Notes:

- N/A

---------

Co-authored-by: Richard Feldman <oss@rtfeldman.com>
@mikayla-maki mikayla-maki force-pushed the re-add-multi-workspace branch 3 times, most recently from b7f61f1 to d1cfad2 Compare February 11, 2026 23:25
@mikayla-maki mikayla-maki enabled auto-merge (squash) February 12, 2026 00:56
@mikayla-maki mikayla-maki removed the run-bundling Configures PR to run the bundle step label Feb 12, 2026
@mikayla-maki mikayla-maki merged commit ee3f40f into main Feb 12, 2026
27 checks passed
@mikayla-maki mikayla-maki deleted the re-add-multi-workspace branch February 12, 2026 01:06
Veykril added a commit that referenced this pull request Feb 12, 2026
Caused by #48763 and
#48800

Release Notes:

- N/A *or* Added/Fixed/Improved ...
KyleBarton pushed a commit that referenced this pull request Feb 13, 2026
…ce entity lease (#49058)

Closes #49055

**Heads up**: This might be a naïve solution. I ran into the issue after
merging latest main into
#48896, and confirming that it
was unrelated to that PR and incoming from upstream.

Agent one-shot the fix, it works and tests pass. But I'm still wrapping
my head around the changes that led to the bug. I figured the breakage
is bad enough (I couldn't open devcontainers at all) to submit a
possibly naïve fix.

## Fix 

Hoists the `find_devcontainer_configs` call out of `new_dev_container`
and into the call site, where we already have a direct `&mut Workspace`
reference that doesn't go through the entity map. The computed configs
are passed into `new_dev_container` as an argument.

## What was happening

After #48800 ("Re-add MultiWorkspace"), `with_active_or_new_workspace`
nests a `Workspace` entity lease inside a `MultiWorkspace` entity lease.
The `OpenDevContainer` handler was also changed from async to sync in
the same PR, so `RemoteServerProjects::new_dev_container` now runs while
`Workspace` is leased. Inside `new_dev_container`, a
`WeakEntity<Workspace>::read_with` call tries to read `Workspace`
through the entity map, finds it already leased, and panics.

Release Notes:

- Fixed a panic when opening the dev container modal via the
`OpenDevContainer` action.
morgankrey pushed a commit that referenced this pull request Feb 19, 2026
Added 20 new actionable suggestions from merged PRs.

Processed ~60 PRs in this run:
- 20 actionable → queued
- ~39 unactionable (no docs needed)
- 1 failed (PR #48800: diff too large)
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.

5 participants