dsh-hyperliquid 0.5.7 → 0.5.8

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.8 — 2026-10-17
+
+- 账户互转补全：现货、主永续、各 HIP-3 交易所之间任意两两划转。现货 ↔ HIP-3、HIP-3 ↔ HIP-3 自动经主永续分两步签名提交，半托管只批准一次；第二步前重新确认主永续可划余额；第二步被拒、被取消或余额不足时报错说明资金在主永续；第二步已提交但未收到确认时报「结果未知，先对账，不要直接重试」，防止重复划转。两端都校验 USDC 保证金，非 USDC 交易所在签名前拒绝。
+- 修复（0.5.7 重写时引入）：钱包签名期间被取消后，签名不再提交到交易所。
+
 ## 0.5.7 — 2026-10-17
 
 - `hyper_account action=transfer` 支持现货 ↔ 永续：`from` / `to` 取 `spot`、`perp` 或 HIP-3 交易所名。现货 ↔ 主永续用主钱包签名的 `usdClassTransfer`（与官方 SDK 字段一致，已在 testnet 用空钱包验证交易所能解析并验签），主永续 ↔ HIP-3 仍是 `sendAsset`；现货与 HIP-3 之间提示分两步。转出前核对可划余额（现货 = 总额 − 冻结，永续 = withdrawable）；统一账户 / 组合保证金模式下拒绝并说明无需划转。旧参数 `dex` + `direction` 不变。

package/README.md

@@ -114,7 +114,7 @@ dsh plugin --profile web add dsh-web3
 | `hyper_decide` | 实盘预检：提交交易意图与依据，返回 30 秒内有效的一次性 `decisionId` |
 | `hyper_order` | place / cancel / leverage；实盘下单必须带匹配的 `decisionId`，可附带止盈止损（目前仅测试网） |
 | `hyper_session` | status / bind，同步用户当前查看的币对 |
-| `hyper_account` 托管动作 | `action=limits`（全托管时 agent 可调整允许币对与各项上限）、`action=transfer`（`from` / `to` 取 spot、perp 或 HIP-3 交易所名，在现货 ↔ 主永续（usdClassTransfer）与主永续 ↔ HIP-3（sendAsset）之间划转 USDC：半托管每次需批准，全托管直接执行；主钱包签名；统一账户无需现货 ↔ 永续划转） |
+| `hyper_account` 托管动作 | `action=limits`（全托管时 agent 可调整允许币对与各项上限）、`action=transfer`（`from` / `to` 取 spot、perp 或 HIP-3 交易所名，自己的任意两个账户之间划转 USDC：现货 ↔ 主永续（usdClassTransfer）、主永续 ↔ HIP-3（sendAsset）一步完成，现货 ↔ HIP-3 与 HIP-3 ↔ HIP-3 自动经主永续两步、只批准一次；半托管每次需批准，全托管直接执行；主钱包签名；统一账户无需现货 ↔ 永续划转） |
 | 交易体检与市场雷达 | `hyper_account action=analyze`：按完整往返统计近 7/30/90 天的胜率、盈亏比、期望、持仓时长、按币种/时段/星期的表现、手续费与资金费，并按金额列出习惯问题和建议规则（样本少于 10 笔往返时不下结论）；`hyper_market action=scan`：扫描流动性最好的约 20 个可交易永续，给出贴近/突破区间、资金费极值、24h 涨跌和溢价的前几名 |
 | `hyper_journal` | 交易员日志（跨会话保留）：交易员档案（风险偏好、持仓周期、打扰偏好等）、策略库（版本与每次修订原因，按 paper / live 分开统计笔数、胜率、期望 R）、交易计划 / 结果 / 复盘 / 教训记录；摘要自动带入每个会话的系统提示 |
 

package/lib/remote.js

