hedgequantx 2.9.243 → 2.9.245

package/package.json

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

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

@@ -126,18 +126,15 @@ const executeAlgo = async ({ service, account, contract, config, strategy: strat
     sessionLogger.signal(dir, signal.entry, signal.confidence, signalLog.details);
     
     if (!running) {
-      const riskLog = smartLogs.getRiskCheckLog(false, 'Algo stopped');
-      ui.addLog('risk', riskLog.message);
+      ui.addLog('risk', 'Algo stopped - ignoring signal');
       return;
     }
     if (pendingOrder) {
-      const riskLog = smartLogs.getRiskCheckLog(false, 'Order pending');
-      ui.addLog('risk', riskLog.message);
+      ui.addLog('risk', 'Order pending - wait for fill');
       return;
     }
     if (currentPosition !== 0) {
-      const riskLog = smartLogs.getRiskCheckLog(false, `Position open (${currentPosition})`);
-      ui.addLog('risk', riskLog.message);
+      ui.addLog('risk', `Position open (${currentPosition}) - close first`);
       return;
     }
     

package/src/services/rithmic/handlers.js

@@ -222,19 +222,20 @@ const handleNewOrderResponse = (service, data) => {
     debug('New order response:', JSON.stringify(res));
     
     // Emit as orderNotification for the placeOrder listener
-    if (res.basketId || res.orderId) {
-      const order = {
-        basketId: res.basketId || res.orderId,
-        accountId: res.accountId,
-        symbol: res.symbol,
-        exchange: res.exchange || 'CME',
-        status: res.rpCode?.[0] === '0' ? 2 : 5, // 2=Working, 5=Rejected
-        notifyType: res.rpCode?.[0] === '0' ? 1 : 0, // 1=Accepted
-        rpCode: res.rpCode,
-        userMsg: res.userMsg,
-      };
-      service.emit('orderNotification', order);
-    }
+    // Even if no basketId, emit for rejection handling
+    const isRejected = res.rpCode?.[0] !== '0';
+    const order = {
+      basketId: res.basketId || res.orderId || res.userMsg?.[0] || 'unknown',
+      accountId: res.accountId,
+      symbol: res.symbol,
+      exchange: res.exchange || 'CME',
+      status: isRejected ? 5 : 2, // 2=Working, 5=Rejected
+      notifyType: isRejected ? 0 : 1, // 1=Accepted
+      rpCode: res.rpCode,
+      rqHandlerRpCode: res.rqHandlerRpCode, // Also include request handler response code
+      userMsg: res.userMsg,
+    };
+    service.emit('orderNotification', order);
     
     // Also emit specific event
     service.emit('newOrderResponse', res);

package/src/services/rithmic/orders.js

@@ -145,18 +145,27 @@ const placeOrder = async (service, orderData) => {
             orderTag,
           });
         } else if (status === 5 || status === 6) {
-          // Extract rejection reason from rpCode[1] if available
+          // Extract rejection reason from rpCode[1] or rqHandlerRpCode[1]
           const rpCode = order.rpCode;
+          const rqCode = order.rqHandlerRpCode;
           let errorMsg = `Order rejected: status ${status}`;
+          
+          // Try rpCode first, then rqHandlerRpCode
           if (rpCode && Array.isArray(rpCode) && rpCode.length > 1 && rpCode[1]) {
-            errorMsg = `Order rejected: ${rpCode[1]}`;
+            errorMsg = `Rejected: ${rpCode[1]}`;
+          } else if (rqCode && Array.isArray(rqCode) && rqCode.length > 1 && rqCode[1]) {
+            errorMsg = `Rejected: ${rqCode[1]}`;
+          } else if (rpCode && Array.isArray(rpCode) && rpCode[0] && rpCode[0] !== '0') {
+            errorMsg = `Rejected: code ${rpCode[0]}`;
           }
+          
           resolve({
             success: false,
             error: errorMsg,
             orderId: order.basketId,
             orderTag,
             rpCode,
+            rqHandlerRpCode: rqCode,
           });
         }
       }