klio 1.4.9 → 1.5.1

package/src/cli/cli.js

@@ -1,13 +1,11 @@
 const { Command } = require('commander');
 const { planets, signs } = require('../astrology/astrologyConstants');
 const { showRetrogradePlanets } = require('../astrology/retrogradeService');
-const { getCurrentTimeInTimezone, showAspectFigures, analyzeElementDistribution, getTimezoneOffset, calculateJulianDayUTC, calculateHouses, getAstrologicalData, getPlanetHouse, showPlanetAspects, calculatePlanetAspects, getAllActiveAspects, showAllActiveAspects, getBirthDataFromConfig, getPersonDataFromConfig, detectAspectFigures, calculatePersonalTransits, showPersonalTransitAspects, showCombinedAnalysis, calculatePersonalTransitAspects, determineAspectPhase, findExactAspectTime, findLastExactAspectTime, getAspectAngle, getFutureAspects, getPastAspects, analyzeCSVWithDatetime, analyzeHouseDistributionSignificance, analyzeAspectDistributionSignificance, analyzeSignDistributionSignificance, calculateAspectStatistics, calculatePlanetComboAspects, showPlanetComboAspects, getCriticalPlanets, getHouseSystemCode, calculateNextPlanetIngress, calculateAstrologicalAngles, longitudeToSignDegree, calculateTransitFrequency } = require('../astrology/astrologyService');
+const { getCurrentTimeInTimezone, showAspectFigures, analyzeElementDistribution, getTimezoneOffset, calculateJulianDayUTC, calculateHouses, getAstrologicalData, getPlanetHouse, showPlanetAspects, calculatePlanetAspects, getAllActiveAspects, showAllActiveAspects, getBirthDataFromConfig, getPersonDataFromConfig, detectAspectFigures, calculatePersonalTransits, showPersonalTransitAspects, showCombinedAnalysis, calculatePersonalTransitAspects, determineAspectPhase, getAspectAngle, getFutureAspects, getPastAspects, analyzeCSVWithDatetime, analyzeHouseDistributionSignificance, analyzeAspectDistributionSignificance, analyzeSignDistributionSignificance, calculateAspectStatistics, calculatePlanetComboAspects, showPlanetComboAspects, getCriticalPlanets, getHouseSystemCode, calculateNextPlanetIngress, calculateAstrologicalAngles, longitudeToSignDegree, calculateTransitFrequency } = require('../astrology/astrologyService');
 const { performSetup, showConfigStatus, loadConfig, setAIModel, askAIModel, setPerson1, setPerson2, setPerson, getPersonData, listPeople, deletePerson } = require('../config/configService');
 const { parseAppleHealthXML } = require('../health/healthService');
 const { analyzeStepsByPlanetSign, analyzeStressByPlanetAspects, analyzePlanetAspectsForSleep, analyzeLateNightAspects, analyzeAllNighterAspects } = require('../health/healthAnalysis');
-const { analyzeHouseDistribution, filterFilesByHouse } = require('../health/fileAnalysis');
 const { getFileCreationDate, parseDateToComponents } = require('../utils/fileUtils');
-const swisseph = require('swisseph');
 const path = require('path');
 const fs = require('fs');
 
@@ -43,7 +41,7 @@ const program = new Command();
 
 // Helper function to check if person data should be used (including new options)
 const shouldUsePersonData = (options) => {
-  return options.ich || options.i || options.p1 || options.p2 || options.withPerson || options.wp || options.up;
+  return options.i || options.p1 || options.p2 || options.withPerson || options.wp || options.up;
 };
 
 // Universal AI handler function that works with any command
@@ -150,7 +148,7 @@ const getPersonDataToUse = (options) => {
     return { source: 'p5', data: getPersonDataFromConfig('p5') };
   } else if (options.p6) {
     return { source: 'p6', data: getPersonDataFromConfig('p6') };
-  } else if (options.ich || options.i) {
+  } else if (options.i) {
     return { source: 'birth', data: getPersonDataFromConfig('birth') };
   }
   return { source: null, data: null };
