Add session default for session shell

Author: dkbennett

src/windows/wslc/commands/SessionShellCommand.cpp

@@ -24,7 +24,7 @@ namespace wsl::windows::wslc {
 std::vector<Argument> SessionShellCommand::GetArguments() const
 {
     return {
-        Argument::Create(ArgType::SessionId, true),
+        Argument::Create(ArgType::SessionId),
     };
 }
 
@@ -35,7 +35,7 @@ std::wstring SessionShellCommand::ShortDescription() const
 
 std::wstring SessionShellCommand::LongDescription() const
 {
-    return {L"Attaches to an active session."};
+    return {L"Attaches to an active session. If no session ID is provided, the default session will be used."};
 }
 
 void SessionShellCommand::ExecuteInternal(CLIExecutionContext& context) const

src/windows/wslc/services/SessionModel.cpp

@@ -23,7 +23,7 @@ SessionOptions SessionOptions::Default()
 
     // TODO: Have a configuration file for those.
     SessionOptions options{};
-    options.m_sessionSettings.DisplayName = L"wsla-cli";
+    options.m_sessionSettings.DisplayName = s_DefaultSessionName.data();
     options.m_sessionSettings.CpuCount = 4;
     options.m_sessionSettings.MemoryMb = 2048;
     options.m_sessionSettings.BootTimeoutMs = 30 * 1000;

src/windows/wslc/services/SessionModel.h

@@ -17,6 +17,9 @@ Module Name:
 #include <wslaservice.h>
 
 namespace wsl::windows::wslc::models {
+
+constexpr std::wstring_view s_DefaultSessionName = L"wsla-cli";
+
 struct Session
 {
     explicit Session(wil::com_ptr<IWSLASession> session) : m_session(std::move(session))

src/windows/wslc/tasks/SessionTasks.cpp

@@ -29,8 +29,17 @@ namespace wsl::windows::wslc::task {
 
 void AttachToSession(CLIExecutionContext& context)
 {
-    WI_ASSERT(context.Args.Contains(ArgType::SessionId));
-    context.ExitCode = SessionService::Attach(context.Args.Get<ArgType::SessionId>());
+    std::wstring sessionId;
+    if (context.Args.Contains(ArgType::SessionId))
+    {
+        sessionId = context.Args.Get<ArgType::SessionId>();
+    }
+    else
+    {
+        sessionId = models::s_DefaultSessionName.data();
+    }
+
+    context.ExitCode = SessionService::Attach(sessionId);
 }
 
 void CreateSession(CLIExecutionContext& context)

test/windows/wslc/CommandLineTestCases.h

@@ -32,6 +32,7 @@ COMMAND_LINE_TEST_CASE(L"session list --verbose --help", L"list", true)
 COMMAND_LINE_TEST_CASE(L"session list --notanarg", L"list", false)
 COMMAND_LINE_TEST_CASE(L"session list extraarg", L"list", false)
 COMMAND_LINE_TEST_CASE(L"session shell session1", L"shell", true)
+COMMAND_LINE_TEST_CASE(L"session shell", L"shell", true)
 
 // Container command tests
 COMMAND_LINE_TEST_CASE(L"container list", L"list", true)