somtum 3.1.0 → 3.2.0

package/dist/core/git_context.js

@@ -0,0 +1,108 @@
+import { execFileSync } from 'node:child_process';
+function git(cwd, args) {
+    try {
+        return execFileSync('git', ['-C', cwd, ...args], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+            timeout: 2000,
+        }).trimEnd();
+    }
+    catch {
+        return null;
+    }
+}
+function lines(out) {
+    return (out ?? '')
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((l) => l.length > 0);
+}
+function findDefaultBranch(cwd, localBranches) {
+    const remoteHead = git(cwd, ['symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD']);
+    if (remoteHead)
+        return remoteHead.replace(/^origin\//, '');
+    for (const name of ['main', 'master', 'trunk']) {
+        if (localBranches.has(name))
+            return name;
+    }
+    return null;
+}
+export function captureGit(cwd) {
+    const branch = git(cwd, ['symbolic-ref', '--quiet', '--short', 'HEAD']);
+    if (branch === null && git(cwd, ['rev-parse', '--is-inside-work-tree']) !== 'true') {
+        return { branch: null, commit: null, defaultBranch: null, beforeFirstCommit: false };
+    }
+    const commit = git(cwd, ['rev-parse', '--verify', '--quiet', 'HEAD']);
+    const local = new Set(lines(git(cwd, ['for-each-ref', '--format=%(refname:short)', 'refs/heads'])));
+    const defaultBranch = findDefaultBranch(cwd, local);
+    const ownCommits = branch && defaultBranch && branch !== defaultBranch && commit
+        ? git(cwd, ['rev-list', '--count', `${defaultBranch}..HEAD`])
+        : null;
+    return { branch, commit, defaultBranch, beforeFirstCommit: ownCommits === '0' };
+}
+// Decides which memories belong in the current branch's context.
+//
+// A memory captured on branch B is recalled on the current branch when B is
+// the current branch, B is the default branch, B has been merged into HEAD,
+// or B no longer exists (deleted locally, or its upstream is gone: the usual
+// state after a merged pull request, including squash merges). Only memories
+// from a branch that still exists and hasn't been merged are hidden, and
+// memories captured before B had a commit of its own stay hidden until B is
+// deleted, since git reports such a branch as merged from the start.
+export class BranchView {
+    current;
+    defaultBranch;
+    alive;
+    merged;
+    constructor(current, defaultBranch, alive, merged) {
+        this.current = current;
+        this.defaultBranch = defaultBranch;
+        this.alive = alive;
+        this.merged = merged;
+    }
+    // Two git calls: this runs on every prompt that has branch-tagged memories.
+    static load(cwd) {
+        const refs = git(cwd, [
+            'for-each-ref',
+            '--format=%(HEAD)\t%(refname)\t%(upstream:track)\t%(symref)',
+            'refs/heads',
+            'refs/remotes/origin/HEAD',
+        ]);
+        if (refs === null)
+            return null;
+        let current = null;
+        let remoteDefault = null;
+        const local = new Set();
+        const alive = new Set();
+        // Not trimmed: %(HEAD) is a space for every branch but the current one.
+        for (const line of refs.split('\n').filter((l) => l.length > 0)) {
+            const [head = '', ref = '', track = '', symref = ''] = line.split('\t');
+            if (ref === 'refs/remotes/origin/HEAD') {
+                remoteDefault = symref.replace(/^refs\/remotes\/origin\//, '') || null;
+                continue;
+            }
+            const name = ref.replace(/^refs\/heads\//, '');
+            local.add(name);
+            if (head === '*')
+                current = name;
+            if (!track.includes('gone'))
+                alive.add(name);
+        }
+        const merged = new Set(lines(git(cwd, ['for-each-ref', '--merged', 'HEAD', '--format=%(refname:short)', 'refs/heads'])));
+        const fallbackDefault = ['main', 'master', 'trunk'].find((n) => local.has(n)) ?? null;
+        return new BranchView(current, remoteDefault ?? fallbackDefault, alive, merged);
+    }
+    isVisible(memory) {
+        const b = memory.git_branch;
+        if (!b)
+            return true;
+        if (b === this.current || b === this.defaultBranch)
+            return true;
+        if (!this.alive.has(b))
+            return true;
+        if (memory.git_before_first_commit)
+            return false;
+        return this.merged.has(b);
+    }
+}
+//# sourceMappingURL=git_context.js.map

package/dist/core/git_context.js.map

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

package/dist/core/recall_filter.d.ts

@@ -0,0 +1,9 @@
+import { BranchView } from './git_context.js';
+import type { Observation } from './schema.js';
+type WithObservation = {
+    observation: Observation;
+};
+export declare function scopeToBranch<T extends WithObservation>(results: T[], cwd: string, view?: BranchView | null): T[];
+export declare function newestOfDuplicates<T extends WithObservation>(results: T[]): T[];
+export {};
+//# sourceMappingURL=recall_filter.d.ts.map

package/dist/core/recall_filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recall_filter.d.ts","sourceRoot":"","sources":["../../src/core/recall_filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,KAAK,eAAe,GAAG;IAAE,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC;AAKpD,wBAAgB,aAAa,CAAC,CAAC,SAAS,eAAe,EACrD,OAAO,EAAE,CAAC,EAAE,EACZ,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI,GACvB,CAAC,EAAE,CAKL;AAID,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAc/E"}

package/dist/core/recall_filter.js

@@ -0,0 +1,30 @@
+import { BranchView } from './git_context.js';
+import { titleSimilarity, TITLE_SIM_THRESHOLD } from './dedup.js';
+// Drops memories captured on another branch that still exists and hasn't been
+// merged into the current one. Git is only consulted when a candidate was
+// captured on a branch, so stores from before 3.2 pay nothing.
+export function scopeToBranch(results, cwd, view) {
+    if (!results.some((r) => r.observation.git_branch))
+        return results;
+    const v = view === undefined ? BranchView.load(cwd) : view;
+    if (!v)
+        return results;
+    return results.filter((r) => v.isVisible(r.observation));
+}
+// When two visible memories are near-duplicates of the same kind (typically the
+// same decision made on two branches that have since merged), keep the newer.
+export function newestOfDuplicates(results) {
+    const kept = [];
+    const byAge = [...results].sort((a, b) => b.observation.created_at - a.observation.created_at);
+    const stale = new Set();
+    for (const r of byAge) {
+        const dup = kept.some((k) => k.observation.kind === r.observation.kind &&
+            titleSimilarity(k.observation.title, r.observation.title) >= TITLE_SIM_THRESHOLD);
+        if (dup)
+            stale.add(r.observation.id);
+        else
+            kept.push(r);
+    }
+    return results.filter((r) => !stale.has(r.observation.id));
+}
+//# sourceMappingURL=recall_filter.js.map

package/dist/core/recall_filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recall_filter.js","sourceRoot":"","sources":["../../src/core/recall_filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAKlE,8EAA8E;AAC9E,0EAA0E;AAC1E,+DAA+D;AAC/D,MAAM,UAAU,aAAa,CAC3B,OAAY,EACZ,GAAW,EACX,IAAwB;IAExB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;QAAE,OAAO,OAAO,CAAC;IACnE,MAAM,CAAC,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,IAAI,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC;IACvB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,gFAAgF;AAChF,8EAA8E;AAC9E,MAAM,UAAU,kBAAkB,CAA4B,OAAY;IACxE,MAAM,IAAI,GAAQ,EAAE,CAAC;IACrB,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CACnB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI;YACzC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,mBAAmB,CACnF,CAAC;QACF,IAAI,GAAG;YAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;;YAChC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC"}

package/dist/core/retriever/bm25.d.ts

@@ -1,6 +1,8 @@
 import type { DB } from '../db.js';
 import type { Observation } from '../schema.js';
 import type { RetrievalResult, Retriever, SearchOptions } from './types.js';
+export declare function queryTerms(query: string): string[];
+export declare function countMatchedTerms(keys: string[], text: string): number;
 export declare class Bm25Retriever implements Retriever {
     private readonly db;
     readonly name: "bm25";

package/dist/core/retriever/bm25.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bm25.d.ts","sourceRoot":"","sources":["../../../src/core/retriever/bm25.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAmC5E,qBAAa,aAAc,YAAW,SAAS;IAIjC,OAAO,CAAC,QAAQ,CAAC,EAAE;IAH/B,QAAQ,CAAC,IAAI,EAAG,MAAM,CAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;gBAEP,EAAE,EAAE,EAAE;IAI7B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CA2BhF;AAED,wBAAgB,eAAe,IAAI;IAAE,cAAc,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,CAE3E;AAED,YAAY,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"bm25.d.ts","sourceRoot":"","sources":["../../../src/core/retriever/bm25.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAmC5E,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAGlD;AAOD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGtE;AAaD,qBAAa,aAAc,YAAW,SAAS;IAIjC,OAAO,CAAC,QAAQ,CAAC,EAAE;IAH/B,QAAQ,CAAC,IAAI,EAAG,MAAM,CAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;gBAEP,EAAE,EAAE,EAAE;IAI7B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CA2BhF;AAED,wBAAgB,eAAe,IAAI;IAAE,cAAc,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,CAE3E;AAED,YAAY,EAAE,WAAW,EAAE,CAAC"}

package/dist/core/retriever/bm25.js

@@ -12,15 +12,40 @@ const STOPWORDS = new Set(('a about above after again all am an and any are as a
     'same she should so some such than thank thanks that the their theirs them then there these ' +
     'they this those through to too under until up us very was we were what when where which ' +
     'while who whom why will with would you your yours').split(' '));
+// Strips common English inflections so "installed" finds "install" and
+// "classes" finds "class". Deliberately light: no stemming of word roots.
+function stem(word) {
+    if (word.length > 5 && word.endsWith('ing'))
+        return word.slice(0, -3);
+    if (word.length > 4 && word.endsWith('ed'))
+        return word.slice(0, -2);
+    if (word.length > 4 && /(ss|x|ch|sh)es$/.test(word))
+        return word.slice(0, -2);
+    if (word.length > 3 && word.endsWith('s') && !word.endsWith('ss'))
+        return word.slice(0, -1);
+    return word;
+}
+// Below this length a prefix match is too loose ("form" would match "format").
+const MIN_PREFIX = 5;
+// The distinct content words of a query as match keys: lowercased, stemmed,
+// split the way the FTS5 unicode61 tokenizer splits text.
+export function queryTerms(query) {
+    const words = query.toLowerCase().split(/[^\p{L}\p{N}]+/u);
+    return [...new Set(words.filter((w) => w.length > 0 && !STOPWORDS.has(w)).map(stem))];
+}
+function keyMatches(key, word) {
+    return key.length >= MIN_PREFIX ? word.startsWith(key) : word === key;
+}
+// How many of the `queryTerms` keys occur in `text`.
+export function countMatchedTerms(keys, text) {
+    const words = text.toLowerCase().split(/[^\p{L}\p{N}]+/u);
+    return keys.filter((k) => words.some((w) => keyMatches(k, w))).length;
+}
 function escapeFtsQuery(query) {
-    const tokens = query
-        .split(/\s+/)
-        .map((t) => t.replace(/["]/g, '').trim())
-        .filter((t) => t.length > 0)
-        .filter((t) => !STOPWORDS.has(t.toLowerCase().replace(/[^\p{L}\p{N}]+/gu, '')));
-    if (tokens.length === 0)
+    const keys = queryTerms(query);
+    if (keys.length === 0)
         return '""';
-    return tokens.map((t) => `"${t}"`).join(' OR ');
+    return keys.map((k) => (k.length >= MIN_PREFIX ? `"${k}"*` : `"${k}"`)).join(' OR ');
 }
 export class Bm25Retriever {
     db;

package/dist/core/retriever/bm25.js.map

@@ -1 +1 @@
-{"version":3,"file":"bm25.js","sourceRoot":"","sources":["../../../src/core/retriever/bm25.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,yEAAyE;AACzE,2EAA2E;AAC3E,uEAAuE;AACvE,sDAAsD;AACtD,8EAA8E;AAC9E,4EAA4E;AAC5E,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,CACE,2FAA2F;IAC3F,6FAA6F;IAC7F,8FAA8F;IAC9F,+FAA+F;IAC/F,6FAA6F;IAC7F,0FAA0F;IAC1F,mDAAmD,CACpD,CAAC,KAAK,CAAC,GAAG,CAAC,CACb,CAAC;AAEF,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,MAAM,GAAG,KAAK;SACjB,KAAK,CAAC,KAAK,CAAC;SACZ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;SACxC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAOD,MAAM,OAAO,aAAa;IAIK;IAHpB,IAAI,GAAG,MAAe,CAAC;IACf,KAAK,CAAc;IAEpC,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,OAAsB;QAChD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAEjC,oEAAoE;QACpE,wDAAwD;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;aACjB,OAAO,CACN;;;;;;;;iBAQS,CACV;aACA,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAc,CAAC;QAE5D,MAAM,OAAO,GAAsB,EAAE,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,GAAG;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"bm25.js","sourceRoot":"","sources":["../../../src/core/retriever/bm25.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,yEAAyE;AACzE,2EAA2E;AAC3E,uEAAuE;AACvE,sDAAsD;AACtD,8EAA8E;AAC9E,4EAA4E;AAC5E,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,CACE,2FAA2F;IAC3F,6FAA6F;IAC7F,8FAA8F;IAC9F,+FAA+F;IAC/F,6FAA6F;IAC7F,0FAA0F;IAC1F,mDAAmD,CACpD,CAAC,KAAK,CAAC,GAAG,CAAC,CACb,CAAC;AAEF,uEAAuE;AACvE,0EAA0E;AAC1E,SAAS,IAAI,CAAC,IAAY;IACxB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9E,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5F,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,4EAA4E;AAC5E,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC3D,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,IAAY;IAC3C,OAAO,GAAG,CAAC,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC;AACxE,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,iBAAiB,CAAC,IAAc,EAAE,IAAY;IAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACxE,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACvF,CAAC;AAOD,MAAM,OAAO,aAAa;IAIK;IAHpB,IAAI,GAAG,MAAe,CAAC;IACf,KAAK,CAAc;IAEpC,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,OAAsB;QAChD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAEjC,oEAAoE;QACpE,wDAAwD;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;aACjB,OAAO,CACN;;;;;;;;iBAQS,CACV;aACA,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAc,CAAC;QAE5D,MAAM,OAAO,GAAsB,EAAE,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,GAAG;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC"}

package/dist/core/retriever/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/core/retriever/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAY5C,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAuB5F;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAUvF"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/core/retriever/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAiB5C,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAyB5F;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CASvF"}

package/dist/core/retriever/factory.js

@@ -4,7 +4,11 @@ import { EmbeddingsRetriever } from './embeddings.js';
 import { HybridRetriever } from './hybrid.js';
 import { LlmIndexRetriever } from './llm_index.js';
 import { anthropicCaller } from '../extractor.js';
-import { isEmbedderReady } from '../embeddings.js';
+import { ensureEmbedderConfigured } from '../embeddings_bootstrap.js';
+import { embeddingsPackageInstalled } from '../embeddings_xenova.js';
+function embeddingsUsable(config) {
+    return config.retrieval.embeddings.enabled && embeddingsPackageInstalled();
+}
 // Returns a retriever by strategy name. Falls back to BM25 when the requested
 // strategy's prerequisites are missing (e.g. embeddings disabled in config or
 // the model has not been loaded). Callers that care about the fallback can
@@ -14,12 +18,14 @@ export function makeRetriever(strategy, db, config) {
         case 'bm25':
             return new Bm25Retriever(db);
         case 'embeddings':
-            if (!config.retrieval.embeddings.enabled)
+            if (!embeddingsUsable(config))
                 return new Bm25Retriever(db);
+            ensureEmbedderConfigured(config);
             return new EmbeddingsRetriever(db);
         case 'hybrid':
-            if (!config.retrieval.embeddings.enabled)
+            if (!embeddingsUsable(config))
                 return new Bm25Retriever(db);
+            ensureEmbedderConfigured(config);
             return new HybridRetriever(db);
         case 'index': {
             if (!config.retrieval.index.enabled)
@@ -41,9 +47,7 @@ export function strategyAvailable(strategy, config) {
     if (strategy === 'bm25')
         return true;
     if (strategy === 'embeddings' || strategy === 'hybrid') {
-        if (!config?.retrieval.embeddings.enabled)
-            return false;
-        return isEmbedderReady() || true;
+        return config !== undefined && embeddingsUsable(config);
     }
     if (strategy === 'index') {
         return Boolean(config?.retrieval.index.enabled && process.env['ANTHROPIC_API_KEY']);

package/dist/core/retriever/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/core/retriever/factory.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,8EAA8E;AAC9E,8EAA8E;AAC9E,2EAA2E;AAC3E,sCAAsC;AACtC,MAAM,UAAU,aAAa,CAAC,QAA2B,EAAE,EAAM,EAAE,MAAc;IAC/E,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/B,KAAK,YAAY;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACrC,KAAK,QAAQ;YACX,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAC1D,OAAO,IAAI,iBAAiB,CAAC,EAAE,EAAE;gBAC/B,MAAM;gBACN,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK;aACpC,CAAC,CAAC;QACL,CAAC;QACD;YACE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAA2B,EAAE,MAAe;IAC5E,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QACxD,OAAO,eAAe,EAAE,IAAI,IAAI,CAAC;IACnC,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/core/retriever/factory.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAErE,SAAS,gBAAgB,CAAC,MAAc;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,IAAI,0BAA0B,EAAE,CAAC;AAC7E,CAAC;AAED,8EAA8E;AAC9E,8EAA8E;AAC9E,2EAA2E;AAC3E,sCAAsC;AACtC,MAAM,UAAU,aAAa,CAAC,QAA2B,EAAE,EAAM,EAAE,MAAc;IAC/E,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/B,KAAK,YAAY;YACf,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAC5D,wBAAwB,CAAC,MAAM,CAAC,CAAC;YACjC,OAAO,IAAI,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACrC,KAAK,QAAQ;YACX,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAC5D,wBAAwB,CAAC,MAAM,CAAC,CAAC;YACjC,OAAO,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAC1D,OAAO,IAAI,iBAAiB,CAAC,EAAE,EAAE;gBAC/B,MAAM;gBACN,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK;aACpC,CAAC,CAAC;QACL,CAAC;QACD;YACE,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAA2B,EAAE,MAAe;IAC5E,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACvD,OAAO,MAAM,KAAK,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}