@okx_ai/okx-trade-cli 1.3.8-beta.3 → 1.3.8-beta.5

package/dist/index.js

@@ -1003,6 +1003,7 @@ function writeCache(hostname, entry, cachePath = getDefaultCachePath()) {
   }
 }
 var FAILED_NODE_TTL_MS = 60 * 60 * 1e3;
+var MAX_PROXY_CACHE_AGE_MS = 60 * 60 * 1e3;
 function classifyAndCache(node, hostname, failedNodes, cachePath) {
   if (!node) {
     return { mode: null, node: null };
@@ -1036,6 +1037,10 @@ function resolvePilot(hostname, cachePath) {
       return { mode: "direct", node: null };
     }
     if (entry.mode === "proxy" && entry.node) {
+      const effectiveTtlMs = Math.min(entry.node.ttl > 0 ? entry.node.ttl * 1e3 : MAX_PROXY_CACHE_AGE_MS, MAX_PROXY_CACHE_AGE_MS);
+      if (Date.now() - entry.updatedAt > effectiveTtlMs) {
+        return { mode: null, node: null };
+      }
       return { mode: "proxy", node: entry.node };
     }
   }
@@ -1555,6 +1560,14 @@ var OKX_CODE_BEHAVIORS = {
   "51022": { retry: false, suggestion: "Instrument not available for trading." },
   "51027": { retry: false, suggestion: "Contract has expired." }
 };
+function hasOkxJsonCode(text) {
+  try {
+    const parsed = JSON.parse(text);
+    return typeof parsed.code === "string" && parsed.code.length > 0;
+  } catch {
+    return false;
+  }
+}
 function isDefined(value) {
   return value !== void 0 && value !== null;
 }
@@ -2032,6 +2045,12 @@ var OkxRestClient = class _OkxRestClient {
     const rawText = await response.text();
     const elapsed = Date.now() - t0;
     const traceId = extractTraceId(response.headers);
+    if (this.pilot.isProxyActive && !response.ok && !hasOkxJsonCode(rawText) && !this.pilot.hasRetried) {
+      const shouldRetry = await this.pilot.handleNetworkFailure();
+      if (shouldRetry && (reqConfig.method === "GET" || reqConfig.retryOnNetworkError)) {
+        return this.request(reqConfig);
+      }
+    }
     this.pilot.cacheDirectIfNeeded();
     return this.processResponse(rawText, response, elapsed, traceId, reqConfig, requestPath);
   }
@@ -2733,6 +2752,203 @@ var MODULE_DESCRIPTIONS = {
   upgrade: "Upgrade okx CLI and MCP server to the latest stable version",
   skill: SKILLS_MARKETPLACE_DESC
 };
+var AGGREGATE_ENDPOINT = "/api/v5/aigc/forward/balance-aggregate";
+var TRADING_ENDPOINT = "/api/v5/account/balance";
+var FUNDING_ENDPOINT = "/api/v5/asset/balances";
+var VALUATION_ENDPOINT = "/api/v5/asset/asset-valuation";
+function parseParams(rawArgs) {
+  const args = asRecord(rawArgs);
+  const accounts = readString(args, "accounts") ?? "trading,funding";
+  return {
+    ccy: readString(args, "ccy"),
+    accounts,
+    requestedAccounts: accounts.split(",").map((s) => s.trim().toLowerCase()).filter(Boolean),
+    showValuation: readBoolean(args, "showValuation") ?? true,
+    valuationCcy: readString(args, "valuationCcy") ?? "USDT",
+    preferParallel: readBoolean(args, "preferParallel") ?? false
+  };
+}
+function normalizeSubError(error) {
+  if (!error || typeof error !== "object") {
+    return void 0;
+  }
+  const e = error;
+  return {
+    code: e["code"] === void 0 || e["code"] === null ? "UNKNOWN" : String(e["code"]),
+    msg: typeof e["msg"] === "string" ? e["msg"] : String(e["msg"] ?? "")
+  };
+}
+function toIsoTimestamp(value, fallbackMs) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return new Date(value).toISOString();
+  }
+  if (typeof value === "string" && value.trim() !== "") {
+    return value;
+  }
+  return new Date(fallbackMs).toISOString();
+}
+function normalizeAggregate(agg, params, startTime) {
+  const result = {};
+  const trading = agg["trading"];
+  if (trading) {
+    result.trading = compactObject({
+      available: trading["available"] ?? false,
+      totalEq: trading["totalEq"],
+      adjEq: trading["adjEq"],
+      details: Array.isArray(trading["details"]) ? trading["details"] : [],
+      error: normalizeSubError(trading["error"])
+    });
+  }
+  const funding = agg["funding"];
+  if (funding) {
+    result.funding = compactObject({
+      available: funding["available"] ?? false,
+      details: Array.isArray(funding["details"]) ? funding["details"] : [],
+      error: normalizeSubError(funding["error"])
+    });
+  }
+  const valuation = agg["valuation"];
+  if (valuation) {
+    result.valuation = compactObject({
+      available: valuation["available"] ?? false,
+      valuationCcy: valuation["valuationCcy"] ?? params.valuationCcy,
+      totalBal: valuation["totalBal"] ?? "0",
+      details: Array.isArray(valuation["details"]) ? valuation["details"] : [],
+      error: normalizeSubError(valuation["error"])
+    });
+  }
+  const meta = agg["meta"] ?? {};
+  result.meta = compactObject({
+    requestedAt: toIsoTimestamp(meta["requestedAt"], startTime),
+    elapsedMs: typeof meta["elapsedMs"] === "number" ? meta["elapsedMs"] : Date.now() - startTime,
+    partialFailure: Boolean(meta["partialFailure"]),
+    site: typeof meta["site"] === "string" ? meta["site"] : void 0,
+    source: "aggregate"
+  });
+  return result;
+}
+async function queryAggregate(context, params, startTime) {
+  const resp = await context.client.privateGet(
+    AGGREGATE_ENDPOINT,
+    compactObject({
+      ccy: params.ccy,
+      accounts: params.accounts,
+      showValuation: params.showValuation,
+      valuationCcy: params.valuationCcy
+    }),
+    privateRateLimit("account_get_balance_all", 5)
+  );
+  const data = resp.data;
+  const agg = Array.isArray(data) ? data[0] : void 0;
+  if (!agg || agg["trading"] === void 0 && agg["funding"] === void 0) {
+    throw new OkxApiError("Aggregate endpoint returned no usable data", {
+      code: "AGG_EMPTY",
+      endpoint: `GET ${AGGREGATE_ENDPOINT}`
+    });
+  }
+  return normalizeAggregate(agg, params, startTime);
+}
+var REQUESTED_KEYS = /* @__PURE__ */ new Set(["trading", "funding"]);
+function buildBalanceTasks(context, params) {
+  const { ccy, requestedAccounts, showValuation, valuationCcy } = params;
+  const tasks = [];
+  if (requestedAccounts.includes("trading")) {
+    tasks.push({
+      key: "trading",
+      run: () => context.client.privateGet(TRADING_ENDPOINT, compactObject({ ccy }), privateRateLimit("account_get_balance", 10)).then((resp) => resp.data)
+    });
+  }
+  if (requestedAccounts.includes("funding")) {
+    tasks.push({
+      key: "funding",
+      run: () => context.client.privateGet(FUNDING_ENDPOINT, compactObject({ ccy }), privateRateLimit("account_get_asset_balance", 6)).then((resp) => resp.data)
+    });
+  }
+  if (showValuation) {
+    tasks.push({
+      key: "valuation",
+      run: () => context.client.privateGet(VALUATION_ENDPOINT, { ccy: valuationCcy }, privateRateLimit("account_get_asset_valuation", 1)).then((resp) => resp.data)
+    });
+  }
+  return tasks;
+}
+async function settleBalanceTasks(tasks) {
+  return Promise.all(
+    tasks.map(async (task) => {
+      try {
+        return { key: task.key, data: await task.run() };
+      } catch (error) {
+        return { key: task.key, error };
+      }
+    })
+  );
+}
+function buildSuccessSection(key, data, valuationCcy) {
+  const rows = Array.isArray(data) ? data : [];
+  const first = rows[0];
+  if (key === "funding") {
+    return { available: true, details: rows };
+  }
+  if (key === "valuation") {
+    return { available: true, valuationCcy, totalBal: first?.["totalBal"] ?? "0", details: rows };
+  }
+  return {
+    available: true,
+    totalEq: first?.["totalEq"] ?? "0",
+    adjEq: first?.["adjEq"] ?? "0",
+    details: first && Array.isArray(first["details"]) ? first["details"] : []
+  };
+}
+function buildErrorSection(error) {
+  return {
+    available: false,
+    error: {
+      code: error instanceof OkxApiError ? error.code ?? "UNKNOWN" : "UNKNOWN",
+      msg: error.message
+    }
+  };
+}
+async function queryParallel(context, params, startTime) {
+  const tasks = buildBalanceTasks(context, params);
+  const outcomes = await settleBalanceTasks(tasks);
+  const authFailure = outcomes.find((o) => o.error instanceof AuthenticationError);
+  if (authFailure?.error) {
+    throw authFailure.error;
+  }
+  const result = {};
+  for (const outcome of outcomes) {
+    result[outcome.key] = outcome.error ? buildErrorSection(outcome.error) : buildSuccessSection(outcome.key, outcome.data, params.valuationCcy);
+  }
+  const requestedCount = tasks.filter((t) => REQUESTED_KEYS.has(t.key)).length;
+  const requestedFailures = outcomes.filter((o) => o.error && REQUESTED_KEYS.has(o.key)).length;
+  if (requestedCount > 0 && requestedFailures >= requestedCount) {
+    throw new OkxApiError("Both balance queries failed", { code: "-30001" });
+  }
+  const site = typeof context.config?.site === "string" ? context.config.site : void 0;
+  result.meta = compactObject({
+    requestedAt: new Date(startTime).toISOString(),
+    elapsedMs: Date.now() - startTime,
+    partialFailure: requestedFailures > 0,
+    site,
+    source: "fallback"
+  });
+  return result;
+}
+async function buildBalanceAll(rawArgs, context) {
+  const params = parseParams(rawArgs);
+  const startTime = Date.now();
+  if (params.preferParallel) {
+    return queryParallel(context, params, startTime);
+  }
+  try {
+    return await queryAggregate(context, params, startTime);
+  } catch (error) {
+    if (error instanceof AuthenticationError) {
+      throw error;
+    }
+    return queryParallel(context, params, startTime);
+  }
+}
 function registerAccountTools() {
   return [
     {
@@ -3312,6 +3528,39 @@ function registerAccountTools() {
         );
         return normalizeResponse(response);
       }
+    },
+    {
+      name: "account_get_balance_all",
+      title: "Get Aggregate Balance Snapshot",
+      module: "account",
+      description: "One-shot snapshot of all OKX assets: trading-account equity + funding-account balances + optional cross-account valuation. Use when the user asks for total assets / net worth / \u603B\u8D44\u4EA7 / all balances. Prefer this over calling account_get_balance + account_get_asset_balance separately. Returns {trading, funding, valuation, meta} with per-section error so partial failures don't block the rest.",
+      isWrite: false,
+      inputSchema: {
+        type: "object",
+        properties: {
+          ccy: {
+            type: "string",
+            description: "Filter by currency, comma-separated (e.g. BTC,ETH). Omit for all. Applied to trading + funding queries only."
+          },
+          accounts: {
+            type: "string",
+            description: "Comma-separated accounts to query: 'trading','funding'. Default 'trading,funding'."
+          },
+          showValuation: {
+            type: "boolean",
+            description: "Include cross-account asset valuation. Default true."
+          },
+          valuationCcy: {
+            type: "string",
+            description: "Currency for valuation (e.g. USDT, BTC). Default USDT. Only effective when showValuation=true."
+          },
+          preferParallel: {
+            type: "boolean",
+            description: "Skip the server-side aggregate endpoint and query trading/funding/valuation directly in parallel. Default false. Use when you need the per-account valuation breakdown or a non-USD valuation currency."
+          }
+        }
+      },
+      handler: (rawArgs, context) => buildBalanceAll(rawArgs, context)
     }
   ];
 }
