dsh-session-autarchive 0.1.5 → 0.1.6

package/README.en.md

@@ -11,6 +11,7 @@ Archives sessions that have gone unused for longer than a configurable number of
 | Where | What it looks like | What it does |
 |---|---|---|
 | Session context menu | One row, "Do not auto-archive", next to Pin / Rename / Fork / Archive | Click once to mark, again to unmark |
+| Session row trailing | On hover, a shield button next to the archive icon (hollow when unmarked, filled when marked) | Toggle "do not auto-archive" without opening the overflow menu |
 | Session row start | A small shield on marked sessions | Shows at a glance that the session is protected |
 | Hover card | One line, "Not auto-archived" | Same, with text |
 | General settings | A row at the bottom, "Auto-archive after (days)" | Saved on blur or Enter, writes the same host field |
@@ -70,7 +71,7 @@ Writes are temp-file-then-rename, and reads retry — a half-written file is nev
 ## How it works
 
 - The host half registers four local routes: `GET /dsh-session-autarchive/api/state`, `POST .../protect`, `POST .../config`, `POST .../run`. Loopback addresses only (`127.*`, `::1`, `::ffff:127.*`); anything else gets 403, a wrong method gets 405.
-- The browser half mounts four slots (menu row, row start, hover card, settings row). Services are probed with `ctx.get`; when one is missing that entry is skipped and the others still mount.
+- The browser half mounts five slots (menu row, row action, row start, hover card, settings row). Services are probed with `ctx.get`; when one is missing that entry is skipped and the others still mount.
 - No network access, nothing uploaded. Decisions use local file times only.
 
 ## Known limits
@@ -85,7 +86,7 @@ Writes are temp-file-then-rename, and reads retry — a half-written file is nev
 The source has two halves:
 
 - `index.js` — host side (decision, archiving, four routes, the tool)
-- `src/entry.jsx` — browser side (menu row, row shield, hover line, settings row, the 5-minute fast path)
+- `src/entry.jsx` — browser side (menu row, row action shield, row shield, hover line, settings row, the 5-minute fast path)
 
 Editing `src/entry.jsx` requires rebuilding. `lib/client.js` is a build artifact committed to the repository; without it the UI does not load:
 

package/README.md

@@ -6,11 +6,12 @@
 
 把长期没动过的会话自动归档。按会话内最后一条对话结束的时间算天数，默认 5 天；已归档、置顶（可关）、标记「不自动归档」的都跳过。侧栏会话右键菜单给单个会话加标记，通用设置里改天数。
 
-## 界面上的三处
+## 界面上的四处
 
 | 位置 | 样子 | 作用 |
 |---|---|---|
 | 会话右键菜单 | 与「置顶会话／重命名／分叉会话／归档会话」并列的一行「不自动归档」 | 点一次标记，再点一次取消 |
+| 会话行尾 | 悬停时归档图标旁边一个盾牌按钮（未标记空心盾、已标记实心盾） | 不用点开「更多」，直接开／关「不自动归档」 |
 | 会话行首 | 被标记的会话多一个小盾牌 | 一眼看出这条不会被自动归档 |
 | 悬停卡片 | 一行「不会被自动归档」 | 同上，带文字说明 |
 | 通用设置 | 最底一行「自动归档天数」 | 失焦或回车即保存，写的是宿主同一个字段 |
@@ -85,7 +86,7 @@ dsh plugin --profile desktop add dsh-session-autarchive
 源码分两半：
 
 - `index.js` —— 宿主半边（判定、归档、四条路由、工具）
-- `src/entry.jsx` —— 浏览器半边（菜单行、行首盾牌、悬停说明、设置行、5 分钟快通道）
+- `src/entry.jsx` —— 浏览器半边（菜单行、行尾盾牌按钮、行首盾牌、悬停说明、设置行、5 分钟快通道）
 
 改过 `src/entry.jsx` 必须重新打包。`lib/client.js` 是提交进仓库的构建产物，缺了它界面不会加载：
 

package/lib/client.js

@@ -30,6 +30,7 @@ __export(entry_exports, {
   ProtectHover: () => ProtectHover,
   ProtectLeading: () => ProtectLeading,
   ProtectMenuItem: () => ProtectMenuItem,
+  ProtectRowAction: () => ProtectRowAction,
   apply: () => apply,
   inject: () => inject
 });
@@ -140,6 +141,35 @@ function ShieldIcon({ size = 14 }) {
     }
   );
 }
