oh-my-dws 0.0.2 → 0.0.3

package/src/actions.js

@@ -6,6 +6,9 @@ const { spawnSync } = require('node:child_process');
 
 const P = require('./paths');
 const { runDws, PullError } = require('./dws');
+const REV = require('./rev');
+const { myOpenId } = require('./auth');
+const SETTINGS = require('./settings');
 const {
   fmtMinute,
   fmtSecond,
@@ -90,13 +93,37 @@ function pullGroup(short) {
     return t !== 0 ? t : String(a.messageId || '').localeCompare(String(b.messageId || ''));
   });
 
+  // 撤回识别：① 钉钉返回了「撤回」占位文案 ② 这条消息原本有正文，现在被清空
+  const fetchedById = new Map();
+  for (const m of fetched.messages || []) if (m.messageId) fetchedById.set(m.messageId, m);
+  for (const m of merged) {
+    if (m.recalled) continue;
+    const now = fetchedById.get(m.messageId);
+    const txt = String((now && now.text) || m.text || '');
+    const looksRecalled = /撤回了一条消息|^\[已撤回\]|^\[撤回\]/.test(txt);
+    const emptied = now && !String(now.text || '').trim() && String(m.text || '').trim();
+    if (looksRecalled || emptied) {
+      m.recalled = true;
+      m.recalledAt = fmtSecond(new Date());
+      m.recalledBy = m.recalledBy || '';
+      m.text = '';
+      delete m.quotedMessage;
+    }
+  }
+
   doc.messages = merged;
   doc.count = merged.length;
   doc.complete = fetched.complete === undefined ? true : Boolean(fetched.complete);
   doc.hasMore = Boolean(fetched.hasMore);
   doc.queryRange = fetched.queryRange || doc.queryRange;
   doc.lastPullAt = fmtSecond(now);
-  doc.newCount = Number(doc.newCount || 0) + added.length;
+  // 未读只算别人发的：我自己发的消息不点红点
+  const selfId = myOpenId();
+  for (const m of added) {
+    if (!selfId || String(m.senderId || '') !== selfId) m.fresh = true;
+  }
+  const othersAdded = added.filter((m) => !selfId || String(m.senderId || '') !== selfId).length;
+  doc.newCount = Number(doc.newCount || 0) + othersAdded;
   doc.lastAddedAt = added.length ? fmtSecond(now) : doc.lastAddedAt || '';
 
   let mem = null;
@@ -109,6 +136,7 @@ function pullGroup(short) {
   }
 
   writeArchive(short, doc, mem);
