dsh-mobile-plugin 0.1.86 → 0.1.87

package/lib/mobile/archive-clean.js

@@ -17,10 +17,10 @@
 
 const { sendJson, readJsonBody } = require('../shared/http-util');
 const { withIdempotency, requestIdOf } = require('./idempotency.js');
-const { canonicalDeviceKey, rememberDeletedSessionIds } = require('./session-cache.js');
+const { canonicalDeviceKey, rememberDeletedSessionIds, deletedSessionIdsOf } = require('./session-cache.js');
 const { invalidateSessionList } = require('./sessions.js');
 const { unwrap } = require('./envelope.js');
-const { deleteSessionData } = require('../session-cleanup.cjs');
+const { deleteSessionData, sessionIdsWithoutAnyData } = require('../session-cleanup.cjs');
 
 /**
  * POST /api/mobile/v1/workspace/clear-archived（token）
@@ -43,10 +43,15 @@ async function handleClearArchived(ctx, req, res) {
     if (selected.length === 0) return { status: 200, body: { ok: true, deleted: 0 } };
     const removed = await deleteSessionData(selected);
     // 删的是列表里可见的行：手机端正开着列表，宿主那份快照可能还带着它们，先在本进程压住。
-    rememberDeletedSessionIds(ctx, removed);
+    // 盘上已经没有数据的归档 id 一并压住：上一次删到一半抛错时，已删的那批没记进删除集，
+    // 宿主的进程内清单却还挂着它们 —— 不补记的话再点清理只回 0，手机上永远清不掉。
+    const already = deletedSessionIdsOf(ctx);
+    const cleared = new Set(removed);
+    for (const id of sessionIdsWithoutAnyData(selected)) if (!already.has(id)) cleared.add(id);
+    rememberDeletedSessionIds(ctx, cleared);
     // 不立刻失效的话，最长 10 秒还能点到已删的行。
     invalidateSessionList(ctx);
-    return { status: 200, body: { ok: true, deleted: removed.length } };
+    return { status: 200, body: { ok: true, deleted: cleared.size } };
   });
   sendJson(res, outcome.status, outcome.body);
 }

package/lib/session-cleanup.cjs

@@ -186,6 +186,38 @@ async function archivedIdsWithoutLogs(archivedSessionIds) {
   return [...orphans]
 }
 
+/**
+ * 盘上已经不剩任何会话数据的 id：目录没了，或者目录里只剩宿主锁着的 `session.lock`。
+ *
+ * 只给移动端的「清理所有已归档」补账用：更早一次删除如果删到一半抛错（2026-10-18 前
+ * Windows 的 ENOTEMPTY 就是这样），已经删掉的那批 id 没能记进本进程的删除集，而宿主的
+ * 进程内清单还挂着它们 —— 再点清理只会回 `deleted: 0`，手机上永远清不掉。
+ *
+ * 判据比 archivedIdsWithoutLogs 更宽（那个只认规范名日志），但**不许宽到把迁移中途的
+ * 临时文件当成没有数据**：目录里只要还有任何非锁文件（含子目录）就算「还在」，读不出来
+ * 也按「还在」算。
+ */
+function sessionIdsWithoutAnyData(sessionIds) {
+  const candidates = new Set(sessionIds)
+  const withoutData = new Set()
+  if (candidates.size === 0) return []
+  const visit = (directory) => {
+    let entries
+    try { entries = fs.readdirSync(directory, { withFileTypes: true }) } catch { return }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue
+      const child = path.join(directory, entry.name)
+      if (!candidates.has(entry.name)) { visit(child); continue }
+      candidates.delete(entry.name)
+      let files
+      try { files = fs.readdirSync(child, { withFileTypes: true }) } catch { continue }
+      if (!files.some((file) => !file.name.endsWith('.lock'))) withoutData.add(entry.name)
+    }
+  }
+  visit(path.join(dshHome(), 'sessions'))
+  return [...candidates, ...withoutData]
+}
+
 async function pruneOrphanedArchivedSessions(ctx) {
   const workspaceList = ctx && ctx.apiProxy && ctx.apiProxy.workspace ? ctx.apiProxy.workspace.list : undefined
   if (typeof workspaceList !== 'function') return 0
@@ -308,4 +340,4 @@ function installSessionCleanup(ctx) {
   registerSessionCleanupTool(ctx)
 }
 
-module.exports = { cleanupSessions, registerSessionCleanupTool, installSessionCleanup, deleteSessionData, forgetArchivedSessions, pruneOrphanedArchivedSessions, pruneOrphanedArchivedSessionsOnce }
+module.exports = { cleanupSessions, registerSessionCleanupTool, installSessionCleanup, deleteSessionData, sessionIdsWithoutAnyData, forgetArchivedSessions, pruneOrphanedArchivedSessions, pruneOrphanedArchivedSessionsOnce }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mobile-plugin",
-  "version": "0.1.86",
+  "version": "0.1.87",
   "description": "Mobile API (/api/mobile/v1) and relay client for the DSH mobile app — desktop profile build (0.2.0-rc.2 compatible, peers resolved by the host)",
   "license": "MIT",
   "type": "module",