@anuma/sdk 3.9.3 → 3.9.5

package/dist/server/index.cjs

@@ -20053,6 +20053,14 @@ var init_lruCache = __esm({
 });
 
 // src/lib/memory/queryEntities.ts
+function hasMeaningfulCandidate(candidates) {
+  for (const candidate of candidates) {
+    if (!candidate.split(/\s+/).every((token) => FALLBACK_STOPWORDS.has(token))) {
+      return true;
+    }
+  }
+  return false;
+}
 function extractQueryEntities(query) {
   if (!query) return [];
   const matches = query.matchAll(ENTITY_REGEX);
@@ -20068,9 +20076,27 @@ function extractQueryEntities(query) {
       seen.add(candidate);
     }
   }
-  return [...seen];
+  if (hasMeaningfulCandidate(seen)) return [...seen];
+  return [.../* @__PURE__ */ new Set([...extractFallbackCandidates(query), ...seen])];
 }
-var STOPWORDS2, ENTITY_REGEX;
+function extractFallbackCandidates(query) {
+  const tokens = (query.match(/\p{L}[\p{L}'-]*/gu) ?? []).map(normalizeEntityName);
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (let n = 1; n <= MAX_FALLBACK_TOKENS; n++) {
+    for (let start = 0; start + n <= tokens.length; start++) {
+      const gram = tokens.slice(start, start + n);
+      if (gram.some((t) => t.length < 2 || FALLBACK_STOPWORDS.has(t))) continue;
+      const candidate = gram.join(" ");
+      if (seen.has(candidate)) continue;
+      seen.add(candidate);
+      out.push(candidate);
+      if (out.length >= MAX_FALLBACK_CANDIDATES) return out;
+    }
+  }
+  return out;
+}
+var STOPWORDS2, ENTITY_REGEX, FALLBACK_ONLY_STOPWORDS, FALLBACK_STOPWORDS, MAX_FALLBACK_CANDIDATES, MAX_FALLBACK_TOKENS;
 var init_queryEntities = __esm({
   "src/lib/memory/queryEntities.ts"() {
     "use strict";
@@ -20122,6 +20148,10 @@ var init_queryEntities = __esm({
       ].map((w) => w.toLowerCase())
     );
     ENTITY_REGEX = /\b\p{Lu}[\p{L}'-]{2,}(?:\s+\p{Lu}[\p{L}'-]+){0,2}\b/gu;
+    FALLBACK_ONLY_STOPWORDS = "a an and or but nor not if then than because so too also just very really about above after again against all am any anyone anybody anything are around as at be been being before behind below between both by can cannot could currently did do does doing done down during each ever every everybody everyone everything few find finds finding for from get gets getting go goes going gone got had has have having he help her here hers him his hmm i in into is it its knew know knows later like liked likes live lived lives living look looked looking looks made make makes may me meet meets might mine more most must my near need needed needs never nobody nothing now of off okay on once only onto other our ours out over own people person please recently said same say says see seen shall she should since some somebody someone something soon still such talk tell tells thank that the their theirs them there these they think thinks this those thought through to today told tomorrow under until up us want wanted wants was we went were which while will with without work worked working works would yeah year years yep yesterday you your yours aren't can't couldn't didn't doesn't don't hadn't hasn't haven't he's how's i'd i'll i'm i've isn't it's let's she's shouldn't that's there's they're they've wasn't we're we've weren't what's when's where's who's why's won't wouldn't you'll you're you've".split(" ");
+    FALLBACK_STOPWORDS = /* @__PURE__ */ new Set([...STOPWORDS2, ...FALLBACK_ONLY_STOPWORDS]);
+    MAX_FALLBACK_CANDIDATES = 12;
+    MAX_FALLBACK_TOKENS = 3;
   }
 });
 
@@ -21575,13 +21605,12 @@ async function buildProjectedCorpus(query, vaultCtx, embeddingOptions, cache, qu
   }));
   return { memories, embeddedItems, queryEmbedding, vaultSize };
 }
