feat: policies-driven discover strategies, market regime, and G=B+M scoring

Land AlphaGBM-inspired discover presets (G=B+M core pool, fear rebound, Buffett lens upgrade), G=B+M scorecard with B/M breakdown on decision cards, and enriched market_regime from local breadth and Marks-cycle proxies. Document macro data backlog and switch README logo to opptrix-logo.png.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Travisun

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="icons/logo@256.png" alt="Opptrix" width="128" height="128" />
+  <img src="icons/opptrix-logo.png" alt="Opptrix" width="128" height="128" />
 </p>
 
 # Opptrix — 你的A股投研助手

apps/server/src/config.ts

@@ -35,7 +35,7 @@ export interface AppConfig {
 
 const DEFAULTS: AppConfig = {
   providers: [],
-  default_scorecard: process.env.DEFAULT_SCORECARD ?? '综合评估',
+  default_scorecard: process.env.DEFAULT_SCORECARD ?? 'G=B+M',
   default_top_n: Number(process.env.DEFAULT_TOP_N ?? 20),
 }
 

client-ui/src/api/client.ts

@@ -72,8 +72,8 @@ import type {
 } from '../types/schemas'
 
 export const research = {
-  diagnose:      (code: string) =>
-    apiCall<StockDiagnosisData>('stock_diagnosis', { code }),
+  diagnose: (code: string, scorecard?: string) =>
+    apiCall<StockDiagnosisData>('stock_diagnosis', { code, ...(scorecard ? { scorecard } : {}) }),
 
   institutionRating: (code: string, groups?: string[], signal?: AbortSignal) =>
     apiCall<InstitutionRatingData>('institution_rating', { code, groups }, { signal }, 20000),
@@ -121,6 +121,9 @@ export const research = {
       tradeDate ? { trade_date: tradeDate } : {},
     ),
 
+  marketRegime: () =>
+    apiCall<import('../types/schemas').MarketRegimeData>('market_regime'),
+
   industryStocks: (industry: string, limit = 120) =>
     apiCall<{ trade_date: string; quote_date: string | null; industry: string; items: IndustryStockItem[] }>(
       'market_industry_stocks',
@@ -170,8 +173,13 @@ export const research = {
   backtest: (codes: string[], scorecard = '综合评估', periods = 5) =>
     apiCall<BacktestResultData>('backtest', { codes, scorecard, periods }),
 
-  latestEval: (code: string, signal?: AbortSignal) =>
-    apiCall<LatestEvalData>('latest_evaluation', { code }, { signal }, 30000),
+  latestEval: (code: string, signal?: AbortSignal, scorecard?: string, force = false) =>
+    apiCall<LatestEvalData>(
+      'latest_evaluation',
+      { code, ...(scorecard ? { scorecard } : {}), ...(force ? { force: true } : {}) },
+      { signal },
+      90000,
+    ),
 
   strategyReport: (code: string) =>
     apiCall<ReportTextData>('strategy_report', { code }),

client-ui/src/market/DiscoverTab.tsx

@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState, type MouseEvent } from 'react'
 import { ProgressBar, Spinner, Tab, TabList, Text, makeStyles, mergeClasses } from '@fluentui/react-components'
 import { AddRegular, ArrowRightRegular, DeleteRegular } from '@fluentui/react-icons'
 import { listDiscoverStrategies, getHealth } from '../api/client'
-import type { DiscoverJobSnapshot, DiscoverStrategyOption, DiscoverStrategyPublic } from '../types/schemas'
+import type { DiscoverJobSnapshot, DiscoverStrategyOption, DiscoverStrategyPublic, MarketRegimeData } from '../types/schemas'
 import type { WatchlistItem } from '../types/market'
 import OpptrixButton from '../components/opptrix/OpptrixButton'
 import DiscoverStrategyPicker from './DiscoverStrategyPicker'
@@ -25,6 +25,7 @@ const CATEGORY_LABEL: Record<DiscoverStrategyPublic['category'], string> = {
   quality: '质量',
   momentum: '动量',
   balanced: '均衡',
+  contrarian: '逆向',
 }
 
 const useStyles = makeStyles({
@@ -103,6 +104,26 @@ const useStyles = makeStyles({
     color: opptrixTokens.textSecondary,
     lineHeight: 1.45,
   },
+  regimeBanner: {
+    flexShrink: 0,
+    padding: `6px ${CONTENT_PAD}`,
+    borderBottom: `1px solid ${opptrixTokens.separator}`,
+    fontSize: '10px',
+    lineHeight: 1.45,
+    color: opptrixTokens.textSecondary,
+    backgroundColor: opptrixTokens.accentSoft,
+  },
+  regimeHeadline: {
+    fontWeight: 650,
+    color: opptrixTokens.textPrimary,
+    marginBottom: '2px',
+  },
+  regimeIndicators: {
+    fontSize: '9px',
+    color: opptrixTokens.textTertiary,
+    lineHeight: 1.4,
+    marginBottom: '3px',
+  },
   summary: {
     flexShrink: 0,
     padding: `8px ${CONTENT_PAD}`,
@@ -363,6 +384,7 @@ export default function DiscoverTab({ session, watchlistCodes, onSelect, onAdd }
   const [panelTab, setPanelTab] = useState<DiscoverPanelTab>('results')
   const [dbReady, setDbReady] = useState<boolean | null>(null)
   const [llmReady, setLlmReady] = useState<boolean | null>(null)
+  const [marketRegime, setMarketRegime] = useState<MarketRegimeData | null>(null)
 
   const { strategies: customStrategies } = useCustomDiscoverStrategies()
 
@@ -409,6 +431,10 @@ export default function DiscoverTab({ session, watchlistCodes, onSelect, onAdd }
       if (cancelled) return
       setLlmReady(Boolean(h.llm_configured))
     }).catch(() => setLlmReady(false))
+    void research.marketRegime().then(resp => {
+      if (cancelled || !resp.success || !resp.data) return
+      setMarketRegime(resp.data)
+    }).catch(() => {})
     return () => { cancelled = true }
   }, [])
 
@@ -427,6 +453,35 @@ export default function DiscoverTab({ session, watchlistCodes, onSelect, onAdd }
   const barValue = running && progressPct <= 0 ? 0.03 : Math.min(1, progressPct / 100)
   const historyJobs = history.filter(h => h.status !== 'running' || h.id === job?.id)
 
+  const regimeIndicators = useMemo(() => {
+    const ind = marketRegime?.indicators
+    if (!ind) return null
+    const parts: string[] = []
+    if (ind.marks_cycle) parts.push(`周期 ${ind.marks_cycle}`)
+    if (ind.valuation_anchor) parts.push(`估值 ${ind.valuation_anchor}`)
+    if (ind.sentiment_score != null) parts.push(`情绪 ${ind.sentiment_score}`)
+    if (ind.advance_pct != null) parts.push(`上涨 ${ind.advance_pct.toFixed(0)}%`)
+    if (ind.index_pe != null) parts.push(`沪深300 PE ${ind.index_pe.toFixed(1)}`)
+    if (ind.northbound_net_yi != null) {
+      const sign = ind.northbound_net_yi >= 0 ? '+' : ''
+      parts.push(`北向 ${sign}${ind.northbound_net_yi.toFixed(1)}亿`)
+    }
+    return parts.length ? parts.join(' · ') : null
+  }, [marketRegime])
+
+  const regimeHint = useMemo(() => {
+    if (!marketRegime) return null
+    if (!selectedId) return marketRegime.detail
+    const suggested = marketRegime.suggested_strategy_ids
+    if (!suggested.length) return marketRegime.detail
+    if (suggested.includes(selectedId)) {
+      return `当前市况与所选策略较契合。${marketRegime.detail}`
+    }
+    const first = builtinList.find(st => st.id === suggested[0])
+    if (!first) return marketRegime.detail
+    return `${marketRegime.detail} 可优先考虑「${first.name}」。`
+  }, [marketRegime, selectedId, builtinList])
+
   const handleLoadHistory = (histJob: DiscoverJobSnapshot) => {
     loadHistoryJob(histJob)
     setPanelTab('results')
@@ -472,6 +527,19 @@ export default function DiscoverTab({ session, watchlistCodes, onSelect, onAdd }
             {llmReady === false ? ' · 需配置大模型' : ''}
           </Text>
         </div>
+        {marketRegime && (
+          <div className={s.regimeBanner}>
+            <Text className={s.regimeHeadline} block>
+              {marketRegime.headline}
+            </Text>
+            {regimeIndicators && (
+              <Text className={s.regimeIndicators} block>
+                {regimeIndicators}
+              </Text>
+            )}
+            {regimeHint && <Text block>{regimeHint}</Text>}
+          </div>
+        )}
       </div>
 
       <div className={s.tabBar}>

client-ui/src/market/StockDecisionCard.tsx

@@ -502,7 +502,11 @@ export default function StockDecisionCard({
 
       <Section title="核心结论">
         <div className={s.metricGrid3}>
-          <Metric label="综合评分" value={vm.scoreSummary} tone={scoreTone} />
+          <Metric
+            label={vm.gbmLabel ? 'G=B+M 评分' : '综合评分'}
+            value={vm.gbmLabel ? `${vm.scoreSummary}（${vm.gbmLabel}）` : vm.scoreSummary}
+            tone={scoreTone}
+          />
           <Metric label="多空倾向" value={vm.strategySummary ?? '—'} tone={strategyTone} />
           <Metric label="研报观点" value={vm.institutionLabel ?? '—'} tone={institutionTone} />
           <Metric label="估值高低" value={vm.valuationLabel ?? '—'} tone={valuationToneVal} />
@@ -511,10 +515,11 @@ export default function StockDecisionCard({
         </div>
         <div className={s.guideBox}>
           <Text className={s.guideText}>
-            <span className={s.guideHighlight}>综合评分：</span>
+            <span className={s.guideHighlight}>{vm.gbmLabel ? 'G=B+M 评分：' : '综合评分：'}</span>
             <span className={mergeClasses(s.guideValue, toneClass(s, scoreTone))}>
               {vm.scoreSummary}
             </span>
+            {vm.gbmLabel ? ` · ${vm.gbmLabel}` : null}
             {' — '}
             {vm.scoreExplanation ?? SCORE_GRADE_LEGEND}
           </Text>

client-ui/src/market/decisionCardLogic.ts

@@ -47,6 +47,8 @@ export interface DecisionCardViewModel {
   grade: string | null
   scoreSummary: string
   scoreExplanation: string | null
+  scorecardLabel: string | null
+  gbmLabel: string | null
   strategySummary: string | null
   institutionLabel: string | null
   valuationLabel: string | null
@@ -123,6 +125,13 @@ export function buildDecisionCardViewModel(input: {
 }): DecisionCardViewModel {
   const factors = input.evalData?.factors ?? {}
   const totalScore = input.evalData?.total_score ?? null
+  const scorecard = input.evalData?.scorecard ?? null
+  const gbm = input.evalData?.gbm ?? null
+
+  let gbmLabel: string | null = null
+  if (gbm) {
+    gbmLabel = `B ${gbm.b_score.toFixed(1)} · M ${gbm.m_score.toFixed(1)}`
+  }
 
   const valuationLabel = formatValuationDisplay({
     factors,
@@ -164,6 +173,8 @@ export function buildDecisionCardViewModel(input: {
     grade: scoreGrade(totalScore),
     scoreSummary: formatScoreSummary(totalScore),
     scoreExplanation: formatScoreExplanation(totalScore),
+    scorecardLabel: scorecard,
+    gbmLabel,
     strategySummary: formatStrategyDisplay(input.strategy),
     institutionLabel,
     valuationLabel,
@@ -193,6 +204,8 @@ export function buildStockResearchContext(input: {
     '## 摘要',
     `- 现价：${vm.priceLabel}`,
     vm.grade ? `- 综合评分：${vm.scoreSummary}` : '- 综合评分：待评估',
+    vm.scorecardLabel ? `- 评分模板：${vm.scorecardLabel}` : null,
+    vm.gbmLabel ? `- G=B+M：${vm.gbmLabel}` : null,
     vm.scoreExplanation ? `- 评分说明：${vm.scoreExplanation}` : null,
     vm.strategySummary ? `- 策略倾向：${vm.strategySummary}` : null,
     vm.institutionLabel ? `- 机构共识：${vm.institutionLabel}` : null,

client-ui/src/market/useStockAnalysis.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { research } from '../api/client'
+import { getConfig, research } from '../api/client'
 import type { InstitutionRatingData, LatestEvalData, StrategySignalData } from '../types/schemas'
 import type { ChipDistributionPoint } from '../types/market'
 import type { WatchlistRadarItem } from '../types/schemas'
@@ -24,7 +24,7 @@ function stepPercent(steps: AnalysisStep[]): number {
 
 function freshSteps(): AnalysisStep[] {
   return [
-    { id: 'eval', label: '综合评分', status: 'pending', message: null },
+    { id: 'eval', label: 'G=B+M 评分', status: 'pending', message: null },
     { id: 'strategy', label: '多空倾向', status: 'pending', message: null },
     { id: 'institution', label: '研报观点', status: 'pending', message: null },
     { id: 'cyq', label: '筹码分布', status: 'pending', message: null },
@@ -37,7 +37,7 @@ function isAbort(e: unknown): boolean {
 }
 
 const STEP_HINTS: Record<string, string> = {
-  eval: '正在计算多维度评分…',
+  eval: '正在计算基本面与动量评分…',
   strategy: '正在汇总多种策略看法，约需 10–30 秒',
   institution: '正在汇总券商研报观点，这一步通常最久',
   cyq: '正在获取筹码与成本区…',
@@ -120,9 +120,19 @@ export function useStockAnalysis(code: string | null) {
 
     try {
       await runStep('eval', STEP_HINTS.eval, async () => {
-        const resp = await research.latestEval(code, controller.signal)
+        const cfg = await getConfig().catch(() => null)
+        const scorecard = cfg?.default_scorecard || 'G=B+M'
+        const resp = await research.latestEval(code, controller.signal, scorecard, force)
         if (resp.success && resp.data) payload.evalData = resp.data
-        return { ok: resp.success, message: resp.success ? '已完成' : (resp.message ?? '未能完成') }
+        const label = resp.data?.scorecard ?? scorecard
+        return {
+          ok: resp.success,
+          message: resp.success
+            ? (resp.data?.gbm
+              ? `${label} · B ${resp.data.gbm.b_score} / M ${resp.data.gbm.m_score}`
+              : label)
+            : (resp.message ?? '未能完成'),
+        }
       })
 
       await runStep('strategy', STEP_HINTS.strategy, async () => {

client-ui/src/pages/Diagnosis.tsx

@@ -5,7 +5,7 @@ import {
 } from '@fluentui/react-components'
 import { ArrowSyncRegular } from '@fluentui/react-icons'
 import MetricTile from '../components/MetricTile'
-import { research } from '../api/client'
+import { getConfig, research } from '../api/client'
 import type { StockDiagnosisData, InstitutionRatingData, StrategySignalData } from '../types/schemas'
 
 const useStyles = makeStyles({
@@ -65,8 +65,10 @@ export default function Diagnosis({ globalStock, setGlobalStock }: Props) {
     if (!code.trim()) return
     setLoading(true)
     try {
+      const cfg = await getConfig().catch(() => null)
+      const scorecard = cfg?.default_scorecard || 'G=B+M'
       const [d, r, sg] = await Promise.all([
-        research.diagnose(code.trim()),
+        research.diagnose(code.trim(), scorecard),
         research.institutionRating(code.trim()),
         research.strategySignals(code.trim()).catch(() => null),
       ])

client-ui/src/pages/SettingsPage.tsx

@@ -351,7 +351,7 @@ function SettingsPageView({
                     <SettingsTextField
                       value={scorecard}
                       onChange={setScorecard}
-                      placeholder="综合评估"
+                      placeholder="G=B+M"
                     />
                   )}
                   last

client-ui/src/pages/settings/DiscoverStrategiesSettingsSection.tsx

@@ -28,6 +28,7 @@ const CATEGORY_LABEL: Record<DiscoverStrategyPublic['category'], string> = {
   quality: '质量',
   momentum: '动量',
   balanced: '均衡',
+  contrarian: '逆向',
 }
 
 type ListItem =