hedgequantx 2.9.67 → 2.9.69

package/package.json

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

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

@@ -88,13 +88,22 @@ const oneAccountMenu = async (service) => {
         
         // Load contracts to find the saved symbol (match by baseSymbol first, then exact symbol)
         const contractsResult = await accountService.getContracts();
-        if (contractsResult.success) {
+        if (contractsResult.success && contractsResult.contracts.length > 0) {
           // Try baseSymbol match first (more stable across contract rolls)
-          contract = contractsResult.contracts.find(c => c.baseSymbol === lastConfig.baseSymbol);
+          if (lastConfig.baseSymbol) {
+            contract = contractsResult.contracts.find(c => c.baseSymbol === lastConfig.baseSymbol);
+          }
           // Fall back to exact symbol match
-          if (!contract) {
+          if (!contract && lastConfig.symbol) {
             contract = contractsResult.contracts.find(c => c.symbol === lastConfig.symbol);
           }
+          // Last resort: try to extract base symbol from saved symbol (e.g., MESH6 -> MES)
+          if (!contract && lastConfig.symbol) {
+            const extractedBase = lastConfig.symbol.replace(/[A-Z]\d+$/, '');
+            if (extractedBase) {
+              contract = contractsResult.contracts.find(c => c.baseSymbol === extractedBase);
+            }
+          }
         }
         
         // Find strategy
@@ -231,9 +240,19 @@ const oneAccountMenu = async (service) => {
 const selectSymbol = async (service, account) => {
   const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
   
+  // Ensure we have a logged-in service
+  if (!service.loginInfo && service.credentials) {
+    spinner.text = 'Reconnecting to broker...';
+    const loginResult = await service.login(service.credentials.username, service.credentials.password);
+    if (!loginResult.success) {
+      spinner.fail(`Login failed: ${loginResult.error}`);
+      return null;
+    }
+  }
+  
   const contractsResult = await service.getContracts();
   if (!contractsResult.success || !contractsResult.contracts?.length) {
-    spinner.fail('Failed to load contracts');
+    spinner.fail(`Failed to load contracts: ${contractsResult.error || 'No contracts'}`);
     return null;
   }