npm - guanwei - Versions diffs - 1.1.2 → 1.1.3 - Mend

guanwei 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

package/README.en.md +5 -2
package/README.md +6 -3
package/dist/assets/index-C3wrtpPY.css +1 -0
package/dist/assets/{index-C7ql6zvs.js → index-CAyAIgw8.js} +25 -25
package/dist/assets/index-CAyAIgw8.js.map +1 -0
package/dist/index.html +2 -2
package/package.json +2 -2
package/server/src/data/db.json +147 -0
package/server/src/index.ts +27 -4
package/server/src/routes/tarot.ts +4 -4
package/server/src/routes/users.ts +42 -7
package/server/src/services/divineStore.ts +1 -5
package/server/src/services/promptBuilder.ts +2 -2
package/server/src/types/index.ts +2 -104
package/{src → shared/core}/data/lifeContext.ts +2 -8
package/{src → shared/core}/data/spreads.ts +1 -1
package/{src → shared/core}/data/tarotCards.ts +1 -1
package/shared/core/engine/bazi.ts +0 -1
package/shared/core/engine/calendar.ts +1 -1
package/{server/src/utils → shared/core/engine}/semanticAnalyzer.ts +9 -46
package/{server/src/utils → shared/core/engine}/tarotEngine.ts +6 -6
package/shared/core/engine/ziwei.ts +3 -2
package/shared/core/engine/ziweiInterpret.ts +0 -3
package/shared/core/types.ts +157 -0
package/src/arts/registry.ts +1 -1
package/src/components/QuestionFields.tsx +0 -1
package/src/components/ReportView.tsx +0 -1
package/src/components/TimeShichenInput.tsx +1 -0
package/src/components/arts/BaziArt.tsx +0 -10
package/src/components/arts/LiurenArt.tsx +1 -1
package/src/components/arts/LiuyaoArt.tsx +0 -1
package/src/components/arts/MeihuaArt.tsx +0 -1
package/src/components/arts/QimenArt.tsx +0 -1
package/src/components/arts/TarotArt.tsx +2 -2
package/src/components/arts/XiaoliurenArt.tsx +1 -2
package/src/components/arts/ZiweiArt.tsx +2 -15
package/src/pages/AuthPage.tsx +4 -6
package/src/pages/DemoPage.tsx +1 -2
package/src/pages/HistoryPage.tsx +10 -9
package/src/pages/ModulePage.tsx +6 -32
package/src/pages/SpreadLibrary.tsx +1 -1
package/src/pages/TarotPage.tsx +7 -9
package/src/services/api.ts +4 -4
package/src/stores/useDivinationStore.ts +1 -1
package/src/types/index.ts +2 -104
package/tsconfig.json +5 -5
package/dist/assets/index-C7ql6zvs.js.map +0 -1
package/dist/assets/index-DQx62TUr.css +0 -1
package/server/src/data/lifeContext.ts +0 -423
package/server/src/data/spreads.ts +0 -255
package/server/src/data/tarotCards.ts +0 -2353
package/src/utils/semanticAnalyzer.ts +0 -555
package/src/utils/tarotEngine.ts +0 -849

package/dist/index.html CHANGED Viewed

@@ -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-C7ql6zvs.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 CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "guanwei",
   "private": false,
-  "version": "1.1.2",
+  "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/server/src/data/db.json CHANGED Viewed

@@ -12075,6 +12075,153 @@
           }
         }
       ]
