@devflow-tools/memory-engine 0.15.0 → 0.16.1
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 +27 -26
- package/dist/consolidator.d.ts.map +1 -1
- package/dist/consolidator.js +31 -146
- package/dist/consolidator.js.map +1 -1
- package/dist/embedding-provider.d.ts +21 -1
- package/dist/embedding-provider.d.ts.map +1 -1
- package/dist/embedding-provider.js +157 -24
- package/dist/embedding-provider.js.map +1 -1
- package/dist/event-grouper.d.ts.map +1 -1
- package/dist/event-grouper.js +43 -1
- package/dist/event-grouper.js.map +1 -1
- package/dist/hybrid-search.d.ts +1 -1
- package/dist/hybrid-search.d.ts.map +1 -1
- package/dist/hybrid-search.js +44 -43
- package/dist/hybrid-search.js.map +1 -1
- package/dist/index.d.ts +6 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -5
- package/dist/index.js.map +1 -1
- package/dist/lease-store.d.ts +33 -0
- package/dist/lease-store.d.ts.map +1 -0
- package/dist/lease-store.js +178 -0
- package/dist/lease-store.js.map +1 -0
- package/dist/lease-store.test.d.ts +2 -0
- package/dist/lease-store.test.d.ts.map +1 -0
- package/dist/lease-store.test.js +167 -0
- package/dist/lease-store.test.js.map +1 -0
- package/dist/memory-engine.d.ts +12 -18
- package/dist/memory-engine.d.ts.map +1 -1
- package/dist/memory-engine.js +220 -148
- package/dist/memory-engine.js.map +1 -1
- package/dist/memory-gate.d.ts +64 -39
- package/dist/memory-gate.d.ts.map +1 -1
- package/dist/memory-gate.js +379 -45
- package/dist/memory-gate.js.map +1 -1
- package/dist/memory-store.d.ts +36 -1
- package/dist/memory-store.d.ts.map +1 -1
- package/dist/memory-store.js +142 -21
- package/dist/memory-store.js.map +1 -1
- package/dist/migrations/v2-to-v3.d.ts +3 -0
- package/dist/migrations/v2-to-v3.d.ts.map +1 -0
- package/dist/migrations/v2-to-v3.js +122 -0
- package/dist/migrations/v2-to-v3.js.map +1 -0
- package/dist/migrations/v2-to-v3.test.d.ts +2 -0
- package/dist/migrations/v2-to-v3.test.d.ts.map +1 -0
- package/dist/migrations/v2-to-v3.test.js +88 -0
- package/dist/migrations/v2-to-v3.test.js.map +1 -0
- package/dist/observation-types.d.ts +7 -0
- package/dist/observation-types.d.ts.map +1 -0
- package/dist/observation-types.js +27 -0
- package/dist/observation-types.js.map +1 -0
- package/dist/project-validator.d.ts.map +1 -1
- package/dist/project-validator.js +1 -2
- package/dist/project-validator.js.map +1 -1
- package/dist/rule-extractor.d.ts +14 -0
- package/dist/rule-extractor.d.ts.map +1 -0
- package/dist/rule-extractor.js +109 -0
- package/dist/rule-extractor.js.map +1 -0
- package/dist/session-summarizer.d.ts +16 -8
- package/dist/session-summarizer.d.ts.map +1 -1
- package/dist/session-summarizer.js +171 -160
- package/dist/session-summarizer.js.map +1 -1
- package/dist/{signal-detector.d.ts → signal-analyzer.d.ts} +6 -2
- package/dist/signal-analyzer.d.ts.map +1 -0
- package/dist/{signal-detector.js → signal-analyzer.js} +34 -3
- package/dist/signal-analyzer.js.map +1 -0
- package/dist/signal-buffer.d.ts +3 -0
- package/dist/signal-buffer.d.ts.map +1 -1
- package/dist/signal-buffer.js.map +1 -1
- package/package.json +6 -6
- package/dist/extractor.d.ts +0 -39
- package/dist/extractor.d.ts.map +0 -1
- package/dist/extractor.js +0 -275
- package/dist/extractor.js.map +0 -1
- package/dist/l2-evaluator.d.ts +0 -31
- package/dist/l2-evaluator.d.ts.map +0 -1
- package/dist/l2-evaluator.js +0 -103
- package/dist/l2-evaluator.js.map +0 -1
- package/dist/llm-provider.d.ts +0 -9
- package/dist/llm-provider.d.ts.map +0 -1
- package/dist/llm-provider.js +0 -37
- package/dist/llm-provider.js.map +0 -1
- package/dist/ollama-checker.d.ts +0 -10
- package/dist/ollama-checker.d.ts.map +0 -1
- package/dist/ollama-checker.js +0 -43
- package/dist/ollama-checker.js.map +0 -1
- package/dist/signal-detector.d.ts.map +0 -1
- package/dist/signal-detector.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-grouper.js","sourceRoot":"","sources":["../src/event-grouper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event-grouper.js","sourceRoot":"","sources":["../src/event-grouper.ts"],"names":[],"mappings":"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"}
|
package/dist/hybrid-search.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export interface SearchOptions {
|
|
|
5
5
|
limit?: number;
|
|
6
6
|
categories?: string[];
|
|
7
7
|
scope?: string;
|
|
8
|
+
recordAccess?: boolean;
|
|
8
9
|
}
|
|
9
10
|
export interface SearchResultEntry {
|
|
10
11
|
id: string;
|
|
@@ -30,7 +31,6 @@ export declare class HybridSearch {
|
|
|
30
31
|
private embedder;
|
|
31
32
|
private engine;
|
|
32
33
|
constructor(store: MemoryStore, embedder: EmbeddingProvider, engine?: MemoryEngine);
|
|
33
|
-
private rerankWithLLM;
|
|
34
34
|
search(query: string, options?: SearchOptions): Promise<SearchResult[]>;
|
|
35
35
|
}
|
|
36
36
|
//# sourceMappingURL=hybrid-search.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid-search.d.ts","sourceRoot":"","sources":["../src/hybrid-search.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"hybrid-search.d.ts","sourceRoot":"","sources":["../src/hybrid-search.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AA+ED,qBAAa,YAAY;IAIrB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ;IAJlB,OAAO,CAAC,MAAM,CAAsB;gBAG1B,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,iBAAiB,EACnC,MAAM,CAAC,EAAE,YAAY;IAKjB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAwIlF"}
|
package/dist/hybrid-search.js
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
const DEFAULT_WEIGHTS = {
|
|
2
|
+
bm25: 0.25,
|
|
3
|
+
vector: 0.35,
|
|
4
|
+
observation: 0.2,
|
|
5
|
+
graph: 0.1,
|
|
6
|
+
retention: 0.1,
|
|
7
|
+
};
|
|
3
8
|
const RRF_K = 60;
|
|
4
9
|
function rrfFusion(results, k) {
|
|
5
10
|
const scored = [];
|
|
@@ -40,6 +45,22 @@ function rowToEntry(row) {
|
|
|
40
45
|
createdAt: row.created_at,
|
|
41
46
|
};
|
|
42
47
|
}
|
|
48
|
+
function observationToEntry(row) {
|
|
49
|
+
return {
|
|
50
|
+
id: row.id,
|
|
51
|
+
type: row.type,
|
|
52
|
+
category: row.type,
|
|
53
|
+
title: row.title,
|
|
54
|
+
content: row.narrative,
|
|
55
|
+
source: 'observation',
|
|
56
|
+
status: 'approved',
|
|
57
|
+
confidence: row.confidence,
|
|
58
|
+
strength: row.importance / 10,
|
|
59
|
+
scope: row.project,
|
|
60
|
+
sessionId: row.session_id,
|
|
61
|
+
createdAt: row.timestamp,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
43
64
|
const MIN_EFFECTIVE_CONFIDENCE = 0.3;
|
|
44
65
|
export class HybridSearch {
|
|
45
66
|
store;
|
|
@@ -50,40 +71,6 @@ export class HybridSearch {
|
|
|
50
71
|
this.embedder = embedder;
|
|
51
72
|
this.engine = engine ?? null;
|
|
52
73
|
}
|
|
53
|
-
async rerankWithLLM(query, fused, docs) {
|
|
54
|
-
const candidates = fused.slice(0, Math.min(fused.length, 20));
|
|
55
|
-
if (candidates.length <= 1)
|
|
56
|
-
return fused;
|
|
57
|
-
const candidateList = candidates.map((c, i) => {
|
|
58
|
-
const doc = docs.get(c.id);
|
|
59
|
-
return `${i + 1}. [${c.id}] ${doc?.entry.title ?? 'Untitled'}\n ${(doc?.entry.content ?? '').slice(0, 200)}`;
|
|
60
|
-
}).join('\n\n');
|
|
61
|
-
const systemPrompt = 'You are a search relevance ranker. Return only the memory IDs in ranked order, one per line.';
|
|
62
|
-
const userMessage = `Query: "${query}"\n\nCandidates:\n${candidateList}\n\nRank these candidates by relevance to the query. Return only IDs, one per line:`;
|
|
63
|
-
try {
|
|
64
|
-
const response = await callLLM(systemPrompt, userMessage);
|
|
65
|
-
if (response.provider === 'rules')
|
|
66
|
-
return fused;
|
|
67
|
-
const llmRanked = new Map();
|
|
68
|
-
for (const line of response.content.split('\n')) {
|
|
69
|
-
const idMatch = line.match(/(mem:[a-zA-Z0-9:_-]+)/);
|
|
70
|
-
if (idMatch) {
|
|
71
|
-
llmRanked.set(idMatch[1], llmRanked.size);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
if (llmRanked.size === 0)
|
|
75
|
-
return fused;
|
|
76
|
-
const rest = fused.slice(candidates.length);
|
|
77
|
-
const ranked = candidates
|
|
78
|
-
.filter(c => llmRanked.has(c.id))
|
|
79
|
-
.sort((a, b) => llmRanked.get(a.id) - llmRanked.get(b.id));
|
|
80
|
-
const unranked = candidates.filter(c => !llmRanked.has(c.id));
|
|
81
|
-
return [...ranked, ...unranked, ...rest];
|
|
82
|
-
}
|
|
83
|
-
catch {
|
|
84
|
-
return fused;
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
74
|
async search(query, options = {}) {
|
|
88
75
|
const limit = options.limit ?? 10;
|
|
89
76
|
const fetchLimit = limit * 3;
|
|
@@ -93,9 +80,11 @@ export class HybridSearch {
|
|
|
93
80
|
}
|
|
94
81
|
catch { /* FTS5 may fail on malformed queries */ }
|
|
95
82
|
let vectorResults = [];
|
|
83
|
+
let observationResults = [];
|
|
96
84
|
try {
|
|
97
85
|
const embedding = await this.embedder.embed(query);
|
|
98
86
|
vectorResults = this.store.searchVector(embedding, fetchLimit);
|
|
87
|
+
observationResults = this.store.searchObservationVector(embedding, fetchLimit);
|
|
99
88
|
}
|
|
100
89
|
catch { /* embedding may fail */ }
|
|
101
90
|
const graphIds = new Set();
|
|
@@ -134,6 +123,16 @@ export class HybridSearch {
|
|
|
134
123
|
}
|
|
135
124
|
docs.get(id)?.ranks.set('vector', i + 1);
|
|
136
125
|
}
|
|
126
|
+
for (let i = 0; i < observationResults.length; i++) {
|
|
127
|
+
const observation = observationResults[i].observation;
|
|
128
|
+
if (!docs.has(observation.id)) {
|
|
129
|
+
docs.set(observation.id, {
|
|
130
|
+
ranks: new Map(),
|
|
131
|
+
entry: observationToEntry(observation),
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
docs.get(observation.id)?.ranks.set('observation', i + 1);
|
|
135
|
+
}
|
|
137
136
|
let graphRank = 1;
|
|
138
137
|
for (const id of graphIds) {
|
|
139
138
|
if (docs.has(id)) {
|
|
@@ -155,9 +154,7 @@ export class HybridSearch {
|
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
156
|
catch { /* retention lookup failure is non-fatal */ }
|
|
158
|
-
const
|
|
159
|
-
// LLM rerank (only when LLM is available)
|
|
160
|
-
const ranked = await this.rerankWithLLM(query, fused, docs);
|
|
157
|
+
const ranked = rrfFusion(docs, RRF_K);
|
|
161
158
|
const sessionCount = new Map();
|
|
162
159
|
const diverse = new Set(ranked.map(r => {
|
|
163
160
|
const doc = docs.get(r.id);
|
|
@@ -196,11 +193,15 @@ export class HybridSearch {
|
|
|
196
193
|
}
|
|
197
194
|
}
|
|
198
195
|
results.push({ entry: doc.entry, score: Math.round(score * 10000) / 10000 });
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
196
|
+
if (options.recordAccess !== false) {
|
|
197
|
+
try {
|
|
198
|
+
if (doc.entry.source === 'observation')
|
|
199
|
+
this.store.incrementObservationAccess(doc.entry.id);
|
|
200
|
+
else
|
|
201
|
+
this.store.incrementAccess(doc.entry.id);
|
|
202
|
+
}
|
|
203
|
+
catch { /* non-critical */ }
|
|
202
204
|
}
|
|
203
|
-
catch { /* non-critical */ }
|
|
204
205
|
if (results.length >= limit)
|
|
205
206
|
break;
|
|
206
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid-search.js","sourceRoot":"","sources":["../src/hybrid-search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hybrid-search.js","sourceRoot":"","sources":["../src/hybrid-search.ts"],"names":[],"mappings":"AAgCA,MAAM,eAAe,GAA2B;IAC9C,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,GAAG;IAChB,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,GAAG;CACf,CAAC;AACF,MAAM,KAAK,GAAG,EAAE,CAAC;AAEjB,SAAS,SAAS,CAChB,OAA8E,EAC9E,CAAS;IAET,MAAM,MAAM,GAAyC,EAAE,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC;QACtC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;YACnC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxB,MAAM,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC;gBAAE,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,MAAM;YAAE,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,GAInB;IACC,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;IACvE,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,GAAG,CAAC,IAAI;QAClB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,YAAY,EAAE,GAAG,CAAC,aAAa,IAAI,SAAS;QAC5C,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,MAAM,EAAE,YAAY;QACpB,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,SAAS,EAAE,GAAG,CAAC,UAAU,IAAI,SAAS;QACtC,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAmB;IAC7C,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,GAAG,CAAC,IAAI;QAClB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE,GAAG,CAAC,SAAS;QACtB,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,UAAU;QAClB,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,QAAQ,EAAE,GAAG,CAAC,UAAU,GAAG,EAAE;QAC7B,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAErC,MAAM,OAAO,YAAY;IAIb;IACA;IAJF,MAAM,CAAsB;IAEpC,YACU,KAAkB,EAClB,QAA2B,EACnC,MAAqB;QAFb,UAAK,GAAL,KAAK,CAAa;QAClB,aAAQ,GAAR,QAAQ,CAAmB;QAGnC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,UAAyB,EAAE;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,CAAC;QAE7B,IAAI,WAAW,GAAwC,EAAE,CAAC;QAC1D,IAAI,CAAC;YACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC,CAAC,wCAAwC,CAAC,CAAC;QAEpD,IAAI,aAAa,GAA4C,EAAE,CAAC;QAChE,IAAI,kBAAkB,GAA6D,EAAE,CAAC;QACtF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACnD,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAC/D,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACjF,CAAC;QAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACpE,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAChD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAClE,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,aAAa,EAAE,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;wBACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACjB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;wBAC9C,KAAK,MAAM,CAAC,IAAI,SAAS;4BAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,0CAA0C,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAoE,CAAC;QAEzF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC/B,IAAI,GAAG;oBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,EAAE,EAAE,EAAE,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC/B,IAAI,GAAG;oBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAC,WAAW,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE;oBACvB,KAAK,EAAE,IAAI,GAAG,EAAE;oBAChB,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC;iBACvC,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC;YACH,MAAM,eAAe,GAAyC,EAAE,CAAC;YACjE,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;gBACnD,IAAI,SAAS,EAAE,CAAC;oBACd,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;YACD,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;YAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,2CAA2C,CAAC,CAAC;QAEvD,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEtC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;YACjC,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,KAAK,IAAI,CAAC;oBAAE,OAAO,IAAI,CAAC;gBAC5B,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,CAAC,CAAC,EAAE,CAAC;QACd,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAEpB,MAAM,OAAO,GAAmB,EAAE,CAAC;QACnC,KAAK,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,MAAM,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAE,SAAS;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG;gBAAE,SAAS;YACnB,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,SAAS;YACzF,IAAI,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;gBAAE,SAAS;YAEjE,8BAA8B;YAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzC,IAAI,GAAG,EAAE,CAAC;oBACR,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC;wBACjD,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU;wBAChC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS;wBAC9B,WAAW,EAAG,GAAW,CAAC,YAAY;wBACtC,cAAc,EAAG,GAAW,CAAC,gBAAgB;qBAC9C,CAAC,CAAC;oBACH,IAAI,OAAO,GAAG,wBAAwB;wBAAE,SAAS;gBACnD,CAAC;YACH,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;YAE7E,IAAI,OAAO,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;gBACnC,IAAI,CAAC;oBACH,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,aAAa;wBAAE,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;;wBACvF,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChD,CAAC;gBAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YAChC,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK;gBAAE,MAAM;QACrC,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,24 +1,21 @@
|
|
|
1
1
|
export { MemoryEngine } from "./memory-engine.js";
|
|
2
2
|
export { MemoryStore } from "./memory-store.js";
|
|
3
|
+
export { LeaseStore } from "./lease-store.js";
|
|
4
|
+
export type { LeaseRow, LeaseStatus } from "./lease-store.js";
|
|
3
5
|
export { MemoryGate } from "./memory-gate.js";
|
|
4
6
|
export { SignalBuffer } from "./signal-buffer.js";
|
|
5
7
|
export type { BufferedEvent } from "./signal-buffer.js";
|
|
6
|
-
export {
|
|
7
|
-
export type { Signal, SignalType, ToolEvent } from "./signal-
|
|
8
|
+
export { SignalAnalyzer } from "./signal-analyzer.js";
|
|
9
|
+
export type { Signal, SignalType, ToolEvent } from "./signal-analyzer.js";
|
|
8
10
|
export { validateProjectRoot, hasForceInitSentinel, writeForceInitSentinel } from "./project-validator.js";
|
|
9
11
|
export type { ProjectRootCheck } from "./project-validator.js";
|
|
10
12
|
export { EmbeddingProvider } from "./embedding-provider.js";
|
|
11
13
|
export { HybridSearch } from "./hybrid-search.js";
|
|
12
14
|
export { GraphStore } from "./graph-store.js";
|
|
13
|
-
export { setLLMClient } from "./llm-provider.js";
|
|
14
|
-
export type { LLMResponse } from "./llm-provider.js";
|
|
15
|
-
export { extractMemories, extractCandidates, extractFromEvents, setExtractionLLMClient, isExtractionAvailable } from "./extractor.js";
|
|
16
|
-
export { L2Evaluator, getL2Evaluator, setL2LLMClient } from "./l2-evaluator.js";
|
|
17
|
-
export type { L2Candidate, L2Decision } from "./l2-evaluator.js";
|
|
18
15
|
export { consolidate } from './consolidator.js';
|
|
19
16
|
export type { ConsolidatorResult } from './consolidator.js';
|
|
20
|
-
export { checkOllama, getOllamaInfoMessage } from "./ollama-checker.js";
|
|
21
|
-
export type { OllamaStatus } from "./ollama-checker.js";
|
|
22
17
|
export type { SearchResult, SearchResultEntry, SearchOptions } from "./hybrid-search.js";
|
|
23
18
|
export type { MemoryRow, ObservationRow, EventRow, SessionRow, SignalRow } from "./memory-store.js";
|
|
19
|
+
export { OBSERVATION_TYPES, isObservationType, normalizeObservationTitle, observationDedupKey, } from "./observation-types.js";
|
|
20
|
+
export type { ObservationType, ObservationSource } from "./observation-types.js";
|
|
24
21
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC3G,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC3G,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACzF,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
export { MemoryEngine } from "./memory-engine.js";
|
|
2
2
|
export { MemoryStore } from "./memory-store.js";
|
|
3
|
+
export { LeaseStore } from "./lease-store.js";
|
|
3
4
|
export { MemoryGate } from "./memory-gate.js";
|
|
4
5
|
export { SignalBuffer } from "./signal-buffer.js";
|
|
5
|
-
export {
|
|
6
|
+
export { SignalAnalyzer } from "./signal-analyzer.js";
|
|
6
7
|
export { validateProjectRoot, hasForceInitSentinel, writeForceInitSentinel } from "./project-validator.js";
|
|
7
8
|
export { EmbeddingProvider } from "./embedding-provider.js";
|
|
8
9
|
export { HybridSearch } from "./hybrid-search.js";
|
|
9
10
|
export { GraphStore } from "./graph-store.js";
|
|
10
|
-
export { setLLMClient } from "./llm-provider.js";
|
|
11
|
-
export { extractMemories, extractCandidates, extractFromEvents, setExtractionLLMClient, isExtractionAvailable } from "./extractor.js";
|
|
12
|
-
export { L2Evaluator, getL2Evaluator, setL2LLMClient } from "./l2-evaluator.js";
|
|
13
11
|
export { consolidate } from './consolidator.js';
|
|
14
|
-
export {
|
|
12
|
+
export { OBSERVATION_TYPES, isObservationType, normalizeObservationTitle, observationDedupKey, } from "./observation-types.js";
|
|
15
13
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAE3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAE3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type Database from "better-sqlite3";
|
|
2
|
+
export type LeaseStatus = "pending" | "committed" | "expired";
|
|
3
|
+
export interface LeaseRow {
|
|
4
|
+
batchId: string;
|
|
5
|
+
eventIds: string[];
|
|
6
|
+
sessionIds: string[];
|
|
7
|
+
eventCount: number;
|
|
8
|
+
createdAt: number;
|
|
9
|
+
expiresAt: number;
|
|
10
|
+
status: LeaseStatus;
|
|
11
|
+
}
|
|
12
|
+
export declare class MalformedDistillLeaseError extends Error {
|
|
13
|
+
readonly batchId: string;
|
|
14
|
+
readonly field: string;
|
|
15
|
+
readonly name = "MalformedDistillLeaseError";
|
|
16
|
+
constructor(batchId: string, field: string);
|
|
17
|
+
}
|
|
18
|
+
export declare class LeaseStore {
|
|
19
|
+
private readonly db;
|
|
20
|
+
constructor(db: Database.Database);
|
|
21
|
+
createLease(eventIds: string[], sessionIds: string[], ttlMs?: number): string;
|
|
22
|
+
getLease(batchId: string): LeaseRow | null;
|
|
23
|
+
commitLease(batchId: string): void;
|
|
24
|
+
expireOverdueLeases(): number;
|
|
25
|
+
getPendingEventIds(): Set<string>;
|
|
26
|
+
releasePendingLeases(sessionId?: string): number;
|
|
27
|
+
private toLeaseRow;
|
|
28
|
+
private parseBatchId;
|
|
29
|
+
private parseStringArray;
|
|
30
|
+
private validateStringArray;
|
|
31
|
+
private parseNonnegativeInteger;
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=lease-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lease-store.d.ts","sourceRoot":"","sources":["../src/lease-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAE9D,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB;AAYD,qBAAa,0BAA2B,SAAQ,KAAK;IAIjD,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAJxB,QAAQ,CAAC,IAAI,gCAAgC;gBAGlC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM;CAOzB;AAED,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,KAAK,SAAiB,GAAG,MAAM;IAuCrF,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAQ1C,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAalC,mBAAmB,IAAI,MAAM;IAkB7B,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC;IAoBjC,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAmBhD,OAAO,CAAC,UAAU;IA6BlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,uBAAuB;CAYhC"}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import { ulid } from "ulidx";
|
|
2
|
+
const DEFAULT_TTL_MS = 10 * 60 * 1000;
|
|
3
|
+
export class MalformedDistillLeaseError extends Error {
|
|
4
|
+
batchId;
|
|
5
|
+
field;
|
|
6
|
+
name = "MalformedDistillLeaseError";
|
|
7
|
+
constructor(batchId, field) {
|
|
8
|
+
super(`Distill lease ${batchId} has malformed ${field}; `
|
|
9
|
+
+ "repair or remove the lease row before retrying.");
|
|
10
|
+
this.batchId = batchId;
|
|
11
|
+
this.field = field;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
export class LeaseStore {
|
|
15
|
+
db;
|
|
16
|
+
constructor(db) {
|
|
17
|
+
this.db = db;
|
|
18
|
+
}
|
|
19
|
+
createLease(eventIds, sessionIds, ttlMs = DEFAULT_TTL_MS) {
|
|
20
|
+
this.validateStringArray(eventIds, "eventIds", true);
|
|
21
|
+
this.validateStringArray(sessionIds, "sessionIds", false);
|
|
22
|
+
if (!Number.isSafeInteger(ttlMs) || ttlMs <= 0) {
|
|
23
|
+
throw new Error("createLease requires a positive safe-integer TTL");
|
|
24
|
+
}
|
|
25
|
+
const createdAt = Date.now();
|
|
26
|
+
const expiresAt = createdAt + ttlMs;
|
|
27
|
+
if (!Number.isSafeInteger(expiresAt)) {
|
|
28
|
+
throw new Error("createLease TTL produces an unsafe expiry timestamp");
|
|
29
|
+
}
|
|
30
|
+
const batchId = ulid();
|
|
31
|
+
this.db
|
|
32
|
+
.prepare(`
|
|
33
|
+
INSERT INTO distill_leases (
|
|
34
|
+
batch_id,
|
|
35
|
+
event_ids,
|
|
36
|
+
session_ids,
|
|
37
|
+
event_count,
|
|
38
|
+
created_at,
|
|
39
|
+
expires_at,
|
|
40
|
+
status
|
|
41
|
+
) VALUES (?, ?, ?, ?, ?, ?, 'pending')
|
|
42
|
+
`)
|
|
43
|
+
.run(batchId, JSON.stringify(eventIds), JSON.stringify(sessionIds), eventIds.length, createdAt, expiresAt);
|
|
44
|
+
return batchId;
|
|
45
|
+
}
|
|
46
|
+
getLease(batchId) {
|
|
47
|
+
const row = this.db
|
|
48
|
+
.prepare(`SELECT * FROM distill_leases WHERE batch_id = ?`)
|
|
49
|
+
.get(batchId);
|
|
50
|
+
return row ? this.toLeaseRow(row, batchId) : null;
|
|
51
|
+
}
|
|
52
|
+
commitLease(batchId) {
|
|
53
|
+
const result = this.db
|
|
54
|
+
.prepare(`
|
|
55
|
+
UPDATE distill_leases SET status = 'committed'
|
|
56
|
+
WHERE batch_id = ? AND status = 'pending' AND expires_at > ?
|
|
57
|
+
`)
|
|
58
|
+
.run(batchId, Date.now());
|
|
59
|
+
if (result.changes !== 1) {
|
|
60
|
+
throw new Error(`Lease ${batchId} not found or already committed/expired`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
expireOverdueLeases() {
|
|
64
|
+
const rows = this.db
|
|
65
|
+
.prepare(`SELECT batch_id, expires_at FROM distill_leases WHERE status = 'pending'`)
|
|
66
|
+
.all();
|
|
67
|
+
for (const row of rows) {
|
|
68
|
+
const batchId = this.parseBatchId(row.batch_id);
|
|
69
|
+
this.parseNonnegativeInteger(row.expires_at, batchId, "expires_at");
|
|
70
|
+
}
|
|
71
|
+
const result = this.db
|
|
72
|
+
.prepare(`UPDATE distill_leases SET status = 'expired' WHERE status = 'pending' AND expires_at <= ?`)
|
|
73
|
+
.run(Date.now());
|
|
74
|
+
return result.changes;
|
|
75
|
+
}
|
|
76
|
+
getPendingEventIds() {
|
|
77
|
+
const rows = this.db
|
|
78
|
+
.prepare(`SELECT * FROM distill_leases WHERE status = 'pending'`)
|
|
79
|
+
.all();
|
|
80
|
+
const eventIds = new Set();
|
|
81
|
+
const now = Date.now();
|
|
82
|
+
for (const row of rows) {
|
|
83
|
+
const batchId = this.parseBatchId(row.batch_id);
|
|
84
|
+
const expiresAt = this.parseNonnegativeInteger(row.expires_at, batchId, "expires_at");
|
|
85
|
+
if (expiresAt <= now)
|
|
86
|
+
continue;
|
|
87
|
+
const lease = this.toLeaseRow(row);
|
|
88
|
+
for (const eventId of lease.eventIds) {
|
|
89
|
+
eventIds.add(eventId);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return eventIds;
|
|
93
|
+
}
|
|
94
|
+
releasePendingLeases(sessionId) {
|
|
95
|
+
const rows = this.db
|
|
96
|
+
.prepare(`SELECT * FROM distill_leases WHERE status = 'pending'`)
|
|
97
|
+
.all();
|
|
98
|
+
const batchIds = rows
|
|
99
|
+
.map(row => this.toLeaseRow(row))
|
|
100
|
+
.filter(lease => sessionId === undefined || lease.sessionIds.includes(sessionId))
|
|
101
|
+
.map(lease => lease.batchId);
|
|
102
|
+
if (batchIds.length === 0)
|
|
103
|
+
return 0;
|
|
104
|
+
const update = this.db.prepare(`UPDATE distill_leases SET status = 'expired' WHERE batch_id = ? AND status = 'pending'`);
|
|
105
|
+
return this.db.transaction(() => batchIds.reduce((count, batchId) => count + update.run(batchId).changes, 0))();
|
|
106
|
+
}
|
|
107
|
+
toLeaseRow(row, expectedBatchId) {
|
|
108
|
+
const batchId = this.parseBatchId(row.batch_id, expectedBatchId);
|
|
109
|
+
const eventIds = this.parseStringArray(row.event_ids, batchId, "event_ids");
|
|
110
|
+
if (eventIds.length === 0) {
|
|
111
|
+
throw new MalformedDistillLeaseError(batchId, "event_ids");
|
|
112
|
+
}
|
|
113
|
+
const sessionIds = this.parseStringArray(row.session_ids, batchId, "session_ids");
|
|
114
|
+
const eventCount = this.parseNonnegativeInteger(row.event_count, batchId, "event_count");
|
|
115
|
+
if (eventCount !== eventIds.length) {
|
|
116
|
+
throw new MalformedDistillLeaseError(batchId, "event_count");
|
|
117
|
+
}
|
|
118
|
+
const createdAt = this.parseNonnegativeInteger(row.created_at, batchId, "created_at");
|
|
119
|
+
const expiresAt = this.parseNonnegativeInteger(row.expires_at, batchId, "expires_at");
|
|
120
|
+
if (row.status !== "pending" && row.status !== "committed" && row.status !== "expired") {
|
|
121
|
+
throw new MalformedDistillLeaseError(batchId, "status");
|
|
122
|
+
}
|
|
123
|
+
return {
|
|
124
|
+
batchId,
|
|
125
|
+
eventIds,
|
|
126
|
+
sessionIds,
|
|
127
|
+
eventCount,
|
|
128
|
+
createdAt,
|
|
129
|
+
expiresAt,
|
|
130
|
+
status: row.status,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
parseBatchId(value, expectedBatchId) {
|
|
134
|
+
if (typeof value !== "string" || value.trim().length === 0) {
|
|
135
|
+
throw new MalformedDistillLeaseError(expectedBatchId ?? "<unknown>", "batch_id");
|
|
136
|
+
}
|
|
137
|
+
return value;
|
|
138
|
+
}
|
|
139
|
+
parseStringArray(value, batchId, field) {
|
|
140
|
+
if (typeof value !== "string") {
|
|
141
|
+
throw new MalformedDistillLeaseError(batchId, field);
|
|
142
|
+
}
|
|
143
|
+
try {
|
|
144
|
+
const parsed = JSON.parse(value);
|
|
145
|
+
if (!Array.isArray(parsed) || !parsed.every(entry => typeof entry === "string" && entry.trim().length > 0) || new Set(parsed).size !== parsed.length) {
|
|
146
|
+
throw new MalformedDistillLeaseError(batchId, field);
|
|
147
|
+
}
|
|
148
|
+
return parsed;
|
|
149
|
+
}
|
|
150
|
+
catch (error) {
|
|
151
|
+
if (error instanceof MalformedDistillLeaseError)
|
|
152
|
+
throw error;
|
|
153
|
+
throw new MalformedDistillLeaseError(batchId, field);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
validateStringArray(value, field, requireNonempty) {
|
|
157
|
+
if (!Array.isArray(value)
|
|
158
|
+
|| (requireNonempty && value.length === 0)
|
|
159
|
+
|| !value.every(entry => typeof entry === "string" && entry.trim().length > 0)
|
|
160
|
+
|| new Set(value).size !== value.length) {
|
|
161
|
+
const requirement = requireNonempty ? "a nonempty unique array" : "a unique array";
|
|
162
|
+
throw new Error(`createLease requires ${field} to be ${requirement} of nonblank strings`);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
parseNonnegativeInteger(value, batchId, field) {
|
|
166
|
+
if (typeof value === "bigint") {
|
|
167
|
+
if (value < 0n || value > BigInt(Number.MAX_SAFE_INTEGER)) {
|
|
168
|
+
throw new MalformedDistillLeaseError(batchId, field);
|
|
169
|
+
}
|
|
170
|
+
return Number(value);
|
|
171
|
+
}
|
|
172
|
+
if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
|
|
173
|
+
throw new MalformedDistillLeaseError(batchId, field);
|
|
174
|
+
}
|
|
175
|
+
return value;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
//# sourceMappingURL=lease-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lease-store.js","sourceRoot":"","sources":["../src/lease-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lease-store.test.d.ts","sourceRoot":"","sources":["../src/lease-store.test.ts"],"names":[],"mappings":""}
|