@pmate/cli 0.24.38 → 0.24.40

package/dist/index.js

@@ -15981,20 +15981,33 @@ async function writeStoredIndex(rootDir, index) {
   const filePath = import_node_path17.default.join(rootDir, "index.json");
   await import_node_fs12.promises.writeFile(filePath, JSON.stringify(index, null, 2) + "\n", "utf8");
 }
-function mergeMessages(existing, incoming) {
+function diffMessages(existing, incoming) {
   const seenMessageIds = new Set(
     existing.map((message) => normalizeMessageId(message.messageId)).filter((value) => !!value)
   );
-  const merged = [...existing];
-  let added = 0;
+  const mergedForMatching = [...existing];
+  const diff = {
+    added: [],
+    upgraded: [],
+    unchangedCount: 0
+  };
   for (const message of incoming) {
     const incomingMessageId = normalizeMessageId(message.messageId);
     if (incomingMessageId && seenMessageIds.has(incomingMessageId)) {
+      diff.unchangedCount += 1;
       continue;
     }
-    const upgradeIndex = merged.findIndex((current) => shouldUpgradeMessage(current, message));
+    const upgradeIndex = mergedForMatching.findIndex(
+      (current) => shouldUpgradeMessage(current, message)
+    );
     if (upgradeIndex >= 0) {
-      merged[upgradeIndex] = message;
+      const before = mergedForMatching[upgradeIndex];
+      mergedForMatching[upgradeIndex] = message;
+      diff.upgraded.push({
+        index: upgradeIndex,
+        before,
+        after: message
+      });
       if (incomingMessageId) {
         seenMessageIds.add(incomingMessageId);
       }
@@ -16003,10 +16016,18 @@ function mergeMessages(existing, incoming) {
     if (incomingMessageId) {
       seenMessageIds.add(incomingMessageId);
     }
-    merged.push(message);
-    added += 1;
+    mergedForMatching.push(message);
+    diff.added.push(message);
+  }
+  return diff;
+}
+function applyMessageDiff(existing, diff) {
+  const merged = [...existing];
+  for (const upgrade of diff.upgraded) {
+    merged[upgrade.index] = upgrade.after;
   }
-  return { messages: merged, added };
+  merged.push(...diff.added);
+  return merged;
 }
 function shouldUpgradeMessage(existing, incoming) {
   const existingMessageId = normalizeMessageId(existing.messageId);
@@ -16113,7 +16134,21 @@ var CollectCommandHandler = class {
         throw new Error(firstFailure);
       }
       await this.writeIndex(target.rootDir, target, results, syncedAt);
-      this.printSyncSummary(target.sourceKey, target.rootDir, threads.length, results, failures);
+      const reportPath = await this.writeSyncReport(
+        target.rootDir,
+        target,
+        results,
+        failures,
+        syncedAt
+      );
+      this.printSyncSummary(
+        target.sourceKey,
+        target.rootDir,
+        reportPath,
+        threads.length,
+        results,
+        failures
+      );
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       throw new Error(`collect failed: ${message}`);
@@ -16132,13 +16167,20 @@ var CollectCommandHandler = class {
       images: [...message.images],
       collectedAt: syncedAt
     }));
-    const merged = mergeMessages(existing?.messages ?? [], incoming);
-    const messagesWithArchivedImages = await archiveMessageImages(
+    const existingMessages = await archiveMessageImages(
       rootDir,
       target.sourceKey,
       threadKey,
-      merged.messages
+      existing?.messages ?? []
     );
+    const incomingMessages = await archiveMessageImages(
+      rootDir,
+      target.sourceKey,
+      threadKey,
+      incoming
+    );
+    const diff = diffMessages(existingMessages, incomingMessages);
+    const messagesWithArchivedImages = applyMessageDiff(existingMessages, diff);
     const stored = {
       source: target.sourceKey,
       endpoint: target.endpoint,
@@ -16154,8 +16196,9 @@ var CollectCommandHandler = class {
     await writeStoredThread(rootDir, stored);
     return {
       thread: stored,
-      addedMessages: merged.added,
-      updated: merged.added > 0 || !existing || existing.preview !== stored.preview || existing.unread !== stored.unread || existing.lastMessageAt !== stored.lastMessageAt
+      diff,
+      addedMessages: diff.added.length,
+      updated: diff.added.length > 0 || diff.upgraded.length > 0 || !existing || existing.preview !== stored.preview || existing.unread !== stored.unread || existing.lastMessageAt !== stored.lastMessageAt
     };
   }
   async writeIndex(rootDir, target, results, syncedAt) {
@@ -16178,7 +16221,44 @@ var CollectCommandHandler = class {
       threads
     });
   }
-  printSyncSummary(sourceKey, rootDir, scannedThreads, results, failures) {
+  async writeSyncReport(rootDir, target, results, failures, syncedAt) {
+    const syncId = toSyncId(syncedAt);
+    const reportPath = import_node_path18.default.join(rootDir, "syncs", `${syncId}.json`);
+    const threadReports = results.map((result) => ({
+      threadKey: result.thread.threadKey,
+      threadName: result.thread.threadName,
+      addedCount: result.diff.added.length,
+      upgradedCount: result.diff.upgraded.length,
+      addedMessages: result.diff.added,
+      upgradedMessages: result.diff.upgraded
+    })).filter((thread) => thread.addedCount > 0 || thread.upgradedCount > 0);
+    await import_node_fs13.promises.mkdir(import_node_path18.default.dirname(reportPath), { recursive: true });
+    await import_node_fs13.promises.writeFile(
+      reportPath,
+      JSON.stringify(
+        {
+          syncId,
+          source: target.sourceKey,
+          endpoint: target.endpoint,
+          syncedAt,
+          threadCount: results.length,
+          changedThreadCount: threadReports.length,
+          addedMessageCount: threadReports.reduce((sum, thread) => sum + thread.addedCount, 0),
+          upgradedMessageCount: threadReports.reduce(
+            (sum, thread) => sum + thread.upgradedCount,
+            0
+          ),
+          threads: threadReports,
+          failures
+        },
+        null,
+        2
+      ) + "\n",
+      "utf8"
+    );
+    return reportPath;
+  }
+  printSyncSummary(sourceKey, rootDir, reportPath, scannedThreads, results, failures) {
     const updatedThreads = results.filter((result) => result.updated).length;
     const newMessages = results.reduce((sum, result) => sum + result.addedMessages, 0);
     ui.plain(`Synced source: ${sourceKey}`);
@@ -16186,7 +16266,8 @@ var CollectCommandHandler = class {
     ui.plain(`Threads updated: ${updatedThreads}`);
     ui.plain(`Threads failed: ${failures.length}`);
     ui.plain(`New messages: ${newMessages}`);
-    ui.plain(`Saved under: ${rootDir}`);
+    ui.plain(`Diff saved: ${reportPath}`);
+    ui.plain(`Archive saved: ${rootDir}`);
     for (const failure of failures.slice(0, 10)) {
       ui.warn(`Thread failed: ${failure.threadName}`, failure.message);
     }
@@ -16552,6 +16633,9 @@ function buildGetMessagesByConversationExpr(conversationId, limit) {
 function escapeForJs(value) {
   return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
 }
+function toSyncId(syncedAt) {
+  return syncedAt.replace(/[:.]/g, "-");
+}
 function formatSentAt(sentAt) {
   const value = typeof sentAt === "number" ? sentAt : typeof sentAt === "string" && /^\d+$/.test(sentAt) ? Number.parseInt(sentAt, 10) : NaN;
   if (!Number.isFinite(value) || value <= 0) {
@@ -18723,7 +18807,7 @@ var ServiceRuntimeRunner = class {
     });
     ui.title(`Logs for ${namespace}/${appName}`);
     ui.info("Source", { mode: options.history ? "history" : "online" });
-    this.renderPage(page, { oldestFirst: Boolean(options.follow) });
+    this.renderPage(page);
     if (options.follow) {
       await this.followLogs(namespace, appName, {
         page: options.page ?? 0,
@@ -18766,8 +18850,7 @@ var ServiceRuntimeRunner = class {
       if (newItems.length === 0) {
         continue;
       }
-      const ordered = [...newItems].reverse();
-      for (const item of ordered) {
+      for (const item of newItems) {
         seen.add(item.hash);
         recent.unshift(item);
         if (recent.length > 200) {
@@ -19374,15 +19457,14 @@ var ServiceRuntimeRunner = class {
     }
     return "preview";
   }
-  renderPage(page, options = {}) {
+  renderPage(page) {
     ui.info("Page", {
       page: page.page,
       totalPage: page.totalPage,
       pageSize: page.pageSize,
       items: page.data.length
     });
-    const items = options.oldestFirst ? [...page.data].reverse() : page.data;
-    for (const item of items) {
+    for (const item of page.data) {
       ui.plain(this.renderLogLine(item));
     }
   }
@@ -19559,7 +19641,7 @@ var ServiceRuntimeRunner = class {
       shown: Math.min(matched.length, 20)
     });
     const toShow = matched.slice(0, 20);
-    for (const item of toShow.reverse()) {
+    for (const item of toShow) {
       ui.plain(this.renderLogLine(item));
     }
   }

package/package.json

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