@@ -901,9 +901,10 @@ export class HyperRemote extends TypertRemoteService {
   }
 
   /**
-   * Move USDC between the spot balance ('spot'), the core perp account ('perp') and a HIP-3 dex (e.g. 'xyz').
-   * spot ↔ perp is a user-signed `usdClassTransfer`; perp ↔ HIP-3 a user-signed `sendAsset`; both need the
-   * main wallet. 半托管 asks the trader every time; 全托管 goes straight to the wallet.
+   * Move USDC between any two of the trader's own accounts: the spot balance ('spot'), the core perp
+   * account ('perp') and each HIP-3 dex (e.g. 'xyz'). spot ↔ perp is a `usdClassTransfer`, perp ↔ HIP-3 a
+   * `sendAsset`; spot ↔ HIP-3 and HIP-3 ↔ HIP-3 go through perp in two signed legs under one approval.
+   * All legs need the main wallet. 半托管 asks the trader once per transfer; 全托管 goes straight through.
    * Accepts { from, to, amount } or the original { dex, direction: 'in' | 'out', amount }.
    */
   async transferCollateral(request, exec) {
@@ -921,22 +922,20 @@ export class HyperRemote extends TypertRemoteService {
     }
     if (from === to) throw new Error('from 和 to 不能相同')
     if ([from, to].some((name) => name.includes(':'))) throw new Error('交易所名不含冒号，如 xyz')
-    // Every transfer has the core perp account on one side: spot ↔ perp or perp ↔ one HIP-3 dex.
-    if (from !== 'perp' && to !== 'perp') {
-      throw new Error(from === 'spot' || to === 'spot'
-        ? '现货与 HIP-3 交易所之间请分两步：先在 spot 与 perp 之间划转，再在 perp 与该交易所之间划转'
-        : 'HIP-3 交易所之间请分两步：先转回 perp，再从 perp 转入目标交易所')
-    }
-    const dex = [from, to].find((name) => name !== 'spot' && name !== 'perp') ?? null
     const amount = Number(request?.amount)
     if (!Number.isFinite(amount) || amount <= 0) throw new Error('amount 必须为正数（USDC）')
     if (Number(amount.toFixed(6)) !== amount) throw new Error('USDC 划转金额最多 6 位小数')
     if (amount > this.cfg.maxPositionUsd) throw new Error(`单次划转不超过仓位上限 ${this.cfg.maxPositionUsd} USD`)
-    if (dex) {
-      const dexs = await this.perpDexList()
-      if (!dexs.some((row) => row?.name === dex)) throw new Error(`未知的 HIP-3 交易所 ${dex}`)
-      const meta = await this.client.info('meta', { dex })
-      if (meta?.collateralToken !== 0) throw new Error(`${dex} 不使用 USDC 保证金，暂不支持划转`)
+    // Every leg has the core perp account on one side; a route without it goes through perp.
+    const legs = from === 'perp' || to === 'perp' ? [[from, to]] : [[from, 'perp'], ['perp', to]]
+    const dexes = [...new Set([from, to].filter((name) => name !== 'spot' && name !== 'perp'))]
+    if (dexes.length) {
+      const known = await this.perpDexList()
+      for (const dex of dexes) {
+        if (!known.some((row) => row?.name === dex)) throw new Error(`未知的 HIP-3 交易所 ${dex}`)
+        const meta = await this.client.info('meta', { dex })
+        if (meta?.collateralToken !== 0) throw new Error(`${dex} 不使用 USDC 保证金，暂不支持划转`)
+      }
     }
     const address = await this.resolveAddress()
     if (!address) throw new Error('live 划转需要钱包地址')
@@ -944,46 +943,78 @@ export class HyperRemote extends TypertRemoteService {
     if (signerAddress.toLowerCase() !== address.toLowerCase()) throw new Error('资金划转需要交易主钱包签名；当前签名钱包与 tradingAddress 不一致，API wallet 不能用于划转')
     const label = (name) => name === 'spot' ? '现货账户' : name === 'perp' ? '主永续账户' : name
     const labelEn = (name) => name === 'spot' ? 'spot' : name === 'perp' ? 'core perps' : name
-    // What can leave the source account now.
+    // Unified / portfolio-margin accounts already share spot and perp USDC: no spot ↔ perp leg. The mode
+    // must be known before signing: a failed lookup stops the transfer.
+    if (from === 'spot' || to === 'spot') {
+      const mode = await this.accountMode(address, true)
+      if (mode === 'unifiedAccount' || mode === 'portfolioMargin') throw new Error(`账户模式为 ${mode}，现货 USDC 已直接作为保证金，现货与永续之间无需划转`)
+    }
+    // What can leave the source account now (the later leg spends what the first one brought into perp).
     let available
     if (from === 'spot') {
-      // Unified / portfolio-margin accounts already use spot USDC as margin: there is nothing to move.
-      // The mode must be known before signing: a failed lookup stops the transfer.
-      const mode = await this.accountMode(address, true)
-      if (mode === 'unifiedAccount' || mode === 'portfolioMargin') throw new Error(`账户模式为 ${mode}，现货 USDC 已直接作为保证金，无需划转`)
       const spot = await this.client.spotClearinghouseState(address)
       const usdc = (spot?.balances ?? []).find((row) => row.coin === 'USDC')
       available = Number(usdc?.total ?? 0) - Number(usdc?.hold ?? 0)
     } else {
-      if (to === 'spot') {
-        const mode = await this.accountMode(address, true)
-        if (mode === 'unifiedAccount' || mode === 'portfolioMargin') throw new Error(`账户模式为 ${mode}，现货与永续共用余额，无需划转`)
-      }
       const state = from === 'perp' ? await this.client.clearinghouseState(address) : await this.client.info('clearinghouseState', { user: address, dex: from })
       available = Number(state?.withdrawable)
     }
     if (!Number.isFinite(available)) throw new Error('无法确认可划转余额')
     if (amount > available + 1e-9) throw new Error(`${label(from)}可划转 ${Math.max(0, available).toFixed(2)} USDC，不足 ${amount}`)
-    const what = `${amount} USDC：${label(from)} → ${label(to)}`
-    if (!this.isManaged()) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 划转 ${what}？`, exec, `Hyperliquid ${this.cfg.network}: transfer ${amount} USDC ${labelEn(from)} → ${labelEn(to)}?`)
-    if (transferEpoch !== this.walletEpoch) throw new Error('钱包已切换，划转已取消')
-    const nonce = this.client.nextNonce()
+    const route = legs.length > 1 ? `${label(from)} → 主永续账户 → ${label(to)}（两步）` : `${label(from)} → ${label(to)}`
+    const what = `${amount} USDC：${route}`
+    if (!this.isManaged()) await this.authorizeToolAction(`Hyperliquid ${this.cfg.network} 划转 ${what}？`, exec,
+      `Hyperliquid ${this.cfg.network}: transfer ${amount} USDC ${[from, ...legs.map(([, next]) => next)].map(labelEn).join(' → ')}?`)
     const isMainnet = this.cfg.network === 'mainnet'
     const amountText = String(Number(amount.toFixed(6)))
-    let built
-    if (from === 'spot' || to === 'spot') built = buildUsdClassTransfer({ amount: amountText, toPerp: to === 'perp', nonce, isMainnet })
-    else {
-      const spotMeta = await this.client.info('spotMeta')
-      const usdc = (spotMeta?.tokens ?? []).find((token) => token.index === 0 && token.name === 'USDC')
-      if (!usdc?.tokenId) throw new Error('无法读取 USDC 代币信息')
-      built = buildSendAsset({ destination: address, sourceDex: from === 'perp' ? '' : from, destinationDex: to === 'perp' ? '' : to, token: `USDC:${usdc.tokenId}`, amount: amountText, nonce, isMainnet })
+    let usdcToken = null
+    const responses = []
+    for (const [index, [source, target]] of legs.entries()) {
+      // Everything before the second leg is submitted can stop it; the first leg's money then sits in perp.
+      const parked = `第一步已完成（${amount} USDC 已到主永续账户）`
+      let submitted = false
+      try {
+        if (transferEpoch !== this.walletEpoch) throw new Error('钱包已切换，划转已取消')
+        exec.signal?.throwIfAborted()
+        if (index > 0) {
+          // The money that just arrived must be free to leave perp (positions may have taken it as margin).
+          const state = await this.client.clearinghouseState(address)
+          const free = Number(state?.withdrawable)
+          if (!Number.isFinite(free) || free + 1e-9 < amount) throw new Error(`主永续账户可划转 ${Number.isFinite(free) ? free.toFixed(2) : '未知'} USDC，不足 ${amount}`)
+        }
+        const nonce = this.client.nextNonce()
+        let built
+        if (source === 'spot' || target === 'spot') built = buildUsdClassTransfer({ amount: amountText, toPerp: target === 'perp', nonce, isMainnet })
+        else {
+          if (!usdcToken) {
+            const spotMeta = await this.client.info('spotMeta')
+            usdcToken = (spotMeta?.tokens ?? []).find((token) => token.index === 0 && token.name === 'USDC')?.tokenId
+            if (!usdcToken) throw new Error('无法读取 USDC 代币信息')
+          }
+          built = buildSendAsset({ destination: address, sourceDex: source === 'perp' ? '' : source, destinationDex: target === 'perp' ? '' : target, token: `USDC:${usdcToken}`, amount: amountText, nonce, isMainnet })
+        }
+        const signature = await this.signUserTyped(built.typed, `Hyperliquid ${this.cfg.network} 资金划转（${index + 1}/${legs.length}）：${amount} USDC ${label(source)} → ${label(target)}`, exec, signerAddress)
+        // Cancelled while the wallet was signing: never submit that signature.
+        exec.signal?.throwIfAborted()
+        if (transferEpoch !== this.walletEpoch) throw new Error('钱包已切换，划转已取消')
+        submitted = true
+        const res = await this.client.exchangeUserSigned(built.action, signature, nonce)
+        submitted = false
+        assertExchangeAccepted(res)
+        responses.push(res)
+      } catch (error) {
+        if (index === 0) throw error
+        const reason = error?.message ?? String(error)
+        this.store.recordEvent('live.transfer', { from: source, to: target, amount, failed: true, unknown: submitted, reason })
+        // Submitted but no answer (timeout, network): it may have gone through. Never suggest a blind retry.
+        if (submitted) throw new Error(`${parked}；第二步 主永续账户 → ${label(target)} 已提交但未收到确认（${reason}），结果未知：先用 hyper_account action=state 核对主永续与 ${label(target)} 的余额，不要直接重试`)
+        throw new Error(`${parked}，第二步 主永续账户 → ${label(target)} 未完成：${reason}。资金在主永续账户，可稍后 from=perp to=${target} 补划`)
+      }
+      this.store.recordEvent('live.transfer', { from: source, to: target, amount, dex: [source, target].find((name) => name !== 'spot' && name !== 'perp'), toDex: target !== 'spot' && target !== 'perp' })
     }
-    const signature = await this.signUserTyped(built.typed, `Hyperliquid ${this.cfg.network} 资金划转：${what}`, exec, signerAddress)
-    exec.signal?.throwIfAborted()
-    const res = await this.client.exchangeUserSigned(built.action, signature, nonce)
-    assertExchangeAccepted(res)
-    this.store.recordEvent('live.transfer', { from, to, amount, dex: dex ?? undefined, toDex: dex ? to === dex : undefined })
-    return { ok: true, from, to, amount, dex: dex ?? undefined, direction: dex ? (to === dex ? 'in' : 'out') : undefined, response: res }
+    const dex = dexes.length === 1 ? dexes[0] : undefined
+    return { ok: true, from, to, amount, legs: legs.map(([source, target]) => ({ from: source, to: target })), dex,
+      direction: dex && legs.length === 1 ? (to === dex ? 'in' : 'out') : undefined, response: responses.at(-1), responses }
   }
 
   /** Sign a user-signed action's EIP-712 payload with the main wallet (dsh-web3 or the local key). */

package/lib/tools.js

@@ -356,7 +356,7 @@ function buildTools(remote) {
       description: '查询交易账户。action=state 返回权益/持仓；orders 返回挂单；fills 返回成交；orderStatus 用 oid 或 cloid 核对某笔 live 订单，尤其在网络超时后。review 返回最近 7/30/90 天成交复盘、订单数量核对、费用和资金费覆盖缺口；不是完整账户收益率。' +
         'action=analyze 交易体检（默认 90 天）：按完整往返统计胜率、盈亏比、期望、持仓时长、按币种/时段/星期的表现、手续费与资金费，并给出按金额排序的习惯问题和建议规则——第一次见面或用户问“我做得怎么样”时用它，不要自己从成交里手算。' +
         'action=limits 修改允许币对（addCoins/removeCoins）与单笔/每日/仓位/杠杆上限——仅全托管模式可用，半托管时由用户在 设置 → 交易限额与签名规则 修改。' +
-        'action=transfer 在账户之间划转 USDC：from / to 取 spot（现货）、perp（主永续）或 HIP-3 交易所名（如 xyz），amount 为数量；支持 spot↔perp 与 perp↔HIP-3，spot 与 HIP-3 之间请分两步经 perp。下单前永续保证金不足而现货有 USDC 时，先 spot→perp。统一账户 / 组合保证金模式无需 spot↔perp 划转。全托管直接执行，半托管每次需用户批准；仅 live，需交易主钱包签名。旧参数 dex + direction（in/out）仍可用。',
+        'action=transfer 在自己的任意两个账户之间划转 USDC：from / to 取 spot（现货）、perp（主永续）或 HIP-3 交易所名（如 xyz），amount 为数量；spot↔perp、perp↔HIP-3 一步完成，spot↔HIP-3 与 HIP-3↔HIP-3 自动经 perp 两步完成（只需批准一次）。下单前永续保证金不足而现货有 USDC 时，先 spot→perp。统一账户 / 组合保证金模式无需 spot↔perp 划转。全托管直接执行，半托管每次需用户批准；仅 live，需交易主钱包签名。旧参数 dex + direction（in/out）仍可用。',
       parameters: {
         type: 'object',
         properties: {
@@ -397,7 +397,7 @@ function buildTools(remote) {
         if (action === 'transfer') {
           const res = await remote.transferCollateral(args, exec)
           const name = (value) => value === 'spot' ? '现货账户' : value === 'perp' ? '主永续账户' : value
-          return { text: `已划转 ${res.amount} USDC：${name(res.from)} → ${name(res.to)}`, ...res }
+          return { text: `已划转 ${res.amount} USDC：${[res.from, ...res.legs.map((leg) => leg.to)].map(name).join(' → ')}${res.legs.length > 1 ? '（两步）' : ''}`, ...res }
         }
         if (action === 'state') {
           const a = await remote.account({ coin: remote.desk?.coin })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-hyperliquid",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Hyperliquid trading desk for the DeepSeek Harness (dsh) - market workspace, native agent conversation and guarded live / paper trading over the Hyperliquid API.",
   "icon": "./icon.svg",
   "type": "module",

package/skills/hyperliquid-trading/SKILL.md

@@ -34,7 +34,7 @@ description: 作为用户的交易副手，在 DSH 交易会话中用 Hyperliqui
 |---|---|---|
 | 实盘下单、撤单、改杠杆 | 每笔都需要用户批准 | 在限额内直接执行 |
 | 允许币对与单笔/每日/仓位/杠杆上限 | 只能由用户在 **设置 → 交易限额与签名规则** 修改 | 你可以用 `hyper_account action=limits` 调整（`addCoins` / `removeCoins` / `maxOrderUsd` / `maxDailyUsd` / `maxPositionUsd` / `maxLeverage`） |
-| USDC 划转（现货 ↔ 永续、永续 ↔ HIP-3） | `hyper_account action=transfer`，每次需要用户批准 | 直接执行 |
+| USDC 划转（现货、主永续、各 HIP-3 交易所之间任意互转） | `hyper_account action=transfer`，每次需要用户批准 | 直接执行 |
 
 两种模式下 dsh-web3 钱包自己的签名策略都仍然生效：钱包拒签就停止，不要绕过。
 
@@ -48,7 +48,7 @@ description: 作为用户的交易副手，在 DSH 交易会话中用 Hyperliqui
 - 先确认：`hyper_account action=state` 看永续可用保证金；现货余额在 Hyperliquid 现货账户里。
 - 不够时用 `hyper_account action=transfer from=spot to=perp amount=…` 把这笔交易需要的保证金加一点缓冲划到永续；不再交易时可 `from=perp to=spot` 划回。半托管需要用户批准，全托管直接执行。不要让用户去网页手动划转。
 - 统一账户（`unifiedAccount`）/ 组合保证金（`portfolioMargin`）模式下现货 USDC 直接作保证金，不需要也不能这样划转。
-- 现货与 HIP-3 交易所之间没有直达，分两步：`from=spot to=perp`，再 `from=perp to=xyz`。
+- 现货 ↔ HIP-3、HIP-3 ↔ HIP-3 直接写 `from=spot to=xyz` / `from=xyz to=abc`，插件自动经主永续两步完成，只需批准一次；如果第二步失败，报错会说明钱已停在主永续，再单独 `from=perp to=…` 补一步即可。
 
 ### HIP-3 的保证金是独立的
 每个 HIP-3 交易所（如 xyz）都有独立的保证金账户，和主永续账户的余额不互通：