pandora-cli-skills 1.1.11 → 1.1.13

package/cli/pandora.cjs

@@ -27,6 +27,8 @@ const {
   runPolymarketApprove,
   runPolymarketPreflight,
 } = require('./lib/polymarket_ops_service.cjs');
+const { runResolve, runLp, runLpPositions } = require('./lib/market_admin_service.cjs');
+const { decodeContractError, formatDecodedContractError } = require('./lib/contract_error_decoder.cjs');
 const {
   defaultManifestFile: defaultMirrorManifestFile,
   findPair: findMirrorPair,
@@ -59,6 +61,8 @@ const COMMAND_TARGETS = {
 const OUTPUT_MODES = new Set(['table', 'json']);
 const DEFAULT_RPC_TIMEOUT_MS = 12_000;
 const DEFAULT_INDEXER_TIMEOUT_MS = 12_000;
+const DEFAULT_POLYMARKET_HOST = 'https://clob.polymarket.com';
+const DEFAULT_POLYMARKET_RPC_URL = 'https://polygon-bor-rpc.publicnode.com';
 const POSITIONS_ORDER_BY_FIELDS = ['lastTradeAt', 'id', 'chainId', 'marketAddress', 'user'];
 const POSITIONS_ORDER_BY_FIELD_SET = new Set(POSITIONS_ORDER_BY_FIELDS);
 const MARKET_LIFECYCLE_FILTERS = new Set(['all', 'active', 'resolved', 'expiring-soon']);
@@ -215,8 +219,8 @@ pandora - Prediction market CLI
 Usage:
   pandora [--output table|json] help
   pandora [--output table|json] init-env [--force] [--dotenv-path <path>] [--example <path>]
-  pandora [--output table|json] doctor [--dotenv-path <path>] [--skip-dotenv] [--check-usdc-code] [--rpc-timeout-ms <ms>]
-  pandora [--output table|json] setup [--force] [--dotenv-path <path>] [--example <path>] [--check-usdc-code] [--rpc-timeout-ms <ms>]
+  pandora [--output table|json] doctor [--dotenv-path <path>] [--skip-dotenv] [--check-usdc-code] [--check-polymarket] [--rpc-timeout-ms <ms>]
+  pandora [--output table|json] setup [--force] [--dotenv-path <path>] [--example <path>] [--check-usdc-code] [--check-polymarket] [--rpc-timeout-ms <ms>]
   pandora [--output table|json] markets list [--limit <n>] [--after <cursor>] [--before <cursor>] [--order-by <field>] [--order-direction asc|desc] [--chain-id <id>] [--creator <address>] [--poll-address <address>] [--market-type <type>] [--where-json <json>] [--active|--resolved|--expiring-soon] [--expiring-hours <n>] [--expand] [--with-odds]
   pandora [--output table|json] markets get [--id <id> ...] [--stdin]
   pandora [--output table|json] polls list [--limit <n>] [--after <cursor>] [--before <cursor>] [--order-by <field>] [--order-direction asc|desc] [--chain-id <id>] [--creator <address>] [--status <int>] [--category <int>] [--question-contains <text>] [--where-json <json>]
@@ -224,7 +228,7 @@ Usage:
   pandora [--output table|json] events list [--type all|liquidity|oracle-fee|claim] [--limit <n>] [--after <cursor>] [--before <cursor>] [--order-direction asc|desc] [--chain-id <id>] [--wallet <address>] [--market-address <address>] [--poll-address <address>] [--tx-hash <hash>]
   pandora [--output table|json] events get --id <id> [--type all|liquidity|oracle-fee|claim]
   pandora [--output table|json] positions list [--wallet <address>] [--market-address <address>] [--chain-id <id>] [--limit <n>] [--after <cursor>] [--before <cursor>] [--order-by <field>] [--order-direction asc|desc] [--where-json <json>]
-  pandora [--output table|json] portfolio --wallet <address> [--chain-id <id>] [--limit <n>] [--include-events|--no-events]
+  pandora [--output table|json] portfolio --wallet <address> [--chain-id <id>] [--limit <n>] [--include-events|--no-events] [--with-lp] [--rpc-url <url>]
   pandora [--output table|json] watch [--wallet <address>] [--market-address <address>] [--side yes|no] [--amount-usdc <amount>] [--iterations <n>] [--interval-ms <ms>] [--chain-id <id>] [--include-events|--no-events] [--yes-pct <0-100>] [--alert-yes-below <0-100>] [--alert-yes-above <0-100>] [--alert-net-liquidity-below <amount>] [--alert-net-liquidity-above <amount>] [--fail-on-alert]
   pandora [--output table|json] scan [--limit <n>] [--after <cursor>] [--before <cursor>] [--order-by <field>] [--order-direction asc|desc] [--chain-id <id>] [--creator <address>] [--poll-address <address>] [--market-type <type>] [--where-json <json>] [--expand] [--with-odds]
   pandora [--output table|json] quote [--indexer-url <url>] [--timeout-ms <ms>] --market-address <address> --side yes|no --amount-usdc <amount> [--yes-pct <0-100>] [--slippage-bps <0-10000>]
@@ -239,20 +243,20 @@ Usage:
   pandora [--output table|json] leaderboard [--metric profit|volume|win-rate] [--chain-id <id>] [--limit <n>] [--min-trades <n>]
   pandora [--output table|json] analyze --market-address <address> [--provider <name>] [--model <id>] [--max-cost-usd <n>] [--temperature <n>] [--timeout-ms <ms>]
   pandora [--output table|json] suggest --wallet <address> --risk low|medium|high --budget <amount> [--count <n>] [--include-venues pandora,polymarket]
-  pandora [--output table|json] resolve --poll-address <address> --answer yes|no|invalid --reason <text> --dry-run|--execute
-  pandora [--output table|json] lp add|remove|positions ...
+  pandora [--output table|json] resolve --poll-address <address> --answer yes|no --reason <text> --dry-run|--execute [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>]
+  pandora [--output table|json] lp add|remove|positions [--market-address <address>] [--wallet <address>] [--amount-usdc <n>] [--lp-tokens <n>] [--dry-run|--execute] [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>] [--usdc <address>] [--deadline-seconds <n>] [--indexer-url <url>] [--timeout-ms <ms>]
   pandora launch [--dotenv-path <path>] [--skip-dotenv] [script args...]
   pandora clone-bet [--dotenv-path <path>] [--skip-dotenv] [script args...]
 
 Examples:
   pandora setup
-  pandora --output json doctor --check-usdc-code
+  pandora --output json doctor --check-usdc-code --check-polymarket
   pandora markets list --active --with-odds --limit 10
   pandora markets get --id market-1 --id market-2
   pandora polls get --id 0xabc...
   pandora events list --type all --limit 25
   pandora positions list --wallet 0x1234...
-  pandora portfolio --wallet 0x1234... --chain-id 1
+  pandora portfolio --wallet 0x1234... --chain-id 1 --with-lp
   pandora watch --market-address 0xabc... --side yes --amount-usdc 10 --iterations 5 --interval-ms 2000
   pandora scan --limit 25 --chain-id 1 --with-odds
   pandora quote --market-address 0xabc... --side yes --amount-usdc 50
@@ -266,9 +270,9 @@ Examples:
   pandora mirror verify --pandora-market-address 0xabc... --polymarket-market-id 0xdef... --include-similarity
   pandora mirror go --polymarket-slug nba-mia-phi-2026-02-28 --liquidity-usdc 10 --paper
   pandora mirror sync once --pandora-market-address 0xabc... --polymarket-market-id 0xdef... --paper --hedge-ratio 1.0
-  pandora polymarket check --rpc-url https://polygon-rpc.com --private-key 0x... --funder 0xproxy...
-  pandora polymarket approve --dry-run --rpc-url https://polygon-rpc.com --private-key 0x... --funder 0xproxy...
-  pandora polymarket preflight --rpc-url https://polygon-rpc.com --private-key 0x... --funder 0xproxy...
+  pandora polymarket check --rpc-url https://polygon-bor-rpc.publicnode.com --private-key 0x... --funder 0xproxy...
+  pandora polymarket approve --dry-run --rpc-url https://polygon-bor-rpc.publicnode.com --private-key 0x... --funder 0xproxy...
+  pandora polymarket preflight --rpc-url https://polygon-bor-rpc.publicnode.com --private-key 0x... --funder 0xproxy...
   pandora mirror close --pandora-market-address 0xabc... --polymarket-market-id 0xdef... --dry-run
   pandora webhook test --webhook-url https://example.com/hook --webhook-template '{\"text\":\"{{message}}\"}'
   pandora leaderboard --metric profit --limit 20
@@ -884,6 +888,7 @@ function parseDoctorFlags(args) {
   let envFile = DEFAULT_ENV_FILE;
   let useEnvFile = true;
   let checkUsdcCode = false;
+  let checkPolymarket = false;
   let rpcTimeoutMs = DEFAULT_RPC_TIMEOUT_MS;
 
   for (let i = 0; i < args.length; i += 1) {
@@ -906,6 +911,11 @@ function parseDoctorFlags(args) {
       continue;
     }
 
+    if (token === '--check-polymarket') {
+      checkPolymarket = true;
+      continue;
+    }
+
     if (token === '--rpc-timeout-ms') {
       const next = requireFlagValue(args, i, '--rpc-timeout-ms');
       rpcTimeoutMs = parsePositiveInteger(next, '--rpc-timeout-ms');
@@ -916,7 +926,7 @@ function parseDoctorFlags(args) {
     throw new CliError('UNKNOWN_FLAG', `Unknown flag for doctor: ${token}`);
   }
 
-  return { envFile, useEnvFile, checkUsdcCode, rpcTimeoutMs };
+  return { envFile, useEnvFile, checkUsdcCode, checkPolymarket, rpcTimeoutMs };
 }
 
 function parseSetupFlags(args) {
@@ -924,6 +934,7 @@ function parseSetupFlags(args) {
   let exampleFile = DEFAULT_ENV_EXAMPLE;
   let force = false;
   let checkUsdcCode = false;
+  let checkPolymarket = false;
   let rpcTimeoutMs = DEFAULT_RPC_TIMEOUT_MS;
 
   for (let i = 0; i < args.length; i += 1) {
@@ -953,6 +964,11 @@ function parseSetupFlags(args) {
       continue;
     }
 
+    if (token === '--check-polymarket') {
+      checkPolymarket = true;
+      continue;
+    }
+
     if (token === '--rpc-timeout-ms') {
       const next = requireFlagValue(args, i, '--rpc-timeout-ms');
       rpcTimeoutMs = parsePositiveInteger(next, '--rpc-timeout-ms');
@@ -963,7 +979,7 @@ function parseSetupFlags(args) {
     throw new CliError('UNKNOWN_FLAG', `Unknown flag for setup: ${token}`);
   }
 
-  return { envFile, exampleFile, force, checkUsdcCode, rpcTimeoutMs };
+  return { envFile, exampleFile, force, checkUsdcCode, checkPolymarket, rpcTimeoutMs };
 }
 
 function parseInitEnvFlags(args) {
@@ -1648,6 +1664,8 @@ function parsePortfolioFlags(args) {
     chainId: null,
     limit: 100,
     includeEvents: true,
+    withLp: false,
+    rpcUrl: null,
   };
 
   for (let i = 0; i < args.length; i += 1) {
@@ -1681,6 +1699,17 @@ function parsePortfolioFlags(args) {
       continue;
     }
 
+    if (token === '--with-lp') {
+      options.withLp = true;
+      continue;
+    }
+
+    if (token === '--rpc-url') {
+      options.rpcUrl = requireFlagValue(args, i, '--rpc-url');
+      i += 1;
+      continue;
+    }
+
     throw new CliError('UNKNOWN_FLAG', `Unknown flag for portfolio: ${token}`);
   }
 
@@ -3207,6 +3236,7 @@ function parseMirrorSyncFlags(args) {
     maxTradesPerDay: null,
     cooldownMs: 60_000,
     depthSlippageBps: 100,
+    minTimeToCloseSec: 1800,
     iterations: null,
     stream: false,
     stateFile: null,
@@ -3334,6 +3364,17 @@ function parseMirrorSyncFlags(args) {
       i += 1;
       continue;
     }
+    if (token === '--min-time-to-close-sec') {
+      options.minTimeToCloseSec = parsePositiveInteger(
+        requireFlagValue(rest, i, '--min-time-to-close-sec'),
+        '--min-time-to-close-sec',
+      );
+      if (options.minTimeToCloseSec < 60) {
+        throw new CliError('INVALID_FLAG_VALUE', '--min-time-to-close-sec must be >= 60.');
+      }
+      i += 1;
+      continue;
+    }
     if (token === '--iterations') {
       options.iterations = parsePositiveInteger(requireFlagValue(rest, i, '--iterations'), '--iterations');
       i += 1;
@@ -3564,6 +3605,9 @@ function buildMirrorSyncDaemonCliArgs(options, shared) {
   }
   args.push('--cooldown-ms', String(options.cooldownMs));
   args.push('--depth-slippage-bps', String(options.depthSlippageBps));
+  if (options.minTimeToCloseSec !== 1800) {
+    args.push('--min-time-to-close-sec', String(options.minTimeToCloseSec));
+  }
   if (Number.isFinite(options.iterations) && options.iterations > 0) {
     args.push('--iterations', String(options.iterations));
   }
@@ -3577,7 +3621,6 @@ function buildMirrorSyncDaemonCliArgs(options, shared) {
     args.push('--chain-id', String(options.chainId));
   }
   if (options.rpcUrl) args.push('--rpc-url', options.rpcUrl);
-  if (options.privateKey) args.push('--private-key', options.privateKey);
   if (options.funder) args.push('--funder', options.funder);
   if (options.usdc) args.push('--usdc', options.usdc);
   if (options.polymarketHost) args.push('--polymarket-host', options.polymarketHost);
@@ -4203,6 +4246,9 @@ function parseResolveFlags(args) {
     reason: null,
     dryRun: false,
     execute: false,
+    chainId: null,
+    rpcUrl: null,
+    privateKey: null,
   };
 
   for (let i = 0; i < args.length; i += 1) {
@@ -4234,6 +4280,25 @@ function parseResolveFlags(args) {
       options.execute = true;
       continue;
     }
+    if (token === '--chain-id') {
+      options.chainId = parseInteger(requireFlagValue(args, i, '--chain-id'), '--chain-id');
+      i += 1;
+      continue;
+    }
+    if (token === '--rpc-url') {
+      options.rpcUrl = requireFlagValue(args, i, '--rpc-url');
+      i += 1;
+      continue;
+    }
+    if (token === '--private-key') {
+      const value = requireFlagValue(args, i, '--private-key');
+      if (!isValidPrivateKey(value)) {
+        throw new CliError('INVALID_FLAG_VALUE', '--private-key must be 0x + 64 hex chars.');
+      }
+      options.privateKey = value;
+      i += 1;
+      continue;
+    }
     throw new CliError('UNKNOWN_FLAG', `Unknown flag for resolve: ${token}`);
   }
 
@@ -4269,6 +4334,12 @@ function parseLpFlags(args) {
     chainId: null,
     dryRun: false,
     execute: false,
+    rpcUrl: null,
+    privateKey: null,
+    usdc: null,
+    deadlineSeconds: 1800,
+    indexerUrl: null,
+    timeoutMs: DEFAULT_INDEXER_TIMEOUT_MS,
   };
 
   for (let i = 0; i < rest.length; i += 1) {
@@ -4298,6 +4369,43 @@ function parseLpFlags(args) {
       i += 1;
       continue;
     }
+    if (token === '--rpc-url') {
+      options.rpcUrl = requireFlagValue(rest, i, '--rpc-url');
+      i += 1;
+      continue;
+    }
+    if (token === '--private-key') {
+      const value = requireFlagValue(rest, i, '--private-key');
+      if (!isValidPrivateKey(value)) {
+        throw new CliError('INVALID_FLAG_VALUE', '--private-key must be 0x + 64 hex chars.');
+      }
+      options.privateKey = value;
+      i += 1;
+      continue;
+    }
+    if (token === '--usdc') {
+      options.usdc = parseAddressFlag(requireFlagValue(rest, i, '--usdc'), '--usdc');
+      i += 1;
+      continue;
+    }
+    if (token === '--deadline-seconds') {
+      options.deadlineSeconds = parsePositiveInteger(requireFlagValue(rest, i, '--deadline-seconds'), '--deadline-seconds');
+      if (options.deadlineSeconds < 60) {
+        throw new CliError('INVALID_FLAG_VALUE', '--deadline-seconds must be >= 60.');
+      }
+      i += 1;
+      continue;
+    }
+    if (token === '--indexer-url') {
+      options.indexerUrl = requireFlagValue(rest, i, '--indexer-url');
+      i += 1;
+      continue;
+    }
+    if (token === '--timeout-ms') {
+      options.timeoutMs = parsePositiveInteger(requireFlagValue(rest, i, '--timeout-ms'), '--timeout-ms');
+      i += 1;
+      continue;
+    }
     if (token === '--dry-run') {
       options.dryRun = true;
       continue;
@@ -4378,6 +4486,42 @@ async function rpcRequest(rpcUrl, method, params, timeoutMs) {
   return payload.result;
 }
 
+async function probeHttpEndpoint(url, timeoutMs, method = 'HEAD') {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(url, {
+      method,
+      signal: controller.signal,
+    });
+    return {
+      ok: response.ok,
+      status: response.status,
+      error: response.ok ? null : `HTTP ${response.status}`,
+    };
+  } catch (err) {
+    if (err && err.name === 'AbortError') {
+      return { ok: false, status: null, error: `Request timed out after ${timeoutMs}ms.` };
+    }
+    return { ok: false, status: null, error: err && err.message ? err.message : String(err) };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+function hasPolymarketDoctorInputs() {
+  const keys = [
+    'POLYMARKET_HOST',
+    'POLYMARKET_RPC_URL',
+    'POLYMARKET_FUNDER',
+    'POLYMARKET_PRIVATE_KEY',
+    'POLYMARKET_API_KEY',
+    'POLYMARKET_API_SECRET',
+    'POLYMARKET_API_PASSPHRASE',
+  ];
+  return keys.some((key) => String(process.env[key] || '').trim().length > 0);
+}
+
 function validateEnvValues() {
   const missing = REQUIRED_ENV_KEYS.filter((key) => !process.env[key] || !String(process.env[key]).trim());
   const missingSet = new Set(missing);
@@ -4449,6 +4593,7 @@ async function buildDoctorReport(options) {
   }
 
   const envState = validateEnvValues();
+  const shouldCheckPolymarket = options.checkPolymarket || hasPolymarketDoctorInputs();
   const report = {
     env: {
       envFile: options.envFile,
@@ -4472,6 +4617,19 @@ async function buildDoctorReport(options) {
       error: null,
     },
     codeChecks: [],
+    polymarket: {
+      checked: shouldCheckPolymarket,
+      host: String(process.env.POLYMARKET_HOST || DEFAULT_POLYMARKET_HOST).trim() || DEFAULT_POLYMARKET_HOST,
+      rpcUrl: String(process.env.POLYMARKET_RPC_URL || DEFAULT_POLYMARKET_RPC_URL).trim() || DEFAULT_POLYMARKET_RPC_URL,
+      hostReachability: {
+        ok: null,
+        status: null,
+        error: null,
+      },
+      check: null,
+      failures: [],
+      warnings: [],
+    },
     summary: {
       ok: false,
       errorCount: 0,
@@ -4548,6 +4706,53 @@ async function buildDoctorReport(options) {
     report.codeChecks.push(check);
   }
 
+  if (shouldCheckPolymarket) {
+    const hostProbe = await probeHttpEndpoint(report.polymarket.host, options.rpcTimeoutMs, 'HEAD');
+    report.polymarket.hostReachability = hostProbe;
+    if (!hostProbe.ok) {
+      report.polymarket.failures.push(`Polymarket host reachability failed: ${hostProbe.error || 'unknown error'}`);
+    }
+
+    let polyCheck = null;
+    try {
+      polyCheck = await runPolymarketCheck({
+        rpcUrl: report.polymarket.rpcUrl,
+        privateKey: process.env.POLYMARKET_PRIVATE_KEY || null,
+        funder: process.env.POLYMARKET_FUNDER || null,
+        host: process.env.POLYMARKET_HOST || DEFAULT_POLYMARKET_HOST,
+      });
+      report.polymarket.check = polyCheck;
+    } catch (err) {
+      const message = err && err.message ? err.message : String(err);
+      report.polymarket.failures.push(`Polymarket check failed: ${message}`);
+      report.polymarket.check = null;
+    }
+
+    if (polyCheck) {
+      if (!polyCheck.chainOk || polyCheck.chainId !== 137) {
+        report.polymarket.failures.push(
+          `Polymarket RPC chain must be Polygon (137). Received: ${polyCheck.chainId === null ? 'unknown' : polyCheck.chainId}.`,
+        );
+      }
+      if (!polyCheck.runtime || !polyCheck.runtime.funderAddress) {
+        report.polymarket.failures.push('POLYMARKET_FUNDER is not configured.');
+      } else if (!polyCheck.ownership || polyCheck.ownership.funderCodePresent !== true) {
+        report.polymarket.failures.push('POLYMARKET_FUNDER does not appear to be a contract/proxy wallet.');
+      }
+      if (!polyCheck.ownership || polyCheck.ownership.ok !== true) {
+        report.polymarket.failures.push('Signer does not match/own configured POLYMARKET_FUNDER.');
+      }
+      if (!polyCheck.apiKeySanity || polyCheck.apiKeySanity.ok !== true) {
+        report.polymarket.failures.push(
+          `Polymarket API-key derivation/sanity failed (${polyCheck.apiKeySanity ? polyCheck.apiKeySanity.status : 'unknown'}).`,
+        );
+      }
+      if (Array.isArray(polyCheck.diagnostics) && polyCheck.diagnostics.length) {
+        report.polymarket.warnings.push(...polyCheck.diagnostics);
+      }
+    }
+  }
+
   const failures = [];
   if (!report.env.required.ok) {
     failures.push(...report.env.required.missing.map((name) => `Missing required env var: ${name}`));
@@ -4566,6 +4771,10 @@ async function buildDoctorReport(options) {
       report.summary.warningCount += 1;
     }
   }
+  if (shouldCheckPolymarket) {
+    failures.push(...report.polymarket.failures);
+    report.summary.warningCount += report.polymarket.warnings.length;
+  }
 
   report.summary.errorCount = failures.length;
   report.summary.ok = failures.length === 0;
@@ -4640,6 +4849,38 @@ function renderDoctorReportTable(report) {
     statusRows.push([`code:${check.key}`, status, detail]);
   }
 
+  if (report.polymarket && report.polymarket.checked) {
+    const host = report.polymarket.hostReachability || {};
+    statusRows.push([
+      'polymarket:host',
+      host.ok ? 'PASS' : 'FAIL',
+      host.ok ? `${report.polymarket.host} (${host.status})` : host.error || 'Unreachable',
+    ]);
+    const polyCheck = report.polymarket.check;
+    statusRows.push([
+      'polymarket:chain',
+      polyCheck && polyCheck.chainOk && polyCheck.chainId === 137 ? 'PASS' : 'FAIL',
+      polyCheck ? `chainId=${polyCheck.chainId} expected=137` : 'Unavailable',
+    ]);
+    statusRows.push([
+      'polymarket:funder',
+      polyCheck && polyCheck.ownership && polyCheck.ownership.funderCodePresent === true ? 'PASS' : 'FAIL',
+      polyCheck && polyCheck.runtime ? polyCheck.runtime.funderAddress || 'missing' : 'Unavailable',
+    ]);
+    statusRows.push([
+      'polymarket:ownership',
+      polyCheck && polyCheck.ownership && polyCheck.ownership.ok ? 'PASS' : 'FAIL',
+      polyCheck && polyCheck.ownership && polyCheck.ownership.ownerCheckError
+        ? polyCheck.ownership.ownerCheckError
+        : '',
+    ]);
+    statusRows.push([
+      'polymarket:api-key',
+      polyCheck && polyCheck.apiKeySanity && polyCheck.apiKeySanity.ok ? 'PASS' : 'FAIL',
+      polyCheck && polyCheck.apiKeySanity ? polyCheck.apiKeySanity.status : 'Unavailable',
+    ]);
+  }
+
   printTable(['Check', 'Status', 'Details'], statusRows);
 
   if (report.summary.ok) {
@@ -4652,6 +4893,13 @@ function renderDoctorReportTable(report) {
       }
     }
   }
+
+  if (report.polymarket && report.polymarket.checked && Array.isArray(report.polymarket.warnings) && report.polymarket.warnings.length) {
+    console.log('Polymarket diagnostics:');
+    for (const warning of report.polymarket.warnings) {
+      console.log(`- ${warning}`);
+    }
+  }
 }
 
 function renderSetupTable(data) {
@@ -4788,7 +5036,14 @@ function renderTradeTable(data) {
     ['quoteAvailable', data.quote && data.quote.quoteAvailable ? 'yes' : 'no'],
     ['account', data.account || ''],
     ['approveTxHash', data.approveTxHash || ''],
+    ['approveTxUrl', data.approveTxUrl || ''],
+    ['approveGasEstimate', data.approveGasEstimate || ''],
+    ['approveStatus', data.approveStatus || ''],
     ['buyTxHash', data.buyTxHash || ''],
+    ['buyTxUrl', data.buyTxUrl || ''],
+    ['buyGasEstimate', data.buyGasEstimate || ''],
+    ['buyStatus', data.buyStatus || ''],
+    ['finalStatus', data.finalStatus || ''],
     ['status', data.status || ''],
   ];
   printTable(['Field', 'Value'], rows);
@@ -4862,6 +5117,10 @@ function renderPortfolioTable(data) {
     ['cashflowNet', data.summary.cashflowNet],
     ['pnlProxy', data.summary.pnlProxy],
     ['eventsIncluded', data.summary.eventsIncluded ? 'yes' : 'no'],
+    ['lpIncluded', data.summary.lpIncluded ? 'yes' : 'no'],
+    ['lpPositionCount', data.summary.lpPositionCount === undefined ? '' : data.summary.lpPositionCount],
+    ['lpMarketsWithBalance', data.summary.lpMarketsWithBalance === undefined ? '' : data.summary.lpMarketsWithBalance],
+    ['lpEstimatedCollateralOutUsdc', data.summary.lpEstimatedCollateralOutUsdc === undefined ? '' : data.summary.lpEstimatedCollateralOutUsdc],
     ['diagnostic', data.summary.diagnostic || ''],
   ];
 
@@ -4878,6 +5137,19 @@ function renderPortfolioTable(data) {
       ]),
     );
   }
+
+  if (Array.isArray(data.lpPositions) && data.lpPositions.length) {
+    console.log('');
+    printTable(
+      ['LP Market', 'LP Tokens', 'Est. Collateral Out (USDC)', 'Diagnostics'],
+      data.lpPositions.map((item) => [
+        short(item.marketAddress, 18),
+        item.lpTokenBalance || '',
+        item.preview && item.preview.collateralOutUsdc ? item.preview.collateralOutUsdc : '',
+        short(Array.isArray(item.diagnostics) ? item.diagnostics.join('; ') : '', 56),
+      ]),
+    );
+  }
 }
 
 function renderWatchTable(data) {
@@ -5081,6 +5353,15 @@ function renderMirrorPlanTable(data) {
 function renderMirrorBrowseTable(data) {
   if (!Array.isArray(data.items) || !data.items.length) {
     console.log('No mirrorable markets found for current filters.');
+    if (data.gammaApiError) {
+      console.log(`Gamma API error: ${data.gammaApiError}`);
+    }
+    if (Array.isArray(data.diagnostics) && data.diagnostics.length) {
+      console.log('Diagnostics:');
+      for (const diagnostic of data.diagnostics) {
+        console.log(`- ${diagnostic}`);
+      }
+    }
     return;
   }
 
@@ -5095,6 +5376,18 @@ function renderMirrorBrowseTable(data) {
       short(item.question || '', 72),
     ]),
   );
+
+  if (Array.isArray(data.diagnostics) && data.diagnostics.length) {
+    console.log('');
+    console.log('Diagnostics:');
+    for (const diagnostic of data.diagnostics) {
+      console.log(`- ${diagnostic}`);
+    }
+  }
+  if (data.gammaApiError) {
+    console.log('');
+    console.log(`Gamma API error: ${data.gammaApiError}`);
+  }
 }
 
 function renderMirrorDeployTable(data) {
@@ -6379,34 +6672,107 @@ async function executeTradeOnchain(options) {
   const publicClient = createPublicClient({ chain: runtime.chain, transport: http(runtime.rpcUrl) });
   const walletClient = createWalletClient({ account, chain: runtime.chain, transport: http(runtime.rpcUrl) });
 
+  const marketCode = await publicClient.getBytecode({ address: options.marketAddress });
+  if (!marketCode || marketCode === '0x' || marketCode === '0x0') {
+    throw new CliError(
+      'MARKET_ADDRESS_NO_CODE',
+      `--market-address has no bytecode on chain ${runtime.chainId}: ${options.marketAddress}`,
+      {
+        chainId: runtime.chainId,
+        marketAddress: options.marketAddress,
+      },
+    );
+  }
+
   const amountRaw = parseUnits(String(options.amountUsdc), 6);
   const minSharesOutRaw = options.minSharesOutRaw === null ? 0n : options.minSharesOutRaw;
+  const explorerBase = runtime.chainId === 1 ? 'https://etherscan.io/tx/' : 'https://sonicscan.org/tx/';
+  const toExplorerUrl = (hash) => (hash ? `${explorerBase}${hash}` : null);
+  const decodeTradeError = async (error, code, fallbackMessage, details = {}) => {
+    const decoded = await decodeContractError(error);
+    const decodedMessage = formatDecodedContractError(decoded);
+    const causeMessage =
+      (error && (error.shortMessage || error.message)) || formatErrorValue(error) || fallbackMessage;
+    throw new CliError(code, decodedMessage || causeMessage || fallbackMessage, {
+      ...details,
+      decodedError: decoded,
+      cause: causeMessage,
+    });
+  };
 
-  const allowance = await publicClient.readContract({
-    address: runtime.usdcAddress,
-    abi: ERC20_ABI,
-    functionName: 'allowance',
-    args: [account.address, options.marketAddress],
-  });
-
-  let approveTxHash = null;
-  if (allowance < amountRaw) {
-    approveTxHash = await walletClient.writeContract({
+  let allowance;
+  try {
+    allowance = await publicClient.readContract({
       address: runtime.usdcAddress,
       abi: ERC20_ABI,
-      functionName: 'approve',
-      args: [options.marketAddress, amountRaw],
+      functionName: 'allowance',
+      args: [account.address, options.marketAddress],
+    });
+  } catch (error) {
+    await decodeTradeError(error, 'ALLOWANCE_READ_FAILED', 'Failed to read USDC allowance.', {
+      stage: 'allowance-read',
+      usdc: runtime.usdcAddress,
     });
-    await publicClient.waitForTransactionReceipt({ hash: approveTxHash });
   }
 
-  const buyTxHash = await walletClient.writeContract({
-    address: options.marketAddress,
-    abi: PARI_MUTUEL_ABI,
-    functionName: 'buy',
-    args: [options.side === 'yes', amountRaw, minSharesOutRaw],
-  });
-  await publicClient.waitForTransactionReceipt({ hash: buyTxHash });
+  let approveTxHash = null;
+  let approveGasEstimate = null;
+  let approveStatus = null;
+  if (allowance < amountRaw) {
+    let approveSimulation;
+    try {
+      approveSimulation = await publicClient.simulateContract({
+        account,
+        address: runtime.usdcAddress,
+        abi: ERC20_ABI,
+        functionName: 'approve',
+        args: [options.marketAddress, amountRaw],
+      });
+      approveGasEstimate =
+        approveSimulation && approveSimulation.request && approveSimulation.request.gas
+          ? approveSimulation.request.gas.toString()
+          : null;
+    } catch (error) {
+      await decodeTradeError(error, 'APPROVE_SIMULATION_FAILED', 'USDC approve simulation failed.', {
+        stage: 'approve-simulate',
+      });
+    }
+    try {
+      approveTxHash = await walletClient.writeContract(approveSimulation.request);
+      const approveReceipt = await publicClient.waitForTransactionReceipt({ hash: approveTxHash });
+      approveStatus = approveReceipt && approveReceipt.status ? approveReceipt.status : null;
+    } catch (error) {
+      await decodeTradeError(error, 'APPROVE_EXECUTION_FAILED', 'USDC approve transaction failed.', {
+        stage: 'approve-execute',
+        approveTxHash,
+      });
+    }
+  }
+
+  let buyTxHash = null;
+  let buyGasEstimate = null;
+  let buyStatus = null;
+  try {
+    const buySimulation = await publicClient.simulateContract({
+      account,
+      address: options.marketAddress,
+      abi: PARI_MUTUEL_ABI,
+      functionName: 'buy',
+      args: [options.side === 'yes', amountRaw, minSharesOutRaw],
+    });
+    buyGasEstimate =
+      buySimulation && buySimulation.request && buySimulation.request.gas
+        ? buySimulation.request.gas.toString()
+        : null;
+    buyTxHash = await walletClient.writeContract(buySimulation.request);
+    const buyReceipt = await publicClient.waitForTransactionReceipt({ hash: buyTxHash });
+    buyStatus = buyReceipt && buyReceipt.status ? buyReceipt.status : null;
+  } catch (error) {
+    await decodeTradeError(error, 'TRADE_EXECUTION_FAILED', 'Buy transaction failed.', {
+      stage: 'buy',
+      buyTxHash,
+    });
+  }
 
   return {
     chainId: runtime.chainId,
@@ -6415,7 +6781,14 @@ async function executeTradeOnchain(options) {
     amountRaw: amountRaw.toString(),
     minSharesOutRaw: minSharesOutRaw.toString(),
     approveTxHash,
+    approveTxUrl: toExplorerUrl(approveTxHash),
+    approveGasEstimate,
+    approveStatus,
     buyTxHash,
+    buyTxUrl: toExplorerUrl(buyTxHash),
+    buyGasEstimate,
+    buyStatus,
+    status: buyStatus || 'confirmed',
   };
 }
 
@@ -6492,7 +6865,14 @@ async function runTradeCommand(args, context) {
     account: execution.account,
     usdc: execution.usdc,
     approveTxHash: execution.approveTxHash,
+    approveTxUrl: execution.approveTxUrl,
+    approveGasEstimate: execution.approveGasEstimate,
+    approveStatus: execution.approveStatus,
     buyTxHash: execution.buyTxHash,
+    buyTxUrl: execution.buyTxUrl,
+    buyGasEstimate: execution.buyGasEstimate,
+    buyStatus: execution.buyStatus,
+    finalStatus: execution.status,
     quote,
   };
 
@@ -7023,6 +7403,7 @@ async function collectPortfolioSnapshot(indexerUrl, options, timeoutMs) {
   const positionsPage = await fetchPortfolioPositions(indexerUrl, options, timeoutMs);
   let liquidityPage = { items: [] };
   let claimPage = { items: [] };
+  let lpPayload = null;
 
   if (options.includeEvents) {
     [liquidityPage, claimPage] = await Promise.all([
@@ -7031,21 +7412,37 @@ async function collectPortfolioSnapshot(indexerUrl, options, timeoutMs) {
     ]);
   }
 
+  if (options.withLp) {
+    lpPayload = await runLpPositions({
+      wallet: options.wallet,
+      chainId: options.chainId,
+      rpcUrl: options.rpcUrl || null,
+      indexerUrl,
+      timeoutMs,
+    });
+  }
+
   const positions = Array.isArray(positionsPage.items) ? positionsPage.items : [];
   const liquidityEvents = Array.isArray(liquidityPage.items) ? liquidityPage.items : [];
   const claimEvents = Array.isArray(claimPage.items) ? claimPage.items : [];
+  const lpPositions = Array.isArray(lpPayload && lpPayload.items) ? lpPayload.items : [];
+  const lpDiagnostics = Array.isArray(lpPayload && lpPayload.diagnostics) ? lpPayload.diagnostics : [];
 
   return {
-    summary: summarizePortfolio(options, positions, liquidityEvents, claimEvents),
+    summary: summarizePortfolio(options, positions, liquidityEvents, claimEvents, lpPositions, lpDiagnostics),
     positions,
+    lpPositions,
     events: {
       liquidity: liquidityEvents,
       claims: claimEvents,
     },
+    diagnostics: {
+      lp: lpDiagnostics,
+    },
   };
 }
 
-function summarizePortfolio(options, positions, liquidityEvents, claimEvents) {
+function summarizePortfolio(options, positions, liquidityEvents, claimEvents, lpPositions = [], lpDiagnostics = []) {
   const uniqueMarkets = new Set(
     positions
       .map((item) => normalizeLookupKey(item && item.marketAddress))
@@ -7079,6 +7476,28 @@ function summarizePortfolio(options, positions, liquidityEvents, claimEvents) {
   if (options.chainId !== null && options.includeEvents) {
     diagnostics.push('Claim events are not chain-filtered by indexer schema; values may span chains.');
   }
+  if (options.withLp && !lpPositions.length) {
+    diagnostics.push('No LP positions found for this wallet/filter.');
+  }
+  if (options.withLp && lpDiagnostics.length) {
+    diagnostics.push(...lpDiagnostics);
+  }
+
+  const lpPositionCount = Array.isArray(lpPositions) ? lpPositions.length : 0;
+  const lpMarketsWithBalance = lpPositions.filter((item) => {
+    try {
+      return BigInt(item && item.lpTokenBalanceRaw ? item.lpTokenBalanceRaw : '0') > 0n;
+    } catch {
+      return false;
+    }
+  }).length;
+  const lpEstimatedCollateralOutUsdc = toFixedNumber(
+    lpPositions.reduce((sum, item) => {
+      const value = Number(item && item.preview && item.preview.collateralOutUsdc);
+      return Number.isFinite(value) ? sum + value : sum;
+    }, 0),
+    6,
+  );
 
   return {
     positionCount: positions.length,
@@ -7090,6 +7509,10 @@ function summarizePortfolio(options, positions, liquidityEvents, claimEvents) {
     cashflowNet,
     pnlProxy: cashflowNet,
     eventsIncluded: options.includeEvents,
+    lpIncluded: Boolean(options.withLp),
+    lpPositionCount,
+    lpMarketsWithBalance,
+    lpEstimatedCollateralOutUsdc,
     diagnostic: diagnostics.join(' '),
   };
 }
@@ -7189,9 +7612,12 @@ async function runPortfolioCommand(args, context) {
     wallet: options.wallet,
     chainId: options.chainId,
     limit: options.limit,
+    withLp: options.withLp,
     summary: snapshot.summary,
     positions: snapshot.positions,
+    lpPositions: snapshot.lpPositions,
     events: snapshot.events,
+    diagnostics: snapshot.diagnostics,
   };
 
   emitSuccess(context.outputMode, 'portfolio', payload, renderPortfolioTable);
@@ -8288,7 +8714,7 @@ async function runMirrorCommand(args, context) {
           'mirror.sync.help',
           {
             usage:
-              'pandora [--output table|json] mirror sync run|once|start|stop|status --pandora-market-address <address> --polymarket-market-id <id>|--polymarket-slug <slug> [--paper|--execute-live] [--private-key <hex>] [--funder <address>] [--trust-deploy] [--daemon] [--stream] [--interval-ms <ms>] [--drift-trigger-bps <n>] [--hedge-trigger-usdc <n>] [--hedge-ratio <n>] [--no-hedge] [--max-rebalance-usdc <n>] [--max-hedge-usdc <n>] [--max-open-exposure-usdc <n>] [--max-trades-per-day <n>] [--cooldown-ms <ms>] [--state-file <path>] [--kill-switch-file <path>]',
+              'pandora [--output table|json] mirror sync run|once|start|stop|status --pandora-market-address <address> --polymarket-market-id <id>|--polymarket-slug <slug> [--paper|--execute-live] [--private-key <hex>] [--funder <address>] [--trust-deploy] [--daemon] [--stream] [--interval-ms <ms>] [--drift-trigger-bps <n>] [--hedge-trigger-usdc <n>] [--hedge-ratio <n>] [--no-hedge] [--max-rebalance-usdc <n>] [--max-hedge-usdc <n>] [--max-open-exposure-usdc <n>] [--max-trades-per-day <n>] [--cooldown-ms <ms>] [--min-time-to-close-sec <n>] [--state-file <path>] [--kill-switch-file <path>]',
             daemonLifecycle: {
               start:
                 'pandora [--output table|json] mirror sync start --pandora-market-address <address> --polymarket-market-id <id>|--polymarket-slug <slug> [run flags]',
@@ -8317,7 +8743,7 @@ async function runMirrorCommand(args, context) {
         );
       } else {
         console.log(
-          'Usage: pandora [--output table|json] mirror sync run|once|start|stop|status --pandora-market-address <address> --polymarket-market-id <id>|--polymarket-slug <slug> [--paper|--execute-live] [--private-key <hex>] [--funder <address>] [--trust-deploy] [--daemon] [--stream] [--interval-ms <ms>] [--drift-trigger-bps <n>] [--hedge-trigger-usdc <n>] [--hedge-ratio <n>] [--no-hedge] [--max-rebalance-usdc <n>] [--max-hedge-usdc <n>] [--max-open-exposure-usdc <n>] [--max-trades-per-day <n>] [--cooldown-ms <ms>] [--state-file <path>] [--kill-switch-file <path>]',
+          'Usage: pandora [--output table|json] mirror sync run|once|start|stop|status --pandora-market-address <address> --polymarket-market-id <id>|--polymarket-slug <slug> [--paper|--execute-live] [--private-key <hex>] [--funder <address>] [--trust-deploy] [--daemon] [--stream] [--interval-ms <ms>] [--drift-trigger-bps <n>] [--hedge-trigger-usdc <n>] [--hedge-ratio <n>] [--no-hedge] [--max-rebalance-usdc <n>] [--max-hedge-usdc <n>] [--max-open-exposure-usdc <n>] [--max-trades-per-day <n>] [--cooldown-ms <ms>] [--min-time-to-close-sec <n>] [--state-file <path>] [--kill-switch-file <path>]',
         );
         console.log('Daemon stop: pandora mirror sync stop --pid-file <path>|--strategy-hash <hash>');
         console.log('Daemon status: pandora mirror sync status --pid-file <path>|--strategy-hash <hash>');
@@ -8391,6 +8817,15 @@ async function runMirrorCommand(args, context) {
         },
         shared,
       );
+      const daemonEnv = {
+        ...process.env,
+      };
+      if (options.privateKey) {
+        daemonEnv.POLYMARKET_PRIVATE_KEY = options.privateKey;
+      }
+      if (options.funder) {
+        daemonEnv.POLYMARKET_FUNDER = options.funder;
+      }
 
       let payload;
       try {
@@ -8399,7 +8834,7 @@ async function runMirrorCommand(args, context) {
           cliPath: __filename,
           cliArgs: daemonCliArgs,
           cwd: process.cwd(),
-          env: process.env,
+          env: daemonEnv,
           mode: 'run',
           executeLive: options.executeLive,
           stateFile: options.stateFile,
@@ -8867,48 +9302,64 @@ async function runSuggestCommand(args, context) {
   emitSuccess(context.outputMode, 'suggest', payload, renderSuggestTable);
 }
 
-function runResolveCommand(args, context) {
+async function runResolveCommand(args, context) {
   if (includesHelpFlag(args)) {
     if (context.outputMode === 'json') {
       emitSuccess(
         context.outputMode,
         'resolve.help',
         commandHelpPayload(
-          'pandora [--output table|json] resolve --poll-address <address> --answer yes|no|invalid --reason <text> --dry-run|--execute',
+          'pandora [--output table|json] resolve --poll-address <address> --answer yes|no --reason <text> --dry-run|--execute [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>]',
         ),
       );
     } else {
       console.log(
-        'Usage: pandora [--output table|json] resolve --poll-address <address> --answer yes|no|invalid --reason <text> --dry-run|--execute',
+        'Usage: pandora [--output table|json] resolve --poll-address <address> --answer yes|no --reason <text> --dry-run|--execute [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>]',
       );
     }
     return;
   }
-  parseResolveFlags(args);
-  throw new CliError(
-    'ABI_READY_REQUIRED',
-    'resolve is ABI-gated and not available yet. Commit verified ABI signatures/events and tests first.',
-    { command: 'resolve' },
-  );
+  const options = parseResolveFlags(args);
+  let payload;
+  try {
+    payload = await runResolve(options);
+  } catch (err) {
+    if (err && err.code) {
+      throw new CliError(err.code, err.message || 'resolve command failed.', err.details);
+    }
+    throw err;
+  }
+  emitSuccess(context.outputMode, 'resolve', payload, renderSingleEntityTable);
 }
 
-function runLpCommand(args, context) {
+async function runLpCommand(args, context) {
   if (includesHelpFlag(args)) {
     if (context.outputMode === 'json') {
-      emitSuccess(context.outputMode, 'lp.help', commandHelpPayload('pandora [--output table|json] lp add|remove|positions ...'));
+      emitSuccess(
+        context.outputMode,
+        'lp.help',
+        commandHelpPayload(
+          'pandora [--output table|json] lp add|remove|positions [--market-address <address>] [--wallet <address>] [--amount-usdc <n>] [--lp-tokens <n>] [--dry-run|--execute] [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>] [--usdc <address>] [--deadline-seconds <n>] [--indexer-url <url>] [--timeout-ms <ms>]',
+        ),
+      );
     } else {
       console.log(
-        'Usage: pandora [--output table|json] lp add|remove|positions ...',
+        'Usage: pandora [--output table|json] lp add|remove|positions [--market-address <address>] [--wallet <address>] [--amount-usdc <n>] [--lp-tokens <n>] [--dry-run|--execute] [--chain-id <id>] [--rpc-url <url>] [--private-key <hex>] [--usdc <address>] [--deadline-seconds <n>] [--indexer-url <url>] [--timeout-ms <ms>]',
       );
     }
     return;
   }
-  parseLpFlags(args);
-  throw new CliError(
-    'ABI_READY_REQUIRED',
-    'lp is ABI-gated and not available yet. Commit verified ABI signatures/events and tests first.',
-    { command: 'lp' },
-  );
+  const options = parseLpFlags(args);
+  let payload;
+  try {
+    payload = await runLp(options);
+  } catch (err) {
+    if (err && err.code) {
+      throw new CliError(err.code, err.message || 'lp command failed.', err.details);
+    }
+    throw err;
+  }
+  emitSuccess(context.outputMode, 'lp', payload, renderSingleEntityTable);
 }
 
 function runInitEnv(args, outputMode) {
@@ -9003,6 +9454,7 @@ async function runSetup(args, outputMode) {
     envFile: options.envFile,
     useEnvFile: true,
     checkUsdcCode: options.checkUsdcCode,
+    checkPolymarket: options.checkPolymarket,
     rpcTimeoutMs: options.rpcTimeoutMs,
   });
 
@@ -9146,12 +9598,12 @@ async function dispatch(command, args, context) {
   }
 
   if (command === 'resolve') {
-    runResolveCommand(args, context);
+    await runResolveCommand(args, context);
     return;
   }
 
   if (command === 'lp') {
-    runLpCommand(args, context);
+    await runLpCommand(args, context);
     return;
   }
 
@@ -9185,6 +9637,10 @@ async function main() {
     return;
   }
 
+  if (args[0] === 'pandora') {
+    args = args.slice(1);
+  }
+
   const command = args[0];
   const commandArgs = args.slice(1);