Initial Support for WSLC Commands #14171

AmelBawa-msft · 2026-02-06T19:19:44Z

Summary of the Pull Request

⚠️ The code changes in this PR are still in a construction phase, but the current quality is sufficient to unblock the team while new functionalities are being implemented.

🙌 Demo

[Window 1]
wslc container --help
wslc container run --help
wslc container run -it --name demo ubuntu:latest /bin/bash

[Window 2]
wslc container exec demo ls -lt
wslc container list --help
wslc container list
wslc container list -aq
wslc container inspect demo
wslc container kill demo

[Window 1]
# Verify container is not attached anymore
wslc container delete demo
wslc container list -a

🦞 Full implementation

Run --help for each command and subcommand for the full list of supported options.

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated if needed and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

JohnMcPMS · 2026-02-06T19:28:38Z

src/windows/wslc/SessionModel.cpp

+    options.CpuCount = 4;
+    options.MemoryMb = 2048;
+    options.BootTimeoutMs = 30 * 1000;
+    options.StoragePath = dataFolder.c_str();


Dangling pointer to local; a suggestion on a pattern to fix it: https://github.com/microsoft/WSL/compare/user/amelbawa/init...JohnMcPMS:amir-suggest?expand=1

… into user/amelbawa/init

Copilot

Pull request overview

This PR introduces an initial command/subcommand framework for the wslc CLI and refactors prior monolithic logic into command + service/model components to support image, container, and shell operations.

Changes:

Replaced the old top-level verb handling with an ICommand-based dispatcher (image, container, shell) and per-subcommand implementations.
Added services/models for sessions, images, containers, console attach/stdio wiring, and table output.
Updated build wiring for the new wslc sources/headers and tweaked the root vswhere detection logic.

Reviewed changes

Copilot reviewed 28 out of 28 changed files in this pull request and generated 35 comments.

Show a summary per file

File	Description
src/windows/wslc/main.cpp	Routes CLI execution through a new RootCommand dispatcher.
src/windows/wslc/ICommand.h / .cpp	Adds a command interface + shared parsing/help utilities.
src/windows/wslc/ShellCommand.h / .cpp	Implements `wslc shell list/attach`.
src/windows/wslc/ShellService.h / .cpp	Adds session listing and attach logic for shell sessions.
src/windows/wslc/ImageCommand.h / .cpp	Implements `wslc image list/pull`.
src/windows/wslc/ImageService.h / .cpp	Adds image list/pull operations via WSLA APIs.
src/windows/wslc/ImageModel.h	Defines image info model + serialization.
src/windows/wslc/ContainerCommand.h / .cpp	Implements `wslc container` subcommands (run/create/start/stop/kill/delete/list/exec/inspect).
src/windows/wslc/ContainerService.h / .cpp	Adds container lifecycle/exec/inspect operations.
src/windows/wslc/ContainerModel.h	Defines container option/result/info models + serialization.
src/windows/wslc/ConsoleService.h / .cpp	Centralizes stdio fd building and console attach/relay logic.
src/windows/wslc/ConsoleModel.h	Defines console attach options.
src/windows/wslc/SessionService.h / .cpp	Adds a session creation helper.
src/windows/wslc/SessionModel.h / .cpp	Defines session wrapper and default session settings.
src/windows/wslc/Utils.h / .cpp	Moves pull/progress logic and terminal cursor RAII helper.
src/windows/wslc/TableOutput.h	Adds a simple table printer for CLI output.
src/windows/wslc/CMakeLists.txt	Adds new command/service/model sources and headers to the build.
localization/strings/en-US/Resources.resw	Updates `MessageWslcUsage` (but currently mismatched with new command layout).
CMakeLists.txt	Modifies Visual Studio discovery behavior via `vswhere`.

src/windows/wslc/ICommand.h

Copilot · 2026-02-06T19:30:33Z

src/windows/wslc/ICommand.h

