fix(cli): do not hoist a bare parent value option with no following value

ml12580 · ml12580 · commit 83bf4222dcec · 2026-06-24T14:34:33.000+08:00
diff --git a/extensions/browser/src/cli/browser-cli.lazy.test.ts b/extensions/browser/src/cli/browser-cli.lazy.test.ts
@@ -209,6 +209,43 @@ describe("registerBrowserCli lazy browser subcommands", () => {
     expect(tabsCommand.parent?.opts().browserProfile).toBe("remote");
   });
 
+  it("preserves the missing-value error for a bare --browser-profile after the subcommand (#55563 regression 1)", async () => {
+    // A bare parent value option with no following value must not be hoisted
+    // alone: hoisting `--browser-profile` before `tabs` would let Commander
+    // consume `tabs` as the profile value. Leaving it in place preserves the
+    // missing-value/unknown-option error and the tabs action never runs.
+    const program = new Command();
+    program.name("openclaw");
+    program.enablePositionalOptions();
+
+    registerBrowserCli(program, ["node", "openclaw", "browser", "tabs", "--browser-profile"]);
+
+    await expect(
+      program.parseAsync(["browser", "tabs", "--browser-profile"], { from: "user" }),
+    ).rejects.toThrow();
+    expect(manageMocks.tabsAction).not.toHaveBeenCalled();
+  });
+
+  it("preserves the missing-value error when --browser-profile is followed by another flag (#55563 regression 1)", async () => {
+    const program = new Command();
+    program.name("openclaw");
+    program.enablePositionalOptions();
+
+    registerBrowserCli(program, [
+      "node",
+      "openclaw",
+      "browser",
+      "tabs",
+      "--browser-profile",
+      "--json",
+    ]);
+
+    await expect(
+      program.parseAsync(["browser", "tabs", "--browser-profile", "--json"], { from: "user" }),
+    ).rejects.toThrow();
+    expect(manageMocks.tabsAction).not.toHaveBeenCalled();
+  });
+
   it("skips browser option values when selecting the lazy command group", async () => {
     const program = new Command();
     program.name("openclaw");
diff --git a/src/cli/program/helpers.test.ts b/src/cli/program/helpers.test.ts
@@ -243,6 +243,47 @@ describe("hoistParentOptionsBeforeSubcommand", () => {
     ]);
   });
 
+  it("does not hoist a bare value option with no following value", () => {
+    const { browser, tabs } = buildBrowserTree();
+    const argv = ["node", "openclaw", "browser", "tabs", "--browser-profile"];
+    expect(
+      hoistParentOptionsBeforeSubcommand({
+        argv,
+        parentCommand: browser,
+        subcommandName: "tabs",
+        subcommandCommand: tabs,
+      }),
+    ).toEqual(argv);
+  });
+
+  it("does not hoist a value option followed by another flag", () => {
+    // The bare `--browser-profile` (no following value) is left in place so the
+    // missing-value error is preserved; the trailing `--json` is a valid parent
+    // boolean option and is still hoisted before the subcommand.
+    const { browser, tabs } = buildBrowserTree();
+    expect(
+      hoistParentOptionsBeforeSubcommand({
+        argv: ["node", "openclaw", "browser", "tabs", "--browser-profile", "--json"],
+        parentCommand: browser,
+        subcommandName: "tabs",
+        subcommandCommand: tabs,
+      }),
+    ).toEqual(["node", "openclaw", "browser", "--json", "tabs", "--browser-profile"]);
+  });
+
+  it("does not hoist an empty --flag= form", () => {
+    const { browser, tabs } = buildBrowserTree();
+    const argv = ["node", "openclaw", "browser", "tabs", "--browser-profile="];
+    expect(
+      hoistParentOptionsBeforeSubcommand({
+        argv,
+        parentCommand: browser,
+        subcommandName: "tabs",
+        subcommandCommand: tabs,
+      }),
+    ).toEqual(argv);
+  });
+
   it("returns argv unchanged when the parent command is the root", () => {
     const root = new Command().name("openclaw").option("--json", "", false);
     root.command("status");
diff --git a/src/cli/program/helpers.ts b/src/cli/program/helpers.ts
@@ -169,7 +169,12 @@ function consumeHoistableOption(
   if (equalsIndex !== -1) {
     return arg.slice(equalsIndex + 1).trim() ? 1 : 0;
   }
-  return isHoistableValueToken(args[index + 1]) ? 2 : 1;
+  // A parent value option without a real following value (bare flag at the
+  // end, or followed by another flag) must NOT be hoisted alone: hoisting the
+  // bare flag before the subcommand would let Commander consume the next token
+  // (e.g. the subcommand name) as the option value on reparse, swallowing the
+  // missing-argument error. Leave it in place so Commander reports the error.
+  return isHoistableValueToken(args[index + 1]) ? 2 : 0;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,12 @@ function consumeHoistableOption(`
`169`	`169`	`if (equalsIndex !== -1) {`
`170`	`170`	`return arg.slice(equalsIndex + 1).trim() ? 1 : 0;`
`171`	`171`	`}`
`172`		`- return isHoistableValueToken(args[index + 1]) ? 2 : 1;`
	`172`	`+ // A parent value option without a real following value (bare flag at the`
	`173`	`+ // end, or followed by another flag) must NOT be hoisted alone: hoisting the`
	`174`	`+ // bare flag before the subcommand would let Commander consume the next token`
	`175`	`+ // (e.g. the subcommand name) as the option value on reparse, swallowing the`
	`176`	`+ // missing-argument error. Leave it in place so Commander reports the error.`
	`177`	`+ return isHoistableValueToken(args[index + 1]) ? 2 : 0;`
`173`	`178`	`}`
`174`	`179`
`175`	`180`	`/**`