fix: preserve root version alias for gateway binary rewrite

ogenev · ogenev · commit 4bc4ac3a65f9 · 2026-02-27T21:45:53.000+02:00
diff --git a/src/cli/run-main.test.ts b/src/cli/run-main.test.ts
@@ -100,6 +100,14 @@ describe("rewriteLegacyGatewayBinaryArgv", () => {
     expect(rewriteLegacyGatewayBinaryArgv(withLogLevel)).toBe(withLogLevel);
   });
 
+  it("keeps root version alias untouched for gateway binaries", () => {
+    const rootAlias = ["node", "/usr/local/bin/openclaw-gateway", "-v"];
+    expect(rewriteLegacyGatewayBinaryArgv(rootAlias)).toBe(rootAlias);
+
+    const withLogLevel = ["node", "/usr/local/bin/openclaw-gateway", "--log-level", "debug", "-v"];
+    expect(rewriteLegacyGatewayBinaryArgv(withLogLevel)).toBe(withLogLevel);
+  });
+
   it("injects gateway after known root flags for normal gateway command paths", () => {
     expect(
       rewriteLegacyGatewayBinaryArgv([
diff --git a/src/cli/run-main.ts b/src/cli/run-main.ts
@@ -40,6 +40,16 @@ function isLegacyGatewayBinary(entryPath: string | undefined): boolean {
 
 const ROOT_BOOLEAN_FLAGS = new Set(["--dev", "--no-color"]);
 const ROOT_VALUE_FLAGS = new Set(["--profile", "--log-level"]);
+const LEGACY_GATEWAY_PASSTHROUGH_TOKENS = new Set([
+  "gateway",
+  "update",
+  "--update",
+  "-h",
+  "--help",
+  "-v",
+  "-V",
+  "--version",
+]);
 
 function resolveLegacyGatewayCommandToken(argv: string[]): {
   commandToken: string | undefined;
@@ -74,7 +84,7 @@ export function rewriteLegacyGatewayBinaryArgv(argv: string[]): string[] {
     return argv;
   }
   const { commandToken, commandIndex } = resolveLegacyGatewayCommandToken(argv);
-  if (commandToken === "gateway" || commandToken === "update" || commandToken === "--update") {
+  if (commandToken && LEGACY_GATEWAY_PASSTHROUGH_TOKENS.has(commandToken)) {
     return argv;
   }
   const next = [...argv];
