@whobot/cli 2.0.3 → 2.0.5

package/README.md

@@ -20,7 +20,7 @@ npx --yes @whobot/cli@latest install
 npx --yes @whobot/cli@2.0.0 install
 ```
 
-首次迁移不要运行旧的 `update apply`，也不要直接复用 `npx @whobot/cli@latest install` 或 `@intranet install`。已发布 v1 的全局程序可能软链接到同一标签的 npx 缓存；再次解析同标签可能在安装器启动前覆盖旧程序，使活动检查和原凭据端点校验失去依据。固定的新版本使用独立缓存入口，安装器先检查旧身份、原编译端点和活动通话，再替换程序。新安装的全局包与 npx 缓存分离。
+首次迁移不要运行旧的 `update apply`，也不要直接复用 `npx @whobot/cli@latest install`。已发布 v1 的全局程序可能软链接到同一标签的 npx 缓存；再次解析同标签可能在安装器启动前覆盖旧程序，使活动检查和原凭据端点校验失去依据。固定的新版本使用独立缓存入口，安装器先检查旧身份、原编译端点和活动通话，再替换程序。新安装的全局包与 npx 缓存分离。
 
 v2 后续更新：
 
@@ -53,4 +53,4 @@ SHA-256 用于核对下载内容与 manifest 一致，不声称提供公开签
 bun test
 ```
 
-发布人员在启用最低版本前，应对实际发行源执行仓库的 `bun deploy/check-upgrade-release.mjs latest`（内网使用 `intranet`），验证两项门槛可满足、完整 Skill 包和说明可取，以及隔离 npm/native 安装成功。配置、先制品后门槛的顺序与用户人工宿主清单见仓库 `docs/releases/skill-cli-v2-cutover.md`；检查通过只覆盖当前平台，不表示真实宿主已验收。
+发布人员在启用最低版本前，应对实际发行源执行仓库的 `bun deploy/check-upgrade-release.mjs latest`，验证两项门槛可满足、完整 Skill 包和说明可取，以及隔离 npm/native 安装成功。配置、先制品后门槛的顺序与用户人工宿主清单见仓库 `docs/releases/skill-cli-v2-cutover.md`；检查通过只覆盖当前平台，不表示真实宿主已验收。

package/bin/install.mjs

