openzca 0.1.49 → 0.1.51

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { spawn as spawn2 } from "child_process";
 import fsSync from "fs";
 import fs6 from "fs/promises";
@@ -16,7 +16,7 @@ import {
   Gender,
   Reactions,
   ReviewPendingMemberRequestStatus,
-  ThreadType as ThreadType2
+  ThreadType as ThreadType3
 } from "zca-js";
 
 // src/lib/store.ts
@@ -214,13 +214,273 @@ async function clearCache(profileName) {
 // src/lib/db.ts
 import crypto from "crypto";
 import fs2 from "fs/promises";
+import { createRequire } from "module";
 import path2 from "path";
-import { open } from "sqlite";
-import sqlite3 from "sqlite3";
+import { Worker } from "worker_threads";
+var require2 = createRequire(import.meta.url);
+function buildDbError(error) {
+  const built = new Error(error.message);
+  built.name = error.name || "Error";
+  built.stack = error.stack ?? built.stack;
+  built.code = error.code;
+  return built;
+}
+function resolveWorkerSpec() {
+  const currentUrl = new URL(import.meta.url);
+  if (currentUrl.pathname.endsWith("/src/lib/db.ts")) {
+    return {
+      url: new URL("./db-worker.ts", currentUrl),
+      execArgv: ["--import", require2.resolve("tsx")]
+    };
+  }
+  return {
+    url: new URL("./db-worker.js", currentUrl)
+  };
+}
+var Database = class _Database {
+  #worker;
+  #closed = false;
+  #closing = false;
+  #released = false;
+  #nextId = 1;
+  #activeRequests = 0;
+  #idleTimer;
+  #closePromise;
+  #pending = /* @__PURE__ */ new Map();
+  #ready;
+  #exited;
+  #releaseConnection;
+  constructor(worker, releaseConnection) {
+    this.#worker = worker;
+    this.#releaseConnection = releaseConnection;
+    let resolveReady;
+    let rejectReady;
+    this.#ready = new Promise((resolve, reject) => {
+      resolveReady = resolve;
+      rejectReady = reject;
+    });
+    let resolveExited;
+    this.#exited = new Promise((resolve) => {
+      resolveExited = resolve;
+    });
+    const rejectPending = (error) => {
+      for (const { reject } of this.#pending.values()) {
+        reject(error);
+      }
+      this.#pending.clear();
+    };
+    worker.on("message", (message) => {
+      if (message.type === "ready") {
+        resolveReady();
+        return;
+      }
+      if (message.type === "fatal") {
+        const error = buildDbError(message.error);
+        rejectReady(error);
+        rejectPending(error);
+        return;
+      }
+      const pending = this.#pending.get(message.id);
+      if (!pending) {
+        return;
+      }
+      this.#pending.delete(message.id);
+      if (message.type === "error") {
+        pending.reject(buildDbError(message.error));
+        return;
+      }
+      pending.resolve(message.result);
+    });
+    worker.once("error", (error) => {
+      rejectReady(error);
+      rejectPending(error instanceof Error ? error : new Error(String(error)));
+    });
+    worker.once("exit", (code) => {
+      this.#closed = true;
+      this.#release();
+      resolveExited();
+      const error = new Error(
+        code === 0 ? "DB worker exited" : `DB worker exited with code ${code}`
+      );
+      if (code !== 0) {
+        rejectReady(error);
+      }
+      if (this.#pending.size > 0) {
+        rejectPending(error);
+      }
+    });
+  }
+  static async open(filename, onClosed) {
+    const { url, execArgv } = resolveWorkerSpec();
+    const worker = new Worker(url, {
+      execArgv,
+      workerData: { filename }
+    });
+    worker.unref();
+    const db = new _Database(worker, onClosed);
+    await db.#ready;
+    return db;
+  }
+  get isClosing() {
+    return this.#closing || this.#closed;
+  }
+  #release() {
+    if (this.#released) {
+      return;
+    }
+    this.#released = true;
+    this.#releaseConnection();
+  }
+  #clearIdleClose() {
+    if (this.#idleTimer) {
+      clearTimeout(this.#idleTimer);
+      this.#idleTimer = void 0;
+    }
+  }
+  #scheduleIdleClose() {
+    this.#clearIdleClose();
+    this.#idleTimer = setTimeout(() => {
+      if (this.#activeRequests === 0 && !this.#closed) {
+        void this.close().catch(() => {
+        });
+      }
+    }, 100);
+    this.#idleTimer.unref();
+  }
+  async #request(type, payload) {
+    if (this.#closed) {
+      throw new Error("DB worker is closed");
+    }
+    if (this.#closing && type !== "close") {
+      throw new Error("DB worker is closing");
+    }
+    this.#clearIdleClose();
+    this.#activeRequests += 1;
+    await this.#ready;
+    const id = this.#nextId;
+    this.#nextId += 1;
+    const request = payload === void 0 ? { id, type } : { id, type, payload };
+    const result = new Promise((resolve, reject) => {
+      this.#pending.set(id, { resolve, reject });
+    });
+    try {
+      this.#worker.postMessage(request);
+    } catch (error) {
+      this.#pending.delete(id);
+      throw error;
+    }
+    try {
+      return await result;
+    } finally {
+      this.#activeRequests -= 1;
+      if (this.#activeRequests === 0 && !this.#closed && !this.#closing) {
+        this.#scheduleIdleClose();
+      }
+    }
+  }
+  async exec(sql) {
+    await this.#request("exec", { sql });
+  }
+  async run(sql, params = []) {
+    return await this.#request("run", { sql, params });
+  }
+  async get(sql, params = []) {
+    const result = await this.#request("get", { sql, params });
+    return result ?? void 0;
+  }
+  async all(sql, params = []) {
+    return await this.#request("all", { sql, params });
+  }
+  async batch(commands, transactional = false) {
+    await this.#request("batch", { commands, transactional });
+  }
+  async close() {
+    if (this.#closed) {
+      return;
+    }
+    if (this.#closePromise) {
+      return this.#closePromise;
+    }
+    this.#closePromise = (async () => {
+      this.#closing = true;
+      this.#release();
+      this.#clearIdleClose();
+      await this.#request("close");
+      this.#closed = true;
+      await this.#exited;
+    })();
+    return this.#closePromise;
+  }
+};
 var DB_CONFIG_FILE = "db.json";
 var DB_FILENAME = "messages.sqlite";
 var connections = /* @__PURE__ */ new Map();
 var writeQueues = /* @__PURE__ */ new Map();
