refactor: close remaining audit findings (#2,#3,#4,#8,#15,#17)

#2: Added WeakMap prepared statement caching to storage-tags.ts and
    storage-ops.ts for consistency with storage-memory.ts pattern.
#3: Extracted insertCompartmentRows/insertFactRows helpers with cached
    prepared statements, replacing 4 duplicate INSERT sites.
#4: Removed dead exports: DreamingConfigSchema, DreamingConfig,
    getQueueSize, hasPendingOps, parseJsoncSafe, JsoncParseResult,
    createTagContentResolver and its file.
#8: Added Intentional comment documenting single-threaded safety of
    compartment runner check-then-set pattern.
#15: Cached scoped assignments in tag resolver with size-based
     invalidation — avoids 16k regex iterations on every transform.
#17: Threaded modelKey through scheduler.shouldExecute() so per-model
     execute_threshold_percentage applies to queue execution decisions.

Author: ualtinok

src/config/schema/magic-context.ts

@@ -28,27 +28,6 @@ export const DEFAULT_DREAMER_TASKS: DreamingTask[] = [
     "improve",
 ];
 
-export const DreamingConfigSchema = z
-    .object({
-        /** Enable dreamer (default: false) */
-        enabled: z.boolean().default(false),
-        /** Scheduled window for overnight dreaming (e.g. "02:00-06:00") */
-        schedule: z.string().default("02:00-06:00"),
-        /** Maximum runtime per dream session in minutes (default: 120) */
-        max_runtime_minutes: z.number().min(10).default(120),
-        /** Tasks to run during dreaming, in order (default: consolidate, verify, archive-stale, improve) */
-        tasks: z.array(DreamingTaskSchema).default(DEFAULT_DREAMER_TASKS),
-        /** Minutes allocated per task before moving to next (default: 20) */
-        task_timeout_minutes: z.number().min(5).default(20),
-    })
-    .default({
-        enabled: false,
-        schedule: "02:00-06:00",
-        max_runtime_minutes: 120,
-        tasks: DEFAULT_DREAMER_TASKS,
-        task_timeout_minutes: 20,
-    });
-
 /** Combined dreamer agent + scheduling configuration */
 export const DreamerConfigSchema = AgentOverrideConfigSchema.merge(
     z.object({
@@ -120,7 +99,6 @@ export const EmbeddingConfigSchema = BaseEmbeddingConfigSchema.transform((data)
 });
 
 export type EmbeddingConfig = z.infer<typeof EmbeddingConfigSchema>;
-export type DreamingConfig = z.infer<typeof DreamingConfigSchema>;
 
 export interface MagicContextConfig {
     enabled: boolean;

src/features/magic-context/compartment-storage.ts

@@ -1,5 +1,32 @@
 import type { Database } from "bun:sqlite";
 
+type PreparedStatement = ReturnType<Database["prepare"]>;
+
+const insertCompartmentStatements = new WeakMap<Database, PreparedStatement>();
+const insertFactStatements = new WeakMap<Database, PreparedStatement>();
+
+function getInsertCompartmentStatement(db: Database): PreparedStatement {
+    let stmt = insertCompartmentStatements.get(db);
+    if (!stmt) {
+        stmt = db.prepare(
+            "INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        );
+        insertCompartmentStatements.set(db, stmt);
+    }
+    return stmt;
+}
+
+function getInsertFactStatement(db: Database): PreparedStatement {
+    let stmt = insertFactStatements.get(db);
+    if (!stmt) {
+        stmt = db.prepare(
+            "INSERT INTO session_facts (session_id, category, content, created_at, updated_at) VALUES (?, ?, ?, ?, ?)",
+        );
+        insertFactStatements.set(db, stmt);
+    }
+    return stmt;
+}
+
 export interface Compartment {
     id: number;
     sessionId: string;
@@ -84,6 +111,40 @@ export interface CompartmentInput {
     content: string;
 }
 
+function insertCompartmentRows(
+    db: Database,
+    sessionId: string,
+    compartments: CompartmentInput[],
+    now: number,
+): void {
+    const stmt = getInsertCompartmentStatement(db);
+    for (const compartment of compartments) {
+        stmt.run(
+            sessionId,
+            compartment.sequence,
+            compartment.startMessage,
+            compartment.endMessage,
+            compartment.startMessageId,
+            compartment.endMessageId,
+            compartment.title,
+            compartment.content,
+            now,
+        );
+    }
+}
+
+function insertFactRows(
+    db: Database,
+    sessionId: string,
+    facts: Array<{ category: string; content: string }>,
+    now: number,
+): void {
+    const stmt = getInsertFactStatement(db);
+    for (const fact of facts) {
+        stmt.run(sessionId, fact.category, fact.content, now, now);
+    }
+}
+
 function toCompartment(row: CompartmentRow): Compartment {
     return {
         id: row.id,
@@ -135,22 +196,7 @@ export function replaceAllCompartments(
     const now = Date.now();
     db.transaction(() => {
         db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
-        const stmt = db.prepare(
-            "INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        );
-        for (const c of compartments) {
-            stmt.run(
-                sessionId,
-                c.sequence,
-                c.startMessage,
-                c.endMessage,
-                c.startMessageId,
-                c.endMessageId,
-                c.title,
-                c.content,
-                now,
-            );
-        }
+        insertCompartmentRows(db, sessionId, compartments, now);
     })();
 }
 
@@ -167,22 +213,7 @@ export function appendCompartments(
     if (compartments.length === 0) return;
     const now = Date.now();
     db.transaction(() => {
-        const stmt = db.prepare(
-            "INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        );
-        for (const c of compartments) {
-            stmt.run(
-                sessionId,
-                c.sequence,
-                c.startMessage,
-                c.endMessage,
-                c.startMessageId,
-                c.endMessageId,
-                c.title,
-                c.content,
-                now,
-            );
-        }
+        insertCompartmentRows(db, sessionId, compartments, now);
     })();
 }
 
@@ -199,12 +230,7 @@ export function replaceSessionFacts(
     const now = Date.now();
     db.transaction(() => {
         db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
-        const stmt = db.prepare(
-            "INSERT INTO session_facts (session_id, category, content, created_at, updated_at) VALUES (?, ?, ?, ?, ?)",
-        );
-        for (const f of facts) {
-            stmt.run(sessionId, f.category, f.content, now, now);
-        }
+        insertFactRows(db, sessionId, facts, now);
         // Clear cached memory block so next injection renders fresh
         db.prepare(
             "UPDATE session_meta SET memory_block_cache = '', memory_block_count = 0 WHERE session_id = ?",
@@ -231,29 +257,8 @@ export function replaceAllCompartmentState(
         db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
         db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
 
-        const compartmentStmt = db.prepare(
-            "INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        );
-        for (const c of compartments) {
-            compartmentStmt.run(
-                sessionId,
-                c.sequence,
-                c.startMessage,
-                c.endMessage,
-                c.startMessageId,
-                c.endMessageId,
-                c.title,
-                c.content,
-                now,
-            );
-        }
-
-        const factStmt = db.prepare(
-            "INSERT INTO session_facts (session_id, category, content, created_at, updated_at) VALUES (?, ?, ?, ?, ?)",
-        );
-        for (const f of facts) {
-            factStmt.run(sessionId, f.category, f.content, now, now);
-        }
+        insertCompartmentRows(db, sessionId, compartments, now);
+        insertFactRows(db, sessionId, facts, now);
 
         // Clear cached memory block so next injection renders fresh (historian run already busts cache)
         db.prepare(
@@ -401,29 +406,8 @@ export function promoteRecompStaging(
         db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
         db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
 
-        const compartmentStmt = db.prepare(
-            "INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        );
-        for (const c of staging.compartments) {
-            compartmentStmt.run(
-                sessionId,
-                c.sequence,
-                c.startMessage,
-                c.endMessage,
-                c.startMessageId,
-                c.endMessageId,
-                c.title,
-                c.content,
-                now,
-            );
-        }
-
-        const factStmt = db.prepare(
-            "INSERT INTO session_facts (session_id, category, content, created_at, updated_at) VALUES (?, ?, ?, ?, ?)",
-        );
-        for (const f of staging.facts) {
-            factStmt.run(sessionId, f.category, f.content, now, now);
-        }
+        insertCompartmentRows(db, sessionId, staging.compartments, now);
+        insertFactRows(db, sessionId, staging.facts, now);
 
         // Clear staging
         db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);

src/features/magic-context/dreamer/queue.ts

@@ -121,13 +121,3 @@ export function clearStaleEntries(db: Database, maxAgeMs: number): number {
         .run(cutoff);
     return result.changes;
 }
-
-/** Get current queue size (unstarted entries only). */
-export function getQueueSize(db: Database): number {
-    const row = db
-        .query<{ count: number }, []>(
-            "SELECT COUNT(*) as count FROM dream_queue WHERE started_at IS NULL",
-        )
-        .get();
-    return row?.count ?? 0;
-}

src/features/magic-context/scheduler.test.ts

@@ -1,3 +1,5 @@
+/// <reference types="bun-types" />
+
 import { describe, expect, it } from "bun:test";
 import { createScheduler, parseCacheTtl } from "./scheduler";
 import type { ContextUsage, SessionMeta } from "./types";
@@ -18,6 +20,7 @@ function createSessionMeta(overrides: Partial<SessionMeta> = {}): SessionMeta {
         lastInputTokens: 0,
         timesExecuteThresholdReached: 0,
         compartmentInProgress: false,
+        systemPromptHash: "",
         ...overrides,
     };
 }
@@ -72,6 +75,23 @@ describe("createScheduler", () => {
         );
     });
 
+    it("uses a model-specific execute threshold when modelKey is provided", () => {
+        const scheduler = createScheduler({
+            executeThresholdPercentage: { default: 70, "openai/gpt-4o": 60 },
+        });
+        const sessionMeta = createSessionMeta({ lastResponseTime: BASE_TIME - 10_000 });
+
+        expect(
+            scheduler.shouldExecute(
+                sessionMeta,
+                createContextUsage(65),
+                BASE_TIME,
+                undefined,
+                "openai/gpt-4o",
+            ),
+        ).toBe("execute");
+    });
+
     it("falls back to 5m default when cacheTtl is invalid", () => {
         const scheduler = createScheduler({ executeThresholdPercentage: 65 });
         const sessionMeta = createSessionMeta({

src/features/magic-context/scheduler.ts

@@ -17,6 +17,7 @@ export interface Scheduler {
         contextUsage: ContextUsage,
         currentTime?: number,
         sessionId?: string,
+        modelKey?: string,
     ): SchedulerDecision;
 }
 
@@ -48,10 +49,11 @@ export function createScheduler(config: SchedulerConfig): Scheduler {
             contextUsage: ContextUsage,
             currentTime: number = Date.now(),
             sessionId?: string,
+            modelKey?: string,
         ): SchedulerDecision {
             const threshold = resolveExecuteThreshold(
                 config.executeThresholdPercentage,
-                undefined,
+                modelKey,
                 65,
             );
             if (contextUsage.percentage >= threshold) {