From dfbd5ae83079a909ab195cbcc63c17b63095f41f Mon Sep 17 00:00:00 2001
From: Matthias Osswald <mat.osswald@sap.com>
Date: Thu, 25 Jun 2026 09:46:25 +0200
Subject: [PATCH] feat(cli)!: Scope project/workspace yargs options per command

The yargs options --config / -c, --dependency-definition, --workspace-config,
and --workspace / -w were previously registered globally in base.js and shown
in --help for every command. Several commands silently ignored them:

  * ui5 config / init / versions did not load a project at all
  * ui5 add / remove / use only operate on ui5.yaml without workspace context

Move the option definitions into a new options.js helper module that exposes
applyProjectConfigOptions() and applyWorkspaceOptions(). Each command builder
now opts in to the option groups it actually consumes, and yargs' existing
strict mode rejects the options on commands that no longer accept them.

The shared last-value-wins dedupe coerce is exported as dedupeArray() so
commands can apply it to their own non-global options (framework-version,
dest, port, etc.) instead of relying on a central coerce list in base.js
that referenced options yargs only sees per-command.

BREAKING CHANGE: ui5 versions, ui5 init, and ui5 config no longer accept
--config, --dependency-definition, --workspace, or --workspace-config.
ui5 add, ui5 remove, and ui5 use no longer accept --workspace or
--workspace-config. Passing any of these to a command that does not
support them now fails with 'Unknown argument: <option>'.
---
 .../documentation/docs/updates/migrate-v5.md  |  18 +++-
 packages/cli/lib/cli/base.js                  |  55 +---------
 packages/cli/lib/cli/commands/add.js          |   2 +
 packages/cli/lib/cli/commands/build.js        |   7 ++
 packages/cli/lib/cli/commands/remove.js       |   2 +
 packages/cli/lib/cli/commands/serve.js        |   6 ++
 packages/cli/lib/cli/commands/tree.js         |   7 +-
 packages/cli/lib/cli/commands/use.js          |   2 +
 packages/cli/lib/cli/options.js               |  78 ++++++++++++++
 packages/cli/test/lib/cli/base.js             |  37 +++++++
 packages/cli/test/lib/cli/options.js          | 101 ++++++++++++++++++
 11 files changed, 260 insertions(+), 55 deletions(-)
 create mode 100644 packages/cli/lib/cli/options.js
 create mode 100644 packages/cli/test/lib/cli/options.js

diff --git a/internal/documentation/docs/updates/migrate-v5.md b/internal/documentation/docs/updates/migrate-v5.md
index 21a97e1ff62..bbc4c82a6ed 100644
--- a/internal/documentation/docs/updates/migrate-v5.md
+++ b/internal/documentation/docs/updates/migrate-v5.md
@@ -15,7 +15,9 @@ Or update your global install via: `npm i --global @ui5/cli@next`
 
 - **@ui5/cli: `ui5 init` defaults to Specification Version 5.0**
 
-- **Rename: Command Option `--cache-mode` is now `--snapshot-cache`**
+- **@ui5/cli: Option `--cache-mode` has been renamed to `--snapshot-cache`**
+
+- **@ui5/cli: Project/Workspace options are now scoped per command**
 
 - **@ui5/server: Live Reload is enabled by default for `ui5 serve`**
 
