@cogitator-ai/memory 0.6.21 → 0.7.0
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 +58 -5
- package/dist/adapters/base.d.ts +6 -0
- package/dist/adapters/base.d.ts.map +1 -1
- package/dist/adapters/base.js +19 -0
- package/dist/adapters/base.js.map +1 -1
- package/dist/adapters/memory-embedding.d.ts.map +1 -1
- package/dist/adapters/memory-embedding.js +16 -2
- package/dist/adapters/memory-embedding.js.map +1 -1
- package/dist/adapters/memory.js +10 -11
- package/dist/adapters/memory.js.map +1 -1
- package/dist/adapters/mongodb.d.ts.map +1 -1
- package/dist/adapters/mongodb.js +23 -20
- package/dist/adapters/mongodb.js.map +1 -1
- package/dist/adapters/postgres.d.ts +5 -0
- package/dist/adapters/postgres.d.ts.map +1 -1
- package/dist/adapters/postgres.js +191 -86
- package/dist/adapters/postgres.js.map +1 -1
- package/dist/adapters/qdrant.d.ts.map +1 -1
- package/dist/adapters/qdrant.js +17 -3
- package/dist/adapters/qdrant.js.map +1 -1
- package/dist/adapters/redis.d.ts +7 -0
- package/dist/adapters/redis.d.ts.map +1 -1
- package/dist/adapters/redis.js +142 -106
- package/dist/adapters/redis.js.map +1 -1
- package/dist/adapters/sqlite.d.ts.map +1 -1
- package/dist/adapters/sqlite.js +19 -7
- package/dist/adapters/sqlite.js.map +1 -1
- package/dist/compaction.d.ts +5 -1
- package/dist/compaction.d.ts.map +1 -1
- package/dist/compaction.js +43 -8
- package/dist/compaction.js.map +1 -1
- package/dist/context-builder.d.ts +10 -0
- package/dist/context-builder.d.ts.map +1 -1
- package/dist/context-builder.js +112 -41
- package/dist/context-builder.js.map +1 -1
- package/dist/core-facts.d.ts.map +1 -1
- package/dist/core-facts.js +20 -5
- package/dist/core-facts.js.map +1 -1
- package/dist/embedding/factory.js +1 -1
- package/dist/embedding/factory.js.map +1 -1
- package/dist/embedding/google.d.ts +2 -0
- package/dist/embedding/google.d.ts.map +1 -1
- package/dist/embedding/google.js +43 -7
- package/dist/embedding/google.js.map +1 -1
- package/dist/embedding/ollama.d.ts.map +1 -1
- package/dist/embedding/ollama.js +18 -4
- package/dist/embedding/ollama.js.map +1 -1
- package/dist/embedding/openai.d.ts +1 -0
- package/dist/embedding/openai.d.ts.map +1 -1
- package/dist/embedding/openai.js +30 -6
- package/dist/embedding/openai.js.map +1 -1
- package/dist/embedding/retry.d.ts +6 -0
- package/dist/embedding/retry.d.ts.map +1 -0
- package/dist/embedding/retry.js +55 -0
- package/dist/embedding/retry.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/knowledge-graph/entity-extractor.d.ts.map +1 -1
- package/dist/knowledge-graph/entity-extractor.js +8 -4
- package/dist/knowledge-graph/entity-extractor.js.map +1 -1
- package/dist/knowledge-graph/graph-adapter.d.ts.map +1 -1
- package/dist/knowledge-graph/graph-adapter.js +23 -3
- package/dist/knowledge-graph/graph-adapter.js.map +1 -1
- package/dist/knowledge-graph/inference-engine.d.ts.map +1 -1
- package/dist/knowledge-graph/inference-engine.js +16 -6
- package/dist/knowledge-graph/inference-engine.js.map +1 -1
- package/dist/knowledge-graph/schema.d.ts +4 -0
- package/dist/knowledge-graph/schema.d.ts.map +1 -1
- package/dist/knowledge-graph/schema.js +11 -1
- package/dist/knowledge-graph/schema.js.map +1 -1
- package/dist/knowledge-graph/sqlite-graph-adapter.d.ts.map +1 -1
- package/dist/knowledge-graph/sqlite-graph-adapter.js +2 -2
- package/dist/knowledge-graph/sqlite-graph-adapter.js.map +1 -1
- package/dist/schema.d.ts +14 -0
- package/dist/schema.d.ts.map +1 -1
- package/dist/schema.js +11 -0
- package/dist/schema.js.map +1 -1
- package/dist/search/bm25.d.ts +1 -1
- package/dist/search/bm25.d.ts.map +1 -1
- package/dist/search/bm25.js +19 -15
- package/dist/search/bm25.js.map +1 -1
- package/dist/search/hybrid-search.d.ts.map +1 -1
- package/dist/search/hybrid-search.js +8 -0
- package/dist/search/hybrid-search.js.map +1 -1
- package/dist/search/rrf.d.ts +0 -2
- package/dist/search/rrf.d.ts.map +1 -1
- package/dist/search/rrf.js +17 -17
- package/dist/search/rrf.js.map +1 -1
- package/dist/search/tokenizer.js +1 -1
- package/dist/search/tokenizer.js.map +1 -1
- package/dist/session-manager.d.ts +22 -2
- package/dist/session-manager.d.ts.map +1 -1
- package/dist/session-manager.js +80 -28
- package/dist/session-manager.js.map +1 -1
- package/package.json +4 -4
package/dist/adapters/redis.js
CHANGED
|
@@ -16,9 +16,29 @@ export class RedisAdapter extends BaseMemoryAdapter {
|
|
|
16
16
|
constructor(config) {
|
|
17
17
|
super();
|
|
18
18
|
this.config = config;
|
|
19
|
-
this.prefix =
|
|
19
|
+
this.prefix = RedisAdapter.resolvePrefix(config);
|
|
20
20
|
this.ttl = config.ttl ?? 86400;
|
|
21
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* In cluster mode every key of the adapter must hash to the same slot (multi-key commands),
|
|
24
|
+
* so the prefix must contain a `{hash tag}`.
|
|
25
|
+
*/
|
|
26
|
+
static resolvePrefix(config) {
|
|
27
|
+
if (!config.cluster)
|
|
28
|
+
return config.keyPrefix ?? 'cogitator:';
|
|
29
|
+
const prefix = config.keyPrefix ?? '{cogitator}:';
|
|
30
|
+
return /\{[^}]+\}/.test(prefix) ? prefix : `{${prefix.replace(/:$/, '')}}:`;
|
|
31
|
+
}
|
|
32
|
+
async run(operation) {
|
|
33
|
+
if (!this.client)
|
|
34
|
+
return this.failure('Not connected');
|
|
35
|
+
try {
|
|
36
|
+
return await operation(this.client);
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
return this.failure(err instanceof Error ? err.message : String(err));
|
|
40
|
+
}
|
|
41
|
+
}
|
|
22
42
|
async connect() {
|
|
23
43
|
try {
|
|
24
44
|
if (this.config.cluster) {
|
|
@@ -47,8 +67,16 @@ export class RedisAdapter extends BaseMemoryAdapter {
|
|
|
47
67
|
}
|
|
48
68
|
async disconnect() {
|
|
49
69
|
if (this.client) {
|
|
50
|
-
|
|
51
|
-
|
|
70
|
+
try {
|
|
71
|
+
await this.client.quit();
|
|
72
|
+
return this.success(undefined);
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
return this.failure(err.message);
|
|
76
|
+
}
|
|
77
|
+
finally {
|
|
78
|
+
this.client = null;
|
|
79
|
+
}
|
|
52
80
|
}
|
|
53
81
|
return this.success(undefined);
|
|
54
82
|
}
|
|
@@ -56,131 +84,139 @@ export class RedisAdapter extends BaseMemoryAdapter {
|
|
|
56
84
|
return `${this.prefix}${type}:${id}`;
|
|
57
85
|
}
|
|
58
86
|
async createThread(agentId, metadata = {}, threadId) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
87
|
+
return this.run(async (client) => {
|
|
88
|
+
const id = threadId ?? this.generateId('thread');
|
|
89
|
+
const existing = await this.readThread(client, id);
|
|
90
|
+
const now = new Date();
|
|
91
|
+
const thread = {
|
|
92
|
+
id,
|
|
93
|
+
agentId,
|
|
94
|
+
metadata,
|
|
95
|
+
createdAt: existing?.createdAt ?? now,
|
|
96
|
+
updatedAt: now,
|
|
97
|
+
};
|
|
98
|
+
await client.setex(this.key('thread', id), this.ttl, JSON.stringify(thread));
|
|
99
|
+
return this.success(thread);
|
|
100
|
+
});
|
|
70
101
|
}
|
|
71
|
-
async
|
|
72
|
-
|
|
73
|
-
return this.failure('Not connected');
|
|
74
|
-
const data = await this.client.get(this.key('thread', threadId));
|
|
102
|
+
async readThread(client, threadId) {
|
|
103
|
+
const data = await client.get(this.key('thread', threadId));
|
|
75
104
|
if (!data)
|
|
76
|
-
return
|
|
105
|
+
return null;
|
|
77
106
|
const thread = JSON.parse(data);
|
|
78
107
|
thread.createdAt = new Date(thread.createdAt);
|
|
79
108
|
thread.updatedAt = new Date(thread.updatedAt);
|
|
80
|
-
return
|
|
109
|
+
return thread;
|
|
110
|
+
}
|
|
111
|
+
async getThread(threadId) {
|
|
112
|
+
return this.run(async (client) => this.success(await this.readThread(client, threadId)));
|
|
81
113
|
}
|
|
82
114
|
async updateThread(threadId, metadata) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
return this.success(thread);
|
|
115
|
+
return this.run(async (client) => {
|
|
116
|
+
const thread = await this.readThread(client, threadId);
|
|
117
|
+
if (!thread)
|
|
118
|
+
return this.failure(`Thread not found: ${threadId}`);
|
|
119
|
+
thread.metadata = { ...thread.metadata, ...metadata };
|
|
120
|
+
thread.updatedAt = new Date();
|
|
121
|
+
await client.setex(this.key('thread', threadId), this.ttl, JSON.stringify(thread));
|
|
122
|
+
return this.success(thread);
|
|
123
|
+
});
|
|
93
124
|
}
|
|
94
125
|
async deleteThread(threadId) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return this.success(undefined);
|
|
126
|
+
return this.run(async (client) => {
|
|
127
|
+
const setKey = this.key('thread:entries', threadId);
|
|
128
|
+
const entryKeys = await client.zrange(setKey, 0, -1);
|
|
129
|
+
if (entryKeys.length > 0) {
|
|
130
|
+
await client.del(...entryKeys);
|
|
131
|
+
}
|
|
132
|
+
await client.del(this.key('thread', threadId), setKey);
|
|
133
|
+
return this.success(undefined);
|
|
134
|
+
});
|
|
105
135
|
}
|
|
106
136
|
async addEntry(entry) {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
137
|
+
return this.run(async (client) => {
|
|
138
|
+
const full = {
|
|
139
|
+
...entry,
|
|
140
|
+
id: this.generateId('entry'),
|
|
141
|
+
createdAt: this.nextEntryTimestamp(entry.threadId),
|
|
142
|
+
};
|
|
143
|
+
const key = this.key('entry', full.id);
|
|
144
|
+
const setKey = this.key('thread:entries', entry.threadId);
|
|
145
|
+
await client.setex(key, this.ttl, JSON.stringify(full));
|
|
146
|
+
await client.zadd(setKey, full.createdAt.getTime(), key);
|
|
147
|
+
await client.expire(setKey, this.ttl);
|
|
148
|
+
await client.expire(this.key('thread', entry.threadId), this.ttl);
|
|
149
|
+
return this.success(full);
|
|
150
|
+
});
|
|
120
151
|
}
|
|
121
152
|
async getEntries(options) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
keys = await this.client.zrange(setKey, 0, -1);
|
|
133
|
-
}
|
|
134
|
-
if (keys.length === 0)
|
|
135
|
-
return this.success([]);
|
|
136
|
-
if (options.limit && keys.length > options.limit) {
|
|
137
|
-
keys = keys.slice(-options.limit);
|
|
138
|
-
}
|
|
139
|
-
const values = await this.client.mget(...keys);
|
|
140
|
-
const entries = values
|
|
141
|
-
.filter((v) => v !== null)
|
|
142
|
-
.map((v) => {
|
|
143
|
-
const entry = JSON.parse(v);
|
|
144
|
-
entry.createdAt = new Date(entry.createdAt);
|
|
145
|
-
if (!options.includeToolCalls) {
|
|
146
|
-
entry.toolCalls = undefined;
|
|
147
|
-
entry.toolResults = undefined;
|
|
153
|
+
return this.run(async (client) => {
|
|
154
|
+
const setKey = this.key('thread:entries', options.threadId);
|
|
155
|
+
let keys;
|
|
156
|
+
if (options.before || options.after) {
|
|
157
|
+
const min = options.after ? `(${options.after.getTime()}` : '-inf';
|
|
158
|
+
const max = options.before ? `(${options.before.getTime()}` : '+inf';
|
|
159
|
+
keys = await client.zrangebyscore(setKey, min, max);
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
keys = await client.zrange(setKey, 0, -1);
|
|
148
163
|
}
|
|
149
|
-
|
|
164
|
+
if (keys.length === 0)
|
|
165
|
+
return this.success([]);
|
|
166
|
+
const values = await client.mget(...keys);
|
|
167
|
+
const expired = keys.filter((_key, index) => values[index] === null);
|
|
168
|
+
if (expired.length > 0) {
|
|
169
|
+
await client.zrem(setKey, ...expired);
|
|
170
|
+
}
|
|
171
|
+
let entries = values
|
|
172
|
+
.filter((v) => v !== null)
|
|
173
|
+
.map((v) => {
|
|
174
|
+
const entry = JSON.parse(v);
|
|
175
|
+
entry.createdAt = new Date(entry.createdAt);
|
|
176
|
+
if (!options.includeToolCalls) {
|
|
177
|
+
entry.toolCalls = undefined;
|
|
178
|
+
entry.toolResults = undefined;
|
|
179
|
+
}
|
|
180
|
+
return entry;
|
|
181
|
+
});
|
|
182
|
+
if (options.limit && entries.length > options.limit) {
|
|
183
|
+
entries = entries.slice(-options.limit);
|
|
184
|
+
}
|
|
185
|
+
return this.success(entries);
|
|
150
186
|
});
|
|
151
|
-
return this.success(entries);
|
|
152
187
|
}
|
|
153
188
|
async getEntry(entryId) {
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
189
|
+
return this.run(async (client) => {
|
|
190
|
+
const data = await client.get(this.key('entry', entryId));
|
|
191
|
+
if (!data)
|
|
192
|
+
return this.success(null);
|
|
193
|
+
const entry = JSON.parse(data);
|
|
194
|
+
entry.createdAt = new Date(entry.createdAt);
|
|
195
|
+
return this.success(entry);
|
|
196
|
+
});
|
|
162
197
|
}
|
|
163
198
|
async deleteEntry(entryId) {
|
|
164
|
-
|
|
165
|
-
return this.failure('Not connected');
|
|
166
|
-
const result = await this.getEntry(entryId);
|
|
167
|
-
if (result.success && result.data) {
|
|
199
|
+
return this.run(async (client) => {
|
|
168
200
|
const key = this.key('entry', entryId);
|
|
169
|
-
await
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
201
|
+
const data = await client.get(key);
|
|
202
|
+
if (data) {
|
|
203
|
+
const entry = JSON.parse(data);
|
|
204
|
+
await client.zrem(this.key('thread:entries', entry.threadId), key);
|
|
205
|
+
await client.del(key);
|
|
206
|
+
}
|
|
207
|
+
return this.success(undefined);
|
|
208
|
+
});
|
|
173
209
|
}
|
|
174
210
|
async clearThread(threadId) {
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
211
|
+
return this.run(async (client) => {
|
|
212
|
+
const setKey = this.key('thread:entries', threadId);
|
|
213
|
+
const keys = await client.zrange(setKey, 0, -1);
|
|
214
|
+
if (keys.length > 0) {
|
|
215
|
+
await client.del(...keys);
|
|
216
|
+
}
|
|
217
|
+
await client.del(setKey);
|
|
218
|
+
return this.success(undefined);
|
|
219
|
+
});
|
|
184
220
|
}
|
|
185
221
|
}
|
|
186
222
|
//# sourceMappingURL=redis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/adapters/redis.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAUH,OAAO,EAAE,iBAAiB,EAAoB,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,OAAO,YAAa,SAAQ,iBAAiB;IACxC,QAAQ,GAAmB,OAAO,CAAC;IAEpC,MAAM,GAAuB,IAAI,CAAC;IAClC,MAAM,CAAqB;IAC3B,MAAM,CAAS;IACf,GAAG,CAAS;IAEpB,YAAY,MAA0B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/adapters/redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/adapters/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAe3C,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAY;IAE7C,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,OAAO,CAAU;gBAEb,MAAM,EAAE,mBAAmB;IAMjC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAqDtC,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/adapters/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAe3C,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAY;IAE7C,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,OAAO,CAAU;gBAEb,MAAM,EAAE,mBAAmB;IAMjC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAqDtC,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAczC,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACtC,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAiC1B,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IA6BjE,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAwB1B,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAW3D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IA8B1F,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAwD7E,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAmCpE,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAWzD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;CAUjE"}
|
package/dist/adapters/sqlite.js
CHANGED
|
@@ -60,8 +60,16 @@ export class SQLiteAdapter extends BaseMemoryAdapter {
|
|
|
60
60
|
}
|
|
61
61
|
async disconnect() {
|
|
62
62
|
if (this.db) {
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
try {
|
|
64
|
+
this.db.close();
|
|
65
|
+
return this.success(undefined);
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
return this.failure(err.message);
|
|
69
|
+
}
|
|
70
|
+
finally {
|
|
71
|
+
this.db = null;
|
|
72
|
+
}
|
|
65
73
|
}
|
|
66
74
|
return this.success(undefined);
|
|
67
75
|
}
|
|
@@ -79,6 +87,10 @@ export class SQLiteAdapter extends BaseMemoryAdapter {
|
|
|
79
87
|
const stmt = this.db.prepare(`
|
|
80
88
|
INSERT INTO threads (id, agent_id, metadata, created_at, updated_at)
|
|
81
89
|
VALUES (?, ?, ?, ?, ?)
|
|
90
|
+
ON CONFLICT(id) DO UPDATE SET
|
|
91
|
+
agent_id = excluded.agent_id,
|
|
92
|
+
metadata = excluded.metadata,
|
|
93
|
+
updated_at = excluded.updated_at
|
|
82
94
|
`);
|
|
83
95
|
stmt.run(thread.id, thread.agentId, JSON.stringify(thread.metadata), thread.createdAt.toISOString(), thread.updatedAt.toISOString());
|
|
84
96
|
return this.success(thread);
|
|
@@ -135,7 +147,6 @@ export class SQLiteAdapter extends BaseMemoryAdapter {
|
|
|
135
147
|
if (!this.db)
|
|
136
148
|
return this.failure('Not connected');
|
|
137
149
|
try {
|
|
138
|
-
this.db.prepare('DELETE FROM entries WHERE thread_id = ?').run(threadId);
|
|
139
150
|
this.db.prepare('DELETE FROM threads WHERE id = ?').run(threadId);
|
|
140
151
|
return this.success(undefined);
|
|
141
152
|
}
|
|
@@ -149,7 +160,7 @@ export class SQLiteAdapter extends BaseMemoryAdapter {
|
|
|
149
160
|
const full = {
|
|
150
161
|
...entry,
|
|
151
162
|
id: this.generateId('entry'),
|
|
152
|
-
createdAt:
|
|
163
|
+
createdAt: this.nextEntryTimestamp(entry.threadId),
|
|
153
164
|
};
|
|
154
165
|
try {
|
|
155
166
|
const stmt = this.db.prepare(`
|
|
@@ -177,11 +188,12 @@ export class SQLiteAdapter extends BaseMemoryAdapter {
|
|
|
177
188
|
conditions.push('created_at > ?');
|
|
178
189
|
params.push(options.after.toISOString());
|
|
179
190
|
}
|
|
180
|
-
let sql = `SELECT * FROM entries WHERE ${conditions.join(' AND ')} ORDER BY created_at ASC`;
|
|
191
|
+
let sql = `SELECT * FROM entries WHERE ${conditions.join(' AND ')} ORDER BY created_at ASC, rowid ASC`;
|
|
181
192
|
if (options.limit) {
|
|
182
193
|
sql = `SELECT * FROM (
|
|
183
|
-
SELECT
|
|
184
|
-
|
|
194
|
+
SELECT *, rowid AS entry_order FROM entries WHERE ${conditions.join(' AND ')}
|
|
195
|
+
ORDER BY created_at DESC, rowid DESC LIMIT ?
|
|
196
|
+
) ORDER BY created_at ASC, entry_order ASC`;
|
|
185
197
|
params.push(options.limit);
|
|
186
198
|
}
|
|
187
199
|
const stmt = this.db.prepare(sql);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../src/adapters/sqlite.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAe3C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACzC,QAAQ,GAAmB,QAAQ,CAAC;IAErC,EAAE,GAAoB,IAAI,CAAC;IAC3B,IAAI,CAAS;IACb,OAAO,CAAU;IAEzB,YAAY,MAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,QAAwC,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACpD,QAAQ,GAAG,YAAY,CAAC,OAAoD,CAAC;QAC/E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAElC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;OAwBZ,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,OAAO,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../src/adapters/sqlite.ts"],"names":[],"mappings":"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"}
|
package/dist/compaction.d.ts
CHANGED
|
@@ -9,7 +9,11 @@ export declare class CompactionService {
|
|
|
9
9
|
private readonly summarize;
|
|
10
10
|
constructor(config: CompactionServiceConfig);
|
|
11
11
|
compact(sessionId: string, config: CompactionConfig): Promise<CompactionResult>;
|
|
12
|
-
|
|
12
|
+
/**
|
|
13
|
+
* Replace `entriesToRemove` with a summary entry placed before `entriesToKeep`: kept entries
|
|
14
|
+
* are re-appended after the summary so the conversation order stays summary → recent messages.
|
|
15
|
+
*/
|
|
16
|
+
applySummary(sessionId: string, entriesToRemove: MemoryEntry[], summary: string, entriesToKeep?: MemoryEntry[]): Promise<number>;
|
|
13
17
|
getSummarizeFn(): SummarizeFn;
|
|
14
18
|
getAdapter(): MemoryAdapter;
|
|
15
19
|
}
|
package/dist/compaction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAEhB,OAAO,EACR,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnE,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,WAAW,CAAC;CACxB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;gBAE5B,MAAM,EAAE,uBAAuB;IAKrC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAEhB,OAAO,EACR,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnE,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,WAAW,CAAC;CACxB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;gBAE5B,MAAM,EAAE,uBAAuB;IAKrC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyCrF;;;OAGG;IACG,YAAY,CAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,WAAW,EAAE,EAC9B,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,WAAW,EAAO,GAChC,OAAO,CAAC,MAAM,CAAC;IAwClB,cAAc,IAAI,WAAW;IAI7B,UAAU,IAAI,aAAa;CAG5B"}
|
package/dist/compaction.js
CHANGED
|
@@ -7,11 +7,23 @@ export class CompactionService {
|
|
|
7
7
|
this.summarize = config.summarize;
|
|
8
8
|
}
|
|
9
9
|
async compact(sessionId, config) {
|
|
10
|
-
const entriesResult = await this.adapter.getEntries({
|
|
10
|
+
const entriesResult = await this.adapter.getEntries({
|
|
11
|
+
threadId: sessionId,
|
|
12
|
+
includeToolCalls: true,
|
|
13
|
+
});
|
|
11
14
|
if (!entriesResult.success) {
|
|
12
15
|
throw new Error(`Failed to load entries: ${entriesResult.error}`);
|
|
13
16
|
}
|
|
14
17
|
const entries = entriesResult.data;
|
|
18
|
+
const totalTokens = entries.reduce((sum, e) => sum + (e.tokenCount ?? countMessagesTokens([e.message])), 0);
|
|
19
|
+
if (totalTokens < config.threshold) {
|
|
20
|
+
return {
|
|
21
|
+
sessionId,
|
|
22
|
+
originalMessages: entries.length,
|
|
23
|
+
compactedMessages: entries.length,
|
|
24
|
+
summaryTokens: 0,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
15
27
|
if (entries.length <= config.keepRecent) {
|
|
16
28
|
return {
|
|
17
29
|
sessionId,
|
|
@@ -20,24 +32,46 @@ export class CompactionService {
|
|
|
20
32
|
summaryTokens: 0,
|
|
21
33
|
};
|
|
22
34
|
}
|
|
35
|
+
const sorted = [...entries].sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
|
|
23
36
|
const strategy = strategies[config.strategy];
|
|
24
|
-
return strategy(this, sessionId,
|
|
37
|
+
return strategy(this, sessionId, sorted, config);
|
|
25
38
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
39
|
+
/**
|
|
40
|
+
* Replace `entriesToRemove` with a summary entry placed before `entriesToKeep`: kept entries
|
|
41
|
+
* are re-appended after the summary so the conversation order stays summary → recent messages.
|
|
42
|
+
*/
|
|
43
|
+
async applySummary(sessionId, entriesToRemove, summary, entriesToKeep = []) {
|
|
30
44
|
const summaryMessage = {
|
|
31
45
|
role: 'system',
|
|
32
46
|
content: `[Conversation summary]\n${summary}`,
|
|
33
47
|
};
|
|
34
48
|
const summaryTokens = countMessagesTokens([summaryMessage]);
|
|
35
|
-
await this.adapter.addEntry({
|
|
49
|
+
const added = await this.adapter.addEntry({
|
|
36
50
|
threadId: sessionId,
|
|
37
51
|
message: summaryMessage,
|
|
38
52
|
tokenCount: summaryTokens,
|
|
39
53
|
metadata: { compactionSummary: true, compactedAt: new Date().toISOString() },
|
|
40
54
|
});
|
|
55
|
+
if (!added.success) {
|
|
56
|
+
throw new Error(`Failed to store compaction summary: ${added.error}`);
|
|
57
|
+
}
|
|
58
|
+
for (const entry of entriesToKeep) {
|
|
59
|
+
const readded = await this.adapter.addEntry({
|
|
60
|
+
threadId: entry.threadId,
|
|
61
|
+
message: entry.message,
|
|
62
|
+
toolCalls: entry.toolCalls,
|
|
63
|
+
toolResults: entry.toolResults,
|
|
64
|
+
tokenCount: entry.tokenCount,
|
|
65
|
+
metadata: entry.metadata,
|
|
66
|
+
});
|
|
67
|
+
if (!readded.success) {
|
|
68
|
+
throw new Error(`Failed to reorder entries after compaction: ${readded.error}`);
|
|
69
|
+
}
|
|
70
|
+
await this.adapter.deleteEntry(entry.id);
|
|
71
|
+
}
|
|
72
|
+
for (const entry of entriesToRemove) {
|
|
73
|
+
await this.adapter.deleteEntry(entry.id);
|
|
74
|
+
}
|
|
41
75
|
return summaryTokens;
|
|
42
76
|
}
|
|
43
77
|
getSummarizeFn() {
|
|
@@ -50,9 +84,10 @@ export class CompactionService {
|
|
|
50
84
|
const summaryStrategy = async (service, sessionId, entries, config) => {
|
|
51
85
|
const splitAt = entries.length - config.keepRecent;
|
|
52
86
|
const oldEntries = entries.slice(0, splitAt);
|
|
87
|
+
const recentEntries = entries.slice(splitAt);
|
|
53
88
|
const oldMessages = oldEntries.map((e) => e.message);
|
|
54
89
|
const summary = await service.getSummarizeFn()(oldMessages);
|
|
55
|
-
const summaryTokens = await service.applySummary(sessionId, oldEntries, summary);
|
|
90
|
+
const summaryTokens = await service.applySummary(sessionId, oldEntries, summary, recentEntries);
|
|
56
91
|
return {
|
|
57
92
|
sessionId,
|
|
58
93
|
originalMessages: entries.length,
|
package/dist/compaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAStD,MAAM,OAAO,iBAAiB;IACX,OAAO,CAAgB;IACvB,SAAS,CAAc;IAExC,YAAY,MAA+B;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,MAAwB;QACvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,16 @@ export declare class ContextBuilder {
|
|
|
24
24
|
constructor(config: ContextBuilderConfig, deps: ContextBuilderDeps);
|
|
25
25
|
build(options: BuildContextOptions): Promise<BuiltContext>;
|
|
26
26
|
private selectRecentEntries;
|
|
27
|
+
/**
|
|
28
|
+
* Entries most similar to the current input that fit the budget, in conversation order.
|
|
29
|
+
* Falls back to the most recent entries when there is no input or embedding service.
|
|
30
|
+
*/
|
|
31
|
+
private selectRelevantEntries;
|
|
32
|
+
/**
|
|
33
|
+
* Similarity of user/assistant text entries to the input, best first. Returns null when
|
|
34
|
+
* embedding fails.
|
|
35
|
+
*/
|
|
36
|
+
private scoreEntries;
|
|
27
37
|
private selectHybridEntries;
|
|
28
38
|
private cosineSimilarity;
|
|
29
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-builder.d.ts","sourceRoot":"","sources":["../src/context-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAMV,oBAAoB,EACpB,YAAY,EACZ,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"context-builder.d.ts","sourceRoot":"","sources":["../src/context-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAMV,oBAAoB,EACpB,YAAY,EACZ,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAcnF,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAiC;IAC/C,OAAO,CAAC,IAAI,CAAqB;gBAErB,MAAM,EAAE,oBAAoB,EAAE,IAAI,EAAE,kBAAkB;IAe5D,KAAK,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IA+NhE,OAAO,CAAC,mBAAmB;IAiB3B;;;OAGG;YACW,qBAAqB;IA0BnC;;;OAGG;YACW,YAAY;YAoCZ,mBAAmB;IAkCjC,OAAO,CAAC,gBAAgB;CAgBzB"}
|