dsh-ws-recency 0.10.6 → 0.11.1

package/README.md

@@ -1,6 +1,6 @@
 # dsh-ws-recency
 
-DSH 侧栏的六件事：**工作区分组按最近活跃排序**、**过期历史自动折叠**、**运行中/未读/需跟进三色标记**、**所有置顶会话汇总到顶部一个区**、**删除会话到可恢复的回收站**、**按工具分类的 token 消耗统计**。单独装上就有效，不依赖其它插件。
+DSH 侧栏的六件事：**工作区分组按最近活跃排序**、**过期历史自动折叠**、**运行中/未读/需跟进三色标记**、**所有置顶会话汇总到顶部一个区**、**删除会话到可恢复的回收站**、**按工具分类的 token 消耗统计**、**把会话移动到另一个工作区**。单独装上就有效，不依赖其它插件。
 
 ## 一、分组排序
 
@@ -75,6 +75,26 @@ DSH 原生的置顶只把会话顶到**它所属工作区分组的第一行**，
 
 宿主半（`index.js`）把统计与删除的路由挂在 webServer 上；如果面板报“宿主半未加载”，说明应用还没重启加载新版本。0.10.1 起面板失败时会带上 HTTP 状态和 `/ws-recency/health` 的自检结果，便于定位。
 
+## 七、移动到工作区
+
+「…」菜单 →「移动到工作区…」，选目标工作区即可。
+
+**为什么核心做不到**：会话属于哪个工作区由它创建时的 `cwd` 决定，工作区的 attach 会校验「header.cwd 必须等于工作区路径」，而 header 是日志里不可变的第一条记录——所以在核心层面没有任何"改工作区"的入口。
+
+**本插件怎么做**（宿主侧，唯一的写操作）：
+
+1. 停掉会话；
+2. 通过 persistence 读出全部事件；
+3. 把旧日志目录移进 `.trash/ws-recency/<id>-move-<时间戳>`（既是备份，也腾出这个 id）；
+4. 用新 `cwd`、原 id 重建日志，再回放全部事件；
+5. 校验新 header 的 cwd；
+6. 先 attach 到目标工作区（失败就回滚原目录），再 detach 旧工作区；
+7. 删投影缓存，让它按新路径重建。
+
+**只移动会话**：对话框里明确提示——它在旧工作区里创建/修改的文件不会跟着走，仍留在原目录（附件与 rewind 快照按会话 id 存，不受影响）。
+
+**风险与退路**：这是插件里唯一改写会话存储的操作。备份会保留，回滚 = 把备份目录移回 `sessions/<project>/<id>`。
+
 ## 设置
 
 **设置 → 通用**：
@@ -110,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.10.6/dsh-ws-recency-0.10.6.tgz
+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-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -123,6 +123,15 @@
           ".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))}",
+          ".wsr-move-row[disabled]{opacity:.55;cursor:default}",
+          ".wsr-move-text{display:flex;flex-direction:column;gap:2px;min-width:0;flex:1}",
+          ".wsr-move-title{font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
+          ".wsr-move-path{font-size:11px;color:var(--dsw-alias-label-tertiary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
+          ".wsr-move-badge{font-size:11px;color:var(--dsw-alias-label-tertiary)}",
           ".wsr-chart{display:flex;flex-direction:column;gap:6px}",
           ".wsr-chart-title{font-size:11px;color:var(--dsw-alias-label-tertiary)}",
           ".wsr-chart-row{display:grid;grid-template-columns:120px 1fr 64px 56px;align-items:center;gap:8px}",
@@ -195,6 +204,15 @@
           "stats.agentDetail": "主 agent 构成：思考 {reasoning} · 回复 {text} · 用户消息 {user} · 系统提示 {system}",
           "stats.diagnose.unmounted": "\n\n（宿主半已加载，但统计路由没挂上——重启应用再试）",
           "stats.diagnose.noHost": "\n\n（宿主半未加载：需要重启应用加载新版本）",
+          "menu.move": "移动到工作区…",
+          "move.title": "移动到工作区",
+          "move.warning": "只移动会话本身：它在旧工作区里创建或修改的文件不会跟着走，仍留在原目录。",
+          "move.note": "会话属于哪个工作区，由它创建时的目录决定；移动会改写会话记录的 cwd，把日志搬到新工作区目录，旧日志备份在 .trash/ws-recency。",
+          "move.confirm": "把会话移动到「{workspace}」？\n\n只移动会话记录，旧工作区里的文件不会跟着搬。",
+          "move.current": "当前",
+          "move.working": "移动中…（会先停止会话）",
+          "move.done": "已移动到「{workspace}」。若列表没刷新，切换一下工作区或重启应用。",
+          "move.failed": "移动失败：",
           "stats.chart": "消耗分布",
           "stats.details.show": "显示明细 ▾",
           "stats.details.hide": "收起明细 ▴",