+var UPSERT_THREAD_SQL = `
+  INSERT INTO threads (
+    profile, scope_thread_id, raw_thread_id, thread_type, peer_id, title,
+    is_pinned, is_hidden, is_archived, raw_json, created_at, updated_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  ON CONFLICT(profile, scope_thread_id) DO UPDATE SET
+    raw_thread_id = excluded.raw_thread_id,
+    thread_type = excluded.thread_type,
+    peer_id = COALESCE(excluded.peer_id, threads.peer_id),
+    title = COALESCE(excluded.title, threads.title),
+    is_pinned = excluded.is_pinned,
+    is_hidden = excluded.is_hidden,
+    is_archived = excluded.is_archived,
+    raw_json = COALESCE(excluded.raw_json, threads.raw_json),
+    updated_at = excluded.updated_at
+`;
+var INSERT_THREAD_MEMBER_SQL = `
+  INSERT INTO thread_members (
+    profile, scope_thread_id, user_id, display_name, zalo_name, avatar,
+    account_status, member_type, raw_json, snapshot_at_ms, created_at, updated_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+`;
+var UPSERT_MESSAGE_SQL = `
+  INSERT INTO messages (
+    profile, message_uid, scope_thread_id, raw_thread_id, thread_type,
+    msg_id, cli_msg_id, action_id, sender_id, sender_name, to_id,
+    timestamp_ms, msg_type, content_text, content_json,
+    quote_msg_id, quote_cli_msg_id, quote_owner_id, quote_text,
+    source, raw_message_json, raw_payload_json, created_at, updated_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  ON CONFLICT(profile, message_uid) DO UPDATE SET
+    scope_thread_id = excluded.scope_thread_id,
+    raw_thread_id = excluded.raw_thread_id,
+    thread_type = excluded.thread_type,
+    msg_id = COALESCE(excluded.msg_id, messages.msg_id),
+    cli_msg_id = COALESCE(excluded.cli_msg_id, messages.cli_msg_id),
+    action_id = COALESCE(excluded.action_id, messages.action_id),
+    sender_id = COALESCE(excluded.sender_id, messages.sender_id),
+    sender_name = COALESCE(excluded.sender_name, messages.sender_name),
+    to_id = COALESCE(excluded.to_id, messages.to_id),
+    timestamp_ms = excluded.timestamp_ms,
+    msg_type = COALESCE(excluded.msg_type, messages.msg_type),
+    content_text = COALESCE(excluded.content_text, messages.content_text),
+    content_json = COALESCE(excluded.content_json, messages.content_json),
+    quote_msg_id = COALESCE(excluded.quote_msg_id, messages.quote_msg_id),
+    quote_cli_msg_id = COALESCE(excluded.quote_cli_msg_id, messages.quote_cli_msg_id),
+    quote_owner_id = COALESCE(excluded.quote_owner_id, messages.quote_owner_id),
+    quote_text = COALESCE(excluded.quote_text, messages.quote_text),
+    source = excluded.source,
+    raw_message_json = COALESCE(excluded.raw_message_json, messages.raw_message_json),
+    raw_payload_json = COALESCE(excluded.raw_payload_json, messages.raw_payload_json),
+    updated_at = excluded.updated_at
+`;
+var INSERT_MESSAGE_MEDIA_SQL = `
+  INSERT INTO message_media (
+    profile, message_uid, item_index, media_kind, media_url,
+    media_path, media_type, raw_json, created_at, updated_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+`;
+var INSERT_MESSAGE_MENTION_SQL = `
+  INSERT INTO message_mentions (
+    profile, message_uid, item_index, target_user_id, pos, len,
+    mention_type, raw_json, created_at, updated_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+`;
 function nowIso2() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -326,165 +586,21 @@ async function resolveDbPath(profile) {
   }
   return path2.isAbsolute(configured) ? configured : path2.resolve(getProfileDir(profile), configured);
 }
