shizai-agent-mcp 0.2.5 → 0.2.7

package/README.md

@@ -1,19 +1,19 @@
 # shizai-agent-mcp
 
-实在 Agent 本地 MCP 的轻量 npm/npx 安装器。它只安装和注册 Shizai MCP，浏览器识别与控制复用实在 Agent 客户端自带的 Chrome 扩展和 DeepCapture。
+实在 Agent 本地 MCP 的轻量 npm/npx 安装器。它只安装和注册 Shizai MCP，浏览器识别与控制复用实在 Agent 客户端自带的 Chrome 扩展和 DeepCapture。
 
 ## 使用
 
 ```powershell
 npx -y shizai-agent-mcp install
-npx -y shizai-agent-mcp register codex
+npx -y shizai-agent-mcp register codex
 ```
 
 也可以注册 Cursor 或 Claude Desktop：
 
 ```powershell
-npx -y shizai-agent-mcp register cursor
-npx -y shizai-agent-mcp register claude
+npx -y shizai-agent-mcp register cursor
+npx -y shizai-agent-mcp register claude
 ```
 
 常用命令：
@@ -24,13 +24,13 @@ npx -y shizai-agent-mcp path
 npx -y shizai-agent-mcp uninstall
 ```
 
-当前 npm launcher 版本为 `0.2.5`，默认下载最新的 `v0.6.5` Windows x64 资产：
-`shizai-agent-v0.6.5-windows-x64.zip`。npm 包不附带浏览器自动化依赖，也不要求用户安装额外扩展。
+当前 npm launcher 版本为 `0.2.7`，默认下载最新的 `v0.6.7` Windows x64 资产：
+`shizai-agent-v0.6.7-windows-x64.zip`。npm 包不附带浏览器自动化依赖，也不要求用户安装额外扩展。
 
-发布 Release 时必须同时上传同名 `.sha256` 文件。安装器先校验、解压到同盘暂存目录，
-再原子替换现有版本；失败会恢复旧安装。测试企业内网镜像时可设置
-`SHIZAI_AGENT_RELEASE_BASE_URL`，测试其他版本可设置 `SHIZAI_AGENT_VERSION`。
-仅临时调试未签名镜像时可显式设置 `SHIZAI_AGENT_ALLOW_UNVERIFIED=1`。
+发布 Release 时必须同时上传同名 `.sha256` 文件。安装器先校验、解压到同盘暂存目录，
+再原子替换现有版本；失败会恢复旧安装。测试企业内网镜像时可设置
+`SHIZAI_AGENT_RELEASE_BASE_URL`，测试其他版本可设置 `SHIZAI_AGENT_VERSION`。
+仅临时调试未签名镜像时可显式设置 `SHIZAI_AGENT_ALLOW_UNVERIFIED=1`。
 
 本地设计器需要正在运行且已登录。MCP 是本地 stdio 服务，Codex 显示 `Auth: Unsupported`
 属于正常状态，实在 Agent 的登录会话由桌面设计器提供。

package/bin/shizai-agent-mcp.js

@@ -7,31 +7,97 @@ const os = require('node:os');
 const crypto = require('node:crypto');
 const { execFileSync, spawn } = require('node:child_process');
 
-const SERVER = 'shizai-agent';
-const REPO = process.env.SHIZAI_AGENT_REPO || 'yimoxzy/shizai-agent';
-const DEFAULT_VERSION = process.env.SHIZAI_AGENT_VERSION || '0.6.5';
+const SERVER = 'shizai-agent';
+const REPO = process.env.SHIZAI_AGENT_REPO || 'yimoxzy/shizai-agent';
+const DEFAULT_VERSION = process.env.SHIZAI_AGENT_VERSION || '0.6.7';
 const installRoot = process.env.SHIZAI_AGENT_HOME || path.join(
   process.env.LOCALAPPDATA || path.join(os.homedir(), '.local'), 'Programs', 'ShizaiAgent'
 );
 
 function fail(message) { console.error(`shizai-agent-mcp: ${message}`); process.exitCode = 1; }
 function json(value) { console.log(JSON.stringify(value, null, 2)); }
-function help() {
-  console.log(`Shizai Agent MCP installer\n\nUsage:\n  shizai-agent-mcp install [--version VERSION]\n  shizai-agent-mcp register <codex|cursor|claude>\n  shizai-agent-mcp status\n  shizai-agent-mcp path\n  shizai-agent-mcp uninstall\n\nEnvironment:\n  SHIZAI_AGENT_VERSION  Release version (default: ${DEFAULT_VERSION})\n  SHIZAI_AGENT_HOME     Installation directory\n  SHIZAI_AGENT_REPO     GitHub repository owner/name\n  SHIZAI_AGENT_RELEASE_BASE_URL  Override release asset base URL\n`);
-}
-function binaryPath() { return path.join(installRoot, 'shizai-agent-mcp.exe'); }
-function validateInstallRoot() {
-  const resolved = path.resolve(installRoot);
-  const parsed = path.parse(resolved);
-  if (resolved === parsed.root || resolved === path.resolve(os.homedir())) {
-    throw new Error(`拒绝使用过宽的安装目录：${resolved}`);
-  }
-  return resolved;
-}
+function help() {
+  console.log(`Shizai Agent MCP installer\n\nUsage:\n  shizai-agent-mcp install [--version VERSION]\n  shizai-agent-mcp register <codex|cursor|claude>\n  shizai-agent-mcp status\n  shizai-agent-mcp path\n  shizai-agent-mcp uninstall\n\nEnvironment:\n  SHIZAI_AGENT_VERSION  Release version (default: ${DEFAULT_VERSION})\n  SHIZAI_AGENT_HOME     Installation directory\n  SHIZAI_AGENT_REPO     GitHub repository owner/name\n  SHIZAI_AGENT_RELEASE_BASE_URL  Override release asset base URL\n`);
+}
+function binaryPath() { return path.join(installRoot, 'shizai-agent-mcp.exe'); }
+function validateInstallRoot() {
+  const resolved = path.resolve(installRoot);
+  const parsed = path.parse(resolved);
+  if (resolved === parsed.root || resolved === path.resolve(os.homedir())) {
+    throw new Error(`拒绝使用过宽的安装目录：${resolved}`);
+  }
+  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 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}`);
@@ -50,84 +116,104 @@ function download(url, destination) {
   const script = `Invoke-WebRequest -UseBasicParsing -Uri ${psQuote(url)} -OutFile ${psQuote(destination)}`;
   runPowerShell(script);
 }
