@johnnren/dsh-zen 1.0.0 → 1.1.0

package/README.md

@@ -78,11 +78,24 @@ The settings panel also shows your **今日禅 / 本周禅** scores and the curr
 npm install
 npm run build        # bundle src/client.ts + src/index.ts → lib/, deploy into web profile
 npm run typecheck    # tsc --noEmit against the local shims in src/dts-shim.d.ts
+npm run e2e:zen      # GUI probe against a disposable dsh-e2e instance (see e2e/)
 ```
 
 The deploy target is `$DSH_HOME/profiles/web/node_modules` (default `~/.dsh`). Client-only
 changes need a page refresh; host-side changes need a DSH restart.
 
+The GUI probe needs a disposable instance started with the provider layer in
+`e2e/profile/e2e-profile.patch.yml`, otherwise agent turns fail with `NO_ADAPTER` and the
+live Chat surfaces cannot be exercised:
+
+```sh
+export CPA_API_KEY=...   # cpa gateway key (see ~/.config/api-vault)
+export DSH_E2E_PLAYWRIGHT_CORE=<path to an installed playwright-core entry>
+dsh-e2e start --patch e2e/profile/e2e-profile.patch.yml --wait-ready
+npm run e2e:zen
+dsh-e2e stop
+```
+
 ### Repository layout
 
 ```
@@ -103,8 +116,15 @@ changes need a page refresh; host-side changes need a DSH restart.
 ## Compatibility
 
 - Requires DeepSeek Harness with the Web client module system (default `web` profile).
+- **Verified against DeepSeek Harness `0.2.0-rc.2`** (see
+  [docs/issues/261011-dsh-02-compat](docs/issues/261011-dsh-02-compat/261011-dsh-02-compat.summary.md)).
 - Slot contracts used: `conversation.view`, `conversation.session.header.actions`,
-  `settings.section`. Verify against your Harness version's source snapshot if upgrading.
+  `settings.section`.
+- Client services used: `slots`, `sessions`, `locale`, `uiConversation`.
+- The Zen view reads the Chat target snapshot through
+  `ctx.uiConversation.binding(sessionId).target("chat")`; the current Session is derived from
+  `sessions.list` main-view retention. Both are 0.2-era contracts — re-verify them against the
+  target version's source when upgrading.
 - **Zero permissions**: no network requests, no file system access, no external
   services — the host face is an empty `apply()` and all data stays in browser
   `localStorage` (`dsh.zen.*`). 无网络请求、无文件写入、无外部服务、无遥测。
@@ -121,3 +141,7 @@ can be cleared by deleting keys prefixed `dsh.zen.`.
 ## License
 
 MIT — see [LICENSE](LICENSE).
