Skip to content

Add detection of devcontainers in subfolders#47411

Merged
KyleBarton merged 6 commits intozed-industries:mainfrom
caiopiccirillo:devcontainer-subfolders
Feb 3, 2026
Merged

Add detection of devcontainers in subfolders#47411
KyleBarton merged 6 commits intozed-industries:mainfrom
caiopiccirillo:devcontainer-subfolders

Conversation

@caiopiccirillo
Copy link
Contributor

Release Notes:

  • Add detection of devcontainers in subfolders
image

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 22, 2026
@caiopiccirillo caiopiccirillo force-pushed the devcontainer-subfolders branch from 9eb74bf to 429972d Compare January 22, 2026 18:10
@caiopiccirillo caiopiccirillo marked this pull request as ready for review January 22, 2026 18:12
@KyleBarton
Copy link
Collaborator

@caiopiccirillo thanks for this! I like how you've extended the UI here, but I think it needs one slight change: There is no way to go "edit" the json before invoking it - this is behavior that's been lost from what's currently in place today. E.g. projects: open remote -> + Connect Dev Container should give you a way to edit the json file.

Today (with devcontainer json in only one location):
Screenshot 2026-01-29 at 10 39 09 AM

Your change:

Screenshot 2026-01-29 at 10 38 49 AM

Selecting one of these configurations immediately starts a launch, without giving the user an opportunity to edit the file first. Do you think that can be addressed?

@caiopiccirillo caiopiccirillo force-pushed the devcontainer-subfolders branch from 429972d to 41d3bdb Compare January 30, 2026 14:21
@caiopiccirillo
Copy link
Contributor Author

caiopiccirillo commented Jan 30, 2026

Hi @KyleBarton! I have fixed the behavior of the UI. You'll see the multiple devcontainers and after choosing one of them, you'll have the old UI to edit the file or to go back.

@KyleBarton
Copy link
Collaborator

@caiopiccirillo thanks! I actually think there's a bit more to figure out here - whereas projects: open remote gives us the ability to edit the json file (which is good), the toast should be able to open a dev container a bit faster, without providing the additional "edit json" file. I think a slight UI tweak would solve the problem here by changing the modal from two steps to two key codes: e.g. "cmd-enter" to edit the json file and "enter" to open the container. Otherwise, we're building a pretty busy modal.

Would you have time to pair with me on this on Monday? https://calendar.app.google/aDZav1C12cGQXasB7
Ping this thread if the calendar schedule doesn't work - I'm new to using it!

@KyleBarton
Copy link
Collaborator

@caiopiccirillo FYI for tomorrow, I'll plan on hanging out in https://zed.dev/channel/dev-containers-11473-28067 - see you there.

@caiopiccirillo
Copy link
Contributor Author

@KyleBarton Thanks, see you there!

Co-authored-by: Caio Piccirillo <caiopiccirillo@gmail.com>
@KyleBarton
Copy link
Collaborator

Things still to do:

  • Picker search isn't matching on the right strings yet
  • PIcker should display both the dev container name and its path to the user (path should probably be in a lighter/secondary font)
  • Picker should match font size with its parent modal (currently looks a bit off)
  • Old code paths should be removed now that picker does a bunch of the work for us

- Picker search fixed
- Show both devcontainer name and path (in a muted color)
- Picker with font size from parent modal
- Cleanup of old code
@caiopiccirillo
Copy link
Contributor Author

@KyleBarton Thanks again for your time today! I have done the changes we've discussed, if there's anything to improve, please let me know 😄

@KyleBarton
Copy link
Collaborator

@caiopiccirillo looks great, thanks again for taking this on!

@KyleBarton KyleBarton enabled auto-merge (squash) February 3, 2026 16:59
@KyleBarton KyleBarton merged commit 13a06e6 into zed-industries:main Feb 3, 2026
27 checks passed
KyleBarton added a commit that referenced this pull request Feb 3, 2026
Small fix for a bug introduced in #47411
In-progress dev container creation didn't show up in modal because of a
duplicated code path. This unifies the logic and ensures that "creating
dev container" shows up while creation in progress.

Release Notes:

- Fixed modal for creating dev container
adb-sh pushed a commit to adb-sh/zed that referenced this pull request Feb 5, 2026
Release Notes:

- Add detection of devcontainers in subfolders

---------

Co-authored-by: KyleBarton <kjb@initialcapacity.io>
adb-sh pushed a commit to adb-sh/zed that referenced this pull request Feb 5, 2026
Small fix for a bug introduced in zed-industries#47411
In-progress dev container creation didn't show up in modal because of a
duplicated code path. This unifies the logic and ensures that "creating
dev container" shows up while creation in progress.

Release Notes:

- Fixed modal for creating dev container
rtfeldman pushed a commit that referenced this pull request Feb 5, 2026
Release Notes:

- Add detection of devcontainers in subfolders

---------

Co-authored-by: KyleBarton <kjb@initialcapacity.io>
rtfeldman pushed a commit that referenced this pull request Feb 5, 2026
Small fix for a bug introduced in #47411
In-progress dev container creation didn't show up in modal because of a
duplicated code path. This unifies the logic and ensures that "creating
dev container" shows up while creation in progress.

Release Notes:

- Fixed modal for creating dev container
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants