klio 1.5.8 → 1.5.9

package/package.json

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

package/src/astrology/astrologyService.js

@@ -79,13 +79,22 @@ function getBirthDataFromConfig(userId = null) {
       const hour = parseInt(timeParts[0]);
       const minute = parseInt(timeParts[1]);
       
+      const birthLocation = config.birthData.location;
+      if (birthLocation && !birthLocation.timezone && config.currentLocation) {
+        const latDiff = Math.abs((birthLocation.latitude || 0) - (config.currentLocation.latitude || 0));
+        const lonDiff = Math.abs((birthLocation.longitude || 0) - (config.currentLocation.longitude || 0));
+        if (latDiff <= 0.1 && lonDiff <= 0.1 && config.currentLocation.timezone) {
+          birthLocation.timezone = config.currentLocation.timezone;
+        }
+      }
+
       return {
         year: year,
         month: month,
         day: day,
         hour: hour,
         minute: minute,
-        location: config.birthData.location
+        location: birthLocation
       };
     }
     
@@ -213,13 +222,9 @@ function calculateHouses(julianDay, houseSystem = 'K', useBirthLocation = false,
     }
 
     // Load the configured location data
-    const configPath = path.join(__dirname, '../../astrocli-config.json');
-    let config;
+    let config = null;
     try {
-      if (fs.existsSync(configPath)) {
-        const configData = fs.readFileSync(configPath, 'utf8');
-        config = JSON.parse(configData);
-      }
+      config = loadConfig();
     } catch (error) {
       console.log('No configuration found, using default location (Berlin)');
     }
