Merge pull request #177 from Travisun/fix/chart-cyq-align-cross-market-summary

fix: watchlist quote reliability, portfolio InstrumentRef, and ETF cache

Author: Travisun

apps/server/src/index.ts

@@ -733,6 +733,11 @@ app.post<{ Body: Record<string, unknown> }>('/api/instruments/quotes', async (re
   return { success: r.success, data: r.data, message: r.message }
 })
 
+app.post<{ Body: Record<string, unknown> }>('/api/instruments/quote', async (req) => {
+  const r = await hub.dispatch('instrument_quote', req.body ?? {})
+  return { success: r.success, data: r.data, message: r.message }
+})
+
 app.post<{ Body: Record<string, unknown> }>('/api/instruments/chart', async (req) => {
   const r = await hub.dispatch('instrument_chart', req.body ?? {})
   return { success: r.success, data: r.data, message: r.message }
@@ -1992,16 +1997,39 @@ app.put<{ Body: { groups?: Array<{ id: string; title: string; sortOrder: number;
   },
 )
 
-app.post<{ Body: { code: string; shares: number; price: number; side?: string; date?: string; market?: string } }>(
+app.post<{ Body: {
+  code: string
+  shares: number
+  price: number
+  side?: string
+  date?: string
+  market?: string
+  assetClass?: string
+  instrument?: { market: string; assetClass: string; symbol: string; exchange?: string }
+} }>(
   '/api/portfolio/trade',
   async (req, reply) => {
-    const { code, shares, price, side = 'buy', date, market } = req.body ?? {}
+    const { code, shares, price, side = 'buy', date, market, assetClass, instrument } = req.body ?? {}
     if (!code || !shares || !price) return reply.code(400).send({ error: 'code, shares, price required' })
     const pm = hub.de.portfolio
     const m = market?.trim() || undefined
-    const result = side === 'sell'
-      ? await pm.sell(code, shares, price, date, '', m as import('@opptrix/shared').Market | undefined)
-      : await pm.buy(code, shares, price, date, '', m as import('@opptrix/shared').Market | undefined)
+    const ac = assetClass?.trim() || undefined
+    const inst = instrument && typeof instrument === 'object'
+      ? instrument as import('@opptrix/shared').InstrumentRef
+      : undefined
+    const result = await pm.recordTrade(
+      side === 'sell' ? 'sell' : 'buy',
+      code,
+      shares,
+      price,
+      {
+        date,
+        name: '',
+        market: m as import('@opptrix/shared').Market | undefined,
+        assetClass: ac as import('@opptrix/shared').AssetClass | undefined,
+        instrument: inst,
+      },
+    )
     return { success: true, trade: result }
   },
 )

client-ui/src/api/client.ts

@@ -598,6 +598,17 @@ export const research = {
       signal,
     ),
 
+  /** 单标的最新价 — 关注添加后立即拉价；默认 fresh 跳过覆盖层缓存 */
+  instrumentQuote: (
+    instrument: InstrumentRef,
+    opts?: { fresh?: boolean },
+    signal?: AbortSignal,
+  ) => postInstrument<{ quote: UnifiedInstrumentQuote; failed?: { code: string; reason: string } }>(
+    '/instruments/quote',
+    { instrument, fresh: opts?.fresh ?? true },
+    signal,
+  ),
+
   instrumentChart: async (
     instrument: InstrumentRef,
     period: ChartPeriod | 'daily' | 'weekly' | 'monthly' | 'intraday' = 'daily',
@@ -1276,7 +1287,14 @@ export async function reloadInstalledProvider(providerId: string) {
 }
 
 export async function portfolioTrade(payload: {
-  code: string; shares: number; price: number; side?: 'buy' | 'sell'; date?: string; market?: string
+  code: string
+  shares: number
+  price: number
+  side?: 'buy' | 'sell'
+  date?: string
+  market?: string
+  assetClass?: string
+  instrument?: { market: string; assetClass: string; symbol: string; exchange?: string }
 }) {
   const resp = await fetchWithTimeout(`${API_BASE}/portfolio/trade`, {
     method: 'POST',

client-ui/src/chat/ComposerStockMentionList.tsx

@@ -1,16 +1,16 @@
 import { ProgressBar, Text } from '@fluentui/react-components'
 import type { WatchlistItem } from '../types/market'
 import {
-  displayCodeFromInstrument,
+  formatInstrumentSearchHitSubtitle,
   normalizeWatchlistItem,
-  tryResolveWatchlistInstrument,
   watchlistItemKey,
 } from '../market/instrument'
 import { UNIVERSE_PREP_COPY, type UniversePrepUi } from '../market/useInstrumentSearchWithUniversePrep'
 import ComposerTooltipMenu, {
   COMPOSER_MENU_WIDTH,
   ComposerTooltipMenuItem,
 } from './ComposerTooltipMenu'
+import HoverMarqueeText from './HoverMarqueeText'
 
 interface Props {
   open: boolean
@@ -79,21 +79,20 @@ export default function ComposerStockMentionList({
       ) : null}
       {items.map((item, index) => {
         const row = normalizeWatchlistItem(item)
-        const ref = tryResolveWatchlistInstrument(row)
-        const codeLabel = ref ? displayCodeFromInstrument(ref) : row.code
         const active = index === activeIndex
+        const subtitle = formatInstrumentSearchHitSubtitle(row)
         return (
           <ComposerTooltipMenuItem
             key={watchlistItemKey(row)}
             active={active}
+            title={subtitle}
+            className="opptrix-hover-marquee-host"
             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}
+              <HoverMarqueeText text={row.name} className="opptrix-composer-tooltip-menu__item-title" />
+              <span className="opptrix-composer-tooltip-menu__item-meta">{subtitle}</span>
             </span>
           </ComposerTooltipMenuItem>
         )

client-ui/src/chat/ComposerTooltipMenu.tsx

@@ -194,16 +194,19 @@ export function ComposerTooltipMenuItem({
   onMouseEnter,
   children,
   className,
+  title,
 }: {
   active?: boolean
   onClick: () => void
   onMouseEnter?: () => void
   children: ReactNode
   className?: string
+  title?: string
 }) {
   return (
     <button
       type="button"
+      title={title}
       className={mergeClasses(
         'opptrix-composer-tooltip-menu__item',
         active && 'opptrix-composer-tooltip-menu__item--active',

client-ui/src/market/CrossMarketDetailPlaceholder.tsx

@@ -73,14 +73,12 @@ interface Props {
   stock: WatchlistItem
   marketLabel?: string
   loading?: boolean
-  localIndexed?: boolean | null
 }
 
 export default function CrossMarketDetailPlaceholder({
   stock,
   marketLabel,
   loading = false,
-  localIndexed = null,
 }: Props) {
   const s = useStyles()
   const ref = resolveWatchlistInstrument(stock)
@@ -122,11 +120,7 @@ export default function CrossMarketDetailPlaceholder({
         ) : (
           <div className={s.card}>
             <Text className={s.muted}>
-              {localIndexed === true
-                ? '已匹配在线名录。实时行情、K 线与深度分析将在对应数据源接入后在此展示。'
-                : localIndexed === false
-                  ? '在线名录暂未匹配该代码，请核对代码或在对话中直接 @ 引用。'
-                  : '跨市场详情页已就绪；接入行情源后将在此展示概况、K 线与分析模块。'}
+              跨市场详情页已就绪；接入行情源后将在此展示概况、K 线与分析模块。
             </Text>
           </div>
         )}

client-ui/src/market/CrossMarketDetailTab.tsx

@@ -5,7 +5,6 @@ import { resolveWatchlistInstrument } from './instrument'
 
 interface Props {
   stock: WatchlistItem
-  localIndexed?: boolean | null
   loading?: boolean
   onManage?: () => void
   onSelectPeer?: (item: WatchlistItem) => void
@@ -19,7 +18,6 @@ export default function CrossMarketDetailTab(props: Props) {
       <CrossMarketDetailPlaceholder
         stock={props.stock}
         loading={props.loading}
-        localIndexed={props.localIndexed}
       />
     )
   }