dsh-ws-recency 0.11.2 → 0.11.4

package/README.md

@@ -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.2/dsh-ws-recency-0.11.2.tgz
+dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.11.4/dsh-ws-recency-0.11.4.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -213,6 +213,7 @@
           "move.working": "移动中…（会先停止会话）",
           "move.done": "已移动到「{workspace}」。若列表没刷新，切换一下工作区或重启应用。",
           "move.doneLive": "\n\n这个会话刚才是打开状态：建议重启应用后再继续对话，避免它沿用旧的目录。",
+          "move.repaired": "已补登记到「{workspace}」：上一次移动只搬了日志、没登记工作区，这次把它补上了。",
           "move.failed": "移动失败：",
           "stats.chart": "消耗分布",
           "stats.details.show": "显示明细 ▾",
@@ -267,6 +268,7 @@
           "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.repaired": "Registered in \"{workspace}\": the previous attempt moved the log without the bookkeeping, and this repaired it.",
           "move.failed": "Move failed: ",
           "stats.chart": "Where the tokens went",
           "stats.details.show": "Show details",
@@ -1448,6 +1450,10 @@
                     })
                     .then(function (result) {
                       if (result.json !== null && result.json.ok === true) {
+                        if (result.json.repaired === true) {
+                          body.textContent = t("move.repaired", { workspace: label });
+                          return;
+                        }
                         body.textContent = t("move.done", { workspace: label });
                         if (result.json.live === true) body.textContent += t("move.doneLive");
                         return;

package/index.js

@@ -469,7 +469,28 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
     ?? workspaces.find((workspace) => workspace.path === workspaceId);
   if (target === undefined) return { ok: false, error: "workspace not found" };
   const targetPath = target.path;
-  if (header.cwd === targetPath) return { ok: false, error: "already in that workspace" };
+  if (header.cwd === targetPath) {
+    /* Already pointed at the target: a previous attempt moved the log but died
+       before the bookkeeping (the app's in-memory header refused it). Repair the
+       membership instead of failing, so such a session is not left unlisted. */
+    try {
+      await target.attachSession(sessionId);
+    } catch (error) {
+      return { ok: false, error: `session is already in that directory but the workspace refused it: ${error instanceof Error ? error.message : String(error)}` };
+    }
+    const stale = [];
+    for (const workspace of workspaces) {
+      if (!Array.isArray(workspace.sessionIds) || !workspace.sessionIds.includes(sessionId)) continue;
+      if (workspace.id === target.id) continue;
+      try {
+        await workspace.detachSession(sessionId);
+        stale.push(workspace.id);
+      } catch {
+        /* a stale membership that filters itself out anyway */
+      }
+    }
+    return { ok: true, repaired: true, workspace: target.id, path: targetPath, detached: stale };
+  }
 
   let targetDirectory;
   try {
@@ -550,8 +571,15 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
      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. */
+  let wasLive = false;
+  try {
   const movedHeader = { ...header, cwd: targetPath };
-  const wasLive = typeof ctx.sessions?.get === "function" && ctx.sessions.get(sessionId) !== undefined;
+  /* Cordis throws on an undeclared service, so the probe is guarded. */
+  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 {
@@ -577,6 +605,10 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
     await rollback();
     return { ok: false, error: `the app still holds this session's old directory (${seenCwd}); restart the app and move it again` };
   }
+  } catch (error) {
+    await rollback();
+    return { ok: false, error: error instanceof Error ? error.message : String(error) };
+  }
 
   /* Attach first, detach second: a refused attach must not orphan the session. */
   try {
@@ -692,7 +724,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.2",
+  "version": "0.11.4",
   "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",