@goodandready/dsh-time-machine 0.1.6 → 0.1.8

package/README.md

@@ -60,38 +60,41 @@ graph LR
 
 ---
 
-## ✨ Key Capabilities & Studio Features
+## 🌟 Key Capabilities
 
-### 1. 🛡️ Non-Intrusive Shadow Git Snapshots (`lib/snapshot.js`)
-* Captures complete working tree state, staged files, and untracked assets using shadow git refs;
-* Zero pollution of user git commit history, tags, or active branches;
-* Retains a rolling history of the last $N$ checkpoints with human-readable labels and timestamps.
+### 1. 🛡️ Lightweight Shadow Git Snapshots
+* Captures the full working tree, staged changes, and untracked files using isolated Git shadow tree references;
+* Zero interference with user commit history, current active branch, or repository staging area;
+* Maintains a rolling history of the most recent checkpoints with clear timestamps, session scoping, and labels.
 
 ### 2. ⏪ Instant Safe Rollback (`time_machine_checkpoint_rollback`)
 * Restores the entire workspace or specific files to any previous checkpoint in milliseconds;
+* Uses non-destructive checkout-index and clean without moving `HEAD` or rewriting branch history;
 * Can be triggered programmatically by the agent or interactively by the user in the UI.
 
 ### 3. 🔍 Visual Snapshot Diff Inspector (`time_machine_diff`)
 * Computes file-by-file visual diffs comparing current workspace state against any checkpoint;
-* Highlights added, deleted, and modified lines with clean line numbers.
+* Highlights added, deleted, and modified lines with clean line numbers and statistics.
 
-### 4. 🕒 Interactive Sidebar Timeline (`lib/client.js`)
-* Seamlessly integrates into DSH Web UI sidebar;
-* Displays a chronological timeline of all session checkpoints with file change counters and 1-click "Restore Checkpoint" and "Inspect Diff" buttons.
+### 4. 🕒 Interactive Sidebar & Settings Timeline (`lib/client.js`)
+* Seamlessly integrates into DSH Web UI sidebar and settings tab;
+* Displays a chronological timeline of session checkpoints with 1-click "Rollback", "Diff", and "Delete" buttons.
 
 ### 5. 🩹 Auto-Heal on Command Failure
-* Automatically prompts the user/agent with a 1-click restore proposal when a destructive command exits with an error.
+* Automatically records checkpoints when a tool or command fails, preserving recovery options.
 
 ---
 
-## 🛠️ Agent Tools Reference (4 Tools)
+## 🛠️ Agent Tools Reference (6 Tools)
 
 | Tool Name | Parameters | Description |
 |---|---|---|
-| `time_machine_checkpoint_create` | `label?: string` | Creates a shadow git workspace checkpoint before risky edits or operations |
-| `time_machine_checkpoint_list` | *(none)* | Lists all recent workspace checkpoints newest first |
-| `time_machine_checkpoint_rollback` | `id: string` | Reverts the entire workspace back to the specified checkpoint state |
-| `time_machine_diff` | `id?: string` | Returns unified file diff between current workspace and target checkpoint |
+| `time_machine_checkpoint_create` | `label?: string, sessionId?: string` | Creates a shadow git workspace checkpoint before risky edits or operations |
+| `time_machine_checkpoint_list` | `sessionId?: string` | Lists all recent workspace checkpoints newest first |
+| `time_machine_checkpoint_rollback` | `id: string, confirm: boolean` | Safely reverts workspace files back to specified checkpoint without altering branch HEAD |
+| `time_machine_diff` | `from: string, to?: string` | Returns unified file diff between current workspace and target checkpoint |
+| `time_machine_checkpoint_delete` | `id: string, confirm: boolean` | Permanently deletes a single checkpoint and purges its git reference |
+| `time_machine_checkpoint_prune` | `sessionId?: string, keep?: number` | Prunes session checkpoints, keeping only the newest N checkpoints |
 
 ---
 
@@ -114,6 +117,20 @@ dsh-time-machine:
 
 ---
 
+## 📋 Release Notes
+
+### 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`.
+* **Changed in v0.1.7**: Native DSH session event integration. Subscribed to `session/event` bus for automated checkpoints on `turn/start`, `approval/asked`, `turn/end`, and command errors.
+* **Changed in v0.1.7**: Automatic Git ref cleanup on snapshot eviction to eliminate disk ref leaks.
+* **Changed in v0.1.7**: Direct working directory diff computation when comparing checkpoints with uncommitted changes.
+* **Changed in v0.1.7**: Strict compliance with DSH Plugin Authoring guidelines: form fields are enabled only when settings status is `ready`.
+* **Added in v0.1.7**: WebServer request body size limit (1MB max payload) for DoS protection.
+* **Added in v0.1.7**: Complete Chinese localization (`zh`) in frontend interface.
+
+---
+
 ## 📄 License
 
-MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
+MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)

package/README.ru.md

@@ -60,34 +60,41 @@ graph LR
 
 ---
 
-## ✨ Ключевые возможности
+## 🌟 Ключевые возможности
 
-### 1. 🛡️ Теневые снапшоты без засорения Git (`lib/snapshot.js`)
+### 1. 🛡️ Легковесные теневые Git-снапшоты
 * Фиксирует всё рабочее дерево, индексированные и новые файлы через изолированные shadow-ссылки Git;
