@michengai/dsh-codex-pet 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.1.7] - 2026-09-18
+
+- Add compatibility with DSH `0.1.6-alpha.2` without dropping the existing supported hosts. Keep `sessions.open`, `pendingInteractions`, and legacy session snapshots on older hosts; use `uiWorkspace.openSession` and `uiSession.sessionStatus` only when those APIs are gone. Pin development types and the default e2e host to this release.
+- Use a bilingual package description matching the GitHub repository.
+
 ## [0.1.6] - 2026-09-16
 
 - Add compatibility with DSH `0.1.6-alpha.1` without dropping the existing supported hosts. Pin development types and the default e2e host to this release.

package/CHANGELOG.zh-CN.md

@@ -1,5 +1,10 @@
 # 更新日志
 
+## [0.1.7] - 2026-09-18
+
+- 新增 DSH `0.1.6-alpha.2` 兼容，不移除已支持的旧宿主。旧宿主继续使用 `sessions.open`、`pendingInteractions` 和会话快照里的旧请求；仅在这些接口消失后改走 `uiWorkspace.openSession` 和 `uiSession.sessionStatus`。开发类型检查和默认端到端宿主固定到该版本。
+- 软件包描述改为与 GitHub 仓库一致的中英文双语。
+
 ## [0.1.6] - 2026-09-16
 
 - 新增 DSH `0.1.6-alpha.1` 兼容，不移除已支持的旧宿主。开发类型检查和默认端到端宿主固定到该版本。

package/README.md

