@mzzsfy/dsh-stock-assistant 0.3.1 → 0.3.2

package/src/providers/tencent.mjs

@@ -1,5 +1,5 @@
 // 腾讯公开行情接口适配器:quotes+kline(备源)。非官方端点,无SLA,随时可能失效;延迟未知,行情时间戳为来源快照时间。
-import { normalizeQuote, parseQuoteTime, StockError } from '../market-model.mjs'
+import { normalizeQuote, parseQuoteTime, StockError, MARKET_META, sharesFromLots, amountFromWan } from '../market-model.mjs'
 // 官方默认端点表(key 供 instance.endpoints 覆盖, 反代/镜像场景由 ctx.endpoints 提供同名 key)
 const DEFAULT_ENDPOINTS = {
   quotes: 'https://qt.gtimg.cn/q=',
@@ -11,7 +11,9 @@ const SYMBOL_PREFIX = { XSHG: 'sh', XSHE: 'sz', XHKG: 'hk' }
 // 美股 symbol 后缀由搜索联想 JYS 字段映射(2026-10-30 实测: suggest 返回 JYS="NASDAQ"/"NYSE"/"AMEX";
 // 腾讯侧 .OQ/.N/裸代码同价有效, .A/.U 形态返回空数据——AMEX 走裸代码兜底)。
 const JYS_TO_SUFFIX = { NASDAQ: 'OQ', NYSE: 'N', AMEX: '' }
-const symbolOf = security => SYMBOL_PREFIX[security.exchange] ? `${SYMBOL_PREFIX[security.exchange]}${security.code}` : `${security.code}`
+// 美股行情端点要 us 前缀(实测 usAAPL 有效, 裸 AAPL 返回空);K线另有 JYS 后缀逻辑, 不复用这张表。
+const isUSExchange = exchange => exchange === 'XNAS' || exchange === 'XNYS'
+const symbolOf = security => isUSExchange(security.exchange) ? `us${security.code}` : SYMBOL_PREFIX[security.exchange] ? `${SYMBOL_PREFIX[security.exchange]}${security.code}` : `${security.code}`
 // kline request 用 market 字段(exchange 是 security 形态的字段名); 港股 code 统一 5 位对齐腾讯 hk00700 实测形态。
 const klineSymbolOf = request => {
   const prefix = SYMBOL_PREFIX[request.market]
@@ -22,6 +24,13 @@ const klineSymbolOf = request => {
 // kline 数据键随复权/周期漂移(qfqday/day/qfqweek/qfqmonth),取第一个数组值兜底。
 const firstArray = data => Object.values(data).find(Array.isArray)
 const num = v => { const n = parseFloat(v); return Number.isFinite(n) ? n : null }
+// 行情时间戳三种写法: 沪深紧凑数字, 港股斜杠, 美股带连字符
+const quoteStamp = raw => {
+  const compact = /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/.exec(raw || '')
+  if (compact) return `${compact[1]}-${compact[2]}-${compact[3]} ${compact[4]}:${compact[5]}:${compact[6]}`
+  const loose = /^(\d{4})[-/](\d{2})[-/](\d{2})[ T](\d{2}):(\d{2})(?::(\d{2}))?/.exec(raw || '')
+  return loose ? `${loose[1]}-${loose[2]}-${loose[3]} ${loose[4]}:${loose[5]}:${loose[6] || '00'}` : null
+}
 
 export const tencent = {
   descriptor: { adapterId: 'tencent', capabilities: ['quotes', 'kline'], markets: ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '腾讯公开接口：免凭据，行情与K线备源，非官方无SLA', endpointKeys: [{ key: 'quotes', label: '行情批量' }, { key: 'kline', label: 'K线历史' }] },
@@ -29,12 +38,12 @@ export const tencent = {
     // kline 探针直接拉代表证券 3 根日K(quotes 不覆盖港股);quotes 探针沿用代表证券行。
     if (request.capability === 'kline') {
       const code = { XSHG: '600519', XSHE: '000001', XHKG: '00700' }[request.market]
-      if (!code) throw new StockError('UNSUPPORTED_CAPABILITY', '腾讯备源不支持该市场K线', 422)
+      if (!code) throw new StockError('UNSUPPORTED_CAPABILITY', '腾讯来源不提供该市场K线', 422)
       const result = await this.kline({ ...request, securityId: `${request.market}:equity:${code}`, code, period: '1d', adjust: 'qfq', limit: 3 }, ctx)
       if (!result.candles.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
       return { status: 'ready', capability: 'kline', market: request.market, instrument: 'equity' }
     }
-    const PROBE = { XSHG: '600519', XSHE: '000001' }
+    const PROBE = { XSHG: '600519', XSHE: '000001', XHKG: '00700', XNAS: 'AAPL', XNYS: 'BABA' }
     const security = request.securities?.[0] || { exchange: request.market, code: PROBE[request.market] || '000001' }
     const rows = await this.quotes({ ...request, securities: [security] }, ctx)
     if (!rows.items.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
@@ -54,33 +63,33 @@ export const tencent = {
     const text = new TextDecoder('gbk').decode(await response.arrayBuffer())
     const seen = new Set(), items = []
     for (const line of text.split(';')) {
-      const match = /v_(sh|sz)(\d{6})="([^"]*)"/.exec(line)
+      const match = /v_((?:sh|sz|hk)\d{5,6}|us[A-Za-z.]+)="([^"]*)"/.exec(line)
       if (!match) continue
-      const providerSymbol = `${match[1]}${match[2]}`, security = symbols.get(providerSymbol)
+      const providerSymbol = match[1], security = symbols.get(providerSymbol)
       if (!security) continue
       if (seen.has(providerSymbol)) throw new StockError('BAD_PAYLOAD', '报价身份冲突', 502)
       seen.add(providerSymbol)
-      const f = match[3].split('~')
+      const f = match[2].split('~')
       if (f.length < 38) throw new StockError('BAD_PAYLOAD', '来源字段数量异常', 502)
-      const [, y, m, d, hh, mm, ss] = /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/.exec(f[30]) || []
+      const volume = num(f[36]), amount = num(f[37])
       items.push(normalizeQuote({
         securityId: security.id, providerInstanceId: request.providerInstanceId, adapterId: 'tencent', providerSymbol,
         last: f[3], previousClose: f[4], open: f[5], high: f[33], low: f[34],
-        volume: f[36] == null || Number.isNaN(Number(f[36])) ? null : String(Number(f[36]) * 100), volumeUnit: 'share',
-        amount: f[37] == null || Number.isNaN(Number(f[37])) ? null : String(Math.round(Number(f[37]) * 10000)), amountUnit: 'CNY',
-        quoteAt: y ? parseQuoteTime(`${y}-${m}-${d} ${hh}:${mm}:${ss}`) : null, timestampKind: 'trade',
+        volume: volume === null ? null : String(sharesFromLots(volume, security.exchange)), volumeUnit: 'share',
+        amount: amount === null ? null : String(amountFromWan(amount, security.exchange)), amountUnit: MARKET_META[security.exchange]?.currency || 'CNY',
+        quoteAt: parseQuoteTime(quoteStamp(f[30])), timestampKind: 'trade',
         receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown',
       }))
     }
     return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: request.securities.filter(s => !seen.has(symbolOf(s))).map(s => ({ securityId: s.id, code: 'NO_DATA', message: '来源未返回此证券报价' })) }
   },
   async kline(request, ctx) {
-    if (request.period === 'trend') throw new StockError('UNSUPPORTED_CAPABILITY', '腾讯备源不支持分时', 422)
+    if (request.period === 'trend') throw new StockError('UNSUPPORTED_CAPABILITY', '腾讯来源不提供分时数据', 422)
     let symbol = klineSymbolOf(request)
     if (request.market === 'XNAS' || request.market === 'XNYS') {
       const mapped = ctx.usSymbols?.get(`US:${request.code}`)
       const suffix = mapped ? JYS_TO_SUFFIX[mapped.jys] : undefined
-      if (suffix === undefined) throw new StockError('UNSUPPORTED_CAPABILITY', '美股腾讯备源需先经搜索建立代码映射', 422)
+      if (suffix === undefined) throw new StockError('UNSUPPORTED_CAPABILITY', '腾讯来源的美股K线需先经搜索建立代码映射', 422)
       symbol = suffix ? `us${request.code}.${suffix}` : `us${request.code}`
     }
     const param = `${symbol},${{ '1d': 'day', '1w': 'week', '1M': 'month' }[request.period]},,,${request.limit},qfq`
@@ -103,7 +112,7 @@ export const tencent = {
       if (!Array.isArray(row) || row.length < 6) throw new StockError('BAD_PAYLOAD', 'K线列数不足', 502)
       if (String(row[0]) <= prevTime) throw new StockError('BAD_PAYLOAD', 'K线时间戳重复或乱序', 502)
       prevTime = String(row[0])
-      candles.push({ time: String(row[0]), open: num(row[1]), close: num(row[2]), high: num(row[3]), low: num(row[4]), volume: num(row[5]) })
+      candles.push({ time: String(row[0]), open: num(row[1]), close: num(row[2]), high: num(row[3]), low: num(row[4]), volume: sharesFromLots(num(row[5]), request.market) })
     }
     // preClose 实测定案: data.{symbol}.qt.{symbol}[4] 为昨收(2026-10-30 实测 sz000001 值 11.54 与东财 f18 一致)。
     const qt = Array.isArray(data?.qt?.[symbol]) ? data.qt[symbol] : null

package/src/providers/tushare.mjs

@@ -84,7 +84,7 @@ export const tushare = {
       seen.add(row.ts_code)
       const security = securities.get(row.ts_code)
       items.push(normalizeQuote({ securityId: security.id, last: row.close, previousClose: row.pre_close, open: row.open, high: row.high, low: row.low,
-        volume: row.vol == null ? null : String(row.vol), volumeUnit: 'share', amount: row.amount == null ? null : String(row.amount), amountUnit: 'CNY',
+        volume: row.vol == null ? null : String(Number(row.vol) * 100), volumeUnit: 'share', amount: row.amount == null ? null : String(row.amount), amountUnit: 'CNY',
         providerInstanceId: request.providerInstanceId, adapterId: 'tushare', providerSymbol: row.ts_code, quoteAt: parseQuoteTime(row.trade_time), timestampKind: 'trade', receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown' }))
     }
     return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: request.securities.filter(s => !seen.has(symbol(s))).map(s => ({ securityId: s.id, code: 'NO_DATA', message: '来源未返回此证券报价' })) }

package/src/providers/xueqiu.mjs

@@ -0,0 +1,81 @@
+// 雪球公开行情接口适配器:quotes(沪深港美)。
+// 与新浪/东财的差别:同一请求可混装多市场,且额外给出换手率/振幅/市值/总股本。
+// 接口需要 xq_a_token cookie,匿名访问首页即可拿到,本适配器惰性获取并按 TTL 缓存。
+import { normalizeQuote, parseQuoteTime, StockError } from '../market-model.mjs'
+const ENDPOINT = 'https://stock.xueqiu.com/v5/stock/batch/quote.json'
+const HOME = 'https://xueqiu.com/'
+const HEADERS = { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36' }
+// cookie 有效期远长于一次会话, 缓存到进程内并按 TTL 刷新, 避免每个请求都先访问首页
+const TOKEN_TTL = 30 * 60 * 1000
+let token = { value: null, until: 0 }
+// 沪深用大写市场前缀, 港股与美股直接用代码本身(实测 HK00700 返回空, 00700 才有数据)
+const symbolOf = security => (security.exchange === 'XSHG' ? 'SH' : security.exchange === 'XSHE' ? 'SZ' : '') + security.code
+const PROBE_SECURITY = { XSHG: '600519', XSHE: '000001', XHKG: '00700', XNAS: 'AAPL', XNYS: 'BABA' }
+const quote = value => { const n = Number(value); return Number.isFinite(n) ? n.toFixed(2) : null }
+
+export const xueqiu = {
+  descriptor: { adapterId: 'xueqiu', capabilities: ['quotes'], markets: ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '雪球公开接口：免凭据（匿名 token），沪深港美行情，可混装多市场，额外提供换手率与市值' },
+  async probe(request, ctx) {
+    const security = request.securities?.[0] || { exchange: request.market, code: PROBE_SECURITY[request.market] }
+    if (!security.code) throw new StockError('UNSUPPORTED_CAPABILITY', '雪球来源不提供该市场行情', 422)
+    const rows = await this.quotes({ ...request, securities: [security] }, ctx)
+    if (!rows.items.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
+    return { status: 'ready', capability: 'quotes', market: request.market, instrument: 'equity' }
+  },
+  async quotes(request, ctx) {
+    const symbols = new Map(request.securities.map(s => [symbolOf(s), s]))
+    let response
+    try {
+      response = await ctx.fetch(`${ENDPOINT}?symbol=${[...symbols.keys()].join(',')}`, { headers: { ...HEADERS, Cookie: await cookieOf(ctx), Referer: HOME }, signal: ctx.signal, redirect: 'error' })
+      // token 过期时来源返回 400/刷新一次重试, 让缓存失真自愈
+      if (response.status === 400) {
+        token = { value: null, until: 0 }
+        response = await ctx.fetch(`${ENDPOINT}?symbol=${[...symbols.keys()].join(',')}`, { headers: { ...HEADERS, Cookie: await cookieOf(ctx) }, signal: ctx.signal, redirect: 'error' })
+      }
+    } catch (e) {
+      if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
+      if (e instanceof StockError) throw e
+      throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
+    }
+    if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
+    const body = await response.json().catch(() => { throw new StockError('BAD_PAYLOAD', '来源响应不是JSON', 502) })
+    const items = body?.data?.items
+    if (!Array.isArray(items)) throw new StockError('BAD_PAYLOAD', '来源字段结构异常', 502)
+    const seen = new Set(), result = []
+    for (const entry of items) {
+      const row = entry?.quote
+      if (!row) continue
+      const security = symbols.get(String(row.symbol || ''))
+      if (!security) continue
+      if (seen.has(security.id)) throw new StockError('BAD_PAYLOAD', '报价身份冲突', 502)
+      seen.add(security.id)
+      // 雪球 volume 统一是股, amount 统一是元; 时间戳是毫秒 Unix
+      result.push(normalizeQuote({
+        securityId: security.id, providerInstanceId: request.providerInstanceId, adapterId: 'xueqiu', providerSymbol: row.symbol,
+        last: quote(row.current), previousClose: quote(row.last_close), open: quote(row.open), high: quote(row.high), low: quote(row.low),
+        volume: Number.isFinite(Number(row.volume)) ? String(Math.round(Number(row.volume))) : null, volumeUnit: 'share',
+        amount: Number.isFinite(Number(row.amount)) ? String(Math.round(Number(row.amount))) : null, amountUnit: String(row.currency || ''),
+        quoteAt: Number.isFinite(Number(row.timestamp)) ? new Date(Number(row.timestamp)).toISOString() : null, timestampKind: 'trade',
+        receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown',
+        turnoverRate: Number.isFinite(Number(row.turnover_rate)) ? Number(row.turnover_rate) : null,
+        marketCapital: Number.isFinite(Number(row.market_capital)) ? Math.round(Number(row.market_capital)) : null,
+      }))
+    }
+    return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items: result, errors: request.securities.filter(s => !seen.has(s.id)).map(s => ({ securityId: s.id, code: 'NO_DATA', message: '来源未返回此证券报价' })) }
+  },
+}
+
+async function cookieOf(ctx) {
+  if (token.value && token.until > ctx.now()) return token.value
+  let response
+  try { response = await ctx.fetch(HOME, { headers: HEADERS, signal: ctx.signal, redirect: 'follow' }) } catch (e) {
+    if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
+    if (e instanceof StockError) throw e
+    throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
+  }
+  const raw = typeof response.headers.getSetCookie === 'function' ? response.headers.getSetCookie() : []
+  const value = raw.map(c => c.split(';')[0]).filter(c => c.includes('=')).join('; ')
+  if (!value) throw new StockError('BAD_PAYLOAD', '来源未返回访问令牌', 502)
+  token = { value, until: ctx.now() + TOKEN_TTL }
+  return value
+}

package/src/schemas.mjs

@@ -2,6 +2,13 @@ import { z } from 'zod'
 import { fail } from './market-model.mjs'
 import { MARKET_META } from './market-model.mjs'
 const id = z.string().regex(/^[a-z][a-z0-9-]{0,47}$/)
+// 用户标在图上并参与盈亏计算的价格点位。kind 决定它在盈亏里扮演什么角色:
+// cost 是持仓成本, target 是打算卖出的价
+export const markSchema = z.strictObject({ id: z.string().min(1).max(40), price: z.number().positive(), kind: z.enum(['cost', 'target']) })
+export const marksSchema = z.array(markSchema).max(12).default([]).superRefine((list, ctx) => {
+  if (new Set(list.map(mark => mark.id)).size !== list.length) ctx.addIssue({ code: 'custom', message: '价格标记 id 重复' })
+  if (new Set(list.map(mark => `${mark.kind}:${mark.price}`)).size !== list.length) ctx.addIssue({ code: 'custom', message: '同类型的价格不能重复' })
+})
 const rate = z.number().int().positive().max(100000)
 export const capability = z.enum(['quotes', 'catalog', 'search', 'calendar', 'kline'])
 export const marketSchema = z.enum(Object.keys(MARKET_META))
@@ -21,6 +28,8 @@ export const klineQuerySchema = z.strictObject({
   securityId: z.string().regex(/^[\w]+:equity:[\w.]{1,15}$/),
   period: z.enum(['trend', '1d', '1w', '1M']),
   limit: z.coerce.number().int().min(20).max(1000).default(250),
+  // 强制刷新:客户端详情页刷新走 ?force=1,服务端据此跳过缓存读;缺省按缓存
+  force: z.enum(['0', '1']).optional(),
 })
 // 路由上限: 八市场×(quotes/catalog/search/calendar/kline) 全开 40 条封顶
 const configSchema = z.strictObject({ providers: z.array(providerSchema).max(8), routes: z.array(routeSchema).max(40) })
@@ -53,7 +62,7 @@ export function parseConfiguration(value) {
   }
   return config
 }
-export const controlSchema = z.object({ revision: z.number().int().nonnegative(), routingRevision: z.number().int().nonnegative(), watchlist: z.object({ order: z.array(z.string()).max(100), items: z.record(z.string(), securitySchema.safeExtend({ alias: z.string(), pinned: z.boolean(), cost: z.number().positive().nullable().default(null), group: z.string().refine(s => [...s.trim()].length <= 12).default('') })) }), preferences: preferencesSchema, providers: z.array(providerSchema), routes: z.array(routeSchema), operations: z.array(z.object({ id: z.uuid(), hash: z.string(), at: z.number(), result: z.object({ revision: z.number() }).passthrough(), action: z.string(), payload: z.unknown() })).max(256) }).superRefine((control, ctx) => {
+export const controlSchema = z.object({ revision: z.number().int().nonnegative(), routingRevision: z.number().int().nonnegative(), watchlist: z.object({ order: z.array(z.string()).max(100), items: z.record(z.string(), securitySchema.safeExtend({ alias: z.string(), pinned: z.boolean(), marks: marksSchema, group: z.string().refine(s => [...s.trim()].length <= 12 && !/[\u0000-\u001f]/.test(s)).default('') })) }), preferences: preferencesSchema, providers: z.array(providerSchema), routes: z.array(routeSchema), operations: z.array(z.object({ id: z.uuid(), hash: z.string(), at: z.number(), result: z.object({ revision: z.number() }).passthrough(), action: z.string(), payload: z.unknown() })).max(256) }).superRefine((control, ctx) => {
   const w = control.watchlist
   if (new Set(w.order).size !== w.order.length || w.order.length !== Object.keys(w.items).length || w.order.some(id => w.items[id]?.id !== id)) ctx.addIssue({ code: 'custom', message: '自选序列与证券不一致' })
   let unpinned = false
@@ -61,15 +70,29 @@ export const controlSchema = z.object({ revision: z.number().int().nonnegative()
   try { parseConfiguration({ providers: control.providers, routes: control.routes }) } catch { ctx.addIssue({ code: 'custom', message: '来源配置不一致' }) }
 })
 export const domainSpec = { name: 'stock_assistant', version: 1, layout: 'single', tables: { control: { valueSchema: controlSchema }, cache: { valueSchema: z.object({ kind: z.string(), source: z.string(), fetchedAt: z.number(), payload: z.unknown() }) } } }
-// 默认数据源:免凭据公开源+保守预算,首用即可检查保存;目录走新浪分市场节点,行情与搜索走东财。
+// 推荐配置:四个免凭据源,东财做八市场主力,其余按实测最强能力分派备份——公开源无SLA,能覆盖的市场都串上备源。
 export const defaultConfig = () => {
-  const catalog = { id: 'sn-catalog', adapterId: 'sina', enabled: true, credentialEnv: null, quotaGroup: 'free-list', budget: { requestsPerMinute: 120, dailyRequestLimit: null, billingUnit: 'request', symbolCreditsPerMinute: null, capabilityLimits: { catalog: 60 } } }
-  const market = { id: 'em-default', adapterId: 'eastmoney', enabled: true, credentialEnv: null, quotaGroup: 'free-quote', budget: { requestsPerMinute: 60, dailyRequestLimit: null, billingUnit: 'request', symbolCreditsPerMinute: null, capabilityLimits: { kline: 30 } } }
-  const routes = ['XSHG', 'XSHE'].flatMap(m => [
-    { id: `${m.toLowerCase()}-catalog`, capability: 'catalog', market: m, instrument: 'equity', primaryInstanceId: catalog.id, fallbackInstanceIds: [], failoverMode: 'off', maxDelaySeconds: null, acceptUnknownDelay: true },
-    { id: `${m.toLowerCase()}-search`, capability: 'search', market: m, instrument: 'equity', primaryInstanceId: market.id, fallbackInstanceIds: [], failoverMode: 'off', maxDelaySeconds: null, acceptUnknownDelay: true },
-    { id: `${m.toLowerCase()}-quotes`, capability: 'quotes', market: m, instrument: 'equity', primaryInstanceId: market.id, fallbackInstanceIds: [], failoverMode: 'off', maxDelaySeconds: null, acceptUnknownDelay: true },
+  const budget = (requestsPerMinute, capabilityLimits = {}) => ({ requestsPerMinute, dailyRequestLimit: null, billingUnit: 'request', symbolCreditsPerMinute: null, capabilityLimits })
+  const providers = [
+    { id: 'em-default', adapterId: 'eastmoney', enabled: true, credentialEnv: null, quotaGroup: 'free-quote', budget: budget(60, { kline: 30 }) },
+    { id: 'sn-backup', adapterId: 'sina', enabled: true, credentialEnv: null, quotaGroup: 'free-list', budget: budget(120, { catalog: 60 }) },
+    { id: 'tx-backup', adapterId: 'tencent', enabled: true, credentialEnv: null, quotaGroup: 'free-backup', budget: budget(60, { kline: 20 }) },
+    { id: 'xq-backup', adapterId: 'xueqiu', enabled: true, credentialEnv: null, quotaGroup: 'free-xq', budget: budget(60) },
+  ]
+  // 备用源只在探针可验证的组合上声明: 腾讯美股K线需先由搜索建立代码映射, 探针期必然不可用
+  const klineBackup = new Set(['XSHG', 'XSHE', 'XHKG'])
+  // 目录覆盖八市场: 东财 clist 的 fs 对日韩英同样有节点(日股 3752 / 韩股 2866 / 英股股票 4608), 全量翻页在 50 页上限内
+  const catalogCovered = new Set(['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS', 'XJPX', 'XKRX', 'XLON'])
+  // 报价备源按市场派: 沪深港走新浪(免cookie、单位已是股), 美股走雪球(时间戳是UTC毫秒, 与东财同口径)
+  const quoteBackupOf = market => (market === 'XNAS' || market === 'XNYS' ? 'xq-backup' : ['XSHG', 'XSHE', 'XHKG'].includes(market) ? 'sn-backup' : null)
+  const route = (market, capability, primary, fallback = null) => ({ id: `${market.toLowerCase()}-${capability}`, capability, market, instrument: 'equity', primaryInstanceId: primary, fallbackInstanceIds: fallback ? [fallback] : [], failoverMode: fallback ? 'network' : 'off', maxDelaySeconds: null, acceptUnknownDelay: true })
+  const routes = ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS', 'XJPX', 'XKRX', 'XLON'].flatMap(market => [
+    // 目录统一走东财: 一个源覆盖八个市场, 不必为沪深单开新浪分支;目录不支持备用源
+    ...(catalogCovered.has(market) ? [route(market, 'catalog', 'em-default')] : []),
+    route(market, 'search', 'em-default'),
+    route(market, 'quotes', 'em-default', quoteBackupOf(market)),
+    route(market, 'kline', 'em-default', klineBackup.has(market) ? 'tx-backup' : null),
   ])
-  return { providers: [catalog, market], routes }
+  return { providers, routes }
 }
 export const initialControl = () => ({ revision: 0, routingRevision: 0, watchlist: { order: [], items: {} }, preferences: { refreshSeconds: 15, colorMode: 'red-up' }, ...defaultConfig(), operations: [] })

package/src/service.mjs

@@ -1,18 +1,21 @@
 import { z } from 'zod'
 import { fail, parseSecurityId } from './market-model.mjs'
-import { securitySchema } from './schemas.mjs'
+import { securitySchema, marksSchema } from './schemas.mjs'
 // 自选身份八市场: parseSecurityId 是唯一事实源(市场/代码形态随 MARKET_META)
 const securityId = z.string().refine(v => { try { parseSecurityId(v); return true } catch { return false } })
 const payloads = {
   add: z.strictObject({ securityId }), remove: z.strictObject({ securityId }),
   restore: z.strictObject({ removeOperationId: z.uuid() }),
   alias: z.strictObject({ securityId, alias: z.string().refine(s => [...s].length <= 30) }),
-  cost: z.strictObject({ securityId, cost: z.number().positive().nullable() }),
-  group: z.strictObject({ securityIds: z.array(securityId).min(1), group: z.string().refine(s => { const t = s.trim(); return [...t].length <= 12 }) }),
-  groupRename: z.strictObject({ from: z.string().min(1), to: z.string().refine(s => { const t = s.trim(); return t.length > 0 && [...t].length <= 12 }) }),
+  marks: z.strictObject({ securityId, marks: marksSchema }),
+  // 组名进来就是用户输入, 校验在入口做: 只靠 state 写入后的不变式兜底会把它报成 500 内部错误
+  group: z.strictObject({ securityIds: z.array(securityId).min(1), group: z.string().refine(s => { const t = s.trim(); return [...t].length <= 12 && !/[\u0000-\u001f]/.test(t) }, '分组名最长 12 字且不能含控制字符') }),
+  groupRename: z.strictObject({ from: z.string().min(1), to: z.string().refine(s => { const t = s.trim(); return t.length > 0 && [...t].length <= 12 && !/[\u0000-\u001f]/.test(t) }, '分组名最长 12 字且不能含控制字符') }),
   groupRemove: z.strictObject({ group: z.string().min(1) }),
   pin: z.strictObject({ securityId, pinned: z.boolean() }),
   move: z.strictObject({ securityId, beforeId: securityId.nullable() }),
+  // 拖拽排序: 提交完整显示序, 前端算好顺序一次落库, 避免逐行 move 的中间态
+  reorder: z.strictObject({ order: z.array(securityId).min(1) }),
 }
 export function createWatchlistService(state, resolveSecurity, now = Date.now) {
   return {
@@ -24,12 +27,20 @@ export function createWatchlistService(state, resolveSecurity, now = Date.now) {
         const w = control.watchlist, item = w.items[p.securityId]
         const insert = (id, beforeId) => { const index = w.order.indexOf(beforeId); w.order.splice(index < 0 ? w.order.length : index, 0, id) }
         const regionEnd = pinned => w.order.find(id => w.items[id].pinned !== pinned && !w.items[id].pinned) || null
+        if (operation.action === 'reorder') {
+          const ids = p.order
+          if (ids.length !== w.order.length || new Set(ids).size !== ids.length || ids.some(id => !w.items[id])) fail('INVALID_ORDER', '排序参数无效')
+          // 置顶项必须连续占据最前段: 与渲染分段一致, 防止拖动把置顶项沉底
+          if (ids.some((id, index) => !w.items[id].pinned && ids.slice(index + 1).some(next => w.items[next].pinned))) fail('INVALID_ORDER', '置顶项必须保持在列表最前')
+          w.order = ids
+          return control
+        }
         if (operation.action === 'add') {
           if (item) return control
           if (w.order.length >= 100) fail('LIMIT_REACHED', '最多添加100只自选', 422)
           const security = resolveSecurity(p.securityId)
           if (!security || !securitySchema.safeParse(security).success) fail('CANDIDATE_EXPIRED', '候选已过期，请重新搜索', 409)
-          w.items[p.securityId] = { ...security, alias: '', pinned: false, cost: null, group: '' }; w.order.push(p.securityId)
+          w.items[p.securityId] = { ...security, alias: '', pinned: false, marks: [], group: '' }; w.order.push(p.securityId)
         } else if (operation.action === 'restore') {
           const deleted = control.operations.find(o => o.id === p.removeOperationId && o.action === 'remove')
           const restore = deleted?.result.restore
@@ -52,7 +63,7 @@ export function createWatchlistService(state, resolveSecurity, now = Date.now) {
             control.operationResult = { restore: { item, previousId: w.order[i - 1] || null, nextId: w.order[i + 1] || null } }
             w.order.splice(i, 1); delete w.items[p.securityId]
           } else if (operation.action === 'alias') item.alias = p.alias.trim()
-          else if (operation.action === 'cost') item.cost = p.cost
+          else if (operation.action === 'marks') item.marks = p.marks
           else if (operation.action === 'pin') {
             if (item.pinned === p.pinned) return control
             w.order = w.order.filter(id => id !== item.id); item.pinned = p.pinned