fix: keep checkpoint persist no-op for malformed rows

jalehman · jalehman · commit 4c3d1f83ce04 · 2026-06-23T17:01:08.000-07:00
diff --git a/src/gateway/session-compaction-checkpoints.test.ts b/src/gateway/session-compaction-checkpoints.test.ts
@@ -930,6 +930,37 @@ describe("session-compaction-checkpoints", () => {
     expect(nextStore[MAIN_SESSION_KEY]?.compactionCheckpoints).toBeUndefined();
   });
 
+  test("persist skips malformed session rows without synthesizing a session id", async () => {
+    const { storePath, sessionId, sessionKey, now } = await makeTempSessionStore(
+      "openclaw-checkpoint-malformed-row-",
+    );
+    await writeSessionStore(storePath, sessionKey, {
+      sessionId: "",
+      updatedAt: now,
+    });
+
+    const stored = await persistMainCheckpoint(storePath, {
+      sessionId,
+      snapshot: {
+        sessionId,
+        leafId: "pre-leaf",
+      },
+      postSessionFile: path.join(path.dirname(storePath), "sess.compacted.jsonl"),
+      postLeafId: "post-leaf",
+      createdAt: now,
+    });
+
+    expect(stored).toBeNull();
+    const nextStore = await readSessionStore<{
+      compactionCheckpoints?: unknown[];
+      sessionId?: string;
+    }>(storePath);
+    expect(nextStore[MAIN_SESSION_KEY]).toEqual({
+      sessionId: "",
+      updatedAt: now,
+    });
+  });
+
   test("persist trims retained checkpoint snapshots by total byte budget", async () => {
     const { dir, storePath, sessionId, sessionKey, now } = await makeTempSessionStore(
       "openclaw-checkpoint-byte-trim-",
diff --git a/src/gateway/session-compaction-checkpoints.ts b/src/gateway/session-compaction-checkpoints.ts
@@ -779,24 +779,29 @@ export async function persistSessionCompactionCheckpoint(
         removed: SessionCompactionCheckpoint[];
       }
     | undefined;
+  let stored = false;
   const updatedEntry = await updateSessionEntry(
     {
       storePath: target.storePath,
       sessionKey: target.canonicalKey,
     },
     async (existing) => {
+      if (!existing.sessionId) {
+        return null;
+      }
       const checkpoints = sessionStoreCheckpoints(existing);
       checkpoints.push(checkpoint);
       const snapshotBytesByPath = await statCheckpointSnapshotBytes(checkpoints);
       trimmedCheckpoints = trimSessionCheckpoints(checkpoints, snapshotBytesByPath);
+      stored = true;
       return {
         updatedAt: Math.max(existing.updatedAt ?? 0, createdAt),
         compactionCheckpoints: trimmedCheckpoints.kept,
       };
     },
   );
 
-  if (!updatedEntry) {
+  if (!updatedEntry || !stored) {
     log.warn("skipping compaction checkpoint persist: session not found", {
       sessionKey: params.sessionKey,
     });