-* Не создаёт лишних коммитов в пользовательской истории и не переключает активные ветки;
-* Хранит скользящую историю последних $N$ чекпоинтов с понятными метками и метками времени.
+* Не создаёт лишних коммитов в пользовательской истории, не переключает активные ветки и не сдвигает указатель `HEAD`;
+* Изолирует рабочий индекс `.git/index` от фонового сохранения чекпоинтов через переменную `GIT_INDEX_FILE`;
+* Хранит скользящую историю последних $N$ чекпоинтов с понятными метками, сессионной привязкой и метками времени.
 
 ### 2. ⏪ Мгновенный безопасный откат (`time_machine_checkpoint_rollback`)
 * Возвращает всё рабочее пространство к любому предыдущему состоянию за миллисекунды;
+* Не затирает историю веток Git: откат выполняется через безопасный `read-tree` + `checkout-index` + `clean -fd`;
 * Может вызываться как программно агентом, так и пользователем через кнопку в интерфейсе.
 
 ### 3. 🔍 Визуальный инспектор Diff (`time_machine_diff`)
-* Сравнивает текущие файлы со снапшотом и формирует наглядный пофайловый Diff.
+* Сравнивает текущие файлы рабочего каталога со снапшотом и формирует наглядный пофайловый Diff.
 
-### 4. 🕒 Интерактивная хроника в сайдбаре (`lib/client.js`)
-* Встраивается в боковую панель Web UI DSH;
-* Показывает список чекпоинтов со счётчиками изменённых файлов и кнопками «Откатить» и «Сравнить Diff».
+### 4. 🕒 Интерактивная хроника в сайдбаре и настройках (`lib/client.js`)
+* Встраивается в боковую панель Web UI DSH и карточку настроек плагинов;
+* Показывает список чекпоинтов с кнопками «Откатить», «Сравнить Diff» и «Удалить».
+
+### 5. 🩹 Авто-восстановление при сбоях команд
+* Автоматически фиксирует контрольную точку при сбоях выполнения инструментов и команд.
 
 ---
 
-## 🛠️ Инструменты агента (4 инструмента)
+## 🛠️ Инструменты агента (6 инструментов)
 
 | Имя инструмента | Параметры | Описание |
 |---|---|---|
-| `time_machine_checkpoint_create` | `label?: string` | Создаёт теневой чекпоинт перед рискованными правками |
-| `time_machine_checkpoint_list` | *(нет)* | Возвращает список недавних снапшотов от новых к старым |
-| `time_machine_checkpoint_rollback` | `id: string` | Откатывает файлы рабочего пространства к указанному снапшоту |
-| `time_machine_diff` | `id?: string` | Возвращает пофайловый Diff между текущим состоянием и чекпоинтом |
+| `time_machine_checkpoint_create` | `label?: string, sessionId?: string` | Создаёт теневой чекпоинт перед рискованными правками |
+| `time_machine_checkpoint_list` | `sessionId?: string` | Возвращает список недавних снапшотов от новых к старым |
+| `time_machine_checkpoint_rollback` | `id: string, confirm: boolean` | Безопасно откатывает файлы рабочего пространства без изменения HEAD ветки |
+| `time_machine_diff` | `from: string, to?: string` | Возвращает пофайловый Diff между текущим состоянием и чекпоинтом |
+| `time_machine_checkpoint_delete` | `id: string, confirm: boolean` | Удаляет отдельный чекпоинт и очищает соответствующий Git ref |
+| `time_machine_checkpoint_prune` | `sessionId?: string, keep?: number` | Прореживает чекпоинты сессии, сохраняя указанное количество самых свежих |
 
 ---
 
@@ -110,6 +117,20 @@ dsh-time-machine:
 
 ---
 
+## 📋 История версий (Release Notes)
+
+### 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`.
+* **Changed in v0.1.7**: Поддержка нативной шины событий DSH `session/event` для автоматических чекпоинтов на `turn/start`, `approval/asked`, `turn/end` и аварийных снапшотов при ошибках.
+* **Changed in v0.1.7**: Автоматическое удаление ссылок `refs/dsh-time-machine/...` из Git при вытеснении старых чекпоинтов по лимиту `maxSnapshots`.
+* **Changed in v0.1.7**: Корректный расчет Diff напрямую относительно рабочей директории с незакоммиченными изменениями.
+* **Changed in v0.1.7**: Соответствие стандартам DSH Plugin Authoring: поля формы настроек разблокированы строго в состоянии `ready`.
+* **Added in v0.1.7**: Защита WebServer API от DoS-атак через лимит тела запроса (макс. 1 МБ).
+* **Added in v0.1.7**: Полная китайская локализация интерфейса (`zh`).
+
+---
+
 ## 📄 Лицензия
 
-MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
+MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)

package/README.zh.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-<h3>DeepSeek Harness 自动化影子 Git 快照、工作区时光机与一键即时回滚插件</h3>
+<h3>面向 DeepSeek Harness 的影子 Git 自动快照、工作区时间旅行与即时回滚引擎</h3>
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@goodandready/dsh-time-machine"><img src="https://img.shields.io/npm/v/@goodandready/dsh-time-machine.svg?style=for-the-badge&color=6366f1&labelColor=1e1b4b" alt="npm version"></a>
@@ -11,7 +11,7 @@
   <a href="https://nodejs.org"><img src="https://img.shields.io/badge/Node-20%2B-f59e0b.svg?style=for-the-badge&labelColor=451a03" alt="Node version"></a>
 </p>
 
