guanwei 1.1.1 → 1.1.3

package/dist/index.html

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>观微 · 玄学问道 —— 九术参详，观微知著</title>
   <meta name="description" content="以纸墨留白为骨，融四柱八字、紫微斗数、奇门遁甲、梅花易数、六爻、大六壬、小六壬、星盘、塔罗九术于一体。观微知著，以术问道。" />
-    <script type="module" crossorigin src="/assets/index-CsOD5rSo.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DQx62TUr.css">
+    <script type="module" crossorigin src="/assets/index-CAyAIgw8.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C3wrtpPY.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "guanwei",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -91,6 +91,6 @@
     "url": "git+https://github.com/RubyCcll/guanwei.git"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22.5.0"
   }
 }

package/scripts/release.sh

@@ -1,21 +1,32 @@
 #!/usr/bin/env bash
 # ============================================================
-# 观微发版脚本：升级版本号 → 同步 lockfile → 打 tag → 推送
-# 用法：./scripts/release.sh 1.1.2        （新版本号，不带 v 前缀）
+# 观微发版脚本：升级版本号 → 同步 lockfile → 打 tag → 推送 git → （可选）发布 npm
+# 用法：./scripts/release.sh 1.1.2            仅 git 发版（tag 触发 CI/Release/镜像）
+#       ./scripts/release.sh 1.1.2 --npm      额外发布 npm 包（需先配置 npm 登录）
 # 要求：工作区无未提交改动；CHANGELOG.md 已写好本次版本条目
+# 详见（本地文档）：docs/RELEASE-SOP.md
 # ============================================================
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
 NEW_VER="${1:-}"
+DO_NPM=0
+if [[ "${2:-}" == "--npm" ]]; then DO_NPM=1; fi
 if [[ -z "$NEW_VER" ]] || ! [[ "$NEW_VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-  echo "用法: ./scripts/release.sh <版本号>   例如: ./scripts/release.sh 1.1.2"; exit 1
+  echo "用法: ./scripts/release.sh <版本号> [--npm]   例如: ./scripts/release.sh 1.1.2 --npm"; exit 1
 fi
 
 if [[ -n "$(git status --porcelain)" ]]; then
   echo "⚠️  工作区有未提交改动，先提交或 stash 再发版"; exit 1
 fi
 
+# 0. 发版前必须全量测试通过（后端集成测试会起服务）
+echo "0️⃣  全量测试（npm test）..."
+if ! npm test >/tmp/guanwei-release-test.log 2>&1; then
+  echo "   ❌ 测试未通过，见 /tmp/guanwei-release-test.log"; exit 1
+fi
+echo "   ✅ 测试通过"
+
 echo "1️⃣  更新 package.json / server/package.json -> ${NEW_VER}"
 node -e "
 const fs = require('fs');
@@ -33,10 +44,23 @@ if ! grep -q "^## \[${NEW_VER}\]" CHANGELOG.md; then
   read -rp "   已补好？回车继续: " _
 fi
 
-echo "3️⃣  提交 + 打 tag + 推送"
+echo "3️⃣  提交 + 打 tag + 推送 git"
 git add package.json package-lock.json server/package.json server/package-lock.json CHANGELOG.md
 git commit -m "chore: 版本升级 ${NEW_VER}"
 git tag "v${NEW_VER}"
 git push origin main
 git push origin "v${NEW_VER}"
-echo "🎉 v${NEW_VER} 已推送——CI / Release / 镜像 / Pages 将自动执行"
+echo "   ✅ 已推送——CI / Release / 镜像 / Pages 将自动执行"
+
+if [[ "$DO_NPM" == "1" ]]; then
+  echo "4️⃣  发布 npm（registry 必须是官方源，本机默认 npmmirror 需显式指定）..."
+  # 用本地缓存避免 ~/.npm 写入受限；发布失败不中断后续提示
+  npm publish --registry https://registry.npmjs.org --cache ./.npm-cache || echo "   ⚠️  npm publish 失败——按 docs/RELEASE-SOP.md 第四节排查（2FA/权限/registry）"
+  rm -rf .npm-cache
+  echo "5️⃣  验证线上版本..."
+  npm view guanwei version --registry https://registry.npmjs.org --cache ./.npm-cache 2>/dev/null || true
+  rm -rf .npm-cache
+else
+  echo "（未加 --npm：跳过 npm 发布。如需发布：./scripts/release.sh ${NEW_VER} --npm，或手动 npm publish）"
+fi
+echo "🎉 v${NEW_VER} 发版完成"

package/server/src/data/db.json

@@ -12054,6 +12054,174 @@
           }
         }
       ]
