dsh-ws-recency 0.11.1 → 0.11.3

package/README.md

@@ -88,7 +88,7 @@ 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 存，不受影响）。
@@ -130,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.1/dsh-ws-recency-0.11.1.tgz
+dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.11.3/dsh-ws-recency-0.11.3.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -212,6 +212,7 @@
           "move.current": "当前",
           "move.working": "移动中…（会先停止会话）",
           "move.done": "已移动到「{workspace}」。若列表没刷新，切换一下工作区或重启应用。",
+          "move.doneLive": "\n\n这个会话刚才是打开状态：建议重启应用后再继续对话，避免它沿用旧的目录。",
           "move.failed": "移动失败：",
           "stats.chart": "消耗分布",
           "stats.details.show": "显示明细 ▾",
@@ -265,6 +266,7 @@
           "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",
@@ -1447,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,45 @@ 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 };
+  /* Cordis throws on an undeclared service, so the probe is guarded. */
+  let wasLive = false;
+  try {
+    wasLive = typeof ctx.sessions?.get === "function" && ctx.sessions.get(sessionId) !== undefined;
+  } catch {
+    wasLive = false;
+  }
+  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 +612,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. */
@@ -659,7 +698,7 @@ export function apply(ctx) {
         }), "ws-recency: stats route");
       });
 
-      webCtx.inject(["sessionPersistence", "workspaceRegistry"], (moveCtx) => {
+      webCtx.inject(["sessionPersistence", "workspaceRegistry", "sessions"], (moveCtx) => {
         moveMounted = true;
         webCtx.effect(() => server.register({
           kind: "exact",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "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",