Fix import path and add Zod validation for FederalTaxInput

Cyrano/src/engines/base-engine.ts

@@ -707,14 +707,4 @@ export abstract class BaseEngine {
    * Cleanup resources
    */
   abstract cleanup(): Promise<void>;
-}
-
-
-}
-}
-}
-}
-}
-}
-}
 }

Cyrano/src/engines/chronometric/chronometric-engine.ts

@@ -341,22 +341,3 @@ export class ChronometricEngine extends BaseEngine {
 
 // Export singleton instance
 export const chronometricEngine = new ChronometricEngine();
-
-}
-}
-}
-}
-}
-}
-}
-]
-}
-}
-}
-}
-}
-}
-}
-}
-]
-}

Cyrano/src/engines/chronometric/modules/cost-estimation-module.ts

@@ -417,14 +417,3 @@ export class CostEstimationModule extends BaseModule {
 }
 
 // Export singleton instance
-export const costEstimationModule = new CostEstimationModule();
-
-}
-}
-}
-}
-}
-}
-}
-}
-}

Cyrano/src/engines/chronometric/modules/pattern-learning-module.ts

@@ -368,9 +368,3 @@ export class PatternLearningModule extends BaseModule {
 }
 
 // Export singleton instance
-export const patternLearningModule = new PatternLearningModule();
-
-
-}
-}
-}

Cyrano/src/engines/chronometric/modules/time-reconstruction-module.ts

@@ -489,10 +489,3 @@ export class TimeReconstructionModule extends BaseModule {
   }
 
 // Export singleton instance
-export const timeReconstructionModule = new TimeReconstructionModule();
-
-}
-}
-}
-}
-}

Cyrano/src/engines/chronometric/services/baseline-config.ts

@@ -128,19 +128,3 @@ export async function addOffDay(userId: string, date: string): Promise<BaselineC
 /**
  * Remove an off-day
  */
-export async function removeOffDay(userId: string, date: string): Promise<BaselineConfig | null> {
-  const config = await getBaselineConfig(userId);
-  if (!config || !config.offDays) {
-    return config;
-  }
-
-  const offDays = config.offDays.filter(d => d !== date);
-
-  return await saveBaselineConfig({
-    ...config,
-    offDays,
-  });
-}
-
-
-}

Cyrano/src/engines/chronometric/services/cost-estimation.ts

@@ -295,19 +295,3 @@ ${new Date().toISOString().split('T')[0]}
 
 // Export singleton instance
 export const costEstimationService = new CostEstimationService();
-
-}
-}
-}
-}
-)
-}
-}
-}
-}
-)
-}
-}
-)
-}
-}

Cyrano/src/engines/chronometric/services/profitability-analyzer.ts

@@ -262,14 +262,3 @@ export async function getProfitabilitySummary(userId: string): Promise<{
     totalActual,
     overallVariance: totalActual - totalBudgeted,
   };
-}
-
-
-}
-}
-}
-}
-}
-}
-}
-}

Cyrano/src/http-bridge.ts