-function install(version) {
-  const destination = validateInstallRoot();
-  const asset = assetName(version);
-  const url = releaseUrl(version, asset);
-  const temp = fs.mkdtempSync(path.join(os.tmpdir(), 'shizai-agent-'));
-  const archive = path.join(temp, asset);
-  const checksum = path.join(temp, `${asset}.sha256`);
-  const parent = path.dirname(destination);
-  const nonce = `${process.pid}-${Date.now()}`;
-  const stage = path.join(parent, `.shizai-agent-stage-${nonce}`);
-  const backup = path.join(parent, `.shizai-agent-backup-${nonce}`);
-  let verified = false;
-  try {
-    console.log(`下载 ${url}`);
-    download(url, archive);
-    try {
-      download(`${url}.sha256`, checksum);
-      const text = fs.readFileSync(checksum, 'utf8');
-      const expected = (text.match(/[a-f0-9]{64}/i) || [])[0];
-      if (!expected) throw new Error('校验文件中没有 SHA-256');
-      verifySha256(archive, expected);
-      verified = true;
-    } catch (error) {
-      if (process.env.SHIZAI_AGENT_ALLOW_UNVERIFIED !== '1') throw error;
-      console.warn('SHIZAI_AGENT_ALLOW_UNVERIFIED=1：本次跳过发布包校验。');
-    }
-    fs.mkdirSync(parent, { recursive: true });
-    fs.mkdirSync(stage);
-    runPowerShell(`Expand-Archive -LiteralPath ${psQuote(archive)} -DestinationPath ${psQuote(stage)} -Force`);
-    let source = stage;
-    if (!fs.existsSync(path.join(source, 'shizai-agent-mcp.exe'))) {
-      const nested = fs.readdirSync(stage, { withFileTypes: true })
-        .filter(entry => entry.isDirectory())
-        .map(entry => path.join(stage, entry.name))
-        .find(candidate => fs.existsSync(path.join(candidate, 'shizai-agent-mcp.exe')));
-      if (!nested) throw new Error('发布包中未找到 shizai-agent-mcp.exe');
-      source = nested;
-    }
-    fs.writeFileSync(path.join(source, 'version.json'), JSON.stringify({ version, asset, installedAt: new Date().toISOString() }, null, 2));
-    let previousMoved = false;
-    try {
-      if (fs.existsSync(destination)) {
-        fs.renameSync(destination, backup);
-        previousMoved = true;
-      }
-      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 });
-  } 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 });
-  }
-}
+function install(version) {
+  const destination = validateInstallRoot();
+  const asset = assetName(version);
+  const url = releaseUrl(version, asset);
+  const temp = fs.mkdtempSync(path.join(os.tmpdir(), 'shizai-agent-'));
+  const archive = path.join(temp, asset);
+  const checksum = path.join(temp, `${asset}.sha256`);
+  const parent = path.dirname(destination);
+  const nonce = `${process.pid}-${Date.now()}`;
+  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);
+    try {
+      download(`${url}.sha256`, checksum);
+      const text = fs.readFileSync(checksum, 'utf8');
+      const expected = (text.match(/[a-f0-9]{64}/i) || [])[0];
+      if (!expected) throw new Error('校验文件中没有 SHA-256');
+      verifySha256(archive, expected);
+      verified = true;
+    } catch (error) {
+      if (process.env.SHIZAI_AGENT_ALLOW_UNVERIFIED !== '1') throw error;
+      console.warn('SHIZAI_AGENT_ALLOW_UNVERIFIED=1：本次跳过发布包校验。');
+    }
+    fs.mkdirSync(parent, { recursive: true });
+    fs.mkdirSync(stage);
+    runPowerShell(`Expand-Archive -LiteralPath ${psQuote(archive)} -DestinationPath ${psQuote(stage)} -Force`);
+    let source = stage;
+    if (!fs.existsSync(path.join(source, 'shizai-agent-mcp.exe'))) {
+      const nested = fs.readdirSync(stage, { withFileTypes: true })
+        .filter(entry => entry.isDirectory())
+        .map(entry => path.join(stage, entry.name))
+        .find(candidate => fs.existsSync(path.join(candidate, 'shizai-agent-mcp.exe')));
+      if (!nested) throw new Error('发布包中未找到 shizai-agent-mcp.exe');
+      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);
+    } catch (error) {
+      if (!fs.existsSync(destination) && previousMoved && fs.existsSync(backup)) {
+        fs.renameSync(backup, destination);
+      }
+      throw error;
+    }
+    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 {
+    removeDirectoryWithRetries(temp);
+    removeDirectoryWithRetries(stage);
+    if (fs.existsSync(backup) && fs.existsSync(destination)) removeDirectoryWithRetries(backup);
+  }
+}
 function replaceTomlSection(content, section, replacement) {
   const escaped = section.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
   const pattern = new RegExp(`^\\[${escaped}\\]\\r?\\n[\\s\\S]*?(?=^\\[|$)`, 'm');
   const next = content.replace(pattern, '').trimEnd();
   return `${next}${next ? '\r\n\r\n' : ''}${replacement.trim()}\r\n`;
 }