+function ShieldFilledIcon({ size = 14 }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    "svg",
+    {
+      width: size,
+      height: size,
+      viewBox: "0 0 24 24",
+      "aria-hidden": "true",
+      focusable: "false",
+      fill: "currentColor",
+      stroke: "none",
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M12 3l7 2.6v5.2c0 4.3-3 8.2-7 9.4-4-1.2-7-5.1-7-9.4V5.6L12 3z" })
+    }
+  );
+}
+var ROW_ACTION = {
+  flex: "none",
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  width: "16px",
+  height: "16px",
+  border: "none",
+  borderRadius: "var(--dsw-radius-xs)",
+  padding: 0,
+  background: "transparent",
+  cursor: "pointer",
+  color: "var(--dsw-alias-label-tertiary)"
+};
 var ITEM = {
   display: "flex",
   alignItems: "center",
@@ -203,6 +233,39 @@ function ProtectMenuItem(props) {
     }
   );
 }
+function ProtectRowAction(props) {
+  const { sessionId } = props;
+  const state = useStore();
+  const [hover, setHover] = (0, import_react.useState)(false);
+  const [busy, setBusy] = (0, import_react.useState)(false);
+  const on = state.protected.has(sessionId);
+  const label = on ? "\u53D6\u6D88\u300C\u4E0D\u81EA\u52A8\u5F52\u6863\u300D" : "\u4E0D\u81EA\u52A8\u5F52\u6863";
+  const click = () => {
+    if (busy) return;
+    setBusy(true);
+    void toggleProtect(sessionId, !on).catch(() => {
+    }).finally(() => setBusy(false));
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    "button",
+    {
+      type: "button",
+      title: label,
+      "aria-label": label,
+      "aria-pressed": on,
+      disabled: busy,
+      onClick: click,
+      onMouseEnter: () => setHover(true),
+      onMouseLeave: () => setHover(false),
+      style: {
+        ...ROW_ACTION,
+        color: hover && !busy ? "var(--dsw-alias-label-primary)" : "var(--dsw-alias-label-tertiary)",
+        opacity: busy ? 0.4 : 1
+      },
+      children: on ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ShieldFilledIcon, {}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ShieldIcon, {})
+    }
+  );
+}
 function ProtectLeading(props) {
   const state = useStore();
   if (!state.protected.has(props.sessionId)) return null;
@@ -380,6 +443,7 @@ function apply(ctx) {
   } catch {
   }
   place(ctx, "sidebar.workspaces.session.menu.item", 450, ProtectMenuItem);
+  place(ctx, "sidebar.workspaces.session.row.action", 150, ProtectRowAction);
   place(ctx, "sidebar.session.row.leading", 100, ProtectLeading);
   place(ctx, "sidebar.session.row.hover", 100, ProtectHover);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-autarchive",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "把长期没动过的会话自动归档（默认 5 天），单个会话可以标成不归档。",
   "type": "module",
   "main": "index.js",
@@ -22,7 +22,7 @@
   ],
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": ">=0.2.1-0"
+    "dsh": ">=0.2.1-alpha.3"
   },
   "dsh": {
     "client": {

package/scripts/smoke.mjs

@@ -256,6 +256,7 @@ const client = readFileSync(join(root, 'lib', 'client.js'), 'utf8')
 const idMatch = /^\s*id:\s*"([^"]+)"/m.exec(client)
 const SLOTS = [
   'sidebar.workspaces.session.menu.item',
+  'sidebar.workspaces.session.row.action',
   'sidebar.session.row.leading',
   'sidebar.session.row.hover',
   'settings.general.item',

package/src/entry.jsx

@@ -1,11 +1,12 @@
 /**
  * 超期会话自动归档（浏览器半边源码）。
  *
- * 会话列表上三处，都只在「点开菜单」或「被标记」之后才出现：
+ * 会话列表上四处：
  *  1. 会话菜单里平铺一行「不自动归档」——与官方「置顶会话／重命名／分叉会话／归档会话」同层并列，不另造「更多」；
- *  2. 被标记的会话行首一个小盾牌；
- *  3. 悬停卡片里一行说明。
- * 行尾那排悬停图标按钮**不放东西**（不与归档／置顶图标并排）。
+ *  2. 行尾悬停图标组里、归档图标紧旁边一个盾牌按钮（order 150，落在归档 100 与置顶 200 之间），
+ *     未保护空心盾、已保护实心盾，点它开／关「不自动归档」——不用点开「更多」；
+ *  3. 被标记的会话行首一个小盾牌；
+ *  4. 悬停卡片里一行说明。
  * 设置里一行：通用设置最底「自动归档天数」（`settings.general.item`），失焦或回车即落盘。
  * 外加每 5 分钟拉一次宿主的候选清单：拿得到官方归档通道就顺手归档，拿不到就只刷新名单——
  * 判定在宿主，宿主自己有兜底定时（窗口没开也照常归档）。
@@ -140,6 +141,28 @@ function ShieldIcon({ size = 14 }) {
   )
 }
 
+/**
+ * 「已标记」实心盾：与描边版同一个轮廓，换成填充，被保护的会话一眼可辨。
+ * @param props.size - 边长，默认 14。
+ * @returns 一个实心盾牌。
+ */
+function ShieldFilledIcon({ size = 14 }) {
+  return (
+    <svg width={size} height={size} viewBox="0 0 24 24" aria-hidden="true" focusable="false"
+      fill="currentColor" stroke="none">
+      <path d="M12 3l7 2.6v5.2c0 4.3-3 8.2-7 9.4-4-1.2-7-5.1-7-9.4V5.6L12 3z" />
+    </svg>
+  )
+}
+
+/** 行尾图标按钮：数值照 Rows.module.css 的 `.iconButton`（16px 格、14px 字形、tertiary → hover primary）。 */
+const ROW_ACTION = {
+  flex: 'none', display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
+  width: '16px', height: '16px', border: 'none', borderRadius: 'var(--dsw-radius-xs)',
+  padding: 0, background: 'transparent', cursor: 'pointer',
+  color: 'var(--dsw-alias-label-tertiary)',
+}
+
 /** 菜单行：照 ui-primitives Menu.module.css 的 `.item`。 */
 const ITEM = {
   display: 'flex', alignItems: 'center', gap: '6px', width: '100%', minHeight: '34px',
@@ -201,6 +224,48 @@ export function ProtectMenuItem(props) {
   )
 }
 
+/**
+ * 行尾悬停按钮（order 150，紧挨归档图标）：盾牌一档，点它开／关「不自动归档」。
+ * 未保护＝空心盾，已保护＝实心盾；标题与 aria-label 写明当前状态要发生什么。
+ * 与官方置顶／归档按钮同一排同一套样式；点击不打开会话行（宿主 rowActions 已截住冒泡）。
+ * @param props - 行身份。
+ * @returns 一个图标按钮。
+ */
+export function ProtectRowAction(props) {
+  const { sessionId } = props
+  const state = useStore()
+  const [hover, setHover] = useState(false)
+  const [busy, setBusy] = useState(false)
+  const on = state.protected.has(sessionId)
+  const label = on ? '取消「不自动归档」' : '不自动归档'
+  const click = () => {
+    if (busy) return
+    setBusy(true)
+    void toggleProtect(sessionId, !on)
+      .catch(() => { /* 路由没挂或写盘失败：不改本地状态，界面保持原样 */ })
+      .finally(() => setBusy(false))
+  }
+  return (
+    <button
+      type="button"
+      title={label}
+      aria-label={label}
+      aria-pressed={on}
+      disabled={busy}
+      onClick={click}
+      onMouseEnter={() => setHover(true)}
+      onMouseLeave={() => setHover(false)}
+      style={{
+        ...ROW_ACTION,
+        color: hover && !busy ? 'var(--dsw-alias-label-primary)' : 'var(--dsw-alias-label-tertiary)',
+        opacity: busy ? 0.4 : 1,
+      }}
+    >
+      {on ? <ShieldFilledIcon /> : <ShieldIcon />}
+    </button>
+  )
+}
+
 /**
  * 会话行首标记：被保护的会话显示盾牌（该格只在行处于空闲态时才渲染）。
  * @param props - 行身份。
@@ -401,8 +466,10 @@ export function apply(ctx) {
     } catch { /* 清理不了也只是多一个定时器 */ }
   } catch { /* 见上 */ }
 
-  // 三处：菜单里并列一行 ＋ 行首标记 ＋ 悬停说明。行尾那排图标按钮不放东西。
+  // 四处：菜单里并列一行 ＋ 行尾悬停组里归档旁的盾牌按钮 ＋ 行首标记 ＋ 悬停说明。
+  // 行尾按钮 order 150：归档是 100、置顶是 200，插在两者之间，紧挨归档。
   place(ctx, 'sidebar.workspaces.session.menu.item', 450, ProtectMenuItem)
+  place(ctx, 'sidebar.workspaces.session.row.action', 150, ProtectRowAction)
   place(ctx, 'sidebar.session.row.leading', 100, ProtectLeading)
   place(ctx, 'sidebar.session.row.hover', 100, ProtectHover)