aiden-shared-calculations-unified 1.0.83 → 1.0.86

package/calculations/core/users-processed.js

@@ -1,27 +1,32 @@
 /**
- * @fileoverview A simple counter that increments for each user processed.
+ * @fileoverview Calculation (Pass 1) for total users processed.
+ *
+ * This metric is a simple counter that tracks the total number
+ * of users processed and the breakdown by user type (Normal/Speculator).
+ *
+ * It is a fundamental metric for sanity-checking the data stream.
  */
-
 class UsersProcessed {
     constructor() {
-        this.userCount = 0;
+        this.totalUsers = 0;
+        this.normalUsers = 0;
+        this.speculatorUsers = 0;
+        this.totalValue = 0;
     }
 
-    // --- NEW ---
     /**
      * Statically defines all metadata for the manifest builder.
      */
     static getMetadata() {
         return {
             type: 'standard',
-            rootDataDependencies: ['portfolio'], // Needs at least one doc to run
+            rootDataDependencies: ['portfolio'], // Needs summary
             isHistorical: false,
             userType: 'all',
-            category: 'core_sanity' // Based on Computation_documentation.md
+            category: 'core_metrics' // A fundamental metric
         };
     }
 
-    // --- NEW ---
     /**
      * Statically declare dependencies.
      */
@@ -31,41 +36,63 @@ class UsersProcessed {
 
     /**
      * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
      */
     static getSchema() {
         return {
             "type": "object",
-            "description": "A simple counter for the total number of users processed.",
+            "description": "Tracks the total count of users processed and their type.",
             "properties": {
-                "rawTotalUsersProcessed": {
-                    "type": "number",
-                    "description": "The total count of users processed by the computation system."
-                }
+                "total_users": { "type": "number" },
+                "normal_users": { "type": "number" },
+                "speculator_users": { "type": "number" },
+                "total_portfolio_value": { "type": "number" }
             },
-            "required": ["rawTotalUsersProcessed"]
+            "required": ["total_users", "normal_users", "speculator_users", "total_portfolio_value"]
         };
     }
 
-    process(portfolioData, yesterdayPortfolio, userId, context) {
-        this.userCount++;
+    // --- UPDATED SIGNATURE ---
+    process(
+        todayPortfolio, 
+        yesterdayPortfolio, 
+        userId, 
+        context, 
+        todayInsights, 
+        yesterdayInsights, 
+        todaySocialPostInsights, 
+        yesterdaySocialPostInsights,
+        todayHistory
+    ) {
+        this.totalUsers++;
+        
+        // Use the userType from the context, which is set by the orchestrator
+        if (context.userType === 'speculator') {
+            this.speculatorUsers++;
+        } else {
+            this.normalUsers++;
+        }
+
+        // --- UPDATED ---
+        const portfolioValue = todayPortfolio?.Summary?.PortfolioValue;
+        if (typeof portfolioValue === 'number') {
+            this.totalValue += portfolioValue;
+        }
     }
 
     getResult() {
-        if (this.userCount === 0) {
-            // Even if 0, we should return the defined schema shape
-            return {
-                rawTotalUsersProcessed: 0
-            };
-        }
-        // FIX: Rename the key to use the 'raw' prefix for correct aggregation.
         return {
-            rawTotalUsersProcessed: this.userCount
+            total_users: this.totalUsers,
+            normal_users: this.normalUsers,
+            speculator_users: this.speculatorUsers,
+            total_portfolio_value: this.totalValue
         };
     }
 
     reset() {
-        this.userCount = 0;
+        this.totalUsers = 0;
+        this.normalUsers = 0;
+        this.speculatorUsers = 0;
+        this.totalValue = 0;
     }
 }
 

package/calculations/gauss/cohort-capital-flow.js

@@ -12,9 +12,11 @@
  * - Added dependency on 'instrument-price-change-1d' (Pass 1 meta calc).
  * - Price adjustment logic now uses the reliable 1-day price change
  * from the new dependency.
+ * - **FIXED:** getResult() was wrapping the ticker map in an "assets" object,
+ * causing a schema validation failure in the test harness.
  * --------------------------
  */
-const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+// --- STANDARD 0: REMOVED require('../../utils/sector_mapping_provider') ---
 
 
 class CohortCapitalFlow {
@@ -23,7 +25,8 @@ class CohortCapitalFlow {
         this.cohortFlows = new Map();
         // { [userId]: "cohortName" }
         this.cohortMap = new Map();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
         this.dependenciesLoaded = false;
         
         // --- NEW ---
@@ -35,7 +38,6 @@ class CohortCapitalFlow {
      * Defines the output schema for this calculation.
      */
     static getSchema() {
-        // ... (Schema remains unchanged) ...
         const flowSchema = {
             "type": "object",
             "properties": {
@@ -68,8 +70,6 @@ class CohortCapitalFlow {
     static getMetadata() {
         return {
             type: 'standard',
-            // --- REVISED ---
-            // Removed 'insights' as it's no longer needed for price.
             rootDataDependencies: ['portfolio', 'history'],
             isHistorical: true, // Needs T-1 portfolio for flow
             userType: 'all',
@@ -83,13 +83,19 @@ class CohortCapitalFlow {
     static getDependencies() {
         return [
             'cohort-definer', // from gauss (Pass 2)
-            // --- REVISED ---
             'instrument-price-change-1d' // from core (Pass 1)
         ];
     }
 
-    _getPortfolioPositions(portfolio) {
-        return portfolio?.AggregatedPositions;
+   _getPortfolioPositions(portfolio) {
+        // FIX: Check for Normal User (AggregatedPositions) OR Speculator (PublicPositions)
+        if (portfolio?.AggregatedPositions) {
+            return portfolio.AggregatedPositions; // Normal User
+        }
+        if (portfolio?.PublicPositions) {
+            return portfolio.PublicPositions; // Speculator User
+        }
+        return [];
     }
 
     _initFlowData(cohortName, instrumentId) {
@@ -124,7 +130,6 @@ class CohortCapitalFlow {
         }
         
         // 2. Load Price Change Data
-        // --- REVISED ---
         this.priceChangeMap = fetchedDependencies['instrument-price-change-1d'] || {};
 
         this.dependenciesLoaded = true;
@@ -133,8 +138,9 @@ class CohortCapitalFlow {
     process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
         this._loadDependencies(fetchedDependencies);
         
-        if (!this.mappings) {
-            this.mappings = context.mappings;
+        // --- STANDARD 0: FIXED ---
+        if (!this.tickerMap) {
+            this.tickerMap = context.instrumentToTicker;
         }
 
         const cohortName = this.cohortMap.get(userId);
@@ -153,11 +159,14 @@ class CohortCapitalFlow {
             return; // Must have AggregatedPositions for both days
         }
         
-        // --- REVISED ---
-        // We no longer need insightsMap
         if (!this.priceChangeMap) {
             return; // Cannot calculate price-adjusted flow
         }
+        
+        // --- STANDARD 0: Check must be done before use ---
+        if (!this.tickerMap) {
+            return; // Cannot map instruments to tickers
+        }
 
         const yPosMap = new Map(yPos.map(p => [p.InstrumentID, p]));
         const tPosMap = new Map(tPos.map(p => [p.InstrumentID, p]));
@@ -178,14 +187,12 @@ class CohortCapitalFlow {
             if (yInvested > 0) {
                 asset.total_invested_yesterday += yInvested;
                 
-                // --- REVISED ---
-                // Get the 1-day price change from our new dependency
-                const ticker = this.mappings.instrumentToTicker[instrumentId];
+                // --- STANDARD 0: SIMPLIFIED ---
+                const ticker = this.tickerMap[instrumentId];
                 const yPriceChange_pct = (ticker && this.priceChangeMap[ticker]) 
                                             ? this.priceChangeMap[ticker].price_change_1d_pct 
                                             : 0;
                 
-                // Convert from percentage (5.5) to decimal (0.055)
                 const yPriceChange_decimal = (yPriceChange_pct || 0) / 100.0;
                 
                 asset.price_change_yesterday += yPriceChange_decimal * yInvested; // Weighted sum
@@ -196,18 +203,22 @@ class CohortCapitalFlow {
         }
     }
 
+    // --- THIS IS THE FIX ---
     async getResult() {
-        if (!this.mappings) {
-            this.mappings = await loadInstrumentMappings();
+        // --- STANDARD 0: REMOVED forbidden data load ---
+
+        // Failsafe check
+        if (!this.tickerMap) {
+            return {}; // process() must run first to set mappings
         }
 
         const finalResult = {};
 
         for (const [cohortName, assetMap] of this.cohortFlows.entries()) {
-            // --- REVISED: Initialize cohortAssets as an object ---
             const cohortAssets = {};
             for (const [instrumentId, data] of assetMap.entries()) {
-                const ticker = this.mappings.instrumentToTicker[instrumentId];
+                // --- STANDARD 0: SIMPLIFIED ---
+                const ticker = this.tickerMap[instrumentId];
                 if (!ticker) continue;
                 
                 const { total_invested_yesterday, total_invested_today, price_change_yesterday } = data;
@@ -231,23 +242,21 @@ class CohortCapitalFlow {
                     };
                 }
             }
-            // --- REVISED: Match schema { "cohortName": { "assets": { ... } } } ---
-            // This was a bug in your original file. The schema expected an object
-            // with an 'assets' key, but the code was returning the map directly.
-            finalResult[cohortName] = { assets: cohortAssets };
+            // Was: finalResult[cohortName] = { assets: cohortAssets };
+            // Is:
+            finalResult[cohortName] = cohortAssets;
         }
         
-        // --- REVISED: The schema for this calc shows the output is NOT sharded. ---
-        // The return should be the final object.
         return finalResult;
     }
+    // --- END FIX ---
 
     reset() {
         this.cohortFlows.clear();
         this.cohortMap.clear();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
         this.dependenciesLoaded = false;
-        // --- NEW ---
         this.priceChangeMap = null;
     }
 }

package/calculations/gauss/cohort-definer.js

@@ -8,7 +8,7 @@
  * It then buckets these users into our final, named sub-cohorts
  * (e.g., "Smart Investors", "FOMO Chasers").
  */
-const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+// --- STANDARD 0: REMOVED require('../../utils/sector_mapping_provider') ---
 
 
 class CohortDefiner {
@@ -18,7 +18,8 @@ class CohortDefiner {
         this.dumbVectors = [];  // [ { userId, skill, time, fomo, bagholder }, ... ]
 
         this.momentumData = null;
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null; 
         this.cohortIdSets = null; // { smart: Set, dumb: Set }
     }
 
@@ -60,7 +61,6 @@ class CohortDefiner {
                 "fomo_chasers": cohortSchema,
                 "patient_losers": cohortSchema,
                 "fomo_bagholders": cohortSchema,
-                // --- FIX [PROBLEM 9]: Add uncategorized bucket ---
                 "uncategorized_smart": cohortSchema,
                 "uncategorized_dumb": cohortSchema
             },
@@ -77,14 +77,12 @@ class CohortDefiner {
         const dnaFilterData = fetchedDependencies['daily-dna-filter'];
         this.momentumData = fetchedDependencies['instrument-price-momentum-20d'];
         
-        // --- FIX [PROBLEM 6]: Validate dependency content, not just existence ---
         if (dnaFilterData && dnaFilterData.smart_cohort_ids && dnaFilterData.dumb_cohort_ids) {
             this.cohortIdSets = {
                 smart: new Set(dnaFilterData.smart_cohort_ids),
                 dumb: new Set(dnaFilterData.dumb_cohort_ids)
             };
         } else {
-            // Initialize with empty sets if dependency is missing or malformed
             this.cohortIdSets = {
                 smart: new Set(),
                 dumb: new Set()
@@ -93,9 +91,9 @@ class CohortDefiner {
     }
 
     _getFomoScore(todayPortfolio, yesterdayPortfolio) {
-        if (!this.mappings) return 0;
+        // --- STANDARD 0: UPDATED CHECK ---
+        if (!this.tickerMap) return 0;
         
-        // --- FIX [PROBLEM 4 related]: Ensure momentum data is loaded ---
         if (!this.momentumData) {
             return 0; // Cannot calculate FOMO without momentum data
         }
@@ -107,8 +105,8 @@ class CohortDefiner {
         let fomoSum = 0;
         let count = 0;
         for (const pos of newPositions) {
-            const ticker = this.mappings.instrumentToTicker[pos.InstrumentID];
-            // --- FIX [PROBLEM 4 related]: Check momentumData[ticker] exists ---
+            // --- STANDARD 0: SIMPLIFIED ---
+            const ticker = this.tickerMap[pos.InstrumentID];
             if (ticker && this.momentumData[ticker]) {
                 fomoSum += this.momentumData[ticker].momentum_20d_pct || 0;
                 count++;
@@ -118,7 +116,8 @@ class CohortDefiner {
     }
 
     _getBagholderScore(todayPortfolio) {
-        const openPositions = todayPortfolio?.AggregatedPositions || [];
+        // FIX: Only Speculator data (PublicPositions) has the OpenDateTime field needed for this calculation.
+        const openPositions = todayPortfolio?.PublicPositions || [];
         if (openPositions.length === 0) return 0;
 
         let durationSum = 0;
@@ -126,8 +125,7 @@ class CohortDefiner {
         const now = new Date();
 
         for (const pos of openPositions) {
-            // 'NetProfit' is a % P&L, e.g., -0.20 for -20%
-            if (pos.NetProfit < -0.20) {
+            if (pos.NetProfit < -20) { 
                 try {
                     const openDate = new Date(pos.OpenDateTime);
                     const durationMs = now.getTime() - openDate.getTime();
@@ -144,8 +142,10 @@ class CohortDefiner {
 
     process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
         this._loadDependencies(fetchedDependencies);
-        if (!this.mappings) {
-            this.mappings = context.mappings;
+        
+        // --- STANDARD 0: FIXED ---
+        if (!this.tickerMap) {
+            this.tickerMap = context.instrumentToTicker;
         }
 
         const isSmart = this.cohortIdSets.smart.has(userId);
@@ -155,9 +155,7 @@ class CohortDefiner {
             return; // Not in our extreme cohorts
         }
 
-        // --- Re-calculate full DNA for this filtered user ---
-        
-        // 1. Get Long-Term (Stable) Traits
+        // FIX: Access history data from the nested property provided by the fixed worker.js
         const history = todayPortfolio?.history?.all;
         if (!history) return;
         
@@ -168,7 +166,6 @@ class CohortDefiner {
         const lt_skill = (winRate * avgWin) - (lossRate * avgLoss);
         const lt_time = history.avgHoldingTimeInMinutes || 0;
 
-        // 2. Get Short-Term (Noisy) Traits
         const st_fomo = this._getFomoScore(todayPortfolio, yesterdayPortfolio);
         const st_bagholder = this._getBagholderScore(todayPortfolio);
 
@@ -185,7 +182,6 @@ class CohortDefiner {
         if (vectors.length === 0) return 0;
         const sorted = vectors.map(v => v[key]).sort((a, b) => a - b);
         const mid = Math.floor(sorted.length / 2);
-        // Handle even-length array by taking average of middle two
         if (sorted.length % 2 === 0 && sorted.length > 0) {
             return (sorted[mid - 1] + sorted[mid]) / 2;
         }
@@ -197,7 +193,6 @@ class CohortDefiner {
         const assignedSmart = new Set();
         const assignedDumb = new Set();
 
-        // 1. Process Smart Cohort
         const smart_median_time = this._getMedian(this.smartVectors, 'time');
         
         cohorts['smart_investors'] = this.smartVectors
@@ -208,12 +203,10 @@ class CohortDefiner {
             .filter(u => u.time < smart_median_time)
             .map(u => { assignedSmart.add(u.userId); return u.userId; });
             
-        // --- FIX [PROBLEM 9]: Add uncategorized bucket ---
         cohorts['uncategorized_smart'] = this.smartVectors
             .filter(u => !assignedSmart.has(u.userId))
             .map(u => u.userId);
             
-        // 2. Process Dumb Cohort
         const dumb_median_fomo = this._getMedian(this.dumbVectors, 'fomo');
         const dumb_median_bag = this._getMedian(this.dumbVectors, 'bagholder');
 
@@ -229,12 +222,10 @@ class CohortDefiner {
             .filter(u => u.fomo >= dumb_median_fomo && u.bagholder >= dumb_median_bag)
             .map(u => { assignedDumb.add(u.userId); return u.userId; });
 
-        // --- FIX [PROBLEM 9]: Add uncategorized bucket ---
         cohorts['uncategorized_dumb'] = this.dumbVectors
             .filter(u => !assignedDumb.has(u.userId))
             .map(u => u.userId);
 
-        // Output is a compact map of cohort_name -> [userIds]
         return cohorts;
     }
     
@@ -242,7 +233,8 @@ class CohortDefiner {
         this.smartVectors = [];
         this.dumbVectors = [];
         this.momentumData = null;
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
         this.cohortIdSets = null;
     }
 }

package/calculations/gauss/daily-dna-filter.js

@@ -21,8 +21,9 @@ class DailyDnaFilter {
     static getMetadata() {
         return {
             type: 'standard',
-            // This calc only needs the 'history' doc,
-            // which is passed inside the portfolio object.
+            // This calc only needs the 'history' doc.
+            // As per the test harness, this means 'todayPortfolio'
+            // in process() *is* the history object.
             rootDataDependencies: ['history'],
             isHistorical: false, // Reads today's history snapshot
             userType: 'all',
@@ -70,8 +71,13 @@ class DailyDnaFilter {
      * @param {string} userId - The user's ID.
      */
     process(todayPortfolio, yesterdayPortfolio, userId) {
-        // 1. Get Long-Term (Stable) Traits from history
-        const history = todayPortfolio?.history?.all;
+        
+        // ---
+        // FIX: 'todayPortfolio' *is* the history object because
+        // getMetadata() only requests ['history'].
+        // The path is 'todayPortfolio.all', not 'todayPortfolio.history.all'.
+        // ---
+        const history = todayPortfolio?.all;
         if (!history || !history.totalTrades || history.totalTrades < 20) {
             return; // Not enough history for a reliable score
         }

package/calculations/gauss/gauss-divergence-signal.js

@@ -6,9 +6,20 @@
  *
  * It consumes the daily flows from all defined cohorts (Pass 3)
  * and aggregates them into a final, actionable signal.
+ *
+ * --- FIX ---
+ * - Aligned data access with the corrected schema of its
+ * dependency, 'cohort-capital-flow'.
+ * - It now reads 'cohortFlows[cohortName]' directly, instead of
+ * the non-existent 'cohortFlows[cohortName].assets'.
  */
 class GaussDivergenceSignal {
 
+    // --- STANDARD 2: ADDED ---
+    constructor() {
+        this.result = {};
+    }
+
     /**
      * Defines the output schema for this calculation.
      * @returns {object} JSON Schema object
@@ -84,14 +95,16 @@ class GaussDivergenceSignal {
     /**
      * This is a 'meta' calculation. It runs once.
      */
-    async process(dateStr, dependencies, config, fetchedDependencies) {
+    // --- THIS IS THE FIX ---
+    async process(dateStr, rootData, dependencies, config, fetchedDependencies) {
         const { logger } = dependencies;
         
         const cohortFlows = fetchedDependencies['cohort-capital-flow'];
 
         if (!cohortFlows) {
             logger.log('WARN', `[gauss/gauss-divergence-signal] Missing dependency 'cohort-capital-flow' for ${dateStr}.`);
-            return {};
+            this.result = {};
+            return;
         }
 
         const SMART_COHORTS = ['smart_investors', 'smart_scalpers'];
@@ -105,9 +118,8 @@ class GaussDivergenceSignal {
             const isDumb = DUMB_COHORTS.includes(cohortName);
             if (!isSmart && !isDumb) continue;
 
-            // --- REVISED ---
-            // Read from the 'assets' property, which contains the map of tickers
-            const assets = cohortFlows[cohortName]?.assets; 
+            // Was: const assets = cohortFlows[cohortName]?.assets;
+            const assets = cohortFlows[cohortName]; // This is now the ticker map
             if (!assets) continue;
             
             for (const [ticker, data] of Object.entries(assets)) {
@@ -115,6 +127,7 @@ class GaussDivergenceSignal {
                     blendedFlows.set(ticker, { smart: 0, dumb: 0 });
                 }
                 
+                // This logic remains correct, as it reads the inner flow object
                 const flow = data.net_flow_contribution || 0; 
                 
                 if (isSmart) {
@@ -124,6 +137,7 @@ class GaussDivergenceSignal {
                 }
             }
         }
+        // --- END FIX ---
 
         // 2. Calculate final signal (logic unchanged)
         const result = {};
@@ -145,7 +159,15 @@ class GaussDivergenceSignal {
             };
         }
         
-        return result;
+        this.result = result;
+    }
+
+    async getResult(fetchedDependencies) {
+        return this.result;
+    }
+
+    reset() {
+        this.result = {};
     }
 }