@@ -158,7 +156,7 @@ const getPersonDataToUse = (options) => {
 
 // Helper function to check if birth data should be used (for backward compatibility only)
 const shouldUseBirthData = (options) => {
-  return options.ich || options.i;
+  return options.i;
 };
 
 // Function to calculate the Julian Day in UTC
@@ -224,19 +222,6 @@ program
   .option('--a', 'Shows all aspects of the planet')
   .option('--k', 'Shows aspects between any planet combinations')
   .option('--s', 'Shows all planet positions in a table with signs, degrees and houses')
-  .option('--folder <path>', 'Analyzes house distribution of all files in the folder')
-  .option('--h1', 'Filters files with planet in house 1')
-  .option('--h2', 'Filters files with planet in house 2')
-  .option('--h3', 'Filters files with planet in house 3')
-  .option('--h4', 'Filters files with planet in house 4')
-  .option('--h5', 'Filters files with planet in house 5')
-  .option('--h6', 'Filters files with planet in house 6')
-  .option('--h7', 'Filters files with planet in house 7')
-  .option('--h8', 'Filters files with planet in house 8')
-  .option('--h9', 'Filters files with planet in house 9')
-  .option('--h10', 'Filters files with planet in house 10')
-  .option('--h11', 'Filters files with planet in house 11')
-  .option('--h12', 'Filters files with planet in house 12')
   .option('--apple <filepath>', 'Analyzes Apple Health Export XML file')
   .option('--hypothesis <type>', 'Specifies the hypothesis to test (e.g. "sleep-moon", "steps-moon", "stress-moon")')
   .option('--sleep', 'Analyzes sleep patterns with moon aspects')
@@ -250,7 +235,6 @@ program
   .option('--rx', 'Shows all retrograde or stationary planets')
   .option('--c', 'Shows all planets on critical degrees')
   .option('--status', 'Shows the stored configuration data')
-  .option('--ich', 'Uses the birth data from setup for calculations')
   .option('--i', 'Uses the birth data from setup for calculations (short form)')
   .option('--p1', 'Uses the data from person 1 for calculations')
   .option('--p2', 'Uses the data from person 2 for calculations')
@@ -270,7 +254,6 @@ program
   .option('--el', 'Shows the element distribution of planets in a horizontal chart')
   .option('--af', 'Shows active aspect figures like T-squares, Grand Trines, etc.')
   .option('--tra', 'Shows personal transits based on birth data')
-  .option('--transit-aspekte', 'Shows personal transit aspects (Transit → Radix)')
   .option('--tr', 'Shows personal transit aspects (Transit → Radix) (short form)')
   .option('--v <count>', 'Shows past aspects between two planets (Format: --v <count> planet1 aspectType planet2)')
   .option('--z <count>', 'Shows future aspects between two planets (Format: --z <count> planet1 aspectType planet2)')
@@ -281,6 +264,7 @@ program
   .option('--wiki <occupation>', 'Fetches people from Wikidata by occupation and checks for specific aspects (Format: planet1 aspectType planet2 --wiki <occupation> [limit])')
   .option('--gui', 'Launches the web interface for command history (port 37421)')
   .option('--gui-port <port>', 'Specify custom port for GUI server')
+  .option('--gui-verbose', 'Enable verbose logging for GUI server')
   .option('--o', 'Shows how often this transit occurs in the sky (frequency calculation)')
   .description('Shows astrological data for a planet')
   .action(async (planetArg, planet2Arg, options) => {
@@ -292,19 +276,18 @@ program
     if (options.gui) {
       if (!guiServer) {
         console.error('❌ GUI server is not available. Please install required dependencies.');
-        console.error('💡 Run: npm install express sqlite3');
         process.exit(1);
       }
 
       try {
+        // Set verbose logging based on --gui-verbose flag
+        guiServer.enableVerboseLogging(!!options.guiVerbose);
+        
         await guiServer.initialize();
         const port = options.guiPort ? parseInt(options.guiPort) : 37421;
         await guiServer.start(port);
         
-        console.log(`\n🌐 GUI Server started successfully!`);
-        console.log(`📊 Open your browser and navigate to: http://localhost:${guiServer.getPort()}`);
-        console.log(`💡 Press Ctrl+C to stop the server and return to CLI`);
-        
+        // Server start messages are now handled by the server itself
         // Keep the process running
         await new Promise(() => {});
         return;
@@ -316,7 +299,7 @@ program
     
     // Show critical planets if --c option is specified (no planet required)
     if (actualOptions.c) {
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let personSource = null;
       const personDataToUse = getPersonDataToUse(options);
@@ -341,6 +324,54 @@ program
         }
       }
       
+      // Use custom date if specified (overrides person data)
+      if (options.d) {
+        // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
+        const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
+        const match = options.d.match(dateRegex);
+        
+        if (match) {
+          const day = parseInt(match[1], 10);
+          const month = parseInt(match[2], 10);
+          const year = parseInt(match[3], 10);
+          const hour = match[4] ? parseInt(match[4], 10) : 12; // Default: 12 o'clock
+          const minute = match[5] ? parseInt(match[5], 10) : 0; // Default: 0 minutes
+          
+          // Check if the date is valid
+          const date = new Date(year, month - 1, day, hour, minute);
+          if (date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day) {
+            customDate = {
+              day: day,
+              month: month,
+              year: year,
+              hour: hour,
+              minute: minute
+            };
+            console.log(`Using custom date: ${day}.${month}.${year} ${hour}:${minute.toString().padStart(2, '0')}`);
+          } else {
+            console.error('Invalid date:', options.d);
+            console.error('💡 Please use the format: DD.MM.YYYY or "DD.MM.YYYY HH:MM" (with quotes for date with time)');
+            process.exit(1);
+          }
+        } else {
+          console.error('Invalid date:', options.d);
+          console.error('💡 Please use the format: DD.MM.YYYY or "DD.MM.YYYY HH:MM" (with quotes for date with time)');
+          process.exit(1);
+        }
+      }
+      
+      // If no custom date is specified, use current date
+      if (!customDate) {
+        const currentTime = getCurrentTimeInTimezone();
+        customDate = {
+          day: currentTime.day,
+          month: currentTime.month,
+          year: currentTime.year,
+          hour: currentTime.hour,
+          minute: currentTime.minute
+        };
+      }
+      
       const criticalPlanets = getCriticalPlanets(customDate);
       
       if (criticalPlanets.length === 0) {
@@ -348,18 +379,20 @@ program
         return;
       }
       
-      console.log('========================================================');
-      console.log('| Planet   | Sign     | Degree  | Type               |');
-      console.log('========================================================');
+      console.log('================================================================================================================');
+      console.log('| Planet   | Sign     | Degree  | Type               | Interpretation                                  |');
+      console.log('================================================================================================================');
       
       criticalPlanets.forEach(planet => {
         const planetName = planet.name.charAt(0).toUpperCase() + planet.name.slice(1);
         const sign = planet.sign.padEnd(10, ' ');
         const degree = planet.degree.padEnd(5, ' ');
-        console.log(`| ${planetName.padEnd(8)} | ${sign} | ${degree} | ${planet.criticalType} |`);
+        const criticalType = planet.criticalType.padEnd(20, ' ');
+        const interpretation = planet.interpretation.padEnd(46, ' ');
+        console.log(`| ${planetName.padEnd(8)} | ${sign} | ${degree} | ${criticalType} | ${interpretation} |`);
       });
       
-      console.log('========================================================');
+      console.log('================================================================================================================');
       if (shouldUseBirthData(options)) {
         console.log('\nThis analysis is based on your birth chart.');
       } else {
@@ -426,7 +459,7 @@ program
 
     // Show element distribution if --el option is specified (no planet required)
     if (options.el) {
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let useBirthData = false;
       let personSource = null;
@@ -452,7 +485,7 @@ program
           console.log(`Location: ${customDate.location.name}, ${customDate.location.country}`);
         }
       }
-      // Use custom date if specified (overrides --p1, --p2 and --ich options)
+      // Use custom date if specified (overrides --p1, --p2 and --i options)
       if (options.d) {
         // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
         const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
@@ -500,7 +533,7 @@ program
         };
       }
       
-      // Check if we should use natal positions (when --i or --ich is used without custom date)
+      // Check if we should use natal positions (when --i is used without custom date)
       if (shouldUseBirthData(options) && !options.d) {
         useNatalPositions = true;
         // customDate is already set to birth data from personDataToUse
@@ -639,9 +672,9 @@ program
       return;
     }
 
-    // Show combined analysis ONLY when --tr/--transit-aspekte is used together with --hs
+    // Show combined analysis ONLY when --tr is used together with --hs
     // This ensures that `--tr` without `--hs` shows only personal transit aspects
-    if ((options.transitAspekte || options.tr) && options.hs) {
+    if (options.tr && options.hs) {
       
       // Person data is required
       const personDataToUse = getPersonDataToUse(options);
@@ -699,7 +732,7 @@ program
         // If no planet is specified, show ONLY the transit aspects table
         console.log('Transit aspects (Transit → Radix):');
         console.log('================================================================================');
-        console.log('| Transit     | Aspect      | With Planet | Orb   | Transit Pos      | Transit House | Birth House | Phase       | Exact Date/Time       |');
+        console.log('| Transit     | Aspect      | With Planet | Orb   | Transit Pos      | Transit House | Birth House | Phase       |');
         console.log('================================================================================');
 
         // Calculate houses once for all planets
@@ -729,18 +762,8 @@ program
               const targetAngle = aspectAngles[aspect.type];
               const phase = determineAspectPhase(planetName, aspect.birthPlanet, transitDateDisplay, aspect.type, targetAngle);
               
-              // Calculate exact date and time for this aspect
-              const exactDateTime = findExactAspectTime(planetName, aspect.birthPlanet, aspect.type, transitDateDisplay);
-              let dateTimeStr = '-';
-              if (exactDateTime) {
-                dateTimeStr = `${String(exactDateTime.day).padStart(2, '0')}.${String(exactDateTime.month).padStart(2, '0')}.${exactDateTime.year} ${String(exactDateTime.hour).padStart(2, '0')}:${String(exactDateTime.minute).padStart(2, '0')}`;
-              } else if (phase === 'separativ') {
-                // For separative phases: find the last exact date in the past
-                const lastExactDateTime = findLastExactAspectTime(planetName, aspect.birthPlanet, aspect.type, transitDateDisplay);
-                if (lastExactDateTime) {
-                  dateTimeStr = `${String(lastExactDateTime.day).padStart(2, '0')}.${String(lastExactDateTime.month).padStart(2, '0')}.${lastExactDateTime.year} ${String(lastExactDateTime.hour).padStart(2, '0')}:${String(lastExactDateTime.minute).padStart(2, '0')} (e)`;
-                }
-              }
+              // Exact time calculation removed
+              const dateTimeStr = '-';
               
               const transitPlanetFormatted = planetName.charAt(0).toUpperCase() + planetName.slice(1);
               const aspectTypeFormatted = aspect.type.padEnd(11);
@@ -752,7 +775,7 @@ program
               const phaseFormatted = phase === 'separativ' ? 'separativ'.padEnd(11) : phase.padEnd(11);
               const dateTimeFormatted = dateTimeStr.padEnd(22);
               
-              console.log(`| ${transitPlanetFormatted.padEnd(10)} | ${aspectTypeFormatted} | ${aspectPlanetFormatted.padEnd(10)} | ${orbFormatted}° | ${transitPosFormatted.padEnd(16)} | ${transitHouseFormatted} | ${birthHouseFormatted} | ${phaseFormatted} | ${dateTimeFormatted} |`);
+              console.log(`| ${transitPlanetFormatted.padEnd(10)} | ${aspectTypeFormatted} | ${aspectPlanetFormatted.padEnd(10)} | ${orbFormatted}° | ${transitPosFormatted.padEnd(16)} | ${transitHouseFormatted} | ${birthHouseFormatted} | ${phaseFormatted} |`);
             });
           }
         }
@@ -766,8 +789,8 @@ program
       return;
     }
 
