@a9i5k4/dsh-auto-memory 2.2.2 → 2.2.4

package/lib/client.js

@@ -270,8 +270,8 @@ window.__ModuleLoader__.load({
         fConsScheduleDays: '固化回看天数', fConsScheduleDaysHint: '定时固化读取最近 N 天日志;默认 7。',
         fMaintSchedule: '定时 30 天蒸馏', fMaintScheduleHint: '每天到点自动把超过 30 天的旧日志蒸馏归档(等价 memory_maintain);无旧日志时零成本跳过。',
         fMaintScheduleTime: '蒸馏触发时间', fMaintScheduleTimeHint: 'HH:MM,默认 10:00(与固化时间错开)。',
-        waterCardTitle: '上下文水位', waterAutoSrc: '自动检测', waterManualSrc: '手动设定', waterMeterOfficial: '官方计量', waterMeterHeuristic: '启发式降级', waterThresholdHint: '水位达到 {t} 时注入交接建议并自动补写账本;计量优先用官方 token-meter(与聊天框 context ring 同源),不可用时降级启发式估算;窗口大小自动取自当前模型(settings.yaml contextWindow),也可在下方手动覆盖。',
-        autoContTitle: '自动接续', autoContHint: '开启后:水位达到阈值且会话空闲(连续两轮水位不增长)时,倒计时 30 秒自动执行一键接续(总结→写账本→同工作区开新会话→注入接续材料);触发后 30 分钟内不重复;随时可取消。', autoContOn: '自动接续:开', autoContOff: '自动接续:关', autoContThreshold: '阈值', autoContCountdown: '⏳ {s} 秒后自动接续(总结并开新会话)…', autoContCancel: '取消',
+        waterCardTitle: '上下文水位', waterAutoSrc: '自动检测', waterManualSrc: '手动设定', waterOfficialSrc: '官方路由容量', waterFallbackSrc: '回退默认值', waterMeterOfficial: '官方计量', waterMeterHeuristic: '启发式降级', waterThresholdHint: '水位达到 {t} 时注入交接建议并自动补写账本;计量优先用官方 token-meter(与聊天框 context ring 同源),不可用时降级启发式估算;窗口优先取官方路由容量(request/context 的 contextWindow),其次按当前模型查 settings.yaml contextWindow,也可在下方手动覆盖。',
+        autoContTitle: '自动接续', autoContHint: '开启后:水位达到阈值、且旧会话已空闲(harness 权威 running 位在轮次边界转为 false,取代旧「两轮水位持平」)时,弹出确认卡——同意=立即接续,拒绝=本轮跳过(同一边界不再提示),30-40 秒无操作视为挂机自动接续;接续前先让旧 Agent 刷新白板 PLAN 与交接账本,再建新会话(沿用工作区/模型/思考档位)并注入分层交接材料;触发后默认 30 分钟内不重复。', autoContOn: '自动接续:开', autoContOff: '自动接续:关', autoContThreshold: '阈值', autoContCountdown: '⏳ {s} 秒后自动接续…', autoContCancel: '取消', autoContConfirm: '本会话水位已达 {p}%,旧会话已空闲(轮次边界)——现在接续到新会话?', autoContAgree: '同意接续', autoContReject: '拒绝', autoContTimeout: '{s} 秒后自动接续(视为挂机)', autoContRejected: '已跳过本次接续(下一个轮次边界再提醒)',
         continueCardTitle: '一键接续', continueCardHint: '写好交接账本→创建新会话→把交接材料作为首条消息预载,并自动切换到新会话继续任务(接续材料含白板节选+最新账本;当前工作区无账本时自动取全局最近一篇)。', continueBtn: '一键接续到新会话', continueBusy: '处理中…',
         fStyle: '反思风格', fStyleHint: '生活化 / 专业性 / 由内容决定。',
         fLocale: '界面语言', fLocaleHint: '默认跟随 DSH 系统语言;也可手动指定中文 / English。', followSystem: '跟随系统语言',
@@ -418,8 +418,8 @@ window.__ModuleLoader__.load({
         fConsScheduleDays: 'Consolidation lookback (days)', fConsScheduleDaysHint: 'How many recent days of logs the scheduled consolidation reads; default 7.',
         fMaintSchedule: 'Scheduled 30-day distill', fMaintScheduleHint: 'Once a day at the set time, distill & archive logs older than 30 days (same flow as memory_maintain); zero cost when nothing to archive.',
         fMaintScheduleTime: 'Distill time', fMaintScheduleTimeHint: 'HH:MM, default 10:00 (staggered from the consolidation time).',
-        waterCardTitle: 'Context water level', waterAutoSrc: 'auto-detected', waterManualSrc: 'manual', waterMeterOfficial: 'official meter', waterMeterHeuristic: 'heuristic fallback', waterThresholdHint: 'Past {t} of the window, the handoff advisory is injected and the skeleton ledger is backfilled; metering prefers the official token-meter (same source as the chat context ring), falling back to the heuristic when unavailable; the window auto-follows the active model (settings.yaml contextWindow) or your manual override below.',
-        autoContTitle: 'Auto continue', autoContHint: 'When on: once the water level passes the threshold and the session is idle (level unchanged across two polls), a 30s countdown auto-runs One-click continue (summarize → write ledger → open a new session in the same workspace → inject the handoff prompt); suppressed for 30 minutes after each run; cancel anytime.', autoContOn: 'Auto continue: on', autoContOff: 'Auto continue: off', autoContThreshold: 'Threshold', autoContCountdown: '⏳ Auto-continue in {s}s (summarize & open new session)…', autoContCancel: 'Cancel',
+        waterCardTitle: 'Context water level', waterAutoSrc: 'auto-detected', waterManualSrc: 'manual', waterOfficialSrc: 'route capacity', waterFallbackSrc: 'fallback default', waterMeterOfficial: 'official meter', waterMeterHeuristic: 'heuristic fallback', waterThresholdHint: 'Past {t} of the window, the handoff advisory is injected and the skeleton ledger is backfilled; metering prefers the official token-meter (same source as the chat context ring), falling back to the heuristic when unavailable; the window prefers the official route capacity (request/context contextWindow), then the active model in settings.yaml, or your manual override below.',
+        autoContTitle: 'Auto continue', autoContHint: 'When on: once the water level passes the threshold AND the old session is idle (the authoritative harness running bit flipped to false at a turn boundary, replacing the old "level unchanged across two polls"), a confirm card appears — Agree = continue now, Decline = skip this boundary (no re-prompt for it), no answer for 30-40s = unattended, continue automatically. Before continuing, the old agent refreshes PLAN + ledger; the new session keeps workspace/model/reasoning effort and receives layered handoff material; suppressed for 30 minutes after each run.', autoContOn: 'Auto continue: on', autoContOff: 'Auto continue: off', autoContThreshold: 'Threshold', autoContCountdown: '⏳ Auto-continue in {s}s…', autoContCancel: 'Cancel', autoContConfirm: 'Water level at {p}% and the old session is idle (turn boundary) — continue into a new session now?', autoContAgree: 'Continue', autoContReject: 'Decline', autoContTimeout: 'auto-continue in {s}s (unattended)', autoContRejected: 'Skipped this handoff (will ask again at the next turn boundary)',
         continueCardTitle: 'One-click continue', continueCardHint: 'Writes the handoff ledger → creates a new session → injects the handoff material as the first message → switches to the new session automatically (material = PLAN excerpt + latest ledger; falls back to the most recent global ledger when this workspace has none).', continueBtn: 'Continue in a new session', continueBusy: 'Working…',
         fStyle: 'Reflection style', fStyleHint: 'Life-style / Professional / Auto.',
         fLocale: 'UI language', fLocaleHint: 'Follows the DSH system language by default; you can also pin Chinese / English.', followSystem: 'Follow system language',
@@ -446,6 +446,21 @@ window.__ModuleLoader__.load({
     }
     var sessions = null
     var remoteFace = null
+    // 官方 session.create 返回形态多样(裸字符串 / {sessionId} / {id} / {value} / {ok,value:{sessionId}}),统一提取会话 id
+    function extractSessionId(created) {
+      if (created == null) return null
+      if (typeof created === 'string') return created
+      if (typeof created !== 'object') return null
+      if (typeof created.sessionId === 'string') return created.sessionId
+      if (typeof created.id === 'string') return created.id
+      var v = created.ok && created.value !== undefined ? created.value : (created.value !== undefined ? created.value : null)
+      if (v && typeof v === 'string') return v
+      if (v && typeof v === 'object') {
+        if (typeof v.sessionId === 'string') return v.sessionId
+        if (typeof v.id === 'string') return v.id
+      }
+      return null
+    }
     // 当前会话工作区(跟随 GUI 切换工作区):从 sessions 服务拿,供 state/summarize/greet 请求使用
     function currentWs() {
       try {
@@ -457,6 +472,32 @@ window.__ModuleLoader__.load({
         return (s && typeof s.cwd === 'string') ? s.cwd : ''
       } catch (e) { return '' }
     }
+    // 轮次边界探测(①,2026-09-08 2.2.4):读 harness 权威 running 位(sessions.list 快照,官方 buildListSnapshot 投影),
+    // 取代旧「连续两轮水位不增长=空闲」——长工具调用会被误判空闲、真挂机又永不触发。
+    function currentRunningInfo() {
+      try {
+        var snap = sessions && sessions.list && sessions.list.getSnapshot()
+        if (!snap) return null
+        var id = snap.current
+        if (id === undefined || id === null) return null
+        var s = snap.byId && snap.byId[id]
+        if (!s) return null
+        return { sessionId: id, running: !!s.running }
+      } catch (e) { return null }
+    }
+    function runningOfSession(sessionId) {
+      try {
+        var snap = sessions && sessions.list && sessions.list.getSnapshot()
+        var s = snap && snap.byId ? snap.byId[sessionId] : null
+        return s ? !!s.running : null
+      } catch (e) { return null }
+    }
+    function amCtzValue() {
+      return (typeof Intl !== 'undefined' && typeof Intl.DateTimeFormat === 'function') ? (Intl.DateTimeFormat().resolvedOptions().timeZone || undefined) : undefined
+    }
+    function amReqId(prefix) {
+      return (window.crypto && typeof crypto.randomUUID === 'function') ? crypto.randomUUID() : (prefix || 'amc') + '-' + Date.now() + '-' + Math.random().toString(36).slice(2)
+    }
     var fontScale = 'lg'
     var FONT_SCALES = { sm: '小', md: '标准', lg: '大', xl: '特大' }
     // 与服务端 lib/index.js DEFAULT_PROMPT_LAYERS 保持一致(设置页显示各层默认文案)
@@ -501,6 +542,27 @@ window.__ModuleLoader__.load({
 
     // ───────────────────────── 更新弹窗 / 首次指导 ─────────────────────────
     var CHANGELOG = {
+      '2.2.4': { zh: [
+        '★ 修复:一键接续的新会话终于落进旧会话所属工作区——官方 session.create 只有传 workspaceId 才会绑定工作区,只传 cwd 仅设工作目录(故此前恒落「未分组」);现 host 先解析旧会话的 workspaceId 再建会话,解析不到才回退 cwd。',
+        '★ 修复:新会话沿用旧会话的模型与思考档位——模型信息在会话日志的 request/header.header.config(旧版查错了事件类型,恒取空 → 回落默认模型)。',
+        '★ 自动接续 v3:触发条件改为「水位≥阈值 且 harness 权威 running==false(轮次边界)」,弃用「两轮水位持平」——长工具调用不再误触发,真挂机一定触发;达阈值先弹确认卡:同意=立即接续 / 拒绝=本轮跳过(同一边界不再提示)/ 30-40 秒无操作=视为挂机自动接续。',
+        '★ 接续前刷新仪式:确认后先让旧 Agent 把白板 PLAN 与交接账本刷到最新,再用最新材料组装交接(可在配置里关掉);新窗口不再拿到过时白板。',
+        '★ 修复:上下文水位虚高(显示「500,998 / 131,072 token · 150%」)——模型窗口解析两条路同时失效:① settings.yaml 的 llm-deepseek 段是 flow 风格 YAML,旧解析器只认 block 风格;② 官方 request/context 的 contextWindow 只在会话开头出现(实测 2999 条事件里仅 2 条),旧代码只扫最近 256 条 → 1M 窗口被当成 128K。现在优先取官方路由容量、全量扫描并按会话缓存,设置页如实标出「官方路由容量 / 回退默认值」,百分比也不再截断到 150%。',
+        '★ 接续材料分层压缩:第0层指令+白板 / 第1层交接账本 / 第2层近期线程(最近 20 条 × 700 字,保留角色与工具标记)/ 第3层完整转写按需 read;材料带时间戳与「白板比账本旧」过期提示。',
+        '★ 新增子代理痕迹回收:自动沉淀 / 时段总结 / 问候 / 蒸馏等一次性子代理每跑一次都会在 ~/.dsh/sessions 下留下一个持久化会话(实测全机 686 个子代理会话里 638 个来自本插件),积累上千后会拖慢会话列表;现在子代理一结束就把痕迹移入 ~/.dsh/subagent-gc-backup(只移动不删除,可回滚),另有每日兜底巡检,设置页可开关并调整保留天数。',
+      ], en: [
+        '★ Fix: one-click continue now lands the new session in the old session\'s workspace — the official session.create only binds a workspace when workspaceId is passed (cwd alone just sets the working directory, which is why it always landed in "Ungrouped"); the host now resolves the old session\'s workspaceId first and only falls back to cwd.',
+        '★ Fix: the new session now inherits the old session\'s model and reasoning effort — that info lives in request/header.header.config (the old code read the wrong event type and always got nothing, falling back to the default model).',
+        '★ Auto-continue v3: triggers on "water level ≥ threshold AND the authoritative harness running bit flipped to false (turn boundary)" instead of "level unchanged across two polls" — long tool calls no longer misfire and genuinely unattended sessions always fire; a confirm card appears first: Agree = continue now, Decline = skip this boundary (no re-prompt), 30-40s of silence = unattended, continue automatically.',
+        '★ Refresh ritual before continuing: the old agent refreshes PLAN + ledger first so the new session never starts from a stale whiteboard (configurable).',
+        '★ Layered handoff material: layer 0 instructions + PLAN / layer 1 ledger / layer 2 recent thread (last 20 entries × 700 chars, roles and tool markers kept) / layer 3 full transcript read on demand; timestamps and a "PLAN older than ledger" staleness hint included.',
+        '★ New subagent trace recycle: every one-shot subagent this plugin spawns (auto-consolidation, scheduled summary, greeting, distillation) left a persisted session under ~/.dsh/sessions (638 of the 686 subagent sessions on this machine came from this plugin), and enough of them slow the session list down. Each trace is now moved into ~/.dsh/subagent-gc-backup right after the task ends (moved, never deleted — fully reversible), plus a daily fallback sweep; toggle and retention days live in Settings.',
+      ] },
+      '2.2.3': { zh: [
+        '打包修复:npm 包 files 现包含 docs/,用户文档随包发布——README 的「📖 用户文档」链接在 GitHub 与 npm 包页均可打开。',
+      ], en: [
+        'Packaging: the npm package now ships docs/ via the files field, so the README user-guide link works on both GitHub and the npm package page.',
+      ] },
       '2.2.2': { zh: [
         '修复:一键接续在部分环境报「harness 未提供 remote.session」——补上官方 remote 注入面(@deepseek-ai/dsh-api-remotes),重启后自动建会话/切换/注入恢复可用。',
         '修复:语义引擎检测面板「未就绪」与「一切就绪」同屏矛盾、缺失时不弹安装引导——检测面补 Python int8 探测(无装=未就绪),按当前引擎模式自动弹出对应安装引导卡。',
@@ -875,7 +937,7 @@ window.__ModuleLoader__.load({
       '[data-dam-banner] { border: 1px solid color-mix(in srgb, var(--dsw-alias-state-warn-primary, #e6a23c) 55%, transparent);',
       '  background: color-mix(in srgb, var(--dsw-alias-state-warn-primary, #e6a23c) 13%, transparent); border-radius: 9px; padding: 8px 10px; margin-bottom: 10px; font-size: calc(12.5px * var(--dam-scale)); }',
       '[data-dam-input], [data-dam-select] { width: 100%; box-sizing: border-box; background: color-mix(in srgb, var(--dsw-alias-bg-layer-1, rgba(128,128,128,.08)) 45%, transparent); color: inherit; border: 1px solid color-mix(in srgb, var(--dsw-alias-border-l1, rgba(128,128,128,.3)) 60%, transparent); border-radius: 7px; padding: 6px 8px; font: inherit; }',
-      '[data-dam-row] { display: flex; align-items: center; gap: 8px; margin-bottom: 10px; }',
+      '[data-dam-row] { display: flex; align-items: center; gap: 8px; margin-bottom: 10px; flex-wrap: wrap; }',
       '[data-dam-row] label { flex: 0 0 110px; opacity: .8; font-size: calc(12.5px * var(--dam-scale)); }',
       '[data-dam-hint] { opacity: .5; font-size: calc(11.5px * var(--dam-scale)); margin-top: 2px; }',
       '[data-dam-sidebar-btn] { display: flex; align-items: center; gap: 6px; width: 100%; border: none; background: transparent; color: inherit; cursor: pointer; padding: 6px 10px; border-radius: 8px; font: inherit; font-size: 13px; opacity: .8; }',
@@ -1850,7 +1912,101 @@ window.__ModuleLoader__.load({
     }
 
     // M-CM6-C 自动接续跨渲染状态(apply 作用域,插件生命周期存活;组件重挂不重置)
-    var autoState = { cdIv: null, lastTokens: null }
+    // v3(2.2.4):lastRunning/edgeAt=轮次边界;rejectedEdgeAt=拒绝后同一边界不重复提示;suppressUntil=接续进行中不重复触发
+    var autoState = { cdIv: null, lastTokens: null, lastRunning: null, edgeAt: 0, edgeSession: '', rejectedEdgeAt: 0, promptVisible: false, suppressUntil: 0 }
+
+    // ───────── 接续执行器(一键接续 + 自动接续共用,2026-09-08 2.2.4)─────────
+    // 流程:③刷新仪式(旧 Agent 先刷 PLAN+账本)→ 取材料 → 修A(workspaceId 建会话)→ 序号标题
+    //      → 修B(沿用模型+思考档位)→ 打开 → 注入材料。
+    var continueFlowBusy = false
+    function continueCreateArgs(d) {
+      // 修A(2026-09-08):官方 session.create 只接受 workspaceId 或 cwd 之一(同传报 bad-request),
+      // 且只有 workspaceId 分支会 workspace.attachSession()(api-session-controller/lib/index.js:566-588);
+      // 只传 cwd 仅设工作目录 → 新会话永远落「未分组工作区」。故优先 workspaceId,解析不到才回退 cwd。
+      if (d && d.workspaceId) return { workspaceId: d.workspaceId, agentPreset: d.agentPreset || undefined }
+      return d && d.ws ? { cwd: d.ws, agentPreset: d.agentPreset || undefined } : { agentPreset: (d && d.agentPreset) || undefined }
+    }
+    async function refreshOldSession(onMsg) {
+      // ③接续前刷新仪式:让旧 Agent 把 PLAN.md 与交接账本刷到最新,host 再用最新材料组装交接。
+      // 任何失败/超时都 fail-soft(用现有材料继续),绝不阻塞接续。
+      try {
+        var st = await apiGet(API.handoffState)
+        var rf = st && st.refresh
+        if (!rf || !rf.sessionId || !rf.prompt) return { ok: false, skipped: true }
+        if (!remoteFace || !remoteFace.session || typeof remoteFace.session.prompt !== 'function') return { ok: false, skipped: true }
+        var before = String((st.planMtime || 0)) + '|' + String((st.ledgers && st.ledgers[0] && st.ledgers[0].name) || '')
+        if (onMsg) onMsg(locale === 'zh' ? '刷新仪式:请旧 Agent 更新白板 PLAN 与交接账本…' : 'Refresh ritual: asking the old agent to update PLAN + ledger…')
+        await remoteFace.session.prompt({ requestId: amReqId('amr'), sessionId: rf.sessionId, mode: 'queue', content: [{ type: 'text', text: rf.prompt }], clientTimeZone: amCtzValue() })
+        var waited = await waitForRefresh(rf.sessionId, before)
+        return { ok: true, waited: waited }
+      } catch (eRf) { return { ok: false, error: String(eRf && eRf.message ? eRf.message : eRf) } }
+    }
+    async function waitForRefresh(oldId, before) {
+      // 结束条件(任一):材料变了 / 旧会话跑完这一轮(true→false) / 超时(默认 90s,配置可调)。
+      var t0 = Date.now()
+      var timeoutMs = 90000
+      try {
+        var cfg = await apiGet(API.config)
+        var sec = cfg && Number(cfg.autoContinueRefreshTimeoutSeconds)
+        if (sec >= 15 && sec <= 600) timeoutMs = sec * 1000
+      } catch (eC) {}
+      var sawRunning = false
+      while (Date.now() - t0 < timeoutMs) {
+        await new Promise(function (r) { setTimeout(r, 2500) })
+        var run = runningOfSession(oldId)
+        if (run === true) sawRunning = true
+        var st2 = null
+        try { st2 = await apiGet(API.handoffState) } catch (eG) {}
+        var now = String((st2 && st2.planMtime) || 0) + '|' + String((st2 && st2.ledgers && st2.ledgers[0] && st2.ledgers[0].name) || '')
+        if (now !== before) return 'updated'
+        if (sawRunning && run === false) return 'turn-ended'
+      }
+      return 'timeout'
+    }
+    async function executeContinue(d, onMsg) {
+      var rf = remoteFace
+      if (!rf || !rf.session || typeof rf.session.create !== 'function') throw new Error(locale === 'zh' ? 'harness 未提供 remote.session(版本过旧?)' : 'remote.session unavailable (harness too old?)')
+      if (onMsg) onMsg(locale === 'zh' ? '正在创建新会话(沿用旧工作区与模型)…' : 'Creating session (same workspace & model)…')
+      var created
+      try { created = await rf.session.create(continueCreateArgs(d)) } catch (eCreate) {
+        // workspaceId 已失效(工作区被删)或旧 harness 不认 → 回退 cwd,再退纯 agentPreset
+        created = await rf.session.create(d && d.ws ? { cwd: d.ws, agentPreset: d.agentPreset || undefined } : { agentPreset: (d && d.agentPreset) || undefined })
+      }
+      // 官方 create 返回裸 SessionId 字符串(而非对象),兼容字符串/{sessionId}/{id}/{value}/{ok,value}
+      var newId = extractSessionId(created)
+      if (!newId) throw new Error('create: no sessionId')
+      // 接续序号标题:让用户一眼区分新会话 vs 延续会话
+      if (d.contSeq && rf.session.rename && typeof rf.session.rename === 'function') {
+        var contTitle = (locale === 'zh' ? '接续 #' : 'Cont.#') + String(d.contSeq) + (d.wsBase ? ' · ' + d.wsBase : '')
+        try { await rf.session.rename({ sessionId: newId, title: contTitle }) } catch (eRen) {}
+      }
+      // 沿用旧会话模型(provider/model/reasoningEffort 由 host 从旧会话 request/header 折叠而来;不可用则静默回退路由默认)
+      if (d.provider && d.model && typeof rf.session.selectModel === 'function') {
+        if (onMsg) onMsg(locale === 'zh' ? '正在沿用旧模型 ' + d.model + (d.reasoningEffort ? '(' + d.reasoningEffort + ')' : '') + '…' : 'Restoring model ' + d.model + '…')
+        try { await rf.session.selectModel({ sessionId: newId, provider: d.provider, model: d.model, reasoningEffort: d.reasoningEffort || undefined }) } catch (eMdl) {}
+      }
+      try { if (sessions && typeof sessions.open === 'function') sessions.open(newId) } catch (eOpen) {}
+      await rf.session.prompt({ requestId: amReqId('amc'), sessionId: newId, mode: 'queue', content: [{ type: 'text', text: d.carryText }], clientTimeZone: amCtzValue() })
+      return newId
+    }
+    async function runContinueFlow(opts) {
+      var onMsg = (opts && opts.onProgress) || function () {}
+      if (continueFlowBusy) return { ok: false, error: 'busy' }
+      continueFlowBusy = true
+      autoState.suppressUntil = Date.now() + 5 * 60 * 1000
+      try {
+        var cfg = null
+        try { cfg = await apiGet(API.config) } catch (eCfg) {}
+        var ritual = !(cfg && cfg.autoContinueRefreshRitual === false) && !(opts && opts.skipRefresh)
+        if (ritual) { try { await refreshOldSession(onMsg) } catch (eRf) {} }
+        onMsg(locale === 'zh' ? '正在构造交接材料(含旧会话转写)…' : 'Preparing handoff material (incl. prev-session transcript)…')
+        var d = await apiPost(API.handoffContinue, {})
+        if (!d || !d.ok) throw new Error((d && d.error) || 'no handoff material')
+        var newId = await executeContinue(d, onMsg)
+        try { localStorage.setItem('dsh-auto-memory.autoCont.last', String(Date.now())) } catch (eL) {}
+        return { ok: true, sessionId: newId, workspaceId: d.workspaceId || '', model: d.model || '', reasoningEffort: d.reasoningEffort || '' }
+      } finally { continueFlowBusy = false }
+    }
 
     function PlanTab() {
       var dataPair = useState(null)
@@ -1869,13 +2025,10 @@ window.__ModuleLoader__.load({
       var contMsgPair = useState('')
       var contMsg = contMsgPair[0]
       var setContMsg = contMsgPair[1]
-      // M-CM6-C 自动接续(水位阈值触发,默认关;轮询 handoff-state,连续两轮水位不增长视为会话空闲)
+      // M-CM6-C 自动接续(①轮次边界触发 + ②确认卡由全局 AutoContinueHost 执行;这里只读/写开关与阈值)
       var autoPair = useState(null)
       var autoCfg = autoPair[0]
       var setAutoCfg = autoPair[1]
-      var cdPair = useState(0)
-      var cd = cdPair[0]
-      var setCd = cdPair[1]
       useEffect(function () {
         apiGet(API.config).then(function (c) {
           setAutoCfg({ enabled: !(c && c.autoContinueEnabled === false), threshold: (c && Number(c.autoContinueThreshold)) || 0.8 })
@@ -1885,47 +2038,13 @@ window.__ModuleLoader__.load({
         setAutoCfg(function (p) { return Object.assign({}, p, patch) })
         apiPost(API.config, patch).catch(function () {})
       }
-      var autoCancel = function () {
-        if (autoState.cdIv) { clearInterval(autoState.cdIv); autoState.cdIv = null }
-        setCd(0)
-      }
-      var autoStartCountdown = function () {
-        if (autoState.cdIv) return
-        var left = 30
-        setCd(left)
-        autoState.cdIv = setInterval(function () {
-          left -= 1
-          if (left <= 0) {
-            clearInterval(autoState.cdIv); autoState.cdIv = null; setCd(0)
-            try { localStorage.setItem('dsh-auto-memory.autoCont.last', String(Date.now())) } catch (eL) {}
-            oneClickContinue()
-          } else setCd(left)
-        }, 1000)
-      }
       async function oneClickContinue() {
+        // 一键接续 = 共用执行器(刷新仪式 → 材料 → workspaceId 建会话 → 沿用模型 → 注入),与自动接续同一路径
         if (contBusy) return
         setContBusy(true)
-        setContMsg(locale === 'zh' ? '正在构造交接材料(含旧会话转写)…' : 'Preparing handoff material (incl. prev-session transcript)…')
         try {
-          var d = await apiPost(API.handoffContinue, {})
-          if (!d || !d.ok) throw new Error((d && d.error) || 'no handoff material')
-          var rf = remoteFace
-          if (!rf || !rf.session || typeof rf.session.create !== 'function') throw new Error(locale === 'zh' ? 'harness 未提供 remote.session(版本过旧?)' : 'remote.session unavailable (harness too old?)')
-          setContMsg(locale === 'zh' ? '正在创建新会话(沿用旧工作区与权限)…' : 'Creating session (same workspace & permissions)…')
-          // M-CM6-B v2:同 cwd 创建 → 工作区绑定/权限状态与旧会话一致;失败回退无参创建
-          var created
-          try { created = await rf.session.create(d.ws ? { cwd: d.ws } : {}) } catch (eCwd) { created = await rf.session.create({}) }
-          var newId = created && (created.sessionId || created.id)
-          if (!newId) throw new Error('create: no sessionId')
-          // 沿用旧会话模型(provider/model 由 host 从旧会话 request/context 折叠而来;不可用则静默回退路由默认)
-          if (d.provider && d.model && typeof rf.session.selectModel === 'function') {
-            setContMsg(locale === 'zh' ? '正在沿用旧模型 ' + d.model + '…' : 'Restoring model ' + d.model + '…')
-            try { await rf.session.selectModel({ sessionId: newId, provider: d.provider, model: d.model }) } catch (eMdl) {}
-          }
-          try { if (sessions && typeof sessions.open === 'function') sessions.open(newId) } catch (eOpen) {}
-          var reqId = (window.crypto && typeof crypto.randomUUID === 'function') ? crypto.randomUUID() : 'amc-' + Date.now() + '-' + Math.random().toString(36).slice(2)
-          await rf.session.prompt({ requestId: reqId, sessionId: newId, mode: 'queue', content: [{ type: 'text', text: d.carryText }] })
-          setContMsg(locale === 'zh' ? '✓ 已创建新会话(模型/工作区已沿用)并预载交接材料' : '✓ Session created (model/workspace restored) with ledger injected')
+          var r = await runContinueFlow({ onProgress: setContMsg })
+          setContMsg((locale === 'zh' ? '✓ 已创建新会话(工作区/模型已沿用)并预载交接材料' : '✓ Session created (workspace/model restored) with ledger injected') + (r && r.model ? ' · ' + r.model + (r.reasoningEffort ? '/' + r.reasoningEffort : '') : ''))
         } catch (e) {
           setContMsg('✗ ' + String(e && e.message ? e.message : e))
         } finally { setContBusy(false) }
@@ -1941,41 +2060,32 @@ window.__ModuleLoader__.load({
         apiGet(API.handoffState, { file: open }).then(function (d) { if (alive) setContent(d.text || '') }).catch(function () {})
         return function () { alive = false }
       }, [open])
-      useEffect(function () {
-        if (!autoCfg || !autoCfg.enabled) return
-        var alive = true
-        var tick = function () {
-          apiGet(API.handoffState).then(function (d) {
-            if (!alive || !d || !d.enabled) return
-            var wl = d.waterLevel || {}
-            if (!wl.window || !(wl.ratio >= (autoCfg.threshold || 0.7))) { autoState.lastTokens = null; return }
-            var idle = autoState.lastTokens !== null && wl.tokens === autoState.lastTokens
-            autoState.lastTokens = wl.tokens
-            if (!idle) return
-            var last = 0
-            try { last = Number(localStorage.getItem('dsh-auto-memory.autoCont.last') || 0) } catch (eL) {}
-            if (Date.now() - last < 30 * 60 * 1000) return
-            autoStartCountdown()
-          }).catch(function () {})
-        }
-        var iv = setInterval(tick, 20000)
-        tick()
-        return function () { alive = false; clearInterval(iv) }
-      }, [autoCfg && autoCfg.enabled, autoCfg && autoCfg.threshold])
+      // 自动触发已移交全局 AutoContinueHost(①轮次边界 + ②确认卡);面板这里只保留手动一键接续与开关/阈值。
       useEffect(function () {
         return function () { if (autoState.cdIv) { clearInterval(autoState.cdIv); autoState.cdIv = null } }
       }, [])
+      // 账本/计划版本按钮：窄面板下长文件名会被折成竖排，只显示短标签(时间)，完整名放悬浮提示
+      function shortLedgerName(name) {
+        var m = /^(handoff|PLAN)-(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})(\d{2})\.md$/.exec(name || '')
+        if (m) { var t = m[5] + ':' + m[6] + (m[1] === 'handoff' ? ':' + m[7] : ''); return (m[1] === 'PLAN' ? 'PLAN ' : '') + m[3] + '-' + m[4] + ' ' + t }
+        var p = /^prev-session-.+-(\d{2})(\d{2})(\d{2})\.md$/.exec(name || '')
+        if (p) return '↻ ' + p[1] + ':' + p[2] + ':' + p[3]
+        return name
+      }
       if (!data) return h(Loading)
       if (!data.enabled) return h(Card, { title: t('planTitle') }, h('div', { 'data-dam-hint': '' }, t('planDisabled')))
       var wl = data.waterLevel || {}
       var rows = [h(Card, { title: t('planTitle') }, h('div', { 'data-dam-content': '' }, data.plan || t('planEmpty')))]
       if (wl.window > 0) {
-        var pct = Math.min(Math.round((wl.ratio || 0) * 100), 150)
-        var barColor = pct >= 80 ? '#d4744f' : pct >= 50 ? '#d4a94f' : 'var(--dam-accent, #4f7cff)'
+        // 2.2.4:百分比显示真实水位(旧版截断到 150% 会把「窗口算错」伪装成「刚好超一点」);进度条宽度仍按 100% 截断。
+        var rawPct = Math.round((wl.ratio || 0) * 100)
+        var pct = Math.min(rawPct, 999)
+        var barColor = rawPct >= 80 ? '#d4744f' : rawPct >= 50 ? '#d4a94f' : 'var(--dam-accent, #4f7cff)'
+        var srcLabel = !wl.source ? '' : wl.source.indexOf('auto') === 0 ? t('waterAutoSrc') + ': ' + wl.source.slice(5) : (wl.source === 'official-context' ? t('waterOfficialSrc') : (wl.source === 'fallback' ? t('waterFallbackSrc') : t('waterManualSrc')))
         rows.unshift(h(Card, { title: t('waterCardTitle') }, h('div', { 'data-dam-content': '' }, [
           h('div', { style: { fontSize: 'calc(12px * var(--dam-scale))', marginBottom: '6px' } },
             (wl.tokens || 0).toLocaleString() + ' / ' + wl.window.toLocaleString() + ' token · ' + pct + '%',
-            ' ', h('span', { 'data-dam-hint': '' }, wl.source ? (wl.source.indexOf('auto') === 0 ? t('waterAutoSrc') + ': ' + wl.source.slice(5) : t('waterManualSrc')) : ''),
+            ' ', h('span', { 'data-dam-hint': '' }, srcLabel),
             ' ', h('span', { 'data-dam-hint': '' }, wl.meter ? (wl.meter.indexOf('official') === 0 ? '· ' + t('waterMeterOfficial') + '(' + String(wl.meter).slice(9) + ')' : '· ' + t('waterMeterHeuristic')) : '')),
           h('div', { style: { height: '6px', borderRadius: '3px', background: 'color-mix(in srgb, currentColor 12%, transparent)', overflow: 'hidden' } },
             h('div', { style: { height: '100%', width: Math.min(pct, 100) + '%', background: barColor, borderRadius: '3px' } })),
@@ -1986,10 +2096,9 @@ window.__ModuleLoader__.load({
         rows.unshift(h(Card, { title: t('autoContTitle') }, h('div', { 'data-dam-content': '' }, [
           h('div', { 'data-dam-hint': '', style: { marginBottom: '6px' } }, t('autoContHint')),
           h('div', { 'data-dam-row': '' },
-            h('button', { 'data-dam-btn': '', onClick: function () { autoCancel(); autoSave({ autoContinueEnabled: !autoCfg.enabled }) } }, autoCfg.enabled ? t('autoContOn') : t('autoContOff')),
+            h('button', { 'data-dam-btn': '', onClick: function () { autoSave({ autoContinueEnabled: !autoCfg.enabled }) } }, autoCfg.enabled ? t('autoContOn') : t('autoContOff')),
             h('label', { 'data-dam-hint': '', style: { marginLeft: '8px' } }, t('autoContThreshold') + ' ',
               h('input', { 'data-dam-input': '', type: 'number', min: 0.5, max: 0.95, step: 0.05, value: String(autoCfg.threshold), style: { width: '64px' }, onChange: function (e) { var v = Number(e.target.value); if (v >= 0.5 && v <= 0.95) autoSave({ autoContinueThreshold: v }) } }))),
-          cd > 0 ? h('div', { 'data-dam-hint': '', style: { marginTop: '6px', color: '#d4744f' } }, t('autoContCountdown').replace('{s}', String(cd)) + ' ', h('button', { 'data-dam-btn': '', onClick: autoCancel }, t('autoContCancel'))) : null,
         ])))
       }
       if (open) {
@@ -1998,11 +2107,11 @@ window.__ModuleLoader__.load({
       } else {
         if (data.planVersions && data.planVersions.length) {
           rows.push(h(Card, { title: t('planVersions') }, h('div', { 'data-dam-row': '' }, data.planVersions.map(function (v) {
-            return h('button', { 'data-dam-btn': '', key: v.name, onClick: function () { setOpen(v.name) } }, v.name)
+            return h('button', { 'data-dam-btn': '', key: v.name, title: v.name, onClick: function () { setOpen(v.name) } }, shortLedgerName(v.name))
           }))))
         }
         rows.push(h(Card, { title: t('planLedgers') }, h('div', { 'data-dam-row': '' }, (data.ledgers || []).length ? data.ledgers.map(function (v) {
-          return h('button', { 'data-dam-btn': '', key: v.name, onClick: function () { setOpen(v.name) } }, v.name)
+          return h('button', { 'data-dam-btn': '', key: v.name, title: v.name, onClick: function () { setOpen(v.name) } }, shortLedgerName(v.name))
         }) : h('div', { 'data-dam-muted': '' }, t('empty')))))
         // M-CM6-B 一键接续:写账本→建新会话→预载交接材料→自动切换
         rows.push(h(Card, { title: t('continueCardTitle') }, h('div', { 'data-dam-content': '' }, [
@@ -3281,9 +3390,10 @@ window.__ModuleLoader__.load({
     // ───────────────────────── 设置页 ─────────────────────────
     var STYLE_IDS = ['auto', 'life', 'professional']
     var LOCALE_IDS_LIST = ['system', 'zh', 'en']
-    // M-CM6-C v2·常驻自动接续 watcher(2026-09-08):全局生效,与面板/页签是否打开无关。
-    // 条件:autoContinueEnabled !== false(缺省=开)&& 水位≥阈值(缺省0.8)&& 连续两轮 tokens 不增长(会话空闲)
-    // && 距上次触发>30min → 30s 可取消倒计时 → 自动执行接续(写账本→建会话→切换→注入材料)。
+    // M-CM6-C v3·常驻自动接续 watcher(2026-09-08 2.2.4):全局生效,与面板/页签是否打开无关。
+    // ①触发 = autoContinueEnabled !== false && 水位≥阈值 && harness 权威 running==false(轮次边界,取代旧"两轮水位持平")
+    //   + 3s 短确认(防刚结束又起新一轮)→ ②确认卡(同意 / 拒绝 / 超时 N 秒自动接续;拒绝记录在案,同一边界不再提示)
+    //   → ③刷新仪式(旧 Agent 刷 PLAN+账本)→ 一键接续(workspaceId 建会话 → 沿用模型 → 注入材料)。
     function AutoContinueHost() {
       var cfgP = useState(null)
       var acCfg = cfgP[0]
@@ -3297,6 +3407,9 @@ window.__ModuleLoader__.load({
       var bsP = useState(false)
       var acBusy = bsP[0]
       var setAcBusy = bsP[1]
+      var cfP = useState(null)
+      var acConfirm = cfP[0]
+      var setAcConfirm = cfP[1]
       useEffect(function () {
         var alive = true
         var load = function () {
@@ -3310,73 +3423,115 @@ window.__ModuleLoader__.load({
         var on = !(acCfg && acCfg.autoContinueEnabled === false)
         if (!on) return
         var thr = (acCfg && Number(acCfg.autoContinueThreshold)) || 0.8
+        var confirmSec = Number(acCfg && acCfg.autoContinueConfirmSeconds)
+        if (!(confirmSec >= 10 && confirmSec <= 120)) confirmSec = 35
+        var cooldownMin = Number(acCfg && acCfg.autoContinueCooldownMinutes)
+        if (!(cooldownMin > 0)) cooldownMin = 30
         var alive = true
-        var tick = function () {
+        var maybePrompt = function (edgeAt) {
+          if (!alive || acBusy || autoState.cdIv || autoState.promptVisible) return
+          if (!edgeAt || Date.now() - edgeAt > 10 * 60 * 1000) return   // 边界太旧不再提示
+          if (Date.now() < autoState.suppressUntil) return
+          if (autoState.rejectedEdgeAt === edgeAt) return                // ②拒绝过同一边界
           apiGet(API.handoffState).then(function (d) {
             if (!alive || !d || !d.enabled) return
             var wl = d.waterLevel || {}
-            if (!wl.window || !(wl.ratio >= thr)) { autoState.lastTokens = null; return }
-            var idle = autoState.lastTokens !== null && wl.tokens === autoState.lastTokens
-            autoState.lastTokens = wl.tokens
-            if (!idle || autoState.cdIv || acBusy) return
+            if (!wl.window || !(wl.ratio >= thr)) return
             var last = 0
             try { last = Number(localStorage.getItem('dsh-auto-memory.autoCont.last') || 0) } catch (eL) {}
-            if (Date.now() - last < 30 * 60 * 1000) return
-            setAcSt(null)
-            var left = 30
+            if (Date.now() - last < cooldownMin * 60 * 1000) return
+            if (autoState.promptVisible || autoState.cdIv) return
+            setAcConfirm({ ratio: Number(wl.ratio) || 0, tokens: Number(wl.tokens) || 0, window: Number(wl.window) || 0, edgeAt: edgeAt })
+            setAcSt('')
+            autoState.promptVisible = true
+            var left = confirmSec
             setAcCd(left)
             autoState.cdIv = setInterval(function () {
               left -= 1
               if (left <= 0) {
                 clearInterval(autoState.cdIv); autoState.cdIv = null; setAcCd(0)
-                runAutoContinue()
+                autoState.promptVisible = false; setAcConfirm(null)
+                runAuto()   // ③超时 = 挂机 → 自动接续兜底
               } else setAcCd(left)
             }, 1000)
           }).catch(function () {})
         }
-        var iv = setInterval(tick, 20000)
-        tick()
-        return function () { alive = false; clearInterval(iv) }
-      }, [acCfg && acCfg.autoContinueEnabled === false, acCfg && (Number(acCfg.autoContinueThreshold) || 0.8), acBusy])
+        // 轮次边界:running true→false 边沿 + 3s 短确认
+        var verifyEdge = function (edgeAt) {
+          if (!alive || autoState.edgeAt !== edgeAt) return
+          var info = currentRunningInfo()
+          if (info && info.running) return   // 短确认失败:新一轮已开始,不算边界
+          maybePrompt(edgeAt)
+        }
+        var armEdge = function () {
+          autoState.edgeAt = Date.now()
+          var info = currentRunningInfo()
+          autoState.edgeSession = info ? info.sessionId : ''
+          var edgeAt = autoState.edgeAt
+          setTimeout(function () { verifyEdge(edgeAt) }, 3000)
+        }
+        var observe = function () {
+          if (!alive) return
+          var info = currentRunningInfo()
+          if (!info) return
+          if (autoState.lastRunning === null) {
+            autoState.lastRunning = info.running
+            if (!info.running) armEdge()   // 首次观察即空闲(挂机/刚进会话):按边界处理
+            return
+          }
+          if (autoState.lastRunning === true && info.running === false) armEdge()
+          autoState.lastRunning = info.running
+        }
+        var unsub = null
+        try { if (sessions && sessions.list && typeof sessions.list.subscribe === 'function') unsub = sessions.list.subscribe(observe) } catch (eSub) {}
+        observe()
+        var iv = setInterval(function () { observe(); maybePrompt(autoState.edgeAt) }, 20000)  // 兜底:水位后到 / 订阅不可用
+        return function () {
+          alive = false
+          clearInterval(iv)
+          if (unsub) { try { unsub() } catch (eU) {} }
+        }
+      }, [acCfg && acCfg.autoContinueEnabled === false, acCfg && (Number(acCfg.autoContinueThreshold) || 0.8), acCfg && acCfg.autoContinueConfirmSeconds, acCfg && acCfg.autoContinueCooldownMinutes, acBusy])
       var cancelAc = function () {
         if (autoState.cdIv) { clearInterval(autoState.cdIv); autoState.cdIv = null }
+        autoState.promptVisible = false
         setAcCd(0)
       }
-      var runAutoContinue = function () {
+      var runAuto = function () {
         if (acBusy) return
+        cancelAc()
+        setAcConfirm(null)
         if (!remoteFace || !remoteFace.session || typeof remoteFace.session.create !== 'function') {
           setAcSt(locale === 'zh' ? '✗ remote.session 不可用——请重启 dsh web 后重试' : '✗ remote.session unavailable — restart dsh web')
           return
         }
         setAcBusy(true)
-        setAcSt(locale === 'zh' ? '正在自动接续:写账本→建新会话→注入材料…' : 'Auto-continuing: ledger → new session → inject…')
-        apiPost(API.handoffContinue, {}).then(function (d) {
-          if (!d || !d.ok) throw new Error((d && d.error) || 'no handoff material')
-          var p
-          try { p = remoteFace.session.create(d.ws ? { cwd: d.ws } : {}) } catch (eC) { p = remoteFace.session.create({}) }
-          return p.then(function (created) {
-            var newId = created && (created.sessionId || created.id)
-            if (!newId) throw new Error('create: no sessionId')
-            var chain = Promise.resolve()
-            if (d.provider && d.model && typeof remoteFace.session.selectModel === 'function') {
-              chain = chain.then(function () { try { return remoteFace.session.selectModel({ sessionId: newId, provider: d.provider, model: d.model }) } catch (eM) { return null } })
-            }
-            return chain.then(function () {
-              try { if (sessions && typeof sessions.open === 'function') sessions.open(newId) } catch (eO) {}
-              var reqId = (window.crypto && typeof crypto.randomUUID === 'function') ? crypto.randomUUID() : 'ac-' + Date.now() + '-' + Math.random().toString(36).slice(2)
-              return remoteFace.session.prompt({ requestId: reqId, sessionId: newId, mode: 'queue', content: [{ type: 'text', text: d.carryText }] })
-            })
-          })
-        }).then(function () {
-          try { localStorage.setItem('dsh-auto-memory.autoCont.last', String(Date.now())) } catch (eL) {}
-          setAcSt(locale === 'zh' ? '✓ 已自动接续到新会话,可直接上手' : '✓ Auto-continued into a new session')
+        setAcSt(locale === 'zh' ? '正在自动接续:刷新白板/账本 → 建新会话 → 注入材料…' : 'Auto-continuing: refresh PLAN/ledger → new session → inject…')
+        runContinueFlow({ onProgress: function (m) { setAcSt(m) } }).then(function (r) {
+          setAcSt((locale === 'zh' ? '✓ 已自动接续到新会话,可直接上手' : '✓ Auto-continued into a new session') + (r && r.model ? ' · ' + r.model + (r.reasoningEffort ? '/' + r.reasoningEffort : '') : ''))
           setAcBusy(false)
         }).catch(function (e) { setAcSt('✗ ' + String(e && e.message ? e.message : e)); setAcBusy(false) })
       }
-      if (acCd > 0 || acSt) {
+      var onAgree = function () { runAuto() }
+      var onReject = function () {
+        var edgeAt = (acConfirm && acConfirm.edgeAt) || autoState.edgeAt || 0
+        cancelAc()
+        setAcConfirm(null)
+        autoState.rejectedEdgeAt = edgeAt
+        setAcSt(t('autoContRejected'))
+      }
+      if (acConfirm || acCd > 0 || acSt) {
         return h('div', { 'data-dam-autocont': '', style: { position: 'fixed', right: '16px', bottom: '16px', zIndex: 9000, maxWidth: 'min(440px, calc(100vw - 32px))', boxSizing: 'border-box', padding: '10px 12px', borderRadius: '12px', border: '1px solid rgba(128,128,128,.35)', background: 'rgba(18,22,30,.93)', color: '#e8eaed', fontSize: '12px', lineHeight: '1.55', fontFamily: 'system-ui', boxShadow: '0 10px 30px rgba(0,0,0,.35)', backdropFilter: 'blur(10px)' } },
-          acCd > 0 ? h('div', null, t('autoContCountdown').replace('{s}', String(acCd)), ' ', h('button', { style: { marginLeft: '6px', border: '1px solid rgba(232,234,237,.45)', borderRadius: '8px', background: 'transparent', color: '#e8eaed', cursor: 'pointer', padding: '2px 10px' }, onClick: cancelAc }, t('autoContCancel'))) : null,
-          acSt ? h('div', { style: acCd > 0 ? { marginTop: '4px' } : {} }, acSt) : null)
+          acConfirm ? h('div', { 'data-dam-autocont-confirm': '' }, [
+            h('div', { style: { marginBottom: '4px' } }, t('autoContConfirm').replace('{p}', String(Math.round((acConfirm.ratio || 0) * 100)))),
+            h('div', { 'data-dam-hint': '' }, (acConfirm.tokens || 0).toLocaleString() + ' / ' + (acConfirm.window || 0).toLocaleString() + ' token'),
+            h('div', { style: { marginTop: '8px' } },
+              h('button', { 'data-dam-btn': '', onClick: onAgree }, t('autoContAgree')),
+              h('button', { 'data-dam-btn': '', style: { marginLeft: '6px' }, onClick: onReject }, t('autoContReject')),
+              acCd > 0 ? h('span', { 'data-dam-hint': '', style: { marginLeft: '8px' } }, t('autoContTimeout').replace('{s}', String(acCd))) : null),
+          ]) : null,
+          !acConfirm && acCd > 0 ? h('div', null, t('autoContCountdown').replace('{s}', String(acCd)), ' ', h('button', { style: { marginLeft: '6px', border: '1px solid rgba(232,234,237,.45)', borderRadius: '8px', background: 'transparent', color: '#e8eaed', cursor: 'pointer', padding: '2px 10px' }, onClick: cancelAc }, t('autoContCancel'))) : null,
+          acSt ? h('div', { style: (acConfirm || acCd > 0) ? { marginTop: '4px' } : {} }, acSt) : null)
       }
       return null
     }
@@ -3907,7 +4062,11 @@ window.__ModuleLoader__.load({
         field(t('fWaterWindow'), h('input', { 'data-dam-input': '', type: 'number', min: 0, value: cfg.waterLevelWindowTokens === undefined ? 65536 : cfg.waterLevelWindowTokens, onChange: function (e) { set('waterLevelWindowTokens', Number(e.target.value) || 0) } }), t('fWaterWindowHint')),
         field(t('fWaterThreshold'), h('input', { 'data-dam-input': '', type: 'number', min: 0.1, max: 1.5, step: 0.05, value: cfg.waterLevelThreshold === undefined ? 0.8 : cfg.waterLevelThreshold, onChange: function (e) { set('waterLevelThreshold', Number(e.target.value) || 0.8) } }), t('fWaterThresholdHint')),
         field(t('fWaterAdvisory'), h('input', { type: 'checkbox', checked: cfg.waterLevelAdvisory !== false, onChange: function (e) { set('waterLevelAdvisory', e.target.checked) } }), t('fWaterAdvisoryHint')),
-        field(t('fWaterAuto'), h('input', { type: 'checkbox', checked: cfg.waterLevelAutoHandoff !== false, onChange: function (e) { set('waterLevelAutoHandoff', e.target.checked) } }), t('fWaterAutoHint'))]),
+        field(t('fWaterAuto'), h('input', { type: 'checkbox', checked: cfg.waterLevelAutoHandoff !== false, onChange: function (e) { set('waterLevelAutoHandoff', e.target.checked) } }), t('fWaterAutoHint')),
+        field(locale === 'zh' ? '子代理痕迹回收' : 'Subagent trace recycle', h('input', { type: 'checkbox', checked: cfg.subagentGcEnabled !== false, onChange: function (e) { set('subagentGcEnabled', e.target.checked) } }),
+          locale === 'zh' ? '本插件的一次性子代理(自动沉淀 / 时段总结 / 问候 / 蒸馏)每跑一次都会在 ~/.dsh/sessions 留下一个持久化会话;数量上千后会话列表会明显变慢。开启后任务一结束就把这些痕迹移入 ~/.dsh/subagent-gc-backup 备份(可回滚),不影响子代理结果。默认开。' : 'Every one-shot subagent this plugin spawns (auto-consolidation, scheduled summary, greeting, distillation) leaves a persisted session under ~/.dsh/sessions; hundreds of them slow the session list down. When on, each trace is moved into ~/.dsh/subagent-gc-backup right after the task ends (reversible), never affecting the subagent result. On by default.'),
+        field(locale === 'zh' ? '兜底回收保留天数' : 'Fallback recycle keep days', h('input', { 'data-dam-input': '', type: 'number', min: 0, value: cfg.subagentGcKeepDays === undefined ? 3 : cfg.subagentGcKeepDays, onChange: function (e) { set('subagentGcKeepDays', Number(e.target.value) || 0) } }),
+          locale === 'zh' ? '每天巡检一次,回收超过该天数仍残留的痕迹(比如任务异常中断没删掉的);0 = 不按时间,只靠任务结束即删。' : 'A daily sweep recycles traces older than this many days (e.g. leftovers from interrupted tasks); 0 = rely on the end-of-task recycle only.')]),
         section('maintenance', sectionLabels.maintenance, [field(t('fVersion'), h('div', { 'data-dam-row': '' },
           h('span', { style: { flex: 1 } }, verInfo ? (verInfo.current || '?') + (verInfo.latest ? ' → ' + verInfo.latest + (verInfo.upToDate ? ' ' + t('upToDate') : ' ' + t('hasUpdate')) : '') : (checkingUpdate ? t('checking') : '—')),
           h('button', { 'data-dam-btn': '', onClick: checkUpdate, disabled: checkingUpdate }, checkingUpdate ? t('checking') : t('checkUpdate')),
@@ -4167,7 +4326,7 @@ window.__ModuleLoader__.load({
       console.log('[dsh-auto-memory] client ready: sidebar entry + panel + settings page')
     }
 
-    exports.inject = ['slots', 'sessions']
+    exports.inject = ['slots', 'sessions', 'remote', 'remote.session']
     exports.apply = apply
     return module.exports
   },