@kidli1412/dsh-token-heatmap 0.1.2 → 0.1.4

package/README.md

@@ -21,7 +21,7 @@ A DeepSeek Harness web plugin: a GitHub-style daily token-usage heatmap of the *
 
 ## 安装 / Install
 
-需要 `web` profile（`@deepseek-ai/dsh >= 0.1.0-rc.6`）与 `pnpm`。
+需要 `web` profile 与 `pnpm`。DSH 兼容版本见下方「兼容性 / Compatibility」；运行于 `@deepseek-ai/dsh >= 0.1.2-alpha.4`（0.1.2 版本线）。
 
 从 npm 安装：
 
@@ -59,6 +59,13 @@ dsh plugin --profile web remove @kidli1412/dsh-token-heatmap
 - 无会话/无工作区时（`input.dock` 需要会话上下文）统计卡不渲染。
 - 服务端与客户端都随 `dsh web` 启动加载，因此新增/更新插件后需要重启。
 
+## 兼容性 / Compatibility
+
+- **DSH**：manifest 通过 `dsh.compatibility.dshReleases` 将官方最新三个版本 `0.1.2-alpha.4`、`0.1.2-alpha.5`、`0.1.2-rc.1` 逐项声明为 `compatible`（DSH STORE 的精确逐版本兼容证据；仅范围声明不会恢复上架）。插件使用的客户端注入（`dsh-api-remotes` / `dsh-client-connection` / `dsh-client-locale` / `dsh-client-ui-conversation` / `dsh-client-ui-settings`）与 Host 服务（`settings` namespace、`webServer` 精确路由）在这条版本线上保持稳定。
+- **Node**：`^22.19.0 || >=24.0.0`（与 DSH 一致）。
+- **依赖**：`@deepseek-ai/dsh-settings` 自 0.1.3 起提升为 `^0.1.2-rc.1`、`@deepseek-ai/schemastery` 提升为 `^3.18.2`，与 DSH 0.1.2 版本线对齐。npm 的 prerelease 解析规则下 `^0.1.0-rc.7` 不会解析到 `0.1.2-rc.1`（只会装 `0.1.0-rc.8`），因此较低的范围会拉到与新版 DSH 不同 train 的 settings 副本。
+- **0.1.4（DSH 0.1.2 适配）**：rc.1 起 live session 不再携带 `.events` 数组（改用 `session.seq` + `session.eventAt(seq)`，与官方 `dsh-token-meter` 相同），新会话判断从 `composerPhase === "blank"` 改为布尔 `session.blank`；`sessionPersistence` 在 rc.1 不再提供会话枚举（list/listSnapshots 已移除），持久化历史的增量刷新降级为保留已有缓存、只累计 live 会话。客户端注入模块列表同步为新架构模块（见上）。
+
 ## License
 
 MIT。聚合与回环端点实现参考了 [dsh-usage-stats](https://github.com/Ychris12138/dsh-usage-stats)（MIT © Ychris12138）。

package/lib/client.js

@@ -542,10 +542,13 @@ window.__ModuleLoader__.load({
 			// config fetch — the loopback endpoint remains as a back-compat API.
 			const config = react.useSyncExternalStore(configStore.subscribe, configStore.getSnapshot);
 
-			// New-session hero only: a blank session whose composer is still in
-			// the guidance phase. Conversed sessions hide the card.
+			// New-session hero only. DSH 0.1.2+ (rc.1) exposes the state as
+			// the boolean `session.blank` (the `composerPhase` string is
+			// gone); older harnesses keep `composerPhase === "blank"`.
+			// Conversed sessions hide the card.
 			if (session === void 0 || session === null || input === void 0 || input === null) return null;
-			if (session.composerPhase !== "blank") return null;
+			const heroBlank = typeof session.blank === "boolean" ? session.blank === true : session.composerPhase === "blank";
+			if (!heroBlank) return null;
 			// Master switch from the settings card (设置 → 插件 → 插件配置).
 			if (config.enabled === false) return null;
 

package/lib/index.js

@@ -37,7 +37,6 @@ import { join, dirname } from "node:path";
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { applyUsageDelta, createUsageState, mergeInto, renderUsage, zeroBuckets } from "./usage.js";
 import { DEFAULT_CONFIG, parseConfig } from "./config.js";
-import { settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
 
 /** Stable Cordis plugin name. */
@@ -56,8 +55,11 @@ const inject = ["webServer", "sessions", "sessionPersistence", "settings"];
  * namespace. The card edits `enabled` + `colorScheme` through the settings
  * scope; the legacy `<DSH_HOME>/storages/token-heatmap-config.json` document
  * is migrated once at startup (see migrateLegacyConfig).
+ * DSH 0.1.2 起 `@deepseek-ai/dsh-settings` 不再导出 settingsNamespace 帮助函数：
+ * namespace 直接以字面量传入（register/get/update 内部仍按
+ * /^[a-z][a-z0-9-]*$/ 校验）。
  */
-const SETTINGS_NAMESPACE = settingsNamespace("token-heatmap");
+const SETTINGS_NAMESPACE = "token-heatmap";
 
 /**
  * Durable display preferences; also the wire envelope the browser scope
@@ -387,6 +389,31 @@ async function handleConfig(ctx, req, res) {
 }
 //#endregion
 
+/**
+ * Enumerate a live session's events from an offset, across session shapes.
+ *
+ * Pre-0.1.2 sessions kept the whole log on the object as `.events`; DSH
+ * 0.1.2+ (rc.1) live sessions expose no `.events` array — the count is
+ * `session.seq` and each event is read via `session.eventAt(seq)` (0-based,
+ * the same reads @deepseek-ai/dsh-token-meter uses).
+ * @returns `{ count, events }` — `count` the session's total event count,
+ *   `events` the events from `from` onward.
+ */
+function liveSessionEvents(session, from) {
+	if (Array.isArray(session.events)) {
+		return { count: session.events.length, events: session.events.slice(from) };
+	}
+	if (typeof session.seq !== "number" || typeof session.eventAt !== "function") {
+		return { count: 0, events: [] };
+	}
+	const events = [];
+	for (let seq = from; seq < session.seq; seq += 1) {
+		const event = session.eventAt(seq);
+		if (event !== void 0) events.push(event);
+	}
+	return { count: session.seq, events };
+}
+
 /**
  * Collect per-day usage across live and persisted sessions, incrementally.
  *
@@ -398,6 +425,9 @@ async function handleConfig(ctx, req, res) {
  * the log was truncated/rewritten, so the session is refolded from scratch.
  * Sessions that vanished are dropped, and a session switching between
  * live/persisted is refolded from scratch to stay exact.
+ * On DSH 0.1.2+ (rc.1) sessionPersistence no longer exposes a session
+ * enumeration (list/listSnapshots are gone), so persisted-only history is
+ * kept in the cache untouched instead of being refreshed or dropped.
  */
 export async function collectUsage(ctx) {
 	return withLock(async () => {
@@ -415,9 +445,9 @@ export async function collectUsage(ctx) {
 					state.currentModel = null;
 					state.consumed = 0;
 				}
-				const count = session.events.length;
+				const { count, events } = liveSessionEvents(session, state.consumed ?? 0);
 				if ((state.consumed ?? 0) < count) {
-					applyUsageDelta(state, session.events.slice(state.consumed ?? 0));
+					applyUsageDelta(state, events);
 					state.consumed = count;
 				}
 				state.kind = "live";
@@ -426,7 +456,10 @@ export async function collectUsage(ctx) {
 		}
 		const persistence = ctx.get("sessionPersistence");
 		const persistedIds = new Set();
-		if (persistence !== void 0) {
+		const canEnumeratePersisted = persistence !== void 0 && (
+			typeof persistence.list === "function" || typeof persistence.listSnapshots === "function"
+		);
+		if (canEnumeratePersisted) {
 			// Prefer the backend's opaque per-log revisions (no file I/O in the
 			// plugin, works for any backend that exposes listSnapshots).
 			let snapshots = null;
@@ -480,9 +513,16 @@ export async function collectUsage(ctx) {
 				}
 				cache.sessions[meta.id] = state;
 			}
+		} else if (persistence !== void 0) {
+			// DSH 0.1.2+ (rc.1): sessionPersistence exposes no session
+			// enumeration (list/listSnapshots are gone). Previously folded
+			// persisted days stay in the cache untouched — they are neither
+			// refreshed (no enumeration to walk) nor dropped (they still
+			// describe real past days).
+			ctx.logger.warn("token-heatmap: sessionPersistence exposes no list()/listSnapshots() enumeration on this DSH; persisted-only history will not refresh");
 		}
 		for (const id of Object.keys(cache.sessions)) {
-			if (!attached.has(id) && !persistedIds.has(id)) delete cache.sessions[id];
+			if (!attached.has(id) && !persistedIds.has(id) && canEnumeratePersisted) delete cache.sessions[id];
 		}
 		const byDay = new Map();
 		for (const state of Object.values(cache.sessions)) mergeInto(byDay, state.days);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kidli1412/dsh-token-heatmap",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "DSH web plugin: GitHub-style daily token-usage heatmap on the new-session screen with a selectable calendar-year view, green/blue color schemes and a display switch (设置 → 插件 → 插件配置), plus today / this-month / all-time totals.",
   "type": "module",
   "main": "lib/index.js",
@@ -17,8 +17,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.2"
   },
   "dsh": {
     "bundle": {
@@ -27,15 +27,24 @@
     "client": {
       "platform": "web",
       "inject": [
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-slots"
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-settings"
       ]
+    },
+    "compatibility": {
+      "dshReleases": {
+        "0.1.2-alpha.4": "compatible",
+        "0.1.2-alpha.5": "compatible",
+        "0.1.2-rc.1": "compatible"
+      }
     }
   },
   "scripts": {
     "check": "node --check lib/usage.js && node --check lib/config.js && node --check lib/index.js && node --check lib/client.js",
-    "test": "node scripts/smoke.mjs && node scripts/settings-smoke.mjs",
+    "test": "node scripts/smoke.mjs && node scripts/settings-smoke.mjs && node scripts/rc1-session-smoke.mjs",
     "prepublishOnly": "npm run check && npm test"
   },
   "license": "MIT",