+    },
+    {
+      "username": "联调3661",
+      "passHash": "h7a11ca53",
+      "createdAt": 1787394463725,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调7035",
+      "passHash": "h7a11ca53",
+      "createdAt": 1787462187089,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调6052",
+      "passHash": "h7a11ca53",
+      "createdAt": 1787463476120,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调4217",
+      "passHash": "scrypt$5d770ea33c351c28afc8ee563d5712a2$7d00490154d70d549eba3a28d0a94a8cf2b4b23fa2fcde990200e850566993779a3854ed20858039690fb21a59ac814942947d95d4bad8f4ae328317d3e35137",
+      "createdAt": 1787463514296,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调3642",
+      "passHash": "scrypt$e68ed2ead08e6da65060e6a7eaa44d4f$494bf83f166632db29cc3d85b334b5a7e64bec70949721cf3ef77c71b3e2b4f2b6a9abf6fe3bf8371ab506df450ead79ba01bda5005beaba47fdc269b9492c64",
+      "createdAt": 1787464003708,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调7150",
+      "passHash": "scrypt$a691ebce2d89d81489e7209925cda9ed$4f9aaf62d714d4ce7bc8f1df2566461161bd8ad32bad88d23680534bede52d3a99efd28897ddbd75eedcf5eb08bc7b748020cc3d242acc8966c96d52fbf53c0d",
+      "createdAt": 1787464067260,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调7275",
+      "passHash": "scrypt$5f91de795c181fe55ef00de36e94e7b8$5d3bd0f8d7097ea4fac56be03934a4a8638642c784f82d066d7b4b582669024c9d38ae82e19d7ab73781a7ab80130858b03a7490f979e04d7ed72294079571e6",
+      "createdAt": 1787468567400,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
+    },
+    {
+      "username": "联调9581",
+      "passHash": "scrypt$16272308b8058bf6ccbe9d3a2ed81a4d$52177ab888d594c6da154cf421557b10d8ab4fd170ee975cbfa432309bdd41cd0fb07c1a58f7d239662e7d36d035db3ce62bc9c50aeb36c0355779a8cf38fac5",
+      "createdAt": 1787468589681,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ]
     }
   ]
 }

package/server/src/index.ts

