hedgequantx 1.8.48 → 2.3.0

package/protos/rithmic/response_product_codes.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package rti;
+
+message ResponseProductCodes {
+  int32 template_id = 154467;       // Template ID = 112
+  repeated string rp_code = 132766; // Response code
+  string exchange = 110101;         // Exchange
+  string product_code = 110102;     // Product code (e.g., "MNQ", "ES")
+  string product_name = 110103;     // Product name
+  string user_msg = 132760;         // Echo of user message
+}

package/protos/rithmic/response_rithmic_system_info.proto

@@ -0,0 +1,12 @@
+
+package rti;
+
+message ResponseRithmicSystemInfo
+	{
+	required int32  template_id            = 154467;
+	repeated string user_msg               = 132760;
+	repeated string rp_code                = 132766;
+
+	repeated string system_name            = 153628;
+	repeated bool   has_aggregated_quotes  = 153649;
+	}

package/protos/rithmic/response_show_order_history.proto

@@ -0,0 +1,11 @@
+
+package rti;
+
+message ResponseShowOrderHistory
+{
+	// PB_OFFSET = 100000, is the offset added for each MNM field id
+
+	required int32   template_id   = 154467;    // PB_OFFSET + MNM_TEMPLATE_ID
+	repeated string  user_msg      = 132760;    // PB_OFFSET + MNM_USER_MSG
+	repeated string  rp_code       = 132766;    // PB_OFFSET + MNM_RESPONSE_CODE
+}

package/protos/rithmic/response_show_order_history_dates.proto

@@ -0,0 +1,13 @@
+
+package rti;
+
+message ResponseShowOrderHistoryDates
+{
+	// CORRECT field IDs from rundef/async_rithmic (verified Dec 2025)
+	// PB_OFFSET = 100000
+	optional int32           template_id        = 154467;
+	repeated string          user_msg           = 132760;
+	repeated string          rq_handler_rp_code = 132764;
+	repeated string          rp_code            = 132766;
+	repeated string          date               = 110615;    // Available dates (YYYYMMDD)
+}

package/protos/rithmic/response_show_order_history_summary.proto

@@ -0,0 +1,11 @@
+
+package rti;
+
+message ResponseShowOrderHistorySummary
+{
+	// Based on async_rithmic proto definitions
+	optional int32        template_id  = 156580;
+	repeated string       user_msg     = 142744;
+	repeated string       rp_code      = 142750;
+	optional int32        fills_collected = 156569;
+}

package/protos/rithmic/response_show_orders.proto

@@ -0,0 +1,11 @@
+
+package rti;
+
+message ResponseShowOrders
+{
+	// PB_OFFSET = 100000, is the offset added for each MNM field id
+
+	required int32   template_id   = 154467;    // PB_OFFSET + MNM_TEMPLATE_ID
+	repeated string  user_msg      = 132760;    // PB_OFFSET + MNM_USER_MSG
+	repeated string  rp_code       = 132766;    // PB_OFFSET + MNM_RESPONSE_CODE
+}

package/protos/rithmic/response_subscribe_for_order_updates.proto

@@ -0,0 +1,11 @@
+
+package rti;
+
+message ResponseSubscribeForOrderUpdates
+	{       
+	// PB_OFFSET = 100000, is the offset added for each MNM field id
+
+	required int32    template_id   = 154467;    // PB_OFFSET + MNM_TEMPLATE_ID
+	repeated string   user_msg      = 132760;    // PB_OFFSET + MNM_USER_MSG	
+	repeated string   rp_code       = 132766;    // PB_OFFSET + MNM_RESPONSE_CODE
+	}

package/protos/rithmic/response_tick_bar_replay.proto

