fix(qa): ignore unsafe Ubuntu VM fallbacks · openclaw/openclaw@2caf92a

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -89,15 +89,11 @@ export function resolveUbuntuVmName(requested: string, explicit = false): string`
`89`	`89`	`}`
`90`	`90`	`const fallback =`
`91`	`91`	`names`
`92`		`-.map((name) => ({ name, version: /ubuntu\s+(\d+(?:\.\d+)*)/i.exec(name)?.[1] }))`
`93`		`-.filter((item): item is { name: string; version: string } => Boolean(item.version))`
`94`		`-.map((item) => ({`
`95`		`-name: item.name,`
`96`		`-parts: item.version.split(".").map(Number),`
`97`		`-}))`
	`92`	`+.map((name) => ({ name, parts: parseUbuntuVersionParts(name) }))`
	`93`	`+.filter((item): item is { name: string; parts: number[] } => Boolean(item.parts))`
`98`	`94`	`.filter((item) => item.parts[0] >= 24)`
`99`	`95`	`.toSorted((a, b) => compareVersions(b.parts, a.parts))[0]?.name ??`
`100`		`-names.find((name) => /ubuntu/i.test(name));`
	`96`	`+names.find(isSafeUbuntuFallbackName);`
`101`	`97`	`if (!fallback) {`
`102`	`98`	die(`VM not found: ${requested}`);
`103`	`99`	`}`
`@@ -130,6 +126,23 @@ function listVms(timeoutMs = PRLCTL_STATUS_TIMEOUT_MS): PrlctlVmListItem[] {`
`130`	`126`	`) as PrlctlVmListItem[];`
`131`	`127`	`}`
`132`	`128`
	`129`	`+function parseUbuntuVersionParts(name: string): number[] \| undefined {`
	`130`	`+const version = /ubuntu\s+(\d+(?:\.\d+)*)/i.exec(name)?.[1];`
	`131`	`+const parts = version?.split(".").map((part) => Number(part));`
	`132`	`+if (!parts?.every((part) => Number.isSafeInteger(part))) {`
	`133`	`+return undefined;`
	`134`	`+}`
	`135`	`+return parts;`
	`136`	`+}`
	`137`	`+`
	`138`	`+function isSafeUbuntuFallbackName(name: string): boolean {`
	`139`	`+if (!/ubuntu/i.test(name)) {`
	`140`	`+return false;`
	`141`	`+}`
	`142`	`+const hasVersion = /ubuntu\s+\d+(?:\.\d+)*/i.test(name);`
	`143`	`+return !hasVersion \|\| Boolean(parseUbuntuVersionParts(name));`
	`144`	`+}`
	`145`	`+`
`133`	`146`	`function compareVersions(a: number[], b: number[]): number {`
`134`	`147`	`for (let index = 0; index < Math.max(a.length, b.length); index++) {`
`135`	`148`	`const diff = (a[index] ?? 0) - (b[index] ?? 0);`

Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,7 @@ set -euo pipefail`
`602`	`602`	`if [[ "$1" == "list" ]]; then`
`603`	`603`	`cat <<'JSON'`
`604`	`604`	`[`
	`605`	`+ {"name": "Ubuntu 9007199254740993.04"},`
`605`	`606`	`{"name": "Ubuntu 26.04"},`
`606`	`607`	`{"name": "Ubuntu 25.10"},`
`607`	`608`	`{"name": "Ubuntu 23.10"},`
`@@ -619,6 +620,7 @@ const isPrlctl = [process.argv0, process.execPath].some((value) =>`
`619`	`620`	`if (isPrlctl) {`
`620`	`621`	`if (process.argv.some((arg) => arg.includes("list"))) {`
`621`	`622`	`console.log(JSON.stringify([`
	`623`	`+ { name: "Ubuntu 9007199254740993.04" },`
`622`	`624`	`{ name: "Ubuntu 26.04" },`
`623`	`625`	`{ name: "Ubuntu 25.10" },`
`624`	`626`	`{ name: "Ubuntu 23.10" },`
`@@ -640,6 +642,49 @@ if (isPrlctl) {`
`640`	`642`	`}`
`641`	`643`	`});`
`642`	`644`
	`645`	`+it("skips unsafe Ubuntu version names in fallback resolver", () => {`
	`646`	`+const tempDir = mkdtempSync(join(tmpdir(), "openclaw-parallels-vm-helper-"));`
	`647`	`+writeFakePrlctl(`
	`648`	`+tempDir,`
	`649`	+`#!/usr/bin/env bash
	`650`	`+set -euo pipefail`
	`651`	`+if [[ "$1" == "list" ]]; then`
	`652`	`+ cat <<'JSON'`
	`653`	`+[`
	`654`	`+ {"name": "Ubuntu 9007199254740993.04"},`
	`655`	`+ {"name": "Ubuntu 23.10"}`
	`656`	`+]`
	`657`	`+JSON`
	`658`	`+ exit 0`
	`659`	`+fi`
	`660`	`+exit 1`
	`661`	+`,
	`662`	+`import { basename } from "node:path";
	`663`	`+const isPrlctl = [process.argv0, process.execPath].some((value) =>`
	`664`	`+ basename(value).toLowerCase() === "prlctl.exe",`
	`665`	`+);`
	`666`	`+if (isPrlctl) {`
	`667`	`+ if (process.argv.some((arg) => arg.includes("list"))) {`
	`668`	`+ console.log(JSON.stringify([`
	`669`	`+ { name: "Ubuntu 9007199254740993.04" },`
	`670`	`+ { name: "Ubuntu 23.10" },`
	`671`	`+ ]));`
	`672`	`+ process.exit(0);`
	`673`	`+ }`
	`674`	`+ process.exit(1);`
	`675`	`+}`
	`676`	+`,
	`677`	`+);`
	`678`	`+`
	`679`	`+try {`
	`680`	`+const output = withEnv(fakePrlctlEnv(tempDir), () => resolveUbuntuVmName("Ubuntu missing"));`
	`681`	`+`
	`682`	`+expect(output).toBe("Ubuntu 23.10");`
	`683`	`+} finally {`
	`684`	`+rmSync(tempDir, { force: true, recursive: true });`
	`685`	`+}`
	`686`	`+});`
	`687`	`+`
`643`	`688`	`it("uses the only macOS VM when the default name is unavailable", () => {`
`644`	`689`	`const tempDir = mkdtempSync(join(tmpdir(), "openclaw-parallels-macos-vm-helper-"));`
`645`	`690`	`writeFakePrlctl(`

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

推荐订阅源

Recent Commits to openclaw:main