fix(qalab): resolve taskkill from system32 in cleanup pro...

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
`@@ -5,6 +5,7 @@ import fs from "node:fs";`
`5`	`5`	`import os from "node:os";`
`6`	`6`	`import path from "node:path";`
`7`	`7`	`import { readPluginInstallRecords } from "../../../../scripts/e2e/lib/plugin-index-sqlite.mjs";`
	`8`	`+import { resolveWindowsTaskkillPath } from "../../../../scripts/lib/windows-taskkill.mjs";`
`8`	`9`	`import { createTempDirTracker } from "../../../helpers/temp-dir.js";`
`9`	`10`
`10`	`11`	`const tempDirs = createTempDirTracker();`
`@@ -269,16 +270,17 @@ async function runCommand(command: string, args: readonly string[], options: Com`
`269`	`270`	`}`
`270`	`271`	`if (!useProcessGroup && child.pid) {`
`271`	`272`	`const runTaskkill = options.taskkillImpl ?? spawnSync;`
	`273`	`+const taskkillPath = resolveWindowsTaskkillPath();`
`272`	`274`	`const args = ["/PID", String(child.pid), "/T"];`
`273`	`275`	`if (signal === "SIGKILL") {`
`274`	`276`	`args.push("/F");`
`275`	`277`	`}`
`276`		`-const result = runTaskkill("taskkill", args, { stdio: "ignore", windowsHide: true });`
	`278`	`+const result = runTaskkill(taskkillPath, args, { stdio: "ignore", windowsHide: true });`
`277`	`279`	`if (!result.error && result.status === 0) {`
`278`	`280`	`return;`
`279`	`281`	`}`
`280`	`282`	`if (signal !== "SIGKILL") {`
`281`		`-const forceResult = runTaskkill("taskkill", [...args, "/F"], {`
	`283`	`+const forceResult = runTaskkill(taskkillPath, [...args, "/F"], {`
`282`	`284`	`stdio: "ignore",`
`283`	`285`	`windowsHide: true,`
`284`	`286`	`});`

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { EventEmitter } from "node:events";`
`3`	`3`	`import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";`
`4`	`4`	`import path from "node:path";`
`5`	`5`	`import { afterEach, describe, expect, it, vi } from "vitest";`
	`6`	`+import { resolveWindowsTaskkillPath } from "../../../../scripts/lib/windows-taskkill.mjs";`
`6`	`7`	`import { createTempDirTracker } from "../../../helpers/temp-dir.js";`
`7`	`8`	`import {`
`8`	`9`	`assertInspectLoaded,`
`@@ -13,6 +14,10 @@ import {`
`13`	`14`
`14`	`15`	`const tempDirs = createTempDirTracker();`
`15`	`16`
	`17`	`+function expectedTaskkillPath(): string {`
	`18`	`+return resolveWindowsTaskkillPath();`
	`19`	`+}`
	`20`	`+`
`16`	`21`	`function makeTempDir(): string {`
`17`	`22`	`return tempDirs.make("openclaw-plugin-lifecycle-probe-");`
`18`	`23`	`}`
`@@ -159,14 +164,24 @@ describe("plugin lifecycle matrix probe", () => {`
`159`	`164`
`160`	`165`	`await vi.advanceTimersByTimeAsync(10);`
`161`	`166`
`162`		`-expect(taskkillImpl).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {`
`163`		`-stdio: "ignore",`
`164`		`-windowsHide: true,`
`165`		`-});`
`166`		`-expect(taskkillImpl).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {`
`167`		`-stdio: "ignore",`
`168`		`-windowsHide: true,`
`169`		`-});`
	`167`	`+expect(taskkillImpl).toHaveBeenNthCalledWith(`
	`168`	`+1,`
	`169`	`+expectedTaskkillPath(),`
	`170`	`+["/PID", "12345", "/T"],`
	`171`	`+{`
	`172`	`+stdio: "ignore",`
	`173`	`+windowsHide: true,`
	`174`	`+},`
	`175`	`+);`
	`176`	`+expect(taskkillImpl).toHaveBeenNthCalledWith(`
	`177`	`+2,`
	`178`	`+expectedTaskkillPath(),`
	`179`	`+["/PID", "12345", "/T", "/F"],`
	`180`	`+{`
	`181`	`+stdio: "ignore",`
	`182`	`+windowsHide: true,`
	`183`	`+},`
	`184`	`+);`
`170`	`185`	`expect(child.signals).toEqual([]);`
`171`	`186`
`172`	`187`	`const error = await runError;`

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import path from "node:path";`
`11`	`11`	`import { pathToFileURL } from "node:url";`
`12`	`12`	`import { gunzipSync } from "node:zlib";`
`13`	`13`	`import { stripLeadingPackageManagerSeparator } from "../../../../scripts/lib/arg-utils.mjs";`
	`14`	`+import { resolveWindowsTaskkillPath } from "../../../../scripts/lib/windows-taskkill.mjs";`
`14`	`15`
`15`	`16`	`type CollectorMode = "local" \| "docker";`
`16`	`17`	`type OtelLogsExporter = "otlp" \| "stdout" \| "both";`
`@@ -1338,9 +1339,13 @@ function terminateChildTree(`
`1338`	`1339`	`): void {`
`1339`	`1340`	`if (platform === "win32") {`
`1340`	`1341`	`if (typeof child.pid === "number") {`
`1341`		`-const result = runTaskkill("taskkill", ["/PID", String(child.pid), "/T", "/F"], {`
`1342`		`-stdio: "ignore",`
`1343`		`-});`
	`1342`	`+const result = runTaskkill(`
	`1343`	`+resolveWindowsTaskkillPath(),`
	`1344`	`+["/PID", String(child.pid), "/T", "/F"],`
	`1345`	`+{`
	`1346`	`+stdio: "ignore",`
	`1347`	`+},`
	`1348`	`+);`
`1344`	`1349`	`if (result.status === 0) {`
`1345`	`1350`	`return;`
`1346`	`1351`	`}`

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,13 @@ import path from "node:path";`
`8`	`8`	`import { setTimeout as delay } from "node:timers/promises";`
`9`	`9`	`import { gzipSync } from "node:zlib";`
`10`	`10`	`import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";`
	`11`	`+import { resolveWindowsTaskkillPath } from "../../../../scripts/lib/windows-taskkill.mjs";`
`11`	`12`	`import { testing } from "./qa-otel-smoke-runtime.js";`
`12`	`13`
	`14`	`+function expectedTaskkillPath(): string {`
	`15`	`+return resolveWindowsTaskkillPath();`
	`16`	`+}`
	`17`	`+`
`13`	`18`	`afterEach(() => {`
`14`	`19`	`vi.unstubAllEnvs();`
`15`	`20`	`vi.restoreAllMocks();`
`@@ -657,7 +662,7 @@ describe("qa-otel-smoke receiver bounds", () => {`
`657`	`662`	`runTaskkill as never,`
`658`	`663`	`);`
`659`	`664`
`660`		`-expect(runTaskkill).toHaveBeenCalledWith("taskkill", ["/PID", "1234", "/T", "/F"], {`
	`665`	`+expect(runTaskkill).toHaveBeenCalledWith(expectedTaskkillPath(), ["/PID", "1234", "/T", "/F"], {`
`661`	`666`	`stdio: "ignore",`
`662`	`667`	`});`
`663`	`668`	`expect(kill).not.toHaveBeenCalled();`

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

推荐订阅源

Recent Commits to openclaw:main