fix(qa-lab): resolve Windows taskkill path · openclaw/ope...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -1025,11 +1025,12 @@ describe("buildQaRuntimeEnv", () => {`
`1025`	`1025`	`runTaskkill,`
`1026`	`1026`	`);`
`1027`	`1027`
`1028`		`-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {`
	`1028`	`+const taskkillPath = path.win32.join("C:\\Windows", "System32", "taskkill.exe");`
	`1029`	`+expect(runTaskkill).toHaveBeenNthCalledWith(1, taskkillPath, ["/PID", "12345", "/T"], {`
`1029`	`1030`	`stdio: "ignore",`
`1030`	`1031`	`windowsHide: true,`
`1031`	`1032`	`});`
`1032`		`-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {`
	`1033`	`+expect(runTaskkill).toHaveBeenNthCalledWith(2, taskkillPath, ["/PID", "12345", "/T", "/F"], {`
`1033`	`1034`	`stdio: "ignore",`
`1034`	`1035`	`windowsHide: true,`
`1035`	`1036`	`});`

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ import { stageQaMockAuthProfiles } from "./providers/shared/mock-auth.js";`
`50`	`50`	`import { seedQaAgentWorkspace } from "./qa-agent-workspace.js";`
`51`	`51`	`import { buildQaGatewayConfig, type QaThinkingLevel } from "./qa-gateway-config.js";`
`52`	`52`	`import type { QaTransportAdapter } from "./qa-transport.js";`
	`53`	`+import { resolveQaWindowsSystem32ExePath } from "./windows-system-tools.js";`
`53`	`54`
`54`	`55`	`export type { QaCliBackendAuthMode } from "./providers/env.js";`
`55`	`56`	`const QA_GATEWAY_CHILD_STARTUP_MAX_ATTEMPTS = 5;`
`@@ -398,19 +399,20 @@ function signalQaGatewayWindowsProcessTree(`
`398`	`399`	`signal: NodeJS.Signals,`
`399`	`400`	`runTaskkill: QaGatewayTaskkillRunner = spawnSync,`
`400`	`401`	`) {`
	`402`	`+const taskkillPath = resolveQaWindowsSystem32ExePath("taskkill.exe");`
`401`	`403`	`const args = ["/PID", String(pid), "/T"];`
`402`	`404`	`if (signal === "SIGKILL") {`
`403`	`405`	`args.push("/F");`
`404`	`406`	`}`
`405`		`-const result = runTaskkill("taskkill", args, {`
	`407`	`+const result = runTaskkill(taskkillPath, args, {`
`406`	`408`	`stdio: "ignore",`
`407`	`409`	`windowsHide: true,`
`408`	`410`	`});`
`409`	`411`	`if (!result.error && result.status === 0) {`
`410`	`412`	`return true;`
`411`	`413`	`}`
`412`	`414`	`if (signal !== "SIGKILL") {`
`413`		`-const forceResult = runTaskkill("taskkill", [...args, "/F"], {`
	`415`	`+const forceResult = runTaskkill(taskkillPath, [...args, "/F"], {`
`414`	`416`	`stdio: "ignore",`
`415`	`417`	`windowsHide: true,`
`416`	`418`	`});`

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import {`
`24`	`24`	`QA_CHANNEL_REQUIRED_PLUGIN_IDS,`
`25`	`25`	`} from "./qa-channel-transport.js";`
`26`	`26`	`import { buildQaGatewayConfig } from "./qa-gateway-config.js";`
	`27`	`+import { resolveQaWindowsSystem32ExePath } from "./windows-system-tools.js";`
`27`	`28`
`28`	`29`	`type ModelRow = {`
`29`	`30`	`key: string;`
`@@ -120,10 +121,14 @@ function killProcessTree(pid: number \| undefined, signal: NodeJS.Signals) {`
`120`	`121`	`}`
`121`	`122`	`try {`
`122`	`123`	`if (process.platform === "win32") {`
`123`		`-const killer = spawn("taskkill", ["/pid", String(pid), "/t", "/f"], {`
`124`		`-stdio: "ignore",`
`125`		`-windowsHide: true,`
`126`		`-});`
	`124`	`+const killer = spawn(`
	`125`	`+resolveQaWindowsSystem32ExePath("taskkill.exe"),`
	`126`	`+["/pid", String(pid), "/t", "/f"],`
	`127`	`+{`
	`128`	`+stdio: "ignore",`
	`129`	`+windowsHide: true,`
	`130`	`+},`
	`131`	`+);`
`127`	`132`	`killer.once("error", () => {`
`128`	`133`	`try {`
`129`	`134`	`process.kill(pid, signal);`

Original file line number	Diff line number	Diff line change
`@@ -213,10 +213,14 @@ describe("qa suite runtime agent process helpers", () => {`
`213`	`213`
`214`	`214`	`await waitForSpawnCount(1);`
`215`	`215`	`await timeoutAssertion;`
`216`		`-expect(spawnSyncMock).toHaveBeenCalledWith("taskkill", ["/PID", "12345", "/T", "/F"], {`
`217`		`-stdio: "ignore",`
`218`		`-windowsHide: true,`
`219`		`-});`
	`216`	`+expect(spawnSyncMock).toHaveBeenCalledWith(`
	`217`	`+path.win32.join("C:\\Windows", "System32", "taskkill.exe"),`
	`218`	`+["/PID", "12345", "/T", "/F"],`
	`219`	`+{`
	`220`	`+stdio: "ignore",`
	`221`	`+windowsHide: true,`
	`222`	`+},`
	`223`	`+);`
`220`	`224`	`expect(child.kill).not.toHaveBeenCalled();`
`221`	`225`	`} finally {`
`222`	`226`	`if (platformDescriptor) {`

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import { liveTurnTimeoutMs } from "./suite-runtime-agent-common.js";`
`19`	`19`	`import { waitForGatewayHealthy, waitForTransportReady } from "./suite-runtime-gateway.js";`
`20`	`20`	`import type { QaDreamingStatus, QaSuiteRuntimeEnv } from "./suite-runtime-types.js";`
`21`	`21`	`import { resolveQaGatewayTimeoutWithGraceMs } from "./timer-timeouts.js";`
	`22`	`+import { resolveQaWindowsSystem32ExePath } from "./windows-system-tools.js";`
`22`	`23`
`23`	`24`	`type QaMemorySearchResult = {`
`24`	`25`	`results?: Array<{ snippet?: string; text?: string; path?: string }>;`
`@@ -209,10 +210,14 @@ function signalQaCliProcessTree(`
`209`	`210`	`) {`
`210`	`211`	`if (process.platform === "win32") {`
`211`	`212`	`if (typeof child.pid === "number") {`
`212`		`-const result = spawnSync("taskkill", ["/PID", String(child.pid), "/T", "/F"], {`
`213`		`-stdio: "ignore",`
`214`		`-windowsHide: true,`
`215`		`-});`
	`213`	`+const result = spawnSync(`
	`214`	`+resolveQaWindowsSystem32ExePath("taskkill.exe"),`
	`215`	`+["/PID", String(child.pid), "/T", "/F"],`
	`216`	`+{`
	`217`	`+stdio: "ignore",`
	`218`	`+windowsHide: true,`
	`219`	`+},`
	`220`	`+);`
`216`	`221`	`if (!result.error && result.status === 0) {`
`217`	`222`	`return;`
`218`	`223`	`}`

Original file line number	Diff line number	Diff line change
`@@ -443,11 +443,12 @@ describe("qa test file scenario runner", () => {`
`443`	`443`	`runTaskkill,`
`444`	`444`	`),`
`445`	`445`	`).toBe(true);`
`446`		`-expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/pid", "12345", "/T"], {`
	`446`	`+const taskkillPath = path.win32.join("C:\\Windows", "System32", "taskkill.exe");`
	`447`	`+expect(runTaskkill).toHaveBeenNthCalledWith(1, taskkillPath, ["/pid", "12345", "/T"], {`
`447`	`448`	`stdio: "ignore",`
`448`	`449`	`windowsHide: true,`
`449`	`450`	`});`
`450`		`-expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/pid", "12345", "/T", "/F"], {`
	`451`	`+expect(runTaskkill).toHaveBeenNthCalledWith(2, taskkillPath, ["/pid", "12345", "/T", "/F"], {`
`451`	`452`	`stdio: "ignore",`
`452`	`453`	`windowsHide: true,`
`453`	`454`	`});`

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import type { QaProviderMode } from "./providers/index.js";`
`21`	`21`	`import type { QaSeedScenarioWithSource } from "./scenario-catalog.js";`
`22`	`22`	`import type { QaScorecardEvidenceMode } from "./scorecard-taxonomy.js";`
`23`	`23`	`import { shellQuote } from "./shell-quote.js";`
	`24`	`+import { resolveQaWindowsSystem32ExePath } from "./windows-system-tools.js";`
`24`	`25`
`25`	`26`	`export type QaTestFileScenario = QaSeedScenarioWithSource & {`
`26`	`27`	`execution: Extract<`
`@@ -196,19 +197,20 @@ function killQaScenarioWindowsProcessTree(`
`196`	`197`	`if (pid === undefined) {`
`197`	`198`	`return false;`
`198`	`199`	`}`
	`200`	`+const taskkillPath = resolveQaWindowsSystem32ExePath("taskkill.exe");`
`199`	`201`	`const args = ["/pid", String(pid), "/T"];`
`200`	`202`	`if (signal === "SIGKILL") {`
`201`	`203`	`args.push("/F");`
`202`	`204`	`}`
`203`		`-const result = runTaskkill("taskkill", args, {`
	`205`	`+const result = runTaskkill(taskkillPath, args, {`
`204`	`206`	`stdio: "ignore",`
`205`	`207`	`windowsHide: true,`
`206`	`208`	`});`
`207`	`209`	`if (!result.error && result.status === 0) {`
`208`	`210`	`return true;`
`209`	`211`	`}`
`210`	`212`	`if (signal !== "SIGKILL") {`
`211`		`-const forceResult = runTaskkill("taskkill", [...args, "/F"], {`
	`213`	`+const forceResult = runTaskkill(taskkillPath, [...args, "/F"], {`
`212`	`214`	`stdio: "ignore",`
`213`	`215`	`windowsHide: true,`
`214`	`216`	`});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,30 @@`
	`1`	`+// Qa Lab tests cover Windows system tool path resolution.`
	`2`	`+import { describe, expect, it } from "vitest";`
	`3`	`+import {`
	`4`	`+resolveQaWindowsSystem32ExePath,`
	`5`	`+resolveQaWindowsSystemRoot,`
	`6`	`+} from "./windows-system-tools.js";`
	`7`	`+`
	`8`	`+describe("qa-lab windows system tools", () => {`
	`9`	`+it("resolves System32 executables from a trusted SystemRoot", () => {`
	`10`	`+expect(resolveQaWindowsSystemRoot({ SystemRoot: "D:\\Windows\\" })).toBe("D:\\Windows");`
	`11`	`+expect(resolveQaWindowsSystem32ExePath("taskkill.exe", { SystemRoot: "D:\\Windows\\" })).toBe(`
	`12`	`+"D:\\Windows\\System32\\taskkill.exe",`
	`13`	`+);`
	`14`	`+});`
	`15`	`+`
	`16`	`+it("falls back to the default Windows root when env roots are unsafe", () => {`
	`17`	`+expect(resolveQaWindowsSystem32ExePath("taskkill.exe", { SystemRoot: "C:\\tmp;C:\\bad" })).toBe(`
	`18`	`+"C:\\Windows\\System32\\taskkill.exe",`
	`19`	`+);`
	`20`	`+});`
	`21`	`+`
	`22`	`+it("rejects non-basename System32 executable names", () => {`
	`23`	`+expect(() => resolveQaWindowsSystem32ExePath("..\\taskkill.exe")).toThrow(`
	`24`	`+"Invalid Windows System32 executable name",`
	`25`	`+);`
	`26`	`+expect(() => resolveQaWindowsSystem32ExePath("taskkill")).toThrow(`
	`27`	`+"Invalid Windows System32 executable name",`
	`28`	`+);`
	`29`	`+});`
	`30`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,62 @@`
	`1`	`+// Qa Lab resolves Windows system tools without trusting PATH.`
	`2`	`+import path from "node:path";`
	`3`	`+`
	`4`	`+const DEFAULT_WINDOWS_SYSTEM_ROOT = "C:\\Windows";`
	`5`	`+`
	`6`	`+function getEnvValueCaseInsensitive(`
	`7`	`+env: Record<string, string \| undefined>,`
	`8`	`+expectedKey: string,`
	`9`	`+): string \| undefined {`
	`10`	`+const direct = env[expectedKey];`
	`11`	`+if (direct !== undefined) {`
	`12`	`+return direct;`
	`13`	`+}`
	`14`	`+const expected = expectedKey.toUpperCase();`
	`15`	`+const actualKey = Object.keys(env).find((key) => key.toUpperCase() === expected);`
	`16`	`+return actualKey ? env[actualKey] : undefined;`
	`17`	`+}`
	`18`	`+`
	`19`	`+function normalizeWindowsSystemRoot(raw: string \| undefined): string \| null {`
	`20`	`+const trimmed = raw?.trim();`
	`21`	`+if (`
	`22`	`+!trimmed \|\|`
	`23`	`+trimmed.includes("\0") \|\|`
	`24`	`+trimmed.includes("\r") \|\|`
	`25`	`+trimmed.includes("\n") \|\|`
	`26`	`+trimmed.includes(";")`
	`27`	`+) {`
	`28`	`+return null;`
	`29`	`+}`
	`30`	`+const normalized = path.win32.normalize(trimmed);`
	`31`	`+if (!path.win32.isAbsolute(normalized) \|\| normalized.startsWith("\\\\")) {`
	`32`	`+return null;`
	`33`	`+}`
	`34`	`+const parsed = path.win32.parse(normalized);`
	`35`	`+if (!/^[A-Za-z]:\\$/u.test(parsed.root) \|\| normalized.length <= parsed.root.length) {`
	`36`	`+return null;`
	`37`	`+}`
	`38`	`+return normalized.replace(/[\\/]+$/u, "");`
	`39`	`+}`
	`40`	`+`
	`41`	`+export function resolveQaWindowsSystemRoot(`
	`42`	`+env: Record<string, string \| undefined> = process.env,`
	`43`	`+): string {`
	`44`	`+return (`
	`45`	`+normalizeWindowsSystemRoot(getEnvValueCaseInsensitive(env, "SystemRoot")) ??`
	`46`	`+normalizeWindowsSystemRoot(getEnvValueCaseInsensitive(env, "WINDIR")) ??`
	`47`	`+DEFAULT_WINDOWS_SYSTEM_ROOT`
	`48`	`+);`
	`49`	`+}`
	`50`	`+`
	`51`	`+export function resolveQaWindowsSystem32ExePath(`
	`52`	`+executableName: string,`
	`53`	`+env: Record<string, string \| undefined> = process.env,`
	`54`	`+): string {`
	`55`	`+if (`
	`56`	`+path.win32.basename(executableName) !== executableName \|\|`
	`57`	`+!/^[A-Za-z0-9_.-]+\.exe$/u.test(executableName)`
	`58`	`+) {`
	`59`	+throw new Error(`Invalid Windows System32 executable name: ${executableName}`);
	`60`	`+}`
	`61`	`+return path.win32.join(resolveQaWindowsSystemRoot(env), "System32", executableName);`
	`62`	`+}`

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

推荐订阅源

Recent Commits to openclaw:main