fix(memory): prevent empty expected model in memory index identity

xydt-tanshanshan · web-flow · commit 85a635368e2f · 2026-06-15T23:56:39.000+08:00
Guard memory index identity resolution against empty or whitespace provider models by falling back to fts-only, and use fts-only as the fallback source model when an adapter fallback cannot resolve a model. This prevents empty expectedModel mismatch reasons that can leave memory search dirty while preserving registered adapter default-model resolution. Refs #90787
diff --git a/extensions/memory-core/src/memory/manager-reindex-state.test.ts b/extensions/memory-core/src/memory/manager-reindex-state.test.ts
@@ -273,4 +273,39 @@ describe("memory reindex state", () => {
       ),
     ).toBe(false);
   });
+
+  it("falls back to fts-only when provider.model is an empty string", () => {
+    expect(
+      resolveMemoryIndexIdentityState(
+        createIdentityParams({
+          provider: { id: "openai", model: "" },
+          meta: createMeta({ model: "fts-only" }),
+        }),
+      ),
+    ).toEqual({ status: "valid" });
+  });
+
+  it("reports mismatch when empty-string expected model is compared to a non-fts index", () => {
+    const state = resolveMemoryIndexIdentityState(
+      createIdentityParams({
+        provider: { id: "openai", model: "" },
+        meta: createMeta({ model: "text-embedding-3-small" }),
+      }),
+    );
+    expect(state.status).toBe("mismatched");
+    if (state.status === "mismatched") {
+      expect(state.reason).toContain("expected fts-only");
+    }
+  });
+
+  it("falls back to fts-only when provider.model is whitespace-only", () => {
+    expect(
+      resolveMemoryIndexIdentityState(
+        createIdentityParams({
+          provider: { id: "openai", model: "  " },
+          meta: createMeta({ model: "fts-only" }),
+        }),
+      ),
+    ).toEqual({ status: "valid" });
+  });
 });
diff --git a/extensions/memory-core/src/memory/manager-reindex-state.ts b/extensions/memory-core/src/memory/manager-reindex-state.ts
@@ -159,7 +159,7 @@ export function resolveMemoryIndexIdentityState(params: {
   if (!meta) {
     return { status: "missing", reason: "index metadata is missing" };
   }
-  const expectedModel = params.provider ? params.provider.model : "fts-only";
+  const expectedModel = params.provider?.model?.trim() || "fts-only";
   const matchingModelIdentities = [
     { model: expectedModel, providerKey: params.providerKey },
     ...(params.providerAliases ?? []),
diff --git a/extensions/memory-core/src/memory/manager-sync-ops.ts b/extensions/memory-core/src/memory/manager-sync-ops.ts
@@ -517,7 +517,7 @@ export abstract class MemoryManagerSyncOps {
               this.settings.provider,
             model:
               this.settings.model.trim() ||
-              resolveEmbeddingProviderFallbackModel(this.settings.provider, "", this.cfg),
+              resolveEmbeddingProviderFallbackModel(this.settings.provider, "fts-only", this.cfg),
           });
     const provider = hasProviderOverride
       ? params.provider!

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ export function resolveMemoryIndexIdentityState(params: {`
`159`	`159`	`if (!meta) {`
`160`	`160`	`return { status: "missing", reason: "index metadata is missing" };`
`161`	`161`	`}`
`162`		`- const expectedModel = params.provider ? params.provider.model : "fts-only";`
	`162`	`+ const expectedModel = params.provider?.model?.trim() \|\| "fts-only";`
`163`	`163`	`const matchingModelIdentities = [`
`164`	`164`	`{ model: expectedModel, providerKey: params.providerKey },`
`165`	`165`	`...(params.providerAliases ?? []),`