Merge pull request #174 from Travisun/feat/stockindex-opptrixquant

feat: remove OpptrixQuant; Tickflow universe search and instrument ID unify

Author: Travisun

AGENTS.md

@@ -226,9 +226,10 @@ Storage Layer (user-store, market-data)
 - **唯一标准入口**：`engine.queryInstrumentData(ref, capability, opts?)`
 - 扩展顺序：复用 capability → 扩 `instrument-query.ts` → 扩 Provider 标准方法 → 最后才 `invokeCustomMethod` + 文档登记
 - **禁止** Hub / client-ui / Agent 主路径新增 `de.realtime()` / 直连第三方行情 URL
-- **内置推荐栈**：tonghuashun（CN，需扶摇 Key）、tickflow、tushare、zzshare、baostock；另含 stockindex（搜索/列表）、binance/okx（CRYPTO）
-- **已移除内置注册**：tencent、sinafinance、eastmoney、akshare、webfeed（实现与注册均已删除，本地配置启动时自动清理）
+- **内置推荐栈**：tonghuashun（CN，需扶摇 Key）、tickflow、tushare、zzshare、baostock；另含 binance/okx（CRYPTO）
+- **已移除内置注册**：tencent、sinafinance、eastmoney、akshare、webfeed、**stockindex（OpptrixQuant）**（实现与注册均已删除，本地配置启动时自动清理）
 - **Hub 降级**：机构持仓详情 Tab、非 CN 宏观 scope、部分跨市场 enrich；**右侧面板**主路径仍经 `queryInstrumentData`
+- **搜索 / 名录**：搜索 = 扶摇 + Tickflow + 本地；名录灌库 = 纯 Tickflow（CN/HK/US 股票与 CN ETF）
 
 ## Agent / MCP 工具（摘要）
 

apps/server/src/index.ts

@@ -933,6 +933,22 @@ app.post('/api/market-data/ui-ready', async () => {
   return { ok: true }
 })
 