@@ -14491,7 +14740,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "52f6524c" : "dev";
+var GIT_HASH = true ? "884b3632" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -15101,6 +15350,11 @@ var CLI_REGISTRY = {
         usage: "okx account balance [<ccy>]",
         description: "Get trading account balance"
       },
+      "balance-all": {
+        toolName: "account_get_balance_all",
+        usage: "okx account balance-all [<ccy>] [--accounts trading,funding] [--no-valuation] [--no-aggregate] [--valuationCcy <ccy>]",
+        description: "One-shot snapshot: trading + funding (+ valuation) via server aggregate, auto-fallback to parallel"
+      },
       "asset-balance": {
         toolName: "account_get_asset_balance",
         usage: "okx account asset-balance [--ccy <ccy>]",
@@ -16679,8 +16933,10 @@ var CLI_OPTIONS = {
   quoteCcy: { type: "string" },
   // account extras
   archive: { type: "boolean", default: false },
-  valuation: { type: "boolean", default: false },
+  valuation: { type: "boolean" },
+  aggregate: { type: "boolean" },
   valuationCcy: { type: "string" },
+  accounts: { type: "string" },
   posMode: { type: "string" },
   ccy: { type: "string" },
   from: { type: "string" },
@@ -17556,6 +17812,88 @@ async function cmdAccountTransfer(run, opts) {
   const r = data?.[0];
   outputLine(`Transfer: ${r?.["transId"]} (${r?.["ccy"]} ${r?.["amt"]})`);
 }
+async function cmdAccountBalanceAll(run, ccy, opts) {
+  const result = await run("account_get_balance_all", {
+    ...ccy ? { ccy } : {},
+    ...opts.accounts ? { accounts: opts.accounts } : {},
+    showValuation: !opts.noValuation,
+    ...opts.preferParallel ? { preferParallel: true } : {},
+    ...opts.valuationCcy ? { valuationCcy: opts.valuationCcy } : {}
+  });
+  if (opts.json) return printJson(result);
+  const meta = result.meta;
+  if (meta?.partialFailure) {
+    outputLine("[PARTIAL] Some balance queries failed \u2014 results may be incomplete.");
+    outputLine("");
+  }
+  const trading = result.trading;
+  if (trading) {
+    if (trading.available) {
+      outputLine("=== Trading Account ===");
+      outputLine(`Total Equity: ${String(trading["totalEq"] ?? "0")}`);
+      const details = trading.details ?? [];
+      const rows = details.filter((d) => Number(d["eq"] ?? d["bal"] ?? 0) > 0).map((d) => ({
+        ccy: d["ccy"],
+        equity: d["eq"] ?? d["bal"],
+        available: d["availEq"] ?? d["availBal"],
+        frozen: d["frozenBal"]
+      }));
+      if (rows.length > 0) printTable(rows);
+    } else {
+      const error = trading.error;
+      outputLine(`=== Trading Account === [ERROR: ${error?.msg ?? "unavailable"}]`);
+    }
+    outputLine("");
+  }
+  const funding = result.funding;
+  if (funding) {
+    if (funding.available) {
+      outputLine("=== Funding Account ===");
+      const details = funding.details ?? [];
+      const rows = details.filter((d) => Number(d["bal"] ?? 0) > 0).map((d) => ({
+        ccy: d["ccy"],
+        balance: d["bal"],
+        available: d["availBal"],
+        frozen: d["frozenBal"]
+      }));
+      if (rows.length > 0) printTable(rows);
+      else outputLine("(no non-zero balances)");
+    } else {
+      const error = funding.error;
+      outputLine(`=== Funding Account === [ERROR: ${error?.msg ?? "unavailable"}]`);
+    }
+    outputLine("");
+  }
+  const valuation = result.valuation;
+  if (valuation) {
+    if (valuation.available) {
+      outputLine(`=== Valuation (${String(valuation.valuationCcy ?? "USDT")}) ===`);
+      printKv({ totalBal: valuation.totalBal });
+      const details = valuation.details ?? [];
+      if (details.length > 0) {
+        const first = details[0];
+        const breakdown = first?.["details"] ?? {};
+        if (Object.keys(breakdown).length > 0) {
+          printKv(breakdown);
+        }
+      }
+    } else {
+      const error = valuation.error;
+      outputLine(`=== Valuation === [ERROR: ${error?.msg ?? "unavailable"}]`);
+    }
+  }
+  const source = meta?.source;
+  if (source) {
+    const site = meta?.site;
+    const elapsed = meta?.elapsedMs;
+    let line = `[source: ${source}`;
+    if (site) line += `, site: ${site}`;
+    if (elapsed !== void 0) line += `, ${String(elapsed)}ms`;
+    line += "]";
+    outputLine("");
+    outputLine(line);
+  }
+}
 function readAuditLogs(logDir, days = 7) {
   const entries = [];
   const now = /* @__PURE__ */ new Date();
@@ -21205,7 +21543,7 @@ async function cmdEventCancel(run, opts) {
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "52f6524c" : "dev";
+var GIT_HASH2 = true ? "884b3632" : "dev";
 function handlePilotCommand(action, json, force, binaryPath) {
   if (action === "status") return cmdPilotStatus(json, binaryPath);
   if (action === "install") return cmdPilotInstall(json, binaryPath);
@@ -21392,6 +21730,7 @@ function handleAccountWriteCommand(run, action, v, json) {
   unknownSubcommand("account", action, [
     "audit",
     "balance",
+    "balance-all",
     "asset-balance",
     "positions",
     "positions-history",
@@ -21410,6 +21749,14 @@ function handleAccountCommand(run, action, rest, v, json) {
     return cmdAccountAudit({ limit: v.limit, tool: v.tool, since: v.since, json });
   const limit = v.limit !== void 0 ? Number(v.limit) : void 0;
   if (action === "balance") return cmdAccountBalance(run, rest[0], json);
+  if (action === "balance-all")
+    return cmdAccountBalanceAll(run, v.ccy ?? rest[0], {
+      accounts: v.accounts,
+      noValuation: v.valuation === false,
+      preferParallel: v.aggregate === false,
+      valuationCcy: v.valuationCcy,
+      json
+    });
   if (action === "asset-balance") return cmdAccountAssetBalance(run, v.ccy, json, v.valuation, v.valuationCcy);
   if (action === "positions")
     return cmdAccountPositions(run, { instType: v.instType, instId: v.instId, json });