+
+## Community
+
+- Thanks to the [LINUX DO](https://linux.do/) community for providing the discussion environment.

package/README.zh-CN.md

@@ -70,11 +70,23 @@ dsh plugin --profile web add @johnnren/dsh-zen
 npm install
 npm run build        # 打包 src/client.ts + src/index.ts → lib/，部署到 web profile
 npm run typecheck    # 基于 src/dts-shim.d.ts 本地 shim 做 tsc --noEmit
+npm run e2e:zen      # 对一次性 dsh-e2e 实例跑 GUI 探针（见 e2e/）
 ```
 
 部署目标为 `$DSH_HOME/profiles/web/node_modules`（默认 `~/.dsh`）。仅客户端改动刷新页面即可；
 host 侧改动需要重启 DSH。
 
+GUI 探针需要带 provider 层的一次性实例，否则 agent 轮次会以 `NO_ADAPTER` 失败，Zen 的实时
+Chat 面无法被覆盖：
+
+```sh
+export CPA_API_KEY=...   # cpa 网关 key（见 ~/.config/api-vault）
+export DSH_E2E_PLAYWRIGHT_CORE=<已安装的 playwright-core 入口路径>
+dsh-e2e start --patch e2e/profile/e2e-profile.patch.yml --wait-ready
+npm run e2e:zen
+dsh-e2e stop
+```
+
 ### 仓库结构
 
 ```
@@ -95,8 +107,14 @@ host 侧改动需要重启 DSH。
 ## 兼容性
 
 - 需要带 Web 客户端模块系统的 DeepSeek Harness（默认 `web` profile）。
+- **已在 DeepSeek Harness `0.2.0-rc.2` 上实测通过**（见
+  [docs/issues/261011-dsh-02-compat](docs/issues/261011-dsh-02-compat/261011-dsh-02-compat.summary.md)）。
 - 使用的 slot 契约：`conversation.view`、`conversation.session.header.actions`、
-  `settings.section`。升级 Harness 版本时请对照对应源码快照核验。
+  `settings.section`。
+- 使用的客户端服务：`slots`、`sessions`、`locale`、`uiConversation`。
+- Zen 视图通过 `ctx.uiConversation.binding(sessionId).target("chat")` 读取 Chat 目标快照；
+  当前会话由 `sessions.list` 的 main-view 引用推导。二者都是 0.2 时代的契约，升级时请对照
+  目标版本源码重新核验。
 - **零权限**：无网络请求、无文件写入、无外部服务——host 面是空的 `apply()`，
   所有数据保存在浏览器 `localStorage`（`dsh.zen.*`），无遥测。
 
@@ -112,3 +130,7 @@ dsh plugin --profile web remove @johnnren/dsh-zen
 ## License
 
 MIT — 见 [LICENSE](LICENSE)。
+
+## 社区
+
+- 感谢 [LINUX DO](https://linux.do/) 社区提供的交流环境。

package/lib/client.js

@@ -333,29 +333,6 @@ function createTracker(ctx) {
     }
     store.set({ sessions: kept });
   }
-  function ensureSession(sessionId, title, running) {
-    store.update((prev) => {
-      if (prev.sessions[sessionId]) {
-        const existing = prev.sessions[sessionId];
-        if (existing.sessionEndMs === null && !running) {
-          return { sessions: { ...prev.sessions, [sessionId]: { ...existing, title, sessionEndMs: Date.now() } } };
-        }
-        if (existing.sessionEndMs !== null && running) {
-          return { sessions: { ...prev.sessions, [sessionId]: { ...existing, title, sessionEndMs: null } } };
-        }
-        if (existing.title !== title) {
-          return { sessions: { ...prev.sessions, [sessionId]: { ...existing, title } } };
-        }
-        return prev;
-      }
-      return {
-        sessions: {
-          ...prev.sessions,
-          [sessionId]: { foregroundMs: 0, runningMs: 0, sessionStartMs: Date.now(), sessionEndMs: running ? null : Date.now(), title, days: {} }
-        }
-      };
-    });
-  }
   function reevaluate() {
     const isZenTabActive = typeof document !== "undefined" && document.querySelector(".dsh-zen-root") !== null;
     const isWindowVisible = !isZenTabActive && typeof document !== "undefined" && !document.hidden;
@@ -363,9 +340,27 @@ function createTracker(ctx) {
     const currentId = listSnap.current ?? null;
     const currentSession = currentId ? listSnap.byId[currentId] : null;
     const isRunning = (currentSession?.running ?? false) && !currentSession?.pendingInteraction;
+    let next = state;
     for (const [id, summary] of Object.entries(listSnap.byId)) {
-      ensureSession(id, summary.displayTitle, summary.running);
+      const title = summary.displayTitle;
+      const existing = next.sessions[id];
+      if (!existing) {
+        next = { sessions: { ...next.sessions, [id]: { foregroundMs: 0, runningMs: 0, sessionStartMs: Date.now(), sessionEndMs: summary.running ? null : Date.now(), title, days: {} } } };
+        continue;
+      }
+      if (existing.sessionEndMs === null && !summary.running) {
+        next = { sessions: { ...next.sessions, [id]: { ...existing, title, sessionEndMs: Date.now() } } };
+        continue;
+      }
+      if (existing.sessionEndMs !== null && summary.running) {
+        next = { sessions: { ...next.sessions, [id]: { ...existing, title, sessionEndMs: null } } };
+        continue;
+      }
+      if (existing.title !== title) {
+        next = { sessions: { ...next.sessions, [id]: { ...existing, title } } };
+      }
     }
+    if (next !== state) store.set(next);
     if (currentId !== activeSessionId) {
       if (activeSessionId !== null) flush(activeSessionId, runSegStart, fgSegStart);
       activeSessionId = currentId;
@@ -924,11 +919,29 @@ function renderMarkdown(MarkdownText, text) {
   return import_react.default.createElement("div", { style: { whiteSpace: "pre-wrap", wordBreak: "break-word" } }, text);
 }
 var ZenView = import_react.default.memo(function ZenView2(props) {
-  const { useSession, sessionId, t, foregroundStore, MarkdownText, zenSettingsStore } = props;
+  const { useSession, sessionId, t, foregroundStore, MarkdownText, zenSettingsStore, bindChat } = props;
   const rawRunning = useSession((s) => s.running);
   const blank = useSession((s) => s.blank);
-  const chat = useSession((s) => s.chat);
-  const runningCalls = useSession((s) => s?.runningCalls);
+  const bindChatRef = import_react.default.useRef(bindChat);
+  bindChatRef.current = bindChat;
+  const chatSource = import_react.default.useMemo(() => {
+    try {
+      return bindChatRef.current();
+    } catch {
+      return null;
+    }
+  }, [sessionId]);
+  const subscribeChat = import_react.default.useCallback(
+    (onChange) => chatSource ? chatSource.subscribe(onChange) : () => {
+    },
+    [chatSource]
+  );
+  const getChat = import_react.default.useCallback(
+    () => chatSource ? chatSource.getSnapshot() : void 0,
+    [chatSource]
+  );
+  const chat = import_react.default.useSyncExternalStore(subscribeChat, getChat);
+  const runningCalls = chat?.legacy?.runningCalls;
   const openState = useSession((s) => s?.openState);
   const isLoading = !blank && (openState === "cold" || openState === "loading");
   const [statusRunning, setStatusRunning] = import_react.default.useState(rawRunning);
@@ -1152,19 +1165,22 @@ body[data-chat-hide="on"] [data-chat-flow-kind="compaction"] { display: none !im
 body[data-chat-hide="on"] [data-chat-flow-kind="model-retry"] { display: none !important; }
 body[data-chat-hide="on"] [data-chat-flow-kind="turn-error"] { display: none !important; }
 body[data-chat-hide="on"] [data-chat-flow-kind="turn-max-tokens"] { display: none !important; }
+/* 0.2 turn-level process disclosure ("\u5DF2\u5904\u7406 N \u6B65") \u2014 hide the control with the rest of the process */
+body[data-chat-hide="on"] [data-chat-flow-kind="turn-process"] { display: none !important; }
 
 /* Hide reasoning rows inside assistant-step */
 body[data-chat-hide="on"] [data-chat-flow-kind="assistant-step"] [data-variant="think"] { display: none !important; }
 
-/* Hide assistant-step that only contains think (no reply) \u2014 prevents extra flex gap */
-body[data-chat-hide="on"] [data-chat-flow-kind="assistant-step"]:has(.Sxvs8a_body > [data-variant="think"]:only-child) { display: none !important; }
+/* Hide assistant-step that only contains think (no reply) \u2014 prevents extra flex gap.
+   Hash-agnostic: CSS-module class names end in _body but their prefix changes per build. */
+body[data-chat-hide="on"] [data-chat-flow-kind="assistant-step"]:has([class*="_body"] > [data-variant="think"]:only-child) { display: none !important; }
 
-/* Collapse context/compaction rows inside user messages (they have padding:2px 0) */
-body[data-chat-hide="on"] .gdEzaW_contextRow:empty,
-body[data-chat-hide="on"] .gdEzaW_compactionRow:empty { display: none !important; }
+/* Collapse empty context/compaction rows inside user messages (they have padding:2px 0) */
+body[data-chat-hide="on"] [class*="_contextRow"]:empty,
+body[data-chat-hide="on"] [class*="_compactionRow"]:empty { display: none !important; }
 
 /* Zero out gap in AssistantMarkdown body when reasoning hidden */
-body[data-chat-hide="on"] [data-chat-flow-kind="assistant-step"] .Sxvs8a_body { gap: 0 !important; }
+body[data-chat-hide="on"] [data-chat-flow-kind="assistant-step"] [class*="_body"]:has([data-variant="think"]) { gap: 0 !important; }
 `;
 if (typeof document !== "undefined" && !document.querySelector('style[data-plugin-css="dsh-zen/chat-hide"]')) {
   const tag = document.createElement("style");
@@ -1563,14 +1579,21 @@ var ZenSettingsSection = import_react3.default.memo(function ZenSettingsSection2
 
 // src/client.ts
 var name = "zen";
-var inject = ["slots", "sessions", "locale"];
+var inject = ["slots", "sessions", "locale", "uiConversation"];
+function resolveCurrentSessionId(snap, previousId) {
+  if (previousId && (snap.byId[previousId]?.retainedBy?.mainView ?? 0) > 0) return previousId;
+  for (const row of Object.values(snap.byId)) {
+    if ((row?.retainedBy?.mainView ?? 0) > 0) return row.id;
+  }
+  return null;
+}
 function initAutoZenSwitcher(ctx, zenSettingsStore) {
   const sessions = ctx.sessions;
   let prevRunning = null;
   let prevSessionId = null;
   function check() {
     const snap = sessions.list.getSnapshot();
-    const currentId = snap.current;
+    const currentId = resolveCurrentSessionId(snap, prevSessionId);
     const session = currentId ? snap.byId[currentId] : null;
     const running = session?.running ?? false;
     if (currentId !== prevSessionId) {
@@ -1621,10 +1644,14 @@ function apply(ctx) {
     order: 5,
     label: () => t("view.zen"),
     locale: NS,
-    inject: (_sessionId) => ({
+    inject: (sessionId) => ({
       foregroundStore,
       MarkdownText,
-      zenSettingsStore
+      zenSettingsStore,
+      // The Chat target snapshot is an independently activated Conversation
+      // view; subscribing through this source also activates the target, so
+      // Zen keeps reading Chat data while it is the visible view.
+      bindChat: () => ctx.uiConversation.binding(sessionId).target("chat")
     })
   }, ZenView));
   ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnnren/dsh-zen",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Zen Mode view tab + foreground time tracker for DeepSeek Harness: a calm minimal surface (status message, latest user message, live activity hints, markdown AI reply, one-line turn stats) while the agent works, with screen-watching time tracking, daily/weekly Zen scores, a chat-hide toggle, auto enter/exit and an Alt+Z shortcut — pure client-side, no network. dsh-zen 禅模式插件：智能体后台运行时提供极简的 Zen 视图标签页（状态文案、用户消息、动态提示、Markdown 最终回复、单行轮次统计），并统计前台盯屏时长、给出每日/每周禅值，支持隐藏中间过程、自动进出禅与 Alt+Z 快捷键——纯前端、无网络请求。",
   "type": "module",
   "main": "./lib/index.js",
@@ -22,7 +22,8 @@
   ],
   "scripts": {
     "build": "node build.mjs",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "e2e:zen": "dsh-e2e run e2e/zen-view.mjs"
   },
   "keywords": [
     "dsh",
@@ -52,10 +53,10 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-api-session-controller",
+        "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
     },