@@ -0,0 +1,40 @@
+
+package rti;
+
+message ResponseTickBarReplay
+	{
+	enum BarType {
+	              TICK_BAR     =  1;
+		      RANGE_BAR    =  2;
+		      VOLUME_BAR   =  3;
+	             }
+
+        enum BarSubType {
+	                 REGULAR  = 1;
+			 CUSTOM   = 2;
+	                }
+              
+	required int32      template_id                  = 154467;
+	optional string     request_key                  = 132758;
+	repeated string     user_msg                     = 132760;
+	repeated string     rq_handler_rp_code           = 132764;
+	repeated string     rp_code                      = 132766;
+
+	optional string     symbol                       = 110100;
+	optional string     exchange                     = 110101;
+
+	optional BarType    type                         = 119200;
+	optional BarSubType sub_type                     = 119208;
+	optional string     type_specifier               = 148162;
+	optional uint64     num_trades                   = 119204;
+	optional uint64     volume                       = 119205;
+	optional uint64     bid_volume                   = 119213;
+	optional uint64     ask_volume                   = 119214;
+	optional double     open_price                   = 100019;
+	optional double     close_price                  = 100021;
+	optional double     high_price                   = 100012;
+	optional double     low_price                    = 100013;
+	optional int32      custom_session_open_ssm      = 119209;
+	repeated int32      data_bar_ssboe               = 119202;
+	repeated int32	    data_bar_usecs               = 119203;
+	}

package/protos/rithmic/response_trade_routes.proto

@@ -0,0 +1,19 @@
+
+package rti;
+
+message ResponseTradeRoutes
+	{       
+	// PB_OFFSET = 100000, is the offset added for each MNM field id
+
+	required int32    template_id               = 154467;    // PB_OFFSET + MNM_TEMPLATE_ID
+	repeated string   user_msg                  = 132760;    // PB_OFFSET + MNM_USER_MSG	
+	repeated string   rq_handler_rp_code        = 132764;    // PB_OFFSET + MNM_REQUEST_HANDLER_RESPONSE_CODE
+	repeated string   rp_code                   = 132766;    // PB_OFFSET + MNM_RESPONSE_CODE
+
+	optional string   fcm_id                    = 154013;    // PB_OFFSET + MNM_FCM_ID
+	optional string   ib_id                     = 154014;    // PB_OFFSET + MNM_IB_ID
+	optional string   exchange                  = 110101;    // PB_OFFSET + MNM_EXCHANGE
+	optional string   trade_route               = 112016;    // PB_OFFSET + MNM_TRADE_ROUTE
+	optional string   status                    = 131407;    // PB_OFFSET + MNM_SERVICE_STATE
+	optional bool     is_default                = 154689;    // PB_OFFSET + MNM_DEFAULT_ROUTE
+	}

package/protos/rithmic/rithmic_order_notification.proto

