@vortex-os/memory-extended 0.5.1 → 0.5.3

package/dist/recall/engine.js

@@ -1,72 +1,203 @@
 import { parseIntent } from "./intent.js";
+import { fuse, fetchK, fusionKey, TOOL_RESULT_MULTIPLIER, } from "./fusion.js";
 const DEFAULT_K = 5;
 const EXCERPT_CHARS = 280;
 /**
- * Two-stage hybrid recall (operator decision 5 / 2026-05-29). Returns
- * structured {@link RecallResult} data — never a pre-rendered report. The
- * caller decides whether to list the hits (explicit `/recall`) or phrase
- * one in conversation (ambient use).
+ * Hybrid recall (P3). Branches on `mode`:
+ *  - `semantic` — the original cosine pipeline (memory hard-filter → vector
+ *    rerank), unchanged in behavior.
+ *  - `keyword`  — FTS5 over memories + session events.
+ *  - `hybrid` (default) — both lanes, fused by Reciprocal Rank Fusion.
  *
- * Pipeline:
- *  1. **Parse intent** — pull obvious filters (type / tag / date) out of the
- *     query (regex, no LLM).
- *  2. **Hard filter (loose)** — if filters were found, restrict candidates
- *     via SQLite. *But* if that leaves fewer than `k` candidates, the
- *     filter is dropped and the semantic stage runs over the whole corpus.
- *     This is the safeguard against the over-narrowing risk: a guessed
- *     filter never costs you a relevant-but-unfiltered memory.
- *  3. **Semantic rerank** — embed the (filter-stripped) query text and ask
- *     the vector store for the closest candidates.
- *  4. **Hydrate** — join vector hits back to their memory rows for name,
- *     description, tags, and a body excerpt.
+ * Returns structured {@link RecallResult} data — never a pre-rendered report.
+ * The memory hard-filter (parsed type/tag/date) constrains the MEMORY lanes
+ * only; session lanes filter by their own semantics (§12 R8). Session hits fuse
+ * at the SESSION level — the semantic lane is de-duped to one best chunk per
+ * session before ranking (§13). The tool_result keyword downweight applies in
+ * `hybrid` only (§12 R6). `score` stays cosine for any semantically-matched
+ * hit; a keyword-only hit gets `1/(1+rank)` (§12 R7).
  */
 export async function recall(params, deps) {
     const { sqlite, vector, embed } = deps;
     const k = params.k ?? DEFAULT_K;
+    const mode = params.mode ?? "hybrid";
     const intent = parseIntent(params.query);
     const corpusSize = vector.count(params.source);
+    const fk = fetchK(k);
+    // ---- memory hard-filter — MEMORY lanes only (never session lanes, §12 R8) ----
     let appliedFilters = {};
-    let ids;
+    let memIds;
     let hardFilterCandidates = corpusSize;
     let hardFilterDropped = false;
-    const hasFilters = hasAnyFilter(intent.filters);
-    if (hasFilters && !params.noHardFilter) {
+    if (hasAnyFilter(intent.filters) && !params.noHardFilter) {
         const filtered = sqlite.query(intent.filters);
         if (filtered.length < k) {
-            // Too narrow — drop it. Searching the full corpus is safer than
-            // excluding a relevant memory the guessed filter happened to miss.
+            // Too narrow — drop it; searching the full corpus is safer than excluding
+            // a relevant memory the guessed filter happened to miss.
             hardFilterDropped = true;
-            hardFilterCandidates = corpusSize;
         }
         else {
             appliedFilters = intent.filters;
-            ids = new Set(filtered.map((r) => r.id));
+            memIds = new Set(filtered.map((r) => r.id));
             hardFilterCandidates = filtered.length;
         }
     }
-    const vectorHits = await vector.search(intent.semanticText, embed, {
-        k,
-        source: params.source,
-        ids,
-    });
+    const runKeyword = mode !== "semantic";
+    const runSemantic = mode !== "keyword";
+    const wantMemory = params.source !== "session-archive";
+    const wantSession = params.source !== "memory";
+    const hydration = new Map();
+    const semanticItems = [];
+    const keywordItems = [];
+    // ---- SEMANTIC lane (cosine) ----
+    if (runSemantic) {
+        if (wantMemory) {
+            const hits = await vector.search(intent.semanticText, embed, {
+                source: "memory",
+                ids: memIds,
+                k: fk,
+            });
+            for (const vh of hits) {
+                const row = sqlite.getById(vh.id);
+                if (!row)
+                    continue; // drift: vector present, memory deleted
+                const key = fusionKey("memory", vh.id);
+                if (!hydration.has(key))
+                    hydration.set(key, { kind: "memory", row });
+                semanticItems.push({ key, weight: 1, score: vh.score, recency: row.updated });
+            }
+        }
+        if (wantSession && deps.sessionChunks) {
+            const sessCount = vector.count("session-archive");
+            const vhits = await vector.search(intent.semanticText, embed, {
+                source: "session-archive",
+                k: sessCount > 0 ? sessCount : fk,
+            });
+            if (mode === "semantic") {
+                // Legacy behavior: PER-CHUNK session hits (id = chunk id), no collapse —
+                // mode:"semantic" reproduces the original cosine pipeline exactly (§12 R1).
+                for (const vh of vhits.slice(0, fk)) {
+                    const chunk = deps.sessionChunks.getById(vh.id);
+                    if (!chunk)
+                        continue;
+                    const key = fusionKey("session-archive", chunk.id);
+                    hydration.set(key, { kind: "session", chunk, perChunk: true });
+                    semanticItems.push({ key, weight: 1, score: vh.score, recency: chunk.startedAt });
+                }
+            }
+            else {
+                // Hybrid: collapse to the single best chunk per session so the keyword and
+                // semantic lanes fuse on a shared SESSION-level key (§13). Over-fetch in
+                // DISTINCT sessions (§14) — search broadly, collapse, then take fk sessions.
+                const best = new Map();
+                for (const vh of vhits) {
+                    const chunk = deps.sessionChunks.getById(vh.id);
+                    if (!chunk)
+                        continue;
+                    const sk = `${chunk.host}/${chunk.sessionId}`;
+                    const prev = best.get(sk);
+                    if (!prev ||
+                        vh.score > prev.score ||
+                        (vh.score === prev.score && chunk.chunkIdx < prev.chunk.chunkIdx)) {
+                        best.set(sk, { chunk, score: vh.score });
+                    }
+                }
+                const sessions = [...best.entries()]
+                    .map(([sk, v]) => ({ sk, chunk: v.chunk, score: v.score }))
+                    .sort(compareSessionSemantic)
+                    .slice(0, fk);
+                for (const { sk, chunk, score } of sessions) {
+                    const key = fusionKey("session-archive", sk);
+                    const ref = hydration.get(key);
+                    if (ref)
+                        ref.chunk = chunk;
+                    else
+                        hydration.set(key, { kind: "session", chunk });
+                    semanticItems.push({ key, weight: 1, score, recency: chunk.startedAt });
+                }
+            }
+        }
+    }
+    // ---- KEYWORD lane (FTS5) ----
+    if (runKeyword) {
+        if (wantMemory) {
+            const mids = sqlite.keywordSearch(intent.semanticText, { limit: fk, ids: memIds });
+            mids.forEach((mid, i) => {
+                const key = fusionKey("memory", mid);
+                let ref = hydration.get(key);
+                if (!ref) {
+                    const row = sqlite.getById(mid);
+                    if (!row)
+                        return; // drift
+                    ref = { kind: "memory", row };
+                    hydration.set(key, ref);
+                }
+                keywordItems.push({ key, weight: 1, score: rankConfidence(i), recency: ref.row.updated });
+            });
+        }
+        if (wantSession && deps.sessionArchive) {
+            // Fetch broadly so the per-session collapse below still yields fk DISTINCT
+            // sessions even when one chatty session owns many of the top events (Codex F3).
+            // O(window) at current archive scale; a SQL GROUP-BY per session is the scale follow-up.
+            const evHits = deps.sessionArchive.searchEvents(intent.semanticText, {
+                limit: Math.max(fk * 50, 500),
+            });
+            // Collapse to the best (first = best-ranked) event per session.
+            const bestEv = new Map();
+            for (const ev of evHits) {
+                const sk = `${ev.host}/${ev.sessionId}`;
+                if (!bestEv.has(sk))
+                    bestEv.set(sk, ev);
+            }
+            let r = 0;
+            for (const [sk, ev] of bestEv) {
+                if (r >= fk)
+                    break; // distinct-session over-fetch budget
+                const key = fusionKey("session-archive", sk);
+                // tool_result downweight is HYBRID-only — keyword-only forensic recall
+                // must not be penalized (§12 R6).
+                const weight = mode === "hybrid" && ev.kind === "tool_result" ? TOOL_RESULT_MULTIPLIER : 1;
+                keywordItems.push({ key, weight, score: rankConfidence(r), recency: ev.at });
+                const ref = hydration.get(key);
+                if (ref)
+                    ref.keywordEvent = ev; // §12 R2: prefer the matched event's snippet
+                else
+                    hydration.set(key, { kind: "session", keywordEvent: ev });
+                r++;
+            }
+        }
+    }
+    // ---- total per-lane ordering before RRF rank assignment (§13 R3) ----
+    semanticItems.sort(compareLaneItem);
+    keywordItems.sort(compareLaneItem);
+    const lanes = [];
+    if (runSemantic)
+        lanes.push({ name: "semantic", items: semanticItems });
+    if (runKeyword)
+        lanes.push({ name: "keyword", items: keywordItems });
+    const fused = fuse(lanes, k);
     const hits = [];
-    for (const vh of vectorHits) {
-        if (vh.source === "session-archive") {
-            const chunk = deps.sessionChunks?.getById(vh.id);
-            if (!chunk)
-                continue; // no session-chunk metadata (not hydratable) — skip
-            hits.push(toSessionHit(chunk, vh.score));
+    for (const entry of fused) {
+        const ref = hydration.get(entry.key);
+        if (!ref)
             continue;
-        }
-        const row = sqlite.getById(vh.id);
-        if (!row)
-            continue; // vector exists but memory was deleted — drift; skip
-        hits.push(toHit(row, vh.source, vh.score));
+        const score = entry.scoreByLane.semantic ?? entry.scoreByLane.keyword ?? 0;
+        // mode:"semantic" keeps the original hit shape — no fusion metadata (§12 R1).
+        const meta = mode === "semantic" ? {} : { lanes: entry.lanes, fusedScore: entry.fusedScore };
+        hits.push(ref.kind === "memory" ? hydrateMemory(ref, score, meta) : hydrateSession(ref, score, meta));
     }
     return {
         query: params.query,
         intent,
-        stage: { appliedFilters, hardFilterCandidates, hardFilterDropped, corpusSize },
+        stage: {
+            appliedFilters,
+            hardFilterCandidates,
+            hardFilterDropped,
+            corpusSize,
+            mode,
+            lanesRun: lanes.map((l) => l.name),
+            laneCandidates: { semantic: semanticItems.length, keyword: keywordItems.length },
+        },
         hits,
     };
 }
@@ -76,10 +207,11 @@ function hasAnyFilter(q) {
         (q.privacy && q.privacy.length) ||
         q.updatedSinceMs !== undefined);
 }
-function toHit(row, source, score) {
+function hydrateMemory(ref, score, meta) {
+    const row = ref.row;
     return {
         id: row.id,
-        source,
+        source: "memory",
         score,
         name: row.name,
         description: row.description,
@@ -87,27 +219,87 @@ function toHit(row, source, score) {
         updated: row.updated,
         tags: row.tags,
         excerpt: excerpt(row.body),
+        ...meta,
     };
 }
-function excerpt(body) {
-    const collapsed = body.replace(/\s+/g, " ").trim();
-    return collapsed.length <= EXCERPT_CHARS
-        ? collapsed
-        : `${collapsed.slice(0, EXCERPT_CHARS).trimEnd()}…`;
-}
-/** Hydrate a session-archive hit from its chunk metadata row. */
-function toSessionHit(chunk, score) {
-    const day = chunk.startedAt ? chunk.startedAt.slice(0, 10) : null;
+function hydrateSession(ref, score, meta) {
+    const chunk = ref.chunk;
+    const ev = ref.keywordEvent;
+    if (ref.perChunk && chunk) {
+        // Legacy per-CHUNK session hit (mode:"semantic") — original id/name shape (§12 R1).
+        const cday = chunk.startedAt ? chunk.startedAt.slice(0, 10) : null;
+        return {
+            id: chunk.id,
+            source: "session-archive",
+            score,
+            name: `${chunk.host} session${cday ? ` (${cday})` : ""} · part ${chunk.chunkIdx + 1}`,
+            description: "",
+            type: "session",
+            updated: chunk.startedAt,
+            tags: [chunk.host],
+            excerpt: chunk.excerpt,
+            ...meta,
+        };
+    }
+    const host = chunk?.host ?? ev?.host ?? "session";
+    const sessionId = chunk?.sessionId ?? ev?.sessionId ?? "";
+    const when = chunk?.startedAt ?? ev?.at ?? null;
+    const day = when ? when.slice(0, 10) : null;
+    // §12 R2: when the keyword lane matched, prefer the matched event's text as
+    // the excerpt (the actual evidence — e.g. the error line) over an unrelated
+    // semantic chunk; otherwise use the chunk excerpt.
+    const excerptText = ev?.text ? excerpt(ev.text) : chunk ? chunk.excerpt : "";
     return {
-        id: chunk.id,
+        id: `${host}/${sessionId}`,
         source: "session-archive",
         score,
-        name: `${chunk.host} session${day ? ` (${day})` : ""} · part ${chunk.chunkIdx + 1}`,
+        name: `${host} session${day ? ` (${day})` : ""}`,
         description: "",
         type: "session",
-        updated: chunk.startedAt,
-        tags: [chunk.host],
-        excerpt: chunk.excerpt,
+        updated: when,
+        tags: [host],
+        excerpt: excerptText,
+        ...meta,
     };
 }
+function excerpt(body) {
+    const collapsed = body.replace(/\s+/g, " ").trim();
+    return collapsed.length <= EXCERPT_CHARS
+        ? collapsed
+        : `${collapsed.slice(0, EXCERPT_CHARS).trimEnd()}…`;
+}
+/** Display/tie-break confidence for a keyword hit at 0-based position `i` → `1/(1+rank)` (§12 R7). */
+function rankConfidence(i) {
+    return 1 / (2 + i);
+}
+/** Total order for a lane's items before RRF (§13 R3): score desc, recency desc (null last), key asc. */
+function compareLaneItem(a, b) {
+    if (b.score !== a.score)
+        return b.score - a.score;
+    const r = compareRecencyDesc(a.recency, b.recency);
+    if (r !== 0)
+        return r;
+    return a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
+}
+/** Total order for best-chunk-per-session: score desc, startedAt desc (null last), chunkIdx asc, key asc. */
+function compareSessionSemantic(a, b) {
+    if (b.score !== a.score)
+        return b.score - a.score;
+    const r = compareRecencyDesc(a.chunk.startedAt, b.chunk.startedAt);
+    if (r !== 0)
+        return r;
+    if (a.chunk.chunkIdx !== b.chunk.chunkIdx)
+        return a.chunk.chunkIdx - b.chunk.chunkIdx;
+    return a.sk < b.sk ? -1 : a.sk > b.sk ? 1 : 0;
+}
+/** Order newer-first; null sorts last (ISO strings compare chronologically). */
+function compareRecencyDesc(a, b) {
+    if (a === b)
+        return 0;
+    if (a === null)
+        return 1;
+    if (b === null)
+        return -1;
+    return a < b ? 1 : -1;
+}
 //# sourceMappingURL=engine.js.map

package/dist/recall/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/recall/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/recall/engine.ts"],"names":[],"mappings":"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"}

package/dist/recall/ftsQuery.d.ts

@@ -0,0 +1,29 @@
+/** Result of parsing a recall query into FTS5-safe tokens (P3 hybrid search). */
+export interface FtsQuery {
+    /**
+     * FTS5 MATCH string: each >=3-codepoint token as a double-quoted phrase,
+     * space-joined (implicit AND). Empty string when no long token is present.
+     */
+    readonly match: string;
+    /**
+     * Sub-3-codepoint terms the `trigram` tokenizer cannot match (a trigram
+     * needs >=3 codepoints — verified on SQLite 3.53.1). These need a LIKE
+     * fallback over the source text instead.
+     */
+    readonly shortTerms: readonly string[];
+    /** Whether the query yielded any usable token at all (long or short). */
+    readonly hasTokens: boolean;
+}
+/**
+ * Parse a natural-language query into an FTS5-safe MATCH string plus the short
+ * terms that need a LIKE fallback. Pure + deterministic — the one shared query
+ * builder for BOTH the memory and session keyword lanes (design §2-B / §11).
+ *
+ * Each whitespace-delimited token of >=3 codepoints becomes a double-quoted
+ * phrase (internal `"` doubled) so paths, `:`, `-`, and error codes are treated
+ * as literal phrases, never FTS5 operators — an unquoted `:`/path throws
+ * (`no such column` — verified), so the quoting is load-bearing. Shorter tokens
+ * go to `shortTerms` for the LIKE branch.
+ */
+export declare function buildFtsQuery(query: string): FtsQuery;
+//# sourceMappingURL=ftsQuery.d.ts.map

package/dist/recall/ftsQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ftsQuery.d.ts","sourceRoot":"","sources":["../../src/recall/ftsQuery.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,yEAAyE;IACzE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAsBrD"}

package/dist/recall/ftsQuery.js

@@ -0,0 +1,36 @@
+/** The `trigram` tokenizer cannot form a trigram from fewer than 3 codepoints. */
+const TRIGRAM_MIN = 3;
+/**
+ * Parse a natural-language query into an FTS5-safe MATCH string plus the short
+ * terms that need a LIKE fallback. Pure + deterministic — the one shared query
+ * builder for BOTH the memory and session keyword lanes (design §2-B / §11).
+ *
+ * Each whitespace-delimited token of >=3 codepoints becomes a double-quoted
+ * phrase (internal `"` doubled) so paths, `:`, `-`, and error codes are treated
+ * as literal phrases, never FTS5 operators — an unquoted `:`/path throws
+ * (`no such column` — verified), so the quoting is load-bearing. Shorter tokens
+ * go to `shortTerms` for the LIKE branch.
+ */
+export function buildFtsQuery(query) {
+    const tokens = query
+        .split(/\s+/)
+        .map((t) => t.trim())
+        .filter((t) => t.length > 0);
+    const phrases = [];
+    const shortTerms = [];
+    for (const tok of tokens) {
+        const codepoints = [...tok].length; // surrogate-safe codepoint count
+        if (codepoints >= TRIGRAM_MIN) {
+            phrases.push(`"${tok.replace(/"/g, '""')}"`);
+        }
+        else {
+            shortTerms.push(tok);
+        }
+    }
+    return {
+        match: phrases.join(" "),
+        shortTerms: [...new Set(shortTerms)],
+        hasTokens: phrases.length > 0 || shortTerms.length > 0,
+    };
+}
+//# sourceMappingURL=ftsQuery.js.map

package/dist/recall/ftsQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ftsQuery.js","sourceRoot":"","sources":["../../src/recall/ftsQuery.ts"],"names":[],"mappings":"AAiBA,kFAAkF;AAClF,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB;;;;;;;;;;GAUG;AACH,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,MAAM,GAAG,KAAK;SACjB,KAAK,CAAC,KAAK,CAAC;SACZ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,iCAAiC;QACrE,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;QACxB,UAAU,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QACpC,SAAS,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;KACvD,CAAC;AACJ,CAAC"}

package/dist/recall/fusion.d.ts

@@ -0,0 +1,58 @@
+/**
+ * Reciprocal Rank Fusion (RRF) for P3 hybrid search.
+ *
+ * Merges the keyword and semantic lanes by RANK, so their incomparable scores
+ * (bm25 is negative/unbounded; e5 cosine sits in a high, narrow band) never need
+ * per-query normalization. Pure + deterministic. See
+ * `docs/P3-hybrid-search-design.md` §2-A and the §11-§14 revisions.
+ */
+export type LaneName = "keyword" | "semantic";
+/** RRF rank-bias constant — the established default. */
+export declare const RRF_K = 60;
+/** Per-item keyword-contribution multiplier for a tool_result hit (hybrid only; §11 C / §12 R6). */
+export declare const TOOL_RESULT_MULTIPLIER = 0.5;
+/** Over-fetch budget per lane so a hit ranked low in one lane still surfaces after fusion. */
+export declare function fetchK(k: number): number;
+export interface LaneItem {
+    /** Fusion identity — the SAME key across lanes denotes the SAME result. */
+    readonly key: string;
+    /** Per-item contribution multiplier (1, or {@link TOOL_RESULT_MULTIPLIER}). */
+    readonly weight: number;
+    /** Raw lane score: cosine for semantic, a rank-confidence proxy for keyword. Tie-break + display. */
+    readonly score: number;
+    /** Recency (ISO) for the deterministic tie-break; null sorts last. */
+    readonly recency: string | null;
+}
+export interface Lane {
+    readonly name: LaneName;
+    /** Items best-first, ALREADY totally ordered by the caller (§13 R3). */
+    readonly items: readonly LaneItem[];
+}
+export interface FusedEntry {
+    readonly key: string;
+    readonly fusedScore: number;
+    /** Which lanes matched this key (provenance). */
+    readonly lanes: readonly LaneName[];
+    /** 1-based rank of this key within each lane that matched it. */
+    readonly rankByLane: Partial<Record<LaneName, number>>;
+    /** Raw score of this key within each lane that matched it. */
+    readonly scoreByLane: Partial<Record<LaneName, number>>;
+    /** Max raw score across matching lanes (tie-break + a sane display value). */
+    readonly bestScore: number;
+    readonly recency: string | null;
+}
+/**
+ * Fuse the given lanes and return the top-`k` entries, deterministically
+ * ordered. Each item contributes `weight / (RRF_K + rank)` to its key, **at most
+ * once per lane** — a key repeated within one lane keeps its best (first) rank,
+ * the "one contribution per lane per item" invariant (§13 HIGH). Tie-break is
+ * total: fusedScore desc, then #lanes desc, then bestScore desc, then recency
+ * desc (nulls last), then key asc — never depends on input/DB row order.
+ */
+export declare function fuse(lanes: readonly Lane[], k: number): FusedEntry[];
+/**
+ * Canonical fusion key — a value-equal string usable directly as a Map key
+ * (§13 LOW: raw arrays compare by object identity, not value).
+ */
+export declare function fusionKey(source: string, id: string): string;
+//# sourceMappingURL=fusion.d.ts.map

package/dist/recall/fusion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fusion.d.ts","sourceRoot":"","sources":["../../src/recall/fusion.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAE9C,wDAAwD;AACxD,eAAO,MAAM,KAAK,KAAK,CAAC;AAExB,oGAAoG;AACpG,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C,8FAA8F;AAC9F,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,MAAM,WAAW,QAAQ;IACvB,2EAA2E;IAC3E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,qGAAqG;IACrG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,iEAAiE;IACjE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACvD,8DAA8D;IAC9D,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,8EAA8E;IAC9E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED;;;;;;;GAOG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,EAAE,CAmDpE;AAkCD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/recall/fusion.js

@@ -0,0 +1,115 @@
+/**
+ * Reciprocal Rank Fusion (RRF) for P3 hybrid search.
+ *
+ * Merges the keyword and semantic lanes by RANK, so their incomparable scores
+ * (bm25 is negative/unbounded; e5 cosine sits in a high, narrow band) never need
+ * per-query normalization. Pure + deterministic. See
+ * `docs/P3-hybrid-search-design.md` §2-A and the §11-§14 revisions.
+ */
+/** RRF rank-bias constant — the established default. */
+export const RRF_K = 60;
+/** Per-item keyword-contribution multiplier for a tool_result hit (hybrid only; §11 C / §12 R6). */
+export const TOOL_RESULT_MULTIPLIER = 0.5;
+/** Over-fetch budget per lane so a hit ranked low in one lane still surfaces after fusion. */
+export function fetchK(k) {
+    return Math.max(k * 4, 20);
+}
+/**
+ * Fuse the given lanes and return the top-`k` entries, deterministically
+ * ordered. Each item contributes `weight / (RRF_K + rank)` to its key, **at most
+ * once per lane** — a key repeated within one lane keeps its best (first) rank,
+ * the "one contribution per lane per item" invariant (§13 HIGH). Tie-break is
+ * total: fusedScore desc, then #lanes desc, then bestScore desc, then recency
+ * desc (nulls last), then key asc — never depends on input/DB row order.
+ */
+export function fuse(lanes, k) {
+    const acc = new Map();
+    for (const lane of lanes) {
+        const seenInLane = new Set();
+        lane.items.forEach((item, i) => {
+            if (seenInLane.has(item.key))
+                return; // one contribution per lane per item
+            seenInLane.add(item.key);
+            const rank = i + 1;
+            let e = acc.get(item.key);
+            if (!e) {
+                e = {
+                    fusedScore: 0,
+                    lanes: new Set(),
+                    rankByLane: {},
+                    scoreByLane: {},
+                    bestScore: -Infinity,
+                    recency: null,
+                };
+                acc.set(item.key, e);
+            }
+            e.fusedScore += item.weight / (RRF_K + rank);
+            e.lanes.add(lane.name);
+            e.rankByLane[lane.name] = rank;
+            e.scoreByLane[lane.name] = item.score;
+            if (item.score > e.bestScore)
+                e.bestScore = item.score;
+            if (isNewer(item.recency, e.recency))
+                e.recency = item.recency;
+        });
+    }
+    const entries = [];
+    for (const [key, e] of acc) {
+        entries.push({
+            key,
+            fusedScore: e.fusedScore,
+            lanes: [...e.lanes],
+            rankByLane: e.rankByLane,
+            scoreByLane: e.scoreByLane,
+            bestScore: e.bestScore,
+            recency: e.recency,
+        });
+    }
+    entries.sort(compareFused);
+    return entries.slice(0, k);
+}
+function compareFused(a, b) {
+    if (b.fusedScore !== a.fusedScore)
+        return b.fusedScore - a.fusedScore;
+    if (b.lanes.length !== a.lanes.length)
+        return b.lanes.length - a.lanes.length;
+    if (b.bestScore !== a.bestScore)
+        return b.bestScore - a.bestScore;
+    const r = compareRecencyDesc(a.recency, b.recency);
+    if (r !== 0)
+        return r;
+    return a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
+}
+/** True iff `cand` is strictly more recent than `cur` (null = oldest). */
+function isNewer(cand, cur) {
+    if (cand === null)
+        return false;
+    if (cur === null)
+        return true;
+    return cand > cur;
+}
+/** Order newer-first; null sorts last (ISO strings compare chronologically). */
+function compareRecencyDesc(a, b) {
+    if (a === b)
+        return 0;
+    if (a === null)
+        return 1;
+    if (b === null)
+        return -1;
+    return a < b ? 1 : -1;
+}
+/**
+ * Fusion-key delimiter: a NUL (U+0000), built with `String.fromCharCode` so the
+ * SOURCE holds no literal control byte (see feedback_no_literal_control_bytes).
+ * NUL cannot occur in `source` (a fixed enum) or `id` (a memory slug, a
+ * `host/sessionId`, or a chunk id), so the joined key is collision-free.
+ */
+const KEY_SEP = String.fromCharCode(0);
+/**
+ * Canonical fusion key — a value-equal string usable directly as a Map key
+ * (§13 LOW: raw arrays compare by object identity, not value).
+ */
+export function fusionKey(source, id) {
+    return source + KEY_SEP + id;
+}
+//# sourceMappingURL=fusion.js.map