openmates 0.18.0-alpha.26 → 0.18.0-alpha.28

package/dist/{chunk-NB43XDHG.js → chunk-4RPAJ4KP.js}

@@ -784,6 +784,100 @@ function hashItemKey(appId, itemKey) {
   return createHash("sha256").update(raw).digest("hex").slice(0, 32);
 }
 
+// ../ui/src/utils/appMemoryRequests.ts
+var REQUEST_TYPE = "app_settings_memories_request";
+var COUNT_SEMANTICS_VERSION = 1;
+function buildMemoryRequestMessage(params) {
+  if (!params.requestId || !params.userMessageId) {
+    throw new Error("Memory requests require stable request and user-message identities");
+  }
+  const keys = Array.from(new Set(params.requestedKeys)).sort();
+  const categories = [];
+  for (const key of keys) {
+    const separator2 = key.indexOf("-");
+    if (separator2 <= 0 || separator2 === key.length - 1) {
+      throw new Error(`Invalid memory category key: ${key}`);
+    }
+    const count = params.entryCounts?.get(key);
+    categories.push({
+      appId: key.slice(0, separator2),
+      itemType: key.slice(separator2 + 1),
+      entryCount: Number.isSafeInteger(count) && count >= 0 ? count : null
+    });
+  }
+  const content = {
+    type: REQUEST_TYPE,
+    user_message_id: params.userMessageId,
+    request_id: params.requestId,
+    requested_keys: keys,
+    categories,
+    count_semantics_version: COUNT_SEMANTICS_VERSION
+  };
+  return {
+    message_id: params.requestId,
+    role: "system",
+    content: JSON.stringify(content),
+    created_at: params.createdAt,
+    user_message_id: params.userMessageId
+  };
+}
+function parseMemoryRequest(content, clientMessageId) {
+  if (typeof content !== "string") return null;
+  let value;
+  try {
+    value = JSON.parse(content);
+  } catch {
+    return null;
+  }
+  if (!value || value.type !== REQUEST_TYPE || typeof value.request_id !== "string" || typeof value.user_message_id !== "string" || !Array.isArray(value.requested_keys) || !Array.isArray(value.categories) || value.categories.some((category) => !category || typeof category.appId !== "string" || typeof category.itemType !== "string") || value.requested_keys.some((key) => typeof key !== "string")) return null;
+  const legacyCli = value.count_semantics_version === void 0 && clientMessageId === value.request_id;
+  return {
+    ...value,
+    categories: value.categories.map((category) => ({
+      ...category,
+      // Old CLI writers used zero for every category, including unavailable counts.
+      entryCount: legacyCli || !Number.isSafeInteger(category.entryCount) || category.entryCount < 0 ? null : category.entryCount
+    }))
+  };
+}
+function mergeMemoryRequests(first, second) {
+  if (first.request_id !== second.request_id || first.user_message_id !== second.user_message_id) {
+    throw new Error("Cannot merge distinct memory consent requests");
+  }
+  const categories = /* @__PURE__ */ new Map();
+  for (const category of [...first.categories, ...second.categories]) {
+    const key = `${category.appId}-${category.itemType}`;
+    const previous = categories.get(key);
+    if (!previous || category.entryCount !== null && (previous.entryCount === null || category.entryCount > previous.entryCount)) {
+      categories.set(key, category);
+    }
+  }
+  return {
+    ...first,
+    count_semantics_version: COUNT_SEMANTICS_VERSION,
+    requested_keys: Array.from(/* @__PURE__ */ new Set([...first.requested_keys, ...second.requested_keys])).sort(),
+    categories: Array.from(categories.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([, category]) => category)
+  };
+}
+function coalesceMemoryRequestMessages(messages) {
+  const result = [];
+  const requests = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    const request = message.role === "system" ? parseMemoryRequest(message.content, message.clientMessageId) : null;
+    if (!request) {
+      result.push(message);
+      continue;
+    }
+    const key = JSON.stringify([request.user_message_id, request.request_id]);
+    const previous = requests.get(key);
+    const merged = previous ? mergeMemoryRequests(previous.content, request) : request;
+    const index = previous?.index ?? result.length;
+    result[index] = { ...result[index] ?? message, content: JSON.stringify(merged) };
+    requests.set(key, { index, content: merged });
+  }
+  return result;
+}
+
 // src/accountImport.ts
 import { createDecipheriv, createHash as createHash2, scryptSync } from "crypto";
 import JSZip from "jszip";
