@morlay/session-rdb 0.0.21-alpha.5 → 0.0.21-alpha.7

package/src/storage-takeover/projection-cache.ts

@@ -27,6 +27,12 @@ type CurrentCheckpointIdentity = CheckpointIdentity & {
   inheritedEventCount: number;
 };
 
+/** header 能证明的生命周期身份（上游 0.1.7 的 header-only 匹配口径）。 */
+type LifecycleIdentity = CheckpointIdentity & {
+  formatVersion: number;
+  isSeeded: boolean;
+};
+
 export interface ProjectionCacheConfig {
   writeEveryEvents: number;
 
@@ -95,16 +101,26 @@ export class SessionProjectionCacheRdb extends Service {
     return identityMatches(record.identity, expected) ? record : undefined;
   }
 
+  /**
+   * header-only 读（会话列表这类）：上游 0.1.7 起只给 header 与 keys——它要求的是**生命周期**身份，
+   * 不再要求调用方提供 inherited cut（那个 cut 只有写路径与 hydration 用得上）。
+   */
   cachedSnapshot(
     meta: SessionHeader,
-    inheritedEventCount: SessionLogOffset,
     keys?: readonly Extract<keyof SessionProjectionMap, string>[],
   ): ProjectionSnapshot | undefined {
-    const record = this.recordFor(meta.id, identityOf(meta, inheritedEventCount));
+    const record = this.recordForLifecycle(meta);
     const snapshot = record === undefined ? undefined : this.viewRecord(record, keys);
     return this.withDirectTitle(meta.id, keys, snapshot);
   }
 
+  private recordForLifecycle(meta: SessionHeader): StoredProjcacheEntry | undefined {
+    const record = this.lookup(meta.id);
+    return record === undefined || !identityMatches(record.identity, lifecycleIdentityOf(meta))
+      ? undefined
+      : record;
+  }
+
   private withDirectTitle(
     id: SessionId,
     keys: readonly Extract<keyof SessionProjectionMap, string>[] | undefined,
@@ -123,17 +139,15 @@ export class SessionProjectionCacheRdb extends Service {
     return { asOfSeq: asOfSeq as SessionSeqCursor, values };
   }
 
-  cachedPredecessorTitle(
-    meta: SessionHeader,
-    inheritedEventCount: SessionLogOffset,
-  ): ProjectionSnapshot | undefined {
-    const expected = identityOf(meta, inheritedEventCount);
+  cachedPredecessorTitle(meta: SessionHeader): ProjectionSnapshot | undefined {
     const record = this.lookup(meta.id);
-    if (record === undefined || !predecessorIdentityMatches(record.identity, expected)) {
+    if (
+      record === undefined ||
+      !predecessorIdentityMatches(record.identity, lifecycleIdentityOf(meta))
+    ) {
       return undefined;
     }
-    const title = this.viewRecord(record, [PREDECESSOR_TITLE_KEY]);
-    return title === undefined ? undefined : { ...title, asOfSeq: -1 };
+    return this.viewRecord(record, [PREDECESSOR_TITLE_KEY]);
   }
 
   private viewRecord(
@@ -322,6 +336,16 @@ function detachJson(
   return JSON.parse(text) as Record<string, ProjectionCheckpointRow>;
 }
 
+/** header 能证明的生命周期身份（不含 inherited cut）：header-only 读只比对它。 */
+function lifecycleIdentityOf(header: SessionHeader): LifecycleIdentity {
+  return {
+    formatVersion: header.version,
+    createdAt: header.createdAt,
+    ...(header.cwd === undefined ? {} : { cwd: header.cwd }),
+    isSeeded: header.isSeeded,
+  };
+}
+
 function identityOf(
   header: SessionHeader,
   inheritedEventCount: SessionLogOffset,
@@ -339,7 +363,7 @@ function identityOf(
   };
 }
 
-function identityMatches(stored: CheckpointIdentity, expected: CurrentCheckpointIdentity): boolean {
+function identityMatches(stored: CheckpointIdentity, expected: LifecycleIdentity): boolean {
   return (
     stored.formatVersion === expected.formatVersion && lifecycleIdentityMatches(stored, expected)
   );
@@ -347,7 +371,7 @@ function identityMatches(stored: CheckpointIdentity, expected: CurrentCheckpoint
 
 function predecessorIdentityMatches(
   stored: CheckpointIdentity,
-  expected: CurrentCheckpointIdentity,
+  expected: LifecycleIdentity,
 ): boolean {
   const predecessor =
     stored.formatVersion === undefined || stored.formatVersion < expected.formatVersion;
@@ -356,12 +380,13 @@ function predecessorIdentityMatches(
 
 function lifecycleIdentityMatches(
   stored: CheckpointIdentity,
-  expected: CurrentCheckpointIdentity,
+  expected: LifecycleIdentity,
 ): boolean {
+  // header-only 读的匹配口径（上游 0.1.7）：只看 formatVersion 与生命周期字段，**不比对 inherited cut**
+  // ——那个 cut 只有写路径与 hydration 用得上。
   return (
     stored.createdAt === expected.createdAt &&
     stored.cwd === expected.cwd &&
-    (stored.isSeeded ?? false) === expected.isSeeded &&
-    (stored.inheritedEventCount ?? 0) === expected.inheritedEventCount
+    (stored.isSeeded ?? false) === expected.isSeeded
   );
 }

package/src/storage-takeover/repository.ts

@@ -219,11 +219,19 @@ export function createStorageRepository(host: StorageRepositoryHost): StorageRep
           .where(isNotNull(tSessions.fArchivedAt))
           .orderBy(tSessions.fArchivedAt),
       );
+      const pinned = await allRows<{ fSessionId: string; fPinnedSeq: number | null }>(
+        db
+          .select({ fSessionId: tSessions.fSessionId, fPinnedSeq: tSessions.fPinnedSeq })
+          .from(tSessions)
+          .where(isNotNull(tSessions.fPinnedSeq))
+          .orderBy(tSessions.fPinnedSeq),
+      );
       const pendingMutation = pendingMutationOf(row);
       return {
         initialized: row.fInitialized !== 0,
         workspaceIds: ordered.map((entry) => entry.fWorkspaceId as WorkspaceId),
         archivedSessionIds: archives.map((entry) => entry.fSessionId as SessionId),
+        pinnedSessionIds: pinned.map((entry) => entry.fSessionId as SessionId),
         ...(pendingMutation === undefined ? {} : { pendingMutation }),
       };
     },
@@ -263,6 +271,32 @@ export function createStorageRepository(host: StorageRepositoryHost): StorageRep
           );
         }
 
+        // 钉住：未在集合里的清掉，集合里的按数组位置写序号（读回即按它排序）。
+        // 找不到会话行的 id 跳过：pin 只作用于已存在的会话（与归档不同，不凭空造行）。
+        // 旧 storages 文档（0.1.6 时代）没有这个集合，导入路径按空处理。
+        const pinned = state.pinnedSessionIds ?? [];
+        await runQuery(
+          pinned.length === 0
+            ? db
+                .update(tSessions)
+                .set({ fPinnedSeq: null })
+                .where(isNotNull(tSessions.fPinnedSeq))
+            : db
+                .update(tSessions)
+                .set({ fPinnedSeq: null })
+                .where(
+                  and(isNotNull(tSessions.fPinnedSeq), notInArray(tSessions.fSessionId, pinned)),
+                ),
+        );
+        for (const [position, sessionId] of pinned.entries()) {
+          await runQuery(
+            db
+              .update(tSessions)
+              .set({ fPinnedSeq: position })
+              .where(eq(tSessions.fSessionId, sessionId)),
+          );
+        }
+
         const archived = state.archivedSessionIds;
         await runQuery(
           archived.length === 0

package/src/storage-takeover/storage-backend.ts

@@ -178,7 +178,8 @@ function workspaceStateOf(value: unknown): WorkspaceDomainState {
     state === null ||
     typeof state.initialized !== "boolean" ||
     !Array.isArray(state.workspaceIds) ||
-    !Array.isArray(state.archivedSessionIds)
+    !Array.isArray(state.archivedSessionIds) ||
+    !Array.isArray(state.pinnedSessionIds)
   ) {
     throw new TypeError("workspace registry state does not match the stored shape");
   }
@@ -186,6 +187,7 @@ function workspaceStateOf(value: unknown): WorkspaceDomainState {
     initialized: state.initialized,
     workspaceIds: state.workspaceIds.map((id) => id as WorkspaceId),
     archivedSessionIds: state.archivedSessionIds.map((id) => id as SessionId),
+    pinnedSessionIds: state.pinnedSessionIds.map((id) => id as SessionId),
     ...(state.pendingMutation === undefined ? {} : { pendingMutation: state.pendingMutation }),
   };
 }

package/src/testing/coordinator-contract.ts

@@ -143,7 +143,8 @@ export function runCoordinatorContract(
           { surfaceOp: "append" },
         );
         expect(() => {
-          (ev.data as { content: { type: "text"; text: string }[] }).content[0]!.text = "HACKED";
+          (ev.data as unknown as { content: { type: "text"; text: string }[] }).content[0]!.text =
+            "HACKED";
         }).toThrow(TypeError);
         session.append("turn/end", { turn: 1, reason: { kind: "completed" } });
         await ctx.sessions.flush(session);

package/src/testing.ts

@@ -1,4 +1,3 @@
-export { EmptySettings } from "./testing/helpers.ts";
 export type { ContractBackend } from "./testing/contract.ts";
 export { appendLog, meta, oneTurnLog, runPersistenceContract } from "./testing/contract.ts";
 export type { CoordinatorFixture } from "./testing/coordinator-contract.ts";

package/src/write-guard.ts

@@ -7,6 +7,11 @@ export class WriteGuard {
     this.headSeqs.set(id, head);
   }
 
+  /** 本实例有没有这条会话的 head 记录（迁移重写用它决定是"登记基准"还是"严格比较"）。 */
+  has(id: SessionId): boolean {
+    return this.headSeqs.has(id);
+  }
+
   assertNoConcurrentWriter(id: SessionId, storedHead: number): void {
     const known = this.headSeqs.get(id);
     if (known === undefined) {

package/src/testing/helpers.ts

@@ -1,20 +0,0 @@
-import { Context } from "@deepseek-ai/cordis";
-import { SettingsProvider, type SettingsNamespace } from "@deepseek-ai/dsh-settings";
-
-export class EmptySettings extends SettingsProvider {
-  constructor(ctx: Context) {
-    super(ctx);
-  }
-
-  get writable(): boolean {
-    return true;
-  }
-
-  protected async load(): Promise<Record<string, unknown>> {
-    return {};
-  }
-
-  protected persist(_ns: SettingsNamespace, _section: Record<string, unknown>): Promise<void> {
-    return Promise.resolve();
-  }
-}