dsh-ws-recency 0.11.0 → 0.11.2

package/README.md

@@ -88,9 +88,11 @@ DSH 原生的置顶只把会话顶到**它所属工作区分组的第一行**，
 3. 把旧日志目录移进 `.trash/ws-recency/<id>-move-<时间戳>`（既是备份，也腾出这个 id）；
 4. 用新 `cwd`、原 id 重建日志，再回放全部事件；
 5. 校验新 header 的 cwd；
-6. 先 attach 到目标工作区（失败就回滚原目录），再 detach 旧工作区；
+6. 把新 cwd 同步到工作区的 header 索引和这个会话的内存对象（否则宿主会用旧目录拒绝 attach），再 attach 到目标（失败就回滚原目录），最后 detach 旧工作区；
 7. 删投影缓存，让它按新路径重建。
 
+**只移动会话**：对话框里明确提示——它在旧工作区里创建/修改的文件不会跟着走，仍留在原目录（附件与 rewind 快照按会话 id 存，不受影响）。
+
 **风险与退路**：这是插件里唯一改写会话存储的操作。备份会保留，回滚 = 把备份目录移回 `sessions/<project>/<id>`。
 
 ## 设置
@@ -128,7 +130,7 @@ dsh plugin --profile <profile> add github:chyxhtc/dsh-ws-recency
 或固定版本的预构建包：
 
 ```powershell
-dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.11.0/dsh-ws-recency-0.11.0.tgz
+dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.11.2/dsh-ws-recency-0.11.2.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -123,6 +123,7 @@
           ".wsr-stats-legend{display:flex;flex-wrap:wrap;gap:10px}",
           ".wsr-stats-legend-item{display:flex;align-items:center;gap:5px;font-size:11px;color:var(--dsw-alias-label-tertiary)}",
           ".wsr-stats-swatch{width:8px;height:8px;border-radius:2px}",
+          ".wsr-move-warning{color:var(--dsw-alias-state-warn-primary,#d9a72c);font-size:11px;line-height:1.5}",
           ".wsr-move-list{display:flex;flex-direction:column;gap:4px}",
           ".wsr-move-row{display:flex;align-items:center;gap:8px;text-align:left;border:none;background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));color:inherit;font:inherit;padding:8px 10px;border-radius:8px;cursor:pointer}",
           ".wsr-move-row:hover:not([disabled]){background:var(--dsw-alias-interactive-bg-hover,rgba(255,255,255,.08))}",
@@ -205,11 +206,13 @@
           "stats.diagnose.noHost": "\n\n（宿主半未加载：需要重启应用加载新版本）",
           "menu.move": "移动到工作区…",
           "move.title": "移动到工作区",
+          "move.warning": "只移动会话本身：它在旧工作区里创建或修改的文件不会跟着走，仍留在原目录。",
           "move.note": "会话属于哪个工作区，由它创建时的目录决定；移动会改写会话记录的 cwd，把日志搬到新工作区目录，旧日志备份在 .trash/ws-recency。",
-          "move.confirm": "把会话移动到「{workspace}」？",
+          "move.confirm": "把会话移动到「{workspace}」？\n\n只移动会话记录，旧工作区里的文件不会跟着搬。",
           "move.current": "当前",
           "move.working": "移动中…（会先停止会话）",
           "move.done": "已移动到「{workspace}」。若列表没刷新，切换一下工作区或重启应用。",
+          "move.doneLive": "\n\n这个会话刚才是打开状态：建议重启应用后再继续对话，避免它沿用旧的目录。",
           "move.failed": "移动失败：",
           "stats.chart": "消耗分布",
           "stats.details.show": "显示明细 ▾",
@@ -257,11 +260,13 @@
           "stats.diagnose.noHost": "\n\n(the host half is not loaded: restart the app to pick up the new version)",
           "menu.move": "Move to workspace\u2026",
           "move.title": "Move to workspace",
+          "move.warning": "Only the session moves: files it created or changed in the old workspace stay where they are.",
           "move.note": "A session belongs to the workspace of the directory it was created in. Moving rewrites the stored cwd, relocates the log and keeps the old one as a backup in .trash/ws-recency.",
-          "move.confirm": "Move this session to \"{workspace}\"?",
+          "move.confirm": "Move this session to \"{workspace}\"?\n\nOnly the session record moves; its files stay in the old workspace.",
           "move.current": "current",
           "move.working": "Moving\u2026 (the session is stopped first)",
           "move.done": "Moved to \"{workspace}\". If the list has not refreshed, switch workspaces or restart the app.",
+          "move.doneLive": "\n\nThe session was open: restart the app before continuing it so it does not keep using the old directory.",
           "move.failed": "Move failed: ",
           "stats.chart": "Where the tokens went",
           "stats.details.show": "Show details",
@@ -1406,6 +1411,7 @@
           var body = statsDiv("wsr-modal-body");
           panel.appendChild(body);
           body.appendChild(statsDiv("wsr-stats-note", t("move.note")));
+          body.appendChild(statsDiv("wsr-move-warning", t("move.warning")));
 
           var current = workspaceOfSession(sessionId);
           var items = (data.workspaces && data.workspaces.items) || [];
@@ -1443,6 +1449,7 @@
                     .then(function (result) {
                       if (result.json !== null && result.json.ok === true) {
                         body.textContent = t("move.done", { workspace: label });
+                        if (result.json.live === true) body.textContent += t("move.doneLive");
                         return;
                       }
                       var reason = (result.json !== null && result.json.error) || (result.text || "").trim().slice(0, 160) || "(empty response)";

package/index.js

@@ -545,6 +545,39 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
     return { ok: false, error: error instanceof Error ? error.message : String(error) };
   }
 
+  /* The moved cwd lives in three places: the log (just rewritten), the Workspace
+     registry's header index, and the live Session object when this process still
+     has the session open. The registry validates against its own view, so both the
+     cached header and the live one have to follow - otherwise an open session is
+     refused with its old directory. */
+  const movedHeader = { ...header, cwd: targetPath };
+  const wasLive = typeof ctx.sessions?.get === "function" && ctx.sessions.get(sessionId) !== undefined;
+  try {
+    if (typeof ctx.workspaceRegistry.indexHeader === "function") await ctx.workspaceRegistry.indexHeader(movedHeader);
+  } catch {
+    /* the index rebuilds from disk on its own */
+  }
+  try {
+    const live = typeof ctx.sessions?.get === "function" ? ctx.sessions.get(sessionId) : undefined;
+    if (live !== undefined && live !== null && live.header !== undefined) live.header = movedHeader;
+  } catch {
+    /* an immutable live header: the attach below reports it */
+  }
+
+  let seenCwd = targetPath;
+  try {
+    if (typeof ctx.workspaceRegistry.readSessionHeader === "function") {
+      const seen = await ctx.workspaceRegistry.readSessionHeader(sessionId);
+      if (seen !== undefined && seen !== null && typeof seen.cwd === "string") seenCwd = seen.cwd;
+    }
+  } catch {
+    seenCwd = targetPath;
+  }
+  if (seenCwd !== targetPath) {
+    await rollback();
+    return { ok: false, error: `the app still holds this session's old directory (${seenCwd}); restart the app and move it again` };
+  }
+
   /* Attach first, detach second: a refused attach must not orphan the session. */
   try {
     await target.attachSession(sessionId);
@@ -573,7 +606,7 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
     /* the cache is derived data */
   }
 
-  return { ok: true, workspace: target.id, path: targetPath, detached, backup };
+  return { ok: true, workspace: target.id, path: targetPath, detached, backup, live: wasLive };
 }
 
 /** POST { sessionId, workspaceId } -> move that session to another workspace. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Sidebar session management for DeepSeek Harness: workspace groups sorted by latest activity, stale history folded, a global pinned section, follow-up marks, session delete into a recoverable trash, per-session token statistics split by tool, and moving a session to another workspace.",
   "license": "MIT",
   "author": "chyxhtc",