@@ -113,7 +113,7 @@ function writeJSONFailure(code, message) {
 
 function bakedChannel() {
   const ch = String(bootstrap.channel || "").trim();
-  if (ch !== "intranet" && ch !== "latest") {
+  if (ch !== "latest") {
     throw new InstallerError("发行渠道缺失或非法", "CHANNEL_INVALID");
   }
   return ch;
@@ -226,7 +226,38 @@ export async function runPostinstall(env) {
   }
 }
 
-export function whichCommand(name, env, ignoreRealpath = "") {
+// npxLauncherIgnore names the command entries of the npx copy at root, which
+// npx puts first on PATH. POSIX npm links them to run.mjs; Windows npm writes
+// cmd-shim files into the same node_modules/.bin, so a realpath alone cannot
+// recognize them. Outside an npx copy nothing is ignored.
+export function npxLauncherIgnore(root) {
+  if (!isNpxPath(root)) {
+    return {};
+  }
+  const ignore = { realpath: realpathSync(path.join(root, "bin", "run.mjs")) };
+  let modules = root;
+  while (path.basename(modules) !== "node_modules") {
+    const parent = path.dirname(modules);
+    if (parent === modules) {
+      return ignore;
+    }
+    modules = parent;
+  }
+  const binDir = path.join(modules, ".bin");
+  try {
+    ignore.binDir = realpathSync(binDir);
+  } catch {
+    // No .bin directory: no PATH entry can be inside it.
+    ignore.binDir = binDir;
+  }
+  return ignore;
+}
+
+function samePath(a, b) {
+  return process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
+}
+
+export function whichCommand(name, env, ignore = {}) {
   const pathEnv = env.PATH || env.Path || "";
   const exts = process.platform === "win32" ? [".cmd", ".exe", ".bat", ""] : [""];
   for (const dir of pathEnv.split(path.delimiter)) {
@@ -237,7 +268,8 @@ export function whichCommand(name, env, ignoreRealpath = "") {
       const candidate = path.join(dir, name + ext);
       try {
         accessSync(candidate, constants.X_OK);
-        if (ignoreRealpath && realpathSync(candidate) === ignoreRealpath) continue;
+        if (ignore.realpath && realpathSync(candidate) === ignore.realpath) continue;
+        if (ignore.binDir && samePath(realpathSync(dir), ignore.binDir)) continue;
         return candidate;
       } catch {
         // try next
@@ -625,7 +657,7 @@ async function repairAndVerifyNative(native, version, env) {
   }
 }
 
-export async function verifyInstalledCLI(tools, npmEnv, prefix, version, env, ignoreLauncher = "") {
+export async function verifyInstalledCLI(tools, npmEnv, prefix, version, env, ignoreLauncher = {}) {
   const registered = readGlobalPackageVersion(tools, npmEnv);
   if (registered !== version) {
     throw new InstallerError(`npm registered version ${registered} does not match ${version}`, "UPDATE_VERIFY_FAILED");
@@ -688,6 +720,9 @@ export async function runExplicitInstall(argv, env) {
     reportViaNative(stagedNative, "install_started", "ok", { attrs: reportAttrs }, env);
     verifyNpmEntryVersion(stagedNative, pkg.version, env);
     if (resetLocal) runResetLocal(stagedNative, env);
+    // An install stopped after moving the old program aside leaves only its
+    // backup; restore it as the installed command does before it runs.
+    await recoverNativeBackup(packageNativeBinary(prefix));
     runInstallPhase(stagedNative, ["update", "check-install", "--previous-binary", packageNativeBinary(prefix)], env, "binding", registered);
     runInstallPhase(stagedNative, updateArgs, env, "preflight", registered);
     prepared = await prepareNativeReplace(packageNativeBinary(prefix));
@@ -696,7 +731,7 @@ export async function runExplicitInstall(argv, env) {
       npmInstallGlobalFrom(tools, pkgRoot, npmEnv);
     }
     // Ignore this npx cache launcher only, not other stale host PATH entries.
-    const ignoreLauncher = isNpxPath(pkgRoot) ? realpathSync(path.join(pkgRoot, "bin", "run.mjs")) : "";
+    const ignoreLauncher = npxLauncherIgnore(pkgRoot);
     const installed = await verifyInstalledCLI(tools, npmEnv, prefix, pkg.version, env, ignoreLauncher);
     runInstallPhase(installed.native, updateArgs, env, "verify", registered);
     await prepared.discard();
@@ -733,8 +768,10 @@ export function reportViaNative(native, name, result, { errorCode = "", attrs =
 }
 
 function failureCode(err) {
-  const code = err && typeof err.code === "string" ? err.code : "";
-  return /^[A-Z][A-Z0-9_]{0,63}$/.test(code) ? code : "";
+  for (const code of [err?.reportCode, err?.code]) {
+    if (typeof code === "string" && /^[A-Z][A-Z0-9_]{0,63}$/.test(code)) return code;
+  }
+  return "";
 }
 
 function runInstallPhase(native, args, env, phase, previous, wantVersion = pkg.version) {
@@ -750,7 +787,10 @@ function runInstallPhase(native, args, env, phase, previous, wantVersion = pkg.v
     const code = response.error?.code || "UPDATE_VERIFY_FAILED";
     // These two already name the recovery (install --reset-local, then sign in again).
     const tail = RESET_LOCAL_CODES.has(code) ? "。" : "；请按上述原因处理后重试，不要删除客户端安装身份。";
-    throw new InstallerError(`安装未完成: ${code} ${response.error?.detail || response.error?.userMessage || "目标程序未通过验收"}${tail}`, "UPDATE_VERIFY_FAILED");
+    const err = new InstallerError(`安装未完成: ${code} ${response.error?.detail || response.error?.userMessage || "目标程序未通过验收"}${tail}`, "UPDATE_VERIFY_FAILED");
+    // Analytics only: the launcher output and exit code stay UPDATE_VERIFY_FAILED.
+    err.reportCode = code;
+    throw err;
   }
   return response;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whobot/cli",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Whobot CLI: npm-managed JS launcher that runs the in-package Go binary.",
   "type": "module",
   "bin": {