hedgequantx 2.9.183 → 2.9.185

package/package.json

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

package/src/services/session.js

@@ -112,12 +112,18 @@ const connections = {
   },
 
   /**
-   * Sanitize account data
+   * Sanitize account data for caching
+   * IMPORTANT: Keep rithmicAccountId for PnL lookups
    */
   _sanitizeAccount(acc) {
-    if (!acc || typeof acc !== 'object' || !acc.accountId) return null;
+    if (!acc || typeof acc !== 'object') return null;
+    
+    // Get the real Rithmic account ID (text like "APEX-130042-63")
+    const rithmicId = acc.rithmicAccountId || acc.accountId;
+    if (!rithmicId) return null;
+    
     return {
-      accountId: String(acc.accountId),
+      accountId: rithmicId,  // Use the real Rithmic ID, not the hash
       fcmId: acc.fcmId ? String(acc.fcmId) : undefined,
       ibId: acc.ibId ? String(acc.ibId) : undefined,
       accountName: acc.accountName ? String(acc.accountName) : undefined,
@@ -152,9 +158,10 @@ const connections = {
    */
   async restoreFromStorage() {
     const sessions = storage.load();
-    const rithmicSessions = sessions.filter(s => s.type === 'rithmic');
+    const rithmicSessions = sessions.filter(s => s.type === 'rithmic' && s.credentials);
     
     if (!rithmicSessions.length) {
+      log.debug('No saved sessions to restore');
       return false;
     }
     
@@ -162,9 +169,12 @@ const connections = {
     
     for (const session of rithmicSessions) {
       try {
-        await this._restoreSession(session);
+        const success = await this._restoreSession(session);
+        if (!success) {
+          log.warn('Session restore returned false', { propfirm: session.propfirm });
+        }
       } catch (err) {
-        log.warn('Failed to restore session', { error: err.message });
+        log.error('Failed to restore session', { propfirm: session.propfirm, error: err.message });
       }
     }
     
@@ -173,12 +183,13 @@ const connections = {
 
   /**
    * Restore a single session using direct RithmicService
+   * @returns {boolean} true if restore succeeded
    */
   async _restoreSession(session) {
     const { type, propfirm, propfirmKey } = session;
     
     if (type !== 'rithmic' || !session.credentials) {
-      return;
+      return false;
     }
     
     const Service = loadRithmicService();
@@ -193,6 +204,13 @@ const connections = {
       if (validAccounts.length === 0) validAccounts = null;
     }
     
+    log.debug('Restoring session', { 
+      propfirm, 
+      propfirmKey,
+      hasCredentials: !!session.credentials,
+      cachedAccounts: validAccounts?.length || 0 
+    });
+    
     // Login with cached accounts to avoid Rithmic API limit
     const loginOptions = validAccounts 
       ? { skipFetchAccounts: true, cachedAccounts: validAccounts } 
@@ -212,9 +230,16 @@ const connections = {
         propfirmKey,
         connectedAt: new Date(),
       });
-      log.info('Session restored', { propfirm, accounts: service.accounts?.length || 0 });
+      log.info('Session restored', { 
+        propfirm, 
+        accounts: service.accounts?.length || 0,
+        hasPnL: !!service.pnlConn,
+        hasOrder: !!service.orderConn
+      });
+      return true;
     } else {
       log.warn('Session restore failed', { propfirm, error: result.error });
+      return false;
     }
   },