klio 1.5.5 → 1.5.7

package/README.md

@@ -36,6 +36,25 @@ npm install -g klio
 klio [options]
 ```
 
+### Planet Selection
+
+By default, Klio uses traditional planets plus Chiron. You can customize which planets and asteroids are active:
+
+```bash
+# Show currently active planets
+klio --active-planets
+
+# Set custom active planets (comma-separated)
+klio --planets "Sun,Moon,Mercury,Venus,Chiron,Hygiea"
+
+klio --planets "Sun,Moon,Mercury,Venus,Mars,Jupiter,Saturn,Uranus,Neptune,Pluto"
+```
+
+Available planets: Sun, Moon, Mercury, Venus, Mars, Jupiter, Saturn, Uranus, Neptune, Pluto, Chiron, Hygiea
+
+> **Note:** By default, only Chiron is active among asteroids. Other asteroids like Hygiea must be explicitly enabled.
+=======
+
 ### Web Interface
 
 AstroCLI includes a web-based GUI that you can launch with the `--gui` flag:
@@ -118,8 +137,12 @@ It's possible to analyze a csv with a column of either ISO date time or unix tim
 
 - **Show house and sign distribution of the datetime column**: `klio [planet] --csv <file-path>`
 - **Show aspect type distribution between two planets:** `klio [planet1] [planet2] --csv <file-path> --a`
+- **Specify date column name:** `klio [planet] --csv <file-path> --date-col "Buchungsdatum"` (e.g., `--date-col "Date"`)
 - **Filter CSV data by column value:** `klio [planet] --csv <file-path> --filter "column:value"` (e.g., `--filter "Item:coffee"`)
+- **Filter CSV data by contains operator:** `klio [planet] --csv <file-path> --filter "column*text"` (e.g., `--filter "Buchungstext*Gutschrift"`)
+- **Filter CSV data by excludes operator:** `klio [planet] --csv <file-path> --filter "column!text"` (e.g., `--filter "Buchungstext!Gutschrift"`)
 - **Filter CSV data by multiple conditions:** `klio [planet] --csv <file-path> --filter "column1:value1,column2:value2"` (e.g., `--filter "FTR:H,HomeTeam:Liverpool"`)
+- **Filter CSV data with comparison operators:** `klio [planet] --csv <file-path> --filter "column>value"` (e.g., `--filter "Amount>100"`)
 - **Creating a bar chart**: Create a bar chart and save the image to the downloads' folder. The image shows the aspect distribution of your csv datetime values: `klio moon sun --csv /home/user/Downloads/coffee.csv  --filter "Item:cookie" --a --title "Eaten cookies during sun-moon aspects"`
 
 - The command also returns a Chi-Square. 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klio",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "A CLI for astrological calculations",
   "main": "src/main.js",
   "bin": {

package/src/astrology/astrologyConstants.js

@@ -13,6 +13,25 @@ const planets = {
   chiron: 15
 };
 
+// Asteroid constants for Swiss Ephemeris
+// Note: These use the SE_AST_OFFSET (10000) + asteroid number
+const asteroidConstants = {
+  ceres: 10001,    // Ceres = 10000 + 1
+  pallas: 10002,   // Pallas = 10000 + 2
+  hygiea: 10010,   // Hygiea = 10000 + 10
+  juno: 10003,     // Juno = 10000 + 3
+  vesta: 10004     // Vesta = 10000 + 4
+};
+
+// Asteroid names for Swiss Ephemeris (used as string identifiers)
+const asteroidNames = {
+  ceres: 'Ceres',
+  pallas: 'Pallas',
+  hygiea: 'Hygiea',
+  juno: 'Juno',
+  vesta: 'Vesta'
+};
+
 // Zodiac signs (English)
 const signs = [
   'Aries', 'Taurus', 'Gemini', 'Cancer', 'Leo', 'Virgo',
@@ -54,8 +73,18 @@ const dignities = {
   15: { sign: 'Virgo', exaltation: 'Pisces', fall: 'Virgo', detriment: 'Pisces' } // Chiron
 };
 
+// Asteroid dignities (using asteroid constants as keys)
+const asteroidDignities = {
+  10001: { sign: 'Taurus', exaltation: 'Virgo', fall: 'Scorpio', detriment: 'Scorpio' }, // Ceres
+  10002: { sign: 'Libra', exaltation: 'Aries', fall: 'Libra', detriment: 'Aries' }, // Pallas
+  10010: { sign: 'Virgo', exaltation: 'Pisces', fall: 'Virgo', detriment: 'Pisces' } // Hygiea
+};
+
 module.exports = {
   planets,
+  asteroidNames,
+  asteroidConstants,
+  asteroidDignities,
   signs,
   elements,
   signTypes,

package/src/astrology/astrologyService.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const moment = require('moment-timezone');
 const csvParser = require('csv-parser');
 const { parse } = require('csv-parse/sync');
-const { planets, signs, elements, signTypes, decans, dignities } = require('./astrologyConstants');
+const { planets, asteroidNames, asteroidConstants, asteroidDignities, signs, elements, signTypes, decans, dignities } = require('./astrologyConstants');
 const { loadConfig } = require('../config/configService');
 const path = require('path');
 
@@ -49,6 +49,17 @@ function getCurrentTimeInTimezone() {
   };
 }
 
+// Function to get active planets (filtered by configuration)
+function getActivePlanets() {
+  try {
+    const { getActivePlanets } = require('../config/configService');
+    return getActivePlanets();
+  } catch (error) {
+    // Fallback to default active planets if config service is not available
+    return ['sun', 'moon', 'mercury', 'venus', 'mars', 'jupiter', 'saturn', 'uranus', 'neptune', 'pluto', 'chiron'];
+  }
+}
+
 // Function to load birth data from configuration
 function getBirthDataFromConfig(userId = null) {
   try {
@@ -377,7 +388,14 @@ function getPlanetHouse(planetLongitude, houseCusps) {
 // Function to calculate astrological data
 function getAstrologicalData(planetName, customDate = null) {
   const planet = planets[planetName];
-  if (planet === undefined) {
+  const isAsteroid = asteroidNames[planetName] !== undefined;
+  let asteroidId = null;
+  
+  if (isAsteroid) {
+    asteroidId = asteroidConstants[planetName];
+  }
+  
+  if (planet === undefined && !isAsteroid) {
     console.error(`Invalid planet: ${planetName}. Available planets:`, Object.keys(planets).join(', '));
     process.exit(1);
   }
@@ -433,16 +451,53 @@ function getAstrologicalData(planetName, customDate = null) {
 
   const julianDay = calculateJulianDayUTC({ year: calcYear, month: calcMonth, day: calcDay, hour: calcHour, minute: calcMinute }, timezoneOffsetMinutes);
   const flag = swisseph.SEFLG_SWIEPH | swisseph.SEFLG_SPEED;
-  let result = swisseph.swe_calc_ut(julianDay, planet, flag);
+  let result;
 
-  if (result.error && result.error.includes('not found')) {
-    // Fallback to Moshier if ephemeris files are missing
-    const moshierFlag = swisseph.SEFLG_MOSEPH | swisseph.SEFLG_SPEED;
-    result = swisseph.swe_calc_ut(julianDay, planet, moshierFlag);
-  }
+  if (isAsteroid) {
+    // Handle asteroid calculations using proper Swiss Ephemeris constants
+    if (asteroidId) {
+      // Use the same swe_calc_ut function but with asteroid ID
+      result = swisseph.swe_calc_ut(julianDay, asteroidId, flag);
+      
+      if (result.error && result.error.includes('not found')) {
+        // Fallback to Moshier if ephemeris files are missing
+        const moshierFlag = swisseph.SEFLG_MOSEPH | swisseph.SEFLG_SPEED;
+        result = swisseph.swe_calc_ut(julianDay, asteroidId, moshierFlag);
+      }
+      
+      if (result.error) {
+        console.warn(`⚠️  Could not calculate asteroid ${planetName}: ${result.error}`);
+        // Fallback to placeholder data if calculation fails
+        result = {
+          longitude: 0,
+          latitude: 0,
+          distance: 0,
+          longitudeSpeed: 0
+        };
+      }
+    } else {
+      console.warn(`⚠️  Unknown asteroid: ${planetName}`);
+      // Fallback to placeholder data for unknown asteroids
+      result = {
+        longitude: 0,
+        latitude: 0,
+        distance: 0,
+        longitudeSpeed: 0
+      };
+    }
+  } else {
+    // Handle regular planet calculations
+    result = swisseph.swe_calc_ut(julianDay, planet, flag);
 
-  if (result.error) {
-    throw new Error(result.error);
+    if (result.error && result.error.includes('not found')) {
+      // Fallback to Moshier if ephemeris files are missing
+      const moshierFlag = swisseph.SEFLG_MOSEPH | swisseph.SEFLG_SPEED;
+      result = swisseph.swe_calc_ut(julianDay, planet, moshierFlag);
+    }
+
+    if (result.error) {
+      throw new Error(result.error);
+    }
   }
 
   const longitude = result.longitude;
@@ -452,16 +507,20 @@ function getAstrologicalData(planetName, customDate = null) {
   const element = elements[signIndex];
   const decan = decans[Math.floor((longitude % 30) / 10)];
 
-  const dignityInfo = dignities[planet];
+  // Get dignity info - use asteroid dignities for asteroids, regular dignities for planets
+  const dignityInfo = isAsteroid ? asteroidDignities[asteroidId] : dignities[planet];
   let dignity = 'Neutral';
-  if (sign === dignityInfo.sign) {
-    dignity = 'Ruler';
-  } else if (sign === dignityInfo.exaltation) {
-    dignity = 'Exaltation';
-  } else if (sign === dignityInfo.fall) {
-    dignity = 'Fall';
-  } else if (sign === dignityInfo.detriment) {
-    dignity = 'Detriment';
+  
+  if (dignityInfo) {
+    if (sign === dignityInfo.sign) {
+      dignity = 'Ruler';
+    } else if (sign === dignityInfo.exaltation) {
+      dignity = 'Exaltation';
+    } else if (sign === dignityInfo.fall) {
+      dignity = 'Fall';
+    } else if (sign === dignityInfo.detriment) {
+      dignity = 'Detriment';
+    }
   }
 
   return {
@@ -510,8 +569,16 @@ function getCriticalPlanets(customDate = null) {
   const offsetMinutes = timezone ? getTimezoneOffset(timeData, timezone) : -new Date().getTimezoneOffset();
   const julianDay = calculateJulianDayUTC(timeData, offsetMinutes);
   
-  // Calculate positions of all planets
+  // Get active planets from configuration
+  const activePlanets = getActivePlanets();
+  
+  // Calculate positions of active planets only
   for (const [name, planetId] of Object.entries(planets)) {
+    // Skip planets that are not in the active list
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
+    
     const flag = swisseph.SEFLG_SWIEPH | swisseph.SEFLG_SPEED;
     let result = swisseph.swe_calc_ut(julianDay, planetId, flag);
     
@@ -772,12 +839,12 @@ function showPlanetComboAspects(planetNames, dateComponents, useBirthData = fals
 // Function to calculate all active aspects between all planets
 function getAllActiveAspects(dateComponents) {
   const allAspects = [];
-  const planetNames = Object.keys(planets);
+  const activePlanets = getActivePlanets();
   const seenAspects = new Set(); // To avoid duplicates
   
-  // Calculate aspects for all planet pairs
-  for (let i = 0; i < planetNames.length; i++) {
-    const planet1 = planetNames[i];
+  // Calculate aspects for active planet pairs only
+  for (let i = 0; i < activePlanets.length; i++) {
+    const planet1 = activePlanets[i];
     const aspects = calculatePlanetAspects(planet1, dateComponents, true); // Always use Huber orbs
     
     aspects.forEach(aspect => {
@@ -1349,16 +1416,25 @@ async function calculatePersonalTransits(transitDate = null, birthData = null) {
   const birthJulianDay = calculateJulianDayUTC(birthData, getTimezoneOffset(birthData, birthData.location?.timezone || 'Europe/Zurich'));
   const houses = await calculateHouses(birthJulianDay, 'K', true, birthData.location || null); // Always Koch house system for transits
 
-  // Calculate current planet positions (Transit)
+  // Get active planets from configuration
+  const activePlanets = getActivePlanets();
+  
+  // Calculate current planet positions (Transit) for active planets only
   const transitPlanets = {};
   for (const [name, planetId] of Object.entries(planets)) {
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
     const data = getAstrologicalData(name, transitDate);
     transitPlanets[name] = data;
   }
 
-  // Calculate birth planet positions (Radix)
+  // Calculate birth planet positions (Radix) for active planets only
   const birthPlanets = {};
   for (const [name, planetId] of Object.entries(planets)) {
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
     const data = getAstrologicalData(name, birthData);
     birthPlanets[name] = data;
   }
@@ -1399,16 +1475,25 @@ function calculatePersonalTransitAspects(transitDate = null, birthData = null, t
     transitDate = getCurrentTimeInTimezone();
   }
 
-  // Calculate current planet positions (Transit)
+  // Get active planets from configuration
+  const activePlanets = getActivePlanets();
+  
+  // Calculate current planet positions (Transit) for active planets only
   const transitPlanets = {};
   for (const [name, planetId] of Object.entries(planets)) {
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
     const data = getAstrologicalData(name, transitDate);
     transitPlanets[name] = data.longitude;
   }
 
-  // Calculate birth planet positions (Radix)
+  // Calculate birth planet positions (Radix) for active planets only
   const birthPlanets = {};
   for (const [name, planetId] of Object.entries(planets)) {
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
     const data = getAstrologicalData(name, birthData);
     birthPlanets[name] = data.longitude;
   }
@@ -1606,15 +1691,23 @@ function analyzeElementDistribution(dateComponents, useBirthData = false) {
   
   const planetElements = {};
   
-  // Calculate elements of all planets
+  // Get active planets from configuration
+  const activePlanets = getActivePlanets();
+  
+  // Calculate elements of active planets only
   for (const [name, planetId] of Object.entries(planets)) {
+    // Skip planets that are not in the active list
+    if (!activePlanets.includes(name)) {
+      continue;
+    }
+    
     const data = getAstrologicalData(name, dateComponents);
     elementCounts[data.element]++;
     planetElements[name] = data.element;
   }
   
-  // Calculate total number of planets
-  const totalPlanets = Object.keys(planets).length;
+  // Calculate total number of active planets
+  const totalPlanets = activePlanets.length;
   
   // Calculate percentages
   const elementPercentages = {};
@@ -1872,6 +1965,37 @@ function parseFilterCriteria(filterString) {
       continue;
     }
 
+    // Check for wildcard patterns in the value (new enhanced syntax)
+    const wildcardMatch = condition.match(/^([^:]+):(.+)$/);
+    if (wildcardMatch) {
+      const column = wildcardMatch[1].trim();
+      const value = wildcardMatch[2].trim();
+      
+      // Remove * and ! from the value for contains/excludes operations
+      const cleanValue = value.replace(/^[*!]+/, '').replace(/[*!]+$/, '');
+      
+      // Check if value contains * or starts with !
+      if (value.includes('*') || value.startsWith('!')) {
+        // Use * operator for contains matching (remove * from value)
+        // Use ! operator for excludes matching (remove ! from value)
+        const operator = value.startsWith('!') ? '!' : '*';
+        criteria.push({
+          column: column,
+          operator: operator,
+          value: cleanValue
+        });
+        continue;
+      }
+      
+      // Regular equality match
+      criteria.push({
+        column: column,
+        operator: '=',
+        value: value
+      });
+      continue;
+    }
+
     const parts = condition.split(':');
     if (parts.length !== 2) {
       console.warn(`Invalid filter format. Expected "column:value" or "column > value" but got "${condition}"`);
@@ -1919,6 +2043,12 @@ function applyFilter(records, filterCriteria) {
         return bothNumeric ? recordNum < valueNum : false;
       case '<=':
         return bothNumeric ? recordNum <= valueNum : false;
+      case '*':
+        // Contains operator - check if record value contains the search string
+        return recordValueStr.includes(valueStr);
+      case '!':
+        // Excludes operator - check if record value does NOT contain the search string
+        return !recordValueStr.includes(valueStr);
       default:
         return false;
     }
@@ -1941,7 +2071,7 @@ function applyFilter(records, filterCriteria) {
   }
 }
 
-function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'koch', analyzeAspects = false, partnerPlanet = null, filterCriteria = null) {
+function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'koch', analyzeAspects = false, partnerPlanet = null, filterCriteria = null, dateColumn = null) {
   return new Promise(async (resolve, reject) => {
     const results = [];
     let pendingOperations = 0;
@@ -2014,8 +2144,25 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
 
         // Process each row
         for (const data of filteredRecords) {
-          // Look for a column with datetime values, prioritizing specific date formats
-          const datetimeColumns = [];
+          // Use specified date column if provided, otherwise auto-detect
+          let datetimeColumns = [];
+          let datetimeValue = null;
+          
+          if (dateColumn) {
+            // Use the specified date column
+            if (data.hasOwnProperty(dateColumn)) {
+              datetimeValue = data[dateColumn];
+              datetimeColumns = [dateColumn];
+            } else {
+              console.warn(`⚠️  Specified date column "${dateColumn}" not found in CSV. Trying auto-detection...`);
+              // Fall back to auto-detection
+            }
+          }
+          
+          // If no date column was specified or it wasn't found, auto-detect
+          if (datetimeColumns.length === 0) {
+            // Look for a column with datetime values, prioritizing specific date formats
+            datetimeColumns = [];
           
           // First pass: look for YYYY-MM-DD format (most specific)
           const yyyyMmDdColumns = Object.keys(data).filter(key => {
@@ -2030,6 +2177,13 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             const trimmed = value != null ? value.toString().trim() : '';
             return /^\d{2}\/\d{2}\/\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(trimmed);
           });
+
+          // Second pass alternative: look for DD.MM.YYYY format (optional time)
+          const ddMmYyyyDotColumns = Object.keys(data).filter(key => {
+            const value = data[key];
+            const trimmed = value != null ? value.toString().trim() : '';
+            return /^\d{2}\.\d{2}\.\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(trimmed);
+          });
           
           // Third pass: look for Unix timestamps (10 or 13 digits)
           const unixTimestampColumns = Object.keys(data).filter(key => {
@@ -2049,11 +2203,15 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             return moment(trimmed, moment.ISO_8601, true).isValid();
           });
           
-          // Prioritize columns: YYYY-MM-DD, DD/MM/YYYY, Unix timestamps, then ISO dates
-          datetimeColumns.push(...yyyyMmDdColumns, ...ddMmYyyyColumns, ...unixTimestampColumns, ...isoDateColumns);
+            // Prioritize columns: YYYY-MM-DD, DD/MM/YYYY, DD.MM.YYYY, Unix timestamps, then ISO dates
+            datetimeColumns.push(...yyyyMmDdColumns, ...ddMmYyyyColumns, ...ddMmYyyyDotColumns, ...unixTimestampColumns, ...isoDateColumns);
+            
+            if (datetimeColumns.length > 0) {
+              datetimeValue = data[datetimeColumns[0]];
+            }
+          }
 
-          if (datetimeColumns.length > 0) {
-            const datetimeValue = data[datetimeColumns[0]];
+          if (datetimeColumns.length > 0 && datetimeValue !== null) {
             const datetimeValueTrimmed = datetimeValue != null ? datetimeValue.toString().trim() : '';
             let datetime;
 
@@ -2073,6 +2231,15 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
               if (datetime.isValid() && !hasTime) {
                 datetime = datetime.hour(12).minute(0);
               }
+            } else if (/^\d{2}\.\d{2}\.\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(datetimeValueTrimmed)) {
+              // Handle as DD.MM.YYYY (optional time)
+              const hasTime = /\d{1,2}:\d{2}/.test(datetimeValueTrimmed);
+              // Replace dots with slashes to use the same parsing logic
+              const datetimeValueWithSlashes = datetimeValueTrimmed.replace(/\./g, '/');
+              datetime = moment(datetimeValueWithSlashes, ['DD/MM/YYYY HH:mm:ss', 'DD/MM/YYYY HH:mm', 'DD/MM/YYYY'], true);
+              if (datetime.isValid() && !hasTime) {
+                datetime = datetime.hour(12).minute(0);
+              }
             } else {
               // Handle as ISO-8601 date
               datetime = moment(datetimeValueTrimmed);
@@ -2249,9 +2416,25 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
 
         // Process each record
         for (const data of filteredRecords) {
-
-          // Look for a column with ISO-Datetime values, YYYY-MM-DD dates, DD/MM/YYYY dates (optional time), or Unix-Timestamps
-          const datetimeColumns = Object.keys(data).filter(key => {
+          // Use specified date column if provided, otherwise auto-detect
+          let datetimeColumns = [];
+          let datetimeValue = null;
+          
+          if (dateColumn) {
+            // Use the specified date column
+            if (data.hasOwnProperty(dateColumn)) {
+              datetimeValue = data[dateColumn];
+              datetimeColumns = [dateColumn];
+            } else {
+              console.warn(`⚠️  Specified date column "${dateColumn}" not found in CSV. Trying auto-detection...`);
+              // Fall back to auto-detection
+            }
+          }
+          
+          // If no date column was specified or it wasn't found, auto-detect
+          if (datetimeColumns.length === 0) {
+            // Look for a column with ISO-Datetime values, YYYY-MM-DD dates, DD/MM/YYYY dates (optional time), or Unix-Timestamps
+            datetimeColumns = Object.keys(data).filter(key => {
             const value = data[key];
             const trimmed = value != null ? value.toString().trim() : '';
             // Check for ISO-8601 date
@@ -2260,13 +2443,19 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             const isYYYYMMDD = /^\d{4}-\d{2}-\d{2}$/.test(trimmed);
             // Check for DD/MM/YYYY date format
             const isDDMMYYYY = /^\d{2}\/\d{2}\/\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(trimmed);
+            // Check for DD.MM.YYYY date format
+            const isDDMMYYYYDot = /^\d{2}\.\d{2}\.\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(trimmed);
             // Check for Unix-Timestamp (number with 10 or 13 digits)
             const isUnixTimestamp = /^\d{10,13}$/.test(trimmed);
-            return isISO || isYYYYMMDD || isDDMMYYYY || isUnixTimestamp;
+            return isISO || isYYYYMMDD || isDDMMYYYY || isDDMMYYYYDot || isUnixTimestamp;
           });
 
-          if (datetimeColumns.length > 0) {
-            const datetimeValue = data[datetimeColumns[0]];
+            if (datetimeColumns.length > 0) {
+              datetimeValue = data[datetimeColumns[0]];
+            }
+          }
+
+          if (datetimeColumns.length > 0 && datetimeValue !== null) {
             const datetimeValueTrimmed = datetimeValue != null ? datetimeValue.toString().trim() : '';
             let datetime;
 
@@ -2286,6 +2475,15 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
               if (datetime.isValid() && !hasTime) {
                 datetime = datetime.hour(12).minute(0);
               }
+            } else if (/^\d{2}\.\d{2}\.\d{4}(?:\s+\d{1,2}:\d{2}(?::\d{2})?)?$/.test(datetimeValueTrimmed)) {
+              // Handle as DD.MM.YYYY (optional time)
+              const hasTime = /\d{1,2}:\d{2}/.test(datetimeValueTrimmed);
+              // Replace dots with slashes to use the same parsing logic
+              const datetimeValueWithSlashes = datetimeValueTrimmed.replace(/\./g, '/');
+              datetime = moment(datetimeValueWithSlashes, ['DD/MM/YYYY HH:mm:ss', 'DD/MM/YYYY HH:mm', 'DD/MM/YYYY'], true);
+              if (datetime.isValid() && !hasTime) {
+                datetime = datetime.hour(12).minute(0);
+              }
             } else {
               // Handle as ISO-8601 date
               datetime = moment(datetimeValueTrimmed);
@@ -2985,7 +3183,10 @@ module.exports = {
   calculateNextPlanetIngress,
   calculateAstrologicalAngles,
   longitudeToSignDegree,
-  calculateTransitFrequency
+  calculateTransitFrequency,
+  // Filter functions for testing
+  parseFilterCriteria,
+  applyFilter
 };
 
 // Function to calculate how often a transit occurs between two planets

package/src/cli/cli.js

@@ -392,7 +392,8 @@ program
   .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)')
   .option('--csv <filepath>', 'Analyzes a CSV file with ISO-Datetime values or Unix timestamps')
-  .option('--filter <column:value>', 'Filters CSV data by column:value (e.g., --filter "Item:coffee")')
+  .option('--date-col <column>', 'Specifies the column name containing date values (e.g., --date-col "Buchungsdatum")')
+  .option('--filter <column:value>', 'Filters CSV data by column:value (e.g., --filter "Item:coffee", "Item:*coffee*", "Item:!bad*")')
   .option('--title <title>', 'Title for the chart image (generates PNG image when provided)')
   .option('--in [count]', 'Shows next planet ingress (entering new sign). Optional count for multiple ingresses')
   .option('--wiki <occupation>', 'Fetches people from Wikidata by occupation and checks for specific aspects (Format: planet1 aspectType planet2 --wiki <occupation> [limit])')
@@ -400,6 +401,8 @@ program
   .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)')
+  .option('--planets <list>', 'Select active planets and asteroids (comma-separated, e.g., "Sun,Moon,Mercury,Venus,Hygiea")')
+  .option('--active-planets', 'Show the currently active planets')
   .description('Shows astrological data for a planet')
   .action(async (planetArg, planet2Arg, options) => {
     // If planet2Arg is an object, it contains the options (commander behavior)
@@ -874,46 +877,68 @@ program
         const houses = await calculateHouses(birthJulianDay, getHouseSystemCode(houseSystem), true);
         const transitDateDisplay = transitDate || getCurrentTimeInTimezone();
 
-        // Show transit aspects for all planets
+        // Collect all transit aspects first
+        const allAspects = [];
         for (const [planetName] of Object.entries(planets)) {
           const transitPlanetData = getAstrologicalData(planetName, transitDateDisplay);
           const transitHouse = getPlanetHouse(parseFloat(transitPlanetData.degreeInSign) + (signs.indexOf(transitPlanetData.sign) * 30), houses.house);
           const transitAspectsData = calculatePersonalTransitAspects(transitDateDisplay, birthData, planetName);
           const transitAspects = transitAspectsData ? transitAspectsData.aspects : [];
-          if (transitAspects.length > 0) {
-            transitAspects.forEach(aspect => {
-              const birthPlanetData = getAstrologicalData(aspect.birthPlanet, birthData);
-              const birthHouse = getPlanetHouse(parseFloat(birthPlanetData.degreeInSign) + (signs.indexOf(birthPlanetData.sign) * 30), houses.house);
-              
-              // Determine aspect phase
-              const aspectAngles = {
-                'Conjunction': 0,
-                'Opposition': 180,
-                'Square': 90,
-                'Trine': 120,
-                'Sextile': 60
-              };
-              const targetAngle = aspectAngles[aspect.type];
-              const phase = determineAspectPhase(planetName, aspect.birthPlanet, transitDateDisplay, aspect.type, targetAngle);
-              
-              // Exact time calculation removed
-              const dateTimeStr = '-';
-              
-              const transitPlanetFormatted = planetName.charAt(0).toUpperCase() + planetName.slice(1);
-              const aspectTypeFormatted = aspect.type.padEnd(11);
-              const aspectPlanetFormatted = aspect.birthPlanet.charAt(0).toUpperCase() + aspect.birthPlanet.slice(1);
-              const orbFormatted = aspect.orb.padEnd(4);
-              const transitPosFormatted = `${transitPlanetData.sign} ${transitPlanetData.degreeInSign}°`;
-              const transitHouseFormatted = transitHouse.toString().padEnd(11);
-              const birthHouseFormatted = birthHouse.toString().padEnd(11);
-              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} |`);
+          
+          // Add planet data to each aspect for later display
+          transitAspects.forEach(aspect => {
+            allAspects.push({
+              planetName: planetName,
+              transitPlanetData: transitPlanetData,
+              transitHouse: transitHouse,
+              aspect: aspect,
+              birthPlanetData: getAstrologicalData(aspect.birthPlanet, birthData),
+              birthHouse: getPlanetHouse(parseFloat(getAstrologicalData(aspect.birthPlanet, birthData).degreeInSign) + (signs.indexOf(getAstrologicalData(aspect.birthPlanet, birthData).sign) * 30), houses.house)
             });
-          }
+          });
         }
 
