@bigbrain-work/mcp-connect 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbrain-work/mcp-connect",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "石榴 AI 官方 CLI：登录、配置 Agent、检查 MCP 状态并桥接远程工具。",
   "type": "module",
   "bin": {

package/src/detection.js

@@ -2,8 +2,18 @@ import { spawnSync } from "node:child_process";
 import { access } from "node:fs/promises";
 import path from "node:path";
 
-export function commandExists(command, spawn = spawnSync) {
-  const result = spawn(command, ["--version"], {
+export function commandExists(
+  command,
+  spawn = spawnSync,
+  { platform = process.platform, env = process.env } = {},
+) {
+  if (!/^[a-z0-9_-]+$/iu.test(command)) return false;
+  const isWindows = platform === "win32";
+  const executable = isWindows ? env.ComSpec || "cmd.exe" : command;
+  const args = isWindows
+    ? ["/d", "/s", "/c", `${command} --version`]
+    : ["--version"];
+  const result = spawn(executable, args, {
     encoding: "utf8",
     windowsHide: true,
     shell: false,

package/src/keyring-worker.js

@@ -0,0 +1,40 @@
+import { stdin, stdout } from "node:process";
+
+async function readRequest() {
+  let input = "";
+  stdin.setEncoding("utf8");
+  for await (const chunk of stdin) input += chunk;
+  return JSON.parse(input);
+}
+
+function validateRequest(request) {
+  if (
+    !request ||
+    !["get", "set", "delete"].includes(request.operation) ||
+    typeof request.service !== "string" ||
+    typeof request.account !== "string" ||
+    (request.operation === "set" && typeof request.password !== "string")
+  ) {
+    throw new Error("凭据库请求无效");
+  }
+  return request;
+}
+
+try {
+  const request = validateRequest(await readRequest());
+  const { Entry } = await import("@napi-rs/keyring");
+  const entry = new Entry(request.service, request.account);
+
+  if (request.operation === "get") {
+    stdout.write(JSON.stringify({ value: await entry.getPassword() }));
+  } else if (request.operation === "set") {
+    await entry.setPassword(request.password);
+    stdout.write(JSON.stringify({ ok: true }));
+  } else {
+    await entry.deletePassword();
+    stdout.write(JSON.stringify({ ok: true }));
+  }
+} catch (error) {
+  process.stderr.write(error?.message || String(error));
+  process.exitCode = 1;
+}

package/src/skill-refresh.js

@@ -77,11 +77,25 @@ async function writeState(home, state) {
   });
 }
 
-function defaultRunUpdate({ cwd, platform = process.platform }) {
-  const command = platform === "win32" ? "npx.cmd" : "npx";
-  const result = spawnSync(
+export function runSkillUpdate({
+  cwd,
+  platform = process.platform,
+  env = process.env,
+  spawnImpl = spawnSync,
+}) {
+  const isWindows = platform === "win32";
+  const command = isWindows ? env.ComSpec || "cmd.exe" : "npx";
+  const args = isWindows
+    ? [
+        "/d",
+        "/s",
+        "/c",
+        `npx.cmd -y skills update ${SHILIU_SKILL_NAME} -y`,
+      ]
+    : ["-y", "skills", "update", SHILIU_SKILL_NAME, "-y"];
+  const result = spawnImpl(
     command,
-    ["-y", "skills", "update", SHILIU_SKILL_NAME, "-y"],
+    args,
     {
       cwd,
       encoding: "utf8",
@@ -111,7 +125,7 @@ export async function refreshShiliuSkill({
   now = Date.now(),
   force = false,
   intervalMs = SKILL_REFRESH_INTERVAL_MS,
-  runUpdate = defaultRunUpdate,
+  runUpdate = runSkillUpdate,
 } = {}) {
   if (!home) throw new Error("缺少用户目录，无法记录 Skill 检查时间");
   const scope = path.resolve(cwd);

package/src/token-store.js

@@ -3,6 +3,12 @@ import {
   KEYRING_SERVICE,
   PENDING_KEYRING_ACCOUNT,
 } from "./constants.js";
+import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+
+const KEYRING_WORKER_PATH = fileURLToPath(
+  new URL("./keyring-worker.js", import.meta.url),
+);
 
 function validateTokenSet(value) {
   if (
@@ -17,7 +23,72 @@ function validateTokenSet(value) {
   return value;
 }
 
-async function createSystemEntry(account) {
+export function runKeyringWorker(request, { spawnImpl = spawn } = {}) {
+  return new Promise((resolve, reject) => {
+    const child = spawnImpl(process.execPath, [KEYRING_WORKER_PATH], {
+      windowsHide: true,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.setEncoding("utf8");
+    child.stderr.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(stderr.trim() || `凭据库子进程返回退出码 ${code}`));
+        return;
+      }
+      try {
+        resolve(JSON.parse(stdout));
+      } catch {
+        reject(new Error("凭据库子进程返回了无效响应"));
+      }
+    });
+    child.stdin.end(JSON.stringify(request));
+  });
+}
+
+export async function createSystemEntry(
+  account,
+  {
+    platform = process.platform,
+    runWorker = runKeyringWorker,
+  } = {},
+) {
+  if (platform === "win32") {
+    return {
+      async setPassword(password) {
+        await runWorker({
+          operation: "set",
+          service: KEYRING_SERVICE,
+          account,
+          password,
+        });
+      },
+      async getPassword() {
+        const result = await runWorker({
+          operation: "get",
+          service: KEYRING_SERVICE,
+          account,
+        });
+        return result.value;
+      },
+      async deletePassword() {
+        await runWorker({
+          operation: "delete",
+          service: KEYRING_SERVICE,
+          account,
+        });
+      },
+    };
+  }
   let module;
   try {
     module = await import("@napi-rs/keyring");

package/src/updater.js

@@ -51,7 +51,14 @@ export async function printUpdateStatus(options = {}) {
   const result = await checkForUpdates(options);
   if (result.updateAvailable) {
     console.log(`发现新版本：${result.current} → ${result.latest}`);
-    console.log(`更新命令：npm install -g ${PACKAGE_NAME}@latest`);
+    console.log(
+      `更新命令：npm install -g ${PACKAGE_NAME}@latest --prefer-online`,
+    );
+    if (process.platform === "win32") {
+      console.log(
+        "Windows 覆盖升级前请关闭正在使用石榴 MCP 的 Agent，避免原生凭据库文件被占用。",
+      );
+    }
   } else {
     console.log(`当前版本：${result.current}；npm latest：${result.latest}`);
   }