+/** Lightweight sync progress for search-universe prep UI (no heavy db_status). */
+app.get('/api/market-data/sync-state', async () => {
+  const snap = getMarketDataService().syncState()
+  return {
+    success: true,
+    data: {
+      running: snap.running,
+      overall_percent: snap.overall_percent,
+      message: snap.message,
+      current_job: snap.current_job,
+      jobs_completed: snap.jobs_completed,
+      jobs_total: snap.jobs_total,
+    },
+  }
+})
+
 app.patch<{ Body: { default_scorecard?: string; default_top_n?: number; default_model?: string } }>(
   '/api/config',
   async (req) => {

client-ui/src/api/client.ts

@@ -532,11 +532,37 @@ export const research = {
     ),
 
   searchInstruments: (keyword: string, limit = 20, signal?: AbortSignal) =>
-    jsonFetch<{ success: boolean; data?: { items: import('../types/instrument').LocalInstrumentHit[]; count: number } }>(
+    jsonFetch<{
+      success: boolean
+      data?: {
+        items: import('../types/instrument').LocalInstrumentHit[]
+        count: number
+        source?: string
+        universe_prep?: {
+          status: 'ready' | 'preparing' | 'failed'
+          percent: number
+          message: string
+          jobs?: string[]
+        }
+      }
+    }>(
       `/instruments/search?keyword=${encodeURIComponent(keyword)}&limit=${limit}`,
       { signal },
     ),
 
+  marketDataSyncState: (signal?: AbortSignal) =>
+    jsonFetch<{
+      success: boolean
+      data?: {
+        running: boolean
+        overall_percent: number
+        message: string | null
+        current_job: string | null
+        jobs_completed: number
+        jobs_total: number
+      }
+    }>('/market-data/sync-state', { signal }),
+
   instrumentsSummary: () =>
     jsonFetch<{ success: boolean; data?: {
       summary: Array<{ market: string; assetClass: string; count: number }>
@@ -712,9 +738,13 @@ export const research = {
 export async function fetchWatchlist() {
   const resp = await jsonFetch<{
     success: boolean
-    data?: { items: import('../types/market').WatchlistItem[]; count: number }
+    data?: {
+      items: import('../types/market').WatchlistItem[]
+      count: number
+      disambiguation_candidates?: Record<string, import('../types/market').DisambiguationCandidate[]>
+    }
   }>('/watchlist')
-  return resp.data ?? { items: [], count: 0 }
+  return resp.data ?? { items: [], count: 0, disambiguation_candidates: {} }
 }
 
 export async function saveWatchlist(items: import('../types/market').WatchlistItem[]) {

client-ui/src/chat/ChatComposer.tsx

@@ -655,6 +655,8 @@ const ChatComposer = forwardRef<ChatComposerHandle, ChatComposerProps>(function
     moveActive: moveMentionActive,
     clampActiveIndex,
     setMentionActiveIndex,
+    universePrep: mentionUniversePrep,
+    refreshingAfterPrep: mentionRefreshingAfterPrep,
   } = useStockMention(watchlistItems)
 
   const {
@@ -720,9 +722,10 @@ const ChatComposer = forwardRef<ChatComposerHandle, ChatComposerProps>(function
     refreshContentState()
   }, [draftSync, closeMention, closeSlash, refreshContentState])
 
-  const buildChipData = useCallback((item: WatchlistItem): InlineChipData => {
+  const buildChipData = useCallback((item: WatchlistItem): InlineChipData | null => {
     const row = normalizeWatchlistItem(item)
     const ref = resolveWatchlistInstrument(row)
+    if (!ref) return null
     const code = displayCodeFromInstrument(ref)
     const market = ref.market !== 'CN' ? marketDisplayName(ref.market) : null
     return {
@@ -741,6 +744,10 @@ const ChatComposer = forwardRef<ChatComposerHandle, ChatComposerProps>(function
     const savedRange = caretRangeRef.current
     root.focus()
     const data = buildChipData(item)
+    if (!data) {
+      closeMention()
+      return
+    }
     if (collectChipKeys(root).includes(data.key)) {
       // 已存在同一标的：仅删除 @query 触发文本，不重复插入。
       const dup = createChipElement(data)
@@ -1283,6 +1290,8 @@ const ChatComposer = forwardRef<ChatComposerHandle, ChatComposerProps>(function
         items={mentionMatches}
         activeIndex={mentionState.activeIndex}
         query={mentionState.query}
+        universePrep={mentionUniversePrep}
+        refreshingAfterPrep={mentionRefreshingAfterPrep}
         onSelect={handleSelectMention}
         onHover={setMentionActiveIndex}
         onClose={closeMention}

client-ui/src/chat/ComposerStockMentionList.tsx

@@ -1,10 +1,12 @@
+import { ProgressBar, Text } from '@fluentui/react-components'
 import type { WatchlistItem } from '../types/market'
 import {
   displayCodeFromInstrument,
   normalizeWatchlistItem,
-  resolveWatchlistInstrument,
+  tryResolveWatchlistInstrument,
   watchlistItemKey,
 } from '../market/instrument'
+import { UNIVERSE_PREP_COPY, type UniversePrepUi } from '../market/useInstrumentSearchWithUniversePrep'
 import ComposerTooltipMenu, {
   COMPOSER_MENU_WIDTH,
   ComposerTooltipMenuItem,
@@ -16,6 +18,8 @@ interface Props {
   items: WatchlistItem[]
   activeIndex: number
   query: string
+  universePrep?: UniversePrepUi
+  refreshingAfterPrep?: boolean
   onSelect: (item: WatchlistItem) => void
   onHover: (index: number) => void
   onClose: () => void
@@ -27,48 +31,73 @@ export default function ComposerStockMentionList({
   items,
   activeIndex,
   query,
+  universePrep,
+  refreshingAfterPrep,
   onSelect,
   onHover,
   onClose,
 }: Props) {
+  const preparing = universePrep?.status === 'preparing'
+  const failed = universePrep?.status === 'failed'
+
   return (
     <ComposerTooltipMenu
       open={open}
       anchorRef={anchorRef}
       align="start"
       width={COMPOSER_MENU_WIDTH.stockMention}
-      maxHeight={200}
+      maxHeight={240}
       ariaLabel="选择标的"
       onClose={onClose}
     >
-      {!items.length ? (
+      {preparing && (
+        <div className="opptrix-composer-tooltip-menu__empty" style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+          <Text size={200}>
+            {refreshingAfterPrep
+              ? UNIVERSE_PREP_COPY.refreshing
+              : (universePrep?.message || UNIVERSE_PREP_COPY.preparing)}
+          </Text>
+          <ProgressBar
+            value={Math.min(1, Math.max(0.03, (universePrep?.percent || 0) / 100))}
+            thickness="medium"
+            color="brand"
+            shape="rounded"
+          />
+        </div>
+      )}
+      {failed && (
+        <div className="opptrix-composer-tooltip-menu__empty">
+          {universePrep?.message || UNIVERSE_PREP_COPY.failed}
+        </div>
+      )}
+      {!items.length && !preparing ? (
         <div className="opptrix-composer-tooltip-menu__empty">
           {query
             ? '没有匹配的标的，可尝试 CN:SZ.000009、US:AAPL 或股票名称'
             : '输入 @ 搜索关注列表或本地标的'}
         </div>
-      ) : (
-        items.map((item, index) => {
-          const row = normalizeWatchlistItem(item)
-          const codeLabel = displayCodeFromInstrument(resolveWatchlistInstrument(row))
-          const active = index === activeIndex
-          return (
-            <ComposerTooltipMenuItem
-              key={watchlistItemKey(row)}
-              active={active}
-              onMouseEnter={() => onHover(index)}
-              onClick={() => onSelect(row)}
-            >
-              <span className="opptrix-composer-tooltip-menu__item-main">
-                <span className="opptrix-composer-tooltip-menu__item-title">{row.name}</span>
-              </span>
-              <span className="opptrix-composer-tooltip-menu__item-code">
-                {codeLabel}
-              </span>
-            </ComposerTooltipMenuItem>
-          )
-        })
-      )}
+      ) : null}
+      {items.map((item, index) => {
+        const row = normalizeWatchlistItem(item)
+        const ref = tryResolveWatchlistInstrument(row)
+        const codeLabel = ref ? displayCodeFromInstrument(ref) : row.code
+        const active = index === activeIndex
+        return (
+          <ComposerTooltipMenuItem
+            key={watchlistItemKey(row)}
+            active={active}
+            onMouseEnter={() => onHover(index)}
+            onClick={() => onSelect(row)}
+          >
+            <span className="opptrix-composer-tooltip-menu__item-main">
+              <span className="opptrix-composer-tooltip-menu__item-title">{row.name}</span>
+            </span>
+            <span className="opptrix-composer-tooltip-menu__item-code">
+              {codeLabel}
+            </span>
+          </ComposerTooltipMenuItem>
+        )
+      })}
     </ComposerTooltipMenu>
   )
 }

client-ui/src/chat/useStockMention.ts

@@ -1,7 +1,10 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import type { WatchlistItem } from '../types/market'
-import { research } from '../api/client'
-import { hitToWatchlistItem, normalizeWatchlistItem, watchlistItemKey } from '../market/instrument'
+import { normalizeWatchlistItem, watchlistItemKey } from '../market/instrument'
+import {
+  useInstrumentSearchWithUniversePrep,
+  type UniversePrepUi,
+} from '../market/useInstrumentSearchWithUniversePrep'
 
 export interface StockMentionState {
   open: boolean
@@ -29,33 +32,24 @@ function findMentionTrigger(text: string, cursor: number) {
 
 export function useStockMention(items: WatchlistItem[]) {
   const [state, setState] = useState<StockMentionState>(CLOSED)
-  const [remote, setRemote] = useState<WatchlistItem[]>([])
-  const searchGen = useRef(0)
 
-  useEffect(() => {
-    if (!state.open) {
-      setRemote([])
-      return
-    }
-    const q = state.query.trim()
-    if (q.length < 2 && !q.includes(':')) {
-      setRemote([])
-      return
-    }
-    const gen = ++searchGen.current
-    const timer = window.setTimeout(() => {
-      void research.searchInstruments(q, 12)
-        .then(resp => {
-          if (gen !== searchGen.current) return
-          const hits = resp.data?.items ?? []
-          setRemote(hits.map(hitToWatchlistItem))
-        })
-        .catch(() => {
-          if (gen === searchGen.current) setRemote([])
-        })
-    }, 220)
-    return () => window.clearTimeout(timer)
-  }, [state.open, state.query])
+  const searchEnabled = state.open && (
+    state.query.trim().length >= 2 || state.query.includes(':')
+  )
+  const searchKeyword = searchEnabled ? state.query.trim() : ''
+
+  const {
+    hits: remote,
+    searching: remoteSearching,
+    universePrep,
+    refreshingAfterPrep,
+  } = useInstrumentSearchWithUniversePrep({
+    keyword: searchKeyword,
+    limit: 12,
+    minLength: state.query.includes(':') ? 1 : 2,
+    debounceMs: 220,
+    enabled: searchEnabled,
+  })
 
   const syncFromInput = useCallback((text: string, cursor: number) => {
     const trigger = findMentionTrigger(text, cursor)
@@ -75,7 +69,6 @@ export function useStockMention(items: WatchlistItem[]) {
 
   const close = useCallback(() => {
     setState(CLOSED)
-    setRemote([])
   }, [])
 
   const matches = useMemo(() => {
@@ -85,10 +78,8 @@ export function useStockMention(items: WatchlistItem[]) {
       if (!q) return true
       const normalized = normalizeWatchlistItem(item)
       const code = normalized.code.toLowerCase()
-      const label = code
       return item.name.toLowerCase().includes(q)
         || code.includes(q)
-        || label.includes(q)
         || (item.industry?.toLowerCase().includes(q) ?? false)
     })
     const merged = new Map<string, WatchlistItem>()
@@ -116,7 +107,6 @@ export function useStockMention(items: WatchlistItem[]) {
     const nextText = `${before}${after}`
     const nextCursor = before.length
     setState(CLOSED)
-    setRemote([])
     return { nextText, nextCursor }
   }, [state.startIndex])
 
@@ -152,5 +142,8 @@ export function useStockMention(items: WatchlistItem[]) {
     clampActiveIndex,
     setActiveIndex,
     setMentionActiveIndex: setActiveIndex,
+    universePrep: universePrep as UniversePrepUi,
+    remoteSearching,
+    refreshingAfterPrep,
   }
 }