fix(scripts): reject short flag values in benchmark CLIs ...

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ function parseFlagValue(flag: string): string \| undefined {`
`449`	`449`	`return undefined;`
`450`	`450`	`}`
`451`	`451`	`const value = process.argv[idx + 1];`
`452`		`-if (!value \|\| value.startsWith("--")) {`
	`452`	`+if (!value \|\| value.startsWith("-")) {`
`453`	`453`	throw new Error(`${flag} requires a value`);
`454`	`454`	`}`
`455`	`455`	`return value;`
`@@ -462,7 +462,8 @@ function hasFlag(flag: string): boolean {`
`462`	`462`	`function parseRepeatableFlag(flag: string): string[] {`
`463`	`463`	`const values: string[] = [];`
`464`	`464`	`for (let i = 0; i < process.argv.length; i += 1) {`
`465`		`-if (process.argv[i] === flag && process.argv[i + 1]) {`
	`465`	`+const value = process.argv[i + 1];`
	`466`	`+if (process.argv[i] === flag && value && !value.startsWith("-")) {`
`466`	`467`	`values.push(process.argv[i + 1]);`
`467`	`468`	`}`
`468`	`469`	`}`
`@@ -474,7 +475,7 @@ function validateCliArgs(argv: readonly string[] = process.argv.slice(2)): void`
`474`	`475`	`const arg = argv[index];`
`475`	`476`	`if (VALUE_FLAGS.has(arg)) {`
`476`	`477`	`const value = argv[index + 1];`
`477`		`-if (!value \|\| value.startsWith("--")) {`
	`478`	`+if (!value \|\| value.startsWith("-")) {`
`478`	`479`	throw new Error(`${arg} requires a value`);
`479`	`480`	`}`
`480`	`481`	`index += 1;`
`@@ -1161,12 +1162,12 @@ function readBenchmarkComparisonForTesting(`
`1161`	`1162`	`}`
`1162`	`1163`
`1163`	`1164`	`async function main(): Promise<void> {`
	`1165`	`+validateCliArgs();`
`1164`	`1166`	`if (hasFlag("--help")) {`
`1165`	`1167`	`printUsage();`
`1166`	`1168`	`return;`
`1167`	`1169`	`}`
`1168`	`1170`
`1169`		`-validateCliArgs();`
`1170`	`1171`	`const options = parseOptions();`
`1171`	`1172`	`if (options.compareBaseline \|\| options.compareCandidate) {`
`1172`	`1173`	`if (!options.compareBaseline \|\| !options.compareCandidate) {`

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class CliArgumentError extends Error {`
`33`	`33`
`34`	`34`	`function readValue(argv: string[], index: number, flag: string): string {`
`35`	`35`	`const value = argv[index + 1]?.trim() ?? "";`
`36`		`-if (!value \|\| value.startsWith("--")) {`
	`36`	`+if (!value \|\| value.startsWith("-")) {`
`37`	`37`	throw new CliArgumentError(`${flag} requires a value`);
`38`	`38`	`}`
`39`	`39`	`return value;`

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,16 @@ Options:`
`53`	`53`
`54`	`54`	`function readOptionValue(argv: readonly string[], index: number, arg: string) {`
`55`	`55`	`const value = argv[index + 1] ?? "";`
`56`		`-if (!value \|\| value.startsWith("--")) {`
	`56`	`+if (!value \|\| value.startsWith("-")) {`
`57`	`57`	throw new Error(`${arg} requires a value`);
`58`	`58`	`}`
`59`	`59`	`return value;`
`60`	`60`	`}`
`61`	`61`
	`62`	`+function isHelpRequest(argv: readonly string[]) {`
	`63`	`+return argv.length === 1 && (argv[0] === "--help" \|\| argv[0] === "-h");`
	`64`	`+}`
	`65`	`+`
`62`	`66`	`function parseOptions(argv: readonly string[]): ProducerOptions {`
`63`	`67`	`let artifactBase = "";`
`64`	`68`	`let repoRoot = process.cwd();`
`@@ -698,7 +702,7 @@ export async function runUxMatrixEvidenceProducer(options: ProducerOptions) {`
`698`	`702`	`if (import.meta.url === pathToFileURL(process.argv[1] ?? "").href) {`
`699`	`703`	`(async () => {`
`700`	`704`	`const cliArgs = process.argv.slice(2);`
`701`		`-if (cliArgs.includes("--help") \|\| cliArgs.includes("-h")) {`
	`705`	`+if (isHelpRequest(cliArgs)) {`
`702`	`706`	`console.log(usage());`
`703`	`707`	`return;`
`704`	`708`	`}`

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,34 @@ describe("bench-cli-startup", () => {`
`36`	`36`	`expect(result.stderr).not.toContain("\n at ");`
`37`	`37`	`});`
`38`	`38`
	`39`	`+it("rejects short flag values before running benchmarks", () => {`
	`40`	`+expect(() => testing.validateCliArgs(["--output", "-h"])).toThrow("--output requires a value");`
	`41`	`+expect(() => testing.validateCliArgs(["--case", "-h"])).toThrow("--case requires a value");`
	`42`	`+`
	`43`	`+const result = spawnSync(`
	`44`	`+process.execPath,`
	`45`	`+["--import", "tsx", "scripts/bench-cli-startup.ts", "--output", "-h"],`
	`46`	`+{`
	`47`	`+cwd: join(__dirname, "../.."),`
	`48`	`+encoding: "utf8",`
	`49`	`+},`
	`50`	`+);`
	`51`	`+`
	`52`	`+expect(result.status).toBe(1);`
	`53`	`+expect(result.stdout).toBe("");`
	`54`	`+expect(result.stderr.trim()).toBe("--output requires a value");`
	`55`	`+expect(result.stderr).not.toContain("Node.js");`
	`56`	`+expect(result.stderr).not.toContain("\n at ");`
	`57`	`+});`
	`58`	`+`
`39`	`59`	`it.runIf(process.platform !== "win32")(`
`40`	`60`	`"cleans timed-out benchmark process groups when the leader exits first",`
`41`	`61`	`() => {`
`42`	`62`	`const tempDirs = createTempDirTracker();`
`43`	`63`	`const tmpDir = tempDirs.make("openclaw-cli-startup-timeout-group-");`
`44`	`64`	`const entryPath = join(tmpDir, "entry.mjs");`
`45`	`65`	`const childPidPath = join(tmpDir, "child.pid");`
`46`		`-let childPid = 0;`
	`66`	`+let childPid: number \| undefined;`
`47`	`67`	`try {`
`48`	`68`	`writeFileSync(`
`49`	`69`	`entryPath,`
`@@ -93,7 +113,7 @@ describe("bench-cli-startup", () => {`
`93`	`113`	`expect(result.stderr).toContain("version sample 1: timed out");`
`94`	`114`	`expect(isProcessAlive(childPid)).toBe(false);`
`95`	`115`	`} finally {`
`96`		`-if (childPid && isProcessAlive(childPid)) {`
	`116`	`+if (childPid !== undefined && isProcessAlive(childPid)) {`
`97`	`117`	`process.kill(childPid, "SIGKILL");`
`98`	`118`	`}`
`99`	`119`	`tempDirs.cleanup();`

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,18 @@ describe("scripts/bench-model", () => {`
`47`	`47`	`expect(result.stderr).not.toContain("Missing ANTHROPIC_API_KEY");`
`48`	`48`	`});`
`49`	`49`
	`50`	`+it("rejects short flag values before checking provider credentials", () => {`
	`51`	`+expect(() => testing.parseArgs(["--prompt", "-h"])).toThrow("--prompt requires a value");`
	`52`	`+expect(() => testing.parseArgs(["--runs", "-h"])).toThrow("--runs requires a value");`
	`53`	`+`
	`54`	`+const result = runBenchModel(["--prompt", "-h"]);`
	`55`	`+`
	`56`	`+expect(result.status).toBe(1);`
	`57`	`+expect(result.stdout).toBe("");`
	`58`	`+expect(result.stderr.trim()).toBe("--prompt requires a value");`
	`59`	`+expect(result.stderr).not.toContain("Missing ANTHROPIC_API_KEY");`
	`60`	`+});`
	`61`	`+`
`50`	`62`	`it("prints help without checking provider credentials", () => {`
`51`	`63`	`const result = runBenchModel(["--help"]);`
`52`	`64`

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,20 @@ describe("QA UX Matrix evidence producer CLI", () => {`
`52`	`52`	`expectNoNodeStack(result.stderr);`
`53`	`53`	`});`
`54`	`54`
	`55`	`+it("reports short flag values without treating them as help", () => {`
	`56`	`+const artifactBaseResult = runCli("--artifact-base", "-h");`
	`57`	`+const repoRootResult = runCli("--artifact-base", "/tmp/openclaw-ux-test", "--repo-root", "-h");`
	`58`	`+`
	`59`	`+expect(artifactBaseResult.status).toBe(1);`
	`60`	`+expect(artifactBaseResult.stdout).toBe("");`
	`61`	`+expect(artifactBaseResult.stderr.trim()).toBe("--artifact-base requires a value");`
	`62`	`+expectNoNodeStack(artifactBaseResult.stderr);`
	`63`	`+expect(repoRootResult.status).toBe(1);`
	`64`	`+expect(repoRootResult.stdout).toBe("");`
	`65`	`+expect(repoRootResult.stderr.trim()).toBe("--repo-root requires a value");`
	`66`	`+expectNoNodeStack(repoRootResult.stderr);`
	`67`	`+});`
	`68`	`+`
`55`	`69`	`it("sanitizes local checkout paths from generated evidence artifacts", () => {`
`56`	`70`	`const artifactBase = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-ux-evidence-test-"));`
`57`	`71`	`const fakeRepoRoot = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-ux-repo-test-"));`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main