@@ -261,39 +266,28 @@ function calculateHouses(julianDay, houseSystem = 'K', useBirthLocation = false,
         }
         reject(result.error);
       } else {
-        // The Swiss Ephemeris often returns indices as strings ("1", "2", ...) in the result.house object
-        // We convert this to a clean 0-based array (0-11) for consistent processing.
+
+        // The Swiss Ephemeris returns house cusps in result.house, but indexing varies:
+        // some implementations return 0-11, others 1-12 (with 0 unused).
+        // Normalize to a 0-based array (0-11) for consistent processing.
         const houseCusps = [];
-        
-        // First try to get indices 1 to 12 directly
-        for (let i = 1; i <= 12; i++) {
-          const cusp = result.house[i];
-          if (cusp !== undefined) {
-            houseCusps.push(cusp);
-          }
-        }
-        
-        // If we don't have 12 houses (e.g., if the object has different keys), 
-        // try to collect all numeric keys
-        if (houseCusps.length < 12) {
-            const keys = Object.keys(result.house).filter(k => !isNaN(k)).sort((a,b) => parseInt(a) - parseInt(b));
-            
-            if (keys.length >= 13) {
-                // Probably index 0 = AC, 1-12 = houses
-                houseCusps.length = 0;
-                for (let i = 1; i <= 12; i++) {
-                    const key = keys.find(k => parseInt(k) === i);
-                    if (key !== undefined) {
-                        houseCusps.push(result.house[key]);
-                    }
-                }
-            } else if (keys.length === 12) {
-                // Probably directly 0-11 = houses
-                houseCusps.length = 0;
-                for (let i = 0; i < 12; i++) {
-                    houseCusps.push(result.house[keys[i]]);
-                }
+        const numericKeys = Object.keys(result.house)
+          .filter(k => !isNaN(k))
+          .map(k => parseInt(k, 10))
+          .sort((a, b) => a - b);
+
+        if (numericKeys.length >= 12) {
+          const hasOneToTwelve = numericKeys.includes(1) && numericKeys.includes(12);
+          const hasZeroToEleven = numericKeys.includes(0) && numericKeys.includes(11) && !numericKeys.includes(12);
+          if (hasOneToTwelve && !hasZeroToEleven) {
+            for (let i = 1; i <= 12; i++) {
+              houseCusps.push(result.house[i]);
+            }
+          } else {
+            for (let i = 0; i < 12; i++) {
+              houseCusps.push(result.house[i]);
             }
+          }
         }
 
         // If we still don't have 12 houses (shouldn't happen), 
@@ -302,9 +296,22 @@ function calculateHouses(julianDay, houseSystem = 'K', useBirthLocation = false,
             houseCusps.push(0);
         }
 
+        let eps = null;
+        if (Number.isFinite(swisseph.SE_ECL_NUT) && swisseph.SE_ECL_NUT >= 0) {
+          const epsResult = swisseph.swe_calc_ut(julianDay, swisseph.SE_ECL_NUT, swisseph.SEFLG_SWIEPH);
+          if (epsResult && !epsResult.error && Number.isFinite(epsResult.longitude)) {
+            eps = epsResult.longitude;
+          }
+        }
+
         const formattedResult = {
           ...result,
-          house: houseCusps
+          house: houseCusps,
+          houseSystem,
+          latitude,
+          longitude,
+          armc: Number.isFinite(result.armc) ? result.armc : null,
+          eps: Number.isFinite(result.eps) ? result.eps : eps
         };
         
         resolve(formattedResult);
@@ -347,17 +354,54 @@ function longitudeToSignDegree(longitude) {
 }
 
 // Function to determine the house for a planet
-function getPlanetHouse(planetLongitude, houseCusps) {
+function getPlanetHouse(planetLongitude, houseData, planetName = null, planetLatitude = null) {
+  const houseCusps = Array.isArray(houseData)
+    ? houseData
+    : (houseData && Array.isArray(houseData.house) ? houseData.house : []);
+  const houseMeta = (!Array.isArray(houseData) && houseData) ? houseData : null;
+
   // Normalize planet longitude to 0-360 range
   planetLongitude = planetLongitude % 360;
   if (planetLongitude < 0) planetLongitude += 360;
 
+  // Debug output for Chiron
+  const isChiron = planetName && planetName.toLowerCase() === 'chiron';
+
+  if (
+    houseMeta &&
+    Number.isFinite(planetLatitude) &&
+    Number.isFinite(houseMeta.latitude) &&
+    Number.isFinite(houseMeta.armc) &&
+    Number.isFinite(houseMeta.eps) &&
+    typeof houseMeta.houseSystem === 'string' &&
+    swisseph.swe_houses_pos
+  ) {
+    const housePosResult = swisseph.swe_houses_pos(
+      houseMeta.armc,
+      houseMeta.latitude,
+      houseMeta.eps,
+      houseMeta.houseSystem,
+      planetLongitude,
+      planetLatitude
+    );
+
+    if (housePosResult && !housePosResult.error && Number.isFinite(housePosResult.housePosition)) {
+      let house = Math.floor(housePosResult.housePosition);
+      if (house < 1) {
+        house = 12;
+      } else if (house > 12) {
+        house = ((house - 1) % 12) + 1;
+      }
+      return house;
+    }
+  }
+
   // House cusps are in houseCusps[0] to houseCusps[11]
   // We need to find between which two house cusps the planet lies
   for (let i = 0; i < 12; i++) {
     const currentCusp = houseCusps[i];
     const nextCusp = houseCusps[(i + 1) % 12];
-    
+
     // Normalize house cusps to 0-360 range
     const normalizedCurrentCusp = currentCusp % 360;
     const normalizedNextCusp = nextCusp % 360;
@@ -376,11 +420,11 @@ function getPlanetHouse(planetLongitude, houseCusps) {
       }
     }
   }
-  
+
   // Debug: Show house cusps if no house was found
   console.log('No house found for planet:', planetLongitude);
   console.log('House cusps:', houseCusps);
-  
+
   // Fallback: Should not occur
   return 1;
 }
@@ -526,6 +570,7 @@ function getAstrologicalData(planetName, customDate = null) {
   return {
     planet: planetName,
     longitude,
+    latitude: result.latitude,
     sign,
     degreeInSign,
     dignity,
@@ -1313,7 +1358,7 @@ function detectAspectFigures(dateComponents, houseSystem = null, useBirthData =
         // Add house information if houses were calculated
         if (houses && houses.house) {
           const planetLongitude = parseFloat(planetData.degreeInSign) + (signs.indexOf(planetData.sign) * 30);
-          const house = getPlanetHouse(planetLongitude, houses.house);
+          const house = getPlanetHouse(planetLongitude, houses);
           figure.planetDetails[planetName].house = house;
         }
       }
@@ -1443,7 +1488,7 @@ async function calculatePersonalTransits(transitDate = null, birthData = null) {
   const transitResults = {};
   for (const [name, data] of Object.entries(transitPlanets)) {
     const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
-    const house = getPlanetHouse(planetLongitude, houses.house);
+    const house = getPlanetHouse(planetLongitude, houses, name, data.latitude);
     
     transitResults[name] = {
       ...data,
@@ -1635,12 +1680,12 @@ async function showCombinedAnalysis(planetName, transitDate = null, birthData =
   // Calculate current planet positions (Transit)
   const transitPlanetData = getAstrologicalData(planetName, transitDate);
   const transitLongitude = transitPlanetData.longitude;
-  const transitHouse = getPlanetHouse(transitLongitude, houses.house);
+  const transitHouse = getPlanetHouse(transitLongitude, houses, planetName, transitPlanetData.latitude);
 
   // Calculate birth planet positions (Radix)
   const birthPlanetData = getAstrologicalData(planetName, birthData);
   const birthLongitude = birthPlanetData.longitude;
-  const birthHouse = getPlanetHouse(birthLongitude, houses.house);
+  const birthHouse = getPlanetHouse(birthLongitude, houses, planetName, birthPlanetData.latitude);
 
   // Calculate birth aspects for the planet
   const birthAspects = calculatePlanetAspects(planetName, birthData, true);
@@ -1669,7 +1714,8 @@ async function showCombinedAnalysis(planetName, transitDate = null, birthData =
     console.log('--------------------------------------------------------------------------------');
     birthAspects.forEach(aspect => {
       const aspectPlanetData = getAstrologicalData(aspect.planet, birthData);
-      const aspectHouse = getPlanetHouse(parseFloat(aspectPlanetData.degreeInSign) + (signs.indexOf(aspectPlanetData.sign) * 30), houses.house);
+      const aspectLongitude = parseFloat(aspectPlanetData.degreeInSign) + (signs.indexOf(aspectPlanetData.sign) * 30);
+      const aspectHouse = getPlanetHouse(aspectLongitude, houses);
       console.log(`${aspect.type.padEnd(12)} with ${aspect.planet.padEnd(8)} (${aspectPlanetData.sign} ${aspectPlanetData.degreeInSign}° House ${aspectHouse}) - Orb: ${aspect.orb}°`);
     });
     console.log('');
@@ -1681,7 +1727,8 @@ async function showCombinedAnalysis(planetName, transitDate = null, birthData =
     console.log('--------------------------------------------------------------------------------');
     transitAspects.forEach(aspect => {
       const birthPlanetData = getAstrologicalData(aspect.birthPlanet, birthData);
-      const birthHouse = getPlanetHouse(parseFloat(birthPlanetData.degreeInSign) + (signs.indexOf(birthPlanetData.sign) * 30), houses.house);
+      const birthLongitude = parseFloat(birthPlanetData.degreeInSign) + (signs.indexOf(birthPlanetData.sign) * 30);
+      const birthHouse = getPlanetHouse(birthLongitude, houses);
       console.log(`${aspect.type.padEnd(12)} with ${aspect.birthPlanet.padEnd(8)} (${birthPlanetData.sign} ${birthPlanetData.degreeInSign}° House ${birthHouse}) - Orb: ${aspect.orb}°`);
     });
     console.log('');
@@ -2321,7 +2368,7 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             calculateHouses(julianDay, getHouseSystemCode(houseSystem), false)
                 .then(houses => {
                   const planetLongitude = parseFloat(astroData.degreeInSign) + (signs.indexOf(astroData.sign) * 30);
-                  const house = getPlanetHouse(planetLongitude, houses.house);
+                  const house = getPlanetHouse(planetLongitude, houses, planetName, astroData.latitude);
 
                   // Calculate aspects if requested
                   let aspects = [];
@@ -2565,7 +2612,7 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             calculateHouses(julianDay, getHouseSystemCode(houseSystem), false)
                 .then(houses => {
                   const planetLongitude = parseFloat(astroData.degreeInSign) + (signs.indexOf(astroData.sign) * 30);
-                  const house = getPlanetHouse(planetLongitude, houses.house);
+                  const house = getPlanetHouse(planetLongitude, houses, planetName, astroData.latitude);
 
                   // Berechne Aspekte, falls angefordert
                   let aspects = [];

package/src/astrology/swissephAdapter.js

@@ -11,6 +11,7 @@ const SE_GREG_CAL = nativeSwisseph ? nativeSwisseph.SE_GREG_CAL : 1;
 const SEFLG_SWIEPH = nativeSwisseph ? nativeSwisseph.SEFLG_SWIEPH : 2;
 const SEFLG_SPEED = nativeSwisseph ? nativeSwisseph.SEFLG_SPEED : 256;
 const SEFLG_MOSEPH = nativeSwisseph ? nativeSwisseph.SEFLG_MOSEPH : 4;
+const SE_ECL_NUT = nativeSwisseph ? nativeSwisseph.SE_ECL_NUT : -1;
 
 let wasmModule = null;
 let wasmGet = null;
@@ -19,10 +20,17 @@ let wasmReadyPromise = null;
 const planetCache = new Map();
 const houseCache = new Map();
 
+function isWasmAllowed() {
+  return process.env.KLIO_ALLOW_WASM === '1';
+}
+
 function ensureReady() {
   if (nativeSwisseph) {
     return;
   }
+  if (!isWasmAllowed()) {
+    throw new Error('Native swisseph is required. Set KLIO_ALLOW_WASM=1 to enable WASM fallback.');
+  }
   if (!wasmModule || !wasmGet) {
     throw new Error('Sweph WASM is not initialized. Call initialize() before use.');
   }
@@ -32,6 +40,9 @@ async function initialize() {
   if (nativeSwisseph) {
     return;
   }
+  if (!isWasmAllowed()) {
+    throw new Error('Native swisseph is required. Set KLIO_ALLOW_WASM=1 to enable WASM fallback.');
+  }
   if (!wasmReadyPromise) {
     wasmReadyPromise = loadSwephWasmModule().then((moduleInstance) => {
       wasmModule = moduleInstance;
@@ -258,6 +269,17 @@ function swe_houses(julianDay, latitude, longitude, houseSystem, callback) {
   return result;
 }
 
+function swe_houses_pos(armc, latitude, eps, houseSystem, longitude, planetLatitude, callback) {
+  if (nativeSwisseph && nativeSwisseph.swe_houses_pos) {
+    return nativeSwisseph.swe_houses_pos(armc, latitude, eps, houseSystem, longitude, planetLatitude, callback);
+  }
+  const fallback = { error: 'swe_houses_pos not available' };
+  if (typeof callback === 'function') {
+    callback(fallback);
+  }
+  return fallback;
+}
+
 function swe_set_ephe_path() {
   if (nativeSwisseph && nativeSwisseph.swe_set_ephe_path) {
     return nativeSwisseph.swe_set_ephe_path.apply(nativeSwisseph, arguments);
@@ -270,10 +292,12 @@ module.exports = {
   SEFLG_SWIEPH,
   SEFLG_SPEED,
   SEFLG_MOSEPH,
+  SE_ECL_NUT,
   initialize,
   swe_set_ephe_path,
   swe_calc_ut,
   swe_julday,
   swe_revjul,
-  swe_houses
+  swe_houses,
+  swe_houses_pos
 };

package/src/cli/cli.js

@@ -269,7 +269,7 @@ const createAstrologicalNote = async (planetArg, planet2Arg, options, customDate
         const julianDay = getJulianDay(currentDate, shouldUseBirthData(options));
         const houses = await calculateHouses(julianDay, getHouseSystemCode(houseSystem), shouldUseBirthData(options));
         const planetLongitude = parseFloat(planetData.degreeInSign) + (signs.indexOf(planetData.sign) * 30);
-        const house = getPlanetHouse(planetLongitude, houses.house);
+        const house = getPlanetHouse(planetLongitude, houses, planetArg, planetData.latitude);
         noteData.house = house;
         noteData.astrologicalSituation += ` in house ${house}`;
       }
@@ -881,19 +881,22 @@ program
         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 transitLongitude = parseFloat(transitPlanetData.degreeInSign) + (signs.indexOf(transitPlanetData.sign) * 30);
+          const transitHouse = getPlanetHouse(transitLongitude, houses, planetName, transitPlanetData.latitude);
           const transitAspectsData = calculatePersonalTransitAspects(transitDateDisplay, birthData, planetName, true);
           const transitAspects = transitAspectsData ? transitAspectsData.aspects : [];
           
           // Add planet data to each aspect for later display
           transitAspects.forEach(aspect => {
+            const birthPlanetData = getAstrologicalData(aspect.birthPlanet, birthData);
+            const birthLongitude = parseFloat(birthPlanetData.degreeInSign) + (signs.indexOf(birthPlanetData.sign) * 30);
             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)
+              birthPlanetData: birthPlanetData,
+              birthHouse: getPlanetHouse(birthLongitude, houses, aspect.birthPlanet, birthPlanetData.latitude)
             });
           });
         }
@@ -1664,7 +1667,7 @@ program
         let house = 'N/A';
         if (houses) {
           const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
-          house = getPlanetHouse(planetLongitude, houses.house);
+          house = getPlanetHouse(planetLongitude, houses, name, data.latitude);
         }
         
         const planetNameFormatted = name.charAt(0).toUpperCase() + name.slice(1);
@@ -1732,7 +1735,7 @@ program
           let house = 'N/A';
           if (houses) {
             const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
-            house = getPlanetHouse(planetLongitude, houses.house);
+            house = getPlanetHouse(planetLongitude, houses, name, data.latitude);
           }
           allPlanetData[name] = {
             sign: data.sign,
@@ -2476,7 +2479,8 @@ program
           houses = await calculateHouses(julianDay, getHouseSystemCode(houseSystem), useBirthLocation);
           
           // Determine the house of the planet
-          const planetHouse = getPlanetHouse(parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30), houses.house);
+          const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
+          const planetHouse = getPlanetHouse(planetLongitude, houses, planet, data.latitude);
           houseInfo = {
             house: planetHouse,
             houseSystem: options.hs
@@ -3021,7 +3025,8 @@ program
         }
 
         // Determine the planet's house
-        const planetHouse = getPlanetHouse(parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30), houses.house);
+        const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
+        const planetHouse = getPlanetHouse(planetLongitude, houses, data.planet, data.latitude);
         const planetNameCapitalized = data.planet.charAt(0).toUpperCase() + data.planet.slice(1);
         console.log(`${planetNameCapitalized} is in house ${planetHouse}`);
         console.log();

package/src/cli/cliService.js

@@ -887,16 +887,18 @@ class CLIService {
         // Function to calculate Julian Day in UTC for house calculation
         const getJulianDayUTCForHouses = () => {
           let timezoneOffsetMinutes = 0;
-          
+
           if (birthData && birthData.location) {
-            timezoneOffsetMinutes = getTimezoneOffset(birthData, birthData.location.timezone || 'Europe/Zurich');
+            // Use the natal location's timezone, but with the current date (or --d date)
+            timezoneOffsetMinutes = getTimezoneOffset(customDate, birthData.location.timezone || 'Europe/Zurich');
           } else if (config && config.currentLocation && config.currentLocation.timezone) {
             timezoneOffsetMinutes = getTimezoneOffset(customDate, config.currentLocation.timezone);
           } else {
             timezoneOffsetMinutes = -new Date().getTimezoneOffset();
           }
-          
-          return calculateJulianDayUTC(birthData ? birthData : customDate, timezoneOffsetMinutes);
+
+          // Always use customDate (current or --d date), not birthData
+          return calculateJulianDayUTC(customDate, timezoneOffsetMinutes);
         };
         
         // Calculate houses if house system is specified
@@ -921,12 +923,12 @@ class CLIService {
         // Calculate positions of all planets
         for (const [name, planetId] of Object.entries(planets)) {
           const data = getAstrologicalData(name, customDate);
-          
+
           // Determine the house if houses were calculated
           let house = 'N/A';
           if (houses) {
-            const planetLongitude = parseFloat(data.degreeInSign) + (signs.indexOf(data.sign) * 30);
-            house = getPlanetHouse(planetLongitude, houses.house);
+            // Use the actual longitude value directly (not reconstructed from sign+degree)
+            house = getPlanetHouse(data.longitude, houses, name, data.latitude);
           }
           
           const planetNameFormatted = name.charAt(0).toUpperCase() + name.slice(1);

package/src/config/configService.js

@@ -735,7 +735,8 @@ async function performSetup(userId = null) {
         name: birthGeoData.name,
         country: birthGeoData.country,
         latitude: birthGeoData.latitude,
-        longitude: birthGeoData.longitude
+        longitude: birthGeoData.longitude,
+        timezone: birthGeoData.timezone
       } : null
     },
     aiConfiguration: aiConfig,

package/src/gui/webcontainerSetup.js

@@ -209,6 +209,7 @@ const command = rawCommand.startsWith('klio ') ? rawCommand.slice(5).trim() : ra
 
 process.env.KLIO_CAPTURE_ONLY = '1';
 process.env.KLIO_CONFIG_PATH = '/src/.astrocli/config.json';
+process.env.KLIO_ALLOW_WASM = '1';
 try {
   const configText = fs.readFileSync(process.env.KLIO_CONFIG_PATH, 'utf8');
   if (configText) {