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, 10 insertions, 0 deletions

diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index f5286e9ee..995ff054f 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <zencore/basicfile.h>
+#include <zencore/logging/sink.h>
 #include <zencore/system.h>
 #include <zenhttp/httpserver.h>
 #include <zenhttp/httpstats.h>
@@ -27,6 +28,8 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
+class HttpSessionsService;
+class SessionsService;
 struct FLLMTag;
 extern const FLLMTag& GetZenserverTag();
 
@@ -57,6 +60,7 @@ protected:
 	int	 Initialize(const ZenServerConfig& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry);
 	void Finalize();
 	void ShutdownServices();
+	void StartSelfSession(std::string_view AppName);
 	void GetBuildOptions(StringBuilderBase& OutOptions, char Separator = ',') const;
 	static std::vector<std::pair<std::string_view, std::string>> BuildSettingsList(const ZenServerConfig& ServerConfig);
 	void														 LogSettingsSummary(const ZenServerConfig& ServerConfig);
@@ -104,6 +108,11 @@ protected:
 	HttpStatusService	 m_StatusService;
 	SystemMetricsTracker m_MetricsTracker;
 
+	// Sessions (shared by all derived servers)
+	std::unique_ptr<SessionsService>	 m_SessionsService;
+	std::unique_ptr<HttpSessionsService> m_HttpSessionsService;
+	logging::SinkPtr					 m_InProcSessionLogSink;
+
 	// Stats reporting
 
 	StatsReporter	   m_StatsReporter;
@@ -137,6 +146,7 @@ protected:
 	virtual void HandleStatusRequest(HttpServerRequest& Request) override;
 
 private:
+	void InitializeSessions();
 	void InitializeSecuritySettings(const ZenServerConfig& ServerOptions);
 };
 class ZenServerMain