perp-cli 0.12.17 → 0.14.0

package/dist/commands/account.js

@@ -1,12 +1,25 @@
+import { listConfiguredAccountVenues } from "../config.js";
 import { makeTable, formatUsd, formatPnl, printJson, jsonOk, jsonError, symbolMatch } from "../utils.js";
 import chalk from "chalk";
 import { hasPacificaSdk, isDexCapable } from "../exchanges/capabilities.js";
-const EXCHANGES = ["pacifica", "hyperliquid", "lighter", "aster"];
+import { PerpError } from "../errors.js";
+import { unsupported } from "../exchanges/trading-v2.js";
 function pac(adapter) {
     if (!hasPacificaSdk(adapter))
         throw new Error("Market settings are only available on Pacifica.");
     return adapter;
 }
+/**
+ * Type / Trigger / Price / Size cells of an order row. A trigger order (stop / TP / SL) shows its
+ * trigger price; a market-type trigger has no limit price ("market"), and a position-level TP/SL
+ * (Pacifica: size 0 — it closes the whole position) shows "position" instead of 0.
+ */
+export function orderCells(o) {
+    const trigger = o.triggerPrice !== null ? `$${formatUsd(o.triggerPrice)}` : "-";
+    const price = Number(o.price) > 0 ? `$${formatUsd(o.price)}` : o.triggerPrice !== null ? "market" : `$${formatUsd(o.price)}`;
+    const size = !(Number(o.size) > 0) && o.triggerPrice !== null ? "position" : o.size;
+    return [o.type, trigger, price, size];
+}
 export function registerAccountCommands(program, getAdapter, isJson, getAdapterForExchange) {
     const account = program.command("account").description("Account commands");
     // ── balance alias → redirect to portfolio (renamed in v0.12) ──
@@ -52,21 +65,25 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .action(async (opts) => {
         const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
         if (!explicitExchange && getAdapterForExchange) {
+            const EXCHANGES = await listConfiguredAccountVenues();
             const allRows = [];
             const errors = {};
+            // One read per venue for both outputs: a venue that fails is an `errors` entry, never dropped.
+            const grouped = {};
             await Promise.all(EXCHANGES.map(async (ex) => {
                 try {
                     const adapter = await getAdapterForExchange(ex);
                     const positions = await adapter.getPositions();
+                    grouped[ex] = positions;
                     for (const p of positions) {
                         allRows.push([
                             chalk.white.bold(p.symbol),
-                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            chalk.gray(ex),
                             p.side === "long" ? chalk.green("LONG") : chalk.red("SHORT"),
                             p.size,
                             `$${formatUsd(p.entryPrice)}`,
                             `$${formatUsd(p.markPrice)}`,
-                            p.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(p.liquidationPrice)}`,
+                            p.liquidationPrice === null ? chalk.gray("-") : `$${formatUsd(p.liquidationPrice)}`,
                             formatPnl(p.unrealizedPnl),
                             `${p.leverage}x`,
                         ]);
@@ -75,6 +92,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                         const hip3 = await fetchHip3Data(adapter, a => a.getPositions());
                         for (const { dex, items } of hip3) {
+                            grouped[`hip3:${dex}`] = items;
                             for (const p of items) {
                                 allRows.push([
                                     chalk.white.bold(p.symbol),
@@ -83,7 +101,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                                     p.size,
                                     `$${formatUsd(p.entryPrice)}`,
                                     `$${formatUsd(p.markPrice)}`,
-                                    p.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(p.liquidationPrice)}`,
+                                    p.liquidationPrice === null ? chalk.gray("-") : `$${formatUsd(p.liquidationPrice)}`,
                                     formatPnl(p.unrealizedPnl),
                                     `${p.leverage}x`,
                                 ]);
@@ -96,19 +114,6 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 }
             }));
             if (isJson()) {
-                const grouped = {};
-                await Promise.all(EXCHANGES.map(async (ex) => {
-                    try {
-                        const adapter = await getAdapterForExchange(ex);
-                        grouped[ex] = await adapter.getPositions();
-                        if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
-                            const hip3 = await fetchHip3Data(adapter, a => a.getPositions());
-                            for (const { dex, items } of hip3)
-                                grouped[`hip3:${dex}`] = items;
-                        }
-                    }
-                    catch { /* skip */ }
-                }));
                 return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
             }
             if (allRows.length === 0) {
@@ -149,7 +154,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             p.size,
             `$${formatUsd(p.entryPrice)}`,
             `$${formatUsd(p.markPrice)}`,
-            p.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(p.liquidationPrice)}`,
+            p.liquidationPrice === null ? chalk.gray("-") : `$${formatUsd(p.liquidationPrice)}`,
             formatPnl(p.unrealizedPnl),
             `${p.leverage}x`,
         ]);
@@ -164,7 +169,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 p.size,
                 `$${formatUsd(p.entryPrice)}`,
                 `$${formatUsd(p.markPrice)}`,
-                p.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(p.liquidationPrice)}`,
+                p.liquidationPrice === null ? chalk.gray("-") : `$${formatUsd(p.liquidationPrice)}`,
                 formatPnl(p.unrealizedPnl),
                 `${p.leverage}x`,
             ]);
@@ -178,21 +183,23 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .action(async (opts) => {
         const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
         if (!explicitExchange && getAdapterForExchange) {
+            const EXCHANGES = await listConfiguredAccountVenues();
             const allRows = [];
             const errors = {};
+            // One read per venue for both outputs: a venue that fails is an `errors` entry, never dropped.
+            const grouped = {};
             await Promise.all(EXCHANGES.map(async (ex) => {
                 try {
                     const adapter = await getAdapterForExchange(ex);
                     const orders = await adapter.getOpenOrders();
+                    grouped[ex] = orders;
                     for (const o of orders) {
                         allRows.push([
                             o.orderId,
                             chalk.white.bold(o.symbol),
-                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            chalk.gray(ex),
                             o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
-                            o.type,
-                            `$${formatUsd(o.price)}`,
-                            o.size,
+                            ...orderCells(o),
                             o.filled,
                             o.status,
                         ]);
@@ -201,15 +208,14 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                         const hip3 = await fetchHip3Data(adapter, a => a.getOpenOrders());
                         for (const { dex, items } of hip3) {
+                            grouped[`hip3:${dex}`] = items;
                             for (const o of items) {
                                 allRows.push([
                                     o.orderId,
                                     chalk.white.bold(o.symbol),
                                     chalk.magenta(dex),
                                     o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
-                                    o.type,
-                                    `$${formatUsd(o.price)}`,
-                                    o.size,
+                                    ...orderCells(o),
                                     o.filled,
                                     o.status,
                                 ]);
@@ -222,19 +228,6 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 }
             }));
             if (isJson()) {
-                const grouped = {};
-                await Promise.all(EXCHANGES.map(async (ex) => {
-                    try {
-                        const adapter = await getAdapterForExchange(ex);
-                        grouped[ex] = await adapter.getOpenOrders();
-                        if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
-                            const hip3 = await fetchHip3Data(adapter, a => a.getOpenOrders());
-                            for (const { dex, items } of hip3)
-                                grouped[`hip3:${dex}`] = items;
-                        }
-                    }
-                    catch { /* skip */ }
-                }));
                 return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
             }
             if (allRows.length === 0) {
@@ -243,7 +236,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     console.log(chalk.gray(`  ${ex}: ${msg}`));
                 return;
             }
-            console.log(makeTable(["ID", "Symbol", "Exch", "Side", "Type", "Price", "Size", "Filled", "Status"], allRows));
+            console.log(makeTable(["ID", "Symbol", "Exch", "Side", "Type", "Trigger", "Price", "Size", "Filled", "Status"], allRows));
             for (const [ex, msg] of Object.entries(errors))
                 console.log(chalk.gray(`  ${ex}: ${msg}`));
             return;
@@ -274,13 +267,11 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 o.orderId,
                 chalk.white.bold(o.symbol),
                 o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
-                o.type,
-                `$${formatUsd(o.price)}`,
-                o.size,
+                ...orderCells(o),
                 o.filled,
                 o.status,
             ]);
-            console.log(makeTable(["ID", "Symbol", "Side", "Type", "Price", "Size", "Filled", "Status"], rows));
+            console.log(makeTable(["ID", "Symbol", "Side", "Type", "Trigger", "Price", "Size", "Filled", "Status"], rows));
         }
         for (const { dex, items } of hip3Orders) {
             console.log(chalk.magenta.bold(`\n  HIP-3: ${dex}`));
@@ -288,13 +279,11 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 o.orderId,
                 chalk.white.bold(o.symbol),
                 o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
-                o.type,
-                `$${formatUsd(o.price)}`,
-                o.size,
+                ...orderCells(o),
                 o.filled,
                 o.status,
             ]);
-            console.log(makeTable(["ID", "Symbol", "Side", "Type", "Price", "Size", "Filled", "Status"], dexRows));
+            console.log(makeTable(["ID", "Symbol", "Side", "Type", "Trigger", "Price", "Size", "Filled", "Status"], dexRows));
         }
     });
     account
