@ganglion/xacpx 0.20.0 → 0.20.1

package/dist/bridge/bridge-main.js

@@ -2102,9 +2102,9 @@ function decodeTarget(value) {
     return null;
   if (parseCanonicalFileTime(item.creationDate) === null)
     return null;
-  if (item.commandLine !== undefined && typeof item.commandLine !== "string")
+  if (item.commandLine !== undefined && item.commandLine !== null && typeof item.commandLine !== "string")
     return null;
-  if (item.executablePath !== undefined && typeof item.executablePath !== "string")
+  if (item.executablePath !== undefined && item.executablePath !== null && typeof item.executablePath !== "string")
     return null;
   return {
     pid: Number(item.pid),
@@ -2228,8 +2228,9 @@ async function terminateWindowsResidual(target, options = {}) {
 }
 async function runPowerShellWorker(request, deadlineMs) {
   return await new Promise((resolve2, reject) => {
-    const child = spawn("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", "-"], {
-      stdio: ["pipe", "pipe", "pipe"],
+    const encodedScript = Buffer.from(WINDOWS_TREE_WORKER_SCRIPT, "utf16le").toString("base64");
+    const child = spawn("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", encodedScript], {
+      stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true,
       env: {
         ...process.env,
@@ -2266,7 +2267,6 @@ async function runPowerShellWorker(request, deadlineMs) {
     });
     child.once("error", (error) => finish(error));
     child.once("close", (code) => code === 0 ? finish() : finish(new Error(`Windows process worker failed (${code}): ${stderr}`)));
-    child.stdin.end(WINDOWS_TREE_WORKER_SCRIPT);
   });
 }
 var UUID, OUTCOMES, WINDOWS_TREE_WORKER_SCRIPT;
@@ -2375,7 +2375,14 @@ if($request.action -eq 'terminate-one-cim'){
   if(!$check.ok){Write-Output (@{outcome=$check.status} | ConvertTo-Json -Compress);exit 0}
   try {
     if(![XacpxNativeProcess]::Alive($check.handle)){$status='already-exited'}
-    elseif(![XacpxNativeProcess]::Kill($check.handle)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'}}
+    elseif(![XacpxNativeProcess]::Kill($check.handle)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($check.handle)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+    }
     else{$status=if([XacpxNativeProcess]::WaitDead($check.handle)){'killed'}else{'kill-requested-unconfirmed'}}
     Write-Output (@{outcome=$status} | ConvertTo-Json -Compress);exit 0
   } finally {[XacpxNativeProcess]::Close($check.handle)}
@@ -2430,7 +2437,15 @@ try {
   foreach($node in $nodes){
     $h=$handles[$node.pid]
     if(![XacpxNativeProcess]::Alive($h)){[void]$outcomes.Add((Outcome $node 'already-exited'));continue}
-    if(![XacpxNativeProcess]::Kill($h)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'};[void]$outcomes.Add((Outcome $node $status));continue}
+    if(![XacpxNativeProcess]::Kill($h)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($h)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+      [void]$outcomes.Add((Outcome $node $status));continue
+    }
     $status=if([XacpxNativeProcess]::WaitDead($h)){'killed'}else{'kill-requested-unconfirmed'}
     [void]$outcomes.Add((Outcome $node $status))
   }
@@ -7210,13 +7225,14 @@ async function verifyAcpInitialize(command, args, options = {}) {
   let stdoutBuffer = "";
   let settled = false;
   let timer;
-  let windowsTarget;
-  if (process.platform === "win32" && child.pid) {
+  const windowsProbe = (async () => {
+    if (process.platform !== "win32" || !child.pid)
+      return;
     const identity = await probeWindowsProcessIdentity(child.pid);
-    if (identity.status === "found") {
-      windowsTarget = { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
-    }
-  }
+    if (identity.status !== "found")
+      return;
+    return { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
+  })();
   try {
     await new Promise((resolve2, reject) => {
       const finish = (error) => {
@@ -7301,6 +7317,7 @@ async function verifyAcpInitialize(command, args, options = {}) {
     child.stdin.destroy();
     child.stdout.destroy();
     child.stderr.destroy();
+    const windowsTarget = await windowsProbe;
     if (process.platform !== "win32" || windowsTarget) {
       await terminateProcessTree(windowsTarget ?? child.pid ?? 0, { detachedProcessGroup: detached });
     }

package/dist/cli.js

@@ -4816,9 +4816,9 @@ function decodeTarget(value) {
     return null;
   if (parseCanonicalFileTime(item.creationDate) === null)
     return null;
-  if (item.commandLine !== undefined && typeof item.commandLine !== "string")
+  if (item.commandLine !== undefined && item.commandLine !== null && typeof item.commandLine !== "string")
     return null;
-  if (item.executablePath !== undefined && typeof item.executablePath !== "string")
+  if (item.executablePath !== undefined && item.executablePath !== null && typeof item.executablePath !== "string")
     return null;
   return {
     pid: Number(item.pid),
@@ -4942,8 +4942,9 @@ async function terminateWindowsResidual(target, options = {}) {
 }
 async function runPowerShellWorker(request, deadlineMs) {
   return await new Promise((resolve2, reject) => {
-    const child = spawn2("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", "-"], {
-      stdio: ["pipe", "pipe", "pipe"],
+    const encodedScript = Buffer.from(WINDOWS_TREE_WORKER_SCRIPT, "utf16le").toString("base64");
+    const child = spawn2("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", encodedScript], {
+      stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true,
       env: {
         ...process.env,
@@ -4980,7 +4981,6 @@ async function runPowerShellWorker(request, deadlineMs) {
     });
     child.once("error", (error) => finish(error));
     child.once("close", (code) => code === 0 ? finish() : finish(new Error(`Windows process worker failed (${code}): ${stderr}`)));
-    child.stdin.end(WINDOWS_TREE_WORKER_SCRIPT);
   });
 }
 var UUID, OUTCOMES, WINDOWS_TREE_WORKER_SCRIPT;
@@ -5089,7 +5089,14 @@ if($request.action -eq 'terminate-one-cim'){
   if(!$check.ok){Write-Output (@{outcome=$check.status} | ConvertTo-Json -Compress);exit 0}
   try {
     if(![XacpxNativeProcess]::Alive($check.handle)){$status='already-exited'}
-    elseif(![XacpxNativeProcess]::Kill($check.handle)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'}}
+    elseif(![XacpxNativeProcess]::Kill($check.handle)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($check.handle)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+    }
     else{$status=if([XacpxNativeProcess]::WaitDead($check.handle)){'killed'}else{'kill-requested-unconfirmed'}}
     Write-Output (@{outcome=$status} | ConvertTo-Json -Compress);exit 0
   } finally {[XacpxNativeProcess]::Close($check.handle)}
@@ -5144,7 +5151,15 @@ try {
   foreach($node in $nodes){
     $h=$handles[$node.pid]
     if(![XacpxNativeProcess]::Alive($h)){[void]$outcomes.Add((Outcome $node 'already-exited'));continue}
-    if(![XacpxNativeProcess]::Kill($h)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'};[void]$outcomes.Add((Outcome $node $status));continue}
+    if(![XacpxNativeProcess]::Kill($h)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($h)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+      [void]$outcomes.Add((Outcome $node $status));continue
+    }
     $status=if([XacpxNativeProcess]::WaitDead($h)){'killed'}else{'kill-requested-unconfirmed'}
     [void]$outcomes.Add((Outcome $node $status))
   }
@@ -5222,13 +5237,14 @@ async function verifyAcpInitialize(command, args, options = {}) {
   let stdoutBuffer = "";
   let settled = false;
   let timer;
-  let windowsTarget;
-  if (process.platform === "win32" && child.pid) {
+  const windowsProbe = (async () => {
+    if (process.platform !== "win32" || !child.pid)
+      return;
     const identity = await probeWindowsProcessIdentity(child.pid);
-    if (identity.status === "found") {
-      windowsTarget = { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
-    }
-  }
+    if (identity.status !== "found")
+      return;
+    return { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
+  })();
   try {
     await new Promise((resolve2, reject) => {
       const finish = (error) => {
@@ -5313,6 +5329,7 @@ async function verifyAcpInitialize(command, args, options = {}) {
     child.stdin.destroy();
     child.stdout.destroy();
     child.stderr.destroy();
+    const windowsTarget = await windowsProbe;
     if (process.platform !== "win32" || windowsTarget) {
       await terminateProcessTree(windowsTarget ?? child.pid ?? 0, { detachedProcessGroup: detached });
     }

package/dist/process/windows-process-tree.d.ts

@@ -56,3 +56,4 @@ export declare function queryWindowsProcessIdentity(pid: number, options?: Windo
 export declare function probeWindowsProcessIdentity(pid: number, options?: WindowsProcessWorkerOptions): Promise<WindowsProbeStatus>;
 export declare function snapshotWindowsProcessesByToken(token: string, options?: WindowsProcessWorkerOptions): Promise<WindowsTokenProcess[] | null>;
 export declare function terminateWindowsResidual(target: BatchTarget, options?: WindowsProcessWorkerOptions): Promise<KillOutcome>;
+export declare const WINDOWS_TREE_WORKER_SCRIPT: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",