hedgequantx 2.9.249 → 2.9.251

package/package.json

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

package/src/pages/algo/algo-executor.js

@@ -119,30 +119,33 @@ const executeAlgo = async ({ service, account, contract, config, strategy: strat
   ui.addLog('system', 'Connecting to market data...');
   
   // Listen for position updates from Rithmic (external closes, manual trades)
+  // Only if service supports events (RithmicService or DaemonProxyService)
   const accId = account.rithmicAccountId || account.accountId;
-  service.on('positionUpdate', (pos) => {
-    // Match by account and symbol
-    const posSymbol = pos.contractId || pos.symbol || '';
-    const matchesSymbol = posSymbol.includes(contract.name) || posSymbol.includes(contractId) || 
-                          posSymbol === symbolCode || contractId.includes(posSymbol);
-    const matchesAccount = pos.accountId === accId || pos.accountId === account.accountId;
-    
-    if (matchesSymbol && matchesAccount) {
-      const qty = parseInt(pos.quantity) || 0;
-      if (!isNaN(qty) && Math.abs(qty) < 1000 && qty !== currentPosition) {
-        const oldPos = currentPosition;
-        currentPosition = qty;
-        if (qty === 0 && oldPos !== 0) {
-          ui.addLog('trade', `Position closed externally (was ${oldPos})`);
-          sessionLogger.log('POSITION', `External close: ${oldPos} -> 0`);
-          pendingOrder = false;  // Reset pending order flag
-        } else if (qty !== 0 && oldPos === 0) {
-          ui.addLog('trade', `Position opened externally: ${qty}`);
-          sessionLogger.log('POSITION', `External open: 0 -> ${qty}`);
+  if (typeof service.on === 'function') {
+    service.on('positionUpdate', (pos) => {
+      // Match by account and symbol
+      const posSymbol = pos.contractId || pos.symbol || '';
+      const matchesSymbol = posSymbol.includes(contract.name) || posSymbol.includes(contractId) || 
+                            posSymbol === symbolCode || contractId.includes(posSymbol);
+      const matchesAccount = pos.accountId === accId || pos.accountId === account.accountId;
+      
+      if (matchesSymbol && matchesAccount) {
+        const qty = parseInt(pos.quantity) || 0;
+        if (!isNaN(qty) && Math.abs(qty) < 1000 && qty !== currentPosition) {
+          const oldPos = currentPosition;
+          currentPosition = qty;
+          if (qty === 0 && oldPos !== 0) {
+            ui.addLog('trade', `Position closed externally (was ${oldPos})`);
+            sessionLogger.log('POSITION', `External close: ${oldPos} -> 0`);
+            pendingOrder = false;  // Reset pending order flag
+          } else if (qty !== 0 && oldPos === 0) {
+            ui.addLog('trade', `Position opened externally: ${qty}`);
+            sessionLogger.log('POSITION', `External open: 0 -> ${qty}`);
+          }
         }
       }
-    }
-  });
+    });
+  }
   
   strategy.on('signal', async (signal) => {
     const dir = signal.direction?.toUpperCase() || 'UNKNOWN';

package/src/services/rithmic/handlers.js

@@ -221,19 +221,31 @@ const handleNewOrderResponse = (service, data) => {
   try {
     const res = proto.decode('ResponseNewOrder', data);
     
+    // Log full response for debugging
+    console.log('[Rithmic] ResponseNewOrder:', JSON.stringify(res));
+    
     const isAccepted = res.rpCode?.[0] === '0';
     
     // Build rejection reason from rpCode array
-    // rpCode is typically ['code', 'message'] or just ['code']
     let rejectReason = null;
-    if (!isAccepted) {
-      // Try to get the error message from rpCode[1] or rqHandlerRpCode[1]
-      const rpMsg = res.rpCode?.slice(1).join(' ') || '';
-      const rqMsg = res.rqHandlerRpCode?.slice(1).join(' ') || '';
-      rejectReason = rpMsg || rqMsg || null;
+    if (!isAccepted && res.rpCode) {
+      // rpCode can be ['0'] for success or ['code', 'message', ...] for errors
+      // Join all parts after the code for the full message
+      const allCodes = Array.isArray(res.rpCode) ? res.rpCode : [res.rpCode];
+      const rqCodes = Array.isArray(res.rqHandlerRpCode) ? res.rqHandlerRpCode : [];
+      
+      // Get message from rpCode (skip first element which is the code)
+      const rpMsg = allCodes.slice(1).join(' ').trim();
+      const rqMsg = rqCodes.slice(1).join(' ').trim();
       
-      // If no message, interpret the code
-      if (!rejectReason && res.rpCode?.[0]) {
+      // Use the message if available
+      if (rpMsg) {
+        rejectReason = rpMsg;
+      } else if (rqMsg) {
+        rejectReason = rqMsg;
+      } else {
+        // Map numeric codes to messages
+        const code = allCodes[0];
         const codeMap = {
           '1': 'Invalid request',
           '2': 'Invalid account',
@@ -245,17 +257,17 @@ const handleNewOrderResponse = (service, data) => {
           '8': 'Position limit exceeded',
           '9': 'Rate limit exceeded',
         };
-        rejectReason = codeMap[res.rpCode[0]] || `Gateway rejected (code: ${res.rpCode[0]})`;
+        rejectReason = codeMap[code] || `Gateway rejected (code: ${code})`;
       }
       
-      console.log('[Rithmic] Gateway rejection:', rejectReason, '| rpCode:', res.rpCode, '| rqHandlerRpCode:', res.rqHandlerRpCode);
+      console.log('[Rithmic] Order REJECTED:', rejectReason);
     }
     
     const order = {
       basketId: res.basketId || null,
       symbol: res.symbol,
       exchange: res.exchange || 'CME',
-      notifyType: isAccepted ? 1 : 6, // 1=STATUS (accepted), 6=REJECT
+      notifyType: isAccepted ? 1 : 6,
       status: isAccepted ? 2 : 6,
       text: rejectReason,
       rpCode: res.rpCode,