squish-memory 0.8.2 → 0.9.2

package/dist/core/memory/feedback-tracker.js

@@ -0,0 +1,151 @@
+/** Feedback Tracker - Track memory usage in responses for Echo/Fizzle loop */
+import { logger } from '../logger.js';
+import { config } from '../../config.js';
+import { getDb } from '../../db/index.js';
+import { memoryFeedback, memories } from '../../drizzle/schema-sqlite.js';
+import { eq, and } from 'drizzle-orm';
+import { analyzeResponseForMemoryReferences, mightContainMemoryReferences } from './response-analyzer.js';
+const injectionTracker = new Map();
+export async function recordInjection(sessionId, memoryIds, memoryContent) {
+    if (!config.feedbackTrackingEnabled)
+        return;
+    injectionTracker.set(sessionId, {
+        memoryIds,
+        memoryContent,
+        injectedAt: new Date(),
+    });
+    const db = await getDb();
+    if (!db)
+        return;
+    try {
+        const now = new Date();
+        for (const memoryId of memoryIds) {
+            await db.insert(memoryFeedback).values({
+                memoryId,
+                sessionId,
+                wasInjected: true,
+                wasReferenced: false,
+                referenceCount: 0,
+                retrievalPriorityDelta: 0,
+                injectedAt: now,
+            }).onConflictDoNothing();
+        }
+        logger.debug(`[FeedbackTracker] Recorded injection of ${memoryIds.length} memories for session ${sessionId}`);
+    }
+    catch (error) {
+        logger.error('[FeedbackTracker] Failed to record injection:', error);
+    }
+}
+export async function analyzeAndRecordFeedback(sessionId, responseText) {
+    if (!config.feedbackTrackingEnabled)
+        return;
+    const injection = injectionTracker.get(sessionId);
+    if (!injection) {
+        logger.debug(`[FeedbackTracker] No injection record for session ${sessionId}`);
+        return;
+    }
+    if (!mightContainMemoryReferences(responseText)) {
+        await applyFizzlePenalty(injection.memoryIds);
+        injectionTracker.delete(sessionId);
+        return;
+    }
+    const analysis = analyzeResponseForMemoryReferences(responseText, injection.memoryIds, injection.memoryContent);
+    const db = await getDb();
+    if (!db)
+        return;
+    try {
+        const now = new Date();
+        for (const memoryId of injection.memoryIds) {
+            const wasReferenced = analysis.referencedMemoryIds.includes(memoryId);
+            const delta = wasReferenced ? config.feedbackEchoBonus : -config.feedbackFizzlePenalty;
+            const existing = await db
+                .select()
+                .from(memoryFeedback)
+                .where(and(eq(memoryFeedback.memoryId, memoryId), eq(memoryFeedback.sessionId, sessionId)))
+                .limit(1);
+            if (existing.length > 0) {
+                await db
+                    .update(memoryFeedback)
+                    .set({
+                    wasReferenced,
+                    referenceCount: wasReferenced ? 1 : 0,
+                    retrievalPriorityDelta: delta,
+                    referencedAt: wasReferenced ? now : null,
+                })
+                    .where(eq(memoryFeedback.id, existing[0].id));
+            }
+            await updateRetrievalPriority(memoryId, delta);
+        }
+        logger.info(`[FeedbackTracker] Feedback recorded: ${analysis.referenceCount} echoes, ${injection.memoryIds.length - analysis.referenceCount} fizzles`);
+        injectionTracker.delete(sessionId);
+    }
+    catch (error) {
+        logger.error('[FeedbackTracker] Failed to record feedback:', error);
+    }
+}
+async function applyFizzlePenalty(memoryIds) {
+    try {
+        for (const memoryId of memoryIds) {
+            await updateRetrievalPriority(memoryId, -config.feedbackFizzlePenalty);
+        }
+        logger.debug(`[FeedbackTracker] Applied fizzle penalty to ${memoryIds.length} memories`);
+    }
+    catch (error) {
+        logger.error('[FeedbackTracker] Failed to apply fizzle penalty:', error);
+    }
+}
+export async function updateRetrievalPriority(memoryId, delta) {
+    const db = await getDb();
+    if (!db)
+        return;
+    try {
+        const [memory] = await db
+            .select({ retrievalPriority: memories.retrievalPriority })
+            .from(memories)
+            .where(eq(memories.id, memoryId))
+            .limit(1);
+        if (!memory)
+            return;
+        const currentPriority = memory.retrievalPriority ?? 50;
+        const newPriority = Math.max(0, Math.min(100, currentPriority + delta));
+        await db
+            .update(memories)
+            .set({ retrievalPriority: newPriority })
+            .where(eq(memories.id, memoryId));
+        logger.debug(`[FeedbackTracker] Updated priority for ${memoryId}: ${currentPriority} -> ${newPriority}`);
+    }
+    catch (error) {
+        logger.error('[FeedbackTracker] Failed to update retrieval priority:', error);
+    }
+}
+export async function getMemoryFeedbackStats(memoryId) {
+    const db = await getDb();
+    if (!db) {
+        return { totalInjections: 0, totalReferences: 0, echoRate: 0, averagePriorityDelta: 0 };
+    }
+    try {
+        const records = await db
+            .select()
+            .from(memoryFeedback)
+            .where(eq(memoryFeedback.memoryId, memoryId));
+        const totalInjections = records.filter((r) => r.wasInjected).length;
+        const totalReferences = records.filter((r) => r.wasReferenced).length;
+        const echoRate = totalInjections > 0 ? totalReferences / totalInjections : 0;
+        const totalDelta = records.reduce((sum, r) => sum + (r.retrievalPriorityDelta ?? 0), 0);
+        const averagePriorityDelta = records.length > 0 ? totalDelta / records.length : 0;
+        return { totalInjections, totalReferences, echoRate, averagePriorityDelta };
+    }
+    catch (error) {
+        logger.error('[FeedbackTracker] Failed to get feedback stats:', error);
+        return { totalInjections: 0, totalReferences: 0, echoRate: 0, averagePriorityDelta: 0 };
+    }
+}
+export function cleanupInjectionTracker(maxAgeMs = 3600000) {
+    const now = Date.now();
+    for (const [sessionId, injection] of injectionTracker.entries()) {
+        if (now - injection.injectedAt.getTime() > maxAgeMs) {
+            injectionTracker.delete(sessionId);
+        }
+    }
+}
+//# sourceMappingURL=feedback-tracker.js.map