-async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, cache, searchOptions) {
-  const limit = searchOptions?.limit ?? 5;
-  const minSimilarity = searchOptions?.minSimilarity ?? 0.1;
-  const scopes = searchOptions?.scopes;
+async function prepareVaultCandidates(query, vaultCtx, embeddingOptions, cache, searchOptions) {
   if (!query || typeof query !== "string") {
-    return { results: [], vaultSize: 0, reranked: false, hadV2Head: false };
+    return { memories: [], embeddedItems: [], queryEmbedding: [], vaultSize: 0 };
   }
+  const limit = searchOptions?.limit ?? 5;
+  const scopes = searchOptions?.scopes;
   const folderId = searchOptions?.folderId;
   const queryOpts = {};
   if (scopes?.length) queryOpts.scopes = scopes;
@@ -21608,11 +21637,11 @@ async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, ca
       ...forceIncludeIds.length > 0 && { forceIncludeIds }
     });
     if (corpus.vaultSize === 0) {
-      return { results: [], vaultSize: 0, reranked: false, hadV2Head: false };
+      return { memories: [], embeddedItems: [], queryEmbedding: [], vaultSize: 0 };
     }
     ({ memories, embeddedItems, queryEmbedding, vaultSize } = corpus);
     if (memories.length === 0) {
-      return { results: [], vaultSize, reranked: false, hadV2Head: false };
+      return { memories: [], embeddedItems: [], queryEmbedding: [], vaultSize };
     }
   } else {
     const loaded = await getAllVaultMemoriesOp(
@@ -21627,7 +21656,7 @@ async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, ca
       );
     }
     if (memories.length === 0) {
-      return { results: [], vaultSize: loaded.length, reranked: false, hadV2Head: false };
+      return { memories: [], embeddedItems: [], queryEmbedding: [], vaultSize: loaded.length };
     }
     queryEmbedding = await generateEmbedding(query, embeddingOptions);
     const currentModel = embeddingOptions.model ?? DEFAULT_API_EMBEDDING_MODEL;
@@ -21692,6 +21721,12 @@ async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, ca
       factType: m.factType
     }));
   }
+  return { memories, embeddedItems, queryEmbedding, vaultSize };
+}
+async function rankPreparedVaultCandidates(query, prepared, embeddingOptions, searchOptions) {
+  const limit = searchOptions?.limit ?? 5;
+  const minSimilarity = searchOptions?.minSimilarity ?? 0.1;
+  const { memories, embeddedItems, queryEmbedding, vaultSize } = prepared;
   if (queryEmbedding.length > 0) {
     const mismatched = embeddedItems.filter(
       (it) => it.embedding.length > 0 && it.embedding.length !== queryEmbedding.length
@@ -21829,6 +21864,25 @@ async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, ca
   });
   return stampTimestamps({ results, vaultSize, hadV2Head: results.length > 0 });
 }
