dsh-ws-recency 0.10.0 → 0.10.1

package/README.md

@@ -73,6 +73,8 @@ DSH 原生的置顶只把会话顶到**它所属工作区分组的第一行**，
 
 口径说明：prompt 的 token 是「整段上下文每一步都计费」，没法精确归属到某一条消息，所以「主 agent / 工具」的拆分是按内容长度估算（中文≈1 token/字，英文≈4 字符/token），用来比较占比；**总量是真的**。数据从会话日志算，跨重启也能看。大会话第一次打开约 1–2 秒（29MB 日志实测 1.2 秒），10 秒内重复打开走缓存。
 
+宿主半（`index.js`）把统计与删除的路由挂在 webServer 上；如果面板报“宿主半未加载”，说明应用还没重启加载新版本。0.10.1 起面板失败时会带上 HTTP 状态和 `/ws-recency/health` 的自检结果，便于定位。
+
 ## 设置
 
 **设置 → 通用**：
@@ -108,7 +110,7 @@ dsh plugin --profile <profile> add github:chyxhtc/dsh-ws-recency
 或固定版本的预构建包：
 
 ```powershell
-dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.10.0/dsh-ws-recency-0.10.0.tgz
+dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.10.1/dsh-ws-recency-0.10.1.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -179,6 +179,8 @@
           "stats.col.share": "\u5360\u6bd4",
           "stats.note": "\u5408\u8ba1\u6765\u81ea\u6bcf\u6b65\u8bb0\u5f55\u7684\u771f\u5b9e usage\uff08\u7f13\u5b58\u547d\u4e2d + \u8f93\u5165 + \u8f93\u51fa\uff09\uff1b\u672c\u8868\u6309\u6765\u6e90\u7684\u62c6\u5206\u662f\u6309\u5185\u5bb9\u957f\u5ea6\u4f30\u7b97\uff08\u4e2d\u6587\u7ea6 1 token/\u5b57\uff0c\u82f1\u6587\u7ea6 4 \u5b57\u7b26/token\uff09\uff0c\u7528\u4e8e\u6bd4\u8f83\u5360\u6bd4\uff0c\u4e0d\u662f\u8ba1\u8d39\u53e3\u5f84\u3002",
           "stats.agentDetail": "主 agent 构成：思考 {reasoning} · 回复 {text} · 用户消息 {user} · 系统提示 {system}",
+          "stats.diagnose.unmounted": "\n\n（宿主半已加载，但统计路由没挂上——重启应用再试）",
+          "stats.diagnose.noHost": "\n\n（宿主半未加载：需要重启应用加载新版本）",
           "trash.confirm": "\u5220\u9664\u8fd9\u4e2a\u4f1a\u8bdd\uff1f\n\n\u4f1a\u5148\u505c\u6b62\u5b83\u6b63\u5728\u8fdb\u884c\u7684\u5de5\u4f5c\uff0c\u518d\u628a\u65e5\u5fd7\u76ee\u5f55\u79fb\u5165\u56de\u6536\u7ad9\uff08\u4e0d\u662f\u7269\u7406\u5220\u9664\uff0c\u53ef\u4ee5\u624b\u52a8\u6062\u590d\uff09\u3002",
           "trash.failed": "\u5220\u9664\u5931\u8d25\uff1a",
         };
@@ -217,6 +219,8 @@
           "stats.col.share": "share",
           "stats.note": "Totals come from the recorded per-step usage (cache read + input + output). The per-source split is estimated from content length (about 1 token per CJK character, 4 characters per token otherwise) so the shares are comparable, not billable.",
           "stats.agentDetail": "Agent composition: reasoning {reasoning} \u00b7 reply {text} \u00b7 user messages {user} \u00b7 system prompt {system}",
+          "stats.diagnose.unmounted": "\n\n(the host half is loaded but the statistics route did not mount - restart the app and retry)",
+          "stats.diagnose.noHost": "\n\n(the host half is not loaded: restart the app to pick up the new version)",
           "trash.confirm": "Delete this session?\n\nIt stops whatever the session is running, then moves the log directory into the trash folder (a move, not an erase: you can restore it by hand).",
           "trash.failed": "Delete failed: ",
         };
@@ -885,16 +889,22 @@
               var question = t("trash.confirm");
               var confirmed = typeof window.confirm === "function" ? window.confirm(question) : false;
               if (!confirmed) return;
-              fetch("/ws-recency/session-trash", {
+              fetch("/ws-recency/session-trash?sessionId=" + encodeURIComponent(props.sessionId), {
                 method: "POST",
                 headers: { "content-type": "application/json" },
                 body: JSON.stringify({ sessionId: props.sessionId }),
               })
-                .then(function (response) { return response.json(); })
+                .then(function (response) {
+                  return response.text().then(function (text) {
+                    var parsed = null;
+                    try { parsed = JSON.parse(text); } catch (error) { parsed = null; }
+                    return { status: response.status, text: text, json: parsed };
+                  });
+                })
                 .then(function (result) {
-                  if (result !== null && result.ok !== true && typeof window.alert === "function") {
-                    window.alert(t("trash.failed") + (result.error || "unknown"));
-                  }
+                  if (result.json !== null && result.json.ok === true) return;
+                  var reason = (result.json !== null && result.json.error) || (result.text || "").trim().slice(0, 120) || "(empty response)";
+                  if (typeof window.alert === "function") window.alert(t("trash.failed") + "HTTP " + result.status + " \u00b7 " + reason);
                 })
                 .catch(function (error) {
                   if (typeof window.alert === "function") window.alert(t("trash.failed") + (error && error.message ? error.message : error));
@@ -1054,22 +1064,50 @@
           statsModal = backdrop;
           document.addEventListener("keydown", onStatsKey);
 
-          fetch("/ws-recency/session-stats", {
+          var controller = typeof AbortController === "function" ? new AbortController() : null;
+          var timer = controller === null ? null : window.setTimeout(function () { controller.abort(); }, 180000);
+          var request = fetch("/ws-recency/session-stats?sessionId=" + encodeURIComponent(sessionId), {
             method: "POST",
             headers: { "content-type": "application/json" },
             body: JSON.stringify({ sessionId: sessionId }),
-          })
-            .then(function (response) { return response.json(); })
-            .then(function (result) {
-              if (result === null || result.ok !== true) {
-                body.textContent = t("stats.failed") + (result && result.error ? result.error : "unknown");
-                return;
-              }
-              renderStats(body, result.stats);
-            })
-            .catch(function (error) {
-              body.textContent = t("stats.failed") + (error && error.message ? error.message : error);
+            signal: controller === null ? undefined : controller.signal,
+          }).then(function (response) {
+            if (timer !== null) window.clearTimeout(timer);
+            return response.text().then(function (text) {
+              var parsed = null;
+              try { parsed = JSON.parse(text); } catch (error) { parsed = null; }
+              return { status: response.status, text: text, json: parsed };
             });
+          }, function (error) {
+            if (timer !== null) window.clearTimeout(timer);
+            throw error;
+          });
+
+          request.then(function (result) {
+            if (result.status === 200 && result.json !== null && result.json.ok === true) {
+              renderStats(body, result.json.stats);
+              return;
+            }
+            var reason = (result.json !== null && result.json.error)
+              || (result.text || "").trim().slice(0, 120)
+              || "(empty response)";
+            body.textContent = t("stats.failed") + "HTTP " + result.status + " \u00b7 " + reason;
+            /* A 405 here is the SPA fallback answering an unknown POST: the host
+               half never mounted. Ask the health route which part is missing. */
+            return fetch("/ws-recency/health").then(function (response) {
+              return response.text();
+            }).then(function (text) {
+              var health = null;
+              try { health = JSON.parse(text); } catch (error) { health = null; }
+              body.textContent += health !== null && health.ok === true
+                ? t("stats.diagnose.unmounted")
+                : t("stats.diagnose.noHost");
+            }).catch(function () {
+              body.textContent += t("stats.diagnose.noHost");
+            });
+          }).catch(function (error) {
+            body.textContent = t("stats.failed") + (error && error.message ? error.message : error);
+          });
         }
 
         /** Session "..." menu row: token statistics of that session. */

package/index.js

@@ -19,24 +19,41 @@
  *
  * @module dsh-ws-recency
  */
-import { access, mkdir, readFile, readdir, rename, stat } from "node:fs/promises";
+import { mkdir, readdir, rename } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { zstdDecompressSync } from "node:zlib";
 
 /** Cordis plugin name shown by the loader. */
 export const name = "ws-recency";
 
-/** Host services this module asks for; `webServer` is injected separately. */
-export const inject = ["sessionPersistence", "workspaceRegistry", "sessions"];
+/** Version marker reported by the health route. */
+export const HOST_VERSION = "0.10.1";
 
-/** Exact route the client half calls. */
+/**
+ * Exact routes the client half calls. Registered on the bare web server, so they
+ * win over the SPA's fallback (which answers unknown POSTs with an empty 405).
+ */
 export const TRASH_SESSION_PATH = "/ws-recency/session-trash";
+export const STATS_SESSION_PATH = "/ws-recency/session-stats";
+export const HEALTH_PATH = "/ws-recency/health";
 
 const STOP_SETTLE_MS = 500;
 const MAX_BODY_BYTES = 16 * 1024;
 const RENAME_RETRY = 4;
 const RENAME_GAP_MS = 150;
 
+/** `?sessionId=` first, then the JSON body: a middleware may have consumed the body. */
+function sessionIdFrom(req, body) {
+  try {
+    const url = new URL(req.url ?? "/", "http://localhost");
+    const fromQuery = url.searchParams.get("sessionId");
+    if (typeof fromQuery === "string" && fromQuery.trim() !== "") return fromQuery.trim();
+  } catch {
+    /* fall through to the body */
+  }
+  return body !== null && body !== undefined && typeof body.sessionId === "string" ? body.sessionId.trim() : "";
+}
+
+/** Only the app itself may call these routes: a foreign origin is refused. */
 function loopbackOrigin(req) {
   const origin = req.headers.origin;
   if (origin === undefined) return true;
@@ -197,7 +214,7 @@ export async function handleTrashRequest(ctx, req, res) {
   }
   try {
     const body = await readJsonBody(req);
-    const sessionId = body !== null && typeof body.sessionId === "string" ? body.sessionId.trim() : "";
+    const sessionId = sessionIdFrom(req, body);
     if (sessionId === "") {
       sendJson(res, 400, { ok: false, error: "sessionId required" });
       return;
@@ -224,9 +241,6 @@ export async function handleTrashRequest(ctx, req, res) {
  * decoding each frame is what makes the whole transcript readable.
  * ------------------------------------------------------------------------- */
 
-export const STATS_SESSION_PATH = "/ws-recency/session-stats";
-
-const ZSTD_MAGIC = Buffer.from([0x28, 0xb5, 0x2f, 0xfd]);
 const STATS_CACHE_MS = 10 * 1000;
 const statsCache = new Map();
 
@@ -362,86 +376,61 @@ export function aggregateSession(events) {
   return summary;
 }
 
-/** Decode every Zstandard frame of a session log and parse its JSONL records. */
-export async function readSessionEvents(path) {
-  const bytes = await readFile(path);
-  const offsets = [];
-  let at = bytes.indexOf(ZSTD_MAGIC, 0);
-  while (at !== -1) {
-    offsets.push(at);
-    at = bytes.indexOf(ZSTD_MAGIC, at + 4);
-  }
-  const parts = [];
-  for (let index = 0; index < offsets.length; index += 1) {
-    const end = index + 1 < offsets.length ? offsets[index + 1] : bytes.length;
-    try {
-      parts.push(zstdDecompressSync(bytes.subarray(offsets[index], end)));
-    } catch {
-      /* a torn tail: the rest of the log is still usable */
-    }
-  }
-  const events = [];
-  for (const line of Buffer.concat(parts).toString("utf8").split("\n")) {
-    if (line === "") continue;
-    try {
-      events.push(JSON.parse(line));
-    } catch {
-      /* a torn final record */
-    }
-  }
-  return events;
-}
-
-/** Absolute path of a session log, or undefined when it is gone. */
-async function sessionLogPath(ctx, sessionId) {
+/**
+ * Read a session's events through the host's own persistence seam.
+ *
+ * Decoding the log by hand looked simpler, but it is a chain of independent
+ * Zstandard frames, and the host's Node build is not guaranteed to ship a zstd
+ * decoder. The persistence service owns both concerns (it carries its own frame
+ * decoder), so ask it instead of touching the file.
+ */
+async function readSessionEvents(ctx, sessionId) {
+  const handle = await ctx.sessionPersistence.open(sessionId, "read");
+  const all = [];
   try {
-    const stat = await ctx.sessionPersistence.stat(sessionId);
-    const meta = stat !== undefined && stat !== null ? stat.header ?? stat : undefined;
-    if (meta !== undefined && typeof ctx.sessionPersistence.locate === "function") {
-      const located = ctx.sessionPersistence.locate(meta);
-      if (located !== undefined && located !== null && typeof located.path === "string") return located.path;
+    /* Page through in slices: one huge read holds the whole transcript plus its
+       parse alive at the same time, which is a lot for a months-old session. */
+    let offset = 0;
+    const page = 5000;
+    for (;;) {
+      const slice = await handle.read(offset, page);
+      const events = slice !== null && slice !== undefined && Array.isArray(slice.events) ? slice.events : [];
+      for (const event of events) all.push(event);
+      if (events.length < page) break;
+      offset += events.length;
+      if (offset >= 400000) break;
     }
-  } catch {
-    /* fall back to the scan */
-  }
-  const home = await dshHome();
-  const root = join(home, "sessions");
-  let projects;
-  try {
-    projects = await readdir(root, { withFileTypes: true });
-  } catch {
-    return undefined;
-  }
-  for (const project of projects) {
-    if (!project.isDirectory()) continue;
-    const candidate = join(root, project.name, sessionId, "session.v4.jsonl.zstd");
+  } finally {
     try {
-      await access(candidate);
-      return candidate;
+      if (typeof handle.close === "function") await handle.close();
     } catch {
-      /* keep scanning */
+      /* closing is best effort */
     }
   }
-  return undefined;
+  return all;
 }
 
 /** Statistics for one session, cached briefly so re-opening the panel is cheap. */
 export async function sessionStatistics(ctx, sessionId) {
-  const path = await sessionLogPath(ctx, sessionId);
-  if (path === undefined) return { ok: false, error: "session log not found" };
-  let info;
+  let stat;
   try {
-    info = await stat(path);
+    stat = await ctx.sessionPersistence.stat(sessionId);
   } catch {
-    return { ok: false, error: "session log not found" };
+    return { ok: false, error: "session not found" };
   }
-  const cacheKey = `${info.size}:${info.mtimeMs}`;
+  if (stat === undefined || stat === null) return { ok: false, error: "session not found" };
+  const cacheKey = `${stat.sizeBytes ?? 0}:${stat.revision ?? ""}`;
   const cached = statsCache.get(sessionId);
   if (cached !== undefined && cached.cacheKey === cacheKey && Date.now() - cached.at < STATS_CACHE_MS) return { ok: true, stats: cached.stats };
   try {
-    const events = await readSessionEvents(path);
+    const events = await readSessionEvents(ctx, sessionId);
     const stats = aggregateSession(events);
     if (stats.session.id === "") stats.session.id = sessionId;
+    const header = stat.header;
+    if (header !== undefined && header !== null) {
+      if (stats.session.createdAt === 0 && typeof header.createdAt === "number") stats.session.createdAt = header.createdAt;
+      if (stats.session.cwd === "" && typeof header.cwd === "string") stats.session.cwd = header.cwd;
+    }
     statsCache.set(sessionId, { cacheKey, stats, at: Date.now() });
     return { ok: true, stats };
   } catch (error) {
@@ -461,7 +450,7 @@ export async function handleStatsRequest(ctx, req, res) {
   }
   try {
     const body = await readJsonBody(req);
-    const sessionId = body !== null && typeof body.sessionId === "string" ? body.sessionId.trim() : "";
+    const sessionId = sessionIdFrom(req, body);
     if (sessionId === "") {
       sendJson(res, 400, { ok: false, error: "sessionId required" });
       return;
@@ -473,24 +462,53 @@ export async function handleStatsRequest(ctx, req, res) {
   }
 }
 
-/** Cordis entry point: mount the routes when the host has a web server. */
+/**
+ * Cordis entry point.
+ *
+ * `apply` itself must not wait for services: the Client half is served from this
+ * same package, and a plugin whose row never applies still shows its sidebar
+ * menu while none of its routes exist. So every capability is injected in its
+ * own nested scope, and the health route reports what actually mounted - the
+ * panel calls it to say "host plugin not loaded" instead of an empty 405.
+ */
 export function apply(ctx) {
   try {
-    if (typeof ctx.inject === "function") {
-      ctx.inject(["webServer"], (webCtx) => {
-        webCtx.effect(() => webCtx.webServer.register({
-          kind: "exact",
-          path: TRASH_SESSION_PATH,
-          handler: (req, res) => handleTrashRequest(ctx, req, res),
-        }), "ws-recency: trash route");
-        webCtx.effect(() => webCtx.webServer.register({
+    if (typeof ctx.inject !== "function") return;
+    ctx.inject(["webServer"], (webCtx) => {
+      const server = webCtx.webServer;
+      if (server === undefined || server === null) return;
+      webCtx.effect(() => server.register({
+        kind: "exact",
+        path: HEALTH_PATH,
+        handler: (req, res) => sendJson(res, 200, {
+          ok: true,
+          version: HOST_VERSION,
+          routes: { stats: statsMounted, trash: trashMounted },
+        }),
+      }), "ws-recency: health route");
+
+      webCtx.inject(["sessionPersistence"], (statsCtx) => {
+        statsMounted = true;
+        webCtx.effect(() => server.register({
           kind: "exact",
           path: STATS_SESSION_PATH,
-          handler: (req, res) => handleStatsRequest(ctx, req, res),
+          handler: (req, res) => handleStatsRequest(statsCtx, req, res),
         }), "ws-recency: stats route");
       });
-    }
+
+      webCtx.inject(["sessionPersistence", "workspaceRegistry", "sessions"], (trashCtx) => {
+        trashMounted = true;
+        webCtx.effect(() => server.register({
+          kind: "exact",
+          path: TRASH_SESSION_PATH,
+          handler: (req, res) => handleTrashRequest(trashCtx, req, res),
+        }), "ws-recency: trash route");
+      });
+    });
   } catch {
     /* a headless profile simply gets no routes */
   }
 }
+
+let statsMounted = false;
+let trashMounted = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Sidebar session management for DeepSeek Harness: workspace groups sorted by latest activity, stale history folded, a global pinned section, follow-up marks, session delete into a recoverable trash, and per-session token statistics split by tool.",
   "license": "MIT",
   "author": "chyxhtc",