package/dist/core/memory/feedback-tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"feedback-tracker.js","sourceRoot":"","sources":["../../../core/memory/feedback-tracker.ts"],"names":[],"mappings":"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"}

package/dist/core/memory/hybrid-retrieval.d.ts

@@ -1,10 +1,12 @@
-import { HybridScorerOptions } from './hybrid-scorer.js';
+import { hybridScore, HybridScorerOptions } from './hybrid-scorer.js';
 import { SearchInput, MemoryRecord } from './memories.js';
 export interface HybridSearchOptions extends SearchInput {
     candidateLimit?: number;
     resultLimit?: number;
     hybridOptions?: HybridScorerOptions;
     queryEntities?: string[];
+    sessionId?: string;
+    skipRewrite?: boolean;
 }
 export interface HybridSearchResult extends MemoryRecord {
     hybridScore: number;
@@ -12,19 +14,16 @@ export interface HybridSearchResult extends MemoryRecord {
     recencyScore: number;
     coactivationScore: number;
     importanceScore: number;
+    confidenceScore: number;
+    feedbackScore: number;
     entityBoost: number;
     rank: number;
+    queryRewrite?: {
+        original: string;
+        rewritten: string;
+        method: string;
+    };
 }
-/**
- * Hybrid search with multi-factor re-ranking + entity filtering
- *
- * Algorithm:
- * 1. Fetch N candidates using vector similarity
- * 2. Filter/boost by entity relevance (Phase 3)
- * 3. Re-rank using hybrid scoring (semantic + recency + coactivation + importance)
- * 4. Return top M results
- *
- * This provides better relevance than pure vector search
- */
+export declare function applyEntityBoostAndRerank(scored: Awaited<ReturnType<typeof hybridScore>>): Awaited<ReturnType<typeof hybridScore>>;
 export declare function hybridSearch(options: HybridSearchOptions): Promise<HybridSearchResult[]>;
 //# sourceMappingURL=hybrid-retrieval.d.ts.map

package/dist/core/memory/hybrid-retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-retrieval.d.ts","sourceRoot":"","sources":["../../../core/memory/hybrid-retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAkB,WAAW,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG1E,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA0D/B"}
+{"version":3,"file":"hybrid-retrieval.d.ts","sourceRoot":"","sources":["../../../core/memory/hybrid-retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAkB,WAAW,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAO1E,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAiBlI;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA0E9F"}

package/dist/core/memory/hybrid-retrieval.js

@@ -2,53 +2,78 @@ import { hybridScore } from './hybrid-scorer.js';
 import { getEmbedding } from '../embeddings.js';
 import { searchMemories } from './memories.js';
 import { filterByEntities } from './entity-resolver.js';
-/**
- * Hybrid search with multi-factor re-ranking + entity filtering
- *
- * Algorithm:
- * 1. Fetch N candidates using vector similarity
- * 2. Filter/boost by entity relevance (Phase 3)
- * 3. Re-rank using hybrid scoring (semantic + recency + coactivation + importance)
- * 4. Return top M results
- *
- * This provides better relevance than pure vector search
- */
+import { rewriteQuery, wouldBenefitFromRewrite } from './query-rewriter.js';
+import { collectRecentContext } from './context-collector.js';
+import { config } from '../../config.js';
+import { logger } from '../logger.js';
+export function applyEntityBoostAndRerank(scored) {
+    const boosted = scored.map((item) => {
+        const rawBoost = item.memory._entityBoost;
+        const entityBoost = typeof rawBoost === 'number' ? rawBoost : 0.5;
+        const multiplier = 0.8 + entityBoost * 0.4;
+        return {
+            ...item,
+            totalScore: Math.min(100, Math.round(item.totalScore * multiplier * 100) / 100),
+        };
+    });
+    boosted.sort((a, b) => b.totalScore - a.totalScore);
+    for (let i = 0; i < boosted.length; i++) {
+        boosted[i].rank = i + 1;
+    }
+    return boosted;
+}
 export async function hybridSearch(options) {
     const candidateLimit = options.candidateLimit ?? 50;
     const resultLimit = options.resultLimit ?? options.limit ?? 5;
-    // Get query embedding
-    const queryEmbedding = await getEmbedding(options.query);
-    // Step 1: Fetch candidates using vector search
-    // We fetch more than we need to allow re-ranking
+    let query = options.query;
+    let rewriteInfo = null;
+    if (config.queryRewritingEnabled && !options.skipRewrite && options.sessionId) {
+        try {
+            const context = await collectRecentContext(options.sessionId, config.queryRewritingContextMessages);
+            if (wouldBenefitFromRewrite(query) || context.length > 0) {
+                const result = await rewriteQuery(query, context);
+                if (result.rewritten !== result.original) {
+                    rewriteInfo = {
+                        original: result.original,
+                        rewritten: result.rewritten,
+                        method: result.method,
+                    };
+                    query = result.rewritten;
+                    logger.info(`[HybridSearch] Query rewritten: "${result.original}" -> "${result.rewritten}" (${result.method})`);
+                }
+            }
+        }
+        catch (error) {
+            logger.warn(`[HybridSearch] Query rewriting failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    const queryEmbedding = await getEmbedding(query);
     const candidates = await searchMemories({
         ...options,
         limit: candidateLimit,
     });
-    if (candidates.length === 0) {
+    if (candidates.length === 0)
         return [];
-    }
-    // Step 2: Entity filtering/boosting (Phase 3)
     const entityScored = filterByEntities(candidates, options.queryEntities || []);
-    // Apply entity boost to memory metadata for scoring
     const boostedCandidates = entityScored.map(({ memory, entityBoost }) => ({
         ...memory,
         _entityBoost: entityBoost,
     }));
-    // Step 3: Re-rank using hybrid scoring
     const scored = await hybridScore(queryEmbedding, boostedCandidates, {
         ...options.hybridOptions,
         weights: {
-            semantic: 0.35, // Vector similarity
-            recency: 0.25, // Time decay (favor recent)
-            coactivation: 0.20, // Graph associations
-            importance: 0.20, // Confidence + tier
+            semantic: 0.30,
+            recency: 0.20,
+            coactivation: 0.10,
+            importance: 0.15,
+            confidence: 0.15,
+            feedback: 0.10,
             ...options.hybridOptions?.weights,
         },
-        decayDays: 7, // Weekly decay for benchmark data
+        decayDays: 7,
     });
-    // Step 4: Take top N results
-    const topResults = scored.slice(0, resultLimit);
-    // Format results
+    const reranked = applyEntityBoostAndRerank(scored);
+    const topResults = reranked.slice(0, resultLimit);
     return topResults.map((scoredItem, index) => ({
         ...scoredItem.memory,
         hybridScore: scoredItem.totalScore,
@@ -56,8 +81,11 @@ export async function hybridSearch(options) {
         recencyScore: scoredItem.components.recency,
         coactivationScore: scoredItem.components.coactivation,
         importanceScore: scoredItem.components.importance,
+        confidenceScore: scoredItem.components.confidence,
+        feedbackScore: scoredItem.components.feedback,
         entityBoost: scoredItem.memory._entityBoost || 0.5,
         rank: index + 1,
+        ...(rewriteInfo && { queryRewrite: rewriteInfo }),
     }));
 }
 //# sourceMappingURL=hybrid-retrieval.js.map

package/dist/core/memory/hybrid-retrieval.js.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-retrieval.js","sourceRoot":"","sources":["../../../core/memory/hybrid-retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAA6B,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAmBxD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAA4B;IAE5B,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC;IAE9D,sBAAsB;IACtB,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEzD,+CAA+C;IAC/C,iDAAiD;IACjD,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC;QACtC,GAAG,OAAO;QACV,KAAK,EAAE,cAAc;KACtB,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,8CAA8C;IAC9C,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAE/E,oDAAoD;IACpD,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QACvE,GAAG,MAAM;QACT,YAAY,EAAE,WAAW;KAC1B,CAAC,CAAC,CAAC;IAEJ,uCAAuC;IACvC,MAAM,MAAM,GAAG,MAAM,WAAW,CAC9B,cAAc,EACd,iBAAiB,EACjB;QACE,GAAG,OAAO,CAAC,aAAa;QACxB,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI,EAAK,oBAAoB;YACvC,OAAO,EAAE,IAAI,EAAM,4BAA4B;YAC/C,YAAY,EAAE,IAAI,EAAE,qBAAqB;YACzC,UAAU,EAAE,IAAI,EAAG,oBAAoB;YACvC,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO;SAClC;QACD,SAAS,EAAE,CAAC,EAAE,kCAAkC;KACjD,CACF,CAAC;IAEF,6BAA6B;IAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAEhD,iBAAiB;IACjB,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,GAAG,UAAU,CAAC,MAAM;QACpB,WAAW,EAAE,UAAU,CAAC,UAAU;QAClC,aAAa,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ;QAC7C,YAAY,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO;QAC3C,iBAAiB,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY;QACrD,eAAe,EAAE,UAAU,CAAC,UAAU,CAAC,UAAU;QACjD,WAAW,EAAG,UAAU,CAAC,MAAc,CAAC,YAAY,IAAI,GAAG;QAC3D,IAAI,EAAE,KAAK,GAAG,CAAC;KAChB,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"hybrid-retrieval.js","sourceRoot":"","sources":["../../../core/memory/hybrid-retrieval.ts"],"names":[],"mappings":"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"}

package/dist/core/memory/hybrid-scorer.d.ts

@@ -1,8 +1,4 @@
-/**
- * Hybrid Scorer
- * Multi-factor relevance scoring combining semantic similarity, recency, co-activation, and importance
- * Provides normalized scores (0-100) for memory ranking
- */
+/** Hybrid Scorer - Multi-factor relevance scoring for memory ranking */
 export interface ScoredMemory {
     memoryId: string;
     memory: any;
@@ -12,6 +8,8 @@ export interface ScoredMemory {
         recency: number;
         coactivation: number;
         importance: number;
+        confidence: number;
+        feedback: number;
     };
     rank: number;
     explanation: string;
@@ -22,24 +20,15 @@ export interface HybridScorerOptions {
         recency?: number;
         coactivation?: number;
         importance?: number;
+        confidence?: number;
+        feedback?: number;
     };
     decayDays?: number;
     minSemanticScore?: number;
     includeExplanation?: boolean;
 }
-/**
- * Calculate hybrid relevance score for memories
- * Combines: semantic similarity, recency, co-activation, and importance
- */
 export declare function hybridScore(queryEmbedding: number[] | null, memories: any[], options?: HybridScorerOptions): Promise<ScoredMemory[]>;
-/**
- * Score and rank memories by relevance
- * Convenience function combining scoring and ranking
- */
 export declare function scoreAndRankMemories(queryEmbedding: number[] | null, memories: any[], topK?: number, options?: HybridScorerOptions): Promise<ScoredMemory[]>;
-/**
- * Get score distribution for diagnostics
- */
 export declare function getScoreDistribution(scored: ScoredMemory[]): {
     min: number;
     max: number;

package/dist/core/memory/hybrid-scorer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-scorer.d.ts","sourceRoot":"","sources":["../../../core/memory/hybrid-scorer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,EAC/B,QAAQ,EAAE,GAAG,EAAE,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CA+DzB;AAsLD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,EAC/B,QAAQ,EAAE,GAAG,EAAE,EACf,IAAI,GAAE,MAAW,EACjB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAazB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EAAE,GACrB;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAeA"}
+{"version":3,"file":"hybrid-scorer.d.ts","sourceRoot":"","sources":["../../../core/memory/hybrid-scorer.ts"],"names":[],"mappings":"AAAA,wEAAwE;AAIxE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAsB,WAAW,CAC/B,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,EAC/B,QAAQ,EAAE,GAAG,EAAE,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAkEzB;AAwMD,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,EAC/B,QAAQ,EAAE,GAAG,EAAE,EACf,IAAI,GAAE,MAAW,EACjB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAUzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG;IAC5D,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAeA"}