-function tomlString(value) { return JSON.stringify(String(value)); }
-function registerCodex() {
+function tomlString(value) { return JSON.stringify(String(value)); }
+function registerCodex() {
   const config = process.env.SHIZAI_CODEX_CONFIG || path.join(os.homedir(), '.codex', 'config.toml');
   fs.mkdirSync(path.dirname(config), { recursive: true });
   const old = fs.existsSync(config) ? fs.readFileSync(config, 'utf8') : '';
   if (old) fs.copyFileSync(config, `${config}.shizai-agent.bak`);
-  const section = `[mcp_servers.${SERVER}]\ncommand = ${tomlString(binaryPath())}\nargs = []\nstartup_timeout_sec = 30\ntool_timeout_sec = 120`;
-  const next = replaceTomlSection(old, `mcp_servers.${SERVER}`, section);
-  fs.writeFileSync(config, next, 'utf8');
-  json({ registered: true, client: 'codex', config, command: binaryPath() });
-}
-function registerJsonClient(client) {
+  const section = `[mcp_servers.${SERVER}]\ncommand = ${tomlString(binaryPath())}\nargs = []\nstartup_timeout_sec = 30\ntool_timeout_sec = 120`;
+  const next = replaceTomlSection(old, `mcp_servers.${SERVER}`, section);
+  fs.writeFileSync(config, next, 'utf8');
+  json({ registered: true, client: 'codex', config, command: binaryPath() });
+}
+function registerJsonClient(client) {
   const locations = {
     cursor: process.env.SHIZAI_CURSOR_CONFIG || path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'Cursor', 'User', 'globalStorage', 'mcp.json'),
     claude: process.env.SHIZAI_CLAUDE_CONFIG || path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'Claude', 'claude_desktop_config.json')
@@ -136,36 +222,42 @@ function registerJsonClient(client) {
   if (!file) throw new Error(`未知客户端：${client}`);
   fs.mkdirSync(path.dirname(file), { recursive: true });
   const data = fs.existsSync(file) ? JSON.parse(fs.readFileSync(file, 'utf8')) : {};
-  data.mcpServers = data.mcpServers || {};
-  data.mcpServers[SERVER] = { command: binaryPath(), args: [] };
-  fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
-  json({ registered: true, client, config: file, command: binaryPath() });
+  data.mcpServers = data.mcpServers || {};
+  data.mcpServers[SERVER] = { command: binaryPath(), args: [] };
+  fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
+  json({ registered: true, client, config: file, command: binaryPath() });
 }
 function launch() {
   if (!fs.existsSync(binaryPath())) install(DEFAULT_VERSION);
   const child = spawn(binaryPath(), process.argv.slice(2), { stdio: 'inherit', windowsHide: true });
   child.on('exit', code => { process.exitCode = code ?? 0; });
 }
-function main() {
-  const [command, target, ...rest] = process.argv.slice(2);
+function main() {
+  const [command, target, ...rest] = process.argv.slice(2);
   if (!command) return launch();
   if (command === '--help' || command === '-h') return help();
-  if (command === 'install') {
-    const args = [target, ...rest].filter(value => value !== undefined);
-    const index = args.indexOf('--version');
-    const version = index >= 0 ? args[index + 1] : args.find(value => !value.startsWith('-'));
-    if (index >= 0 && !version) throw new Error('--version 后需要版本号');
-    return install(version || DEFAULT_VERSION);
-  }
-  if (command === 'register') {
-    if (!fs.existsSync(binaryPath())) throw new Error('尚未安装，请先运行 install');
-    if (target === 'codex') return registerCodex();
-    if (target === 'cursor' || target === 'claude') return registerJsonClient(target);
-    throw new Error('请指定 codex、cursor 或 claude');
-  }
-  if (command === 'status') return json({ installed: fs.existsSync(binaryPath()), directory: installRoot, command: binaryPath(), versionFile: path.join(installRoot, 'version.json') });
+  if (command === 'install') {
+    const args = [target, ...rest].filter(value => value !== undefined);
+    const index = args.indexOf('--version');
+    const version = index >= 0 ? args[index + 1] : args.find(value => !value.startsWith('-'));
+    if (index >= 0 && !version) throw new Error('--version 后需要版本号');
+    return install(version || DEFAULT_VERSION);
+  }
+  if (command === 'register') {
+    if (!fs.existsSync(binaryPath())) throw new Error('尚未安装，请先运行 install');
+    if (target === 'codex') return registerCodex();
+    if (target === 'cursor' || target === 'claude') return registerJsonClient(target);
+    throw new Error('请指定 codex、cursor 或 claude');
+  }
+  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,23 +1,23 @@
-{
-  "name": "shizai-agent-mcp",
-  "version": "0.2.5",
-  "description": "Installer and launcher for the Shizai Agent local MCP server",
-  "bin": {
-    "shizai-agent-mcp": "bin/shizai-agent-mcp.js"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "bin",
-    "README.md"
-  ],
-  "keywords": [
-    "mcp",
-    "shizai-agent",
-    "codex",
-    "cursor",
-    "claude"
-  ],
-  "license": "MIT"
-}
+{
+  "name": "shizai-agent-mcp",
+  "version": "0.2.7",
+  "description": "Installer and launcher for the Shizai Agent local MCP server",
+  "bin": {
+    "shizai-agent-mcp": "bin/shizai-agent-mcp.js"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "bin",
+    "README.md"
+  ],
+  "keywords": [
+    "mcp",
+    "shizai-agent",
+    "codex",
+    "cursor",
+    "claude"
+  ],
+  "license": "MIT"
+}