+#define CMD_ARG_REQUIRED(arg, msg) if (arg.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }
+#define CMD_ARG_ARRAY_REQUIRED(argArray, msg) if (argArray.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }


CMD_ARG_REQUIRED/CMD_ARG_ARRAY_REQUIRED depend on a wslutil namespace alias being defined in every .cpp that uses them, which is brittle and easy to break. Prefer referencing wsl::windows::common::wslutil::PrintMessage directly in the macros (or move these helpers into a .cpp).

Suggested change

#define CMD_ARG_REQUIRED(arg, msg) if (arg.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }

#define CMD_ARG_ARRAY_REQUIRED(argArray, msg) if (argArray.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }

#define CMD_ARG_REQUIRED(arg, msg) if (arg.empty()) { wsl::windows::common::wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }

#define CMD_ARG_ARRAY_REQUIRED(argArray, msg) if (argArray.empty()) { wsl::windows::common::wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }

Copilot · 2026-02-06T19:30:34Z

src/windows/wslc/ContainerCommand.h

+private:
+    bool m_all;
+    std::string m_format;
+    bool m_quiet;
+};


m_all/m_quiet are not initialized; if the flags are omitted, the values can be indeterminate. Default-initialize them to false (e.g., bool m_all{}; bool m_quiet{};).

Copilot · 2026-02-06T19:30:34Z

src/windows/wslc/ShellService.cpp

+    wsl::windows::common::security::ConfigureForCOMImpersonation(sessionManager.get());
+
+    wil::unique_cotaskmem_array_ptr<WSLA_SESSION_INFORMATION> sessions;
+    (sessionManager->ListSessions(&sessions, sessions.size_address<ULONG>()));


ListSessions's HRESULT is ignored here. This should be THROW_IF_FAILED(...) (or otherwise handled), otherwise failures will be silently ignored and sessions may be in an unexpected state.

Suggested change

(sessionManager->ListSessions(&sessions, sessions.size_address<ULONG>()));

THROW_IF_FAILED(sessionManager->ListSessions(&sessions, sessions.size_address<ULONG>()));

Copilot · 2026-02-06T19:30:34Z

src/windows/wslc/ContainerCommand.cpp

+    CMD_IF_HELP_PRINT_HELP();
+    auto containersToKill = Arguments();
+    auto session = m_sessionService.CreateSession();
+    wslc::services::ContainerService containerService;


If --all is not set and no container IDs are provided, this command becomes a no-op and returns success. Please validate that at least one ID is provided when m_all is false and return a non-zero error code otherwise.

Copilot · 2026-02-06T19:30:40Z

src/windows/wslc/ICommand.h

+
+protected:
+    virtual int ExecuteInternal(std::wstring_view commandLine, int parserOffset = 0) = 0;
+    bool m_help;


m_help is not initialized. Default-initialize it (e.g., bool m_help{};) so CMD_IF_HELP_PRINT_HELP() cannot read an indeterminate value if parsing fails or is bypassed.

Suggested change

bool m_help;

bool m_help{};

Copilot · 2026-02-06T19:30:40Z

src/windows/wslc/Utils.cpp

+    wslc::services::SessionService sessionService;
+    auto session = sessionService.CreateSession();
+
+    wslc::services::ImageService imageService;
+    Callback callback;
+    imageService.Pull(session, Image, &callback);


PullImpl creates a new session (sessionService.CreateSession()) instead of using the Session parameter that callers pass in. This breaks the expectation that pulls happen within the caller-provided session; please use the passed-in session (or remove the parameter and update call sites).

Suggested change

wslc::services::SessionService sessionService;

auto session = sessionService.CreateSession();

wslc::services::ImageService imageService;

Callback callback;

imageService.Pull(session, Image, &callback);

wslc::services::ImageService imageService;

Callback callback;

imageService.Pull(Session, Image, &callback);

Copilot · 2026-02-06T19:30:41Z

src/windows/wslc/ShellService.cpp

