@pmate/cli 0.21.14 → 0.21.16

package/dist/index.js

@@ -15664,7 +15664,6 @@ var QuizCommandHandler = class {
 
 // src/commands/CollectCommandHandler.ts
 var import_playwright = require("playwright");
-var import_node_crypto4 = require("crypto");
 
 // src/collectStore.ts
 var import_node_crypto3 = require("crypto");
@@ -15715,27 +15714,36 @@ async function writeStoredIndex(rootDir, index) {
   await import_node_fs11.promises.writeFile(filePath, JSON.stringify(index, null, 2) + "\n", "utf8");
 }
 function mergeMessages(existing, incoming) {
-  const seen = new Set(existing.map((message) => message.hash));
+  const seenMessageIds = new Set(
+    existing.map((message) => normalizeMessageId(message.messageId)).filter((value) => !!value)
+  );
   const merged = [...existing];
   let added = 0;
   for (const message of incoming) {
-    if (seen.has(message.hash)) {
+    const incomingMessageId = normalizeMessageId(message.messageId);
+    if (incomingMessageId && seenMessageIds.has(incomingMessageId)) {
       continue;
     }
     const upgradeIndex = merged.findIndex((current) => shouldUpgradeMessage(current, message));
     if (upgradeIndex >= 0) {
       merged[upgradeIndex] = message;
-      seen.add(message.hash);
+      if (incomingMessageId) {
+        seenMessageIds.add(incomingMessageId);
+      }
       continue;
     }
-    seen.add(message.hash);
+    if (incomingMessageId) {
+      seenMessageIds.add(incomingMessageId);
+    }
     merged.push(message);
     added += 1;
   }
   return { messages: merged, added };
 }
 function shouldUpgradeMessage(existing, incoming) {
-  if (existing.hash === incoming.hash) {
+  const existingMessageId = normalizeMessageId(existing.messageId);
+  const incomingMessageId = normalizeMessageId(incoming.messageId);
+  if (existingMessageId && incomingMessageId && existingMessageId === incomingMessageId) {
     return false;
   }
   if (existing.time && incoming.time && existing.time !== incoming.time) {
@@ -15746,6 +15754,10 @@ function shouldUpgradeMessage(existing, incoming) {
 function normalizeMessageField(value) {
   return (value ?? "").trim();
 }
+function normalizeMessageId(value) {
+  const normalized = (value ?? "").trim();
+  return normalized || null;
+}
 function joinNormalized(values) {
   return values.map((value) => value.trim()).join("|");
 }
@@ -15753,7 +15765,7 @@ async function readStoredMessages(rootDir, threadKey) {
   const filePath = getThreadMessagesFilePath(rootDir, threadKey);
   try {
     const raw = await import_node_fs11.promises.readFile(filePath, "utf8");
-    return raw.split("\n").map((line) => line.trim()).filter(Boolean).map((line) => JSON.parse(line));
+    return raw.split("\n").map((line) => line.trim()).filter(Boolean).map((line) => normalizeStoredMessage(JSON.parse(line)));
   } catch {
     return [];
   }
@@ -15776,6 +15788,17 @@ function getThreadMessagesFilePath(rootDir, threadKey) {
 function getLegacyThreadFilePath(rootDir, threadKey) {
   return import_node_path16.default.join(rootDir, "threads", `${threadKey}.json`);
 }
+function normalizeStoredMessage(message) {
+  return {
+    messageId: normalizeMessageId(message.messageId),
+    time: message.time ?? null,
+    sender: message.sender ?? null,
+    content: message.content ?? "",
+    links: Array.isArray(message.links) ? message.links : [],
+    images: Array.isArray(message.images) ? message.images : [],
+    collectedAt: message.collectedAt
+  };
+}
 
 // src/commands/CollectCommandHandler.ts
 var CollectCommandHandler = class {
@@ -15833,7 +15856,7 @@ var CollectCommandHandler = class {
   async persistThread(rootDir, target, thread, messages2, syncedAt, existing) {
     const threadKey = toThreadKey(thread.name);
     const incoming = messages2.map((message) => ({
-      hash: message.hash,
+      messageId: message.messageId,
       time: message.time,
       sender: message.sender,
       content: message.content,
@@ -15949,7 +15972,9 @@ var CollectCommandHandler = class {
         error: result && "reason" in result && typeof result.reason === "string" ? result.reason : "unknown error"
       };
     }
-    const seenHashes = new Set(existingMessages.map((message) => message.hash));
+    const seenMessageIds = new Set(
+      existingMessages.map((message) => (message.messageId ?? "").trim()).filter((value) => !!value)
+    );
     const collected = [];
     for (let i = result.messages.length - 1; i >= 0; i -= 1) {
       const raw = result.messages[i];
@@ -15960,18 +15985,17 @@ var CollectCommandHandler = class {
       const attachmentPaths = Array.isArray(raw.attachments) ? raw.attachments.map((attachment) => attachment.path ?? null).filter((value) => !!value) : [];
       const message = {
         index: raw.index,
-        hash: "",
+        messageId: normalizeText(raw.id ?? "") || null,
         time: formatSentAt(raw.sentAt),
         sender: normalizeText(raw.senderName ?? raw.source ?? "") || null,
         content: contentParts.filter(Boolean).join("\n") || (attachmentPaths.length > 0 ? "[Image]" : ""),
         links: [],
         images: attachmentPaths
       };
-      message.hash = computeMessageHash(thread.name, message);
       if (!message.content && message.images.length === 0) {
         continue;
       }
-      if (seenHashes.has(message.hash)) {
+      if (message.messageId && seenMessageIds.has(message.messageId)) {
         break;
       }
       collected.push(message);
@@ -16002,17 +16026,6 @@ function normalizeUnreadCount(value) {
   const parsed = typeof value === "number" ? value : typeof value === "string" && value.trim() ? Number.parseInt(value, 10) : 0;
   return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
 }
-function computeMessageHash(threadName, message) {
-  const base = [
-    normalizeText(threadName),
-    normalizeText(message.sender ?? ""),
-    normalizeText(message.time ?? ""),
-    normalizeText(message.content),
-    message.links.map(normalizeText).join("|"),
-    message.images.map(normalizeText).join("|")
-  ].join("||");
-  return (0, import_node_crypto4.createHash)("sha1").update(base).digest("hex").slice(0, 16);
-}
 function buildListThreadsExpr() {
   return `(function() {
     try {
@@ -16085,6 +16098,19 @@ function buildListThreadsExpr() {
         }
         return null;
       }
+      function isArchived(model) {
+        var attrs = typeof model.attributes === 'object' ? model.attributes : model || {};
+        var candidates = [
+          attrs.isArchived,
+          attrs.archived,
+          model && model.get ? model.get('isArchived') : null,
+          model && model.get ? model.get('archived') : null,
+        ];
+        for (var i = 0; i < candidates.length; i++) {
+          if (candidates[i] === true) return true;
+        }
+        return false;
+      }
       var all = [];
       if (typeof controller.getAllPrivateConversations === 'function') {
         var privates = controller.getAllPrivateConversations();
@@ -16101,6 +16127,7 @@ function buildListThreadsExpr() {
         var conversationId = normalize(model && model.get ? model.get('id') : model && model.id);
         if (!conversationId || seen[conversationId]) continue;
         seen[conversationId] = true;
+        if (isArchived(model)) continue;
         var name = pickName(model);
         if (!name) continue;
         threads.push({
@@ -16225,7 +16252,7 @@ init_sessionStore();
 var STORE_LOG_VERSION = 1;
 var LOG_KIND_TABLE = 1e4;
 var LOG_KIND_MAPPING = 6003;
-function createHash4() {
+function createHash3() {
   return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }
 function createDescriptor(input) {
@@ -16364,7 +16391,7 @@ var Namespace = class {
       },
       appendRow: async (data) => {
         const log = {
-          hash: createHash4(),
+          hash: createHash3(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -16376,7 +16403,7 @@ var Namespace = class {
       updateRow: async (data) => {
         const { id, ...value } = data;
         const log = {
-          hash: createHash4(),
+          hash: createHash3(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -16387,7 +16414,7 @@ var Namespace = class {
       },
       deleteRow: async (id) => {
         const log = {
-          hash: createHash4(),
+          hash: createHash3(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -16430,7 +16457,7 @@ var Namespace = class {
       },
       set: async (key, value) => {
         const log = {
-          hash: createHash4(),
+          hash: createHash3(),
           t: Date.now(),
           kind: LOG_KIND_MAPPING,
           topic: descriptorToTopic(descriptor),
@@ -16441,7 +16468,7 @@ var Namespace = class {
       },
       delete: async (key) => {
         const log = {
-          hash: createHash4(),
+          hash: createHash3(),
           t: Date.now(),
           kind: LOG_KIND_MAPPING,
           topic: descriptorToTopic(descriptor),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.21.14",
+  "version": "0.21.16",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {