opcode-pg-memory 2.3.2 → 2.4.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 +53 -0
- package/dist/mcp-server.js +257 -24099
- package/dist/src/hooks/message-part-updated.js +1 -1
- package/dist/src/hooks/message-updated.d.ts.map +1 -1
- package/dist/src/hooks/message-updated.js +102 -93
- package/dist/src/hooks/message-updated.js.map +1 -1
- package/dist/src/hooks/session-compacting.js +9 -9
- package/dist/src/hooks/session-compacting.js.map +1 -1
- package/dist/src/hooks/session-completed.d.ts.map +1 -1
- package/dist/src/hooks/session-completed.js +8 -7
- package/dist/src/hooks/session-completed.js.map +1 -1
- package/dist/src/hooks/session-created.d.ts +1 -1
- package/dist/src/hooks/session-created.js +9 -9
- package/dist/src/hooks/session-created.js.map +1 -1
- package/dist/src/hooks/tool-execute.d.ts.map +1 -1
- package/dist/src/hooks/tool-execute.js +51 -14
- package/dist/src/hooks/tool-execute.js.map +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +17 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/recall-memory.d.ts +4 -0
- package/dist/src/mcp/recall-memory.d.ts.map +1 -1
- package/dist/src/mcp/recall-memory.js +136 -22
- package/dist/src/mcp/recall-memory.js.map +1 -1
- package/dist/src/services/async-embedder.d.ts +27 -0
- package/dist/src/services/async-embedder.d.ts.map +1 -0
- package/dist/src/services/async-embedder.js +88 -0
- package/dist/src/services/async-embedder.js.map +1 -0
- package/dist/src/services/db-polling.d.ts +5 -0
- package/dist/src/services/db-polling.d.ts.map +1 -1
- package/dist/src/services/db-polling.js +35 -27
- package/dist/src/services/db-polling.js.map +1 -1
- package/dist/src/services/event-synchronizer.d.ts +3 -0
- package/dist/src/services/event-synchronizer.d.ts.map +1 -1
- package/dist/src/services/event-synchronizer.js +69 -50
- package/dist/src/services/event-synchronizer.js.map +1 -1
- package/dist/src/services/opencode-schema-adapter.d.ts +18 -0
- package/dist/src/services/opencode-schema-adapter.d.ts.map +1 -1
- package/dist/src/services/opencode-schema-adapter.js +123 -24
- package/dist/src/services/opencode-schema-adapter.js.map +1 -1
- package/package.json +11 -10
|
@@ -4,6 +4,7 @@ exports.OpenCodeDBPollingSource = void 0;
|
|
|
4
4
|
const opencode_schema_adapter_1 = require("./opencode-schema-adapter");
|
|
5
5
|
const logger_1 = require("./logger");
|
|
6
6
|
const logger = (0, logger_1.createLogger)('db-polling');
|
|
7
|
+
const BATCH_SIZE = 100;
|
|
7
8
|
const DEFAULT_CONFIG = {
|
|
8
9
|
intervalMs: 5000,
|
|
9
10
|
backoffBaseMs: 1000,
|
|
@@ -51,7 +52,7 @@ class OpenCodeDBPollingSource {
|
|
|
51
52
|
if (!this.adapter.isConnected() && !this.adapter.connect())
|
|
52
53
|
return;
|
|
53
54
|
try {
|
|
54
|
-
// 1
|
|
55
|
+
// ── Phase 1: Sync new sessions ──
|
|
55
56
|
const sessions = this.adapter.getRecentSessions();
|
|
56
57
|
for (const s of sessions) {
|
|
57
58
|
if (!this.knownSessions.has(s.id)) {
|
|
@@ -59,34 +60,41 @@ class OpenCodeDBPollingSource {
|
|
|
59
60
|
await this.synchronizer.handleEvent(this.event('session.created', s.id, { title: s.title, agent: s.agent }));
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
|
-
// 2
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
63
|
+
// ── Phase 2: Batch sync tool calls ──
|
|
64
|
+
// Use cursor-based pagination to avoid N+1 queries and ensure reliable progress
|
|
65
|
+
const since = this.lastSyncTime || undefined;
|
|
66
|
+
const totalToolCalls = this.adapter.getToolCallsCount(since);
|
|
67
|
+
if (totalToolCalls > 0) {
|
|
68
|
+
logger.info('Batch syncing tool calls', { total: totalToolCalls, batchSize: BATCH_SIZE, lastSyncTime: this.lastSyncTime });
|
|
69
|
+
for (let offset = 0; offset < totalToolCalls; offset += BATCH_SIZE) {
|
|
70
|
+
const toolCalls = this.adapter.getToolCallsSince(since, BATCH_SIZE, offset);
|
|
71
|
+
if (toolCalls.length === 0)
|
|
72
|
+
break;
|
|
73
|
+
for (const tc of toolCalls) {
|
|
74
|
+
await this.synchronizer.handleEvent({
|
|
75
|
+
id: `tool.execute.after:${tc.sessionId}:${Date.now()}:${tc.callID}`,
|
|
76
|
+
type: 'tool.execute.after',
|
|
77
|
+
sessionId: tc.sessionId,
|
|
78
|
+
timestamp: Date.now(),
|
|
79
|
+
version: 1,
|
|
80
|
+
source: 'poll',
|
|
81
|
+
data: {
|
|
82
|
+
toolName: tc.tool,
|
|
83
|
+
callID: tc.callID, // ← CRITICAL: ensures unique dedup key per tool call
|
|
84
|
+
result: {
|
|
85
|
+
success: tc.status === 'completed',
|
|
86
|
+
data: tc.output,
|
|
87
|
+
error: tc.status === 'failed' ? tc.output : undefined,
|
|
88
|
+
},
|
|
89
|
+
executionTimeMs: 0,
|
|
90
|
+
parameters: tc.input || {},
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
logger.info('Batch progress', { offset: offset + toolCalls.length, total: totalToolCalls });
|
|
88
95
|
}
|
|
89
96
|
}
|
|
97
|
+
// ── Phase 3: Advance cursor so next cycle only picks up new tool calls ──
|
|
90
98
|
this.lastSyncTime = Date.now();
|
|
91
99
|
this.currentInterval = this.config.intervalMs; // Reset on success
|
|
92
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-polling.js","sourceRoot":"","sources":["../../../src/services/db-polling.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"db-polling.js","sourceRoot":"","sources":["../../../src/services/db-polling.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,14 @@ export declare class EventSynchronizer {
|
|
|
5
5
|
private config;
|
|
6
6
|
private dedupSet;
|
|
7
7
|
private stopped;
|
|
8
|
+
processingCount: number;
|
|
8
9
|
private logger;
|
|
9
10
|
constructor(pool: Pool, config?: Partial<EventSynchronizerConfig>);
|
|
10
11
|
handleEvent(event: PluginEvent): Promise<void>;
|
|
11
12
|
private ensureSessionMap;
|
|
12
13
|
private getHandler;
|
|
13
14
|
private sleep;
|
|
15
|
+
drain(timeoutMs?: number): Promise<void>;
|
|
16
|
+
isAvailable(): boolean;
|
|
14
17
|
}
|
|
15
18
|
//# sourceMappingURL=event-synchronizer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-synchronizer.d.ts","sourceRoot":"","sources":["../../../src/services/event-synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B,OAAO,KAAK,EAAE,WAAW,EAAmB,uBAAuB,EAAY,MAAM,UAAU,CAAC;AAOhG,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAS;
|
|
1
|
+
{"version":3,"file":"event-synchronizer.d.ts","sourceRoot":"","sources":["../../../src/services/event-synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B,OAAO,KAAK,EAAE,WAAW,EAAmB,uBAAuB,EAAY,MAAM,UAAU,CAAC;AAOhG,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAS;IACjB,eAAe,SAAK;IAC3B,OAAO,CAAC,MAAM,CAA8B;gBAEhC,IAAI,EAAE,IAAI,EAAE,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM;IAY/D,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;YA4EtC,gBAAgB;IAO9B,OAAO,CAAC,UAAU;IAkDlB,OAAO,CAAC,KAAK;IAIP,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU9C,WAAW,IAAI,OAAO;CAGvB"}
|
|
@@ -12,6 +12,7 @@ class EventSynchronizer {
|
|
|
12
12
|
config;
|
|
13
13
|
dedupSet = new Map(); // eventId → timestamp
|
|
14
14
|
stopped = false;
|
|
15
|
+
processingCount = 0;
|
|
15
16
|
logger = (0, logger_1.createLogger)('event-sync');
|
|
16
17
|
constructor(pool, config = {}) {
|
|
17
18
|
this.pool = pool;
|
|
@@ -27,63 +28,69 @@ class EventSynchronizer {
|
|
|
27
28
|
async handleEvent(event) {
|
|
28
29
|
if (this.stopped)
|
|
29
30
|
return;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
this.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
// 3. Clean old dedup entries (keep last 1000)
|
|
44
|
-
if (this.dedupSet.size > 1000) {
|
|
45
|
-
const cutoff = Date.now() - 60000;
|
|
46
|
-
for (const [k, t] of this.dedupSet) {
|
|
47
|
-
if (t < cutoff)
|
|
48
|
-
this.dedupSet.delete(k);
|
|
31
|
+
this.processingCount++;
|
|
32
|
+
try {
|
|
33
|
+
// 1. Mode filtering
|
|
34
|
+
if (this.config.mode === 'event-only' && event.source === 'poll')
|
|
35
|
+
return;
|
|
36
|
+
if (this.config.mode === 'poll-only' && event.source === 'hook')
|
|
37
|
+
return;
|
|
38
|
+
// 2. Dedup within sliding window
|
|
39
|
+
const dedupKey = `${event.type}:${event.sessionId}:${event.version}:${event.data?.callID || event.data?.message_id || event.data?.message?.id || ''}`;
|
|
40
|
+
const lastTime = this.dedupSet.get(dedupKey) || 0;
|
|
41
|
+
if (Date.now() - lastTime < this.config.eventDedupWindowMs) {
|
|
42
|
+
this.logger.debug('Duplicate event skipped', { key: dedupKey });
|
|
43
|
+
return;
|
|
49
44
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
let lastError = null;
|
|
58
|
-
for (let attempt = 0; attempt <= this.config.retryMaxAttempts; attempt++) {
|
|
59
|
-
try {
|
|
60
|
-
// Ensure session_map entry exists first
|
|
61
|
-
await this.ensureSessionMap(event);
|
|
62
|
-
// Call the handler
|
|
63
|
-
await handler(event, this.pool);
|
|
64
|
-
// Optimistic locking: update version on session_map
|
|
65
|
-
if (event.version > 0) {
|
|
66
|
-
const result = await this.pool.query('UPDATE session_map SET version = version + 1 WHERE opencode_session_id = $1 AND (version = $2 OR version IS NULL)', [event.sessionId, event.version]);
|
|
67
|
-
if (result.rowCount === 0 && attempt < this.config.retryMaxAttempts) {
|
|
68
|
-
// Version conflict — retry
|
|
69
|
-
lastError = new Error(`Version conflict for ${event.sessionId}`);
|
|
70
|
-
await this.sleep(this.config.retryBaseDelayMs * Math.pow(2, attempt));
|
|
71
|
-
continue;
|
|
72
|
-
}
|
|
45
|
+
this.dedupSet.set(dedupKey, Date.now());
|
|
46
|
+
// 3. Clean old dedup entries (keep last 1000)
|
|
47
|
+
if (this.dedupSet.size > 1000) {
|
|
48
|
+
const cutoff = Date.now() - 60000;
|
|
49
|
+
for (const [k, t] of this.dedupSet) {
|
|
50
|
+
if (t < cutoff)
|
|
51
|
+
this.dedupSet.delete(k);
|
|
73
52
|
}
|
|
74
|
-
|
|
53
|
+
}
|
|
54
|
+
// 4. Dispatch to handler (with retry for version conflicts)
|
|
55
|
+
const handler = this.getHandler(event.type);
|
|
56
|
+
if (!handler) {
|
|
57
|
+
this.logger.warn('No handler for event', { type: event.type });
|
|
75
58
|
return;
|
|
76
59
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
60
|
+
let lastError = null;
|
|
61
|
+
for (let attempt = 0; attempt <= this.config.retryMaxAttempts; attempt++) {
|
|
62
|
+
try {
|
|
63
|
+
// Ensure session_map entry exists first
|
|
64
|
+
await this.ensureSessionMap(event);
|
|
65
|
+
// Call the handler
|
|
66
|
+
await handler(event, this.pool);
|
|
67
|
+
// Optimistic locking: update version on session_map
|
|
68
|
+
if (event.version > 0) {
|
|
69
|
+
const result = await this.pool.query('UPDATE session_map SET version = version + 1 WHERE opencode_session_id = $1 AND (version = $2 OR version IS NULL)', [event.sessionId, event.version]);
|
|
70
|
+
if (result.rowCount === 0 && attempt < this.config.retryMaxAttempts) {
|
|
71
|
+
// Version conflict — retry
|
|
72
|
+
lastError = new Error(`Version conflict for ${event.sessionId}`);
|
|
73
|
+
await this.sleep(this.config.retryBaseDelayMs * Math.pow(2, attempt));
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
this.logger.debug('Event processed', { type: event.type, sessionId: event.sessionId, attempt });
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
catch (err) {
|
|
81
|
+
lastError = err;
|
|
82
|
+
if (attempt < this.config.retryMaxAttempts) {
|
|
83
|
+
await this.sleep(this.config.retryBaseDelayMs * Math.pow(2, attempt));
|
|
84
|
+
}
|
|
81
85
|
}
|
|
82
86
|
}
|
|
87
|
+
this.logger.error('Event processing failed after retries', {
|
|
88
|
+
type: event.type, sessionId: event.sessionId, error: lastError?.message,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
this.processingCount--;
|
|
83
93
|
}
|
|
84
|
-
this.logger.error('Event processing failed after retries', {
|
|
85
|
-
type: event.type, sessionId: event.sessionId, error: lastError?.message,
|
|
86
|
-
});
|
|
87
94
|
}
|
|
88
95
|
async ensureSessionMap(event) {
|
|
89
96
|
await this.pool.query('INSERT INTO session_map (opencode_session_id) VALUES ($1) ON CONFLICT DO NOTHING', [event.sessionId]);
|
|
@@ -114,6 +121,18 @@ class EventSynchronizer {
|
|
|
114
121
|
sleep(ms) {
|
|
115
122
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
116
123
|
}
|
|
124
|
+
async drain(timeoutMs) {
|
|
125
|
+
const start = Date.now();
|
|
126
|
+
while (this.processingCount > 0) {
|
|
127
|
+
if (timeoutMs !== undefined && Date.now() - start >= timeoutMs) {
|
|
128
|
+
throw new Error(`Drain timeout after ${timeoutMs}ms`);
|
|
129
|
+
}
|
|
130
|
+
await this.sleep(50);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
isAvailable() {
|
|
134
|
+
return !this.stopped && this.processingCount === 0;
|
|
135
|
+
}
|
|
117
136
|
}
|
|
118
137
|
exports.EventSynchronizer = EventSynchronizer;
|
|
119
138
|
//# sourceMappingURL=event-synchronizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-synchronizer.js","sourceRoot":"","sources":["../../../src/services/event-synchronizer.ts"],"names":[],"mappings":";;;AACA,qCAAwC;AAExC,8DAAgE;AAChE,kEAAoE;AACpE,oEAA8F;AAC9F,8DAAgE;AAChE,wDAAwF;AAExF,MAAa,iBAAiB;IACpB,IAAI,CAAO;IACX,MAAM,CAA0B;IAChC,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC,CAAE,sBAAsB;IAClE,OAAO,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"event-synchronizer.js","sourceRoot":"","sources":["../../../src/services/event-synchronizer.ts"],"names":[],"mappings":";;;AACA,qCAAwC;AAExC,8DAAgE;AAChE,kEAAoE;AACpE,oEAA8F;AAC9F,8DAAgE;AAChE,wDAAwF;AAExF,MAAa,iBAAiB;IACpB,IAAI,CAAO;IACX,MAAM,CAA0B;IAChC,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC,CAAE,sBAAsB;IAClE,OAAO,GAAG,KAAK,CAAC;IACjB,eAAe,GAAG,CAAC,CAAC;IACnB,MAAM,GAAG,IAAA,qBAAY,EAAC,YAAY,CAAC,CAAC;IAE5C,YAAY,IAAU,EAAE,SAA2C,EAAE;QACnE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG;YACZ,IAAI,EAAE,QAAQ;YACd,iBAAiB,EAAE,IAAI;YACvB,gBAAgB,EAAE,CAAC;YACnB,gBAAgB,EAAE,EAAE;YACpB,kBAAkB,EAAE,IAAI;YACxB,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAkB;QAClC,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAEzB,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,IAAI,CAAC;YACH,oBAAoB;YACpB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO;YACzE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO;YAExE,iCAAiC;YACjC,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,UAAU,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;YACtJ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAChE,OAAO;YACT,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAExC,8CAA8C;YAC9C,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBAClC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnC,IAAI,CAAC,GAAG,MAAM;wBAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,4DAA4D;YAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YAED,IAAI,SAAS,GAAiB,IAAI,CAAC;YACnC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,CAAC;gBACzE,IAAI,CAAC;oBACH,wCAAwC;oBACxC,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAEnC,mBAAmB;oBACnB,MAAM,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEhC,oDAAoD;oBACpD,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;wBACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAClC,mHAAmH,EACnH,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CACjC,CAAC;wBACF,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;4BACpE,2BAA2B;4BAC3B,SAAS,GAAG,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;4BACjE,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;4BACtE,SAAS;wBACX,CAAC;oBACH,CAAC;oBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;oBAChG,OAAO;gBAET,CAAC;gBAAC,OAAO,GAAQ,EAAE,CAAC;oBAClB,SAAS,GAAG,GAAG,CAAC;oBAChB,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;wBAC3C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;oBACxE,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;gBACzD,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO;aACxE,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAkB;QAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CACnB,kFAAkF,EAClF,CAAC,KAAK,CAAC,SAAS,CAAC,CAClB,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,IAAqB;QACtC,MAAM,QAAQ,GAAsE;YAClF,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAChC,MAAM,IAAA,sCAAoB,EACxB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAC/H,EAAE,OAAO,EAAE,EAAE,EAAE,EACf,CAAC,EACD,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAC7D,CAAC;YACJ,CAAC;YACD,mBAAmB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,IAAA,0CAAsB,EAC1B,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,YAAY,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EACxI,EAAE,EACF,CAAC,EACD,EAAE,CACH,CAAC;YACJ,CAAC;YACD,mBAAmB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,IAAA,2CAAsB,EAC1B,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC,IAAI,EAAE,iBAAiB,IAAI,EAAE,EAAE,kBAAkB,EAAE,OAAO,EAAE,EACjH,EAAE,EACF,CAAC,CACF,CAAC;YACJ,CAAC;YACD,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAChC,MAAM,IAAA,sCAAoB,EACxB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,EAChE,EAAE,EACF,CAAC,CACF,CAAC;YACJ,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBACpC,MAAM,IAAA,sCAAuB,EAC3B,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,EAAE,EAC/I,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,EACxC,CAAC,CACF,CAAC;YACJ,CAAC;YACD,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBACnC,MAAM,IAAA,qCAAsB,EAC1B,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,IAAI,EAAE,eAAe,IAAI,CAAC,EAAE,EAC3O,EAAE,EACF,CAAC,CACF,CAAC;YACJ,CAAC;SACF,CAAC;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,EAAU;QACtB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAkB;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE,CAAC;YAChC,IAAI,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,SAAS,EAAE,CAAC;gBAC/D,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,IAAI,CAAC,CAAC;YACxD,CAAC;YACD,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,KAAK,CAAC,CAAC;IACrD,CAAC;CACF;AA1KD,8CA0KC"}
|
|
@@ -56,6 +56,10 @@ export declare class OpenCodeSchemaAdapter {
|
|
|
56
56
|
constructor(customPath?: string);
|
|
57
57
|
connect(): boolean;
|
|
58
58
|
private detectDrizzleVersion;
|
|
59
|
+
/** Unified query helper — supports both bun:sqlite and better-sqlite3 APIs */
|
|
60
|
+
private queryAll;
|
|
61
|
+
/** Unified single-row query helper */
|
|
62
|
+
private queryGet;
|
|
59
63
|
isConnected(): boolean;
|
|
60
64
|
getDrizzleVersion(): number;
|
|
61
65
|
getRecentSessions(): SQLiteSession[];
|
|
@@ -88,6 +92,20 @@ export declare class OpenCodeSchemaAdapter {
|
|
|
88
92
|
output?: any;
|
|
89
93
|
status?: string;
|
|
90
94
|
}>;
|
|
95
|
+
/** 批量获取工具调用（JOIN 查询，避免 N+1），支持增量拉取和分页 */
|
|
96
|
+
getToolCallsSince(sinceTime?: number, limit?: number, offset?: number): Array<{
|
|
97
|
+
messageId: string;
|
|
98
|
+
sessionId: string;
|
|
99
|
+
tool: string;
|
|
100
|
+
callID: string;
|
|
101
|
+
input?: any;
|
|
102
|
+
output?: any;
|
|
103
|
+
status: string;
|
|
104
|
+
partId: string;
|
|
105
|
+
timeCreated: number;
|
|
106
|
+
}>;
|
|
107
|
+
/** 获取工具调用总数（用于进度追踪） */
|
|
108
|
+
getToolCallsCount(sinceTime?: number): number;
|
|
91
109
|
/** 检查数据库是否可访问 */
|
|
92
110
|
healthCheck(): {
|
|
93
111
|
ok: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-schema-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/opencode-schema-adapter.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACrH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,GAAG,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxC;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,cAAc,CAAa;gBAEvB,UAAU,CAAC,EAAE,MAAM;IAI/B,OAAO,IAAI,OAAO;
|
|
1
|
+
{"version":3,"file":"opencode-schema-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/opencode-schema-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,36 +27,72 @@ class OpenCodeSchemaAdapter {
|
|
|
27
27
|
if (this.db)
|
|
28
28
|
return true;
|
|
29
29
|
try {
|
|
30
|
+
// Try bun:sqlite first (faster, native)
|
|
30
31
|
const { Database } = require('bun:sqlite');
|
|
31
32
|
this.db = new Database(this.path);
|
|
32
33
|
this.detectDrizzleVersion();
|
|
33
34
|
return true;
|
|
34
35
|
}
|
|
35
|
-
catch
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
catch {
|
|
37
|
+
try {
|
|
38
|
+
// Fall back to better-sqlite3 (Node.js compatible)
|
|
39
|
+
const Database = require('better-sqlite3');
|
|
40
|
+
this.db = new Database(this.path);
|
|
41
|
+
this.detectDrizzleVersion();
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
logger.warn('No SQLite driver available', { path: this.path, error: err.message });
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
38
48
|
}
|
|
39
49
|
}
|
|
40
50
|
detectDrizzleVersion() {
|
|
41
51
|
try {
|
|
42
|
-
const rows = this.
|
|
52
|
+
const rows = this.queryAll('SELECT count(*) as cnt FROM __drizzle_migrations');
|
|
43
53
|
this.drizzleVersion = rows.length > 0 ? rows[0].cnt || 0 : 0;
|
|
44
54
|
}
|
|
45
55
|
catch {
|
|
46
56
|
this.drizzleVersion = 0;
|
|
47
57
|
}
|
|
48
58
|
}
|
|
59
|
+
/** Unified query helper — supports both bun:sqlite and better-sqlite3 APIs */
|
|
60
|
+
queryAll(sql, ...params) {
|
|
61
|
+
if (!this.db)
|
|
62
|
+
return [];
|
|
63
|
+
try {
|
|
64
|
+
if (typeof this.db.query === 'function') {
|
|
65
|
+
return this.db.query(sql).all(...params);
|
|
66
|
+
}
|
|
67
|
+
return this.db.prepare(sql).all(...params);
|
|
68
|
+
}
|
|
69
|
+
catch {
|
|
70
|
+
return [];
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/** Unified single-row query helper */
|
|
74
|
+
queryGet(sql, ...params) {
|
|
75
|
+
if (!this.db)
|
|
76
|
+
return null;
|
|
77
|
+
try {
|
|
78
|
+
if (typeof this.db.query === 'function') {
|
|
79
|
+
return this.db.query(sql).get(...params);
|
|
80
|
+
}
|
|
81
|
+
return this.db.prepare(sql).get(...params);
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
49
87
|
isConnected() { return this.db !== null; }
|
|
50
88
|
getDrizzleVersion() { return this.drizzleVersion; }
|
|
51
89
|
// ── 会话 ─────────────────────────────────────────
|
|
52
90
|
getRecentSessions() {
|
|
53
|
-
if (!this.db)
|
|
54
|
-
return [];
|
|
55
91
|
try {
|
|
56
|
-
return this.
|
|
92
|
+
return this.queryAll(`
|
|
57
93
|
SELECT id, title, time_created, agent, model
|
|
58
94
|
FROM session ORDER BY time_created ASC
|
|
59
|
-
`)
|
|
95
|
+
`);
|
|
60
96
|
}
|
|
61
97
|
catch (err) {
|
|
62
98
|
logger.warn('Failed to query sessions', { error: err.message });
|
|
@@ -64,10 +100,8 @@ class OpenCodeSchemaAdapter {
|
|
|
64
100
|
}
|
|
65
101
|
}
|
|
66
102
|
getSessionById(id) {
|
|
67
|
-
if (!this.db)
|
|
68
|
-
return null;
|
|
69
103
|
try {
|
|
70
|
-
return this.
|
|
104
|
+
return this.queryGet('SELECT id, title, time_created, agent FROM session WHERE id = ?', id) || null;
|
|
71
105
|
}
|
|
72
106
|
catch {
|
|
73
107
|
return null;
|
|
@@ -85,12 +119,10 @@ class OpenCodeSchemaAdapter {
|
|
|
85
119
|
}
|
|
86
120
|
/** 获取指定会话的全部消息（含 JSON 解析） */
|
|
87
121
|
getMessagesBySession(sessionId) {
|
|
88
|
-
if (!this.db)
|
|
89
|
-
return [];
|
|
90
122
|
try {
|
|
91
|
-
const rows = this.
|
|
123
|
+
const rows = this.queryAll(`
|
|
92
124
|
SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC
|
|
93
|
-
|
|
125
|
+
`, sessionId);
|
|
94
126
|
return rows.map(r => ({ id: r.id, meta: this.parseMessageMeta(r.data) }));
|
|
95
127
|
}
|
|
96
128
|
catch (err) {
|
|
@@ -100,8 +132,6 @@ class OpenCodeSchemaAdapter {
|
|
|
100
132
|
}
|
|
101
133
|
/** 获取增量消息（time_created > sinceTime） */
|
|
102
134
|
getRecentMessages(sinceTime) {
|
|
103
|
-
if (!this.db)
|
|
104
|
-
return [];
|
|
105
135
|
try {
|
|
106
136
|
let sql = 'SELECT id, session_id, data, time_created FROM message';
|
|
107
137
|
const params = [];
|
|
@@ -110,7 +140,7 @@ class OpenCodeSchemaAdapter {
|
|
|
110
140
|
params.push(sinceTime);
|
|
111
141
|
}
|
|
112
142
|
sql += ' ORDER BY time_created ASC';
|
|
113
|
-
const rows = this.
|
|
143
|
+
const rows = this.queryAll(sql, ...params);
|
|
114
144
|
return rows.map(r => ({ id: r.id, session_id: r.session_id, meta: this.parseMessageMeta(r.data) }));
|
|
115
145
|
}
|
|
116
146
|
catch (err) {
|
|
@@ -130,10 +160,8 @@ class OpenCodeSchemaAdapter {
|
|
|
130
160
|
}
|
|
131
161
|
/** 获取指定消息的全部部件 */
|
|
132
162
|
getPartsByMessage(messageId) {
|
|
133
|
-
if (!this.db)
|
|
134
|
-
return [];
|
|
135
163
|
try {
|
|
136
|
-
const rows = this.
|
|
164
|
+
const rows = this.queryAll('SELECT data FROM part WHERE message_id = ? ORDER BY time_created ASC', messageId);
|
|
137
165
|
return rows.map(r => this.parsePart(r.data)).filter(Boolean);
|
|
138
166
|
}
|
|
139
167
|
catch (err) {
|
|
@@ -149,7 +177,7 @@ class OpenCodeSchemaAdapter {
|
|
|
149
177
|
/** 获取指定会话的全部工具调用（两段式：message → part） */
|
|
150
178
|
getToolCallsBySession(sessionId) {
|
|
151
179
|
const results = [];
|
|
152
|
-
const msgs = this.
|
|
180
|
+
const msgs = this.queryAll('SELECT id FROM message WHERE session_id = ? ORDER BY time_created ASC', sessionId);
|
|
153
181
|
for (const msg of msgs) {
|
|
154
182
|
const tools = this.getToolCallsByMessage(msg.id);
|
|
155
183
|
for (const t of tools) {
|
|
@@ -165,13 +193,84 @@ class OpenCodeSchemaAdapter {
|
|
|
165
193
|
}
|
|
166
194
|
return results;
|
|
167
195
|
}
|
|
196
|
+
// ── 批量工具查询 ──────────────────────────────────
|
|
197
|
+
/** 批量获取工具调用（JOIN 查询，避免 N+1），支持增量拉取和分页 */
|
|
198
|
+
getToolCallsSince(sinceTime, limit, offset) {
|
|
199
|
+
try {
|
|
200
|
+
let sql = `
|
|
201
|
+
SELECT m.id as message_id, m.session_id, m.time_created, p.id as part_id, p.data as part_data
|
|
202
|
+
FROM message m
|
|
203
|
+
JOIN part p ON p.message_id = m.id
|
|
204
|
+
WHERE 1=1
|
|
205
|
+
`;
|
|
206
|
+
const params = [];
|
|
207
|
+
if (sinceTime) {
|
|
208
|
+
sql += ' AND m.time_created > ?';
|
|
209
|
+
params.push(sinceTime);
|
|
210
|
+
}
|
|
211
|
+
sql += ' ORDER BY m.time_created ASC, p.time_created ASC';
|
|
212
|
+
if (limit !== undefined) {
|
|
213
|
+
sql += ' LIMIT ?';
|
|
214
|
+
params.push(limit);
|
|
215
|
+
}
|
|
216
|
+
if (offset !== undefined) {
|
|
217
|
+
sql += ' OFFSET ?';
|
|
218
|
+
params.push(offset);
|
|
219
|
+
}
|
|
220
|
+
const rows = this.queryAll(sql, ...params);
|
|
221
|
+
const results = [];
|
|
222
|
+
for (const row of rows) {
|
|
223
|
+
const parsed = this.parsePart(row.part_data);
|
|
224
|
+
if (!parsed || parsed.type !== 'tool')
|
|
225
|
+
continue;
|
|
226
|
+
results.push({
|
|
227
|
+
messageId: row.message_id,
|
|
228
|
+
sessionId: row.session_id,
|
|
229
|
+
tool: parsed.tool || 'unknown',
|
|
230
|
+
callID: parsed.callID || `gen_${row.part_id}`,
|
|
231
|
+
input: parsed.state?.input,
|
|
232
|
+
output: parsed.state?.output,
|
|
233
|
+
status: parsed.state?.status || 'unknown',
|
|
234
|
+
partId: row.part_id,
|
|
235
|
+
timeCreated: row.time_created,
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
return results;
|
|
239
|
+
}
|
|
240
|
+
catch (err) {
|
|
241
|
+
logger.warn('Failed to query tool calls since', { error: err.message });
|
|
242
|
+
return [];
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
/** 获取工具调用总数（用于进度追踪） */
|
|
246
|
+
getToolCallsCount(sinceTime) {
|
|
247
|
+
try {
|
|
248
|
+
let sql = `
|
|
249
|
+
SELECT count(*) as cnt
|
|
250
|
+
FROM message m
|
|
251
|
+
JOIN part p ON p.message_id = m.id
|
|
252
|
+
WHERE 1=1
|
|
253
|
+
`;
|
|
254
|
+
const params = [];
|
|
255
|
+
if (sinceTime) {
|
|
256
|
+
sql += ' AND m.time_created > ?';
|
|
257
|
+
params.push(sinceTime);
|
|
258
|
+
}
|
|
259
|
+
const row = this.queryGet(sql, ...params);
|
|
260
|
+
return row?.cnt || 0;
|
|
261
|
+
}
|
|
262
|
+
catch (err) {
|
|
263
|
+
logger.warn('Failed to count tool calls', { error: err.message });
|
|
264
|
+
return 0;
|
|
265
|
+
}
|
|
266
|
+
}
|
|
168
267
|
/** 检查数据库是否可访问 */
|
|
169
268
|
healthCheck() {
|
|
170
269
|
try {
|
|
171
270
|
if (!this.db)
|
|
172
271
|
return { ok: false, drizzleVersion: 0, sessionCount: 0, messageCount: 0 };
|
|
173
|
-
const sc = this.
|
|
174
|
-
const mc = this.
|
|
272
|
+
const sc = this.queryGet('SELECT count(*) as c FROM session')?.c || 0;
|
|
273
|
+
const mc = this.queryGet('SELECT count(*) as c FROM message')?.c || 0;
|
|
175
274
|
return { ok: true, drizzleVersion: this.drizzleVersion, sessionCount: sc, messageCount: mc };
|
|
176
275
|
}
|
|
177
276
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-schema-adapter.js","sourceRoot":"","sources":["../../../src/services/opencode-schema-adapter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,qCAAwC;AACxC,+BAA4B;AAC5B,2BAA6B;AAE7B,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAC;AAyC9C,MAAa,qBAAqB;IACxB,EAAE,GAAQ,IAAI,CAAC;IACf,IAAI,CAAS;IACb,cAAc,GAAW,CAAC,CAAC;IAEnC,YAAY,UAAmB;QAC7B,IAAI,CAAC,IAAI,GAAG,UAAU,IAAI,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,YAAY,CAAQ,CAAC;YAClD,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"opencode-schema-adapter.js","sourceRoot":"","sources":["../../../src/services/opencode-schema-adapter.ts"],"names":[],"mappings":"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"}
|