dsh-hyperliquid 0.1.0 → 0.3.0

package/lib/remote.js

@@ -13,6 +13,12 @@ import { canonicalMarketCoin } from './market-symbol.js'
 import { HyperStore } from './store.js'
 import { addressFromPrivateKey, buildL1TypedData, splitSignature } from './signing.js'
 import { TradingGuard } from './trading-guard.js'
+import { normalizeMaLines } from './moving-average.js'
+import { ALERT_KINDS, ICON_NAMES, TEXT_KINDS, drawingGeometry, drawingStyle, isIconLabel, linePriceAt } from './chart-drawings.js'
+import { normalizeRiskSettings } from './risk-settings.js'
+import { INDICATOR_IDS, normalizeIndicatorSettings } from './studies.js'
+import { normalizeResearch } from './workspace-settings.js'
+import { fundingWindow } from './review.js'
 
 const TOOL_CALL = Symbol('verified DSH tool call')
 
@@ -81,6 +87,7 @@ const ACCOUNT_MODE_TTL_MS = 30_000
 const TRADE_CAPACITY_TTL_MS = 15_000
 const SUB_SWEEP_MS = 30_000
 const SUB_IDLE_MS = 120_000
+const ALERT_CHECK_MS = 2_000
 const BOOK_GROUPINGS = {
   full: null,
   '5': { nSigFigs: 5 },
@@ -121,6 +128,10 @@ export class HyperRemote extends TypertRemoteService {
     if (this.cfg.tradingAddress && !/^0x[0-9a-fA-F]{40}$/.test(this.cfg.tradingAddress)) throw new Error('tradingAddress 必须为 20 字节 EVM 地址')
     this.client = new HyperliquidClient({ network: this.cfg.network, privateKey: this.cfg.privateKey })
     this.store = new HyperStore(this.cfg.dataDir, this.cfg.network)
+    this.baseRiskSettings = Object.fromEntries(['allowedCoins', 'maxOrderUsd', 'maxDailyUsd', 'maxPositionUsd', 'maxLeverage'].map((key) => [key, this.cfg[key]]))
+    const savedRiskSettings = this.store.getRiskSettings()
+    this.riskSettingsOverride = savedRiskSettings != null
+    if (savedRiskSettings) Object.assign(this.cfg, normalizeRiskSettings(savedRiskSettings))
     this.guard = new TradingGuard(this.cfg.dataDir, { ...this.cfg, dataDir: this.cfg.dataDir })
     this.paperGuard = new TradingGuard(this.cfg.dataDir, { ...this.cfg, dataDir: this.cfg.dataDir }, { budgetName: this.cfg.network === 'mainnet' ? 'paper-budget-mainnet.json' : 'paper-budget.json' })
     this.marketsCache = null
@@ -149,6 +160,10 @@ export class HyperRemote extends TypertRemoteService {
       }
     }
     this.sweepTimer = setInterval(() => this.sweepSubs(), SUB_SWEEP_MS)
+    this.sweepTimer.unref?.()
+    this.alertSides = new Map() // drawing id → last side of the mid price (-1 below, 1 above)
+    this.alertTimer = setInterval(() => { try { this.checkDrawingAlerts() } catch { /* next tick retries */ } }, ALERT_CHECK_MS)
+    this.alertTimer.unref?.()
   }
 
   sweepSubs() {
@@ -443,7 +458,7 @@ export class HyperRemote extends TypertRemoteService {
     const sessionId = String(request?.sessionId ?? '')
     if (!this.store.getSession(sessionId)) return { marks: [] }
     const coin = requireCoin(request)
-    const interval = requireInterval(request?.interval ?? this.desk.interval)
+    const interval = request?.allIntervals === true ? null : requireInterval(request?.interval ?? this.desk.interval)
     return { marks: this.store.listChartMarks(sessionId, coin, interval) }
   }
 
@@ -451,30 +466,100 @@ export class HyperRemote extends TypertRemoteService {
     this.requireTradingSession(sessionId)
     const coin = requireCoin(request)
     const interval = requireInterval(request?.interval ?? this.desk.interval)
-    const kind = request?.kind === 'trend' ? 'trend' : 'level'
+    const kind = request?.kind ?? 'level'
     const role = ['support', 'resistance', 'neutral'].includes(request?.role) ? request.role : 'neutral'
     const label = String(request?.label ?? '').trim()
-    if (!label || label.length > 60) throw new Error('图表标注需要 1-60 字标签')
-    const mark = { sessionId, coin, interval, kind, role, label, source }
-    if (kind === 'level') {
-      const price = Number(request?.price)
-      if (!Number.isFinite(price) || price <= 0) throw new Error('水平线 price 必须为正数')
-      mark.price = price
-    } else {
-      const fromTime = Number(request?.fromTime)
-      const toTime = Number(request?.toTime)
-      const fromPrice = Number(request?.fromPrice)
-      const toPrice = Number(request?.toPrice)
-      const oldest = Date.now() - 90 * 86_400_000
-      const latest = Date.now() + 86_400_000
-      if (!(fromTime >= oldest && toTime > fromTime && toTime <= latest && fromPrice > 0 && toPrice > 0 && Number.isFinite(fromPrice) && Number.isFinite(toPrice))) {
-        throw new Error('趋势线需要最近 90 天内递增的毫秒时间戳及正数价格')
-      }
-      Object.assign(mark, { fromTime, toTime, fromPrice, toPrice })
-    }
+    const maxLabel = TEXT_KINDS.includes(kind) ? 200 : 60
+    if (!label || label.length > maxLabel) throw new Error(`图表标注需要 1-${maxLabel} 字${TEXT_KINDS.includes(kind) ? '文本' : '标签'}`)
+    if (kind === 'icon' && !isIconLabel(label)) throw new Error(`图标 label 必须为 ${ICON_NAMES.join('/')} 或贴图库中的 emoji:<贴纸>`)
+    const mark = { sessionId, coin, interval, kind, role, label, source, ...drawingGeometry(kind, request), ...drawingStyle({ ...request, kind }) }
     return this.store.addChartMark(mark)
   }
 
+  /** Replace a session chart's MA lines (agent path); the desk reloads on the `chart.ma` event. */
+  setSessionMaLines(sessionId, lines) {
+    this.requireTradingSession(sessionId)
+    const maLines = normalizeMaLines(lines)
+    this.store.updateSessionWorkspace(sessionId, { maLines })
+    this.store.recordEvent('chart.ma', { sessionId, ids: maLines.map((line) => line.id) })
+    return maLines
+  }
+
+  /** Agent sets what the session chart shows (interval, indicator panes); the desk follows on `chart.view`. */
+  setSessionChartView(sessionId, { interval, show = [], hide = [] } = {}) {
+    this.requireTradingSession(sessionId)
+    const unknown = [...show, ...hide].filter((id) => !INDICATOR_IDS.includes(id))
+    if (unknown.length) throw new Error(`未知指标 ${unknown.join(',')}，可选：${INDICATOR_IDS.join(', ')}`)
+    const current = this.store.getSessionWorkspace(sessionId)
+    const patch = { indicators: [...new Set([...(current.indicators ?? []).filter((id) => !hide.includes(id)), ...show])] }
+    if (interval != null) patch.interval = requireInterval(interval)
+    const next = this.store.updateSessionWorkspace(sessionId, patch)
+    if (this.desk?.sessionId === sessionId && patch.interval) this.desk.interval = patch.interval
+    this.store.recordEvent('chart.view', { sessionId, interval: next.interval, indicators: next.indicators })
+    return next
+  }
+
+  /** Move, reshape, restyle or relabel one drawing; geometry is re-validated as a whole. */
+  editChartMark(id, patch, sessionId) {
+    this.requireTradingSession(sessionId)
+    const current = this.store.getChartMark(sessionId, String(id ?? ''))
+    if (!patch || typeof patch !== 'object' || Array.isArray(patch)) throw new Error('画线修改无效')
+    const merged = { ...current, ...patch }
+    const geometryKeys = ['price', 'fromTime', 'fromPrice', 'toTime', 'toPrice', 'points']
+    const fields = { ...drawingStyle({ ...patch, kind: current.kind }) }
+    if (patch?.alert === true) fields.alertTriggeredAt = undefined
+    // null clears a style back to its default (undo of a first restyle relies on this).
+    for (const key of ['color', 'lineWidth', 'lineStyle', 'rows', 'valueArea']) if (key in patch && patch[key] === null) fields[key] = undefined
+    if (geometryKeys.some((key) => key in patch)) Object.assign(fields, drawingGeometry(current.kind, merged))
+    if ('label' in patch) {
+      const label = String(patch.label ?? '').trim()
+      const maxLabel = TEXT_KINDS.includes(current.kind) ? 200 : 60
+      if (!label || label.length > maxLabel) throw new Error(`图表标注需要 1-${maxLabel} 字`)
+      fields.label = label
+    }
+    if (current.locked && !('locked' in patch) && Object.keys(fields).length) throw new Error('该画线已锁定，先解锁再修改')
+    return this.store.updateChartMark(sessionId, current.id, fields)
+  }
+
+  async updateChartMark(request) {
+    return this.editChartMark(request?.id, request?.patch, String(request?.sessionId ?? ''))
+  }
+
+  /**
+   * Drawing alerts: when the mid price crosses an alert-enabled line it fires once (the alert
+   * switches off, the time is recorded) and the desk gets a `chart.alert` event.
+   * @param mids - coin → mid (defaults to the live allMids snapshot).
+   */
+  checkDrawingAlerts(now = Date.now(), mids = null) {
+    const watched = this.store.allChartMarks?.().filter((mark) => mark.alert && ALERT_KINDS.includes(mark.kind)) ?? []
+    for (const id of [...this.alertSides.keys()]) if (!watched.some((mark) => mark.id === id)) this.alertSides.delete(id)
+    if (!watched.length) return []
+    let book = mids
+    if (!book) {
+      const key = this.touch(keys.allMids())
+      const snap = this.client.snapshot(key)
+      if (!snap || now - snap.at > 10_000) return []
+      book = snap.data?.mids ?? snap.data
+    }
+    const fired = []
+    for (const mark of watched) {
+      const mid = Number(book?.[mark.coin])
+      const line = linePriceAt(mark, now)
+      if (!Number.isFinite(mid) || line == null || !Number.isFinite(line)) continue
+      const side = mid > line ? 1 : mid < line ? -1 : 0
+      const before = this.alertSides.get(mark.id)
+      if (side !== 0) this.alertSides.set(mark.id, side)
+      if (before == null || side === 0 || side === before) continue
+      this.alertSides.delete(mark.id)
+      const saved = this.store.updateChartMark(mark.sessionId, mark.id, { alert: false, alertTriggeredAt: now })
+      const event = { sessionId: mark.shared ? null : mark.sessionId, shared: Boolean(mark.shared), coin: mark.coin, id: mark.id, label: mark.label, kind: mark.kind,
+        price: mid, line, direction: side > 0 ? 'up' : 'down', at: now }
+      this.store.recordEvent('chart.alert', event)
+      fired.push({ ...event, mark: saved })
+    }
+    return fired
+  }
+
   removeChartMark(id, sessionId) {
     this.requireTradingSession(sessionId)
     return this.store.removeChartMark(sessionId, String(id ?? ''))
@@ -505,21 +590,29 @@ export class HyperRemote extends TypertRemoteService {
       patch.tapeTab = input.tapeTab
     }
     if ('bottomTab' in input) {
-      if (!['positions', 'orders', 'account'].includes(input.bottomTab)) throw new Error('账户页签无效')
+      if (!['positions', 'orders', 'account', 'review'].includes(input.bottomTab)) throw new Error('账户页签无效')
       patch.bottomTab = input.bottomTab
     }
     if ('indicators' in input) {
-      const allowed = ['volume', 'sma20', 'sma60', 'ema20', 'ema50', 'bollinger20', 'rsi14', 'macd']
+      const allowed = INDICATOR_IDS
       if (!Array.isArray(input.indicators) || input.indicators.length > allowed.length || input.indicators.some((id) => !allowed.includes(id))) throw new Error('图表指标无效')
       patch.indicators = [...new Set(input.indicators)]
     }
+    if ('maLines' in input) patch.maLines = normalizeMaLines(input.maLines)
+    if ('indicatorSettings' in input) patch.indicatorSettings = normalizeIndicatorSettings(input.indicatorSettings)
+    if ('research' in input) patch.research = normalizeResearch(input.research)
+    if ('showDataWindow' in input) { if (typeof input.showDataWindow !== 'boolean') throw Error('数据窗口设置无效'); patch.showDataWindow = input.showDataWindow }
+    if ('chartType' in input) {
+      if (!['candles', 'bars', 'line', 'area', 'heikinAshi'].includes(input.chartType)) throw new Error('图表类型无效')
+      patch.chartType = input.chartType
+    }
     if ('priceScale' in input) {
       if (!['normal', 'log', 'percentage'].includes(input.priceScale)) throw new Error('价格刻度无效')
       patch.priceScale = input.priceScale
     }
     if ('chartLayers' in input) {
       const layers = input.chartLayers
-      if (!layers || typeof layers !== 'object' || Array.isArray(layers) || Object.keys(layers).some((key) => !['orders', 'fills', 'drawings'].includes(key)) || Object.values(layers).some((value) => typeof value !== 'boolean')) throw new Error('图表图层无效')
+      if (!layers || typeof layers !== 'object' || Array.isArray(layers) || Object.keys(layers).some((key) => !['orders', 'fills', 'drawings', 'reasons'].includes(key)) || Object.values(layers).some((value) => typeof value !== 'boolean')) throw new Error('图表图层无效')
       patch.chartLayers = layers
     }
     if ('layout' in input) {
@@ -556,9 +649,30 @@ export class HyperRemote extends TypertRemoteService {
     return result
   }
 
+  async indicatorTemplates(request) {
+    const action = request?.action ?? 'list'
+    if (action === 'list') return { templates: this.store.indicatorTemplates() }
+    if (action === 'remove') { this.store.removeIndicatorTemplate(String(request?.id ?? '')); return { templates: this.store.indicatorTemplates() } }
+    if (action !== 'save') throw Error('指标模板操作无效')
+    const name = String(request?.name ?? '').trim()
+    if (!name || name.length > 60) throw Error('模板名称需要 1–60 个字符')
+    const indicators = request?.indicators
+    if (!Array.isArray(indicators) || indicators.length > INDICATOR_IDS.length || indicators.some((id) => !INDICATOR_IDS.includes(id))) throw Error('模板指标无效')
+    const id = request?.id
+    if (id != null && !this.store.indicatorTemplates().some((row) => row.id === id)) throw Error('指标模板不存在')
+    const template = this.store.saveIndicatorTemplate({ id, name, indicators: [...new Set(indicators)], indicatorSettings: normalizeIndicatorSettings(request?.indicatorSettings), maLines: normalizeMaLines(request?.maLines ?? []) })
+    return { template, templates: this.store.indicatorTemplates() }
+  }
+
+  async updatePaperCosts(request) {
+    if (this.activeTradeOps > 0) throw Error('交易操作仍在进行，请稍后修改模拟成本')
+    return { paperCosts: this.store.setPaperCosts(request?.costs) }
+  }
+
   async drawChartMark(request) {
     const sessionId = String(request?.sessionId ?? '')
-    return this.addChartMark(request, sessionId, 'user')
+    // Undo re-creates a deleted agent drawing; keep its origin so the chart still labels it as the agent's.
+    return this.addChartMark(request, sessionId, request?.restoreSource === 'agent' ? 'agent' : 'user')
   }
 
   async eraseChartMark(request) {
@@ -616,6 +730,31 @@ export class HyperRemote extends TypertRemoteService {
     return { mode }
   }
 
+  /** Persist limits as one atomic override and update both live/paper guards. */
+  async updateRiskSettings(request) {
+    if (this.activeTradeOps > 0) throw new Error('交易操作仍在进行，暂不能修改限额')
+    const limits = normalizeRiskSettings(request?.limits)
+    this.store.saveRiskSettings(limits)
+    this.applyRiskSettings(limits, true)
+    return { riskLimits: { ...limits, usedTodayUsd: this.usedTodayUsd() } }
+  }
+
+  async resetRiskSettings(request) {
+    if (this.activeTradeOps > 0) throw new Error('交易操作仍在进行，暂不能修改限额')
+    this.store.clearRiskSettings()
+    this.applyRiskSettings(this.baseRiskSettings, false)
+    return { riskLimits: { ...this.baseRiskSettings, usedTodayUsd: this.usedTodayUsd() } }
+  }
+
+  applyRiskSettings(limits, override) {
+    Object.assign(this.cfg, limits)
+    Object.assign(this.guard.limits, limits)
+    Object.assign(this.paperGuard.limits, limits)
+    this.guard.plans.clear()
+    this.riskSettingsOverride = override
+    this.store.recordEvent('risk.changed')
+  }
+
   /** Today's (UTC) notional already counted against maxDailyUsd for the active mode. */
   usedTodayUsd() {
     const guard = this.cfg.tradingMode === 'paper' ? this.paperGuard : this.guard
@@ -628,10 +767,12 @@ export class HyperRemote extends TypertRemoteService {
     const address = await this.resolveAddress()
     const wallet = this.cfg.signer === 'web3' ? this.walletService() : null
     return {
+      paperCosts: this.store.paperCosts?.() ?? { feeBps: 4.5, slippageBps: 5 },
       network: this.cfg.network,
       tradingMode: this.cfg.tradingMode,
       signer: this.cfg.signer,
       autonomousLive: this.cfg.autonomousLive,
+      riskSettingsSource: this.riskSettingsOverride ? 'desk' : 'plugin',
       riskLimits: { allowedCoins: this.cfg.allowedCoins, maxOrderUsd: this.cfg.maxOrderUsd, maxDailyUsd: this.cfg.maxDailyUsd, maxPositionUsd: this.cfg.maxPositionUsd, maxLeverage: this.cfg.maxLeverage,
         // Day budget of the ledger that applies to the current mode (paper and live are separate).
         usedTodayUsd: this.usedTodayUsd() },
@@ -737,7 +878,7 @@ export class HyperRemote extends TypertRemoteService {
         marginUsed: risk.marksConfirmed ? risk.marginUsed : null,
         availableMargin: risk.marksConfirmed ? Math.max(0, risk.equity - risk.marginUsed) : null,
         marksConfirmed: risk.marksConfirmed, positions: risk.positions, fills: paper.fills.slice(0, 50),
-        simulation: '固定滑点；未模拟盘口深度、手续费、资金费或强平' }
+        simulation: '已模拟配置的滑点与手续费；未模拟盘口深度、资金费或强平' }
     }
     const address = await this.resolveAddress()
     if (!address) throw new Error('live 模式需要钱包（config.privateKey 或 signer=web3）')
@@ -830,34 +971,58 @@ export class HyperRemote extends TypertRemoteService {
   }
 
   /** Explicitly loaded history: these weighted API calls must not join the 3s account poll. */
-  async tradeHistory() {
-    if (this.cfg.tradingMode === 'paper') {
+  async tradeHistory(request) {
+    const client = this.client, mode = this.cfg.tradingMode, network = this.cfg.network
+    if (request?.days != null && ![7, 30, 90].includes(request.days)) throw Error('复盘支持最近 7/30/90 天')
+    const end = Date.now(), requestedStart = request?.days != null ? end - request.days * 86_400_000 : request?.startTime == null ? null : Number(request.startTime)
+    if (requestedStart != null && (!Number.isFinite(requestedStart) || requestedStart < end - 90 * 86_400_000 || requestedStart >= end)) throw Error('复盘时间范围必须在最近 90 天内')
+    const start = requestedStart ?? Math.max(0, end - 30 * 86_400_000)
+    let result
+    if (mode === 'paper') {
       const paper = this.store.paperAccount()
-      return { mode: 'paper', orders: paper.orders.slice(0, 200), fills: paper.fills.slice(0, 200) }
+      result = { mode: 'paper', orders: paper.orders.slice(0, 5000), fills: paper.fills.slice(0, 5000), paperCosts: this.store.paperCosts(), funding: [],
+        coverage: { fundingStatus: 'not-simulated', fillsLimited: paper.fills.length >= 200, ordersLimited: paper.orders.length >= 200 } }
+    } else {
+      const address = await this.resolveAddress()
+      if (!address) throw Error('未配置交易主账户地址')
+      const [orders, fills] = await Promise.all([client.historicalOrders(address), client.userFills(address)])
+      if (!Array.isArray(orders) || !Array.isArray(fills)) throw Error('交易所历史数据响应无效')
+      const decisions = this.store.liveDecisions ?? {}
+      const rows = orders.slice(0, 2000).map((entry) => {
+        const order = entry.order ?? entry, local = this.store.liveOrders?.[order.cloid], decision = decisions[local?.decisionId]
+        return { ...order, status: entry.status ?? local?.status ?? 'unknown', statusTimestamp: entry.statusTimestamp,
+          referencePx: decision?.preview?.mid ?? null,
+          reason: local?.thesis ?? decision?.thesis ?? null, sessionId: local?.sessionId ?? decision?.sessionId ?? null }
+      })
+      result = { mode: 'live', orders: rows, fills: fills.slice(0, 2000), funding: [],
+        coverage: { fundingStatus: 'not-requested', fillsLimited: fills.length >= 2000, ordersLimited: orders.length >= 2000 },
+        localOrders: Object.entries(this.store.liveOrders ?? {}).map(([cloid, row]) => ({ cloid, coin: row.coin, status: row.status, at: row.updatedAt ?? row.at, sessionId: row.sessionId })) }
+      if (request?.includeFunding) {
+        try {
+          const funding = await fundingWindow(client, address, start, end)
+          result.funding = funding.rows
+          result.coverage.fundingStatus = funding.status
+        } catch (error) { result.coverage.fundingStatus = 'error'; result.coverage.fundingError = String(error?.message ?? error) }
+      }
     }
-    const address = await this.resolveAddress()
-    if (!address) throw new Error('未配置交易主账户地址')
-    const [orders, fills] = await Promise.all([
-      this.client.historicalOrders(address), this.client.userFills(address),
-    ])
-    if (!Array.isArray(orders) || !Array.isArray(fills)) throw new Error('交易所历史数据响应无效')
-    const localByCloid = this.store.liveOrders
-    const decisions = this.store.liveDecisions
-    return { mode: 'live', orders: orders.slice(0, 2000).map((entry) => {
-      const order = entry.order ?? entry
-      const local = localByCloid[order.cloid]
-      return { ...order, status: entry.status ?? local?.status ?? 'unknown', statusTimestamp: entry.statusTimestamp,
-        reason: local?.thesis ?? (local?.decisionId ? decisions[local.decisionId]?.thesis ?? null : null) }
-    }), fills: fills.slice(0, 2000) }
+    if (requestedStart != null) {
+      result.fills = result.fills.filter((row) => Number(row.time) >= start && Number(row.time) <= end)
+      const ids = new Set(result.fills.filter((row) => row.oid != null).map((row) => `${row.coin}:${row.oid}`))
+      result.orders = result.orders.filter((row) => Number(row.timestamp ?? row.time) >= start || ids.has(`${row.coin}:${row.oid}`))
+    }
+    return { ...result, network, observedAt: Date.now(), coverage: { ...result.coverage, startTime: start, endTime: end, bounded: true } }
   }
 
   /** Hyperliquid portfolio samples are display data, not an accounting ledger. */
-  async portfolio() {
+  async portfolio(request) {
     if (this.cfg.tradingMode === 'paper') {
       const account = await this.account({})
       const fills = this.store.paperAccount().fills
       return { mode: 'paper', equity: account.equity, unrealizedPnl: account.uPnl,
-        realizedPnl: fills.reduce((sum, fill) => sum + Number(fill.realized ?? 0), 0), series: {} }
+        realizedPnl: fills.reduce((sum, fill) => sum + Number(fill.realized ?? 0), 0),
+        fees: fills.reduce((sum, fill) => sum + Number(fill.fee ?? 0), 0),
+        netRealizedPnl: fills.some((fill) => fill.fee == null) ? null : fills.reduce((sum, fill) => sum + Number(fill.realized ?? 0) - Number(fill.fee), 0),
+        retainedFills: fills.length, series: {} }
     }
     const address = await this.resolveAddress()
     if (!address) throw new Error('未配置交易主账户地址')
@@ -1011,9 +1176,11 @@ export class HyperRemote extends TypertRemoteService {
     if (!sessionId || !this.store.getSession(sessionId)) throw new Error('交易操作必须来自已登记的交易会话')
   }
 
-  async authorizeToolAction(reason, exec) {
+  async authorizeToolAction(reason, exec, english = reason) {
     if (!exec?.agent) throw new Error('live 签名仅允许从 DSH agent 工具调用')
-    const outcome = await this.approvalGateway().request({ toolName: 'dsh-hyperliquid', callId: exec.callId, agent: exec.agent, signal: exec.signal, reason })
+    // reason stays the audit text; displayReason only localizes the approval panel.
+    const outcome = await this.approvalGateway().request({ toolName: 'dsh-hyperliquid', callId: exec.callId, agent: exec.agent, signal: exec.signal, reason,
+      displayReason: { en: english, zh: reason } })
     if (outcome !== 'allowed-once') throw new Error(`用户未批准 live 操作（${outcome}）`)
   }
 
@@ -1044,29 +1211,32 @@ export class HyperRemote extends TypertRemoteService {
         if (!Number.isFinite(limit) || limit <= 0) throw new Error('限价单需要有效 px')
         if ((isBuy && limit < mid) || (!isBuy && limit > mid)) throw new Error('paper 当前只支持可立即成交的限价单')
       }
-      const slip = Number(request?.slippagePct)
-      const pct = Number.isFinite(slip) ? Math.min(Math.max(slip, 0), 10) / 100 : 0.0005
+      const costs = this.store.paperCosts()
+      const slip = request?.slippagePct == null ? null : Number(request.slippagePct)
+      const pct = slip != null && Number.isFinite(slip) ? Math.min(Math.max(slip, 0), 10) / 100 : costs.slippageBps / 10_000
       const px = mid * (isBuy ? 1 + pct : 1 - pct)
       if (request?.type === 'limit' && (isBuy ? px > Number(request.px) : px < Number(request.px))) throw new Error('paper 模拟滑点后无法满足限价')
       const paper = this.store.paperAccount()
-      const risk = paperRiskState(paper, { ...await safeMids(this), [coin]: px }, true)
+      const risk = paperRiskState(paper, { ...await safeMids(this), [coin]: mid }, true)
       const positionSize = Number(paper.positions[coin]?.size ?? 0)
       const leverage = Number(paper.positions[coin]?.leverage ?? paper.leverageByCoin?.[coin] ?? 1)
       const otherExposureUsd = risk.positions.reduce((sum, p) => sum + (p.coin === coin ? 0 : Math.abs(p.size) * p.markPx), 0)
       const guard = this.paperGuard ??= new TradingGuard(this.cfg.dataDir, { ...this.cfg, dataDir: this.cfg.dataDir }, { budgetName: this.cfg.network === 'mainnet' ? 'paper-budget-mainnet.json' : 'paper-budget.json' })
       const checked = guard.validate({ coin, isBuy, sz, price: px, positionSize, otherExposureUsd, accountValue: risk.equity, leverage, reduceOnly })
-      const currentMargin = Math.abs(positionSize) * px / leverage
-      const projectedMargin = risk.marginUsed - currentMargin + Math.abs(checked.nextSize) * px / leverage
-      if (!checked.riskReducing && projectedMargin > risk.equity + 1e-8) throw new Error('模拟账户可用保证金不足')
+      const currentMargin = Math.abs(positionSize) * mid / leverage
+      const projectedMargin = risk.marginUsed - currentMargin + Math.abs(checked.nextSize) * mid / leverage
+      const projectedEquity = risk.equity - checked.notionalUsd * costs.feeBps / 10_000 - sz * (isBuy ? px - mid : mid - px)
+      if (!checked.riskReducing && projectedMargin > projectedEquity + 1e-8) throw new Error('模拟账户可用保证金不足')
       const budgetTicket = guard.reserve(checked.notionalUsd, { riskReducing: checked.riskReducing })
       let fill
-      try { fill = this.store.paperFill({ coin, isBuy, sz, px, reason: request?.reason ?? 'chat' }) }
+      const sessionId = request?.[TOOL_CALL]?.sessionId ?? null
+      try { fill = this.store.paperFill({ coin, isBuy, sz, px, reason: request?.reason ?? 'chat', sessionId, feeBps: costs.feeBps, referencePx: mid, slippageBps: pct * 10_000 }) }
       catch (err) { guard.release(budgetTicket); throw err }
-      this.store.paperOrderRecord({ coin, isBuy, sz, px: request?.type === 'limit' ? Number(request.px) : px,
+      this.store.paperOrderRecord({ oid: fill.oid, referencePx: mid, coin, isBuy, sz, px: request?.type === 'limit' ? Number(request.px) : px,
         filledPx: px, type: request?.type === 'limit' ? 'limit' : 'market', reduceOnly,
-        reason: request?.reason ?? '' })
-      return { mode: 'paper', fill, marginUsed: projectedMargin, availableMargin: Math.max(0, risk.equity - projectedMargin),
-        simulation: '固定滑点；未模拟盘口深度、手续费、资金费或强平' }
+        reason: request?.reason ?? '', sessionId })
+      return { mode: 'paper', fill, marginUsed: projectedMargin, availableMargin: Math.max(0, projectedEquity - projectedMargin),
+        simulation: '已模拟配置的滑点与手续费；未模拟盘口深度、资金费或强平' }
     }
     // live
     const trusted = request?.[TOOL_CALL]
@@ -1077,7 +1247,8 @@ export class HyperRemote extends TypertRemoteService {
     const fresh = await this.checkLiveOrder(orderSpec)
     if (Math.abs(fresh.mid / preview.mid - 1) > 0.01) throw new Error('价格已偏离预检超过 1%，请重新决策')
     if (!this.cfg.autonomousLive) {
-      await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} ${coin} ${isBuy ? '买入' : '卖出'} ${sz}，预估名义价值 ${fresh.notionalUsd.toFixed(2)} USD。是否允许本次交易？`, trusted.exec)
+      await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} ${coin} ${isBuy ? '买入' : '卖出'} ${sz}，预估名义价值 ${fresh.notionalUsd.toFixed(2)} USD。是否允许本次交易？`, trusted.exec,
+        `Hyperliquid ${this.cfg.network}: ${isBuy ? 'buy' : 'sell'} ${sz} ${coin}, estimated notional ${fresh.notionalUsd.toFixed(2)} USD. Allow this trade?`)
     }
     const { universe } = await this.markets()
     const idx = universe.findIndex((u) => u.name === coin)
@@ -1156,7 +1327,7 @@ export class HyperRemote extends TypertRemoteService {
     if (this.cfg.tradingMode === 'paper') throw new Error('paper 模式没有挂单')
     const exec = request?.[TOOL_CALL]?.exec
     if (!exec?.agent) throw new Error('live 撤单仅允许从 DSH agent 工具调用')
-    if (!this.cfg.autonomousLive || !this.cfg.allowedCoins.includes(coin)) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 撤销 ${coin} 订单 oid=${oid}？`, exec)
+    if (!this.cfg.autonomousLive || !this.cfg.allowedCoins.includes(coin)) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 撤销 ${coin} 订单 oid=${oid}？`, exec, `Hyperliquid ${this.cfg.network}: cancel ${coin} order oid=${oid}?`)
     const { universe } = await this.markets()
     const idx = universe.findIndex((u) => u.name === coin)
     if (idx < 0) throw new Error(`未知合约 ${coin}`)
@@ -1194,7 +1365,7 @@ export class HyperRemote extends TypertRemoteService {
     if (!this.cfg.allowedCoins.includes(coin)) throw new Error(`交易限额：${coin} 不在允许交易币对内（allowedCoins）`)
     const exec = request?.[TOOL_CALL]?.exec
     if (!exec?.agent) throw new Error('live 杠杆变更仅允许从 DSH agent 工具调用')
-    if (!this.cfg.autonomousLive) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 将 ${coin} 杠杆设为 ${leverage}x？`, exec)
+    if (!this.cfg.autonomousLive) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 将 ${coin} 杠杆设为 ${leverage}x？`, exec, `Hyperliquid ${this.cfg.network}: set ${coin} leverage to ${leverage}x?`)
     const res = await this.submitAction({ type: 'updateLeverage', asset: idx, isCross, leverage }, exec)
     assertExchangeAccepted(res)
     this.store.recordEvent('live.leverage', { coin, leverage, isCross })
@@ -1218,6 +1389,7 @@ export class HyperRemote extends TypertRemoteService {
   /** Stop the WS loop on teardown. */
   stopWs() {
     clearInterval(this.sweepTimer)
+    clearInterval(this.alertTimer)
     this.client.close()
   }
 }
@@ -1385,7 +1557,7 @@ function paperRiskState(paper, mids, strict = false) {
 
 // Remote markers: every method the web client may call.
 for (const m of [
-  'status', 'switchNetwork', 'switchTradingMode', 'markets', 'marketCatalog', 'marketDetail', 'chartMarks', 'drawChartMark', 'eraseChartMark', 'sessionWorkspace', 'updateSessionWorkspace', 'snapshot', 'candles', 'fundingHistory', 'account', 'fills', 'tradeHistory', 'portfolio',
+  'indicatorTemplates', 'updatePaperCosts', 'status', 'switchNetwork', 'switchTradingMode', 'updateRiskSettings', 'resetRiskSettings', 'markets', 'marketCatalog', 'marketDetail', 'chartMarks', 'drawChartMark', 'updateChartMark', 'eraseChartMark', 'sessionWorkspace', 'updateSessionWorkspace', 'snapshot', 'candles', 'fundingHistory', 'account', 'fills', 'tradeHistory', 'portfolio',
   'sessions', 'registerSession', 'removeSession', 'bindCoin', 'deskState',
   'eventsSince',
 ]) {

package/lib/review.d.ts

@@ -0,0 +1,3 @@
+export interface ReviewRecord { id: string; coin: string; oid: string | number | null; time: number | null; px: number | null; size: number | null; isBuy: boolean | null; gross: number | null; fee: number | null; feeToken: string; net: number | null; reference: number | null; slippageBps: number | null; closedSize: number | null; reason: string; sessionId: string | null; flags: string[]; source: string }
+export declare function fundingWindow(client: any, address: string, startTime: number, endTime: number): Promise<{rows: any[]; status: string; pages: number}>
+export declare function reviewLedger(payload: any, coin?: string): { records: ReviewRecord[]; orders: any[]; duplicates: number; fees: Record<string, number>; gross: number | null; tradingNet: number | null; funding: number | null; net: number | null; closeCount: number; missingReasons: number; unmatched: number; gaps: number; unsupported: number }

package/lib/review.js

@@ -0,0 +1,79 @@
+/** Evidence over a bounded history window; missing fields remain unknown. No balance inference. */
+const numeric = (value) => value == null || value === '' || !Number.isFinite(Number(value)) ? null : Number(value)
+const key = (row) => row?.oid == null || !row.coin ? null : `${row.coin}:${String(row.oid)}`
+const core = (coin) => typeof coin === 'string' && coin.trim().length > 0 && !coin.startsWith('#') && !coin.includes(':') && !coin.startsWith('@') && !coin.includes('/')
+export async function fundingWindow(client, address, startTime, endTime) {
+  const rows = [], seen = new Set(); let cursor = startTime, partial = false
+  for (let page = 0; page < 12; page++) {
+    const result = await client.info('userFunding', { user: address, startTime: cursor, endTime })
+    if (!Array.isArray(result)) throw Error('资金费历史响应无效')
+    const valid = result.filter((row) => Number.isFinite(Number(row.time)) && Number(row.time) >= cursor && Number(row.time) <= endTime && row.delta?.type === 'funding')
+    if (valid.length !== result.length) partial = true
+    for (const row of valid) {
+      const id = `${row.time}:${row.hash ?? ''}:${row.delta.coin}:${row.delta.usdc}`
+      if (!seen.has(id)) { seen.add(id); rows.push(row) }
+    }
+    if (result.length < 500) return { rows, status: partial ? 'partial' : 'complete', pages: page + 1 }
+    const last = Math.max(...valid.map((row) => Number(row.time)))
+    if (!Number.isFinite(last) || last <= cursor) return { rows, status: 'partial', pages: page + 1 }
+    // Inclusive boundary: repeat the final timestamp and deduplicate, avoiding lost peers.
+    cursor = last
+  }
+  return { rows, status: 'partial', pages: 12 }
+}
+export function reviewLedger(payload, coin = '') {
+  const orders = (payload.orders ?? []).filter((row) => !coin || row.coin === coin)
+  const allFills = (payload.fills ?? []).filter((row) => !coin || row.coin === coin)
+  const byOrder = new Map(orders.filter((row) => key(row)).map((row) => [key(row), row]))
+  const seen = new Set(), records = []; let duplicates = 0
+  for (const [index, fill] of allFills.entries()) {
+    const id = fill.tid != null ? `${fill.coin}:${fill.tid}` : payload.mode === 'paper' && fill.oid ? `${fill.coin}:${fill.oid}` : `unidentified:${index}`
+    if (seen.has(id)) { duplicates++; continue } seen.add(id)
+    const order = byOrder.get(key(fill)), pnl = numeric(fill.closedPnl ?? fill.realized), fee = numeric(fill.fee)
+    const feeToken = String(fill.feeToken ?? '').trim()
+    const px = numeric(fill.px), size = numeric(fill.sz), buy = typeof fill.isBuy === 'boolean' ? fill.isBuy : fill.side === 'B' ? true : fill.side === 'A' ? false : null
+    const reference = numeric(fill.referencePx ?? order?.referencePx)
+    const reason = fill.reason || order?.reason || ''
+    const closed = numeric(fill.closedSize) ?? (buy != null && numeric(fill.startPosition) != null && Math.sign(Number(fill.startPosition)) !== (buy ? 1 : -1) ? Math.min(Math.abs(Number(fill.startPosition)), size ?? 0) : /^Close/.test(fill.dir ?? '') ? size : null)
+    const eligible = core(fill.coin) && feeToken === 'USDC'
+    const net = eligible && pnl != null && fee != null ? pnl - fee : null
+    const flags = []
+    if (!order) flags.push('unmatched-order')
+    if (px == null || px <= 0) flags.push('missing-price')
+    if (size == null || size <= 0) flags.push('missing-size')
+    if (numeric(fill.time) == null) flags.push('missing-time')
+    if (buy == null) flags.push('missing-side')
+    if (!reason || /^(session:|tool$|chat$|order$)/.test(reason)) flags.push('missing-reason')
+    if (fee == null || !feeToken) flags.push('missing-fee')
+    if (pnl == null) flags.push('missing-pnl')
+    if (fill.tid == null && payload.mode !== 'paper') flags.push('missing-trade-id')
+    records.push({ id, coin: fill.coin, oid: fill.oid ?? null, time: numeric(fill.time), px, size, isBuy: buy, gross: pnl, fee, feeToken, net,
+      reference, slippageBps: reference && reference > 0 && px && buy != null ? (buy ? px - reference : reference - px) / reference * 10_000 : null,
+      closedSize: closed, reason: flags.includes('missing-reason') ? '' : reason, sessionId: fill.sessionId ?? order?.sessionId ?? null, flags, source: payload.mode })
+  }
+  const reconciled = orders.map((order) => {
+    const fills = records.filter((row) => key(row) && key(row) === key(order))
+    const filled = fills.reduce((sum, row) => sum + (row.size ?? 0), 0)
+    const expected = numeric(order.origSz ?? order.sz), tolerance = Math.max(1e-8, (expected ?? 0) * 1e-6)
+    const status = fills.some((row) => row.flags.includes('missing-size')) ? 'missing-size' : /filled/i.test(order.status ?? '') && expected != null && Math.abs(filled - expected) > tolerance ? 'size-gap'
+      : expected != null && filled > expected + tolerance ? 'excess-fill' : fills.length ? 'matched' : 'no-fill-in-window'
+    return { coin: order.coin, oid: order.oid ?? null, status, filled, expected, exchangeStatus: order.status ?? 'unknown', reason: order.reason ?? '' }
+  })
+  const supported = records.filter((row) => core(row.coin))
+  const fees = {}; for (const row of records) if (row.fee != null && row.feeToken) fees[row.feeToken] = (fees[row.feeToken] ?? 0) + row.fee
+  const supportedScope = !coin || core(coin)
+  const gross = supportedScope ? supported.reduce((sum, row) => sum + (row.gross ?? 0), 0) : null
+  const tradingNet = !supportedScope || supported.some((row) => row.net == null) ? null : supported.reduce((sum, row) => sum + row.net, 0)
+  const fundingRows = (payload.funding ?? []).filter((row) => core(row.delta?.coin) && (!coin || row.delta.coin === coin))
+  const funding = supportedScope && payload.coverage?.fundingStatus === 'complete' && fundingRows.every((row) => numeric(row.delta.usdc) != null)
+    ? fundingRows.reduce((sum, row) => sum + Number(row.delta.usdc), 0) : null
+  const closes = supported.filter((row) => row.closedSize > 0)
+  return { records, orders: reconciled, duplicates, fees, gross, tradingNet, funding,
+    net: tradingNet != null && funding != null ? tradingNet + funding : null,
+    closeCount: closes.length,
+    missingReasons: records.filter((row) => row.flags.includes('missing-reason')).length,
+    unmatched: records.filter((row) => row.flags.includes('unmatched-order')).length,
+    gaps: reconciled.filter((row) => ['size-gap', 'excess-fill'].includes(row.status)).length,
+    unsupported: records.length - supported.length,
+  }
+}

package/lib/risk-settings.js

@@ -0,0 +1,20 @@
+/** Validate the user-editable trading limits before they reach either guard. */
+export function normalizeRiskSettings(input) {
+  if (!input || typeof input !== 'object' || Array.isArray(input)) throw new Error('交易设置无效')
+  const allowed = ['allowedCoins', 'maxOrderUsd', 'maxDailyUsd', 'maxPositionUsd', 'maxLeverage']
+  if (Object.keys(input).some((key) => !allowed.includes(key)) || allowed.some((key) => !(key in input))) throw new Error('交易设置字段无效')
+  const coins = typeof input.allowedCoins === 'string' ? input.allowedCoins.split(',') : input.allowedCoins
+  if (!Array.isArray(coins)) throw new Error('允许交易的币对无效')
+  const allowedCoins = [...new Set(coins.map((coin) => String(coin).trim()).filter(Boolean))]
+  if (!allowedCoins.length || allowedCoins.length > 100 || allowedCoins.some((coin) => coin.length > 32 || !/^[A-Za-z0-9:_-]+$/.test(coin))) {
+    throw new Error('允许交易的币对无效')
+  }
+  const values = {}
+  for (const key of allowed.slice(1)) {
+    const value = Number(input[key])
+    if (!Number.isFinite(value) || value <= 0 || value > 1_000_000_000) throw new Error(`${key} 必须为正数`)
+    values[key] = value
+  }
+  if (!Number.isInteger(values.maxLeverage) || values.maxLeverage > 50) throw new Error('maxLeverage 必须为 1–50 的整数')
+  return { allowedCoins, ...values }
+}