Merge branch 'main' into sb/zen-helpsb/zen-help

- Combine HelpCommand (this branch) with HistoryCommand (main) in zen CLI dispatcher
- Keep filter-aware TuiPickOne rewrite; adopt main's ASCII arrow glyphs in doc comment

1 files changed, 22 insertions, 36 deletions

diff --git a/src/zen/cmds/workspaces_cmd.cpp b/src/zen/cmds/workspaces_cmd.cpp
index 9e49b464e..3ab3b9e04 100644
--- a/src/zen/cmds/workspaces_cmd.cpp
+++ b/src/zen/cmds/workspaces_cmd.cpp
@@ -2,6 +2,8 @@
 
 #include "workspaces_cmd.h"
 
+#include "zenserviceclient.h"
+
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
@@ -137,7 +139,7 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		throw OptionParseException("'verb' option is required", m_Options.help());
 	}
 
-	// Parse subcommand permissively — forward unrecognised options to the parent parser.
+	// Parse subcommand permissively - forward unrecognised options to the parent parser.
 	std::vector<std::string> SubUnmatched;
 	if (!ParseOptionsPermissive(*SubOption, gsl::narrow<int>(SubCommandArguments.size()), SubCommandArguments.data(), SubUnmatched))
 	{
@@ -159,8 +161,6 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		return;
 	}
 
-	m_HostName = ResolveTargetHostSpec(m_HostName);
-
 	if (m_SystemRootDir.empty())
 	{
 		m_SystemRootDir = PickDefaultSystemRootDirectory();
@@ -199,7 +199,8 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		{
 			if (!m_HostName.empty())
 			{
-				HttpClient Http = CreateHttpClient(m_HostName);
+				ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+				HttpClient&		 Http = Service.Http();
 				if (HttpClient::Response Result = Http.Get("/ws/refresh"); !Result)
 				{
 					ZEN_CONSOLE_WARN("Failed to refresh workspaces for host {}. Reason: '{}'", m_HostName, Result.ErrorMessage(""sv));
@@ -271,7 +272,8 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		{
 			if (!m_HostName.empty())
 			{
-				HttpClient Http = CreateHttpClient(m_HostName);
+				ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+				HttpClient&		 Http = Service.Http();
 				if (HttpClient::Response Result = Http.Get("/ws/refresh"); !Result)
 				{
 					ZEN_CONSOLE_WARN("Failed to refresh workspaces for host {}. Reason: '{}'", m_HostName, Result.ErrorMessage(""sv));
@@ -403,7 +405,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 		throw OptionParseException("'verb' option is required", m_Options.help());
 	}
 
-	// Parse subcommand permissively — forward unrecognised options to the parent parser.
+	// Parse subcommand permissively - forward unrecognised options to the parent parser.
 	std::vector<std::string> SubUnmatched;
 	if (!ParseOptionsPermissive(*SubOption, gsl::narrow<int>(SubCommandArguments.size()), SubCommandArguments.data(), SubUnmatched))
 	{
@@ -425,8 +427,6 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 		return;
 	}
 
-	m_HostName = ResolveTargetHostSpec(m_HostName);
-
 	if (m_SystemRootDir.empty())
 	{
 		m_SystemRootDir = PickDefaultSystemRootDirectory();
@@ -509,7 +509,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 		{
 			if (!m_HostName.empty())
 			{
-				HttpClient Http = CreateHttpClient(m_HostName);
+				ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+				HttpClient&		 Http = Service.Http();
 				if (HttpClient::Response Result = Http.Get("/ws/refresh"); !Result)
 				{
 					ZEN_CONSOLE_WARN("Failed to refresh workspaces for host {}. Reason: '{}'", m_HostName, Result.ErrorMessage(""sv));
@@ -626,7 +627,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 		{
 			if (!m_HostName.empty())
 			{
-				HttpClient Http = CreateHttpClient(m_HostName);
+				ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+				HttpClient&		 Http = Service.Http();
 				if (HttpClient::Response Result = Http.Get("/ws/refresh"); !Result)
 				{
 					ZEN_CONSOLE_WARN("Failed to refresh workspaces for host {}. Reason: '{}'", m_HostName, Result.ErrorMessage(""sv));
@@ -674,12 +676,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			Params.Entries.insert_or_assign("refresh", ToString(m_Refresh));
 		}
 
-		if (m_HostName.empty())
-		{
-			throw OptionParseException("Unable to resolve server specification", SubOption->help());
-		}
-
-		HttpClient Http = CreateHttpClient(m_HostName);
+		ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+		HttpClient&		 Http = Service.Http();
 		if (HttpClient::Response Result = Http.Get(fmt::format("/ws/{}/files", GetShareIdentityUrl(m_FilesOptions)), {}, Params))
 		{
 			ZEN_CONSOLE("{}: {}", Result, Result.ToText());
@@ -707,12 +705,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			Params.Entries.insert_or_assign("refresh", ToString(m_Refresh));
 		}
 
-		if (m_HostName.empty())
-		{
-			throw OptionParseException("Unable to resolve server specification", SubOption->help());
-		}
-
-		HttpClient Http = CreateHttpClient(m_HostName);
+		ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+		HttpClient&		 Http = Service.Http();
 		if (HttpClient::Response Result = Http.Get(fmt::format("/ws/{}/entries", GetShareIdentityUrl(m_EntriesOptions)), {}, Params))
 		{
 			ZEN_CONSOLE("{}: {}", Result, Result.ToText());
@@ -777,18 +771,14 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 
 	if (SubOption == &m_GetChunkOptions)
 	{
-		if (m_HostName.empty())
-		{
-			throw OptionParseException("Unable to resolve server specification", SubOption->help());
-		}
-
 		if (m_ChunkId.empty())
 		{
 			throw OptionParseException("'--chunk' is required", SubOption->help());
 		}
 
-		HttpClient Http = CreateHttpClient(m_HostName);
-		m_ChunkId		= ChunksToOidStrings(Http, m_WorkspaceId, m_ShareId, std::vector<std::string>{m_ChunkId})[0];
+		ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+		HttpClient&		 Http = Service.Http();
+		m_ChunkId			  = ChunksToOidStrings(Http, m_WorkspaceId, m_ShareId, std::vector<std::string>{m_ChunkId})[0];
 
 		HttpClient::KeyValueMap Params;
 		if (m_Offset != 0)
@@ -813,11 +803,6 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 
 	if (SubOption == &m_GetChunkBatchOptions)
 	{
-		if (m_HostName.empty())
-		{
-			throw OptionParseException("Unable to resolve server specification", SubOption->help());
-		}
-
 		if (m_ShareId.empty())
 		{
 			throw OptionParseException("'--share' is required", SubOption->help());
@@ -828,8 +813,9 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			throw OptionParseException("'--chunks' is required", SubOption->help());
 		}
 
-		HttpClient Http = CreateHttpClient(m_HostName);
-		m_ChunkIds		= ChunksToOidStrings(Http, m_WorkspaceId, m_ShareId, m_ChunkIds);
+		ZenServiceClient Service({.HostSpec = m_HostName, .CommandName = Name});
+		HttpClient&		 Http = Service.Http();
+		m_ChunkIds			  = ChunksToOidStrings(Http, m_WorkspaceId, m_ShareId, m_ChunkIds);
 
 		std::vector<RequestChunkEntry> ChunkRequests;
 		ChunkRequests.resize(m_ChunkIds.size());