@morty-build/cli 0.4.3 → 0.4.7
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-DVSX6ALB.js → chunk-J56NGK6J.js} +763 -780
- package/dist/{chunk-DVSX6ALB.js.map → chunk-J56NGK6J.js.map} +4 -4
- package/dist/{chunk-OEX63ZJX.js → chunk-TLYWGG4Q.js} +2 -2
- package/dist/{chunk-OEX63ZJX.js.map → chunk-TLYWGG4Q.js.map} +1 -1
- package/dist/{cli-3TKBBY7N.js → cli-MJKKZEI4.js} +3 -3
- package/dist/cli.js +2 -2
- package/dist/engine/generated/acp-session-store-migrations.d.ts +6 -0
- package/dist/engine/generated/acp-session-store-migrations.d.ts.map +1 -1
- package/dist/engine/generated/acp-session-store-migrations.js +9 -1
- package/dist/engine/generated/acp-session-store-migrations.js.map +1 -1
- package/dist/engine/runtime/command/registry/prompt.d.ts.map +1 -1
- package/dist/engine/runtime/command/registry/prompt.js +16 -3
- package/dist/engine/runtime/command/registry/prompt.js.map +1 -1
- package/dist/engine/schema/{command-cancellation/cancelled-command.d.ts → acp-session-store/command-outcome.d.ts} +10 -7
- package/dist/engine/schema/acp-session-store/command-outcome.d.ts.map +1 -0
- package/dist/engine/schema/acp-session-store/command-outcome.js +10 -0
- package/dist/engine/schema/acp-session-store/command-outcome.js.map +1 -0
- package/dist/engine/schema/acp-session-store/{execution-receipt.d.ts → command.d.ts} +20 -32
- package/dist/engine/schema/acp-session-store/command.d.ts.map +1 -0
- package/dist/engine/schema/acp-session-store/command.js +24 -0
- package/dist/engine/schema/acp-session-store/command.js.map +1 -0
- package/dist/engine/schema/acp-session-store/index.d.ts +2 -2
- package/dist/engine/schema/acp-session-store/index.d.ts.map +1 -1
- package/dist/engine/schema/acp-session-store/index.js +2 -2
- package/dist/engine/schema/acp-session-store/index.js.map +1 -1
- package/dist/engine/session/api/session-api.d.ts +0 -2
- package/dist/engine/session/api/session-api.d.ts.map +1 -1
- package/dist/engine/session/api/session-api.js.map +1 -1
- package/dist/engine/session/api/session-layer.d.ts.map +1 -1
- package/dist/engine/session/api/session-layer.js +3 -7
- package/dist/engine/session/api/session-layer.js.map +1 -1
- package/dist/engine/session/prompt/execute-prompt.d.ts +4 -9
- package/dist/engine/session/prompt/execute-prompt.d.ts.map +1 -1
- package/dist/engine/session/prompt/execute-prompt.js +9 -19
- package/dist/engine/session/prompt/execute-prompt.js.map +1 -1
- package/dist/engine/session/prompt/prompt-lifecycle.d.ts +2 -1
- package/dist/engine/session/prompt/prompt-lifecycle.d.ts.map +1 -1
- package/dist/engine/session/prompt/prompt-lifecycle.js +9 -6
- package/dist/engine/session/prompt/prompt-lifecycle.js.map +1 -1
- package/dist/engine/session/turn/active-turn.d.ts +17 -2
- package/dist/engine/session/turn/active-turn.d.ts.map +1 -1
- package/dist/engine/session/turn/active-turn.js +23 -15
- package/dist/engine/session/turn/active-turn.js.map +1 -1
- package/dist/engine/session/turn/execution-receipts.d.ts +28 -21
- package/dist/engine/session/turn/execution-receipts.d.ts.map +1 -1
- package/dist/engine/session/turn/execution-receipts.js +173 -259
- package/dist/engine/session/turn/execution-receipts.js.map +1 -1
- package/dist/engine/session/turn/session-execution.d.ts +7 -10
- package/dist/engine/session/turn/session-execution.d.ts.map +1 -1
- package/dist/engine/session/turn/session-execution.js +13 -19
- package/dist/engine/session/turn/session-execution.js.map +1 -1
- package/dist/engine/session/turn/session-turns.d.ts +2 -3
- package/dist/engine/session/turn/session-turns.d.ts.map +1 -1
- package/dist/engine/session/turn/session-turns.js.map +1 -1
- package/dist/engine/storage/session/command-ledger-table.d.ts +68 -0
- package/dist/engine/storage/session/command-ledger-table.d.ts.map +1 -0
- package/dist/engine/storage/session/command-ledger-table.js +172 -0
- package/dist/engine/storage/session/command-ledger-table.js.map +1 -0
- package/dist/engine/storage/sqlite/local-databases.d.ts +0 -3
- package/dist/engine/storage/sqlite/local-databases.d.ts.map +1 -1
- package/dist/engine/storage/sqlite/local-databases.js +0 -4
- package/dist/engine/storage/sqlite/local-databases.js.map +1 -1
- package/dist/engine.js +2 -2
- package/package.json +1 -1
- package/dist/engine/generated/command-cancellation-migrations.d.ts +0 -5
- package/dist/engine/generated/command-cancellation-migrations.d.ts.map +0 -1
- package/dist/engine/generated/command-cancellation-migrations.js +0 -9
- package/dist/engine/generated/command-cancellation-migrations.js.map +0 -1
- package/dist/engine/schema/acp-session-store/execution-identity.d.ts +0 -57
- package/dist/engine/schema/acp-session-store/execution-identity.d.ts.map +0 -1
- package/dist/engine/schema/acp-session-store/execution-identity.js +0 -8
- package/dist/engine/schema/acp-session-store/execution-identity.js.map +0 -1
- package/dist/engine/schema/acp-session-store/execution-receipt.d.ts.map +0 -1
- package/dist/engine/schema/acp-session-store/execution-receipt.js +0 -12
- package/dist/engine/schema/acp-session-store/execution-receipt.js.map +0 -1
- package/dist/engine/schema/command-cancellation/cancelled-command.d.ts.map +0 -1
- package/dist/engine/schema/command-cancellation/cancelled-command.js +0 -7
- package/dist/engine/schema/command-cancellation/cancelled-command.js.map +0 -1
- package/dist/engine/schema/command-cancellation/index.d.ts +0 -2
- package/dist/engine/schema/command-cancellation/index.d.ts.map +0 -1
- package/dist/engine/schema/command-cancellation/index.js +0 -2
- package/dist/engine/schema/command-cancellation/index.js.map +0 -1
- package/dist/engine/storage/session/command-cancellation-table.d.ts +0 -17
- package/dist/engine/storage/session/command-cancellation-table.d.ts.map +0 -1
- package/dist/engine/storage/session/command-cancellation-table.js +0 -28
- package/dist/engine/storage/session/command-cancellation-table.js.map +0 -1
- package/dist/engine/storage/session/execution-receipt-table.d.ts +0 -28
- package/dist/engine/storage/session/execution-receipt-table.d.ts.map +0 -1
- package/dist/engine/storage/session/execution-receipt-table.js +0 -87
- package/dist/engine/storage/session/execution-receipt-table.js.map +0 -1
- /package/dist/{cli-3TKBBY7N.js.map → cli-MJKKZEI4.js.map} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-receipts.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execution-receipts.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/execution-receipts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
import { type SessionPromptCommand } from "@morty-build/client/protocol";
|
|
2
|
-
import { ActiveRuntimeTurn, type RecordedSessionEvent } from "./active-turn.ts";
|
|
2
|
+
import { ActiveRuntimeTurn, type PromptDispatch, type RecordedSessionEvent } from "./active-turn.ts";
|
|
3
3
|
import type { ExecutionReceipts } from "./execution-receipts.ts";
|
|
4
|
-
export type SessionAdmission = {
|
|
5
|
-
readonly kind: "available";
|
|
6
|
-
readonly disposition: string;
|
|
7
|
-
} | {
|
|
8
|
-
readonly kind: "busy";
|
|
9
|
-
} | {
|
|
10
|
-
readonly kind: "queue-target-unavailable";
|
|
11
|
-
};
|
|
12
4
|
/**
|
|
13
5
|
* One session's in-flight turns: FIFO admission, steering, and interaction recording. Admission is the only place
|
|
14
6
|
* that decides whether the Session is busy; whether a turn started is read from its execution receipt.
|
|
@@ -23,6 +15,11 @@ export declare class SessionExecutionState {
|
|
|
23
15
|
readonly recordEvent: (event: RecordedSessionEvent) => RecordedSessionEvent;
|
|
24
16
|
readonly turns: () => readonly ActiveRuntimeTurn[];
|
|
25
17
|
readonly close: () => Promise<void>;
|
|
26
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Admits the turn in arrival order. A steering prompt joins the running turn it names. An appended prompt runs
|
|
20
|
+
* when no earlier turn owns an execution, and otherwise waits in the queue until every earlier one ended or the
|
|
21
|
+
* user promotes it to steer the turn it waits behind. Admission never refuses an appended prompt.
|
|
22
|
+
*/
|
|
23
|
+
readonly admitAndWait: (turn: ActiveRuntimeTurn, waitSignal: AbortSignal, onQueued: () => void) => Promise<PromptDispatch>;
|
|
27
24
|
}
|
|
28
25
|
//# sourceMappingURL=session-execution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-execution.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,oBAAoB,EAE5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-execution.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,oBAAoB,EAE5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AA6BjE;;;GAGG;AACH,qBAAa,qBAAqB;;IAK9B,YAAY,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAG3D;IAED,QAAQ,CAAC,OAAO,QAAO,OAAO,CAAsC;IAEpE,QAAQ,CAAC,KAAK,YAAa,oBAAoB,aAAa,MAAM,KAAG,iBAAiB,CASpF;IAEF,QAAQ,CAAC,GAAG,cAAe,MAAM,KAAG,iBAAiB,GAAG,SAAS,CAA0C;IAE3G,QAAQ,CAAC,MAAM,SAAU,iBAAiB,KAAG,IAAI,CAG/C;IAEF,QAAQ,CAAC,WAAW,UAAW,oBAAoB,KAAG,oBAAoB,CAexE;IAEF,QAAQ,CAAC,KAAK,QAAO,SAAS,iBAAiB,EAAE,CAAyC;IAE1F,QAAQ,CAAC,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAMtC;IAEF;;;;OAIG;IACH,QAAQ,CAAC,YAAY,SACX,iBAAiB,cACX,WAAW,YACb,MAAM,IAAI,KACrB,OAAO,CAAC,cAAc,CAAC,CA+BxB;CACL"}
|
|
@@ -69,34 +69,28 @@ export class SessionExecutionState {
|
|
|
69
69
|
}
|
|
70
70
|
await Promise.all(turns.map((turn) => turn.completion));
|
|
71
71
|
};
|
|
72
|
+
/**
|
|
73
|
+
* Admits the turn in arrival order. A steering prompt joins the running turn it names. An appended prompt runs
|
|
74
|
+
* when no earlier turn owns an execution, and otherwise waits in the queue until every earlier one ended or the
|
|
75
|
+
* user promotes it to steer the turn it waits behind. Admission never refuses an appended prompt.
|
|
76
|
+
*/
|
|
72
77
|
admitAndWait = async (turn, waitSignal, onQueued) => {
|
|
73
78
|
const command = turn.command;
|
|
74
79
|
waitSignal.throwIfAborted();
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
// The
|
|
79
|
-
|
|
80
|
-
if (
|
|
81
|
-
const target = head();
|
|
82
|
-
if ((target === turn || target?.command.commandId !== command.targetCommandId) &&
|
|
83
|
-
!this.#operations.isTerminalExecution(command.targetCommandId, this.#sessionId)) {
|
|
84
|
-
return { kind: "queue-target-unavailable" };
|
|
85
|
-
}
|
|
80
|
+
if (command.disposition === SessionPromptDisposition.Steer) {
|
|
81
|
+
return turn.admit({ kind: "steer", targetCommandId: command.targetCommandId });
|
|
82
|
+
}
|
|
83
|
+
// The earliest turn that owns an execution: a promoted prompt steers instead and holds no place.
|
|
84
|
+
const head = () => [...this.#turnsByCommandId.values()].find((candidate) => !candidate.isSteering());
|
|
85
|
+
if (head() !== turn) {
|
|
86
86
|
turn.enqueue();
|
|
87
87
|
onQueued();
|
|
88
88
|
}
|
|
89
|
-
if (turn.effectiveDisposition() === SessionPromptDisposition.Steer) {
|
|
90
|
-
return { disposition: turn.admit(), kind: "available" };
|
|
91
|
-
}
|
|
92
89
|
for (;;) {
|
|
93
90
|
waitSignal.throwIfAborted();
|
|
94
91
|
const first = head();
|
|
95
92
|
if (first === undefined || first === turn) {
|
|
96
|
-
return
|
|
97
|
-
}
|
|
98
|
-
if (command.disposition !== SessionPromptDisposition.Queue) {
|
|
99
|
-
return { kind: "busy" };
|
|
93
|
+
return turn.admit({ kind: "own" });
|
|
100
94
|
}
|
|
101
95
|
const promotion = turn.queuePromotion();
|
|
102
96
|
if (promotion === null) {
|
|
@@ -107,7 +101,7 @@ export class SessionExecutionState {
|
|
|
107
101
|
promotion.then(() => "promoted"),
|
|
108
102
|
]);
|
|
109
103
|
if (decision === "promoted") {
|
|
110
|
-
return
|
|
104
|
+
return turn.admit({ kind: "steer", targetCommandId: first.command.commandId });
|
|
111
105
|
}
|
|
112
106
|
}
|
|
113
107
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-execution.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iCAAiC,EACjC,gCAAgC,EAEhC,wBAAwB,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"session-execution.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { SessionLiveEvent, SessionPromptCommand } from "@morty-build/client/protocol";
|
|
2
|
-
import type { ActiveRuntimeTurn, RecordedSessionEvent } from "./active-turn.ts";
|
|
2
|
+
import type { ActiveRuntimeTurn, PromptDispatch, RecordedSessionEvent } from "./active-turn.ts";
|
|
3
3
|
import type { ExecutionReceipts } from "./execution-receipts.ts";
|
|
4
4
|
import { RuntimeTurnActivity } from "./runtime-turn-activity.ts";
|
|
5
|
-
import type { SessionAdmission } from "./session-execution.ts";
|
|
6
5
|
import { SessionExecutionState } from "./session-execution.ts";
|
|
7
6
|
/** Runtime-owned index over per-session execution state; owns no session state itself. */
|
|
8
7
|
export declare class SessionTurns {
|
|
@@ -91,7 +90,7 @@ export declare class SessionTurns {
|
|
|
91
90
|
}>[];
|
|
92
91
|
}>[];
|
|
93
92
|
}>;
|
|
94
|
-
readonly admitAndWait: (turn: ActiveRuntimeTurn, waitSignal: AbortSignal, onQueued: () => void) => Promise<
|
|
93
|
+
readonly admitAndWait: (turn: ActiveRuntimeTurn, waitSignal: AbortSignal, onQueued: () => void) => Promise<PromptDispatch>;
|
|
95
94
|
/** Discards empty session states so the index does not grow unboundedly. */
|
|
96
95
|
readonly sweep: () => void;
|
|
97
96
|
readonly close: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-turns.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-turns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAChH,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-turns.d.ts","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-turns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAChH,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,0FAA0F;AAC1F,qBAAa,YAAY;;IAKrB,YAAY,UAAU,EAAE,iBAAiB,EAAE,QAAQ,sBAA4B,EAG9E;IAED,QAAQ,CAAC,cAAc,QAAO,OAAO,CAAoC;IAEzE,QAAQ,CAAC,OAAO,cAAe,MAAM,KAAG,qBAAqB,CAO3D;IAEF,QAAQ,CAAC,GAAG,cAAe,MAAM,aAAa,MAAM,KAAG,iBAAiB,GAAG,SAAS,CAC/B;IAErD,QAAQ,CAAC,KAAK,YAAa,oBAAoB,aAAa,MAAM,KAAG,iBAAiB,CAIpF;IAEF,QAAQ,CAAC,MAAM,SAAU,iBAAiB,KAAG,IAAI,CAI/C;IAEF,QAAQ,CAAC,WAAW,UAAW,oBAAoB,KAAG,oBAAoB,CAC+B;IAEzG,QAAQ,CAAC,kBAAkB,UAAW,gBAAgB,KAAG,IAAI,CAU3D;IAEF,QAAQ,CAAC,iBAAiB,YAAmB,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiC9F;IAEF,QAAQ,CAAC,YAAY,SACX,iBAAiB,cACX,WAAW,YACb,MAAM,IAAI,KACrB,OAAO,CAAC,cAAc,CAAC,CAAkF;IAE5G,4EAA4E;IAC5E,QAAQ,CAAC,KAAK,QAAO,IAAI,CAMvB;IAEF,QAAQ,CAAC,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAEtC;CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-turns.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-turns.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-turns.js","sourceRoot":"","sources":["../../../../src/engine/session/turn/session-turns.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import type { LocalSqliteDatabase } from "../sqlite/local-sqlite-database.ts";
|
|
2
|
+
/**
|
|
3
|
+
* What became of a command. A settled command's outcome is the content-free terminal event it recorded, or null once
|
|
4
|
+
* retention dropped it; a command that settled before it started without being cancelled is forgotten with its outcome.
|
|
5
|
+
*/
|
|
6
|
+
export type CommandFate = {
|
|
7
|
+
readonly kind: "pending";
|
|
8
|
+
} | {
|
|
9
|
+
readonly kind: "started";
|
|
10
|
+
readonly startedAt: string;
|
|
11
|
+
} | {
|
|
12
|
+
readonly kind: "cancelled";
|
|
13
|
+
readonly outcome: string | null;
|
|
14
|
+
} | {
|
|
15
|
+
readonly kind: "settled-before-start";
|
|
16
|
+
readonly outcome: string;
|
|
17
|
+
} | {
|
|
18
|
+
readonly kind: "settled-after-start";
|
|
19
|
+
readonly startedAt: string;
|
|
20
|
+
readonly outcome: string | null;
|
|
21
|
+
};
|
|
22
|
+
export type SettledFate = Extract<CommandFate, {
|
|
23
|
+
readonly outcome: unknown;
|
|
24
|
+
}>["kind"];
|
|
25
|
+
export type LedgerCommand = Readonly<{
|
|
26
|
+
commandId: string;
|
|
27
|
+
sessionId: string;
|
|
28
|
+
commandHash: string;
|
|
29
|
+
attemptId: string;
|
|
30
|
+
admissionOrder: number;
|
|
31
|
+
fate: CommandFate;
|
|
32
|
+
}>;
|
|
33
|
+
export type CommandIdentity = Readonly<{
|
|
34
|
+
commandId: string;
|
|
35
|
+
sessionId: string;
|
|
36
|
+
commandHash: string;
|
|
37
|
+
attemptId: string;
|
|
38
|
+
}>;
|
|
39
|
+
/**
|
|
40
|
+
* Owns the command ledger: one row per admitted command, and the outcomes kept for each Session's latest settled
|
|
41
|
+
* commands. Every transition is one transaction, so a command's identity, order, fate and outcome never disagree.
|
|
42
|
+
*/
|
|
43
|
+
export declare class CommandLedgerTable {
|
|
44
|
+
#private;
|
|
45
|
+
constructor(database: LocalSqliteDatabase);
|
|
46
|
+
readonly read: (commandId: string) => LedgerCommand | undefined;
|
|
47
|
+
/** The Session's commands in admission order. */
|
|
48
|
+
readonly session: (sessionId: string) => readonly LedgerCommand[];
|
|
49
|
+
/** Every command in admission order. */
|
|
50
|
+
readonly all: () => readonly LedgerCommand[];
|
|
51
|
+
/** The commands that have not settled. */
|
|
52
|
+
readonly unsettled: () => readonly string[];
|
|
53
|
+
/**
|
|
54
|
+
* Admits a command after every other. An earlier admission of the identifier that settled before it started is
|
|
55
|
+
* replaced; any other earlier admission makes this one fail.
|
|
56
|
+
*/
|
|
57
|
+
readonly admit: (identity: CommandIdentity) => void;
|
|
58
|
+
/** Records that a pending command was handed to its Agent. */
|
|
59
|
+
readonly start: (commandId: string, startedAt: string) => void;
|
|
60
|
+
/**
|
|
61
|
+
* Settles an unsettled command with its outcome and drops the outcomes the Session no longer keeps. Returns the
|
|
62
|
+
* commands whose outcome was dropped.
|
|
63
|
+
*/
|
|
64
|
+
readonly settle: (commandId: string, fate: SettledFate, outcome: string) => readonly string[];
|
|
65
|
+
/** Admits an unseen command as already cancelled, so the identifier can never run. */
|
|
66
|
+
readonly admitCancelled: (identity: CommandIdentity, outcome: string) => readonly string[];
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=command-ledger-table.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-ledger-table.d.ts","sourceRoot":"","sources":["../../../../src/engine/storage/session/command-ledger-table.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAK9E;;;GAGG;AACH,MAAM,MAAM,WAAW,GACjB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC/D;IAAE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnE;IAAE,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE5G,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtF,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,WAAW,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAqCH;;;GAGG;AACH,qBAAa,kBAAkB;;IAG3B,YAAY,QAAQ,EAAE,mBAAmB,EAExC;IAiBD,QAAQ,CAAC,IAAI,cAAe,MAAM,KAAG,aAAa,GAAG,SAAS,CAG5D;IAEF,iDAAiD;IACjD,QAAQ,CAAC,OAAO,cAAe,MAAM,KAAG,SAAS,aAAa,EAAE,CAKL;IAE3D,wCAAwC;IACxC,QAAQ,CAAC,GAAG,QAAO,SAAS,aAAa,EAAE,CAIgB;IAE3D,0CAA0C;IAC1C,QAAQ,CAAC,SAAS,QAAO,SAAS,MAAM,EAAE,CAML;IAErC;;;OAGG;IACH,QAAQ,CAAC,KAAK,aAAc,eAAe,KAAG,IAAI,CAehD;IAEF,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,cAAe,MAAM,aAAa,MAAM,KAAG,IAAI,CAM3D;IAEF;;;OAGG;IACH,QAAQ,CAAC,MAAM,cAAe,MAAM,QAAQ,WAAW,WAAW,MAAM,KAAG,SAAS,MAAM,EAAE,CAarF;IAEP,sFAAsF;IACtF,QAAQ,CAAC,cAAc,aAAc,eAAe,WAAW,MAAM,KAAG,SAAS,MAAM,EAAE,CAQlF;CAsCV"}
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
import { and, asc, desc, eq, inArray, lt, max } from "drizzle-orm";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { command, commandOutcome } from "../../schema/acp-session-store/index.js";
|
|
4
|
+
/** How many settled outcomes each Session keeps; older ones are dropped, never the fate of a command that ran. */
|
|
5
|
+
const OUTCOMES_PER_SESSION = 1_024;
|
|
6
|
+
const rowSchema = z
|
|
7
|
+
.object({
|
|
8
|
+
commandId: z.string(),
|
|
9
|
+
sessionId: z.string(),
|
|
10
|
+
commandHash: z.string(),
|
|
11
|
+
attemptId: z.string(),
|
|
12
|
+
admissionOrder: z.number().int().positive().safe(),
|
|
13
|
+
fate: z.enum(["pending", "started", "cancelled", "settled-before-start", "settled-after-start"]),
|
|
14
|
+
startedAt: z.string().nullable(),
|
|
15
|
+
outcome: z.string().nullable(),
|
|
16
|
+
})
|
|
17
|
+
.readonly();
|
|
18
|
+
function ledgerCommand({ fate, startedAt, outcome, ...identity }) {
|
|
19
|
+
const invalid = () => {
|
|
20
|
+
throw new Error("The command ledger holds an invalid row", { cause: { commandId: identity.commandId, fate } });
|
|
21
|
+
};
|
|
22
|
+
switch (fate) {
|
|
23
|
+
case "pending":
|
|
24
|
+
return outcome === null ? { ...identity, fate: { kind: fate } } : invalid();
|
|
25
|
+
case "started":
|
|
26
|
+
return startedAt !== null && outcome === null
|
|
27
|
+
? { ...identity, fate: { kind: fate, startedAt } }
|
|
28
|
+
: invalid();
|
|
29
|
+
case "cancelled":
|
|
30
|
+
return { ...identity, fate: { kind: fate, outcome } };
|
|
31
|
+
case "settled-before-start":
|
|
32
|
+
return outcome === null ? invalid() : { ...identity, fate: { kind: fate, outcome } };
|
|
33
|
+
case "settled-after-start":
|
|
34
|
+
return startedAt === null ? invalid() : { ...identity, fate: { kind: fate, startedAt, outcome } };
|
|
35
|
+
default:
|
|
36
|
+
return fate;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Owns the command ledger: one row per admitted command, and the outcomes kept for each Session's latest settled
|
|
41
|
+
* commands. Every transition is one transaction, so a command's identity, order, fate and outcome never disagree.
|
|
42
|
+
*/
|
|
43
|
+
export class CommandLedgerTable {
|
|
44
|
+
#database;
|
|
45
|
+
constructor(database) {
|
|
46
|
+
this.#database = database;
|
|
47
|
+
}
|
|
48
|
+
#select = () => this.#database.orm
|
|
49
|
+
.select({
|
|
50
|
+
commandId: command.commandId,
|
|
51
|
+
sessionId: command.sessionId,
|
|
52
|
+
commandHash: command.commandHash,
|
|
53
|
+
attemptId: command.attemptId,
|
|
54
|
+
admissionOrder: command.admissionOrder,
|
|
55
|
+
fate: command.fate,
|
|
56
|
+
startedAt: command.startedAt,
|
|
57
|
+
outcome: commandOutcome.outcome,
|
|
58
|
+
})
|
|
59
|
+
.from(command)
|
|
60
|
+
.leftJoin(commandOutcome, eq(commandOutcome.commandId, command.commandId));
|
|
61
|
+
read = (commandId) => {
|
|
62
|
+
const row = this.#select().where(eq(command.commandId, commandId)).get();
|
|
63
|
+
return row === undefined ? undefined : ledgerCommand(rowSchema.parse(row));
|
|
64
|
+
};
|
|
65
|
+
/** The Session's commands in admission order. */
|
|
66
|
+
session = (sessionId) => this.#select()
|
|
67
|
+
.where(eq(command.sessionId, sessionId))
|
|
68
|
+
.orderBy(asc(command.admissionOrder))
|
|
69
|
+
.all()
|
|
70
|
+
.map((row) => ledgerCommand(rowSchema.parse(row)));
|
|
71
|
+
/** Every command in admission order. */
|
|
72
|
+
all = () => this.#select()
|
|
73
|
+
.orderBy(asc(command.admissionOrder))
|
|
74
|
+
.all()
|
|
75
|
+
.map((row) => ledgerCommand(rowSchema.parse(row)));
|
|
76
|
+
/** The commands that have not settled. */
|
|
77
|
+
unsettled = () => this.#database.orm
|
|
78
|
+
.select({ commandId: command.commandId })
|
|
79
|
+
.from(command)
|
|
80
|
+
.where(inArray(command.fate, ["pending", "started"]))
|
|
81
|
+
.all()
|
|
82
|
+
.map((row) => row.commandId);
|
|
83
|
+
/**
|
|
84
|
+
* Admits a command after every other. An earlier admission of the identifier that settled before it started is
|
|
85
|
+
* replaced; any other earlier admission makes this one fail.
|
|
86
|
+
*/
|
|
87
|
+
admit = (identity) => {
|
|
88
|
+
this.#database.transaction(() => {
|
|
89
|
+
const replaced = this.#database.orm
|
|
90
|
+
.delete(command)
|
|
91
|
+
.where(and(eq(command.commandId, identity.commandId), eq(command.fate, "settled-before-start")))
|
|
92
|
+
.returning({ commandId: command.commandId })
|
|
93
|
+
.get();
|
|
94
|
+
if (replaced !== undefined) {
|
|
95
|
+
this.#database.orm.delete(commandOutcome).where(eq(commandOutcome.commandId, replaced.commandId)).run();
|
|
96
|
+
}
|
|
97
|
+
this.#database.orm
|
|
98
|
+
.insert(command)
|
|
99
|
+
.values({ ...identity, admissionOrder: this.#nextAdmissionOrder(), fate: "pending" })
|
|
100
|
+
.run();
|
|
101
|
+
});
|
|
102
|
+
};
|
|
103
|
+
/** Records that a pending command was handed to its Agent. */
|
|
104
|
+
start = (commandId, startedAt) => {
|
|
105
|
+
this.#database.orm
|
|
106
|
+
.update(command)
|
|
107
|
+
.set({ fate: "started", startedAt })
|
|
108
|
+
.where(and(eq(command.commandId, commandId), eq(command.fate, "pending")))
|
|
109
|
+
.run();
|
|
110
|
+
};
|
|
111
|
+
/**
|
|
112
|
+
* Settles an unsettled command with its outcome and drops the outcomes the Session no longer keeps. Returns the
|
|
113
|
+
* commands whose outcome was dropped.
|
|
114
|
+
*/
|
|
115
|
+
settle = (commandId, fate, outcome) => this.#database.transaction(() => {
|
|
116
|
+
const settled = this.#database.orm
|
|
117
|
+
.update(command)
|
|
118
|
+
.set(fate === "settled-after-start" ? { fate } : { fate, startedAt: null })
|
|
119
|
+
.where(and(eq(command.commandId, commandId), inArray(command.fate, ["pending", "started"])))
|
|
120
|
+
.returning({ sessionId: command.sessionId })
|
|
121
|
+
.get();
|
|
122
|
+
if (settled === undefined) {
|
|
123
|
+
return [];
|
|
124
|
+
}
|
|
125
|
+
this.#database.orm.insert(commandOutcome).values({ commandId, outcome }).run();
|
|
126
|
+
return this.#dropOutcomes(settled.sessionId);
|
|
127
|
+
});
|
|
128
|
+
/** Admits an unseen command as already cancelled, so the identifier can never run. */
|
|
129
|
+
admitCancelled = (identity, outcome) => this.#database.transaction(() => {
|
|
130
|
+
this.#database.orm
|
|
131
|
+
.insert(command)
|
|
132
|
+
.values({ ...identity, admissionOrder: this.#nextAdmissionOrder(), fate: "cancelled" })
|
|
133
|
+
.run();
|
|
134
|
+
this.#database.orm.insert(commandOutcome).values({ commandId: identity.commandId, outcome }).run();
|
|
135
|
+
return this.#dropOutcomes(identity.sessionId);
|
|
136
|
+
});
|
|
137
|
+
#nextAdmissionOrder = () => (this.#database.orm
|
|
138
|
+
.select({ latest: max(command.admissionOrder) })
|
|
139
|
+
.from(command)
|
|
140
|
+
.get()?.latest ?? 0) + 1;
|
|
141
|
+
/** Keeps the outcomes of the Session's latest settled commands; a command that never started goes with its outcome. */
|
|
142
|
+
#dropOutcomes = (sessionId) => {
|
|
143
|
+
const boundary = this.#database.orm
|
|
144
|
+
.select({ admissionOrder: command.admissionOrder })
|
|
145
|
+
.from(command)
|
|
146
|
+
.innerJoin(commandOutcome, eq(commandOutcome.commandId, command.commandId))
|
|
147
|
+
.where(eq(command.sessionId, sessionId))
|
|
148
|
+
.orderBy(desc(command.admissionOrder))
|
|
149
|
+
.limit(1)
|
|
150
|
+
.offset(OUTCOMES_PER_SESSION - 1)
|
|
151
|
+
.get();
|
|
152
|
+
if (boundary === undefined) {
|
|
153
|
+
return [];
|
|
154
|
+
}
|
|
155
|
+
const dropped = this.#database.orm
|
|
156
|
+
.select({ commandId: command.commandId, fate: command.fate })
|
|
157
|
+
.from(command)
|
|
158
|
+
.innerJoin(commandOutcome, eq(commandOutcome.commandId, command.commandId))
|
|
159
|
+
.where(and(eq(command.sessionId, sessionId), lt(command.admissionOrder, boundary.admissionOrder)))
|
|
160
|
+
.all();
|
|
161
|
+
const commandIds = dropped.map((row) => row.commandId);
|
|
162
|
+
if (commandIds.length > 0) {
|
|
163
|
+
this.#database.orm.delete(commandOutcome).where(inArray(commandOutcome.commandId, commandIds)).run();
|
|
164
|
+
this.#database.orm
|
|
165
|
+
.delete(command)
|
|
166
|
+
.where(and(inArray(command.commandId, commandIds), eq(command.fate, "settled-before-start")))
|
|
167
|
+
.run();
|
|
168
|
+
}
|
|
169
|
+
return commandIds;
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
//# sourceMappingURL=command-ledger-table.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-ledger-table.js","sourceRoot":"","sources":["../../../../src/engine/storage/session/command-ledger-table.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { LocalSqliteDatabase } from "./local-sqlite-database.ts";
|
|
2
2
|
export interface ChannelSessionDatabasePaths {
|
|
3
|
-
readonly cancellations: string;
|
|
4
3
|
readonly events: string;
|
|
5
4
|
readonly sessions: string;
|
|
6
5
|
}
|
|
7
6
|
/** Each relay channel keeps its saved sessions and its spilled session events in its own files. */
|
|
8
7
|
export declare function channelSessionDatabasePaths(stateDirectory: string, channelId: string): ChannelSessionDatabasePaths;
|
|
9
8
|
export declare const openAcpSessionDatabase: (path: string) => LocalSqliteDatabase;
|
|
10
|
-
/** Cancellation receipts have an independent lifetime from Session history. */
|
|
11
|
-
export declare const openCommandCancellationDatabase: (path: string) => LocalSqliteDatabase;
|
|
12
9
|
export declare const openSessionEventCacheDatabase: (path: string) => LocalSqliteDatabase;
|
|
13
10
|
//# 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":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,MAAM,WAAW,2BAA2B;IACxC,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,CAMlH;AAED,eAAO,MAAM,sBAAsB,SAAU,MAAM,KAAG,mBAErD,CAAC;AAEF,eAAO,MAAM,6BAA6B,SAAU,MAAM,KAAG,mBAKvD,CAAC"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { acpSessionStoreMigrations } from "../../generated/acp-session-store-migrations.js";
|
|
4
|
-
import { commandCancellationMigrations } from "../../generated/command-cancellation-migrations.js";
|
|
5
4
|
import { sessionEventCacheMigrations } from "../../generated/session-event-cache-migrations.js";
|
|
6
5
|
import { LocalSqliteDatabase } from "./local-sqlite-database.js";
|
|
7
6
|
/** Each relay channel keeps its saved sessions and its spilled session events in its own files. */
|
|
8
7
|
export function channelSessionDatabasePaths(stateDirectory, channelId) {
|
|
9
8
|
const channelHash = createHash("sha256").update(channelId).digest("hex");
|
|
10
9
|
return {
|
|
11
|
-
cancellations: join(stateDirectory, "sessions", `${channelHash}.cancellations.sqlite`),
|
|
12
10
|
events: join(stateDirectory, "sessions", `${channelHash}.events.sqlite`),
|
|
13
11
|
sessions: join(stateDirectory, "sessions", `${channelHash}.sqlite`),
|
|
14
12
|
};
|
|
@@ -16,8 +14,6 @@ export function channelSessionDatabasePaths(stateDirectory, channelId) {
|
|
|
16
14
|
export const openAcpSessionDatabase = (path) => {
|
|
17
15
|
return new LocalSqliteDatabase(path, "ACP Session database", acpSessionStoreMigrations);
|
|
18
16
|
};
|
|
19
|
-
/** Cancellation receipts have an independent lifetime from Session history. */
|
|
20
|
-
export const openCommandCancellationDatabase = (path) => new LocalSqliteDatabase(path, "Command cancellation database", commandCancellationMigrations);
|
|
21
17
|
export const openSessionEventCacheDatabase = (path) => new LocalSqliteDatabase(path, "V2 Session event cache", sessionEventCacheMigrations, [
|
|
22
18
|
"PRAGMA journal_mode = WAL",
|
|
23
19
|
"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,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,
|
|
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,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAOjE,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,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,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAuB,EAAE;IACxE,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,sBAAsB,EAAE,yBAAyB,CAAC,CAAC;AAC5F,CAAC,CAAC;AAEF,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
package/package.json
CHANGED
|
@@ -1,5 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,9 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|