openmates 0.8.0-alpha.3 → 0.9.0-alpha.10

package/dist/{chunk-XNONURHY.js → chunk-IZYE5MAJ.js}

@@ -730,6 +730,49 @@ var OpenMatesWsClient = class {
       this.socket.on("close", onClose);
     });
   }
+  /**
+   * Collect all frames until `terminatorType` arrives (or timeout).
+   * Returns every frame received before the terminator, in order.
+   * Used by ensureSynced to consume the full phased-sync event stream.
+   */
+  collectMessages(terminatorType, timeoutMs = 9e4) {
+    return new Promise((resolve4, reject) => {
+      const collected = [];
+      const onMessage = (rawData) => {
+        try {
+          const parsed = JSON.parse(rawData.toString());
+          if (parsed.type === terminatorType) {
+            cleanup();
+            resolve4(collected);
+            return;
+          }
+          collected.push(parsed);
+        } catch {
+        }
+      };
+      const onError = (error) => {
+        cleanup();
+        reject(error);
+      };
+      const onClose = () => {
+        cleanup();
+        resolve4(collected);
+      };
+      const timeout = setTimeout(() => {
+        cleanup();
+        reject(new Error(`Timeout waiting for '${terminatorType}'`));
+      }, timeoutMs);
+      const cleanup = () => {
+        clearTimeout(timeout);
+        this.socket.off("message", onMessage);
+        this.socket.off("error", onError);
+        this.socket.off("close", onClose);
+      };
+      this.socket.on("message", onMessage);
+      this.socket.on("error", onError);
+      this.socket.on("close", onClose);
+    });
+  }
   /**
    * Collect the AI response for a sent message.
    *
@@ -902,10 +945,11 @@ var OpenMatesWsClient = class {
 
 // src/mentions.ts
 var MODEL_ALIASES = {
-  best: "claude-opus-4-6",
+  best: "claude-opus-4-7",
   fast: "qwen3-235b-a22b-2507"
 };
 var CHAT_MODELS = [
+  { id: "claude-opus-4-7", name: "Claude Opus 4.7" },
   { id: "claude-opus-4-6", name: "Claude Opus 4.6" },
   { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
   { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" },
@@ -914,9 +958,11 @@ var CHAT_MODELS = [
   { id: "gemini-3-flash-preview", name: "Gemini 3 Flash" },
   { id: "gemini-3-pro-image-preview", name: "Gemini 3 Pro" },
   { id: "gemini-3.1-pro-preview", name: "Gemini 3.1 Pro" },
-  { id: "deepseek-v3.2", name: "DeepSeek V3.2" },
+  { id: "deepseek-v4-pro", name: "DeepSeek V4 Pro" },
+  { id: "deepseek-v4-flash", name: "DeepSeek V4 Flash" },
   { id: "qwen3-235b-a22b-2507", name: "Qwen 3 256b" },
   { id: "kimi-k2.5", name: "Kimi K2.5" },
+  { id: "kimi-k2.6", name: "Kimi K2.6" },
   { id: "zai-glm-4.7", name: "GLM 4.7" },
   { id: "mistral-medium-latest", name: "Mistral Medium" },
   { id: "mistral-small-2506", name: "Mistral Small 3.2" },
@@ -1642,6 +1688,7 @@ var MATE_NAMES = {
   onboarding_support: "Suki"
 };
 var DEFAULT_API_URL = process.env.OPENMATES_API_URL ?? "https://api.openmates.org";
+var SETTINGS_GET_RATE_LIMIT_RETRY_MS = 61e3;
 function deriveAppUrl(apiUrl) {
   if (process.env.OPENMATES_APP_URL) {
     return process.env.OPENMATES_APP_URL.replace(/\/$/, "");
@@ -2572,10 +2619,18 @@ var OpenMatesClient = class _OpenMatesClient {
   async settingsGet(path) {
     this.requireSession();
     const normalizedPath = this.normalizePath(path);
-    const response = await this.http.get(
+    let response = await this.http.get(
       normalizedPath,
       this.getCliRequestHeaders()
     );
+    if (response.status === 429) {
+      process.stderr.write(
+        `Rate limited by settings API; retrying in ${Math.ceil(SETTINGS_GET_RATE_LIMIT_RETRY_MS / 1e3)}s...
+`
+      );
+      await new Promise((resolve4) => setTimeout(resolve4, SETTINGS_GET_RATE_LIMIT_RETRY_MS));
+      response = await this.http.get(normalizedPath, this.getCliRequestHeaders());
+    }
     if (!response.ok) {
       throw new Error(`Settings GET failed with HTTP ${response.status}`);
     }
@@ -3229,41 +3284,53 @@ Required: ${schema.required.join(", ")}`
     let totalChatCount = 0;
     try {
       ws.send("phased_sync_request", {
-        phase: "phase3",
+        phase: "all",
         client_chat_versions: clientChatVersions,
         client_chat_ids: clientChatIds,
         client_embed_ids: clientEmbedIds
       });
-      const initial = await ws.waitForMessage("phase_3_last_100_chats_ready");
-      const initialPayload = initial.payload;
-      const firstChats = initialPayload.chats ?? [];
-      for (const wrapper of firstChats) {
-        const details = wrapper.chat_details;
-        if (!details || typeof details.id !== "string") continue;
-        const messages = Array.isArray(wrapper.messages) ? wrapper.messages : [];
-        chats.push({ details, messages });
-      }
-      totalChatCount = initialPayload.total_chat_count ?? firstChats.length;
-      embeds = initialPayload.embeds ?? [];
-      embedKeys = initialPayload.embed_keys ?? [];
-      newChatSuggestions = initialPayload.new_chat_suggestions ?? [];
-      let offset = firstChats.length;
-      while (offset < totalChatCount) {
-        ws.send("load_more_chats", { offset, limit: 50 });
-        const more = await ws.waitForMessage("load_more_chats_response");
-        const payload = more.payload;
-        const batch = payload.chats ?? [];
-        for (const wrapper of batch) {
-          const details = wrapper.chat_details;
-          if (!details || typeof details.id !== "string") continue;
-          const messages = Array.isArray(wrapper.messages) ? wrapper.messages : [];
-          chats.push({ details, messages });
+      const frames = await ws.collectMessages("phased_sync_complete", 9e4);
+      const messagesByChatId = /* @__PURE__ */ new Map();
+      for (const frame of frames) {
+        if (frame.type === "phase_1_last_chat_ready") {
+          const p = frame.payload;
+          newChatSuggestions = p.new_chat_suggestions ?? [];
+        } else if (frame.type === "phase_1b_chat_content_ready") {
+          const p = frame.payload;
+          for (const c of p.chats ?? []) {
+            if (c.chat_id && Array.isArray(c.messages) && c.messages.length > 0) {
+              messagesByChatId.set(c.chat_id, c.messages);
+            }
+          }
+          if (p.embeds) embeds.push(...p.embeds);
+          if (p.embed_keys) embedKeys.push(...p.embed_keys);
+        } else if (frame.type === "phase_2_last_20_chats_ready") {
+          const p = frame.payload;
+          totalChatCount = p.total_chat_count ?? 0;
+          for (const wrapper of p.chats ?? []) {
+            const details = wrapper.chat_details;
+            if (!details || typeof details.id !== "string") continue;
+            chats.push({ details, messages: [] });
+          }
+        } else if (frame.type === "background_message_sync") {
+          const p = frame.payload;
+          for (const c of p.chats ?? []) {
+            if (c.chat_id && Array.isArray(c.messages) && c.messages.length > 0) {
+              messagesByChatId.set(c.chat_id, c.messages);
+            }
+          }
+          if (p.embeds) embeds.push(...p.embeds);
+          if (p.embed_keys) embedKeys.push(...p.embed_keys);
         }
-        if (payload.embeds) embeds.push(...payload.embeds);
-        if (payload.embed_keys) embedKeys.push(...payload.embed_keys);
-        offset += batch.length;
-        if (!payload.has_more || batch.length === 0) break;
       }
