@okx_ai/okx-trade-cli 1.3.8-beta.4 → 1.3.8-beta.6

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);
   }
@@ -2506,6 +2525,56 @@ function resolveIndicatorCode(name) {
   const lower = name.toLowerCase();
   return INDICATOR_CODE_OVERRIDES[lower] ?? name.toUpperCase().replace(/-/g, "_");
 }
+var DEFAULT_INDICATOR_PARAMS = {
+  // Moving Averages — PRD example default is [14]
+  ma: [14],
+  ema: [14],
+  wma: [14],
+  dema: [14],
+  tema: [14],
+  zlema: [14],
+  hma: [14],
+  kama: [14],
+  // Trend
+  macd: [12, 26, 9],
+  adx: [14],
+  aroon: [14],
+  cci: [20],
+  dpo: [20],
+  // Momentum
+  rsi: [14],
+  "stoch-rsi": [14],
+  stoch: [14, 3, 3],
+  roc: [12],
+  mom: [10],
+  ppo: [12, 26, 9],
+  trix: [15],
+  uo: [7, 14, 28],
+  wr: [14],
+  // Volatility
+  bb: [20, 2],
+  bbwidth: [20, 2],
+  bbpct: [20, 2],
+  atr: [14],
+  keltner: [20, 2],
+  donchian: [20],
+  hv: [20],
+  stddev: [20],
+  // Volume
+  mvwap: [20],
+  cmf: [20],
+  mfi: [14],
+  // Custom
+  kdj: [9, 3, 3],
+  supertrend: [10, 3]
+};
+function getDefaultIndicatorParams(name) {
+  const lower = name.toLowerCase();
+  const direct = DEFAULT_INDICATOR_PARAMS[lower];
+  if (direct !== void 0) return direct;
+  const code = resolveIndicatorCode(lower);
+  return DEFAULT_INDICATOR_PARAMS[code.toLowerCase()];
+}
 function validateIndicatorName(name) {
   const lower = name.toLowerCase();
   if (VALID_INDICATOR_NAMES.has(lower)) return;
@@ -2549,7 +2618,7 @@ function registerIndicatorTools() {
           params: {
             type: "array",
             items: { type: "number" },
-            description: "Indicator-specific parameters as a number array. Examples: MA/EMA [14] (period), MACD [12,26,9] (fast,slow,signal), BB [20,2] (period,stdDev), RSI [14] (period). Omit to use server defaults."
+            description: "Indicator-specific parameters as a number array. Examples: MA/EMA [14] (period), MACD [12,26,9] (fast,slow,signal), BB [20,2] (period,stdDev), RSI [14] (period). For period-based indicators a parameter is required; the CLI applies a sensible default when omitted."
           },
           returnList: {
             type: "boolean",
@@ -14124,6 +14193,115 @@ async function handleAuthCommand(action, _rest, v) {
   }
 }
 
+// src/commands/outcomes.ts
+import { spawn as spawn4 } from "child_process";
+import { existsSync as existsSync9 } from "fs";
+import { delimiter, join as join15 } from "path";
+var OUTCOMES_BINARY_NAME = process.platform === "win32" ? "okx-outcomes.exe" : "okx-outcomes";
+function resolveOutcomesBinaryPath() {
+  const override = process.env.OKX_OUTCOMES_BIN;
+  if (override) {
+    if (existsSync9(override)) return override;
+    errorLine(
+      `Warning: OKX_OUTCOMES_BIN is set to '${override}' but no file exists there; falling back to PATH search.`
+    );
+  }
+  const paths = (process.env.PATH ?? "").split(delimiter);
+  for (const dir of paths) {
+    if (!dir) continue;
+    const full = join15(dir, OUTCOMES_BINARY_NAME);
+    if (existsSync9(full)) return full;
+  }
+  return null;
+}
+function printInstallHint() {
+  errorLine("Error: okx-outcomes binary not found in PATH.");
+  errorLine("");
+  errorLine("Install (macOS / Linux):");
+  errorLine("  curl -fsSL https://raw.githubusercontent.com/okx/outcomes-cli/main/install.sh | sh");
+  errorLine("");
+  errorLine("Install (Windows): download okx-outcomes.exe from");
+  errorLine("  https://github.com/okx/outcomes-cli/releases");
+  errorLine("and place it on your PATH.");
+  errorLine("");
+  errorLine("Or set OKX_OUTCOMES_BIN env var to a custom binary path.");
+}
+function runOkxOutcomes(args) {
+  const binPath = resolveOutcomesBinaryPath();
+  if (!binPath) {
+    printInstallHint();
+    return Promise.resolve(127);
+  }
+  return new Promise((resolve4, reject) => {
+    const child = spawn4(binPath, args, { stdio: "inherit" });
+    child.on(
+      "error",
+      (err) => reject(new Error(`Failed to spawn okx-outcomes: ${err.message}`))
+    );
+    child.on("close", (code) => resolve4(code ?? 1));
+  });
+}
+function printOutcomesHelp() {
+  const lines = [
+    "Usage: okx outcomes <command> [args...]",
+    "",
+    "OKX Outcomes - YES/NO event contract trading via the okx-outcomes binary.",
+    "",
+    "Common commands:",
+    "  data events                     List outcome events",
+    "  data event <eventId>            Get event detail",
+    "  data event-markets <eventId>    Event + all its markets (returns asset ids)",
+    "  data market <marketId>          Get single market detail",
+    "  data trending                   List trending events",
+    "  data ticker <assetId>           24h ticker for an outcome asset",
+    "  data candles <assetId>          OHLCV candles for an outcome asset",
+    "  search <keyword>                Search events/markets",
+    "  (Note: events/event/market etc. live UNDER the `data` namespace \u2014 calling them",
+    "         as top-level commands prints the binary's help instead of returning JSON.)",
+    "",
+    "  clob price/prices/midpoint(s)/spread(s)/book(s) --asset <id>",
+    "                                  CLOB read-side market data",
+    "  clob create-order               Place limit order (EIP-712 signed)",
+    "  clob market-order               Cross book immediately (IOC/FOK)",
+    "  clob cancel-oid | cancel-all | heartbeat",
+    "",
+    "  ctf split/merge/redeem          Conditional token operations",
+    "",
+    "  account balance/order/orders/positions/trades",
+    "                                  Account queries (OAuth sign-in; closed = positions --status closed)",
+    "",
+    "  auth login --manual [--json]    OAuth device-code sign-in (prints URL+code; agent-friendly)",
+    "  auth login [--site global|us]   OAuth sign-in, browser-foreground (user at a terminal)",
+    "  auth refresh | auth status      Verify/refresh session; show sign-in state",
+    "  setup status|region|bind        Step-by-step onboarding (all non-interactive; agent-runnable)",
+    "",
+    "  wallet show                     Show derived wallet address",
+    "  status                          Health check",
+    "  setup                           Interactive setup wizard (region -> OAuth -> wallet bind)",
+    "",
+    "Run 'okx outcomes <command> --help' for command-specific help.",
+    "",
+    "Note: place flags after the subcommand, e.g. 'okx outcomes events --json'",
+    "      (or before the module: 'okx --json outcomes events'). Writing",
+    "      'okx outcomes --json events' is not supported.",
+    "",
+    "Requires: curl -fsSL https://raw.githubusercontent.com/okx/outcomes-cli/main/install.sh | sh"
+  ];
+  for (const line of lines) outputLine(line);
+}
+async function handleOutcomesCommand(action, rest, v) {
+  if (!action || action === "--help" || action === "-h" || action === "help") {
+    printOutcomesHelp();
+    return;
+  }
+  const forwardArgs = [action, ...rest];
+  if (v.json && !forwardArgs.includes("--json") && !forwardArgs.includes("-j")) {
+    forwardArgs.push("--json");
+  }
+  const code = await runOkxOutcomes(forwardArgs);
+  if (code !== 0) process.exitCode = code;
+}
+
 // src/commands/diagnose.ts
 import dns from "dns/promises";
 import net from "net";
@@ -14218,7 +14396,7 @@ function sanitize2(value) {
 import fs5 from "fs";
 import path4 from "path";
 import os4 from "os";
-import { spawnSync, spawn as spawn4 } from "child_process";
+import { spawnSync, spawn as spawn5 } from "child_process";
 import { createRequire as createRequire2 } from "module";
 import { fileURLToPath } from "url";
 var _require2 = createRequire2(import.meta.url);
@@ -14552,7 +14730,7 @@ async function checkStdioHandshake(entryPath, report) {
       clearTimeout(timer);
       resolve4(passed);
     };
-    const child = spawn4(process.execPath, [entryPath], {
+    const child = spawn5(process.execPath, [entryPath], {
       stdio: ["pipe", "pipe", "pipe"],
       env: { ...process.env }
     });
@@ -14671,7 +14849,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "9beb3ee8" : "dev";
+var GIT_HASH = true ? "e2de3b7e" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -15033,12 +15211,12 @@ function suggestSubcommand(action, knownActions, knownPaths = []) {
 // src/commands/upgrade.ts
 import { spawnSync as spawnSync2 } from "child_process";
 import { readFileSync as readFileSync11, writeFileSync as writeFileSync8, mkdirSync as mkdirSync11 } from "fs";
-import { dirname as dirname8, join as join15 } from "path";
+import { dirname as dirname8, join as join16 } from "path";
 import { homedir as homedir11 } from "os";
 var PACKAGES = ["@okx_ai/okx-trade-mcp", "@okx_ai/okx-trade-cli"];
-var CACHE_FILE2 = join15(homedir11(), ".okx", "last_check");
+var CACHE_FILE2 = join16(homedir11(), ".okx", "last_check");
 var THROTTLE_MS = 12 * 60 * 60 * 1e3;
-var NPM_BIN = join15(dirname8(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+var NPM_BIN = join16(dirname8(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
 function readLastCheck() {
   try {
     return parseInt(readFileSync11(CACHE_FILE2, "utf-8").trim(), 10) || 0;
@@ -15048,7 +15226,7 @@ function readLastCheck() {
 }
 function writeLastCheck() {
   try {
-    mkdirSync11(join15(homedir11(), ".okx"), { recursive: true });
+    mkdirSync11(join16(homedir11(), ".okx"), { recursive: true });
     writeFileSync8(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
   } catch {
   }
@@ -16209,6 +16387,68 @@ var CLI_REGISTRY = {
     description: "Upgrade okx CLI and MCP server to the latest stable version",
     usage: "okx upgrade [--check] [--beta] [--force] [--json]"
   },
+  // ── outcomes ───────────────────────────────────────────────────────────────
+  // External binary wrapper - forwards to the okx-outcomes binary (formerly okx-predict).
+  // All toolName=null because outcomes commands are not exposed as MCP tools.
+  outcomes: {
+    description: "OKX Outcomes markets (YES/NO event contracts) via external okx-outcomes binary",
+    commands: {
+      // Note: events / event / event-markets / market / trending / ticker /
+      // candles live UNDER the `data` namespace in the upstream binary.
+      // Calling them as top-level commands prints the binary's help text
+      // instead of returning JSON. Always invoke as `okx outcomes data <cmd>`.
+      data: {
+        toolName: null,
+        usage: "okx outcomes data <events|event|event-markets|market|trending|ticker|candles> [args...]",
+        description: "Public market data namespace: events, event(-markets), market, trending, ticker, candles"
+      },
+      search: {
+        toolName: null,
+        usage: "okx outcomes search <keyword> [--limit <n>] [--cursor <c>]",
+        description: "Search events/markets by keyword (OAuth)"
+      },
+      account: {
+        toolName: null,
+        usage: "okx outcomes account <balance|order|orders|positions|trades> (closed = positions --status closed)",
+        description: "Account queries (OAuth)"
+      },
+      auth: {
+        toolName: null,
+        usage: "okx outcomes auth <login|refresh|status> [--manual] [--site global|us] [--json]",
+        description: "OAuth sign-in / token refresh / session status (login --manual = agent-friendly device-code flow)"
+      },
+      clob: {
+        toolName: null,
+        usage: "okx outcomes clob <price|prices|midpoint|midpoints|spread|spreads|book|books|order|orders|trades|create-order|market-order|cancel-oid|cancel-all|heartbeat>",
+        description: "CLOB market data (--asset) + EIP-712 signed order operations"
+      },
+      ctf: {
+        toolName: null,
+        usage: "okx outcomes ctf <split|merge|redeem> --market <id> [--amount <xp>]",
+        description: "Conditional Token Framework: split xp into YES/NO, merge, redeem"
+      },
+      wallet: {
+        toolName: null,
+        usage: "okx outcomes wallet show",
+        description: "Show derived wallet address (from the signing key)"
+      },
+      status: {
+        toolName: null,
+        usage: "okx outcomes status [--json]",
+        description: "Health check: API + balance reachability"
+      },
+      setup: {
+        toolName: null,
+        usage: "okx outcomes setup [status|region|bind]",
+        description: "Setup wizard (region -> OAuth sign-in -> wallet bind); subcommands: status/region/bind"
+      },
+      shell: {
+        toolName: null,
+        usage: "okx outcomes shell",
+        description: "Interactive REPL (do not invoke from agent context)"
+      }
+    }
+  },
   // ── list-tools ──────────────────────────────────────────────────────────────
   "list-tools": {
     description: "List all available tools and their parameters (use --json for machine-readable output)",
@@ -17083,8 +17323,33 @@ function parseCli(argv) {
   }
   return { values, positionals };
 }
+function peekFirstPositional(argv) {
+  const booleanFlags = /* @__PURE__ */ new Set();
+  for (const [name, opt] of Object.entries(CLI_OPTIONS)) {
+    const o = opt;
+    if (o.type === "boolean") {
+      booleanFlags.add(name);
+      if (o.short) booleanFlags.add(o.short);
+    }
+  }
+  for (let i = 0; i < argv.length; i++) {
+    const tok = argv[i];
+    if (tok === "--") {
+      const next2 = argv[i + 1];
+      return next2 === void 0 ? void 0 : { module: next2, idx: i + 1 };
+    }
+    if (!tok.startsWith("-")) return { module: tok, idx: i };
+    if (tok.includes("=")) continue;
+    const name = tok.replace(/^--?/, "");
+    if (booleanFlags.has(name)) continue;
+    const next = argv[i + 1];
+    if (next !== void 0 && !next.startsWith("-")) i++;
+  }
+  return void 0;
+}
 
 // src/commands/market.ts
+var NO_INDICATOR_VALUES_HINT = "No indicator values returned. This indicator may require a period \u2014 try --params (e.g. --params 14).";
 function getData2(result) {
   return result.data;
 }
@@ -17291,11 +17556,13 @@ function cmdMarketIndicatorList(json) {
 }
 async function cmdMarketIndicator(run, indicator, instId, opts) {
   const params = opts.params ? opts.params.split(",").map((p) => Number(p.trim())).filter((n) => !Number.isNaN(n)) : void 0;
+  const explicit = params && params.length > 0 ? params : void 0;
+  const effectiveParams = explicit ?? getDefaultIndicatorParams(indicator);
   const result = await run("market_get_indicator", {
     instId,
     indicator,
     bar: opts.bar,
-    params: params && params.length > 0 ? params : void 0,
+    params: effectiveParams,
     returnList: opts.list ?? false,
     limit: opts.limit,
     backtestTime: opts.backtestTime
@@ -17303,7 +17570,7 @@ async function cmdMarketIndicator(run, indicator, instId, opts) {
   const outerArray = getData2(result);
   if (opts.json) return printJson(outerArray);
   if (!outerArray?.length) {
-    process.stdout.write("No data\n");
+    outputLine("No data");
     return;
   }
   const apiCode = resolveIndicatorCode(indicator);
@@ -17312,16 +17579,18 @@ async function cmdMarketIndicator(run, indicator, instId, opts) {
   const instData = innerArray?.[0];
   const timeframes = instData?.["timeframes"];
   if (!timeframes) {
-    process.stdout.write(JSON.stringify(outerArray, null, 2) + "\n");
+    output(JSON.stringify(outerArray, null, 2) + "\n");
     return;
   }
+  let printed = false;
   for (const [tf, tfData] of Object.entries(timeframes)) {
     const indicators = tfData?.["indicators"];
     const values = indicators?.[apiCode];
     if (!values?.length) continue;
-    process.stdout.write(`${instId} | ${apiCode} | ${tf}
+    printed = true;
+    output(`${instId} | ${apiCode} | ${tf}
 `);
-    process.stdout.write("-".repeat(40) + "\n");
+    output("-".repeat(40) + "\n");
     if (opts.list) {
       const tableRows = values.map((entry) => ({
         ts: new Date(Number(entry["ts"])).toLocaleString(),
@@ -17336,6 +17605,7 @@ async function cmdMarketIndicator(run, indicator, instId, opts) {
       });
     }
   }
+  if (!printed) outputLine(NO_INDICATOR_VALUES_HINT);
 }
 async function cmdMarketInstrumentsByCategory(run, opts) {
   const result = await run("market_get_instruments_by_category", {
@@ -17409,8 +17679,9 @@ async function cmdMarketFilter(run, opts) {
     sortOrder: opts.sortOrder,
     limit: opts.limit
   });
-  const data = getData2(result);
-  if (opts.json) return printJson(data);
+  const raw = getData2(result);
+  if (opts.json) return printJson(raw);
+  const data = Array.isArray(raw) ? raw[0] : raw;
   const rows = data?.["rows"] ?? [];
   const total = data?.["total"] ?? rows.length;
   outputLine(`Total: ${total}`);
@@ -20567,20 +20838,20 @@ async function cmdDcdQuoteAndBuy(run, opts) {
 
 // src/commands/skill.ts
 import { tmpdir, homedir as homedir13 } from "os";
-import { join as join17, dirname as dirname9 } from "path";
-import { mkdirSync as mkdirSync12, rmSync, existsSync as existsSync10, copyFileSync as copyFileSync2 } from "fs";
+import { join as join18, dirname as dirname9 } from "path";
+import { mkdirSync as mkdirSync12, rmSync, existsSync as existsSync11, copyFileSync as copyFileSync2 } from "fs";
 import { execFileSync as execFileSync2 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 function resolveNpx() {
-  const sibling = join17(dirname9(process.execPath), "npx");
-  if (existsSync10(sibling)) return sibling;
+  const sibling = join18(dirname9(process.execPath), "npx");
+  if (existsSync11(sibling)) return sibling;
   return "npx";
 }
 function npxEnv() {
   return { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" };
 }
 function getSkillContentDir(name) {
-  return join17(homedir13(), ".agents", "skills", name);
+  return join18(homedir13(), ".agents", "skills", name);
 }
 var THIRD_PARTY_INSTALL_NOTICE = "Note: This skill was created by a third-party developer, not by OKX. Review SKILL.md before use.";
 async function cmdSkillSearch(run, opts) {
@@ -20646,13 +20917,13 @@ async function wrapVerify(fn) {
 async function cmdSkillAdd(name, config, json, force = false, exec = execFileSync2, _deps) {
   const _download = _deps?.download ?? downloadSkillZip;
   const _extract = _deps?.extract ?? extractSkillZip;
-  const tmpBase = join17(tmpdir(), `okx-skill-${randomUUID2()}`);
+  const tmpBase = join18(tmpdir(), `okx-skill-${randomUUID2()}`);
   mkdirSync12(tmpBase, { recursive: true });
   try {
     outputLine(`Downloading ${name}...`);
     const client = new OkxRestClient(config);
     const zipPath = await _download(client, name, tmpBase);
-    const contentDir = await _extract(zipPath, join17(tmpBase, "content"));
+    const contentDir = await _extract(zipPath, join18(tmpBase, "content"));
     const meta = readMetaJson(contentDir);
     validateSkillMdExists(contentDir);
     outputLine("Verifying signature...");
@@ -20689,7 +20960,7 @@ async function cmdSkillAdd(name, config, json, force = false, exec = execFileSyn
         env: npxEnv()
       });
     } catch (e) {
-      const savedZip = join17(process.cwd(), `${name}.zip`);
+      const savedZip = join18(process.cwd(), `${name}.zip`);
       try {
         copyFileSync2(zipPath, savedZip);
       } catch {
@@ -20802,7 +21073,7 @@ async function cmdSkillVerify(name, config, json) {
     return;
   }
   const contentDir = getSkillContentDir(name);
-  if (!existsSync10(contentDir)) {
+  if (!existsSync11(contentDir)) {
     errorLine(`Skill content directory not found: ${contentDir}`);
     errorLine(`Try reinstalling with: okx skill add ${name}`);
     process.exitCode = 1;
@@ -21467,7 +21738,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 ? "9beb3ee8" : "dev";
+var GIT_HASH2 = true ? "e2de3b7e" : "dev";
 function handlePilotCommand(action, json, force, binaryPath) {
   if (action === "status") return cmdPilotStatus(json, binaryPath);
   if (action === "install") return cmdPilotInstall(json, binaryPath);
@@ -22949,7 +23220,16 @@ async function main() {
     err: (m) => process.stderr.write(m)
   });
   checkForUpdates("@okx_ai/okx-trade-cli", CLI_VERSION2);
-  const { values, positionals } = parseCli(process.argv.slice(2));
+  const rawArgv = process.argv.slice(2);
+  const peek = peekFirstPositional(rawArgv);
+  if (peek?.module === "outcomes") {
+    const after = rawArgv.slice(peek.idx + 1);
+    const action2 = after[0];
+    const rest2 = after.slice(1);
+    const json2 = rawArgv.includes("--json") || rawArgv.includes("-j");
+    return handleOutcomesCommand(action2, rest2, { json: json2 });
+  }
+  const { values, positionals } = parseCli(rawArgv);
   if (values.version) {
     printVersion();
     return;