@xmoxmo/bncr 0.6.5 → 0.6.7

package/src/plugin/sqlite-state.ts

@@ -1,11 +1,17 @@
 import { createHash } from 'node:crypto';
 import { DatabaseSync } from 'node:sqlite';
+import { normalizeAccountId } from '../core/accounts.ts';
 import {
   dumpRegisterDriftSnapshot,
   normalizeRegisterDriftSnapshot,
   type RegisterDriftSnapshot,
 } from '../core/register-trace.ts';
 import type { BncrRoute, OutboxEntry } from '../core/types.ts';
+import {
+  normalizePersistedHistoryKey,
+  resolvePersistedHistoryAccountId,
+  resolvePersistedHistoryKey,
+} from '../messaging/inbound/conversation-history.ts';
 import type {
   BncrGroupReplyMode,
   BncrPersistedAccountTimestamp,
@@ -776,16 +782,18 @@ function loadControlState(db: DatabaseSync): BncrSqliteControlState {
 }
 
 function deriveHistoryKeyFromRoute(args: {
+  accountId?: string | null;
   platform?: string;
   groupId?: string;
   userId?: string;
 }): string | null {
+  const accountId = normalizeAccountId(args.accountId);
   const platform = String(args.platform || '').trim();
   const groupId = String(args.groupId || '0').trim() || '0';
   const userId = String(args.userId || '0').trim() || '0';
   if (!platform) return null;
-  if (groupId !== '0') return `${platform}:${groupId}`;
-  if (userId !== '0') return `${platform}:${userId}`;
+  if (groupId !== '0') return `${accountId}:${platform}:${groupId}`;
+  if (userId !== '0') return `${accountId}:${platform}:${userId}`;
   return null;
 }
 
@@ -861,7 +869,7 @@ function replaceHistoryMessages(
     const seenReplayMessageIds = new Map<string, Set<string>>();
 
     for (const bucket of historyBuckets) {
-      const historyKey = String(bucket.key || '').trim();
+      const historyKey = normalizePersistedHistoryKey(String(bucket.key || '').trim());
       if (!historyKey) continue;
       for (const entry of Array.isArray(bucket.entries) ? bucket.entries : []) {
         const sender = String(entry?.sender || '').trim();
@@ -909,12 +917,22 @@ function replaceHistoryMessages(
     }
 
     for (const bucket of replayBuckets) {
-      const bufferKey = String(bucket.key || '').trim();
-      if (!bufferKey) continue;
+      const bucketKey = normalizePersistedHistoryKey(String(bucket.key || '').trim());
+      if (!bucketKey) continue;
       for (const entry of Array.isArray(bucket.entries) ? bucket.entries : []) {
         const sender = String(entry?.sender || '').trim();
         const body = String(entry?.body || '').trim();
         if (!sender || !body) continue;
+        const entryAccountId = entry.accountId
+          ? normalizeAccountId(entry.accountId)
+          : resolvePersistedHistoryAccountId(bucketKey);
+        const routeHistoryKey = deriveHistoryKeyFromRoute({
+          accountId: entryAccountId,
+          platform: entry.route?.platform,
+          groupId: entry.route?.groupId,
+          userId: entry.route?.userId,
+        });
+        const bufferKey = routeHistoryKey || resolvePersistedHistoryKey(bucketKey, entryAccountId);
         if (entry.messageId) {
           const seen = seenReplayMessageIds.get(bufferKey) ?? new Set<string>();
           if (seen.has(entry.messageId)) continue;
@@ -930,16 +948,12 @@ function replaceHistoryMessages(
         if (entry.messageId && isConsumedReplayMessage.get(bufferKey, entry.messageId)) {
           continue;
         }
-        const historyKey = deriveHistoryKeyFromRoute({
-          platform: entry.route?.platform,
-          groupId: entry.route?.groupId,
-          userId: entry.route?.userId,
-        });
+        const historyKey = routeHistoryKey || bufferKey;
         insert.run(
           'replay',
           historyKey ?? '',
           bufferKey,
-          entry.accountId ?? null,
+          entryAccountId,
           sender,
           entry.senderId ?? null,
           'assistant',
@@ -1807,13 +1821,23 @@ export function createBncrSqliteStateDatabase(
   }
 
   function normalizeHistoryKeySkipList(skipHistoryKeys: readonly string[] | undefined): string[] {
-    return Array.from(
-      new Set(
-        (skipHistoryKeys ?? [])
-          .map((key) => String(key || '').trim())
-          .filter((key) => Boolean(key)),
-      ),
-    );
+    const normalized: string[] = [];
+    for (const rawKey of skipHistoryKeys ?? []) {
+      const key = String(rawKey || '').trim();
+      if (!key) continue;
+      normalized.push(key);
+      const legacyKey = toLegacyHistoryKey(key);
+      if (legacyKey && legacyKey !== key) normalized.push(legacyKey);
+    }
+    return Array.from(new Set(normalized));
+  }
+
+  function toLegacyHistoryKey(historyKey: string): string {
+    const firstColon = historyKey.indexOf(':');
+    if (firstColon <= 0) return '';
+    const secondColon = historyKey.indexOf(':', firstColon + 1);
+    if (secondColon <= firstColon + 1) return '';
+    return historyKey.slice(firstColon + 1);
   }
 
   function buildHistoryKeySkipCondition(skipped: readonly string[]): string {

package/src/plugin/state-store.ts

@@ -10,8 +10,12 @@ import {
   type BncrConversationHistoryMap,
   buildBncrBotReplyMessageId,
   buildBncrConversationHistoryKeyFromRoute,
+  normalizePersistedHistoryKey,
   resetConversationHistoryVersions,
   resolveBncrHistoryLimit,
+  resolveBncrSceneKeyFromHistoryKey,
+  resolvePersistedHistoryAccountId,
+  resolvePersistedHistoryKey,
 } from '../messaging/inbound/conversation-history.ts';
 import {
   getConversationHistorySerialOwner,
@@ -165,7 +169,8 @@ export function createBncrStateStore(runtime: {
   }
 
   function resolvePersistedConversationHistoryLimit(key: string): number {
-    const scene = runtime.sceneRegistry.get(key);
+    const sceneKey = resolveBncrSceneKeyFromHistoryKey(key);
+    const scene = runtime.sceneRegistry.get(sceneKey);
     const sceneLimit = resolveBncrHistoryLimit(scene?.historyLimit);
     return Math.max(DEFAULT_PERSISTED_CONVERSATION_HISTORY_LIMIT, Math.ceil(sceneLimit * 1.2));
   }
@@ -176,7 +181,11 @@ export function createBncrStateStore(runtime: {
   ): string | null {
     const route = entries.find((entry) => runtime.parseRouteLike(entry?.route))?.route;
     if (route) {
+      const accountId = entries.find((entry) =>
+        runtime.asString(entry.accountId || '').trim(),
+      )?.accountId;
       return buildBncrConversationHistoryKeyFromRoute({
+        accountId,
         platform: route.platform,
         groupId: route.groupId,
         userId: route.userId,
@@ -184,7 +193,7 @@ export function createBncrStateStore(runtime: {
     }
     const separator = bucketKey.indexOf(':');
     if (separator < 0 || separator >= bucketKey.length - 1) return null;
-    return bucketKey.slice(separator + 1).trim() || null;
+    return normalizePersistedHistoryKey(bucketKey);
   }
 
   function resolveOutboundReplayBucketLimit(
@@ -193,7 +202,8 @@ export function createBncrStateStore(runtime: {
   ): number {
     const historyKey = resolveOutboundReplayBucketHistoryKey(bucketKey, entries);
     if (!historyKey) return DEFAULT_PERSISTED_CONVERSATION_HISTORY_LIMIT;
-    return resolveBncrHistoryLimit(runtime.sceneRegistry.get(historyKey)?.historyLimit);
+    const sceneKey = resolveBncrSceneKeyFromHistoryKey(historyKey);
+    return resolveBncrHistoryLimit(runtime.sceneRegistry.get(sceneKey)?.historyLimit);
   }
 
   function normalizeOutboundReplayBucket(
@@ -282,6 +292,7 @@ export function createBncrStateStore(runtime: {
     for (const bucket of buckets) {
       const key = runtime.asString(bucket?.key || '').trim();
       if (!key) continue;
+      const normalizedKey = normalizePersistedHistoryKey(key);
       const entries: BncrPersistedConversationHistoryEntry[] = [];
       const rawEntries = Array.isArray(bucket?.entries)
         ? (bucket.entries as PersistedConversationHistoryEntryInput[])
@@ -315,7 +326,7 @@ export function createBncrStateStore(runtime: {
         }
 
         const rawRole = entry?.role;
-        const assistantMessageIds = options?.assistantMessageIdsByHistoryKey?.get(key);
+        const assistantMessageIds = options?.assistantMessageIdsByHistoryKey?.get(normalizedKey);
         const role =
           rawRole === 'user' || rawRole === 'assistant' || rawRole === 'system'
             ? rawRole
@@ -325,7 +336,7 @@ export function createBncrStateStore(runtime: {
         if (!messageId) {
           messageId = buildMigratedHistoryMessageId(
             JSON.stringify({
-              key,
+              key: normalizedKey,
               entryIndex,
               sender,
               senderId: runtime.asString(entry?.senderId || '').trim(),
@@ -365,8 +376,10 @@ export function createBncrStateStore(runtime: {
         entries.push(normalizedEntry);
       }
       if (entries.length > 0) {
-        const limit = resolveLimit(key);
-        const merged = options?.merge ? [...(target.get(key) || []), ...entries] : entries;
+        const limit = resolveLimit(normalizedKey);
+        const merged = options?.merge
+          ? [...(target.get(normalizedKey) || []), ...entries]
+          : entries;
         const seenMessageIds = new Set<string>();
         const deduped: BncrPersistedConversationHistoryEntry[] = [];
         for (const entry of merged) {
@@ -375,7 +388,7 @@ export function createBncrStateStore(runtime: {
           if (messageId) seenMessageIds.add(messageId);
           deduped.push(entry);
         }
-        target.set(key, Number.isFinite(limit) ? deduped.slice(-limit) : deduped);
+        target.set(normalizedKey, Number.isFinite(limit) ? deduped.slice(-limit) : deduped);
       }
     }
   }
@@ -409,6 +422,7 @@ export function createBncrStateStore(runtime: {
         sender?: unknown;
         body?: unknown;
         messageId?: unknown;
+        accountId?: unknown;
         route?: { platform?: unknown; groupId?: unknown; userId?: unknown };
       }>) {
         const sender = runtime.asString(entry?.sender || '').trim();
@@ -417,12 +431,17 @@ export function createBncrStateStore(runtime: {
         const messageId = runtime.asString(entry?.messageId || '').trim();
         if (!messageId) continue;
         const route = entry?.route;
+        const entryAccountId = runtime.asString(entry?.accountId || '').trim() || undefined;
         const historyKey =
           buildBncrConversationHistoryKeyFromRoute({
+            accountId: entryAccountId,
             platform: typeof route?.platform === 'string' ? route.platform : undefined,
             groupId: typeof route?.groupId === 'string' ? route.groupId : undefined,
             userId: typeof route?.userId === 'string' ? route.userId : undefined,
-          }) ?? (bucketKey.includes(':') ? bucketKey.slice(bucketKey.indexOf(':') + 1) : '');
+          }) ??
+          (entryAccountId
+            ? resolvePersistedHistoryKey(bucketKey, entryAccountId)
+            : normalizePersistedHistoryKey(bucketKey));
         if (!historyKey) continue;
         const scopedMessageIds = messageIdsByHistoryKey.get(historyKey) ?? new Set<string>();
         scopedMessageIds.add(messageId);
@@ -440,18 +459,18 @@ export function createBncrStateStore(runtime: {
     timestamp: number;
     media: BncrPersistedConversationHistoryMediaEntry[];
     route?: BncrRoute | null;
+    accountId?: string;
     historyMap?: Map<string, BncrPersistedConversationHistoryEntry[]>;
   }): string | undefined {
     const route = args.route;
     const historyKey = route
       ? buildBncrConversationHistoryKeyFromRoute({
+          accountId: args.accountId,
           platform: route.platform,
           groupId: route.groupId,
           userId: route.userId,
         })
-      : args.bucketKey.includes(':')
-        ? args.bucketKey.slice(args.bucketKey.indexOf(':') + 1).trim()
-        : '';
+      : normalizePersistedHistoryKey(args.bucketKey);
     if (!historyKey) return undefined;
 
     const matchingHistory = args.historyMap
@@ -491,7 +510,7 @@ export function createBncrStateStore(runtime: {
     for (const bucket of buckets) {
       const key = runtime.asString(bucket?.key || '').trim();
       if (!key) continue;
-      const entries: BncrOutboundReplayEntry[] = [];
+      const entriesByHistoryKey = new Map<string, BncrOutboundReplayEntry[]>();
       const rawEntries = Array.isArray(bucket?.entries)
         ? (bucket.entries as PersistedOutboundReplayEntryInput[])
         : [];
@@ -502,6 +521,9 @@ export function createBncrStateStore(runtime: {
         const timestamp = runtime.finiteNumberOr(entry?.timestamp, 0);
         const messageId = runtime.asString(entry?.messageId || '').trim();
         const accountId = runtime.asString(entry?.accountId || '').trim();
+        const effectiveAccountId = runtime.normalizeAccountId(
+          accountId || resolvePersistedHistoryAccountId(key),
+        );
         const sessionKey = runtime.asString(entry?.sessionKey || '').trim();
         const type = runtime.asString(entry?.type || '').trim();
         const mediaUrl = runtime.asString(entry?.mediaUrl || '').trim();
@@ -514,6 +536,14 @@ export function createBncrStateStore(runtime: {
             groupId: entry?.route?.groupId,
             userId: entry?.route?.userId,
           });
+        const historyKey = route
+          ? buildBncrConversationHistoryKeyFromRoute({
+              accountId: effectiveAccountId,
+              platform: route.platform,
+              groupId: route.groupId,
+              userId: route.userId,
+            }) || resolvePersistedHistoryKey(key, effectiveAccountId)
+          : resolvePersistedHistoryKey(key, effectiveAccountId);
         const media: BncrPersistedConversationHistoryMediaEntry[] = [];
         const rawMedia = Array.isArray(entry?.media)
           ? (entry.media as Partial<BncrPersistedConversationHistoryMediaEntry>[])
@@ -534,13 +564,14 @@ export function createBncrStateStore(runtime: {
         const resolvedMessageId =
           messageId ||
           resolvePersistedOutboundReplayMessageId({
-            bucketKey: key,
+            bucketKey: historyKey,
             sender,
             senderId: runtime.asString(entry?.senderId || '').trim(),
             body,
             timestamp,
             media,
             route,
+            accountId: effectiveAccountId,
             historyMap: options?.historyMap,
           });
         const normalizedMedia = media.map((item) => ({
@@ -549,7 +580,7 @@ export function createBncrStateStore(runtime: {
             ? { messageId: item.messageId || resolvedMessageId }
             : {}),
         }));
-        entries.push({
+        const normalizedEntry = {
           sender,
           ...(runtime.asString(entry?.senderId || '').trim()
             ? { senderId: runtime.asString(entry?.senderId || '').trim() }
@@ -558,7 +589,7 @@ export function createBncrStateStore(runtime: {
           ...(timestamp > 0 ? { timestamp } : {}),
           ...(resolvedMessageId ? { messageId: resolvedMessageId } : {}),
           ...(normalizedMedia.length > 0 ? { media: normalizedMedia } : {}),
-          ...(accountId ? { accountId } : {}),
+          accountId: effectiveAccountId,
           ...(sessionKey ? { sessionKey } : {}),
           ...(route ? { route } : {}),
           ...(type ? { type } : {}),
@@ -567,10 +598,13 @@ export function createBncrStateStore(runtime: {
           ...(status === 'pushed' || status === 'acked'
             ? { status: status as BncrOutboundReplayStatus }
             : {}),
-        });
+        } satisfies BncrOutboundReplayEntry;
+        const entries = entriesByHistoryKey.get(historyKey) || [];
+        entries.push(normalizedEntry);
+        entriesByHistoryKey.set(historyKey, entries);
       }
-      if (entries.length > 0) {
-        const combined = options?.merge ? [...(target.get(key) || []), ...entries] : entries;
+      for (const [historyKey, entries] of entriesByHistoryKey) {
+        const combined = options?.merge ? [...(target.get(historyKey) || []), ...entries] : entries;
         const seenMessageIds = new Set<string>();
         const deduped: BncrOutboundReplayEntry[] = [];
         for (const entry of combined) {
@@ -580,7 +614,7 @@ export function createBncrStateStore(runtime: {
           deduped.push(entry);
         }
         if (deduped.length > 0) {
-          target.set(key, normalizeOutboundReplayBucket(key, deduped));
+          target.set(historyKey, normalizeOutboundReplayBucket(historyKey, deduped));
         }
       }
     }