shizai-agent-mcp 0.2.5 → 0.2.6

package/README.md

@@ -24,7 +24,7 @@ npx -y shizai-agent-mcp path
 npx -y shizai-agent-mcp uninstall
 ```
 
-当前 npm launcher 版本为 `0.2.5`，默认下载最新的 `v0.6.5` Windows x64 资产：
+当前 npm launcher 版本为 `0.2.6`，默认下载最新的 `v0.6.5` Windows x64 资产：
 `shizai-agent-v0.6.5-windows-x64.zip`。npm 包不附带浏览器自动化依赖，也不要求用户安装额外扩展。
 
 发布 Release 时必须同时上传同名 `.sha256` 文件。安装器先校验、解压到同盘暂存目录，

package/bin/shizai-agent-mcp.js

@@ -29,9 +29,75 @@ function validateInstallRoot() {
   return resolved;
 }
 function psQuote(value) { return `'${String(value).replaceAll("'", "''")}'`; }
-function runPowerShell(script, args = []) {
-  return execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script, ...args], { encoding: 'utf8' });
-}
+function runPowerShell(script, args = []) {
+  return execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script, ...args], { encoding: 'utf8' });
+}
+function sleepSync(milliseconds) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds);
+}
+function removeDirectoryWithRetries(directory, attempts = 10) {
+  if (!fs.existsSync(directory)) return;
+  let lastError;
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    try {
+      fs.rmSync(directory, { recursive: true, force: true });
+      return;
+    } catch (error) {
+      lastError = error;
+      sleepSync(200 * (attempt + 1));
+    }
+  }
+  throw lastError;
+}
+function stopInstalledProcesses(destination) {
+  if (process.platform !== 'win32') return [];
+  const executables = [
+    path.join(destination, 'shizai-agent-mcp.exe'),
+    path.join(destination, 'shizai-agent.exe')
+  ];
+  const targetList = executables.map(psQuote).join(', ');
+  const script = String.raw`
+$ErrorActionPreference = 'Stop'
+$targets = @(${targetList} | ForEach-Object { [IO.Path]::GetFullPath([string]$_).ToLowerInvariant() })
+$matches = @(Get-CimInstance Win32_Process | Where-Object {
+  if (-not $_.ExecutablePath) { return $false }
+  try { $targets -contains [IO.Path]::GetFullPath([string]$_.ExecutablePath).ToLowerInvariant() } catch { $false }
+})
+$matchedIds = @($matches | ForEach-Object { [int]$_.ProcessId })
+foreach ($process in $matches) {
+  Stop-Process -Id $process.ProcessId -Force -ErrorAction Stop
+}
+$deadline = [DateTime]::UtcNow.AddSeconds(5)
+do {
+  $remainingIds = @()
+  foreach ($targetId in $matchedIds) {
+    if ($null -ne (Get-Process -Id $targetId -ErrorAction SilentlyContinue)) {
+      $remainingIds += $targetId
+    }
+  }
+  if ($remainingIds.Count -eq 0) { break }
+  Start-Sleep -Milliseconds 100
+} while ([DateTime]::UtcNow -lt $deadline)
+if ($remainingIds.Count -gt 0) {
+  throw ('安装前无法停止实在 Agent 进程：' + (($remainingIds | Sort-Object) -join ', '))
+}
+@($matchedIds) | ConvertTo-Json -Compress
+`;
+  const output = runPowerShell(script).trim();
+  if (!output) return [];
+  const parsed = JSON.parse(output);
+  return Array.isArray(parsed) ? parsed : [parsed];
+}
+function cleanupInstallArtifacts(parent, excluded = []) {
+  const excludedPaths = new Set(excluded.map(item => path.resolve(item).toLowerCase()));
+  for (const entry of fs.readdirSync(parent, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    if (!entry.name.startsWith('.shizai-agent-stage-') && !entry.name.startsWith('.shizai-agent-backup-')) continue;
+    const candidate = path.join(parent, entry.name);
+    if (excludedPaths.has(path.resolve(candidate).toLowerCase())) continue;
+    removeDirectoryWithRetries(candidate);
+  }
+}
 function assetName(version) {
   if (process.platform !== 'win32' || process.arch !== 'x64') {
     throw new Error(`当前 npm 安装器暂时只提供 Windows x64，检测到 ${process.platform}/${process.arch}`);
@@ -62,6 +128,7 @@ function install(version) {
   const stage = path.join(parent, `.shizai-agent-stage-${nonce}`);
   const backup = path.join(parent, `.shizai-agent-backup-${nonce}`);
   let verified = false;
+  const stoppedProcesses = new Set();
   try {
     console.log(`下载 ${url}`);
     download(url, archive);
@@ -89,25 +156,44 @@ function install(version) {
       source = nested;
     }
     fs.writeFileSync(path.join(source, 'version.json'), JSON.stringify({ version, asset, installedAt: new Date().toISOString() }, null, 2));
+    cleanupInstallArtifacts(parent, [stage, backup]);
+    for (const processId of stopInstalledProcesses(destination)) stoppedProcesses.add(processId);
     let previousMoved = false;
     try {
       if (fs.existsSync(destination)) {
         fs.renameSync(destination, backup);
         previousMoved = true;
+        for (const processId of stopInstalledProcesses(destination)) stoppedProcesses.add(processId);
       }
       fs.renameSync(source, destination);
-      if (previousMoved) fs.rmSync(backup, { recursive: true, force: true });
     } catch (error) {
       if (!fs.existsSync(destination) && previousMoved && fs.existsSync(backup)) {
         fs.renameSync(backup, destination);
       }
       throw error;
     }
-    json({ installed: true, version, directory: destination, command: binaryPath(), verified });
+    if (previousMoved) {
+      try {
+        removeDirectoryWithRetries(backup);
+      } catch (error) {
+        for (const processId of stopInstalledProcesses(destination)) stoppedProcesses.add(processId);
+        try {
+          removeDirectoryWithRetries(backup);
+        } catch (retryError) {
+          const failedInstall = path.join(temp, 'failed-install');
+          fs.renameSync(destination, failedInstall);
+          fs.renameSync(backup, destination);
+          removeDirectoryWithRetries(failedInstall);
+          throw new Error(`旧版本清理失败，已恢复原安装：${retryError.message}`);
+        }
+      }
+    }
+    cleanupInstallArtifacts(parent, [stage, backup]);
+    json({ installed: true, version, directory: destination, command: binaryPath(), verified, stopped_processes: [...stoppedProcesses].sort((left, right) => left - right) });
   } finally {
-    fs.rmSync(temp, { recursive: true, force: true });
-    fs.rmSync(stage, { recursive: true, force: true });
-    if (fs.existsSync(backup) && fs.existsSync(destination)) fs.rmSync(backup, { recursive: true, force: true });
+    removeDirectoryWithRetries(temp);
+    removeDirectoryWithRetries(stage);
+    if (fs.existsSync(backup) && fs.existsSync(destination)) removeDirectoryWithRetries(backup);
   }
 }
 function replaceTomlSection(content, section, replacement) {
@@ -165,7 +251,13 @@ function main() {
   }
   if (command === 'status') return json({ installed: fs.existsSync(binaryPath()), directory: installRoot, command: binaryPath(), versionFile: path.join(installRoot, 'version.json') });
   if (command === 'path') return console.log(binaryPath());
-  if (command === 'uninstall') { if (fs.existsSync(installRoot)) fs.rmSync(installRoot, { recursive: true, force: true }); return json({ uninstalled: true, directory: installRoot }); }
+  if (command === 'uninstall') {
+    const destination = validateInstallRoot();
+    const stoppedProcesses = stopInstalledProcesses(destination);
+    removeDirectoryWithRetries(destination);
+    if (fs.existsSync(path.dirname(destination))) cleanupInstallArtifacts(path.dirname(destination));
+    return json({ uninstalled: true, directory: destination, stopped_processes: stoppedProcesses });
+  }
   throw new Error(`未知命令：${command}`);
 }
 try { main(); } catch (error) { fail(error.message); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shizai-agent-mcp",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Installer and launcher for the Shizai Agent local MCP server",
   "bin": {
     "shizai-agent-mcp": "bin/shizai-agent-mcp.js"