@@ -74,7 +74,7 @@ For a desktop workbench, download [DSH Codex Desktop](https://github.com/Micheng
 
 ## Installation
 
-Supported DeepSeek Harness versions: **`0.1.0-rc.8`, `0.1.1-rc.2`, `0.1.2-rc.1`, `0.1.5-rc.1`, `0.1.5-rc.2`, and `0.1.6-alpha.1`**. New compatibility is added without dropping these older releases. Make sure the `dsh` command is available. The example uses the `web` profile; replace it with your target profile.
+Supported DeepSeek Harness versions: **`0.1.0-rc.8`, `0.1.1-rc.2`, `0.1.2-rc.1`, `0.1.5-rc.1`, `0.1.5-rc.2`, `0.1.6-alpha.1`, and `0.1.6-alpha.2`**. New compatibility is added without dropping these older releases. Make sure the `dsh` command is available. The example uses the `web` profile; replace it with your target profile.
 
 ```powershell
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8

package/README.zh-CN.md

@@ -74,7 +74,7 @@
 
 ## 安装
 
-支持 DeepSeek Harness **`0.1.0-rc.8`、`0.1.1-rc.2`、`0.1.2-rc.1`、`0.1.5-rc.1`、`0.1.5-rc.2`、`0.1.6-alpha.1`**，需要可使用 `dsh` 命令。新增兼容不移除这些旧版。以下示例使用 `web` profile，请按实际环境替换。
+支持的 DeepSeek Harness 版本：**`0.1.0-rc.8`、`0.1.1-rc.2`、`0.1.2-rc.1`、`0.1.5-rc.1`、`0.1.5-rc.2`、`0.1.6-alpha.1`、`0.1.6-alpha.2`**。新增兼容不移除这些旧版。需要可用的 `dsh` 命令。以下示例使用 `web` profile，请按实际环境替换。
 
 ```powershell
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8

package/lib/client.js

@@ -38,14 +38,44 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 
 // src/session-compat.ts
-function compatibleSessions(sessions) {
+function compatibleSessions(sessions, navigate, status) {
   const cache = /* @__PURE__ */ new WeakMap();
+  const refs = /* @__PURE__ */ new Map();
+  const sweep = () => {
+    const ids = new Set(sessions.list?.getSnapshot?.()?.ids ?? []);
+    for (const [id, ref] of refs) if (!ids.has(id)) {
+      try {
+        ref.release();
+      } catch {
+      }
+      refs.delete(id);
+    }
+  };
+  sessions.list?.subscribe?.(sweep);
   return {
     list: sessions.list,
-    open: (id) => sessions.open(id),
-    create: (options) => sessions.create(options),
+    status: status ?? sessions.status,
+    using: sessions.using?.bind(sessions),
+    open: (id) => navigate ? navigate(id) : sessions.open?.(id),
+    create: (options) => {
+      if (!sessions.create) throw new Error("\u521B\u5EFA\u4F1A\u8BDD\u5C1A\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u8BD5");
+      return sessions.create(options);
+    },
     binding(id) {
-      const binding = sessions.binding(id);
+      sweep();
+      let binding = sessions.binding(id);
+      if (!binding && sessions.retain) {
+        let ref = refs.get(id);
+        if (!ref) {
+          try {
+            ref = sessions.retain(id, { source: "controllerOperation" });
+            refs.set(id, ref);
+          } catch {
+            return void 0;
+          }
+        }
+        binding = ref.binding;
+      }
       if (!binding || binding.eventSource) return binding;
       const cached = cache.get(binding);
       if (cached) return cached;
@@ -73,6 +103,31 @@ function compatibleSessions(sessions) {
   };
 }
 
+// src/pending-status.ts
+function pendingFromSessionStatus(status) {
+  return {
+    getSnapshot() {
+      const next = /* @__PURE__ */ new Map();
+      for (const [id, row] of status.getSnapshot()) {
+        const wait = row.pendingInteraction;
+        if (!wait || typeof wait !== "object") continue;
+        const item = wait;
+        next.set(String(id), {
+          kind: item.kind,
+          key: item.key,
+          sessionId: item.sessionId ?? String(id),
+          toolName: item.toolName,
+          reason: item.reason,
+          questions: item.questions,
+          answer: typeof item.answer === "function" ? item.answer.bind(item) : void 0
+        });
+      }
+      return next;
+    },
+    subscribe: (listener) => status.subscribe(listener)
+  };
+}
+
 // src/legacy-pending.ts
 function compatiblePending(sessions, resolveModern) {
   const legacy = legacyPending(sessions);
@@ -893,7 +948,7 @@ function PluginUpdateHeader({ locale }) {
         zh2 ? "\u5BA0\u7269" : "Pets",
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dcp-version", children: [
           "v",
-          "0.1.6"
+          "0.1.7"
         ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("nav", { className: "dcp-project-links", children: [
@@ -1880,6 +1935,12 @@ function Companion({
   );
 }
 
+// src/activity.ts
+function selectedSessionId(list) {
+  for (const id of list.ids) if ((list.byId[id]?.retainedBy?.mainView ?? 0) > 0) return id;
+  return list.current;
+}
+
 // src/notifications.ts
 var priority = { waiting: 0, failed: 1, review: 2, running: 3 };
 var lifetime = { failed: 36e5, waiting: 864e5, review: 6048e5 };
@@ -1910,7 +1971,8 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
     if (publishing) return;
     publishing = true;
     try {
-      const list = sessions.list.getSnapshot(), requests = pending.getSnapshot();
+      const list = sessions.list.getSnapshot(), requests = pending.getSnapshot(), statuses = sessions.status?.getSnapshot();
+      const current = selectedSessionId(list);
       const ids = new Set(list.ids.filter((id) => list.byId[id] && list.byId[id].origin !== "subagent"));
       for (const id of records.keys()) if (!ids.has(id)) {
         records.delete(id);
@@ -1927,33 +1989,35 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
       for (const id of ids) {
         const row = list.byId[id];
         if (!row) continue;
+        const status = statuses?.get(id);
         const binding = sessions.binding(id);
         let record = records.get(id);
         if (!record) {
-          record = { round: 0, running: row.running, completion: !!row.completed, error: null, revision: binding?.eventSource.getSnapshot().revision ?? -1, updatedAt: row.updatedAt ?? now(), lastPose: "" };
+          record = { round: 0, running: row.running, completion: !!status?.completionUnread || !!row.completed, error: null, revision: binding?.eventSource?.getSnapshot().revision ?? -1, updatedAt: row.updatedAt ?? now(), lastPose: "" };
           records.set(id, record);
         }
         const previous = bindings.get(id);
         if (binding && (previous?.binding.session !== binding.session || previous.binding.eventSource !== binding.eventSource)) {
           previous?.off();
-          record.revision = binding.eventSource.getSnapshot().revision;
-          const offSession = binding.session.subscribe(publish), offEvents = binding.eventSource.subscribe(publish);
+          record.revision = binding.eventSource?.getSnapshot().revision ?? record.revision;
+          const offSession = binding.session.subscribe(publish), offEvents = binding.eventSource?.subscribe(publish);
           bindings.set(id, { binding, off: () => {
             offSession();
-            offEvents();
+            offEvents?.();
           } });
         }
         const snapshot = binding?.session.getSnapshot();
-        const running = id === list.current ? snapshot?.running ?? row.running : row.running;
+        const running = status?.running ?? (id === current ? snapshot?.running ?? row.running : row.running);
         if (running && !record.running) {
           record.round++;
           record.awaitingStart = true;
           record.finished = void 0;
           record.completion = false;
           record.error = null;
+          record.suppressStopCompletion = false;
           record.updatedAt = now();
         }
-        const events = binding?.eventSource.getSnapshot();
+        const events = binding?.eventSource?.getSnapshot();
         if (events && record.revision !== events.revision) {
           record.revision = events.revision;
           if (events.change.kind === "append") for (const entry of events.change.entries) {
@@ -1971,11 +2035,18 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
               record.updatedAt = now();
             }
           }
+          else if (events.change.kind === "replace") record.suppressStopCompletion = true;
         }
+        const stopped = !running && record.running;
         record.running = running;
-        if (snapshot?.lastAgentError && snapshot.lastAgentError !== record.snapshotError) record.error = snapshot.lastAgentError;
-        record.snapshotError = snapshot?.lastAgentError;
-        if (row.completed && !running && (!record.finished || record.finished === "completed")) record.completion = true;
+        const agentError = snapshot?.lastAgentError ?? snapshot?.promptError?.error?.message ?? null;
+        if (agentError && agentError !== record.snapshotError) record.error = agentError;
+        record.snapshotError = agentError;
+        if (stopped && !record.suppressStopCompletion && !record.finished && !record.error) {
+          record.completion = true;
+          record.updatedAt = now();
+        }
+        if ((status?.completionUnread || row.completed) && !running && (!record.finished || record.finished === "completed")) record.completion = true;
         const request2 = requests.get(id);
         const activity = selectActivity([{ id, title: row.title ?? row.displayTitle, running, waiting: !!request2, error: running ? null : record.error, completed: !running && record.completion }]);
         if (activity.pose === "idle") continue;
@@ -2002,7 +2073,7 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
       publishing = false;
     }
   };
-  const offList = sessions.list.subscribe(publish), offPending = pending.subscribe(publish);
+  const offList = sessions.list.subscribe(publish), offPending = pending.subscribe(publish), offStatus = sessions.status?.subscribe(publish);
   publish();
   const timer = setInterval(publish, 1e3);
   return {
@@ -2025,6 +2096,7 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
         return;
       }
       if (command.type === "open") {
+        if (!sessions.open) throw new Error("\u5BBF\u4E3B\u672A\u63D0\u4F9B\u6253\u5F00\u4F1A\u8BDD\u80FD\u529B");
         sessions.open(item.id);
         if (item.pose === "review") dismissed.set(item.id, item.token);
         publish();
@@ -2064,6 +2136,7 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
     dispose() {
       offList();
       offPending();
+      offStatus?.();
       clearInterval(timer);
       for (const value of bindings.values()) value.off();
       bindings.clear();
@@ -2072,17 +2145,38 @@ function createNotifications(sessions, pending, notify, now = Date.now) {
 }
 
 // src/creation.ts
+function tryOpen(sessions, id) {
+  try {
+    sessions.open?.(id);
+  } catch {
+  }
+}
 async function createPetSession(sessions, description, directory, skill) {
   if (!description.trim() || description.length > 2e3) throw new Error("\u8BF7\u8F93\u5165 1\u20132000 \u5B57\u7684\u5BA0\u7269\u63CF\u8FF0");
   const id = await sessions.create({ cwd: directory });
-  sessions.open(id);
-  const binding = sessions.binding(id);
-  if (!binding) throw new Error("\u521B\u5EFA\u4F1A\u8BDD\u5C1A\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u8BD5");
   const text = `\u8BF7\u5148\u8BFB\u53D6\u5E76\u9075\u5FAA\u5BA0\u7269\u521B\u5EFA Skill\uFF1A${skill}
 \u5BA0\u7269\u8981\u6C42\uFF1A${description.trim()}
 \u6210\u54C1\u4FDD\u5B58\u5230 ${directory} \u4E0B\u7684\u65B0\u76EE\u5F55\uFF0C\u4FDD\u7559\u6240\u6709\u5DF2\u6709\u5BA0\u7269\u3002\u4F7F\u7528 DSH \u5F53\u524D\u914D\u7F6E\u7684\u56FE\u50CF\u5DE5\u5177\u3002\u7F3A\u5C11\u751F\u56FE\u5DE5\u5177\u65F6\u660E\u786E\u8BF4\u660E\uFF0C\u4E0D\u751F\u6210\u5360\u4F4D\u56FE\uFF0C\u4E0D\u865A\u62A5\u5B8C\u6210\u3002`;
-  const result = await binding.session.prompt([{ type: "text", text }], "queue");
-  if (!result.ok) throw new Error(result.error?.message ?? "DSH \u672A\u63A5\u53D7\u5BA0\u7269\u521B\u5EFA\u8BF7\u6C42");
+  const send = async (session) => {
+    const result = await session.prompt([{ type: "text", text }], "queue");
+    if (!result.ok) throw new Error(result.error?.message ?? "DSH \u672A\u63A5\u53D7\u5BA0\u7269\u521B\u5EFA\u8BF7\u6C42");
+  };
+  tryOpen(sessions, id);
+  const binding = sessions.binding(id);
+  if (binding?.session.prompt) {
+    await send(binding.session);
+    tryOpen(sessions, id);
+    return;
+  }
+  if (sessions.using) {
+    await sessions.using(id, { source: "controllerOperation" }, async (reference) => {
+      await reference.ready;
+      await send(reference.binding.session);
+    });
+    tryOpen(sessions, id);
+    return;
+  }
+  throw new Error("\u521B\u5EFA\u4F1A\u8BDD\u5C1A\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u8BD5");
 }
 
 // src/settings-icon.ts
@@ -2227,8 +2321,7 @@ function Overlay({
         activity: state.activity,
         tray: { state, command },
         open: () => {
-          if (state.activity.sessionId)
-            sessions.open(state.activity.sessionId);
+          if (state.activity.sessionId) sessions.open?.(state.activity.sessionId);
         },
         settings: openSettings
       }
@@ -2300,11 +2393,58 @@ function Page({
     }
   );
 }
+function probe(ctx, name2) {
+  if (ctx.reflect) {
+    try {
+      return ctx.reflect.get(name2);
+    } catch {
+      return void 0;
+    }
+  }
+  return ctx[name2];
+}
+function liveSessionStatus(ctx) {
+  const resolve = () => {
+    const live = probe(ctx, "uiSession");
+    return live && "sessionStatus" in live ? live.sessionStatus : void 0;
+  };
+  return {
+    getSnapshot() {
+      return resolve()?.getSnapshot() ?? /* @__PURE__ */ new Map();
+    },
+    subscribe(listener) {
+      let source = resolve();
+      let off = source?.subscribe(listener);
+      const timer = setInterval(() => {
+        const next = resolve();
+        if (next === source) return;
+        off?.();
+        source = next;
+        off = next?.subscribe(listener);
+        listener();
+      }, 250);
+      return () => {
+        clearInterval(timer);
+        off?.();
+      };
+    }
+  };
+}
 function apply(ctx) {
-  const sessions = compatibleSessions(ctx.sessions);
+  const sessions = compatibleSessions(
+    ctx.sessions,
+    (id) => {
+      const open = ctx.sessions.open;
+      if (open) return open.call(ctx.sessions, id);
+      const uiWorkspace = probe(ctx, "uiWorkspace");
+      if (uiWorkspace) return uiWorkspace.openSession(id);
+    },
+    liveSessionStatus(ctx)
+  );
   const pending = compatiblePending(sessions, () => {
-    const service = ctx.reflect ? ctx.reflect.get("uiSession") : ctx.uiSession;
-    return service?.pendingInteractions;
+    const live = probe(ctx, "uiSession");
+    if (live && "sessionStatus" in live && live.sessionStatus) return pendingFromSessionStatus(live.sessionStatus);
+    return live && "pendingInteractions" in live ? live.pendingInteractions : void 0;
   });
   ctx.slots.inject(
     "settings.section",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@michengai/dsh-codex-pet",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "Apache-2.0",
-  "description": "独立实现的 DSH 宠物插件：Codex 原始宠物库、Skill 创建、Web 页内显示与消费者接入接口",
+  "description": "DSH Codex Pet — 为 DeepSeek Harness 提供宠物陪伴、多任务提醒与交互，以及 Skill 自定义宠物 · A pet companion with multi-task notifications, interactions, and Skill-based custom pets for DeepSeek Harness",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -59,7 +59,7 @@
     "assets:import": "tsx scripts/import-codex.ts"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8 || 0.1.1-rc.2 || 0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1",
+    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8 || 0.1.1-rc.2 || 0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -70,13 +70,14 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-session": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.6-alpha.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.6-alpha.1",
+    "@deepseek-ai/dsh": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-workspace": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.6-alpha.2",
     "@electron/asar": "^3.4.1",
     "@radix-ui/react-icons": "^1.3.2",
     "@types/node": "^24.0.0",