@goodandready/dsh-time-machine 0.1.8 → 0.1.9

package/README.md

@@ -119,6 +119,11 @@ dsh-time-machine:
 
 ## 📋 Release Notes
 
+### v0.1.9 — Event Bus Harmonization & Dependency Cleanup
+* **Changed in v0.1.9**: Harmonized event bus subscriptions to prevent duplicate checkpoints. Native DSH `session/event` bus takes precedence, with legacy `ctx.events` used strictly as a fallback when `ctx.on` is unavailable.
+* **Changed in v0.1.9**: Removed unused `@deepseek-ai/dsh-credentials` from `peerDependencies`.
+* **Added in v0.1.9**: Standardized project design contract in `docs/design/DESIGN.md`.
+
 ### v0.1.7 — Critical Safety, Staging Isolation & Native Event Bus
 * **Changed in v0.1.7**: Safe workspace rollback via `read-tree` + `checkout-index` + `clean -fd`. Rolling back to a checkpoint never modifies branch `HEAD` or severs git commit history.
 * **Changed in v0.1.7**: User staging area protection. Checkpoints now isolate git index creation through `GIT_INDEX_FILE`, preventing disruption of pre-staged files in `.git/index`.

package/README.ru.md

@@ -119,6 +119,11 @@ dsh-time-machine:
 
 ## 📋 История версий (Release Notes)
 
+### v0.1.9 — Гармонизация шины событий и очистка зависимостей
+* **Changed in v0.1.9**: Устранено потенциальное дублирование авто-снапшотов. Нативная шина событий DSH `session/event` теперь имеет приоритет, а legacy `ctx.events` подключается строго как fallback при отсутствии `ctx.on`.
+* **Changed in v0.1.9**: Удалена неиспользуемая зависимость `@deepseek-ai/dsh-credentials` из `peerDependencies`.
+* **Added in v0.1.9**: Добавлен дизайн-контракт проекта `docs/design/DESIGN.md`.
+
 ### v0.1.7 — Безопасность истории веток, изоляция индекса и события DSH
 * **Changed in v0.1.7**: Безопасный откат рабочего каталога через `read-tree` + `checkout-index` + `clean -fd`. Устранена критическая проблема переноса `HEAD` ветки на сиротский коммит.
 * **Changed in v0.1.7**: Защита пользовательского индекса Git. Чекпоинты создаются с изолированным `GIT_INDEX_FILE`, предотвращая перезапись подготовленных файлов в `.git/index`.

package/README.zh.md

@@ -94,6 +94,11 @@ dsh-time-machine:
 
 ## 📋 版本更新记录 (Release Notes)
 
+### v0.1.9 — 事件总线统一与依赖清理
+* **Changed in v0.1.9**: 统一事件总线监听逻辑，杜绝自动快照重复触发。优先使用原生 DSH `session/event` 总线，仅在缺失 `ctx.on` 时启用 legacy `ctx.events` 回退。
+* **Changed in v0.1.9**: 从 `peerDependencies` 中移除未使用的 `@deepseek-ai/dsh-credentials`。
+* **Added in v0.1.9**: 新增项目设计规范文档 `docs/design/DESIGN.md`。
+
 ### v0.1.7 — 分支历史安全、暂存区隔离与 DSH 原生事件总线
 * **Changed in v0.1.7**: 安全工作区回滚。改用 `read-tree` + `checkout-index` + `clean -fd`，彻底杜绝回滚时误将分支 `HEAD` 覆盖为孤立提交的严重缺陷。
 * **Changed in v0.1.7**: 保护用户 Git 暂存区。快照操作通过独立的 `GIT_INDEX_FILE` 执行，不会覆盖 `.git/index` 中已暂存的文件。

package/lib/index.js

@@ -56,66 +56,71 @@ export function apply(ctx, config) {
   };
 
   // 1. Native DSH session/event bus (Cordis standard in DSH)