-async function migrateDb(db) {
-  await db.exec(`
-    PRAGMA journal_mode = WAL;
-    PRAGMA foreign_keys = ON;
-
-    CREATE TABLE IF NOT EXISTS threads (
-      profile TEXT NOT NULL,
-      scope_thread_id TEXT NOT NULL,
-      raw_thread_id TEXT NOT NULL,
-      thread_type TEXT NOT NULL,
-      peer_id TEXT,
-      title TEXT,
-      is_pinned INTEGER NOT NULL DEFAULT 0,
-      is_hidden INTEGER NOT NULL DEFAULT 0,
-      is_archived INTEGER NOT NULL DEFAULT 0,
-      raw_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, scope_thread_id)
-    );
-
-    CREATE TABLE IF NOT EXISTS thread_members (
-      profile TEXT NOT NULL,
-      scope_thread_id TEXT NOT NULL,
-      user_id TEXT NOT NULL,
-      display_name TEXT,
-      zalo_name TEXT,
-      avatar TEXT,
-      account_status INTEGER,
-      member_type INTEGER,
-      raw_json TEXT,
-      snapshot_at_ms INTEGER NOT NULL,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, scope_thread_id, user_id)
-    );
-
-    CREATE TABLE IF NOT EXISTS friends (
-      profile TEXT NOT NULL,
-      user_id TEXT NOT NULL,
-      display_name TEXT,
-      zalo_name TEXT,
-      avatar TEXT,
-      account_status INTEGER,
-      raw_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, user_id)
-    );
-
-    CREATE TABLE IF NOT EXISTS self_profiles (
-      profile TEXT NOT NULL,
-      user_id TEXT NOT NULL,
-      display_name TEXT,
-      info_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile)
-    );
-
-    CREATE TABLE IF NOT EXISTS messages (
-      profile TEXT NOT NULL,
-      message_uid TEXT NOT NULL,
-      scope_thread_id TEXT NOT NULL,
-      raw_thread_id TEXT NOT NULL,
-      thread_type TEXT NOT NULL,
-      msg_id TEXT,
-      cli_msg_id TEXT,
-      action_id TEXT,
-      sender_id TEXT,
-      sender_name TEXT,
-      to_id TEXT,
-      timestamp_ms INTEGER NOT NULL,
-      msg_type TEXT,
-      content_text TEXT,
-      content_json TEXT,
-      quote_msg_id TEXT,
-      quote_cli_msg_id TEXT,
-      quote_owner_id TEXT,
-      quote_text TEXT,
-      source TEXT NOT NULL,
-      raw_message_json TEXT,
-      raw_payload_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, message_uid)
-    );
-
-    CREATE TABLE IF NOT EXISTS message_media (
-      profile TEXT NOT NULL,
-      message_uid TEXT NOT NULL,
-      item_index INTEGER NOT NULL,
-      media_kind TEXT,
-      media_url TEXT,
-      media_path TEXT,
-      media_type TEXT,
-      raw_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, message_uid, item_index)
-    );
-
-    CREATE TABLE IF NOT EXISTS message_mentions (
-      profile TEXT NOT NULL,
-      message_uid TEXT NOT NULL,
-      item_index INTEGER NOT NULL,
-      target_user_id TEXT NOT NULL,
-      pos INTEGER,
-      len INTEGER,
-      mention_type INTEGER,
-      raw_json TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, message_uid, item_index)
-    );
-
-    CREATE TABLE IF NOT EXISTS sync_state (
-      profile TEXT NOT NULL,
-      scope TEXT NOT NULL,
-      scope_thread_id TEXT NOT NULL,
-      thread_type TEXT NOT NULL,
-      status TEXT NOT NULL,
-      completeness TEXT,
-      cursor TEXT,
-      last_sync_at TEXT,
-      error TEXT,
-      created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (profile, scope)
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_messages_thread_time
-      ON messages (profile, scope_thread_id, timestamp_ms DESC);
-    CREATE INDEX IF NOT EXISTS idx_messages_msg_id
-      ON messages (profile, msg_id);
-    CREATE INDEX IF NOT EXISTS idx_messages_cli_msg_id
-      ON messages (profile, cli_msg_id);
-    CREATE INDEX IF NOT EXISTS idx_threads_type
-      ON threads (profile, thread_type, updated_at DESC);
-    CREATE INDEX IF NOT EXISTS idx_members_thread
-      ON thread_members (profile, scope_thread_id);
-    CREATE INDEX IF NOT EXISTS idx_friends_name
-      ON friends (profile, display_name, zalo_name, user_id);
-  `);
-}
 async function openDb(profile) {
   const filename = await resolveDbPath(profile);
   await fs2.mkdir(path2.dirname(filename), { recursive: true });
-  const db = await open({
-    filename,
-    driver: sqlite3.Database
+  return Database.open(filename, () => {
+    connections.delete(profile);
   });
-  await migrateDb(db);
-  return db;
 }
 async function getDb(profile) {
   const existing = connections.get(profile);
   if (existing) {
-    return existing;
+    const db = await existing;
+    if (!db.isClosing) {
+      return db;
+    }
+    connections.delete(profile);
   }
   const created = openDb(profile).catch((error) => {
     connections.delete(profile);
@@ -596,77 +712,48 @@ function enqueueDbWrite(profile, task) {
 async function persistThread(record) {
   const db = await getDb(record.profile);
   const now = nowIso2();
-  await db.run(
-    `
-      INSERT INTO threads (
-        profile, scope_thread_id, raw_thread_id, thread_type, peer_id, title,
-        is_pinned, is_hidden, is_archived, raw_json, created_at, updated_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-      ON CONFLICT(profile, scope_thread_id) DO UPDATE SET
-        raw_thread_id = excluded.raw_thread_id,
-        thread_type = excluded.thread_type,
-        peer_id = COALESCE(excluded.peer_id, threads.peer_id),
-        title = COALESCE(excluded.title, threads.title),
-        is_pinned = excluded.is_pinned,
-        is_hidden = excluded.is_hidden,
-        is_archived = excluded.is_archived,
-        raw_json = COALESCE(excluded.raw_json, threads.raw_json),
-        updated_at = excluded.updated_at
-    `,
-    [
-      record.profile,
-      record.scopeThreadId,
-      record.rawThreadId,
-      record.threadType,
-      record.peerId ?? null,
-      record.title ?? null,
-      record.isPinned ? 1 : 0,
-      record.isHidden ? 1 : 0,
-      record.isArchived ? 1 : 0,
-      record.rawJson ?? null,
-      now,
-      now
-    ]
-  );
+  await db.run(UPSERT_THREAD_SQL, [
+    record.profile,
+    record.scopeThreadId,
+    record.rawThreadId,
+    record.threadType,
+    record.peerId ?? null,
+    record.title ?? null,
+    record.isPinned ? 1 : 0,
+    record.isHidden ? 1 : 0,
+    record.isArchived ? 1 : 0,
+    record.rawJson ?? null,
+    now,
+    now
+  ]);
 }
 async function replaceThreadMembers(profile, scopeThreadId, members) {
   const db = await getDb(profile);
   const now = nowIso2();
-  await db.exec("BEGIN");
-  try {
-    await db.run(
-      `DELETE FROM thread_members WHERE profile = ? AND scope_thread_id = ?`,
-      [profile, scopeThreadId]
-    );
-    for (const member of members) {
-      await db.run(
-        `
-          INSERT INTO thread_members (
-            profile, scope_thread_id, user_id, display_name, zalo_name, avatar,
-            account_status, member_type, raw_json, snapshot_at_ms, created_at, updated_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `,
-        [
-          member.profile,
-          member.scopeThreadId,
-          member.userId,
-          member.displayName ?? null,
-          member.zaloName ?? null,
-          member.avatar ?? null,
-          member.accountStatus ?? null,
-          member.memberType ?? null,
-          member.rawJson ?? null,
-          member.snapshotAtMs,
-          now,
-          now
-        ]
-      );
-    }
-    await db.exec("COMMIT");
-  } catch (error) {
-    await db.exec("ROLLBACK");
-    throw error;
-  }
+  const commands = [
+    {
+      sql: `DELETE FROM thread_members WHERE profile = ? AND scope_thread_id = ?`,
+      params: [profile, scopeThreadId]
+    },
+    ...members.map((member) => ({
+      sql: INSERT_THREAD_MEMBER_SQL,
+      params: [
+        member.profile,
+        member.scopeThreadId,
+        member.userId,
+        member.displayName ?? null,
+        member.zaloName ?? null,
+        member.avatar ?? null,
+        member.accountStatus ?? null,
+        member.memberType ?? null,
+        member.rawJson ?? null,
+        member.snapshotAtMs,
+        now,
+        now
+      ]
+    }))
+  ];
+  await db.batch(commands, true);
 }
 async function persistFriend(record) {
   const db = await getDb(record.profile);
@@ -726,49 +813,27 @@ async function persistMessage(record) {
   const db = await getDb(record.profile);
   const now = nowIso2();
   const messageUid = toMessageUid(record);
-  await db.exec("BEGIN");
-  try {
-    await persistThread({
-      profile: record.profile,
-      scopeThreadId: record.scopeThreadId,
-      rawThreadId: record.rawThreadId,
-      threadType: record.threadType,
-      peerId: record.peerId,
-      title: record.title
-    });
-    await db.run(
-      `
-        INSERT INTO messages (
-          profile, message_uid, scope_thread_id, raw_thread_id, thread_type,
-          msg_id, cli_msg_id, action_id, sender_id, sender_name, to_id,
-          timestamp_ms, msg_type, content_text, content_json,
-          quote_msg_id, quote_cli_msg_id, quote_owner_id, quote_text,
-          source, raw_message_json, raw_payload_json, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(profile, message_uid) DO UPDATE SET
-          scope_thread_id = excluded.scope_thread_id,
-          raw_thread_id = excluded.raw_thread_id,
-          thread_type = excluded.thread_type,
-          msg_id = COALESCE(excluded.msg_id, messages.msg_id),
-          cli_msg_id = COALESCE(excluded.cli_msg_id, messages.cli_msg_id),
-          action_id = COALESCE(excluded.action_id, messages.action_id),
-          sender_id = COALESCE(excluded.sender_id, messages.sender_id),
-          sender_name = COALESCE(excluded.sender_name, messages.sender_name),
-          to_id = COALESCE(excluded.to_id, messages.to_id),
-          timestamp_ms = excluded.timestamp_ms,
-          msg_type = COALESCE(excluded.msg_type, messages.msg_type),
-          content_text = COALESCE(excluded.content_text, messages.content_text),
-          content_json = COALESCE(excluded.content_json, messages.content_json),
-          quote_msg_id = COALESCE(excluded.quote_msg_id, messages.quote_msg_id),
-          quote_cli_msg_id = COALESCE(excluded.quote_cli_msg_id, messages.quote_cli_msg_id),
-          quote_owner_id = COALESCE(excluded.quote_owner_id, messages.quote_owner_id),
-          quote_text = COALESCE(excluded.quote_text, messages.quote_text),
-          source = excluded.source,
-          raw_message_json = COALESCE(excluded.raw_message_json, messages.raw_message_json),
-          raw_payload_json = COALESCE(excluded.raw_payload_json, messages.raw_payload_json),
-          updated_at = excluded.updated_at
-      `,
-      [
+  const commands = [
+    {
+      sql: UPSERT_THREAD_SQL,
+      params: [
+        record.profile,
+        record.scopeThreadId,
+        record.rawThreadId,
+        record.threadType,
+        record.peerId ?? null,
+        record.title ?? null,
+        0,
+        0,
+        0,
+        null,
+        now,
+        now
+      ]
+    },
+    {
+      sql: UPSERT_MESSAGE_SQL,
+      params: [
         record.profile,
         messageUid,
         record.scopeThreadId,
@@ -794,64 +859,47 @@ async function persistMessage(record) {
         now,
         now
       ]
-    );
-    await db.run(
-      `DELETE FROM message_media WHERE profile = ? AND message_uid = ?`,
-      [record.profile, messageUid]
-    );
-    await db.run(
-      `DELETE FROM message_mentions WHERE profile = ? AND message_uid = ?`,
-      [record.profile, messageUid]
-    );
-    for (const [index, media] of (record.media ?? []).entries()) {
-      await db.run(
-        `
-          INSERT INTO message_media (
-            profile, message_uid, item_index, media_kind, media_url,
-            media_path, media_type, raw_json, created_at, updated_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `,
-        [
-          record.profile,
-          messageUid,
-          index,
-          media.mediaKind ?? null,
-          media.mediaUrl ?? null,
-          media.mediaPath ?? null,
-          media.mediaType ?? null,
-          media.rawJson ?? null,
-          now,
-          now
-        ]
-      );
-    }
-    for (const [index, mention] of (record.mentions ?? []).entries()) {
-      await db.run(
-        `
-          INSERT INTO message_mentions (
-            profile, message_uid, item_index, target_user_id, pos, len,
-            mention_type, raw_json, created_at, updated_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `,
-        [
-          record.profile,
-          messageUid,
-          index,
-          mention.uid,
-          mention.pos ?? null,
-          mention.len ?? null,
-          mention.type ?? null,
-          mention.rawJson ?? null,
-          now,
-          now
-        ]
-      );
-    }
-    await db.exec("COMMIT");
-  } catch (error) {
-    await db.exec("ROLLBACK");
-    throw error;
-  }
+    },
+    {
+      sql: `DELETE FROM message_media WHERE profile = ? AND message_uid = ?`,
+      params: [record.profile, messageUid]
+    },
+    {
+      sql: `DELETE FROM message_mentions WHERE profile = ? AND message_uid = ?`,
+      params: [record.profile, messageUid]
+    },
+    ...(record.media ?? []).map((media, index) => ({
+      sql: INSERT_MESSAGE_MEDIA_SQL,
+      params: [
+        record.profile,
+        messageUid,
+        index,
+        media.mediaKind ?? null,
+        media.mediaUrl ?? null,
+        media.mediaPath ?? null,
+        media.mediaType ?? null,
+        media.rawJson ?? null,
+        now,
+        now
+      ]
+    })),
+    ...(record.mentions ?? []).map((mention, index) => ({
+      sql: INSERT_MESSAGE_MENTION_SQL,
+      params: [
+        record.profile,
+        messageUid,
+        index,
+        mention.uid,
+        mention.pos ?? null,
+        mention.len ?? null,
+        mention.type ?? null,
+        mention.rawJson ?? null,
+        now,
+        now
+      ]
+    }))
+  ];
+  await db.batch(commands, true);
 }
 async function setSyncState(params) {
   const db = await getDb(params.profile);
@@ -2494,9 +2542,234 @@ async function sendNativeVideo(params) {
   }
 }
 
+// src/lib/reply.ts
+import { ThreadType as ThreadType2 } from "zca-js";
+function prepareReplyMessage(value, params) {
+  const sourceRecord = asReplyMessageRecord(value);
+  const metadata = asOptionalReplyMessageRecord(sourceRecord.metadata);
+  const rawMessageRecord = asOptionalReplyMessageRecord(sourceRecord.rawMessage);
+  const rawPayloadRecord = asOptionalReplyMessageRecord(sourceRecord.rawPayload);
+  const canonicalRecord = rawMessageRecord ?? sourceRecord;
+  const content = parseReplyMessageContent(
+    canonicalRecord.content ?? sourceRecord.content,
+    isLikelyOpenzcaListenPayload(sourceRecord) && !rawMessageRecord
+  );
+  const msgType = requireStringLike(
+    [canonicalRecord.msgType, sourceRecord.msgType, metadata?.msgType],
+    "reply message msgType"
+  );
+  const uidFrom = requireStringLike(
+    [
+      canonicalRecord.uidFrom,
+      sourceRecord.uidFrom,
+      sourceRecord.senderId,
+      sourceRecord.fromId,
+      metadata?.senderId,
+      metadata?.fromId
+    ],
+    "reply message uidFrom"
+  );
+  const msgId = requireStringLike(
+    [canonicalRecord.msgId, sourceRecord.msgId, rawPayloadRecord?.msgId],
+    "reply message msgId"
+  );
+  const cliMsgId = requireStringLike(
+    [canonicalRecord.cliMsgId, sourceRecord.cliMsgId, rawPayloadRecord?.cliMsgId],
+    "reply message cliMsgId"
+  );
+  const ts = requireTsString(
+    [canonicalRecord.ts, sourceRecord.ts, maybeTimestampSecondsToMsString(sourceRecord.timestamp)],
+    "reply message ts"
+  );
+  const ttl = parseReplyMessageTtl(canonicalRecord.ttl ?? sourceRecord.ttl);
+  const propertyExt = parseReplyMessagePropertyExt(canonicalRecord.propertyExt);
+  return {
+    quote: {
+      content,
+      msgType,
+      propertyExt,
+      uidFrom,
+      msgId,
+      cliMsgId,
+      ts,
+      ttl
+    },
+    inferredThreadId: inferReplyMessageThreadId({
+      sourceRecord,
+      canonicalRecord,
+      metadata,
+      threadType: params?.threadType,
+      selfId: params?.selfId
+    })
+  };
+}
+function prepareStoredReplyMessage(value, params) {
+  const record = asReplyMessageRecord(value);
+  const storedThreadType = record.threadType === "group" ? ThreadType2.Group : record.threadType === "user" ? ThreadType2.User : void 0;
+  if (storedThreadType !== void 0 && storedThreadType !== params.threadType) {
+    throw new Error("Reply source thread type does not match --group.");
+  }
+  const storedThreadId = firstString([record.threadId, record.rawThreadId]) ?? void 0;
+  if (storedThreadId && storedThreadId !== params.threadId) {
+    throw new Error("Reply source belongs to a different thread.");
+  }
+  const rawMessage = asOptionalReplyMessageRecord(record.rawMessage);
+  const rawPayload = asOptionalReplyMessageRecord(record.rawPayload);
+  const replyRecord = rawMessage ?? rawPayload;
+  if (!replyRecord) {
+    throw new Error(
+      "Reply source found in DB but has no reusable raw message payload. Re-sync or capture it via listener first."
+    );
+  }
+  return prepareReplyMessage(replyRecord, {
+    threadType: params.threadType,
+    selfId: params.selfId
+  }).quote;
+}
+function asReplyMessageRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("Reply message must be a JSON object matching the raw message.data shape.");
+  }
+  return value;
+}
+function asOptionalReplyMessageRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  return value;
+}
+function parseReplyMessageContent(value, stripOpenzcaDecorations) {
+  if (typeof value === "string") {
+    return stripOpenzcaDecorations ? stripEnrichedReplyDecorations(value) : value;
+  }
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  throw new Error("Reply message content must be a string or object.");
+}
+function stripEnrichedReplyDecorations(value) {
+  const lines = value.split("\n");
+  while (lines.length > 0) {
+    const last = lines[lines.length - 1].trim();
+    if (last.startsWith("[reply context: ") || last.startsWith("[reply media attached:") || last.startsWith("[reply media attached ")) {
+      lines.pop();
+      continue;
+    }
+    break;
+  }
+  return lines.join("\n");
+}
+function parseReplyMessagePropertyExt(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("Reply message propertyExt must be an object when provided.");
+  }
+  return value;
+}
+function parseReplyMessageTtl(value) {
+  if (value === void 0 || value === null || value === "") {
+    return 0;
+  }
+  const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value) : Number.NaN;
+  if (!Number.isFinite(parsed)) {
+    throw new Error("Reply message ttl must be a finite number.");
+  }
+  return Math.trunc(parsed);
+}
+function requireStringLike(values, label) {
+  const value = firstString(values);
+  if (!value) {
+    throw new Error(`Missing ${label}.`);
+  }
+  return value;
+}
+function requireTsString(values, label) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim()) {
+      return value.trim();
+    }
+    if (typeof value === "number" && Number.isFinite(value)) {
+      return String(Math.trunc(value));
+    }
+  }
+  throw new Error(`Missing ${label}.`);
+}
+function firstString(values) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim()) {
+      return value.trim();
+    }
+    if (typeof value === "number" && Number.isFinite(value)) {
+      return String(Math.trunc(value));
+    }
+  }
+  return void 0;
+}
+function maybeTimestampSecondsToMsString(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return void 0;
+  }
+  return String(Math.trunc(value * 1e3));
+}
+function isLikelyOpenzcaListenPayload(record) {
+  return typeof record.threadId === "string" && (typeof record.senderId === "string" || typeof record.chatType === "string" || typeof record.metadata === "object");
+}
+function inferReplyMessageThreadId(params) {
+  const directThreadId = firstString([
+    params.sourceRecord.threadId,
+    params.sourceRecord.targetId,
+    params.sourceRecord.conversationId,
+    params.metadata?.threadId,
+    params.metadata?.targetId
+  ]);
+  if (directThreadId) {
+    return directThreadId;
+  }
+  if (params.threadType === void 0) {
+    return void 0;
+  }
+  const idTo = firstString([
+    params.canonicalRecord.idTo,
+    params.sourceRecord.idTo,
+    params.sourceRecord.toId,
+    params.metadata?.toId
+  ]);
+  if (params.threadType === ThreadType2.Group) {
+    return idTo;
+  }
+  const uidFrom = firstString([
+    params.canonicalRecord.uidFrom,
+    params.sourceRecord.uidFrom,
+    params.sourceRecord.senderId,
+    params.sourceRecord.fromId,
+    params.metadata?.senderId,
+    params.metadata?.fromId
+  ]);
+  if (!uidFrom && !idTo) {
+    return void 0;
+  }
+  if (params.selfId) {
+    if (uidFrom && uidFrom !== params.selfId && uidFrom !== "0") {
+      return uidFrom;
+    }
+    if (idTo && idTo !== params.selfId && idTo !== "0") {
+      return idTo;
+    }
+  }
+  if (uidFrom && uidFrom !== "0") {
+    return uidFrom;
+  }
+  if (idTo && idTo !== "0") {
+    return idTo;
+  }
+  return void 0;
+}
+
 // src/cli.ts
