sensemaking 0.24.3 → 0.24.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -12
- package/dist/cjs/cli/status.js +14 -24
- package/dist/cjs/cli/status.js.map +1 -1
- package/dist/cjs/commands/search.js +22 -0
- package/dist/cjs/commands/search.js.map +1 -1
- package/dist/cjs/config/types.js.map +1 -1
- package/dist/cjs/errors.d.cts +1 -1
- package/dist/cjs/errors.d.ts +1 -1
- package/dist/cjs/errors.js.map +1 -1
- package/dist/cjs/lib/worker-file.d.cts +1 -0
- package/dist/cjs/lib/worker-file.d.ts +1 -0
- package/dist/cjs/lib/worker-file.js +34 -0
- package/dist/cjs/lib/worker-file.js.map +1 -0
- package/dist/cjs/output/search-error.js +38 -0
- package/dist/cjs/output/search-error.js.map +1 -1
- package/dist/cjs/scan/pool.js +2 -23
- package/dist/cjs/scan/pool.js.map +1 -1
- package/dist/cjs/store/builder.d.cts +2 -1
- package/dist/cjs/store/builder.d.ts +2 -1
- package/dist/cjs/store/builder.js +4 -4
- package/dist/cjs/store/builder.js.map +1 -1
- package/dist/cjs/store/duckdb/lexical.d.cts +1 -0
- package/dist/cjs/store/duckdb/lexical.d.ts +1 -0
- package/dist/cjs/store/duckdb/lexical.js +28 -9
- package/dist/cjs/store/duckdb/lexical.js.map +1 -1
- package/dist/cjs/store/duckdb/native.d.cts +2 -0
- package/dist/cjs/store/duckdb/native.d.ts +2 -0
- package/dist/cjs/store/duckdb/native.js +11 -1
- package/dist/cjs/store/duckdb/native.js.map +1 -1
- package/dist/cjs/store/duckdb/ordered-bm25.d.cts +17 -0
- package/dist/cjs/store/duckdb/ordered-bm25.d.ts +17 -0
- package/dist/cjs/store/duckdb/ordered-bm25.js +238 -0
- package/dist/cjs/store/duckdb/ordered-bm25.js.map +1 -0
- package/dist/cjs/store/lock-wait.d.cts +2 -2
- package/dist/cjs/store/lock-wait.d.ts +2 -2
- package/dist/cjs/store/lock-wait.js +14 -11
- package/dist/cjs/store/lock-wait.js.map +1 -1
- package/dist/cjs/store/native.d.cts +4 -0
- package/dist/cjs/store/native.d.ts +4 -0
- package/dist/cjs/store/native.js +64 -9
- package/dist/cjs/store/native.js.map +1 -1
- package/dist/cjs/store/open.js +11 -7
- package/dist/cjs/store/open.js.map +1 -1
- package/dist/cjs/store/reconcile.d.cts +5 -1
- package/dist/cjs/store/reconcile.d.ts +5 -1
- package/dist/cjs/store/reconcile.js +5 -4
- package/dist/cjs/store/reconcile.js.map +1 -1
- package/dist/cjs/store/turso/connection.js +2 -2
- package/dist/cjs/store/turso/connection.js.map +1 -1
- package/dist/cjs/store/turso/lexical.js +5 -1
- package/dist/cjs/store/turso/lexical.js.map +1 -1
- package/dist/cjs/store/turso/reconcile.js +7 -6
- package/dist/cjs/store/turso/reconcile.js.map +1 -1
- package/dist/cjs/text/segment.js +168 -3
- package/dist/cjs/text/segment.js.map +1 -1
- package/dist/cjs/watch-claim.d.cts +39 -0
- package/dist/cjs/watch-claim.d.ts +39 -0
- package/dist/cjs/watch-claim.js +446 -0
- package/dist/cjs/watch-claim.js.map +1 -0
- package/dist/cjs/watch.js +240 -141
- package/dist/cjs/watch.js.map +1 -1
- package/dist/cjs/workers/watch-heartbeat.d.cts +1 -0
- package/dist/cjs/workers/watch-heartbeat.d.ts +1 -0
- package/dist/cjs/workers/watch-heartbeat.js +308 -0
- package/dist/cjs/workers/watch-heartbeat.js.map +1 -0
- package/dist/esm/cli/status.js +6 -5
- package/dist/esm/cli/status.js.map +1 -1
- package/dist/esm/commands/search.js +21 -0
- package/dist/esm/commands/search.js.map +1 -1
- package/dist/esm/config/types.js.map +1 -1
- package/dist/esm/errors.d.ts +1 -1
- package/dist/esm/errors.js.map +1 -1
- package/dist/esm/lib/worker-file.d.ts +1 -0
- package/dist/esm/lib/worker-file.js +24 -0
- package/dist/esm/lib/worker-file.js.map +1 -0
- package/dist/esm/output/search-error.js +21 -0
- package/dist/esm/output/search-error.js.map +1 -1
- package/dist/esm/scan/pool.js +2 -22
- package/dist/esm/scan/pool.js.map +1 -1
- package/dist/esm/store/builder.d.ts +2 -1
- package/dist/esm/store/builder.js +4 -4
- package/dist/esm/store/builder.js.map +1 -1
- package/dist/esm/store/duckdb/lexical.d.ts +1 -0
- package/dist/esm/store/duckdb/lexical.js +16 -7
- package/dist/esm/store/duckdb/lexical.js.map +1 -1
- package/dist/esm/store/duckdb/native.d.ts +2 -0
- package/dist/esm/store/duckdb/native.js +5 -1
- package/dist/esm/store/duckdb/native.js.map +1 -1
- package/dist/esm/store/duckdb/ordered-bm25.d.ts +17 -0
- package/dist/esm/store/duckdb/ordered-bm25.js +56 -0
- package/dist/esm/store/duckdb/ordered-bm25.js.map +1 -0
- package/dist/esm/store/lock-wait.d.ts +2 -2
- package/dist/esm/store/lock-wait.js +17 -14
- package/dist/esm/store/lock-wait.js.map +1 -1
- package/dist/esm/store/native.d.ts +4 -0
- package/dist/esm/store/native.js +60 -6
- package/dist/esm/store/native.js.map +1 -1
- package/dist/esm/store/open.js +9 -6
- package/dist/esm/store/open.js.map +1 -1
- package/dist/esm/store/reconcile.d.ts +5 -1
- package/dist/esm/store/reconcile.js +4 -3
- package/dist/esm/store/reconcile.js.map +1 -1
- package/dist/esm/store/turso/connection.js +1 -1
- package/dist/esm/store/turso/connection.js.map +1 -1
- package/dist/esm/store/turso/lexical.js +5 -1
- package/dist/esm/store/turso/lexical.js.map +1 -1
- package/dist/esm/store/turso/reconcile.js +8 -5
- package/dist/esm/store/turso/reconcile.js.map +1 -1
- package/dist/esm/text/segment.js +130 -4
- package/dist/esm/text/segment.js.map +1 -1
- package/dist/esm/watch-claim.d.ts +39 -0
- package/dist/esm/watch-claim.js +176 -0
- package/dist/esm/watch-claim.js.map +1 -0
- package/dist/esm/watch.js +168 -117
- package/dist/esm/watch.js.map +1 -1
- package/dist/esm/workers/watch-heartbeat.d.ts +1 -0
- package/dist/esm/workers/watch-heartbeat.js +106 -0
- package/dist/esm/workers/watch-heartbeat.js.map +1 -0
- package/package.json +2 -2
- package/skills/sense/SKILL.md +105 -104
- package/skills/sense/references/search.md +47 -0
- package/skills/sense/references/sql.md +120 -0
- package/skills/sense/references/stores/duckdb.md +35 -0
- package/skills/sense/references/stores/sqlite.md +66 -0
- package/skills/sense/references/stores/turso.md +36 -0
- package/skills/sense-setup/SKILL.md +93 -34
- package/skills/sense-setup/references/embeddings.md +51 -0
- package/skills/sense-setup/references/store-benchmarks.md +16 -0
- package/skills/sense-setup/references/stores/duckdb.md +28 -0
- package/skills/sense-setup/references/stores/sqlite.md +21 -0
- package/skills/sense-setup/references/stores/turso.md +25 -0
|
@@ -4,6 +4,7 @@ import { SenseError } from '../../errors.js';
|
|
|
4
4
|
import { foldForSearch, matchesSearchPhrase, searchTokens } from '../../text/segment.js';
|
|
5
5
|
import { getMeta, setMeta } from '../shared.js';
|
|
6
6
|
import { withTransaction } from '../transaction.js';
|
|
7
|
+
import { ensureOrderedBm25, ORDERED_BM25_MACRO } from './ordered-bm25.js';
|
|
7
8
|
const FIELDS = [
|
|
8
9
|
'title',
|
|
9
10
|
'summary',
|
|
@@ -17,7 +18,7 @@ const FIELD_WEIGHT = {
|
|
|
17
18
|
text: 1
|
|
18
19
|
};
|
|
19
20
|
// FTS5 operator syntax (sqlite.org/fts5.html sec. 3) that words/substrings below would otherwise silently
|
|
20
|
-
// treat as literal terms (PRINCIPLES: no-silent-modes).
|
|
21
|
+
// treat as literal terms (PRINCIPLES: no-silent-modes). Quoted contents stay ignored while their boundary remains detectable.
|
|
21
22
|
const FTS5_OPERATORS = [
|
|
22
23
|
{
|
|
23
24
|
label: 'prefix query',
|
|
@@ -38,10 +39,14 @@ const FTS5_OPERATORS = [
|
|
|
38
39
|
{
|
|
39
40
|
label: 'column filter',
|
|
40
41
|
re: /(?:^|\s)[\p{L}_]\w*\s*:/u
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
label: 'grouping operator',
|
|
45
|
+
re: /[()]/
|
|
41
46
|
}
|
|
42
47
|
];
|
|
43
48
|
function unsupportedOperator(terms) {
|
|
44
|
-
const withoutPhrases = terms.replace(/"[^"]*"/g, '
|
|
49
|
+
const withoutPhrases = terms.replace(/"[^"]*"/g, 'phrase');
|
|
45
50
|
for (const { label, re } of FTS5_OPERATORS){
|
|
46
51
|
const m = withoutPhrases.match(re);
|
|
47
52
|
if (m) return {
|
|
@@ -63,7 +68,8 @@ async function stateFor(conn) {
|
|
|
63
68
|
// Anything but a persisted '0' (missing key, or '1') means a rebuild is owed: a cache that
|
|
64
69
|
// never built an index, or one a prior process marked stale and never got to clear.
|
|
65
70
|
state = {
|
|
66
|
-
stale: await getMeta(conn, FTS_STALE_META_KEY) !== '0'
|
|
71
|
+
stale: await getMeta(conn, FTS_STALE_META_KEY) !== '0',
|
|
72
|
+
orderedMacroReady: false
|
|
67
73
|
};
|
|
68
74
|
ftsState.set(conn, state);
|
|
69
75
|
}
|
|
@@ -73,7 +79,8 @@ async function stateFor(conn) {
|
|
|
73
79
|
// transaction (reconcile.ts) so a crash never lands the content write without the stale mark.
|
|
74
80
|
export async function markContentStale(conn) {
|
|
75
81
|
ftsState.set(conn, {
|
|
76
|
-
stale: true
|
|
82
|
+
stale: true,
|
|
83
|
+
orderedMacroReady: false
|
|
77
84
|
});
|
|
78
85
|
await setMeta(conn, FTS_STALE_META_KEY, '1');
|
|
79
86
|
}
|
|
@@ -126,6 +133,7 @@ function splitTerms(terms) {
|
|
|
126
133
|
// the full rebuild whenever `state.stale`, which meta.fts_stale keeps true across processes until cleared below.
|
|
127
134
|
async function ensureFtsFresh(conn, state) {
|
|
128
135
|
if (!state.stale) return;
|
|
136
|
+
state.orderedMacroReady = false;
|
|
129
137
|
await conn.exec('INSTALL fts; LOAD fts;');
|
|
130
138
|
await withTransaction(conn, async ()=>{
|
|
131
139
|
// stopwords='none': sqlite's porter/unicode61 tokenizer never removes stopwords either (verified 1.5.5); the fts extension's
|
|
@@ -147,16 +155,16 @@ function buildScoreAndGate(words, bareWords, phraseWords, substrings) {
|
|
|
147
155
|
if (words.length > 0) {
|
|
148
156
|
const wordQuery = words.map(foldForSearch).join(' ');
|
|
149
157
|
for (const field of FIELDS){
|
|
150
|
-
scoreParts.push(`${FIELD_WEIGHT[field]}.0 * COALESCE(
|
|
158
|
+
scoreParts.push(`${FIELD_WEIGHT[field]}.0 * COALESCE(${ORDERED_BM25_MACRO}(content."path", ?, fields := '${field}', conjunctive := false), 0)`);
|
|
151
159
|
scoreParams.push(wordQuery);
|
|
152
160
|
}
|
|
153
161
|
if (bareWords.length > 0) {
|
|
154
|
-
const nativeGate =
|
|
162
|
+
const nativeGate = `${ORDERED_BM25_MACRO}(content."path", ?, conjunctive := true) IS NOT NULL`;
|
|
155
163
|
gateParts.push(nativeGate);
|
|
156
164
|
gateParams.push(bareWords.map(foldForSearch).join(' '));
|
|
157
165
|
}
|
|
158
166
|
if (phraseWords.length > 0) {
|
|
159
|
-
const nativeGate =
|
|
167
|
+
const nativeGate = `${ORDERED_BM25_MACRO}(content."path", ?, conjunctive := true) IS NOT NULL`;
|
|
160
168
|
const fallback = phraseWords.map((_word)=>`(${FIELDS.map((field)=>`contains(strip_accents(lower(content.${field})), ?)`).join(' OR ')})`).join(' AND ');
|
|
161
169
|
gateParts.push(`(${nativeGate} OR (${fallback}))`);
|
|
162
170
|
gateParams.push(phraseWords.map(foldForSearch).join(' '));
|
|
@@ -192,6 +200,7 @@ export async function queryLexical(conn, terms, opts, state) {
|
|
|
192
200
|
const { words, bareWords, phraseWords, substrings, phrases, emptyPhrase } = splitTerms(terms);
|
|
193
201
|
if (emptyPhrase || words.length === 0 && substrings.length === 0) return [];
|
|
194
202
|
if (words.length > 0) await ensureFtsFresh(conn, state);
|
|
203
|
+
if (words.length > 0) await ensureOrderedBm25(conn, state);
|
|
195
204
|
const { scoreSql, gateSql, params } = buildScoreAndGate(words, bareWords, phraseWords, substrings);
|
|
196
205
|
const selectFields = phrases.length > 0 ? ', content.title, content.summary, content.text' : '';
|
|
197
206
|
const sqlLimit = phrases.length > 0 ? '' : ' LIMIT ?';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/duckdb/lexical.ts"],"sourcesContent":["// D1: fts BM25 for ranking, contains() scans for exact substring / phrase verification /\n// unspaced scripts, JS snippets for every doc (no snippet()).\nimport { SenseError } from '../../errors.ts';\nimport { foldForSearch, matchesSearchPhrase, type SearchToken, searchTokens } from '../../text/segment.ts';\nimport { getMeta, setMeta } from '../shared.ts';\nimport { withTransaction } from '../transaction.ts';\nimport type { Connection, LexicalHit, LexicalQueryOptions } from '../types.ts';\n\nconst FIELDS = ['title', 'summary', 'text'] as const;\ntype Field = (typeof FIELDS)[number];\n// Mirrors sqlite's bm25(content, 10.0, 5.0, 1.0, ...) column-weight intent; DuckDB's match_bm25 has no\n// field_weights argument (verified 1.5.5), so each field is scored separately and combined here.\nconst FIELD_WEIGHT: Record<Field, number> = { title: 10, summary: 5, text: 1 };\n\n// FTS5 operator syntax (sqlite.org/fts5.html sec. 3) that words/substrings below would otherwise silently\n// treat as literal terms (PRINCIPLES: no-silent-modes). Checked with quoted spans blanked; those go through contains() and are supported.\nconst FTS5_OPERATORS: Array<{ label: string; re: RegExp }> = [\n { label: 'prefix query', re: /[\\p{L}\\p{N}_]+\\*(?=\\s|$)/u },\n { label: 'boolean operator', re: /(?:^|\\s)(?:AND|OR|NOT)(?=\\s|$)/ },\n { label: 'NEAR operator', re: /(?:^|\\s)NEAR\\b/ },\n { label: 'initial-token operator', re: /(?:^|\\s)\\^\\S+/ },\n { label: 'column filter', re: /(?:^|\\s)[\\p{L}_]\\w*\\s*:/u },\n];\n\nfunction unsupportedOperator(terms: string): { label: string; token: string } | null {\n const withoutPhrases = terms.replace(/\"[^\"]*\"/g, ' ');\n for (const { label, re } of FTS5_OPERATORS) {\n const m = withoutPhrases.match(re);\n if (m) return { label, token: m[0].trim() };\n }\n return null;\n}\n\ninterface FtsIndexState {\n stale: boolean;\n}\n\n// Durable across connections/processes (meta table, shared.ts); `stale` is the in-memory cache of\n// it for this connection's lifetime, so a watcher's repeat queries don't re-read meta every time.\nconst FTS_STALE_META_KEY = 'fts_stale';\n\n// One state per connection, not per store instance: reconcileContent (reconcile.ts) marks it\n// stale from outside createLexicalIndex's closure, whether a one-shot open or a watcher's builder ran it.\nconst ftsState = new WeakMap<Connection, FtsIndexState>();\nasync function stateFor(conn: Connection): Promise<FtsIndexState> {\n let state = ftsState.get(conn);\n if (!state) {\n // Anything but a persisted '0' (missing key, or '1') means a rebuild is owed: a cache that\n // never built an index, or one a prior process marked stale and never got to clear.\n state = { stale: (await getMeta(conn, FTS_STALE_META_KEY)) !== '0' };\n ftsState.set(conn, state);\n }\n return state;\n}\n\n// Called whenever this store's reconcileContent changes `content`; must run inside that same\n// transaction (reconcile.ts) so a crash never lands the content write without the stale mark.\nexport async function markContentStale(conn: Connection): Promise<void> {\n ftsState.set(conn, { stale: true });\n await setMeta(conn, FTS_STALE_META_KEY, '1');\n}\n\n// A run whose script marks no word boundaries makes match_bm25's whitespace tokenizer index the whole run as one token,\n// so unspaced terms use contains() and quoted phrases use the shared authored-field verifier.\nfunction splitTerms(terms: string): { words: string[]; bareWords: string[]; phraseWords: string[]; substrings: string[]; phrases: SearchToken[][]; emptyPhrase: boolean } {\n const words: string[] = [];\n const bareWords: string[] = [];\n const phraseWords: string[] = [];\n const substrings: string[] = [];\n const phrases: SearchToken[][] = [];\n let emptyPhrase = false;\n const withoutPhrases = terms.replace(/\"([^\"]*)\"/g, (_m, inner: string) => {\n const phrase = inner.trim();\n const phraseTokens = searchTokens(phrase);\n if (phraseTokens.length === 0) {\n emptyPhrase = true;\n return ' ';\n }\n phrases.push(phraseTokens);\n for (const token of phraseTokens) {\n if (token.unspaced) substrings.push(token.text);\n else {\n words.push(token.text);\n phraseWords.push(token.text);\n }\n }\n return ' ';\n });\n for (const tok of withoutPhrases.split(/\\s+/)) {\n if (tok.length === 0) continue;\n for (const token of searchTokens(tok)) {\n if (token.unspaced) substrings.push(token.text);\n else {\n words.push(token.text);\n bareWords.push(token.text);\n }\n }\n }\n return { words, bareWords, phraseWords, substrings, phrases, emptyPhrase };\n}\n\n// No incremental update (verified 1.5.5: PRAGMA create_fts_index is rebuild-only), so this pays\n// the full rebuild whenever `state.stale`, which meta.fts_stale keeps true across processes until cleared below.\nasync function ensureFtsFresh(conn: Connection, state: FtsIndexState): Promise<void> {\n if (!state.stale) return;\n await conn.exec('INSTALL fts; LOAD fts;');\n await withTransaction(conn, async () => {\n // stopwords='none': sqlite's porter/unicode61 tokenizer never removes stopwords either (verified 1.5.5); the fts extension's\n // default 571-word list would otherwise drop common words (e.g. \"and\") from the index but not match_bm25's conjunctive gate, breaking multi-word matches.\n await conn.exec(`PRAGMA create_fts_index('content', 'path', 'title', 'summary', 'text', stopwords='none', overwrite=1)`);\n // Same transaction as the rebuild: a crash before commit leaves the mark set (a redundant\n // rebuild next time), never a cleared mark serving a half-built index as fresh.\n await setMeta(conn, FTS_STALE_META_KEY, '0');\n });\n state.stale = false;\n}\n\n// Field-weighted fragments (title 10 / summary 5 / text 1), with params emitted in the exact left-to-right order the assembled SQL needs for positional `?` binding.\n// score/gate params stay in separate arrays until joined at the end, since the SQL puts every score part before every gate part; sharing one array would shift binds once a query has both words and substrings (PRINCIPLES: no-silent-modes).\nfunction buildScoreAndGate(words: string[], bareWords: string[], phraseWords: string[], substrings: string[]): { scoreSql: string; gateSql: string; params: unknown[] } {\n const scoreParts: string[] = [];\n const gateParts: string[] = [];\n const scoreParams: unknown[] = [];\n const gateParams: unknown[] = [];\n\n if (words.length > 0) {\n const wordQuery = words.map(foldForSearch).join(' ');\n for (const field of FIELDS) {\n scoreParts.push(`${FIELD_WEIGHT[field]}.0 * COALESCE(fts_main_content.match_bm25(content.\"path\", ?, fields := '${field}', conjunctive := false), 0)`);\n scoreParams.push(wordQuery);\n }\n if (bareWords.length > 0) {\n const nativeGate = `fts_main_content.match_bm25(content.\"path\", ?, conjunctive := true) IS NOT NULL`;\n gateParts.push(nativeGate);\n gateParams.push(bareWords.map(foldForSearch).join(' '));\n }\n if (phraseWords.length > 0) {\n const nativeGate = `fts_main_content.match_bm25(content.\"path\", ?, conjunctive := true) IS NOT NULL`;\n const fallback = phraseWords.map((_word) => `(${FIELDS.map((field) => `contains(strip_accents(lower(content.${field})), ?)`).join(' OR ')})`).join(' AND ');\n gateParts.push(`(${nativeGate} OR (${fallback}))`);\n gateParams.push(phraseWords.map(foldForSearch).join(' '));\n gateParams.push(...phraseWords.flatMap((word) => FIELDS.map(() => foldForSearch(word))));\n }\n }\n\n for (const raw of substrings) {\n const needle = raw.toLowerCase();\n for (const field of FIELDS) {\n scoreParts.push(`${FIELD_WEIGHT[field]}.0 * CAST(contains(strip_accents(lower(content.${field})), ?) AS INTEGER)`);\n scoreParams.push(foldForSearch(needle));\n }\n gateParts.push(`(${FIELDS.map((field) => `contains(strip_accents(lower(content.${field})), ?)`).join(' OR ')})`);\n gateParams.push(...FIELDS.map(() => foldForSearch(needle)));\n }\n\n return { scoreSql: scoreParts.join(' + '), gateSql: gateParts.join(' AND ') || 'TRUE', params: [...scoreParams, ...gateParams] };\n}\n\n// Ranked query, scoped by the caller-built SQL fragments (same fragments sqlite's queryLexical takes).\n// Phrase rows carry authored fields through the post-filter; the public result still contains paths only.\nexport async function queryLexical(conn: Connection, terms: string, opts: LexicalQueryOptions, state: FtsIndexState): Promise<LexicalHit[]> {\n const unsupported = unsupportedOperator(terms);\n if (unsupported !== null) {\n throw new SenseError('STORE_CAPABILITY_MISSING', `store \"duckdb\" does not implement FTS5's ${unsupported.label} (\"${unsupported.token}\") in this build; rephrase \"${terms.trim()}\" without it, or set \"store\" to \"sqlite\" in this tree's config to search it as written`);\n }\n const { whereJoin, whereCond, scopeCond, limit } = opts;\n const { words, bareWords, phraseWords, substrings, phrases, emptyPhrase } = splitTerms(terms);\n if (emptyPhrase || (words.length === 0 && substrings.length === 0)) return [];\n\n if (words.length > 0) await ensureFtsFresh(conn, state);\n\n const { scoreSql, gateSql, params } = buildScoreAndGate(words, bareWords, phraseWords, substrings);\n const selectFields = phrases.length > 0 ? ', content.title, content.summary, content.text' : '';\n const sqlLimit = phrases.length > 0 ? '' : ' LIMIT ?';\n const sql = `SELECT path, score${phrases.length > 0 ? ', title, summary, text' : ''} FROM (\n SELECT content.\"path\" AS path, (${scoreSql}) AS score${selectFields}\n FROM content\n ${whereJoin}\n WHERE ${gateSql}\n ${whereCond} ${scopeCond}\n ) sq ORDER BY score DESC, path${sqlLimit}`;\n const stmt = await conn.prepare(sql);\n const rows = (await stmt.all(...params, ...(phrases.length > 0 ? [] : [limit]))) as Array<LexicalHit & Partial<Record<Field, string>>>;\n const matches = phrases.length === 0 ? rows : rows.filter((row) => phrases.every((phrase) => FIELDS.some((field) => matchesSearchPhrase(row[field] ?? '', phrase))));\n return matches.slice(0, limit).map(({ path }) => ({ path }));\n}\n\n// `stale`'s first read for a connection comes from meta.fts_stale (a fresh connection can't know\n// otherwise), and reconcileContent (reconcile.ts) marks it stale again on every content change.\nexport function createLexicalIndex(conn: Connection): { query: (terms: string, opts: LexicalQueryOptions) => Promise<LexicalHit[]>; markStale: () => Promise<void> } {\n return {\n query: async (terms, opts) => queryLexical(conn, terms, opts, await stateFor(conn)),\n markStale: () => markContentStale(conn),\n };\n}\n"],"names":["SenseError","foldForSearch","matchesSearchPhrase","searchTokens","getMeta","setMeta","withTransaction","FIELDS","FIELD_WEIGHT","title","summary","text","FTS5_OPERATORS","label","re","unsupportedOperator","terms","withoutPhrases","replace","m","match","token","trim","FTS_STALE_META_KEY","ftsState","WeakMap","stateFor","conn","state","get","stale","set","markContentStale","splitTerms","words","bareWords","phraseWords","substrings","phrases","emptyPhrase","_m","inner","phrase","phraseTokens","length","push","unspaced","tok","split","ensureFtsFresh","exec","buildScoreAndGate","scoreParts","gateParts","scoreParams","gateParams","wordQuery","map","join","field","nativeGate","fallback","_word","flatMap","word","raw","needle","toLowerCase","scoreSql","gateSql","params","queryLexical","opts","unsupported","whereJoin","whereCond","scopeCond","limit","selectFields","sqlLimit","sql","stmt","prepare","rows","all","matches","filter","row","every","some","slice","path","createLexicalIndex","query","markStale"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/duckdb/lexical.ts"],"sourcesContent":["// D1: fts BM25 for ranking, contains() scans for exact substring / phrase verification /\n// unspaced scripts, JS snippets for every doc (no snippet()).\nimport { SenseError } from '../../errors.ts';\nimport { foldForSearch, matchesSearchPhrase, type SearchToken, searchTokens } from '../../text/segment.ts';\nimport { getMeta, setMeta } from '../shared.ts';\nimport { withTransaction } from '../transaction.ts';\nimport type { Connection, LexicalHit, LexicalQueryOptions } from '../types.ts';\nimport { ensureOrderedBm25, ORDERED_BM25_MACRO } from './ordered-bm25.ts';\n\nconst FIELDS = ['title', 'summary', 'text'] as const;\ntype Field = (typeof FIELDS)[number];\n// Mirrors sqlite's bm25(content, 10.0, 5.0, 1.0, ...) column-weight intent; DuckDB's match_bm25 has no\n// field_weights argument (verified 1.5.5), so each field is scored separately and combined here.\nconst FIELD_WEIGHT: Record<Field, number> = { title: 10, summary: 5, text: 1 };\n\n// FTS5 operator syntax (sqlite.org/fts5.html sec. 3) that words/substrings below would otherwise silently\n// treat as literal terms (PRINCIPLES: no-silent-modes). Quoted contents stay ignored while their boundary remains detectable.\nconst FTS5_OPERATORS: Array<{ label: string; re: RegExp }> = [\n { label: 'prefix query', re: /[\\p{L}\\p{N}_]+\\*(?=\\s|$)/u },\n { label: 'boolean operator', re: /(?:^|\\s)(?:AND|OR|NOT)(?=\\s|$)/ },\n { label: 'NEAR operator', re: /(?:^|\\s)NEAR\\b/ },\n { label: 'initial-token operator', re: /(?:^|\\s)\\^\\S+/ },\n { label: 'column filter', re: /(?:^|\\s)[\\p{L}_]\\w*\\s*:/u },\n { label: 'grouping operator', re: /[()]/ },\n];\n\nfunction unsupportedOperator(terms: string): { label: string; token: string } | null {\n const withoutPhrases = terms.replace(/\"[^\"]*\"/g, 'phrase');\n for (const { label, re } of FTS5_OPERATORS) {\n const m = withoutPhrases.match(re);\n if (m) return { label, token: m[0].trim() };\n }\n return null;\n}\n\ninterface FtsIndexState {\n stale: boolean;\n orderedMacroReady: boolean;\n}\n\n// Durable across connections/processes (meta table, shared.ts); `stale` is the in-memory cache of\n// it for this connection's lifetime, so a watcher's repeat queries don't re-read meta every time.\nconst FTS_STALE_META_KEY = 'fts_stale';\n\n// One state per connection, not per store instance: reconcileContent (reconcile.ts) marks it\n// stale from outside createLexicalIndex's closure, whether a one-shot open or a watcher's builder ran it.\nconst ftsState = new WeakMap<Connection, FtsIndexState>();\nasync function stateFor(conn: Connection): Promise<FtsIndexState> {\n let state = ftsState.get(conn);\n if (!state) {\n // Anything but a persisted '0' (missing key, or '1') means a rebuild is owed: a cache that\n // never built an index, or one a prior process marked stale and never got to clear.\n state = { stale: (await getMeta(conn, FTS_STALE_META_KEY)) !== '0', orderedMacroReady: false };\n ftsState.set(conn, state);\n }\n return state;\n}\n\n// Called whenever this store's reconcileContent changes `content`; must run inside that same\n// transaction (reconcile.ts) so a crash never lands the content write without the stale mark.\nexport async function markContentStale(conn: Connection): Promise<void> {\n ftsState.set(conn, { stale: true, orderedMacroReady: false });\n await setMeta(conn, FTS_STALE_META_KEY, '1');\n}\n\n// A run whose script marks no word boundaries makes match_bm25's whitespace tokenizer index the whole run as one token,\n// so unspaced terms use contains() and quoted phrases use the shared authored-field verifier.\nfunction splitTerms(terms: string): { words: string[]; bareWords: string[]; phraseWords: string[]; substrings: string[]; phrases: SearchToken[][]; emptyPhrase: boolean } {\n const words: string[] = [];\n const bareWords: string[] = [];\n const phraseWords: string[] = [];\n const substrings: string[] = [];\n const phrases: SearchToken[][] = [];\n let emptyPhrase = false;\n const withoutPhrases = terms.replace(/\"([^\"]*)\"/g, (_m, inner: string) => {\n const phrase = inner.trim();\n const phraseTokens = searchTokens(phrase);\n if (phraseTokens.length === 0) {\n emptyPhrase = true;\n return ' ';\n }\n phrases.push(phraseTokens);\n for (const token of phraseTokens) {\n if (token.unspaced) substrings.push(token.text);\n else {\n words.push(token.text);\n phraseWords.push(token.text);\n }\n }\n return ' ';\n });\n for (const tok of withoutPhrases.split(/\\s+/)) {\n if (tok.length === 0) continue;\n for (const token of searchTokens(tok)) {\n if (token.unspaced) substrings.push(token.text);\n else {\n words.push(token.text);\n bareWords.push(token.text);\n }\n }\n }\n return { words, bareWords, phraseWords, substrings, phrases, emptyPhrase };\n}\n\n// No incremental update (verified 1.5.5: PRAGMA create_fts_index is rebuild-only), so this pays\n// the full rebuild whenever `state.stale`, which meta.fts_stale keeps true across processes until cleared below.\nasync function ensureFtsFresh(conn: Connection, state: FtsIndexState): Promise<void> {\n if (!state.stale) return;\n state.orderedMacroReady = false;\n await conn.exec('INSTALL fts; LOAD fts;');\n await withTransaction(conn, async () => {\n // stopwords='none': sqlite's porter/unicode61 tokenizer never removes stopwords either (verified 1.5.5); the fts extension's\n // default 571-word list would otherwise drop common words (e.g. \"and\") from the index but not match_bm25's conjunctive gate, breaking multi-word matches.\n await conn.exec(`PRAGMA create_fts_index('content', 'path', 'title', 'summary', 'text', stopwords='none', overwrite=1)`);\n // Same transaction as the rebuild: a crash before commit leaves the mark set (a redundant\n // rebuild next time), never a cleared mark serving a half-built index as fresh.\n await setMeta(conn, FTS_STALE_META_KEY, '0');\n });\n state.stale = false;\n}\n\n// Field-weighted fragments (title 10 / summary 5 / text 1), with params emitted in the exact left-to-right order the assembled SQL needs for positional `?` binding.\n// score/gate params stay in separate arrays until joined at the end, since the SQL puts every score part before every gate part; sharing one array would shift binds once a query has both words and substrings (PRINCIPLES: no-silent-modes).\nfunction buildScoreAndGate(words: string[], bareWords: string[], phraseWords: string[], substrings: string[]): { scoreSql: string; gateSql: string; params: unknown[] } {\n const scoreParts: string[] = [];\n const gateParts: string[] = [];\n const scoreParams: unknown[] = [];\n const gateParams: unknown[] = [];\n\n if (words.length > 0) {\n const wordQuery = words.map(foldForSearch).join(' ');\n for (const field of FIELDS) {\n scoreParts.push(`${FIELD_WEIGHT[field]}.0 * COALESCE(${ORDERED_BM25_MACRO}(content.\"path\", ?, fields := '${field}', conjunctive := false), 0)`);\n scoreParams.push(wordQuery);\n }\n if (bareWords.length > 0) {\n const nativeGate = `${ORDERED_BM25_MACRO}(content.\"path\", ?, conjunctive := true) IS NOT NULL`;\n gateParts.push(nativeGate);\n gateParams.push(bareWords.map(foldForSearch).join(' '));\n }\n if (phraseWords.length > 0) {\n const nativeGate = `${ORDERED_BM25_MACRO}(content.\"path\", ?, conjunctive := true) IS NOT NULL`;\n const fallback = phraseWords.map((_word) => `(${FIELDS.map((field) => `contains(strip_accents(lower(content.${field})), ?)`).join(' OR ')})`).join(' AND ');\n gateParts.push(`(${nativeGate} OR (${fallback}))`);\n gateParams.push(phraseWords.map(foldForSearch).join(' '));\n gateParams.push(...phraseWords.flatMap((word) => FIELDS.map(() => foldForSearch(word))));\n }\n }\n\n for (const raw of substrings) {\n const needle = raw.toLowerCase();\n for (const field of FIELDS) {\n scoreParts.push(`${FIELD_WEIGHT[field]}.0 * CAST(contains(strip_accents(lower(content.${field})), ?) AS INTEGER)`);\n scoreParams.push(foldForSearch(needle));\n }\n gateParts.push(`(${FIELDS.map((field) => `contains(strip_accents(lower(content.${field})), ?)`).join(' OR ')})`);\n gateParams.push(...FIELDS.map(() => foldForSearch(needle)));\n }\n\n return { scoreSql: scoreParts.join(' + '), gateSql: gateParts.join(' AND ') || 'TRUE', params: [...scoreParams, ...gateParams] };\n}\n\n// Ranked query, scoped by the caller-built SQL fragments (same fragments sqlite's queryLexical takes).\n// Phrase rows carry authored fields through the post-filter; the public result still contains paths only.\nexport async function queryLexical(conn: Connection, terms: string, opts: LexicalQueryOptions, state: FtsIndexState): Promise<LexicalHit[]> {\n const unsupported = unsupportedOperator(terms);\n if (unsupported !== null) {\n throw new SenseError('STORE_CAPABILITY_MISSING', `store \"duckdb\" does not implement FTS5's ${unsupported.label} (\"${unsupported.token}\") in this build; rephrase \"${terms.trim()}\" without it, or set \"store\" to \"sqlite\" in this tree's config to search it as written`);\n }\n const { whereJoin, whereCond, scopeCond, limit } = opts;\n const { words, bareWords, phraseWords, substrings, phrases, emptyPhrase } = splitTerms(terms);\n if (emptyPhrase || (words.length === 0 && substrings.length === 0)) return [];\n\n if (words.length > 0) await ensureFtsFresh(conn, state);\n if (words.length > 0) await ensureOrderedBm25(conn, state);\n\n const { scoreSql, gateSql, params } = buildScoreAndGate(words, bareWords, phraseWords, substrings);\n const selectFields = phrases.length > 0 ? ', content.title, content.summary, content.text' : '';\n const sqlLimit = phrases.length > 0 ? '' : ' LIMIT ?';\n const sql = `SELECT path, score${phrases.length > 0 ? ', title, summary, text' : ''} FROM (\n SELECT content.\"path\" AS path, (${scoreSql}) AS score${selectFields}\n FROM content\n ${whereJoin}\n WHERE ${gateSql}\n ${whereCond} ${scopeCond}\n ) sq ORDER BY score DESC, path${sqlLimit}`;\n const stmt = await conn.prepare(sql);\n const rows = (await stmt.all(...params, ...(phrases.length > 0 ? [] : [limit]))) as Array<LexicalHit & Partial<Record<Field, string>>>;\n const matches = phrases.length === 0 ? rows : rows.filter((row) => phrases.every((phrase) => FIELDS.some((field) => matchesSearchPhrase(row[field] ?? '', phrase))));\n return matches.slice(0, limit).map(({ path }) => ({ path }));\n}\n\n// `stale`'s first read for a connection comes from meta.fts_stale (a fresh connection can't know\n// otherwise), and reconcileContent (reconcile.ts) marks it stale again on every content change.\nexport function createLexicalIndex(conn: Connection): { query: (terms: string, opts: LexicalQueryOptions) => Promise<LexicalHit[]>; markStale: () => Promise<void> } {\n return {\n query: async (terms, opts) => queryLexical(conn, terms, opts, await stateFor(conn)),\n markStale: () => markContentStale(conn),\n };\n}\n"],"names":["SenseError","foldForSearch","matchesSearchPhrase","searchTokens","getMeta","setMeta","withTransaction","ensureOrderedBm25","ORDERED_BM25_MACRO","FIELDS","FIELD_WEIGHT","title","summary","text","FTS5_OPERATORS","label","re","unsupportedOperator","terms","withoutPhrases","replace","m","match","token","trim","FTS_STALE_META_KEY","ftsState","WeakMap","stateFor","conn","state","get","stale","orderedMacroReady","set","markContentStale","splitTerms","words","bareWords","phraseWords","substrings","phrases","emptyPhrase","_m","inner","phrase","phraseTokens","length","push","unspaced","tok","split","ensureFtsFresh","exec","buildScoreAndGate","scoreParts","gateParts","scoreParams","gateParams","wordQuery","map","join","field","nativeGate","fallback","_word","flatMap","word","raw","needle","toLowerCase","scoreSql","gateSql","params","queryLexical","opts","unsupported","whereJoin","whereCond","scopeCond","limit","selectFields","sqlLimit","sql","stmt","prepare","rows","all","matches","filter","row","every","some","slice","path","createLexicalIndex","query","markStale"],"mappings":"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"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import { loadOrInstall, packageNodeModules } from '../native.js';
|
|
2
2
|
export const DUCKDB_PACKAGE = '@duckdb/node-api';
|
|
3
|
+
export const DUCKDB_VERSION = '1.5.5-r.4';
|
|
4
|
+
export const DUCKDB_INSTALL_SPEC = `${DUCKDB_PACKAGE}@${DUCKDB_VERSION}`;
|
|
3
5
|
const DUCKDB = {
|
|
4
6
|
store: 'duckdb',
|
|
5
7
|
pkg: DUCKDB_PACKAGE,
|
|
6
|
-
sizeHint: '~110MB'
|
|
8
|
+
sizeHint: '~110MB',
|
|
9
|
+
version: DUCKDB_VERSION,
|
|
10
|
+
installSpec: DUCKDB_INSTALL_SPEC
|
|
7
11
|
};
|
|
8
12
|
let duckdbApiPromise;
|
|
9
13
|
// The one accessor every consumer of @duckdb/node-api must go through: after a fresh install in this process, Node keeps returning
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/duckdb/native.ts"],"sourcesContent":["import { loadOrInstall, type NativeDescriptor, packageNodeModules } from '../native.ts';\n\nexport const DUCKDB_PACKAGE = '@duckdb/node-api';\n\nconst DUCKDB: NativeDescriptor = {
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/duckdb/native.ts"],"sourcesContent":["import { loadOrInstall, type NativeDescriptor, packageNodeModules } from '../native.ts';\n\nexport const DUCKDB_PACKAGE = '@duckdb/node-api';\nexport const DUCKDB_VERSION = '1.5.5-r.4';\nexport const DUCKDB_INSTALL_SPEC = `${DUCKDB_PACKAGE}@${DUCKDB_VERSION}`;\n\nconst DUCKDB: NativeDescriptor = {\n store: 'duckdb',\n pkg: DUCKDB_PACKAGE,\n sizeHint: '~110MB',\n version: DUCKDB_VERSION,\n installSpec: DUCKDB_INSTALL_SPEC,\n};\n\nlet duckdbApiPromise: Promise<typeof import('@duckdb/node-api')> | undefined;\n\n// The one accessor every consumer of @duckdb/node-api must go through: after a fresh install in this process, Node keeps returning\n// the pre-install \"not found\" miss to any new bare-specifier lookup of the same path, so caching the resolved module here means only the first caller ever resolves it.\nexport function duckdbApi(): Promise<typeof import('@duckdb/node-api')> {\n if (!duckdbApiPromise) duckdbApiPromise = loadOrInstall<typeof import('@duckdb/node-api')>(DUCKDB, packageNodeModules());\n return duckdbApiPromise;\n}\n"],"names":["loadOrInstall","packageNodeModules","DUCKDB_PACKAGE","DUCKDB_VERSION","DUCKDB_INSTALL_SPEC","DUCKDB","store","pkg","sizeHint","version","installSpec","duckdbApiPromise","duckdbApi"],"mappings":"AAAA,SAASA,aAAa,EAAyBC,kBAAkB,QAAQ,eAAe;AAExF,OAAO,MAAMC,iBAAiB,mBAAmB;AACjD,OAAO,MAAMC,iBAAiB,YAAY;AAC1C,OAAO,MAAMC,sBAAsB,GAAGF,eAAe,CAAC,EAAEC,gBAAgB,CAAC;AAEzE,MAAME,SAA2B;IAC/BC,OAAO;IACPC,KAAKL;IACLM,UAAU;IACVC,SAASN;IACTO,aAAaN;AACf;AAEA,IAAIO;AAEJ,mIAAmI;AACnI,wKAAwK;AACxK,OAAO,SAASC;IACd,IAAI,CAACD,kBAAkBA,mBAAmBX,cAAiDK,QAAQJ;IACnG,OAAOU;AACT"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { Connection } from '../types.js';
|
|
2
|
+
export declare const ORDERED_BM25_MACRO = "sense_ordered_match_bm25";
|
|
3
|
+
interface NativeMacroRow {
|
|
4
|
+
function_type: string;
|
|
5
|
+
parameters: unknown;
|
|
6
|
+
parameter_types: unknown;
|
|
7
|
+
macro_definition: string;
|
|
8
|
+
}
|
|
9
|
+
interface NativeMacroContract {
|
|
10
|
+
version: string;
|
|
11
|
+
macro: NativeMacroRow;
|
|
12
|
+
}
|
|
13
|
+
export declare function validateNativeMacroContract({ version, macro }: NativeMacroContract): string;
|
|
14
|
+
export declare function ensureOrderedBm25(conn: Connection, state: {
|
|
15
|
+
orderedMacroReady: boolean;
|
|
16
|
+
}): Promise<void>;
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { SenseError } from '../../errors.js';
|
|
3
|
+
// This is a connection-local TEMP macro. The contract hash covers the native fts definition,
|
|
4
|
+
// DuckDB version, and the reviewed parameter defaults captured in the retained diagnostic.
|
|
5
|
+
export const ORDERED_BM25_MACRO = 'sense_ordered_match_bm25';
|
|
6
|
+
const SUPPORTED_DUCKDB_VERSION = 'v1.5.5';
|
|
7
|
+
const SUPPORTED_CONTRACT_SHA256 = '4476d543e43e7f8c89751cac0659b64e09d906cd3fefb1bfcaf4d15d3b1d9e00';
|
|
8
|
+
const EXPECTED_PARAMETERS = [
|
|
9
|
+
'docname',
|
|
10
|
+
'query_string',
|
|
11
|
+
'fields',
|
|
12
|
+
'k',
|
|
13
|
+
'b',
|
|
14
|
+
'conjunctive'
|
|
15
|
+
];
|
|
16
|
+
const EXPECTED_DEFAULTS = {
|
|
17
|
+
fields: 'NULL',
|
|
18
|
+
k: '1.2',
|
|
19
|
+
b: '0.75',
|
|
20
|
+
conjunctive: 'false'
|
|
21
|
+
};
|
|
22
|
+
const EXPECTED_SIGNATURE = `docname, query_string, fields := ${EXPECTED_DEFAULTS.fields}, k := ${EXPECTED_DEFAULTS.k}, b := ${EXPECTED_DEFAULTS.b}, conjunctive := ${EXPECTED_DEFAULTS.conjunctive}`;
|
|
23
|
+
const UNORDERED_SUM = 'sum(subscore)';
|
|
24
|
+
function unsupported(message) {
|
|
25
|
+
return new SenseError('STORE_CAPABILITY_MISSING', `store "duckdb" cannot install its deterministic native BM25 adapter: ${message}; update the DuckDB adapter before using lexical search`);
|
|
26
|
+
}
|
|
27
|
+
function contractSha256(version, definition) {
|
|
28
|
+
return createHash('sha256').update(`${version}\0${EXPECTED_SIGNATURE}\0${definition}`).digest('hex');
|
|
29
|
+
}
|
|
30
|
+
export function validateNativeMacroContract({ version, macro }) {
|
|
31
|
+
if (version !== SUPPORTED_DUCKDB_VERSION) throw unsupported(`DuckDB ${version} is unsupported (validated version is ${SUPPORTED_DUCKDB_VERSION})`);
|
|
32
|
+
if (macro.function_type !== 'macro') throw unsupported(`match_bm25 is ${macro.function_type}, not a macro`);
|
|
33
|
+
if (JSON.stringify(macro.parameters) !== JSON.stringify(EXPECTED_PARAMETERS)) throw unsupported(`match_bm25 parameters changed (${JSON.stringify(macro.parameters)})`);
|
|
34
|
+
if (!Array.isArray(macro.parameter_types) || macro.parameter_types.some((type)=>type !== null)) throw unsupported('match_bm25 parameter types changed');
|
|
35
|
+
if (contractSha256(version, macro.macro_definition) !== SUPPORTED_CONTRACT_SHA256) throw unsupported('match_bm25 definition or reviewed parameter-default contract changed');
|
|
36
|
+
if (macro.macro_definition.split(UNORDERED_SUM).length !== 2) throw unsupported('match_bm25 does not contain exactly one validated unordered subscore sum');
|
|
37
|
+
return macro.macro_definition.replace(UNORDERED_SUM, 'sum(subscore ORDER BY subscore)');
|
|
38
|
+
}
|
|
39
|
+
export async function ensureOrderedBm25(conn, state) {
|
|
40
|
+
if (state.orderedMacroReady) return;
|
|
41
|
+
const versionStatement = await conn.prepare('SELECT version() AS version');
|
|
42
|
+
const versionRow = await versionStatement.get();
|
|
43
|
+
const macroStatement = await conn.prepare(`
|
|
44
|
+
SELECT function_type, parameters, parameter_types, macro_definition
|
|
45
|
+
FROM duckdb_functions()
|
|
46
|
+
WHERE schema_name = 'fts_main_content' AND function_name = 'match_bm25'
|
|
47
|
+
`);
|
|
48
|
+
const macro = await macroStatement.get();
|
|
49
|
+
if (!macro) throw unsupported('fts_main_content.match_bm25 is missing');
|
|
50
|
+
const orderedDefinition = validateNativeMacroContract({
|
|
51
|
+
version: versionRow.version,
|
|
52
|
+
macro
|
|
53
|
+
});
|
|
54
|
+
await conn.exec(`CREATE OR REPLACE TEMP MACRO ${ORDERED_BM25_MACRO}(${EXPECTED_SIGNATURE}) AS ${orderedDefinition}`);
|
|
55
|
+
state.orderedMacroReady = true;
|
|
56
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/duckdb/ordered-bm25.ts"],"sourcesContent":["import { createHash } from 'node:crypto';\nimport { SenseError } from '../../errors.ts';\nimport type { Connection } from '../types.ts';\n\n// This is a connection-local TEMP macro. The contract hash covers the native fts definition,\n// DuckDB version, and the reviewed parameter defaults captured in the retained diagnostic.\nexport const ORDERED_BM25_MACRO = 'sense_ordered_match_bm25';\nconst SUPPORTED_DUCKDB_VERSION = 'v1.5.5';\nconst SUPPORTED_CONTRACT_SHA256 = '4476d543e43e7f8c89751cac0659b64e09d906cd3fefb1bfcaf4d15d3b1d9e00';\nconst EXPECTED_PARAMETERS = ['docname', 'query_string', 'fields', 'k', 'b', 'conjunctive'];\nconst EXPECTED_DEFAULTS = { fields: 'NULL', k: '1.2', b: '0.75', conjunctive: 'false' } as const;\nconst EXPECTED_SIGNATURE = `docname, query_string, fields := ${EXPECTED_DEFAULTS.fields}, k := ${EXPECTED_DEFAULTS.k}, b := ${EXPECTED_DEFAULTS.b}, conjunctive := ${EXPECTED_DEFAULTS.conjunctive}`;\nconst UNORDERED_SUM = 'sum(subscore)';\n\ninterface NativeMacroRow {\n function_type: string;\n parameters: unknown;\n parameter_types: unknown;\n macro_definition: string;\n}\n\ninterface NativeMacroContract {\n version: string;\n macro: NativeMacroRow;\n}\n\nfunction unsupported(message: string): SenseError {\n return new SenseError('STORE_CAPABILITY_MISSING', `store \"duckdb\" cannot install its deterministic native BM25 adapter: ${message}; update the DuckDB adapter before using lexical search`);\n}\n\nfunction contractSha256(version: string, definition: string): string {\n return createHash('sha256').update(`${version}\\0${EXPECTED_SIGNATURE}\\0${definition}`).digest('hex');\n}\n\nexport function validateNativeMacroContract({ version, macro }: NativeMacroContract): string {\n if (version !== SUPPORTED_DUCKDB_VERSION) throw unsupported(`DuckDB ${version} is unsupported (validated version is ${SUPPORTED_DUCKDB_VERSION})`);\n if (macro.function_type !== 'macro') throw unsupported(`match_bm25 is ${macro.function_type}, not a macro`);\n if (JSON.stringify(macro.parameters) !== JSON.stringify(EXPECTED_PARAMETERS)) throw unsupported(`match_bm25 parameters changed (${JSON.stringify(macro.parameters)})`);\n if (!Array.isArray(macro.parameter_types) || macro.parameter_types.some((type) => type !== null)) throw unsupported('match_bm25 parameter types changed');\n if (contractSha256(version, macro.macro_definition) !== SUPPORTED_CONTRACT_SHA256) throw unsupported('match_bm25 definition or reviewed parameter-default contract changed');\n if (macro.macro_definition.split(UNORDERED_SUM).length !== 2) throw unsupported('match_bm25 does not contain exactly one validated unordered subscore sum');\n return macro.macro_definition.replace(UNORDERED_SUM, 'sum(subscore ORDER BY subscore)');\n}\n\nexport async function ensureOrderedBm25(conn: Connection, state: { orderedMacroReady: boolean }): Promise<void> {\n if (state.orderedMacroReady) return;\n const versionStatement = await conn.prepare('SELECT version() AS version');\n const versionRow = (await versionStatement.get()) as { version: string };\n const macroStatement = await conn.prepare(`\n SELECT function_type, parameters, parameter_types, macro_definition\n FROM duckdb_functions()\n WHERE schema_name = 'fts_main_content' AND function_name = 'match_bm25'\n `);\n const macro = (await macroStatement.get()) as NativeMacroRow | undefined;\n if (!macro) throw unsupported('fts_main_content.match_bm25 is missing');\n const orderedDefinition = validateNativeMacroContract({ version: versionRow.version, macro });\n await conn.exec(`CREATE OR REPLACE TEMP MACRO ${ORDERED_BM25_MACRO}(${EXPECTED_SIGNATURE}) AS ${orderedDefinition}`);\n state.orderedMacroReady = true;\n}\n"],"names":["createHash","SenseError","ORDERED_BM25_MACRO","SUPPORTED_DUCKDB_VERSION","SUPPORTED_CONTRACT_SHA256","EXPECTED_PARAMETERS","EXPECTED_DEFAULTS","fields","k","b","conjunctive","EXPECTED_SIGNATURE","UNORDERED_SUM","unsupported","message","contractSha256","version","definition","update","digest","validateNativeMacroContract","macro","function_type","JSON","stringify","parameters","Array","isArray","parameter_types","some","type","macro_definition","split","length","replace","ensureOrderedBm25","conn","state","orderedMacroReady","versionStatement","prepare","versionRow","get","macroStatement","orderedDefinition","exec"],"mappings":"AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,UAAU,QAAQ,kBAAkB;AAG7C,6FAA6F;AAC7F,2FAA2F;AAC3F,OAAO,MAAMC,qBAAqB,2BAA2B;AAC7D,MAAMC,2BAA2B;AACjC,MAAMC,4BAA4B;AAClC,MAAMC,sBAAsB;IAAC;IAAW;IAAgB;IAAU;IAAK;IAAK;CAAc;AAC1F,MAAMC,oBAAoB;IAAEC,QAAQ;IAAQC,GAAG;IAAOC,GAAG;IAAQC,aAAa;AAAQ;AACtF,MAAMC,qBAAqB,CAAC,iCAAiC,EAAEL,kBAAkBC,MAAM,CAAC,OAAO,EAAED,kBAAkBE,CAAC,CAAC,OAAO,EAAEF,kBAAkBG,CAAC,CAAC,iBAAiB,EAAEH,kBAAkBI,WAAW,EAAE;AACpM,MAAME,gBAAgB;AActB,SAASC,YAAYC,OAAe;IAClC,OAAO,IAAIb,WAAW,4BAA4B,CAAC,qEAAqE,EAAEa,QAAQ,uDAAuD,CAAC;AAC5L;AAEA,SAASC,eAAeC,OAAe,EAAEC,UAAkB;IACzD,OAAOjB,WAAW,UAAUkB,MAAM,CAAC,GAAGF,QAAQ,EAAE,EAAEL,mBAAmB,EAAE,EAAEM,YAAY,EAAEE,MAAM,CAAC;AAChG;AAEA,OAAO,SAASC,4BAA4B,EAAEJ,OAAO,EAAEK,KAAK,EAAuB;IACjF,IAAIL,YAAYb,0BAA0B,MAAMU,YAAY,CAAC,OAAO,EAAEG,QAAQ,sCAAsC,EAAEb,yBAAyB,CAAC,CAAC;IACjJ,IAAIkB,MAAMC,aAAa,KAAK,SAAS,MAAMT,YAAY,CAAC,cAAc,EAAEQ,MAAMC,aAAa,CAAC,aAAa,CAAC;IAC1G,IAAIC,KAAKC,SAAS,CAACH,MAAMI,UAAU,MAAMF,KAAKC,SAAS,CAACnB,sBAAsB,MAAMQ,YAAY,CAAC,+BAA+B,EAAEU,KAAKC,SAAS,CAACH,MAAMI,UAAU,EAAE,CAAC,CAAC;IACrK,IAAI,CAACC,MAAMC,OAAO,CAACN,MAAMO,eAAe,KAAKP,MAAMO,eAAe,CAACC,IAAI,CAAC,CAACC,OAASA,SAAS,OAAO,MAAMjB,YAAY;IACpH,IAAIE,eAAeC,SAASK,MAAMU,gBAAgB,MAAM3B,2BAA2B,MAAMS,YAAY;IACrG,IAAIQ,MAAMU,gBAAgB,CAACC,KAAK,CAACpB,eAAeqB,MAAM,KAAK,GAAG,MAAMpB,YAAY;IAChF,OAAOQ,MAAMU,gBAAgB,CAACG,OAAO,CAACtB,eAAe;AACvD;AAEA,OAAO,eAAeuB,kBAAkBC,IAAgB,EAAEC,KAAqC;IAC7F,IAAIA,MAAMC,iBAAiB,EAAE;IAC7B,MAAMC,mBAAmB,MAAMH,KAAKI,OAAO,CAAC;IAC5C,MAAMC,aAAc,MAAMF,iBAAiBG,GAAG;IAC9C,MAAMC,iBAAiB,MAAMP,KAAKI,OAAO,CAAC,CAAC;;;;EAI3C,CAAC;IACD,MAAMnB,QAAS,MAAMsB,eAAeD,GAAG;IACvC,IAAI,CAACrB,OAAO,MAAMR,YAAY;IAC9B,MAAM+B,oBAAoBxB,4BAA4B;QAAEJ,SAASyB,WAAWzB,OAAO;QAAEK;IAAM;IAC3F,MAAMe,KAAKS,IAAI,CAAC,CAAC,6BAA6B,EAAE3C,mBAAmB,CAAC,EAAES,mBAAmB,KAAK,EAAEiC,mBAAmB;IACnHP,MAAMC,iBAAiB,GAAG;AAC5B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function recordLockWaitMs(
|
|
2
|
-
export declare function lockWaitBudgetMs(
|
|
1
|
+
export declare function recordLockWaitMs(configDir: string, ms: number): void;
|
|
2
|
+
export declare function lockWaitBudgetMs(configDir: string): number;
|
|
@@ -6,31 +6,34 @@ import { STATE_DIR } from '../config/index.js';
|
|
|
6
6
|
const SIDECAR_FILENAME = 'lock-wait.json';
|
|
7
7
|
const FLOOR_MS = 5000;
|
|
8
8
|
const CEILING_MS = 600000;
|
|
9
|
-
function sidecarPath(
|
|
10
|
-
return join(
|
|
9
|
+
function sidecarPath(configDir) {
|
|
10
|
+
return join(configDir, STATE_DIR, SIDECAR_FILENAME);
|
|
11
11
|
}
|
|
12
|
-
function readRecordedMs(
|
|
12
|
+
function readRecordedMs(configDir) {
|
|
13
13
|
try {
|
|
14
|
-
const raw = JSON.parse(readFileSync(sidecarPath(
|
|
15
|
-
|
|
14
|
+
const raw = JSON.parse(readFileSync(sidecarPath(configDir), 'utf8'));
|
|
15
|
+
const value = raw.reconcile_max_ms;
|
|
16
|
+
return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : undefined;
|
|
16
17
|
} catch {
|
|
17
|
-
return
|
|
18
|
+
return undefined;
|
|
18
19
|
}
|
|
19
20
|
}
|
|
20
|
-
// Called after every reconcile's write transaction, every store alike, so a fresh
|
|
21
|
-
//
|
|
22
|
-
export function recordLockWaitMs(
|
|
23
|
-
|
|
21
|
+
// Called after every reconcile's write transaction, every store alike, so a fresh cache records
|
|
22
|
+
// its first write even when the measured duration is zero.
|
|
23
|
+
export function recordLockWaitMs(configDir, ms) {
|
|
24
|
+
const recordedMs = readRecordedMs(configDir);
|
|
25
|
+
if (recordedMs !== undefined && ms <= recordedMs) return;
|
|
24
26
|
try {
|
|
25
|
-
writeFileSync(sidecarPath(
|
|
27
|
+
writeFileSync(sidecarPath(configDir), JSON.stringify({
|
|
26
28
|
reconcile_max_ms: ms
|
|
27
29
|
}));
|
|
28
30
|
} catch {
|
|
29
31
|
// Best-effort: a write failure here only narrows the next waiter's budget back to the floor.
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
|
-
// 3x the largest reconcile this
|
|
34
|
+
// 3x the largest reconcile this cache has recorded, floored and capped -- a waiter outlasts a
|
|
33
35
|
// real reconcile and still fails behind a hung one.
|
|
34
|
-
export function lockWaitBudgetMs(
|
|
35
|
-
|
|
36
|
+
export function lockWaitBudgetMs(configDir) {
|
|
37
|
+
var _readRecordedMs;
|
|
38
|
+
return Math.min(Math.max(FLOOR_MS, 3 * ((_readRecordedMs = readRecordedMs(configDir)) !== null && _readRecordedMs !== void 0 ? _readRecordedMs : 0)), CEILING_MS);
|
|
36
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/lock-wait.ts"],"sourcesContent":["import { readFileSync, writeFileSync } from 'node:fs';\nimport { join } from 'node:path';\nimport { STATE_DIR } from '../config/index.ts';\n\n// duckdb/turso lock the cache file exclusively, so a waiter can't connect and read reconcile_max_ms\n// from meta; this sidecar is plain fs, readable while locked. Same derivation as busy_timeout (open.ts).\nconst SIDECAR_FILENAME = 'lock-wait.json';\nconst FLOOR_MS = 5_000;\nconst CEILING_MS = 600_000;\n\nfunction sidecarPath(
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/lock-wait.ts"],"sourcesContent":["import { readFileSync, writeFileSync } from 'node:fs';\nimport { join } from 'node:path';\nimport { STATE_DIR } from '../config/index.ts';\n\n// duckdb/turso lock the cache file exclusively, so a waiter can't connect and read reconcile_max_ms\n// from meta; this sidecar is plain fs, readable while locked. Same derivation as busy_timeout (open.ts).\nconst SIDECAR_FILENAME = 'lock-wait.json';\nconst FLOOR_MS = 5_000;\nconst CEILING_MS = 600_000;\n\nfunction sidecarPath(configDir: string): string {\n return join(configDir, STATE_DIR, SIDECAR_FILENAME);\n}\n\nfunction readRecordedMs(configDir: string): number | undefined {\n try {\n const raw = JSON.parse(readFileSync(sidecarPath(configDir), 'utf8'));\n const value = raw.reconcile_max_ms;\n return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : undefined;\n } catch {\n return undefined;\n }\n}\n\n// Called after every reconcile's write transaction, every store alike, so a fresh cache records\n// its first write even when the measured duration is zero.\nexport function recordLockWaitMs(configDir: string, ms: number): void {\n const recordedMs = readRecordedMs(configDir);\n if (recordedMs !== undefined && ms <= recordedMs) return;\n try {\n writeFileSync(sidecarPath(configDir), JSON.stringify({ reconcile_max_ms: ms }));\n } catch {\n // Best-effort: a write failure here only narrows the next waiter's budget back to the floor.\n }\n}\n\n// 3x the largest reconcile this cache has recorded, floored and capped -- a waiter outlasts a\n// real reconcile and still fails behind a hung one.\nexport function lockWaitBudgetMs(configDir: string): number {\n return Math.min(Math.max(FLOOR_MS, 3 * (readRecordedMs(configDir) ?? 0)), CEILING_MS);\n}\n"],"names":["readFileSync","writeFileSync","join","STATE_DIR","SIDECAR_FILENAME","FLOOR_MS","CEILING_MS","sidecarPath","configDir","readRecordedMs","raw","JSON","parse","value","reconcile_max_ms","Number","isFinite","undefined","recordLockWaitMs","ms","recordedMs","stringify","lockWaitBudgetMs","Math","min","max"],"mappings":"AAAA,SAASA,YAAY,EAAEC,aAAa,QAAQ,UAAU;AACtD,SAASC,IAAI,QAAQ,YAAY;AACjC,SAASC,SAAS,QAAQ,qBAAqB;AAE/C,oGAAoG;AACpG,yGAAyG;AACzG,MAAMC,mBAAmB;AACzB,MAAMC,WAAW;AACjB,MAAMC,aAAa;AAEnB,SAASC,YAAYC,SAAiB;IACpC,OAAON,KAAKM,WAAWL,WAAWC;AACpC;AAEA,SAASK,eAAeD,SAAiB;IACvC,IAAI;QACF,MAAME,MAAMC,KAAKC,KAAK,CAACZ,aAAaO,YAAYC,YAAY;QAC5D,MAAMK,QAAQH,IAAII,gBAAgB;QAClC,OAAO,OAAOD,UAAU,YAAYE,OAAOC,QAAQ,CAACH,UAAUA,SAAS,IAAIA,QAAQI;IACrF,EAAE,OAAM;QACN,OAAOA;IACT;AACF;AAEA,gGAAgG;AAChG,2DAA2D;AAC3D,OAAO,SAASC,iBAAiBV,SAAiB,EAAEW,EAAU;IAC5D,MAAMC,aAAaX,eAAeD;IAClC,IAAIY,eAAeH,aAAaE,MAAMC,YAAY;IAClD,IAAI;QACFnB,cAAcM,YAAYC,YAAYG,KAAKU,SAAS,CAAC;YAAEP,kBAAkBK;QAAG;IAC9E,EAAE,OAAM;IACN,6FAA6F;IAC/F;AACF;AAEA,8FAA8F;AAC9F,oDAAoD;AACpD,OAAO,SAASG,iBAAiBd,SAAiB;QACRC;IAAxC,OAAOc,KAAKC,GAAG,CAACD,KAAKE,GAAG,CAACpB,UAAU,MAAKI,kBAAAA,eAAeD,wBAAfC,6BAAAA,kBAA6B,KAAKH;AAC5E"}
|
|
@@ -2,6 +2,10 @@ export interface NativeDescriptor {
|
|
|
2
2
|
store: string;
|
|
3
3
|
pkg: string;
|
|
4
4
|
sizeHint: string;
|
|
5
|
+
/** Optional exact package version required by this native binding. */
|
|
6
|
+
version?: string;
|
|
7
|
+
/** npm specifier used only when installation is required (imports stay bare). */
|
|
8
|
+
installSpec?: string;
|
|
5
9
|
}
|
|
6
10
|
export declare function packageNodeModules(): string;
|
|
7
11
|
export declare function loadOrInstall<T>(descriptor: NativeDescriptor, nodeModulesPath: string, importName?: string): Promise<T>;
|
package/dist/esm/store/native.js
CHANGED
|
@@ -48,22 +48,76 @@ function resolveEntrySpecifier(importName, nodeModulesPath) {
|
|
|
48
48
|
const entryPath = join(pkgDir, entry);
|
|
49
49
|
return typeof require === 'undefined' ? pathToFileURL(entryPath).href : entryPath;
|
|
50
50
|
}
|
|
51
|
+
function readPackageMetadata(pkgDir) {
|
|
52
|
+
try {
|
|
53
|
+
return JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8'));
|
|
54
|
+
} catch {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function targetPackageMetadata(importName, nodeModulesPath) {
|
|
59
|
+
const pkgDir = join(nodeModulesPath, ...importName.split('/'));
|
|
60
|
+
return {
|
|
61
|
+
exists: existsSync(pkgDir),
|
|
62
|
+
metadata: readPackageMetadata(pkgDir)
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function resolvedPackageMetadata(importName) {
|
|
66
|
+
try {
|
|
67
|
+
let dir = dirname(_require.resolve(importName));
|
|
68
|
+
for(;;){
|
|
69
|
+
const manifest = join(dir, 'package.json');
|
|
70
|
+
if (existsSync(manifest)) {
|
|
71
|
+
const pkg = readPackageMetadata(dir);
|
|
72
|
+
if (!pkg) return undefined;
|
|
73
|
+
if (pkg.name === importName) return pkg;
|
|
74
|
+
}
|
|
75
|
+
const parent = dirname(dir);
|
|
76
|
+
if (parent === dir) return undefined;
|
|
77
|
+
dir = parent;
|
|
78
|
+
}
|
|
79
|
+
} catch {
|
|
80
|
+
return undefined;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function versionContractError(descriptor, installed) {
|
|
84
|
+
var _descriptor_installSpec;
|
|
85
|
+
const installSpec = (_descriptor_installSpec = descriptor.installSpec) !== null && _descriptor_installSpec !== void 0 ? _descriptor_installSpec : descriptor.pkg;
|
|
86
|
+
const detail = installed ? `${descriptor.pkg}@${installed} is installed` : `${descriptor.pkg} has missing or unreadable version metadata`;
|
|
87
|
+
return new SenseError('STORE_DEPENDENCY_MISSING', `store "${descriptor.store}" needs ${installSpec}, but ${detail}; refusing to overwrite it -- run \`npm install ${installSpec}\` yourself and try again`);
|
|
88
|
+
}
|
|
89
|
+
function assertExpectedVersion(descriptor, metadata) {
|
|
90
|
+
if (!descriptor.version) return;
|
|
91
|
+
if (!(metadata === null || metadata === void 0 ? void 0 : metadata.version) || metadata.version !== descriptor.version) throw versionContractError(descriptor, metadata === null || metadata === void 0 ? void 0 : metadata.version);
|
|
92
|
+
}
|
|
51
93
|
// Import-then-install-then-retry, over an injectable importName so the failure path can be
|
|
52
94
|
// exercised in tests without a real native binding. Thrown errors always name descriptor.pkg.
|
|
53
95
|
export async function loadOrInstall(descriptor, nodeModulesPath, importName = descriptor.pkg) {
|
|
96
|
+
if (descriptor.version) {
|
|
97
|
+
const target = targetPackageMetadata(importName, nodeModulesPath);
|
|
98
|
+
if (target.exists) assertExpectedVersion(descriptor, target.metadata);
|
|
99
|
+
}
|
|
100
|
+
let loaded;
|
|
54
101
|
try {
|
|
55
|
-
|
|
102
|
+
loaded = await import(importName);
|
|
56
103
|
} catch {
|
|
57
|
-
|
|
104
|
+
var _descriptor_installSpec, _descriptor_installSpec1;
|
|
105
|
+
const installSpec = (_descriptor_installSpec = descriptor.installSpec) !== null && _descriptor_installSpec !== void 0 ? _descriptor_installSpec : importName;
|
|
106
|
+
const displaySpec = (_descriptor_installSpec1 = descriptor.installSpec) !== null && _descriptor_installSpec1 !== void 0 ? _descriptor_installSpec1 : descriptor.pkg;
|
|
107
|
+
console.error(`sense: store "${descriptor.store}" needs ${displaySpec}; installing it now (one-time download, ${descriptor.sizeHint})...`);
|
|
58
108
|
try {
|
|
59
|
-
await installOnce(
|
|
109
|
+
await installOnce(installSpec, nodeModulesPath);
|
|
60
110
|
} catch (installErr) {
|
|
61
|
-
throw new SenseError('STORE_DEPENDENCY_MISSING', `store "${descriptor.store}" needs ${
|
|
111
|
+
throw new SenseError('STORE_DEPENDENCY_MISSING', `store "${descriptor.store}" needs ${displaySpec}, and installing it automatically failed (${installErr.message}); this can happen offline, in a sandboxed environment, or when node_modules is read-only or owned by another user (e.g. under a global install) -- run \`npm install ${displaySpec}\` yourself and try again`);
|
|
62
112
|
}
|
|
63
113
|
try {
|
|
64
|
-
|
|
114
|
+
const loaded = await import(resolveEntrySpecifier(importName, nodeModulesPath));
|
|
115
|
+
assertExpectedVersion(descriptor, targetPackageMetadata(importName, nodeModulesPath).metadata);
|
|
116
|
+
return loaded;
|
|
65
117
|
} catch (loadErr) {
|
|
66
|
-
throw new SenseError('STORE_DEPENDENCY_MISSING', `store "${descriptor.store}" installed ${
|
|
118
|
+
throw new SenseError('STORE_DEPENDENCY_MISSING', `store "${descriptor.store}" installed ${displaySpec} but it could not be loaded (${loadErr.message}); it may not be available for this platform (${process.platform}-${process.arch}) -- run \`npm install ${displaySpec}\` to see the underlying error`);
|
|
67
119
|
}
|
|
68
120
|
}
|
|
121
|
+
if (descriptor.version) assertExpectedVersion(descriptor, resolvedPackageMetadata(importName));
|
|
122
|
+
return loaded;
|
|
69
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/native.ts"],"sourcesContent":["import { existsSync, readFileSync } from 'node:fs';\nimport Module from 'node:module';\nimport { dirname, join } from 'node:path';\nimport { fileURLToPath, pathToFileURL } from 'node:url';\nimport { SenseError } from '../errors.ts';\n\n// A store's optional native package, and the strings its error messages and install notice name.\nexport interface NativeDescriptor {\n store: string;\n pkg: string;\n sizeHint: string;\n}\n\n// install-module-linked is small, but a target native package can be large (@duckdb/node-api's\n// ~110MB), so it is required lazily inside the gated branch below, not for every store/index.ts load.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\nconst _dirname = dirname(typeof __filename !== 'undefined' ? __filename : fileURLToPath(import.meta.url));\n\n// Walks up from this file's own directory rather than a fixed dot-count: it sits at a\n// different depth under src/ than under built dist/{cjs,esm}/store output.\nexport function packageNodeModules(): string {\n let dir = _dirname;\n for (;;) {\n const candidate = join(dir, 'package.json');\n if (existsSync(candidate)) {\n const pkg = JSON.parse(readFileSync(candidate, 'utf8')) as { name?: string };\n if (pkg.name === 'sensemaking') return join(dir, 'node_modules');\n }\n const parent = dirname(dir);\n if (parent === dir) throw new Error('could not locate the sensemaking package root to install a native dependency into');\n dir = parent;\n }\n}\n\nconst installing = new Map<string, Promise<void>>();\n\n// De-dupes concurrent installs: since the install is async, concurrent callers await the same\n// in-flight promise, keyed by specifier and target. A failed install is not cached, so a later call retries.\nfunction installOnce(specifier: string, nodeModulesPath: string): Promise<void> {\n const key = `${specifier}\\n${nodeModulesPath}`;\n let promise = installing.get(key);\n if (!promise) {\n const installModuleLinked = (_require('install-module-linked') as { default: (specifier: string, nodeModulesPath: string) => Promise<string> }).default;\n promise = installModuleLinked(specifier, nodeModulesPath).then(\n () => {},\n (err) => {\n installing.delete(key);\n throw err;\n }\n );\n installing.set(key, promise);\n }\n return promise;\n}\n\n// Node caches a bare specifier's resolution, including a \"not found\" miss, for the process\n// lifetime; use the installed entry directly, as a URL for ESM and a path for CJS.\nfunction resolveEntrySpecifier(importName: string, nodeModulesPath: string): string {\n const pkgDir = join(nodeModulesPath, ...importName.split('/'));\n const pkg = JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8')) as { main?: string; exports?: string };\n const entry = typeof pkg.exports === 'string' ? pkg.exports : (pkg.main ?? 'index.js');\n const entryPath = join(pkgDir, entry);\n return typeof require === 'undefined' ? pathToFileURL(entryPath).href : entryPath;\n}\n\n// Import-then-install-then-retry, over an injectable importName so the failure path can be\n// exercised in tests without a real native binding. Thrown errors always name descriptor.pkg.\nexport async function loadOrInstall<T>(descriptor: NativeDescriptor, nodeModulesPath: string, importName: string = descriptor.pkg): Promise<T> {\n try {\n return (await import(importName)) as T;\n } catch {\n console.error(`sense: store \"${descriptor.store}\" needs ${descriptor.pkg}; installing it now (one-time download, ${descriptor.sizeHint})...`);\n try {\n await installOnce(importName, nodeModulesPath);\n } catch (installErr) {\n throw new SenseError(\n 'STORE_DEPENDENCY_MISSING',\n `store \"${descriptor.store}\" needs ${descriptor.pkg}, and installing it automatically failed (${(installErr as Error).message}); this can happen offline, in a sandboxed environment, or when node_modules is read-only or owned by another user (e.g. under a global install) -- run \\`npm install ${descriptor.pkg}\\` yourself and try again`\n );\n }\n try {\n return (await import(resolveEntrySpecifier(importName, nodeModulesPath))) as T;\n } catch (loadErr) {\n throw new SenseError(\n 'STORE_DEPENDENCY_MISSING',\n `store \"${descriptor.store}\" installed ${descriptor.pkg} but it could not be loaded (${(loadErr as Error).message}); it may not be available for this platform (${process.platform}-${process.arch}) -- run \\`npm install ${descriptor.pkg}\\` to see the underlying error`\n );\n }\n }\n}\n"],"names":["existsSync","readFileSync","Module","dirname","join","fileURLToPath","pathToFileURL","SenseError","_require","require","createRequire","url","_dirname","__filename","packageNodeModules","dir","candidate","pkg","JSON","parse","name","parent","Error","installing","Map","installOnce","specifier","nodeModulesPath","key","promise","get","installModuleLinked","default","then","err","delete","set","resolveEntrySpecifier","importName","pkgDir","split","entry","exports","main","entryPath","href","loadOrInstall","descriptor","console","error","store","sizeHint","installErr","message","loadErr","process","platform","arch"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/sensemaking/src/store/native.ts"],"sourcesContent":["import { existsSync, readFileSync } from 'node:fs';\nimport Module from 'node:module';\nimport { dirname, join } from 'node:path';\nimport { fileURLToPath, pathToFileURL } from 'node:url';\nimport { SenseError } from '../errors.ts';\n\n// A store's optional native package, and the strings its error messages and install notice name.\nexport interface NativeDescriptor {\n store: string;\n pkg: string;\n sizeHint: string;\n /** Optional exact package version required by this native binding. */\n version?: string;\n /** npm specifier used only when installation is required (imports stay bare). */\n installSpec?: string;\n}\n\n// install-module-linked is small, but a target native package can be large (@duckdb/node-api's\n// ~110MB), so it is required lazily inside the gated branch below, not for every store/index.ts load.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\nconst _dirname = dirname(typeof __filename !== 'undefined' ? __filename : fileURLToPath(import.meta.url));\n\n// Walks up from this file's own directory rather than a fixed dot-count: it sits at a\n// different depth under src/ than under built dist/{cjs,esm}/store output.\nexport function packageNodeModules(): string {\n let dir = _dirname;\n for (;;) {\n const candidate = join(dir, 'package.json');\n if (existsSync(candidate)) {\n const pkg = JSON.parse(readFileSync(candidate, 'utf8')) as { name?: string };\n if (pkg.name === 'sensemaking') return join(dir, 'node_modules');\n }\n const parent = dirname(dir);\n if (parent === dir) throw new Error('could not locate the sensemaking package root to install a native dependency into');\n dir = parent;\n }\n}\n\nconst installing = new Map<string, Promise<void>>();\n\n// De-dupes concurrent installs: since the install is async, concurrent callers await the same\n// in-flight promise, keyed by specifier and target. A failed install is not cached, so a later call retries.\nfunction installOnce(specifier: string, nodeModulesPath: string): Promise<void> {\n const key = `${specifier}\\n${nodeModulesPath}`;\n let promise = installing.get(key);\n if (!promise) {\n const installModuleLinked = (_require('install-module-linked') as { default: (specifier: string, nodeModulesPath: string) => Promise<string> }).default;\n promise = installModuleLinked(specifier, nodeModulesPath).then(\n () => {},\n (err) => {\n installing.delete(key);\n throw err;\n }\n );\n installing.set(key, promise);\n }\n return promise;\n}\n\n// Node caches a bare specifier's resolution, including a \"not found\" miss, for the process\n// lifetime; use the installed entry directly, as a URL for ESM and a path for CJS.\nfunction resolveEntrySpecifier(importName: string, nodeModulesPath: string): string {\n const pkgDir = join(nodeModulesPath, ...importName.split('/'));\n const pkg = JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8')) as { main?: string; exports?: string };\n const entry = typeof pkg.exports === 'string' ? pkg.exports : (pkg.main ?? 'index.js');\n const entryPath = join(pkgDir, entry);\n return typeof require === 'undefined' ? pathToFileURL(entryPath).href : entryPath;\n}\n\ntype PackageMetadata = { name?: string; version?: string };\n\nfunction readPackageMetadata(pkgDir: string): PackageMetadata | undefined {\n try {\n return JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8')) as PackageMetadata;\n } catch {\n return undefined;\n }\n}\n\nfunction targetPackageMetadata(importName: string, nodeModulesPath: string): { exists: boolean; metadata?: PackageMetadata } {\n const pkgDir = join(nodeModulesPath, ...importName.split('/'));\n return { exists: existsSync(pkgDir), metadata: readPackageMetadata(pkgDir) };\n}\n\nfunction resolvedPackageMetadata(importName: string): PackageMetadata | undefined {\n try {\n let dir = dirname(_require.resolve(importName));\n for (;;) {\n const manifest = join(dir, 'package.json');\n if (existsSync(manifest)) {\n const pkg = readPackageMetadata(dir);\n if (!pkg) return undefined;\n if (pkg.name === importName) return pkg;\n }\n const parent = dirname(dir);\n if (parent === dir) return undefined;\n dir = parent;\n }\n } catch {\n return undefined;\n }\n}\n\nfunction versionContractError(descriptor: NativeDescriptor, installed?: string): SenseError {\n const installSpec = descriptor.installSpec ?? descriptor.pkg;\n const detail = installed ? `${descriptor.pkg}@${installed} is installed` : `${descriptor.pkg} has missing or unreadable version metadata`;\n return new SenseError('STORE_DEPENDENCY_MISSING', `store \"${descriptor.store}\" needs ${installSpec}, but ${detail}; refusing to overwrite it -- run \\`npm install ${installSpec}\\` yourself and try again`);\n}\n\nfunction assertExpectedVersion(descriptor: NativeDescriptor, metadata: PackageMetadata | undefined): void {\n if (!descriptor.version) return;\n if (!metadata?.version || metadata.version !== descriptor.version) throw versionContractError(descriptor, metadata?.version);\n}\n\n// Import-then-install-then-retry, over an injectable importName so the failure path can be\n// exercised in tests without a real native binding. Thrown errors always name descriptor.pkg.\nexport async function loadOrInstall<T>(descriptor: NativeDescriptor, nodeModulesPath: string, importName: string = descriptor.pkg): Promise<T> {\n if (descriptor.version) {\n const target = targetPackageMetadata(importName, nodeModulesPath);\n if (target.exists) assertExpectedVersion(descriptor, target.metadata);\n }\n let loaded: T;\n try {\n loaded = (await import(importName)) as T;\n } catch {\n const installSpec = descriptor.installSpec ?? importName;\n const displaySpec = descriptor.installSpec ?? descriptor.pkg;\n console.error(`sense: store \"${descriptor.store}\" needs ${displaySpec}; installing it now (one-time download, ${descriptor.sizeHint})...`);\n try {\n await installOnce(installSpec, nodeModulesPath);\n } catch (installErr) {\n throw new SenseError(\n 'STORE_DEPENDENCY_MISSING',\n `store \"${descriptor.store}\" needs ${displaySpec}, and installing it automatically failed (${(installErr as Error).message}); this can happen offline, in a sandboxed environment, or when node_modules is read-only or owned by another user (e.g. under a global install) -- run \\`npm install ${displaySpec}\\` yourself and try again`\n );\n }\n try {\n const loaded = (await import(resolveEntrySpecifier(importName, nodeModulesPath))) as T;\n assertExpectedVersion(descriptor, targetPackageMetadata(importName, nodeModulesPath).metadata);\n return loaded;\n } catch (loadErr) {\n throw new SenseError('STORE_DEPENDENCY_MISSING', `store \"${descriptor.store}\" installed ${displaySpec} but it could not be loaded (${(loadErr as Error).message}); it may not be available for this platform (${process.platform}-${process.arch}) -- run \\`npm install ${displaySpec}\\` to see the underlying error`);\n }\n }\n if (descriptor.version) assertExpectedVersion(descriptor, resolvedPackageMetadata(importName));\n return loaded;\n}\n"],"names":["existsSync","readFileSync","Module","dirname","join","fileURLToPath","pathToFileURL","SenseError","_require","require","createRequire","url","_dirname","__filename","packageNodeModules","dir","candidate","pkg","JSON","parse","name","parent","Error","installing","Map","installOnce","specifier","nodeModulesPath","key","promise","get","installModuleLinked","default","then","err","delete","set","resolveEntrySpecifier","importName","pkgDir","split","entry","exports","main","entryPath","href","readPackageMetadata","undefined","targetPackageMetadata","exists","metadata","resolvedPackageMetadata","resolve","manifest","versionContractError","descriptor","installed","installSpec","detail","store","assertExpectedVersion","version","loadOrInstall","target","loaded","displaySpec","console","error","sizeHint","installErr","message","loadErr","process","platform","arch"],"mappings":"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"}
|
package/dist/esm/store/open.js
CHANGED
|
@@ -17,9 +17,8 @@ import { changedSignatureKeys, embedIdentityAdopted, signatureDiff } from './sig
|
|
|
17
17
|
// Bounded by this tree's recorded reconcile time (lock-wait.ts), not a fixed guess.
|
|
18
18
|
const LOCK_POLL_MS = 50;
|
|
19
19
|
const lockWait = channel('sensemaking.store.lock-wait');
|
|
20
|
-
async function connectUnlocked(dbPath, cfg, dialect) {
|
|
21
|
-
|
|
22
|
-
const budgetMs = lockWaitBudgetMs((_cfg_configDir = cfg.configDir) !== null && _cfg_configDir !== void 0 ? _cfg_configDir : cfg.baseDir);
|
|
20
|
+
async function connectUnlocked(dbPath, cfg, configDir, dialect) {
|
|
21
|
+
const budgetMs = lockWaitBudgetMs(configDir);
|
|
23
22
|
const deadline = Date.now() + budgetMs;
|
|
24
23
|
for(;;){
|
|
25
24
|
try {
|
|
@@ -41,18 +40,22 @@ async function connectUnlocked(dbPath, cfg, dialect) {
|
|
|
41
40
|
}
|
|
42
41
|
async function connectWithDialect(cfg, dialect) {
|
|
43
42
|
var _cfg_configDir, _cfg_rootDir;
|
|
44
|
-
const
|
|
43
|
+
const configDir = (_cfg_configDir = cfg.configDir) !== null && _cfg_configDir !== void 0 ? _cfg_configDir : cfg.baseDir;
|
|
44
|
+
const stateDir = join(configDir, STATE_DIR);
|
|
45
45
|
mkdirSync(stateDir, {
|
|
46
46
|
recursive: true
|
|
47
47
|
});
|
|
48
48
|
const dbPath = join(stateDir, dialect.filename);
|
|
49
|
-
const { handle, conn } = await connectUnlocked(dbPath, cfg, dialect);
|
|
49
|
+
const { handle, conn } = await connectUnlocked(dbPath, cfg, configDir, dialect);
|
|
50
50
|
// A throw below must release this handle, or the leaked WAL makes the cache file undeletable on
|
|
51
51
|
// Windows. `closed` keeps the catch from double-closing a handle a rebuild branch already closed.
|
|
52
52
|
let closed = false;
|
|
53
53
|
// Created here, not inside reconcile(): invalidate()/invalidateFeatures() below share its pool
|
|
54
54
|
// with the build() call that follows them.
|
|
55
|
-
const builder = createBuilder(conn, cfg,
|
|
55
|
+
const builder = createBuilder(conn, cfg, {
|
|
56
|
+
rootDir: (_cfg_rootDir = cfg.rootDir) !== null && _cfg_rootDir !== void 0 ? _cfg_rootDir : cfg.baseDir,
|
|
57
|
+
configDir
|
|
58
|
+
}, dialect.reconcileDialect);
|
|
56
59
|
try {
|
|
57
60
|
await conn.exec('CREATE TABLE IF NOT EXISTS meta (key TEXT PRIMARY KEY, value TEXT)');
|
|
58
61
|
// Schema-version or feature-set mismatch: reconcile only reparses changed files, so an
|