+  REV.bump('pull');
   return {
     short,
     added: added.length,
@@ -173,8 +201,15 @@ function markSeen(short) {
   const doc = loadMessages(short);
   if (!doc || !Object.keys(doc).length) throw new PullError(`归档为空：${short}`);
   doc.newCount = 0;
+  let cleared = 0;
+  for (const m of doc.messages || []) {
+    if (m.fresh) {
+      delete m.fresh;
+      cleared += 1;
+    }
+  }
   writeJson(path.join(P.RAW_DIR, short + P.MSG_SUFFIX), doc);
-  return { short, newCount: 0 };
+  return { short, newCount: 0, cleared };
 }
 
 // ---------------------------------------------------------------- @我 聚合
@@ -183,73 +218,96 @@ function mentionsSources() {
   return shortNames().filter((s) => archiveKind(s) === 'group');
 }
 
-function refreshMentions() {
-  const sources = mentionsSources();
-  if (!sources.length && !shortNames().includes(P.MENTIONS_SHORT)) {
-    throw new PullError('还没有已归档的群，无法汇总 @我');
+/** cid → 已归档的群简称 */
+function groupShortByCid() {
+  const map = new Map();
+  for (const s of shortNames()) {
+    if (archiveKind(s) !== 'group') continue;
+    const cid = conversationId(s);
+    if (cid) map.set(cid, s);
   }
-  const old = loadMessages(P.MENTIONS_SHORT);
+  return map;
+}
+
+/**
+ * 汇总 @我：一次 `chat +at-me`（不带 --group）就能覆盖所有会话，
+ * **包括还没归档的群**——这些群在侧栏来源里标「未归档」，点开时再自动归档。
+ *
+ * 只从「起点日」往今天累积（doc.since）：第一次汇总把起点定在今天，
+ * 以后新来的 @我 往上加，很久以前的历史不再往回捞。
+ */
+function refreshMentions({ reset = false } = {}) {
+  const old = reset ? { messages: [], sources: [] } : loadMessages(P.MENTIONS_SHORT);
+  const today = fmtSecond(new Date()).slice(0, 10);
+  const since = reset ? today : (old.since || today);
   const index = new Map();
   for (const m of old.messages || []) if (m.messageId) index.set(m.messageId, m);
+
+  // 回溯天数：从起点日（含）算到今天，最多 3650 天
   const now = new Date();
+  const sinceDate = parseLocal(`${since} 00:00:00`);
+  const days = sinceDate
+    ? Math.min(3650, Math.max(1, Math.floor((now.getTime() - sinceDate.getTime()) / 86400000) + 1))
+    : 1;
+
+  const data = runDws([
+    'chat', '+at-me', '--days', String(days),
+    '--page-all', '--page-limit', '50', '--no-reactions', '--format', 'json',
+  ]);
+  if (data.failedCount) {
+    throw new PullError(`dws 分页存在失败项：${JSON.stringify((data.failures || []).slice(0, 3))}`);
+  }
+
+  const byCid = groupShortByCid();
   const added = [];
-  const errors = [];
+  const sources = new Map(); // cid -> {short, cid, name}
 
-  for (const short of sources) {
-    const cid = conversationId(short);
+  for (const it of data.items || data.messages || []) {
+    const mid = it.messageId;
+    if (!mid) continue;
+    const conv = it.conversation || {};
+    const cid = String(it.conversationId || conv.openConversationId || '');
     if (!cid) continue;
-    const gtitle = groupTitle(short);
-    const gmsgs = loadMessages(short).messages || [];
-    // 回溯天数按该群最早一条消息算，避免默认 7 天漏历史
-    const first = gmsgs.length ? parseLocal(gmsgs[0].createTime) : null;
-    const days = first
-      ? Math.min(3650, Math.max(1, Math.floor((now.getTime() - first.getTime()) / 86400000) + 2))
-      : 7;
-
-    let data;
-    try {
-      data = runDws([
-        'chat', '+at-me', '--group', cid, '--days', String(days),
-        '--page-all', '--no-reactions', '--format', 'json',
-      ]);
-    } catch (err) {
-      errors.push({ short, error: err.message });
+    const short = byCid.get(cid) || '';
+    const name = conv.name || short || cid;
+    if (!sources.has(cid)) sources.set(cid, { short, cid, name });
+
+    if (index.has(mid)) {
+      const hit = index.get(mid);
+      // 之前没归档的群现在归档了，补上 groupShort，便于按来源群筛选
+      if (short && !hit.groupShort) hit.groupShort = short;
       continue;
     }
-
-    for (const it of data.items || data.messages || []) {
-      const mid = it.messageId;
-      if (!mid || index.has(mid)) continue;
-      const conv = it.conversation || {};
-      const m = {
-        conversationId: it.conversationId || cid,
-        messageId: mid,
-        sender: it.sender || '',
-        senderId: it.senderId || '',
-        text: it.text || '',
-        createTime: it.time || it.createTime || '',
-        groupName: conv.name || gtitle,
-        groupShort: short,
-      };
-      index.set(mid, m);
-      added.push(m);
-    }
+    const m = {
+      conversationId: cid,
+      messageId: mid,
+      sender: it.sender || '',
+      senderId: it.senderId || '',
+      text: it.text || '',
+      createTime: it.time || it.createTime || '',
+      groupName: name,
+      groupCid: cid,
+      groupShort: short,
+    };
+    index.set(mid, m);
+    added.push(m);
   }
 
-  const keep = new Set(sources);
+  // 丢掉早于起点日的（历史包袱不往回捞）
   const merged = [...index.values()]
-    .filter((m) => keep.has(m.groupShort || ''))
+    .filter((m) => !since || String(m.createTime || '') >= since)
     .sort((a, b) => {
-      const t = String(a.createTime || '').localeCompare(String(b.createTime || ''));
-      return t !== 0 ? t : String(a.messageId || '').localeCompare(String(b.messageId || ''));
-    });
+    const t = String(a.createTime || '').localeCompare(String(b.createTime || ''));
+    return t !== 0 ? t : String(a.messageId || '').localeCompare(String(b.messageId || ''));
+  });
 
   const doc = {
     conversationId: '@mentions',
     kind: 'mentions',
+    since,
     messages: merged,
     count: merged.length,
-    complete: errors.length === 0,
+    complete: data.complete === undefined ? true : Boolean(data.complete),
     hasMore: false,
     queryRange: {
       startTime: merged.length ? merged[0].createTime : '',
@@ -257,11 +315,12 @@ function refreshMentions() {
     },
     lastPullAt: fmtSecond(now),
     newCount: Number(old.newCount || 0) + added.length,
-    sources: sources.map((s) => ({
-      short: s,
-      name: groupTitle(s),
-      cid: conversationId(s),
-    })),
+    // 来源：只留真的有 @我 消息的会话（已归档的在前）
+    sources: [...sources.values()]
+      .filter((s2) => merged.some((m) => (m.groupCid || '') === s2.cid))
+      .sort((a, b) =>
+      (b.short ? 1 : 0) - (a.short ? 1 : 0) || String(a.name).localeCompare(String(b.name), 'zh')
+    ),
   };
 
   ensureDir(gdir(P.MENTIONS_SHORT));
@@ -270,16 +329,18 @@ function refreshMentions() {
     fs.writeFileSync(infoPath, '# @我的消息\n', 'utf8');
   }
   writeArchive(P.MENTIONS_SHORT, doc, null);
+  REV.bump('mentions');
 
   return {
     short: P.MENTIONS_SHORT,
+    since,
     added: added.length,
     total: merged.length,
     complete: doc.complete,
     hasMore: false,
     window: [doc.queryRange.startTime, doc.queryRange.endTime],
     newIds: added.map((m) => m.messageId),
-    errors,
+    errors: [],
   };
 }
 
@@ -290,6 +351,10 @@ function dmPeer(short) {
   if (doc.peerOpenId) return [doc.peerOpenId, groupTitle(short)];
   const parts = participants(doc.messages || []);
   if (parts.length === 1) return [parts[0][0], parts[0][1]];
+  // 单聊里有两个参与者时，排除自己
+  const me = myOpenId();
+  const others = parts.filter(([id]) => id && id !== me);
+  if (others.length === 1) return [others[0][0], others[0][1]];
   return [null, groupTitle(short)];
 }
 
@@ -345,6 +410,440 @@ async function sendMessage(short, content, aiTag = false) {
   return { sent: true, target, verified, messageId, added };
 }
 
+// ---------------------------------------------------------------- 事件驱动的增量写入
+
+/**
+ * 把实时事件里的一条消息直接写进归档（不调消息接口，省 API 额度）。
+ * 去重按 messageId；返回 { added } 或 { duplicate }。
+ */
+function appendMessage(short, msg) {
+  const mid = String((msg && msg.messageId) || '').trim();
+  if (!mid) return { skipped: 'no-message-id' };
+  if (!shortNames().includes(short)) return { skipped: 'unknown-short' };
+  if (archiveKind(short) === 'mentions') return { skipped: 'mentions' };
+
+  const doc = loadMessages(short);
+  const list = doc.messages || [];
+  if (list.some((m) => String(m.messageId || '') === mid)) return { duplicate: true };
+
+  const sender = String(msg.sender || '');
+  const senderId = String(msg.senderId || '');
+  const createTime = String(msg.createTime || '') || fmtSecond(new Date());
+  const text = String(msg.text || '');
+  if (!sender && !senderId && !text) return { skipped: 'empty' };
+
+  list.push({
+    conversationId: String(msg.conversationId || conversationId(short) || ''),
+    createTime,
+    messageId: mid,
+    sender,
+    senderId,
+    text,
+  });
+  list.sort((a, b) => {
+    const t = String(a.createTime || '').localeCompare(String(b.createTime || ''));
+    return t !== 0 ? t : String(a.messageId || '').localeCompare(String(b.messageId || ''));
+  });
+
+  doc.messages = list;
+  doc.count = list.length;
+  // 自己发的不计未读（手动在钉钉里发的也会回灌到归档，只是不亮红点）
+  const selfId = myOpenId();
+  if (!selfId || senderId !== selfId) {
+    doc.newCount = Number(doc.newCount || 0) + 1;
+    list[list.length - 1].fresh = true;
+  }
+  doc.lastAddedAt = fmtSecond(new Date());
+  doc.queryRange = {
+    startTime: list.length ? list[0].createTime : '',
+    endTime: list.length ? list[list.length - 1].createTime : '',
+  };
+  writeArchive(short, doc, null);
+  REV.bump('event');
+  return { added: 1, messageId: mid };
+}
+
+// ---------------------------------------------------------------- 按人发单聊（常用联系人）
+
+/** 找到这个人对应的单聊归档（没有就返回空，不影响发送） */
+function dmArchiveOf(openId) {
+  for (const s of shortNames()) {
+    if (archiveKind(s) !== 'dm') continue;
+    const doc = loadMessages(s);
+    if (String(doc.peerOpenId || '') === openId) return s;
+    const parts = participants(doc.messages || []);
+    if (parts.length === 1 && parts[0][0] === openId) return s;
+  }
+  return '';
+}
+
+/** 给某个人发单聊：直接用 openDingTalkId，不依赖是否已归档该单聊 */
+async function sendToPerson(openId, content, aiTag = false) {
+  const oid = String(openId || '').trim();
+  if (!oid) throw new PullError('缺少 openDingTalkId');
+  const text = String(content || '').trim();
+  if (!text) throw new PullError('消息内容为空');
+  if (text.length > 4000) throw new PullError('消息过长（>4000 字）');
+
+  const args = ['chat', '+messages-send', '--open-dingtalk-id', oid, '--text', text, '--format', 'json'];
+  if (!aiTag) args.push('--ai-tag', 'false');
+
+  runDws([...args, '--dry-run']); // 先校验目标可解析
+  runDws([...args, '--yes'], { timeout: 90000 });
+
+  // 若已有该单聊归档，顺手回读确认落库
+  const short = dmArchiveOf(oid);
+  let verified = false;
+  let messageId = '';
+  if (short) {
+    try {
+      pullGroup(short);
+      const msgs = loadMessages(short).messages || [];
+      for (let i = msgs.length - 1; i >= 0; i -= 1) {
+        if (String(msgs[i].text || '').trim() === text) {
+          messageId = msgs[i].messageId || '';
+          verified = true;
+          break;
+        }
+      }
+    } catch {
+      /* 回读失败不影响已发出 */
+    }
+  }
+
+  return { sent: true, target: `单聊:${oid}`, verified, messageId, short, added: 0 };
+}
+
+// ---------------------------------------------------------------- 私聊聚合
+
+/**
+ * 所有私聊消息汇总成一条时间线（只汇总已归档的单聊，也就是点开过 / 在常用联系人里点开的）。
+ * 返回 { messages, peers }：peers 用来渲染「哪些人找我说话」。
+ */
+function dmTimeline({ limit = 5000 } = {}) {
+  const peers = [];
+  const out = [];
+  const me = myOpenId();
+  for (const short of shortNames()) {
+    if (archiveKind(short) !== 'dm') continue;
+    const doc = loadMessages(short);
+    const msgs = doc.messages || [];
+    if (!msgs.length) continue;
+    const parts = participants(msgs);
+    const peerOpenId = String(
+      doc.peerOpenId || (parts.find(([id]) => id && id !== me) || [''])[0] || ''
+    );
+    const name = groupTitle(short) || short;
+    let fromPeer = 0;
+    let unread = 0;
+    let lastTime = '';
+    for (const m of msgs) {
+      if (String(m.senderId || '') === me) continue;
+      fromPeer += 1;
+      if (m.fresh) unread += 1;
+      lastTime = m.createTime || lastTime;
+      out.push({
+        conversationId: m.conversationId || '',
+        messageId: m.messageId || '',
+        sender: m.sender || name,
+        senderId: m.senderId || '',
+        text: m.text || '',
+        createTime: m.createTime || '',
+        recalled: m.recalled || false,
+        fresh: Boolean(m.fresh),
+        recalledBy: m.recalledBy || '',
+        recalledAt: m.recalledAt || '',
+        groupShort: short,
+        groupName: name,
+        peerOpenId,
+      });
+    }
+    peers.push({ short, name, openId: peerOpenId, count: fromPeer, unread, lastTime });
+  }
+  out.sort((a, b) => {
+    const t = String(a.createTime || '').localeCompare(String(b.createTime || ''));
+    return t !== 0 ? t : String(a.messageId || '').localeCompare(String(b.messageId || ''));
+  });
+  const messages = out.length > limit ? out.slice(-limit) : out;
+  peers.sort((a, b) => String(b.lastTime || '').localeCompare(String(a.lastTime || '')));
+  return {
+    messages,
+    peers,
+    count: messages.length,
+    total: out.length,
+    peerCount: peers.length,
+    unread: out.filter((m) => m.fresh).length,
+  };
+}
+
+// ---------------------------------------------------------------- 撤回自己的消息
+
+/** 撤回自己发的一条消息（DingTalk 限制只能撤回自己发的） */
+async function recallMessage(short, messageId) {
+  const mid = String(messageId || '').trim();
+  if (!mid) throw new PullError('缺少 messageId');
+
+  // 先在本工具里找到这条消息，确认是我发的，并拿到会话 ID
+  let cid = '';
+  let msg = null;
+  const candidates = [];
+  if (short && shortNames().includes(short)) candidates.push(short);
+  if (!short || archiveKind(short) === 'mentions') {
+    for (const s2 of shortNames()) if (!candidates.includes(s2)) candidates.push(s2);
+  }
+  for (const s2 of candidates) {
+    const list = loadMessages(s2).messages || [];
+    const hit = list.find((m) => String(m.messageId || '') === mid);
+    if (hit) {
+      msg = hit;
+      cid = String(hit.conversationId || conversationId(s2) || '');
+      break;
+    }
+  }
+  if (!msg) throw new PullError('归档里没有这条消息，先「拉取最新消息」再试');
+  const me = myOpenId();
+  if (!me) throw new PullError('拿不到自己的 openDingTalkId，无法确认归属');
+  if (String(msg.senderId || '') !== me) throw new PullError('只能撤回自己发的消息');
+  if (!cid) throw new PullError('这条消息缺少会话 ID');
+
+  runDws(['chat', 'message', 'recall', '--conversation-id', cid, '--message-id', mid, '--format', 'json'], {
+    timeout: 60000,
+  });
+
+  // 本地立刻打标记（不依赖钉钉回读）
+  markRecalledByMessageId(mid, '我');
+  // 顺手回读，让归档和钉钉一致
+  const owner = short && shortNames().includes(short) && archiveKind(short) !== 'mentions' ? short : null;
+  if (owner) {
+    try {
+      pullGroup(owner);
+    } catch {}
+  }
+  REV.bump('recall');
+  return { ok: true, messageId: mid, cid };
+}
+
+/** 把某条消息标成「已撤回」：清空正文，留撤回人和时间 */
+function markRecalled(short, messageId, recaller = '') {
+  const mid = String(messageId || '').trim();
+  if (!mid || !shortNames().includes(short)) return { skipped: true };
+  const doc = loadMessages(short);
+  const list = doc.messages || [];
+  const hit = list.find((m) => String(m.messageId || '') === mid);
+  if (!hit) return { skipped: 'not-found' };
+  if (hit.recalled) return { duplicate: true };
+  hit.recalled = true;
+  hit.recalledAt = fmtSecond(new Date());
+  hit.recalledBy = String(recaller || '');
+  hit.text = '';
+  delete hit.quotedMessage;
+  writeArchive(short, doc, null);
+  REV.bump('recall-event');
+  return { ok: true, messageId: mid };
+}
+
+/** 按消息 ID 在所有归档里找并标记（撤回事件只知道 messageId） */
+function markRecalledByMessageId(messageId, recaller = '') {
+  const mid = String(messageId || '').trim();
+  if (!mid) return { skipped: true };
+  for (const short of shortNames()) {
+    const list = loadMessages(short).messages || [];
+    if (list.some((m) => String(m.messageId || '') === mid)) {
+      return markRecalled(short, mid, recaller);
+    }
+  }
+  return { skipped: 'not-found' };
+}
+
+// ---------------------------------------------------------------- 发图片/文件
+
+/**
+ * 发送剪贴板/拖进来的图片：CLI 只有「本地文件」通道（--msg-type file），
+ * 所以会作为**文件消息**发出去（钉钉里显示成可下载的附件，不是内联图片）。
+ */
+/** 发送目标：优先用传入的 cid/openId，其次按归档推断 */
+function resolveSendTarget({ short = '', cid = '', openId = '' } = {}) {
+  let targetCid = String(cid || '').trim();
+  let targetOpen = String(openId || '').trim();
+  if (!targetCid && !targetOpen && short && shortNames().includes(short)) {
+    if (archiveKind(short) === 'dm') {
+      const [oid] = dmPeer(short);
+      targetOpen = oid || '';
+    } else {
+      targetCid = conversationId(short) || '';
+    }
+  }
+  if (!targetCid && !targetOpen) throw new PullError('缺少会话目标（cid / openDingTalkId）');
+  return { targetCid, targetOpen };
+}
+
+/** dataURL → Buffer + 扩展名 */
+function decodeDataUrl(dataUrl) {
+  const m = String(dataUrl).match(/^data:(image\/[a-z+]+);base64,([A-Za-z0-9+/=\s]+)$/i);
+  if (!m) throw new PullError('只支持图片（png/jpg/webp/gif）');
+  const mime = m[1].toLowerCase();
+  const ext = mime.includes('png') ? 'png'
+    : mime.includes('jpeg') || mime.includes('jpg') ? 'jpg'
+      : mime.includes('webp') ? 'webp' : 'gif';
+  const buf = Buffer.from(m[2].replace(/\s/g, ''), 'base64');
+  if (!buf.length) throw new PullError('图片内容为空');
+  return { buf, ext };
+}
+
+/**
+ * 图文混排发送：文字 + 一张或多张图片合成**一条** markdown 消息
+ * （钉钉只有公网 URL 的 markdown 图片才会内联渲染，所以图片要先传图床）
+ */
+async function sendRich({ short = '', cid = '', openId = '', text = '', images = [], names = [] } = {}) {
+  const body = String(text || '').trim();
+  const list = Array.isArray(images) ? images.filter(Boolean) : [];
+  if (!body && !list.length) throw new PullError('没有内容可发');
+  const { targetCid, targetOpen } = resolveSendTarget({ short, cid, openId });
+
+  const dir = path.join(P.MEDIA_DIR, '已发');
+  ensureDir(dir);
+  const urls = [];
+  const saved = [];
+  for (let i = 0; i < list.length; i += 1) {
+    const { buf, ext } = decodeDataUrl(list[i]);
+    if (buf.length > 20 * 1024 * 1024) throw new PullError('图片太大（>20MB）');
+    const raw = String((names && names[i]) || `image-${i + 1}`).replace(/\.[^.]+$/, '');
+    const base = raw.replace(/[^A-Za-z0-9_\u4e00-\u9fa5-]/g, '').slice(0, 40) || 'image';
+    let file = `${base}.${ext}`;
+    for (let k = 2; fs.existsSync(path.join(dir, file)); k += 1) file = `${base}-${k}.${ext}`;
+    fs.writeFileSync(path.join(dir, file), buf);
+    saved.push(file);
+    urls.push(uploadImage(path.join(dir, file)));
+  }
+
+  const content = [body, ...urls.map((u) => `![](${u})`)].filter(Boolean).join('\n\n');
+  const args = ['chat', 'message', 'send'];
+  if (targetCid) args.push('--conversation-id', targetCid);
+  else args.push('--open-dingtalk-id', targetOpen);
+  args.push('--content', content);
+  if (body) args.push('--title', body.slice(0, 20));
+  args.push('--yes', '--format', 'json');
+  runDws(args, { timeout: 120000 });
+
+  if (short && shortNames().includes(short) && archiveKind(short) !== 'mentions') {
+    setTimeout(() => {
+      try {
+        pullGroup(short);
+      } catch {}
+    }, 1500).unref?.();
+  }
+  return { sent: true, text: body, images: urls.length, files: saved, content, target: targetCid || targetOpen };
+}
+
+const UPLOAD_SCRIPT = process.env.IMAGE_UPLOAD_SCRIPT
+  || '/Users/dds/.agents/skills/inke-image-upload/scripts/upload-image.mjs';
+
+/** 把本地图片传到图床，拿公网 URL（钉钉 markdown 图片必须有公网地址才能内联渲染） */
+function uploadImage(file) {
+  if (!fs.existsSync(UPLOAD_SCRIPT)) {
+    throw new PullError(`找不到图床上传脚本：${UPLOAD_SCRIPT}（可用 IMAGE_UPLOAD_SCRIPT 指定）`);
+  }
+  const r = spawnSync(process.execPath, [UPLOAD_SCRIPT, file], {
+    encoding: 'utf8',
+    timeout: 120000,
+    maxBuffer: 8 * 1024 * 1024,
+  });
+  const out = `${r.stdout || ''}`.trim();
+  if (r.status !== 0 || !out.includes('{')) {
+    throw new PullError(`图片上传失败：${((r.stderr || out) || '').slice(0, 300)}`);
+  }
+  let j;
+  try {
+    j = JSON.parse(out.slice(out.indexOf('{')));
+  } catch {
+    throw new PullError(`图片上传返回无法解析：${out.slice(0, 200)}`);
+  }
+  const url = String((j && (j.url || (j.data && j.data.url))) || '');
+  if (!url) throw new PullError(`图片上传没返回 URL：${out.slice(0, 200)}`);
+  return url;
+}
+
+/**
+ * 贴图发送：
+ *   mode=inline（默认）→ 传到图床拿公网 URL，用 markdown 图片发出去（钉钉里是内联图片）
+ *   mode=file        → 走本地文件通道（作为附件）
+ */
+async function sendImage({ short = '', cid = '', openId = '', dataUrl = '', name = '', mode = '' } = {}) {
+  const m = String(dataUrl).match(/^data:(image\/[a-z+]+);base64,([A-Za-z0-9+/=\s]+)$/i);
+  if (!m) throw new PullError('只支持图片（png/jpg/webp/gif）');
+  const ext = m[1].toLowerCase().includes('png') ? 'png'
+    : m[1].toLowerCase().includes('jpeg') || m[1].toLowerCase().includes('jpg') ? 'jpg'
+      : m[1].toLowerCase().includes('webp') ? 'webp' : 'gif';
+  const buf = Buffer.from(m[2].replace(/\s/g, ''), 'base64');
+  if (!buf.length) throw new PullError('图片内容为空');
+  if (buf.length > 20 * 1024 * 1024) throw new PullError('图片太大（>20MB）');
+
+  const { targetCid, targetOpen } = resolveSendTarget({ short, cid, openId });
+
+  // 存到 _媒体/已发/：钉钉不开放 fileId 下载，所以自己发的图要留本地副本才能回显
+  const dir = path.join(P.MEDIA_DIR, '已发');
+  ensureDir(dir);
+  const raw = String(name || '').replace(/\.[^.]+$/, '');
+  const base = (raw.replace(/[^A-Za-z0-9_\u4e00-\u9fa5-]/g, '').slice(0, 40) || 'image');
+  let file = `${base}.${ext}`;
+  for (let i = 2; fs.existsSync(path.join(dir, file)); i += 1) file = `${base}-${i}.${ext}`;
+  fs.writeFileSync(path.join(dir, file), buf);
+  try {
+    const idxFile = path.join(dir, '_index.json');
+    let idx = {};
+    try {
+      idx = JSON.parse(fs.readFileSync(idxFile, 'utf8'));
+    } catch {}
+    idx[file] = { at: fmtSecond(new Date()), target: targetCid || targetOpen };
+    fs.writeFileSync(idxFile, `${JSON.stringify(idx, null, 2)}\n`, 'utf8');
+  } catch {}
+
+  const base1 = ['chat', 'message', 'send'];
+  if (targetCid) base1.push('--conversation-id', targetCid);
+  else base1.push('--open-dingtalk-id', targetOpen);
+
+  let mode1 = mode || SETTINGS.prefs().imageSendMode || 'inline';
+  let imageUrl = '';
+  if (mode1 !== 'file') {
+    try {
+      imageUrl = uploadImage(path.join(dir, file));
+      runDws([...base1, '--content', `![](${imageUrl})`, '--title', '图片', '--yes', '--format', 'json'], {
+        timeout: 120000,
+      });
+    } catch (e) {
+      // 图床不通就退回文件方式，别让用户白粘一次
+      mode1 = 'file';
+      runDws([...base1, '--msg-type', 'file', '--file', `./${file}`, '--yes', '--format', 'json'], {
+        cwd: dir,
+        timeout: 120000,
+      });
+      mode1 = `file（内联失败：${e.message.slice(0, 80)}）`;
+    }
+  } else {
+    runDws([...base1, '--msg-type', 'file', '--file', `./${file}`, '--yes', '--format', 'json'], {
+      cwd: dir,
+      timeout: 120000,
+    });
+  }
+
+  // 让归档尽快跟上（失败不影响发送结论）
+  if (short && shortNames().includes(short) && archiveKind(short) !== 'mentions') {
+    setTimeout(() => {
+      try {
+        pullGroup(short);
+      } catch {}
+    }, 1500).unref?.();
+  }
+  return {
+    sent: true,
+    file,
+    imageUrl,
+    mode: mode1,
+    target: targetCid || targetOpen,
+    via: targetCid ? 'group' : 'dm',
+  };
+}
+
 // ---------------------------------------------------------------- 打开钉钉
 
 function copyToClipboard(text) {
@@ -356,13 +855,32 @@ function copyToClipboard(text) {
   }
 }
 
-function openInDingtalk(short, messageId = '', copyOnly = false) {
-  if (!shortNames().includes(short)) throw new PullError(`未登记该归档：${short}`);
-  const doc = loadMessages(short);
-  const cid = conversationId(short);
-  const msgs = doc.messages || [];
-  const msg = messageId ? msgs.find((m) => m.messageId === messageId) : null;
-  const name = groupTitle(short);
+/**
+ * 唤起钉钉 / 复制定位信息。
+ * - short 传了：按归档里的消息拼
+ * - 没传 short（@我 里来自未归档群的）：用传入的 raw {cid,name,text,time,sender} 拼，一样能复制去钉钉里搜
+ */
+function openInDingtalk(short, messageId = '', copyOnly = false, raw = null) {
+  const archived = Boolean(short) && shortNames().includes(short);
+  if (!archived && !raw) throw new PullError(`未登记该归档：${short}`);
+  let cid = '';
+  let name = '';
+  let msg = null;
+  if (archived) {
+    const doc = loadMessages(short);
+    cid = conversationId(short);
+    const msgs = doc.messages || [];
+    msg = messageId ? msgs.find((m) => m.messageId === messageId) : null;
+    name = groupTitle(short);
+  } else {
+    cid = String(raw.cid || '');
+    name = String(raw.name || '');
+    msg = {
+      createTime: String(raw.time || ''),
+      sender: String(raw.sender || ''),
+      text: String(raw.text || ''),
+    };
+  }
 
   const lines = [`群：${name}`];
   if (msg) {
@@ -434,6 +952,7 @@ function deleteArchive(short, purge = false) {
   }
 
   writeIndexMd();
+  REV.bump('delete');
   return { short, purged: purge, trash: trashed };
 }
 
@@ -446,7 +965,15 @@ module.exports = {
   mentionsSources,
   refreshMentions,
   dmPeer,
+  appendMessage,
+  markRecalled,
+  markRecalledByMessageId,
+  dmTimeline,
+  sendImage,
+  sendRich,
   sendMessage,
+  recallMessage,
+  sendToPerson,
   openInDingtalk,
   deleteArchive,
 };