-    // Show personal transit aspects if --transit-aspekte or --tr option is specified
-    if (options.transitAspekte || options.tr) {
+    // Show personal transit aspects if --tr option is specified
+    if (options.tr) {
       // Person data is required for transit aspects
       const personDataToUse = getPersonDataToUse(options);
       if (!personDataToUse.data) {
@@ -845,7 +868,7 @@ program
 
     // Show aspect figures if --af option is specified (no planet required)
     if (options.af) {
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let useBirthData = false;
       let personSource = null;
@@ -871,7 +894,7 @@ program
           console.log(`Location: ${customDate.location.name}, ${customDate.location.country}`);
         }
       }
-      // Use custom date if specified (overrides --p1, --p2 and --ich options)
+      // Use custom date if specified (overrides --p1, --p2 and --i options)
       if (options.d) {
         // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
         const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
@@ -1248,7 +1271,7 @@ program
 
     // Show table view of all planet positions if --s option is specified
     if (options.s) {
-      // Use person data for house calculation if --p1, --p2 or --ich option is specified
+      // Use person data for house calculation if --p1, --p2 or --i option is specified
       let customDate = null;
       let birthData = null;
       let houseSystem = options.hs ? options.hs.toLowerCase() : 'koch';
@@ -1327,7 +1350,7 @@ program
         };
       }
       
-      // Check if we should use natal positions (when --i or --ich is used without custom date)
+      // Check if we should use natal positions (when --i is used without custom date)
       if (shouldUseBirthData(options) && !options.d) {
         useNatalPositions = true;
         customDate = birthData; // Use birth data for planet positions
@@ -1694,7 +1717,7 @@ program
     const planet = planetArg ? planetArg.toLowerCase() : null;
     
     if (options.a) {
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let useBirthData = false;
       let personSource = null;
@@ -1720,7 +1743,7 @@ program
           console.log(`Location: ${customDate.location.name}, ${customDate.location.country}`);
         }
       }
-      // Use custom date if specified (overrides --p1, --p2 and --ich options)
+      // Use custom date if specified (overrides --p1, --p2 and --i options)
       if (options.d) {
         // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
         const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
@@ -1828,7 +1851,7 @@ program
         process.exit(1);
       }
       
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let useBirthData = false;
       let personSource = null;
@@ -1854,7 +1877,7 @@ program
           console.log(`Location: ${customDate.location.name}, ${customDate.location.country}`);
         }
       }