-  ctx.effect(() => {
-    const off = ctx.on && ctx.on('session/event', (session, event) => {
-      const sid = (session && session.id) || sessionIdOf(event, ctx);
-      const type = event && event.type;
-      if (type === 'turn/start') {
-        const turnId = event.turnId || event.data?.turnId || Date.now();
-        autoSnap(`auto:turn:${turnId}`, sid);
-      } else if (type === 'approval/asked') {
-        const tool = event.tool || event.data?.toolName || event.data?.tool || 'approval';
-        autoSnap(`auto:approval:${tool}`, sid);
-      } else if (type === 'turn/end') {
-        if (!getConfig().autoSnapshotEnabled) return;
-        const outcome = String((event && (event.outcome || event.data?.outcome || event.result?.outcome || event.result?.status)) || '');
-        if (!sid) return;
-        if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
-          engine.pruneSnapshots(sid, 3).catch(() => {});
-        }
-      } else if (type === 'tool/error' || type === 'command/error') {
-        if (getConfig().autoHealPrompt) {
-          const tool = event.tool || event.data?.toolName || 'command';
-          autoSnap(`auto:error:${tool}`, sid);
+  // When native session/event bus is present, use it exclusively to prevent double-fire.
+  const hasNativeEvents = typeof ctx.on === 'function';
+
+  if (hasNativeEvents) {
+    ctx.effect(() => {
+      const off = ctx.on('session/event', (session, event) => {
+        const sid = (session && session.id) || sessionIdOf(event, ctx);
+        const type = event && event.type;
+        if (type === 'turn/start') {
+          const turnId = event.turnId || event.data?.turnId || Date.now();
+          autoSnap(`auto:turn:${turnId}`, sid);
+        } else if (type === 'approval/asked') {
+          const tool = event.tool || event.data?.toolName || event.data?.tool || 'approval';
+          autoSnap(`auto:approval:${tool}`, sid);
+        } else if (type === 'turn/end') {
+          if (!getConfig().autoSnapshotEnabled) return;
+          const outcome = String((event && (event.outcome || event.data?.outcome || event.result?.outcome || event.result?.status)) || '');
+          if (!sid) return;
+          if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
+            engine.pruneSnapshots(sid, 3).catch(() => {});
+          }
+        } else if (type === 'tool/error' || type === 'command/error') {
+          if (getConfig().autoHealPrompt) {
+            const tool = event.tool || event.data?.toolName || 'command';
+            autoSnap(`auto:error:${tool}`, sid);
+          }
         }
+      });
+      return () => { try { typeof off === 'function' && off(); } catch {} };
+    }, 'dsh-time-machine: native session events');
+  } else {
+    // 2. Legacy/mock events bus fallback (for unit tests and non-standard environments without ctx.on)
+    try {
+      if (ctx.events && typeof ctx.events.on === 'function') {
+        ctx.effect(() => {
+          const offs = [];
+          try {
+            offs.push(ctx.events.on('turn/start', (ev) => {
+              const sid = sessionIdOf(ev, ctx);
+              autoSnap(`auto:turn:${ev?.turnId || Date.now()}`, sid);
+            }));
+          } catch {}
+          try {
+            offs.push(ctx.events.on('approval/asked', (ev) => {
+              const sid = sessionIdOf(ev, ctx);
+              const tool = ev?.tool || ev?.name || 'approval';
+              autoSnap(`auto:approval:${tool}`, sid);
+            }));
+          } catch {}
+          try {
+            offs.push(ctx.events.on('turn/end', (ev) => {
+              if (!getConfig().autoSnapshotEnabled) return;
+              const outcome = String((ev && (ev.outcome || ev.result?.outcome || ev.result?.status)) || '');
+              const sid = sessionIdOf(ev, ctx);
+              if (!sid) return;
+              if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
+                engine.pruneSnapshots(sid, 3).catch(() => {});
+              }
+            }));
+          } catch {}
+          return () => { for (const off of offs) try { typeof off === 'function' && off(); } catch {} };
+        }, 'dsh-time-machine: auto snapshot events fallback');
       }
-    });
-    return () => { try { typeof off === 'function' && off(); } catch {} };
-  }, 'dsh-time-machine: native session events');
-
-  // 2. Legacy/mock events bus fallback (for unit tests and non-standard environments)
-  try {
-    if (ctx.events && typeof ctx.events.on === 'function') {
-      ctx.effect(() => {
-        const offs = [];
-        try {
-          offs.push(ctx.events.on('turn/start', (ev) => {
-            const sid = sessionIdOf(ev, ctx);
-            autoSnap(`auto:turn:${ev?.turnId || Date.now()}`, sid);
-          }));
-        } catch {}
-        try {
-          offs.push(ctx.events.on('approval/asked', (ev) => {
-            const sid = sessionIdOf(ev, ctx);
-            const tool = ev?.tool || ev?.name || 'approval';
-            autoSnap(`auto:approval:${tool}`, sid);
-          }));
-        } catch {}
-        try {
-          offs.push(ctx.events.on('turn/end', (ev) => {
-            if (!getConfig().autoSnapshotEnabled) return;
-            const outcome = String((ev && (ev.outcome || ev.result?.outcome || ev.result?.status)) || '');
-            const sid = sessionIdOf(ev, ctx);
-            if (!sid) return;
-            if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
-              engine.pruneSnapshots(sid, 3).catch(() => {});
-            }
-          }));
-        } catch {}
-        return () => { for (const off of offs) try { typeof off === 'function' && off(); } catch {} };
-      }, 'dsh-time-machine: auto snapshot events');
-    }
-  } catch {}
+    } catch {}
+  }
 
   // tools (session-aware)
   const registerTools = (tctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-time-machine",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "DSH plugin for smart checkpoints, workspace safety guards, and instant rollback",
   "type": "module",
   "main": "lib/index.js",
@@ -47,7 +47,6 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
@@ -56,4 +55,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}