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, 14 insertions, 3 deletions

diff --git a/xmake.lua b/xmake.lua
index 30f3d3411..8200f6991 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -208,7 +208,7 @@ set_policy("package.precompiled", false)
 
 add_defines("gsl_FEATURE_GSL_COMPATIBILITY_MODE=1") 
 add_requires("gsl-lite", {system = false})
-add_requires("http_parser", {system = false})
+add_requires("llhttp", {system = false})
 add_requires("json11", {system = false})
 add_requires("lua", {system = false})
 add_requires("lz4", {system = false})
@@ -329,6 +329,10 @@ if is_os("windows") then
         add_cxxflags("/Zc:u8EscapeEncoding")        -- Enable UTF-8 encoding for u8 string literals (clang does this by default)
         add_cxxflags("/Zc:preprocessor")            -- Enable preprocessor conformance mode
         add_cxxflags("/Zc:inline")                  -- Enforce inline semantics
+        if is_mode("release") then
+            add_cflags("/Zo")                       -- better debug info for optimized code
+            add_cxxflags("/Zo")                     -- better debug info for optimized code
+        end
     end
 
     -- add_ldflags("/MAP")
@@ -404,6 +408,13 @@ option("zenrpmalloc")
 option_end()
 add_define_by_config("ZEN_USE_RPMALLOC", "zenrpmalloc")
 
+option("zenlibsecret")
+    set_default(false)
+    set_showmenu(true)
+    set_description("Use libsecret (Secret Service / gnome-keyring) on Linux for zen auth key wrapping. Requires libsecret-1-dev at build time.")
+option_end()
+add_define_by_config("ZEN_USE_LIBSECRET", "zenlibsecret")
+
 if is_os("windows") then
     option("httpsys")
         set_default(true)
@@ -462,6 +473,7 @@ option("zentrace")
 option_end()
 add_define_by_config("ZEN_WITH_TRACE", "zentrace")
 
+
 set_warnings("allextra", "error")
 set_languages("cxx20")
 
@@ -501,7 +513,6 @@ end
 if has_config("zennomad") then
     includes("src/zennomad")
 end
-includes("src/zens3-testbed")
 includes("src/zenstore",            "src/zenstore-test")
 includes("src/zentelemetry",        "src/zentelemetry-test")
 includes("src/zenutil",             "src/zenutil-test")
@@ -509,7 +520,7 @@ if is_plat("windows") then
     includes("src/zenvfs")
 end
 includes("src/zenserver",           "src/zenserver-test")
-includes("src/zen")
+includes("src/zen",                 "src/zen-test")
 includes("src/zentest-appstub")
 
 --------------------------------------------------------------------------