guanwei 1.1.1 → 1.1.3

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

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

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

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

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

package/shared/core/types.ts

@@ -198,6 +198,163 @@ export interface TarotCardData {
   reversed: boolean;
 }
 
+// ─── 塔罗解读链路（原 src/types + src/utils/semanticAnalyzer 收敛至此，双端单一副本）───
+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;
+}
+
+// 问题语义分析（原 src/utils/semanticAnalyzer 类型部分）
+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;
+}
+
+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 interface LifeContext {
+  scenes: string[];
+  actions: string[];
+  warnings: string[];
+  timeline: { short: string; mid: string; long: string };
+  emotionAdvice: Record<Emotion, string>;
+}
+
 // 通用引擎契约
 export interface ArtEngine<TInput, TResult> {
   id: ArtId;

package/src/arts/registry.ts

@@ -11,7 +11,7 @@ import { AstrologyPanel, AstrologyResult } from '@/components/arts/AstrologyArt'
 import { TarotPanel, TarotResult } from '@/components/arts/TarotArt';
 
 export interface ArtPair {
-  Panel: ComponentType<{ onDivine: (fn: () => unknown) => void }>;
+  Panel: ComponentType<{ onDivine: (...args: any[]) => void }>;
   Result: ComponentType<{ data: any }>;
   placeholder: string;
 }

package/src/components/QuestionFields.tsx

@@ -1,5 +1,4 @@
 // 所问之事的统一输入：类型选择 + 问题输入（占问类必填区，命盘类可留白）
-import { useState } from 'react';
 import SongSelect from '@/components/SongSelect';
 
 const DEFAULT_TYPES = [

package/src/components/ReportView.tsx

@@ -1,6 +1,5 @@
 // AI 解读报告结构化展示：按 Schema 匹配填充（命盘类/占问类）
 import type { AIReport } from '@/services/api';
-import { ResultCard } from '@/components/ResultCard';
 
 interface Props {
   report: AIReport;

package/src/components/TimeShichenInput.tsx

@@ -9,6 +9,7 @@ interface Props {
 }
 
 export default function TimeShichenInput({ value, onChange, id, label = '出生时刻（精确）' }: Props) {
+  void label;
   return (
     <div>
       <div style={{ display: 'flex', gap: '.5rem', alignItems: 'stretch' }}>

package/src/components/arts/BaziArt.tsx

@@ -1,6 +1,5 @@
 // 四柱八字：输入面板（含出生地点→真太阳时）+ 结果渲染（四柱/五行/十神）
 import { useState } from 'react';
-import { baziCalc } from '@core/engine/bazi';
 import { SHISHEN_MAP, WUXING } from '@core/data/ganzhi';
 import type { BaziResult, GeoLocation } from '@core/types';
 import type { UserProfile } from '@/utils/userStore';
@@ -258,12 +257,3 @@ export function BaziResult({ data }: { data: BaziResult }) {
     </>
   );
 }
-// 十神格局点睛
-function shishenFocus(r: any): string {
-  const names = r.shishen.map((s: any) => s.name);
-  if (names.includes('正官') || names.includes('七杀')) return '官杀透干，主担当与约束，成事在于守正。';
-  if (names.includes('正财') || names.includes('偏财')) return '财星显露，主经营与所得，宜务实聚财。';
-  if (names.includes('正印') || names.includes('偏印')) return '印星为用，主学识与荫庇，宜向学深造。';
-  if (names.includes('食神') || names.includes('伤官')) return '食伤泄秀，主才情与输出，宜展露所长。';
-  return '比劫同气，主自立与同侪，宜广结善缘。';
-}

package/src/components/arts/LiurenArt.tsx

@@ -1,6 +1,6 @@
 // 大六壬：起课面板 + 天地盘/四课三传渲染
 import { useState } from 'react';
-import { liurenCalc, jiangName } from '@core/engine/liuren';
+import { jiangName } from '@core/engine/liuren';
 import { ZHI } from '@core/data/ganzhi';
 import { LR_JIANG_SYMBOL, LR_JIANG_WX } from '@core/data/liuren';
 import type { LiurenResult } from '@core/types';

package/src/components/arts/LiuyaoArt.tsx

@@ -1,6 +1,5 @@
 // 六爻：铜钱摇卦面板 + 六爻/卦象渲染
 import { useState } from 'react';
-import { liuyaoCalc } from '@core/engine/liuyao';
 import type { LiuyaoResult } from '@core/types';
 import { ResultCard } from '@/components/ResultCard';
 import SongSelect from '@/components/SongSelect';

package/src/components/arts/MeihuaArt.tsx

@@ -1,6 +1,5 @@
 // 梅花易数：起卦面板（时间/报数）+ 卦象渲染（本卦/互卦/变卦 + 体用）
 import { useState } from 'react';
-import { meihuaCalc } from '@core/engine/meihua';
 import { BAGUA } from '@core/data/gua64';
 import type { MeihuaResult } from '@core/types';
 import { ResultCard } from '@/components/ResultCard';

package/src/components/arts/QimenArt.tsx

@@ -1,6 +1,5 @@
 // 奇门遁甲：起局面板 + 九宫盘渲染
 import { useState } from 'react';
-import { qimenCalc } from '@core/engine/qimen';
 import type { QimenResult } from '@core/types';
 import { ResultCard } from '@/components/ResultCard';
 import SongSelect from '@/components/SongSelect';

package/src/components/arts/TarotArt.tsx

@@ -1,7 +1,7 @@
 // 塔罗：问镜面板（牌阵选择）+ 扇形翻牌（未翻开不示牌名）+ 牌阵之示
 import { useState } from 'react';
 import { Link } from 'react-router-dom';
-import { tarotDraw, SUIT } from '@core/engine/tarot';
+import { SUIT } from '@core/engine/tarot';
 import { allTarotSpreads, type TarotSpread } from '@core/data/tarotSpreads';
 import type { TarotCardData } from '@core/types';
 import { ResultCard } from '@/components/ResultCard';
@@ -96,7 +96,7 @@ export function TarotResult({ data }: { data: DrawResult }) {
   );
 }
 // 塔罗全阵参详（正逆位比例 + 元素侧重，现代语言）
-function tarotSummary(cards: any[], spread: any): string {
+function tarotSummary(cards: any[], _spread: any): string {
   const rev = cards.filter(c => c.reversed).length;
   const majors = cards.filter(c => c.major).length;
   const parts: string[] = [];

package/src/components/arts/XiaoliurenArt.tsx

@@ -1,7 +1,6 @@
 // 小六壬：掐指占时面板 + 掌诀/推演轨迹渲染
 import { useState } from 'react';
-import { xiaoliurenCalc } from '@core/engine/xiaoliuren';
-import { XLR_ORDER, XLR } from '@core/data/xiaoliuren';
+import { XLR_ORDER } from '@core/data/xiaoliuren';
 import { mod } from '@core/data/ganzhi';
 import type { XiaoliurenResult } from '@core/types';
 import { ResultCard } from '@/components/ResultCard';

package/src/components/arts/ZiweiArt.tsx

@@ -1,9 +1,7 @@
 // 紫微斗数：输入面板（干支年/农历月日时 + 地点经度校正）+ 紫微盘渲染
 import { useState } from 'react';
-import { ziweiCalc } from '@core/engine/ziwei';
-import { ZW_STARS, ZW_STAR_MEAN, PALACE_NAMES } from '@core/data/ziwei';
+import { PALACE_NAMES } from '@core/data/ziwei';
 import { interpretZiwei } from '@core/engine/ziweiInterpret';
-import { ganZhiIndex, GAN, ZHI, NAYIN } from '@core/data/ganzhi';
 import { timeToHourIndex, hourIndexLabel } from '@/data/shichen';
 import TimeShichenInput from '@/components/TimeShichenInput';
 import type { ZiweiResult, GeoLocation } from '@core/types';
@@ -22,16 +20,6 @@ import LifeEventsInput, { type LifeEvent } from '@/components/LifeEventsInput';
 const DIZHI = ['寅', '卯', '辰', '巳', '午', '未', '申', '酉', '戌', '亥', '子', '丑'];
 const mod = (a: number, n: number) => ((a % n) + n) % n;
 
-// 干支年选项（1950-2010）
-function ganzhiOptions() {
-  const out: { gz: string; year: number }[] = [];
-  for (let y = 1950; y <= 2010; y++) {
-    const i = ((y - 4) % 60 + 60) % 60;
-    out.push({ gz: GAN[i % 10] + ZHI[i % 12], year: y });
-  }
-  return out;
-}
-
 interface PanelProps { onDivine: (inputs: unknown, profile?: UserProfile, question?: string, profileId?: string) => void; }
 
 export function ZiweiPanel({ onDivine }: PanelProps) {
@@ -53,7 +41,7 @@ export function ZiweiPanel({ onDivine }: PanelProps) {
     if (new Date(yy, mm - 1, dd).getMonth() !== mm - 1) { setFormMsg('⚠ 出生日期不合法，请检查'); return; }
     setFormMsg('');
     // 公历 → 农历（万年历），紫微依农历排盘
-    let lm = 1, ld = 1, gz = '甲子', birthYear = yy;
+    let lm = 1, ld = 1, gz = '甲子';
     try {
       const lunar = Solar.fromYmd(yy, mm, dd).getLunar();
       const rawMonth = lunar.getMonth();
@@ -61,7 +49,6 @@ export function ZiweiPanel({ onDivine }: PanelProps) {
       // 闰月（lunar 返回负数）：按 iztro fixLeap 规则，后半月算下月
       lm = Math.abs(rawMonth) + (rawMonth < 0 && ld > 15 ? 1 : 0);
       gz = lunar.getYearInGanZhi();
-      birthYear = lunar.getYear();
     } catch { /* 非法日期回退默认 */ }
     // 时辰未知：紫微以午时示例排盘（仅命局五行参考），档案标记未知供 AI 解读约束
     const hourIdx = hourUnknown ? 6 : timeToHourIndex(birthTime);

package/src/pages/AuthPage.tsx

@@ -5,15 +5,13 @@ import { apiDivineHistory, apiDivineDetail, apiDivineDelete, downloadReport } fr
 import ReportView from '@/components/ReportView';
 import {
   register, login, logout, currentUser, updateProfile,
-  addSampleProfile, updateSampleProfile, removeSampleProfile, promoteSampleProfile,
-  DEFAULT_PROFILE, type UserProfile, type NamedProfile,
+  updateSampleProfile, removeSampleProfile, promoteSampleProfile,
+  type UserProfile, type NamedProfile,
 } from '@/utils/userStore';
 import { useConfirm } from '@/components/SongDialog';
 import { syncRecordsFromServer } from '@/utils/recordStore';
 import { syncProfileToServer } from '@/utils/userStore';
 import ProfileForm from '@/components/ProfileForm';
-import SongSelect from '@/components/SongSelect';
-
 export default function AuthPage() {
   const navigate = useNavigate();
   const confirm = useConfirm();
@@ -220,12 +218,12 @@ export default function AuthPage() {
                 <p>此占尚未召 AI 成文，仅存排盘之象</p>
               </div>
             )}
-            {histDetail.resultRaw && (
+            {histDetail.resultRaw ? (
               <details className="mh-intro" style={{ marginTop: 'var(--sp-2)' }}>
                 <summary>排盘原始数据</summary>
                 <pre style={{ fontSize: '.72rem', lineHeight: 1.7, whiteSpace: 'pre-wrap', wordBreak: 'break-all' }}>{JSON.stringify(histDetail.resultRaw, null, 1)}</pre>
               </details>
-            )}
+            ) : null}
           </div>
         </div>
       )}

package/src/pages/DemoPage.tsx

@@ -67,7 +67,6 @@ export default function DemoPage() {
   const [artId, setArtId] = useState('bazi');
   const [localResult, setLocalResult] = useState<unknown>(null);
   const art = ARTS.find(a => a.id === artId)!;
-  const chart = baziCalc(DEMO_BIRTH);
 
   const reset = () => {
     setPhase('idle');
@@ -136,7 +135,7 @@ export default function DemoPage() {
         {phase === 'done' && (
           <>
             <div className="altar-result stagger">
-              {localResult && RESULT_VIEWS[artId]?.(localResult)}
+              {localResult ? RESULT_VIEWS[artId]?.(localResult) : null}
               {report && (
                 <div className="result-card mt-3">
                   <h3>AI 深度解读 <span className="tag-cool" style={{ marginLeft: '.4rem', fontSize: '.72rem' }}>示例报告</span></h3>

package/src/pages/HistoryPage.tsx

@@ -61,7 +61,7 @@ export default function HistoryPage() {
   }
 
   const records = useMemo(() => getRecords(), [tick, artFilter, search]);
-  const [profileFilter, setProfileFilter] = useState('all');
+  const [profileFilter] = useState('all');
   const filtered = records.filter(r => {
     if (profileFilter !== 'all' && (r.profileId || 'main') !== profileFilter) return false;
     if (artFilter !== 'all' && r.artId !== artFilter) return false;
@@ -115,15 +115,16 @@ export default function HistoryPage() {
 function summarize(result: unknown): string {
   const r = result as Record<string, any>;
   if (!r) return '（结果不可读）';
-  if (r.yearGZ) return `${r.yearGZ}年 ${r.monthGZ}月 ${r.dayGZ}日 ${r.hourGZ}时 · ${r.strength || ''}`;
-  if (r.benGua) return `本卦${r.benGua.name} · ${r.bianGua ? '变' + r.bianGua.name : ''} · ${r.shengke || ''}`;
-  if (r.ju) return `${r.jqName} · ${r.yin ? '阴' : '阳'}遁${r.ju}局 · ${r.dayGZ}日`;
-  if (r.name && r.detail) return `${r.name} · ${r.detail.ji || ''} · ${r.detail.wx || ''}`;
-  if (r.jiang) return `${r.jiang}将加时 · 四课${r.ke1}/${r.ke2}/${r.ke3}/${r.ke4}`;
-  if (r.ming !== undefined) return `命宫@${r.ming} · ${r.juName || ''} · 紫微@${r.zwPos}`;
+  const o: Record<string, any> = Array.isArray(r) ? {} : r;
+  if (o.yearGZ) return `${o.yearGZ}年 ${o.monthGZ}月 ${o.dayGZ}日 ${o.hourGZ}时 · ${o.strength || ''}`;
+  if (o.benGua) return `本卦${o.benGua.name} · ${o.bianGua ? '变' + o.bianGua.name : ''} · ${o.shengke || ''}`;
+  if (o.ju) return `${o.jqName} · ${o.yin ? '阴' : '阳'}遁${o.ju}局 · ${o.dayGZ}日`;
+  if (o.name && o.detail) return `${o.name} · ${o.detail.ji || ''} · ${o.detail.wx || ''}`;
+  if (o.jiang) return `${o.jiang}将加时 · 四课${o.ke1}/${o.ke2}/${o.ke3}/${o.ke4}`;
+  if (o.ming !== undefined) return `命宫@${o.ming} · ${o.juName || ''} · 紫微@${o.zwPos}`;
   if (Array.isArray(r) && r[0] && r[0].name) return `${r.length} 张牌：${r.map((c: any) => c.name).join('、')}`;
-  if (r.planets) return `太阳落${signOf(r.sun)} · 月亮落${signOf(r.moon)}`;
-  if (r.yin !== undefined) return `${r.jqName || ''} · ${r.yin ? '阴' : '阳'}遁${r.ju}局`;
+  if (o.planets) return `太阳落${signOf(o.sun)} · 月亮落${signOf(o.moon)}`;
+  if (o.yin !== undefined) return `${o.jqName || ''} · ${o.yin ? '阴' : '阳'}遁${o.ju}局`;
   return JSON.stringify(r).slice(0, 40);
 }