@@ -1015,8 +1015,14 @@ app.get('/api/good-counsel/overview', async (req, res) => {
 // FORECASTER API (LexFiat Forecaster™ standalone frontend compatibility)
 // ============================================================================
 
+// Import FederalTaxInputSchema dynamically for validation
+// Note: We use z.lazy() to avoid circular dependency issues with dynamic imports
 const ForecastHttpRequestSchema = z.object({
-  forecast_input: z.any(),
+  forecast_input: z.lazy(() => {
+    // This will be validated in the handler after importing the schema
+    // Using z.record allows flexibility for additional properties
+    return z.record(z.any());
+  }),
   branding: z.object({
     presentationMode: z.enum(['strip', 'watermark', 'none']).optional(),
     userRole: z.enum(['attorney', 'staff', 'client', 'other']).optional(),
@@ -1050,8 +1056,19 @@ app.post('/api/forecast/tax', async (req, res) => {
     }
 
     // Use calculateFederal() for complete credit calculations (CTC/ODC/ACTC/EITC)
-    const { calculateFederal } = await import('./modules/forecast/formulas/tax-formulas.js');
-    const calculatedValues = calculateFederal(forecast_input);
+    const { calculateFederal, FederalTaxInputSchema } = await import('./modules/forecast/formulas/tax-formulas.js');
+
+    // Validate forecast_input with FederalTaxInputSchema for type safety
+    const validationResult = FederalTaxInputSchema.safeParse(forecast_input);
+    if (!validationResult.success) {
+      return res.status(400).json({
+        success: false,
+        error: 'Invalid forecast_input data',
+        details: validationResult.error.issues
+      });
+    }
+
+    const calculatedValues = calculateFederal(validationResult.data);
 
     res.json({
       success: true,
@@ -1080,8 +1097,19 @@ app.post('/api/forecast/tax/pdf', async (req, res) => {
     const year = forecast_input?.year || new Date().getFullYear();
 
     // 1) Calculate values using calculateFederal() for complete credit calculations
-    const { calculateFederal } = await import('./modules/forecast/formulas/tax-formulas.js');
-    const calculated = calculateFederal(forecast_input);
+    const { calculateFederal, FederalTaxInputSchema } = await import('./modules/forecast/formulas/tax-formulas.js');
+
+    // Validate forecast_input with Zod schema
+    const validationResult = FederalTaxInputSchema.safeParse(forecast_input);
+    if (!validationResult.success) {
+      return res.status(400).json({
+        success: false,
+        error: 'Invalid forecast_input data',
+        details: validationResult.error.issues
+      });
+    }
+
+    const calculated = calculateFederal(validationResult.data);
 
     // 2) Map to 1040 fill keys (minimal set; expands as module evolves)
     const filingStatusIndex: Record<string, number> = {

Cyrano/src/modules/forecast/formulas/tax-formulas.ts

@@ -9,6 +9,8 @@
  * Implements IRS tax brackets and calculation logic for 2018-2025
  */
 
+import { z } from 'zod';
+
 export type FilingStatus = 'single' | 'married_joint' | 'married_separate' | 'head_of_household' | 'qualifying_widow';
 
 export interface TaxBracket {
@@ -511,6 +513,30 @@ export interface FederalTaxInput {
   estimatedWithholding?: number;
 }
 
+/**
+ * Zod validation schema for FederalTaxInput
+ * Ensures type safety and runtime validation at API boundaries
+ */
+export const FederalTaxInputSchema = z.object({
+  year: z.number().int().min(2018).max(2025),
+  filingStatus: z.enum(['single', 'married_joint', 'married_separate', 'head_of_household', 'qualifying_widow']),
+  wages: z.number().nonnegative(),
+  selfEmploymentIncome: z.number().nonnegative().optional(),
+  interestIncome: z.number().nonnegative().optional(),
+  dividendIncome: z.number().nonnegative().optional(),
+  capitalGains: z.number().optional(),
+  otherIncome: z.number().optional(),
+  itemizedDeductions: z.number().nonnegative().optional(),
+  standardDeduction: z.number().nonnegative().optional(),
+  qualifyingChildrenUnder17: z.number().int().nonnegative().optional(),
+  otherDependents: z.number().int().nonnegative().optional(),
+  filerAge: z.number().int().positive().optional(),
+  spouseAge: z.number().int().positive().optional(),
+  canBeClaimedAsDependent: z.boolean().optional(),
+  estimatedWithholding: z.number().nonnegative().optional()
+});
+
+
 /**
  * Standalone backend result interface (for compatibility)
  */

apps/forecaster/backend/package.json

@@ -18,9 +18,8 @@
   "devDependencies": {
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
-    "@types/node": "^25.0.3",
+    "@types/node": "^25.0.8",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   }
 }
-

apps/forecaster/backend/src/city/city-tax.ts

@@ -57,8 +57,4 @@ export function calculateCityTax(input: CityTaxInput): CityTaxResult {
     refundOrBalance,
     warnings
   };
-}
-
-
-}
 }

apps/forecaster/backend/src/pdf/pdf-filler.ts

@@ -138,10 +138,4 @@ export async function applyBranding(params: {
 
   const bytes = await pdfDoc.save();
   return { pdfBase64: toBase64(bytes) };
-}
-
-
-}
-}
-}
-)
+}

apps/forecaster/backend/src/tax/federal.ts

@@ -12,7 +12,7 @@ import {
   type FederalTaxInput,
   type FederalTaxResult,
   type FilingStatus,
-} from '../../../../Cyrano/src/modules/forecast/formulas/tax-formulas.js';
+} from '../../../../../Cyrano/src/modules/forecast/formulas/tax-formulas.js';
 
 // Re-export for backward compatibility
 export type { FederalTaxInput, FederalTaxResult, FilingStatus };

apps/forecaster/backend/tsconfig.json

@@ -5,13 +5,12 @@
     "module": "ESNext",
     "moduleResolution": "bundler",
     "outDir": "dist",
-    "rootDir": "src",
     "strict": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "types": ["node"]
   },
-  "include": ["src"]
+  "include": ["src", "../../../Cyrano/src/modules/forecast/formulas/tax-formulas.ts"]
 }