@moxt-ai/mobius 0.0.390 → 0.0.391
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/{chunk-KWRP3J26.js → chunk-4VUCI4MS.js} +2 -2
- package/dist/{chunk-KWRP3J26.js.map → chunk-4VUCI4MS.js.map} +1 -1
- package/dist/{chunk-ZW763PCS.js → chunk-TQJ2GJH7.js} +113 -22
- package/dist/{chunk-ZW763PCS.js.map → chunk-TQJ2GJH7.js.map} +4 -4
- package/dist/{cli-K2JBHPL5.js → cli-FNJ2BQAZ.js} +3 -3
- package/dist/cli.js +2 -2
- package/dist/engine/generated/command-cancellation-migrations.d.ts +5 -0
- package/dist/engine/generated/command-cancellation-migrations.d.ts.map +1 -0
- package/dist/engine/generated/command-cancellation-migrations.js +9 -0
- package/dist/engine/generated/command-cancellation-migrations.js.map +1 -0
- package/dist/engine/schema/command-cancellation/cancelled-command.d.ts +41 -0
- package/dist/engine/schema/command-cancellation/cancelled-command.d.ts.map +1 -0
- package/dist/engine/schema/command-cancellation/cancelled-command.js +7 -0
- package/dist/engine/schema/command-cancellation/cancelled-command.js.map +1 -0
- package/dist/engine/schema/command-cancellation/index.d.ts +2 -0
- package/dist/engine/schema/command-cancellation/index.d.ts.map +1 -0
- package/dist/engine/schema/command-cancellation/index.js +2 -0
- package/dist/engine/schema/command-cancellation/index.js.map +1 -0
- package/dist/engine/session/api/session-layer.d.ts.map +1 -1
- package/dist/engine/session/api/session-layer.js +6 -2
- package/dist/engine/session/api/session-layer.js.map +1 -1
- package/dist/engine/session/turn/execution-receipts.d.ts +2 -1
- package/dist/engine/session/turn/execution-receipts.d.ts.map +1 -1
- package/dist/engine/session/turn/execution-receipts.js +91 -33
- package/dist/engine/session/turn/execution-receipts.js.map +1 -1
- package/dist/engine/storage/session/command-cancellation-table.d.ts +17 -0
- package/dist/engine/storage/session/command-cancellation-table.d.ts.map +1 -0
- package/dist/engine/storage/session/command-cancellation-table.js +28 -0
- package/dist/engine/storage/session/command-cancellation-table.js.map +1 -0
- package/dist/engine/storage/sqlite/local-databases.d.ts +3 -0
- package/dist/engine/storage/sqlite/local-databases.d.ts.map +1 -1
- package/dist/engine/storage/sqlite/local-databases.js +4 -0
- package/dist/engine/storage/sqlite/local-databases.js.map +1 -1
- package/dist/engine.js +2 -2
- package/package.json +1 -1
- /package/dist/{cli-K2JBHPL5.js.map → cli-FNJ2BQAZ.js.map} +0 -0
|
@@ -26,10 +26,10 @@ import {
|
|
|
26
26
|
unhandledRejectionLogFilename,
|
|
27
27
|
validateLocalPath,
|
|
28
28
|
validatePairingId
|
|
29
|
-
} from "./chunk-
|
|
29
|
+
} from "./chunk-TQJ2GJH7.js";
|
|
30
30
|
import {
|
|
31
31
|
package_default
|
|
32
|
-
} from "./chunk-
|
|
32
|
+
} from "./chunk-4VUCI4MS.js";
|
|
33
33
|
|
|
34
34
|
// ../../node_modules/.pnpm/commander@15.0.0/node_modules/commander/lib/error.js
|
|
35
35
|
var CommanderError = class extends Error {
|
|
@@ -5675,4 +5675,4 @@ async function runCLI() {
|
|
|
5675
5675
|
export {
|
|
5676
5676
|
runCLI
|
|
5677
5677
|
};
|
|
5678
|
-
//# sourceMappingURL=cli-
|
|
5678
|
+
//# sourceMappingURL=cli-FNJ2BQAZ.js.map
|
package/dist/cli.js
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
__commonJS,
|
|
4
4
|
__toESM,
|
|
5
5
|
package_default
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-4VUCI4MS.js";
|
|
7
7
|
|
|
8
8
|
// ../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/constants.js
|
|
9
9
|
var require_constants = __commonJS({
|
|
@@ -2008,7 +2008,7 @@ if (!(0, import_semver.satisfies)(process.versions.node, package_default.engines
|
|
|
2008
2008
|
);
|
|
2009
2009
|
process.exitCode = 1;
|
|
2010
2010
|
} else {
|
|
2011
|
-
const { runCLI } = await import("./cli-
|
|
2011
|
+
const { runCLI } = await import("./cli-FNJ2BQAZ.js");
|
|
2012
2012
|
await runCLI();
|
|
2013
2013
|
}
|
|
2014
2014
|
//# sourceMappingURL=cli.js.map
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare const commandCancellationMigrations: readonly [{
|
|
2
|
+
readonly name: "0000_tired_cardiac.sql";
|
|
3
|
+
readonly sql: "CREATE TABLE `cancelled_command` (\n\t`command_id` text PRIMARY KEY NOT NULL,\n\t`session_id` text NOT NULL\n);\n";
|
|
4
|
+
}];
|
|
5
|
+
//# sourceMappingURL=command-cancellation-migrations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-cancellation-migrations.d.ts","sourceRoot":"","sources":["../../../src/engine/generated/command-cancellation-migrations.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,6BAA6B;aAElC,IAAM,EAAE,wBAAwB;aAChC,GAAK,EAAE,mHAAmH;EAExH,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// Generated by scripts/generate-sql-modules.ts. Do not edit.
|
|
2
|
+
// Sources: ../../../migrations/command-cancellation/0000_tired_cardiac.sql
|
|
3
|
+
export const commandCancellationMigrations = [
|
|
4
|
+
{
|
|
5
|
+
"name": "0000_tired_cardiac.sql",
|
|
6
|
+
"sql": "CREATE TABLE `cancelled_command` (\n\t`command_id` text PRIMARY KEY NOT NULL,\n\t`session_id` text NOT NULL\n);\n"
|
|
7
|
+
}
|
|
8
|
+
];
|
|
9
|
+
//# sourceMappingURL=command-cancellation-migrations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-cancellation-migrations.js","sourceRoot":"","sources":["../../../src/engine/generated/command-cancellation-migrations.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,2EAA2E;AAC3E,MAAM,CAAC,MAAM,6BAA6B,GAAG;IACzC;QACI,MAAM,EAAE,wBAAwB;QAChC,KAAK,EAAE,mHAAmH;KAC7H;CACK,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/** Explicit cancellation is a permanent command fact, independent of execution and receipt retention. */
|
|
2
|
+
export declare const cancelledCommand: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
|
|
3
|
+
name: "cancelled_command";
|
|
4
|
+
schema: undefined;
|
|
5
|
+
columns: {
|
|
6
|
+
commandId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
7
|
+
name: string;
|
|
8
|
+
tableName: "cancelled_command";
|
|
9
|
+
dataType: "string";
|
|
10
|
+
data: string;
|
|
11
|
+
driverParam: string;
|
|
12
|
+
notNull: true;
|
|
13
|
+
hasDefault: false;
|
|
14
|
+
isPrimaryKey: true;
|
|
15
|
+
isAutoincrement: false;
|
|
16
|
+
hasRuntimeDefault: false;
|
|
17
|
+
enumValues: [string, ...string[]];
|
|
18
|
+
baseColumn: never;
|
|
19
|
+
identity: undefined;
|
|
20
|
+
generated: undefined;
|
|
21
|
+
}, {}>;
|
|
22
|
+
sessionId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
23
|
+
name: string;
|
|
24
|
+
tableName: "cancelled_command";
|
|
25
|
+
dataType: "string";
|
|
26
|
+
data: string;
|
|
27
|
+
driverParam: string;
|
|
28
|
+
notNull: true;
|
|
29
|
+
hasDefault: false;
|
|
30
|
+
isPrimaryKey: false;
|
|
31
|
+
isAutoincrement: false;
|
|
32
|
+
hasRuntimeDefault: false;
|
|
33
|
+
enumValues: [string, ...string[]];
|
|
34
|
+
baseColumn: never;
|
|
35
|
+
identity: undefined;
|
|
36
|
+
generated: undefined;
|
|
37
|
+
}, {}>;
|
|
38
|
+
};
|
|
39
|
+
dialect: 'sqlite';
|
|
40
|
+
}>;
|
|
41
|
+
//# sourceMappingURL=cancelled-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cancelled-command.d.ts","sourceRoot":"","sources":["../../../../src/engine/schema/command-cancellation/cancelled-command.ts"],"names":[],"mappings":"AAEA,yGAAyG;AACzG,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG3B,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { sqliteTable, text } from "drizzle-orm/sqlite-core";
|
|
2
|
+
/** Explicit cancellation is a permanent command fact, independent of execution and receipt retention. */
|
|
3
|
+
export const cancelledCommand = sqliteTable("cancelled_command", {
|
|
4
|
+
commandId: text("command_id").primaryKey(),
|
|
5
|
+
sessionId: text("session_id").notNull(),
|
|
6
|
+
});
|
|
7
|
+
//# sourceMappingURL=cancelled-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cancelled-command.js","sourceRoot":"","sources":["../../../../src/engine/schema/command-cancellation/cancelled-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE5D,yGAAyG;AACzG,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,mBAAmB,EAAE;IAC7D,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE;IAC1C,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;CAC1C,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/engine/schema/command-cancellation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/engine/schema/command-cancellation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-layer.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/api/session-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"session-layer.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/api/session-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAYjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,sGAAsG;AACtG,qBAAa,oBAAqB,SAAQ,mBAAmB;;IAKzD,YACI,MAAM,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,EACzC,WAAW,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,EACrD,kBAAkB,GAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,KAAK,IAAe,EAMxF;IAED,SAAkB,oBAAoB,WAAY,MAAM,YAAY,kBAAkB,KAAG,IAAI,CAE3F;IAEF,SAAkB,cAAc,UAAW,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAAC,CAGzE;IAEF,SAAkB,MAAM,UAAW,uBAAuB,KAAG,OAAO,CAAC,IAAI,CAAC,CAGxE;CACL;AAED,2GAA2G;AAC3G,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAC5C,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACzB;AAED,wGAAwG;AACxG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB;;;;;;;;;EAoH7D"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AcpSessionTable } from "../../storage/session/acp-session-table.js";
|
|
2
|
+
import { CommandCancellationTable } from "../../storage/session/command-cancellation-table.js";
|
|
2
3
|
import { ExecutionReceiptTable } from "../../storage/session/execution-receipt-table.js";
|
|
3
4
|
import { LiveEventPositionTable } from "../../storage/session/live-event-position-table.js";
|
|
4
5
|
import { SessionEventCacheTable } from "../../storage/session/session-event-cache-table.js";
|
|
5
|
-
import { channelSessionDatabasePaths, openAcpSessionDatabase, openSessionEventCacheDatabase, } from "../../storage/sqlite/local-databases.js";
|
|
6
|
+
import { channelSessionDatabasePaths, openAcpSessionDatabase, openCommandCancellationDatabase, openSessionEventCacheDatabase, } from "../../storage/sqlite/local-databases.js";
|
|
6
7
|
import { SqliteSessionLiveEventPosition } from "../history/live-event-positions.js";
|
|
7
8
|
import { CachedSessionEventStore } from "../history/session-event-store.js";
|
|
8
9
|
import { SessionManager } from "../manager/session-manager.js";
|
|
@@ -43,11 +44,14 @@ export function buildSessionLayer(options) {
|
|
|
43
44
|
const sessionDatabase = openAcpSessionDatabase(databases.sessions);
|
|
44
45
|
let events;
|
|
45
46
|
let operations;
|
|
47
|
+
let cancellations;
|
|
46
48
|
try {
|
|
47
|
-
|
|
49
|
+
cancellations = new CommandCancellationTable(openCommandCancellationDatabase(databases.cancellations));
|
|
50
|
+
operations = new ExecutionReceipts(new ExecutionReceiptTable(sessionDatabase), cancellations, options.onExecutionCountChange);
|
|
48
51
|
events = new CachedSessionEventStore(new SessionEventCacheTable(openSessionEventCacheDatabase(databases.events)), new SqliteSessionLiveEventPosition(new LiveEventPositionTable(sessionDatabase)));
|
|
49
52
|
}
|
|
50
53
|
catch (error) {
|
|
54
|
+
cancellations?.close();
|
|
51
55
|
sessionDatabase.close();
|
|
52
56
|
throw error;
|
|
53
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-layer.js","sourceRoot":"","sources":["../../../../src/engine/session/api/session-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,EACH,2BAA2B,EAC3B,sBAAsB,EACtB,6BAA6B,GAChC,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,sGAAsG;AACtG,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;IAChD,mBAAmB,CAAyD;IAC5E,YAAY,CAA2C;IACvD,OAAO,CAAoC;IAEpD,YACI,MAAyC,EACzC,WAAqD,EACrD,kBAAkB,GAA2D,GAAG,EAAE,GAAE,CAAC;QAErF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAEiB,oBAAoB,GAAG,CAAC,MAAc,EAAE,QAA4B,EAAQ,EAAE;QAC5F,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEgB,cAAc,GAAG,CAAC,KAAuB,EAAiB,EAAE;QAC1E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAC;IAEgB,MAAM,GAAG,CAAC,KAA8B,EAAiB,EAAE;QACzE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAC;CACL;AAgBD,wGAAwG;AACxG,MAAM,UAAU,iBAAiB,CAAC,OAA4B;IAC1D,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACtG,MAAM,SAAS,GAAG,2BAA2B,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,sBAAsB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnE,IAAI,MAA+B,CAAC;IACpC,IAAI,UAA6B,CAAC;IAClC,IAAI,CAAC;QACD,UAAU,GAAG,IAAI,iBAAiB,
|
|
1
|
+
{"version":3,"file":"session-layer.js","sourceRoot":"","sources":["../../../../src/engine/session/api/session-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type CommandDelivery, type LastTurnOutcome, type SessionEventPayload, type SessionLiveEvent } from "@moxt-ai/mobius-sdk/protocol";
|
|
2
|
+
import type { CommandCancellationTable } from "../../storage/session/command-cancellation-table.ts";
|
|
2
3
|
import type { ExecutionReceiptTable } from "../../storage/session/execution-receipt-table.ts";
|
|
3
4
|
export type RuntimeExecutionReceipt = Readonly<{
|
|
4
5
|
attemptId: string;
|
|
@@ -16,7 +17,7 @@ export type RuntimeExecutionReceipt = Readonly<{
|
|
|
16
17
|
};
|
|
17
18
|
export declare class ExecutionReceipts {
|
|
18
19
|
#private;
|
|
19
|
-
constructor(table: ExecutionReceiptTable, onCount?: (count: number) => void);
|
|
20
|
+
constructor(table: ExecutionReceiptTable, cancellations: CommandCancellationTable, onCount?: (count: number) => void);
|
|
20
21
|
readonly beginShutdown: () => void;
|
|
21
22
|
readonly outcome: (commandId: string) => SessionEventPayload | undefined;
|
|
22
23
|
/** The command's delivery as these receipts know it; another Session's command reads as unknown. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-receipts.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,eAAe,EAIpB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAI9F,MAAM,MAAM,uBAAuB,GAC7B,QAAQ,CAAC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,UAAU,CAAC;CACpB,CAAC,GACF,QAAQ,CAAC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC5C,CAAC,GACF;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"execution-receipts.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,eAAe,EAIpB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EACR,wBAAwB,EAE3B,MAAM,qDAAqD,CAAC;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAI9F,MAAM,MAAM,uBAAuB,GAC7B,QAAQ,CAAC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,UAAU,CAAC;CACpB,CAAC,GACF,QAAQ,CAAC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC5C,CAAC,GACF;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AA+DnC,qBAAa,iBAAiB;;IAQ1B,YACI,KAAK,EAAE,qBAAqB,EAC5B,aAAa,EAAE,wBAAwB,EACvC,OAAO,GAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAsB,EAmBrD;IAiDD,QAAQ,CAAC,aAAa,QAAO,IAAI,CAE/B;IACF,QAAQ,CAAC,OAAO,cAAe,MAAM,KAAG,mBAAmB,GAAG,SAAS,CAIrE;IACF,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,cAAe,MAAM,aAAa,MAAM,KAAG,eAAe,CAyBzE;IACF;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,cAAe,MAAM,KAAG,eAAe,GAAG,SAAS,CA+BlE;IACF,uFAAuF;IACvF,QAAQ,CAAC,UAAU,cAAe,MAAM,aAAa,MAAM,KAAG,OAAO,CAMnE;IAEF,kGAAkG;IAClG,QAAQ,CAAC,iCAAiC,cAC3B,MAAM,aACN,MAAM,KAClB,mBAAmB,GAAG,SAAS,CAuDhC;IACF;;;;OAIG;IACH,QAAQ,CAAC,MAAM,UAAW,gBAAgB,KAAG,IAAI,CA8B/C;IACF,QAAQ,CAAC,OAAO,QAAO,SAAS;QAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;QACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;KAC/B,EAAE,CAqDD;IAEF,QAAQ,CAAC,cAAc,cAAe,MAAM,aAAa,MAAM,eAAe,MAAM,KAAG,uBAAuB,CA6C5G;IAEF,sEAAsE;IACtE,QAAQ,CAAC,sBAAsB,cAAe,MAAM,aAAa,MAAM,KAAG,MAAM,GAAG,IAAI,CAGrF;IAEF,QAAQ,CAAC,mBAAmB,cAAe,MAAM,aAAa,MAAM,KAAG,OAAO,CAG5E;IAEF,QAAQ,CAAC,KAAK,QAAO,IAAI,CAIvB;CACL"}
|
|
@@ -17,6 +17,15 @@ function executionStarted(state) {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
+
function cancelledBeforeStart(state) {
|
|
21
|
+
if (state.kind !== "settled-before-start") {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
const outcome = decodeKnownSessionEventPayload(JSON.parse(state.outcome));
|
|
25
|
+
return (outcome?.type === "lifecycle-metadata" &&
|
|
26
|
+
outcome.payload.kind === "prompt.completed" &&
|
|
27
|
+
outcome.payload.stopReason === "cancelled");
|
|
28
|
+
}
|
|
20
29
|
function executionOutcome(state) {
|
|
21
30
|
switch (state.kind) {
|
|
22
31
|
case "pending":
|
|
@@ -38,31 +47,29 @@ export class ExecutionReceipts {
|
|
|
38
47
|
#executions = new Map();
|
|
39
48
|
#recoveredCommands = new Set();
|
|
40
49
|
#table;
|
|
50
|
+
#cancellations;
|
|
41
51
|
#closing = false;
|
|
42
52
|
#onCount;
|
|
43
|
-
constructor(table, onCount = () => undefined) {
|
|
53
|
+
constructor(table, cancellations, onCount = () => undefined) {
|
|
44
54
|
this.#onCount = onCount;
|
|
45
55
|
this.#table = table;
|
|
56
|
+
this.#cancellations = cancellations;
|
|
57
|
+
const retained = [];
|
|
46
58
|
for (const { commandId, started, outcome, updatedAt: _updatedAt, ...identity } of table.list()) {
|
|
47
|
-
const
|
|
59
|
+
const pending = { kind: started ? "started" : "pending" };
|
|
60
|
+
const state = outcome === null ? pending : settledExecution(pending, outcome);
|
|
48
61
|
this.#executions.set(commandId, {
|
|
49
62
|
...identity,
|
|
50
|
-
state
|
|
63
|
+
state,
|
|
51
64
|
});
|
|
65
|
+
if (cancelledBeforeStart(state)) {
|
|
66
|
+
retained.push({ commandId, sessionId: identity.sessionId });
|
|
67
|
+
}
|
|
52
68
|
this.#recoveredCommands.add(commandId);
|
|
53
69
|
}
|
|
70
|
+
cancellations.retain(retained);
|
|
54
71
|
}
|
|
55
|
-
#
|
|
56
|
-
const { state, ...identity } = receipt;
|
|
57
|
-
const evicted = this.#closing
|
|
58
|
-
? []
|
|
59
|
-
: this.#table.save({
|
|
60
|
-
...identity,
|
|
61
|
-
commandId,
|
|
62
|
-
started: executionStarted(state),
|
|
63
|
-
outcome: durableOutcome,
|
|
64
|
-
updatedAt: new Date().toISOString(),
|
|
65
|
-
}, MAX_TERMINAL_RECEIPTS);
|
|
72
|
+
#remember = (commandId, receipt, evicted) => {
|
|
66
73
|
// Live failure detail may quote user input; only the durable receipt goes to the table.
|
|
67
74
|
this.#executions.set(commandId, receipt);
|
|
68
75
|
for (const evictedCommandId of evicted) {
|
|
@@ -77,6 +84,25 @@ export class ExecutionReceipts {
|
|
|
77
84
|
}
|
|
78
85
|
this.#onCount(activeCount);
|
|
79
86
|
};
|
|
87
|
+
#save = (commandId, receipt, durableOutcome = executionOutcome(receipt.state)) => {
|
|
88
|
+
const { state, ...identity } = receipt;
|
|
89
|
+
if (!this.#closing && cancelledBeforeStart(state)) {
|
|
90
|
+
// Commit the non-replayable fact first. A crash before saving/pruning the receipt must not reopen work.
|
|
91
|
+
this.#cancellations.retain([{ commandId, sessionId: receipt.sessionId }]);
|
|
92
|
+
// Cancellation is already authoritative even if the detailed receipt write fails.
|
|
93
|
+
this.#remember(commandId, receipt, []);
|
|
94
|
+
}
|
|
95
|
+
const evicted = this.#closing
|
|
96
|
+
? []
|
|
97
|
+
: this.#table.save({
|
|
98
|
+
...identity,
|
|
99
|
+
commandId,
|
|
100
|
+
started: executionStarted(state),
|
|
101
|
+
outcome: durableOutcome,
|
|
102
|
+
updatedAt: new Date().toISOString(),
|
|
103
|
+
}, MAX_TERMINAL_RECEIPTS);
|
|
104
|
+
this.#remember(commandId, receipt, evicted);
|
|
105
|
+
};
|
|
80
106
|
#nextAdmissionOrder = () => {
|
|
81
107
|
let latest = 0;
|
|
82
108
|
for (const receipt of this.#executions.values()) {
|
|
@@ -96,7 +122,8 @@ export class ExecutionReceipts {
|
|
|
96
122
|
delivery = (commandId, sessionId) => {
|
|
97
123
|
const receipt = this.#executions.get(commandId);
|
|
98
124
|
if (receipt === undefined) {
|
|
99
|
-
return this.#table.identity(commandId)?.sessionId === sessionId
|
|
125
|
+
return this.#table.identity(commandId)?.sessionId === sessionId ||
|
|
126
|
+
this.#cancellations.read(commandId)?.sessionId === sessionId
|
|
100
127
|
? { state: "expired" }
|
|
101
128
|
: { state: "unknown" };
|
|
102
129
|
}
|
|
@@ -177,6 +204,20 @@ export class ExecutionReceipts {
|
|
|
177
204
|
}
|
|
178
205
|
: undefined;
|
|
179
206
|
}
|
|
207
|
+
const cancellation = this.#cancellations.read(commandId);
|
|
208
|
+
if (cancellation !== undefined) {
|
|
209
|
+
return cancellation.sessionId === sessionId
|
|
210
|
+
? {
|
|
211
|
+
type: "lifecycle-metadata",
|
|
212
|
+
payload: {
|
|
213
|
+
kind: "prompt.completed",
|
|
214
|
+
commandId,
|
|
215
|
+
stopReason: "cancelled",
|
|
216
|
+
execution: "not-started",
|
|
217
|
+
},
|
|
218
|
+
}
|
|
219
|
+
: undefined;
|
|
220
|
+
}
|
|
180
221
|
const outcome = {
|
|
181
222
|
type: "lifecycle-metadata",
|
|
182
223
|
payload: { kind: "prompt.completed", commandId, stopReason: "cancelled", execution: "not-started" },
|
|
@@ -236,33 +277,46 @@ export class ExecutionReceipts {
|
|
|
236
277
|
const recovered = [];
|
|
237
278
|
for (const [commandId, receipt] of [...this.#executions]) {
|
|
238
279
|
const outcome = executionOutcome(receipt.state);
|
|
239
|
-
const
|
|
280
|
+
const restoreCancellation = !this.hasStarted(commandId, receipt.sessionId) &&
|
|
281
|
+
!cancelledBeforeStart(receipt.state) &&
|
|
282
|
+
this.#cancellations.read(commandId)?.sessionId === receipt.sessionId;
|
|
283
|
+
const event = restoreCancellation
|
|
240
284
|
? {
|
|
241
285
|
type: "lifecycle-metadata",
|
|
242
|
-
payload:
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
message: "The local runtime restarted while this request was running",
|
|
249
|
-
}
|
|
250
|
-
: {
|
|
251
|
-
kind: "prompt.failed-before-start",
|
|
252
|
-
commandId,
|
|
253
|
-
code: "runtime_restarted",
|
|
254
|
-
message: "The local runtime restarted before this request started",
|
|
255
|
-
},
|
|
286
|
+
payload: {
|
|
287
|
+
kind: "prompt.completed",
|
|
288
|
+
commandId,
|
|
289
|
+
stopReason: "cancelled",
|
|
290
|
+
execution: "not-started",
|
|
291
|
+
},
|
|
256
292
|
}
|
|
257
|
-
:
|
|
293
|
+
: outcome === null
|
|
294
|
+
? {
|
|
295
|
+
type: "lifecycle-metadata",
|
|
296
|
+
payload: executionStarted(receipt.state)
|
|
297
|
+
? {
|
|
298
|
+
kind: "prompt.failed",
|
|
299
|
+
commandId,
|
|
300
|
+
attemptId: receipt.attemptId,
|
|
301
|
+
code: "runtime_restarted",
|
|
302
|
+
message: "The local runtime restarted while this request was running",
|
|
303
|
+
}
|
|
304
|
+
: {
|
|
305
|
+
kind: "prompt.failed-before-start",
|
|
306
|
+
commandId,
|
|
307
|
+
code: "runtime_restarted",
|
|
308
|
+
message: "The local runtime restarted before this request started",
|
|
309
|
+
},
|
|
310
|
+
}
|
|
311
|
+
: decodeKnownSessionEventPayload(JSON.parse(outcome));
|
|
258
312
|
if (event === null) {
|
|
259
313
|
continue;
|
|
260
314
|
}
|
|
261
|
-
const recordedAt = outcome === null
|
|
315
|
+
const recordedAt = restoreCancellation || outcome === null
|
|
262
316
|
? new Date().toISOString()
|
|
263
317
|
: z.object({ recordedAt: z.string() }).parse(JSON.parse(outcome)).recordedAt;
|
|
264
318
|
recovered.push({ sessionId: receipt.sessionId, event, recordedAt });
|
|
265
|
-
if (outcome === null) {
|
|
319
|
+
if (restoreCancellation || outcome === null) {
|
|
266
320
|
this.#save(commandId, {
|
|
267
321
|
...receipt,
|
|
268
322
|
state: settledExecution(receipt.state, JSON.stringify({ ...event, recordedAt })),
|
|
@@ -302,6 +356,9 @@ export class ExecutionReceipts {
|
|
|
302
356
|
? { kind: "expired" }
|
|
303
357
|
: { kind: "conflict" };
|
|
304
358
|
}
|
|
359
|
+
if (this.#cancellations.read(commandId) !== undefined) {
|
|
360
|
+
return { kind: "conflict" };
|
|
361
|
+
}
|
|
305
362
|
const attemptId = randomUUID();
|
|
306
363
|
this.#save(commandId, {
|
|
307
364
|
admissionOrder: this.#nextAdmissionOrder(),
|
|
@@ -324,6 +381,7 @@ export class ExecutionReceipts {
|
|
|
324
381
|
close = () => {
|
|
325
382
|
this.#executions.clear();
|
|
326
383
|
this.#recoveredCommands.clear();
|
|
384
|
+
this.#cancellations.close();
|
|
327
385
|
};
|
|
328
386
|
}
|
|
329
387
|
//# sourceMappingURL=execution-receipts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-receipts.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAEH,8BAA8B,EAC9B,qCAAqC,EACrC,gBAAgB,GAInB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAuBpC,4FAA4F;AAC5F,SAAS,gBAAgB,CAAC,KAAqB;IAC3C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,sBAAsB;YACvB,OAAO,KAAK,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,qBAAqB;YACtB,OAAO,IAAI,CAAC;QAChB,SAAS,CAAC;YACN,MAAM,WAAW,GAAU,KAAK,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAqB;IAC3C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACV,OAAO,IAAI,CAAC;QAChB,KAAK,sBAAsB,CAAC;QAC5B,KAAK,qBAAqB;YACtB,OAAO,KAAK,CAAC,OAAO,CAAC;QACzB,SAAS,CAAC;YACN,MAAM,WAAW,GAAU,KAAK,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAqB,EAAE,OAAe;IAC5D,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,sBAAsB,EAAE,OAAO,EAAE,CAAC;AACvG,CAAC;AAUD,MAAM,OAAO,iBAAiB;IACjB,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAC;IAClD,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,MAAM,CAAwB;IACvC,QAAQ,GAAG,KAAK,CAAC;IACR,QAAQ,CAA0B;IAC3C,YAAY,KAA4B,EAAE,OAAO,GAA4B,GAAG,EAAE,CAAC,SAAS;QACxF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,QAAQ,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7F,MAAM,KAAK,GAAmB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE;gBAC5B,GAAG,QAAQ;gBACX,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC;aACrE,CAAC,CAAC;YACH,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC;IACQ,KAAK,GAAG,CACb,SAAiB,EACjB,OAAyB,EACzB,cAAc,GAAkB,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,EAC3D,EAAE;QACN,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ;YACzB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ;gBACI,GAAG,QAAQ;gBACX,SAAS;gBACT,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;gBAChC,OAAO,EAAE,cAAc;gBACvB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACtC,EACD,qBAAqB,CACxB,CAAC;QACR,wFAAwF;QACxF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,KAAK,MAAM,gBAAgB,IAAI,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5C,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;gBACzC,WAAW,IAAI,CAAC,CAAC;YACrB,CAAC;QACL,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,CAAC;IACO,mBAAmB,GAAG,GAAW,EAAE;QACxC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,MAAM,GAAG,CAAC,CAAC;IACtB,CAAC,CAAC;IACO,aAAa,GAAG,GAAS,EAAE;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC;IACO,OAAO,GAAG,CAAC,SAAiB,EAAmC,EAAE;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/E,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;IAC7G,CAAC,CAAC;IACF,oGAAoG;IAC3F,QAAQ,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAmB,EAAE;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,KAAK,SAAS;gBAC3D,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE;gBACtB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;YAC3C,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,OAAO,EAAE,IAAI,KAAK,oBAAoB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/E,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAChC,CAAC;QACD,QAAQ,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC3B,KAAK,kBAAkB;gBACnB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC1E,KAAK,eAAe,CAAC;YACrB,KAAK,4BAA4B;gBAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC/D,CAAC;IACL,CAAC,CAAC;IACF;;;;OAIG;IACM,QAAQ,GAAG,CAAC,SAAiB,EAA+B,EAAE;QACnE,IAAI,IAAwB,CAAC;QAC7B,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAClD,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAClC,SAAS;YACb,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxC,MAAM,iBAAiB,GACnB,OAAO,EAAE,IAAI,KAAK,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,4BAA4B,CAAC;YACpG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,OAAO,CAAC,cAAc,GAAG,WAAW,EAAE,CAAC;gBACjG,IAAI,GAAG,SAAS,CAAC;gBACjB,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;YACzC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,EAAE,IAAI,KAAK,oBAAoB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACrG,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,QAAQ,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC3B,KAAK,kBAAkB;gBACnB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3F,KAAK,eAAe,CAAC;YACrB,KAAK,4BAA4B;gBAC7B,OAAO;oBACH,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;oBAC1B,SAAS,EAAE,IAAI;oBACf,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;oBAChC,KAAK,EAAE,QAAQ;iBAClB,CAAC;QACV,CAAC;IACL,CAAC,CAAC;IACF,uFAAuF;IAC9E,UAAU,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAW,EAAE;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,CACH,CAAC,OAAO,EAAE,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,KAAK,SAAS,CAC3D,CAAC;IACN,CAAC,CAAC;IAEF,kGAAkG;IACzF,iCAAiC,GAAG,CACzC,SAAiB,EACjB,SAAiB,EACc,EAAE;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,iFAAiF;YACjF,mFAAmF;YACnF,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS;gBACnC,CAAC,CAAC;oBACI,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE;iBAC5E;gBACH,CAAC,CAAC,SAAS,CAAC;QACpB,CAAC;QACD,MAAM,OAAO,GAAwB;YACjC,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE;SACtG,CAAC;QACF,iGAAiG;QACjG,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC;aACnC,MAAM,CACH,qCAAqC,CAAC;YAClC,SAAS;YACT,IAAI,EAAE,6BAA6B;YACnC,SAAS;SACZ,CAAC,CACL;aACA,MAAM,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YAClB,cAAc,EAAE,IAAI,CAAC,mBAAmB,EAAE;YAC1C,SAAS,EAAE,UAAU,EAAE;YACvB,WAAW;YACX,SAAS;YACT,KAAK,EAAE;gBACH,IAAI,EAAE,sBAAsB;gBAC5B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;aAChF;SACJ,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;IACF;;;;OAIG;IACM,MAAM,GAAG,CAAC,KAAuB,EAAQ,EAAE;QAChD,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACtC,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxD,mEAAmE;YACnE,IAAI,OAAO,EAAE,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAC9E,CAAC;YACD,OAAO;QACX,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QACD,MAAM,SAAS,GACX,OAAO,CAAC,IAAI,KAAK,kBAAkB;YAC/B,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,gDAAgD,EAAE,CAAC;QACpF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;QACtF,IAAI,CAAC,KAAK,CACN,OAAO,CAAC,SAAS,EACjB,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,EAC/E,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CACrD,CAAC;IACN,CAAC,CAAC;IACO,OAAO,GAAG,GAIf,EAAE;QACF,MAAM,SAAS,GAA4E,EAAE,CAAC;QAC9F,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,KAAK,GACP,OAAO,KAAK,IAAI;gBACZ,CAAC,CAAC;oBACI,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;wBACpC,CAAC,CAAC;4BACI,IAAI,EAAE,eAAe;4BACrB,SAAS;4BACT,SAAS,EAAE,OAAO,CAAC,SAAS;4BAC5B,IAAI,EAAE,mBAAmB;4BACzB,OAAO,EAAE,4DAA4D;yBACxE;wBACH,CAAC,CAAC;4BACI,IAAI,EAAE,4BAA4B;4BAClC,SAAS;4BACT,IAAI,EAAE,mBAAmB;4BACzB,OAAO,EAAE,yDAAyD;yBACrE;iBACV;gBACH,CAAC,CAAC,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,SAAS;YACb,CAAC;YACD,MAAM,UAAU,GACZ,OAAO,KAAK,IAAI;gBACZ,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBAC1B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;YACrF,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YACpE,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACnB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;oBAClB,GAAG,OAAO;oBACV,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;iBACnF,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,CAAC;IAEO,cAAc,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,WAAmB,EAA2B,EAAE;QAC7G,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3E,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzC,IACI,QAAQ,EAAE,SAAS,KAAK,SAAS;YACjC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjC,QAAQ,EAAE,IAAI,KAAK,oBAAoB;YACvC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,4BAA4B;YACtD,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,mBAAmB,EAC/C,CAAC;YACC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACnC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1C,QAAQ,GAAG,SAAS,CAAC;QACzB,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;gBAC3E,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;YAChC,CAAC;YACD,OAAO;gBACH,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,SAAS;gBACT,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;aACxF,CAAC;QACN,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW;gBAC3E,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QAC/B,CAAC;QACD,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YAClB,cAAc,EAAE,IAAI,CAAC,mBAAmB,EAAE;YAC1C,SAAS;YACT,WAAW;YACX,SAAS;YACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAC7B,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACtD,CAAC,CAAC;IAEF,sEAAsE;IAC7D,sBAAsB,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAiB,EAAE;QACtF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,OAAO,EAAE,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACnH,CAAC,CAAC;IAEO,mBAAmB,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAW,EAAE;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,OAAO,EAAE,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IACxF,CAAC,CAAC;IAEO,KAAK,GAAG,GAAS,EAAE;QACxB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;IACpC,CAAC,CAAC;CACL"}
|
|
1
|
+
{"version":3,"file":"execution-receipts.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import type { LocalSqliteDatabase } from "../sqlite/local-sqlite-database.ts";
|
|
3
|
+
declare const cancellationSchema: z.ZodReadonly<z.ZodObject<{
|
|
4
|
+
commandId: z.ZodString;
|
|
5
|
+
sessionId: z.ZodString;
|
|
6
|
+
}, z.core.$strip>>;
|
|
7
|
+
export type PersistedCommandCancellation = z.infer<typeof cancellationSchema>;
|
|
8
|
+
/** Owns the cancellation ledger's database; older Runtimes leave this additive store untouched. */
|
|
9
|
+
export declare class CommandCancellationTable {
|
|
10
|
+
#private;
|
|
11
|
+
constructor(database: LocalSqliteDatabase);
|
|
12
|
+
readonly close: () => void;
|
|
13
|
+
readonly read: (commandId: string) => PersistedCommandCancellation | undefined;
|
|
14
|
+
readonly retain: (cancellations: readonly PersistedCommandCancellation[]) => void;
|
|
15
|
+
}
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=command-cancellation-table.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-cancellation-table.d.ts","sourceRoot":"","sources":["../../../../src/engine/storage/session/command-cancellation-table.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAE9E,QAAA,MAAM,kBAAkB;;;kBAAwE,CAAC;AACjG,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9E,mGAAmG;AACnG,qBAAa,wBAAwB;;IAGjC,YAAY,QAAQ,EAAE,mBAAmB,EAExC;IAED,QAAQ,CAAC,KAAK,QAAO,IAAI,CAA2B;IAEpD,QAAQ,CAAC,IAAI,cAAe,MAAM,KAAG,4BAA4B,GAAG,SAAS,CAO3E;IAEF,QAAQ,CAAC,MAAM,kBAAmB,SAAS,4BAA4B,EAAE,KAAG,IAAI,CAM9E;CACL"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { eq } from "drizzle-orm";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { cancelledCommand } from "../../schema/command-cancellation/index.js";
|
|
4
|
+
const cancellationSchema = z.object({ commandId: z.string(), sessionId: z.string() }).readonly();
|
|
5
|
+
/** Owns the cancellation ledger's database; older Runtimes leave this additive store untouched. */
|
|
6
|
+
export class CommandCancellationTable {
|
|
7
|
+
#database;
|
|
8
|
+
constructor(database) {
|
|
9
|
+
this.#database = database;
|
|
10
|
+
}
|
|
11
|
+
close = () => this.#database.close();
|
|
12
|
+
read = (commandId) => {
|
|
13
|
+
const row = this.#database.orm
|
|
14
|
+
.select()
|
|
15
|
+
.from(cancelledCommand)
|
|
16
|
+
.where(eq(cancelledCommand.commandId, commandId))
|
|
17
|
+
.get();
|
|
18
|
+
return row === undefined ? undefined : cancellationSchema.parse(row);
|
|
19
|
+
};
|
|
20
|
+
retain = (cancellations) => {
|
|
21
|
+
this.#database.transaction(() => {
|
|
22
|
+
for (const cancellation of cancellations) {
|
|
23
|
+
this.#database.orm.insert(cancelledCommand).values(cancellation).onConflictDoNothing().run();
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=command-cancellation-table.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-cancellation-table.js","sourceRoot":"","sources":["../../../../src/engine/storage/session/command-cancellation-table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAG9E,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAGjG,mGAAmG;AACnG,MAAM,OAAO,wBAAwB;IACxB,SAAS,CAAsB;IAExC,YAAY,QAA6B;QACrC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAEQ,KAAK,GAAG,GAAS,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAE3C,IAAI,GAAG,CAAC,SAAiB,EAA4C,EAAE;QAC5E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG;aACzB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;aAChD,GAAG,EAAE,CAAC;QACX,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC,CAAC;IAEO,MAAM,GAAG,CAAC,aAAsD,EAAQ,EAAE;QAC/E,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE;YAC5B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;gBACvC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,CAAC;YACjG,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;CACL"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { LocalSqliteDatabase } from "./local-sqlite-database.ts";
|
|
2
2
|
export interface ChannelSessionDatabasePaths {
|
|
3
|
+
readonly cancellations: string;
|
|
3
4
|
readonly events: string;
|
|
4
5
|
readonly sessions: string;
|
|
5
6
|
}
|
|
6
7
|
/** Each relay channel keeps its saved sessions and its spilled session events in its own files. */
|
|
7
8
|
export declare function channelSessionDatabasePaths(stateDirectory: string, channelId: string): ChannelSessionDatabasePaths;
|
|
8
9
|
export declare const openAcpSessionDatabase: (path: string) => LocalSqliteDatabase;
|
|
10
|
+
/** A separate migration history keeps old Session database readers usable during rollback. */
|
|
11
|
+
export declare const openCommandCancellationDatabase: (path: string) => LocalSqliteDatabase;
|
|
9
12
|
export declare const openSessionEventCacheDatabase: (path: string) => LocalSqliteDatabase;
|
|
10
13
|
//# sourceMappingURL=local-databases.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-databases.d.ts","sourceRoot":"","sources":["../../../../src/engine/storage/sqlite/local-databases.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-databases.d.ts","sourceRoot":"","sources":["../../../../src/engine/storage/sqlite/local-databases.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,MAAM,WAAW,2BAA2B;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC7B;AAED,mGAAmG;AACnG,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,2BAA2B,CAOlH;AAwBD,eAAO,MAAM,sBAAsB,SAAU,MAAM,KAAG,mBAGrD,CAAC;AAEF,8FAA8F;AAC9F,eAAO,MAAM,+BAA+B,SAAU,MAAM,KAAG,mBACkC,CAAC;AAElG,eAAO,MAAM,6BAA6B,SAAU,MAAM,KAAG,mBAKvD,CAAC"}
|
|
@@ -3,12 +3,14 @@ import { existsSync } from "node:fs";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { DatabaseSync } from "node:sqlite";
|
|
5
5
|
import { acpSessionStoreMigrations } from "../../generated/acp-session-store-migrations.js";
|
|
6
|
+
import { commandCancellationMigrations } from "../../generated/command-cancellation-migrations.js";
|
|
6
7
|
import { sessionEventCacheMigrations } from "../../generated/session-event-cache-migrations.js";
|
|
7
8
|
import { LocalSqliteDatabase } from "./local-sqlite-database.js";
|
|
8
9
|
/** Each relay channel keeps its saved sessions and its spilled session events in its own files. */
|
|
9
10
|
export function channelSessionDatabasePaths(stateDirectory, channelId) {
|
|
10
11
|
const channelHash = createHash("sha256").update(channelId).digest("hex");
|
|
11
12
|
return {
|
|
13
|
+
cancellations: join(stateDirectory, "sessions", `${channelHash}.cancellations.sqlite`),
|
|
12
14
|
events: join(stateDirectory, "sessions", `${channelHash}.events.sqlite`),
|
|
13
15
|
sessions: join(stateDirectory, "sessions", `${channelHash}.sqlite`),
|
|
14
16
|
};
|
|
@@ -39,6 +41,8 @@ export const openAcpSessionDatabase = (path) => {
|
|
|
39
41
|
recordAppliedAdmissionOrder(path);
|
|
40
42
|
return new LocalSqliteDatabase(path, "ACP Session database", acpSessionStoreMigrations);
|
|
41
43
|
};
|
|
44
|
+
/** A separate migration history keeps old Session database readers usable during rollback. */
|
|
45
|
+
export const openCommandCancellationDatabase = (path) => new LocalSqliteDatabase(path, "Command cancellation database", commandCancellationMigrations);
|
|
42
46
|
export const openSessionEventCacheDatabase = (path) => new LocalSqliteDatabase(path, "V2 Session event cache", sessionEventCacheMigrations, [
|
|
43
47
|
"PRAGMA journal_mode = WAL",
|
|
44
48
|
"PRAGMA synchronous = OFF",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-databases.js","sourceRoot":"","sources":["../../../../src/engine/storage/sqlite/local-databases.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"local-databases.js","sourceRoot":"","sources":["../../../../src/engine/storage/sqlite/local-databases.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAQjE,mGAAmG;AACnG,MAAM,UAAU,2BAA2B,CAAC,cAAsB,EAAE,SAAiB;IACjF,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzE,OAAO;QACH,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,GAAG,WAAW,uBAAuB,CAAC;QACtF,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,GAAG,WAAW,gBAAgB,CAAC;QACxE,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,GAAG,WAAW,SAAS,CAAC;KACtE,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,IAAY;IAC7C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO;IACX,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,QAAQ;aAClB,OAAO,CAAC,wFAAwF,CAAC;aACjG,GAAG,EAAE,CAAC;QACX,IAAI,OAAO,KAAK,CAAC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACxC,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;YAAS,CAAC;QACP,QAAQ,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAuB,EAAE;IACxE,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,sBAAsB,EAAE,yBAAyB,CAAC,CAAC;AAC5F,CAAC,CAAC;AAEF,8FAA8F;AAC9F,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,IAAY,EAAuB,EAAE,CACjF,IAAI,mBAAmB,CAAC,IAAI,EAAE,+BAA+B,EAAE,6BAA6B,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,IAAY,EAAuB,EAAE,CAC/E,IAAI,mBAAmB,CAAC,IAAI,EAAE,wBAAwB,EAAE,2BAA2B,EAAE;IACjF,2BAA2B;IAC3B,0BAA0B;IAC1B,2BAA2B;CAC9B,CAAC,CAAC"}
|
package/dist/engine.js
CHANGED