@@ -239,6 +257,15 @@
           "stats.agentDetail": "Agent composition: reasoning {reasoning} \u00b7 reply {text} \u00b7 user messages {user} \u00b7 system prompt {system}",
           "stats.diagnose.unmounted": "\n\n(the host half is loaded but the statistics route did not mount - restart the app and retry)",
           "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}\"?\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.failed": "Move failed: ",
           "stats.chart": "Where the tokens went",
           "stats.details.show": "Show details",
           "stats.details.hide": "Hide details",
@@ -1354,6 +1381,105 @@
           });
         }
 
+        /** Which workspace currently owns a session, per the client snapshot. */
+        function workspaceOfSession(sessionId) {
+          var items = (data.workspaces && data.workspaces.items) || [];
+          for (var i = 0; i < items.length; i += 1) {
+            if ((items[i].sessionIds || []).indexOf(sessionId) !== -1) return items[i];
+          }
+          return null;
+        }
+
+        /** Modal that lists the workspaces and moves the session into the chosen one. */
+        function openMovePanel(sessionId) {
+          if (typeof document === "undefined") return;
+          closeStatsPanel();
+          var backdrop = statsDiv("wsr-modal-backdrop");
+          var panel = statsDiv("wsr-modal");
+          backdrop.appendChild(panel);
+          var head = statsDiv("wsr-modal-head");
+          head.appendChild(statsDiv("wsr-modal-title", t("move.title")));
+          var close = document.createElement("button");
+          close.type = "button";
+          close.className = "wsr-modal-close";
+          close.textContent = "\u00d7";
+          close.addEventListener("click", closeStatsPanel);
+          head.appendChild(close);
+          panel.appendChild(head);
+          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) || [];
+          var list = statsDiv("wsr-move-list");
+          for (var i = 0; i < items.length; i += 1) {
+            (function (item) {
+              var isCurrent = current !== null && current.workspaceId === item.workspaceId;
+              var row = document.createElement("button");
+              row.type = "button";
+              row.className = "wsr-move-row";
+              row.setAttribute("data-wsr-move-target", String(item.workspaceId));
+              if (isCurrent) row.setAttribute("disabled", "true");
+              var text = statsDiv("wsr-move-text");
+              text.appendChild(statsDiv("wsr-move-title", (item.title && String(item.title)) || baseName(item.path)));
+              text.appendChild(statsDiv("wsr-move-path", String(item.path || "")));
+              row.appendChild(text);
+              row.appendChild(statsDiv("wsr-move-badge", isCurrent ? t("move.current") : ""));
+              if (!isCurrent) {
+                row.addEventListener("click", function () {
+                  var label = (item.title && String(item.title)) || baseName(item.path);
+                  if (typeof window.confirm !== "function" || !window.confirm(t("move.confirm", { workspace: label }))) return;
+                  body.textContent = t("move.working");
+                  fetch("/ws-recency/session-move?sessionId=" + encodeURIComponent(sessionId), {
+                    method: "POST",
+                    headers: { "content-type": "application/json" },
+                    body: JSON.stringify({ sessionId: sessionId, workspaceId: item.workspaceId }),
+                  })
+                    .then(function (response) {
+                      return response.text().then(function (text) {
+                        var parsed = null;
+                        try { parsed = JSON.parse(text); } catch (error) { parsed = null; }
+                        return { status: response.status, text: text, json: parsed };
+                      });
+                    })
+                    .then(function (result) {
+                      if (result.json !== null && result.json.ok === true) {
+                        body.textContent = t("move.done", { workspace: label });
+                        return;
+                      }
+                      var reason = (result.json !== null && result.json.error) || (result.text || "").trim().slice(0, 160) || "(empty response)";
+                      body.textContent = t("move.failed") + "HTTP " + result.status + " \u00b7 " + reason;
+                    })
+                    .catch(function (error) {
+                      body.textContent = t("move.failed") + (error && error.message ? error.message : error);
+                    });
+                });
+              }
+              list.appendChild(row);
+            })(items[i]);
+          }
+          body.appendChild(list);
+          backdrop.addEventListener("click", function (event) {
+            if (event !== undefined && event.target === backdrop) closeStatsPanel();
+          });
+          document.body.appendChild(backdrop);
+          statsModal = backdrop;
+          document.addEventListener("keydown", onStatsKey);
+        }
+
+        /** Session "..." menu row: move the conversation to another workspace. */
+        function MoveMenuItem(props) {
+          var Item = ui.MenuItemButton;
+          if (typeof Item !== "function") return null;
+          var Icon = ui.IconFolderOpenOutlineRegular;
+          return h(Item, {
+            icon: typeof Icon === "function" ? h(Icon, {}) : undefined,
+            onSelect: function () { openMovePanel(props.sessionId); },
+          }, t("menu.move"));
+        }
+
         /** Session "..." menu row: token statistics of that session. */
         function StatsMenuItem(props) {
           var Item = ui.MenuItemButton;
@@ -1600,6 +1726,16 @@
             }, FollowUpDot);
           });
 
