guanwei 1.1.1 → 1.1.3

package/src/pages/ModulePage.tsx

@@ -7,40 +7,13 @@ import { useDivine } from '@/hooks/useDivine';
 import { useAIInterpret } from '@/hooks/useAIInterpret';
 import { artPairOf } from '@/arts/registry';
 import { saveRecord } from '@/utils/recordStore';
-import { downloadReport, apiDivine, type AIReport } from '@/services/api';
+import { apiDivine, type AIReport } from '@/services/api';
 import ReportView from '@/components/ReportView';
 import { currentUser, addSampleProfile } from '@/utils/userStore';
 import { analyzeQuestionFit } from '@core/engine/questionFit';
 import type { UserProfile } from '@/utils/userStore';
 import { useEffect, useRef, useState } from 'react';
-import { BaziPanel, BaziResult } from '@/components/arts/BaziArt';
-import { ZiweiPanel, ZiweiResult } from '@/components/arts/ZiweiArt';
-import { QimenPanel, QimenResultView } from '@/components/arts/QimenArt';
-import { MeihuaPanel, MeihuaResult } from '@/components/arts/MeihuaArt';
-import { LiuyaoPanel, LiuyaoResult } from '@/components/arts/LiuyaoArt';
-import { LiurenPanel, LiurenResult } from '@/components/arts/LiurenArt';
-import { XiaoliurenPanel, XiaoliurenResult } from '@/components/arts/XiaoliurenArt';
-import { AstrologyPanel, AstrologyResult } from '@/components/arts/AstrologyArt';
-import { TarotPanel, TarotResult } from '@/components/arts/TarotArt';
-import type { ComponentType } from 'react';
 