-      // Use custom date if specified (overrides --p1, --p2 and --ich options)
+      // Use custom date if specified (overrides --p1, --p2 and --i options)
       if (options.d) {
         // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
         const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
@@ -2119,57 +2142,7 @@ program
       return;
     }
   
-    // Check for house filter options
-    const houseOptions = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7', 'h8', 'h9', 'h10', 'h11', 'h12'];
-    const selectedHouseOption = houseOptions.find(opt => options[opt]);
-    
-    if (selectedHouseOption && options.folder) {
-      const targetHouse = parseInt(selectedHouseOption.substring(1));
-      const houseSystem = options.hs ? options.hs.toLowerCase() : 'koch';
-      await filterFilesByHouse(planet, options.folder, targetHouse,
-        getHouseSystemCode(houseSystem));
-        
-      // Handle AI request for house filter
-      if (options.p) {
-        const folderData = {
-          planet: planet,
-          sign: 'Multiple',
-          degreeInSign: 'Multiple',
-          dignity: `Folder analysis: Files filtered by ${planet} in house ${targetHouse} (${houseSystem} system)`,
-          element: 'Multiple',
-          decan: 'Multiple',
-          analysisType: 'house-filter',
-          targetHouse: targetHouse,
-          houseSystem: houseSystem
-        };
-        await handleAIRequest(options, folderData);
-      }
-      return;
-    }
-    
-    // Perform folder analysis if --folder option is provided
-    if (options.folder) {
-      const houseSystem = options.hs ? options.hs.toLowerCase() : 'koch';
-      await analyzeHouseDistribution(planet, options.folder, getHouseSystemCode(houseSystem));
-      
-      // Handle AI request for folder analysis
-      if (options.p) {
-        const folderData = {
-          planet: planet,
-          sign: 'Multiple',
-          degreeInSign: 'Multiple',
-          dignity: `Folder analysis: House distribution for ${planet} (${houseSystem} system)`,
-          element: 'Multiple',
-          decan: 'Multiple',
-          analysisType: 'folder-analysis',
-          houseSystem: houseSystem
-        };
-        await handleAIRequest(options, folderData);
-      }
-      return;
-    }
-
-    // Use person data if --p1, --p2, or --ich option is provided
+    // Use person data if --p1, --p2, or --i option is provided
     let customDate = null;
     const personDataToUse = getPersonDataToUse(options);
     if (personDataToUse.data) {
@@ -2193,7 +2166,7 @@ program
         console.log(`Location: ${customDate.location.name}, ${customDate.location.country}`);
       }
     }