+        SessionInformation info;
+        info.CreatorPid = current.CreatorPid;
+        info.SessionId = current.SessionId;
+        info.DisplayName = current.DisplayName;


current.DisplayName can be null (the previous implementation explicitly handled null). Assigning a null wchar_t* into std::wstring is undefined behavior. Please guard against null and use an empty string when it is not provided.

Suggested change

info.DisplayName = current.DisplayName;

info.DisplayName = current.DisplayName ? current.DisplayName : L"";

Copilot · 2026-02-06T19:30:41Z

src/windows/wslc/SessionModel.cpp

+    options.MemoryMb = 2048;
+    options.BootTimeoutMs = 30 * 1000;
+    options.StoragePath = dataFolder.c_str();
+    options.MaximumStorageSizeMb = 10000; // 10GB.
+    options.NetworkingMode = WSLANetworkingModeNAT;


options.StoragePath is set from dataFolder.c_str(), but dataFolder is a local variable and its storage is freed when Default() returns, leaving a dangling pointer in the returned settings. The settings object needs to own the backing string (e.g., keep a std::wstring buffer inside SessionOptions).

src/windows/wslc/ContainerCommand.cpp

AmelBawa-msft added 27 commits January 27, 2026 18:25

Init

52d9194

Init new commands

bc4cc7d

Init image commands

2f073b4

CE

93dc4cd

Added a simple TablePrinter class

90b03d6

Initial draft for image list

b8c8573

Initial draft for image pull

435b093

Initial draft for container run

ae00f81

Initial draft for container create

c31f134

Initial draft for container start/stop/kill/delete/list

ba1a80e

Fix build

c349e5d

Initial draft for container exec

fdbf90d

Initial draft for container inspect

d6cffde

Update structure

1ae0d80

Enhance structure

ebde670

Generate a unique container name

4b6047c

Adding error messages

42c4e9a

Initial draft enhanced

69e4d6e

Fix exec

7c3acdc

Fix kill

4734e7f

Add image commands

0e712e9

Added shell command

8667a7a

Init session service

f6c5eb8

Fix bug

e1eb4d3

Added console service

0dd8ac0

print help for image commands

d892899

Added -a option to kill, delete and stop

ab48a55

AmelBawa-msft requested a review from a team as a code owner February 6, 2026 19:19

Copilot AI review requested due to automatic review settings February 6, 2026 19:19

Copilot started reviewing on behalf of AmelBawa-msft February 6, 2026 19:20 View session

Revert

7ba7004

JohnMcPMS reviewed Feb 6, 2026

View reviewed changes

Merge branch 'feature/wsl-for-apps' of https://github.com/microsoft/wsl…

2840e17

… into user/amelbawa/init

Copilot AI reviewed Feb 6, 2026

View reviewed changes

Resolve copilot comment

6992b8c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial Support for WSLC Commands #14171

Initial Support for WSLC Commands #14171

AmelBawa-msft commented Feb 6, 2026 •

edited

Loading

Uh oh!

JohnMcPMS Feb 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		#define CMD_ARG_REQUIRED(arg, msg) if (arg.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }
		#define CMD_ARG_ARRAY_REQUIRED(argArray, msg) if (argArray.empty()) { wslutil::PrintMessage(msg, stderr); PrintHelp(); return E_INVALIDARG; }

	(sessionManager->ListSessions(&sessions, sessions.size_address<ULONG>()));
	THROW_IF_FAILED(sessionManager->ListSessions(&sessions, sessions.size_address<ULONG>()));

	info.DisplayName = current.DisplayName;
	info.DisplayName = current.DisplayName ? current.DisplayName : L"";

Initial Support for WSLC Commands #14171

Are you sure you want to change the base?

Initial Support for WSLC Commands #14171

Conversation

AmelBawa-msft commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

🙌 Demo

🦞 Full implementation

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

JohnMcPMS Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

AmelBawa-msft commented Feb 6, 2026 •

edited

Loading