@omnitronix/bonnys-fortune-game-engine 1.7.2 → 1.8.0

package/src/__tests__/base-game.test.ts

@@ -1,5 +1,5 @@
 /**
- * Base Game Logic Tests — Bonnys Fortune
+ * Base Game Logic Tests -- Bonnys Fortune
  *
  * Tests the core base game mechanics:
  *   - Screen generation (5x3 grid, 243 ways)
@@ -20,9 +20,11 @@ import {
   nextCommandId,
   resetCommandIdCounter,
   validateRngOutcome,
+  getOutcome,
 } from './helpers/test-engine-factory';
+import { MeterState } from '../logic/bonnys-fortune.types';
 
-describe('Base Game Logic — Bonnys Fortune', () => {
+describe('Base Game Logic -- Bonnys Fortune', () => {
   beforeEach(() => {
     resetCommandIdCounter();
   });
@@ -35,10 +37,11 @@ describe('Base Game Logic — Bonnys Fortune', () => {
       const result = await executeSpin(engine, session.publicState, session.privateState);
       expect(result.success).toBe(true);
 
-      const screen = result.outcome?.result?.screen ?? result.outcome?.screen;
+      const outcome = getOutcome(result);
+      const screen = outcome.result?.screen ?? outcome.screen;
       expect(screen).toBeDefined();
-      expect(screen.length).toBe(5);
-      for (const reel of screen) {
+      expect(screen!.length).toBe(5);
+      for (const reel of screen!) {
         expect(reel.length).toBe(3);
       }
     });
@@ -50,8 +53,9 @@ describe('Base Game Logic — Bonnys Fortune', () => {
       const result = await executeSpin(engine, session.publicState, session.privateState);
       expect(result.success).toBe(true);
 
-      const screen = result.outcome?.result?.screen ?? result.outcome?.screen;
-      for (const reel of screen) {
+      const outcome = getOutcome(result);
+      const screen = outcome.result?.screen ?? outcome.screen;
+      for (const reel of screen!) {
         for (const symbol of reel) {
           expect(typeof symbol).toBe('number');
           expect(symbol).toBeGreaterThanOrEqual(0);
@@ -71,7 +75,7 @@ describe('Base Game Logic — Bonnys Fortune', () => {
 
       for (let i = 0; i < 50; i++) {
         if (priv.nextSpinType !== 'BASE_GAME_SPIN') {
-          // Bonus triggered — complete it via extractFinalBonusState
+          // Bonus triggered -- complete it via extractFinalBonusState
           if (priv.pendingBonuses?.length > 0) {
             const bonus = priv.pendingBonuses[0];
             const bonusResult = await startBonusRound(engine, pub, priv, bonus.bonusType);
@@ -92,7 +96,8 @@ describe('Base Game Logic — Bonnys Fortune', () => {
 
         const result = await executeSpin(engine, pub, priv);
         expect(result.success).toBe(true);
-        const screen = result.outcome?.result?.screen ?? result.outcome?.screen ?? result.privateState.screen;
+        const outcome = getOutcome(result);
+        const screen = outcome.result?.screen ?? outcome.screen ?? result.privateState.screen;
         screens.push(JSON.stringify(screen));
 
         pub = result.publicState;
@@ -112,7 +117,8 @@ describe('Base Game Logic — Bonnys Fortune', () => {
       const result = await executeSpin(engine, session.publicState, session.privateState);
       expect(result.success).toBe(true);
 
-      const playerWinning = result.outcome?.result?.playerWinning ?? result.outcome?.playerWinning;
+      const outcome = getOutcome(result);
+      const playerWinning = outcome.result?.playerWinning ?? outcome.playerWinning;
       if (playerWinning !== undefined) {
         expect(playerWinning).toBeGreaterThanOrEqual(0);
         expect(typeof playerWinning).toBe('number');
@@ -132,7 +138,8 @@ describe('Base Game Logic — Bonnys Fortune', () => {
         const result = await executeSpin(engine, pub, priv);
         expect(result.success).toBe(true);
 
-        const playerWinning = result.outcome?.result?.playerWinning ?? result.outcome?.playerWinning;
+        const outcome = getOutcome(result);
+        const playerWinning = outcome.result?.playerWinning ?? outcome.playerWinning;
         if (playerWinning !== undefined) {
           expect(Number.isFinite(playerWinning)).toBe(true);
         }
@@ -159,7 +166,7 @@ describe('Base Game Logic — Bonnys Fortune', () => {
 
       const meters = session.publicState.bonusMeters;
       for (const [, meter] of Object.entries(meters || {})) {
-        const m = meter as any;
+        const m = meter as MeterState;
         expect(m.threshold).toBeGreaterThan(0);
         expect(m.progress).toBeGreaterThanOrEqual(0);
         expect(typeof m.threshold).toBe('number');
@@ -183,7 +190,7 @@ describe('Base Game Logic — Bonnys Fortune', () => {
 
         // Verify meter structure integrity
         for (const [, meter] of Object.entries(result.publicState.bonusMeters || {})) {
-          const m = meter as any;
+          const m = meter as MeterState;
           expect(m.threshold).toBeGreaterThan(0);
           expect(m.progress).toBeGreaterThanOrEqual(0);
           expect(m.progress).toBeLessThanOrEqual(m.threshold);
@@ -208,7 +215,7 @@ describe('Base Game Logic — Bonnys Fortune', () => {
         expect(result.success).toBe(true);
 
         for (const [, meter] of Object.entries(result.publicState.bonusMeters || {})) {
-          const m = meter as any;
+          const m = meter as MeterState;
           expect(m.progress).toBeLessThanOrEqual(m.threshold);
         }
 
@@ -236,7 +243,7 @@ describe('Base Game Logic — Bonnys Fortune', () => {
       expect(result.success).toBe(true);
       expect(result.rngOutcome).toBeDefined();
 
-      const validation = validateRngOutcome(result.rngOutcome);
+      const validation = validateRngOutcome(result.rngOutcome!);
       expect(validation.valid).toBe(true);
     });
   });
@@ -288,8 +295,10 @@ describe('Base Game Logic — Bonnys Fortune', () => {
       expect(result1.success).toBe(true);
       expect(result2.success).toBe(true);
 
-      const screen1 = JSON.stringify(result1.outcome?.screen || result1.privateState.screen);
-      const screen2 = JSON.stringify(result2.outcome?.screen || result2.privateState.screen);
+      const outcome1 = getOutcome(result1);
+      const outcome2 = getOutcome(result2);
+      const screen1 = JSON.stringify(outcome1.screen || result1.privateState.screen);
+      const screen2 = JSON.stringify(outcome2.screen || result2.privateState.screen);
       expect(screen1).toBe(screen2);
     });
   });

package/src/__tests__/bonus-handlers.test.ts

@@ -18,6 +18,7 @@ import {
   debugTriggerBonus,
   nextCommandId,
   resetCommandIdCounter,
+  getOutcome,
 } from './helpers/test-engine-factory';
 
 describe('Bonus Handlers — Bonnys Fortune', () => {
@@ -93,13 +94,11 @@ describe('Bonus Handlers — Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      if (bonusResult.outcome) {
-        const outcomes = Array.isArray(bonusResult.outcome)
-          ? bonusResult.outcome
-          : [bonusResult.outcome];
-        for (const o of outcomes) {
-          if (o.playerWinning !== undefined) {
-            expect(o.playerWinning).toBeGreaterThanOrEqual(0);
+      const outcome = getOutcome(bonusResult);
+      if (outcome.results) {
+        for (const r of outcome.results) {
+          if (r.result?.playerWinning !== undefined) {
+            expect(r.result.playerWinning).toBeGreaterThanOrEqual(0);
           }
         }
       }
@@ -201,13 +200,11 @@ describe('Bonus Handlers — Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      if (bonusResult.outcome) {
-        const outcomes = Array.isArray(bonusResult.outcome)
-          ? bonusResult.outcome
-          : [bonusResult.outcome];
-        for (const o of outcomes) {
-          if (o.playerWinning !== undefined) {
-            expect(o.playerWinning).toBeGreaterThanOrEqual(0);
+      const outcome = getOutcome(bonusResult);
+      if (outcome.results) {
+        for (const r of outcome.results) {
+          if (r.result?.playerWinning !== undefined) {
+            expect(r.result.playerWinning).toBeGreaterThanOrEqual(0);
           }
         }
       }
@@ -364,13 +361,11 @@ describe('Bonus Handlers — Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      if (bonusResult.outcome) {
-        const outcomes = Array.isArray(bonusResult.outcome)
-          ? bonusResult.outcome
-          : [bonusResult.outcome];
-        for (const o of outcomes) {
-          if (o.playerWinning !== undefined) {
-            expect(o.playerWinning).toBeGreaterThanOrEqual(0);
+      const outcome = getOutcome(bonusResult);
+      if (outcome.results) {
+        for (const r of outcome.results) {
+          if (r.result?.playerWinning !== undefined) {
+            expect(r.result.playerWinning).toBeGreaterThanOrEqual(0);
           }
         }
       }

package/src/__tests__/bonus-meters.test.ts

@@ -22,9 +22,14 @@ import {
   resetCommandIdCounter,
   MockRngClient,
   injectMockRng,
+  BonnysFortuneCommandResult,
 } from './helpers/test-engine-factory';
 import { gameLogicConfig } from '../config/game-logic-config/game-logic-config';
-import { MeterState } from '../logic/bonnys-fortune.types';
+import {
+  MeterState,
+  BonnysFortunePublicState,
+  BonnysFortunePrivateState,
+} from '../logic/bonnys-fortune.types';
 import { BonnysFortuneV1GameEngine } from '../bonnys-fortune-v1.game-engine';
 
 /**
@@ -33,11 +38,11 @@ import { BonnysFortuneV1GameEngine } from '../bonnys-fortune-v1.game-engine';
  */
 async function updateBonusMeterProgress(
   engine: BonnysFortuneV1GameEngine,
-  publicState: any,
-  privateState: any,
+  publicState: BonnysFortunePublicState,
+  privateState: BonnysFortunePrivateState,
   bonusType: string,
   progress: number,
-): Promise<any> {
+): Promise<BonnysFortuneCommandResult> {
   return engine.processCommand(publicState, privateState, {
     id: nextCommandId('debug-meter'),
     type: 'DEBUG_UPDATE_BONUS_METER_PROGRESS',
@@ -335,12 +340,12 @@ describe('Bonus Meters - Bonnys Fortune', () => {
         expect(result.success).toBe(true);
 
         // Meters for bet amount 2.0 should be unchanged (thresholds same)
-        const afterMeters2Thresholds = Object.values(
+        const afterMeters2Thresholds = (Object.values(
           result.privateState.bonusMetersByAmount[2.0] || {},
-        ).map((m: any) => m.threshold);
-        const initialMeters2Thresholds = Object.values(
+        ) as MeterState[]).map((m) => m.threshold);
+        const initialMeters2Thresholds = (Object.values(
           JSON.parse(initialMeters2) || {},
-        ).map((m: any) => m.threshold);
+        ) as MeterState[]).map((m) => m.threshold);
 
         expect(afterMeters2Thresholds).toEqual(initialMeters2Thresholds);
       }

package/src/__tests__/collect-feature-handler.test.ts

@@ -19,8 +19,19 @@ import {
   nextCommandId,
   resetCommandIdCounter,
   MockRngClient,
+  BonnysFortuneCommandResult,
 } from './helpers/test-engine-factory';
-import { SpinType } from '../logic/bonnys-fortune.types';
+import {
+  SpinType,
+  SpinResultResponse,
+  CollectFeatureSpinResult,
+  BonusRoundResult,
+} from '../logic/bonnys-fortune.types';
+
+/** Helper to extract collect feature results from a bonus command result */
+function getCollectResults(result: BonnysFortuneCommandResult): SpinResultResponse<CollectFeatureSpinResult>[] {
+  return (result.outcome as unknown as BonusRoundResult<CollectFeatureSpinResult>).results;
+}
 
 describe('Collect Feature Handler - Bonnys Fortune', () => {
   beforeEach(() => {
@@ -50,11 +61,12 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       );
 
       expect(bonusResult.success).toBe(true);
-      expect(bonusResult.outcome?.results).toBeDefined();
-      expect(bonusResult.outcome.results.length).toBeGreaterThan(0);
+      const results = getCollectResults(bonusResult);
+      expect(results).toBeDefined();
+      expect(results.length).toBeGreaterThan(0);
 
       // Each spin should have symbols array
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of results) {
         expect(spin.result.symbols).toBeDefined();
         expect(Array.isArray(spin.result.symbols)).toBe(true);
       }
@@ -84,7 +96,8 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       // Check symbol naming convention
-      for (const spin of bonusResult.outcome.results) {
+      const results = getCollectResults(bonusResult);
+      for (const spin of results) {
         for (const symbol of spin.result.symbols) {
           // Symbols should follow CV (value) or CM (multiplier) pattern
           expect(symbol).toMatch(/^(CV|CM)\d+$/);
@@ -115,7 +128,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.slashed).toBeDefined();
         expect(Array.isArray(spin.result.slashed)).toBe(true);
         // slashed should match symbols length
@@ -151,8 +164,8 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       // Verify sequential spinIndex
-      for (let i = 0; i < bonusResult.outcome.results.length; i++) {
-        expect(bonusResult.outcome.results[i].result.spinIndex).toBe(i);
+      for (let i = 0; i < getCollectResults(bonusResult).length; i++) {
+        expect(getCollectResults(bonusResult)[i].result.spinIndex).toBe(i);
       }
     });
   });
@@ -181,7 +194,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.currentValues).toBeDefined();
         expect(typeof spin.result.currentValues).toBe('number');
         expect(spin.result.currentValues).toBeGreaterThanOrEqual(0);
@@ -213,7 +226,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       // totalValues should accumulate monotonically
       let prevTotal = 0;
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.totalValues).toBeGreaterThanOrEqual(prevTotal);
         prevTotal = spin.result.totalValues;
       }
@@ -244,7 +257,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       // Verify accumulation
       let calculatedTotal = 0;
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         calculatedTotal += spin.result.currentValues;
         expect(spin.result.totalValues).toBeCloseTo(calculatedTotal, 2);
       }
@@ -275,7 +288,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.currentMultipliers).toBeDefined();
         expect(typeof spin.result.currentMultipliers).toBe('number');
         expect(spin.result.currentMultipliers).toBeGreaterThanOrEqual(0);