+      for (const chat of chats) {
+        const id = typeof chat.details.id === "string" ? chat.details.id : "";
+        const msgs = messagesByChatId.get(id);
+        if (msgs && msgs.length > 0) {
+          chat.messages = msgs;
+        }
+      }
+      if (totalChatCount === 0) totalChatCount = chats.length;
     } finally {
       ws.close();
     }
@@ -3524,8 +3591,8 @@ function getSecretSuffix(match, n = 3) {
   if (cleaned.length <= n) return cleaned;
   return cleaned.slice(-n);
 }
-function generatePlaceholder(prefix, match, suffixLength = 3) {
-  return `[${prefix}_${getSecretSuffix(match, suffixLength)}]`;
+function generatePlaceholder(prefix, match, suffixLength = 3, counter = 1) {
+  return `[${prefix}_${counter}_${getSecretSuffix(match, suffixLength)}]`;
 }
 var SECRET_PATTERNS = [
   {
@@ -3983,6 +4050,7 @@ var SecretScanner = class {
         allMappings.push(mapping);
       }
     }
+    const typeCounts = {};
     if (this.options.enablePatternDetection) {
       for (const pattern of SECRET_PATTERNS) {
         pattern.regex.lastIndex = 0;
@@ -3998,10 +4066,12 @@ var SecretScanner = class {
           if (pattern.validate && !pattern.validate(matchText)) continue;
           const existing = this.registry.get(matchText);
           if (existing) continue;
+          typeCounts[pattern.type] = (typeCounts[pattern.type] || 0) + 1;
           const placeholder = generatePlaceholder(
             pattern.placeholderPrefix,
             matchText,
-            this.options.suffixLength
+            this.options.suffixLength,
+            typeCounts[pattern.type]
           );
           allMappings.push({
             placeholder,
@@ -4081,7 +4151,7 @@ var OutputRedactor = class {
   }
   /**
    * Initialize the redactor by loading personal data entries from
-   * the user's encrypted Settings & Memories.
+   * the user's encrypted Memories.
    *
    * Safe to call without a session — silently skips if not logged in.
    *
@@ -6377,7 +6447,7 @@ async function main() {
     apiUrl: typeof parsed.flags["api-url"] === "string" ? parsed.flags["api-url"] : void 0
   });
   const redactor = new OutputRedactor();
-  if (client.hasSession()) {
+  if (client.hasSession() && shouldInitializeRedactor(command, subcommand)) {
     try {
       const memories = await client.listMemories();
       redactor.initializeFromMemories(memories);
@@ -6485,6 +6555,9 @@ async function main() {
   }
   throw new Error(`Unknown command '${command}'. Run 'openmates help'.`);
 }
+function shouldInitializeRedactor(command, subcommand) {
+  return command === "chats" && ["new", "send", "incognito"].includes(subcommand ?? "");
+}
 async function handleChats(client, subcommand, rest, flags, redactor) {
   if (!subcommand || subcommand === "help" || flags.help === true) {
     printChatsHelp();
@@ -9132,7 +9205,7 @@ async function handleMentions(client, subcommand, _rest, flags) {
       mate: "Mates",
       skill: "Skills",
       focus_mode: "Focus Modes",
-      settings_memory: "Settings & Memories"
+      settings_memory: "Memories"
     };
     for (const [type, items] of grouped) {
       const label = typeLabels[type] || type;
@@ -9302,7 +9375,7 @@ Types:
   mate              AI mates/personas (@Sophia, @Finn)
   skill             App skills (@Web-Search, @Code-Get-Docs)
   focus_mode        Focus modes (@Web-Research)
-  settings_memory   Settings & memories (@Code-Projects)
+  settings_memory   Memories (@Code-Projects)
 
 Use @mentions in chat messages:
   openmates chats new "@Sophia tell me about React hooks"
@@ -9321,7 +9394,7 @@ Commands:
   openmates apps [--help]                    App skill commands (list, run, ...)
   openmates mentions [--help]                List available @mentions
   openmates embeds [--help]                  Embed commands (show)
-  openmates settings [--help]                Settings & memories
+  openmates settings [--help]                Memories
   openmates inspirations [--lang <code>] [--json]   Daily inspirations
   openmates newchatsuggestions [--limit <n>] [--json]   Personalized new chat suggestions
   openmates server [--help]                   Server management (install, start, stop, ...)
@@ -9386,7 +9459,7 @@ Options for 'delete':
   @Claude-Opus-4.6      Specific model
   @Sophia               AI mate/persona
   @Web-Search           App skill
-  @Code-Projects        Settings & memories
+  @Code-Projects        Memories
   @/path/to/file.ts     Attach local file (secrets auto-redacted)
 
   Sensitive files (.env) use zero-knowledge mode (only names + last 3 chars).
@@ -9503,7 +9576,6 @@ ${h("Billing")}
     \x1B[2mGift cards (buy/manage): ${s("billing/gift-cards")}\x1B[0m
 ${h("Privacy")}
     openmates settings post auto-delete-chats --data '{"period":"90d"}'
-    openmates settings post auto-delete-usage --data '{"period":"1y"}'
     \x1B[2mHide personal data / anonymization: ${s("privacy/hide-personal-data")}\x1B[0m
 ${h("Notifications")}
     openmates settings get reminders [--json]           Active reminders
@@ -9513,8 +9585,8 @@ ${h("Interface")}
     openmates settings post user/language --data '{"language":"en"}'
     openmates settings post user/darkmode --data '{"dark_mode":true}'
     openmates settings post ai-model-defaults --data '{"simple":"...","complex":"..."}'
-${h("App Store")}
-    openmates apps list                                 Same as App Store
+${h("Apps")}
+    openmates apps list                                 Same as Apps
     openmates apps <app-id>                             App details
     \x1B[2mWeb: ${s("app_store")}\x1B[0m
 ${h("Mates")}

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   getExtForLang,
   serializeToYaml
-} from "./chunk-XNONURHY.js";
+} from "./chunk-IZYE5MAJ.js";
 export {
   getExtForLang,
   serializeToYaml

package/dist/index.js

@@ -6,7 +6,7 @@ import {
   getExtForLang,
   parseNewChatSuggestionText,
   serializeToYaml
-} from "./chunk-XNONURHY.js";
+} from "./chunk-IZYE5MAJ.js";
 export {
   MATE_NAMES,
   MEMORY_TYPE_REGISTRY,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.8.0-alpha.3",
+  "version": "0.9.0-alpha.10",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",