@ardennguyen/zalo-agent-cli 1.0.7 → 2.1.0

package/src/commands/msg.js

@@ -1,12 +1,296 @@
 /**
  * Message commands — send text, images, files, cards, bank cards, QR transfers,
- * stickers, reactions, delete, forward.
+ * stickers, reactions, delete, forward, pin.
  */
 
-import { resolve } from "path";
-import { getApi } from "../core/zalo-client.js";
-import { success, error, info, output } from "../utils/output.js";
-import { extractMessageText } from "../utils/extract-message-text.js";
+import { existsSync } from "node:fs";
+import { resolve, join } from "path";
+import { InvalidArgumentError } from "commander";
+import { getApi, getOwnId } from "../core/zalo-client.js";
+import { withCurrentSenderNames } from "../core/current-user-names.js";
+import { success, error, info, output, warning } from "../utils/output.js";
+import { parseIntOption } from "../utils/parse-options.js";
+import { getActive } from "../core/accounts.js";
+import { CONFIG_DIR } from "../core/credentials.js";
+import { initDb, getMessages, getMessageById, getDisplayName, getThreadType } from "../core/db.js";
+import { sendViaDaemon, getDaemonChannel, getSyncChannel, syncViaDaemon } from "../core/daemon-channel.js";
+import { fetchAndCacheHistory } from "../core/history-fetch.js";
+import { classifyLiveMessage } from "../core/sync-v2/message-types.js";
+import { downloadSyncedMedia } from "../core/sync-v2/media.js";
+import { describeZaloError } from "../core/sync-v2/board.js";
+import {
+    cachedCliMsgId,
+    cachedText,
+    resolveSenderUid,
+    cachedMessageById,
+    reactionCliMsgId,
+    recallCliMsgId,
+} from "../core/cached-message.js";
+import { buildForwardReference, sendForward, LOG_SRC_TYPE } from "../core/forward.js";
+import { fetchMemberNames } from "../core/group-members.js";
+import { pinMessage, unpinMessage, textPinParams } from "../core/pin.js";
+import { expandMentions, parseMentionSpecs, shiftStyles, ALL_MENTION_UID } from "../utils/mentions.js";
+import { applySelfThreadAlias } from "../utils/my-documents.js";
+import { buildQuote, resolveQuoteSender } from "../utils/quote.js";
+import { urgencyLevel } from "../utils/urgency.js";
+
+/**
+ * Open the active account's SQLite cache.
+ *
+ * Best-effort on purpose: every caller here has a useful fallback for "no
+ * account, no cache file, or a db that will not open", so this reports that
+ * as false rather than failing the command.
+ *
+ * @returns {boolean} true when db.js is initialized and safe to query
+ */
+function openAccountDb() {
+    try {
+        const acc = getActive();
+        if (!acc) return false;
+        initDb(join(CONFIG_DIR, "accounts", acc.ownId, "zalo.db"));
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+/**
+ * Display name for a `@[uid]` mention token, or null.
+ *
+ * Never throws. A name that cannot be looked up degrades to the uid, which
+ * still tags the right person — failing the whole send over a cache miss
+ * would be a far worse trade.
+ *
+ * @param {string} uid
+ * @param {boolean} cacheOpen - whether openAccountDb() succeeded
+ * @returns {string|null}
+ */
+function mentionName(uid, cacheOpen) {
+    if (!cacheOpen) return null;
+    try {
+        return getDisplayName(uid);
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * Ask Zalo for the names the local cache could not supply.
+ *
+ * The cache only knows someone who has already spoken — `senderName` comes
+ * off their messages — so a member who has never posted in the group would
+ * be tagged as a bare uid. `getGroupMembersInfo` takes the whole missing set
+ * in one call, and only runs when there is something missing, so the common
+ * case still costs no network at all.
+ *
+ * Nothing is written back. `msg send` writes nothing to zalo.db (Arden,
+ * 2026-09-30: "the msg send should not write anything, the data will come
+ * from live listener or sync"), so a member the cache cannot name costs this
+ * one lookup on every send until the listener or a sync learns their name.
+ *
+ * Never throws: no session, not a member of that group, or an API hiccup all
+ * leave the uid in place, which is still a valid mention. The lookup itself is
+ * shared with `zalo_get_group_members` (src/core/group-members.js).
+ *
+ * @param {string[]} uids - uids the cache had no name for
+ * @returns {Promise<Map<string, string>>} uid → display name, for those found
+ */
+async function fetchMentionNames(uids) {
+    if (uids.length === 0) return new Map();
+    try {
+        return (await fetchMemberNames(getApi(), uids)).names;
+    } catch {
+        return new Map(); // no session: fall back to the uid — see the doc comment
+    }
+}
+
+/**
+ * {@link cachedMessageById} for the active account, opening its cache first.
+ *
+ * The lookup is shared with the MCP tools (src/core/cached-message.js); only
+ * opening the db is the CLI's own. Null when there is no account or no cache.
+ *
+ * @param {string} threadId
+ * @param {string} msgId
+ * @returns {{cliMsgId: string, uidFrom: string|null}|null}
+ */
+function cachedInAccount(threadId, msgId) {
+    return openAccountDb() ? cachedMessageById(threadId, msgId) : null;
+}
+
+/**
+ * Whether a conversation is a group, for commands that can act on either.
+ *
+ * `-t` wins whenever something set it: the user, or the preAction hook that
+ * fills it in from the cache for a `threadId` argument. When it is still at
+ * its default -- e.g. `msg pin <msgId>`, where the conversation comes from the
+ * cached message rather than an argument -- the cache decides, and the
+ * default (0) applies only to a conversation the cache has never seen.
+ *
+ * @param {string} threadId
+ * @param {object} opts - the command's options
+ * @param {import("commander").Command} cmd
+ * @returns {boolean}
+ */
+function threadIsGroup(threadId, opts, cmd) {
+    if (cmd?.getOptionValueSource?.("type") === "default") {
+        try {
+            const kind = openAccountDb() ? getThreadType(threadId) : null;
+            if (kind) return kind === "group";
+        } catch {
+            /* fall back to the flag */
+        }
+    }
+    return Number(opts.type) === 1;
+}
+
+/**
+ * This session's My Documents thread id (`loginInfo.send2me_id`), or null.
+ *
+ * @param {object} api
+ * @returns {string|null}
+ */
+function send2meIdOf(api) {
+    try {
+        const id = api.getContext().loginInfo?.send2me_id;
+        return id ? String(id) : null;
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * What a forward reference needs to know about its source message.
+ *
+ * @param {object} api - a logged-in zca-js API
+ * @param {object} row - the cached source message
+ * @returns {Promise<object>} the input for buildForwardReference, or `{error}`
+ */
+async function forwardSource(api, row) {
+    const cliMsgId = cachedCliMsgId(row);
+    if (!cliMsgId) {
+        return {
+            error:
+                "its cliMsgId was never cached, and the forward reference is derived from it " +
+                "(`listen` caches messages as they arrive, `sync` restores older ones)",
+        };
+    }
+    const threadId = String(row.threadId || "");
+    const isMyDocuments = Boolean(threadId) && threadId === send2meIdOf(api);
+    let kind = null;
+    try {
+        kind = threadId ? getThreadType(threadId) : null;
+    } catch {
+        /* reported below */
+    }
+    if (!kind && !isMyDocuments) {
+        return {
+            error:
+                `the local cache does not say whether its conversation (${threadId || "unknown"}) is a group ` +
+                `or a 1-1, and the forward reference depends on it`,
+        };
+    }
+    const sender = await resolveSenderUid(api, row.senderId, getOwnId());
+    if (sender.error) return { error: sender.error };
+    return {
+        cliMsgId,
+        senderUid: sender.uid,
+        threadId,
+        isGroup: kind === "group" && !isMyDocuments,
+        // The web's sendDttm: the server timestamp for any message it did not
+        // send itself. The cliMsgId is the fallback for a row that lost it.
+        ts: Number(row.timestamp) || Number(cliMsgId),
+        ...(isMyDocuments && { logSrcType: LOG_SRC_TYPE.MY_CLOUD }),
+    };
+}
+
+/**
+ * Commander parser for `--urgency`: `important` → 1, `urgent` → 2. The
+ * mapping is src/utils/urgency.js, which `zalo_send_message` shares.
+ *
+ * @param {string} value
+ * @returns {number}
+ * @throws {InvalidArgumentError} for anything else
+ */
+function parseUrgency(value) {
+    const level = urgencyLevel(value);
+    if (!level) throw new InvalidArgumentError("Expected one of: important, urgent.");
+    return level;
+}
+
+/**
+ * Report a refusal: the error line, and a non-zero exit.
+ *
+ * @param {string} message
+ */
+function refuse(message) {
+    error(message);
+    process.exitCode = 1;
+}
+
+/**
+ * A history row built with the classifier every other capture path uses.
+ *
+ * `msg history` is a third way into the cache, beside the listener and the
+ * mobile sync, and it used to carry its own mapping: the raw live msgType
+ * (chat.photo) as the row type -- the very spelling a one-off migration had to
+ * clean out -- and no has_attachment, so replaying a synced photo overwrote it
+ * to 0 and sync-media never fetched it again. It also won the merge below over
+ * the correctly classified cached row, so even the printed history showed the
+ * raw spelling.
+ *
+ * @param {object} data - a live-encoded message payload (msgType string + content)
+ * @param {string} threadId
+ * @returns {object} the row as printed; `raw_data` is dropped before output
+ */
+function historyRow(data, threadId) {
+    const info = classifyLiveMessage(data || {});
+    return {
+        msgId: data?.msgId,
+        threadId,
+        senderId: data?.uidFrom || null,
+        senderName: data?.dName || null,
+        text: info.text,
+        timestamp: data?.ts ? Number(data.ts) : null,
+        type: info.type,
+        has_attachment: info.hasAttachment ? 1 : 0,
+        raw_data: info.raw,
+    };
+}
+
+/**
+ * Why a running daemon did not hand back `msg history`'s fetch.
+ *
+ * Every case ends the command with nothing fetched or written in this process:
+ * the daemon holds the account's one web session and is its one db writer, so
+ * doing either beside it is exactly what the hand-off exists to prevent. The
+ * only way past a daemon is for it to be gone, which a re-run finds out.
+ *
+ * @param {{status?: number, error?: string, disconnected?: boolean, busyStage?: string,
+ *   busySince?: number}} r - syncViaDaemon's refusal
+ * @param {number} pid - the daemon's
+ * @returns {string} the reason, to follow "History fetch failed: "
+ */
+function daemonHistoryFailure(r, pid) {
+    const who = `the listen/mcp daemon (pid ${pid})`;
+    if (r.status === 409) {
+        const since = r.busySince ? `, started ${Math.round((Date.now() - Number(r.busySince)) / 1000)}s ago` : "";
+        return (
+            `${who} is running a ${r.busyStage || "sync"} stage${since} — run this again when it finishes. ` +
+            "This command wrote nothing."
+        );
+    }
+    if (r.status === 404 || r.status === 503) {
+        return `${who} does not run the history fetch — restart it, then run this again.`;
+    }
+    if (r.disconnected) {
+        return (
+            `lost ${who} mid-fetch (${r.error}). This command wrote nothing. Run it again: a daemon that is ` +
+            "still up fetches it, and once the daemon has stopped this command fetches on its own."
+        );
+    }
+    return `${who} could not fetch it: ${r.error || "no reason given"}. This command wrote nothing.`;
+}
 
 /**
  * TextStyle codes matching zca-js TextStyle enum.
@@ -74,6 +358,174 @@ function parseMarkdownStyles(input) {
     return { plain, styles };
 }
 
+/**
+ * Extensions zca-js uploads through its inline-image path.
+ *
+ * uploadAttachment() routes on EXTENSION, not on which CLI command was used:
+ * these four resolve their upload promise synchronously, `gif` is split off
+ * by sendMessage() into its own inline path, and **everything else** —
+ * bmp, tiff, heic, avif, svg, mp4, pdf, … — takes the "others"/"video" path,
+ * which waits on a WebSocket upload-complete frame.
+ *
+ * Zalo does not restrict these formats (its `restricted_ext_file` denylist
+ * covers only executables: exe, cmd, bat, com, lnk, vbs, msi, …), so a user
+ * can legitimately hand `send-image` a .bmp. It simply arrives as a file
+ * attachment rather than an inline image.
+ */
+const INLINE_IMAGE_EXTS = new Set(["jpg", "jpeg", "png", "webp", "gif"]);
+
+/** True when every path is a format Zalo renders inline. */
+function allInlineImages(paths) {
+    return paths.every((p) => INLINE_IMAGE_EXTS.has(p.split(".").pop().toLowerCase()));
+}
+
+/**
+ * Pull the {msgId, cliMsgId} pairs out of an attachment send response.
+ *
+ * `msg send` reports `result.cliMsgId` off `result.message`, but an
+ * attachment send usually has no `result.message` at all: for a single
+ * jpg/jpeg/png/webp zca-js folds the caption into the attachment and leaves
+ * `message` null. The ids live in `result.attachment` instead -- an array,
+ * one entry per file.
+ *
+ * Until this existed an attachment's cliMsgId was unreachable from the CLI,
+ * so `msg undo` could not recall an image or a file at all unless a listener
+ * happened to be running and cached Zalo's echo of it. That is how tier 4
+ * ended up unable to clean up 24 attachments it had sent itself.
+ *
+ * @param {object} result - sendMessage() response
+ * @returns {Array<{msgId: string, cliMsgId: string|null}>}
+ */
+function sentAttachmentIds(result) {
+    const raw = result?.attachment;
+    const rows = Array.isArray(raw) ? raw : [raw];
+    return rows
+        .filter((r) => (r?.msgId ?? null) !== null)
+        .map((r) => ({
+            msgId: String(r.msgId),
+            cliMsgId: (r.cliMsgId ?? null) === null ? null : String(r.cliMsgId),
+        }));
+}
+
+/**
+ * Send attachments, bringing the WebSocket listener up first when any of
+ * them needs it.
+ *
+ * zca-js's uploadAttachment() resolves synchronously for inline images, but
+ * for "video" and "others" it registers an entry in ctx.uploadCallbacks and
+ * awaits a promise that ONLY apis/listen.js can settle, when the
+ * upload-complete control frame arrives. With no listener there is no
+ * timeout and no fallback — the await never settles and the command hangs
+ * with no output at all.
+ *
+ * Both `send-image` and `send-file` hit this, because the routing is by
+ * extension: `send-image photo.bmp` takes the same "others" path as
+ * `send-file doc.pdf`. So the listener decision is made from the actual
+ * paths, not from the command name.
+ *
+ * Opening that socket is only safe when nothing else holds one. A running
+ * `listen` or `mcp` daemon does, and Zalo answers a second session by killing
+ * the first, so this asks the daemon to do the upload when one is up and only
+ * opens its own session when none is. See src/core/daemon-channel.js.
+ *
+ * @param {object} api
+ * @param {string[]} absPaths
+ * @param {string} threadId
+ * @param {number} type
+ * @param {object} opts - {caption, uploadTimeout}
+ * @returns {Promise<{result?: object, error?: string, listenerStarted?: boolean, viaDaemon?: boolean}>}
+ */
+async function sendAttachments(api, absPaths, threadId, type, opts) {
+    const needsListener = !allInlineImages(absPaths);
+    let listenerStarted = false;
+
+    // A running `listen`/`mcp` daemon already holds the account's one permitted
+    // socket. Opening a second one here makes Zalo evict the daemon (cmd 3000),
+    // which loses every message that arrives during its ~6s reconnect -- a real
+    // message was lost this way, and the gap it recorded has no working repair
+    // path. So hand the upload to the daemon when there is one.
+    if (needsListener) {
+        const acc = getActive();
+        if (acc) {
+            const viaDaemon = await sendViaDaemon(join(CONFIG_DIR, "accounts", acc.ownId), {
+                paths: absPaths,
+                threadId,
+                type,
+                caption: opts.caption,
+                timeoutMs: Number(opts.uploadTimeout),
+            });
+            // null means no daemon answered; fall through and open our own.
+            if (viaDaemon) {
+                return viaDaemon.ok
+                    ? { result: viaDaemon.result, viaDaemon: true }
+                    : { error: viaDaemon.error, viaDaemon: true };
+            }
+        }
+    }
+
+    if (needsListener) {
+        try {
+            await new Promise((res, rej) => {
+                const timer = setTimeout(() => rej(new Error("Listener connection timeout")), 15000);
+                api.listener.once("connected", () => {
+                    clearTimeout(timer);
+                    listenerStarted = true;
+                    res();
+                });
+                api.listener.once("error", (err) => {
+                    clearTimeout(timer);
+                    rej(err);
+                });
+                api.listener.start({ retryOnClose: false });
+            });
+        } catch (e) {
+            return { error: `Could not open the upload channel: ${e.message}` };
+        }
+    }
+
+    try {
+        const result = await withTimeout(
+            api.sendMessage({ msg: opts.caption, attachments: absPaths }, threadId, type),
+            Number(opts.uploadTimeout),
+            "Upload timed out waiting for Zalo's upload-complete event",
+        );
+        return { result, listenerStarted };
+    } catch (e) {
+        return { error: e.message, listenerStarted };
+    } finally {
+        if (listenerStarted) {
+            try {
+                api.listener.stop();
+            } catch {
+                // Nothing useful to do — we're exiting anyway.
+            }
+        }
+    }
+}
+
+/**
+ * Reject with `message` if `promise` hasn't settled within `ms`.
+ *
+ * Used by the attachment path: zca-js's non-inline upload waits on a
+ * WebSocket event with no timeout of its own, so a dropped or missed
+ * upload-complete frame would otherwise hang the command indefinitely.
+ * Better to fail loudly than to look frozen.
+ *
+ * @param {Promise} promise
+ * @param {number} ms
+ * @param {string} message
+ */
+function withTimeout(promise, ms, message) {
+    if (!Number.isFinite(ms) || ms <= 0) return promise;
+    let timer;
+    return Promise.race([
+        promise.finally(() => clearTimeout(timer)),
+        new Promise((_, reject) => {
+            timer = setTimeout(() => reject(new Error(message)), ms);
+        }),
+    ]);
+}
+
 /**
  * Parse manual style specs: "start:len:style" → { start, len, st }
  * Style names: bold, italic, underline, strikethrough, red, orange, yellow, green, big, small
@@ -92,12 +544,32 @@ function parseStyleSpecs(specs) {
 export function registerMsgCommands(program) {
     const msg = program.command("msg").description("Send and manage messages");
 
+    // `me` (or the own uid) as a thread argument means My Documents, a 1-1
+    // thread of its own -- see src/utils/my-documents.js. Resolved once, here,
+    // for every msg subcommand that takes a threadId. Runs after the program's
+    // hook, so the session is already logged in.
+    msg.hook("preAction", (_msgCommand, actionCommand) => {
+        const out = applySelfThreadAlias(actionCommand, {
+            ownId: getOwnId(),
+            send2meId: () => getApi().getContext().loginInfo?.send2me_id,
+        });
+        if (out?.error) {
+            error(out.error);
+            process.exit(1);
+        }
+        if (out?.notice) info(out.notice);
+    });
+
     msg.command("send <threadId> <message>")
-        .description("Send a text message with optional formatting")
+        .description("Send a text message with optional formatting. <threadId> may be `me` for My Documents")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
         .option(
             "--mention <specs...>",
-            "Mention users in group message. Format: pos:userId:len (e.g. 0:USER_ID:5). Use userId=-1 for @All.",
+            "Mention users by raw offset. Format: pos:userId:len (e.g. 0:USER_ID:5). Prefer writing @[userId] in the message — offsets are then computed for you. Use userId=-1 for @All.",
+        )
+        .option(
+            "--quote <msgId>",
+            "Send as a quote-reply to this message. Text messages only, and it must already be in the local cache. A running `listen`/`mcp` daemon is what puts messages there as they arrive; `msg history`/`sync` backfill older ones, but neither can seed a message you just sent.",
         )
         .option("--style <specs...>", "Text styles. Format: start:len:style (e.g. 0:5:bold 6:5:italic)")
         .option("--md", "Parse markdown-like formatting: **bold** *italic* __underline__ ~~strike~~ {red:text}")
@@ -105,13 +577,17 @@ export function registerMsgCommands(program) {
             "--react <icon>",
             "Auto-react to sent message. Codes: :> (haha), /-heart (heart), /-strong (like), :o (wow), :-(( (cry), :-h (angry)",
         )
+        .option(
+            "--urgency <level>",
+            "Mark the message the way the apps' Important/Urgent option does: important | urgent",
+            parseUrgency,
+        )
         .action(async (threadId, message, opts) => {
             try {
-                // Parse mention specs: "pos:uid:len" → { pos, uid, len }
-                const mentions = (opts.mention || []).map((spec) => {
-                    const [pos, uid, len] = spec.split(":");
-                    return { pos: Number(pos), uid, len: Number(len) };
-                });
+                // One cache open serves both the @[uid] name lookups and the
+                // --quote rebuild. Absent cache is not fatal for either: names
+                // fall back to the uid, and --quote reports why it cannot.
+                const cached = openAccountDb();
 
                 // Parse text styles
                 let styles = [];
@@ -129,26 +605,139 @@ export function registerMsgCommands(program) {
                     styles = styles.concat(parseStyleSpecs(opts.style));
                 }
 
-                // Build message content
-                const hasExtras = mentions.length > 0 || styles.length > 0;
+                // Mentions expand last, on the post-markdown text: a `@[uid]`
+                // token contains no markdown metacharacters, whereas a display
+                // name may well contain `*` or `_` and would be eaten the other
+                // way round. Styles are then moved across the substitutions,
+                // since their offsets were counted before the names went in.
+                //
+                // Expanding is pure and cheap, so it runs twice: once off the
+                // cache to learn which uids it could not name, then again with
+                // whatever one batched lookup filled in.
+                const missing = new Set();
+                let expanded = expandMentions(finalMsg, (uid) => {
+                    const name = mentionName(uid, cached);
+                    if (!name && uid !== ALL_MENTION_UID) missing.add(uid);
+                    return name;
+                });
+                if (missing.size > 0 && Number(opts.type) === 1) {
+                    const fetched = await fetchMentionNames([...missing]);
+                    if (fetched.size > 0) {
+                        expanded = expandMentions(finalMsg, (uid) => fetched.get(uid) || mentionName(uid, cached));
+                    }
+                }
+
+                finalMsg = expanded.text;
+                styles = shiftStyles(styles, expanded.edits);
+                const mentions = [...parseMentionSpecs(opts.mention), ...expanded.mentions];
+
+                // zca-js drops mentions outside a group, so a `-t 0` send would
+                // quietly arrive with the names as plain text and nobody tagged.
+                if (mentions.length > 0 && Number(opts.type) !== 1) {
+                    warning("Mentions only apply to group messages — pass -t 1 to tag anyone.");
+                }
+
+                let quote;
+                if (opts.quote) {
+                    const built = buildQuote(cached ? getMessageById(opts.quote) : null, {
+                        msgId: opts.quote,
+                        threadId,
+                    });
+                    if (built.error) {
+                        error(built.error);
+                        return;
+                    }
+                    if (built.warning) warning(built.warning);
+                    quote = built.quote;
+                    // A sync-restored row's sender is a noised id that Zalo
+                    // rejects outright (code 114), so resolve it rather than
+                    // send something that cannot land.
+                    if (built.opaqueSender) {
+                        const fixed = await resolveQuoteSender(quote, getApi());
+                        if (fixed.error) {
+                            error(fixed.error);
+                            return;
+                        }
+                        if (fixed.resolved) info(`Resolved the quoted message's sender: ${fixed.resolved}`);
+                    }
+                }
+
+                // Build message content. `urgency` is 1 (important) or 2
+                // (urgent); zca-js turns it into the `metaData: {urgency}`
+                // object Zalo Web sends, on every text endpoint.
+                const urgency = opts.urgency;
+                const hasExtras = mentions.length > 0 || styles.length > 0 || Boolean(quote) || Boolean(urgency);
                 const msgContent = hasExtras
-                    ? { msg: finalMsg, ...(mentions.length > 0 && { mentions }), ...(styles.length > 0 && { styles }) }
+                    ? {
+                          msg: finalMsg,
+                          ...(mentions.length > 0 && { mentions }),
+                          ...(styles.length > 0 && { styles }),
+                          ...(quote && { quote }),
+                          ...(urgency && { urgency }),
+                      }
                     : finalMsg;
 
-                const cliMsgId = String(Date.now());
                 const result = await getApi().sendMessage(msgContent, threadId, Number(opts.type));
-                result.cliMsgId = cliMsgId;
+
+                // The cliMsgId comes back from zca-js, which hands over the
+                // clientId it actually put on the wire (patches/zca-js+2.2.0.patch
+                // — upstream stamps `params.clientId = Date.now()` inside
+                // handleMessage() and returns only {msgId}).
+                //
+                // This used to be a second `Date.now()` read here, taken before
+                // the call. That is a different number from the one zca-js sent,
+                // by however long the AES encrypt and the POST took — usually
+                // 0-2ms, never guaranteed equal. So every id `send --json`
+                // printed was a near-miss, and all three things that key on it
+                // (`msg react`, `msg undo`, and `--quote`, which rebuilds the
+                // payload from a cached row's cliMsgId) failed silently on it.
+                //
+                // Report only an id Zalo really holds. When there is none, say
+                // so — a fabricated one is worse than an absent one.
+                const cliMsgId = result.message?.cliMsgId ? String(result.message.cliMsgId) : null;
+                if (cliMsgId) result.cliMsgId = cliMsgId;
                 output(result, program.opts().json, () => success("Message sent"));
 
+                if (result.message && !cliMsgId) {
+                    warning(
+                        "Zalo returned no cliMsgId for this send, so none is reported — the zca-js patch " +
+                            "is missing (run `npx patch-package`). `msg react`/`msg undo`/`msg send --quote` " +
+                            "need one; the local cache gets the real value once `listen` or `sync` sees " +
+                            "Zalo echo the message back.",
+                    );
+                }
+
                 // Auto-react if --react flag provided
                 if (opts.react && result.message?.msgId) {
-                    const dest = {
-                        data: { msgId: String(result.message.msgId), cliMsgId },
-                        threadId,
-                        type: Number(opts.type),
-                    };
-                    await getApi().addReaction(opts.react, dest);
-                    success(`Auto-reacted with '${opts.react}'`);
+                    // addReaction needs the message's real cliMsgId — with the
+                    // msgId in its place Zalo accepts the call and the
+                    // reaction never shows up. It used to fall back to exactly
+                    // that on an install whose zca-js patch had not applied;
+                    // now the reaction is skipped and the way to add it later
+                    // is named. The message itself has already gone out.
+                    //
+                    // Exit status stays 0: the send succeeded, and a caller
+                    // that read a failure here would send the message twice.
+                    const sentMsgId = String(result.message.msgId);
+                    const target = reactionCliMsgId(
+                        { msgId: sentMsgId, threadId, cliMsgId },
+                        { lookup: cachedInAccount },
+                    );
+                    if (target.error) {
+                        warning(
+                            `--react skipped: Zalo returned no cliMsgId for this send, and a reaction keyed on ` +
+                                `the msgId is accepted but never shown. Once \`listen\` has cached the message, ` +
+                                `run: msg react ${sentMsgId} ${threadId} <icon> (or pass -c <cliMsgId>).`,
+                        );
+                    } else {
+                        const dest = {
+                            data: { msgId: sentMsgId, cliMsgId: target.cliMsgId },
+                            threadId,
+                            type: Number(opts.type),
+                        };
+                        await getApi().addReaction(opts.react, dest);
+                        success(`Auto-reacted with '${opts.react}'`);
+                    }
                 }
             } catch (e) {
                 error(e.message);
@@ -156,39 +745,84 @@ export function registerMsgCommands(program) {
         });
 
     msg.command("send-image <threadId> <paths...>")
-        .description("Send one or more images")
+        .description("Send one or more images (jpg/jpeg/png/webp/gif render inline; other formats arrive as files)")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
         .option("-m, --caption <text>", "Caption text", "")
+        .option("--upload-timeout <ms>", "Max wait for the upload-complete event", "120000")
         .action(async (threadId, paths, opts) => {
-            try {
-                const absPaths = paths.map((p) => resolve(p));
-                const result = await getApi().sendMessage(
-                    { msg: opts.caption, attachments: absPaths },
-                    threadId,
-                    Number(opts.type),
+            const absPaths = paths.map((p) => resolve(p));
+
+            // A format Zalo does not render inline (bmp, tiff, heic, …) is
+            // still uploaded — Zalo only denylists executables — but it
+            // arrives as a file attachment. Say so rather than letting the
+            // command name quietly mislead.
+            const offbeat = absPaths.filter((p) => !INLINE_IMAGE_EXTS.has(p.split(".").pop().toLowerCase()));
+            if (offbeat.length && !program.opts().json) {
+                warning(
+                    `Not an inline image format: ${offbeat.map((p) => p.split(/[\\/]/).pop()).join(", ")} — ` +
+                        `will arrive as a file attachment. Convert to PNG/JPEG for an inline image.`,
                 );
-                output(result, program.opts().json, () => success(`Image(s) sent to ${threadId}`));
-            } catch (e) {
-                error(e.message);
             }
+
+            const {
+                result,
+                error: err,
+                listenerStarted,
+                viaDaemon,
+            } = await sendAttachments(getApi(), absPaths, threadId, Number(opts.type), opts);
+            if (err) error(err);
+            // Surface which socket carried this. sendAttachments() has always
+            // returned viaDaemon, and every caller dropped it on the floor —
+            // so the one branch whose entire reason for existing is that a
+            // second socket evicts the running daemon with cmd 3000 was
+            // invisible from the outside, and untestable.
+            else
+                output(
+                    { ...result, sent: sentAttachmentIds(result), viaDaemon: Boolean(viaDaemon) },
+                    program.opts().json,
+                    () => success(`Image(s) sent to ${threadId}${viaDaemon ? " (via the running daemon)" : ""}`),
+                );
+
+            // Only force-exit when the listener ran; it leaves handles behind
+            // that keep the event loop alive. The pure-inline path needs no
+            // such thing, so leave its exit behavior untouched.
+            if (listenerStarted) process.exit(err ? 1 : 0);
+            else if (err) process.exitCode = 1;
         });
 
     msg.command("send-file <threadId> <paths...>")
         .description("Send files (docx, pdf, zip, etc.)")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
         .option("-m, --caption <text>", "Caption text", "")
+        .option("--upload-timeout <ms>", "Max wait for the upload-complete event", "120000")
         .action(async (threadId, paths, opts) => {
-            try {
-                const absPaths = paths.map((p) => resolve(p));
-                const result = await getApi().sendMessage(
-                    { msg: opts.caption, attachments: absPaths },
-                    threadId,
-                    Number(opts.type),
+            // Shares sendAttachments() with `send-image`. It used to carry its
+            // own copy of the bring-the-listener-up dance, which meant the
+            // hand-off to a running daemon only ever applied to send-image --
+            // and send-file is the command that needs it most, since every
+            // non-inline attachment takes the socket path.
+            const absPaths = paths.map((p) => resolve(p));
+            const {
+                result,
+                error: err,
+                listenerStarted,
+                viaDaemon,
+            } = await sendAttachments(getApi(), absPaths, threadId, Number(opts.type), opts);
+            if (err) error(err);
+            else
+                output(
+                    { ...result, sent: sentAttachmentIds(result), viaDaemon: Boolean(viaDaemon) },
+                    program.opts().json,
+                    () => success(`File(s) sent to ${threadId}${viaDaemon ? " (via the running daemon)" : ""}`),
                 );
-                output(result, program.opts().json, () => success(`File(s) sent to ${threadId}`));
-            } catch (e) {
-                error(e.message);
-            }
+
+            // listener.stop() closes the socket but does not release every
+            // handle it registered, so the event loop stays alive and the
+            // command would sit there, done but not exited. `msg history`
+            // resolves the same problem the same way. Nothing to force when
+            // the daemon did the upload -- this process never opened a socket.
+            if (listenerStarted) process.exit(err ? 1 : 0);
+            else if (err) process.exitCode = 1;
         });
 
     msg.command("send-card <threadId> <userId>")
@@ -243,7 +877,7 @@ export function registerMsgCommands(program) {
     msg.command("send-qr-transfer <threadId> <accountNumber>")
         .description("Generate VietQR and send as image")
         .requiredOption("-b, --bank <name>", "Bank name or BIN code")
-        .option("-a, --amount <n>", "Transfer amount in VND", parseInt)
+        .option("-a, --amount <n>", "Transfer amount in VND", parseIntOption)
         .option("-m, --content <text>", "Transfer content (max 50 chars)")
         .option("--template <tpl>", "QR style: compact, print, qronly", "compact")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
@@ -329,7 +963,7 @@ export function registerMsgCommands(program) {
     msg.command("send-voice <threadId> <voiceUrl>")
         .description("Send a voice message from URL")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
-        .option("--ttl <ms>", "Time to live in milliseconds", parseInt, 0)
+        .option("--ttl <ms>", "Time to live in milliseconds", parseIntOption, 0)
         .action(async (threadId, voiceUrl, opts) => {
             try {
                 info(`Sending voice: ${voiceUrl}`);
@@ -359,9 +993,9 @@ export function registerMsgCommands(program) {
         .requiredOption("--thumb <url>", "Thumbnail image URL")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
         .option("-m, --caption <text>", "Caption text", "")
-        .option("-d, --duration <ms>", "Video duration in milliseconds", parseInt)
-        .option("-W, --width <px>", "Video width", parseInt, 1280)
-        .option("-H, --height <px>", "Video height", parseInt, 720)
+        .option("-d, --duration <ms>", "Video duration in milliseconds", parseIntOption)
+        .option("-W, --width <px>", "Video width", parseIntOption, 1280)
+        .option("-H, --height <px>", "Video height", parseIntOption, 720)
         .action(async (threadId, videoUrl, opts) => {
             try {
                 info(`Sending video: ${videoUrl}`);
@@ -426,12 +1060,26 @@ export function registerMsgCommands(program) {
             "React to a message. Reaction codes: :> (haha), /-heart (heart), /-strong (like), :o (wow), :-(( (cry), :-h (angry)",
         )
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
-        .option("-c, --cli-msg-id <id>", "Client message ID (required for reaction to appear, get from listen --json)")
+        .option(
+            "-c, --cli-msg-id <id>",
+            "Message's cliMsgId. Looked up in the local cache when omitted; the reaction is refused when neither has it",
+        )
         .action(async (msgId, threadId, reaction, opts) => {
             try {
-                // zca-js addReaction(icon, dest) — dest needs msgId + cliMsgId
+                // zca-js addReaction(icon, dest) — dest needs msgId + cliMsgId.
+                // The cliMsgId used to fall back to the msgId, which Zalo
+                // accepts and never displays. Resolved before getApi(), so an
+                // uncached message is refused without touching the network.
+                const target = reactionCliMsgId(
+                    { msgId, threadId, cliMsgId: opts.cliMsgId },
+                    { lookup: cachedInAccount },
+                );
+                if (target.error) {
+                    refuse(target.error);
+                    return;
+                }
                 const dest = {
-                    data: { msgId, cliMsgId: opts.cliMsgId || msgId },
+                    data: { msgId, cliMsgId: target.cliMsgId },
                     threadId,
                     type: Number(opts.type),
                 };
@@ -443,12 +1091,59 @@ export function registerMsgCommands(program) {
         });
 
     msg.command("delete <msgId> <threadId>")
-        .description("Delete a message you sent")
+        .description("Delete a message from your own view only (use `msg undo` to recall it for everyone)")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
+        .option("-c, --cli-msg-id <id>", "Message's cliMsgId. Looked up in the local cache when omitted")
+        .option("--uid-from <id>", "Message sender's id (defaults to your own id)")
+        .option(
+            "--everyone",
+            "Delete for everyone instead of just you. Only valid for SOMEONE ELSE'S message in a group — " +
+                "Zalo rejects it for your own messages (use `msg undo`) and in private chats",
+        )
         .action(async (msgId, threadId, opts) => {
             try {
-                const result = await getApi().deleteMessage(msgId, threadId, Number(opts.type));
-                output(result, program.opts().json, () => success("Message deleted"));
+                const type = Number(opts.type);
+
+                // zca-js takes deleteMessage(dest, onlyMe) where dest is
+                // {data: {cliMsgId, msgId, uidFrom}, threadId, type} — NOT
+                // (msgId, threadId, type), which is what this used to pass.
+                // That shape put a bare string where `dest` belongs, so every
+                // invocation died on "Cannot read properties of undefined
+                // (reading 'uidFrom')" before reaching the network.
+                //
+                // cliMsgId is not derivable from msgId, exactly as for `undo`:
+                // it is a client-generated id that only the sender ever saw.
+                // Look in the local cache first, then insist the caller
+                // supplies it rather than guessing.
+                let cliMsgId = opts.cliMsgId;
+                let uidFrom = opts.uidFrom;
+
+                if (!cliMsgId || !uidFrom) {
+                    const cached = cachedInAccount(threadId, msgId);
+                    cliMsgId = cliMsgId || cached?.cliMsgId;
+                    uidFrom = uidFrom || cached?.uidFrom;
+                }
+                uidFrom = uidFrom || getOwnId();
+
+                if (!cliMsgId) {
+                    error(
+                        "cliMsgId is required to delete a message and is not in the local cache. " +
+                            "Pass --cli-msg-id (from `listen --json`).",
+                    );
+                    return;
+                }
+
+                const result = await getApi().deleteMessage(
+                    {
+                        data: { cliMsgId: String(cliMsgId), msgId: String(msgId), uidFrom: String(uidFrom) },
+                        threadId,
+                        type,
+                    },
+                    Boolean(opts.everyone) === false,
+                );
+                output(result, program.opts().json, () =>
+                    success(opts.everyone ? "Message deleted for everyone" : "Message deleted from your view"),
+                );
             } catch (e) {
                 error(e.message);
             }
@@ -457,14 +1152,33 @@ export function registerMsgCommands(program) {
     msg.command("undo <msgId> <threadId>")
         .description("Recall/undo a message for both sides (like Zalo app recall). Requires cliMsgId.")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
-        .option("-c, --cli-msg-id <id>", "Client message ID (required, get from listen --json or send --json)")
+        .option("-c, --cli-msg-id <id>", "Message's cliMsgId. Looked up in the local cache when omitted")
         .action(async (msgId, threadId, opts) => {
             try {
-                if (!opts.cliMsgId) {
-                    error("cliMsgId is required for undo. Get it from: listen --json or send --json output.");
+                // Same lookup `msg delete` does. cliMsgId is client-generated
+                // and not derivable from msgId, but anything `listen`, `mcp` or
+                // a sync captured has it -- so asking the caller for it was
+                // only ever necessary for a message this machine never saw.
+                //
+                // `send --json` is a valid source again. It used to print a
+                // second Date.now() of its own -- zca-js stamps the real
+                // clientId inside handleMessage() and upstream returns only
+                // {msgId} -- so the id it gave matched only by luck. The zca-js
+                // patch now hands that clientId back, and `msg send` reports
+                // that value or none at all.
+                //
+                // The resolution is shared with `zalo_undo`
+                // (src/core/cached-message.js). The refusal exits 0 here, as
+                // it always has.
+                const target = recallCliMsgId(
+                    { msgId, threadId, cliMsgId: opts.cliMsgId },
+                    { lookup: cachedInAccount },
+                );
+                if (target.error) {
+                    error(target.error);
                     return;
                 }
-                const payload = { msgId, cliMsgId: opts.cliMsgId };
+                const payload = { msgId, cliMsgId: target.cliMsgId };
                 const result = await getApi().undo(payload, threadId, Number(opts.type));
                 output(result, program.opts().json, () => success("Message recalled (undone)"));
             } catch (e) {
@@ -473,129 +1187,563 @@ export function registerMsgCommands(program) {
         });
 
     msg.command("forward <msgId> <threadId>")
-        .description("Forward a message to another thread")
+        .description(
+            "Forward a cached message to another conversation. Text goes out as a real forward, badged the way " +
+                "the apps badge it; other kinds are re-sent as a message of their own type",
+        )
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
         .action(async (msgId, threadId, opts) => {
+            // This command could never have worked. zca-js takes
+            // `forwardMessage(payload, threadIds, type)` where payload is
+            // `{ message: string }` and threadIds is an ARRAY; the old call
+            // passed the msgId string as the payload and a bare string as the
+            // thread list. `if (!payload.message) throw` fires on the first
+            // line of the API, so every invocation died with "Missing message
+            // content" before touching the network -- identically for -t 0 and
+            // -t 1, for every message type. The zca-api-surface test did not
+            // catch it because the method does exist; only its arity was wrong.
+            const jsonMode = program.opts().json;
+            const activeAcc = getActive();
+            if (!activeAcc) {
+                error("No active account. Please login first.");
+                process.exit(1);
+            }
+
+            let row;
             try {
-                const result = await getApi().forwardMessage(msgId, threadId, Number(opts.type));
-                output(result, program.opts().json, () => success("Message forwarded"));
+                initDb(join(CONFIG_DIR, "accounts", activeAcc.ownId, "zalo.db"));
+                row = getMessageById(msgId);
+            } catch (e) {
+                error(
+                    `Local cache unavailable (${e.message}). Run \`zalo-agent listen\` or \`zalo-agent sync\` first.`,
+                );
+                process.exit(1);
+            }
+            if (!row) {
+                error(`Message ${msgId} is not in the local cache.`);
+                info("Fetch the conversation first:  zalo-agent msg history <threadId> -t <0|1>");
+                process.exit(1);
+            }
+
+            // "Forward" is not one operation in Zalo. Only TEXT rides the
+            // mforward API and gets the "forwarded" badge. Everything else the
+            // app re-sends as a fresh message of its own kind -- measured
+            // 2026-09-28 by forwarding a contact card by hand: the copy that
+            // arrived carried no `reference` and no `fwLvl` at all, where a
+            // forwarded text carries both. So dispatch on the row's classified
+            // type and reproduce what the app does.
+            //
+            // Guard on `type`, never on `typeof text === "string"`: a synced
+            // photo/file/sticker stores a human placeholder ("[Hình ảnh]",
+            // "[File] x.pdf") in the text column, and a type-of check would
+            // forward that placeholder and call it a forwarded photo.
+            const api = getApi();
+            const threadType = Number(opts.type);
+            let raw = {};
+            try {
+                raw = JSON.parse(row.raw_data || "{}");
+            } catch {
+                /* a row with unreadable raw_data can still forward as text */
+            }
+            const c = raw.content && typeof raw.content === "object" ? raw.content : null;
+
+            /**
+             * Re-send a downloaded file as its own attachment.
+             *
+             * Goes through sendAttachments, not api.sendMessage: a non-inline
+             * upload needs a socket to settle its upload-complete frame, and a
+             * running daemon holds the account's only one. Calling sendMessage
+             * directly parks the send in ctx.uploadCallbacks with nothing left
+             * to settle it -- measured, a file forward simply hung for four
+             * minutes and returned nothing at all. sendAttachments hands the
+             * upload to the daemon and falls back to its own socket when none
+             * is running.
+             */
+            const resendLocal = async () => {
+                if (!row.localPath || !existsSync(row.localPath)) {
+                    error(`Message ${msgId} is "${row.type}" but its media is not downloaded locally.`);
+                    info("Fetch it first:  zalo-agent sync-media -T <threadId>");
+                    process.exit(1);
+                }
+                const out = await sendAttachments(api, [resolve(row.localPath)], threadId, threadType, {
+                    caption: "",
+                    uploadTimeout: 120000,
+                });
+                if (out.error) throw new Error(out.error);
+                return out.result;
+            };
+
+            const forwarders = {
+                // action "recommened.user" carries the shared person's uid in
+                // `params`; sendCard reproduces the card exactly as the app does.
+                card: async () => api.sendCard({ userId: String(c?.params ?? "").trim() }, threadId, threadType),
+                sticker: async () =>
+                    api.sendSticker({ id: c?.id, cateId: c?.catId, type: c?.type ?? 3 }, threadId, threadType),
+                link: async () => api.sendLink({ link: c?.href }, threadId, threadType),
+                // sendVideo wants the geometry too; Zalo rejects the call with
+                // code 114 when duration/width/height are missing. They live in
+                // the payload's `params` blob, not as top-level fields.
+                video: async () => {
+                    let p = {};
+                    try {
+                        p = typeof c?.params === "string" ? JSON.parse(c.params) : (c?.params ?? {});
+                    } catch {
+                        /* geometry falls back to the defaults below */
+                    }
+                    return api.sendVideo(
+                        {
+                            videoUrl: c?.href,
+                            thumbnailUrl: c?.thumb || "",
+                            duration: Number(p.duration) || 0,
+                            width: Number(p.video_width || p.video_original_width) || 1280,
+                            height: Number(p.video_height || p.video_original_height) || 720,
+                        },
+                        threadId,
+                        threadType,
+                    );
+                },
+                voice: async () => api.sendVoice({ voiceUrl: c?.href }, threadId, threadType),
+                photo: resendLocal,
+                file: resendLocal,
+                gif: resendLocal,
+                doodle: resendLocal,
+            };
+
+            // A shared contact arrives as a link whose action says otherwise.
+            const kind = c?.action === "recommened.user" ? "card" : row.type;
+
+            if (kind !== "text") {
+                const send = forwarders[kind];
+                if (!send) {
+                    error(`Cannot forward a "${row.type}" message — no send path reproduces it.`);
+                    info("Text uses the forward API; other kinds are re-sent as a new message of their own type.");
+                    process.exit(1);
+                }
+                try {
+                    const res = await send();
+                    output(res, jsonMode, () => success(`Forwarded ${kind} to ${threadId}`));
+                } catch (e) {
+                    error(`Forward failed (${kind}): ${e.message}`);
+                    process.exit(1);
+                }
+                return;
+            }
+            const text = cachedText(row);
+            if (!text) {
+                error(`Message ${msgId} has no text to forward.`);
+                process.exit(1);
+            }
+
+            // A forward is the text plus a `reference` naming the source
+            // message. Without it the copy arrives as plain text with no
+            // "forwarded" badge, which is all this command used to send. The
+            // reference id is md5(cliMsgId + senderUid + conversationKey),
+            // derived the way Zalo Web derives it -- src/core/forward.js has
+            // the derivation and the capture it reproduces. Refuse rather than
+            // send a reference built from a guess.
+            const source = await forwardSource(api, row);
+            if (source.error) {
+                error(`Cannot forward message ${msgId}: ${source.error}.`);
+                info("To send the words without the forward, use:  zalo-agent msg send <threadId> <text>");
+                process.exit(1);
+            }
+
+            try {
+                const { reference, decorLog } = buildForwardReference(source);
+                const result = await sendForward(
+                    api,
+                    { message: text, reference, decorLog },
+                    [threadId],
+                    Number(opts.type),
+                );
+
+                // Zalo answers {success: [...], failed: [...]}. This read
+                // `result.fail`, which is never a key on that response, so
+                // the count was always 0 and a rejected target was reported
+                // as a success. Accept both spellings rather than betting on
+                // one.
+                const rejected = result?.failed ?? result?.fail ?? [];
+                if (rejected.length > 0) {
+                    error(`Forward rejected for ${rejected.length} target(s): ${JSON.stringify(rejected)}`);
+                    process.exit(1);
+                }
+
+                // Pair each target's msgId with the cliMsgId, the same
+                // `sent` shape send-image and send-file report. The forward
+                // call mints ONE clientId for the whole call; Zalo echoes it
+                // per target as `clientId`, and sendForward reports it at the
+                // top level as `cliMsgId` (as patches/zca-js+2.2.0.patch does
+                // for zca-js's forwardMessage) -- neither spot alone gives a
+                // caller the {msgId, cliMsgId} pair that `msg undo` needs.
+                // Tier 4 hit exactly that: it recorded the forwarded msgId
+                // with a null id and could not recall the message.
+                const shared = (result?.cliMsgId ?? null) === null ? null : String(result.cliMsgId);
+                const sent = (Array.isArray(result?.success) ? result.success : [])
+                    .filter((x) => (x?.msgId ?? null) !== null)
+                    .map((x) => ({
+                        msgId: String(x.msgId),
+                        cliMsgId: (x.clientId ?? shared ?? null) === null ? null : String(x.clientId ?? shared),
+                    }));
+
+                output({ ...result, sent }, jsonMode, () => success(`Forwarded to ${threadId}`));
             } catch (e) {
                 error(e.message);
             }
         });
 
+    msg.command("pin <msgId> [threadId]")
+        .description(
+            "Pin a text message to the top of its conversation, as the apps do. The message must be in the local " +
+                "cache; [threadId] defaults to the one it was cached under",
+        )
+        .option("-t, --type <n>", "Thread type: 0=User, 1=Group (default: the cached conversation's kind)", "0")
+        .action(async (msgId, threadId, opts, cmd) => {
+            try {
+                // Everything the pin carries -- cliMsgId, sender, text -- comes
+                // from the cached row, so every refusal below happens before
+                // any request.
+                const row = openAccountDb() ? getMessageById(msgId) : null;
+                if (!row) {
+                    refuse(
+                        `Message ${msgId} is not in the local cache, so it cannot be pinned: a pin carries the ` +
+                            `message's cliMsgId, sender and text. \`listen\` caches messages as they arrive and ` +
+                            `\`sync\` restores older ones.`,
+                    );
+                    return;
+                }
+                if (threadId && row.threadId && String(row.threadId) !== String(threadId)) {
+                    refuse(`Message ${msgId} belongs to thread ${row.threadId}, not ${threadId}.`);
+                    return;
+                }
+                if (row.type !== "text") {
+                    refuse(
+                        `Only text messages can be pinned from the CLI; message ${msgId} is a ` +
+                            `${row.type || "message of unknown kind"}. Pin it from the app.`,
+                    );
+                    return;
+                }
+                const cliMsgId = cachedCliMsgId(row);
+                if (!cliMsgId) {
+                    refuse(`Message ${msgId}'s cliMsgId was never cached, and a pin must name it.`);
+                    return;
+                }
+                const conversation = String(threadId || row.threadId);
+                const isGroup = threadIsGroup(conversation, opts, cmd);
+
+                const api = getApi();
+                const sender = await resolveSenderUid(api, row.senderId, getOwnId());
+                if (sender.error) {
+                    refuse(`Cannot pin message ${msgId}: ${sender.error}.`);
+                    return;
+                }
+                const params = textPinParams({
+                    cliMsgId,
+                    msgId,
+                    senderUid: sender.uid,
+                    senderName: row.senderName,
+                    text: cachedText(row),
+                });
+                const result = await pinMessage(api, { threadId: conversation, isGroup, params });
+                output(result, program.opts().json, () => success(`Pinned message ${msgId} in ${conversation}`));
+            } catch (e) {
+                refuse(`Pin failed: ${describeZaloError(e)}`);
+            }
+        });
+
+    msg.command("unpin <msgId> [threadId]")
+        .description(
+            "Unpin a message. [threadId] defaults to the conversation the message is cached under, and is " +
+                "required when it is not cached",
+        )
+        .option("-t, --type <n>", "Thread type: 0=User, 1=Group (default: the cached conversation's kind)", "0")
+        .action(async (msgId, threadId, opts, cmd) => {
+            try {
+                // Unpinning takes the pin's topic id, which comes from the
+                // conversation's live pin list -- so only the conversation has
+                // to be known, not the message.
+                const row = openAccountDb() ? getMessageById(msgId) : null;
+                if (threadId && row?.threadId && String(row.threadId) !== String(threadId)) {
+                    refuse(`Message ${msgId} belongs to thread ${row.threadId}, not ${threadId}.`);
+                    return;
+                }
+                const conversation = threadId || row?.threadId;
+                if (!conversation) {
+                    refuse(
+                        `Message ${msgId} is not in the local cache, so its thread is unknown. ` +
+                            `Name it:  zalo-agent msg unpin ${msgId} <threadId> -t <0|1>`,
+                    );
+                    return;
+                }
+                const isGroup = threadIsGroup(String(conversation), opts, cmd);
+                const result = await unpinMessage(getApi(), { threadId: String(conversation), isGroup, msgId });
+                if (result.notPinned) {
+                    refuse(`Message ${msgId} is not pinned in ${conversation}.`);
+                    return;
+                }
+                output(result, program.opts().json, () => success(`Unpinned message ${msgId} in ${conversation}`));
+            } catch (e) {
+                refuse(`Unpin failed: ${describeZaloError(e)}`);
+            }
+        });
+
     msg.command("history <threadId>")
-        .description("Fetch message history from a DM or group conversation via WebSocket")
+        .description("Fetch message history. Groups try REST API then fallback to WebSocket. DMs use WebSocket.")
         .option("-t, --type <n>", "Thread type: 0=User(DM), 1=Group", "0")
-        .option("-n, --limit <n>", "Max messages to fetch (fetches in pages until limit)", "50")
+        .option("-n, --limit <n>", "Max most-recent messages to fetch", "50")
+        .option("--scan <n>", "Max raw global messages to scan (WebSocket only)", "2000")
+        .option("--from-msg-id <id>", "Anchor message ID to scan older messages from")
         .option("--timeout <ms>", "Timeout in milliseconds waiting for response", "15000")
+        .option("--no-cache", "Force live fetch instead of using local cache, and amend db")
         .action(async (threadId, opts) => {
             const jsonMode = program.opts().json;
             const threadType = Number(opts.type);
             const limit = Number(opts.limit);
             const timeout = Number(opts.timeout);
+            const scanLimit = Number(opts.scan);
+
+            // Order matters: getApi() throws when there is no session, and
+            // this line sits outside any try/catch. Calling it ABOVE the
+            // guard made the friendly message unreachable — a logged-out
+            // user got a raw Node stack trace instead. `conv recent` gets
+            // this order right; keep them consistent.
+            const activeAcc = getActive();
+            if (!activeAcc) {
+                error("No active account. Please login first.");
+                process.exit(1);
+            }
+
+            let api;
+            try {
+                api = getApi();
+            } catch (e) {
+                error(e.message);
+                process.exit(1);
+            }
+
+            if (!jsonMode) {
+                info(
+                    "Note: To maintain a complete local cache without missing gaps, ensure the 'zalo-cli listen' daemon is running continuously on this device.",
+                );
+            }
+
+            let localMsgs = [];
+            let dbActive = false;
+
+            try {
+                const accountDir = join(CONFIG_DIR, "accounts", activeAcc.ownId);
+                initDb(join(accountDir, "zalo.db"));
+                dbActive = true;
+
+                if (opts.cache !== false) {
+                    localMsgs = getMessages(threadId, limit);
+                    if (localMsgs && localMsgs.length >= limit) {
+                        if (!jsonMode) info(`Found ${localMsgs.length} messages in local cache.`);
+                        // Fetch through the shared downloader, which writes to
+                        // accounts/<ownId>/media/<threadName>/ and records the
+                        // path itself. The old per-command downloader used a
+                        // different flat layout and its extension logic keyed off
+                        // Number(message.type) -- always NaN for a string type --
+                        // so reading history quietly scattered files into a second
+                        // location that nothing else knew about.
+                        try {
+                            await downloadSyncedMedia({
+                                api,
+                                accountDir,
+                                threadId,
+                                limit,
+                                concurrency: 2,
+                            });
+                            localMsgs = getMessages(threadId, limit);
+                        } catch {
+                            /* showing history must not fail because media did */
+                        }
+                        const messages = await withCurrentSenderNames(
+                            api,
+                            localMsgs.map((m) => ({
+                                msgId: m.msgId,
+                                threadId: m.threadId,
+                                senderId: m.senderId,
+                                senderName: m.senderName,
+                                text: m.text,
+                                timestamp: m.timestamp,
+                                type: m.type,
+                                localPath: m.localPath,
+                            })),
+                            threadType === 0 ? [threadId] : [],
+                        );
+
+                        output(
+                            {
+                                threadId,
+                                threadType: threadType === 0 ? "dm" : "group",
+                                count: messages.length,
+                                source: "sqlite",
+                                messages,
+                            },
+                            jsonMode,
+                            () => {
+                                success(`${messages.length} message(s) from ${threadId} (Local Cache)`);
+                                for (const m of messages) {
+                                    const date = m.timestamp ? new Date(m.timestamp).toLocaleString() : "?";
+                                    const name = m.senderDisplayName || m.senderId || "?";
+                                    const mediaInfo = m.localPath ? ` [Media: ${m.localPath}]` : "";
+                                    console.log(`  [${date}] ${name}: ${(m.text || "").slice(0, 200)}${mediaInfo}`);
+                                }
+                            },
+                        );
+                        return;
+                    } else if (localMsgs && localMsgs.length > 0 && !jsonMode) {
+                        info(
+                            `Found only ${localMsgs.length} messages in cache. Falling back to live fetch to reach limit of ${limit}.`,
+                        );
+                    }
+                } else if (opts.cache === false && !jsonMode) {
+                    info(`--no-cache specified. Fetching live from server and amending database.`);
+                }
+            } catch (err) {
+                if (!jsonMode && err.message !== "Database not initialized") {
+                    warning(`Local DB query failed: ${err.message}. Falling back to network.`);
+                }
+            }
 
             try {
                 if (!jsonMode && limit > 100) {
-                    info(
-                        `Warning: fetching up to ${limit} messages. Large history may use significant memory and bandwidth.`,
-                    );
+                    info(`Warning: fetching up to ${limit} messages.`);
                 }
 
-                const api = getApi();
-                const allMessages = [];
-                let lastMsgId = null;
-                let done = false;
-
-                // Start listener (required for WebSocket requestOldMessages)
-                await new Promise((resolve, reject) => {
-                    const timer = setTimeout(() => reject(new Error("Listener connection timeout")), 10000);
-                    api.listener.on("connected", () => {
-                        clearTimeout(timer);
-                        resolve();
+                /** One progress line from the fetch, whichever process runs it. */
+                const report = (e) => {
+                    if (jsonMode || !e?.detail) return;
+                    if (e.level === "warn") warning(e.detail);
+                    else info(e.detail);
+                };
+                const fetchOpts = { limit, scanLimit, timeoutMs: timeout, fromMsgId: opts.fromMsgId || null };
+
+                // The group store, the WebSocket global stream scanning and the
+                // cache write after them are one function, fetchAndCacheHistory,
+                // run by whichever process holds the account: it owns the one web
+                // session the scan needs and is the one db writer (AGENTS.md
+                // §13). With a daemon up that is the daemon, and this command
+                // only displays what it returns.
+                const daemonDir = join(CONFIG_DIR, "accounts", activeAcc.ownId);
+                const daemon = getDaemonChannel(daemonDir);
+                let fetched = null;
+                let handledByDaemon = false;
+                if (daemon) {
+                    // Nothing below fetches, writes or opens a socket in this
+                    // process beside a live daemon: when it cannot answer, the
+                    // command fails and says why.
+                    if (!getSyncChannel(daemonDir, "history")) {
+                        throw new Error(
+                            `a listen/mcp daemon (pid ${daemon.pid}) holds this account but predates the ` +
+                                "history hand-off — restart it, then run this again.",
+                        );
+                    }
+                    report({
+                        detail: `A listen/mcp daemon (pid ${daemon.pid}) holds this account — it fetches and caches; this command only displays.`,
                     });
-                    api.listener.on("error", (err) => {
-                        clearTimeout(timer);
-                        reject(err);
+                    const viaDaemon = await syncViaDaemon(daemonDir, {
+                        stage: "history",
+                        params: { threadId, threadType, ...fetchOpts },
+                        onEvent: report,
                     });
-                    api.listener.start({ retryOnClose: false });
-                });
-
-                // Fetch pages until limit reached or no more messages
-                while (!done && allMessages.length < limit) {
-                    const pageMessages = await new Promise((resolve) => {
-                        const handler = (messages) => {
-                            clearTimeout(timer);
-                            api.listener.removeListener("old_messages", handler);
-                            resolve(messages);
-                        };
-                        const timer = setTimeout(() => {
-                            api.listener.removeListener("old_messages", handler);
-                            resolve([]);
-                        }, timeout);
+                    if (viaDaemon && !viaDaemon.ok) throw new Error(daemonHistoryFailure(viaDaemon, daemon.pid));
+                    // null: gone before the request reached it. Confirmed gone,
+                    // so the session is this process's again.
+                    handledByDaemon = viaDaemon !== null;
+                    fetched = viaDaemon?.result ?? null;
+                }
 
-                        api.listener.on("old_messages", handler);
-                        api.listener.requestOldMessages(threadType, lastMsgId);
+                if (!handledByDaemon) {
+                    fetched = await fetchAndCacheHistory(api, threadId, threadType, {
+                        ...fetchOpts,
+                        cache: dbActive,
+                        onProgress: report,
+                        // No daemon: the session is this process's, and so is
+                        // opening the socket for the scan and closing it after.
+                        connect: async () => {
+                            await new Promise((resolve, reject) => {
+                                const timer = setTimeout(() => reject(new Error("Listener connection timeout")), 10000);
+                                api.listener.once("connected", () => {
+                                    clearTimeout(timer);
+                                    resolve();
+                                });
+                                api.listener.once("error", (err) => {
+                                    clearTimeout(timer);
+                                    reject(err);
+                                });
+                                api.listener.start({ retryOnClose: false });
+                            });
+                            return () => {
+                                try {
+                                    api.listener.stop();
+                                } catch {}
+                            };
+                        },
                     });
+                }
 
-                    if (!pageMessages || pageMessages.length === 0) {
-                        done = true;
-                        break;
-                    }
+                const frames = Array.isArray(fetched?.frames) ? fetched.frames : [];
+                const fetchedMessages = frames.map((f) => historyRow(f.data, f.threadId));
+                if (handledByDaemon && typeof fetched?.added !== "number") {
+                    // Its history stage from before this version returned frames
+                    // for the CLI to write, and nothing here writes them.
+                    warning(
+                        `The listen/mcp daemon (pid ${daemon.pid}) predates cached history: it fetched this ` +
+                            "but cached none of it. Restart it so what msg history fetches is cached.",
+                    );
+                } else if (!jsonMode && fetched?.cached && frames.length > 0) {
+                    info(
+                        `${handledByDaemon ? "The daemon cached" : "Cached"} ${fetched.added} message(s) the local ` +
+                            `database did not have; ${fetched.untouched} already there or not storable were left untouched.`,
+                    );
+                }
 
-                    for (const msg of pageMessages) {
-                        if (allMessages.length >= limit) break;
-                        // API returns messages globally — filter to requested thread
-                        const msgThread = String(msg.threadId || "");
-                        const msgSender = String(msg.data?.uidFrom || "");
-                        const target = String(threadId);
-                        if (msgThread !== target && msgSender !== target) continue;
-                        allMessages.push({
-                            msgId: msg.data?.msgId,
-                            threadId: msg.threadId,
-                            senderId: msg.data?.uidFrom || null,
-                            senderName: msg.data?.dName || null,
-                            text:
-                                typeof msg.data?.content === "string"
-                                    ? msg.data.content
-                                    : extractMessageText(msg.data?.content, msg.data?.msgType),
-                            timestamp: msg.data?.ts ? Number(msg.data.ts) : null,
-                            type: typeof msg.data?.content === "string" ? "text" : msg.data?.msgType || "attachment",
-                        });
-                    }
+                // Merge and sort
+                // If we fetched live, we might want to merge with localMsgs in case we didn't fetch enough to hit the limit
+                const mergedMap = new Map();
+                for (const m of localMsgs) mergedMap.set(m.msgId, m);
+                for (const m of fetchedMessages) mergedMap.set(m.msgId, m);
 
-                    // Use last message's actionId for pagination
-                    const lastMsg = pageMessages[pageMessages.length - 1];
-                    const nextId = lastMsg?.data?.actionId || lastMsg?.data?.msgId;
-                    if (!nextId || nextId === lastMsgId) {
-                        done = true;
-                    }
-                    lastMsgId = nextId;
-                }
+                const mergedArray = Array.from(mergedMap.values());
+                // Sort newest-first (descending timestamp)
+                mergedArray.sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0));
+
+                const result = mergedArray.slice(0, limit);
 
-                // Sort by timestamp (oldest first)
-                allMessages.sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
+                // Format final output
+                const cleanResult = await withCurrentSenderNames(
+                    api,
+                    result.map((m) => {
+                        const r = { ...m };
+                        delete r.raw_data;
+                        return r;
+                    }),
+                    threadType === 0 ? [threadId] : [],
+                );
 
                 output(
                     {
                         threadId,
                         threadType: threadType === 0 ? "dm" : "group",
-                        count: allMessages.length,
-                        messages: allMessages,
+                        count: cleanResult.length,
+                        source: "live",
+                        // A group's store withheld older messages (since-login only).
+                        filtered: fetched?.filtered === true,
+                        messages: cleanResult,
                     },
                     jsonMode,
                     () => {
-                        success(`${allMessages.length} message(s) from ${threadId}`);
-                        for (const m of allMessages) {
+                        success(`${cleanResult.length} message(s) from ${threadId}`);
+                        for (const m of cleanResult) {
                             const date = m.timestamp ? new Date(m.timestamp).toLocaleString() : "?";
-                            const name = m.senderName || m.senderId || "?";
-                            console.log(`  [${date}] ${name}: ${(m.text || "").slice(0, 200)}`);
+                            const name = m.senderDisplayName || m.senderId || "?";
+                            const mediaInfo = m.localPath ? ` [Media: ${m.localPath}]` : "";
+                            console.log(`  [${date}] ${name}: ${(m.text || "").slice(0, 200)}${mediaInfo}`);
                         }
                     },
                 );
 
-                // Clean up listener
-                api.listener.stop();
                 process.exit(0);
             } catch (e) {
                 try {