@morlay/session-rdb 0.0.14 → 0.0.15
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/artifact.d.mts +1 -1
- package/dist/artifact.mjs +2 -2
- package/dist/{import-B-tf5vQn.mjs → import-DFed8DBt.mjs} +1 -1
- package/dist/import.mjs +1 -1
- package/dist/index.mjs +3 -3
- package/dist/{schema-BfPVmr1X.mjs → schema-vwzwEXNE.mjs} +6 -3
- package/dist/{sqlite-BUWnS0so.mjs → sqlite-CG_Qcx5C.mjs} +1 -1
- package/dist/storage.mjs +2 -2
- package/package.json +1 -1
- package/src/log.ts +9 -3
package/dist/artifact.d.mts
CHANGED
|
@@ -35,7 +35,7 @@ declare function remapShadowedRange(range: {
|
|
|
35
35
|
start: number;
|
|
36
36
|
end: number;
|
|
37
37
|
};
|
|
38
|
-
declare function remapShadowedSeqs(seqs: readonly number[],
|
|
38
|
+
declare function remapShadowedSeqs(seqs: readonly number[], seqMap: ReadonlyMap<number, number>): number[];
|
|
39
39
|
declare function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>): SessionEvent;
|
|
40
40
|
declare function buildSeqMap(rows: readonly Pick<EventRow, "fSequence" | "fOriginalSeq">[]): Map<number, number>;
|
|
41
41
|
/**
|
package/dist/artifact.mjs
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { A as sessionInsertRow, C as remapSurfaceOp, D as rowToMeta, E as rowToEvent, O as scanRows, S as remapShadowedSeqs, T as repairSurfaceOps, _ as buildSeqMap, b as recomputeReplaceProvenance, j as toJsonlArtifact, k as sessionConflictRow, v as findSurfaceRepairs, w as repairOrphanInboxSplices, x as remapShadowedRange, y as orphanInboxSpliceSeqs } from "./schema-
|
|
2
|
-
import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-
|
|
1
|
+
import { A as sessionInsertRow, C as remapSurfaceOp, D as rowToMeta, E as rowToEvent, O as scanRows, S as remapShadowedSeqs, T as repairSurfaceOps, _ as buildSeqMap, b as recomputeReplaceProvenance, j as toJsonlArtifact, k as sessionConflictRow, v as findSurfaceRepairs, w as repairOrphanInboxSplices, x as remapShadowedRange, y as orphanInboxSpliceSeqs } from "./schema-vwzwEXNE.mjs";
|
|
2
|
+
import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-DFed8DBt.mjs";
|
|
3
3
|
export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, buildSeqMap, expandProvenanceFromStorage, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, remapShadowedRange, remapShadowedSeqs, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { D as rowToMeta, l as isPersistedEvent } from "./schema-
|
|
1
|
+
import { D as rowToMeta, l as isPersistedEvent } from "./schema-vwzwEXNE.mjs";
|
|
2
2
|
import { randomUUID } from "node:crypto";
|
|
3
3
|
import { SESSION_FORMAT_VERSION, SessionLogOffset, decodeSeqRanges, decodeStorageRecord } from "@deepseek-ai/dsh-session";
|
|
4
4
|
import { SessionBranch, SessionBranchError, balanceRewindPrefix, buildTimeline } from "@morlay/session-branch";
|
package/dist/import.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-
|
|
1
|
+
import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-DFed8DBt.mjs";
|
|
2
2
|
export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, expandProvenanceFromStorage, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };
|
package/dist/index.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { i as WriteGuard, r as createTablesSql, t as SqliteBackend } from "./sqlite-
|
|
2
|
-
import { A as sessionInsertRow, D as rowToMeta, O as scanRows, T as repairSurfaceOps, _ as buildSeqMap, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, b as recomputeReplaceProvenance, g as toPostgresSchema, i as SCHEMA_VERSION, j as toJsonlArtifact, k as sessionConflictRow, l as isPersistedEvent, m as postgresTableDefs, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, r as EVENT_ENCODING, t as DEFAULT_BUSY_TIMEOUT_MS, w as repairOrphanInboxSplices } from "./schema-
|
|
3
|
-
import { c as SessionBranchRdb, l as SessionBranchRdbProvider, s as registerSessionImport, u as locateTurnEnd } from "./import-
|
|
1
|
+
import { i as WriteGuard, r as createTablesSql, t as SqliteBackend } from "./sqlite-CG_Qcx5C.mjs";
|
|
2
|
+
import { A as sessionInsertRow, D as rowToMeta, O as scanRows, T as repairSurfaceOps, _ as buildSeqMap, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, b as recomputeReplaceProvenance, g as toPostgresSchema, i as SCHEMA_VERSION, j as toJsonlArtifact, k as sessionConflictRow, l as isPersistedEvent, m as postgresTableDefs, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, r as EVENT_ENCODING, t as DEFAULT_BUSY_TIMEOUT_MS, w as repairOrphanInboxSplices } from "./schema-vwzwEXNE.mjs";
|
|
3
|
+
import { c as SessionBranchRdb, l as SessionBranchRdbProvider, s as registerSessionImport, u as locateTurnEnd } from "./import-DFed8DBt.mjs";
|
|
4
4
|
import z from "@deepseek-ai/schemastery";
|
|
5
5
|
import { randomUUID } from "node:crypto";
|
|
6
6
|
import { Pool } from "pg";
|
|
@@ -59,8 +59,11 @@ function remapShadowedRange(range, remap) {
|
|
|
59
59
|
end: remap(range.end)
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
|
-
function remapShadowedSeqs(seqs,
|
|
63
|
-
return seqs.
|
|
62
|
+
function remapShadowedSeqs(seqs, seqMap) {
|
|
63
|
+
return seqs.flatMap((seq) => {
|
|
64
|
+
const dense = seqMap.get(seq);
|
|
65
|
+
return dense === void 0 ? [] : [dense];
|
|
66
|
+
});
|
|
64
67
|
}
|
|
65
68
|
function rowToEvent(row, seqMap) {
|
|
66
69
|
const remap = (seq) => seqMap.get(seq) ?? seq;
|
|
@@ -69,7 +72,7 @@ function rowToEvent(row, seqMap) {
|
|
|
69
72
|
if (row.fType === "compaction/summary" || row.fType === "compaction/prune") {
|
|
70
73
|
const metering = data;
|
|
71
74
|
if (metering.shadowedRange !== void 0) metering.shadowedRange = remapShadowedRange(metering.shadowedRange, remap);
|
|
72
|
-
if (metering.shadowedSeqs !== void 0) metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs,
|
|
75
|
+
if (metering.shadowedSeqs !== void 0) metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs, seqMap);
|
|
73
76
|
}
|
|
74
77
|
return {
|
|
75
78
|
type: row.fType,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { A as sessionInsertRow, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, d as tPersistenceState, f as tSessionEvents, h as sqliteTableDefs, k as sessionConflictRow, o as eventDimensions, p as tSessions, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-
|
|
1
|
+
import { A as sessionInsertRow, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, d as tPersistenceState, f as tSessionEvents, h as sqliteTableDefs, k as sessionConflictRow, o as eventDimensions, p as tSessions, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-vwzwEXNE.mjs";
|
|
2
2
|
import { randomUUID } from "node:crypto";
|
|
3
3
|
import { and, desc, eq, gte, sql } from "drizzle-orm";
|
|
4
4
|
import { statSync } from "node:fs";
|
package/dist/storage.mjs
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { i as WriteGuard, n as openDatabase, t as SqliteBackend } from "./sqlite-
|
|
2
|
-
import { a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, c as isEphemeralType, d as tPersistenceState, f as tSessionEvents, i as SCHEMA_VERSION, l as isPersistedEvent, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, p as tSessions, r as EVENT_ENCODING, s as eventKind, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-
|
|
1
|
+
import { i as WriteGuard, n as openDatabase, t as SqliteBackend } from "./sqlite-CG_Qcx5C.mjs";
|
|
2
|
+
import { a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, c as isEphemeralType, d as tPersistenceState, f as tSessionEvents, i as SCHEMA_VERSION, l as isPersistedEvent, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, p as tSessions, r as EVENT_ENCODING, s as eventKind, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-vwzwEXNE.mjs";
|
|
3
3
|
export { DEFAULT_BUSY_TIMEOUT_MS, EPHEMERAL_EVENT_TYPES, EVENT_ENCODING, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, SqliteBackend, WriteGuard, eventDimensions, eventKind, isEphemeralType, isPersistedEvent, openDatabase, tEvents, tPersistenceState, tSessionEvents, tSessions };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@morlay/session-rdb",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.15",
|
|
4
4
|
"description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"branch",
|
package/src/log.ts
CHANGED
|
@@ -92,9 +92,15 @@ export function remapShadowedRange(
|
|
|
92
92
|
|
|
93
93
|
export function remapShadowedSeqs(
|
|
94
94
|
seqs: readonly number[],
|
|
95
|
-
|
|
95
|
+
seqMap: ReadonlyMap<number, number>,
|
|
96
96
|
): number[] {
|
|
97
|
-
|
|
97
|
+
// 未持久化的引用(分支裁剪等)直接丢弃:恒等回退会留下陈旧的上游 seq,
|
|
98
|
+
// 稠密坐标通常被压缩,它可能大于 replace 事件的稠密 seq,上游
|
|
99
|
+
// assertProvenance 会以 "must reference earlier events" 拒绝整个会话。
|
|
100
|
+
return seqs.flatMap((seq) => {
|
|
101
|
+
const dense = seqMap.get(seq);
|
|
102
|
+
return dense === undefined ? [] : [dense];
|
|
103
|
+
});
|
|
98
104
|
}
|
|
99
105
|
|
|
100
106
|
export function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>): SessionEvent {
|
|
@@ -117,7 +123,7 @@ export function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>):
|
|
|
117
123
|
metering.shadowedRange = remapShadowedRange(metering.shadowedRange, remap);
|
|
118
124
|
}
|
|
119
125
|
if (metering.shadowedSeqs !== undefined) {
|
|
120
|
-
metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs,
|
|
126
|
+
metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs, seqMap);
|
|
121
127
|
}
|
|
122
128
|
}
|
|
123
129
|
return {
|