@@ -0,0 +1,124 @@
+
+package rti;
+
+message RithmicOrderNotification
+	{       
+	enum NotifyType {
+	                 ORDER_RCVD_FROM_CLNT      =   1;
+			 MODIFY_RCVD_FROM_CLNT     =   2;
+			 CANCEL_RCVD_FROM_CLNT     =   3;
+			 OPEN_PENDING              =   4;
+			 MODIFY_PENDING            =   5;
+			 CANCEL_PENDING            =   6;
+			 ORDER_RCVD_BY_EXCH_GTWY   =   7;
+			 MODIFY_RCVD_BY_EXCH_GTWY  =   8;
+			 CANCEL_RCVD_BY_EXCH_GTWY  =   9;
+			 ORDER_SENT_TO_EXCH        =  10;
+			 MODIFY_SENT_TO_EXCH       =  11;
+			 CANCEL_SENT_TO_EXCH       =  12;
+			 OPEN                      =  13;
+			 MODIFIED                  =  14;
+			 COMPLETE                  =  15;
+			 MODIFICATION_FAILED       =  16;
+			 CANCELLATION_FAILED       =  17;
+			 TRIGGER_PENDING           =  18;
+			 GENERIC                   =  19;
+			 LINK_ORDERS_FAILED        =  20;
+                        }	
+
+        enum TransactionType {
+	                      BUY  = 1;
+		              SELL = 2;
+			      SS   = 3;
+	                     }
+
+        enum Duration {
+	               DAY  = 1;
+		       GTC  = 2;
+		       IOC  = 3;
+		       FOK  = 4;
+                      }
+ 
+        enum PriceType {
+	                LIMIT        = 1;
+			MARKET       = 2;
+			STOP_LIMIT   = 3;
+			STOP_MARKET  = 4;
+                       }
+
+	enum BracketType {
+	                  STOP_ONLY               = 1;
+			  TARGET_ONLY             = 2;
+			  TARGET_AND_STOP         = 3;
+			  STOP_ONLY_STATIC        = 4;
+			  TARGET_ONLY_STATIC      = 5;
+			  TARGET_AND_STOP_STATIC  = 6;
+                         }
+
+        enum OrderPlacement {
+	                     MANUAL  = 1;
+			     AUTO    = 2;
+	                    }
+
+	required int32             template_id            = 154467;
+	optional string            user_tag               = 154119;
+
+	optional NotifyType        notify_type            = 153625;
+	optional bool              is_snapshot            = 110121;
+
+	optional string            status                 = 110303;
+	optional string            basket_id              = 110300;
+	optional string            original_basket_id     = 154497;
+	optional string            linked_basket_ids      = 110358;
+
+	optional string            fcm_id                 = 154013;
+	optional string            ib_id                  = 154014;
+	optional string            user_id                = 131003;
+	optional string            account_id             = 154008;
+
+	optional string            symbol                 = 110100;
+	optional string            exchange               = 110101;
+	optional string            trade_exchange         = 112021;
+	optional string            trade_route            = 112016;
+	optional string            exchange_order_id      = 149238;
+	optional string            instrument_type        = 110116;
+	optional string            completion_reason      = 149273;
+
+	optional  int32            quantity               = 112004;
+	optional  int32            quan_release_pending   = 112027;
+	optional  double           price                  = 110306;
+	optional  double           trigger_price          = 149247;
+
+	optional  TransactionType  transaction_type       = 112003;
+	optional  Duration         duration               = 112005;
+	optional  PriceType        price_type             = 112008;
+	optional  PriceType        orig_price_type        = 154770;
+	optional  OrderPlacement   manual_or_auto         = 154710;
+	optional  BracketType      bracket_type           = 157087;
+
+	optional  double           avg_fill_price         = 110322;
+
+	optional  int32            total_fill_size        = 154111;
+	optional  int32            total_unfilled_size    = 154112;
+
+ 	optional string            sequence_number        = 112002;
+	optional string            orig_sequence_number   = 149263;
+	optional string            cor_sequence_number    = 149264;
+
+	optional string            currency               = 154382;
+	optional string            country_code           = 154172;
+
+	optional string            text                   = 120008;
+	optional string            report_text            = 120028;
+	optional string            remarks                = 154806;
+
+	optional string            window_name            = 154629;
+	optional string            originator_window_name = 154671;
+
+	optional  int32            cancel_at_ssboe        = 157085;
+	optional  int32            cancel_at_usecs        = 157086;
+        optional  int32            cancel_after_secs      = 154488;
+
+	optional int32             ssboe                  = 150100;
+	optional int32             usecs                  = 150101;
+	}

package/src/app.js

@@ -19,13 +19,22 @@ const { showAccounts } = require('./pages/accounts');
 const { algoTradingMenu } = require('./pages/algo');
 
 // Menus
-const { projectXMenu, rithmicMenu, tradovateMenu, addPropAccountMenu, dashboardMenu, handleUpdate } = require('./menus');
+const {
+  projectXMenu,
+  rithmicMenu,
+  tradovateMenu,
+  addPropAccountMenu,
+  dashboardMenu,
+  handleUpdate,
+} = require('./menus');
 
