fix(client-ui): 搜索与关注列表保留 OpptrixQuant 标的 ID

搜索命中不再经 normalizeWatchlistItem 改写 code；展示、添加与持久化统一使用 API 返回的 Opptrix ID，旧关注项仍兼容命名空间格式。

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

Author: Rui

client-ui/src/chat/ChatComposer.tsx

@@ -31,7 +31,7 @@ import type { PublicAgentSkill } from '../api/client'
 import {
   displayCodeFromInstrument,
   marketDisplayName,
-  normalizeWatchlistItem,
+  prepareWatchlistItemForStore,
   resolveWatchlistInstrument,
   watchlistItemKey,
 } from '../market/instrument'
@@ -723,7 +723,7 @@ const ChatComposer = forwardRef<ChatComposerHandle, ChatComposerProps>(function
   }, [draftSync, closeMention, closeSlash, refreshContentState])
 
   const buildChipData = useCallback((item: WatchlistItem): InlineChipData | null => {
-    const row = normalizeWatchlistItem(item)
+    const row = prepareWatchlistItemForStore(item)
     const ref = resolveWatchlistInstrument(row)
     if (!ref) return null
     const code = displayCodeFromInstrument(ref)

client-ui/src/chat/ComposerStockMentionList.tsx

@@ -2,7 +2,6 @@ import { ProgressBar, Text } from '@fluentui/react-components'
 import type { WatchlistItem } from '../types/market'
 import {
   formatInstrumentSearchHitSubtitle,
-  normalizeWatchlistItem,
   watchlistItemKey,
 } from '../market/instrument'
 import { UNIVERSE_PREP_COPY, type UniversePrepUi } from '../market/useInstrumentSearchWithUniversePrep'
@@ -78,20 +77,19 @@ export default function ComposerStockMentionList({
         </div>
       ) : null}
       {items.map((item, index) => {
-        const row = normalizeWatchlistItem(item)
         const active = index === activeIndex
-        const subtitle = formatInstrumentSearchHitSubtitle(row)
+        const subtitle = formatInstrumentSearchHitSubtitle(item)
         return (
           <ComposerTooltipMenuItem
-            key={watchlistItemKey(row)}
+            key={watchlistItemKey(item)}
             active={active}
             title={subtitle}
             className="opptrix-hover-marquee-host"
             onMouseEnter={() => onHover(index)}
-            onClick={() => onSelect(row)}
+            onClick={() => onSelect(item)}
           >
             <span className="opptrix-composer-tooltip-menu__item-main">
-              <HoverMarqueeText text={row.name} className="opptrix-composer-tooltip-menu__item-title" />
+              <HoverMarqueeText text={item.name} className="opptrix-composer-tooltip-menu__item-title" />
               <span className="opptrix-composer-tooltip-menu__item-meta">{subtitle}</span>
             </span>
           </ComposerTooltipMenuItem>

client-ui/src/chat/useStockMention.ts

@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useState } from 'react'
 import type { WatchlistItem } from '../types/market'
-import { normalizeWatchlistItem, watchlistItemKey } from '../market/instrument'
+import { isOpptrixInstrumentCode, normalizeWatchlistItem, prepareWatchlistItemForStore, watchlistItemKey } from '../market/instrument'
 import {
   useInstrumentSearchWithUniversePrep,
   type UniversePrepUi,
@@ -84,7 +84,7 @@ export function useStockMention(items: WatchlistItem[]) {
     })
     const merged = new Map<string, WatchlistItem>()
     for (const item of [...local, ...remote]) {
-      const row = normalizeWatchlistItem(item)
+      const row = isOpptrixInstrumentCode(item.code) ? item : normalizeWatchlistItem(item)
       merged.set(watchlistItemKey(row), row)
     }
     return [...merged.values()].slice(0, 10)
@@ -113,7 +113,7 @@ export function useStockMention(items: WatchlistItem[]) {
   const selectActive = useCallback((text: string, cursor: number) => {
     const item = matches[state.activeIndex]
     if (!item) return null
-    return { ...applySelection(text, cursor), item: normalizeWatchlistItem(item) }
+    return { ...applySelection(text, cursor), item: prepareWatchlistItemForStore(item) }
   }, [applySelection, matches, state.activeIndex])
 
   const clampActiveIndex = useCallback(() => {

client-ui/src/market/WatchlistContext.tsx

@@ -14,6 +14,7 @@ import type { DisambiguationCandidate, WatchlistItem } from '../types/market'
 import {
   isAmbiguousNumericCode,
   normalizeWatchlistItem,
+  prepareWatchlistItemForStore,
   tryResolveWatchlistInstrument,
   watchlistItemKey,
 } from './instrument'
@@ -29,7 +30,7 @@ const DEFAULT_ITEMS: WatchlistItem[] = [
 ]
 
 function itemKey(item: WatchlistItem): string {
-  return watchlistItemKey(normalizeWatchlistItem(item))
+  return watchlistItemKey(prepareWatchlistItemForStore(item))
 }
 
 function computeItemsKey(list: WatchlistItem[]): string {
@@ -90,7 +91,7 @@ export function WatchlistProvider({ children }: { children: ReactNode }) {
         const remote = await fetchWatchlist()
         if (cancelled) return
         if (remote.items.length > 0) {
-          const normalized = remote.items.map(normalizeWatchlistItem)
+          const normalized = remote.items.map(prepareWatchlistItemForStore)
           skipNextSync.current = true
           setItems(normalized)
           setSyncedItemsKey(computeItemsKey(normalized))
@@ -136,7 +137,7 @@ export function WatchlistProvider({ children }: { children: ReactNode }) {
       void fetchWatchlist()
         .then(remote => {
           if (!remote.items.length) return
-          const normalized = remote.items.map(normalizeWatchlistItem)
+          const normalized = remote.items.map(prepareWatchlistItemForStore)
           skipNextSync.current = true
           setItems(normalized)
           setSyncedItemsKey(computeItemsKey(normalized))
@@ -161,12 +162,12 @@ export function WatchlistProvider({ children }: { children: ReactNode }) {
   }, [items])
 
   const addItem = useCallback((item: WatchlistItem, opts?: { addedPrice?: number | null }) => {
-    const row = normalizeWatchlistItem(item)
+    const row = prepareWatchlistItemForStore(item)
     const key = itemKey(row)
     const now = new Date().toISOString()
     setItems(prev => {
       if (prev.some(x => itemKey(x) === key)) return prev
-      return [normalizeWatchlistItem({
+      return [prepareWatchlistItemForStore({
         ...row,
         addedAt: row.addedAt ?? now,
         addedPrice: opts?.addedPrice ?? row.addedPrice ?? null,
@@ -175,14 +176,14 @@ export function WatchlistProvider({ children }: { children: ReactNode }) {
   }, [])
 
   const addItemAndSync = useCallback(async (item: WatchlistItem, opts?: { addedPrice?: number | null }) => {
-    const row = normalizeWatchlistItem(item)
+    const row = prepareWatchlistItemForStore(item)
     const key = itemKey(row)
     const now = new Date().toISOString()
     const prev = itemsRef.current
     const existing = prev.find(x => itemKey(x) === key)
     if (existing) return existing
 
-    const added = normalizeWatchlistItem({
+    const added = prepareWatchlistItemForStore({
       ...row,
       addedAt: row.addedAt ?? now,
       addedPrice: opts?.addedPrice ?? row.addedPrice ?? null,
@@ -212,7 +213,7 @@ export function WatchlistProvider({ children }: { children: ReactNode }) {
     setItems(prev => prev.map(item => {
       const match = item.code === code || itemKey(item) === code
       if (!match && item.code !== code) return item
-      return normalizeWatchlistItem({ ...item, ...patch, code: patch.code ?? item.code })
+      return prepareWatchlistItemForStore({ ...item, ...patch, code: patch.code ?? item.code })
     }))
   }, [])
 

client-ui/src/market/WatchlistTab.tsx

@@ -1089,27 +1089,23 @@ export default function WatchlistTab({
               hint="试试输入完整代码，或换一个字再搜"
             />
           )}
-          {searchHits.map(hit => {
-            const row = normalizeWatchlistItem(hit)
-            return (
-              <button
-                key={watchlistItemKey(row)}
-                type="button"
-                className={mergeClasses(s.resultItem, 'opptrix-hover-marquee-host')}
-                onClick={async () => {
-                  const row = normalizeWatchlistItem(hit)
-                  await Promise.resolve(onAdd(row, {}))
-                  setKeyword('')
-                }}
-              >
-                <div className={s.resultMain}>
-                  <HoverMarqueeText text={row.name} className={s.resultName} />
-                  <span className={s.resultSubtitle}>{formatInstrumentSearchHitSubtitle(row)}</span>
-                </div>
-                <span className={s.resultAction}>添加</span>
-              </button>
-            )
-          })}
+          {searchHits.map(hit => (
+            <button
+              key={watchlistItemKey(hit)}
+              type="button"
+              className={mergeClasses(s.resultItem, 'opptrix-hover-marquee-host')}
+              onClick={async () => {
+                await Promise.resolve(onAdd(hit, {}))
+                setKeyword('')
+              }}
+            >
+              <div className={s.resultMain}>
+                <HoverMarqueeText text={hit.name} className={s.resultName} />
+                <span className={s.resultSubtitle}>{formatInstrumentSearchHitSubtitle(hit)}</span>
+              </div>
+              <span className={s.resultAction}>添加</span>
+            </button>
+          ))}
         </div>
       )}
 

client-ui/src/market/instrument.ts

@@ -13,6 +13,7 @@ import {
   normalizeInstrumentRef,
   parseCanonicalInstrumentInput,
   parseInstrumentNamespace,
+  parseOpptrixInstrumentId,
   resolveCnInstrumentIdentity,
   tryParseInstrumentInput as sharedTryParse,
 } from '@opptrix/shared/instrument-symbol'
@@ -161,13 +162,40 @@ export const UNRESOLVED_INSTRUMENT_COPY = {
   ambiguousShort: '点选确认',
 } as const
 
-/** 展示用代码：已消歧用 namespace，否则保留原 code */
+/** OpptrixQuant 搜索 / 入库用的统一 ID（CN:REIT:508000.SH 等） */
+export function isOpptrixInstrumentCode(code: string): boolean {
+  return parseOpptrixInstrumentId(code.trim()) != null
+}
+
+/** 入库前：搜索 Opptrix ID 原样保留；旧关注项仍走 normalizeWatchlistItem */
+export function prepareWatchlistItemForStore(item: WatchlistItem): WatchlistItem {
+  const raw = item.code.trim()
+  if (isOpptrixInstrumentCode(raw)) {
+    return {
+      ...item,
+      code: raw,
+      name: item.name?.trim() || raw,
+      industry: item.industry?.trim() || undefined,
+      note: item.note?.trim() || undefined,
+      addedPrice: item.addedPrice ?? null,
+      instrument: item.instrument ? normalizeInstrumentRefLocal(item.instrument) : undefined,
+    }
+  }
+  return normalizeWatchlistItem(item)
+}
+
+/** 展示用代码：Opptrix ID 直接展示；旧关注项用命名空间 */
 export function watchlistDisplayCode(item: WatchlistItem): string {
+  const raw = item.code.trim()
+  if (isOpptrixInstrumentCode(raw)) return raw
   const ref = tryResolveWatchlistInstrument(item)
-  return ref ? displayCodeFromInstrument(ref) : (item.code.trim() || '—')
+  return ref ? displayCodeFromInstrument(ref) : (raw || '—')
 }
 
 export function normalizeWatchlistItem(item: WatchlistItem): WatchlistItem {
+  if (isOpptrixInstrumentCode(item.code)) {
+    return prepareWatchlistItemForStore(item)
+  }
   const resolved = tryResolveWatchlistInstrument(item)
   if (resolved) {
     const code = displayCodeFromInstrument(resolved)
@@ -249,12 +277,11 @@ export function marketDisplayName(market: Market): string {
   }
 }
 
-/** 搜索候选副标题 — 市场 · 代码 · 类型，单行 ellipsis 友好 */
+/** 搜索候选副标题 — 市场 · 代码 · 类型（搜索 ID 不再 normalize） */
 export function formatInstrumentSearchHitSubtitle(item: WatchlistItem): string {
-  const row = normalizeWatchlistItem(item)
-  const ref = row.instrument
-  const code = watchlistDisplayCode(row)
-  if (!ref) return row.industry?.trim() || code
+  const ref = item.instrument ?? tryResolveWatchlistInstrument(item)
+  const code = watchlistDisplayCode(item)
+  if (!ref) return item.industry?.trim() || code
 
   const parts: string[] = [marketDisplayName(ref.market), code]
   if (ref.assetClass === 'ETF') {
@@ -301,7 +328,7 @@ export function hitToWatchlistItem(hit: LocalInstrumentHit): WatchlistItem {
     : hit.market === 'CN' && hit.exchange
       ? `${marketDisplayName(hit.market)} · ${hit.exchange === 'SH' ? '上交所' : hit.exchange === 'SZ' ? '深交所' : hit.exchange === 'BJ' ? '北交所' : hit.exchange}`
       : marketDisplayName(hit.market)
-  return normalizeWatchlistItem({
+  return prepareWatchlistItemForStore({
     code: hit.code,
     name: hit.name ?? hit.code,
     industry,