dsh-recall-plugin 2.3.19 → 2.3.20

package/lib/routes-core.js

@@ -79,8 +79,8 @@ function createRoutesCore(deps) {
       });
       if (!result.ok) return result;
       const cutSeq = await snaps.resolveCutSeq(sessionId, id);
-      const staleQueueRpcIds = await snaps.resolveStaleQueueRpcIds(sessionId, cutSeq);
-      return { ok: true, count: result.count, cutSeq, staleQueueRpcIds };
+      const staleQueueItemIds = await snaps.resolveStaleQueueItemIds(sessionId, cutSeq);
+      return { ok: true, count: result.count, cutSeq, staleQueueItemIds };
     },
     // 设置页排障：最近错误（Host 侧 console.error 的页面可见副本）。
     // M1-D3/D5：条目自带 count/kind（recordError 富集）——count 在服务端

package/lib/snapshots.js

@@ -71,7 +71,7 @@ function scanCutSeqDetail(events, messageId) {
 function scanCutSeq(events, messageId) {
   return scanCutSeqDetail(events, messageId).cut;
 }
-function scanStaleQueueRpcIds(events, cutSeq) {
+function scanStaleQueueItemIds(events, cutSeq) {
   if (!Array.isArray(events)) return [];
   if (typeof cutSeq !== "number" || !Number.isFinite(cutSeq)) return [];
   const out = [];
@@ -83,12 +83,20 @@ function scanStaleQueueRpcIds(events, cutSeq) {
     for (const item of inserted) {
       const source = item && item.source;
       if (!source || source.kind !== "user") continue;
-      const rpcId = source.rpcId;
-      if (typeof rpcId === "string" && rpcId !== "" && out.indexOf(rpcId) < 0) out.push(rpcId);
+      const id = item.id;
+      if (typeof id === "string" && id !== "" && out.indexOf(id) < 0) out.push(id);
     }
   }
   return out;
 }
+function liveEventsOf(live) {
+  if (!live) return null;
+  if (typeof live.snapshotEvents === "function") {
+    const events = live.snapshotEvents();
+    if (Array.isArray(events)) return events;
+  }
+  return Array.isArray(live.events) ? live.events : null;
+}
 function disposeLease(lease) {
   const disposeSymbol = Symbol.dispose;
   if (!disposeSymbol || lease === null || typeof lease !== "object") return;
@@ -427,30 +435,31 @@ function createSnapshots(ctx, rt, config) {
     state.cutSeqCache.set(cacheKey, result);
     return result;
   }
-  async function resolveStaleQueueRpcIds(sessionId, cutSeq) {
+  async function resolveStaleQueueItemIds(sessionId, cutSeq) {
     if (!sessionId || typeof cutSeq !== "number" || !Number.isFinite(cutSeq)) return [];
-    const live = sessions.get(sessionId);
-    if (live && Array.isArray(live.events)) return scanStaleQueueRpcIds(live.events, cutSeq);
+    const live = liveEventsOf(sessions.get(sessionId));
+    if (live) return scanStaleQueueItemIds(live, cutSeq);
     const query = ctx.get("sessionQuery");
     if (!query) return [];
-    try {
-      const log = await query.readSession(sessionId);
-      if (log && Array.isArray(log.events)) return scanStaleQueueRpcIds(log.events, cutSeq);
-    } catch (error) {
-    }
-    if (typeof query.observeSession !== "function") return [];
-    try {
-      const lease = await query.observeSession(sessionId);
+    if (typeof query.observeSession === "function") {
       try {
-        return lease && Array.isArray(lease.events) ? scanStaleQueueRpcIds(lease.events, cutSeq) : [];
-      } finally {
-        disposeLease(lease);
+        const lease = await query.observeSession(sessionId);
+        try {
+          return lease && Array.isArray(lease.events) ? scanStaleQueueItemIds(lease.events, cutSeq) : [];
+        } finally {
+          disposeLease(lease);
+        }
+      } catch (error) {
       }
+    }
+    try {
+      const log = await query.readSession(sessionId);
+      return log && Array.isArray(log.events) ? scanStaleQueueItemIds(log.events, cutSeq) : [];
     } catch (error) {
       return [];
     }
   }
-  return { saveIndex, loadIndex, readExclude, writeExclude, rebuildOrphans, captureSnapshot, diffFor, rollbackFor, resolveCutSeq, resolveStaleQueueRpcIds, feedbackFor, loadLineage, recordLineage };
+  return { saveIndex, loadIndex, readExclude, writeExclude, rebuildOrphans, captureSnapshot, diffFor, rollbackFor, resolveCutSeq, resolveStaleQueueItemIds, feedbackFor, loadLineage, recordLineage };
 }
 export {
   createSnapshots,
@@ -463,5 +472,5 @@ export {
   rescueRollback,
   scanCutSeq,
   scanCutSeqDetail,
-  scanStaleQueueRpcIds
+  scanStaleQueueItemIds
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recall-plugin",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "在 DSH 中撤回自己发过的消息：工作区文件与对话历史一起回到那条消息发出之前，消息的文本与附件自动放回输入框，改完即可重发。文件走独立影子 git 快照（不碰项目自身的 git），对话走官方 sessions.fork，原会话归档可找回。",
   "type": "module",
   "repository": {