-<!-- 官方展示中心跳转按钮 -->
+<!-- 作者所有开源项目目录按钮 -->
 <p align="center">
   <a href="https://goodandready.app/"><img src="https://img.shields.io/badge/作者全部项目-goodandready.app-ff4500.svg?style=for-the-badge&logo=rocket&logoColor=white&labelColor=1a1a2e" alt="作者全部项目"></a>
 </p>
@@ -60,6 +60,19 @@ graph LR
 
 ---
 
+## 🛠️ 智能体工具列表 (6 个工具)
+
+| 工具名称 | 参数 | 说明 |
+|---|---|---|
+| `time_machine_checkpoint_create` | `label?: string, sessionId?: string` | 在高危修改前创建影子 Git 检查点快照 |
+| `time_machine_checkpoint_list` | `sessionId?: string` | 按时间倒序列出最近的工作区检查点 |
+| `time_machine_checkpoint_rollback` | `id: string, confirm: boolean` | 安全还原工作区文件至指定检查点（不移动分支 HEAD） |
+| `time_machine_diff` | `from: string, to?: string` | 对比当前工作区文件与目标检查点的文件差异 |
+| `time_machine_checkpoint_delete` | `id: string, confirm: boolean` | 删除指定检查点并同步清理 Git 引用 |
+| `time_machine_checkpoint_prune` | `sessionId?: string, keep?: number` | 清理会话过期检查点，保留指定数量的最新快照 |
+
+---
+
 ## 📦 安装指南
 
 ```bash
@@ -68,6 +81,31 @@ dsh plugin --profile web add @goodandready/dsh-time-machine
 
 ---
 
+## ⚙️ 配置说明 (`settings.yaml`)
+
+```yaml
+dsh-time-machine:
+  autoSnapshotEnabled: true    # 文件修改前自动创建快照
+  maxSnapshots: 20             # 内存保留的最大滚动检查点数量
+  autoHealPrompt: true         # 终端命令执行失败时提示回滚
+```
+
+---
+
+## 📋 版本更新记录 (Release Notes)
+
+### 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` 中已暂存的文件。
+* **Changed in v0.1.7**: 原生对接 DSH `session/event` 事件总线，全面激活 `turn/start`、`approval/asked`、`turn/end` 和错误自愈事件监听。
+* **Changed in v0.1.7**: 修复快照淘汰时的 Git 引用泄露问题，自动执行 `git update-ref -d`。
+* **Changed in v0.1.7**: 修复 Diff 计算，直接对比当前工作区中的未提交修改。
+* **Changed in v0.1.7**: 严格遵循 DSH 插件规范：仅在 `ready` 状态下允许编辑配置。
+* **Added in v0.1.7**: WebServer API 增加 1MB 请求体大小上限，抵御 DoS 攻击。
+* **Added in v0.1.7**: 前端界面完整支持中文本地化 (`zh`)。
+
+---
+
 ## 📄 开源协议
 
-MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
+MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)

package/lib/client.js