+async function searchVaultMemoriesWithSize(query, vaultCtx, embeddingOptions, cache, searchOptions) {
+  if (!query || typeof query !== "string") {
+    return { results: [], vaultSize: 0, reranked: false, hadV2Head: false };
+  }
+  const prepared = await prepareVaultCandidates(
+    query,
+    vaultCtx,
+    embeddingOptions,
+    cache,
+    searchOptions
+  );
+  if (prepared.vaultSize === 0) {
+    return { results: [], vaultSize: 0, reranked: false, hadV2Head: false };
+  }
+  if (prepared.memories.length === 0) {
+    return { results: [], vaultSize: prepared.vaultSize, reranked: false, hadV2Head: false };
+  }
+  return rankPreparedVaultCandidates(query, prepared, embeddingOptions, searchOptions);
+}
 async function searchVaultMemories(query, vaultCtx, embeddingOptions, cache, searchOptions) {
   const { results } = await searchVaultMemoriesWithSize(
     query,
@@ -27609,9 +27663,25 @@ async function retain(content, ctx, options = {}) {
   const resolvedScope = options.scope ?? DEFAULT_SCOPE;
   let supersedeTargetIds = [];
   let supersedeContent;
+  let prepared;
   if (enableAutoMerge) {
+    prepared = await prepareVaultCandidates(
+      trimmed,
+      ctx.vaultCtx,
+      ctx.embeddingOptions,
+      ctx.vaultCache,
+      {
+        limit: Math.max(options.consolidateTopK ?? DEFAULT_CONSOLIDATE_TOP_K, 1),
+        useFusion: false,
+        scopes: [resolvedScope],
+        // PR5 — include archived rows as merge candidates so a re-observed fact
+        // resurrects (un-archives) the decayed row instead of duplicating it.
+        includeArchived: true,
+        ...options.folderId !== void 0 && { folderId: options.folderId }
+      }
+    );
     if (options.consolidateOptions) {
-      const outcome = await tryConsolidate(trimmed, ctx, options);
+      const outcome = await tryConsolidate(trimmed, ctx, options, prepared);
       if (outcome) {
         if ("done" in outcome) return outcome.done;
         supersedeTargetIds = outcome.supersede;
@@ -27619,23 +27689,14 @@ async function retain(content, ctx, options = {}) {
       }
     }
     if (supersedeTargetIds.length === 0) {
-      const matches = await searchVaultMemories(
+      const { results: matches } = await rankPreparedVaultCandidates(
         trimmed,
-        ctx.vaultCtx,
+        prepared,
         ctx.embeddingOptions,
-        ctx.vaultCache,
         {
           limit: 1,
           minSimilarity: threshold,
-          useFusion: false,
-          scopes: [resolvedScope],
-          // PR5 — include archived rows as merge candidates so a re-observed
-          // fact resurrects (un-archives) the decayed row instead of creating a
-          // fresh duplicate. The resurrection is applied on the merge write
-          // below, but ONLY for a row that is not superseded/deleted (the
-          // guards below preserve main's tombstone/supersession suppression).
-          includeArchived: true,
-          ...options.folderId !== void 0 && { folderId: options.folderId }
+          useFusion: false
         }
       );
       if (matches.length > 0) {
@@ -27683,7 +27744,8 @@ async function retain(content, ctx, options = {}) {
     }
   }
   const contentToWrite = supersedeContent ?? trimmed;
-  const embedding = await generateEmbedding(contentToWrite, ctx.embeddingOptions);
+  const reusableQueryEmbedding = supersedeContent === void 0 && prepared && prepared.queryEmbedding.length > 0 ? prepared.queryEmbedding : void 0;
+  const embedding = reusableQueryEmbedding ?? await generateEmbedding(contentToWrite, ctx.embeddingOptions);
   const embeddingModel = ctx.embeddingOptions.model ?? DEFAULT_API_EMBEDDING_MODEL;
   if (options.respectTombstones) {
     const tombstoneId = await findTombstoneMatch(embedding, embeddingModel, resolvedScope, ctx, {
@@ -27812,26 +27874,19 @@ function pickFactTypeUpdate(existing, incoming) {
 function resurrectFields(existing) {
   return typeof existing.archivedAt === "number" ? { restore: true } : { preserveUpdatedAt: true };
 }
-async function tryConsolidate(trimmed, ctx, options) {
+async function tryConsolidate(trimmed, ctx, options, prepared) {
   const consolidateOptions = options.consolidateOptions;
   if (!consolidateOptions) return null;
   const consolidateThreshold = options.consolidateThreshold ?? DEFAULT_CONSOLIDATE_THRESHOLD;
   const topK = options.consolidateTopK ?? DEFAULT_CONSOLIDATE_TOP_K;
-  const resolvedScope = options.scope ?? DEFAULT_SCOPE;
-  const matches = await searchVaultMemories(
+  const { results: matches } = await rankPreparedVaultCandidates(
     trimmed,
-    ctx.vaultCtx,
+    prepared,
     ctx.embeddingOptions,
-    ctx.vaultCache,
     {
       limit: topK,
       minSimilarity: consolidateThreshold,
-      useFusion: false,
-      scopes: [resolvedScope],
-      // PR5 — archived rows are consolidation candidates too, so a paraphrased
-      // re-observation resurrects a decayed row rather than duplicating it.
-      includeArchived: true,
-      ...options.folderId !== void 0 && { folderId: options.folderId }
+      useFusion: false
     }
   );
   if (matches.length === 0) return null;

package/dist/server/index.mjs

@@ -88,6 +88,8 @@ import {
   onClearAllEncryptionState,
   onKeyAvailable,
   preEmbedVaultMemories,
+  prepareVaultCandidates,
+  rankPreparedVaultCandidates,
   recall,
   replaceMemoryEntitiesGuardedOp,
   requestEncryptionKey,
@@ -125,7 +127,7 @@ import {
   updateVaultMemoryOp,
   upsertMessageOp,
   vaultMemoryToStored
-} from "./chunk-ICGTS7X6.mjs";
+} from "./chunk-UU2F523R.mjs";
 import {
   createStreamingDeAnonymizer,
   resolvePiiRedactor
@@ -5265,9 +5267,25 @@ async function retain(content, ctx, options = {}) {
   const resolvedScope = options.scope ?? DEFAULT_SCOPE;
   let supersedeTargetIds = [];
   let supersedeContent;
+  let prepared;
   if (enableAutoMerge) {
+    prepared = await prepareVaultCandidates(
+      trimmed,
+      ctx.vaultCtx,
+      ctx.embeddingOptions,
+      ctx.vaultCache,
+      {
+        limit: Math.max(options.consolidateTopK ?? DEFAULT_CONSOLIDATE_TOP_K, 1),
+        useFusion: false,
+        scopes: [resolvedScope],
+        // PR5 — include archived rows as merge candidates so a re-observed fact
+        // resurrects (un-archives) the decayed row instead of duplicating it.
+        includeArchived: true,
+        ...options.folderId !== void 0 && { folderId: options.folderId }
+      }
+    );
     if (options.consolidateOptions) {
-      const outcome = await tryConsolidate(trimmed, ctx, options);
+      const outcome = await tryConsolidate(trimmed, ctx, options, prepared);
       if (outcome) {
         if ("done" in outcome) return outcome.done;
         supersedeTargetIds = outcome.supersede;
@@ -5275,23 +5293,14 @@ async function retain(content, ctx, options = {}) {
       }
     }
     if (supersedeTargetIds.length === 0) {
-      const matches = await searchVaultMemories(
+      const { results: matches } = await rankPreparedVaultCandidates(
         trimmed,
-        ctx.vaultCtx,
+        prepared,
         ctx.embeddingOptions,
-        ctx.vaultCache,
         {
           limit: 1,
           minSimilarity: threshold,
-          useFusion: false,
-          scopes: [resolvedScope],
-          // PR5 — include archived rows as merge candidates so a re-observed
-          // fact resurrects (un-archives) the decayed row instead of creating a
-          // fresh duplicate. The resurrection is applied on the merge write
-          // below, but ONLY for a row that is not superseded/deleted (the
-          // guards below preserve main's tombstone/supersession suppression).
-          includeArchived: true,
-          ...options.folderId !== void 0 && { folderId: options.folderId }
+          useFusion: false
         }
       );
       if (matches.length > 0) {
@@ -5339,7 +5348,8 @@ async function retain(content, ctx, options = {}) {
     }
   }
   const contentToWrite = supersedeContent ?? trimmed;
-  const embedding = await generateEmbedding(contentToWrite, ctx.embeddingOptions);
+  const reusableQueryEmbedding = supersedeContent === void 0 && prepared && prepared.queryEmbedding.length > 0 ? prepared.queryEmbedding : void 0;
+  const embedding = reusableQueryEmbedding ?? await generateEmbedding(contentToWrite, ctx.embeddingOptions);
   const embeddingModel = ctx.embeddingOptions.model ?? DEFAULT_API_EMBEDDING_MODEL;
   if (options.respectTombstones) {
     const tombstoneId = await findTombstoneMatch(embedding, embeddingModel, resolvedScope, ctx, {
@@ -5468,26 +5478,19 @@ function pickFactTypeUpdate(existing, incoming) {
 function resurrectFields(existing) {
   return typeof existing.archivedAt === "number" ? { restore: true } : { preserveUpdatedAt: true };
 }
-async function tryConsolidate(trimmed, ctx, options) {
+async function tryConsolidate(trimmed, ctx, options, prepared) {
   const consolidateOptions = options.consolidateOptions;
   if (!consolidateOptions) return null;
   const consolidateThreshold = options.consolidateThreshold ?? DEFAULT_CONSOLIDATE_THRESHOLD;
   const topK = options.consolidateTopK ?? DEFAULT_CONSOLIDATE_TOP_K;
-  const resolvedScope = options.scope ?? DEFAULT_SCOPE;
-  const matches = await searchVaultMemories(
+  const { results: matches } = await rankPreparedVaultCandidates(
     trimmed,
-    ctx.vaultCtx,
+    prepared,
     ctx.embeddingOptions,
-    ctx.vaultCache,
     {
       limit: topK,
       minSimilarity: consolidateThreshold,
-      useFusion: false,
-      scopes: [resolvedScope],
-      // PR5 — archived rows are consolidation candidates too, so a paraphrased
-      // re-observation resurrects a decayed row rather than duplicating it.
-      includeArchived: true,
-      ...options.folderId !== void 0 && { folderId: options.folderId }
+      useFusion: false
     }
   );
   if (matches.length === 0) return null;

package/dist/server/{recall-5OW4RJVC.mjs → recall-RVRZ4RQT.mjs}

@@ -1,6 +1,6 @@
 import {
   recall
-} from "./chunk-ICGTS7X6.mjs";
+} from "./chunk-UU2F523R.mjs";
 import "./chunk-MIXEASUP.mjs";
 import "./chunk-3RPGXXPZ.mjs";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anuma/sdk",
-  "version": "3.9.3",
+  "version": "3.9.5",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",