negodiy/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(cli): resolve --url option collision in browser cookies set

Browse Source 
When addGatewayClientOptions registers --url on the parent browser
command, Commander.js captures it before the cookies set subcommand
can receive it. Switch from requiredOption to option and resolve
via inheritOptionFromParent, matching the existing pattern used
for --target-id.

Fixes #24811

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
(cherry picked from commit 96fcb963ec6ef4254898aa2afa91d85b61ce677a)
This commit is contained in:
HCL
2026-02-24 12:04:06 +08:00
committed by Peter Steinberger
parent d51a4695f0
commit 24e52f53e4
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/cli/browser-cli-state.option-collisions.test.ts
View File

@@ -26,12 +26,15 @@ vi.mock("../runtime.js", () => ({
}));
describe("browser state option collisions", () => {
const createBrowserProgram = () => {
const createBrowserProgram = ({ withGatewayUrl = false } = {}) => {
const program = new Command();
const browser = program
.command("browser")
.option("--browser-profile <name>", "Browser profile")
.option("--json", "Output JSON", false);
if (withGatewayUrl) {
browser.option("--url <url>", "Gateway WebSocket URL");
}
const parentOpts = (cmd: Command) => cmd.parent?.opts?.() as BrowserParentOpts;
registerBrowserStateCommands(browser, parentOpts);
return program;
@@ -79,6 +82,30 @@ describe("browser state option collisions", () => {
expect((request as { body?: { targetId?: string } }).body?.targetId).toBe("tab-1");
});
it("resolves --url via parent when addGatewayClientOptions captures it", async () => {
const program = createBrowserProgram({ withGatewayUrl: true });
await program.parseAsync(
["browser", "--url", "ws://gw", "cookies", "set", "session", "abc", "--url", "https://example.com"],
{ from: "user" },
);
const call = mocks.callBrowserRequest.mock.calls.at(-1);
expect(call).toBeDefined();
const request = call![1] as { body?: { cookie?: { url?: string } } };
expect(request.body?.cookie?.url).toBe("https://example.com");
});
it("inherits --url from parent when subcommand does not provide it", async () => {
const program = createBrowserProgram({ withGatewayUrl: true });
await program.parseAsync(
["browser", "--url", "https://inherited.example.com", "cookies", "set", "session", "abc"],
{ from: "user" },
);
const call = mocks.callBrowserRequest.mock.calls.at(-1);
expect(call).toBeDefined();
const request = call![1] as { body?: { cookie?: { url?: string } } };
expect(request.body?.cookie?.url).toBe("https://inherited.example.com");
});
it("accepts legacy parent `--json` by parsing payload via positional headers fallback", async () => {
const request = (await runBrowserCommandAndGetRequest([
"set",