-var require2 = createRequire(import.meta.url);
-var { version: PKG_VERSION } = require2("../package.json");
+var require3 = createRequire2(import.meta.url);
+var { version: PKG_VERSION } = require3("../package.json");
 var program = new Command();
 var EMOJI_REACTION_MAP = {
   "\u2764\uFE0F": Reactions.HEART,
@@ -2656,7 +2929,7 @@ function normalizeCommandAliases(argv) {
   return normalized;
 }
 function asThreadType(groupFlag) {
-  return groupFlag ? ThreadType2.Group : ThreadType2.User;
+  return groupFlag ? ThreadType3.Group : ThreadType3.User;
 }
 function parseBooleanFromEnv(name, fallback) {
   const raw = process.env[name]?.trim();
@@ -2866,7 +3139,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
         fail(parsed.requestId, "Invalid upload payload.");
         return;
       }
-      const threadType = parsed.threadType === "group" ? ThreadType2.Group : ThreadType2.User;
+      const threadType = parsed.threadType === "group" ? ThreadType3.Group : ThreadType3.User;
       const requestTimeoutMs = parsePositiveIntFromUnknown(parsed.uploadTimeoutMs) ?? uploadTimeoutMs;
       writeDebugLine(
         "listen.ipc.upload.start",
@@ -3023,7 +3296,7 @@ async function tryUploadViaListenerIpc(profile, threadId, threadType, attachment
     {
       profile,
       threadId,
-      threadType: threadType === ThreadType2.Group ? "group" : "user",
+      threadType: threadType === ThreadType3.Group ? "group" : "user",
       attachmentCount: attachments.length,
       socketPath,
       requestId,
@@ -3067,7 +3340,7 @@ async function tryUploadViaListenerIpc(profile, threadId, threadType, attachment
         requestId,
         profile,
         threadId,
-        threadType: threadType === ThreadType2.Group ? "group" : "user",
+        threadType: threadType === ThreadType3.Group ? "group" : "user",
         attachments
       };
       socket.write(`${JSON.stringify(payload)}
@@ -3129,21 +3402,21 @@ async function tryUploadViaListenerIpc(profile, threadId, threadType, attachment
 }
 async function resolveUploadThreadType(api, profile, threadId, groupFlag, command) {
   if (groupFlag) {
-    return { type: ThreadType2.Group, reason: "explicit_group_flag" };
+    return { type: ThreadType3.Group, reason: "explicit_group_flag" };
   }
   const autoDetectEnabled = parseBooleanFromEnv("OPENZCA_UPLOAD_AUTO_THREAD_TYPE", false);
   if (!autoDetectEnabled) {
-    return { type: ThreadType2.User, reason: "auto_detect_disabled" };
+    return { type: ThreadType3.User, reason: "auto_detect_disabled" };
   }
   try {
     const cache = await readCache(profile);
     const groupIds = collectIdsFromCacheEntries(cache.groups, ["groupId", "grid", "threadId", "id"]);
     if (groupIds.has(threadId)) {
-      return { type: ThreadType2.Group, reason: "cache_group_match" };
+      return { type: ThreadType3.Group, reason: "cache_group_match" };
     }
     const friendIds = collectIdsFromCacheEntries(cache.friends, ["userId", "uid", "id", "threadId"]);
     if (friendIds.has(threadId)) {
-      return { type: ThreadType2.User, reason: "cache_friend_match" };
+      return { type: ThreadType3.User, reason: "cache_friend_match" };
     }
   } catch (error) {
     writeDebugLine(
@@ -3158,7 +3431,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
   }
   const probeEnabled = parseBooleanFromEnv("OPENZCA_UPLOAD_GROUP_PROBE", true);
   if (!probeEnabled) {
-    return { type: ThreadType2.User, reason: "probe_disabled" };
+    return { type: ThreadType3.User, reason: "probe_disabled" };
   }
   const probeTimeoutMs = parsePositiveIntFromEnv("OPENZCA_UPLOAD_GROUP_PROBE_TIMEOUT_MS", 5e3);
   try {
@@ -3168,7 +3441,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
       `Timed out waiting ${probeTimeoutMs}ms while probing group thread type.`
     );
     if (groupInfo?.gridInfoMap?.[threadId]) {
-      return { type: ThreadType2.Group, reason: "probe_group_match" };
+      return { type: ThreadType3.Group, reason: "probe_group_match" };
     }
   } catch (error) {
     writeDebugLine(
@@ -3181,7 +3454,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
       command
     );
   }
-  return { type: ThreadType2.User, reason: "default_user" };
+  return { type: ThreadType3.User, reason: "default_user" };
 }
 function parseReaction(input) {
   const normalized = input.trim();
@@ -3279,6 +3552,62 @@ async function shouldWriteToDb(profile, override) {
   }
   return isDbEnabled(profile);
 }
+async function resolveSendReplyQuote(params) {
+  const replyId = params.replyId?.trim();
+  const replyMessage = params.replyMessage?.trim();
+  if (replyId && replyMessage) {
+    throw new Error("Use either --reply-id or --reply-message, not both.");
+  }
+  if (!replyId && !replyMessage) {
+    return void 0;
+  }
+  if (replyId) {
+    if (!await shouldWriteToDb(params.profile)) {
+      throw new Error("`--reply-id` requires the local DB. Enable DB/listen sync first.");
+    }
+    const row = await getMessageById({
+      profile: params.profile,
+      id: replyId
+    });
+    if (!row) {
+      throw new Error(`Reply source not found in DB: ${replyId}`);
+    }
+    if (row.threadType === "group" !== (params.threadType === ThreadType3.Group)) {
+      throw new Error("Reply source thread type does not match --group.");
+    }
+    if (row.threadId !== params.threadId) {
+      throw new Error("Reply source belongs to a different thread.");
+    }
+    if (!row.rawMessage || typeof row.rawMessage !== "object") {
+      if (!row.rawPayload || typeof row.rawPayload !== "object") {
+        throw new Error(
+          "Reply source found in DB but has no reusable raw message payload. Re-sync or capture it via listener first."
+        );
+      }
+    }
+    return prepareStoredReplyMessage(row, {
+      threadId: params.threadId,
+      threadType: params.threadType,
+      selfId: params.api.getOwnId()
+    });
+  }
+  let parsedReplyMessage;
+  try {
+    parsedReplyMessage = JSON.parse(replyMessage);
+  } catch (error) {
+    throw new Error(
+      `Invalid JSON for --reply-message: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  const preparedReply = prepareReplyMessage(parsedReplyMessage, {
+    threadType: params.threadType,
+    selfId: params.api.getOwnId()
+  });
+  if (preparedReply.inferredThreadId && preparedReply.inferredThreadId !== params.threadId) {
+    throw new Error("Reply message belongs to a different thread.");
+  }
+  return preparedReply.quote;
+}
 function scheduleDbWrite(profile, command, event, task) {
   enqueueDbWrite(profile, async () => {
     try {
@@ -4259,7 +4588,7 @@ function normalizeGroupHistoryMessages(messages, fallbackThreadId) {
     const threadIdRaw = String(raw.idTo ?? "").trim();
     normalized.push({
       threadId: threadIdRaw || fallbackThreadId,
-      type: ThreadType2.Group,
+      type: ThreadType3.Group,
       data: {
         actionId: typeof raw.actionId === "string" && raw.actionId.trim() ? raw.actionId : void 0,
         msgId: String(raw.msgId ?? ""),
@@ -4364,7 +4693,7 @@ async function crawlGroupHistoryViaListener(api, options) {
         requestedCursors.add(cursor);
       }
       pagesRequested += 1;
-      api.listener.requestOldMessages(ThreadType2.Group, cursor || null);
+      api.listener.requestOldMessages(ThreadType3.Group, cursor || null);
       return true;
     };
     const armIdleTimer = () => {
@@ -4419,7 +4748,7 @@ async function crawlGroupHistoryViaListener(api, options) {
       }
     };
     const onOldMessages = (messages, type) => {
-      if (type !== ThreadType2.Group) return;
+      if (type !== ThreadType3.Group) return;
       armIdleTimer();
       const typedMessages = messages;
       processing = processing.then(async () => {
@@ -4508,7 +4837,7 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
         requestedCursors.add(cursor);
       }
       pagesRequested += 1;
-      api.listener.requestOldMessages(ThreadType2.User, cursor || null);
+      api.listener.requestOldMessages(ThreadType3.User, cursor || null);
       return true;
     };
     const cleanup = () => {
@@ -4540,7 +4869,7 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
       }
     };
     const onOldMessages = (messages, type) => {
-      if (type !== ThreadType2.User) return;
+      if (type !== ThreadType3.User) return;
       const typedMessages = messages;
       for (const message of typedMessages) {
         if (message.threadId === threadId) {
@@ -4616,7 +4945,7 @@ async function fetchRecentUserMessagesAcrossThreads(api, maxMessages) {
         requestedCursors.add(cursor);
       }
       pagesRequested += 1;
-      api.listener.requestOldMessages(ThreadType2.User, cursor || null);
+      api.listener.requestOldMessages(ThreadType3.User, cursor || null);
       return true;
     };
     const cleanup = () => {
@@ -4648,7 +4977,7 @@ async function fetchRecentUserMessagesAcrossThreads(api, maxMessages) {
       }
     };
     const onOldMessages = (messages, type) => {
-      if (type !== ThreadType2.User) return;
+      if (type !== ThreadType3.User) return;
       const typedMessages = messages;
       for (const message of typedMessages) {
         const key = toKey(message);
@@ -4731,7 +5060,7 @@ function toDbRecordFromRecentMessage(params) {
   const quote = params.message.data?.quote;
   return normalizeInboundListenRecord({
     profile: params.profile,
-    threadType: params.message.type === ThreadType2.Group ? "group" : "user",
+    threadType: params.message.type === ThreadType3.Group ? "group" : "user",
     rawThreadId: params.message.threadId,
     senderId: params.message.data?.uidFrom,
     senderName: params.message.data?.dName,
@@ -6083,17 +6412,29 @@ dbSync.command("chat <chatId>").option("-n, --count <count>", "Recent messages t
   })
 );
 var msg = program.command("msg").description("Messaging commands");
-msg.command("send <threadId> <message>").option("-g, --group", "Send to group").option("--raw", "Send raw text without parsing formatting markers").description("Send text message with formatting (**bold** *italic* __bold__ ~~strike~~ {underline}text{/underline} {red}color{/red} {big}size{/big} lists indents). Group sends also resolve unique @Name/@userId mentions.").action(
+msg.command("send <threadId> <message>").option("-g, --group", "Send to group").option("--raw", "Send raw text without parsing formatting markers").option("--reply-id <id>", "Reply using a stored DB message id/msgId/cliMsgId").option("--reply-message <json>", "Reply using a raw message.data JSON object").description("Send text message with formatting (**bold** *italic* __bold__ ~~strike~~ {underline}text{/underline} {red}color{/red} {big}size{/big} lists indents). Group sends also resolve unique @Name/@userId mentions.").action(
   wrapAction(async (threadId, message, opts, command) => {
     const { api, profile } = await requireApi(command);
     const threadType = asThreadType(opts.group);
-    const payload = await buildTextSendPayload({
+    const textPayload = await buildTextSendPayload({
       message,
       raw: opts.raw,
       threadType,
       threadId,
-      listGroupMembers: threadType === ThreadType2.Group ? (groupId) => listGroupMentionMembers(api, groupId) : void 0
+      listGroupMembers: threadType === ThreadType3.Group ? (groupId) => listGroupMentionMembers(api, groupId) : void 0
+    });
+    const quote = await resolveSendReplyQuote({
+      profile,
+      api,
+      threadId,
+      threadType,
+      replyId: opts.replyId,
+      replyMessage: opts.replyMessage
     });
+    const payload = quote || typeof textPayload !== "string" ? {
+      ...typeof textPayload === "string" ? { msg: textPayload } : textPayload,
+      ...quote ? { quote } : {}
+    } : textPayload;
     const response = await api.sendMessage(payload, threadId, threadType);
     output(response, false);
     if (await shouldWriteToDb(profile)) {
@@ -6582,8 +6923,8 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
         {
           threadId,
           explicitGroupFlag: Boolean(opts.group),
-          isGroup: threadResolution.type === ThreadType2.Group,
-          threadType: threadResolution.type === ThreadType2.Group ? "group" : "user",
+          isGroup: threadResolution.type === ThreadType3.Group,
+          threadType: threadResolution.type === ThreadType3.Group ? "group" : "user",
           threadTypeReason: threadResolution.reason,
           localFiles,
           urlInputs
@@ -6611,7 +6952,7 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
             "msg.upload.ipc.done",
             {
               threadId,
-              threadType: threadResolution.type === ThreadType2.Group ? "group" : "user"
+              threadType: threadResolution.type === ThreadType3.Group ? "group" : "user"
             },
             command
           );
@@ -6622,7 +6963,7 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
           "msg.upload.ipc.fallback",
           {
             threadId,
-            threadType: threadResolution.type === ThreadType2.Group ? "group" : "user",
+            threadType: threadResolution.type === ThreadType3.Group ? "group" : "user",
             reason: ipcResult.reason
           },
           command
@@ -6661,7 +7002,7 @@ msg.command("recent <threadId>").option("-g, --group", "List recent messages for
       const { api, profile } = await requireApi(command);
       const parsedCount = Number(opts.count);
       const count = Number.isFinite(parsedCount) ? Math.min(Math.max(Math.trunc(parsedCount), 1), 200) : 20;
-      const threadType = opts.group ? ThreadType2.Group : ThreadType2.User;
+      const threadType = opts.group ? ThreadType3.Group : ThreadType3.User;
       const source = (opts.source ?? "live").trim().toLowerCase();
       if (!["live", "db", "auto"].includes(source)) {
         throw new Error("--source must be one of: live, db, auto");
@@ -6682,7 +7023,7 @@ msg.command("recent <threadId>").option("-g, --group", "List recent messages for
           msgId: message.data.msgId,
           cliMsgId: message.data.cliMsgId,
           threadId: message.threadId || threadId,
-          threadType: message.type === ThreadType2.Group ? "group" : "user",
+          threadType: message.type === ThreadType3.Group ? "group" : "user",
           senderId: message.data.uidFrom,
           senderName: message.data.dName ?? "",
           ts: message.data.ts,
@@ -6691,7 +7032,7 @@ msg.command("recent <threadId>").option("-g, --group", "List recent messages for
             msgId: message.data.msgId,
             cliMsgId: message.data.cliMsgId,
             threadId: message.threadId || threadId,
-            group: message.type === ThreadType2.Group
+            group: message.type === ThreadType3.Group
           },
           content: typeof message.data.content === "string" ? message.data.content : JSON.stringify(message.data.content)
         }));
@@ -6700,7 +7041,7 @@ msg.command("recent <threadId>").option("-g, --group", "List recent messages for
         output(
           {
             threadId,
-            threadType: threadType === ThreadType2.Group ? "group" : "user",
+            threadType: threadType === ThreadType3.Group ? "group" : "user",
             count: rows.length,
             messages: rows
           },
@@ -6720,7 +7061,7 @@ msg.command("pin <threadId>").option("-g, --group", "Pin group conversation").de
     output(
       {
         threadId,
-        threadType: type === ThreadType2.Group ? "group" : "user",
+        threadType: type === ThreadType3.Group ? "group" : "user",
         pinned: true,
         response
       },
@@ -6736,7 +7077,7 @@ msg.command("unpin <threadId>").option("-g, --group", "Unpin group conversation"
     output(
       {
         threadId,
-        threadType: type === ThreadType2.Group ? "group" : "user",
+        threadType: type === ThreadType3.Group ? "group" : "user",
         pinned: false,
         response
       },
@@ -7576,7 +7917,7 @@ ${replyMediaText}` : replyMediaText;
             processedText = processedText.trim() ? `${processedText}
 ${replyContextText}` : replyContextText;
           }
-          const chatType = message.type === ThreadType2.Group ? "group" : "user";
+          const chatType = message.type === ThreadType3.Group ? "group" : "user";
           const senderId = getStringCandidate(messageData, ["uidFrom"]) || message.data.uidFrom;
           const senderDisplayNameRaw = getStringCandidate(messageData, [
             "dName",
@@ -7585,7 +7926,7 @@ ${replyContextText}` : replyContextText;
             "displayName"
           ]);
           const senderDisplayName = senderDisplayNameRaw || void 0;
-          const senderNameForMetadata = message.type === ThreadType2.Group ? senderDisplayName : void 0;
+          const senderNameForMetadata = message.type === ThreadType3.Group ? senderDisplayName : void 0;
           const toId = getStringCandidate(messageData, ["idTo"]) || void 0;
           const threadName = typeof messageData.threadName === "string" ? messageData.threadName : typeof messageData.tName === "string" ? messageData.tName : void 0;
           const mentions = extractInboundMentions({
@@ -7623,7 +7964,7 @@ ${replyContextText}` : replyContextText;
             mentions: mentions.length > 0 ? mentions : void 0,
             mentionIds: mentionIds.length > 0 ? mentionIds : void 0,
             metadata: {
-              isGroup: message.type === ThreadType2.Group,
+              isGroup: message.type === ThreadType3.Group,
               chatType,
               threadId: message.threadId,
               targetId: message.threadId,