ziwei-cli 1.1.1 → 1.1.3

package/bin/install.cjs

@@ -161,18 +161,23 @@ async function installCli() {
   logStep("3/4", "安装 ziwei CLI...");
 
   try {
-    // Check if already installed
+    // Check if already installed with correct version
     try {
-      execSync("which ziwei", { stdio: "ignore" });
-      logSuccess("ziwei CLI 已安装");
-      return true;
+      const version = execSync("ziwei --version", { encoding: "utf8" }).trim();
+      const pkg = require(path.join(PACKAGE_ROOT, "package.json"));
+      if (version === pkg.version) {
+        logSuccess(`ziwei CLI 已安装 (v${version})`);
+        return true;
+      }
+      logInfo(`当前版本 ${version}，升级到 ${pkg.version}...`);
     } catch {
       // Not installed, proceed
     }
 
-    // Try npm link from package root
-    logInfo("正在全局安装 ziwei CLI...");
-    execSync("npm link", { cwd: PACKAGE_ROOT, stdio: "inherit" });
+    // Global install ensures dependencies are properly resolved
+    // and persists after npx temp dir is cleaned up
+    logInfo("正在全局安装 ziwei CLI 及依赖...");
+    execSync("npm install -g ziwei-cli", { stdio: "inherit" });
     logSuccess("ziwei CLI 安装成功");
 
     // Verify
@@ -182,7 +187,7 @@ async function installCli() {
     return true;
   } catch (error) {
     logError(`CLI 安装失败: ${error.message}`);
-    logInfo("你可以手动运行: cd " + PACKAGE_ROOT + " && npm link");
+    logInfo("你可以手动运行: npm install -g ziwei-cli");
     return false;
   }
 }
@@ -197,15 +202,16 @@ ${color("green", "━━━━━━━━━━━━━━━━━━━━
 
 ${color("cyan", "CLI 命令:")}
   ziwei palace --palace 命宫 --date 1990-05-15 --time 10:30 --gender 男 --city 北京
-  ziwei palace --palace 官禄宫 --scope yearly --year 2025 ...
+  ziwei bazi --date 1990-05-15 --time 10:30 --gender 男
+  ziwei calendar
 
 ${color("cyan", "Skill 触发词:")}
-  算命、看命、命盘、运势、合盘、紫微、流年、大限
+  算命、看命、命盘、运势、合盘、紫微、八字、流年、大限
 
 ${color("yellow", "在 Claude Code / OpenClaw 中试试:")}
   "帮我算命"
   "看看我今年的运势"
-  "我和对方合适吗"
+  "帮我排个八字"
 
 ${color("dim", "重启 Claude Code 会话后 skill 将自动加载")}
 `);

package/lib/commands/palace.js

@@ -16,28 +16,13 @@ function buildQueryDate(year, month = 1, day = 1) {
 }
 
 /**
- * 获取指定层级的宫位及三方四正
+ * 获取指定层级的宫位及三方四正（统一走 horoscope 接口）
  */
-function getScopedPalaceAndSurrounded(astrolabe, palaceName, scope, queryDate) {
-  if (scope === 'origin') {
-    // 本命层直接从 astrolabe 获取
-    const targetPalace = astrolabe.palace(palaceName);
-    const surroundedPalaces = astrolabe.surroundedPalaces(palaceName);
-    return { targetPalace, surroundedPalaces, scopeData: {} };
-  } else {
-    // 运限层从 horoscope 获取
-    const horoscope = astrolabe.horoscope(queryDate);
-    const scopeData = horoscope[scope];
-
-    if (!scopeData) {
-      throw new Error(`无效的运限范围: ${scope}`);
-    }
-
-    const targetPalace = horoscope.palace(palaceName, scope);
-    const surroundedPalaces = horoscope.surroundPalaces(palaceName, scope);
-
-    return { targetPalace, surroundedPalaces, scopeData };
-  }
+function getScopedPalaceAndSurrounded(horoscope, palaceName, scope) {
+  const scopeData = horoscope[scope] || {};
+  const targetPalace = horoscope.palace(palaceName, scope);
+  const surroundedPalaces = horoscope.surroundPalaces(palaceName, scope);
+  return { targetPalace, surroundedPalaces, scopeData };
 }
 
 /**
@@ -87,18 +72,20 @@ export async function executePalace(options) {
       is_leap: leap || false
     });
 
-    // 获取目标宫位名称
-    // origin 模式需要带"宫"字，horoscope 模式不需要
-    const palaceNameWithSuffix = palace.replace(/宫$/, '') + '宫';
-    const palaceNameWithoutSuffix = palace.replace(/宫$/, '');
-    const targetPalaceName = scope === 'origin' ? palaceNameWithSuffix : palaceNameWithoutSuffix;
+    // 归一化宫位名称：iztro 内部除"命宫"外均不带"宫"字
+    const base = palace.replace(/宫$/, '');
+    const targetPalaceName = base === '命' ? '命宫' : base;
+
+    // 构建查询日期（origin 用今天的日期，不影响本命数据）
+    const queryDate = scope !== 'origin'
+      ? buildQueryDate(year, month || 1, day || 1)
+      : new Date().toISOString().slice(0, 10);
 
-    // 构建查询日期
-    const queryDate = scope !== 'origin' ? buildQueryDate(year, month || 1, day || 1) : null;
+    // 统一通过 horoscope 接口查询所有层级
+    const horoscope = astrolabe.horoscope(queryDate);
 
-    // 获取目标宫位和三方四正
     const { targetPalace, surroundedPalaces, scopeData } = getScopedPalaceAndSurrounded(
-      astrolabe, targetPalaceName, scope, queryDate
+      horoscope, targetPalaceName, scope
     );
 
     if (!targetPalace) {
@@ -109,13 +96,7 @@ export async function executePalace(options) {
     }
 
     // 检测格局
-    let patterns;
-    if (scope === 'origin') {
-      patterns = detectPatterns(astrolabe);
-    } else {
-      const horoscope = astrolabe.horoscope(queryDate);
-      patterns = detectPatterns(horoscope, scope);
-    }
+    const patterns = detectPatterns(horoscope, scope);
 
     // 构建结果
     const result = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ziwei-cli",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "紫微斗数 + 八字命理分析 CLI 工具 - Claude Code / OpenClaw Skill",
   "type": "module",
   "main": "bin/ziwei.js",