-// Current service reference
+/** @type {Object|null} */
 let currentService = null;
 
+// ==================== TERMINAL ====================
+
 /**
- * Global terminal restoration
+ * Restore terminal state
  */
 const restoreTerminal = () => {
   try {
@@ -35,123 +44,153 @@ const restoreTerminal = () => {
       process.stdin.setRawMode(false);
     }
     process.stdin.removeAllListeners('keypress');
-  } catch (e) {}
+  } catch {
+    // Ignore terminal errors
+  }
 };
 
+// Signal handlers
 process.on('exit', restoreTerminal);
 process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });
 process.on('SIGTERM', () => { restoreTerminal(); process.exit(0); });
+
 process.on('uncaughtException', (err) => {
   restoreTerminal();
+  log.error('Uncaught Exception', { error: err.message });
   console.error(chalk.red('Uncaught Exception:'), err.message);
   process.exit(1);
 });
+
 process.on('unhandledRejection', (reason) => {
   restoreTerminal();
+  log.error('Unhandled Rejection', { reason: String(reason) });
   console.error(chalk.red('Unhandled Rejection:'), reason);
   process.exit(1);
 });
 
+// ==================== STATS ====================
+
 /**
- * Refresh cached stats
+ * Refresh cached stats from all connections
  */
 const refreshStats = async () => {
-  if (connections.count() > 0) {
-    try {
-      const allAccounts = await connections.getAllAccounts();
-      const activeAccounts = allAccounts.filter(acc => acc.status === 0);
-      
-      let totalBalance = null, totalPnl = null;
-      let hasBalanceData = false, hasPnlData = false;
-      
-      activeAccounts.forEach(account => {
-        if (account.balance !== null && account.balance !== undefined) {
-          totalBalance = (totalBalance || 0) + account.balance;
-          hasBalanceData = true;
-        }
-        if (account.profitAndLoss !== null && account.profitAndLoss !== undefined) {
-          totalPnl = (totalPnl || 0) + account.profitAndLoss;
-          hasPnlData = true;
-        }
-      });
-      
-      setCachedStats({
-        connections: connections.count(),
-        accounts: activeAccounts.length,
-        balance: hasBalanceData ? totalBalance : null,
-        pnl: hasPnlData ? totalPnl : null,
-        pnlPercent: null
-      });
-    } catch (e) {}
-  } else {
+  if (connections.count() === 0) {
     clearCachedStats();
+    return;
+  }
+
+  try {
+    const allAccounts = await connections.getAllAccounts();
+    const activeAccounts = allAccounts.filter(acc => acc.status === 0);
+
+    let totalBalance = null;
+    let totalPnl = null;
+    let hasBalanceData = false;
+    let hasPnlData = false;
+
+    for (const account of activeAccounts) {
+      if (account.balance != null) {
+        totalBalance = (totalBalance || 0) + account.balance;
+        hasBalanceData = true;
+      }
+      if (account.profitAndLoss != null) {
+        totalPnl = (totalPnl || 0) + account.profitAndLoss;
+        hasPnlData = true;
+      }
+    }
+
+    setCachedStats({
+      connections: connections.count(),
+      accounts: activeAccounts.length,
+      balance: hasBalanceData ? totalBalance : null,
+      pnl: hasPnlData ? totalPnl : null,
+      pnlPercent: null,
+    });
+  } catch (err) {
+    log.warn('Failed to refresh stats', { error: err.message });
   }
 };
 
+// ==================== BANNER ====================
+
 /**
- * Display banner
+ * Display application banner
  */
 const banner = async () => {
   console.clear();
+  
   const termWidth = process.stdout.columns || 100;
   const isMobile = termWidth < 60;
   const boxWidth = isMobile ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
   const innerWidth = boxWidth - 2;
   const version = require('../package.json').version;
-  
+
   console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+
+  // Logo
+  const logoLines = isMobile ? getMobileLogo() : getFullLogo();
   
-  if (isMobile) {
-    const logoHQ = ['██╗  ██╗ ██████╗ ','██║  ██║██╔═══██╗','███████║██║   ██║','██╔══██║██║▄▄ ██║','██║  ██║╚██████╔╝','╚═╝  ╚═╝ ╚══▀▀═╝ '];
-    const logoX = ['██╗  ██╗','╚██╗██╔╝',' ╚███╔╝ ',' ██╔██╗ ','██╔╝ ██╗','╚═╝  ╚═╝'];
-    logoHQ.forEach((line, i) => {
-      const fullLine = chalk.cyan(line) + chalk.yellow(logoX[i]);
-      const totalLen = line.length + logoX[i].length;
-      const padding = innerWidth - totalLen;
-      const leftPad = Math.floor(padding / 2);
-      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
-    });
-  } else {
-    const logo = [
-      '██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗',
-      '██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝',
-      '███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ',
-      '██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ',
-      '██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ',
-      '╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   '
-    ];
-    const logoX = ['██╗  ██╗','╚██╗██╔╝',' ╚███╔╝ ',' ██╔██╗ ','██╔╝ ██╗','╚═╝  ╚═╝'];
-    logo.forEach((line, i) => {
-      const fullLine = chalk.cyan(line) + chalk.yellow(logoX[i]);
-      const totalLen = line.length + logoX[i].length;
-      const padding = innerWidth - totalLen;
-      const leftPad = Math.floor(padding / 2);
-      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
-    });
+  for (const [hq, x] of logoLines) {
+    const fullLine = chalk.cyan(hq) + chalk.yellow(x);
+    const totalLen = hq.length + x.length;
+    const padding = innerWidth - totalLen;
+    const leftPad = Math.floor(padding / 2);
+    console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
   }
-  
+
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+  
   const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
   console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
 };
 
 /**
- * Display banner with closing border (for loading states)
+ * Get full logo lines
+ * @returns {Array<[string, string]>}
+ */
+const getFullLogo = () => [
+  ['██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗', '██╗  ██╗'],
+  ['██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝', '╚██╗██╔╝'],
+  ['███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ', ' ╚███╔╝ '],
+  ['██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ', ' ██╔██╗ '],
+  ['██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ', '██╔╝ ██╗'],
+  ['╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ', '╚═╝  ╚═╝'],
+];
+
+/**
+ * Get mobile logo lines
+ * @returns {Array<[string, string]>}
+ */
+const getMobileLogo = () => [
+  ['██╗  ██╗ ██████╗ ', '██╗  ██╗'],
+  ['██║  ██║██╔═══██╗', '╚██╗██╔╝'],
+  ['███████║██║   ██║', ' ╚███╔╝ '],
+  ['██╔══██║██║▄▄ ██║', ' ██╔██╗ '],
+  ['██║  ██║╚██████╔╝', '██╔╝ ██╗'],
+  ['╚═╝  ╚═╝ ╚══▀▀═╝ ', '╚═╝  ╚═╝'],
+];
+
+/**
+ * Display banner with closing border
  */
 const bannerClosed = async () => {
   await banner();
-  const boxWidth = process.stdout.columns < 60 ? Math.max(process.stdout.columns - 2, 40) : Math.max(getLogoWidth(), 98);
+  const termWidth = process.stdout.columns || 100;
+  const boxWidth = termWidth < 60 ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
   console.log(chalk.cyan('╚' + '═'.repeat(boxWidth - 2) + '╝'));
 };
 
+// ==================== MENUS ====================
+
 /**
- * Main menu
+ * Main menu (platform selection)
+ * @returns {Promise<string>}
  */
 const mainMenu = async () => {
   const boxWidth = getLogoWidth();
   const innerWidth = boxWidth - 2;
   const col1Width = Math.floor(innerWidth / 2);
-  
+
   const menuRow = (left, right) => {
     const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
     const rightPlain = right ? right.replace(/\x1b\[[0-9;]*m/g, '') : '';
@@ -159,29 +198,24 @@ const mainMenu = async () => {
     const rightPadded = (right || '') + ' '.repeat(Math.max(0, innerWidth - col1Width - rightPlain.length));
     console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
   };
-  
-  // Continue from banner (use ╠ not ╔)
+
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PLATFORM', innerWidth)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-  
+
   menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
   menuRow(chalk.cyan('[3] Tradovate'), chalk.red('[X] Exit'));
-  
+
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 
   const input = await prompts.textInput(chalk.cyan('Select (1/2/3/X)'));
-  
-  const actionMap = {
-    '1': 'projectx',
-    '2': 'rithmic',
-    '3': 'tradovate',
-    'x': 'exit'
-  };
 
-  return actionMap[(input || '').toLowerCase()] || 'exit';
+  const actions = { '1': 'projectx', '2': 'rithmic', '3': 'tradovate', 'x': 'exit' };
+  return actions[(input || '').toLowerCase()] || 'exit';
 };
 
+// ==================== MAIN LOOP ====================
+
 /**
  * Main application loop
  */
@@ -189,10 +223,11 @@ const run = async () => {
   try {
     log.info('Starting HQX CLI');
     await bannerClosed();
-    
+
+    // Restore session
     const spinner = ora({ text: 'Restoring session...', color: 'yellow' }).start();
     const restored = await connections.restoreFromStorage();
-    
+
     if (restored) {
       spinner.succeed('Session restored');
       currentService = connections.getAll()[0].service;
@@ -201,39 +236,45 @@ const run = async () => {
       spinner.info('No active session');
     }
 
+    // Main loop
     while (true) {
       try {
         prepareStdin();
         await banner();
-        
+
         if (!connections.isConnected()) {
           const choice = await mainMenu();
-          
+
           if (choice === 'exit') {
             console.log(chalk.gray('Goodbye!'));
             process.exit(0);
           }
-          
+
           let service = null;
           if (choice === 'projectx') service = await projectXMenu();
           else if (choice === 'rithmic') service = await rithmicMenu();
           else if (choice === 'tradovate') service = await tradovateMenu();
-          
+
           if (service) {
             currentService = service;
             await refreshStats();
           }
         } else {
-          const action = await dashboardMenu(currentService);
+          // Refresh stats before showing dashboard
+          await refreshStats();
           
+          const action = await dashboardMenu(currentService);
+
           switch (action) {
             case 'accounts':
               await showAccounts(currentService);
               break;
+
             case 'stats':
               await showStats(currentService);
               break;
-            case 'add_prop_account':
+
+            case 'add_prop_account': {
               const platformChoice = await addPropAccountMenu();
               let newService = null;
               if (platformChoice === 'projectx') newService = await projectXMenu();
@@ -244,17 +285,21 @@ const run = async () => {
                 await refreshStats();
               }
               break;
+            }
+
             case 'algotrading':
               try {
                 await algoTradingMenu(currentService);
-              } catch (algoErr) {
-                console.log(chalk.red(`  Algo error: ${algoErr.message}`));
+              } catch (err) {
+                console.log(chalk.red(`  Algo error: ${err.message}`));
                 prepareStdin();
               }
               break;
+
             case 'update':
               await handleUpdate();
               break;
+
             case 'disconnect':
               connections.disconnectAll();
               currentService = null;
@@ -264,10 +309,12 @@ const run = async () => {
           }
         }
       } catch (loopError) {
+        log.error('Loop error', { error: loopError.message });
         console.error(chalk.red('Error:'), loopError.message);
       }
     }
   } catch (error) {
+    log.error('Fatal error', { error: error.message });
     console.error(chalk.red('Fatal error:'), error.message);
     process.exit(1);
   }