+    },
+    {
+      "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 CHANGED Viewed

@@ -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/tarot.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 RENAMED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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--) {

package/{server/src/utils → shared/core/engine}/semanticAnalyzer.ts RENAMED Viewed

@@ -1,53 +1,16 @@
 // 问题语义分析器
 // 在解读阶段对用户问题进行多维度分析
+// 类型定义收敛自 shared/core/types.ts（单一副本），此处仅保留分析与函数逻辑
-export type Scene = 'love' | 'career' | 'wealth' | 'study' | 'health' | 'family' | 'friendship' | 'spiritual' | 'travel' | 'general';
-export type Emotion = 'anxious' | 'hopeful' | 'confused' | 'lost' | 'grateful' | 'calm' | 'angry' | 'sad' | 'curious';
-export type Tense = 'past' | 'present' | 'future' | 'hypothetical' | 'ongoing';
-export type Subject = 'self' | 'other' | 'mutual' | 'third-party';
-export type Depth = 'surface' | 'mid' | 'deep';
-// 问题类型：决策 / 预测 / 原因 / 建议 / 读心 / 时间 / 通用
-export type QuestionType = 'decision' | 'prediction' | 'reason' | 'advice' | 'mindreading' | 'timing' | 'general';
-// 用户需要的回应方式：安慰 / 方向 / 确认 / 警示
-export type ResponseNeed = 'comfort' | 'direction' | 'confirmation' | 'warning';
-// 关键实体
-export interface KeyEntity {
-  type: 'person' | 'event' | 'time';
-  value: string;
-}
-// 问题的深度分析
-export interface QuestionAnalysis {
-  realQuestion: string; // 用户真正想问的是什么
-  emotionalNeed: string; // 问题背后的情绪需求
-  responseNeed: ResponseNeed; // 用户需要什么样的回应
-  responseNeedLabel: string;
-}
+import type {
+  Scene, Emotion, Tense, Subject, Depth,
+  QuestionType, ResponseNeed, KeyEntity, QuestionAnalysis, SemanticAnalysis,
+} from '../types.js';
-export interface SemanticAnalysis {
-  scene: Scene;
-  sceneLabel: string;
-  emotion: Emotion;
-  emotionLabel: string;
-  tense: Tense;
-  tenseLabel: string;
-  subject: Subject;
-  subjectLabel: string;
-  depth: Depth;
-  depthLabel: string;
-  keywords: string[];
-  intensity: number; // 0-1，问题强度
-  confidence: number; // 0-1，分析置信度
-  // —— 以下为新增字段 ——
-  questionType: QuestionType; // 问题类型
-  questionTypeLabel: string; // 问题类型中文标签
-  questionCore: string; // 问题的核心意图
-  questionSummary: string; // 一句话概括用户问题的本质
-  keyEntities: KeyEntity[]; // 问题中的关键实体
-  questionAnalysis: QuestionAnalysis; // 深度分析问题的潜台词
-}
+export type {
+  Scene, Emotion, Tense, Subject, Depth,
+  QuestionType, ResponseNeed, KeyEntity, QuestionAnalysis, SemanticAnalysis,
+};
 // 场景关键词库
 const SCENE_KEYWORDS: Record<Scene, { label: string; words: string[]; weight: number }> = {

package/{server/src/utils → shared/core/engine}/tarotEngine.ts RENAMED Viewed

@@ -1,6 +1,6 @@
-import type { TarotCard, DrawnCard, Spread, QuestionCategory } from '../types/index.js';
+import type { TarotCard, DrawnCard, Spread, QuestionCategory } from '../types.js';
 import { tarotCards } from '../data/tarotCards.js';
-import { analyzeQuestion, type SemanticAnalysis, type Scene, type Emotion } from '../utils/semanticAnalyzer.js';
+import { analyzeQuestion, type SemanticAnalysis, type Scene, type Emotion } from './semanticAnalyzer.js';
 import { LIFE_CONTEXTS } from '../data/lifeContext.js';
 type LifeAreaKey = 'love' | 'career' | 'wealth' | 'health' | 'growth';
@@ -157,7 +157,7 @@ ${revealLines[Math.floor(Math.random() * revealLines.length)]}`;
 function generateOverviewSection(
   cards: DrawnCard[],
   spread: Spread,
-  question: string,
+  _question: string,
   semantic: SemanticAnalysis
 ): InterpretationSection {
   const cardData = cards.map((drawn) => {
@@ -316,7 +316,7 @@ function generateOverviewSection(
 function generateOverviewStoryFlow(
   cardData: { card: TarotCard; drawn: DrawnCard; position: { name: string; description: string } }[],
-  semantic: SemanticAnalysis
+  _semantic: SemanticAnalysis
 ): string {
   if (cardData.length === 0) return '';
@@ -362,7 +362,7 @@ function generateCardSection(
   position: { name: string; description: string },
   index: number,
   semantic: SemanticAnalysis,
-  lifeContext: typeof LIFE_CONTEXTS.love,
+  _lifeContext: typeof LIFE_CONTEXTS.love,
   totalCards: number
 ): InterpretationSection {
   const orientation = drawn.isReversed ? '逆位' : '正位';
@@ -429,7 +429,7 @@ ${selectedSymbols[0] || '画面里的核心意象'}在这个位置倒过来，
   };
 }
-function generateEsotericSection(cards: DrawnCard[], semantic: SemanticAnalysis): InterpretationSection {
+function generateEsotericSection(cards: DrawnCard[], _semantic: SemanticAnalysis): InterpretationSection {
   const elements: Record<string, number> = { 火: 0, 水: 0, 风: 0, 土: 0, 以太: 0 };
   const planets = new Set<string>();
   const sephiroth = new Set<string>();

package/shared/core/engine/ziwei.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 // 紫微斗数：简式星盘（命宫/五行局/紫微定位/十四主星）+ 补齐层（辅星/身宫/四化/庙旺/格局）
-import { NAYIN, NAYIN_JU, ganZhiIndex, mod } from '../data/ganzhi';
+import { NAYIN, ganZhiIndex, mod } from '../data/ganzhi';
+import { GAN } from '../data/ganzhi';
 import { trueSolarTime } from './trueSolarTime';
 import type { ZiweiInput, ZiweiResult } from '../types';
-import { GAN, ZHI } from '../data/ganzhi';
 import { PALACE_NAMES, ZW_SIHUA, ZW_BRIGHTNESS, LU_CUN, KUI_YUE, TIAN_MA, HUO_START, LING_START, ZW_GEJU } from '../data/ziwei';
 // 地支位：0=寅 起（与既有约定一致）

package/shared/core/engine/ziweiInterpret.ts CHANGED Viewed

@@ -73,9 +73,6 @@ export function interpretZiwei(r: ZiweiResult): ZiweiInsight[] {
     const stars = starsOf(r, pos);
     if (stars.length === 0) continue;
     const pname = PALACE_NAMES[i];
-    const brief = stars.map(starBrief).join('；');
-    const line = pname + '宫（' + DIZHI[pos] + '）见' + stars.join('、') + '——' + brief + '。此宫主' + palaceTheme(pname) + '。'
-      + stars[0] + '入' + pname + '，' + (GOOD_STARS.includes(stars[0]) ? '为得地之象，多主顺遂。' : '须留意分寸，化其棱角则吉。');
     overview.push({ name: pname, stars, pos });
   }
   out.push({