@@ -307,7 +320,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       // totalMultipliers should accumulate or stay constant
       let prevTotal = 0;
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.totalMultipliers).toBeGreaterThanOrEqual(prevTotal);
         prevTotal = spin.result.totalMultipliers;
       }
@@ -337,7 +350,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       // First spin should have at least 1 as base multiplier
-      const firstSpin = bonusResult.outcome.results[0];
+      const firstSpin = getCollectResults(bonusResult)[0];
       expect(firstSpin.result.totalMultipliers).toBeGreaterThanOrEqual(1);
     });
   });
@@ -367,8 +380,8 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       // spinsLeft should decrement
-      for (let i = 0; i < bonusResult.outcome.results.length; i++) {
-        const spin = bonusResult.outcome.results[i];
+      for (let i = 0; i < getCollectResults(bonusResult).length; i++) {
+        const spin = getCollectResults(bonusResult)[i];
         expect(spin.result.spinsLeft).toBeDefined();
         expect(spin.result.spinsLeft).toBeGreaterThanOrEqual(0);
       }
@@ -398,7 +411,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       const lastSpin =
-        bonusResult.outcome.results[bonusResult.outcome.results.length - 1];
+        getCollectResults(bonusResult)[getCollectResults(bonusResult).length - 1];
       expect(lastSpin.result.spinsLeft).toBe(0);
       expect(lastSpin.result.nextSpinType).toBe(SpinType.BASE_GAME_SPIN);
     });
