fix(memory): preserve pending dirty state on refresh

mushuiyu886 · mushuiyu886 · commit f007c10b7cc4 · 2026-06-14T23:58:07.000+08:00
Keep real pending memory and session dirty work when an external index replacement clears stale identity state, while still cleaning identity-only dirty flags.
diff --git a/extensions/memory-core/src/memory/manager.self-heal-missing-identity.test.ts b/extensions/memory-core/src/memory/manager.self-heal-missing-identity.test.ts
@@ -212,4 +212,48 @@ describe("memory manager self-heal missing identity with FTS-only chunks", () =>
     expect(statusAfter.custom?.indexIdentity).toEqual({ status: "valid" });
     expect(statusAfter.dirty).toBe(false);
   });
+
+  it("preserves pending memory and session dirty work when replacement refresh clears missing identity", async () => {
+    await seedChunksWithNoMeta();
+    const memoryManager = await createManager({ provider: "none", vectorEnabled: false });
+    const dirtyState = memoryManager as unknown as {
+      dirty: boolean;
+      memoryFullRetryDirty: boolean;
+      sessionsDirty: boolean;
+      sessionsDirtyFiles: Set<string>;
+      sessionsFullRetryDirty: boolean;
+    };
+
+    expect(indexIdentityStatus(memoryManager)).toBe("missing");
+    dirtyState.dirty = true;
+    dirtyState.memoryFullRetryDirty = true;
+    dirtyState.sessionsDirty = true;
+    dirtyState.sessionsDirtyFiles.add("session-a.jsonl");
+    dirtyState.sessionsFullRetryDirty = true;
+
+    const cliResult = await getMemorySearchManager({
+      cfg: createCfg({ provider: "none", vectorEnabled: false }),
+      agentId: "main",
+      purpose: "cli",
+    });
+    if (!cliResult.manager) {
+      throw new Error(cliResult.error ?? "cli manager missing");
+    }
+    const cliManager = cliResult.manager as unknown as MemoryIndexManager;
+    try {
+      await cliManager.sync({ reason: "cli", force: true });
+    } finally {
+      await cliManager.close?.();
+    }
+
+    const statusAfter = memoryManager.status();
+
+    expect(statusAfter.custom?.indexIdentity).toEqual({ status: "valid" });
+    expect(statusAfter.dirty).toBe(true);
+    expect(dirtyState.dirty).toBe(true);
+    expect(dirtyState.memoryFullRetryDirty).toBe(true);
+    expect(dirtyState.sessionsDirty).toBe(true);
+    expect(dirtyState.sessionsDirtyFiles.has("session-a.jsonl")).toBe(true);
+    expect(dirtyState.sessionsFullRetryDirty).toBe(true);
+  });
 });
diff --git a/extensions/memory-core/src/memory/manager.ts b/extensions/memory-core/src/memory/manager.ts
@@ -636,11 +636,8 @@ export class MemoryIndexManager extends MemoryManagerEmbeddingOps implements Mem
       state.status === "mismatched" ||
       (state.status === "missing" && (this.sources.has("memory") || this.hasIndexedChunks()));
     if (refreshedDatabase && hadIndexIdentityDirty && state.status === "valid") {
-      this.dirty = false;
-      this.sessionsDirty = false;
-      this.sessionsDirtyFiles.clear();
-      this.memoryFullRetryDirty = false;
-      this.sessionsFullRetryDirty = false;
+      this.dirty = this.memoryFullRetryDirty || this.pendingWatchPaths.size > 0;
+      this.sessionsDirty = this.sessionsFullRetryDirty || this.sessionsDirtyFiles.size > 0;
     }
     if (refreshedDatabase) {
       this.indexFileRefreshPendingDirtyCleanup = false;