@@ -80,6 +82,20 @@ With UI5 CLI v5, the option `--cache-mode` (for commands `ui5 build` and `ui5 se
 
 When legacy `--cache-mode` is used, the behavior remains the same but a deprecation warning is logged. When both `--snapshot-cache` and `--cache-mode` are used, the `--snapshot-cache` flag always gets priority.
 
+## Project/Workspace Options Scoped per Command
+
+In previous versions, the options `--config` / `-c`, `--dependency-definition`, `--workspace-config`, and `--workspace` / `-w` were accepted by every UI5 CLI command. Several commands silently ignored them.
+
+With UI5 CLI v5, these options are now only accepted by commands that actually consume them. Passing them to other commands now fails with `Unknown argument: <option>`.
+
+| Command                       | `--config` / `--dependency-definition` | `--workspace` / `--workspace-config` |
+| ----------------------------- | -------------------------------------- | ------------------------------------ |
+| `ui5 build`, `serve`, `tree`  | ✓                                      | ✓                                    |
+| `ui5 add`, `remove`, `use`    | ✓                                      | —                                    |
+| `ui5 config`, `init`, `versions` | —                                   | —                                    |
+
+If you previously passed any of these options to a command that did not use them, remove them from your invocation.
+
 ## UI5 CLI Init Command
 
 The `ui5 init` command now generates projects with Specification Version 5.0 by default.
diff --git a/packages/cli/lib/cli/base.js b/packages/cli/lib/cli/base.js
index 260dd1d36b4..09626fda3a1 100644
--- a/packages/cli/lib/cli/base.js
+++ b/packages/cli/lib/cli/base.js
@@ -1,30 +1,11 @@
 import chalk from "chalk";
 import {isLogLevelEnabled} from "@ui5/logger";
 import ConsoleWriter from "@ui5/logger/writers/Console";
+import {dedupeArray} from "./options.js";
 
 export default function(cli) {
 	cli.usage("Usage: ui5 <command> [options]")
 		.demandCommand(1, "Command required")
-		.option("config", {
-			alias: "c",
-			describe: "Path to project configuration file in YAML format",
-			type: "string"
-		})
-		.option("dependency-definition", {
-			describe: "Path to a YAML file containing the project's dependency tree. " +
-		"This option will disable resolution of node package dependencies.",
-			type: "string"
-		})
-		.option("workspace-config", {
-			describe: "Path to workspace configuration file in YAML format",
-			type: "string"
-		})
-		.option("workspace", {
-			alias: "w",
-			describe: "Name of the workspace configuration to use",
-			default: "default",
-			type: "string"
-		})
 		.option("loglevel", {
 			alias: "log-level",
 			describe: "Set the logging level",
@@ -47,43 +28,11 @@ export default function(cli) {
 			default: false,
 			type: "boolean"
 		})
-		.coerce([
-			// base.js
-			"config", "dependency-definition", "workspace-config", "workspace", "log-level",
-
-			// tree.js, build.js & serve.js
-			"framework-version", "cache-mode",
-
-			// build.js
-			"dest",
-
-			// serve.js
-			"open", "port", "key", "cert",
-		], (arg) => {
-			// If an option is specified multiple times, yargs creates an array for all the values,
-			// independently of whether the option is of type "array" or "string".
-			// This is unexpected for options listed above, which should all only have only one definitive value.
-			// The yargs behavior could be disabled by using the parserConfiguration "duplicate-arguments-array": true
-			// However, yargs would then cease to create arrays for those options where we *do* expect the
-			// automatic creation of arrays in case the option is specified multiple times. Like "--include-task".
-			// Also see https://github.com/yargs/yargs/issues/1318
-			// Note: This is not necessary for options of type "boolean"
-			if (Array.isArray(arg)) {
-				// If the option is specified multiple times, use the value of the last option
-				return arg[arg.length - 1];
-			}
-			return arg;
-		})
+		.coerce(["log-level"], dedupeArray)
 		.showHelpOnFail(true)
 		.strict(true)
 		.alias("help", "h")
 		.alias("version", "v")
-		.example("ui5 <command> --dependency-definition /path/to/projectDependencies.yaml",
-			"Execute command using a static dependency tree instead of resolving node package dependencies")
-		.example("ui5 <command> --config /path/to/ui5.yaml",
-			"Execute command using a project configuration from custom path")
-		.example("ui5 <command> --workspace dolphin",
-			"Execute command using the 'dolphin' workspace of a ui5-workspace.yaml")
 		.example("ui5 <command> --log-level silly",
 			"Execute command with the maximum log output")
 		.fail(function(msg, err, yargs) {
diff --git a/packages/cli/lib/cli/commands/add.js b/packages/cli/lib/cli/commands/add.js
index d8943a6067c..f80bd60f7c7 100644
--- a/packages/cli/lib/cli/commands/add.js
+++ b/packages/cli/lib/cli/commands/add.js
@@ -1,5 +1,6 @@
 // Add
 import base from "../middlewares/base.js";
+import {applyProjectConfigOptions} from "../options.js";
 const addCommand = {
 	command: "add [--development] [--optional] <framework-libraries..>",
 	describe: "Add SAPUI5/OpenUI5 framework libraries to the project configuration.",
@@ -7,6 +8,7 @@ const addCommand = {
 };
 
 addCommand.builder = function(cli) {
+	applyProjectConfigOptions(cli);
 	return cli
 		.positional("framework-libraries", {
 			describe: "Framework library names",
diff --git a/packages/cli/lib/cli/commands/build.js b/packages/cli/lib/cli/commands/build.js
index cf99cf7a767..c8d218abc45 100644
--- a/packages/cli/lib/cli/commands/build.js
+++ b/packages/cli/lib/cli/commands/build.js
@@ -1,4 +1,5 @@
 import baseMiddleware from "../middlewares/base.js";
+import {applyProjectConfigOptions, applyWorkspaceOptions, dedupeArray} from "../options.js";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("cli:commands:build");
 
@@ -10,6 +11,8 @@ const build = {
 };
 
 build.builder = function(cli) {
+	applyProjectConfigOptions(cli);
+	applyWorkspaceOptions(cli);
 	return cli
 		.command("jsdoc", "Build JSDoc resources", {
 			handler: handleBuild,
@@ -97,6 +100,7 @@ build.builder = function(cli) {
 			choices: ["Default", "Force", "ReadOnly", "Off"],
 		})
 		.coerce("cache", (opt) => {
+			opt = dedupeArray(opt);
 			const lower = opt.toLowerCase();
 			if (lower === "readonly" || lower === "read-only") {
 				return "ReadOnly";
@@ -135,6 +139,7 @@ build.builder = function(cli) {
 			choices: ["Default", "Force", "Off"],
 		})
 		.coerce("cache-mode", (opt) => {
+			opt = dedupeArray(opt);
 			// Log a warning if this option is used
 			if (opt !== undefined) {
 				log.warn("As of UI5 CLI version 5, '--cache-mode' is renamed to '--snapshot-cache'. " +
@@ -172,8 +177,10 @@ build.builder = function(cli) {
 			choices: ["Default", "Flat", "Namespace"],
 		})
 		.coerce("output-style", (opt) => {
+			opt = dedupeArray(opt);
 			return opt.charAt(0).toUpperCase() + opt.slice(1).toLowerCase();
 		})
+		.coerce(["framework-version", "dest"], dedupeArray)
 		.example("ui5 build", "Preload build for project without dependencies")
 		.example("ui5 build self-contained", "Self-contained build for project")
 		.example("ui5 build --exclude-task=* --include-task=minify generateComponentPreload",
diff --git a/packages/cli/lib/cli/commands/remove.js b/packages/cli/lib/cli/commands/remove.js
index 3665c676f64..3a1e92853d1 100644
--- a/packages/cli/lib/cli/commands/remove.js
+++ b/packages/cli/lib/cli/commands/remove.js
@@ -1,5 +1,6 @@
 // Remove
 import baseMiddleware from "../middlewares/base.js";
+import {applyProjectConfigOptions} from "../options.js";
 
 const removeCommand = {
 	command: "remove <framework-libraries..>",
@@ -8,6 +9,7 @@ const removeCommand = {
 };
 
 removeCommand.builder = function(cli) {
+	applyProjectConfigOptions(cli);
 	return cli
 		.positional("framework-libraries", {
 			describe: "Framework library names",
diff --git a/packages/cli/lib/cli/commands/serve.js b/packages/cli/lib/cli/commands/serve.js
index 0446e8b82e9..da4974c7bde 100644
--- a/packages/cli/lib/cli/commands/serve.js
+++ b/packages/cli/lib/cli/commands/serve.js
@@ -2,6 +2,7 @@ import path from "node:path";
 import os from "node:os";
 import chalk from "chalk";
 import baseMiddleware from "../middlewares/base.js";
+import {applyProjectConfigOptions, applyWorkspaceOptions, dedupeArray} from "../options.js";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("cli:commands:serve");
 
@@ -13,6 +14,8 @@ const serve = {
 };
 
 serve.builder = function(cli) {
+	applyProjectConfigOptions(cli);
+	applyWorkspaceOptions(cli);
 	return cli
 		.option("port", {
 			describe: "Port to bind on (default for HTTP: 8080, HTTP/2: 8443)",
@@ -82,6 +85,7 @@ serve.builder = function(cli) {
 			choices: ["Default", "Force", "ReadOnly", "Off"],
 		})
 		.coerce("cache", (opt) => {
+			opt = dedupeArray(opt);
 			const lower = opt.toLowerCase();
 			if (lower === "readonly" || lower === "read-only") {
 				return "ReadOnly";
@@ -103,6 +107,7 @@ serve.builder = function(cli) {
 			choices: ["Default", "Force", "Off"],
 		})
 		.coerce("cache-mode", (opt) => {
+			opt = dedupeArray(opt);
 			// Log a warning if this option is used
 			if (opt !== undefined) {
 				log.warn("As of UI5 CLI version 5, '--cache-mode' is renamed to '--snapshot-cache'. " +
@@ -119,6 +124,7 @@ serve.builder = function(cli) {
 			defaultDescription: "Default", // Use "defaultDescription" to allow undefined (needed for evaluation)
 			choices: ["Default", "Force", "Off"],
 		})
+		.coerce(["framework-version", "open", "port", "key", "cert"], dedupeArray)
 		.example("ui5 serve", "Start a web server for the current project")
 		.example("ui5 serve --h2", "Enable the HTTP/2 protocol for the web server (requires SSL certificate)")
 		.example("ui5 serve --config /path/to/ui5.yaml", "Use the project configuration from a custom path")
diff --git a/packages/cli/lib/cli/commands/tree.js b/packages/cli/lib/cli/commands/tree.js
index 0c93af6c117..789ea741a94 100644
--- a/packages/cli/lib/cli/commands/tree.js
+++ b/packages/cli/lib/cli/commands/tree.js
@@ -1,5 +1,6 @@
 // Tree
 import baseMiddleware from "../middlewares/base.js";
+import {applyProjectConfigOptions, applyWorkspaceOptions, dedupeArray} from "../options.js";
 import chalk from "chalk";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("cli:commands:tree");
@@ -14,6 +15,8 @@ const tree = {
 };
 
 tree.builder = function(cli) {
+	applyProjectConfigOptions(cli);
+	applyWorkspaceOptions(cli);
 	return cli
 		.option("flat", {
 			describe: "Output a flat list of all dependencies instead of a tree hierarchy",
@@ -40,6 +43,7 @@ tree.builder = function(cli) {
 			choices: ["Default", "Force", "Off"],
 		})
 		.coerce("cache-mode", (opt) => {
+			opt = dedupeArray(opt);
 			// Log a warning if this option is used
 			if (opt !== undefined) {
 				log.warn("As of UI5 CLI version 5, '--cache-mode' is renamed to '--snapshot-cache'. " +
@@ -55,7 +59,8 @@ tree.builder = function(cli) {
 			type: "string",
 			defaultDescription: "Default", // Use "defaultDescription" to allow undefined (needed for evaluation)
 			choices: ["Default", "Force", "Off"],
-		});
+		})
+		.coerce(["framework-version"], dedupeArray);
 };
 
 tree.handler = async function(argv) {
diff --git a/packages/cli/lib/cli/commands/use.js b/packages/cli/lib/cli/commands/use.js
index f30f64d72b5..b06b0b684f9 100644
--- a/packages/cli/lib/cli/commands/use.js
+++ b/packages/cli/lib/cli/commands/use.js
@@ -1,5 +1,6 @@
 // Use
 import baseMiddleware from "../middlewares/base.js";
+import {applyProjectConfigOptions} from "../options.js";
 
 const useCommand = {
 	command: "use <framework-info>",
@@ -8,6 +9,7 @@ const useCommand = {
 };
 
 useCommand.builder = function(cli) {
+	applyProjectConfigOptions(cli);
 	return cli
 		.positional("framework-info", {
 			describe: "Framework name, version or both (name@version).\n" +
diff --git a/packages/cli/lib/cli/options.js b/packages/cli/lib/cli/options.js
new file mode 100644
index 00000000000..8c1412b4ca8
--- /dev/null
+++ b/packages/cli/lib/cli/options.js
@@ -0,0 +1,78 @@
+/**
+ * Shared yargs option factories used by the CLI commands.
+ *
+ * Project-graph related options are not relevant for every command (e.g. "ui5 versions"
+ * does not load a project). To keep the option definitions in a single place while only
+ * exposing them on commands that actually consume them, each command builder opts in
+ * to the option groups it needs via the helpers below.
+ */
+
+/**
+ * Coerce function that keeps only the last value when an option is specified multiple times.
+ *
+ * If an option is specified multiple times, yargs creates an array for all the values,
+ * independently of whether the option is of type "array" or "string".
+ * This is unexpected for the options listed in the helpers below, which should all
+ * only have one definitive value.
+ *
+ * The yargs behavior could be disabled by using the parserConfiguration
+ * "duplicate-arguments-array": true. However, yargs would then cease to create arrays
+ * for those options where we *do* expect the automatic creation of arrays in case the
+ * option is specified multiple times. Like "--include-task".
+ * Also see https://github.com/yargs/yargs/issues/1318
+ *
+ * Note: This is not necessary for options of type "boolean".
+ *
+ * @param {any} arg The yargs value (may be an array if the option was specified multiple times)
+ * @returns {any} The last value when arg is an array, otherwise arg unchanged
+ */
+export function dedupeArray(arg) {
+	if (Array.isArray(arg)) {
+		return arg[arg.length - 1];
+	}
+	return arg;
+}
+
+/**
+ * Adds the project configuration related options ("--config" / "-c" and
+ * "--dependency-definition") to the given yargs instance.
+ *
+ * @param {object} cli The yargs instance
+ * @returns {object} The yargs instance
+ */
+export function applyProjectConfigOptions(cli) {
+	return cli
+		.option("config", {
+			alias: "c",
+			describe: "Path to project configuration file in YAML format",
+			type: "string"
+		})
+		.option("dependency-definition", {
+			describe: "Path to a YAML file containing the project's dependency tree. " +
+				"This option will disable resolution of node package dependencies.",
+			type: "string"
+		})
+		.coerce(["config", "dependency-definition"], dedupeArray);
+}
+
+/**
+ * Adds the workspace related options ("--workspace-config" and "--workspace" / "-w")
+ * to the given yargs instance.
+ *
+ * @param {object} cli The yargs instance
+ * @returns {object} The yargs instance
+ */
+export function applyWorkspaceOptions(cli) {
+	return cli
+		.option("workspace-config", {
+			describe: "Path to workspace configuration file in YAML format",
+			type: "string"
+		})
+		.option("workspace", {
+			alias: "w",
+			describe: "Name of the workspace configuration to use",
+			default: "default",
+			type: "string"
+		})
+		.coerce(["workspace-config", "workspace"], dedupeArray);
+}
diff --git a/packages/cli/test/lib/cli/base.js b/packages/cli/test/lib/cli/base.js
index fc4597b0dcc..872c5df8153 100644
--- a/packages/cli/test/lib/cli/base.js
+++ b/packages/cli/test/lib/cli/base.js
@@ -280,3 +280,40 @@ test.serial("ui5 --no-update-notifier", async (t) => {
 	t.regex(stdout, /@ui5\/cli:/, "Output includes version information");
 	t.false(failed, "Command should not fail");
 });
+
+// Strict-rejection tests for project/workspace options on commands that should not accept them.
+// These commands do not load a project graph, so the corresponding global options have been
+// removed from their builders in UI5 CLI v5.
+[
+	{command: "versions", flag: "--config", value: "foo"},
+	{command: "versions", flag: "--dependency-definition", value: "foo"},
+	{command: "versions", flag: "--workspace", value: "foo"},
+	{command: "versions", flag: "--workspace-config", value: "foo"},
+	{command: "init", flag: "--config", value: "foo"},
+	{command: "init", flag: "--workspace", value: "foo"},
+	{command: "config", flag: "--config", value: "foo", args: ["list"]},
+	{command: "config", flag: "--workspace", value: "foo", args: ["list"]},
+].forEach(({command, flag, value, args = []}) => {
+	test.serial(`ui5 ${command} ${flag}: rejects unknown argument`, async (t) => {
+		const {stderr, exitCode} = await ui5([command, ...args, flag, value], {reject: false});
+		t.is(exitCode, 1, "Command exits with error code 1");
+		t.regex(stripAnsi(stderr), new RegExp(`Unknown arguments?: .*\\b${flag.replace(/^--/, "")}\\b`),
+			"Stderr contains 'Unknown argument' message");
+	});
+});
+
+// Strict-rejection tests for workspace options on add/remove/use which do operate on ui5.yaml
+// but not within a workspace context.
+[
+	{command: "add", flag: "--workspace", value: "foo", args: ["sap.ui.core"]},
+	{command: "add", flag: "--workspace-config", value: "foo", args: ["sap.ui.core"]},
+	{command: "remove", flag: "--workspace", value: "foo", args: ["sap.ui.core"]},
+	{command: "use", flag: "--workspace", value: "foo", args: ["latest"]},
+].forEach(({command, flag, value, args}) => {
+	test.serial(`ui5 ${command} ${flag}: rejects unknown argument`, async (t) => {
+		const {stderr, exitCode} = await ui5([command, ...args, flag, value], {reject: false});
+		t.is(exitCode, 1, "Command exits with error code 1");
+		t.regex(stripAnsi(stderr), new RegExp(`Unknown arguments?: .*\\b${flag.replace(/^--/, "")}\\b`),
+			"Stderr contains 'Unknown argument' message");
+	});
+});
diff --git a/packages/cli/test/lib/cli/options.js b/packages/cli/test/lib/cli/options.js
new file mode 100644
index 00000000000..657aa4c2ce4
--- /dev/null
+++ b/packages/cli/test/lib/cli/options.js
@@ -0,0 +1,101 @@
+import test from "ava";
+import yargs from "yargs";
+import {
+	applyProjectConfigOptions,
+	applyWorkspaceOptions,
+	dedupeArray,
+} from "../../../lib/cli/options.js";
+
+function buildCli(applyFns) {
+	const cli = yargs().strict(true).exitProcess(false);
+	for (const apply of applyFns) {
+		apply(cli);
+	}
+	cli.command("test", "test command", () => {}, () => {});
+	cli.fail((msg) => {
+		throw new Error(msg);
+	});
+	return cli;
+}
+
+test("dedupeArray returns last value of array", (t) => {
+	t.is(dedupeArray(["a", "b", "c"]), "c");
+});
+
+test("dedupeArray returns scalar unchanged", (t) => {
+	t.is(dedupeArray("a"), "a");
+	t.is(dedupeArray(undefined), undefined);
+});
+
+test("applyProjectConfigOptions: --config and --dependency-definition accepted", async (t) => {
+	const cli = buildCli([applyProjectConfigOptions]);
+	const argv = await cli.parse(["test", "--config", "a.yaml", "--dependency-definition", "b.yaml"]);
+	t.is(argv.config, "a.yaml");
+	t.is(argv.dependencyDefinition, "b.yaml");
+});
+
+test("applyProjectConfigOptions: -c alias works", async (t) => {
+	const cli = buildCli([applyProjectConfigOptions]);
+	const argv = await cli.parse(["test", "-c", "a.yaml"]);
+	t.is(argv.config, "a.yaml");
+});
+
+test("applyProjectConfigOptions: --config specified twice keeps last value", async (t) => {
+	const cli = buildCli([applyProjectConfigOptions]);
+	const argv = await cli.parse(["test", "--config", "first.yaml", "--config", "second.yaml"]);
+	t.is(argv.config, "second.yaml");
+});
+
+test("applyProjectConfigOptions: rejects --workspace when workspace options not applied", (t) => {
+	const cli = buildCli([applyProjectConfigOptions]);
+	t.throws(() => cli.parse(["test", "--workspace", "foo"]), {
+		message: /Unknown argument: workspace/,
+	});
+});
+
+test("applyWorkspaceOptions: --workspace and --workspace-config accepted", async (t) => {
+	const cli = buildCli([applyWorkspaceOptions]);
+	const argv = await cli.parse(["test", "--workspace", "dolphin", "--workspace-config", "ws.yaml"]);
+	t.is(argv.workspace, "dolphin");
+	t.is(argv.workspaceConfig, "ws.yaml");
+});
+
+test("applyWorkspaceOptions: -w alias works", async (t) => {
+	const cli = buildCli([applyWorkspaceOptions]);
+	const argv = await cli.parse(["test", "-w", "dolphin"]);
+	t.is(argv.workspace, "dolphin");
+});
+
+test("applyWorkspaceOptions: --workspace defaults to 'default'", async (t) => {
+	const cli = buildCli([applyWorkspaceOptions]);
+	const argv = await cli.parse(["test"]);
+	t.is(argv.workspace, "default");
+});
+
+test("applyWorkspaceOptions: --workspace specified twice keeps last value", async (t) => {
+	const cli = buildCli([applyWorkspaceOptions]);
+	const argv = await cli.parse(["test", "--workspace", "first", "--workspace", "second"]);
+	t.is(argv.workspace, "second");
+});
+
+test("applyWorkspaceOptions: rejects --config when project-config options not applied", (t) => {
+	const cli = buildCli([applyWorkspaceOptions]);
+	t.throws(() => cli.parse(["test", "--config", "foo.yaml"]), {
+		message: /Unknown argument: config/,
+	});
+});
+
+test("Both helpers combined: all four options accepted", async (t) => {
+	const cli = buildCli([applyProjectConfigOptions, applyWorkspaceOptions]);
+	const argv = await cli.parse([
+		"test",
+		"--config", "a.yaml",
+		"--dependency-definition", "b.yaml",
+		"--workspace", "dolphin",
+		"--workspace-config", "ws.yaml",
+	]);
+	t.is(argv.config, "a.yaml");
+	t.is(argv.dependencyDefinition, "b.yaml");
+	t.is(argv.workspace, "dolphin");
+	t.is(argv.workspaceConfig, "ws.yaml");
+});