@@ -313,13 +302,11 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             o.orderId,
             chalk.white.bold(o.symbol),
             o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
-            o.type,
-            `$${formatUsd(o.price)}`,
-            o.size,
+            ...orderCells(o),
             o.filled,
             o.status,
         ]);
-        console.log(makeTable(["ID", "Symbol", "Side", "Type", "Price", "Size", "Filled", "Status"], rows));
+        console.log(makeTable(["ID", "Symbol", "Side", "Type", "Trigger", "Price", "Size", "Filled", "Status"], rows));
     });
     account
         .command("settings")
@@ -332,39 +319,39 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             const settings = await sdk.getAccountSettings(adapter.publicKey);
             if (isJson())
                 return printJson(jsonOk(settings));
-            if (!Array.isArray(settings) || settings.length === 0) {
-                console.log(chalk.gray("\n  No market settings configured.\n"));
+            // GET /account/settings returns an object; per-market entries are in `margin_settings`
+            // (only markets changed from the default cross / max leverage are listed).
+            const marginSettings = settings?.margin_settings;
+            if (!Array.isArray(marginSettings)) {
+                throw new PerpError("EXCHANGE_ERROR", `Pacifica /account/settings returned no margin_settings list (got ${JSON.stringify(settings).slice(0, 160)})`, { exchange: "pacifica" });
+            }
+            if (marginSettings.length === 0) {
+                console.log(chalk.gray("\n  No market settings configured (every market is at the default: cross margin, max leverage).\n"));
                 return;
             }
-            const rows = settings.map((s) => [
+            const rows = marginSettings.map((s) => [
                 chalk.white.bold(s.symbol),
-                s.margin_mode,
+                s.isolated ? "isolated" : "cross",
                 `${s.leverage}x`,
             ]);
             console.log(makeTable(["Symbol", "Margin Mode", "Leverage"], rows));
             return;
         }
-        // HL / Lighter: derive settings from open positions
-        const positions = await adapter.getPositions();
-        if (positions.length === 0) {
-            if (isJson())
-                return printJson(jsonOk([]));
-            console.log(chalk.gray("\n  No open positions — settings shown per active position.\n"));
-            return;
+        // Every other venue: the per-market leverage / margin mode the venue itself exposes
+        // (adapter.getMarketSettings). No read path → the uniform CAPABILITY_UNSUPPORTED; an
+        // empty answer is never printed as "no settings".
+        const read = adapter.getMarketSettings;
+        if (typeof read !== "function") {
+            throw unsupported(adapter.name, "accountSettings", "the adapter has no per-market leverage / margin-mode read", `Set them explicitly per market: perp trade leverage <symbol> <n> [--isolated] -e ${adapter.name}`);
         }
-        const settings = positions.map(p => ({
-            symbol: p.symbol,
-            leverage: p.leverage,
-            margin_mode: "cross", // HL/Lighter default to cross
-        }));
+        const rows = await read.call(adapter);
+        if (rows.length === 0) {
+            throw unsupported(adapter.name, "accountSettings", "the venue lists no per-market leverage / margin mode for this account (no market traded or configured yet)", `Set one: perp trade leverage <symbol> <n> [--isolated] -e ${adapter.name}`);
+        }
+        const settings = rows.map(r => ({ symbol: r.symbol, leverage: r.leverage, margin_mode: r.marginMode }));
         if (isJson())
             return printJson(jsonOk(settings));
-        const rows = settings.map((s) => [
-            chalk.white.bold(s.symbol),
-            s.margin_mode,
-            `${s.leverage}x`,
-        ]);
-        console.log(makeTable(["Symbol", "Margin Mode", "Leverage"], rows));
+        console.log(makeTable(["Symbol", "Margin Mode", "Leverage"], settings.map(s => [chalk.white.bold(s.symbol), s.margin_mode, `${s.leverage}x`])));
     });
     account
         .command("trades")
@@ -392,7 +379,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .command("funding-history")
         .alias("funding")
         .description("Personal funding payment history")
-        .option("-n, --limit <n>", "Number of records", "200")
+        .option("--limit <n>", "Number of records", "200")
         .action(async (opts) => {
         const adapter = await getAdapter();
         const payments = await adapter.getFundingPayments(parseInt(opts.limit));
@@ -428,6 +415,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 if (isJson())
                     return printJson(jsonError("POSITION_NOT_FOUND", `No open position for ${sym}`));
                 console.log(chalk.gray(`\n  No open position for ${sym}.\n`));
+                process.exitCode = 1;
                 return;
             }
             const positionNotional = Math.abs(Number(pos.size) * Number(pos.markPrice));
@@ -461,7 +449,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             console.log(`  Notional:         $${formatUsd(positionNotional)}`);
             console.log(`  Margin Required:  $${formatUsd(marginRequired)}`);
             console.log(`  Margin % Equity:  ${marginPct.toFixed(2)}%`);
-            console.log(`  Liquidation:      ${pos.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(pos.liquidationPrice)}`}`);
+            console.log(`  Liquidation:      ${pos.liquidationPrice === null ? chalk.gray("-") : `$${formatUsd(pos.liquidationPrice)}`}`);
             console.log(`  Unrealized PnL:   ${formatPnl(pos.unrealizedPnl)}`);
             console.log();
         }
@@ -476,6 +464,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 }));
             }
             console.error(chalk.red(`Error: ${msg}`));
+            process.exitCode = 1;
         }
     });
     // ── PnL Report ──
@@ -607,29 +596,18 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .command("twap-orders")
         .description("Active TWAP orders")
         .action(async () => {
-        let p;
-        try {
-            const adapter = await getAdapter();
-            p = pac(adapter);
-        }
-        catch (err) {
-            // pac() throws a generic "Market settings are only available on
-            // Pacifica" — replace with a TWAP-specific message so HL/LT/Aster
-            // users see what's actually unsupported. Codex QA matrix #1 fix.
-            const orig = err instanceof Error ? err.message : String(err);
-            const msg = orig.includes("only available on Pacifica")
-                ? "TWAP orders are a Pacifica-only feature."
-                : orig;
+        const adapter = await getAdapter();
+        if (!hasPacificaSdk(adapter)) {
+            const msg = "TWAP orders are a Pacifica-only feature.";
             if (isJson())
                 return printJson(jsonError("NOT_SUPPORTED", msg, {
                     details: { remediation: "Use 'perp -e pacifica account twap-orders'" },
                 }));
             console.error(chalk.red(`\n  ${msg}\n`));
-            if (orig.includes("only available on Pacifica")) {
-                console.error(chalk.gray(`  Run: perp -e pacifica account twap-orders\n`));
-            }
+            console.error(chalk.gray(`  Run: perp -e pacifica account twap-orders\n`));
             return;
         }
+        const p = pac(adapter);
         const sdk = p.sdk;
         const orders = await sdk.getTWAPOrders(p.publicKey);
         if (isJson())

package/dist/commands/agent-import.d.ts

@@ -0,0 +1,114 @@
+import type { AgentMeta, ArcusAgentMeta, OndoAgentMeta, QfexAgentMeta } from "../settings.js";
+import type { Network, VenueId } from "../exchanges/venue-types.js";
+/** Shown wherever an import is offered: what the imported key can and cannot do. */
+export declare const IMPORT_SCOPE_NOTE = "Trading works with the imported key. Deposits, withdrawals, transfers, referral and agent approvals need the master wallet \u2014 do them on the exchange website, or add the master with `perp wallet import`.";
+/**
+ * Printed on every import: an imported key is held in a local file protected only by file
+ * permissions (empty passphrase), and what it may do (withdraw, transfer) is decided on the
+ * exchange website when the key is created.
+ */
+export declare const IMPORT_KEY_WARNING = "The imported key is stored with an empty passphrase \u2014 it is protected by file permissions only. Its permissions (trade / withdraw) are set on the exchange website: create API keys WITHOUT withdraw permission.";
+export type ImportSecret = {
+    kind: "key";
+    key: string;
+} | {
+    kind: "ondo";
+    keyId: string;
+    secret: string;
+} | {
+    kind: "qfex";
+    publicKey: string;
+    secret: string;
+};
+/** The account a QFEX key was resolved to at import, shown for confirmation before anything is stored. */
+export interface ImportAccountBinding {
+    accountId: string;
+    isPrimaryAccount: boolean;
+    method: string;
+}
+export interface ImportAgentParams {
+    venue: VenueId;
+    network: Network;
+    /** null → defaultImportAgentName(venue, network). */
+    agentName: string | null;
+    /** Master / owner public address. Required for aster, pacifica, arcus; optional (cross-checked) for hyperliquid. */
+    masterAddress: string | null;
+    /** Lighter-family account index (required) / Arcus subaccount (optional, cross-checked). */
+    accountIndex: number | null;
+    /** Lighter-family API key slot (required). */
+    apiKeyIndex: number | null;
+    /** Expiry shown on the website, recorded when the venue does not report it (30d / 1y / ISO). null = unknown. */
+    expiresIn: string | null;
+    /** Replace an existing IMPORTED record of the same name (its local key is deleted first). */
+    replace: boolean;
+    secret: ImportSecret;
+    /** QFEX: the account UUID the key should trade (--account-id); null = the user's primary account. Other venues: null. */
+    accountId: string | null;
+    /**
+     * QFEX: confirms the RESOLVED account before anything is stored (interactive y/N, or — without
+     * a terminal — only an explicit --account-id that equals it). Other venues never call it.
+     */
+    confirmAccount: ((binding: ImportAccountBinding) => Promise<boolean>) | null;
+}
+export interface ImportVerification {
+    status: "verified" | "unverified";
+    /** How the key was checked (or why it could not be). */
+    method: string;
+}
+export interface ImportAgentOutcome {
+    venue: VenueId;
+    network: Network;
+    agentName: string;
+    source: "imported";
+    masterAddress: string;
+    agentAddress: string | null;
+    publicKey: string | null;
+    accountIndex: number | null;
+    apiKeyIndex: number | null;
+    /** QFEX: the account UUID the key is bound to; null for every other venue. */
+    accountId: string | null;
+    /** ISO expiry, or null when neither the venue nor --expires-in gave one. */
+    expiresAt: string | null;
+    /** Where the secret now lives (OWS wallet name / keystore path) — never the secret. */
+    storage: string;
+    verification: ImportVerification;
+    /** Shown with every import (IMPORT_KEY_WARNING). */
+    warnings: string[];
+}
+/** Default record name for an imported key (distinct from the approve default `perp-cli-*`). */
+export declare function defaultImportAgentName(venue: VenueId, network: Network): string;
+/** OWS wallet holding an imported EVM / Solana / Ed25519 agent key. */
+export declare function importedAgentWalletName(venue: "hyperliquid" | "aster" | "pacifica" | "arcus", agentName: string): string;
+/** Prompt label for the venue's secret. */
+export declare function importSecretLabel(venue: VenueId): string;
+/**
+ * Number of stdin lines the venue's secret takes (ondo: key id + secret; qfex: public key + secret; others: the key).
+ * Used by `perp setup --non-interactive --import-agents` to split stdin.
+ */
+export declare function importSecretLineCount(venue: VenueId): number;
+/** Turn the venue's stdin lines into an ImportSecret. */
+export declare function importSecretFromLines(venue: VenueId, lines: string[]): ImportSecret;
+/** Read the secret: hidden TTY prompt, else piped stdin (ondo: 2 lines key id + secret; others: 1 line). */
+export declare function readImportSecret(venue: VenueId): Promise<ImportSecret>;
+/** Venues whose import cannot be checked against the venue (stored as "unverified"). */
+export declare const UNVERIFIED_IMPORT_VENUES: readonly VenueId[];
+/**
+ * M3: a batch import (perp setup --import-agents) must not carry the same key for two venues
+ * (a mis-ordered paste). Compares every textual form (0x / case / Ed25519 seed). The error
+ * names venues only — never the key.
+ */
+export declare function assertDistinctImportSecrets(entries: ReadonlyArray<readonly [VenueId, ImportSecret]>): void;
+/** Delete the local key + record of an imported agent (the key stays authorized on the venue). */
+export declare function deleteImportedAgentLocal(venue: VenueId, network: Network, meta: AgentMeta | OndoAgentMeta | ArcusAgentMeta | QfexAgentMeta): Promise<{
+    keyRemoved: boolean;
+}>;
+/** A probed QFEX read permission: null = it could not be told (a never-funded account has no balance record to read). */
+export declare function qfexPermissionText(p: boolean | null): string;
+/**
+ * Import one website-created agent / API key. Verifies (where the venue allows) before storing;
+ * a refused verification stores nothing. Holds the venue's agent lock. Key material never
+ * appears in a thrown error.
+ */
+export declare function importVenueAgent(p: ImportAgentParams): Promise<ImportAgentOutcome>;
+/** Human summary of an import (public data only). */
+export declare function printImportOutcome(o: ImportAgentOutcome): void;