+        // Sort all aspects by orb (smallest orb first)
+        allAspects.sort((a, b) => {
+          return parseFloat(a.aspect.orb) - parseFloat(b.aspect.orb);
+        });
+
+        // Display sorted aspects
+        allAspects.forEach(aspectData => {
+          const planetName = aspectData.planetName;
+          const transitPlanetData = aspectData.transitPlanetData;
+          const transitHouse = aspectData.transitHouse;
+          const aspect = aspectData.aspect;
+          const birthPlanetData = aspectData.birthPlanetData;
+          const birthHouse = aspectData.birthHouse;
+          
+          // Determine aspect phase
+          const aspectAngles = {
+            'Conjunction': 0,
+            'Opposition': 180,
+            'Square': 90,
+            'Trine': 120,
+            'Sextile': 60
+          };
+          const targetAngle = aspectAngles[aspect.type];
+          const phase = determineAspectPhase(planetName, aspect.birthPlanet, transitDateDisplay, aspect.type, targetAngle);
+          
+          // Exact time calculation removed
+          const dateTimeStr = '-';
+          
+          const transitPlanetFormatted = planetName.charAt(0).toUpperCase() + planetName.slice(1);
+          const aspectTypeFormatted = aspect.type.padEnd(11);
+          const aspectPlanetFormatted = aspect.birthPlanet.charAt(0).toUpperCase() + aspect.birthPlanet.slice(1);
+          const orbFormatted = aspect.orb.padEnd(4);
+          const transitPosFormatted = `${transitPlanetData.sign} ${transitPlanetData.degreeInSign}°`;
+          const transitHouseFormatted = transitHouse.toString().padEnd(11);
+          const birthHouseFormatted = birthHouse.toString().padEnd(11);
+          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} |`);
+        });
+
         console.log('================================================================================');
         console.log(`\nAnalyse-Datum: ${transitDateDisplay.day}.${transitDateDisplay.month}.${transitDateDisplay.year}`);
         console.log(`Geburtsdatum: ${birthData.day}.${birthData.month}.${birthData.year} ${birthData.hour}:${birthData.minute.toString().padStart(2, '0')}`);
@@ -1206,6 +1231,21 @@ program
       return;
     }
 
+    // Set active planets if --planets option is specified (no planet required)
+    if (options.planets) {
+      const { setActivePlanets } = require('../config/configService');
+      setActivePlanets(options.planets);
+      return;
+    }
+
+    // Show active planets if --active-planets option is specified (no planet required)
+    if (options.activePlanets) {
+      const { getActivePlanets } = require('../config/configService');
+      const activePlanets = getActivePlanets();
+      console.log('Active planets:', activePlanets.join(', '));
+      return;
+    }
+
     // Set AI model if --ai option is specified (no planet required)
     if (options.ai) {
       setAIModel(options.ai);
@@ -1742,7 +1782,9 @@ program
       const analyzeAspects = actualOptions.a || false;
       const filterCriteria = actualOptions.filter;
       
-      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria)
+      const dateColumn = actualOptions.dateCol;
+
+      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria, dateColumn)
         .then(({ results, houseDistribution, signDistribution, aspectStatistics }) => {
           if (results.length === 0) {
             console.log('No valid ISO-Datetime values found in the CSV file.');
@@ -2785,7 +2827,9 @@ program
       const analyzeAspects = actualOptions.a || false;
       const filterCriteria = actualOptions.filter;
       
-      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria)
+      const dateColumn = actualOptions.dateCol;
+
+      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria, dateColumn)
         .then(({ results, houseDistribution, signDistribution, aspectStatistics }) => {
           if (results.length === 0) {
             console.log('No valid ISO-Datetime values found in the CSV file.');

package/src/cli/cliService.js

@@ -160,13 +160,15 @@ class CLIService {
       .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)')
       .option('--csv <filepath>', 'Analyzes a CSV file with ISO-Datetime values or Unix timestamps')
-      .option('--filter <column:value>', 'Filters CSV data by column:value (e.g., --filter "Item:coffee")')
+      .option('--filter <column:value>', 'Filters CSV data by column:value (e.g., --filter "Item:coffee", "Item:*coffee*", "Item:!bad*")')
       .option('--title <title>', 'Title for the chart image (generates PNG image when provided)')
       .option('--in [count]', 'Shows next planet ingress (entering new sign). Optional count for multiple ingresses')
       .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('--o', 'Shows how often this transit occurs in the sky (frequency calculation)')
+      .option('--planets <list>', 'Select active planets and asteroids (comma-separated, e.g., "Sun,Moon,Mercury,Venus,Hygiea")')
+      .option('--active-planets', 'Show the currently active planets')
       .description('Shows astrological data for a planet')
       .action(this.handleCommand.bind(this));
   }
@@ -652,6 +654,21 @@ class CLIService {
         return { success: true, output: output.join('\n') };
       }
 
+      // Set active planets if --planets option is specified (no planet required)
+      if (actualOptions.planets) {
+        const { setActivePlanets } = require('../config/configService');
+        setActivePlanets(actualOptions.planets, userId);
+        return { success: true, output: output.join('\n') };
+      }
+
+      // Show active planets if --active-planets option is specified (no planet required)
+      if (actualOptions.activePlanets) {
+        const { getActivePlanets } = require('../config/configService');
+        const activePlanets = getActivePlanets(userId);
+        console.log('Active planets:', activePlanets.join(', '));
+        return { success: true, output: output.join('\n') };
+      }
+
       // Delete person if --delete-person option is specified (no planet required)
       if (actualOptions.deletePerson) {
         deletePerson(actualOptions.deletePerson, userId);

package/src/config/configService.js

@@ -456,6 +456,52 @@ function setAIModel(modelName, userId = null) {
   return false;
 }
 
+// Function to set active planets
+function setActivePlanets(planetList, userId = null) {
+  const config = loadConfig(userId) || {
+    currentLocation: null,
+    birthData: null,
+    setupDate: new Date().toISOString()
+  };
+
+  // Get available planets for validation
+  const { planets } = require('../astrology/astrologyConstants');
+  const availablePlanets = Object.keys(planets);
+
+  // Convert comma-separated string to array and normalize planet names
+  const planetsArray = planetList.split(',').map(p => p.trim().toLowerCase());
+  
+  // Validate planet names
+  const invalidPlanets = planetsArray.filter(p => !availablePlanets.includes(p));
+  if (invalidPlanets.length > 0) {
+    console.error(`Error: Invalid planet names: ${invalidPlanets.join(', ')}`);
+    console.error(`Available planets: ${availablePlanets.join(', ')}`);
+    return false;
+  }
+  
+  config.activePlanets = planetsArray;
+
+  if (saveConfig(config, userId)) {
+    console.log(`Active planets set: ${planetsArray.join(', ')}`);
+    return true;
+  }
+  return false;
+}
+
+// Function to get active planets (with defaults)
+function getActivePlanets(userId = null) {
+  const config = loadConfig(userId);
+  
+  // Default active planets (traditional planets + Chiron, excluding other asteroids)
+  const defaultActivePlanets = ['sun', 'moon', 'mercury', 'venus', 'mars', 'jupiter', 'saturn', 'uranus', 'neptune', 'pluto', 'chiron'];
+  
+  if (config && config.activePlanets && Array.isArray(config.activePlanets)) {
+    return config.activePlanets;
+  }
+  
+  return defaultActivePlanets;
+}
+
 // Function to set a custom system prompt
 function setSystemPrompt(prompt, userId = null) {
   const config = loadConfig(userId) || {
@@ -903,5 +949,8 @@ module.exports = {
   showNotes,
   searchNotesBySituation,
   // Add helper functions for user-specific operations
-  getConfigPath
+  getConfigPath,
+  // Planet selection functions
+  setActivePlanets,
+  getActivePlanets
 };