+          ctx.slots.inject("sidebar.workspaces.session.menu.item", function () {
+            return ctx.slots.register({
+              name: "sidebar.workspaces.session.menu.item",
+              id: "ws-recency-move",
+              order: 690,
+              store: prefs,
+              locale: NS,
+            }, MoveMenuItem);
+          });
+
           ctx.slots.inject("sidebar.workspaces.session.menu.item", function () {
             return ctx.slots.register({
               name: "sidebar.workspaces.session.menu.item",

package/index.js

@@ -19,7 +19,7 @@
  *
  * @module dsh-ws-recency
  */
-import { mkdir, readdir, rename } from "node:fs/promises";
+import { mkdir, readdir, rename, rm, stat as statPath } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
 /** Cordis plugin name shown by the loader. */
@@ -35,6 +35,7 @@ export const HOST_VERSION = "0.10.1";
 export const TRASH_SESSION_PATH = "/ws-recency/session-trash";
 export const STATS_SESSION_PATH = "/ws-recency/session-stats";
 export const HEALTH_PATH = "/ws-recency/health";
+export const MOVE_SESSION_PATH = "/ws-recency/session-move";
 
 const STOP_SETTLE_MS = 500;
 const MAX_BODY_BYTES = 16 * 1024;
@@ -438,6 +439,168 @@ export async function sessionStatistics(ctx, sessionId) {
   }
 }
 
+/**
+ * Move one session into another workspace.
+ *
+ * A Session belongs to a Workspace through its stored header's `cwd`, and the
+ * Workspace registry refuses to attach a session whose header names another
+ * directory - so the header itself has to change. It is the immutably stored
+ * first record, so the move rewrites the log:
+ *
+ *   1. stop the session and read every event through the persistence seam
+ *   2. rename the old log directory into `.trash/ws-recency` (a backup, and it
+ *      frees the id for the create below)
+ *   3. create the same id with the new `cwd` and append the same events
+ *   4. verify the new header, then detach from the old workspace and attach to
+ *      the target (which validates the new cwd)
+ *   5. drop the projection cache so it rebuilds against the new path
+ *
+ * Any failure before step 4 rolls the backup back into place. The backup is kept
+ * afterwards on purpose: it is the only undo, and it is one rename away.
+ */
+export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
+  const stat = await ctx.sessionPersistence.stat(sessionId);
+  if (stat === undefined || stat === null) return { ok: false, error: "session not found" };
+  const header = stat.header;
+  if (header === undefined || header === null) return { ok: false, error: "session header unavailable" };
+
+  const workspaces = ctx.workspaceRegistry.list();
+  const target = workspaces.find((workspace) => workspace.id === 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" };
+
+  let targetDirectory;
+  try {
+    targetDirectory = await statPath(targetPath);
+  } catch {
+    return { ok: false, error: `target directory does not exist: ${targetPath}` };
+  }
+  if (!targetDirectory.isDirectory()) return { ok: false, error: "target path is not a directory" };
+
+  try {
+    await ctx.parallel("workspace/session-stop", { sessionId });
+  } catch {
+    /* stopping is best effort, exactly like "stop and archive" */
+  }
+  await new Promise((resolve) => setTimeout(resolve, STOP_SETTLE_MS));
+
+  let events;
+  try {
+    events = await readSessionEvents(ctx, sessionId);
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : String(error) };
+  }
+
+  const located = typeof ctx.sessionPersistence.locate === "function" ? ctx.sessionPersistence.locate(header) : undefined;
+  const sourceDirectory = located !== undefined && located !== null && typeof located.path === "string" ? dirname(located.path) : undefined;
+  if (sourceDirectory === undefined) return { ok: false, error: "session log not found" };
+
+  const home = await dshHome();
+  const backupRoot = join(home, ".trash", "ws-recency");
+  const backup = join(backupRoot, `${sessionId}-move-${Date.now()}`);
+  let movedAside = false;
+  try {
+    await mkdir(backupRoot, { recursive: true });
+    await rename(sourceDirectory, backup);
+    movedAside = true;
+  } catch (error) {
+    return { ok: false, error: `could not park the old log: ${error instanceof Error ? error.message : String(error)}` };
+  }
+
+  /** Undo the rewrite: drop whatever was written and put the original back. */
+  const rollback = async () => {
+    try {
+      const partial = typeof ctx.sessionPersistence.locate === "function" ? ctx.sessionPersistence.locate({ ...header, cwd: targetPath }) : undefined;
+      if (partial !== undefined && partial !== null && typeof partial.path === "string") await rm(dirname(partial.path), { recursive: true, force: true });
+    } catch {
+      /* nothing partial to clean */
+    }
+    try {
+      await rename(backup, sourceDirectory);
+    } catch {
+      /* the backup stays in the trash folder */
+    }
+  };
+
+  try {
+    const created = await ctx.sessionPersistence.create({ ...header, cwd: targetPath }, { inheritedEventCount: 0 });
+    try {
+      if (events.length > 0) await created.append(events);
+      if (typeof created.flush === "function") await created.flush();
+    } finally {
+      try {
+        await created.close();
+      } catch {
+        /* closing is best effort */
+      }
+    }
+    const check = await ctx.sessionPersistence.stat(sessionId);
+    if (check === undefined || check === null || check.header === undefined || check.header.cwd !== targetPath) {
+      throw new Error("the rewritten header did not take");
+    }
+  } 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 {
+    await target.attachSession(sessionId);
+  } catch (error) {
+    await rollback();
+    return { ok: false, error: `the workspace refused the attach: ${error instanceof Error ? error.message : String(error)}` };
+  }
+
+  const detached = [];
+  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);
+      detached.push(workspace.id);
+    } catch {
+      /* the session is already in the target; a stale membership is cosmetic */
+    }
+  }
+
+  try {
+    const domain = ctx.get("storageDomain");
+    const projcache = typeof domain?.get === "function" ? domain.get("session_projcache") : undefined;
+    if (projcache !== undefined) await projcache.table("sessions").delete(sessionId);
+  } catch {
+    /* the cache is derived data */
+  }
+
+  return { ok: true, workspace: target.id, path: targetPath, detached, backup };
+}
+
+/** POST { sessionId, workspaceId } -> move that session to another workspace. */
+export async function handleMoveRequest(ctx, req, res) {
+  if ((req.method ?? "POST").toUpperCase() !== "POST") {
+    sendJson(res, 405, { ok: false, error: "method not allowed" });
+    return;
+  }
+  if (!loopbackOrigin(req)) {
+    sendJson(res, 403, { ok: false, error: "origin not trusted" });
+    return;
+  }
+  try {
+    const body = await readJsonBody(req);
+    const sessionId = sessionIdFrom(req, body);
+    const workspaceId = body !== null && typeof body.workspaceId === "string" ? body.workspaceId.trim() : "";
+    if (sessionId === "" || workspaceId === "") {
+      sendJson(res, 400, { ok: false, error: "sessionId and workspaceId are required" });
+      return;
+    }
+    const result = await moveSessionToWorkspace(ctx, sessionId, workspaceId);
+    sendJson(res, result.ok ? 200 : 500, result);
+  } catch (error) {
+    sendJson(res, 500, { ok: false, error: error instanceof Error ? error.message : String(error) });
+  }
+}
+
 /** POST { sessionId } -> token statistics for that session. */
 export async function handleStatsRequest(ctx, req, res) {
   if ((req.method ?? "POST").toUpperCase() !== "POST") {
@@ -483,7 +646,7 @@ export function apply(ctx) {
         handler: (req, res) => sendJson(res, 200, {
           ok: true,
           version: HOST_VERSION,
-          routes: { stats: statsMounted, trash: trashMounted },
+          routes: { stats: statsMounted, trash: trashMounted, move: moveMounted },
         }),
       }), "ws-recency: health route");
 
@@ -496,6 +659,15 @@ export function apply(ctx) {
         }), "ws-recency: stats route");
       });
 
+      webCtx.inject(["sessionPersistence", "workspaceRegistry"], (moveCtx) => {
+        moveMounted = true;
+        webCtx.effect(() => server.register({
+          kind: "exact",
+          path: MOVE_SESSION_PATH,
+          handler: (req, res) => handleMoveRequest(moveCtx, req, res),
+        }), "ws-recency: move route");
+      });
+
       webCtx.inject(["sessionPersistence", "workspaceRegistry", "sessions"], (trashCtx) => {
         trashMounted = true;
         webCtx.effect(() => server.register({
@@ -512,3 +684,4 @@ export function apply(ctx) {
 
 let statsMounted = false;
 let trashMounted = false;
+let moveMounted = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.10.6",
-  "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, and per-session token statistics split by tool.",
+  "version": "0.11.1",
+  "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",
   "repository": {