-interface ArtPair {
-  Panel: ComponentType<{ onDivine: (fn: () => unknown) => void }>;
-  Result: ComponentType<{ data: unknown }>;
-  placeholder: string;
-}
-
-const ART_PAIRS: Record<string, ArtPair> = {
-  bazi:       { Panel: BaziPanel, Result: BaziResult, placeholder: '静候四柱 · 观五行流转' },
-  ziwei:      { Panel: ZiweiPanel, Result: ZiweiResult, placeholder: '静候星布 · 观十四主星' },
-  qimen:      { Panel: QimenPanel, Result: QimenResultView, placeholder: '静候局成 · 观九宫遁甲' },
-  meihua:     { Panel: MeihuaPanel, Result: MeihuaResult, placeholder: '静候心动 · 观梅花开落' },
-  liuyao:     { Panel: LiuyaoPanel, Result: LiuyaoResult, placeholder: '静候钱落 · 观六爻成象' },
-  liuren:     { Panel: LiurenPanel, Result: LiurenResult, placeholder: '静候课起 · 观天地人盘' },
-  xiaoliuren: { Panel: XiaoliurenPanel, Result: XiaoliurenResult, placeholder: '静候指落 · 观掌诀玄机' },
-  astrology: { Panel: AstrologyPanel, Result: AstrologyResult, placeholder: '静候星布 · 观天穹为书' },
-  tarot: { Panel: TarotPanel, Result: TarotResult, placeholder: '静候牌启 · 观镜照本心' },
-};
 
 const PANEL_META: Record<string, { panelTitle: string; btn: string; btnSmall: string }> = {
   bazi:       { panelTitle: '布盘', btn: '排 盘', btnSmall: '布四柱 · 观五行 · 推十神' },
@@ -54,6 +27,23 @@ const PANEL_META: Record<string, { panelTitle: string; btn: string; btnSmall: st
   tarot:      { panelTitle: '问镜', btn: '洗 牌 抽 牌', btnSmall: '静心默问 · 凭心取牌' },
 };
 
+// AI 错误码 → 用户可行动的引导文案（与后端 mapLlmError 呼应；null = 无专门引导）
+function aiErrorHint(code: string): string | null {
+  switch (code) {
+    case 'AI_HTTP_401': return '💡 多半是 API Key 无效或过期：检查服务端 .env 中 Key 是否正确（可运行 guanwei doctor 自检）。';
+    case 'AI_HTTP_403': return '💡 API Key 无权限访问该模型：请检查服务商账号权限，或换用其他服务商 Key。';
+    case 'AI_HTTP_404': return '💡 模型名有误：请检查服务端 .env 中 LLM_*_MODEL 配置与所选服务商是否匹配。';
+    case 'AI_HTTP_429': return '💡 请求过频或额度不足：稍等片刻再试；若常触发，可检查服务商账户余额。';
+    case 'AI_HTTP_500':
+    case 'AI_HTTP_502':
+    case 'AI_HTTP_503':
+    case 'AI_HTTP_504': return '💡 AI 服务商暂时不可用：过一会儿再试即可，无需改动配置。';
+    case 'STREAM_TIMEOUT': return '💡 生成超时：网络波动或服务繁忙，请重试。';
+    case 'NETWORK': return '💡 网络连接异常：请检查本机网络，或确认服务仍在运行（guanwei status）。';
+    default: return null;
+  }
+}
+
 export default function ModulePage() {
   const { artId } = useParams<{ artId: string }>();
   const art = artId ? artById(artId) : undefined;
@@ -89,10 +79,11 @@ export default function ModulePage() {
   };
   const isProfileArt = ['bazi', 'ziwei', 'astrology'].includes(art?.id || '');
   const exportReport = (rep: AIReport) => {
+    const artName = art?.name || '观微';
     const lines = [
       '# ' + (rep.title || '观微解读报告'),
       '',
-      '> 术别：' + art.name + '　·　' + new Date().toLocaleString('zh-CN'),
+      '> 术别：' + artName + '　·　' + new Date().toLocaleString('zh-CN'),
       '',
       '## 总述',
       '',
@@ -220,11 +211,11 @@ export default function ModulePage() {
                 <p>凝神静气 · 卦象将成</p>
               </div>
             )}
-            {status === 'done' && result && PairResult && <PairResult data={result} />}
+            {status === 'done' && result ? (PairResult ? <PairResult data={result} /> : null) : null}
             {status === 'error' && (
               <ResultPlaceholder glyph="滞" text={divineError || '推演未应机 · 请稍后再试'} />
             )}
-            {status === 'done' && result && (
+            {status === 'done' && result ? (
               <div className="result-card mt-3">
                 <h3>AI 深度解读</h3>
                 {ai.status === 'idle' && (
@@ -289,6 +280,8 @@ export default function ModulePage() {
                           <li>配置后重启服务即可；也可运行 <code style={{ background: 'rgba(0,0,0,.06)', padding: '0 .3rem' }}>guanwei doctor</code> 检查配置</li>
                         </ol>
                       </div>
+                    ) : aiErrorHint(ai.errorCode) ? (
+                      <p className="tiny muted" style={{ marginTop: '.4rem' }}>{aiErrorHint(ai.errorCode)}</p>
                     ) : (
                       <p className="tiny muted">古法规则解读为备，可先依上列排盘自行观照；若为 AI 服务异常，可于服务端检查 LLM 配置后重试。</p>
                     )}
@@ -310,7 +303,7 @@ export default function ModulePage() {
                 )}
                 <button className="btn-seal btn-ghost no-print" style={{ marginTop: 'var(--sp-3)', fontSize: '.9rem', padding: '.5rem 1.4rem' }} onClick={() => { ai.reset(); reset(); }}>再 起 一 占</button>
               </div>
-            )}
+            ) : null}
           </div>
         </div>
         <Disclaimer />

package/src/pages/SpreadLibrary.tsx

@@ -1,7 +1,7 @@
 import { useState, useMemo } from 'react';
 import { Link } from 'react-router-dom';
 import { Search, Plus, Sparkles, Filter, X, Star } from 'lucide-react';
-import { defaultSpreads } from '@/data/spreads';
+import { defaultSpreads } from '@core/data/spreads';
 import { getCustomSpreads } from '@/utils/spreadStorage';
 import type { Spread } from '@/types';
 import { useEffect } from 'react';

package/src/pages/TarotPage.tsx

@@ -1,13 +1,13 @@
 import { useState, useCallback, useEffect, useMemo, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Sparkles, Shuffle, Edit3, ChevronDown, ChevronUp, RotateCcw, Search, Plus, Library, X, Play, Pause, SkipForward, SkipBack } from 'lucide-react';
-import type { QuestionCategory, Spread, DrawnCard, TarotCard as TarotCardType } from '@/types';
-import { defaultSpreads } from '@/data/spreads';
-import { tarotCards } from '@/data/tarotCards';
-import { drawCards, generateInterpretation } from '@/utils/tarotEngine';
+import { Sparkles, Shuffle, Edit3, RotateCcw, Search, Library, X, Play, Pause, SkipForward, SkipBack } from 'lucide-react';
+import type { QuestionCategory, Spread, DrawnCard } from '@/types';
+import { defaultSpreads } from '@core/data/spreads';
+import { tarotCards } from '@core/data/tarotCards';
 import { generateComboResult } from '@/utils/comboEngine';
-import { saveRecord } from '@/utils/storage';
+
 import { getCustomSpreads } from '@/utils/spreadStorage';
+import { saveRecord } from '@/utils/storage';
 import { api } from '@/services/api';
 import { useDivinationStore } from '@/stores/useDivinationStore';
 import TarotCard from '@/components/TarotCard';
@@ -89,7 +89,6 @@ export default function TarotPage() {
   const [comboResultLocal, setComboResultLocal] = useState<any>(null);
   const [manualMode, setManualMode] = useState(false);
   const [manualCards, setManualCards] = useState<{ cardId: number; isReversed: boolean }[]>([]);
-  const [expandedSection, setExpandedSection] = useState<string | null>(null);
   const [showLibrary, setShowLibrary] = useState(false);
   const [cardSearch, setCardSearch] = useState('');
   const [activeSuit, setActiveSuit] = useState('all');
@@ -213,7 +212,6 @@ export default function TarotPage() {
     setIsComboEnabled(false);
     setManualMode(false);
     setManualCards([]);
-    setExpandedSection(null);
     setCurrentSectionIndex(0);
     setCompletedSections([]);
     setIsPlaying(false);
@@ -664,7 +662,7 @@ export default function TarotPage() {
                 </div>
               </div>
               <div className="mt-4 flex items-center gap-2">
-                {interpretation.sections.map((_, idx) => (
+                {interpretation.sections.map((_: unknown, idx: number) => (
                   <button
                     key={idx}
                     onClick={() => goToSection(idx)}

package/src/services/api.ts

@@ -1,5 +1,5 @@
 import type { QuestionCategory, Spread, DrawnCard } from '@/types';
-import type { InterpretationResult } from '@/utils/tarotEngine';
+import type { InterpretationResult } from '@core/engine/tarotEngine';
 
 // 开发环境直连后端（规避 proxy/IPv6 组合的 SSE 不确定性）；生产同域 /api
 const API_BASE = (import.meta.env.VITE_API_BASE as string | undefined) || '/api';
@@ -189,7 +189,7 @@ export async function aiInterpretStream(
     // 超时从「收到首个字节」起算（两步管线 Step1 为非流式，首字节前可能等待 30-120 秒，不能误判超时）
     timeoutTimer = setInterval(() => {
       if (firstByteAt && Date.now() - firstByteAt > 180000) {
-        clearInterval(timeoutTimer);
+        if (timeoutTimer) clearInterval(timeoutTimer);
         controller.abort();
         fail('STREAM_TIMEOUT', 'AI 生成逾时，请重试');
       }
@@ -240,7 +240,7 @@ export interface DivineResult {
   display?: unknown;
 }
 
-export async function apiDivine(username: string, artId: string, inputs: unknown, profile?: unknown, question?: string, profileId?: string): Promise<DivineResult> {
+export async function apiDivine(username: string, artId: string, inputs: unknown, profile?: unknown, question?: string, _profileId?: string): Promise<DivineResult> {
   const res = await fetch(API_BASE + '/divine', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -290,7 +290,7 @@ export function downloadReport(report: AIReport, artName: string, question: stri
     '',
     report.overview,
     '',
-    ...report.chapters.flatMap(c => ['## ' + (c.skill || '参详'), '', c.content, '']),
+    ...(report.chapters || []).flatMap(c => ['## ' + (c.skill || '参详'), '', c.content, '']),
     '## 结语',
     '',
     report.conclusion,

package/src/stores/useDivinationStore.ts

@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import type { TarotReading, ComboResult, QuestionCategory, DivinationRecord, DrawnCard } from '@/types';
+import type { TarotReading, ComboResult } from '@/types';
 
 interface DivinationState {
   currentReading: TarotReading | null;

package/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 '@core/types';

package/tsconfig.json

@@ -16,10 +16,10 @@
     "moduleDetection": "force",
     "noEmit": true,
     "jsx": "react-jsx",
-    "strict": false,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noFallthroughCasesInSwitch": false,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": false,
     "forceConsistentCasingInFileNames": false,
     "ignoreDeprecations": "5.0",
@@ -37,4 +37,4 @@
     "src",
     "api"
   ]
-}
+}