@anuma/sdk 7.3.0 → 7.3.2

package/dist/server/index.mjs

@@ -15181,7 +15181,7 @@ function onKeyAvailable(address, callback) {
   callbacks.add(callback);
   return () => {
     callbacks.delete(callback);
-    if (callbacks.size === 0) {
+    if (callbacks.size === 0 && keyAvailableCallbacks.get(address) === callbacks) {
       keyAvailableCallbacks.delete(address);
     }
   };
@@ -26093,6 +26093,67 @@ var import_watermelondb19 = __toESM(require_watermelondb());
 // src/lib/db/entities/operations.ts
 var import_watermelondb18 = __toESM(require_watermelondb());
 
+// src/lib/db/memoryVault/types.ts
+var MEMORY_KINDS = [
+  "display_name",
+  "birth_date",
+  "bio",
+  "occupation",
+  "interest",
+  "gender",
+  "height_cm",
+  "looking_for",
+  "politics",
+  "religion",
+  "ethnicity",
+  "smoking",
+  "drinking",
+  "exercise",
+  "sexuality",
+  "prompt"
+];
+var MEMORY_LEVELS = ["private", "matching", "profile"];
+var MemoryLevelError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "MemoryLevelError";
+  }
+};
+var MemorySourceIneligibleError = class extends Error {
+  constructor() {
+    super("Memory source is no longer eligible");
+    this.name = "MemorySourceIneligibleError";
+  }
+};
+var PUBLISHED_SCOPES = /* @__PURE__ */ new Set(["shared", "public"]);
+function levelFromScope(scope) {
+  return typeof scope === "string" && PUBLISHED_SCOPES.has(scope) ? "matching" : "private";
+}
+function scopeForLevel(level) {
+  return level === "private" ? "private" : "shared";
+}
+function resolveMemoryLevel(level, scope) {
+  return typeof level === "string" && MEMORY_LEVELS.includes(level) ? level : levelFromScope(scope);
+}
+function levelForScopeChange(current, nextScope) {
+  const implied = levelFromScope(nextScope);
+  return implied === "matching" && resolveMemoryLevel(current.level, current.scope) === "profile" ? "profile" : implied;
+}
+function parseMedia(value) {
+  if (typeof value !== "string" || value === "") return null;
+  try {
+    const parsed = JSON.parse(value);
+    if (!Array.isArray(parsed)) return null;
+    const refs = parsed.filter((r) => typeof r === "object" && r !== null).map((r) => ({
+      feedItemId: Number(r.feedItemId ?? r.feed_item_id),
+      objectKey: r.objectKey ?? r.object_key ?? null
+    })).filter((r) => Number.isFinite(r.feedItemId));
+    return refs.length > 0 ? refs : null;
+  } catch {
+    return null;
+  }
+}
+
 // src/lib/db/entities/types.ts
 var ENTITY_KINDS = [
   "person",
@@ -26142,7 +26203,7 @@ function parseTopics(value) {
 // src/lib/db/entities/operations.ts
 async function assertCanWrite(ctx) {
   if (ctx.canWrite && !await ctx.canWrite()) {
-    throw new Error("Memory source is no longer eligible");
+    throw new MemorySourceIneligibleError();
   }
 }
 function entityToStored(e) {
@@ -26534,61 +26595,6 @@ function serializeSourceChunkIds(ids) {
   return JSON.stringify(ids.slice(start));
 }
 
-// src/lib/db/memoryVault/types.ts
-var MEMORY_KINDS = [
-  "display_name",
-  "birth_date",
-  "bio",
-  "occupation",
-  "interest",
-  "gender",
-  "height_cm",
-  "looking_for",
-  "politics",
-  "religion",
-  "ethnicity",
-  "smoking",
-  "drinking",
-  "exercise",
-  "sexuality",
-  "prompt"
-];
-var MEMORY_LEVELS = ["private", "matching", "profile"];
-var MemoryLevelError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "MemoryLevelError";
-  }
-};
-var PUBLISHED_SCOPES = /* @__PURE__ */ new Set(["shared", "public"]);
-function levelFromScope(scope) {
-  return typeof scope === "string" && PUBLISHED_SCOPES.has(scope) ? "matching" : "private";
-}
-function scopeForLevel(level) {
-  return level === "private" ? "private" : "shared";
-}
-function resolveMemoryLevel(level, scope) {
-  return typeof level === "string" && MEMORY_LEVELS.includes(level) ? level : levelFromScope(scope);
-}
-function levelForScopeChange(current, nextScope) {
-  const implied = levelFromScope(nextScope);
-  return implied === "matching" && resolveMemoryLevel(current.level, current.scope) === "profile" ? "profile" : implied;
-}
-function parseMedia(value) {
-  if (typeof value !== "string" || value === "") return null;
-  try {
-    const parsed = JSON.parse(value);
-    if (!Array.isArray(parsed)) return null;
-    const refs = parsed.filter((r) => typeof r === "object" && r !== null).map((r) => ({
-      feedItemId: Number(r.feedItemId ?? r.feed_item_id),
-      objectKey: r.objectKey ?? r.object_key ?? null
-    })).filter((r) => Number.isFinite(r.feedItemId));
-    return refs.length > 0 ? refs : null;
-  } catch {
-    return null;
-  }
-}
-
 // src/lib/db/memoryVault/operations.ts
 function visibilityOrPrivate(value) {
   return value === "public" ? value : "private";
@@ -26608,7 +26614,7 @@ function isKinded(record) {
 }
 async function assertCanWrite2(ctx) {
   if (ctx.canWrite && !await ctx.canWrite()) {
-    throw new Error("Memory source is no longer eligible");
+    throw new MemorySourceIneligibleError();
   }
 }
 function assertValidKindLevel(kind, level) {
@@ -27285,7 +27291,7 @@ async function updateVaultMemoryOp(ctx, id, opts) {
       ctx.embeddedWalletSigner
     );
   } catch (err) {
-    if (err instanceof MemoryLevelError) throw err;
+    if (err instanceof MemoryLevelError || err instanceof MemorySourceIneligibleError) throw err;
     return null;
   }
 }
@@ -30961,6 +30967,13 @@ var DEFAULT_AUTO_MERGE_THRESHOLD = 0.8;
 var DEFAULT_SCOPE = "private";
 var DEFAULT_CONSOLIDATE_THRESHOLD = 0.55;
 var DEFAULT_CONSOLIDATE_TOP_K = 20;
+var RetainError = class extends Error {
+  constructor(reason, message) {
+    super(message);
+    this.reason = reason;
+    this.name = "RetainError";
+  }
+};
 async function retain(content, ctx, options = {}) {
   const embeddingOptions = {
     ...ctx.embeddingOptions,
@@ -31016,7 +31029,8 @@ async function retainWithPersistence(content, ctx, options = {}) {
     });
     prepared = withoutKindedRows(prepared);
     if (prepared.embeddingFailure || prepared.embeddingsUnavailable) {
-      throw new Error(
+      throw new RetainError(
+        "embeddings-unavailable",
         "retain: embeddings unavailable \u2014 refusing to auto-merge against an inert cosine lane, which would create a duplicate instead of merging into the existing memory. Retry when embeddings recover, or pass enableAutoMerge: false to force a create."
       );
     }
@@ -31386,7 +31400,10 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
 async function assertMergeTargetGoneOrThrow(ctx, targetId) {
   const stillExists = await (ctx.persistence.getFresh ? ctx.persistence.getFresh(targetId) : ctx.persistence.get(targetId));
   if (stillExists && (stillExists.kind === null || stillExists.kind === void 0)) {
-    throw new Error(`retain: merge into memory ${targetId} failed to persist`);
+    throw new RetainError(
+      "merge-not-persisted",
+      `retain: merge into memory ${targetId} failed to persist`
+    );
   }
 }
 
@@ -31544,6 +31561,12 @@ function restoreCandidates(candidates, redactor, ownNames) {
     (c) => c.candidate.content.length <= MAX_CONTENT_LENGTH && !c.unresolved && !isLowSignalContent(c.candidate.content, ownNames)
   ).map((c) => c.candidate);
 }
+function writeFailureReasonOf(err) {
+  if (err instanceof MemorySourceIneligibleError) return "source-ineligible";
+  if (err instanceof RetainError) return err.reason;
+  if (err?.name === "AbortError") return "aborted";
+  return "unknown";
+}
 async function extractAndRetain(messages, retainCtx, options) {
   const { memoryStore, signal } = options;
   if (memoryStore === null) throw new Error("Memory store is not ready");
@@ -31633,6 +31656,7 @@ async function extractAndRetain(messages, retainCtx, options) {
   const results = [];
   const quarantinedInfo = [];
   let failedWrites = 0;
+  let writeFailureReason;
   let auditRows;
   const tRetain = Date.now();
   for (const { candidate, isQuarantined, reason, signature } of toRetain) {
@@ -31728,6 +31752,7 @@ async function extractAndRetain(messages, retainCtx, options) {
       }
     } catch (err) {
       failedWrites++;
+      writeFailureReason ?? (writeFailureReason = writeFailureReasonOf(err));
       log.warn("[memory/extract] retain failed for one candidate", err);
       options.onCandidateFailed?.(candidate, err);
     }
@@ -31740,6 +31765,7 @@ async function extractAndRetain(messages, retainCtx, options) {
     candidates: succeededCandidates,
     results,
     failedCount: failedWrites,
+    ...writeFailureReason !== void 0 && { writeFailureReason },
     outcome,
     quarantined: quarantinedInfo,
     funnel: {
@@ -32008,7 +32034,17 @@ function createAutoExtractor(options) {
     const t0 = Date.now();
     void (async () => {
       try {
-        const { candidates, results, failedCount, outcome, failure, funnel, timings, model } = await extractAndRetain(window2, retainCtx, {
+        const {
+          candidates,
+          results,
+          failedCount,
+          writeFailureReason,
+          outcome,
+          failure,
+          funnel,
+          timings,
+          model
+        } = await extractAndRetain(window2, retainCtx, {
           extract,
           memoryStore: options.memoryStore,
           signal: options.signal,
@@ -32044,6 +32080,7 @@ function createAutoExtractor(options) {
           candidates,
           results,
           failedCount,
+          ...writeFailureReason !== void 0 && { writeFailureReason },
           durationMs: Date.now() - t0,
           conversationId,
           outcome,
@@ -34156,10 +34193,10 @@ function createLocalMemoryStore(options) {
   const assertWrite = async (writeOptions) => {
     writeOptions?.signal?.throwIfAborted();
     if (writeOptions?.canWrite && !await writeOptions.canWrite()) {
-      throw new Error("Memory source is no longer eligible");
+      throw new MemorySourceIneligibleError();
     }
     if (options.canWrite && !await options.canWrite()) {
-      throw new Error("Memory source is no longer eligible");
+      throw new MemorySourceIneligibleError();
     }
     writeOptions?.signal?.throwIfAborted();
   };
@@ -35114,10 +35151,20 @@ function batchError(result) {
 var AccountFailureError = class extends Error {
 };
 var LockedSourcesError = class extends Error {
-  constructor(persistentIds) {
-    super("Source messages are locked; retained for retry");
+  constructor(persistentIds, locked) {
+    const counts = /* @__PURE__ */ new Map();
+    for (const message of locked) {
+      const version = /^enc:(v\d+):/.exec(message.content)?.[1] ?? "unknown";
+      const key = `${message.decryptionStatus ?? "no_status"}:${version}`;
+      counts.set(key, (counts.get(key) ?? 0) + 1);
+    }
+    const summary = [...counts].map(([key, count]) => `${key}=${count}`).join(", ");
+    super(`Source messages are locked; retained for retry (${summary})`);
     this.persistentIds = persistentIds;
   }
+  get awaitingKey() {
+    return this.persistentIds.length === 0;
+  }
 };
 function splitTurns(messages) {
   const turns = [];
@@ -35171,6 +35218,8 @@ function createDurableAutoExtractor(options) {
   const attempts = /* @__PURE__ */ new Map();
   const sessionFailures = /* @__PURE__ */ new Map();
   const skippedThisSession = /* @__PURE__ */ new Set();
+  const awaitingKey = /* @__PURE__ */ new Set();
+  let keyEpoch = 0;
   const clock = options.now ?? Date.now;
   const reportError = (error, conversationId) => {
     try {
@@ -35364,13 +35413,15 @@ function createDurableAutoExtractor(options) {
       for (const job of pending) {
         if (disposed) break;
         const attempted = attempts.get(job.id) ?? 0;
-        if (attempted >= MAX_ATTEMPTS || skippedThisSession.has(job.id)) continue;
+        if (attempted >= MAX_ATTEMPTS || skippedThisSession.has(job.id) || awaitingKey.has(job.id))
+          continue;
         if (processed >= MAX_JOBS_PER_PASS) {
           scheduleAfterSuccess = true;
           break;
         }
         processed++;
         const conversationId = String(job._getRaw("conversation_id"));
+        const epochAtRead = keyEpoch;
         let ids = [];
         let loaded = [];
         try {
@@ -35404,16 +35455,39 @@ function createDurableAutoExtractor(options) {
             );
             continue;
           }
-          const locked = loaded.filter((message) => message && isEncrypted(message.content));
+          const foreign = new Set(
+            ids.filter((_id, index) => loaded[index]?.conversationId !== conversationId)
+          );
+          if (foreign.size) {
+            await database.write(
+              () => job.update(
+                (r) => r._setRaw(
+                  "message_ids",
+                  JSON.stringify(idsOf(job).filter((id) => !foreign.has(id)))
+                )
+              )
+            );
+            attempts.delete(job.id);
+            scheduleAfterSuccess = true;
+            reportError(
+              new Error(`Dropped ${foreign.size} source id(s) from another conversation`),
+              conversationId
+            );
+            continue;
+          }
+          const locked = loaded.filter(
+            (message) => !!message && isEncrypted(message.content)
+          );
           if (locked.length) {
             throw new LockedSourcesError(
               locked.flatMap(
                 (message) => message.decryptionStatus === "auth_mismatch" || message.decryptionStatus === "invalid_payload" ? [message.uniqueId] : []
-              )
+              ),
+              locked
             );
           }
           const messages = loaded.flatMap(
-            (m) => m && m.conversationId === conversationId && (m.role === "user" || m.role === "assistant") ? [{ id: m.uniqueId, role: m.role, content: m.content }] : []
+            (m) => m && (m.role === "user" || m.role === "assistant") ? [{ id: m.uniqueId, role: m.role, content: m.content }] : []
           );
           const jobScope = currentScope() === "private" ? "private" : String(job._getRaw("scope"));
           const jobFolderId = job._getRaw("folder_id") ?? null;
@@ -35463,6 +35537,12 @@ function createDurableAutoExtractor(options) {
           scheduleAfterSuccess = true;
         } catch (error) {
           if (disposed) break;
+          if (error instanceof LockedSourcesError && error.awaitingKey) {
+            reportError(error, conversationId);
+            if (keyEpoch === epochAtRead) awaitingKey.add(job.id);
+            else scheduleAfterSuccess = true;
+            continue;
+          }
           attempts.set(job.id, attempted + 1);
           retry = true;
           reportError(error, conversationId);
@@ -35490,7 +35570,18 @@ function createDurableAutoExtractor(options) {
     activeBatch?.abort(options.signal?.reason);
     if (timer !== void 0) clearTimeout(timer);
     options.signal?.removeEventListener("abort", dispose);
+    unsubscribeKey?.();
   }
+  const unsubscribeKey = vault.walletAddress ? onKeyAvailable(vault.walletAddress, () => {
+    keyEpoch++;
+    if (!awaitingKey.size) return;
+    awaitingKey.clear();
+    if (timer !== void 0) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+    schedule(0);
+  }) : void 0;
   if (options.signal?.aborted) dispose();
   else options.signal?.addEventListener("abort", dispose, { once: true });
   schedule(0);
@@ -35506,9 +35597,31 @@ function createDurableAutoExtractor(options) {
             (candidate) => candidate._getRaw("scope") === scope && (candidate._getRaw("folder_id") ?? null) === folderId
           );
           const positions = new Map(ids.map((id, index) => [id, index]));
+          const watermarks = existing.flatMap((prior) => {
+            const watermark = prior._getRaw("watermark");
+            return typeof watermark === "string" && watermark ? [watermark] : [];
+          });
+          if (watermarks.length) {
+            const misplaced = new Set(
+              await storage.messagesCollection.query(
+                import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(watermarks)),
+                import_watermelondb25.Q.where("conversation_id", import_watermelondb25.Q.notEq(conversationId))
+              ).fetchIds()
+            );
+            for (const prior of existing)
+              if (misplaced.has(String(prior._getRaw("watermark"))))
+                await prior.update((r) => {
+                  r._setRaw("watermark", null);
+                  r._setRaw("watermark_seq", null);
+                });
+          }
           const rows = await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetch();
+          const foreignRows = new Set(
+            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+          );
           const sequences = /* @__PURE__ */ new Map();
           for (const row of rows) {
+            if (foreignRows.has(row.id)) continue;
             const sequence = Number(row._getRaw("message_id"));
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
@@ -35551,13 +35664,14 @@ function createDurableAutoExtractor(options) {
           const ownWatermark = job?._getRaw("watermark");
           const atOwnWatermark = !!job && boundary >= 0 && failedSessionsOf(job, String(ownWatermark)) < MAX_FAILED_SESSIONS && (ids[boundary] === ownWatermark || sequences.get(ids[boundary]) !== void 0 && sequences.get(ids[boundary]) === seqOf(job));
           const overlapStart = atOwnWatermark ? Math.max(0, boundary - 1) : start;
-          const fresh = ids.slice(overlapStart).filter((id) => !foreignSources.has(id));
+          const fresh = ids.slice(overlapStart).filter((id) => !foreignSources.has(id) && !foreignRows.has(id));
           if (!fresh.length) return;
           if (job) {
             await job.update(
               (r) => r._setRaw("message_ids", JSON.stringify([.../* @__PURE__ */ new Set([...idsOf(job), ...fresh])]))
             );
             attempts.delete(job.id);
+            awaitingKey.delete(job.id);
           } else {
             await jobs.create((r) => {
               r._setRaw("owner_key", owner);

package/package.json

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