@lark-people/cli 0.0.4 → 0.0.6

package/package.json

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

package/scripts/install-wizard.js

@@ -58,6 +58,7 @@ const messages = {
     step4: "授权",
     step4NotFound: "未找到 people-cli，跳过授权",
     step4Confirm: "是否现在执行登录授权，让 CLI 能访问你已授权的 People 数据？",
+    step4SkipExisting: "检测到已有用户授权，跳过登录",
     step4Skip: "跳过授权。后续运行 people-cli auth login 完成授权",
     step4Done: "授权完成",
     step4Fail: "授权失败。运行以下命令重试: people-cli auth login",
@@ -91,6 +92,7 @@ const messages = {
     step4: "Authorization",
     step4NotFound: "people-cli not found. Skipping authorization",
     step4Confirm: "Authorize now so People CLI can access your approved People data?",
+    step4SkipExisting: "Existing user authorization found. Skipped login",
     step4Skip: "Skipped. Run people-cli auth login to authorize later",
     step4Done: "Authorization complete",
     step4Fail: "Failed to authorize. Run people-cli auth login to retry",
@@ -307,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;
@@ -353,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) {
@@ -375,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,
   };
@@ -451,6 +486,23 @@ function getExistingAppId(binPath) {
   }
 }
 
+function isAuthenticatedStatus(status) {
+  return Boolean(
+    status &&
+    status.identity === "user" &&
+    status.userOpenId &&
+    status.tokenStatus !== "expired",
+  );
+}
+
+function shouldAutoReuseExistingConfig(existing) {
+  return Boolean(existing && existing.appId && existing.reusable);
+}
+
+function shouldSkipAuthLogin(existing) {
+  return Boolean(existing && existing.authenticated);
+}
+
 function inspectExistingAppConfig(binPath, deps = {}) {
   const runSilentFn = deps.runSilent || runSilent;
   try {
@@ -458,16 +510,17 @@ function inspectExistingAppConfig(binPath, deps = {}) {
     const parsed = JSON.parse(out.toString());
     const appId = parsed.appId || parsed.app_id || null;
     if (!appId) {
-      return { appId: null, reusable: false };
+      return { appId: null, reusable: false, authenticated: false };
     }
     try {
-      runSilentFn(binPath, ["auth", "status"], { timeout: 10000 });
-      return { appId, reusable: true };
+      const statusOut = runSilentFn(binPath, ["auth", "status"], { timeout: 10000 });
+      const status = JSON.parse(statusOut.toString());
+      return { appId, reusable: true, authenticated: isAuthenticatedStatus(status) };
     } catch (_) {
-      return { appId, reusable: false };
+      return { appId, reusable: false, authenticated: false };
     }
   } catch (_) {
-    return { appId: null, reusable: false };
+    return { appId: null, reusable: false, authenticated: false };
   }
 }
 
@@ -733,12 +786,16 @@ async function stepConfigInit(msg, lang) {
   }
 
   if (existing.appId && existing.reusable) {
+    if (shouldAutoReuseExistingConfig(existing)) {
+      p.log.info(msg.step3Skip);
+      return existing;
+    }
     const reuse = await p.confirm({
       message: fmt(msg.step3Found, existing.appId),
     });
     if (handleCancel(reuse, msg) && reuse) {
       p.log.info(msg.step3Skip);
-      return;
+      return existing;
     }
   } else if (existing.appId) {
     p.log.warn(msg.step3Reinit);
@@ -747,19 +804,25 @@ async function stepConfigInit(msg, lang) {
   try {
     run(peopleCli, ["config", "init", "--new", "--lang", lang]);
     p.log.success(msg.step3Done);
+    return { appId: null, reusable: false, authenticated: false };
   } catch (_) {
     p.log.error(msg.step3Fail);
     process.exit(1);
   }
 }
 
-async function stepAuthLogin(msg) {
+async function stepAuthLogin(msg, existing = null) {
   const peopleCli = whichPeopleCli();
   if (!peopleCli) {
     p.log.warn(msg.step4NotFound);
     return;
   }
 
+  if (shouldSkipAuthLogin(existing)) {
+    p.log.info(msg.step4SkipExisting);
+    return;
+  }
+
   const yes = await p.confirm({
     message: msg.step4Confirm,
   });
@@ -790,8 +853,8 @@ async function main() {
     p.intro(msg.setup);
     await stepInstallGlobally(msg);
     await stepInstallSkills(msg);
-    await stepConfigInit(msg, lang);
-    await stepAuthLogin(msg);
+    const existing = await stepConfigInit(msg, lang);
+    await stepAuthLogin(msg, existing);
     p.outro(msg.done);
   } else {
     console.log(msg.setup);
@@ -824,6 +887,8 @@ module.exports = {
   removeConflictingLegacyPackage,
   resolveGlobalBinOwner,
   resolveSkillsLauncher,
+  shouldAutoReuseExistingConfig,
+  shouldSkipAuthLogin,
   stepInstallSkills,
   main,
   runCLI,

package/skills/people-cli/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: people-cli
 version: 1.0.0
-description: "当用户需要通过 people-cli/People CLI 处理飞书人事或招聘数据时使用；覆盖 CoreHR 员工、部门组织、待入职、异动、离职、续约/续签、编制/HC，以及 Hire 职位、招需、投递、候选人、面试、评估、人才查询；也适用于 CLI 安装、升级、登录授权、Permission denied 和 scope 权限问题。"
+description: "当用户需要处理飞书人事或飞书招聘数据时使用；覆盖 CoreHR 员工、部门组织、待入职、异动、离职、续约/续签、编制/HC，以及 Hire 职位、招需、投递、候选人、面试、评估、人才查询；也适用于 CLI 安装、升级、登录授权、Permission denied 和 scope 权限问题。"
 metadata:
   requires:
     bins: ["people-cli"]
@@ -49,7 +49,7 @@ npx @lark-people/cli install
 people-cli update --check
 ```
 
-如果提示有新版本，或任意 `people-cli` JSON 输出中包含 `_notice.update` / `_notice.skills`，执行：
+如果提示有新版本，或后续任意 `people-cli` 输出中提示需要更新 CLI / Skills，执行：
 
 ```bash
 people-cli update