@@ -7033,41 +7127,7 @@ function normalizeStringArray(value) {
   if (!Array.isArray(value)) return [];
   return Array.from(new Set(value.map((item) => String(item).trim()).filter(Boolean)));
 }
-function categoryFromMemoryKey(key) {
-  const separator2 = key.indexOf("-");
-  if (separator2 <= 0 || separator2 === key.length - 1) return null;
-  return {
-    appId: key.slice(0, separator2),
-    itemType: key.slice(separator2 + 1)
-  };
-}
-function buildAppSettingsMemoryRequestSystemMessage(params) {
-  const seen = /* @__PURE__ */ new Set();
-  const categories = [];
-  for (const key of params.requestedKeys) {
-    if (seen.has(key)) continue;
-    seen.add(key);
-    const parsed = categoryFromMemoryKey(key);
-    if (!parsed) continue;
-    categories.push({
-      ...parsed,
-      entryCount: 0
-    });
-  }
-  return {
-    message_id: params.requestId,
-    role: "system",
-    content: JSON.stringify({
-      type: "app_settings_memories_request",
-      user_message_id: params.userMessageId,
-      request_id: params.requestId,
-      requested_keys: params.requestedKeys,
-      categories
-    }),
-    created_at: params.createdAt,
-    user_message_id: params.userMessageId
-  };
-}
+var buildAppSettingsMemoryRequestSystemMessage = buildMemoryRequestMessage;
 function buildAppSettingsMemoryResponseSystemMessage(params) {
   return {
     message_id: params.messageId,
@@ -9777,7 +9837,7 @@ var OpenMatesClient = class _OpenMatesClient {
       });
     }
     messages.sort((a, b) => a.createdAt - b.createdAt);
-    return messages;
+    return coalesceMemoryRequestMessages(messages);
   }
   async resolveCachedChatForQuery(query, cache, wrappingKey, teamId) {
     const normalized = query.trim().toLowerCase();
@@ -10483,10 +10543,12 @@ var OpenMatesClient = class _OpenMatesClient {
     }
     const shouldWaitForAi = shouldWaitForTeamAi(finalMessage, teamId);
     let availableMemories = [];
+    let memoryCountsLoaded = false;
     let memoryMetadataKeys = [];
     if (!params.incognito) {
       try {
         availableMemories = await this.listMemories({ teamId });
+        memoryCountsLoaded = true;
         memoryMetadataKeys = [
           ...new Set(
             availableMemories.filter((memory) => memory.app_id && memory.item_type).map((memory) => `${memory.app_id}-${memory.item_type}`)
@@ -10947,6 +11009,7 @@ var OpenMatesClient = class _OpenMatesClient {
         userMessageId: messageId,
         requestId,
         requestedKeys: event.requestedKeys,
+        entryCounts: memoryCountsLoaded ? new Map(event.requestedKeys.map((key) => [key, availableMemories.filter((memory) => `${memory.app_id}-${memory.item_type}` === key).length])) : void 0,
         createdAt: Math.floor(Date.now() / 1e3)
       }));
     };

package/dist/cli.js

@@ -12,7 +12,7 @@ import {
   resolveProjectContext,
   serializeToYaml,
   shouldRequireTrustedAccountGuard
-} from "./chunk-NB43XDHG.js";
+} from "./chunk-4RPAJ4KP.js";
 import "./chunk-IWKP55ZB.js";
 import "./chunk-BBKJZ23O.js";
 export {

package/dist/index.js

@@ -42,7 +42,7 @@ import {
   selectAssistantMessagesForSpeech,
   serializeToYaml,
   summarizeAssistantSpeech
-} from "./chunk-NB43XDHG.js";
+} from "./chunk-4RPAJ4KP.js";
 import "./chunk-IWKP55ZB.js";
 import "./chunk-BBKJZ23O.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.18.0-alpha.26",
+  "version": "0.18.0-alpha.28",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",