@@ -427,8 +440,8 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       // All spins except last should have COLLECT_FEATURE_SPIN as next
-      for (let i = 0; i < bonusResult.outcome.results.length - 1; i++) {
-        const spin = bonusResult.outcome.results[i];
+      for (let i = 0; i < getCollectResults(bonusResult).length - 1; i++) {
+        const spin = getCollectResults(bonusResult)[i];
         if (spin.result.spinsLeft > 0) {
           expect(spin.result.nextSpinType).toBe(SpinType.COLLECT_FEATURE_SPIN);
         }
@@ -460,7 +473,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       expect(bonusResult.success).toBe(true);
 
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.playerWinning).toBeDefined();
         expect(typeof spin.result.playerWinning).toBe('number');
       }
@@ -491,7 +504,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
       // totalWin should accumulate
       let prevTotal = 0;
-      for (const spin of bonusResult.outcome.results) {
+      for (const spin of getCollectResults(bonusResult)) {
         expect(spin.result.totalWin).toBeGreaterThanOrEqual(prevTotal);
         prevTotal = spin.result.totalWin;
       }
@@ -526,7 +539,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       // totalWin should be proportional to totalValues * totalMultipliers
       // (actual formula includes betStake derived from config)
       const lastSpin =
-        bonusResult.outcome.results[bonusResult.outcome.results.length - 1];
+        getCollectResults(bonusResult)[getCollectResults(bonusResult).length - 1];
       const baseProduct =
         lastSpin.result.totalValues * lastSpin.result.totalMultipliers;
 
@@ -565,7 +578,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
       expect(bonusResult.success).toBe(true);
 
       const lastSpin =
-        bonusResult.outcome.results[bonusResult.outcome.results.length - 1];
+        getCollectResults(bonusResult)[getCollectResults(bonusResult).length - 1];
       expect(lastSpin.result.totalWin).toBeGreaterThanOrEqual(0);
     });
 
