@kisuke/cli 1.1.76-dev.85.1 → 1.1.84-dev.93.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kisuke/cli",
-  "version": "1.1.76-dev.85.1",
+  "version": "1.1.84-dev.93.1",
   "private": false,
   "description": "Kisuke CLI (dev) installer",
   "type": "module",

package/scripts/preuninstall.mjs

@@ -26,6 +26,50 @@ const executable = process.platform === 'win32'
   ? path.join(bundleDir, 'kisuke.cmd')
   : path.join(bundleDir, 'kisuke');
 
+// ---------------------------------------------------------------------------
+// Windows: kill the daemon BEFORE calling `kisuke uninstall`, so that by the
+// time the uninstall command spawns its own (short-lived) node.exe the daemon
+// is already gone and we don't fight two lock sources at once.
+//
+// Process tree started by Task Scheduler:
+//   wscript.exe → cmd.exe (daemon-task-runner.cmd) → node.exe (daemon.js)
+//
+// We need to kill the entire tree, not just node.exe.
+// ---------------------------------------------------------------------------
+if (process.platform === 'win32') {
+  const bundledNodeExe = path.join(bundleDir, 'bin', 'node.exe');
+
+  // Kill daemon by PID from pid file (fastest path)
+  try {
+    const kisukeDir = path.join(process.env.USERPROFILE || '', '.kisuke');
+    const pidFile = path.join(kisukeDir, 'kisuke.pid');
+    const pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
+    if (pid > 0) {
+      // taskkill /T kills the entire process tree rooted at the PID
+      spawnSync('taskkill', ['/F', '/T', '/PID', String(pid)], {
+        stdio: 'ignore',
+        timeout: 5_000,
+      });
+      try { fs.unlinkSync(pidFile); } catch {}
+    }
+  } catch {
+    // No PID file or process already gone — fine
+  }
+
+  // Kill any remaining processes using the bundled node.exe.
+  // Catches orphaned daemon processes not tracked by the PID file.
+  try {
+    const escaped = bundledNodeExe.replace(/'/g, "''");
+    spawnSync('powershell', [
+      '-NoProfile', '-NonInteractive', '-Command',
+      `Get-Process | Where-Object { $_.Path -eq '${escaped}' } | Stop-Process -Force -ErrorAction SilentlyContinue`,
+    ], { stdio: 'ignore', timeout: 10_000 });
+  } catch {}
+}
+
+// Run `kisuke uninstall` to remove the scheduled task / launchd plist /
+// systemd unit. On Windows the daemon is already dead at this point, so
+// the only node.exe invocation here is this short-lived CLI command.
 if (fs.existsSync(executable)) {
   const result = spawnSync(executable, ['uninstall'], {
     stdio: 'pipe',
@@ -41,61 +85,41 @@ if (fs.existsSync(executable)) {
       console.warn(`kisuke uninstall warning: ${stderr}`);
     }
   }
+}
 
-  // On Windows, if the daemon is still alive after service removal,
-  // kill it directly so npm can delete the bundled node.exe.
-  // We must also wait for Windows to fully release the file lock —
-  // the kernel holds it briefly after process termination while
-  // cleaning up handles and memory-mapped image sections.
-  if (process.platform === 'win32') {
-    const bundledNodeExe = path.join(bundleDir, 'bin', 'node.exe');
-
-    // Stage 1: Kill daemon by PID from pid file
-    try {
-      const kisukeDir = path.join(process.env.USERPROFILE || '', '.kisuke');
-      const pidFile = path.join(kisukeDir, 'kisuke.pid');
-      const pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
-      if (pid > 0) {
-        try { process.kill(pid, 'SIGTERM'); } catch {}
-        // Always follow up with taskkill /F — process.kill on Windows
-        // can succeed without the process fully terminating yet
-        spawnSync('taskkill', ['/F', '/PID', String(pid)], {
-          stdio: 'ignore',
-          timeout: 5_000,
-        });
-        try { fs.unlinkSync(pidFile); } catch {}
-      }
-    } catch {
-      // No PID file or process already gone — fine
-    }
-
-    // Stage 2: Kill any remaining processes using the bundled node.exe.
-    // Catches orphaned daemon processes not tracked by the PID file.
-    try {
-      const escaped = bundledNodeExe.replace(/'/g, "''");
-      spawnSync('powershell', [
-        '-NoProfile', '-NonInteractive', '-Command',
-        `Get-Process | Where-Object { $_.Path -eq '${escaped}' } | Stop-Process -Force -ErrorAction SilentlyContinue`,
-      ], { stdio: 'ignore', timeout: 10_000 });
-    } catch {}
+// ---------------------------------------------------------------------------
+// Windows: proactively remove node.exe so npm's cleanup phase can't fail on
+// it. After the CLI command above, the only lock source is the brief kernel
+// hold while Windows tears down the image mapping (and possibly Defender).
+// ---------------------------------------------------------------------------
+if (process.platform === 'win32') {
+  const bundledNodeExe = path.join(bundleDir, 'bin', 'node.exe');
 
-    // Stage 3: Wait for Windows to release the file lock on node.exe.
-    // Without this, npm's rename-then-delete fails with EBUSY / EPERM.
-    if (fs.existsSync(bundledNodeExe)) {
-      const deadline = Date.now() + 5_000;
-      while (Date.now() < deadline) {
-        try {
-          // Opening the executable for writing fails while it's mapped
-          const fd = fs.openSync(bundledNodeExe, 'r+');
-          fs.closeSync(fd);
+  if (fs.existsSync(bundledNodeExe)) {
+    let removed = false;
+    const deadline = Date.now() + 10_000;
+    while (Date.now() < deadline) {
+      try {
+        fs.unlinkSync(bundledNodeExe);
+        removed = true;
+        break;
+      } catch (e) {
+        if (e.code !== 'EBUSY' && e.code !== 'EPERM' && e.code !== 'EACCES') {
           break;
-        } catch (e) {
-          if (e.code !== 'EBUSY' && e.code !== 'EPERM' && e.code !== 'EACCES') {
-            break; // Unexpected error — don't keep retrying
-          }
-          Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 500);
         }
+        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 500);
       }
     }
+    // Last resort: rename into %TEMP% — rename often succeeds even while
+    // the file is locked because most AV locks use FILE_SHARE_DELETE.
+    if (!removed && fs.existsSync(bundledNodeExe)) {
+      try {
+        const tmp = path.join(
+          process.env.TEMP || process.env.TMP || '.',
+          `kisuke-node-${Date.now()}.exe.old`,
+        );
+        fs.renameSync(bundledNodeExe, tmp);
+      } catch {}
+    }
   }
 }