dsh-ws-recency 0.11.3 → 0.11.5

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

package/client.js

@@ -213,6 +213,13 @@
           "move.working": "移动中…（会先停止会话）",
           "move.done": "已移动到「{workspace}」。若列表没刷新，切换一下工作区或重启应用。",
           "move.doneLive": "\n\n这个会话刚才是打开状态：建议重启应用后再继续对话，避免它沿用旧的目录。",
+          "move.repaired": "已补登记到「{workspace}」：上一次移动只搬了日志、没登记工作区，这次把它补上了。",
+          "adopt.title": "补登记游离会话",
+          "adopt.description": "有些会话的目录已经指向某个工作区，却不在任何分组里（移动中断会留下这种状态）。这里可以一次性找回。",
+          "adopt.action": "扫描",
+          "adopt.working": "扫描中…",
+          "adopt.done": "已补登记 {n} 个会话。",
+          "adopt.failed": "扫描失败：",
           "move.failed": "移动失败：",
           "stats.chart": "消耗分布",
           "stats.details.show": "显示明细 ▾",
@@ -267,6 +274,13 @@
           "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.",
+          "adopt.title": "Adopt unlisted sessions",
+          "adopt.description": "A session whose directory already belongs to a workspace can end up listed nowhere (an interrupted move leaves exactly this). Scan to re-attach them.",
+          "adopt.action": "Scan",
+          "adopt.working": "Scanning\u2026",
+          "adopt.done": "Re-attached {n} session(s).",
+          "adopt.failed": "Scan failed: ",
           "move.failed": "Move failed: ",
           "stats.chart": "Where the tokens went",
           "stats.details.show": "Show details",
@@ -1448,6 +1462,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;
@@ -1561,6 +1579,44 @@
           );
         }
 
+        /** Settings -> General: re-attach sessions that belong to no workspace. */
+        function AdoptRow() {
+          var result = react.useState("");
+          var message = result[0];
+          var setMessage = result[1];
+          var run = function () {
+            setMessage(t("adopt.working"));
+            fetch("/ws-recency/session-adopt", { method: "POST", headers: { "content-type": "application/json" }, body: "{}" })
+              .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 (answer) {
+                if (answer.json !== null && answer.json.ok === true) {
+                  var count = Array.isArray(answer.json.adopted) ? answer.json.adopted.length : 0;
+                  setMessage(t("adopt.done", { n: count }));
+                  return;
+                }
+                setMessage(t("adopt.failed") + (answer.json && answer.json.error ? answer.json.error : answer.text.slice(0, 120)));
+              })
+              .catch(function (error) {
+                setMessage(t("adopt.failed") + (error && error.message ? error.message : error));
+              });
+          };
+          return h("div", { className: "wsr-setRow" },
+            h("div", { className: "wsr-setText" },
+              h("div", { className: "wsr-setTitle" }, t("adopt.title")),
+              h("div", { className: "wsr-setDesc" }, message === "" ? t("adopt.description") : message),
+            ),
+            h("div", { className: "wsr-controls" },
+              h("button", { type: "button", className: "wsr-step", onClick: run }, t("adopt.action")),
+            ),
+          );
+        }
+
         /** Settings -> General row: the global pinned section on/off. */
         function PinSectionRow(props) {
           var settings = props.useStore(function (state) { return state; });
@@ -1699,6 +1755,16 @@
             }, ColorsRow);
           });
 
+          ctx.slots.inject("settings.general.item", function () {
+            return ctx.slots.register({
+              name: "settings.general.item",
+              id: "ws-recency-adopt",
+              order: 49,
+              store: prefs,
+              locale: NS,
+            }, AdoptRow);
+          });
+
           ctx.slots.inject("settings.general.item", function () {
             return ctx.slots.register({
               name: "settings.general.item",

package/index.js

@@ -36,6 +36,7 @@ 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";
+export const ADOPT_SESSION_PATH = "/ws-recency/session-adopt";
 
 const STOP_SETTLE_MS = 500;
 const MAX_BODY_BYTES = 16 * 1024;
@@ -469,7 +470,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,9 +572,10 @@ 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 };
   /* 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 {
@@ -583,6 +606,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 {
@@ -615,6 +642,51 @@ export async function moveSessionToWorkspace(ctx, sessionId, workspaceId) {
   return { ok: true, workspace: target.id, path: targetPath, detached, backup, live: wasLive };
 }
 
+/**
+ * Re-attach sessions whose stored cwd already names a workspace but which are
+ * listed by none - the shape an aborted move leaves behind. Idempotent: it only
+ * ever adds memberships the registry's own validation accepts.
+ */
+export async function adoptOrphanSessions(ctx) {
+  const snapshots = await ctx.sessionPersistence.list();
+  const workspaces = ctx.workspaceRegistry.list();
+  const byPath = new Map();
+  for (const workspace of workspaces) byPath.set(workspace.path, workspace);
+  const adopted = [];
+  for (const snapshot of snapshots) {
+    const header = snapshot !== null && snapshot !== undefined ? snapshot.header : undefined;
+    if (header === undefined || header === null || typeof header.cwd !== "string" || typeof header.id !== "string") continue;
+    const target = byPath.get(header.cwd);
+    if (target === undefined) continue;
+    const listed = workspaces.some((workspace) => Array.isArray(workspace.sessionIds) && workspace.sessionIds.includes(header.id));
+    if (listed) continue;
+    try {
+      await target.attachSession(header.id);
+      adopted.push(header.id);
+    } catch {
+      /* the registry refused it; leave it alone */
+    }
+  }
+  return { ok: true, adopted };
+}
+
+/** POST {} -> attach every session that belongs nowhere. */
+export async function handleAdoptRequest(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 {
+    sendJson(res, 200, await adoptOrphanSessions(ctx));
+  } catch (error) {
+    sendJson(res, 500, { ok: false, error: error instanceof Error ? error.message : String(error) });
+  }
+}
+
 /** POST { sessionId, workspaceId } -> move that session to another workspace. */
 export async function handleMoveRequest(ctx, req, res) {
   if ((req.method ?? "POST").toUpperCase() !== "POST") {
@@ -705,6 +777,11 @@ export function apply(ctx) {
           path: MOVE_SESSION_PATH,
           handler: (req, res) => handleMoveRequest(moveCtx, req, res),
         }), "ws-recency: move route");
+        webCtx.effect(() => server.register({
+          kind: "exact",
+          path: ADOPT_SESSION_PATH,
+          handler: (req, res) => handleAdoptRequest(moveCtx, req, res),
+        }), "ws-recency: adopt route");
       });
 
       webCtx.inject(["sessionPersistence", "workspaceRegistry", "sessions"], (trashCtx) => {

package/package.json

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