@@ -599,7 +612,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
         if (bonusResult.success) {
           const lastSpin =
-            bonusResult.outcome.results[bonusResult.outcome.results.length - 1];
+            getCollectResults(bonusResult)[getCollectResults(bonusResult).length - 1];
           totalWins.push(lastSpin.result.totalWin);
         }
       }
@@ -696,7 +709,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
 
   describe('RNG Determinism', () => {
     it('should produce consistent results with same LCG seed', async () => {
-      const results: any[] = [];
+      const results: SpinResultResponse<CollectFeatureSpinResult>[][] = [];
 
       for (let i = 0; i < 2; i++) {
         resetCommandIdCounter();
@@ -720,7 +733,7 @@ describe('Collect Feature Handler - Bonnys Fortune', () => {
           bonus.bonusType,
         );
 
-        results.push(bonusResult.outcome.results);
+        results.push(getCollectResults(bonusResult));
       }
 
       expect(results.length).toBe(2);

package/src/__tests__/comprehensive.test.ts

@@ -16,6 +16,10 @@
 
 import { BonnysFortuneV1GameEngine } from '../bonnys-fortune-v1.game-engine';
 import { GameActionCommand } from '../game-engine.interface';
+import {
+  BonnysFortunePublicState,
+  BonnysFortunePrivateState,
+} from '../logic/bonnys-fortune.types';
 
 describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   let engine: BonnysFortuneV1GameEngine;
@@ -38,7 +42,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
         },
       };
 
-      const result = await engine.processCommand(null, null, command);
+      const result = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, command);
 
       expect(result.success).toBe(true);
       expect(result.publicState).toBeDefined();
@@ -46,7 +50,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
     });
 
     it('should initialize with bonus meters', async () => {
-      const result = await engine.processCommand(null, null, {
+      const result = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init-meters',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -60,7 +64,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
       const betAmounts = [0.5, 1.0, 2.0, 5.0, 10.0];
 
       for (const betAmount of betAmounts) {
-        const result = await engine.processCommand(null, null, {
+        const result = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
           id: `init-${betAmount}`,
           type: 'INIT_SESSION_STATE',
           payload: { betAmount },
@@ -84,11 +88,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // BASE GAME SPINS
   // ============================================================
   describe('Base Game Spins', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -176,11 +180,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // BONUS GAME 1 - TREASURE HUNT
   // ============================================================
   describe('bonusGame1 (Treasure Hunt) Flow', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -262,11 +266,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // BONUS GAME 2 - FREE SPINS
   // ============================================================
   describe('bonusGame2 (Free Spins) Flow', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -327,11 +331,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // BONUS GAME 3 - STEERING TO THE FORTUNE
   // ============================================================
   describe('bonusGame3 (Steering to the Fortune) Flow', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -392,11 +396,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // COLLECT FEATURE
   // ============================================================
   describe('collectFeature Flow', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -423,7 +427,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
       const betAmounts = [1.0, 2.0, 5.0];
 
       for (const betAmount of betAmounts) {
-        const init = await engine.processCommand(null, null, {
+        const init = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
           id: `init-${betAmount}`,
           type: 'INIT_SESSION_STATE',
           payload: { betAmount },
@@ -452,11 +456,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // BONUS METER MANIPULATION
   // ============================================================
   describe('Bonus Meter Manipulation', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -509,11 +513,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // SPIN/BONUS COMBINATIONS
   // ============================================================
   describe('Spin/Bonus Combinations', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -653,7 +657,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
       ];
 
       for (const { betAmount, bonusType } of configs) {
-        const init = await engine.processCommand(null, null, {
+        const init = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
           id: `init-${betAmount}`,
           type: 'INIT_SESSION_STATE',
           payload: { betAmount },
@@ -697,11 +701,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // DEBUG TRIGGER ERROR CASES
   // ============================================================
   describe('Debug Trigger Error Cases', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -730,7 +734,7 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
       // Engine throws TypeError when state is null
       // This is expected behavior - state must be initialized
       await expect(
-        engine.processCommand(null, null, {
+        engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
           id: 'no-state',
           type: 'DEBUG_TRIGGER_BONUS',
           payload: {
@@ -747,11 +751,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // SESSION MANAGEMENT
   // ============================================================
   describe('Session Management', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },
@@ -775,11 +779,11 @@ describe("Bonny's Fortune - Comprehensive Test Suite", () => {
   // STATE PERSISTENCE
   // ============================================================
   describe('State Persistence', () => {
-    let publicState: any;
-    let privateState: any;
+    let publicState: BonnysFortunePublicState;
+    let privateState: BonnysFortunePrivateState;
 
     beforeEach(async () => {
-      const initResult = await engine.processCommand(null, null, {
+      const initResult = await engine.processCommand(null as unknown as BonnysFortunePublicState, null as unknown as BonnysFortunePrivateState, {
         id: 'init',
         type: 'INIT_SESSION_STATE',
         payload: { betAmount: 1.0 },