@@ -87,6 +87,28 @@ window.__ModuleLoader__.load({
       unavailable: 'Настройки недоступны',
       tabTitle: 'Машина времени',
     };
+    const zh = {
+      title: '时光机与检查点',
+      sub: '影子快照、差异对比与即时回滚，保障智能体安全。',
+      loading: '加载中…',
+      create: '创建检查点',
+      labelPh: '检查点标签',
+      list: '时间线',
+      empty: '暂无检查点。',
+      diff: '差异',
+      rollback: '回滚',
+      delete: '删除',
+      confirmDelete: '确定删除此检查点？',
+      confirmRollback: '确定回滚到此检查点？工作区将被重置。',
+      close: '关闭',
+      save: '保存',
+      saved: '已保存',
+      autoSnapshot: '文件变更前自动创建快照',
+      maxSnapshots: '最大快照数',
+      autoHeal: '命令失败时提示恢复',
+      unavailable: '设置不可用',
+      tabTitle: '时光机',
+    };
 
     let ChevronIcon = null;
     try {
@@ -102,8 +124,8 @@ window.__ModuleLoader__.load({
     function useLocale(ctx) {
       if (!ctx || !ctx.locale) return 'en';
       const lang = React.useSyncExternalStore(
-        React.useMemo(() => (cb) => ctx.locale.subscribe(cb) ?? (() => {}), [ctx]),
-        React.useCallback(() => ctx.locale.getSnapshot().active ?? 'en', [ctx])
+        React.useMemo(() => (cb) => ctx.locale.subscribe ? (ctx.locale.subscribe(cb) ?? (() => {})) : (() => {}), [ctx]),
+        React.useCallback(() => (ctx.locale.getSnapshot && ctx.locale.getSnapshot()?.active) || 'en', [ctx])
       );
       return lang;
     }
@@ -211,19 +233,13 @@ window.__ModuleLoader__.load({
 
     function PluginCard(props) {
       const ctx = props.ctx;
-      const sid = sessionIdOf(ctx);
       const [expanded, setExpanded] = React.useState(false);
       const lang = useLocale(ctx);
-      const t = lang === 'ru' ? ru : en;
-      const [snapshots, setSnapshots] = React.useState([]);
-      const [loading, setLoading] = React.useState(false);
-      const [label, setLabel] = React.useState('');
-      const [diffText, setDiffText] = React.useState(null);
-      const [busy, setBusy] = React.useState(false);
-      const [err, setErr] = React.useState('');
+      const t = lang.startsWith('zh') ? zh : (lang.startsWith('ru') ? ru : en);
       const [settingsStatus, setSettingsStatus] = React.useState('loading');
       const [draft, setDraft] = React.useState({ autoSnapshotEnabled: true, maxSnapshots: 20, autoHealPrompt: true });
       const [saving, setSaving] = React.useState(false);
+      const [saveErr, setSaveErr] = React.useState('');
 
       const scope = React.useMemo(() => {
         try { return ctx.settingsScope ? ctx.settingsScope.bind({ namespace: NS }) : null; } catch { return null; }
@@ -256,65 +272,22 @@ window.__ModuleLoader__.load({
         return () => { alive = false; try { unsub(); } catch {} };
       }, [scope]);
 
-      const fetchList = React.useCallback(() => {
-        setLoading(true); setErr('');
-        const q = sid ? '?sessionId=' + encodeURIComponent(sid) : '';
-        fetch('/dsh-time-machine/snapshots' + q).then(r => r.json()).then(j => {
-          if (j.success) setSnapshots(j.snapshots || []);
-          else setErr(j.error || 'load failed');
-        }).catch(e => setErr(String(e.message || e))).finally(() => setLoading(false));
-      }, [sid]);
-
-      React.useEffect(() => { if (expanded) fetchList(); }, [expanded, fetchList]);
-
-      const onCreate = () => {
-        setBusy(true); setErr('');
-        fetch('/dsh-time-machine/create', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ label, sessionId: sid }) })
-          .then(r => r.json()).then(j => {
-            if (!j.success) throw new Error(j.error || 'create failed');
-            setLabel(''); fetchList();
-          }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
-      };
-      const onDiff = (id) => {
-        setBusy(true); setErr('');
-        fetch('/dsh-time-machine/diff?from=' + encodeURIComponent(id)).then(r => r.json()).then(j => {
-          if (!j.success) throw new Error(j.error || 'diff failed');
-          setDiffText(j.diff || '');
-        }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
-      };
-      const onRollback = (id) => {
-        if (!window.confirm(t.confirmRollback)) return;
-        setBusy(true); setErr('');
-        fetch('/dsh-time-machine/rollback', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id, confirm: true }) })
-          .then(r => r.json()).then(j => {
-            if (!j.success) throw new Error(j.error || 'rollback failed');
-            fetchList();
-          }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
-      };
-      const onDelete = (id) => {
-        if (!window.confirm(t.confirmDelete)) return;
-        setBusy(true); setErr('');
-        fetch('/dsh-time-machine/delete', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id, confirm: true }) })
-          .then(r => r.json()).then(j => {
-            if (!j.success) throw new Error(j.error || 'delete failed');
-            fetchList();
-          }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
-      };
       const onSave = async () => {
         if (!scope) return;
-        setSaving(true); setErr('');
+        setSaving(true); setSaveErr('');
         try {
           const keys = ['autoSnapshotEnabled', 'maxSnapshots', 'autoHealPrompt'];
           const failures = [];
           for (const k of keys) {
             try { await scope.set(k, draft[k]); } catch (e) { failures.push(k + ': ' + String(e.message || e)); }
           }
-          if (failures.length) setErr(failures.join('; '));
-        } catch (e) { setErr(String(e.message || e)); }
+          if (failures.length) setSaveErr(failures.join('; '));
+        } catch (e) { setSaveErr(String(e.message || e)); }
         finally { setSaving(false); }
       };
 
-      const writable = settingsStatus === 'ready' || settingsStatus === 'unavailable';
+      // Strict adherence to DSH Plugin Authoring: writable ONLY when ready
+      const writable = settingsStatus === 'ready';
 
       return React.createElement('li', { className: 'tm-card' },
         React.createElement('button', { type: 'button', className: 'tm-head', 'aria-expanded': expanded, onClick: () => setExpanded(!expanded) },
@@ -339,42 +312,15 @@ window.__ModuleLoader__.load({
                 React.createElement('input', { type: 'checkbox', checked: !!draft.autoHealPrompt, disabled: !writable, onChange: (e) => setDraft(d => ({ ...d, autoHealPrompt: e.target.checked })) }), ' ' + t.autoHeal
               )
             ),
+            saveErr ? React.createElement('div', { className: 'tm-label', style: { color: 'var(--dsw-alias-state-error-primary)' } }, saveErr) : null,
             React.createElement('div', { className: 'tm-foot' },
               React.createElement('button', { className: 'tm-save', disabled: !writable || saving, onClick: onSave }, saving ? t.loading : t.save)
             )
           ),
-          React.createElement('div', { className: 'tm-field' },
-            React.createElement('div', { style: { display: 'flex', gap: 8 } },
-              React.createElement('input', { className: 'tm-input', style: { flex: 1 }, placeholder: t.labelPh, value: label, onChange: (e) => setLabel(e.target.value) }),
-              React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: onCreate }, t.create)
-            )
-          ),
           React.createElement('div', { className: 'tm-field' },
             React.createElement('div', { className: 'tm-label' }, t.list),
-            loading ? React.createElement('div', { className: 'tm-label' }, t.loading) : null,
-            err ? React.createElement('div', { className: 'tm-label', style: { color: 'var(--dsw-alias-state-error-primary)' } }, err) : null,
-            snapshots.length === 0 && !loading ? React.createElement('div', { className: 'tm-label' }, t.empty) : null,
-            React.createElement('div', { className: 'tm-list' },
-              snapshots.map(s => React.createElement('div', { key: s.id, className: 'tm-row' },
-                React.createElement('span', { className: 'tm-row-main' },
-                  React.createElement('span', { className: 'tm-row-title' }, s.label + ' · ' + s.id),
-                  React.createElement('span', { className: 'tm-row-meta' }, new Date(s.createdAt).toLocaleString() + (s.commit ? ' · ' + s.commit.slice(0,7) : ''))
-                ),
-                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDiff(s.id) }, t.diff),
-                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onRollback(s.id) }, t.rollback),
-                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDelete(s.id) }, t.delete)
-              ))
-            )
-          ),
-          diffText !== null ? React.createElement('div', { className: 'tm-modal', onClick: () => setDiffText(null) },
-            React.createElement('div', { className: 'tm-modal-box', onClick: (e) => e.stopPropagation() },
-              React.createElement('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8 } },
-                React.createElement('strong', null, 'diff'),
-                React.createElement('button', { className: 'tm-btn', onClick: () => setDiffText(null) }, t.close)
-              ),
-              React.createElement('pre', { style: { margin: 0, whiteSpace: 'pre-wrap' } }, diffText)
-            )
-          ) : null
+            React.createElement(Timeline, { t, ctx })
+          )
         ) : null
       );
     }
