chatlab-cli 0.30.2 → 0.31.1

package/dist/{chunk-36JGKW6K.mjs → chunk-KCPGEILH.mjs}

@@ -9,7 +9,7 @@ import {
   createEmptyContactsDiagnostics,
   normalizeContactsTimeRangePreset,
   resolveContactsTimeRange
-} from "./chunk-TEX44HNL.mjs";
+} from "./chunk-7HBVGVOB.mjs";
 import {
   PEOPLE_RELATIONSHIPS_ALGORITHM_VERSION,
   buildPeopleRelationshipsNeighborhoodGraph,
@@ -18,7 +18,10 @@ import {
   computePeopleRelationshipsSnapshot,
   normalizePeopleRelationshipsTimeRangePreset,
   resolvePeopleRelationshipsTimeRange
-} from "./chunk-WV5GSRQM.mjs";
+} from "./chunk-LJXSUN25.mjs";
+import {
+  ANNUAL_SUMMARY_ALGORITHM_VERSION
+} from "./chunk-YAQLYL52.mjs";
 import {
   BUILTIN_MODELS,
   BUILTIN_PROVIDERS,
@@ -34,18 +37,23 @@ import {
   batchSegmentWithFrequency,
   buildExcludeKeywordsConditions,
   buildSessionInfo,
+  cleanupAnnualSummarySnapshotTempFiles,
   clearJiebaInstance,
   clearSessionIndex,
   collectPosTagStats,
+  deleteAnnualSummarySnapshots,
   deleteMember,
   generateIncrementalSessionIndex,
   generateMessageKey,
   generateSessionIndex,
+  getAnnualSummarySnapshotPath,
   getBuiltinModelsByProvider,
   getChatSessionList,
   getContactsDir,
   getContactsFactsCacheDir,
   getDbFileVersion,
+  getGlobalInsightDir,
+  getGlobalInsightFactsCacheDir,
   getJieba,
   getMemberNameHistory,
   getMembersPaginated,
@@ -67,20 +75,25 @@ import {
   mergeConfirmedNames,
   mergeMembers,
   needsStreamingThinkParsing,
+  normalizeAnnualSummaryRange,
   normalizeBuiltinToolNames,
   openBetterSqliteDatabase,
+  readAnnualSummarySnapshot,
   renameSession,
   resolveApiKey,
   saveSegmentSummary,
   segment,
   snapshotPathProvider,
+  toAnnualSummaryLocalDate,
+  toAnnualSummaryRangeKey,
   tokenizeForFts,
   tokenizeQueryForFts,
   truncateToolResultText,
   updateMemberAliases,
   updateSessionOwnerId,
+  writeAnnualSummarySnapshot,
   writeAuthProfile
-} from "./chunk-LVEJHB3X.mjs";
+} from "./chunk-DQ45LDKZ.mjs";
 import {
   __commonJS,
   __export,
@@ -696,8 +709,8 @@ var require_FilterBase = __commonJS({
     var FilterBase = class _FilterBase extends Transform {
       static stringFilter(string, separator) {
         return (stack) => {
-          const path30 = stack.join(separator);
-          return path30.length === string.length && path30 === string || path30.length > string.length && path30.substr(0, string.length) === string && path30.substr(string.length, separator.length) === separator;
+          const path31 = stack.join(separator);
+          return path31.length === string.length && path31 === string || path31.length > string.length && path31.substr(0, string.length) === string && path31.substr(string.length, separator.length) === separator;
         };
       }
       static regExpFilter(regExp, separator) {
@@ -1151,12 +1164,12 @@ var require_Assembler = __commonJS({
         return (this.stack.length >> 1) + (this.done ? 0 : 1);
       }
       get path() {
-        const path30 = [];
+        const path31 = [];
         for (let i = 0; i < this.stack.length; i += 2) {
           const key = this.stack[i + 1];
-          path30.push(key === null ? this.stack[i].length : key);
+          path31.push(key === null ? this.stack[i].length : key);
         }
-        return path30;
+        return path31;
       }
       dropToLevel(level) {
         if (level < this.depth) {
@@ -1438,7 +1451,7 @@ var require_pend = __commonJS({
 var require_fd_slicer = __commonJS({
   "../../packages/node-runtime/node_modules/yauzl/fd-slicer.js"(exports) {
     "use strict";
-    var fs33 = __require("fs");
+    var fs35 = __require("fs");
     var util = __require("util");
     var stream = __require("stream");
     var Readable = stream.Readable;
@@ -1458,7 +1471,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs33.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
+        fs35.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
           cb();
           callback(err, bytesRead, buffer2);
         });
@@ -1475,7 +1488,7 @@ var require_fd_slicer = __commonJS({
       self.refCount -= 1;
       if (self.refCount < 0) throw new Error("invalid unref");
       if (self.refCount > 0) return;
-      fs33.close(self.fd, onCloseDone);
+      fs35.close(self.fd, onCloseDone);
       function onCloseDone(err) {
         if (err) {
           self.emit("error", err);
@@ -1507,7 +1520,7 @@ var require_fd_slicer = __commonJS({
       }
       self.context.pend.go(function(cb) {
         var buffer = Buffer.allocUnsafe(toRead);
-        fs33.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+        fs35.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
           if (err) {
             self.destroy(err);
           } else if (bytesRead === 0) {
@@ -1869,7 +1882,7 @@ var require_crc32 = __commonJS({
 var require_yauzl = __commonJS({
   "../../packages/node-runtime/node_modules/yauzl/index.js"(exports) {
     "use strict";
-    var fs33 = __require("fs");
+    var fs35 = __require("fs");
     var zlib = __require("zlib");
     var fd_slicer = require_fd_slicer();
     var util = __require("util");
@@ -1894,9 +1907,9 @@ var require_yauzl = __commonJS({
     exports.Entry = Entry;
     exports.LocalFileHeader = LocalFileHeader;
     exports.RandomAccessReader = RandomAccessReader;
-    function openPromise2(path30, options2) {
+    function openPromise2(path31, options2) {
       return new Promise((resolve2, reject) => {
-        open(path30, { ...options2, lazyEntries: true }, function(err, zipfile) {
+        open(path31, { ...options2, lazyEntries: true }, function(err, zipfile) {
           if (err) return reject(err);
           resolve2(zipfile);
         });
@@ -1926,7 +1939,7 @@ var require_yauzl = __commonJS({
         });
       });
     }
-    function open(path30, options2, callback) {
+    function open(path31, options2, callback) {
       if (typeof options2 === "function") {
         callback = options2;
         options2 = null;
@@ -1938,10 +1951,10 @@ var require_yauzl = __commonJS({
       if (options2.validateEntrySizes == null) options2.validateEntrySizes = true;
       if (options2.strictFileNames == null) options2.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs33.open(path30, "r", function(err, fd) {
+      fs35.open(path31, "r", function(err, fd) {
         if (err) return callback(err);
         fromFd(fd, options2, function(err2, zipfile) {
-          if (err2) fs33.close(fd, defaultCallback);
+          if (err2) fs35.close(fd, defaultCallback);
           callback(err2, zipfile);
         });
       });
@@ -1958,7 +1971,7 @@ var require_yauzl = __commonJS({
       if (options2.validateEntrySizes == null) options2.validateEntrySizes = true;
       if (options2.strictFileNames == null) options2.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs33.fstat(fd, function(err, stats) {
+      fs35.fstat(fd, function(err, stats) {
         if (err) return callback(err);
         var reader = new fd_slicer.FdSlicer(fd);
         fromRandomAccessReader(reader, stats.size, options2, callback);
@@ -2743,7 +2756,7 @@ function writeParseResultToDb(db, meta, members, messages) {
       meta.ownerId || null
     );
     const insertMember = db.prepare(
-      `INSERT OR IGNORE INTO member (platform_id, account_name, group_nickname, avatar, roles) VALUES (?, ?, ?, ?, ?)`
+      `INSERT OR IGNORE INTO member (platform_id, account_name, group_nickname, aliases, avatar, roles) VALUES (?, ?, ?, ?, ?, ?)`
     );
     const getMemberId = db.prepare(`SELECT id FROM member WHERE platform_id = ?`);
     const memberIdMap = /* @__PURE__ */ new Map();
@@ -2752,6 +2765,7 @@ function writeParseResultToDb(db, meta, members, messages) {
         member.platformId,
         member.accountName || null,
         member.groupNickname || null,
+        member.aliases ? JSON.stringify(member.aliases) : "[]",
         member.avatar || null,
         member.roles ? JSON.stringify(member.roles) : "[]"
       );
@@ -3178,6 +3192,7 @@ function toParsedMember(member, fromHead) {
     platformId: member.platformId,
     accountName: member.accountName,
     groupNickname: member.groupNickname,
+    aliases: member.aliases,
     avatar: member.avatar,
     // Role objects pass through with their original key set ({id} or {id, name}).
     roles: member.roles?.map((role) => role.name !== void 0 ? { id: role.id, name: role.name } : { id: role.id })
@@ -3193,7 +3208,9 @@ var chatlabAdapter = {
       platform: meta.platform,
       type: meta.chatType,
       groupId: meta.groupId ?? void 0,
-      groupAvatar: meta.groupAvatar ?? void 0
+      groupAvatar: meta.groupAvatar ?? void 0,
+      ownerId: meta.ownerId ?? void 0,
+      sourceSessionId: meta.sourceSessionId ?? void 0
     };
   },
   mapMembers(members, metaJson) {
@@ -3285,7 +3302,9 @@ async function* parseChatLab(options2) {
           platform: metaObj.platform || KNOWN_PLATFORMS.UNKNOWN,
           type: metaObj.type || "group" /* GROUP */,
           groupId: metaObj.groupId,
-          groupAvatar: metaObj.groupAvatar
+          groupAvatar: metaObj.groupAvatar,
+          ownerId: metaObj.ownerId,
+          sourceSessionId: metaObj.sourceSessionId
         };
       }
     }
@@ -3296,22 +3315,6 @@ async function* parseChatLab(options2) {
   }
   yield { type: "meta", data: meta };
   const members = [];
-  try {
-    const membersMatch = headContent.match(/"members"\s*:\s*\[([\s\S]*?)\]/);
-    if (membersMatch) {
-      const membersJson = JSON.parse(`[${membersMatch[1]}]`);
-      for (const m of membersJson) {
-        members.push({
-          platformId: m.platformId,
-          accountName: m.accountName,
-          groupNickname: m.groupNickname,
-          avatar: m.avatar,
-          roles: m.roles
-        });
-      }
-    }
-  } catch {
-  }
   const memberMapFromMessages = /* @__PURE__ */ new Map();
   const messageBatch = [];
   await new Promise((resolve2, reject) => {
@@ -3319,9 +3322,20 @@ async function* parseChatLab(options2) {
     readStream.on("data", (chunk) => {
       bytesRead += typeof chunk === "string" ? Buffer.byteLength(chunk) : chunk.length;
     });
-    const pipeline2 = chain([readStream, parser(), pick({ filter: /^messages\.\d+$/ }), streamValues()]);
+    const pipeline2 = chain([readStream, parser(), pick({ filter: /^(?:members|messages)\.\d+$/ }), streamValues()]);
     const batchCollector = [];
     pipeline2.on("data", ({ value }) => {
+      if (!("sender" in value)) {
+        members.push({
+          platformId: value.platformId,
+          accountName: value.accountName,
+          groupNickname: value.groupNickname,
+          aliases: value.aliases,
+          avatar: value.avatar,
+          roles: value.roles
+        });
+        return;
+      }
       const msg = value;
       if (members.length === 0) {
         memberMapFromMessages.set(msg.sender, {
@@ -3460,7 +3474,9 @@ async function* parseChatLabJsonl(options2) {
             platform: parsed.meta.platform || KNOWN_PLATFORMS.UNKNOWN,
             type: parsed.meta.type || "group" /* GROUP */,
             groupId: parsed.meta.groupId,
-            groupAvatar: parsed.meta.groupAvatar
+            groupAvatar: parsed.meta.groupAvatar,
+            ownerId: parsed.meta.ownerId,
+            sourceSessionId: parsed.meta.sourceSessionId
           };
           headerParsed = true;
           yield { type: "meta", data: meta };
@@ -3865,6 +3881,9 @@ function extractNameFromFilePath3(filePath) {
   const basename13 = path5.basename(filePath);
   return basename13.replace(/\.json$/i, "") || "\u672A\u77E5\u7FA4\u804A";
 }
+function isPlaceholderSenderId(id) {
+  return id === "0" || id === "\u672A\u77E5";
+}
 function countSenders(content) {
   const sendersStart = content.indexOf('"senders"');
   if (sendersStart === -1) return 0;
@@ -3879,8 +3898,19 @@ function countSenders(content) {
   }
   if (depth !== 0) return 0;
   const sendersContent = content.slice(arrayStart + 1, i - 1);
-  const uidMatches = sendersContent.match(/"uid"\s*:/g);
-  return uidMatches ? uidMatches.length : 0;
+  const uidMatches = sendersContent.matchAll(/"uid"\s*:\s*"([^"]*)"/g);
+  let count = 0;
+  for (const match of uidMatches) {
+    const uid = match[1];
+    if (uid && !isPlaceholderSenderId(uid)) count++;
+  }
+  return count;
+}
+function resolveChatType(chatInfoType, headContent) {
+  if (chatInfoType === "group") return "group" /* GROUP */;
+  const sendersCount = countSenders(headContent);
+  if (chatInfoType === "private") return sendersCount > 2 ? "group" /* GROUP */ : "private" /* PRIVATE */;
+  return sendersCount > 2 ? "group" /* GROUP */ : sendersCount > 0 ? "private" /* PRIVATE */ : "group" /* GROUP */;
 }
 function convertMessageType(messageType, content, isRecalled) {
   if (isRecalled) return 81 /* RECALL */;
@@ -3934,8 +3964,7 @@ async function* parseV4(options2) {
     }
   } catch {
   }
-  const sendersCount = countSenders(headContent);
-  const chatType = sendersCount > 2 ? "group" /* GROUP */ : sendersCount > 0 ? "private" /* PRIVATE */ : "group" /* GROUP */;
+  const chatType = resolveChatType(chatInfo.type, headContent);
   const meta = {
     name: chatInfo.name || extractNameFromFilePath3(filePath),
     platform: KNOWN_PLATFORMS.QQ,
@@ -3954,7 +3983,7 @@ async function* parseV4(options2) {
     const pipeline2 = chain3([readStream, parser4(), pick3({ filter: /^messages\.\d+$/ }), streamValues3()]);
     pipeline2.on("data", ({ value }) => {
       const platformId = value.sender.uin || value.sender.uid || value.rawMessage?.senderUin || value.rawMessage?.senderUid;
-      if (!platformId) {
+      if (!platformId || isPlaceholderSenderId(platformId)) {
         skippedMessages++;
         return;
       }
@@ -3973,9 +4002,11 @@ async function* parseV4(options2) {
         skippedMessages++;
         return;
       }
-      const type = value.isSystemMessage ? 80 /* SYSTEM */ : convertMessageType(value.messageType, value.content, value.isRecalled);
+      const isSystem = value.system ?? value.isSystemMessage;
+      const isRecalled = value.recalled ?? value.isRecalled;
+      const type = isSystem ? 80 /* SYSTEM */ : convertMessageType(value.messageType, value.content, isRecalled);
       let textContent = value.content?.text || "";
-      if (value.isRecalled) textContent = "[\u5DF2\u64A4\u56DE] " + textContent;
+      if (isRecalled) textContent = "[\u5DF2\u64A4\u56DE] " + textContent;
       messageBatch.push({
         platformMessageId: value.messageId,
         // 消息的平台原始 ID
@@ -5502,6 +5533,14 @@ function extractNameFromFilePath5(filePath) {
   if (matchZhTw) return matchZhTw[1].trim();
   return basename13.replace(/\.txt$/i, "") || "\u672A\u77E5\u804A\u5929";
 }
+function shouldInferPrivateChatName(filePath, fallbackName) {
+  const basename13 = path8.basename(filePath);
+  return /^_chat\.txt$/i.test(basename13) || /^whatsapp(?:[-_\s].*)?$/i.test(fallbackName);
+}
+function inferPrivateChatName(memberMap, fallbackName) {
+  const member = Array.from(memberMap.values()).find((item) => item.platformId !== "system");
+  return member?.nickname || fallbackName;
+}
 var feature10 = {
   id: "whatsapp-native-txt",
   name: "WhatsApp \u5B98\u65B9\u5BFC\u51FA (TXT)",
@@ -5520,9 +5559,9 @@ var feature10 = {
       // 英文加密提示（WhatsApp 独有）
       /你发送给自己的消息已进行端到端加密/,
       // 简体中文自己对话提示（WhatsApp 独有）
-      /\d{1,4}\/\d{1,2}\/\d{2,4},?\s+\d{1,2}:\d{2} - /,
+      /\d{1,4}\/\d{1,2}\/\d{2,4},?\s+\d{1,2}:\d{2}(?::\d{2})?(?:[\s\u2009\u202F]*(?:AM|PM|A\.M\.|P\.M\.|上午|下午|午前|午後|오전|오후))?\s+- /i,
       // 消息行格式特征（无方括号，含 " - " 分隔符，WhatsApp 独有）
-      /\[\d{1,4}\/\d{1,2}\/\d{2,4}[\s,].*\d{1,2}:\d{2}:\d{2}.*\] /
+      /\[\d{1,4}\/\d{1,2}\/\d{1,4}[\s,].*\d{1,2}:\d{2}(?::\d{2})?.*\] /
       // 消息行格式特征（方括号 + 含日期和时间的时间戳，兼容各地区变体）
     ],
     // 文件名特征：与xxx的 WhatsApp 聊天.txt
@@ -5532,9 +5571,9 @@ var feature10 = {
 function cleanLine(line) {
   return line.replace(/^(?:\uFEFF|\u200E|\u200F|\u200B|\u200C|\u200D|\u2060)+/, "").trim();
 }
-var MESSAGE_LINE_REGEX_V1 = /^(\d{1,4}\/\d{1,2}\/\d{2,4},?\s+\d{1,2}:\d{2}) - (.+)$/;
+var MESSAGE_LINE_REGEX_V1 = /^(\d{1,4}\/\d{1,2}\/\d{2,4},?\s+\d{1,2}:\d{2}(?::\d{2})?(?:[\s\u2009\u202F]*(?:AM|PM|A\.M\.|P\.M\.|上午|下午|午前|午後|오전|오후))?) - (.+)$/i;
 var MESSAGE_LINE_REGEX_V2 = /^\[([^\]]+)\] (.+)$/;
-var SENDER_CONTENT_REGEX = /^(.+?):[\s\u200E]+(.*)$/;
+var SENDER_CONTENT_REGEX = /^(.+?):[\s\u200E]*(.*)$/;
 var SYSTEM_MESSAGE_PATTERNS = [
   // 简体中文系统消息
   /消息和通话已进行端到端加密/,
@@ -5586,12 +5625,12 @@ function detectMessageType2(content) {
 }
 var AMPM_MARKERS = [
   [/\bPM\b/i, true],
-  [/\bP\.M\.\b/i, true],
+  [/\bP\.M\.(?!\w)/i, true],
   [/下午/, true],
   [/午後/, true],
   [/오후/, true],
   [/\bAM\b/i, false],
-  [/\bA\.M\.\b/i, false],
+  [/\bA\.M\.(?!\w)/i, false],
   [/上午/, false],
   [/午前/, false],
   [/오전/, false]
@@ -5607,7 +5646,7 @@ function parseFlexibleV2Timestamp(raw) {
     }
   }
   str = str.replace(/,/g, " ").replace(/\s+/g, " ").trim();
-  const match = str.match(/^(\d{1,4}\/\d{1,2}\/\d{2,4})\s+(\d{1,2}:\d{2}(?::\d{2})?)$/);
+  const match = str.match(/^(\d{1,4}\/\d{1,2}\/\d{1,4})\s+(\d{1,2}:\d{2}(?::\d{2})?)$/);
   if (!match) return null;
   const [, datePart, timePart] = match;
   const dateParts = datePart.split("/").map((s) => parseInt(s, 10));
@@ -5636,32 +5675,7 @@ function parseFlexibleV2Timestamp(raw) {
   return isNaN(ts) ? null : ts;
 }
 function parseV1Timestamp(timeStr) {
-  const str = timeStr.replace(/,/g, "").replace(/\s+/g, " ").trim();
-  const match = str.match(/^(\d{1,4})\/(\d{1,2})\/(\d{2,4})\s+(\d{1,2}):(\d{2})$/);
-  if (!match) {
-    const normalized = timeStr.replace(/,/g, "").replace(/\//g, "-").replace(/\s+/, "T") + ":00";
-    return Math.floor(new Date(normalized).getTime() / 1e3);
-  }
-  const parts = [parseInt(match[1], 10), parseInt(match[2], 10), parseInt(match[3], 10)];
-  const hour = parseInt(match[4], 10);
-  const minute = parseInt(match[5], 10);
-  let year, month, day;
-  if (parts[0] > 31) {
-    year = parts[0];
-    month = parts[1];
-    day = parts[2];
-  } else if (parts[2] > 31) {
-    day = parts[0];
-    month = parts[1];
-    year = parts[2];
-  } else {
-    month = parts[0];
-    day = parts[1];
-    year = 2e3 + parts[2];
-  }
-  const date = new Date(year, month - 1, day, hour, minute, 0);
-  const ts = Math.floor(date.getTime() / 1e3);
-  return isNaN(ts) ? 0 : ts;
+  return parseFlexibleV2Timestamp(timeStr) ?? 0;
 }
 async function* parseWhatsApp(options2) {
   const { filePath, batchSize = 5e3, onProgress, onLog } = options2;
@@ -5673,7 +5687,7 @@ async function* parseWhatsApp(options2) {
   yield { type: "progress", data: initialProgress };
   onProgress?.(initialProgress);
   onLog?.("info", `\u5F00\u59CB\u89E3\u6790 WhatsApp TXT \u6587\u4EF6\uFF0C\u5927\u5C0F: ${(totalBytes / 1024 / 1024).toFixed(2)} MB`);
-  const chatName = extractNameFromFilePath5(filePath);
+  const fileChatName = extractNameFromFilePath5(filePath);
   const memberMap = /* @__PURE__ */ new Map();
   const messages = [];
   let currentMessage = null;
@@ -5772,6 +5786,7 @@ async function* parseWhatsApp(options2) {
   const hasSystemMember = memberMap.has("system");
   const realMemberCount = hasSystemMember ? memberMap.size - 1 : memberMap.size;
   const chatType = realMemberCount > 2 ? "group" /* GROUP */ : "private" /* PRIVATE */;
+  const chatName = chatType === "private" /* PRIVATE */ && shouldInferPrivateChatName(filePath, fileChatName) ? inferPrivateChatName(memberMap, fileChatName) : fileChatName;
   const meta = {
     name: chatName,
     platform: KNOWN_PLATFORMS.WHATSAPP,
@@ -7410,6 +7425,35 @@ function searchByFts(db, keywords, limit = 1e3, offset = 0) {
 
 // ../../packages/node-runtime/src/import/streaming-importer.ts
 import * as fs20 from "fs";
+
+// ../../packages/node-runtime/src/import/message-deduplicator.ts
+function generateFallbackMessageKey(message) {
+  const contentKey = generateMessageKey(message.timestamp, message.senderPlatformId, message.content);
+  return JSON.stringify([contentKey, message.type, message.replyToMessageId || null]);
+}
+function createMessageDedupState(platformMessageIds = [], fallbackKeys = [], fallbackOnlyKeys = []) {
+  return {
+    platformMessageIds: new Set(platformMessageIds),
+    fallbackKeys: new Set(fallbackKeys),
+    fallbackOnlyKeys: new Set(fallbackOnlyKeys)
+  };
+}
+function registerMessageAndCheckDuplicate(message, state) {
+  const key = generateFallbackMessageKey(message);
+  if (message.platformMessageId) {
+    if (state.platformMessageIds.has(message.platformMessageId)) return true;
+    state.platformMessageIds.add(message.platformMessageId);
+    if (state.fallbackOnlyKeys.delete(key)) return true;
+    state.fallbackKeys.add(key);
+    return false;
+  }
+  if (state.fallbackKeys.has(key)) return true;
+  state.fallbackKeys.add(key);
+  state.fallbackOnlyKeys.add(key);
+  return false;
+}
+
+// ../../packages/node-runtime/src/import/streaming-importer.ts
 var BATCH_COMMIT_SIZE = 5e4;
 var CHECKPOINT_INTERVAL = 2e5;
 var yieldToEventLoop = () => new Promise((resolve2) => setImmediate(resolve2));
@@ -7418,6 +7462,28 @@ function defaultGenerateSessionId() {
   const rand = Math.random().toString(36).substring(2, 8);
   return `chat_${ts}_${rand}`;
 }
+function prepareMessageForCreate(message) {
+  if (!message.senderPlatformId) return { skipCounter: "skippedNoSenderId" };
+  if (!message.senderAccountName) return { skipCounter: "skippedNoAccountName" };
+  if (message.timestamp === void 0 || message.timestamp === null || isNaN(message.timestamp)) {
+    return { skipCounter: "skippedInvalidTimestamp" };
+  }
+  if (message.type === void 0 || message.type === null) return { skipCounter: "skippedNoType" };
+  let content = null;
+  if (message.content != null) {
+    content = typeof message.content === "string" ? message.content : JSON.stringify(message.content);
+  }
+  return {
+    message: {
+      platformMessageId: message.platformMessageId,
+      timestamp: message.timestamp,
+      senderPlatformId: message.senderPlatformId,
+      type: message.type,
+      content,
+      replyToMessageId: message.replyToMessageId
+    }
+  };
+}
 async function streamingImport(filePath, deps, formatOptions, externalSessionId) {
   if (formatOptions?.formatId) {
     const formatId = formatOptions.formatId;
@@ -7494,11 +7560,12 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
     `INSERT INTO meta (name, platform, type, imported_at, group_id, group_avatar, owner_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
   );
   const insertMember = db.prepare(
-    `INSERT INTO member (platform_id, account_name, group_nickname, avatar, roles)
-     VALUES (?, ?, ?, ?, ?)
+    `INSERT INTO member (platform_id, account_name, group_nickname, aliases, avatar, roles)
+     VALUES (?, ?, ?, ?, ?, ?)
      ON CONFLICT(platform_id) DO UPDATE SET
        account_name = COALESCE(NULLIF(excluded.account_name, ''), account_name),
        group_nickname = COALESCE(NULLIF(excluded.group_nickname, ''), group_nickname),
+       aliases = CASE WHEN excluded.aliases != '[]' THEN excluded.aliases ELSE aliases END,
        avatar = COALESCE(NULLIF(excluded.avatar, ''), avatar),
        roles = CASE WHEN excluded.roles != '[]' THEN excluded.roles ELSE roles END`
   );
@@ -7518,6 +7585,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
   let metaInserted = false;
   let messageCountInBatch = 0;
   let totalMessageCount = 0;
+  let duplicateCount = 0;
   let lastCheckpointCount = 0;
   let inTransaction = false;
   const beginTransaction = () => {
@@ -7569,6 +7637,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
     skippedInvalidTimestamp: 0,
     skippedNoType: 0
   };
+  const dedupState = createMessageDedupState();
   logger?.info("Starting streamParseFile...");
   try {
     await streamParseFile(
@@ -7613,6 +7682,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
               member.platformId,
               member.accountName || null,
               member.groupNickname || null,
+              member.aliases ? JSON.stringify(member.aliases) : "[]",
               member.avatar || null,
               member.roles ? JSON.stringify(member.roles) : "[]"
             );
@@ -7634,20 +7704,14 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
           let memberInsertCount = 0;
           let nicknameChangeCount = 0;
           for (const msg of messages) {
-            if (!msg.senderPlatformId) {
-              callbackStats.skippedNoSenderId++;
-              continue;
-            }
-            if (!msg.senderAccountName) {
-              callbackStats.skippedNoAccountName++;
-              continue;
-            }
-            if (msg.timestamp === void 0 || msg.timestamp === null || isNaN(msg.timestamp)) {
-              callbackStats.skippedInvalidTimestamp++;
+            const prepared = prepareMessageForCreate(msg);
+            if ("skipCounter" in prepared) {
+              callbackStats[prepared.skipCounter]++;
               continue;
             }
-            if (msg.type === void 0 || msg.type === null) {
-              callbackStats.skippedNoType++;
+            const dedupMessage = prepared.message;
+            if (registerMessageAndCheckDuplicate(dedupMessage, dedupState)) {
+              duplicateCount++;
               continue;
             }
             let t0 = Date.now();
@@ -7656,6 +7720,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
                 msg.senderPlatformId,
                 msg.senderAccountName || null,
                 msg.senderGroupNickname || null,
+                "[]",
                 null,
                 "[]"
               );
@@ -7669,18 +7734,14 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
             }
             const senderId = memberIdMap.get(msg.senderPlatformId);
             if (senderId === void 0) continue;
-            let safeContent = null;
-            if (msg.content != null) {
-              safeContent = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content);
-            }
             t0 = Date.now();
             insertMessage.run(
               senderId,
               msg.senderAccountName || null,
               msg.senderGroupNickname || null,
-              msg.timestamp,
-              msg.type,
-              safeContent,
+              dedupMessage.timestamp,
+              dedupMessage.type,
+              dedupMessage.content,
               msg.replyToMessageId || null,
               msg.platformMessageId || null
             );
@@ -7797,6 +7858,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
         logger?.info(`  invalid timestamp: ${callbackStats.skippedInvalidTimestamp}`);
       if (callbackStats.skippedNoType > 0) logger?.info(`  missing type: ${callbackStats.skippedNoType}`);
     }
+    if (duplicateCount > 0) logger?.info(`Duplicate messages skipped: ${duplicateCount}`);
     logger?.summary(totalMessageCount, memberIdMap.size);
     if (totalMessageCount === 0) {
       logger?.error(
@@ -7829,6 +7891,7 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
     detectedFormat: formatFeature ? `${formatFeature.name} (${formatFeature.id})` : null,
     messagesReceived: callbackStats.totalMessagesReceived,
     messagesWritten: totalMessageCount,
+    duplicateCount,
     messagesSkipped: callbackStats.skippedNoSenderId + callbackStats.skippedNoAccountName + callbackStats.skippedInvalidTimestamp + callbackStats.skippedNoType,
     skipReasons: {
       noSenderId: callbackStats.skippedNoSenderId,
@@ -7842,32 +7905,54 @@ async function streamImportSingle(filePath, deps, formatFeature, formatOptions,
   }
   return { success: true, sessionId, diagnostics };
 }
-async function analyzeNewImport(filePath, onProgress) {
-  const formatFeature = detectFormat(filePath);
+async function analyzeNewImport(filePath, onProgress, options2) {
+  const formatFeature = options2?.formatId ? getFormatFeatureById(options2.formatId) : detectFormat(filePath);
   if (!formatFeature) {
-    return { totalMessages: 0, totalMembers: 0, meta: null, error: "error.unrecognized_format" };
+    return {
+      totalMessages: 0,
+      newMessageCount: 0,
+      duplicateCount: 0,
+      totalMembers: 0,
+      meta: null,
+      error: "error.unrecognized_format"
+    };
   }
   let meta = null;
   const memberSet = /* @__PURE__ */ new Set();
+  const dedupState = createMessageDedupState();
   let totalMessages = 0;
-  await streamParseFile(filePath, {
-    onMeta: (parsedMeta) => {
-      meta = { name: parsedMeta.name, platform: parsedMeta.platform, type: parsedMeta.type };
-    },
-    onMembers: (members) => {
-      for (const m of members) memberSet.add(m.platformId);
-    },
-    onProgress: (progress) => {
-      onProgress(progress);
-    },
-    onMessageBatch: (batch) => {
-      for (const msg of batch) {
-        totalMessages++;
-        if (!memberSet.has(msg.senderPlatformId)) memberSet.add(msg.senderPlatformId);
+  let newMessageCount = 0;
+  let duplicateCount = 0;
+  await streamParseFile(
+    filePath,
+    {
+      formatOptions: options2?.chatIndex === void 0 ? void 0 : { chatIndex: options2.chatIndex },
+      onMeta: (parsedMeta) => {
+        meta = { name: parsedMeta.name, platform: parsedMeta.platform, type: parsedMeta.type };
+      },
+      onMembers: (members) => {
+        for (const m of members) memberSet.add(m.platformId);
+      },
+      onProgress: (progress) => {
+        onProgress(progress);
+      },
+      onMessageBatch: (batch) => {
+        for (const msg of batch) {
+          totalMessages++;
+          if (!memberSet.has(msg.senderPlatformId)) memberSet.add(msg.senderPlatformId);
+          const prepared = prepareMessageForCreate(msg);
+          if ("skipCounter" in prepared) continue;
+          if (registerMessageAndCheckDuplicate(prepared.message, dedupState)) {
+            duplicateCount++;
+          } else {
+            newMessageCount++;
+          }
+        }
       }
-    }
-  });
-  return { totalMessages, totalMembers: memberSet.size, meta };
+    },
+    options2?.formatId
+  );
+  return { totalMessages, newMessageCount, duplicateCount, totalMembers: memberSet.size, meta };
 }
 async function streamParseFileInfo(filePath, deps) {
   const formatFeature = detectFormat(filePath);
@@ -8028,37 +8113,43 @@ function countHistory(tracker) {
 function loadExistingDedup(db) {
   const existingPlatformMsgIds = /* @__PURE__ */ new Set();
   const existingKeys = /* @__PURE__ */ new Set();
+  const existingFallbackOnlyKeys = /* @__PURE__ */ new Set();
   const pmidRows = db.prepare("SELECT platform_message_id FROM message WHERE platform_message_id IS NOT NULL").all();
   for (const row of pmidRows) {
     existingPlatformMsgIds.add(row.platform_message_id);
   }
   const hashRows = db.prepare(
-    `SELECT ts, m.platform_id as sender_platform_id, content
+    `SELECT ts, m.platform_id as sender_platform_id, msg.type, content, reply_to_message_id,
+              platform_message_id
        FROM message msg
        JOIN member m ON msg.sender_id = m.id`
   ).all();
   for (const row of hashRows) {
-    existingKeys.add(generateMessageKey(row.ts, row.sender_platform_id, row.content));
+    const key = generateFallbackMessageKey({
+      timestamp: row.ts,
+      senderPlatformId: row.sender_platform_id,
+      type: row.type,
+      content: row.content,
+      replyToMessageId: row.reply_to_message_id ?? void 0
+    });
+    existingKeys.add(key);
+    if (!row.platform_message_id) existingFallbackOnlyKeys.add(key);
   }
-  return { existingPlatformMsgIds, existingKeys };
+  return { existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys };
 }
-function isDuplicate(msg, existingPlatformMsgIds, existingKeys) {
-  if (msg.platformMessageId) {
-    if (existingPlatformMsgIds.has(msg.platformMessageId)) return true;
-    existingPlatformMsgIds.add(msg.platformMessageId);
-    return false;
-  }
-  const key = generateMessageKey(msg.timestamp, msg.senderPlatformId, msg.content);
-  if (existingKeys.has(key)) return true;
-  existingKeys.add(key);
-  return false;
+function isDuplicate(msg, existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys) {
+  return registerMessageAndCheckDuplicate(msg, {
+    platformMessageIds: existingPlatformMsgIds,
+    fallbackKeys: existingKeys,
+    fallbackOnlyKeys: existingFallbackOnlyKeys
+  });
 }
-function normalizeTimestamp(timestamp) {
+function normalizeImportTimestamp(timestamp) {
   const value = typeof timestamp === "string" && timestamp.trim() !== "" ? Number(timestamp) : timestamp;
   return typeof value === "number" && value > 0 && Number.isFinite(value) ? value : null;
 }
-async function analyzeIncrementalImport(sessionId, filePath, deps) {
-  const formatFeature = detectFormat(filePath);
+async function analyzeIncrementalImport(sessionId, filePath, deps, options2) {
+  const formatFeature = options2?.formatId ? getFormatFeatureById(options2.formatId) : detectFormat(filePath);
   if (!formatFeature) {
     return { error: "error.unrecognized_format", newMessageCount: 0, duplicateCount: 0, totalInFile: 0 };
   }
@@ -8068,36 +8159,41 @@ async function analyzeIncrementalImport(sessionId, filePath, deps) {
   } catch {
     return { error: "error.session_not_found", newMessageCount: 0, duplicateCount: 0, totalInFile: 0 };
   }
-  const { existingPlatformMsgIds, existingKeys } = loadExistingDedup(db);
+  const { existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys } = loadExistingDedup(db);
   db.close();
   let totalInFile = 0;
   let newMessageCount = 0;
   let duplicateCount = 0;
-  await streamParseFile(filePath, {
-    onMeta: () => {
-    },
-    onMembers: () => {
-    },
-    onProgress: (progress) => {
-      deps.onProgress(progress);
-    },
-    onMessageBatch: (batch) => {
-      for (const msg of batch) {
-        totalInFile++;
-        const timestamp = normalizeTimestamp(msg.timestamp);
-        if (timestamp === null) continue;
-        if (isDuplicate({ ...msg, timestamp }, existingPlatformMsgIds, existingKeys)) {
-          duplicateCount++;
-        } else {
-          newMessageCount++;
+  await streamParseFile(
+    filePath,
+    {
+      formatOptions: options2?.chatIndex === void 0 ? void 0 : { chatIndex: options2.chatIndex },
+      onMeta: () => {
+      },
+      onMembers: () => {
+      },
+      onProgress: (progress) => {
+        deps.onProgress(progress);
+      },
+      onMessageBatch: (batch) => {
+        for (const msg of batch) {
+          totalInFile++;
+          const timestamp = normalizeImportTimestamp(msg.timestamp);
+          if (timestamp === null) continue;
+          if (isDuplicate({ ...msg, timestamp }, existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys)) {
+            duplicateCount++;
+          } else {
+            newMessageCount++;
+          }
         }
       }
-    }
-  });
+    },
+    options2?.formatId
+  );
   return { newMessageCount, duplicateCount, totalInFile };
 }
 async function incrementalImport(sessionId, filePath, deps, options2) {
-  const formatFeature = detectFormat(filePath);
+  const formatFeature = options2?.formatId ? getFormatFeatureById(options2.formatId) : detectFormat(filePath);
   if (!formatFeature) {
     return { success: false, newMessageCount: 0, error: "error.unrecognized_format" };
   }
@@ -8118,18 +8214,19 @@ async function incrementalImport(sessionId, filePath, deps, options2) {
       }
     };
     var trackError = trackError2;
-    const { existingPlatformMsgIds, existingKeys } = loadExistingDedup(db);
+    const { existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys } = loadExistingDedup(db);
     const memberIdMap = /* @__PURE__ */ new Map();
     const existingMembers = db.prepare("SELECT id, platform_id FROM member").all();
     for (const m of existingMembers) {
       memberIdMap.set(m.platform_id, m.id);
     }
     const upsertMember = db.prepare(`
-      INSERT INTO member (platform_id, account_name, group_nickname, avatar, roles)
-      VALUES (?, ?, ?, ?, ?)
+      INSERT INTO member (platform_id, account_name, group_nickname, aliases, avatar, roles)
+      VALUES (?, ?, ?, ?, ?, ?)
       ON CONFLICT(platform_id) DO UPDATE SET
         account_name = COALESCE(NULLIF(excluded.account_name, ''), account_name),
         group_nickname = COALESCE(NULLIF(excluded.group_nickname, ''), group_nickname),
+        aliases = CASE WHEN excluded.aliases != '[]' THEN excluded.aliases ELSE aliases END,
         avatar = COALESCE(NULLIF(excluded.avatar, ''), avatar),
         roles = CASE WHEN excluded.roles != '[]' THEN excluded.roles ELSE roles END
     `);
@@ -8165,106 +8262,112 @@ async function incrementalImport(sessionId, filePath, deps, options2) {
     const MAX_ERROR_SAMPLES = 5;
     const BATCH_SIZE2 = 5e3;
     const newFtsEntries = [];
-    await streamParseFile(filePath, {
-      onMeta: (meta) => {
-        if (metaUpdateMode === "none") return;
-        updateMeta.run(
-          meta.name || "",
-          meta.groupId || "",
-          meta.groupAvatar || "",
-          meta.ownerId || "",
-          Math.floor(Date.now() / 1e3)
-        );
-        metaUpdated = true;
-      },
-      onMembers: (members) => {
-        if (memberUpdateMode === "none") return;
-        for (const m of members) {
-          const existed = memberIdMap.has(m.platformId);
-          upsertMember.run(
-            m.platformId,
-            m.accountName || null,
-            m.groupNickname || null,
-            m.avatar || null,
-            m.roles ? JSON.stringify(m.roles) : "[]"
+    await streamParseFile(
+      filePath,
+      {
+        formatOptions: options2?.chatIndex === void 0 ? void 0 : { chatIndex: options2.chatIndex },
+        onMeta: (meta) => {
+          if (metaUpdateMode === "none") return;
+          updateMeta.run(
+            meta.name || "",
+            meta.groupId || "",
+            meta.groupAvatar || "",
+            meta.ownerId || "",
+            Math.floor(Date.now() / 1e3)
           );
-          if (!existed) {
-            const row = getMemberId.get(m.platformId);
-            if (row) memberIdMap.set(m.platformId, row.id);
-            membersAdded++;
-          } else {
-            membersUpdated++;
-          }
-        }
-      },
-      onProgress: (progress) => {
-        deps.onProgress(progress);
-      },
-      onMessageBatch: (batch) => {
-        for (const msg of batch) {
-          processedCount++;
-          if (!msg.senderPlatformId) {
-            trackError2(processedCount, "MISSING_SENDER", "sender field is empty");
-            continue;
-          }
-          if (msg.timestamp === void 0 || msg.timestamp === null) {
-            trackError2(processedCount, "MISSING_TIMESTAMP", "timestamp field is missing");
-            continue;
-          }
-          const timestamp = normalizeTimestamp(msg.timestamp);
-          if (timestamp === null) {
-            trackError2(processedCount, "INVALID_TIMESTAMP", `timestamp value: ${msg.timestamp}`);
-            continue;
-          }
-          if (isDuplicate({ ...msg, timestamp }, existingPlatformMsgIds, existingKeys)) {
-            duplicateCount++;
-            continue;
+          metaUpdated = true;
+        },
+        onMembers: (members) => {
+          if (memberUpdateMode === "none") return;
+          for (const m of members) {
+            const existed = memberIdMap.has(m.platformId);
+            upsertMember.run(
+              m.platformId,
+              m.accountName || null,
+              m.groupNickname || null,
+              m.aliases ? JSON.stringify(m.aliases) : "[]",
+              m.avatar || null,
+              m.roles ? JSON.stringify(m.roles) : "[]"
+            );
+            if (!existed) {
+              const row = getMemberId.get(m.platformId);
+              if (row) memberIdMap.set(m.platformId, row.id);
+              membersAdded++;
+            } else {
+              membersUpdated++;
+            }
           }
-          let memberId = memberIdMap.get(msg.senderPlatformId);
-          if (!memberId) {
-            insertMemberMinimal.run(
-              msg.senderPlatformId,
+        },
+        onProgress: (progress) => {
+          deps.onProgress(progress);
+        },
+        onMessageBatch: (batch) => {
+          for (const msg of batch) {
+            processedCount++;
+            if (!msg.senderPlatformId) {
+              trackError2(processedCount, "MISSING_SENDER", "sender field is empty");
+              continue;
+            }
+            if (msg.timestamp === void 0 || msg.timestamp === null) {
+              trackError2(processedCount, "MISSING_TIMESTAMP", "timestamp field is missing");
+              continue;
+            }
+            const timestamp = normalizeImportTimestamp(msg.timestamp);
+            if (timestamp === null) {
+              trackError2(processedCount, "INVALID_TIMESTAMP", `timestamp value: ${msg.timestamp}`);
+              continue;
+            }
+            if (isDuplicate({ ...msg, timestamp }, existingPlatformMsgIds, existingKeys, existingFallbackOnlyKeys)) {
+              duplicateCount++;
+              continue;
+            }
+            let memberId = memberIdMap.get(msg.senderPlatformId);
+            if (!memberId) {
+              insertMemberMinimal.run(
+                msg.senderPlatformId,
+                msg.senderAccountName || null,
+                msg.senderGroupNickname || null,
+                null
+              );
+              const row = getMemberId.get(msg.senderPlatformId);
+              if (row) {
+                memberId = row.id;
+                memberIdMap.set(msg.senderPlatformId, memberId);
+                membersAdded++;
+              }
+            }
+            if (!memberId) continue;
+            const msgResult = insertMessage.run(
+              memberId,
               msg.senderAccountName || null,
               msg.senderGroupNickname || null,
-              null
+              timestamp,
+              msg.type,
+              msg.content || null,
+              msg.replyToMessageId || null,
+              msg.platformMessageId || null
             );
-            const row = getMemberId.get(msg.senderPlatformId);
-            if (row) {
-              memberId = row.id;
-              memberIdMap.set(msg.senderPlatformId, memberId);
-              membersAdded++;
-            }
+            newFtsEntries.push({
+              id: Number(msgResult.lastInsertRowid ?? 0),
+              content: msg.content || null
+            });
+            if (timestamp < minWrittenTs) minWrittenTs = timestamp;
+            newMessageCount++;
+          }
+          if (processedCount % BATCH_SIZE2 === 0) {
+            deps.onProgress({
+              stage: "saving",
+              bytesRead: 0,
+              totalBytes: 0,
+              messagesProcessed: processedCount,
+              percentage: 50,
+              message: `Processed ${processedCount}, added ${newMessageCount}`
+            });
           }
-          if (!memberId) continue;
-          const msgResult = insertMessage.run(
-            memberId,
-            msg.senderAccountName || null,
-            msg.senderGroupNickname || null,
-            timestamp,
-            msg.type,
-            msg.content || null,
-            msg.replyToMessageId || null,
-            msg.platformMessageId || null
-          );
-          newFtsEntries.push({
-            id: Number(msgResult.lastInsertRowid ?? 0),
-            content: msg.content || null
-          });
-          if (timestamp < minWrittenTs) minWrittenTs = timestamp;
-          newMessageCount++;
-        }
-        if (processedCount % BATCH_SIZE2 === 0) {
-          deps.onProgress({
-            stage: "saving",
-            bytesRead: 0,
-            totalBytes: 0,
-            messagesProcessed: processedCount,
-            percentage: 50,
-            message: `Processed ${processedCount}, added ${newMessageCount}`
-          });
         }
-      }
-    });
+      },
+      options2?.formatId
+    );
     db.exec("COMMIT");
     if (!metaUpdated) {
       db.prepare("UPDATE meta SET imported_at = ?").run(Math.floor(Date.now() / 1e3));
@@ -8340,56 +8443,408 @@ async function incrementalImport(sessionId, filePath, deps, options2) {
   }
 }
 
-// ../../packages/node-runtime/src/import/archive/errors.ts
-var ArchiveImportError = class extends Error {
-  constructor(code, message, options2) {
-    super(message, options2);
-    this.code = code;
-    this.name = "ArchiveImportError";
-  }
-  code;
-};
+// ../../packages/node-runtime/src/import/session-id.ts
+var SAFE_IMPORT_SESSION_ID_RE = /^[A-Za-z0-9_@-][A-Za-z0-9._@-]{0,127}$/;
+function isValidImportSessionId(sessionId) {
+  return SAFE_IMPORT_SESSION_ID_RE.test(sessionId) && !sessionId.includes("..");
+}
 
-// ../../packages/node-runtime/src/import/archive/archive-reader.ts
-var import_yauzl = __toESM(require_yauzl(), 1);
-import * as fs21 from "fs";
-import * as path16 from "path";
-import { pipeline } from "stream/promises";
-var DEFAULT_MAX_ENTRIES = 1e5;
-var DEFAULT_MAX_ENTRY_BYTES = 20 * 1024 * 1024 * 1024;
-var DEFAULT_MAX_COMPRESSION_RATIO = 1e4;
-function validateArchiveEntryName(fileName) {
-  if (fileName.startsWith("/") || /^[A-Za-z]:\//.test(fileName) || fileName.includes("\\") || fileName.split("/").includes("..")) {
-    throw new ArchiveImportError("error.archive_unsafe_path", `Unsafe archive entry path: ${fileName}`);
+// ../../packages/node-runtime/src/import/auto-import-matcher.ts
+var MATCH_WINDOW_SIZE = 5;
+function buildPrivateIdentity(ownerId, memberIds) {
+  if (!ownerId) return null;
+  const ids = [...new Set(memberIds)].filter((id) => id && id.toLowerCase() !== "system").sort();
+  return ids.length > 0 ? `${ownerId}\0${ids.join("\0")}` : null;
+}
+function isBusinessMessage(type, content) {
+  return type !== 80 /* SYSTEM */ && type !== 81 /* RECALL */ && Boolean(content?.trim());
+}
+function addMessageWindow(recentKeys, windows, message) {
+  if (!message.senderPlatformId || !isBusinessMessage(message.type, message.content)) return;
+  const timestamp = normalizeImportTimestamp(message.timestamp);
+  if (timestamp === null) return;
+  recentKeys.push(generateMessageKey(timestamp, message.senderPlatformId, message.content));
+  if (recentKeys.length > MATCH_WINDOW_SIZE) recentKeys.shift();
+  if (recentKeys.length === MATCH_WINDOW_SIZE) windows.add(recentKeys.join(""));
+}
+async function resolveAutoImportTarget(filePath, deps, formatOptions) {
+  let sourceMeta = null;
+  const sourceMemberIds = /* @__PURE__ */ new Set();
+  const sourceWindows = /* @__PURE__ */ new Set();
+  const recentSourceKeys = [];
+  const { formatId, ...parserOptions } = formatOptions ?? {};
+  await streamParseFile(
+    filePath,
+    {
+      formatOptions: parserOptions,
+      onProgress: deps.onProgress ?? (() => {
+      }),
+      onMeta: (meta2) => {
+        sourceMeta = meta2;
+      },
+      onMembers: (members) => {
+        for (const member of members) sourceMemberIds.add(member.platformId);
+      },
+      onMessageBatch: (messages) => {
+        for (const message of messages) {
+          sourceMemberIds.add(message.senderPlatformId);
+          addMessageWindow(recentSourceKeys, sourceWindows, message);
+        }
+      }
+    },
+    typeof formatId === "string" ? formatId : void 0
+  );
+  if (!sourceMeta) throw new Error("Import source did not provide metadata");
+  const meta = sourceMeta;
+  const privateIdentity = meta.type === "private" ? buildPrivateIdentity(meta.ownerId, sourceMemberIds) : null;
+  const hasStableIdentity = Boolean(meta.groupId || privateIdentity);
+  const stableMatches = [];
+  const trailingMatches = [];
+  for (const sessionId of deps.listSessionIds()) {
+    let db = null;
+    try {
+      db = deps.openReadonly(sessionId);
+      if (!isChatSessionDb(db)) continue;
+      const candidate = getSessionMeta(db);
+      if (candidate?.platform !== meta.platform || candidate.type !== meta.type) continue;
+      const groupMatches = Boolean(meta.groupId && candidate.groupId === meta.groupId);
+      const memberRows = privateIdentity ? db.prepare("SELECT platform_id FROM member WHERE LOWER(platform_id) != 'system'").all() : [];
+      const candidatePrivateIdentity = privateIdentity ? buildPrivateIdentity(
+        candidate.ownerId,
+        memberRows.map((row) => row.platform_id)
+      ) : null;
+      if (groupMatches || privateIdentity && candidatePrivateIdentity === privateIdentity) {
+        stableMatches.push(sessionId);
+      }
+      if (sourceWindows.size > 0) {
+        const rows = db.prepare(
+          `SELECT msg.ts, member.platform_id, msg.type, msg.content
+             FROM message msg
+             JOIN member ON member.id = msg.sender_id
+             WHERE msg.type NOT IN (?, ?)
+               AND NULLIF(TRIM(msg.content), '') IS NOT NULL
+             ORDER BY msg.ts DESC, msg.id DESC
+             LIMIT ?`
+        ).all(80 /* SYSTEM */, 81 /* RECALL */, MATCH_WINDOW_SIZE);
+        if (rows.length === MATCH_WINDOW_SIZE) {
+          const signature = rows.reverse().map((row) => generateMessageKey(row.ts, row.platform_id, row.content)).join("");
+          if (sourceWindows.has(signature)) trailingMatches.push(sessionId);
+        }
+      }
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to inspect import candidate ${JSON.stringify(sessionId)}: ${detail}`, {
+        cause: error
+      });
+    } finally {
+      db?.close();
+    }
+  }
+  if (hasStableIdentity) {
+    if (meta.sourceSessionId && stableMatches.includes(meta.sourceSessionId)) {
+      return { action: "incremental", sessionId: meta.sourceSessionId, matchedBy: "source-session-id" };
+    }
+    if (stableMatches.length === 1) {
+      return { action: "incremental", sessionId: stableMatches[0], matchedBy: "stable-id" };
+    }
   }
+  if (meta.sourceSessionId && trailingMatches.includes(meta.sourceSessionId)) {
+    return { action: "incremental", sessionId: meta.sourceSessionId, matchedBy: "source-session-id" };
+  }
+  if (trailingMatches.length === 1) {
+    return { action: "incremental", sessionId: trailingMatches[0], matchedBy: "trailing-messages" };
+  }
+  const ambiguous = stableMatches.length > 1 || trailingMatches.length > 1;
+  return { action: "create", reason: ambiguous ? "ambiguous" : "no-match" };
 }
-function mapArchiveError(error) {
-  if (error instanceof ArchiveImportError) return error;
-  const message = error instanceof Error ? error.message : String(error);
-  return new ArchiveImportError("error.archive_corrupt", `Invalid ZIP archive: ${message}`, {
-    cause: error
-  });
+
+// ../../packages/node-runtime/src/import/auto-importer.ts
+async function planAutoImport(filePath, deps, options2) {
+  if (options2.explicitSessionId) {
+    if (!isValidImportSessionId(options2.explicitSessionId)) {
+      throw new Error("sessionId contains invalid characters");
+    }
+    return deps.sessionExists(options2.explicitSessionId) ? { action: "incremental", sessionId: options2.explicitSessionId } : { action: "create", sessionId: options2.explicitSessionId };
+  }
+  const decision = await (deps.resolveTarget ?? resolveAutoImportTarget)(
+    filePath,
+    deps,
+    options2.formatOptions
+  );
+  return decision.action === "incremental" ? { action: "incremental", sessionId: decision.sessionId, matchedBy: decision.matchedBy } : { action: "create", reason: decision.reason };
 }
-function toSummary(entry) {
+function mapCreateResult(result, createReason) {
+  if (!result.success || !result.sessionId) {
+    return { success: false, error: result.error, diagnostics: result.diagnostics };
+  }
   return {
-    name: entry.fileName,
-    compressedSize: entry.compressedSize,
-    uncompressedSize: entry.uncompressedSize,
-    compressionMethod: entry.compressionMethod,
-    isDirectory: entry.fileName.endsWith("/")
+    success: true,
+    sessionId: result.sessionId,
+    importMode: "created",
+    ...createReason ? { createReason } : {},
+    newMessageCount: result.diagnostics?.messagesWritten ?? 0,
+    duplicateCount: result.diagnostics?.duplicateCount ?? 0,
+    batch: result.diagnostics ? {
+      receivedCount: result.diagnostics.messagesReceived,
+      writtenCount: result.diagnostics.messagesWritten,
+      duplicateCount: result.diagnostics.duplicateCount
+    } : void 0,
+    diagnostics: result.diagnostics
   };
 }
-function validateEntry(entry, options2) {
-  validateArchiveEntryName(entry.fileName);
-  if (entry.isEncrypted()) {
-    throw new ArchiveImportError("error.archive_encrypted", `Encrypted ZIP entry is not supported: ${entry.fileName}`);
-  }
-  if (!entry.canDecodeFileData() || entry.compressionMethod !== 0 && entry.compressionMethod !== 8) {
-    throw new ArchiveImportError(
-      "error.archive_unsupported",
-      `Unsupported ZIP compression method for entry: ${entry.fileName}`
+function mapIncrementalResult(sessionId, result, matchedBy) {
+  if (!result.success) return { success: false, sessionId, error: result.error };
+  return {
+    success: true,
+    sessionId,
+    importMode: "incremental",
+    ...matchedBy ? { matchedBy } : {},
+    newMessageCount: result.newMessageCount,
+    duplicateCount: result.batch?.duplicateCount ?? 0,
+    batch: result.batch,
+    session: result.session,
+    updates: result.updates
+  };
+}
+async function autoImportFile(filePath, deps, options2 = {}) {
+  try {
+    if (!options2.explicitSessionId) {
+      appLogger.info("import", "Automatic session matching started", {
+        candidateCount: deps.listSessionIds().length
+      });
+    }
+    const plan = await planAutoImport(filePath, deps, options2);
+    if (plan.action === "incremental") {
+      const result2 = mapIncrementalResult(
+        plan.sessionId,
+        await deps.appendSession(plan.sessionId, filePath, options2.formatOptions),
+        plan.matchedBy
+      );
+      appLogger.info("import", "Incremental import completed", {
+        sessionId: plan.sessionId,
+        matchedBy: plan.matchedBy,
+        success: result2.success,
+        newMessageCount: result2.newMessageCount,
+        duplicateCount: result2.duplicateCount
+      });
+      return result2;
+    }
+    const result = mapCreateResult(
+      await deps.createSession(filePath, options2.formatOptions, plan.sessionId),
+      plan.reason
     );
-  }
+    appLogger.info("import", "Import created a new session", {
+      reason: plan.reason,
+      sessionId: result.sessionId,
+      success: result.success
+    });
+    return result;
+  } catch (error) {
+    appLogger.error("import", "Automatic import failed", error);
+    return { success: false, error: error instanceof Error ? error.message : String(error) };
+  }
+}
+async function analyzeAutoImportFile(filePath, deps, options2 = {}) {
+  try {
+    const plan = await planAutoImport(filePath, deps, options2);
+    if (plan.action === "incremental") {
+      const analysis2 = await deps.analyzeAppendSession(plan.sessionId, filePath, options2.formatOptions);
+      if (analysis2.error) return { success: false, error: analysis2.error };
+      const result2 = {
+        success: true,
+        importMode: "incremental",
+        sessionId: plan.sessionId,
+        ...plan.matchedBy ? { matchedBy: plan.matchedBy } : {},
+        totalMessageCount: analysis2.totalInFile,
+        newMessageCount: analysis2.newMessageCount,
+        duplicateCount: analysis2.duplicateCount
+      };
+      appLogger.info("import", "Incremental import analysis completed", {
+        sessionId: plan.sessionId,
+        matchedBy: plan.matchedBy,
+        newMessageCount: analysis2.newMessageCount,
+        duplicateCount: analysis2.duplicateCount
+      });
+      return result2;
+    }
+    const analysis = await deps.analyzeCreateSession(filePath, options2.formatOptions);
+    if (analysis.error) return { success: false, error: analysis.error };
+    const result = {
+      success: true,
+      importMode: "created",
+      ...plan.sessionId ? { sessionId: plan.sessionId } : {},
+      ...plan.reason ? { createReason: plan.reason } : {},
+      totalMessageCount: analysis.totalMessages,
+      newMessageCount: analysis.newMessageCount,
+      duplicateCount: analysis.duplicateCount,
+      totalMemberCount: analysis.totalMembers,
+      meta: analysis.meta
+    };
+    appLogger.info("import", "New session import analysis completed", {
+      reason: plan.reason,
+      messageCount: analysis.totalMessages,
+      memberCount: analysis.totalMembers
+    });
+    return result;
+  } catch (error) {
+    appLogger.error("import", "Automatic import analysis failed", error);
+    return { success: false, error: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+// ../../packages/node-runtime/src/import/import-lock.ts
+import * as fs21 from "fs";
+import * as path16 from "path";
+import { randomUUID } from "crypto";
+var IMPORT_LOCK_FILENAME = ".chatlab-import.lock";
+var IMPORT_IN_PROGRESS_ERROR_KEY = "error.import_in_progress";
+var ImportInProgressError = class extends Error {
+  code = "IMPORT_IN_PROGRESS";
+  errorKey = IMPORT_IN_PROGRESS_ERROR_KEY;
+  constructor() {
+    super("Another import is already in progress");
+    this.name = "ImportInProgressError";
+  }
+};
+function parseOwner(lockPath) {
+  try {
+    const parsed = JSON.parse(fs21.readFileSync(lockPath, "utf-8"));
+    if (typeof parsed.pid !== "number" || !Number.isInteger(parsed.pid) || parsed.pid <= 0 || typeof parsed.token !== "string" || parsed.token.length === 0 || typeof parsed.startedAt !== "number") {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function isProcessRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code !== "ESRCH";
+  }
+}
+function removeStaleLock(lockPath) {
+  const owner = parseOwner(lockPath);
+  if (owner) {
+    if (isProcessRunning(owner.pid)) return false;
+  } else {
+    try {
+      if (Date.now() - fs21.statSync(lockPath).mtimeMs < 5e3) return false;
+    } catch {
+      return true;
+    }
+  }
+  try {
+    fs21.unlinkSync(lockPath);
+    appLogger.warn("import-lock", "Removed stale import lock", { ownerPid: owner?.pid });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function releaseLock(lockPath, fd, owner) {
+  try {
+    fs21.closeSync(fd);
+  } catch (error) {
+    appLogger.error("import-lock", "Failed to close import lock", error);
+  }
+  try {
+    if (parseOwner(lockPath)?.token !== owner.token) {
+      appLogger.warn("import-lock", "Import lock ownership changed before release");
+      return;
+    }
+    fs21.unlinkSync(lockPath);
+    appLogger.info("import-lock", "Import lock released");
+  } catch (error) {
+    appLogger.error("import-lock", "Failed to release import lock", error);
+  }
+}
+async function withDataDirImportLock(userDataDir, task) {
+  fs21.mkdirSync(userDataDir, { recursive: true });
+  const lockPath = path16.join(userDataDir, IMPORT_LOCK_FILENAME);
+  let fd = null;
+  for (let attempt = 0; attempt < 2; attempt++) {
+    try {
+      fd = fs21.openSync(lockPath, "wx");
+      break;
+    } catch (error) {
+      const code = error.code;
+      if (code === "EEXIST" && attempt === 0 && removeStaleLock(lockPath)) continue;
+      if (code === "EEXIST") {
+        appLogger.warn("import-lock", "Rejected concurrent import");
+        throw new ImportInProgressError();
+      }
+      throw error;
+    }
+  }
+  if (fd === null) throw new ImportInProgressError();
+  const owner = {
+    pid: process.pid,
+    token: randomUUID(),
+    startedAt: Date.now()
+  };
+  try {
+    fs21.writeFileSync(fd, JSON.stringify(owner), "utf-8");
+    fs21.fsyncSync(fd);
+    appLogger.info("import-lock", "Import lock acquired");
+    return await task();
+  } finally {
+    releaseLock(lockPath, fd, owner);
+  }
+}
+
+// ../../packages/node-runtime/src/import/archive/errors.ts
+var ArchiveImportError = class extends Error {
+  constructor(code, message, options2) {
+    super(message, options2);
+    this.code = code;
+    this.name = "ArchiveImportError";
+  }
+  code;
+};
+
+// ../../packages/node-runtime/src/import/archive/archive-reader.ts
+var import_yauzl = __toESM(require_yauzl(), 1);
+import * as fs22 from "fs";
+import * as path17 from "path";
+import { pipeline } from "stream/promises";
+var DEFAULT_MAX_ENTRIES = 1e5;
+var DEFAULT_MAX_ENTRY_BYTES = 20 * 1024 * 1024 * 1024;
+var DEFAULT_MAX_COMPRESSION_RATIO = 1e4;
+function validateArchiveEntryName(fileName) {
+  if (fileName.startsWith("/") || /^[A-Za-z]:\//.test(fileName) || fileName.includes("\\") || fileName.split("/").includes("..")) {
+    throw new ArchiveImportError("error.archive_unsafe_path", `Unsafe archive entry path: ${fileName}`);
+  }
+}
+function mapArchiveError(error) {
+  if (error instanceof ArchiveImportError) return error;
+  const message = error instanceof Error ? error.message : String(error);
+  return new ArchiveImportError("error.archive_corrupt", `Invalid ZIP archive: ${message}`, {
+    cause: error
+  });
+}
+function toSummary(entry) {
+  return {
+    name: entry.fileName,
+    compressedSize: entry.compressedSize,
+    uncompressedSize: entry.uncompressedSize,
+    compressionMethod: entry.compressionMethod,
+    isDirectory: entry.fileName.endsWith("/")
+  };
+}
+function validateEntry(entry, options2) {
+  validateArchiveEntryName(entry.fileName);
+  if (entry.isEncrypted()) {
+    throw new ArchiveImportError("error.archive_encrypted", `Encrypted ZIP entry is not supported: ${entry.fileName}`);
+  }
+  if (!entry.canDecodeFileData() || entry.compressionMethod !== 0 && entry.compressionMethod !== 8) {
+    throw new ArchiveImportError(
+      "error.archive_unsupported",
+      `Unsupported ZIP compression method for entry: ${entry.fileName}`
+    );
+  }
   if (entry.uncompressedSize > options2.maxEntryBytes) {
     throw new ArchiveImportError("error.archive_limit_exceeded", `ZIP entry exceeds the size limit: ${entry.fileName}`);
   }
@@ -8472,8 +8927,8 @@ var ZipArchiveReader = class {
     await this.visitEntries(async (entry, openStream) => {
       const destination = targets.get(entry.name);
       if (!destination || entry.isDirectory) return;
-      fs21.mkdirSync(path16.dirname(destination), { recursive: true });
-      await pipeline(await openStream(), fs21.createWriteStream(destination, { flags: "wx" }));
+      fs22.mkdirSync(path17.dirname(destination), { recursive: true });
+      await pipeline(await openStream(), fs22.createWriteStream(destination, { flags: "wx" }));
       remaining.delete(entry.name);
     });
     if (remaining.size > 0) {
@@ -8490,8 +8945,8 @@ var import_stream_chain9 = __toESM(require_stream_chain(), 1);
 var import_stream_json9 = __toESM(require_stream_json(), 1);
 var import_Pick8 = __toESM(require_Pick(), 1);
 var import_StreamValues9 = __toESM(require_StreamValues(), 1);
-import * as fs22 from "fs";
-import * as path17 from "path";
+import * as fs23 from "fs";
+import * as path18 from "path";
 var { chain: chain9 } = import_stream_chain9.default;
 var { parser: parser10 } = import_stream_json9.default;
 var { pick: pick8 } = import_Pick8.default;
@@ -8620,16 +9075,16 @@ var GoogleChatTakeoutResolver = class {
         `Google Chat conversation is missing required files: ${chat.chatId}`
       );
     }
-    fs22.mkdirSync(targetDir, { recursive: true });
+    fs23.mkdirSync(targetDir, { recursive: true });
     await reader.pipeEntries(
       /* @__PURE__ */ new Map([
-        [userInfoEntry, path17.join(targetDir, "user_info.json")],
-        [groupInfoEntry, path17.join(targetDir, "group_info.json")],
-        [messagesEntry, path17.join(targetDir, "messages.json")]
+        [userInfoEntry, path18.join(targetDir, "user_info.json")],
+        [groupInfoEntry, path18.join(targetDir, "group_info.json")],
+        [messagesEntry, path18.join(targetDir, "messages.json")]
       ])
     );
-    const manifestPath = path17.join(targetDir, "google-chat-import.json");
-    fs22.writeFileSync(
+    const manifestPath = path18.join(targetDir, "google-chat-import.json");
+    fs23.writeFileSync(
       manifestPath,
       JSON.stringify(
         {
@@ -8652,9 +9107,9 @@ var GoogleChatTakeoutResolver = class {
 };
 
 // ../../packages/node-runtime/src/import/archive/source-manager.ts
-import * as fs23 from "fs";
-import * as path18 from "path";
-import { randomUUID } from "crypto";
+import * as fs24 from "fs";
+import * as path19 from "path";
+import { randomUUID as randomUUID2 } from "crypto";
 var DEFAULT_TTL_MS = 30 * 60 * 1e3;
 var ArchiveImportSourceManager = class {
   records = /* @__PURE__ */ new Map();
@@ -8664,11 +9119,11 @@ var ArchiveImportSourceManager = class {
   now;
   resolvers;
   constructor(options2 = {}) {
-    this.tempRoot = options2.tempRoot ?? path18.join(process.cwd(), ".chatlab-import-sources");
+    this.tempRoot = options2.tempRoot ?? path19.join(process.cwd(), ".chatlab-import-sources");
     this.ttlMs = options2.ttlMs ?? DEFAULT_TTL_MS;
     this.now = options2.now ?? Date.now;
     this.resolvers = options2.resolvers ?? [new GoogleChatTakeoutResolver()];
-    fs23.mkdirSync(this.tempRoot, { recursive: true });
+    fs24.mkdirSync(this.tempRoot, { recursive: true });
   }
   prepareLocalArchive(archivePath) {
     return this.prepareArchive(archivePath, false);
@@ -8691,7 +9146,7 @@ var ArchiveImportSourceManager = class {
       const resolver = matches[0];
       const chats = await resolver.scan(reader);
       const createdAt = this.now();
-      const sourceId = randomUUID();
+      const sourceId = randomUUID2();
       const descriptor = {
         sourceId,
         formatId: resolver.id,
@@ -8725,7 +9180,7 @@ var ArchiveImportSourceManager = class {
         `Archive conversation was not found: ${chatId}`
       );
     }
-    const materializedDir = fs23.mkdtempSync(path18.join(this.tempRoot, `materialized-${sourceId}-`));
+    const materializedDir = fs24.mkdtempSync(path19.join(this.tempRoot, `materialized-${sourceId}-`));
     try {
       const reader = new ZipArchiveReader(record.archivePath);
       const materialized = await record.resolver.materialize(reader, chat, materializedDir);
@@ -8776,7 +9231,7 @@ var ArchiveImportSourceManager = class {
   }
   removePath(targetPath) {
     try {
-      fs23.rmSync(targetPath, { recursive: true, force: true });
+      fs24.rmSync(targetPath, { recursive: true, force: true });
     } catch {
     }
   }
@@ -8846,12 +9301,12 @@ ${rawErrorLabel}: ${details}`;
 }
 
 // ../../packages/node-runtime/src/ai/assistant-parser.ts
-import * as path19 from "path";
+import * as path20 from "path";
 import matter from "gray-matter";
 function parseAssistantFile(content, filePath) {
   try {
     const { data: fm, content: body } = matter(content);
-    const id = fm.id ?? path19.basename(filePath, ".md");
+    const id = fm.id ?? path20.basename(filePath, ".md");
     const name = fm.name;
     if (!name) return null;
     return {
@@ -8930,8 +9385,8 @@ var AssistantManager = class {
   }
   // ==================== Init ====================
   init() {
-    const { fs: fs33, assistantsDir } = this.deps;
-    fs33.ensureDir(assistantsDir);
+    const { fs: fs35, assistantsDir } = this.deps;
+    fs35.ensureDir(assistantsDir);
     const generalCreated = this.ensureGeneralAssistants();
     this.loadAll();
     this.initialized = true;
@@ -8942,26 +9397,26 @@ var AssistantManager = class {
     return { total: this.cache.size, generalCreated };
   }
   ensureGeneralAssistants() {
-    const { fs: fs33, assistantsDir } = this.deps;
+    const { fs: fs35, assistantsDir } = this.deps;
     let anyCreated = false;
     for (const id of this.generalIds) {
       const config = this.getBuiltinConfig(id);
       if (!config) continue;
-      const filePath = fs33.joinPath(assistantsDir, `${id}.md`);
-      if (fs33.fileExists(filePath)) continue;
-      fs33.writeFile(filePath, serializeAssistant({ ...config, builtinId: config.id }));
+      const filePath = fs35.joinPath(assistantsDir, `${id}.md`);
+      if (fs35.fileExists(filePath)) continue;
+      fs35.writeFile(filePath, serializeAssistant({ ...config, builtinId: config.id }));
       anyCreated = true;
     }
     return anyCreated;
   }
   loadAll() {
-    const { fs: fs33, assistantsDir } = this.deps;
+    const { fs: fs35, assistantsDir } = this.deps;
     this.cache.clear();
-    const files = fs33.listFiles(assistantsDir, ".md");
+    const files = fs35.listFiles(assistantsDir, ".md");
     for (const file of files) {
       try {
-        const filePath = fs33.joinPath(assistantsDir, file);
-        const content = fs33.readFile(filePath);
+        const filePath = fs35.joinPath(assistantsDir, file);
+        const content = fs35.readFile(filePath);
         const config = parseAssistantFile(content, filePath);
         if (config) {
           this.cache.set(config.id, config);
@@ -9073,12 +9528,12 @@ var AssistantManager = class {
 };
 
 // ../../packages/node-runtime/src/ai/skill-parser.ts
-import * as path20 from "path";
+import * as path21 from "path";
 import matter2 from "gray-matter";
 function parseSkillFile(content, filePath) {
   try {
     const { data: fm, content: prompt } = matter2(content);
-    const id = fm.id ?? path20.basename(filePath, ".md");
+    const id = fm.id ?? path21.basename(filePath, ".md");
     const name = fm.name;
     if (!name) return null;
     return {
@@ -9097,7 +9552,7 @@ function parseSkillFile(content, filePath) {
 function extractSkillId(content, filePath) {
   try {
     const { data: fm } = matter2(content);
-    return fm.id ?? path20.basename(filePath, ".md");
+    return fm.id ?? path21.basename(filePath, ".md");
   } catch {
     return null;
   }
@@ -9116,8 +9571,8 @@ function validateChatScope(raw) {
 
 // ../../packages/node-runtime/src/ai/chats.ts
 import Database from "better-sqlite3";
-import * as fs24 from "fs";
-import * as path21 from "path";
+import * as fs25 from "fs";
+import * as path22 from "path";
 var DEFAULT_GENERAL_ID = "general_cn";
 var defaultLogger = {
   warn(_category, message, extra) {
@@ -9136,14 +9591,14 @@ var AIChatManager = class {
     this.nativeBinding = options2?.nativeBinding;
   }
   ensureDir(dir) {
-    if (!fs24.existsSync(dir)) {
-      fs24.mkdirSync(dir, { recursive: true });
+    if (!fs25.existsSync(dir)) {
+      fs25.mkdirSync(dir, { recursive: true });
     }
   }
   getDb() {
     if (this.db) return this.db;
     this.ensureDir(this.aiDataDir);
-    const dbPath = path21.join(this.aiDataDir, "conversations.db");
+    const dbPath = path22.join(this.aiDataDir, "conversations.db");
     this.db = this.nativeBinding ? new Database(dbPath, { nativeBinding: this.nativeBinding }) : new Database(dbPath);
     this.db.pragma("journal_mode = WAL");
     this.db.exec(`
@@ -9386,16 +9841,16 @@ var AIChatManager = class {
     if (allRows.length === 0) return [];
     const rowMap = new Map(allRows.map((row) => [row.id, row]));
     let currentId = leafMessageId ?? this.getActiveMessageId(aiChatId);
-    const path30 = [];
+    const path31 = [];
     const seen = /* @__PURE__ */ new Set();
     while (currentId && !seen.has(currentId)) {
       seen.add(currentId);
       const row = rowMap.get(currentId);
       if (!row) break;
-      path30.push(row);
+      path31.push(row);
       currentId = row.parentId;
     }
-    return path30.length > 0 ? path30.reverse() : allRows;
+    return path31.length > 0 ? path31.reverse() : allRows;
   }
   // ==================== 生命周期 ====================
   close() {
@@ -9965,21 +10420,21 @@ var SkillManagerCore = class {
   }
   // ==================== Init ====================
   init() {
-    const { fs: fs33, skillsDir } = this.deps;
-    fs33.ensureDir(skillsDir);
+    const { fs: fs35, skillsDir } = this.deps;
+    fs35.ensureDir(skillsDir);
     this.loadAll();
     this.initialized = true;
     this.deps.logger?.info("SkillManager", "Initialized", { total: this.cache.size });
     return { total: this.cache.size };
   }
   loadAll() {
-    const { fs: fs33, skillsDir } = this.deps;
+    const { fs: fs35, skillsDir } = this.deps;
     this.cache.clear();
-    const files = fs33.listFiles(skillsDir, ".md");
+    const files = fs35.listFiles(skillsDir, ".md");
     for (const file of files) {
       try {
-        const filePath = fs33.joinPath(skillsDir, file);
-        const content = fs33.readFile(filePath);
+        const filePath = fs35.joinPath(skillsDir, file);
+        const content = fs35.readFile(filePath);
         const def = parseSkillFile(content, filePath);
         if (def) {
           this.cache.set(def.id, def);
@@ -10131,8 +10586,8 @@ var SkillManagerCore = class {
 };
 
 // ../../packages/node-runtime/src/ai/skill-manager.ts
-import * as fs25 from "fs";
-import * as path22 from "path";
+import * as fs26 from "fs";
+import * as path23 from "path";
 var SKILLS_DIR_NAME = "skills";
 var defaultLogger2 = {
   info: () => {
@@ -10142,26 +10597,26 @@ var defaultLogger2 = {
 };
 var nodeFs = {
   ensureDir(dir) {
-    fs25.mkdirSync(dir, { recursive: true });
+    fs26.mkdirSync(dir, { recursive: true });
   },
   listFiles(dir, ext) {
-    if (!fs25.existsSync(dir)) return [];
-    return fs25.readdirSync(dir).filter((file) => file.endsWith(ext));
+    if (!fs26.existsSync(dir)) return [];
+    return fs26.readdirSync(dir).filter((file) => file.endsWith(ext));
   },
   readFile(filePath) {
-    return fs25.readFileSync(filePath, "utf-8");
+    return fs26.readFileSync(filePath, "utf-8");
   },
   writeFile(filePath, content) {
-    fs25.writeFileSync(filePath, content, "utf-8");
+    fs26.writeFileSync(filePath, content, "utf-8");
   },
   deleteFile(filePath) {
-    fs25.unlinkSync(filePath);
+    fs26.unlinkSync(filePath);
   },
   fileExists(filePath) {
-    return fs25.existsSync(filePath);
+    return fs26.existsSync(filePath);
   },
   joinPath(...parts) {
-    return path22.join(...parts);
+    return path23.join(...parts);
   }
 };
 var SkillManager = class {
@@ -10171,7 +10626,7 @@ var SkillManager = class {
     this.logger = logger ?? defaultLogger2;
     this.core = new SkillManagerCore({
       fs: nodeFs,
-      skillsDir: path22.join(aiDataDir, SKILLS_DIR_NAME),
+      skillsDir: path23.join(aiDataDir, SKILLS_DIR_NAME),
       builtinRawSkills: [],
       logger: {
         info: () => {
@@ -14001,9 +14456,9 @@ var localeMap = {
   "ja-JP": ja_JP_default,
   "zh-TW": zh_TW_default
 };
-function getNestedValue(obj, path30) {
+function getNestedValue(obj, path31) {
   let current = obj;
-  for (const segment2 of path30.split(".")) {
+  for (const segment2 of path31.split(".")) {
     if (current == null || typeof current !== "object") return void 0;
     current = current[segment2];
   }
@@ -15156,7 +15611,13 @@ function queryMessages(db, timeFilter) {
   const sql = `
     SELECT msg.ts,
            COALESCE(m.group_nickname, m.account_name, m.platform_id) as senderName,
-           msg.content
+           m.platform_id as sender,
+           COALESCE(msg.sender_account_name, m.account_name, m.platform_id) as accountName,
+           COALESCE(msg.sender_group_nickname, m.group_nickname) as groupNickname,
+           msg.type,
+           msg.content,
+           msg.platform_message_id as platformMessageId,
+           msg.reply_to_message_id as replyToMessageId
     FROM message msg
     JOIN member m ON msg.sender_id = m.id
     ${hasFilter ? "WHERE msg.ts >= ? AND msg.ts <= ?" : ""}
@@ -15168,9 +15629,6 @@ function queryMessages(db, timeFilter) {
   }
   return db.prepare(sql).all(...params);
 }
-function formatTime(ts) {
-  return new Date(ts * 1e3).toLocaleString();
-}
 function formatTimeShort(ts) {
   return new Date(ts * 1e3).toLocaleTimeString("zh-CN", { hour: "2-digit", minute: "2-digit", second: "2-digit" });
 }
@@ -15190,16 +15648,69 @@ function exportAsTxt(messages, sessionName) {
   }
   return lines.join("\n");
 }
-function exportAsJson(messages, sessionName) {
+function parseOptionalArray(value) {
+  if (!value) return void 0;
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) && parsed.length > 0 ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function exportAsJson(db, messages, sessionName, sourceSessionId) {
+  const meta = db.prepare(
+    `SELECT name,
+              platform,
+              type,
+              group_id as groupId,
+              group_avatar as groupAvatar,
+              owner_id as ownerId
+       FROM meta
+       LIMIT 1`
+  ).get();
+  if (!meta) throw new Error("Cannot read session metadata");
+  const members = db.prepare(
+    `SELECT platform_id as platformId,
+              account_name as accountName,
+              group_nickname as groupNickname,
+              aliases,
+              avatar,
+              roles
+       FROM member
+       ORDER BY id ASC`
+  ).all();
   const data = {
-    sessionName,
-    exportTime: (/* @__PURE__ */ new Date()).toISOString(),
-    totalMessages: messages.length,
+    chatlab: {
+      version: "0.0.2",
+      exportedAt: Math.floor(Date.now() / 1e3),
+      generator: "ChatLab"
+    },
+    meta: {
+      name: meta.name || sessionName,
+      platform: meta.platform,
+      type: meta.type,
+      groupId: meta.groupId || void 0,
+      groupAvatar: meta.groupAvatar || void 0,
+      ownerId: meta.ownerId || void 0,
+      sourceSessionId
+    },
+    members: members.map((member) => ({
+      platformId: member.platformId,
+      accountName: member.accountName || member.platformId,
+      groupNickname: member.groupNickname || void 0,
+      aliases: parseOptionalArray(member.aliases),
+      avatar: member.avatar || void 0,
+      roles: parseOptionalArray(member.roles)
+    })),
     messages: messages.map((msg) => ({
+      sender: msg.sender,
+      accountName: msg.accountName,
+      groupNickname: msg.groupNickname || void 0,
       timestamp: msg.ts,
-      time: formatTime(msg.ts),
-      sender: msg.senderName,
-      content: msg.content || ""
+      type: msg.type,
+      content: msg.content,
+      platformMessageId: msg.platformMessageId || void 0,
+      replyToMessageId: msg.replyToMessageId || void 0
     }))
   };
   return JSON.stringify(data, null, 2);
@@ -15250,7 +15761,7 @@ function exportWithFormat(params, openDatabase) {
         content = exportAsTxt(messages, params.sessionName);
         break;
       case "json":
-        content = exportAsJson(messages, params.sessionName);
+        content = exportAsJson(db, messages, params.sessionName, params.sessionId);
         break;
       case "markdown":
         content = exportAsMarkdown(messages, params.sessionName);
@@ -15258,8 +15769,15 @@ function exportWithFormat(params, openDatabase) {
     }
     const timestamp = Date.now();
     const filename = `${params.sessionName}_export_${timestamp}.${ext}`;
+    appLogger.info("export", "chat export generated", {
+      sessionId: params.sessionId,
+      format: params.format,
+      totalMessages: messages.length,
+      filteredByTime: !!params.timeFilter
+    });
     return { success: true, totalMessages: messages.length, content, filename, mimeType: mime };
   } catch (error) {
+    appLogger.error("export", "chat export failed", error);
     return {
       success: false,
       error: String(error),
@@ -15272,8 +15790,8 @@ function exportWithFormat(params, openDatabase) {
 }
 
 // ../../packages/node-runtime/src/merger/temp-db.ts
-import * as fs26 from "fs";
-import * as path23 from "path";
+import * as fs27 from "fs";
+import * as path24 from "path";
 var TEMP_DB_SCHEMA = `
   CREATE TABLE IF NOT EXISTS meta (
     name TEXT NOT NULL,
@@ -15518,21 +16036,21 @@ function exportSessionToJson(db) {
 }
 function deleteTempDatabase(dbPath) {
   try {
-    if (fs26.existsSync(dbPath)) fs26.unlinkSync(dbPath);
+    if (fs27.existsSync(dbPath)) fs27.unlinkSync(dbPath);
     const walPath = dbPath + "-wal";
     const shmPath = dbPath + "-shm";
-    if (fs26.existsSync(walPath)) fs26.unlinkSync(walPath);
-    if (fs26.existsSync(shmPath)) fs26.unlinkSync(shmPath);
+    if (fs27.existsSync(walPath)) fs27.unlinkSync(walPath);
+    if (fs27.existsSync(shmPath)) fs27.unlinkSync(shmPath);
   } catch {
   }
 }
 function cleanupTempDatabases(tempDir) {
   try {
-    if (!fs26.existsSync(tempDir)) return;
-    const files = fs26.readdirSync(tempDir);
+    if (!fs27.existsSync(tempDir)) return;
+    const files = fs27.readdirSync(tempDir);
     for (const file of files) {
       if (file.startsWith("merge_") && file.endsWith(".db")) {
-        deleteTempDatabase(path23.join(tempDir, file));
+        deleteTempDatabase(path24.join(tempDir, file));
       }
     }
   } catch {
@@ -15558,7 +16076,21 @@ function buildSession(db, id, dbPath, options2) {
   if (meta.type === "private") {
     memberAvatar = getPrivateChatMemberAvatar(db, meta.name, meta.ownerId);
   }
-  let dto = { ...info, id, dbPath, memberAvatar, aiConversationCount: 0 };
+  const ownerMember = meta.ownerId ? db.prepare(
+    `SELECT COALESCE(NULLIF(group_nickname, ''), NULLIF(account_name, ''), platform_id) as displayName
+           FROM member
+           WHERE platform_id = ?
+           LIMIT 1`
+  ).get(meta.ownerId) : void 0;
+  let dto = {
+    ...info,
+    id,
+    dbPath,
+    memberAvatar,
+    aiConversationCount: 0,
+    ownerName: ownerMember?.displayName ?? null,
+    ownerStatus: !meta.ownerId ? "missing" : ownerMember ? "resolved" : "unresolved"
+  };
   if (options2?.enrichSession) {
     dto = options2.enrichSession(dto);
   }
@@ -15898,8 +16430,8 @@ function clearSessionOwner(adapter, sessionId) {
 }
 
 // ../../packages/node-runtime/src/services/contacts/overrides.ts
-import fs27 from "fs";
-import path24 from "path";
+import fs28 from "fs";
+import path25 from "path";
 var CONTACT_OVERRIDES_FILE_NAME = "contact-overrides.json";
 var CONTACT_OVERRIDES_TMP_PREFIX = "contact-overrides.tmp-";
 var CONTACT_OVERRIDES_VERSION = 1;
@@ -15910,23 +16442,23 @@ function createEmptyContactOverridesFile() {
   };
 }
 function getContactOverridesPath(snapshotDir) {
-  return path24.join(snapshotDir, CONTACT_OVERRIDES_FILE_NAME);
+  return path25.join(snapshotDir, CONTACT_OVERRIDES_FILE_NAME);
 }
 function readContactOverrides(snapshotDir) {
   const filePath = getContactOverridesPath(snapshotDir);
-  if (!fs27.existsSync(filePath)) return createEmptyContactOverridesFile();
+  if (!fs28.existsSync(filePath)) return createEmptyContactOverridesFile();
   try {
-    return normalizeContactOverrides(JSON.parse(fs27.readFileSync(filePath, "utf-8")));
+    return normalizeContactOverrides(JSON.parse(fs28.readFileSync(filePath, "utf-8")));
   } catch (error) {
     appLogger.warn("contacts", "contact overrides file is unreadable", error);
     return createEmptyContactOverridesFile();
   }
 }
 function writeContactOverrides(snapshotDir, overrides) {
-  if (!fs27.existsSync(snapshotDir)) fs27.mkdirSync(snapshotDir, { recursive: true });
-  const tmpPath = path24.join(snapshotDir, `${CONTACT_OVERRIDES_TMP_PREFIX}${process.pid}-${Date.now()}`);
-  fs27.writeFileSync(tmpPath, JSON.stringify(normalizeContactOverrides(overrides), null, 2), "utf-8");
-  fs27.renameSync(tmpPath, getContactOverridesPath(snapshotDir));
+  if (!fs28.existsSync(snapshotDir)) fs28.mkdirSync(snapshotDir, { recursive: true });
+  const tmpPath = path25.join(snapshotDir, `${CONTACT_OVERRIDES_TMP_PREFIX}${process.pid}-${Date.now()}`);
+  fs28.writeFileSync(tmpPath, JSON.stringify(normalizeContactOverrides(overrides), null, 2), "utf-8");
+  fs28.renameSync(tmpPath, getContactOverridesPath(snapshotDir));
 }
 function normalizeContactOverrides(value) {
   const input = isRecord2(value) ? value : {};
@@ -15961,23 +16493,23 @@ function buildContactsSignature(adapter, timeRangePreset) {
 }
 
 // ../../packages/node-runtime/src/services/contacts/snapshot.ts
-import fs28 from "fs";
-import path25 from "path";
+import fs29 from "fs";
+import path26 from "path";
 var CONTACTS_SNAPSHOT_TMP_PREFIX = "contacts-snapshot.tmp-";
 function getContactsSnapshotPath(snapshotDir, timeRangePreset) {
   const preset = normalizeContactsTimeRangePreset(timeRangePreset);
-  return path25.join(snapshotDir, `contacts-snapshot-${preset}.json`);
+  return path26.join(snapshotDir, `contacts-snapshot-${preset}.json`);
 }
 function readContactsSnapshot(snapshotDir, timeRangePreset, options2 = {}) {
   const snapshotPath = getContactsSnapshotPath(snapshotDir, timeRangePreset);
-  if (!fs28.existsSync(snapshotPath)) return null;
+  if (!fs29.existsSync(snapshotPath)) return null;
   try {
-    return JSON.parse(fs28.readFileSync(snapshotPath, "utf-8"));
+    return JSON.parse(fs29.readFileSync(snapshotPath, "utf-8"));
   } catch (error) {
     const ts = options2.now?.() ?? Date.now();
-    const backupPath = path25.join(snapshotDir, `contacts-snapshot.corrupt-${ts}.json`);
+    const backupPath = path26.join(snapshotDir, `contacts-snapshot.corrupt-${ts}.json`);
     try {
-      fs28.renameSync(snapshotPath, backupPath);
+      fs29.renameSync(snapshotPath, backupPath);
     } catch (renameError) {
       appLogger.warn("contacts", "failed to backup corrupt contacts snapshot", renameError);
     }
@@ -15986,17 +16518,17 @@ function readContactsSnapshot(snapshotDir, timeRangePreset, options2 = {}) {
   }
 }
 function writeContactsSnapshot(snapshotDir, snapshot) {
-  if (!fs28.existsSync(snapshotDir)) fs28.mkdirSync(snapshotDir, { recursive: true });
-  const tmpPath = path25.join(snapshotDir, `${CONTACTS_SNAPSHOT_TMP_PREFIX}${process.pid}-${Date.now()}`);
-  fs28.writeFileSync(tmpPath, JSON.stringify(snapshot, null, 2), "utf-8");
-  fs28.renameSync(tmpPath, getContactsSnapshotPath(snapshotDir, snapshot.timeRange.preset));
+  if (!fs29.existsSync(snapshotDir)) fs29.mkdirSync(snapshotDir, { recursive: true });
+  const tmpPath = path26.join(snapshotDir, `${CONTACTS_SNAPSHOT_TMP_PREFIX}${process.pid}-${Date.now()}`);
+  fs29.writeFileSync(tmpPath, JSON.stringify(snapshot, null, 2), "utf-8");
+  fs29.renameSync(tmpPath, getContactsSnapshotPath(snapshotDir, snapshot.timeRange.preset));
 }
 function cleanupContactsSnapshotTempFiles(snapshotDir) {
-  if (!fs28.existsSync(snapshotDir)) return;
-  for (const name of fs28.readdirSync(snapshotDir)) {
+  if (!fs29.existsSync(snapshotDir)) return;
+  for (const name of fs29.readdirSync(snapshotDir)) {
     if (!name.startsWith(CONTACTS_SNAPSHOT_TMP_PREFIX)) continue;
     try {
-      fs28.rmSync(path25.join(snapshotDir, name), { force: true });
+      fs29.rmSync(path26.join(snapshotDir, name), { force: true });
     } catch (error) {
       appLogger.warn("contacts", "failed to remove contacts snapshot temp file", error);
     }
@@ -16494,23 +17026,23 @@ function buildPeopleRelationshipsSignature(adapter, timeRangePreset) {
 }
 
 // ../../packages/node-runtime/src/services/people/relationships/snapshot.ts
-import fs29 from "fs";
-import path26 from "path";
+import fs30 from "fs";
+import path27 from "path";
 var PEOPLE_RELATIONSHIPS_SNAPSHOT_TMP_PREFIX = "people-relationships-snapshot.tmp-";
 function getPeopleRelationshipsSnapshotPath(snapshotDir, timeRangePreset) {
   const preset = normalizePeopleRelationshipsTimeRangePreset(timeRangePreset);
-  return path26.join(snapshotDir, `graph-snapshot-${preset}.json`);
+  return path27.join(snapshotDir, `graph-snapshot-${preset}.json`);
 }
 function readPeopleRelationshipsSnapshot(snapshotDir, timeRangePreset, options2 = {}) {
   const snapshotPath = getPeopleRelationshipsSnapshotPath(snapshotDir, timeRangePreset);
-  if (!fs29.existsSync(snapshotPath)) return null;
+  if (!fs30.existsSync(snapshotPath)) return null;
   try {
-    return JSON.parse(fs29.readFileSync(snapshotPath, "utf-8"));
+    return JSON.parse(fs30.readFileSync(snapshotPath, "utf-8"));
   } catch (error) {
     const ts = options2.now?.() ?? Date.now();
-    const backupPath = path26.join(snapshotDir, `graph-snapshot.corrupt-${ts}.json`);
+    const backupPath = path27.join(snapshotDir, `graph-snapshot.corrupt-${ts}.json`);
     try {
-      fs29.renameSync(snapshotPath, backupPath);
+      fs30.renameSync(snapshotPath, backupPath);
     } catch (renameError) {
       appLogger.warn("people-relationships", "failed to backup corrupt people relationships snapshot", renameError);
     }
@@ -16519,17 +17051,17 @@ function readPeopleRelationshipsSnapshot(snapshotDir, timeRangePreset, options2
   }
 }
 function writePeopleRelationshipsSnapshot(snapshotDir, snapshot) {
-  if (!fs29.existsSync(snapshotDir)) fs29.mkdirSync(snapshotDir, { recursive: true });
-  const tmpPath = path26.join(snapshotDir, `${PEOPLE_RELATIONSHIPS_SNAPSHOT_TMP_PREFIX}${process.pid}-${Date.now()}`);
-  fs29.writeFileSync(tmpPath, JSON.stringify(snapshot, null, 2), "utf-8");
-  fs29.renameSync(tmpPath, getPeopleRelationshipsSnapshotPath(snapshotDir, snapshot.timeRange.preset));
+  if (!fs30.existsSync(snapshotDir)) fs30.mkdirSync(snapshotDir, { recursive: true });
+  const tmpPath = path27.join(snapshotDir, `${PEOPLE_RELATIONSHIPS_SNAPSHOT_TMP_PREFIX}${process.pid}-${Date.now()}`);
+  fs30.writeFileSync(tmpPath, JSON.stringify(snapshot, null, 2), "utf-8");
+  fs30.renameSync(tmpPath, getPeopleRelationshipsSnapshotPath(snapshotDir, snapshot.timeRange.preset));
 }
 function cleanupPeopleRelationshipsSnapshotTempFiles(snapshotDir) {
-  if (!fs29.existsSync(snapshotDir)) return;
-  for (const name of fs29.readdirSync(snapshotDir)) {
+  if (!fs30.existsSync(snapshotDir)) return;
+  for (const name of fs30.readdirSync(snapshotDir)) {
     if (!name.startsWith(PEOPLE_RELATIONSHIPS_SNAPSHOT_TMP_PREFIX)) continue;
     try {
-      fs29.rmSync(path26.join(snapshotDir, name), { force: true });
+      fs30.rmSync(path27.join(snapshotDir, name), { force: true });
     } catch (error) {
       appLogger.warn("people-relationships", "failed to remove people relationships snapshot temp file", error);
     }
@@ -17050,9 +17582,310 @@ __export(relationships_exports, {
   getPeopleRelationshipsFactsCacheDir: () => getPeopleRelationshipsFactsCacheDir
 });
 
+// ../../packages/node-runtime/src/services/global-insight/service.ts
+import fs31 from "fs";
+
+// ../../packages/node-runtime/src/services/global-insight/signature.ts
+function buildAnnualSummarySignature(adapter, range) {
+  const parts = [
+    `algorithm:${ANNUAL_SUMMARY_ALGORITHM_VERSION}`,
+    `range:${toAnnualSummaryRangeKey(range)}`,
+    `start:${range.startTs}`,
+    `day:${toAnnualSummaryLocalDate(range)}`
+  ];
+  for (const sessionId of [...adapter.listSessionIds()].sort()) {
+    parts.push(`${sessionId}:${getDbFileVersion(adapter.getDbPath(sessionId))}`);
+  }
+  return parts.join("|");
+}
+
+// ../../packages/node-runtime/src/services/global-insight/worker-runner.ts
+import { existsSync as existsSync11 } from "fs";
+import { Worker as Worker3 } from "worker_threads";
+function resolveDefaultAnnualSummaryWorkerEntryUrl(currentModuleUrl = import.meta.url, entryExists = (url) => existsSync11(url)) {
+  const moduleUrl = typeof currentModuleUrl === "string" ? currentModuleUrl : currentModuleUrl.href;
+  if (moduleUrl.endsWith(".ts")) return new URL("./worker-entry.ts", moduleUrl);
+  if (moduleUrl.endsWith(".mjs")) return new URL("./global-insight-worker.mjs", moduleUrl);
+  const sibling = new URL("./worker-entry.js", moduleUrl);
+  return entryExists(sibling) ? sibling : new URL("./global-insight-worker.js", moduleUrl);
+}
+function createAnnualSummaryWorkerRunner(options2) {
+  return ({ signature, range, signal, onProgress }) => new Promise((resolve2, reject) => {
+    if (signal.aborted) {
+      reject(new Error("annual summary worker aborted"));
+      return;
+    }
+    const worker = createWorker3(
+      {
+        paths: snapshotPathProvider(options2.pathProvider),
+        runtimeIdentity: options2.runtimeIdentity,
+        nativeBinding: options2.nativeBinding,
+        signature,
+        range
+      },
+      options2.workerEntryUrl
+    );
+    let settled = false;
+    const abort = () => {
+      if (settled) return;
+      settled = true;
+      void worker.terminate();
+      reject(new Error("annual summary worker aborted"));
+    };
+    signal.addEventListener("abort", abort, { once: true });
+    worker.on("message", (message) => {
+      if (message.type === "progress" && message.progress) {
+        onProgress(message.progress);
+        return;
+      }
+      if (message.type === "success" && message.snapshot) {
+        settled = true;
+        signal.removeEventListener("abort", abort);
+        resolve2(message.snapshot);
+        void worker.terminate();
+        return;
+      }
+      if (message.type === "error") {
+        settled = true;
+        signal.removeEventListener("abort", abort);
+        reject(new Error(message.error ?? "annual summary worker failed"));
+        void worker.terminate();
+      }
+    });
+    worker.on("error", (error) => {
+      if (settled) return;
+      settled = true;
+      signal.removeEventListener("abort", abort);
+      reject(error);
+    });
+    worker.on("exit", (code) => {
+      if (settled || code === 0) return;
+      settled = true;
+      signal.removeEventListener("abort", abort);
+      reject(new Error(`annual summary worker exited with code ${code}`));
+    });
+  });
+}
+function createWorker3(workerData, entryUrlInput) {
+  const entryUrl = entryUrlInput ? typeof entryUrlInput === "string" ? new URL(entryUrlInput) : entryUrlInput : resolveDefaultAnnualSummaryWorkerEntryUrl();
+  if (!entryUrl.href.endsWith(".ts")) return new Worker3(entryUrl, { workerData });
+  const bootstrap = `
+    import { register } from 'tsx/esm/api';
+    register();
+    await import(${JSON.stringify(entryUrl.href)});
+  `;
+  const workerOptions = { eval: true, type: "module", workerData, execArgv: [] };
+  return new Worker3(bootstrap, workerOptions);
+}
+
+// ../../packages/node-runtime/src/services/global-insight/service.ts
+function createGlobalInsightService(deps) {
+  return new DefaultGlobalInsightService(deps);
+}
+var DefaultGlobalInsightService = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.snapshotDir = deps.userDataDir ? getGlobalInsightDir(deps.userDataDir) : getGlobalInsightDir(requirePathProvider3(deps).getUserDataDir());
+    cleanupAnnualSummarySnapshotTempFiles(this.snapshotDir);
+    this.runner = deps.runner ?? createAnnualSummaryWorkerRunner({
+      pathProvider: requirePathProvider3(deps),
+      runtimeIdentity: deps.runtimeIdentity,
+      nativeBinding: deps.nativeBinding,
+      workerEntryUrl: deps.workerEntryUrl
+    });
+  }
+  deps;
+  snapshots = /* @__PURE__ */ new Map();
+  snapshotDir;
+  runner;
+  inFlight = null;
+  task = createIdleTaskState3();
+  getAnnualSummary(options2 = {}) {
+    const range = this.normalizeRange(options2);
+    const signature = buildAnnualSummarySignature(this.deps.adapter, range);
+    const status = this.getCacheStatus(signature, range);
+    if (this.shouldStartTask(options2, status)) this.ensureTaskStarted(signature, range);
+    return this.toResponse(signature, range, options2.acceptStale === true);
+  }
+  startRecompute(options2 = {}) {
+    const range = this.normalizeRange(options2);
+    const signature = buildAnnualSummarySignature(this.deps.adapter, range);
+    this.ensureTaskStarted(signature, range);
+    return this.toResponse(signature, range, true);
+  }
+  invalidateCache() {
+    this.snapshots.clear();
+  }
+  normalizeRange(input = {}) {
+    return normalizeAnnualSummaryRange(input, new Date(this.now()));
+  }
+  replaceSnapshotForTests(snapshot) {
+    writeAnnualSummarySnapshot(this.snapshotDir, snapshot);
+    this.snapshots.set(toAnnualSummaryRangeKey(snapshot.range), snapshot);
+  }
+  async close() {
+    const inFlight = this.inFlight;
+    if (!inFlight) return;
+    this.inFlight = null;
+    inFlight.abortController.abort();
+    this.task = {
+      ...this.task,
+      status: "failed",
+      finishedAt: this.now(),
+      lastError: "annual summary task aborted"
+    };
+  }
+  shouldStartTask(options2, status) {
+    if (options2.forceRecompute) return true;
+    if (status === "fresh") return false;
+    return this.task.status !== "failed";
+  }
+  ensureTaskStarted(signature, range) {
+    if (this.inFlight) return;
+    const id = `annual_summary_${this.now()}_${Math.random().toString(36).slice(2)}`;
+    this.task = {
+      id,
+      status: "running",
+      startedAt: this.now(),
+      finishedAt: null,
+      processedSessions: 0,
+      totalSessions: this.deps.adapter.listSessionIds().length
+    };
+    const abortController = new AbortController();
+    const promise = this.runner({
+      signature,
+      range,
+      signal: abortController.signal,
+      onProgress: (progress) => {
+        if (this.task.id !== id || this.task.status !== "running") return;
+        this.task = { ...this.task, ...progress };
+      }
+    });
+    this.inFlight = { id, signature, promise, abortController };
+    promise.then((snapshot) => this.handleTaskSuccess(id, signature, snapshot)).catch((error) => this.handleTaskFailure(id, error));
+  }
+  handleTaskSuccess(id, inputSignature, snapshot) {
+    if (this.inFlight?.id !== id) return;
+    const latestSignature = buildAnnualSummarySignature(this.deps.adapter, snapshot.range);
+    const finishedAt = this.now();
+    if (inputSignature !== latestSignature || snapshot.signature !== latestSignature) {
+      this.inFlight = null;
+      this.task = { ...this.task, status: "superseded", finishedAt, currentSessionId: void 0 };
+      appLogger.info("global-insight", "annual summary worker result discarded because signature changed");
+      return;
+    }
+    try {
+      writeAnnualSummarySnapshot(this.snapshotDir, snapshot);
+      this.inFlight = null;
+      this.snapshots.set(toAnnualSummaryRangeKey(snapshot.range), snapshot);
+      this.task = {
+        ...this.task,
+        status: "succeeded",
+        finishedAt,
+        processedSessions: snapshot.workerStats.processedSessions,
+        totalSessions: snapshot.workerStats.totalSessions,
+        currentSessionId: void 0
+      };
+      appLogger.info("global-insight", "annual summary snapshot persisted", {
+        analyzedSessions: snapshot.coverage.analyzedSessions,
+        durationMs: snapshot.workerStats.durationMs
+      });
+    } catch (error) {
+      this.handleTaskFailure(id, error);
+    }
+  }
+  handleTaskFailure(id, error) {
+    if (this.inFlight?.id !== id) return;
+    this.inFlight = null;
+    this.task = {
+      ...this.task,
+      status: "failed",
+      finishedAt: this.now(),
+      currentSessionId: void 0,
+      lastError: error instanceof Error ? error.message : String(error)
+    };
+    appLogger.error("global-insight", "annual summary worker failed", error);
+  }
+  toResponse(signature, range, acceptStale) {
+    const snapshot = this.getSnapshot(range);
+    const status = this.getCacheStatus(signature, range);
+    const includeSnapshot = status === "fresh" || status === "stale" && acceptStale;
+    return {
+      range,
+      availableDataYears: includeSnapshot ? snapshot?.availableDataYears ?? [] : [],
+      latestDataYear: includeSnapshot ? snapshot?.latestDataYear ?? null : null,
+      metrics: includeSnapshot ? snapshot?.metrics ?? null : null,
+      monthlyActivity: includeSnapshot ? snapshot?.monthlyActivity ?? [] : [],
+      dailyActivity: includeSnapshot ? snapshot?.dailyActivity ?? [] : [],
+      messageTypes: includeSnapshot ? snapshot?.messageTypes ?? [] : [],
+      textLength: includeSnapshot ? snapshot?.textLength ?? null : null,
+      coverage: includeSnapshot ? snapshot?.coverage ?? emptyCoverage() : emptyCoverage(),
+      cache: {
+        status,
+        computedAt: snapshot?.computedAt ?? null,
+        signature: snapshot?.signature,
+        staleReason: status === "stale" ? "signature_changed" : void 0
+      },
+      task: this.task
+    };
+  }
+  getCacheStatus(signature, range) {
+    const snapshot = this.getSnapshot(range);
+    if (!snapshot) return "missing";
+    return snapshot.signature === signature ? "fresh" : "stale";
+  }
+  getSnapshot(range) {
+    const key = toAnnualSummaryRangeKey(range);
+    if (this.snapshots.has(key) && !fs31.existsSync(getAnnualSummarySnapshotPath(this.snapshotDir, range))) {
+      this.snapshots.delete(key);
+    }
+    if (!this.snapshots.has(key)) {
+      this.snapshots.set(key, readAnnualSummarySnapshot(this.snapshotDir, range, { now: this.deps.now }));
+    }
+    return this.snapshots.get(key) ?? null;
+  }
+  now() {
+    return this.deps.now?.() ?? Date.now();
+  }
+};
+function requirePathProvider3(deps) {
+  if (!deps.pathProvider)
+    throw new Error("GlobalInsightService requires pathProvider unless userDataDir and runner are provided");
+  return deps.pathProvider;
+}
+function createIdleTaskState3() {
+  return {
+    id: null,
+    status: "idle",
+    startedAt: null,
+    finishedAt: null,
+    processedSessions: 0,
+    totalSessions: 0
+  };
+}
+function emptyCoverage() {
+  return {
+    totalSessions: 0,
+    analyzedSessions: 0,
+    missingOwnerSessions: 0,
+    unresolvedOwnerSessions: 0,
+    failedSessions: 0
+  };
+}
+
+// ../../packages/node-runtime/src/services/global-insight/index.ts
+var global_insight_exports = {};
+__export(global_insight_exports, {
+  ANNUAL_SUMMARY_ALGORITHM_VERSION: () => ANNUAL_SUMMARY_ALGORITHM_VERSION,
+  createGlobalInsightService: () => createGlobalInsightService,
+  deleteAnnualSummarySnapshots: () => deleteAnnualSummarySnapshots,
+  getGlobalInsightDir: () => getGlobalInsightDir,
+  getGlobalInsightFactsCacheDir: () => getGlobalInsightFactsCacheDir
+});
+
 // ../../packages/node-runtime/src/semantic-index/config.ts
-import fs30 from "fs";
-import path27 from "path";
+import fs32 from "fs";
+import path28 from "path";
 var DEFAULT_SEMANTIC_INDEX_MODEL_DOWNLOAD_SOURCE = "huggingface";
 var SEMANTIC_INDEX_CONFIG_VERSION = 1;
 var SEARCH_MAX_RESULTS_DEFAULT = 10;
@@ -17141,9 +17974,9 @@ var SemanticIndexConfigStore = class {
     return this.set({ ...this.get(), enabled });
   }
   get() {
-    if (!fs30.existsSync(this.filePath)) return defaultSemanticIndexConfig();
+    if (!fs32.existsSync(this.filePath)) return defaultSemanticIndexConfig();
     try {
-      const raw = JSON.parse(fs30.readFileSync(this.filePath, "utf-8"));
+      const raw = JSON.parse(fs32.readFileSync(this.filePath, "utf-8"));
       return normalizeConfig(raw);
     } catch {
       return defaultSemanticIndexConfig();
@@ -17151,9 +17984,9 @@ var SemanticIndexConfigStore = class {
   }
   set(config) {
     const normalized = normalizeConfig(config);
-    const dir = path27.dirname(this.filePath);
-    if (!fs30.existsSync(dir)) fs30.mkdirSync(dir, { recursive: true });
-    fs30.writeFileSync(this.filePath, JSON.stringify(normalized, null, 2), "utf-8");
+    const dir = path28.dirname(this.filePath);
+    if (!fs32.existsSync(dir)) fs32.mkdirSync(dir, { recursive: true });
+    fs32.writeFileSync(this.filePath, JSON.stringify(normalized, null, 2), "utf-8");
     return normalized;
   }
   resolveModelId() {
@@ -17162,7 +17995,7 @@ var SemanticIndexConfigStore = class {
 };
 
 // ../../packages/node-runtime/src/semantic-index/service.ts
-import path28 from "path";
+import path29 from "path";
 
 // ../../packages/node-runtime/src/semantic-index/chunker-config.ts
 import { createHash as createHash2 } from "crypto";
@@ -18143,7 +18976,7 @@ function formatDateTime(ts) {
   const d = new Date(ts);
   return `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())} ${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
 }
-function formatTime2(ts) {
+function formatTime(ts) {
   const d = new Date(ts);
   return `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
 }
@@ -18151,7 +18984,7 @@ function formatTimeRange2(startTs, endTs) {
   const start = new Date(startTs);
   const end = new Date(endTs);
   const sameDay = start.getFullYear() === end.getFullYear() && start.getMonth() === end.getMonth() && start.getDate() === end.getDate();
-  return `${formatDateTime(startTs)} - ${sameDay ? formatTime2(endTs) : formatDateTime(endTs)}`;
+  return `${formatDateTime(startTs)} - ${sameDay ? formatTime(endTs) : formatDateTime(endTs)}`;
 }
 function resolveSenderNameTokenCap(nameTokenCounts, totalLimit) {
   const total = nameTokenCounts.reduce((sum, count) => sum + count, 0);
@@ -18693,16 +19526,16 @@ function resolveSearchToolEvidenceTokens(maxResultTokens) {
   return maxResultTokens && maxResultTokens > 0 ? Math.min(SEARCH_TOOL_EVIDENCE_TOKENS, maxResultTokens) : SEARCH_TOOL_EVIDENCE_TOKENS;
 }
 function sessionIdFromDbPath(dbPath) {
-  return path28.basename(dbPath, ".db");
+  return path29.basename(dbPath, ".db");
 }
 var SEMANTIC_INDEX_DB_FILE = "embedding_index.db";
 var SEMANTIC_INDEX_CONFIG_FILE = "semantic-index-config.json";
 function createSemanticIndexService(params) {
   const { pathProvider } = params;
   return new SemanticIndexService({
-    vectorDbPath: path28.join(pathProvider.getVectorDir(), SEMANTIC_INDEX_DB_FILE),
-    configPath: path28.join(pathProvider.getAiDataDir(), SEMANTIC_INDEX_CONFIG_FILE),
-    modelsCacheDir: path28.join(pathProvider.getAiDataDir(), "models", "semantic-index"),
+    vectorDbPath: path29.join(pathProvider.getVectorDir(), SEMANTIC_INDEX_DB_FILE),
+    configPath: path29.join(pathProvider.getAiDataDir(), SEMANTIC_INDEX_CONFIG_FILE),
+    modelsCacheDir: path29.join(pathProvider.getAiDataDir(), "models", "semantic-index"),
     modelDownloadProxyUrl: params.modelDownloadProxyUrl,
     sessionAdapter: params.sessionAdapter,
     nativeBinding: params.nativeBinding,
@@ -19252,8 +20085,8 @@ ${text}`;
 };
 
 // ../../packages/node-runtime/src/services/merge-cache.ts
-import * as fs31 from "fs";
-import * as path29 from "path";
+import * as fs33 from "fs";
+import * as path30 from "path";
 import * as crypto from "crypto";
 var MergeSessionCache = class {
   cache = /* @__PURE__ */ new Map();
@@ -19262,15 +20095,15 @@ var MergeSessionCache = class {
   constructor(pathProvider, options2) {
     this.tempDir = pathProvider.getTempDir();
     this.nativeBinding = options2?.nativeBinding;
-    if (!fs31.existsSync(this.tempDir)) {
-      fs31.mkdirSync(this.tempDir, { recursive: true });
+    if (!fs33.existsSync(this.tempDir)) {
+      fs33.mkdirSync(this.tempDir, { recursive: true });
     }
   }
   generateTempDbPath(filename) {
     const ts = Date.now();
     const rand = Math.random().toString(36).slice(2, 8);
     const safeName = filename.replace(/[/\\?%*:|"<>]/g, "_").slice(0, 40);
-    return path29.join(this.tempDir, `merge_${safeName}_${ts}_${rand}.db`);
+    return path30.join(this.tempDir, `merge_${safeName}_${ts}_${rand}.db`);
   }
   /** Store a parsed file's temp DB and return a handle for subsequent requests. */
   store(filename, tempDbPath) {
@@ -19281,7 +20114,7 @@ var MergeSessionCache = class {
   /** Open a TempDbReader for a given handle. Caller must close the reader. */
   openReader(handle) {
     const entry = this.cache.get(handle);
-    if (!entry || !fs31.existsSync(entry.tempDbPath)) return null;
+    if (!entry || !fs33.existsSync(entry.tempDbPath)) return null;
     const adapter = openBetterSqliteDatabase(entry.tempDbPath, {
       readonly: true,
       nativeBinding: this.nativeBinding
@@ -19326,21 +20159,44 @@ var MergeSessionCache = class {
 };
 
 // ../../packages/node-runtime/src/services/push-importer.ts
-import * as fs32 from "fs";
-var importInProgress = /* @__PURE__ */ new Set();
+import * as fs34 from "fs";
 var SYSTEM_SENDER_ID = "SYSTEM";
 var SYSTEM_MEMBER_NAME = "\u7CFB\u7EDF\u6D88\u606F";
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function validateOptionalString(value, field) {
+  return value !== void 0 && typeof value !== "string" ? `${field} must be a string` : null;
+}
 function validatePayload(payload, isNew) {
+  if (!isRecord3(payload)) return "payload must be an object";
   const messages = payload.messages;
   if (!Array.isArray(messages) || messages.length === 0) return "messages is required and must be a non-empty array";
+  if (payload.chatlab !== void 0) {
+    if (!isRecord3(payload.chatlab)) return "chatlab must be an object";
+    if (typeof payload.chatlab.version !== "string" || payload.chatlab.version.length === 0)
+      return "chatlab.version must be a string";
+    if (typeof payload.chatlab.exportedAt !== "number" || !Number.isFinite(payload.chatlab.exportedAt))
+      return "chatlab.exportedAt must be a number";
+    const generatorError = validateOptionalString(payload.chatlab.generator, "chatlab.generator");
+    if (generatorError) return generatorError;
+  }
   if (isNew) {
     if (!payload.chatlab) return "chatlab is required for new sessions";
     if (!payload.meta) return "meta is required for new sessions";
-    const m = payload.meta;
-    if (!m.name) return "meta.name is required";
-    if (!m.platform) return "meta.platform is required";
-    if (!m.type) return "meta.type is required";
   }
+  if (payload.meta !== void 0) {
+    if (!isRecord3(payload.meta)) return "meta must be an object";
+    const metaFields = ["name", "platform", "type", "groupId", "groupAvatar", "ownerId"];
+    for (const field of metaFields) {
+      const error = validateOptionalString(payload.meta[field], `meta.${field}`);
+      if (error) return error;
+    }
+    if (isNew && !payload.meta.name) return "meta.name is required";
+    if (isNew && !payload.meta.platform) return "meta.platform is required";
+    if (isNew && !payload.meta.type) return "meta.type is required";
+  }
+  if (payload.options !== void 0 && !isRecord3(payload.options)) return "options must be an object";
   const { metaUpdateMode, memberUpdateMode } = payload.options ?? {};
   if (metaUpdateMode !== void 0 && metaUpdateMode !== "patch" && metaUpdateMode !== "none") {
     return `options.metaUpdateMode must be 'patch' or 'none'`;
@@ -19351,16 +20207,35 @@ function validatePayload(payload, isNew) {
   if (payload.members !== void 0 && !Array.isArray(payload.members)) return "members must be an array";
   if (payload.members) {
     for (let i = 0; i < payload.members.length; i++) {
-      if (typeof payload.members[i].platformId !== "string" || payload.members[i].platformId.length === 0)
+      const member = payload.members[i];
+      if (!isRecord3(member)) return `members[${i}] must be an object`;
+      if (typeof member.platformId !== "string" || member.platformId.length === 0)
         return `members[${i}].platformId must be a string`;
+      for (const field of ["accountName", "groupNickname", "avatar"]) {
+        const error = validateOptionalString(member[field], `members[${i}].${field}`);
+        if (error) return error;
+      }
+      if (member.roles !== void 0) {
+        if (!Array.isArray(member.roles)) return `members[${i}].roles must be an array`;
+        for (let j = 0; j < member.roles.length; j++) {
+          const role = member.roles[j];
+          if (!isRecord3(role) || typeof role.id !== "string" || role.id.length === 0)
+            return `members[${i}].roles[${j}].id must be a string`;
+        }
+      }
     }
   }
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
+    if (!isRecord3(msg)) return `messages[${i}] must be an object`;
     if (typeof msg.sender !== "string" || msg.sender.length === 0) return `messages[${i}].sender must be a string`;
-    if (typeof msg.timestamp !== "number" || msg.timestamp <= 0)
+    if (typeof msg.timestamp !== "number" || !Number.isFinite(msg.timestamp) || msg.timestamp <= 0)
       return `messages[${i}].timestamp must be a positive number`;
-    if (typeof msg.type !== "number") return `messages[${i}].type must be a number`;
+    if (typeof msg.type !== "number" || !Number.isFinite(msg.type)) return `messages[${i}].type must be a number`;
+    for (const field of ["accountName", "groupNickname"]) {
+      const error = validateOptionalString(msg[field], `messages[${i}].${field}`);
+      if (error) return error;
+    }
     if (msg.content !== void 0 && msg.content !== null && typeof msg.content !== "string")
       return `messages[${i}].content must be a string or null`;
     if (msg.platformMessageId !== void 0 && typeof msg.platformMessageId !== "string")
@@ -19381,47 +20256,79 @@ function normalizeSenderAccountName(sender, accountName) {
 function normalizeSenderGroupNickname(sender, groupNickname) {
   return sender === SYSTEM_SENDER_ID ? SYSTEM_MEMBER_NAME : groupNickname;
 }
-function writeMessages(db, messages, existingPmids, existingKeys) {
+function isCountedMember(platformId) {
+  return platformId !== SYSTEM_SENDER_ID;
+}
+function registerPushMessageAndCheckDuplicate(message, dedupState) {
+  return registerMessageAndCheckDuplicate(
+    {
+      platformMessageId: message.platformMessageId,
+      timestamp: message.timestamp,
+      senderPlatformId: message.sender,
+      type: message.type,
+      content: message.content ?? null,
+      replyToMessageId: message.replyToMessageId
+    },
+    dedupState
+  );
+}
+function createExistingMessageDedupState(db) {
+  const existingPmids = /* @__PURE__ */ new Set();
+  const existingKeys = /* @__PURE__ */ new Set();
+  const existingFallbackOnlyKeys = /* @__PURE__ */ new Set();
+  const existingMessages = db.prepare(
+    `SELECT msg.ts, m.platform_id, msg.type, msg.content, msg.reply_to_message_id, msg.platform_message_id
+       FROM message msg
+       JOIN member m ON msg.sender_id = m.id`
+  ).all();
+  for (const message of existingMessages) {
+    if (message.platform_message_id) existingPmids.add(message.platform_message_id);
+    const key = generateFallbackMessageKey({
+      timestamp: message.ts,
+      senderPlatformId: message.platform_id,
+      type: message.type,
+      content: message.content,
+      replyToMessageId: message.reply_to_message_id ?? void 0
+    });
+    existingKeys.add(key);
+    if (!message.platform_message_id) existingFallbackOnlyKeys.add(key);
+  }
+  return createMessageDedupState(existingPmids, existingKeys, existingFallbackOnlyKeys);
+}
+function writeMessages(db, messages, dedupState) {
   const insertMsg = db.prepare(
     `INSERT INTO message (sender_id, sender_account_name, sender_group_nickname, ts, type, content, reply_to_message_id, platform_message_id)
      VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
   );
   const getMemberId = db.prepare("SELECT id FROM member WHERE platform_id = ?");
-  const insertMinimalMember = db.prepare("INSERT OR IGNORE INTO member (platform_id, account_name) VALUES (?, ?)");
+  const insertMinimalMember = db.prepare(
+    "INSERT OR IGNORE INTO member (platform_id, account_name, group_nickname) VALUES (?, ?, ?)"
+  );
   const memberIdCache = /* @__PURE__ */ new Map();
   let writtenCount = 0;
   let duplicateCount = 0;
+  let membersAdded = 0;
   let minWrittenTs = Infinity;
   const ftsEntries = [];
   const sorted = [...messages].sort((a, b) => a.timestamp - b.timestamp);
   db.transaction(() => {
     for (const msg of sorted) {
-      const key = generateMessageKey(msg.timestamp, msg.sender, msg.content ?? null);
-      if (msg.platformMessageId) {
-        if (existingPmids.has(msg.platformMessageId)) {
-          duplicateCount++;
-          continue;
-        }
-        if (existingKeys.has(key)) {
-          duplicateCount++;
-          continue;
-        }
-        existingPmids.add(msg.platformMessageId);
-        existingKeys.add(key);
-      } else {
-        if (existingKeys.has(key)) {
-          duplicateCount++;
-          continue;
-        }
-        existingKeys.add(key);
+      if (registerPushMessageAndCheckDuplicate(msg, dedupState)) {
+        duplicateCount++;
+        continue;
       }
       let memberId = memberIdCache.get(msg.sender);
       if (!memberId) {
-        insertMinimalMember.run(msg.sender, normalizeSenderAccountName(msg.sender, msg.accountName) || null);
+        const insertResult = insertMinimalMember.run(
+          msg.sender,
+          normalizeSenderAccountName(msg.sender, msg.accountName) || null,
+          normalizeSenderGroupNickname(msg.sender, msg.groupNickname) || null
+        );
         const row = getMemberId.get(msg.sender);
         if (row) {
           memberId = row.id;
           memberIdCache.set(msg.sender, memberId);
+          if (isCountedMember(msg.sender)) membersAdded += insertResult.changes;
         }
       }
       if (!memberId) continue;
@@ -19440,7 +20347,7 @@ function writeMessages(db, messages, existingPmids, existingKeys) {
       writtenCount++;
     }
   });
-  return { writtenCount, duplicateCount, minWrittenTs, ftsEntries };
+  return { writtenCount, duplicateCount, membersAdded, minWrittenTs, ftsEntries };
 }
 function fullImport(db, meta, members, messages) {
   db.exec(CHAT_DB_SCHEMA);
@@ -19457,29 +20364,13 @@ function fullImport(db, meta, members, messages) {
     }
   }
   const allMembers = extraMembers.length > 0 ? [...members, ...extraMembers] : members;
-  const pmids = /* @__PURE__ */ new Set();
-  const hashKeys = /* @__PURE__ */ new Set();
+  const dedupState = createMessageDedupState();
   let duplicateCount = 0;
   const dedupedMessages = [];
   for (const msg of messages) {
-    const key = generateMessageKey(msg.timestamp, msg.sender, msg.content ?? null);
-    if (msg.platformMessageId) {
-      if (pmids.has(msg.platformMessageId)) {
-        duplicateCount++;
-        continue;
-      }
-      if (hashKeys.has(key)) {
-        duplicateCount++;
-        continue;
-      }
-      pmids.add(msg.platformMessageId);
-      hashKeys.add(key);
-    } else {
-      if (hashKeys.has(key)) {
-        duplicateCount++;
-        continue;
-      }
-      hashKeys.add(key);
+    if (registerPushMessageAndCheckDuplicate(msg, dedupState)) {
+      duplicateCount++;
+      continue;
     }
     dedupedMessages.push(msg);
   }
@@ -19507,15 +20398,12 @@ function fullImport(db, meta, members, messages) {
     generateSessionIndex(db);
   } catch {
   }
-  return { writtenCount: stats.messageCount, duplicateCount, membersAdded: members.length };
+  return { writtenCount: stats.messageCount, duplicateCount };
 }
-function incrementalImport2(db, payload) {
+function writeIncrementalImport(db, payload) {
   const metaUpdateMode = payload.options?.metaUpdateMode ?? "patch";
   const memberUpdateMode = payload.options?.memberUpdateMode ?? "upsert";
-  const existingPmids = /* @__PURE__ */ new Set();
-  const existingKeys = /* @__PURE__ */ new Set();
-  db.prepare("SELECT platform_message_id FROM message WHERE platform_message_id IS NOT NULL").all().forEach((r) => existingPmids.add(r.platform_message_id));
-  db.prepare(`SELECT msg.ts, m.platform_id, msg.content FROM message msg JOIN member m ON msg.sender_id = m.id`).all().forEach((r) => existingKeys.add(generateMessageKey(r.ts, r.platform_id, r.content)));
+  const dedupState = createExistingMessageDedupState(db);
   let metaUpdated = false;
   let membersAdded = 0;
   let membersUpdated = 0;
@@ -19552,22 +20440,23 @@ function incrementalImport2(db, payload) {
           m.roles ? JSON.stringify(m.roles) : "[]"
         );
         if (!existed) {
-          membersAdded++;
+          if (isCountedMember(m.platformId)) membersAdded++;
           const row = getMemberId.get(m.platformId);
           if (row) existingMemberIds.add(m.platformId);
-        } else {
+        } else if (isCountedMember(m.platformId)) {
           membersUpdated++;
         }
       }
     });
   }
   const preWriteMaxTs = db.prepare("SELECT MAX(ts) as max_ts FROM message").get()?.max_ts ?? 0;
-  const { writtenCount, duplicateCount, minWrittenTs, ftsEntries } = writeMessages(
-    db,
-    payload.messages,
-    existingPmids,
-    existingKeys
-  );
+  const {
+    writtenCount,
+    duplicateCount,
+    membersAdded: autoCreatedMembersAdded,
+    minWrittenTs,
+    ftsEntries
+  } = writeMessages(db, payload.messages, dedupState);
   if (ftsEntries.length > 0) {
     try {
       insertFtsEntries(db, ftsEntries);
@@ -19587,40 +20476,69 @@ function incrementalImport2(db, payload) {
   if (!metaUpdated) {
     db.prepare("UPDATE meta SET imported_at = ?").run(Math.floor(Date.now() / 1e3));
   }
-  return { writtenCount, duplicateCount, metaUpdated, membersAdded, membersUpdated };
+  return {
+    writtenCount,
+    duplicateCount,
+    metaUpdated,
+    membersAdded: membersAdded + autoCreatedMembersAdded,
+    membersUpdated
+  };
+}
+function incrementalImport2(db, payload) {
+  return db.transaction(() => writeIncrementalImport(db, payload));
 }
-var SAFE_SESSION_ID_RE = /^[a-zA-Z0-9_@-][a-zA-Z0-9_@.-]*$/;
 async function pushImport(dbManager, sessionId, payload) {
-  if (!SAFE_SESSION_ID_RE.test(sessionId) || sessionId.includes("..")) {
-    return { ok: false, reason: "invalid_payload", message: "sessionId contains invalid characters" };
+  try {
+    return await withDataDirImportLock(dbManager.getUserDataDir(), async () => {
+      const outcome = await executePushImportUnlocked(
+        {
+          getDbPath: (id) => dbManager.getDbPath(id),
+          openDatabase: (id, options2) => dbManager.openRawSessionDatabase(id, options2),
+          deleteDatabase: (id) => {
+            dbManager.deleteSessionDatabaseFiles(id);
+          }
+        },
+        sessionId,
+        payload
+      );
+      if (!outcome.ok) return outcome;
+      try {
+        dbManager.raiseCurrentChatDbCompatibilityGate();
+      } catch (error) {
+        if (outcome.result.created) dbManager.deleteSessionDatabaseFiles(sessionId);
+        throw error;
+      }
+      return outcome;
+    });
+  } catch (error) {
+    if (error instanceof ImportInProgressError) {
+      return {
+        ok: false,
+        reason: "import_in_progress",
+        message: "Another import is already in progress"
+      };
+    }
+    throw error;
   }
-  if (importInProgress.has(sessionId)) {
-    return {
-      ok: false,
-      reason: "import_in_progress",
-      message: "Another import is already in progress for this session"
-    };
+}
+async function executePushImportUnlocked(deps, sessionId, payload) {
+  if (!isValidImportSessionId(sessionId)) {
+    return { ok: false, reason: "invalid_payload", message: "sessionId contains invalid characters" };
   }
-  const dbPath = dbManager.getDbPath(sessionId);
-  const isNew = !fs32.existsSync(dbPath);
+  const dbPath = deps.getDbPath(sessionId);
+  const isNew = !fs34.existsSync(dbPath);
   const validationError = validatePayload(payload, isNew);
   if (validationError) {
     return { ok: false, reason: "invalid_payload", message: validationError };
   }
-  importInProgress.add(sessionId);
   try {
     if (isNew) {
-      const db2 = dbManager.openRawSessionDatabase(sessionId, { create: true });
+      const db2 = deps.openDatabase(sessionId, { create: true });
       try {
-        const { writtenCount, duplicateCount, membersAdded } = fullImport(
-          db2,
-          payload.meta,
-          payload.members ?? [],
-          payload.messages
-        );
+        const { writtenCount, duplicateCount } = fullImport(db2, payload.meta, payload.members ?? [], payload.messages);
         const session = queryStats(db2);
-        dbManager.raiseCurrentChatDbCompatibilityGate();
-        return {
+        const membersAdded = session.memberCount;
+        const outcome = {
           ok: true,
           result: {
             sessionId,
@@ -19630,16 +20548,17 @@ async function pushImport(dbManager, sessionId, payload) {
             updates: { metaUpdated: true, membersAdded, membersUpdated: 0 }
           }
         };
+        appLogger.info("push-import", "Push import completed", outcome.result);
+        return outcome;
       } finally {
         db2.close();
       }
     }
-    const db = dbManager.openRawSessionDatabase(sessionId, { readonly: false });
+    const db = deps.openDatabase(sessionId, { readonly: false });
     try {
       const { writtenCount, duplicateCount, metaUpdated, membersAdded, membersUpdated } = incrementalImport2(db, payload);
       const session = queryStats(db);
-      dbManager.raiseCurrentChatDbCompatibilityGate();
-      return {
+      const outcome = {
         ok: true,
         result: {
           sessionId,
@@ -19649,6 +20568,8 @@ async function pushImport(dbManager, sessionId, payload) {
           updates: { metaUpdated, membersAdded, membersUpdated }
         }
       };
+      appLogger.info("push-import", "Push import completed", outcome.result);
+      return outcome;
     } finally {
       db.close();
     }
@@ -19656,16 +20577,54 @@ async function pushImport(dbManager, sessionId, payload) {
     if (err instanceof DataDirCompatibilityError) throw err;
     if (isNew) {
       try {
-        dbManager.deleteSessionDatabaseFiles(sessionId);
+        deps.deleteDatabase(sessionId);
       } catch {
       }
     }
+    appLogger.error("push-import", "Push import failed", err);
     return { ok: false, reason: "import_failed", message: err instanceof Error ? err.message : String(err) };
-  } finally {
-    importInProgress.delete(sessionId);
   }
 }
 
+// ../../packages/node-runtime/src/services/import-idempotency.ts
+import { createHash as createHash4 } from "crypto";
+var DEFAULT_IMPORT_IDEMPOTENCY_TTL_MS = 60 * 60 * 1e3;
+function hashImportBody(body) {
+  return createHash4("sha256").update(JSON.stringify(body ?? "")).digest("hex");
+}
+var ImportIdempotencyCache = class {
+  constructor(ttlMs = DEFAULT_IMPORT_IDEMPOTENCY_TTL_MS) {
+    this.ttlMs = ttlMs;
+  }
+  ttlMs;
+  entries = /* @__PURE__ */ new Map();
+  start(key, bodyHash, now = Date.now()) {
+    this.prune(now);
+    const entry = this.entries.get(key);
+    if (!entry) {
+      this.entries.set(key, { bodyHash, status: "pending", timestamp: now });
+      return { status: "started" };
+    }
+    if (entry.bodyHash !== bodyHash) return { status: "conflict" };
+    if (entry.status === "pending") return { status: "pending" };
+    return { status: "success", response: entry.response };
+  }
+  success(key, response) {
+    const entry = this.entries.get(key);
+    if (!entry) return;
+    entry.status = "success";
+    entry.response = response;
+  }
+  fail(key) {
+    this.entries.delete(key);
+  }
+  prune(now) {
+    for (const [key, entry] of this.entries) {
+      if (now - entry.timestamp > this.ttlMs) this.entries.delete(key);
+    }
+  }
+};
+
 export {
   writeParseResultToDb,
   detectFormat,
@@ -19704,6 +20663,14 @@ export {
   streamParseFileInfo,
   analyzeIncrementalImport,
   incrementalImport,
+  isValidImportSessionId,
+  resolveAutoImportTarget,
+  autoImportFile,
+  analyzeAutoImportFile,
+  IMPORT_LOCK_FILENAME,
+  IMPORT_IN_PROGRESS_ERROR_KEY,
+  ImportInProgressError,
+  withDataDirImportLock,
   ArchiveImportError,
   validateArchiveEntryName,
   ZipArchiveReader,
@@ -19809,6 +20776,8 @@ export {
   contacts_exports,
   createPeopleRelationshipsService,
   relationships_exports,
+  createGlobalInsightService,
+  global_insight_exports,
   CHUNK_VECTOR_INDEX_TABLE,
   CHUNK_VECTOR_INDEX_INDEXES,
   EMBEDDING_INDEX_SCHEMA,
@@ -19866,6 +20835,10 @@ export {
   createSemanticIndexService,
   SemanticIndexService,
   MergeSessionCache,
-  pushImport
+  pushImport,
+  executePushImportUnlocked,
+  DEFAULT_IMPORT_IDEMPOTENCY_TTL_MS,
+  hashImportBody,
+  ImportIdempotencyCache
 };
-//# sourceMappingURL=chunk-36JGKW6K.mjs.map
+//# sourceMappingURL=chunk-KCPGEILH.mjs.map