@lark-people/cli 0.0.5 → 0.0.6

package/package.json

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

package/scripts/install-wizard.js

@@ -309,6 +309,29 @@ function sameResolvedPath(a, b) {
   }
 }
 
+function resolveExistingPath(targetPath) {
+  if (!targetPath) {
+    return null;
+  }
+  try {
+    return fs.realpathSync(targetPath);
+  } catch (_) {
+    return targetPath;
+  }
+}
+
+function isNpxCachePath(packageDir) {
+  if (!packageDir) {
+    return false;
+  }
+  const normalized = String(packageDir).replace(/\\/g, "/");
+  return normalized.includes("/_npx/") && normalized.includes("/node_modules/");
+}
+
+function packageInstallTarget(packageName, version) {
+  return version ? `${packageName}@${version}` : packageName;
+}
+
 function parseVersion(version) {
   if (!version) {
     return null;
@@ -355,10 +378,19 @@ function planGlobalInstall({
   currentPackageDir = CURRENT_PACKAGE_DIR,
   globalPackageDir = resolveGlobalPackageDir(currentPackageName),
 } = {}) {
+  const resolvedCurrentPackageDir = resolveExistingPath(currentPackageDir);
+  const resolvedGlobalPackageDir = resolveExistingPath(globalPackageDir);
+  const currentPackageFromNpxCache = isNpxCachePath(currentPackageDir) || isNpxCachePath(resolvedCurrentPackageDir);
+  const globalPackageLinkedToNpxCache = isNpxCachePath(globalPackageDir) || isNpxCachePath(resolvedGlobalPackageDir);
+  const missingGlobalInstallFromNpxCache = currentPackageFromNpxCache && !installedVersion;
+  const registryInstallVersion = currentVersion || latestVersion || installedVersion || null;
+  const registryInstallTarget = packageInstallTarget(currentPackageName, registryInstallVersion);
   const useCurrentPackage = Boolean(
     currentPackageDir &&
     globalPackageDir &&
-    !sameResolvedPath(currentPackageDir, globalPackageDir),
+    !sameResolvedPath(currentPackageDir, globalPackageDir) &&
+    !currentPackageFromNpxCache &&
+    !globalPackageLinkedToNpxCache,
   );
 
   if (useCurrentPackage) {
@@ -377,11 +409,12 @@ function planGlobalInstall({
     installVersion &&
     compareVersions(installedVersion, installVersion) < 0,
   );
+  const needsRepair = Boolean(globalPackageLinkedToNpxCache || missingGlobalInstallFromNpxCache);
 
   return {
-    skip: Boolean(installedVersion && !needsUpgrade),
+    skip: Boolean(installedVersion && !needsUpgrade && !needsRepair),
     needsUpgrade,
-    installTarget: currentPackageName,
+    installTarget: needsRepair ? registryInstallTarget : currentPackageName,
     installVersion,
     useCurrentPackage: false,
   };