@moxt-ai/mobius 0.0.154 → 0.0.156
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/dist/acp/agent-query-processes.d.ts +2 -1
- package/dist/acp/agent-query-processes.d.ts.map +1 -1
- package/dist/acp/agent-query-processes.js +7 -1
- package/dist/acp/agent-query-processes.js.map +1 -1
- package/dist/acp/agent-runtime-manager.d.ts +4 -2
- package/dist/acp/agent-runtime-manager.d.ts.map +1 -1
- package/dist/acp/agent-runtime-manager.js +19 -0
- package/dist/acp/agent-runtime-manager.js.map +1 -1
- package/dist/acp/agent-session.d.ts +2 -1
- package/dist/acp/agent-session.d.ts.map +1 -1
- package/dist/acp/agent-session.js +16 -2
- package/dist/acp/agent-session.js.map +1 -1
- package/dist/acp/session-contracts.d.ts +9 -1
- package/dist/acp/session-contracts.d.ts.map +1 -1
- package/dist/acp/session-contracts.js +1 -0
- package/dist/acp/session-contracts.js.map +1 -1
- package/dist/acp/session-history.d.ts +3 -2
- package/dist/acp/session-history.d.ts.map +1 -1
- package/dist/acp/session-history.js +17 -1
- package/dist/acp/session-history.js.map +1 -1
- package/dist/acp/session-store.d.ts +7 -0
- package/dist/acp/session-store.d.ts.map +1 -1
- package/dist/acp/session-store.js +34 -3
- package/dist/acp/session-store.js.map +1 -1
- package/dist/cli.js +1050 -402
- package/dist/cli.js.map +4 -4
- package/dist/daemon-command-handler.d.ts +3 -1
- package/dist/daemon-command-handler.d.ts.map +1 -1
- package/dist/daemon-command-handler.js +9 -3
- package/dist/daemon-command-handler.js.map +1 -1
- package/dist/daemon-history-commands.d.ts +2 -1
- package/dist/daemon-history-commands.d.ts.map +1 -1
- package/dist/daemon-history-commands.js +64 -1
- package/dist/daemon-history-commands.js.map +1 -1
- package/dist/daemon-observers.d.ts +3 -2
- package/dist/daemon-observers.d.ts.map +1 -1
- package/dist/daemon-observers.js +7 -1
- package/dist/daemon-observers.js.map +1 -1
- package/dist/daemon-prompt-executor.d.ts +3 -1
- package/dist/daemon-prompt-executor.d.ts.map +1 -1
- package/dist/daemon-prompt-executor.js +9 -3
- package/dist/daemon-prompt-executor.js.map +1 -1
- package/dist/generated/acp-session-store-migrations.d.ts +3 -0
- package/dist/generated/acp-session-store-migrations.d.ts.map +1 -1
- package/dist/generated/acp-session-store-migrations.js +5 -1
- package/dist/generated/acp-session-store-migrations.js.map +1 -1
- package/dist/index.js +1033 -385
- package/dist/index.js.map +4 -4
- package/dist/relay-connection/run-relay-connection.d.ts +3 -1
- package/dist/relay-connection/run-relay-connection.d.ts.map +1 -1
- package/dist/relay-connection/run-relay-connection.js +4 -16
- package/dist/relay-connection/run-relay-connection.js.map +1 -1
- package/dist/relay-connection/session-event-publisher.d.ts +5 -9
- package/dist/relay-connection/session-event-publisher.d.ts.map +1 -1
- package/dist/relay-connection/session-event-publisher.js +34 -131
- package/dist/relay-connection/session-event-publisher.js.map +1 -1
- package/dist/run-daemon.d.ts.map +1 -1
- package/dist/run-daemon.js +5 -2
- package/dist/run-daemon.js.map +1 -1
- package/dist/runtime.js +1032 -384
- package/dist/runtime.js.map +4 -4
- package/dist/schema/acp-session-store/index.d.ts +1 -0
- package/dist/schema/acp-session-store/index.d.ts.map +1 -1
- package/dist/schema/acp-session-store/index.js +1 -0
- package/dist/schema/acp-session-store/index.js.map +1 -1
- package/dist/schema/acp-session-store/session-event-v2.d.ts +82 -0
- package/dist/schema/acp-session-store/session-event-v2.d.ts.map +1 -0
- package/dist/schema/acp-session-store/session-event-v2.js +11 -0
- package/dist/schema/acp-session-store/session-event-v2.js.map +1 -0
- package/dist/session-event-log-v2.d.ts +15 -0
- package/dist/session-event-log-v2.d.ts.map +1 -0
- package/dist/session-event-log-v2.js +238 -0
- package/dist/session-event-log-v2.js.map +1 -0
- package/package.json +1 -1
- package/dist/relay-connection/session-event-queue.d.ts +0 -14
- package/dist/relay-connection/session-event-queue.d.ts.map +0 -1
- package/dist/relay-connection/session-event-queue.js +0 -75
- package/dist/relay-connection/session-event-queue.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-contracts.js","sourceRoot":"","sources":["../../src/acp/session-contracts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-contracts.js","sourceRoot":"","sources":["../../src/acp/session-contracts.ts"],"names":[],"mappings":"AAoHA,MAAM,OAAO,sBAAsB;IACtB,WAAW,GAAG,CAAC,UAAkB,EAAE,OAA2B,EAAiB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACpG,UAAU,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACpD,QAAQ,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,SAAS,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACnD,aAAa,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACvD,qBAAqB,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/D,MAAM,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAChD,YAAY,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACtD,oBAAoB,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC9D,OAAO,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;CAC7D;AAED,MAAM,OAAO,kBAAkB;IAClB,SAAS,CAAS;IAClB,YAAY,CAAS;IACrB,YAAY,CAAsB;IAClC,QAAQ,CAA4B;IACpC,aAAa,CAAiC;IAC9C,QAAQ,CAAU;IAClB,QAAQ,CAAU;IAE3B,YACI,SAAiB,EACjB,YAAoB,EACpB,YAAiC,EACjC,QAAmC,EACnC,aAA6C,EAC7C,QAAiB,EACjB,QAAiB;QAEjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAED,MAAM,OAAO,wBAAwB;IACxB,SAAS,CAAS;IAClB,YAAY,CAAS;IACrB,aAAa,CAAiC;IAEvD,YAAY,SAAiB,EAAE,YAAoB,EAAE,aAA6C;QAC9F,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;CACJ"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { SessionNotification } from "@agentclientprotocol/sdk";
|
|
2
|
-
import { type NativeSessionHistory } from "@moxt-ai/mobius-protocol";
|
|
2
|
+
import { type AcpSessionUpdateV2, type NativeSessionHistory } from "@moxt-ai/mobius-protocol";
|
|
3
3
|
/** Captures ACP load replay without turning historical updates into live turns. */
|
|
4
4
|
export declare class AcpHistoryReplay {
|
|
5
5
|
#private;
|
|
6
|
-
readonly record: (update: SessionNotification["update"]) => Promise<void>;
|
|
6
|
+
readonly record: (update: SessionNotification["update"], rawUpdate: AcpSessionUpdateV2) => Promise<void>;
|
|
7
|
+
readonly eventPage: (eventLimit: number, cursor: string | null) => import("./session-contracts.ts").AcpNativeEventReplayV2;
|
|
7
8
|
readonly snapshot: () => Promise<NativeSessionHistory>;
|
|
8
9
|
private readonly recordAssistantContent;
|
|
9
10
|
private readonly trimMessages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-history.d.ts","sourceRoot":"","sources":["../../src/acp/session-history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,
|
|
1
|
+
{"version":3,"file":"session-history.d.ts","sourceRoot":"","sources":["../../src/acp/session-history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EACH,KAAK,kBAAkB,EAIvB,KAAK,oBAAoB,EAE5B,MAAM,0BAA0B,CAAC;AAgDlC,mFAAmF;AACnF,qBAAa,gBAAgB;;IA0BzB,QAAQ,CAAC,MAAM,WAAkB,mBAAmB,CAAC,QAAQ,CAAC,aAAa,kBAAkB,KAAG,OAAO,CAAC,IAAI,CAAC,CA4F3G;IAEF,QAAQ,CAAC,SAAS,eACF,MAAM,UACV,MAAM,GAAG,IAAI,KACtB,OAAO,wBAAwB,EAAE,sBAAsB,CAaxD;IAEF,QAAQ,CAAC,QAAQ,QAAa,OAAO,CAAC,oBAAoB,CAAC,CAmDzD;IAEF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAmBrC;IAEF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAgB3B;CACL"}
|
|
@@ -30,6 +30,7 @@ function historyContentCharacters(messages) {
|
|
|
30
30
|
export class AcpHistoryReplay {
|
|
31
31
|
#activities = new Map();
|
|
32
32
|
#messages = [];
|
|
33
|
+
#updates = [];
|
|
33
34
|
#turnActivityIds = new Set();
|
|
34
35
|
#activityTracker = new AcpActivityTracker(async (activity) => {
|
|
35
36
|
this.#activities.set(activity.activityId, activity);
|
|
@@ -49,7 +50,8 @@ export class AcpHistoryReplay {
|
|
|
49
50
|
#firstMessageIndex = 0;
|
|
50
51
|
#characters = 0;
|
|
51
52
|
#truncated = false;
|
|
52
|
-
record = async (update) => {
|
|
53
|
+
record = async (update, rawUpdate) => {
|
|
54
|
+
this.#updates.push(rawUpdate);
|
|
53
55
|
if (update.sessionUpdate === "agent_thought_chunk") {
|
|
54
56
|
if (update.content.type === "text") {
|
|
55
57
|
await this.#activityTracker.recordNarrative("reasoning", update.messageId ?? "current", update.content.text);
|
|
@@ -130,6 +132,20 @@ export class AcpHistoryReplay {
|
|
|
130
132
|
this.#lastMessageId = id;
|
|
131
133
|
this.trimMessages();
|
|
132
134
|
};
|
|
135
|
+
eventPage = (eventLimit, cursor) => {
|
|
136
|
+
const parsedCursor = cursor === null ? this.#updates.length : Number(cursor);
|
|
137
|
+
if (!Number.isSafeInteger(parsedCursor) || parsedCursor < 0 || parsedCursor > this.#updates.length) {
|
|
138
|
+
throw new Error("The native event cursor is invalid");
|
|
139
|
+
}
|
|
140
|
+
const endUpdate = parsedCursor;
|
|
141
|
+
const startUpdate = Math.max(0, endUpdate - eventLimit);
|
|
142
|
+
return {
|
|
143
|
+
nextCursor: startUpdate === 0 ? null : startUpdate.toString(),
|
|
144
|
+
startPosition: startUpdate + 1,
|
|
145
|
+
truncated: startUpdate > 0,
|
|
146
|
+
updates: this.#updates.slice(startUpdate, endUpdate),
|
|
147
|
+
};
|
|
148
|
+
};
|
|
133
149
|
snapshot = async () => {
|
|
134
150
|
await this.#activityTracker.finish();
|
|
135
151
|
const messages = this.#messages
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-history.js","sourceRoot":"","sources":["../../src/acp/session-history.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"session-history.js","sourceRoot":"","sources":["../../src/acp/session-history.ts"],"names":[],"mappings":"AACA,OAAO,EAMH,+BAA+B,GAClC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAoB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAcjF,MAAM,4BAA4B,GAAG,OAAO,CAAC;AAC7C,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,SAAS,eAAe,CAAC,QAAqB;IAC1C,OAAO;QACH,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QAC7C,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QACjD,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QACvC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,4BAA4B,CAAC;QAC5D,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACvF,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QACjC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,4BAA4B,CAAC;QAC9D,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QACpC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;KAC3C,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAAC,QAAyC;IACvE,OAAO,QAAQ,CAAC,MAAM,CAClB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACf,KAAK;QACL,OAAO,CAAC,IAAI,CAAC,MAAM;QACnB,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YACzB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM;YACpF,CAAC,CAAC,CAAC,CAAC,EACZ,CAAC,CACJ,CAAC;AACN,CAAC;AAED,mFAAmF;AACnF,MAAM,OAAO,gBAAgB;IAChB,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,SAAS,GAAoB,EAAE,CAAC;IAChC,QAAQ,GAAyB,EAAE,CAAC;IACpC,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,gBAAgB,GAAG,IAAI,kBAAkB,CAC9C,KAAK,EAAE,QAAQ,EAAE,EAAE;QACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,MAAM,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;gBACxC,GAAG,MAAM;gBACT,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;aAC1C,CAAC;QACN,CAAC;IACL,CAAC;IACD,wEAAwE;IACxE,+CAA+C;IAC/C,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAC1B,CAAC;IACF,cAAc,GAAkB,IAAI,CAAC;IACrC,kBAAkB,GAAG,CAAC,CAAC;IACvB,WAAW,GAAG,CAAC,CAAC;IAChB,UAAU,GAAG,KAAK,CAAC;IAEV,MAAM,GAAG,KAAK,EAAE,MAAqC,EAAE,SAA6B,EAAiB,EAAE;QAC5G,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,aAAa,KAAK,qBAAqB,EAAE,CAAC;YACjD,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CACvC,WAAW,EACX,MAAM,CAAC,SAAS,IAAI,SAAS,EAC7B,MAAM,CAAC,OAAO,CAAC,IAAI,CACtB,CAAC;YACN,CAAC;YACD,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACnD,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,kBAAkB,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACzD,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/C,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;YACzC,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACrD,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/C,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,oBAAoB,IAAI,MAAM,CAAC,aAAa,KAAK,qBAAqB,EAAE,CAAC;YAClG,OAAO;QACX,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,KAAK,qBAAqB,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CACvC,UAAU,EACV,MAAM,CAAC,SAAS,IAAI,SAAS,EAC7B,MAAM,CAAC,OAAO,CAAC,IAAI,CACtB,CAAC;YACN,CAAC;YACD,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,KAAK,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;QAClF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,IAAI,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAClD,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAC9C,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtF,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GACN,OAAO,CAAC,IAAI,KAAK,MAAM;YACnB,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO;gBACxB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;oBACrB,CAAC,CAAC,iBAAiB,OAAO,CAAC,QAAQ,WAAW,OAAO,CAAC,IAAI,GAAG;oBAC7D,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC;wBAC7C,CAAC,CAAC,YAAY,OAAO,CAAC,GAAG,GAAG;wBAC5B,CAAC,CAAC,oBAAoB;gBAC5B,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,cAAc,CAAC;QAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC;QACpC,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,CAAC,cAAc,CAAC;QAC3E,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;YACrC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAClC,CAAC;QACD,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjE,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7C,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,+BAA+B,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,IAAI,KAAK,MAAM;YACX,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;YACzB,CAAC,CAAC;gBACI,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBACvC,OAAO,EAAE,QAAQ,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/D,IAAI;gBACJ,IAAI,EAAE,OAAO;aAChB,CACV,CAAC;QACF,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC,CAAC;IAEO,SAAS,GAAG,CACjB,UAAkB,EAClB,MAAqB,EACkC,EAAE;QACzD,MAAM,YAAY,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7E,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,CAAC,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACjG,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,SAAS,GAAG,YAAY,CAAC;QAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;QACxD,OAAO;YACH,UAAU,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE;YAC7D,aAAa,EAAE,WAAW,GAAG,CAAC;YAC9B,SAAS,EAAE,WAAW,GAAG,CAAC;YAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC;SACvD,CAAC;IACN,CAAC,CAAC;IAEO,QAAQ,GAAG,KAAK,IAAmC,EAAE;QAC1D,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,QAAQ,GAA2B,IAAI,CAAC,SAAS;aAClD,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;aAC9B,GAAG,CAAC,CAAC,OAAO,EAAwB,EAAE;YACnC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,OAAO,CAAC;YACnB,CAAC;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC1C,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;gBAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YAC3B,CAAC;YACD,OAAO;gBACH,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBACtC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC;aACxD,CAAC;QACN,CAAC,CAAC,CAAC;QACP,OAAO,wBAAwB,CAAC,QAAQ,CAAC,GAAG,+BAA+B,EAAE,CAAC;YAC1E,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAChC,CAAC,OAAO,EAAE,EAAE,CACR,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CACpG,CAAC;YACF,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;gBACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACJ,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACpC,IAAI,OAAO,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;oBAChC,QAAQ,CAAC,SAAS,CAAC,GAAG;wBAClB,GAAG,OAAO;wBACV,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU;wBAC5F,OAAO,EACH,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;4BACzD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;4BAC1B,CAAC,CAAC,OAAO,CAAC,OAAO;qBAC5B,CAAC;gBACN,CAAC;YACL,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,OAAO;YACH,MAAM,EAAE,WAAW;YACnB,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,iBAAiB,EAAE,EAAE;YACrB,iBAAiB,EAAE,EAAE;SACxB,CAAC;IACN,CAAC,CAAC;IAEe,sBAAsB,GAAG,CAAC,SAAwB,EAAE,OAA4B,EAAQ,EAAE;QACvG,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,SAAS,KAAK,IAAI,CAAC,cAAc,CAAC;QACzF,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;gBACxC,GAAG,QAAQ;gBACX,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBACvC,OAAO,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;aAC1C,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAChB,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBACvC,OAAO,EAAE,CAAC,OAAO,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,EAAE;aACX,CAAC,CAAC;QACP,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC,CAAC;IAEe,YAAY,GAAG,GAAS,EAAE;QACvC,OACI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,GAAG,qBAAqB;YACvE,IAAI,CAAC,WAAW,GAAG,+BAA+B,EACpD,CAAC;YACC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACxD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACxB,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;gBACxC,IAAI,CAAC,kBAAkB,IAAI,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,kBAAkB,IAAI,qBAAqB,EAAE,CAAC;YACnD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClD,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAChC,CAAC;IACL,CAAC,CAAC;CACL"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type SessionEventV2 } from "@moxt-ai/mobius-protocol";
|
|
1
2
|
export declare class AcpStoredSession {
|
|
2
3
|
readonly additionalDirectories: readonly string[];
|
|
3
4
|
readonly agentId: string;
|
|
@@ -25,32 +26,38 @@ export declare class DeletedAcpStoredSession extends AcpStoredSessionLookup {
|
|
|
25
26
|
readonly found = false;
|
|
26
27
|
}
|
|
27
28
|
export interface AcpSessionStore {
|
|
29
|
+
readonly appendEventV2: (event: SessionEventV2) => void;
|
|
28
30
|
readonly close: () => void;
|
|
29
31
|
readonly findNative: (agentId: string, nativeSessionId: string) => readonly AcpStoredSession[];
|
|
30
32
|
readonly list: () => readonly AcpStoredSession[];
|
|
31
33
|
readonly markDeleted: (agentId: string, nativeSessionId: string) => readonly string[];
|
|
32
34
|
readonly read: (sessionId: string) => AcpStoredSessionLookup;
|
|
35
|
+
readonly readEventsV2: (sessionId: string) => readonly SessionEventV2[];
|
|
33
36
|
readonly remove: (sessionId: string) => void;
|
|
34
37
|
readonly write: (session: AcpStoredSession) => void;
|
|
35
38
|
}
|
|
36
39
|
export declare class MemoryAcpSessionStore implements AcpSessionStore {
|
|
37
40
|
#private;
|
|
41
|
+
readonly appendEventV2: (event: SessionEventV2) => void;
|
|
38
42
|
readonly close: () => void;
|
|
39
43
|
readonly findNative: (agentId: string, nativeSessionId: string) => readonly AcpStoredSession[];
|
|
40
44
|
readonly list: () => readonly AcpStoredSession[];
|
|
41
45
|
readonly markDeleted: (agentId: string, nativeSessionId: string) => readonly string[];
|
|
42
46
|
readonly read: (sessionId: string) => AcpStoredSessionLookup;
|
|
43
47
|
readonly remove: (sessionId: string) => void;
|
|
48
|
+
readonly readEventsV2: (sessionId: string) => readonly SessionEventV2[];
|
|
44
49
|
readonly write: (session: AcpStoredSession) => void;
|
|
45
50
|
}
|
|
46
51
|
export declare class SqliteAcpSessionStore implements AcpSessionStore {
|
|
47
52
|
#private;
|
|
48
53
|
constructor(path: string);
|
|
49
54
|
readonly close: () => void;
|
|
55
|
+
readonly appendEventV2: (event: SessionEventV2) => void;
|
|
50
56
|
readonly findNative: (agentId: string, nativeSessionId: string) => readonly AcpStoredSession[];
|
|
51
57
|
readonly list: () => readonly AcpStoredSession[];
|
|
52
58
|
readonly markDeleted: (agentId: string, nativeSessionId: string) => readonly string[];
|
|
53
59
|
readonly read: (sessionId: string) => AcpStoredSessionLookup;
|
|
60
|
+
readonly readEventsV2: (sessionId: string) => readonly SessionEventV2[];
|
|
54
61
|
readonly remove: (sessionId: string) => void;
|
|
55
62
|
readonly write: (session: AcpStoredSession) => void;
|
|
56
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/acp/session-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/acp/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { chmodSync, mkdirSync } from "node:fs";
|
|
2
2
|
import { dirname } from "node:path";
|
|
3
|
+
import { decodeSessionEventV2 } from "@moxt-ai/mobius-protocol";
|
|
3
4
|
import Database from "better-sqlite3";
|
|
4
|
-
import { and, desc, eq } from "drizzle-orm";
|
|
5
|
+
import { and, asc, desc, eq } from "drizzle-orm";
|
|
5
6
|
import { drizzle } from "drizzle-orm/better-sqlite3";
|
|
6
7
|
import { z } from "zod";
|
|
7
8
|
import { acpSessionStoreMigrations } from "../generated/acp-session-store-migrations.js";
|
|
8
9
|
import * as schema from "../schema/acp-session-store/index.js";
|
|
9
|
-
import { acpSession, deletedAcpSession } from "../schema/acp-session-store/index.js";
|
|
10
|
+
import { acpSession, deletedAcpSession, sessionEventV2 } from "../schema/acp-session-store/index.js";
|
|
10
11
|
export class AcpStoredSession {
|
|
11
12
|
additionalDirectories;
|
|
12
13
|
agentId;
|
|
@@ -48,9 +49,14 @@ export class DeletedAcpStoredSession extends AcpStoredSessionLookup {
|
|
|
48
49
|
export class MemoryAcpSessionStore {
|
|
49
50
|
#sessions = new Map();
|
|
50
51
|
#deleted = new Set();
|
|
52
|
+
#eventsV2 = new Map();
|
|
53
|
+
appendEventV2 = (event) => {
|
|
54
|
+
this.#eventsV2.set(event.sessionId, [...(this.#eventsV2.get(event.sessionId) ?? []), event]);
|
|
55
|
+
};
|
|
51
56
|
close = () => {
|
|
52
57
|
this.#sessions.clear();
|
|
53
58
|
this.#deleted.clear();
|
|
59
|
+
this.#eventsV2.clear();
|
|
54
60
|
};
|
|
55
61
|
findNative = (agentId, nativeSessionId) => [...this.#sessions.values()].filter((session) => session.agentId === agentId && session.nativeSessionId === nativeSessionId);
|
|
56
62
|
list = () => [...this.#sessions.values()].toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt));
|
|
@@ -59,6 +65,7 @@ export class MemoryAcpSessionStore {
|
|
|
59
65
|
for (const id of ids) {
|
|
60
66
|
this.#sessions.delete(id);
|
|
61
67
|
this.#deleted.add(id);
|
|
68
|
+
this.#eventsV2.delete(id);
|
|
62
69
|
}
|
|
63
70
|
return ids;
|
|
64
71
|
};
|
|
@@ -71,7 +78,9 @@ export class MemoryAcpSessionStore {
|
|
|
71
78
|
};
|
|
72
79
|
remove = (sessionId) => {
|
|
73
80
|
this.#sessions.delete(sessionId);
|
|
81
|
+
this.#eventsV2.delete(sessionId);
|
|
74
82
|
};
|
|
83
|
+
readEventsV2 = (sessionId) => this.#eventsV2.get(sessionId) ?? [];
|
|
75
84
|
write = (session) => {
|
|
76
85
|
this.#sessions.set(session.sessionId, session);
|
|
77
86
|
};
|
|
@@ -134,6 +143,17 @@ export class SqliteAcpSessionStore {
|
|
|
134
143
|
close = () => {
|
|
135
144
|
this.#sqliteDatabase.close();
|
|
136
145
|
};
|
|
146
|
+
appendEventV2 = (event) => {
|
|
147
|
+
this.#database
|
|
148
|
+
.insert(sessionEventV2)
|
|
149
|
+
.values({
|
|
150
|
+
eventId: event.eventId,
|
|
151
|
+
eventJson: JSON.stringify(event),
|
|
152
|
+
position: Number(event.position),
|
|
153
|
+
sessionId: event.sessionId,
|
|
154
|
+
})
|
|
155
|
+
.run();
|
|
156
|
+
};
|
|
137
157
|
findNative = (agentId, nativeSessionId) => this.#database
|
|
138
158
|
.select()
|
|
139
159
|
.from(acpSession)
|
|
@@ -155,6 +175,7 @@ export class SqliteAcpSessionStore {
|
|
|
155
175
|
.run();
|
|
156
176
|
for (const id of ids) {
|
|
157
177
|
transaction.insert(deletedAcpSession).values({ sessionId: id }).onConflictDoNothing().run();
|
|
178
|
+
transaction.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, id)).run();
|
|
158
179
|
}
|
|
159
180
|
});
|
|
160
181
|
return ids;
|
|
@@ -172,8 +193,18 @@ export class SqliteAcpSessionStore {
|
|
|
172
193
|
const row = this.#database.select().from(acpSession).where(eq(acpSession.sessionId, sessionId)).get();
|
|
173
194
|
return row === undefined ? new MissingAcpStoredSession() : new FoundAcpStoredSession(decodeStoredSession(row));
|
|
174
195
|
};
|
|
196
|
+
readEventsV2 = (sessionId) => this.#database
|
|
197
|
+
.select({ eventJson: sessionEventV2.eventJson })
|
|
198
|
+
.from(sessionEventV2)
|
|
199
|
+
.where(eq(sessionEventV2.sessionId, sessionId))
|
|
200
|
+
.orderBy(asc(sessionEventV2.position))
|
|
201
|
+
.all()
|
|
202
|
+
.map((row) => decodeSessionEventV2(row.eventJson));
|
|
175
203
|
remove = (sessionId) => {
|
|
176
|
-
this.#database.
|
|
204
|
+
this.#database.transaction((transaction) => {
|
|
205
|
+
transaction.delete(acpSession).where(eq(acpSession.sessionId, sessionId)).run();
|
|
206
|
+
transaction.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
|
|
207
|
+
});
|
|
177
208
|
};
|
|
178
209
|
write = (session) => {
|
|
179
210
|
const value = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/acp/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/acp/session-store.ts"],"names":[],"mappings":"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"}
|