-    // Use custom date if provided (overrides --p1, --p2, and --ich options)
+    // Use custom date if provided (overrides --p1, --p2, and --i options)
     if (options.d) {
       // Try to parse the date as DD.MM.YYYY or DD.MM.YYYY HH:MM
       const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2}))?$/;
@@ -2269,7 +2242,7 @@ program
     // Show only house table (without planet info)
     if (options.hl) {
       const julianDay = getJulianDay(null, shouldUsePersonData(options));
-      const useBirthLocation = shouldUsePersonData(options); // Use birth location if --p1, --p2 or --ich option is specified
+      const useBirthLocation = shouldUsePersonData(options); // Use birth location if --p1, --p2 or --i option is specified
       
       try {
         let houses;
@@ -2331,33 +2304,45 @@ program
       // Example: "saturn k neptun" for Saturn conjunction Neptune
 
       // Parse planet and aspect information
-      const args = process.argv.slice(2); // Skip 'node' and 'script.js'
+      let planet1, aspectType, planet2, count;
+      
+      // Check if arguments are already parsed (from CLI service executeCommand)
+      if (options.vPlanet1 && options.vAspectType && options.vPlanet2) {
+        // Arguments already parsed by CLI service
+        planet1 = options.vPlanet1.toLowerCase();
+        aspectType = options.vAspectType.toLowerCase();
+        planet2 = options.vPlanet2.toLowerCase();
+        count = parseInt(options.v);
+      } else {
+        // Parse from process.argv (direct CLI execution)
+        const args = process.argv.slice(2); // Skip 'node' and 'script.js'
 
-      // Find position of --v option
-      const vIndex = args.findIndex(arg => arg === '--v');
-      if (vIndex === -1) {
-        console.error('Error: --v option not found');
-        process.exit(1);
-      }
+        // Find position of --v option
+        const vIndex = args.findIndex(arg => arg === '--v');
+        if (vIndex === -1) {
+          console.error('Error: --v option not found');
+          process.exit(1);
+        }
 
-      // The next arguments after --v should be count, planet1, aspectType, planet2
-      const count = parseInt(options.v);
+        // The next arguments after --v should be count, planet1, aspectType, planet2
+        count = parseInt(options.v);
+
+        // We need three additional arguments: planet1, aspectType, planet2
+        // The arguments are the next three arguments after --v
+        // Check if we have enough arguments
+        if (args.length < vIndex + 5) {
+          console.error('Error: Past aspects require two planets and an aspect type.');
+          console.error('Format: --v <count> planet1 aspectType planet2');
+          console.error('Example: --v 3 saturn k neptun');
+          console.error('Aspect types: k=conjunction, o=opposition, q=square, t=trine, s=sextile');
+          process.exit(1);
+        }
 
-      // We need three additional arguments: planet1, aspectType, planet2
-      // The arguments are the next three arguments after --v
-      // Check if we have enough arguments
-      if (args.length < vIndex + 5) {
-        console.error('Error: Past aspects require two planets and an aspect type.');
-        console.error('Format: --v <count> planet1 aspectType planet2');
-        console.error('Example: --v 3 saturn k neptun');
-        console.error('Aspect types: k=conjunction, o=opposition, q=square, t=trine, s=sextile');
-        process.exit(1);
+        planet1 = args[vIndex + 2].toLowerCase();
+        aspectType = args[vIndex + 3].toLowerCase();
+        planet2 = args[vIndex + 4].toLowerCase();
       }
 
-      const planet1 = args[vIndex + 2].toLowerCase();
-      const aspectType = args[vIndex + 3].toLowerCase();
-      const planet2 = args[vIndex + 4].toLowerCase();
-
       // Check if planets are valid
       if (!planets[planet1] || !planets[planet2]) {
         console.error('Error: Invalid planets.');
@@ -2420,23 +2405,35 @@ program
       // Example: "saturn k neptun" for Saturn conjunction Neptune
 
       // Parse planet and aspect information
-      const args = process.argv.slice(2); // Skip 'node' and 'script.js'
+      let planet1, aspectType, planet2, count;
+      
+      // Check if arguments are already parsed (from CLI service executeCommand)
+      if (options.zPlanet1 && options.zAspectType && options.zPlanet2) {
+        // Arguments already parsed by CLI service
+        planet1 = options.zPlanet1.toLowerCase();
+        aspectType = options.zAspectType.toLowerCase();
+        planet2 = options.zPlanet2.toLowerCase();
+        count = parseInt(options.z);
+      } else {
+        // Parse from process.argv (direct CLI execution)
+        const args = process.argv.slice(2); // Skip 'node' and 'script.js'
 
-      // Find position of --z option
-      const zIndex = args.findIndex(arg => arg === '--z');
-      if (zIndex === -1) {
-        console.error('Error: --z option not found');
-        process.exit(1);
-      }
+        // Find position of --z option
+        const zIndex = args.findIndex(arg => arg === '--z');
+        if (zIndex === -1) {
+          console.error('Error: --z option not found');
+          process.exit(1);
+        }
 
-      // The next arguments after --z should be count, planet1, aspectType, planet2
-      const count = parseInt(options.z);
+        // The next arguments after --z should be count, planet1, aspectType, planet2
+        count = parseInt(options.z);
 
-      // We need three additional arguments: planet1, aspectType, planet2
-      // The arguments are the next three arguments after --z
-      const planet1 = args[zIndex + 2].toLowerCase();
-      const aspectType = args[zIndex + 3].toLowerCase();
-      const planet2 = args[zIndex + 4].toLowerCase();
+        // We need three additional arguments: planet1, aspectType, planet2
+        // The arguments are the next three arguments after --z
+        planet1 = args[zIndex + 2].toLowerCase();
+        aspectType = args[zIndex + 3].toLowerCase();
+        planet2 = args[zIndex + 4].toLowerCase();
+      }
 
       if (!planet1 || !aspectType || !planet2) {
         console.error('Error: Future aspects require two planets and an aspect type.');
@@ -2715,7 +2712,7 @@ program
 
     // House calculation with planet position
     if (options.hs) {
-      // Use person data if --p1, --p2 or --ich option is specified
+      // Use person data if --p1, --p2 or --i option is specified
       let customDate = null;
       let useBirthData = false;
       let personSource = null;
@@ -2801,4 +2798,3 @@ function getAspectTypeFullName(aspectType) {
   
   return aspectNames[aspectType.toLowerCase()] || aspectType;
 }
-