CLI: resolve parent/subcommand option collisions (#18725)

Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: b7e51cf90950cdd3049ac3c7a3a949717b8ba261
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras

src/cli/update-cli.option-collisions.test.ts

@@ -0,0 +1,68 @@
+import { Command } from "commander";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const updateCommand = vi.fn(async () => {});
+const updateStatusCommand = vi.fn(async () => {});
+const updateWizardCommand = vi.fn(async () => {});
+
+const defaultRuntime = {
+  log: vi.fn(),
+  error: vi.fn(),
+  exit: vi.fn(),
+};
+
+vi.mock("./update-cli/update-command.js", () => ({
+  updateCommand: (opts: unknown) => updateCommand(opts),
+}));
+
+vi.mock("./update-cli/status.js", () => ({
+  updateStatusCommand: (opts: unknown) => updateStatusCommand(opts),
+}));
+
+vi.mock("./update-cli/wizard.js", () => ({
+  updateWizardCommand: (opts: unknown) => updateWizardCommand(opts),
+}));
+
+vi.mock("../runtime.js", () => ({
+  defaultRuntime,
+}));
+
+describe("update cli option collisions", () => {
+  beforeEach(() => {
+    updateCommand.mockClear();
+    updateStatusCommand.mockClear();
+    updateWizardCommand.mockClear();
+    defaultRuntime.log.mockClear();
+    defaultRuntime.error.mockClear();
+    defaultRuntime.exit.mockClear();
+  });
+
+  it("forwards parent-captured --json/--timeout to `update status`", async () => {
+    const { registerUpdateCli } = await import("./update-cli.js");
+    const program = new Command();
+    registerUpdateCli(program);
+
+    await program.parseAsync(["update", "status", "--json", "--timeout", "9"], { from: "user" });
+
+    expect(updateStatusCommand).toHaveBeenCalledWith(
+      expect.objectContaining({
+        json: true,
+        timeout: "9",
+      }),
+    );
+  });
+
+  it("forwards parent-captured --timeout to `update wizard`", async () => {
+    const { registerUpdateCli } = await import("./update-cli.js");
+    const program = new Command();
+    registerUpdateCli(program);
+
+    await program.parseAsync(["update", "wizard", "--timeout", "13"], { from: "user" });
+
+    expect(updateWizardCommand).toHaveBeenCalledWith(
+      expect.objectContaining({
+        timeout: "13",
+      }),
+    );
+  });
+});