@lark-people/cli 0.0.0-beta.1 → 0.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-people/cli",
-  "version": "0.0.0-beta.1",
+  "version": "0.0.0-beta.3",
   "description": "The official CLI for People open platform",
   "bin": {
     "people-cli": "scripts/run.js"

package/scripts/install-wizard.js

@@ -10,7 +10,16 @@ const CURRENT_PACKAGE_DIR = path.resolve(__dirname, "..");
 const DEFAULT_PKG = "@lark-people/cli";
 const DEFAULT_SKILLS_DIR = path.join(__dirname, "..", "skills");
 const isWindows = process.platform === "win32";
-const EXCLUDED_BUNDLED_SKILLS = new Set(["people-skill-maker"]);
+// Skills excluded from installation. `people-skill-maker` is an authoring-only
+// skill; the people-attendance/people-overtime/people-hire skills are gated
+// until their capabilities are ready for release (keep in sync with
+// internal/features/features.go).
+const EXCLUDED_BUNDLED_SKILLS = new Set([
+  "people-skill-maker",
+  "people-attendance",
+  "people-overtime",
+  "people-hire",
+]);
 
 function readPackageMeta(packageDir = CURRENT_PACKAGE_DIR) {
   try {
@@ -32,6 +41,9 @@ const messages = {
     step1Done: "已全局安装",
     step1Upgraded: "已升级到 v%s",
     step1Fail: "全局安装失败。运行以下命令重试: npm install -g %s",
+    step1MigrateSpinner: "检测到旧版包 %s 占用 people-cli 命令，正在迁移...",
+    step1MigrateDone: "已卸载旧版包 %s",
+    step1MigrateFail: "卸载旧版包 %s 失败，请手动运行: npm uninstall -g %s",
     step2Spinner: "正在安装 Skills...",
     step2Skip: "官方 Skills 已齐全，跳过",
     step2Done: "Skills 已安装",
@@ -62,6 +74,9 @@ const messages = {
     step1Done: "Installed globally",
     step1Upgraded: "Upgraded to v%s",
     step1Fail: "Failed to install globally. Run manually: npm install -g %s",
+    step1MigrateSpinner: "Legacy package %s owns the people-cli command. Migrating...",
+    step1MigrateDone: "Removed legacy package %s",
+    step1MigrateFail: "Failed to remove legacy package %s. Run manually: npm uninstall -g %s",
     step2Spinner: "Installing skills...",
     step2Skip: "Official skills already present. Skipped",
     step2Done: "Skills installed",
@@ -212,6 +227,76 @@ function resolveGlobalPackageDir(packageName = PKG) {
   }
 }
 
+// Extract the owning npm package name from a resolved path that points inside a
+// node_modules tree, e.g. ".../node_modules/@people/people-cli/scripts/run.js"
+// -> "@people/people-cli". Returns null when the path is not inside a package.
+function packageNameFromModulePath(resolvedPath) {
+  if (!resolvedPath) {
+    return null;
+  }
+  const normalized = String(resolvedPath).replace(/\\/g, "/");
+  const marker = "/node_modules/";
+  const idx = normalized.lastIndexOf(marker);
+  if (idx === -1) {
+    return null;
+  }
+  const segments = normalized.slice(idx + marker.length).split("/").filter(Boolean);
+  if (segments.length === 0) {
+    return null;
+  }
+  if (segments[0].startsWith("@")) {
+    return segments.length >= 2 ? `${segments[0]}/${segments[1]}` : null;
+  }
+  return segments[0];
+}
+
+// Resolve which npm package currently owns the global `people-cli` bin. On
+// POSIX the bin is a symlink into the owning package; on Windows the .cmd shim
+// is not a symlink, so ownership cannot be resolved and we return null.
+function resolveGlobalBinOwner(binName = BIN_NAME, deps = {}) {
+  const runSilentFn = deps.runSilent || runSilent;
+  const realpathSync = deps.realpathSync || fs.realpathSync;
+  try {
+    const prefix = runSilentFn("npm", ["prefix", "-g"], { timeout: 15000 }).toString().trim();
+    const binPath = isWindows
+      ? path.join(prefix, `${binName}.cmd`)
+      : path.join(prefix, "bin", binName);
+    const resolved = realpathSync(binPath);
+    return packageNameFromModulePath(resolved);
+  } catch (_) {
+    return null;
+  }
+}
+
+// Decide whether a globally installed package owns the `people-cli` bin under a
+// DIFFERENT package name than the one we are about to install. This is the root
+// cause of `npm EEXIST` after a package rename: npm refuses to overwrite a bin
+// owned by another package. Returns the conflicting owner name, or null.
+function findConflictingBinOwner(targetPackageName = PKG, deps = {}) {
+  const owner = deps.resolveGlobalBinOwner
+    ? deps.resolveGlobalBinOwner(BIN_NAME)
+    : resolveGlobalBinOwner();
+  if (!owner || owner === targetPackageName) {
+    return null;
+  }
+  return owner;
+}
+
+// Uninstall a conflicting legacy package that owns the `people-cli` bin so the
+// renamed package can claim the bin without `npm EEXIST`.
+function removeConflictingLegacyPackage(owner, deps = {}) {
+  if (!owner) {
+    return false;
+  }
+  const runSilentFn = deps.runSilent || runSilent;
+  try {
+    runSilentFn("npm", ["uninstall", "-g", owner], { timeout: 120000 });
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
 function sameResolvedPath(a, b) {
   if (!a || !b) {
     return false;
@@ -503,6 +588,32 @@ async function stepInstallGlobally(msg) {
     return false;
   }
 
+  // Detect a legacy package that owns the `people-cli` bin under a different
+  // name (e.g. after renaming @people/people-cli -> @lark-people/cli). Left in
+  // place, npm aborts the install with EEXIST. Remove it first so the renamed
+  // package (always installed under currentPkg's name) can claim the bin.
+  const conflictingOwner = findConflictingBinOwner(currentPkg);
+  if (conflictingOwner) {
+    const migrateSpinner = p ? p.spinner() : null;
+    if (migrateSpinner) {
+      migrateSpinner.start(fmt(msg.step1MigrateSpinner, conflictingOwner));
+    } else {
+      console.log(fmt(msg.step1MigrateSpinner, conflictingOwner));
+    }
+    const removed = removeConflictingLegacyPackage(conflictingOwner);
+    if (removed) {
+      if (migrateSpinner) {
+        migrateSpinner.stop(fmt(msg.step1MigrateDone, conflictingOwner));
+      } else {
+        console.log(fmt(msg.step1MigrateDone, conflictingOwner));
+      }
+    } else if (migrateSpinner) {
+      migrateSpinner.stop(fmt(msg.step1MigrateFail, conflictingOwner, conflictingOwner));
+    } else {
+      console.error(fmt(msg.step1MigrateFail, conflictingOwner, conflictingOwner));
+    }
+  }
+
   const spinner = p ? p.spinner() : null;
   if (spinner) {
     spinner.start(
@@ -518,12 +629,22 @@ async function stepInstallGlobally(msg) {
     }
     return true;
   } catch (_) {
-    if (spinner) {
-      spinner.stop(fmt(msg.step1Fail, PKG));
-    } else {
-      console.error(fmt(msg.step1Fail, PKG));
+    // Last-resort retry: force npm to overwrite any bin left behind by a legacy
+    // package that could not be cleanly removed above.
+    try {
+      await runSilentAsync("npm", ["install", "-g", "--force", plan.installTarget], { timeout: 120000 });
+      if (spinner) {
+        spinner.stop(plan.needsUpgrade ? fmt(msg.step1Upgraded, plan.installVersion) : msg.step1Done);
+      }
+      return true;
+    } catch (_) {
+      if (spinner) {
+        spinner.stop(fmt(msg.step1Fail, PKG));
+      } else {
+        console.error(fmt(msg.step1Fail, PKG));
+      }
+      process.exit(1);
     }
-    process.exit(1);
   }
 }
 
@@ -672,15 +793,19 @@ module.exports = {
   buildInstallAuthLoginArgs,
   DEFAULT_SKILLS_DIR,
   diffMissingSkills,
+  findConflictingBinOwner,
   formatCommandFailure,
   buildSkillsCommandArgs,
   inspectExistingAppConfig,
   listBundledSkills,
   listInstalledGlobalSkills,
+  packageNameFromModulePath,
   parseGlobalSkillsJSON,
   parseGlobalSkillsText,
   parseLangArg,
   planGlobalInstall,
+  removeConflictingLegacyPackage,
+  resolveGlobalBinOwner,
   resolveSkillsLauncher,
   stepInstallSkills,
   main,