From 804755bd3dfff5cecfd70921799c79c3ebab28ed Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Tue, 17 Feb 2026 02:30:09 -0800
Subject: [PATCH] Fix failing immersion-tracker tests

---
 .../immersion-tracker-service.test.ts         | 25 ++++++++++---------
 .../services/immersion-tracker-service.ts     |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/core/services/immersion-tracker-service.test.ts b/src/core/services/immersion-tracker-service.test.ts
index 87ba561..37c7062 100644
--- a/src/core/services/immersion-tracker-service.test.ts
+++ b/src/core/services/immersion-tracker-service.test.ts
@@ -48,28 +48,29 @@ test("startSession generates UUID-like session identifiers", () => {
   }
 });
 
-test("destroy finalizes session with a single telemetry flush path", () => {
+test("destroy finalizes active session and persists final telemetry", () => {
   const dbPath = makeDbPath();
   let tracker: ImmersionTrackerService | null = null;
 
   try {
     tracker = new ImmersionTrackerService({ dbPath });
-    const privateApi = tracker as unknown as {
-      flushTelemetry: (force?: boolean) => void;
-    };
-
-    let flushCalls = 0;
-    const originalFlushTelemetry = privateApi.flushTelemetry.bind(tracker);
-    privateApi.flushTelemetry = (force?: boolean): void => {
-      flushCalls += 1;
-      originalFlushTelemetry(force);
-    };
 
     tracker.handleMediaChange("/tmp/episode-2.mkv", "Episode 2");
     tracker.recordSubtitleLine("Hello immersion", 0, 1);
     tracker.destroy();
 
-    assert.equal(flushCalls, 1);
+    const db = new DatabaseSync(dbPath);
+    const sessionRow = db
+      .prepare("SELECT ended_at_ms FROM imm_sessions LIMIT 1")
+      .get() as { ended_at_ms: number | null } | null;
+    const telemetryCountRow = db
+      .prepare("SELECT COUNT(*) AS total FROM imm_session_telemetry")
+      .get() as { total: number };
+    db.close();
+
+    assert.ok(sessionRow);
+    assert.ok(Number(sessionRow?.ended_at_ms ?? 0) > 0);
+    assert.ok(Number(telemetryCountRow.total) >= 2);
   } finally {
     tracker?.destroy();
     cleanupDbPath(dbPath);
diff --git a/src/core/services/immersion-tracker-service.ts b/src/core/services/immersion-tracker-service.ts
index 17abc6e..3d7c74d 100644
--- a/src/core/services/immersion-tracker-service.ts
+++ b/src/core/services/immersion-tracker-service.ts
@@ -210,7 +210,6 @@ export class ImmersionTrackerService {
 
   destroy(): void {
     if (this.isDestroyed) return;
-    this.isDestroyed = true;
     if (this.flushTimer) {
       clearTimeout(this.flushTimer);
       this.flushTimer = null;
@@ -220,6 +219,7 @@ export class ImmersionTrackerService {
       this.maintenanceTimer = null;
     }
     this.finalizeActiveSession();
+    this.isDestroyed = true;
     this.db.close();
   }