fix(memory): resolve adapter default model in plain status identity check (#90816)

clawsweeper[bot] · 849261680 · Takhoffman · web-flow · commit 50aaf1f9b634 · 2026-06-06T02:34:29.000Z
Summary: - This PR updates memory-core index identity resolution to treat an empty configured model as the embedding adapter default and adds a regression test for plain memory status. - PR surface: Source +5, Tests +33. Total +38 across 2 files. - Reproducibility: yes. from source and inherited proof: current main compares identity against an unresolved empty model in the plain status path, and the source PR shows the before/after CLI behavior on the same index. Automerge notes: - PR branch already contained follow-up commit before automerge: fix(memory): resolve adapter default model in plain status identity c… Validation: - ClawSweeper review passed for head 9741437. - Required merge gates passed before the squash merge. Prepared head SHA: 9741437 Review: #90816 (comment) Co-authored-by: 宇宙熊Yzx <53250620+849261680@users.noreply.github.com> Co-authored-by: clawsweeper <274271284+clawsweeper[bot]@users.noreply.github.com> Co-authored-by: clawsweeper[bot] <274271284+clawsweeper[bot]@users.noreply.github.com> Approved-by: takhoffman Co-authored-by: takhoffman <781889+takhoffman@users.noreply.github.com>
diff --git a/extensions/memory-core/src/memory/index.test.ts b/extensions/memory-core/src/memory/index.test.ts
@@ -493,6 +493,39 @@ describe("memory index", () => {
     }
   });
 
+  it("keeps status clean when configured model defaults to the adapter model (#90413)", async () => {
+    const dbPath = path.join(workspaceDir, "index-default-model-status.sqlite");
+    // Index under the provider's resolved default model, as provider init does.
+    const indexCfg = createCfg({
+      storePath: dbPath,
+      provider: "gemini",
+      model: "gemini-embed",
+      hybrid: { enabled: true, vectorWeight: 0.5, textWeight: 0.5 },
+    });
+    const indexManager = await getFreshManager(indexCfg);
+    await indexManager.sync({ reason: "test", force: true });
+    await indexManager.close?.();
+
+    // Plain status path before provider init: settings.model is the empty
+    // default, so identity must resolve the adapter model instead of comparing
+    // meta against a blank "expected" model.
+    const statusCfg = createCfg({
+      storePath: dbPath,
+      provider: "gemini",
+      model: "",
+      hybrid: { enabled: true, vectorWeight: 0.5, textWeight: 0.5 },
+    });
+    const statusManager = await getFreshManager(statusCfg, "status");
+    try {
+      const status = statusManager.status();
+
+      expect(status.dirty).toBe(false);
+      expect(status.custom?.indexIdentity).toEqual({ status: "valid" });
+    } finally {
+      await statusManager.close?.();
+    }
+  });
+
   it("does not search stale rows when index metadata is missing", async () => {
     const dbPath = path.join(workspaceDir, "index-missing-meta-cutover.sqlite");
     const cfg = createCfg({
diff --git a/extensions/memory-core/src/memory/manager-sync-ops.ts b/extensions/memory-core/src/memory/manager-sync-ops.ts
@@ -40,6 +40,7 @@ import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coer
 import {
   createEmbeddingProvider,
   resolveEmbeddingProviderAdapterId,
+  resolveEmbeddingProviderFallbackModel,
   type EmbeddingProvider,
   type EmbeddingProviderId,
   type EmbeddingProviderRuntime,
@@ -299,14 +300,18 @@ export abstract class MemoryManagerSyncOps {
     hasIndexedChunks?: boolean;
   }): MemoryIndexIdentityState {
     const hasProviderOverride = params && "provider" in params;
+    // Plain status can compare identity before provider init. Mirror provider
+    // init's empty-model fallback so adapter defaults do not look mismatched.
     const configuredProvider =
       this.settings.provider === "none"
         ? null
         : {
             id:
               resolveEmbeddingProviderAdapterId(this.settings.provider, this.cfg) ??
               this.settings.provider,
-            model: this.settings.model,
+            model:
+              this.settings.model.trim() ||
+              resolveEmbeddingProviderFallbackModel(this.settings.provider, "", this.cfg),
           };
     const provider = hasProviderOverride
       ? params.provider!