@@ -3,15 +3,38 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 // 轻量 .env 加载（无第三方依赖）
+// 支持：# 注释行、空行、KEY=value（可带双引号/单引号，内嵌转义 \n \t \" \\ 与注释剥离）
 (() => {
   try {
     const __dirname = path.dirname(fileURLToPath(import.meta.url));
     const envFile = path.join(__dirname, '..', '.env');
     const content = fs.readFileSync(envFile, 'utf-8');
-    content.split('\n').forEach(line => {
-      const m = /^\s*([A-Z_]+)\s*=\s*(.+)\s*$/.exec(line);
-      if (m && process.env[m[1]] === undefined) process.env[m[1]] = m[2].replace(/^["']|["']$/g, '');
-    });
+    for (const rawLine of content.split(/\r?\n/)) {
+      const line = rawLine.trim();
+      if (!line || line.startsWith('#')) continue;               // 空行 / 注释行
+      const eq = line.indexOf('=');
+      if (eq <= 0) continue;                                      // 无等号 → 跳过
+      const key = line.slice(0, eq).trim();
+      if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) continue;        // 非法键名 → 跳过
+      if (process.env[key] !== undefined) continue;               // 环境变量优先，不覆盖
+      let val = line.slice(eq + 1).trim();
+      // 行内注释剥离（引号外的 # 视为注释起点）
+      if (!val.startsWith('"') && !val.startsWith("'")) {
+        const hash = val.indexOf(' #');
+        if (hash >= 0) val = val.slice(0, hash);
+      }
+      // 引号包裹 → 整体剥引号 + 处理转义（仅双引号内做转义展开）
+      const q = val.startsWith('"') ? '"' : val.startsWith("'") ? "'" : null;
+      if (q && val.endsWith(q) && val.length >= 2) {
+        val = val.slice(1, -1);
+        if (q === '"') {
+          val = val.replace(/\\n/g, '\n').replace(/\\t/g, '\t').replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+        }
+      } else {
+        val = val.trim();
+      }
+      process.env[key] = val;
+    }
     console.log('· 已加载 .env（LLM_PROVIDER=' + (process.env.LLM_PROVIDER || '未配置') + '）');
   } catch { /* 无 .env 时忽略 */ }
 })();

package/server/src/routes/ai.ts

@@ -63,6 +63,12 @@ router.post('/interpret', async (req, res) => {
     if (e.message === 'AI_UNCONFIGURED') {
       return res.status(503).json({ error: 'AI_UNCONFIGURED', message: '未配置 AI 服务，请设置 LLM_PROVIDER 与对应 Key' });
     }
+    // 透传服务商 HTTP 错误码（401 Key 无效 / 404 模型不存在 / 429 额度限流 / 5xx 故障等），前端给专门引导
+    const mapped = mapLlmError(e);
+    if (mapped) {
+      console.error('[ai/interpret]', e.message);
+      return res.status(502).json({ error: mapped.code, message: mapped.message });
+    }
     console.error('[ai/interpret]', e);
     res.status(502).json({ error: 'AI_FAILED', message: 'AI 解读暂未应机' });
   }
@@ -141,6 +147,18 @@ router.post('/interpret/stream', async (req, res) => {
       }
       return;
     }
+    // 透传服务商 HTTP 错误码，前端给专门引导
+    const mapped = mapLlmError(e);
+    if (mapped) {
+      console.error('[ai/stream]', e.message);
+      if (res.headersSent) {
+        res.write(`data: ${JSON.stringify({ type: 'error', code: mapped.code, message: mapped.message })}\n\n`);
+        res.end();
+      } else {
+        res.status(502).json({ error: mapped.code, message: mapped.message });
+      }
+      return;
+    }
     console.error('[ai/stream]', e);
     if (res.headersSent) {
       res.write(`data: ${JSON.stringify({ type: 'error', code: 'AI_FAILED', message: 'AI 解读暂未应机' })}\n\n`);
@@ -373,4 +391,23 @@ export function parseSections(text: string): { title: string; content: string }[
   return [{ title: 'AI 参详', content: cleaned || 'AI 未返回内容' }];
 }
 
+// LLM 服务商 HTTP 错误 → 用户可行动的引导码（AI_HTTP_401 等透传给前端）
+export function mapLlmError(e: any): { code: string; message: string } | null {
+  const m = /^AI_HTTP_(\d{3})$/.exec(String(e?.message || ''));
+  if (!m) return null;
+  const status = Number(m[1]);
+  switch (status) {
+    case 401: return { code: 'AI_HTTP_401', message: 'API Key 无效或已过期——请检查 server/.env 中的 Key 是否正确（guanwei doctor 可自检）' };
+    case 403: return { code: 'AI_HTTP_403', message: 'API Key 无权限访问该模型——请检查账号权限或更换模型' };
+    case 404: return { code: 'AI_HTTP_404', message: '模型不存在或模型名有误——请检查 .env 中 LLM_*_MODEL 配置' };
+    case 402:
+    case 429: return { code: 'AI_HTTP_429', message: '请求过于频繁或额度不足——请稍后重试，或检查服务商账户余额' };
+    case 500:
+    case 502:
+    case 503:
+    case 504: return { code: 'AI_HTTP_' + status, message: 'AI 服务商暂时不可用——请稍后重试' };
+    default: return { code: 'AI_HTTP_' + status, message: 'AI 服务响应异常（HTTP ' + status + '）——请稍后重试' };
+  }
+}
+
 export default router;

package/server/src/routes/tarot.ts

@@ -1,8 +1,8 @@
 import { Router } from 'express';
-import { tarotCards } from '../data/tarotCards.js';
-import { defaultSpreads } from '../data/spreads.js';
-import { drawCards, generateInterpretation } from '../utils/tarotEngine.js';
-import { analyzeQuestion } from '../utils/semanticAnalyzer.js';
+import { tarotCards } from '../../../shared/core/data/tarotCards.js';
+import { defaultSpreads } from '../../../shared/core/data/spreads.js';
+import { drawCards, generateInterpretation } from '../../../shared/core/engine/tarotEngine.js';
+import { analyzeQuestion } from '../../../shared/core/engine/semanticAnalyzer.js';
 import type { QuestionCategory, Spread } from '../types/index.js';
 
 const router = Router();

package/server/src/routes/users.ts

@@ -2,11 +2,18 @@
 import { Router } from 'express';
 import fs from 'fs';
 import path from 'path';
+import crypto from 'crypto';
 import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const DB_FILE = path.join(__dirname, '..', 'data', 'db.json');
 
+function scryptAsync(pw: string, salt: Buffer, keylen: number): Promise<Buffer> {
+  return new Promise((resolve, reject) => {
+    crypto.scrypt(pw, salt, keylen, (err, key) => err ? reject(err) : resolve(key));
+  });
+}
+
 interface DbUser {
   username: string;
   passHash: string;
@@ -28,11 +35,31 @@ function saveDb(db: Db): void {
   fs.writeFileSync(DB_FILE, JSON.stringify(db, null, 2));
 }
 
-function hash(pw: string): string {
+// 密码哈希：scrypt（带随机盐，防彩虹表/暴力破解）。
+// 格式：scrypt$<saltHex>$<hashHex>；登录时对存量旧哈希（djb2 前缀 'h'）做兼容校验，命中即升级为 scrypt。
+const SCRYPT_N = 16384, SCRYPT_R = 8, SCRYPT_P = 1, SCRYPT_KEYLEN = 64;
+
+async function hashPassword(pw: string): Promise<string> {
+  const salt = crypto.randomBytes(16);
+  const key = await scryptAsync(pw, salt, SCRYPT_KEYLEN);
+  return 'scrypt$' + salt.toString('hex') + '$' + key.toString('hex');
+}
+
+async function verifyPassword(pw: string, stored: string): Promise<boolean> {
+  if (!stored) return false;
+  if (stored.startsWith('scrypt$')) {
+    const parts = stored.split('$');
+    if (parts.length !== 3) return false;
+    const salt = Buffer.from(parts[1], 'hex');
+    const expected = Buffer.from(parts[2], 'hex');
+    const key = await scryptAsync(pw, salt, expected.length);
+    return key.length === expected.length && crypto.timingSafeEqual(key, expected);
+  }
+  // 旧格式（djb2 变体）：仅做兼容校验，命中后由调用方升级
   let h = 5381;
   const s = 'guanwei::' + pw;
   for (let i = 0; i < s.length; i++) h = ((h << 5) + h + s.charCodeAt(i)) >>> 0;
-  return 'h' + h.toString(16);
+  return 'h' + h.toString(16) === stored;
 }
 
 const router = Router();
@@ -51,7 +78,7 @@ function upsertUser(username: string): DbUser {
   return user;
 }
 
-router.post('/register', (req, res) => {
+router.post('/register', async (req, res) => {
   const { username, password, profile } = req.body;
   const name = String(username || '').trim();
   if (name.length < 2) return res.status(400).json({ error: '名号至少二字' });
@@ -61,25 +88,33 @@ router.post('/register', (req, res) => {
   if (existing) {
     // 云同步自动建档的占位账号（无密语）可被正式注册升级
     if (!existing.passHash) {
-      existing.passHash = hash(String(password));
+      existing.passHash = await hashPassword(String(password));
       if (profile) existing.profile = { ...existing.profile, ...profile };
       saveDb(db);
       return res.json({ ok: true, upgraded: true, user: { username: existing.username, profile: existing.profile, samples: existing.samples } });
     }
     return res.status(400).json({ error: '此名号已有人用' });
   }
-  const user: DbUser = { username: name, passHash: hash(String(password)), createdAt: Date.now(), profile: profile || {}, samples: [], records: [] };
+  const user: DbUser = { username: name, passHash: await hashPassword(String(password)), createdAt: Date.now(), profile: profile || {}, samples: [], records: [] };
   db.users.push(user);
   saveDb(db);
   res.json({ ok: true, user: { username: user.username, profile: user.profile, samples: user.samples } });
 });
 
 // 登录
-router.post('/login', (req, res) => {
+router.post('/login', async (req, res) => {
   const { username, password } = req.body;
   const db = loadDb();
   const user = db.users.find(u => u.username === String(username || '').trim());
-  if (!user || user.passHash !== hash(String(password || ''))) return res.status(401).json({ error: '名号或密语未合' });
+  if (!user) return res.status(401).json({ error: '名号或密语未合' });
+  const ok = await verifyPassword(String(password || ''), user.passHash);
+  if (!ok) return res.status(401).json({ error: '名号或密语未合' });
+  // 旧哈希命中 → 升级为 scrypt 存储
+  if (user.passHash && !user.passHash.startsWith('scrypt$')) {
+    user.passHash = await hashPassword(String(password));
+    saveDb(db);
+    console.log(`[users] 密码哈希已升级为 scrypt: ${user.username}`);
+  }
   res.json({ ok: true, user: { username: user.username, profile: user.profile, samples: user.samples } });
 });
 

package/server/src/services/divineStore.ts

@@ -30,11 +30,7 @@ export function getDb(): DatabaseSync {
       report_quality TEXT,
       status        TEXT NOT NULL DEFAULT 'divined',
       created_at    INTEGER NOT NULL,
-      updated_at    INTEGER NOT NULL,
-      plan_tier     TEXT NOT NULL DEFAULT 'free',
-      quota_key     TEXT,
-      quota_consumed INTEGER NOT NULL DEFAULT 1,
-      billing_meta  TEXT
+      updated_at    INTEGER NOT NULL
     );
     CREATE INDEX IF NOT EXISTS idx_div_user_time ON divinations(username, created_at DESC);
 

package/server/src/services/promptBuilder.ts

@@ -1,4 +1,4 @@
-// 提示词构建：9 术 agent + Skills 编排 + 两套报告 Schema 模板 + 档案注入
+// 提示词构建：9 术角色 persona（单轮注入，多 Agent 编排规划中）+ 两套报告 Schema 模板 + 档案注入
 import type { ChatMessage } from './llmProvider';
 import { agentOf } from './skills';
 import { chartBrief } from './chartBrief';
@@ -89,7 +89,7 @@ function lifeEventsNote(profile?: unknown): string {
   return '【命主已知人生经历 · 解读校准】以下为命主本人确认的人生事件，解读必须与此相符：\n' + clean.join('\n') + '\n要求：① 凡解读涉及这些年份（或与之相邻的大运流年）时，必须呼应对应事件（如该年患病手术，则论健康/流年时须呼应）；② 严禁写出与已知经历相矛盾的内容（如已知 2024 年重大健康事件，就不得断言该年平安无事）；③ 已知经历未覆盖的年份正常论命，不得为了呼应而编造具体事件细节。';
 }
 
-// Skills 编排版：9 术 agent + 档案 + 排盘结果 → 结构化解读报告
+// 角色化解读版：9 术 persona（单轮注入）+ 档案 + 排盘结果 → 结构化解读报告
 export function buildReportMessages(
   artId: string,
   question: string,

package/server/src/types/index.ts

@@ -1,104 +1,2 @@
-export interface TarotCard {
-  id: number;
-  name: string;
-  nameEn: string;
-  arcana: 'major' | 'minor';
-  suit?: 'wands' | 'cups' | 'swords' | 'pentacles';
-  number?: number;
-  keywords: string[];
-  meanings: {
-    upright: string;
-    reversed: string;
-  };
-  deepMeaning: {
-    coreTheme: string;
-    psychological: string;
-    spiritual: string;
-    shadow: string;
-    lifeAreas: {
-      love: string;
-      career: string;
-      wealth: string;
-      health: string;
-      growth: string;
-    };
-    advice: string;
-    warning: string;
-  };
-  imageSymbols: string[];
-  story: string;
-  astrology: {
-    zodiac?: string;
-    planet?: string;
-    element?: string;
-  };
-  kabbalah: {
-    path?: number;
-    sephirah?: string;
-  };
-  alchemy: {
-    stage?: string;
-    element?: string;
-  };
-  numerology: {
-    number: number;
-    meaning: string;
-  };
-  image: string;
-}
-
-export interface SpreadPosition {
-  id: number;
-  name: string;
-  description: string;
-  x: number;
-  y: number;
-}
-
-export interface Spread {
-  id: string;
-  name: string;
-  description: string;
-  positions: SpreadPosition[];
-  category: 'basic' | 'advanced' | 'custom';
-  scene?: string[];
-  isCustom?: boolean;
-}
-
-export interface DrawnCard {
-  cardId: number;
-  isReversed: boolean;
-  positionId: number;
-}
-
-export interface DivinationRecord {
-  id: string;
-  type: 'tarot' | 'combo' | 'ziwei' | 'bazi' | 'astrology';
-  question: string;
-  category: string;
-  spreadId?: string;
-  cards?: DrawnCard[];
-  comboMethod?: string;
-  comboResult?: string;
-  interpretation: string;
-  timestamp: number;
-}
-
-export interface ComboResult {
-  method: 'xiaoliuren' | 'daliuren' | 'liuyao' | 'meihua' | 'qimen';
-  methodName: string;
-  result: string;
-  detail: string;
-  relationToTarot: string;
-}
-
-export type QuestionCategory = 'love' | 'career' | 'wealth' | 'health' | 'study' | 'family' | 'friendship' | 'spiritual' | 'travel' | 'general';
-
-export interface TarotReading {
-  question: string;
-  category: QuestionCategory;
-  spreadId: string;
-  cards: DrawnCard[];
-  interpretation: string;
-  comboResult?: ComboResult;
-}
+// 类型桥（单一副本）：全部类型收敛于 shared/core/types.ts，此处仅 re-export 保持旧导入路径兼容
+export * from '../../../shared/core/types.js';

package/{src → shared/core}/data/lifeContext.ts

@@ -1,15 +1,9 @@
 // 生活化场景语料库
 // 根据场景提供具体的日常落地建议
 
-import type { Scene, Emotion } from '@/utils/semanticAnalyzer';
+import type { Scene, LifeContext } from '../types.js';
 
-export interface LifeContext {
-  scenes: string[];
-  actions: string[];
-  warnings: string[];
-  timeline: { short: string; mid: string; long: string };
-  emotionAdvice: Record<Emotion, string>;
-}
+export type { LifeContext };
 
 export const LIFE_CONTEXTS: Record<Scene, LifeContext> = {
   love: {

package/{src → shared/core}/data/spreads.ts

@@ -1,4 +1,4 @@
-import type { Spread } from '@/types';
+import type { Spread } from '../types.js';
 
 export const defaultSpreads: Spread[] = [
   // ===== 极简牌阵 =====

package/{src → shared/core}/data/tarotCards.ts

@@ -1,4 +1,4 @@
-import type { TarotCard } from '@/types';
+import type { TarotCard } from '../types.js';
 
 export const tarotCards: TarotCard[] = [
   // ===== 大阿卡纳 Major Arcana =====

package/shared/core/engine/bazi.ts

@@ -104,7 +104,6 @@ export function baziCalc(input: BaziInput): BaziResult {
   const nayin = NAYIN[Math.floor(jiaziIndex(y) / 2) % 30];
   const support = wxCount[dayGanWx] + wxCount[WX_ORDER[(WX_ORDER.indexOf(dayGanWx) + 4) % 5]];
   const drain = gzList.length * 2 - support;
-  const strength = support > drain ? '身强' : (support < drain ? '身弱' : '中和');
 
   // ─── 7. 地支藏干 + 藏干十神 + 加权五行 ───
   const canggan = gzList.map(gz => ({

package/shared/core/engine/calendar.ts

@@ -16,7 +16,7 @@ export function daysSince(y: number, m: number, d: number): number {
 
 /* ---------- 节气 ---------- */
 // 近似表取法（奇门定遁 / 展示用）：
-export function getJieqiApproxName(y: number, m: number, d: number): string {
+export function getJieqiApproxName(_y: number, m: number, d: number): string {
   const v = m * 100 + d;
   let name = '大雪';
   for (let i = JIEQI_APPROX.length - 1; i >= 0; i--) {