hedgequantx 2.9.81 → 2.9.83

package/dist/lib/m/hqx-2b.js

@@ -463,6 +463,8 @@ var require_core = __commonJS({
         this.barHistory = /* @__PURE__ */ new Map();
         this.swingPoints = /* @__PURE__ */ new Map();
         this.liquidityZones = /* @__PURE__ */ new Map();
+        this.currentBar = /* @__PURE__ */ new Map();
+        this.barIntervalMs = 6e4;
         this.lastSignalTime = 0;
         this.stats = { signals: 0, trades: 0, wins: 0, losses: 0, pnl: 0 };
         this.recentTrades = [];
@@ -475,26 +477,64 @@ var require_core = __commonJS({
         this.barHistory.set(contractId, []);
         this.swingPoints.set(contractId, []);
         this.liquidityZones.set(contractId, []);
+        this.currentBar.delete(contractId);
         this.emit("log", {
           type: "info",
-          message: `[HQX-2B] Initialized for ${contractId}: tick=${tickSize}, value=${tickValue}`
+          message: `[HQX-2B] Initialized for ${contractId}: tick=${tickSize}, value=${tickValue}, TF=1min`
         });
         this.emit("log", {
           type: "info",
           message: `[HQX-2B] Params: Stop=${this.config.execution.stopTicks}t, Target=${this.config.execution.targetTicks}t, BE=${this.config.execution.breakevenTicks}t, Trail=${this.config.execution.trailTriggerTicks}/${this.config.execution.trailDistanceTicks}`
         });
       }
+      /**
+       * Process incoming tick and aggregate into 1-minute bars
+       * Only calls processBar() when a bar closes (every 60 seconds)
+       */
       processTick(tick) {
         const { contractId, price, volume, timestamp } = tick;
-        const bar = {
-          timestamp: timestamp || Date.now(),
-          open: price,
-          high: price,
-          low: price,
-          close: price,
-          volume: volume || 1
-        };
-        return this.processBar(contractId, bar);
+        const ts = timestamp || Date.now();
+        const vol = volume || 1;
+        let bar = this.currentBar.get(contractId);
+        const barStartTime = Math.floor(ts / this.barIntervalMs) * this.barIntervalMs;
+        if (!bar || bar.startTime !== barStartTime) {
+          if (bar) {
+            const closedBar = {
+              timestamp: bar.startTime,
+              open: bar.open,
+              high: bar.high,
+              low: bar.low,
+              close: bar.close,
+              volume: bar.volume
+            };
+            const signal = this.processBar(contractId, closedBar);
+            this.currentBar.set(contractId, {
+              startTime: barStartTime,
+              open: price,
+              high: price,
+              low: price,
+              close: price,
+              volume: vol
+            });
+            return signal;
+          } else {
+            this.currentBar.set(contractId, {
+              startTime: barStartTime,
+              open: price,
+              high: price,
+              low: price,
+              close: price,
+              volume: vol
+            });
+            return null;
+          }
+        } else {
+          bar.high = Math.max(bar.high, price);
+          bar.low = Math.min(bar.low, price);
+          bar.close = price;
+          bar.volume += vol;
+          return null;
+        }
       }
       onTick(tick) {
         return this.processTick(tick);
@@ -622,6 +662,7 @@ var require_core = __commonJS({
         this.barHistory.set(contractId, []);
         this.swingPoints.set(contractId, []);
         this.liquidityZones.set(contractId, []);
+        this.currentBar.delete(contractId);
         this.emit("log", {
           type: "info",
           message: `[HQX-2B] Reset state for ${contractId}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.9.81",
+  "version": "2.9.83",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/config/constants.js

@@ -51,10 +51,46 @@ const ORDER_SIDE = {
 
 // All symbols/contracts come from Rithmic API (TICKER_PLANT)
 
+// Contract descriptions for display (API only returns short codes)
+const CONTRACT_DESCRIPTIONS = {
+  // Equity Index Futures
+  ES: 'E-mini S&P 500', MES: 'Micro E-mini S&P 500',
+  NQ: 'E-mini Nasdaq 100', MNQ: 'Micro E-mini Nasdaq',
+  RTY: 'E-mini Russell 2000', M2K: 'Micro E-mini Russell',
+  YM: 'E-mini Dow $5', MYM: 'Micro E-mini Dow',
+  EMD: 'E-mini S&P MidCap', NKD: 'Nikkei 225',
+  // Metals
+  GC: 'Gold', MGC: 'Micro Gold', '1OZ': 'Micro Gold (1oz)',
+  SI: 'Silver', SIL: 'Micro Silver', HG: 'Copper', MHG: 'Micro Copper',
+  PL: 'Platinum', PA: 'Palladium',
+  // Energy
+  CL: 'Crude Oil WTI', MCL: 'Micro Crude Oil', NG: 'Natural Gas',
+  BZ: 'Brent Crude', RB: 'RBOB Gasoline', HO: 'Heating Oil',
+  // Currencies
+  '6E': 'Euro FX', M6E: 'Micro Euro', '6B': 'British Pound', M6B: 'Micro GBP',
+  '6A': 'Australian $', M6A: 'Micro AUD', '6J': 'Japanese Yen',
+  '6C': 'Canadian $', '6S': 'Swiss Franc', '6N': 'New Zealand $',
+  '6M': 'Mexican Peso', E7: 'E-mini Euro',
+  // Crypto
+  BTC: 'Bitcoin', MBT: 'Micro Bitcoin', ETH: 'Ether', MET: 'Micro Ether',
+  // Treasuries
+  ZB: '30Y T-Bond', ZN: '10Y T-Note', ZF: '5Y T-Note', ZT: '2Y T-Note',
+  ZQ: '30-Day Fed Funds', TN: 'Ultra 10Y',
+  // Grains
+  ZC: 'Corn', ZS: 'Soybeans', ZW: 'Wheat', ZM: 'Soybean Meal',
+  ZL: 'Soybean Oil', ZO: 'Oats',
+  // Livestock
+  LE: 'Live Cattle', HE: 'Lean Hogs', GF: 'Feeder Cattle',
+};
+
+const getContractDescription = (baseSymbol) => CONTRACT_DESCRIPTIONS[baseSymbol] || baseSymbol;
+
 module.exports = {
   ACCOUNT_STATUS,
   ACCOUNT_TYPE,
   ORDER_STATUS,
   ORDER_TYPE,
-  ORDER_SIDE
+  ORDER_SIDE,
+  CONTRACT_DESCRIPTIONS,
+  getContractDescription,
 };

package/src/config/index.js

@@ -17,6 +17,8 @@ const {
   ORDER_STATUS,
   ORDER_TYPE,
   ORDER_SIDE,
+  CONTRACT_DESCRIPTIONS,
+  getContractDescription,
 } = require('./constants');
 
 const {
@@ -43,6 +45,8 @@ module.exports = {
   ORDER_STATUS,
   ORDER_TYPE,
   ORDER_SIDE,
+  CONTRACT_DESCRIPTIONS,
+  getContractDescription,
 
   // Settings
   TIMEOUTS,

package/src/pages/algo/copy-trading.js

@@ -9,6 +9,7 @@ const ora = require('ora');
 
 const { connections } = require('../../services');
 const { prompts } = require('../../utils');
+const { getContractDescription } = require('../../config');
 const { checkMarketHours } = require('../../services/rithmic/market');
 const { getActiveAgentCount, getSupervisionConfig, getActiveAgents } = require('../ai-agents');
 const { launchCopyTrading } = require('./copy-executor');
@@ -383,10 +384,14 @@ const selectSymbol = async (service) => {
   
   spinner.succeed(`Found ${contracts.length} contracts`);
   
-  const options = contracts.map(c => ({
-    label: `${c.symbol} - ${c.name} (${c.exchange})`,
-    value: c
-  }));
+  const options = contracts.map(c => {
+    const desc = getContractDescription(c.baseSymbol || c.name);
+    const isMicro = desc.toLowerCase().includes('micro');
+    const label = isMicro 
+      ? `${c.symbol} - ${chalk.cyan(desc)} (${c.exchange})`
+      : `${c.symbol} - ${desc} (${c.exchange})`;
+    return { label, value: c };
+  });
   options.push({ label: chalk.gray('< Back'), value: 'back' });
   
   const selected = await prompts.selectOption(chalk.yellow('Select Symbol:'), options);

package/src/pages/algo/custom-strategy.js

@@ -12,6 +12,7 @@ const ora = require('ora');
 const { getLogoWidth, centerText, displayBanner , clearScreen } = require('../../ui');
 const { prompts } = require('../../utils');
 const { connections } = require('../../services');
+const { getContractDescription } = require('../../config');
 const { getActiveProvider, getActiveAgents } = require('../ai-agents');
 const cliproxy = require('../../services/cliproxy');
 const { runPreflightCheck, formatPreflightResults, getPreflightSummary } = require('../../services/ai-supervision');
@@ -146,7 +147,14 @@ const selectSymbol = async (service) => {
   
   spinner.succeed(`Found ${result.contracts.length} contracts`);
   
-  const options = result.contracts.map(c => ({ label: `${c.symbol} - ${c.name} (${c.exchange})`, value: c }));
+  const options = result.contracts.map(c => {
+    const desc = getContractDescription(c.baseSymbol || c.name);
+    const isMicro = desc.toLowerCase().includes('micro');
+    const label = isMicro 
+      ? `${c.symbol} - ${chalk.cyan(desc)} (${c.exchange})`
+      : `${c.symbol} - ${desc} (${c.exchange})`;
+    return { label, value: c };
+  });
   options.push({ label: chalk.gray('< Back'), value: 'back' });
   
   const selected = await prompts.selectOption(chalk.yellow('Select Symbol:'), options);

package/src/pages/algo/one-account.js

@@ -8,6 +8,7 @@ const ora = require('ora');
 
 const { connections } = require('../../services');
 const { prompts } = require('../../utils');
+const { getContractDescription } = require('../../config');
 const { checkMarketHours } = require('../../services/rithmic/market');
 const { executeAlgo } = require('./algo-executor');
 const { getActiveAgentCount, getSupervisionConfig, getActiveAgents } = require('../ai-agents');
@@ -281,11 +282,15 @@ const selectSymbol = async (service, account) => {
   
   spinner.succeed(`Found ${contracts.length} contracts`);
   
-  // Display sorted contracts from API: symbol - name (exchange)
-  const options = contracts.map(c => ({
-    label: `${c.symbol} - ${c.name} (${c.exchange})`,
-    value: c
-  }));
+  // Display sorted contracts with full description
+  const options = contracts.map(c => {
+    const desc = getContractDescription(c.baseSymbol || c.name);
+    const isMicro = desc.toLowerCase().includes('micro');
+    const label = isMicro 
+      ? `${c.symbol} - ${chalk.cyan(desc)} (${c.exchange})`
+      : `${c.symbol} - ${desc} (${c.exchange})`;
+    return { label, value: c };
+  });
   
   options.push({ label: chalk.gray('< Back'), value: 'back' });