hedgequantx 2.9.34 → 2.9.36

package/package.json

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

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

@@ -39,7 +39,10 @@ const copyTradingMenu = async () => {
     return;
   }
   
-  const activeAccounts = allAccounts.filter(acc => acc.status === 0);
+  // Filter active accounts: status === 0 (ProjectX) OR status === 'active' (Rithmic) OR no status
+  const activeAccounts = allAccounts.filter(acc => 
+    acc.status === 0 || acc.status === 'active' || acc.status === undefined || acc.status === null
+  );
   
   if (activeAccounts.length < 2) {
     spinner.fail(`Need at least 2 active accounts (found: ${activeAccounts.length})`);

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

@@ -46,7 +46,10 @@ const customStrategyMenu = async (service) => {
   
   if (!allAccounts?.length) { spinner.fail('No accounts found'); await prompts.waitForEnter(); return; }
   
-  const activeAccounts = allAccounts.filter(acc => acc.status === 0);
+  // Filter active accounts: status === 0 (ProjectX) OR status === 'active' (Rithmic) OR no status
+  const activeAccounts = allAccounts.filter(acc => 
+    acc.status === 0 || acc.status === 'active' || acc.status === undefined || acc.status === null
+  );
   if (!activeAccounts.length) { spinner.fail('No active accounts'); await prompts.waitForEnter(); return; }
   
   spinner.succeed(`Found ${activeAccounts.length} active account(s)`);

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

@@ -1,5 +1,5 @@
 /**
- * One Account Mode - HQX Ultra Scalping
+ * One Account Mode - Trading with Strategy Selection
  * Supports multi-agent AI supervision
  */
 
@@ -12,6 +12,7 @@ const { checkMarketHours } = require('../../services/rithmic/market');
 const { executeAlgo } = require('./algo-executor');
 const { getActiveAgentCount, getSupervisionConfig, getActiveAgents } = require('../ai-agents');
 const { runPreflightCheck, formatPreflightResults, getPreflightSummary } = require('../../services/ai-supervision');
+const { getAvailableStrategies } = require('../../lib/m');
 
 
 
@@ -40,7 +41,10 @@ const oneAccountMenu = async (service) => {
     return;
   }
   
-  const activeAccounts = allAccounts.filter(acc => acc.status === 0);
+  // Filter active accounts: status === 0 (ProjectX) OR status === 'active' (Rithmic) OR no status
+  const activeAccounts = allAccounts.filter(acc => 
+    acc.status === 0 || acc.status === 'active' || acc.status === undefined || acc.status === null
+  );
   
   if (!activeAccounts.length) {
     spinner.fail('No active accounts');
@@ -74,8 +78,12 @@ const oneAccountMenu = async (service) => {
   const contract = await selectSymbol(accountService, selectedAccount);
   if (!contract) return;
   
+  // Select strategy
+  const strategy = await selectStrategy();
+  if (!strategy) return;
+  
   // Configure algo
-  const config = await configureAlgo(selectedAccount, contract);
+  const config = await configureAlgo(selectedAccount, contract, strategy);
   if (!config) return;
   
   // Check for AI Supervision
@@ -126,6 +134,7 @@ const oneAccountMenu = async (service) => {
     account: selectedAccount,
     contract,
     config,
+    strategy,
     options: { supervisionConfig }
   });
 };
@@ -179,12 +188,42 @@ const selectSymbol = async (service, account) => {
   return contract === 'back' || contract === null ? null : contract;
 };
 
+/**
+ * Select trading strategy
+ */
+const selectStrategy = async () => {
+  console.log();
+  console.log(chalk.cyan('  Select Strategy'));
+  console.log();
+  
+  const strategies = getAvailableStrategies();
+  
+  const options = strategies.map(s => ({
+    label: `${s.name} (${s.backtest.winRate} WR, R:R ${s.params.riskReward})`,
+    value: s
+  }));
+  options.push({ label: chalk.gray('< Back'), value: 'back' });
+  
+  // Show strategy details
+  for (const s of strategies) {
+    console.log(chalk.white(`  ${s.name}`));
+    console.log(chalk.gray(`    ${s.description}`));
+    console.log(chalk.gray(`    Backtest: ${s.backtest.pnl} | ${s.backtest.winRate} WR | ${s.backtest.trades} trades`));
+    console.log(chalk.gray(`    Stop: ${s.params.stopTicks} ticks | Target: ${s.params.targetTicks} ticks | R:R ${s.params.riskReward}`));
+    console.log();
+  }
+  
+  const selected = await prompts.selectOption(chalk.yellow('Select Strategy:'), options);
+  return selected === 'back' || selected === null ? null : selected;
+};
+
 /**
  * Configure algo
  */
-const configureAlgo = async (account, contract) => {
+const configureAlgo = async (account, contract, strategy) => {
   console.log();
   console.log(chalk.cyan('  Configure Algo Parameters'));
+  console.log(chalk.gray(`  Strategy: ${strategy.name}`));
   console.log();
   
   const contracts = await prompts.numberInput('Number of contracts:', 1, 1, 10);

package/src/services/rithmic/contracts.js

@@ -176,10 +176,13 @@ const fetchAllFrontMonths = (service) => {
 
 /**
  * Decode ProductCodes response
- * @param {Buffer} buffer - Protobuf buffer
+ * @param {Buffer} buffer - Protobuf buffer (with 4-byte length prefix)
  * @returns {Object} Decoded product data
  */
 const decodeProductCodes = (buffer) => {
+  // Skip 4-byte length prefix
+  const data = buffer.length > 4 ? buffer.slice(4) : buffer;
+  
   const result = {};
   let offset = 0;
 
@@ -200,18 +203,18 @@ const decodeProductCodes = (buffer) => {
     return [buf.slice(newOff, newOff + len).toString('utf8'), newOff + len];
   };
 
-  while (offset < buffer.length) {
+  while (offset < data.length) {
     try {
-      const [tag, tagOff] = readVarint(buffer, offset);
+      const [tag, tagOff] = readVarint(data, offset);
       const wireType = tag & 0x7;
       const fieldNumber = tag >>> 3;
       offset = tagOff;
 
       if (wireType === 0) {
-        const [, newOff] = readVarint(buffer, offset);
+        const [, newOff] = readVarint(data, offset);
         offset = newOff;
       } else if (wireType === 2) {
-        const [val, newOff] = readString(buffer, offset);
+        const [val, newOff] = readString(data, offset);
         offset = newOff;
         if (fieldNumber === 110101) result.exchange = val;
         if (fieldNumber === 100749) result.productCode = val;

package/src/services/rithmic/protobuf.js

@@ -459,44 +459,48 @@ function decodeProductCodes(buffer) {
 
 /**
  * Decode ResponseFrontMonthContract (template 114) - current tradeable contract
+ * Skips 4-byte length prefix if present
  */
 function decodeFrontMonthContract(buffer) {
+  // Skip 4-byte length prefix
+  const data = buffer.length > 4 ? buffer.slice(4) : buffer;
+  
   const result = { rpCode: [] };
   let offset = 0;
 
-  while (offset < buffer.length) {
+  while (offset < data.length) {
     try {
-      const [tag, tagOffset] = readVarint(buffer, offset);
+      const [tag, tagOffset] = readVarint(data, offset);
       const wireType = tag & 0x7;
       const fieldNumber = tag >>> 3;
       offset = tagOffset;
 
       switch (fieldNumber) {
         case SYMBOL_FIELDS.TEMPLATE_ID:
-          [result.templateId, offset] = readVarint(buffer, offset);
+          [result.templateId, offset] = readVarint(data, offset);
           break;
         case SYMBOL_FIELDS.RP_CODE:
           let rpCode;
-          [rpCode, offset] = readLengthDelimited(buffer, offset);
+          [rpCode, offset] = readLengthDelimited(data, offset);
           result.rpCode.push(rpCode);
           break;
         case SYMBOL_FIELDS.SYMBOL:
-          [result.symbol, offset] = readLengthDelimited(buffer, offset);
+          [result.symbol, offset] = readLengthDelimited(data, offset);
           break;
         case SYMBOL_FIELDS.EXCHANGE:
-          [result.exchange, offset] = readLengthDelimited(buffer, offset);
+          [result.exchange, offset] = readLengthDelimited(data, offset);
           break;
         case SYMBOL_FIELDS.TRADING_SYMBOL:
-          [result.tradingSymbol, offset] = readLengthDelimited(buffer, offset);
+          [result.tradingSymbol, offset] = readLengthDelimited(data, offset);
           break;
         case SYMBOL_FIELDS.DESCRIPTION:
-          [result.description, offset] = readLengthDelimited(buffer, offset);
+          [result.description, offset] = readLengthDelimited(data, offset);
           break;
         case SYMBOL_FIELDS.USER_MSG:
-          [result.userMsg, offset] = readLengthDelimited(buffer, offset);
+          [result.userMsg, offset] = readLengthDelimited(data, offset);
           break;
         default:
-          offset = skipField(buffer, offset, wireType);
+          offset = skipField(data, offset, wireType);
       }
     } catch (error) {
       break;