dsh-session-autarchive 0.1.4 → 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/index.js

@@ -549,87 +549,99 @@ function registerRoutes(ctx) {
 
 /** 注册工具与路由。 */
 export function apply(ctx) {
-  ctx.tools.register({
-    name: 'dsh-session-autarchive',
-    description: '超期会话自动归档的开关台：status 看配置、保护名单与当前候选；run 立刻归档候选；protect/unprotect 标记单个会话「不自动归档」；config 改阈值与开关。判定口径＝会话内最后一条对话结束事件（turn/end）的时间——只是被打开/恢复过（会追写开场提示）不算活动；读不到事件时退回文件最后写入时间。已归档、保护名单内、置顶（可关）都跳过。浏览器半边每 5 分钟按同一份清单自动执行，侧栏右键菜单的「不自动归档」也写这份名单。',
-    parameters: {
-      type: 'object',
-      properties: {
-        action: { type: 'string', description: '要做什么：status（默认，看状态）｜run（立刻归档候选）｜protect（标记不自动归档）｜unprotect（取消标记）｜config（改阈值/开关）' },
-        sessionId: { type: 'string', description: 'protect/unprotect 用：会话 id，形如 session-xxxxxxxx-…' },
-        dryRun: { type: 'boolean', description: 'run 用：true 时只列候选、不动手' },
-        days: { type: 'number', description: 'config 用：多少天没动就归档，默认 5' },
-        enabled: { type: 'boolean', description: 'config 用：是否启用自动归档' },
-        exemptPinned: { type: 'boolean', description: 'config 用：置顶会话是否也豁免（默认豁免）' },
-      },
-      required: [],
-      additionalProperties: false,
-    },
-    output: {
-      schema: {
+  // 工具注册失败（重名、DSH 升级后格式漂移）不该拖垮路由与兜底定时：
+  // 单独圈起来，失败只留一行警告，归档主功能照常。
+  try {
+    ctx.tools.register({
+      name: 'dsh-session-autarchive',
+      description: '超期会话自动归档的开关台：status 看配置、保护名单与当前候选；run 立刻归档候选；protect/unprotect 标记单个会话「不自动归档」；config 改阈值与开关。判定口径＝会话内最后一条对话结束事件（turn/end）的时间——只是被打开/恢复过（会追写开场提示）不算活动；读不到事件时退回文件最后写入时间。已归档、保护名单内、置顶（可关）都跳过。浏览器半边每 5 分钟按同一份清单自动执行，侧栏右键菜单的「不自动归档」也写这份名单。',
+      parameters: {
         type: 'object',
-        properties: { ok: { type: 'boolean' }, text: { type: 'string' } },
-        required: ['ok', 'text'],
+        properties: {
+          action: { type: 'string', description: '要做什么：status（默认，看状态）｜run（立刻归档候选）｜protect（标记不自动归档）｜unprotect（取消标记）｜config（改阈值/开关）' },
+          sessionId: { type: 'string', description: 'protect/unprotect 用：会话 id，形如 session-xxxxxxxx-…' },
+          dryRun: { type: 'boolean', description: 'run 用：true 时只列候选、不动手' },
+          days: { type: 'number', description: 'config 用：多少天没动就归档，默认 5' },
+          enabled: { type: 'boolean', description: 'config 用：是否启用自动归档' },
+          exemptPinned: { type: 'boolean', description: 'config 用：置顶会话是否也豁免（默认豁免）' },
+        },
+        required: [],
         additionalProperties: false,
       },
-      render: (_args, value) => [{ type: 'text', text: value.text }],
-    },
-    async execute(args) {
-      const action = String((args && args.action) || 'status')
-      let state = readState()
-
-      if (action === 'status') {
-        return { ok: true, text: statusText(ctx, state) }
-      }
-
-      if (action === 'run') {
-        const result = await runArchive(ctx, state, args && args.dryRun === true)
-        const head = args && args.dryRun === true
-          ? '干跑：候选 ' + result.candidates.length + ' 个，未动手'
-          : '已归档 ' + result.archived.length + ' 个' + (result.failed.length > 0 ? '，失败 ' + result.failed.length + ' 个' : '')
-        const lines = [head]
-        for (const id of result.archived) lines.push('  ✓ ' + id.slice(8, 16))
-        for (const line of result.failed) lines.push('  ✗ ' + line)
-        if (args && args.dryRun === true) {
-          for (const c of result.candidates) lines.push('  · ' + c.id.slice(8, 16) + '  最后对话 ' + stamp(c.last))
+      output: {
+        schema: {
+          type: 'object',
+          properties: { ok: { type: 'boolean' }, text: { type: 'string' } },
+          required: ['ok', 'text'],
+          additionalProperties: false,
+        },
+        render: (_args, value) => [{ type: 'text', text: value.text }],
+      },
+      async execute(args) {
+        const action = String((args && args.action) || 'status')
+        let state = readState()
+  
+        if (action === 'status') {
+          return { ok: true, text: statusText(ctx, state) }
         }
-        return { ok: true, text: lines.join('\n') }
-      }
-
-      if (action === 'protect' || action === 'unprotect') {
-        const sessionId = String((args && args.sessionId) || '')
-        if (!/^session-/.test(sessionId)) return { ok: false, text: 'protect/unprotect 需要 sessionId（形如 session-xxxxxxxx-…）' }
-        const keep = new Set(state.protected)
-        if (action === 'protect') keep.add(sessionId)
-        else keep.delete(sessionId)
-        state = { ...state, protected: [...keep] }
-        writeProtected(state.protected)
-        audit((action === 'protect' ? 'protect ' : 'unprotect ') + sessionId + '，名单现有 ' + state.protected.length + ' 个')
-        return {
-          ok: true,
-          text: (action === 'protect' ? '已标记不自动归档：' : '已取消标记：') + sessionId
-            + '\n保护名单现有 ' + state.protected.length + ' 个',
+  
+        if (action === 'run') {
+          const result = await runArchive(ctx, state, args && args.dryRun === true)
+          const head = args && args.dryRun === true
+            ? '干跑：候选 ' + result.candidates.length + ' 个，未动手'
+            : '已归档 ' + result.archived.length + ' 个' + (result.failed.length > 0 ? '，失败 ' + result.failed.length + ' 个' : '')
+          const lines = [head]
+          for (const id of result.archived) lines.push('  ✓ ' + id.slice(8, 16))
+          for (const line of result.failed) lines.push('  ✗ ' + line)
+          if (args && args.dryRun === true) {
+            for (const c of result.candidates) lines.push('  · ' + c.id.slice(8, 16) + '  最后对话 ' + stamp(c.last))
+          }
+          return { ok: true, text: lines.join('\n') }
         }
-      }
-
-      if (action === 'config') {
-        const next = { ...state }
-        if (args.days !== undefined) next.days = Number(args.days) > 0 ? Number(args.days) : next.days
-        if (args.enabled !== undefined) next.enabled = args.enabled === true
-        if (args.exemptPinned !== undefined) next.exemptPinned = args.exemptPinned === true
-        writeState(next)
-        return { ok: true, text: '已更新：' + describe(next) }
-      }
-
-      return { ok: false, text: '不认识的 action：' + action + '（可用 status／run／protect／unprotect／config）' }
-    },
-  })
+  
+        if (action === 'protect' || action === 'unprotect') {
+          const sessionId = String((args && args.sessionId) || '')
+          if (!/^session-/.test(sessionId)) return { ok: false, text: 'protect/unprotect 需要 sessionId（形如 session-xxxxxxxx-…）' }
+          const keep = new Set(state.protected)
+          if (action === 'protect') keep.add(sessionId)
+          else keep.delete(sessionId)
+          state = { ...state, protected: [...keep] }
+          writeProtected(state.protected)
+          audit((action === 'protect' ? 'protect ' : 'unprotect ') + sessionId + '，名单现有 ' + state.protected.length + ' 个')
+          return {
+            ok: true,
+            text: (action === 'protect' ? '已标记不自动归档：' : '已取消标记：') + sessionId
+              + '\n保护名单现有 ' + state.protected.length + ' 个',
+          }
+        }
+  
+        if (action === 'config') {
+          const next = { ...state }
+          if (args.days !== undefined) next.days = Number(args.days) > 0 ? Number(args.days) : next.days
+          if (args.enabled !== undefined) next.enabled = args.enabled === true
+          if (args.exemptPinned !== undefined) next.exemptPinned = args.exemptPinned === true
+          writeState(next)
+          return { ok: true, text: '已更新：' + describe(next) }
+        }
+  
+        return { ok: false, text: '不认识的 action：' + action + '（可用 status／run／protect／unprotect／config）' }
+      },
+    })
+  } catch (error) {
+    console.warn('[dsh-session-autarchive] 工具未注册：' + (error && error.message ? error.message : error))
+  }
 
   registerRoutes(ctx)
 
   // 宿主侧兜底：浏览器窗口没开着也照常归档（客户端那条是让侧栏当场刷新的快通道）。
   // 启动 60 秒后第一次（避开启动竞争），之后每 10 分钟。
-  const tick = () => { void runArchive(ctx, readState(), false).catch(() => { /* 这轮不行，下一轮再来 */ }) }
+  // 开关每次现读：关掉自动归档后这条定时链要立刻停，不能等重启。
+  // 手动执行（工具／路由的 run）不在这里拦，那是用户主动点的，开关只管自动。
+  const tick = () => {
+    const state = readState()
+    if (!state.enabled) return
+    void runArchive(ctx, state, false).catch(() => { /* 这轮不行，下一轮再来 */ })
+  }
   const first = setTimeout(tick, 60 * 1000)
   const timer = setInterval(tick, 10 * 60 * 1000)
   if (typeof ctx.effect === 'function') {

package/lib/client.js

@@ -26,9 +26,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var entry_exports = {};
 __export(entry_exports, {
   AutoArchiveRow: () => AutoArchiveRow,
+  AutoArchiveToggleRow: () => AutoArchiveToggleRow,
   ProtectHover: () => ProtectHover,
   ProtectLeading: () => ProtectLeading,
   ProtectMenuItem: () => ProtectMenuItem,
+  ProtectRowAction: () => ProtectRowAction,
   apply: () => apply,
   inject: () => inject
 });
@@ -139,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",
@@ -202,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;
@@ -223,6 +287,70 @@ var ROW_CSS = `
 .zsa-unit { font-size:12px; color:var(--dsw-alias-label-secondary); }
 .zsa-error { font-size:12px; line-height:18px; color:var(--dsw-alias-state-error-primary); }
 `;
+function Switch({ on, disabled, onChange }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    "button",
+    {
+      type: "button",
+      role: "switch",
+      "aria-checked": on,
+      "aria-label": on ? "\u5173\u95ED\u81EA\u52A8\u5F52\u6863" : "\u5F00\u542F\u81EA\u52A8\u5F52\u6863",
+      disabled,
+      onClick: () => onChange(!on),
+      style: {
+        width: 36,
+        height: 20,
+        flex: "none",
+        border: 0,
+        borderRadius: 10,
+        padding: 0,
+        cursor: disabled ? "default" : "pointer",
+        position: "relative",
+        background: on ? "var(--dsw-alias-brand-primary)" : "var(--dsw-alias-border-l1)",
+        opacity: disabled ? 0.5 : 1,
+        transition: "background .15s"
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: {
+        position: "absolute",
+        top: 2,
+        left: on ? 18 : 2,
+        width: 16,
+        height: 16,
+        borderRadius: 8,
+        background: "#fff",
+        transition: "left .15s"
+      } })
+    }
+  );
+}
+function AutoArchiveToggleRow() {
+  const state = useStore();
+  const [busy, setBusy] = (0, import_react.useState)(false);
+  const [error, setError] = (0, import_react.useState)(null);
+  const on = state.enabled !== false;
+  const toggle = async (next) => {
+    if (busy) return;
+    setBusy(true);
+    setError(null);
+    try {
+      const data = await call("POST", ROUTE + "/config", { enabled: next });
+      patchStore({ enabled: data.enabled !== false });
+    } catch (err) {
+      setError("\u6CA1\u4FDD\u5B58\u4E0A\uFF1A" + String(err && err.message || err));
+    } finally {
+      setBusy(false);
+    }
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "zsa-item", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("style", { children: ROW_CSS }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "zsa-text", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "zsa-title", children: "\u81EA\u52A8\u5F52\u6863" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "zsa-desc", children: "\u5173\u95ED\u540E\u540E\u53F0\u4E0D\u518D\u81EA\u52A8\u5F52\u6863\uFF1B\u624B\u52A8\u6267\u884C\u4ECD\u7136\u53EF\u7528\u3002\u5F53\u524D\u5019\u9009 " + state.candidates.length + " \u4E2A\u3002" }),
+      error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "zsa-error", role: "alert", children: error }) : null
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "zsa-field", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Switch, { on, disabled: busy, onChange: (next) => void toggle(next) }) })
+  ] });
+}
 function AutoArchiveRow() {
   const state = useStore();
   const [draft, setDraft] = (0, import_react.useState)(null);
@@ -277,7 +405,7 @@ function AutoArchiveRow() {
           max: 3650,
           step: 1,
           value,
-          disabled: busy,
+          disabled: busy || state.enabled === false,
           "aria-label": "\u81EA\u52A8\u5F52\u6863\u5929\u6570",
           onChange: (event) => {
             setDraft(event.target.value);
@@ -315,9 +443,15 @@ 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 {
+    ctx.slots.inject("settings.general.item", () => ctx.slots.register({
+      name: "settings.general.item",
+      id: "session-autarchive-enabled",
+      order: 94
+    }, AutoArchiveToggleRow));
     ctx.slots.inject("settings.general.item", () => ctx.slots.register({
       name: "settings.general.item",
       id: "session-autarchive-days",

package/package.json

@@ -1,18 +1,16 @@
 {
   "name": "dsh-session-autarchive",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "把长期没动过的会话自动归档（默认 5 天），单个会话可以标成不归档。",
   "type": "module",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
-    "./invariant": "./invariant.js",
     "./client": "./lib/client.js",
     "./package.json": "./package.json"
   },
   "files": [
     "index.js",
-    "invariant.js",
     "cordis.patch.yml",
     "src",
     "lib/client.js",
@@ -24,7 +22,7 @@
   ],
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": ">=0.2.1-0"
+    "dsh": ">=0.2.1-alpha.3"
   },
   "dsh": {
     "client": {
@@ -48,7 +46,7 @@
     "build:client": "node scripts/build-client.mjs",
     "check:client": "node scripts/build-client.mjs --check",
     "smoke": "node scripts/smoke.mjs",
-    "check": "node --check index.js && node --check invariant.js"
+    "check": "node --check index.js"
   },
   "devDependencies": {
     "esbuild": "^0.28.1"

package/scripts/smoke.mjs

@@ -2,20 +2,21 @@
 /**
  * 本机冒烟：不起应用、不发网络请求、不碰真实会话数据。
  *
- * 六关：
+ * 七关：
  *   1. 包结构      —— files 声明的必需文件都在（含已提交的 lib/client.js）
  *   2. 组合声明    —— dsh.bundle.patch 指向的文件在，且里面的 insert id 等于包名
  *   3. 宿主半边    —— 桩 ctx 跑 apply：注册 1 个工具、4 条路由，路径与包名一致
  *   4. 路由鉴权    —— 非回环 403、非 POST 405、坏会话 id 400
  *   5. 状态读写    —— 指向临时 DSH_HOME：改天数、加名单后回读一致
- *   6. 客户端产物  —— 外壳 id == 包名，产物里带上了路由与四个 slot 名
+ *   6. 开关生效    —— enabled=false 时兜底定时不归档，手动 run 仍归档
+ *   7. 客户端产物  —— 外壳 id == 包名，产物里带上了路由与四个 slot 名
  *
  * 用法：node scripts/smoke.mjs   （任一条失败退出码 1）
  *
  * ⚠️ 全程使用临时 DSH_HOME，跑完删掉；不会读到或改到你自己的会话数据。
  */
 
-import { readFileSync, existsSync, mkdtempSync, rmSync } from 'node:fs'
+import { readFileSync, existsSync, mkdirSync, mkdtempSync, rmSync, utimesSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
@@ -33,7 +34,6 @@ const fail = (label, why) => {
 /** 1. 包结构 */
 const REQUIRED = [
   'index.js',
-  'invariant.js',
   'cordis.patch.yml',
   'src/entry.jsx',
   'lib/client.js',
@@ -184,11 +184,79 @@ if (routes.length === wanted.length) {
   }
 }
 
-/** 6. 客户端产物 */
+/** 6. 开关生效：enabled=false 时兜底定时不归档；手动 run 不受限 */
+{
+  // 造一个 30 天前的会话目录（档里没有 turn/end，判定退回文件写入时间）
+  const wsDir = join(home, 'sessions', 'ws-smoke')
+  const sessDir = join(wsDir, 'session-smoke-old')
+  mkdirSync(sessDir, { recursive: true })
+  const oldFile = join(sessDir, 'session.v4.jsonl.zstd')
+  writeFileSync(oldFile, '')
+  const oldStamp = new Date(Date.now() - 30 * 86400000)
+  utimesSync(oldFile, oldStamp, oldStamp)
+  utimesSync(sessDir, oldStamp, oldStamp)
+
+  // 用一份新的桩 ctx 跑 apply，并把 60 秒的首次定时立即点一次
+  const tickOnce = async (enabled) => {
+    await call(routeOf('/config'), { method: 'POST', body: { enabled } })
+    const archived = []
+    const registry = {
+      archivedSessionIds: [],
+      pinnedSessionIds: [],
+      list: () => [{ sessionIds: ['session-smoke-old'] }],
+      archiveSession: async (id) => { archived.push(id) },
+    }
+    const hostTools = []
+    const hostCtx = {
+      tools: { register: (tool) => { hostTools.push(tool) } },
+      get: (name) => (name === 'webServer' ? webServer : name === 'workspaceRegistry' ? registry : undefined),
+      effect: (fn) => {
+        const cleanup = fn()
+        if (typeof cleanup === 'function') cleanups.push(cleanup)
+      },
+    }
+    const realSetTimeout = globalThis.setTimeout
+    globalThis.setTimeout = (fn, ms) => {
+      if (ms === 60 * 1000) { fn(); return { unref() {} } }
+      return realSetTimeout(fn, ms)
+    }
+    try {
+      mod.apply(hostCtx)
+      await new Promise((resolve) => setImmediate(resolve))
+      await new Promise((resolve) => setImmediate(resolve))
+    } finally {
+      globalThis.setTimeout = realSetTimeout
+    }
+    return { archived, tools: hostTools }
+  }
+
+  const off = await tickOnce(false)
+  // 先记下定时链这一轮的归档数：手动 run 会往同一个数组里记，不能等到 run 之后再判
+  const tickArchivedWhileOff = off.archived.length
+  const manualTool = off.tools[0]
+  let manualArchived = false
+  if (manualTool) {
+    const result = await manualTool.execute({ action: 'run' })
+    manualArchived = result && result.ok === true && /已归档 1 个/.test(result.text)
+  }
+  const on = await tickOnce(true)
+  if (tickArchivedWhileOff !== 0) {
+    fail('开关生效', 'enabled=false 时兜底定时仍归档了 ' + tickArchivedWhileOff + ' 个')
+  } else if (!manualArchived) {
+    fail('开关生效', 'enabled=false 时手动 run 没有归档候选')
+  } else if (on.archived.length !== 1) {
+    fail('开关生效', 'enabled=true 时兜底定时归档 ' + on.archived.length + ' 个，应为 1')
+  } else {
+    ok('开关生效', '关闭时定时不归档、手动照常、打开后恢复')
+  }
+}
+
+/** 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',
@@ -199,9 +267,32 @@ else if (!client.includes(pkg.name + '/api')) fail('客户端产物', '产物里
 else {
   const absent = SLOTS.filter((slot) => !client.includes(slot))
   if (absent.length > 0) fail('客户端产物', '产物里缺 slot：' + absent.join('、'))
+  else if (!client.includes('session-autarchive-enabled')) fail('客户端产物', '产物里没有设置开关行（源码改了但没重新构建）')
   else ok('客户端产物', 'id=' + pkg.name + '，' + Buffer.byteLength(client, 'utf8') + ' 字节')
 }
 
+/** 8. 失败隔离：工具注册抛错时，路由与定时器照常 */
+{
+  const routesAfter = []
+  let effects = 0
+  const hostWeb = { port: 0, register: (route) => { routesAfter.push(route); return () => {} } }
+  const throwingCtx = {
+    tools: { register: () => { throw new Error('simulated duplicate tool') } },
+    get: (name) => (name === 'webServer' ? hostWeb : undefined),
+    effect: (fn) => {
+      effects += 1
+      const cleanup = fn()
+      if (typeof cleanup === 'function') cleanups.push(cleanup)
+    },
+  }
+  let threw = null
+  try { mod.apply(throwingCtx) } catch (error) { threw = error }
+  if (threw) fail('失败隔离', '工具注册抛错后 apply 整体抛出：' + threw.message)
+  else if (routesAfter.length !== 4) fail('失败隔离', '工具注册抛错后注册了 ' + routesAfter.length + ' 条路由，应为 4')
+  else if (effects !== 5) fail('失败隔离', '工具注册抛错后 effect 登记 ' + effects + ' 个，应为 5（4 条路由 + 1 个定时器）')
+  else ok('失败隔离', '工具注册抛错，路由 4 条与定时器照常')
+}
+
 /** 收尾：清掉宿主半边的定时器与临时目录 */
 for (const cleanup of cleanups) {
   try {

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 - 行身份。
@@ -242,6 +307,73 @@ const ROW_CSS = `
 .zsa-error { font-size:12px; line-height:18px; color:var(--dsw-alias-state-error-primary); }
 `
 
+/** 开关：纯内联样式，不 import 宿主组件包。 */
+function Switch({ on, disabled, onChange }) {
+  return (
+    <button
+      type="button"
+      role="switch"
+      aria-checked={on}
+      aria-label={on ? '关闭自动归档' : '开启自动归档'}
+      disabled={disabled}
+      onClick={() => onChange(!on)}
+      style={{
+        width: 36, height: 20, flex: 'none', border: 0, borderRadius: 10, padding: 0,
+        cursor: disabled ? 'default' : 'pointer', position: 'relative',
+        background: on ? 'var(--dsw-alias-brand-primary)' : 'var(--dsw-alias-border-l1)',
+        opacity: disabled ? 0.5 : 1, transition: 'background .15s',
+      }}
+    >
+      <span style={{
+        position: 'absolute', top: 2, left: on ? 18 : 2, width: 16, height: 16,
+        borderRadius: 8, background: '#fff', transition: 'left .15s',
+      }} />
+    </button>
+  )
+}
+
+/**
+ * 通用设置里的一行：自动归档开关。
+ * 关掉后宿主定时链与浏览器侧都不再自动归档；手动 run 不受影响（宿主那边也这么判）。
+ * @returns 一行设置。
+ */
+export function AutoArchiveToggleRow() {
+  const state = useStore()
+  const [busy, setBusy] = useState(false)
+  const [error, setError] = useState(null)
+  const on = state.enabled !== false
+
+  const toggle = async (next) => {
+    if (busy) return
+    setBusy(true)
+    setError(null)
+    try {
+      const data = await call('POST', ROUTE + '/config', { enabled: next })
+      patchStore({ enabled: data.enabled !== false })
+    } catch (err) {
+      setError('没保存上：' + String((err && err.message) || err))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  return (
+    <div className="zsa-item">
+      <style>{ROW_CSS}</style>
+      <div className="zsa-text">
+        <div className="zsa-title">自动归档</div>
+        <div className="zsa-desc">
+          {'关闭后后台不再自动归档；手动执行仍然可用。当前候选 ' + state.candidates.length + ' 个。'}
+        </div>
+        {error ? <div className="zsa-error" role="alert">{error}</div> : null}
+      </div>
+      <div className="zsa-field">
+        <Switch on={on} disabled={busy} onChange={(next) => void toggle(next)} />
+      </div>
+    </div>
+  )
+}
+
 /**
  * 通用设置里的一行：自动归档天数。
  * 失焦或回车即落盘（与设置里其它行一样即时生效），写的是宿主同一个 days 字段。
@@ -301,7 +433,7 @@ export function AutoArchiveRow() {
           max={3650}
           step={1}
           value={value}
-          disabled={busy}
+          disabled={busy || state.enabled === false}
           aria-label="自动归档天数"
           onChange={(event) => { setDraft(event.target.value); setError(null) }}
           onBlur={() => { void commit() }}
@@ -334,13 +466,21 @@ 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)
 
-  // 通用设置里一行，排在「当前版本」上面（order 95，当前版本是 100）：自动归档天数。
+  // 通用设置里两行，排在「当前版本」上面（order 94/95，当前版本是 100）：
+  // 「自动归档」开关与「自动归档天数」。先开关后天数，与页面从上到下的阅读顺序一致。
   try {
+    ctx.slots.inject('settings.general.item', () => ctx.slots.register({
+      name: 'settings.general.item',
+      id: 'session-autarchive-enabled',
+      order: 94,
+    }, AutoArchiveToggleRow))
     ctx.slots.inject('settings.general.item', () => ctx.slots.register({
       name: 'settings.general.item',
       id: 'session-autarchive-days',

package/invariant.js

@@ -1,10 +0,0 @@
-const PACKAGE_NAME = 'dsh-session-autarchive'
-
-/** Cordis companion plugin name. */
-export const name = 'dsh-session-autarchive-invariant'
-/** Service required before the companion can reserve package ownership. */
-export const inject = ['invariants']
-
-const install = () => {}
-
-export const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))