@@ -382,7 +328,7 @@ window.__ModuleLoader__.load({
     function TimeMachineTab(props) {
       const ctx = props.ctx;
       const lang = useLocale(ctx);
-      const t = lang === 'ru' ? ru : en;
+      const t = lang.startsWith('zh') ? zh : (lang.startsWith('ru') ? ru : en);
       return React.createElement('div', { className: 'tm-tab' },
         React.createElement('div', { style: { fontSize: 13, fontWeight: 600, color: 'var(--dsw-alias-label-primary)' } }, t.tabTitle),
         React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)', marginBottom: 4 } }, t.sub),
@@ -393,7 +339,7 @@ window.__ModuleLoader__.load({
     module.exports.inject = ['slots', 'locale'];
     module.exports.apply = function apply(ctx) {
       ensureStyles();
-      try { ctx.locale && ctx.locale.register && ctx.locale.register(NS, { en, ru }); } catch {}
+      try { ctx.locale && ctx.locale.register && ctx.locale.register(NS, { en, ru, zh }); } catch {}
       // declaration-safe settings registration (alpha2 SlotCore requires inject)
       let settingsRegistered = false;
       const doRegisterSettings = () => {
@@ -423,7 +369,6 @@ window.__ModuleLoader__.load({
           ctx.slots.inject('settings.plugin.item', () => {
             doRegisterSettings();
           });
-          // also handle delayed BetterSidebar via inject
         } catch (e) {
           console.error('[dsh-time-machine] slots.inject failed', e);
           doRegisterSettings();
@@ -441,8 +386,8 @@ window.__ModuleLoader__.load({
           svc.registerTab({
             id: 'time-machine',
             title: () => {
-              const a = ctx.locale && ctx.locale.getSnapshot && ctx.locale.getSnapshot().active || 'en';
-              return a.startsWith('ru') ? 'Машина времени' : 'Time Machine';
+              const a = (ctx.locale && ctx.locale.getSnapshot && ctx.locale.getSnapshot().active) || 'en';
+              return a.startsWith('zh') ? '时光机' : (a.startsWith('ru') ? 'Машина времени' : 'Time Machine');
             },
             order: 30,
             single: true,
@@ -464,7 +409,6 @@ window.__ModuleLoader__.load({
             return () => {};
           });
         } catch (e) {
-          // betterSidebar is optional, do not hide loader failure
           if (String(e && e.message || '').includes('not declared')) {
             // service not declared in this host build - silently skip tab
           } else {
@@ -475,4 +419,4 @@ window.__ModuleLoader__.load({
     };
     return module.exports;
   },
-});
+});

package/lib/index.js

@@ -15,6 +15,12 @@ const NS = '@goodandready/dsh-time-machine';
 function sessionIdOf(execution, ctx) {
   try {
     if (execution && execution.sessionId) return String(execution.sessionId);
+    if (execution && execution.session) {
+      return String(execution.session.id || execution.session.header?.id || '');
+    }
+    if (execution && execution.data && execution.data.sessionId) {
+      return String(execution.data.sessionId);
+    }
     if (execution && execution.agent && execution.agent.session) {
       return String(execution.agent.session.id || execution.agent.session.header?.id || '');
     }
@@ -49,7 +55,35 @@ export function apply(ctx, config) {
     } catch {}
   };
 
-  // listen to DSH events if available
+  // 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);
+        }
+      }
+    });
+    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(() => {
@@ -76,7 +110,6 @@ export function apply(ctx, config) {
             if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
               engine.pruneSnapshots(sid, 3).catch(() => {});
             }
-            // failure/blocked: keep all checkpoints for review
           }));
         } catch {}
         return () => { for (const off of offs) try { typeof off === 'function' && off(); } catch {} };
@@ -114,10 +147,6 @@ export function apply(ctx, config) {
       },
       execute: async (args = {}, execution) => {
         const sid = args.sessionId != null ? String(args.sessionId).trim() : (sessionIdOf(execution, tctx) ? String(sessionIdOf(execution, tctx)).trim() : undefined);
-        const list = sid !== undefined ? engine.listSnapshots(sid) : engine.listSnapshots();
-        // if sid undefined and we want all, return all; but if sessionId was auto-detected, filter
-        // For backward compat, if no sid provided and engine has sessionIds, return all
-        // If sid was auto-detected (execution has session), use it
         const finalList = (args.sessionId == null && sid !== undefined && sid !== '') ? engine.listSnapshots(sid) : (args.sessionId != null ? engine.listSnapshots(String(args.sessionId)) : engine.listSnapshots());
         return { success: true, snapshots: finalList, sessionId: sid || '' };
       },
@@ -197,6 +226,33 @@ export function apply(ctx, config) {
     else ctx.inject(['tools'], (tctx) => registerTools(tctx));
   } catch {}
 
+  // Safe read body with max 1MB limit to protect against DoS
+  const readJsonBody = (req, res, cb) => {
+    let body = '';
+    let exceeded = false;
+    req.on('data', (c) => {
+      body += c;
+      if (body.length > 1024 * 1024) {
+        exceeded = true;
+        res.statusCode = 413;
+        res.setHeader('content-type', 'application/json');
+        res.end(JSON.stringify({ success: false, error: 'payload too large' }));
+        req.destroy();
+      }
+    });
+    req.on('end', () => {
+      if (exceeded) return;
+      try {
+        const parsed = body ? JSON.parse(body) : {};
+        cb(parsed);
+      } catch (e) {
+        res.statusCode = 400;
+        res.setHeader('content-type', 'application/json');
+        res.end(JSON.stringify({ success: false, error: 'invalid json' }));
+      }
+    });
+  };
+
   // web routes for UI (session-aware via ?sessionId=)
   ctx.effect(() => {
     const disposals = [];
@@ -233,12 +289,9 @@ export function apply(ctx, config) {
       disposals.push(ctx.webServer.register({
         kind: 'exact',
         path: '/dsh-time-machine/create',
-        handler: async (req, res) => {
-          let body = '';
-          req.on('data', (c) => body += c);
-          req.on('end', async () => {
+        handler: (req, res) => {
+          readJsonBody(req, res, async (parsed) => {
             try {
-              const parsed = body ? JSON.parse(body) : {};
               const sid = String(parsed.sessionId || new URL(req.url, 'http://localhost').searchParams.get('sessionId') || '').trim();
               const snap = await engine.createSnapshot(parsed.label, { sessionId: sid });
               res.setHeader('content-type', 'application/json');
@@ -254,12 +307,9 @@ export function apply(ctx, config) {
       disposals.push(ctx.webServer.register({
         kind: 'exact',
         path: '/dsh-time-machine/delete',
-        handler: async (req, res) => {
-          let body = '';
-          req.on('data', (c) => body += c);
-          req.on('end', async () => {
+        handler: (req, res) => {
+          readJsonBody(req, res, async (parsed) => {
             try {
-              const parsed = body ? JSON.parse(body) : {};
               const out = await engine.deleteSnapshot(String(parsed.id || ''), { confirm: parsed.confirm });
               res.setHeader('content-type', 'application/json');
               res.end(JSON.stringify({ success: true, ...out }));
@@ -274,12 +324,9 @@ export function apply(ctx, config) {
       disposals.push(ctx.webServer.register({
         kind: 'exact',
         path: '/dsh-time-machine/prune',
-        handler: async (req, res) => {
-          let body = '';
-          req.on('data', (c) => body += c);
-          req.on('end', async () => {
+        handler: (req, res) => {
+          readJsonBody(req, res, async (parsed) => {
             try {
-              const parsed = body ? JSON.parse(body) : {};
               const sid = String(parsed.sessionId || new URL(req.url, 'http://localhost').searchParams.get('sessionId') || '');
               const out = await engine.pruneSnapshots(sid, parsed.keep);
               res.setHeader('content-type', 'application/json');
@@ -295,12 +342,9 @@ export function apply(ctx, config) {
       disposals.push(ctx.webServer.register({
         kind: 'exact',
         path: '/dsh-time-machine/rollback',
-        handler: async (req, res) => {
-          let body = '';
-          req.on('data', (c) => body += c);
-          req.on('end', async () => {
+        handler: (req, res) => {
+          readJsonBody(req, res, async (parsed) => {
             try {
-              const parsed = body ? JSON.parse(body) : {};
               const out = await engine.rollbackSnapshot(String(parsed.id || ''), { confirm: parsed.confirm });
               res.setHeader('content-type', 'application/json');
               res.end(JSON.stringify({ success: true, ...out }));
@@ -317,4 +361,4 @@ export function apply(ctx, config) {
   }, 'dsh-time-machine: web routes');
 
   ctx.provide?.('timeMachineEngine', engine);
-}
+}

package/lib/snapshot.js

@@ -1,4 +1,6 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import { execFile as execFileCb } from 'node:child_process';
 import { promisify } from 'node:util';
 
@@ -6,7 +8,7 @@ const execFile = promisify(execFileCb);
 
 async function defaultExec(cmd, args, opts = {}) {
   try {
-    const { stdout } = await execFile(cmd, args, { encoding: 'utf8', ...opts });
+    const { stdout } = await execFile(cmd, args, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, ...opts });
     return { stdout: String(stdout ?? ''), stderr: '' };
   } catch (e) {
     const err = e;
@@ -28,16 +30,26 @@ export class ShadowSnapshotEngine {
 
   _now() { return Date.now(); }
 
-  _trimFor(sessionId) {
+  async _trimFor(sessionId) {
     if (!sessionId) {
-      while (this.snapshots.length > this.maxSnapshots) this.snapshots.shift();
+      while (this.snapshots.length > this.maxSnapshots) {
+        const oldest = this.snapshots.shift();
+        if (oldest?.ref) {
+          try { await this.exec('git', ['update-ref', '-d', oldest.ref], this.cwd ? { cwd: this.cwd } : {}); } catch {}
+        }
+      }
       return;
     }
     const perSession = this.snapshots.filter(s => s.sessionId === sessionId);
     while (perSession.length > this.maxSnapshots) {
       const oldest = perSession.shift();
       const idx = this.snapshots.indexOf(oldest);
-      if (idx !== -1) this.snapshots.splice(idx, 1);
+      if (idx !== -1) {
+        this.snapshots.splice(idx, 1);
+        if (oldest?.ref) {
+          try { await this.exec('git', ['update-ref', '-d', oldest.ref], this.cwd ? { cwd: this.cwd } : {}); } catch {}
+        }
+      }
     }
   }
 
@@ -48,6 +60,17 @@ export class ShadowSnapshotEngine {
     } catch { return false; }
   }
 
+  async _gitDir() {
+    try {
+      const { stdout } = await this.exec('git', ['rev-parse', '--git-dir'], this.cwd ? { cwd: this.cwd } : {});
+      const gdir = String(stdout ?? '').trim();
+      if (!gdir) return null;
+      return path.isAbsolute(gdir) ? gdir : path.resolve(this.cwd || process.cwd(), gdir);
+    } catch {
+      return null;
+    }
+  }
+
   // Restore checkpoint metadata from git shadow refs after a restart.
   // git is the durable store; memory is rebuilt from refs/dsh-time-machine/*.
   async loadFromRefs() {
@@ -89,8 +112,15 @@ export class ShadowSnapshotEngine {
     for (const snap of restored) snap.seq = ++this.seq;
     this.snapshots.push(...restored);
     const sessions = [...new Set(this.snapshots.map(s => s.sessionId))];
-    for (const sid of sessions) this._trimFor(sid);
-    if (sessions.length === 0) while (this.snapshots.length > this.maxSnapshots) this.snapshots.shift();
+    for (const sid of sessions) await this._trimFor(sid);
+    if (sessions.length === 0) {
+      while (this.snapshots.length > this.maxSnapshots) {
+        const oldest = this.snapshots.shift();
+        if (oldest?.ref) {
+          try { await this.exec('git', ['update-ref', '-d', oldest.ref], this.cwd ? { cwd: this.cwd } : {}); } catch {}
+        }
+      }
+    }
     return restored.length;
   }
 
@@ -98,27 +128,49 @@ export class ShadowSnapshotEngine {
     const id = crypto.randomUUID().slice(0, 8);
     const createdAt = this._now();
     const safeLabel = String(label ?? '').trim() || `checkpoint-${id}`;
-    const sid = String(sessionId || '').trim();
+    const rawSid = String(sessionId || '').trim();
+    const safeSid = rawSid ? rawSid.replace(/[^a-zA-Z0-9_-]/g, '_') : '';
     let commit = null;
     let ref = null;
     const inGit = await this._isGitRepo();
     if (inGit) {
+      let shadowIndex = null;
       try {
-        await this.exec('git', ['add', '-A'], this.cwd ? { cwd: this.cwd } : {});
-        const { stdout: tree } = await this.exec('git', ['write-tree'], this.cwd ? { cwd: this.cwd } : {});
+        const gitDir = await this._gitDir();
+        const baseOpts = this.cwd ? { cwd: this.cwd } : {};
+        const execEnv = {
+          ...process.env,
+          GIT_AUTHOR_NAME: 'DSH Time Machine',
+          GIT_AUTHOR_EMAIL: 'time-machine@dsh.local',
+          GIT_COMMITTER_NAME: 'DSH Time Machine',
+          GIT_COMMITTER_EMAIL: 'time-machine@dsh.local',
+        };
+
+        if (gitDir) {
+          shadowIndex = path.join(gitDir, `tm_index_${id}`);
+          execEnv.GIT_INDEX_FILE = shadowIndex;
+        }
+
+        const shadowOpts = { ...baseOpts, env: execEnv };
+        await this.exec('git', ['add', '-A'], shadowOpts);
+        const { stdout: tree } = await this.exec('git', ['write-tree'], shadowOpts);
         const treeHash = String(tree).trim();
-        const { stdout: commitHash } = await this.exec('git', ['commit-tree', treeHash, '-m', safeLabel], this.cwd ? { cwd: this.cwd } : {});
+        const { stdout: commitHash } = await this.exec('git', ['commit-tree', treeHash, '-m', safeLabel], shadowOpts);
         commit = String(commitHash).trim();
-        ref = sid ? `refs/dsh-time-machine/${sid}/${id}` : `refs/dsh-time-machine/${id}`;
-        await this.exec('git', ['update-ref', ref, commit], this.cwd ? { cwd: this.cwd } : {});
+        ref = safeSid ? `refs/dsh-time-machine/${safeSid}/${id}` : `refs/dsh-time-machine/${id}`;
+        await this.exec('git', ['update-ref', ref, commit], baseOpts);
       } catch {
         commit = null;
         ref = null;
+      } finally {
+        if (shadowIndex) {
+          try { await fs.unlink(shadowIndex); } catch {}
+        }
       }
     }
-    const snap = { id, label: safeLabel, sessionId: sid, createdAt, commit, ref, seq: ++this.seq };
+    const snap = { id, label: safeLabel, sessionId: rawSid, createdAt, commit, ref, seq: ++this.seq };
     this.snapshots.push(snap);
-    this._trimFor(sid);
+    await this._trimFor(rawSid);
     return snap;
   }
 
@@ -146,11 +198,16 @@ export class ShadowSnapshotEngine {
     }
     const inGit = await this._isGitRepo();
     if (inGit && snap.commit) {
+      const opts = this.cwd ? { cwd: this.cwd } : {};
       try {
-        await this.exec('git', ['reset', '--hard', snap.commit], this.cwd ? { cwd: this.cwd } : {});
+        // Safe rollback: restore index and working tree to snapshot without moving branch HEAD
+        await this.exec('git', ['read-tree', snap.commit], opts);
+        await this.exec('git', ['checkout-index', '-a', '-f'], opts);
+        await this.exec('git', ['clean', '-fd'], opts);
       } catch (e) {
-        await this.exec('git', ['read-tree', snap.commit], this.cwd ? { cwd: this.cwd } : {}).catch(()=>{});
-        await this.exec('git', ['checkout-index', '-a', '-f'], this.cwd ? { cwd: this.cwd } : {}).catch(()=>{});
+        // Fallback: checkout files directly from commit tree
+        await this.exec('git', ['checkout', snap.commit, '--', '.'], opts).catch(() => {});
+        await this.exec('git', ['clean', '-fd'], opts).catch(() => {});
       }
     }
     return { rolledBack: true, snapshot: snap };
@@ -181,7 +238,7 @@ export class ShadowSnapshotEngine {
   async pruneSnapshots(sessionId, keep = 3) {
     const sid = sessionId != null ? String(sessionId).trim() : undefined;
     const list = this.listSnapshots(sid); // newest first
-    const minKeep = Math.max(0, Number(keep) || 3);
+    const minKeep = Math.max(0, Number.isFinite(Number(keep)) ? Number(keep) : 3);
     const toRemove = list.slice(minKeep);
     const removed = [];
     for (const snap of toRemove) {
@@ -200,15 +257,20 @@ export class ShadowSnapshotEngine {
     let to = toId ? this.getSnapshot(toId) : null;
     const inGit = await this._isGitRepo();
     if (inGit && from.commit) {
+      const opts = this.cwd ? { cwd: this.cwd } : {};
       try {
-        const range = to?.commit ? `${from.commit}..${to.commit}` : `${from.commit}..HEAD`;
-        const { stdout } = await this.exec('git', ['diff', '--stat', range], this.cwd ? { cwd: this.cwd } : {});
+        const args = to?.commit
+          ? ['diff', '--stat', `${from.commit}..${to.commit}`]
+          : ['diff', '--stat', from.commit];
+        const { stdout } = await this.exec('git', args, opts);
         const diffStat = String(stdout ?? '').trim();
         if (diffStat) return { from: fromId, to: toId || 'HEAD', diff: diffStat };
       } catch {}
       try {
-        const range = to?.commit ? `${from.commit}..${to.commit}` : from.commit;
-        const { stdout } = await this.exec('git', ['diff', '--name-only', range], this.cwd ? { cwd: this.cwd } : {});
+        const args = to?.commit
+          ? ['diff', '--name-only', `${from.commit}..${to.commit}`]
+          : ['diff', '--name-only', from.commit];
+        const { stdout } = await this.exec('git', args, opts);
         return { from: fromId, to: toId || 'HEAD', diff: String(stdout ?? '').trim() || '(no changes)' };
       } catch {}
     }
@@ -218,11 +280,15 @@ export class ShadowSnapshotEngine {
 
   setMax(n) {
     this.maxSnapshots = Math.max(1, Number(n) || 20);
-    // trim all sessions
     const sessions = [...new Set(this.snapshots.map(s => s.sessionId))];
-    for (const sid of sessions) this._trimFor(sid);
+    for (const sid of sessions) this._trimFor(sid).catch(() => {});
     if (sessions.length === 0) {
-      while (this.snapshots.length > this.maxSnapshots) this.snapshots.shift();
+      while (this.snapshots.length > this.maxSnapshots) {
+        const oldest = this.snapshots.shift();
+        if (oldest?.ref) {
+          this.exec('git', ['update-ref', '-d', oldest.ref], this.cwd ? { cwd: this.cwd } : {}).catch(() => {});
+        }
+      }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-time-machine",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "DSH plugin for smart checkpoints, workspace safety guards, and instant rollback",
   "type": "module",
   "main": "lib/index.js",
@@ -42,9 +42,7 @@
     },
     "client": {
       "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
+      "inject": []
     }
   },
   "peerDependencies": {