@a9i5k4/dsh-auto-memory 2.2.5 → 2.2.6

package/lib/client.js

@@ -561,6 +561,13 @@ window.__ModuleLoader__.load({
 
     // ───────────────────────── 更新弹窗 / 首次指导 ─────────────────────────
     var CHANGELOG = {
+      '2.2.6': { zh: [
+        '★ 修复:交接测量终于站到官方压缩的同一条边界上——官方自动压缩挂在每个 step 边界(pre-step,阈值 80%),而插件此前只在「一轮结束」测量;某一轮把水位从阈值下推到 80% 以上时,官方会在该轮就压缩完,交接白板/账本来不及写。现在 pre-step 也做同一测量(同一会话 5 秒节流),水位一到阈值就先写交接材料,不再被官方抢跑。',
+        '★ 自动接续改为宿主兜底:建新会话不再依赖浏览器页面——水位达标后在宿主侧开倒计时,确认卡照常弹出(同意/拒绝都直接发给宿主);页面被后台节流、标签页关闭或人不在时,倒计时一到宿主自己完成「刷新白板/账本 → 建新会话 → 沿用模型与工作区 → 注入交接材料」,不再因浏览器休眠而断档。',
+      ], en: [
+        '★ Fix: handoff measurement now runs on the same boundary as official compaction — the official auto-compaction hook fires at every step boundary (pre-step, 80% threshold) while the plugin only measured at turn end; a single turn that pushes the level past 80% let the official compaction finish before the handoff ledger was written. The same measurement now also runs on pre-step (throttled to once per 5s per session), so the handoff material is written as soon as the threshold is crossed.',
+        '★ Auto-continue is now host-side: creating the new session no longer depends on the browser tab. Once the water level crosses the threshold the host starts a countdown; the confirm card still appears (Agree/Decline are sent straight to the host), and if the tab is throttled, closed, or nobody is at the keyboard, the host itself completes "refresh PLAN/ledger → create session → restore model & workspace → inject handoff material" when the countdown ends. No more missed handoffs from a sleeping browser.',
+      ] },
       '2.2.5': { zh: [
         '★ 修复:上下文水位百分比不再被硬截断到 150%——旧版 `Math.min(tokens / window, 1.5)` 让任何超额都显示成同一个数(例如 761,692 / 131,072 真实为 581%)。现在如实上报,进度条仍按 100% 封顶。',
         '★ 修复:水位卡标出的模型现在是「当前会话真实使用的模型」——此前一律读 settings.yaml 的 agent-default-model(新会话默认模型),你在界面切过模型后,卡片会张冠李戴地标成另一个模型(实测会话跑 deepseek-official/deepseek-v4.1-flash,却标成 opencode-go/deepseek-v4-flash)。现改为优先取会话日志 request/header 的 provider/model,默认模型只作兜底。',
@@ -854,6 +861,8 @@ window.__ModuleLoader__.load({
       pyStatus: '/api/dsh-auto-memory/python-setup/status',
       handoffState: '/api/dsh-auto-memory/handoff-state',
       handoffContinue: '/api/dsh-auto-memory/handoff-continue',
+      autoContState: '/api/dsh-auto-memory/auto-continue-state',
+      autoContDecide: '/api/dsh-auto-memory/auto-continue-decide',
       semanticDownload: '/api/dsh-auto-memory/semantic-download',
     }
     function query(params) {
@@ -3489,114 +3498,78 @@ window.__ModuleLoader__.load({
       var cfP = useState(null)
       var acConfirm = cfP[0]
       var setAcConfirm = cfP[1]
+      // 2.2.6:宿主兜底状态(倒计时/执行中/结果全部由宿主权威判定;浏览器只展示与传达决定)
+      var asP = useState(null)
+      var acState = asP[0]
+      var setAcState = asP[1]
       useEffect(function () {
         var alive = true
         var load = function () {
           apiGet(API.config).then(function (c) { if (alive) setAcCfg(c || {}) }).catch(function () {})
+          apiGet(API.autoContState).then(function (s) { if (alive && s) setAcState(s) }).catch(function () {})
         }
         load()
-        var iv = setInterval(load, 30000)
+        var iv = setInterval(load, 3000)
         return function () { alive = false; clearInterval(iv) }
       }, [])
       useEffect(function () {
+        var alive = true
         var on = !(acCfg && acCfg.autoContinueEnabled === false)
         if (!on) return
         var thr = (acCfg && Number(acCfg.autoContinueThreshold)) || 0.75
-        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 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, { sessionId: currentSessionIdClient() }).then(function (d) {
-            if (!alive || !d || !d.enabled) return
-            var wl = d.waterLevel || {}
-            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 < 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)
-                autoState.promptVisible = false; setAcConfirm(null)
-                runAuto()   // ③超时 = 挂机 → 自动接续兜底
-              } else setAcCd(left)
-            }, 1000)
-          }).catch(function () {})
-        }
-        // 轮次边界: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 () {
+        // 渲染:armed 倒计时 → 确认卡;executing → 执行中;lastOk → 成功;error → 失败提示。
+        // 触发/倒计时/超时执行全部由宿主侧驱动(2.2.6),浏览器即使被节流也不影响接续。
+        var poll = 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) {} }
+          apiGet(API.autoContState).then(function (s) {
+            if (!alive || !s) return
+            setAcState(s)
+            if (s.executing) {
+              setAcSt(locale === 'zh' ? '宿主正在自动接续:刷新白板/账本 → 建新会话 → 注入材料…' : 'Host auto-continuing: refresh PLAN/ledger → new session → inject…')
+              return
+            }
+            if (s.lastOk) {
+              setAcSt((locale === 'zh' ? '✓ 已自动接续到新会话,可直接上手' : '✓ Auto-continued into a new session') + (s.lastOk.model ? ' · ' + s.lastOk.model + (s.lastOk.reasoningEffort ? '/' + s.lastOk.reasoningEffort : '') : ''))
+              return
+            }
+            if (s.error) { setAcSt('✗ ' + s.error); return }
+            var arm = s.armed
+            if (arm && arm.ratio >= thr) {
+              setAcConfirm({ ratio: Number(arm.ratio) || 0, tokens: Number(arm.tokens) || 0, window: Number(arm.window) || 0, edgeAt: Number(arm.edgeAt) || 0 })
+              setAcCd(Math.max(0, Math.ceil((Number(arm.expiresAt) || 0) - Date.now()) / 1000))
+            } else {
+              setAcConfirm(null)
+              setAcCd(0)
+              if (acSt && /^✗/.test(acSt)) setAcSt('')
+            }
+          }).catch(function () {})
         }
-      }, [acCfg && acCfg.autoContinueEnabled === false, acCfg && (Number(acCfg.autoContinueThreshold) || 0.75), acCfg && acCfg.autoContinueConfirmSeconds, acCfg && acCfg.autoContinueCooldownMinutes, acBusy])
+        poll()
+        var iv = setInterval(poll, 3000)
+        return function () { alive = false; clearInterval(iv) }
+      }, [acCfg && acCfg.autoContinueEnabled === false, acCfg && (Number(acCfg.autoContinueThreshold) || 0.75)])
       var cancelAc = function () {
-        if (autoState.cdIv) { clearInterval(autoState.cdIv); autoState.cdIv = null }
-        autoState.promptVisible = false
         setAcCd(0)
       }
+      // 2.2.6:执行权在宿主。同意/拒绝都 POST 给宿主(浏览器只传达决定);执行/超时全部宿主侧完成。
       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: 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) })
+        var edgeAt = (acConfirm && acConfirm.edgeAt) || 0
+        apiPost(API.autoContDecide, { action: 'agree', edgeAt: edgeAt }).then(function (r) {
+          if (r && r.ok) {
+            setAcConfirm(null)
+            setAcCd(0)
+            setAcSt(locale === 'zh' ? '宿主正在自动接续:刷新白板/账本 → 建新会话 → 注入材料…' : 'Host auto-continuing: refresh PLAN/ledger → new session → inject…')
+          } else {
+            setAcSt('✗ ' + String((r && r.error) || 'auto-continue agree failed'))
+          }
+        }).catch(function (e) { setAcSt('✗ ' + String(e && e.message ? e.message : e)) })
       }
       var onAgree = function () { runAuto() }
       var onReject = function () {
-        var edgeAt = (acConfirm && acConfirm.edgeAt) || autoState.edgeAt || 0
+        var edgeAt = (acConfirm && acConfirm.edgeAt) || 0
         cancelAc()
         setAcConfirm(null)
-        autoState.rejectedEdgeAt = edgeAt
+        apiPost(API.autoContDecide, { action: 'reject', edgeAt: edgeAt }).then(function () {}).catch(function () {})
         setAcSt(t('autoContRejected'))
       }
       if (acConfirm || acCd > 0 || acSt) {
@@ -3609,7 +3582,7 @@ window.__ModuleLoader__.load({
               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,
+          !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: onReject }, t('autoContCancel'))) : null,
           acSt ? h('div', { style: (acConfirm || acCd > 0) ? { marginTop: '4px' } : {} }, acSt) : null)
       }
       return null

package/lib/index.js

@@ -161,6 +161,8 @@ export const API = {
   'semantic-deep-detect': '/api/dsh-auto-memory/semantic-deep-detect',
   'handoff-state': '/api/dsh-auto-memory/handoff-state',
   'handoff-continue': '/api/dsh-auto-memory/handoff-continue',
+  'auto-continue-state': '/api/dsh-auto-memory/auto-continue-state',
+  'auto-continue-decide': '/api/dsh-auto-memory/auto-continue-decide',
   'subagent-gc': '/api/dsh-auto-memory/subagent-gc',
   'semantic-download': '/api/dsh-auto-memory/semantic-download',
   'semantic-emit': '/api/dsh-auto-memory/semantic-emit',
@@ -1861,6 +1863,153 @@ class MemoryEngine {
     } catch (e) { diag('checkWaterLevel error: ' + (e && e.message)) }
   }
 
+  /** M-CM6-A·水位 v3(2026-09-08):pre-step 边界补测 —— 官方自动压缩(compaction-basic)挂在 `agent/pre-step`,
+   *  阈值 thresholdRatio=0.8 对「路由请求 token」;插件此前只在 turn-stopping 测量,一旦某一轮把水位从阈值下推到 0.8 以上,
+   *  官方会在该轮的 pre-step 就压缩完,交接白板/账本根本来不及写(实测:20:11 轮末测得 768158/1000000=0.77 时,会话日志里
+   *  已有 2 次 compaction/start+summary)。这里在 pre-step 也做同一测量,让交接与官方压缩站在同一条边界上。
+   *  节流:同一 agent 至少间隔 minGapMs(默认 5s),避免每个 step 都扫会话事件/读 tokenMeter。 */
+  checkWaterLevelAtStep(agent, minGapMs = 5000) {
+    try {
+      if (this.config.handoffEnabled === false) return
+      if (!agent || !this.hasReliableSessionIdentity(agent)) return
+      const rt = this.runtimeFor(agent)
+      const now = Date.now()
+      if (rt && rt.waterStepAt && now - rt.waterStepAt < minGapMs) return
+      if (rt) rt.waterStepAt = now
+      void this.checkWaterLevel(agent)
+    } catch (e) { diag('checkWaterLevelAtStep error: ' + (e && e.message)) }
+  }
+
+  /** M-CM6-C·宿主兜底自动接续(2026-09-08,2.2.6):浏览器端 AutoContinueHost 被后台节流/关闭时,
+   *  宿主自身在倒计时到期后直接建新会话。协议:turn-stopping 且水位≥阈值 → arm 倒计时(confirmSeconds,
+   *  默认 35s,写入 _autoContState)→ 浏览器轮询 GET auto-continue-state 显示确认卡(同意=POST decide
+   *  agree,宿主立即执行;拒绝=POST decide reject,同一边界不再触发)→ 到期无人响应 → 宿主自动执行,
+   *  与官方 SessionController service(ctx.get('sessionController'))同进程直调,不依赖浏览器。 */
+  armAutoContinue(agent, wl) {
+    try {
+      if (!agent || !this.hasReliableSessionIdentity(agent)) return
+      if (this.config.handoffEnabled === false) return
+      if (this.config.autoContinueEnabled === false) return
+      if (!wl || !(wl.ratio >= (Number(this.config.autoContinueThreshold) || 0.75))) return
+      const st = this._autoContState || (this._autoContState = {})
+      const now = Date.now()
+      const cooldownMin = Number(this.config.autoContinueCooldownMinutes) || 30
+      if (st.lastRunAt && now - st.lastRunAt < cooldownMin * 60000) return
+      const sid = String(agent.session.id || agent.session.header?.id || '')
+      // 拒绝语义:时间窗 10 分钟内不再 arm(近似客户端「拒绝=跳过本边界」;窗口过后按新边界重新评估)
+      if (st.rejectedEdgeAt && now - st.rejectedEdgeAt < 10 * 60 * 1000) return
+      if (st.armed && Date.now() < st.armed.expiresAt) return         // 已有进行中的倒计时
+      if (st.executing) return
+      const confirmSec = Number(this.config.autoContinueConfirmSeconds)
+      const sec = confirmSec >= 10 && confirmSec <= 120 ? confirmSec : 35
+      st.armed = {
+        edgeAt: now,
+        sessionId: sid,
+        expiresAt: now + sec * 1000,
+        ratio: Number(wl.ratio) || 0,
+        tokens: Number(wl.tokens) || 0,
+        window: Number(wl.window) || 0,
+        source: String(wl.source || ''),
+      }
+      diag('auto-continue armed: sid=' + sid + ' ratio=' + st.armed.ratio.toFixed(2) + ' expiresAt=' + st.armed.expiresAt)
+    } catch (e) { diag('armAutoContinue error: ' + (e && e.message)) }
+  }
+
+  /** 心跳驱动:倒计时到期且无人决定 → 宿主自动执行接续。 */
+  async tickAutoContinue() {
+    try {
+      const st = this._autoContState || (this._autoContState = {})
+      if (!st.armed || st.executing) return
+      if (Date.now() < st.armed.expiresAt) return
+      diag('auto-continue deadline reached, executing host-side')
+      await this.hostAutoContinue()
+    } catch (e) { diag('tickAutoContinue error: ' + (e && e.message)) }
+  }
+
+  /** 宿主侧执行接续:刷账本(已由水位检查写过)→ 材料 → sessionController.create/selectModel/prompt。 */
+  async hostAutoContinue() {
+    const st = this._autoContState || (this._autoContState = {})
+    if (st.executing) return { ok: false, error: 'already executing' }
+    const armed = st.armed
+    st.armed = null
+    st.executing = true
+    st.error = ''
+    try {
+      const sc = this._sessionController || (() => { try { this._sessionController = this._ctxRef?.get?.('sessionController') || undefined } catch (e) {} return this._sessionController })()
+      if (!sc || typeof sc.create !== 'function') throw new Error('sessionController service unavailable(宿主无法建会话;请重启 dsh web 或保持页面打开)')
+      const d = await this.buildContinueCarry()
+      if (!d || !d.ok) throw new Error((d && d.error) || 'no handoff material')
+      const created = await sc.create({
+        ...(d.workspaceId ? { workspaceId: d.workspaceId } : { cwd: d.ws }),
+        ...(d.agentPreset ? { agentPreset: d.agentPreset } : {}),
+      })
+      const newId = String((created && (created.sessionId || created.id)) || '')
+      if (!newId) throw new Error('create returned no sessionId')
+      if (d.provider && d.model && typeof sc.selectModel === 'function') {
+        try { await sc.selectModel({ sessionId: newId, provider: d.provider, model: d.model, ...(d.reasoningEffort ? { reasoningEffort: d.reasoningEffort } : {}) }) } catch (eM) { diag('host auto-continue selectModel: ' + (eM && eM.message)) }
+      }
+      if (typeof sc.prompt === 'function') {
+        const signal = typeof AbortSignal !== 'undefined' && AbortSignal.timeout ? AbortSignal.timeout(120000) : undefined
+        await sc.prompt({ sessionId: newId, content: [{ type: 'text', text: d.carryText }], mode: 'queue' }, signal)
+      }
+      st.lastRunAt = Date.now()
+      st.lastOk = { sessionId: newId, model: d.model || '', reasoningEffort: d.reasoningEffort || '', workspaceId: d.workspaceId || '' }
+      diag('auto-continue host-executed: new session ' + newId + ' model=' + (d.model || 'default'))
+      return { ok: true, sessionId: newId, model: d.model || '', reasoningEffort: d.reasoningEffort || '' }
+    } catch (e) {
+      st.error = String(e && e.message ? e.message : e)
+      diag('hostAutoContinue error: ' + st.error)
+      return { ok: false, error: st.error }
+    } finally {
+      st.executing = false
+      st.armed = null
+    }
+  }
+
+  /** 浏览器轮询视图:armed 倒计时 / 最近一次执行结果 / 拒绝边界 / 错误。 */
+  autoContinueState() {
+    const st = this._autoContState || (this._autoContState = {})
+    const armed = st.armed ? {
+      edgeAt: st.armed.edgeAt,
+      sessionId: st.armed.sessionId,
+      ratio: st.armed.ratio,
+      tokens: st.armed.tokens,
+      window: st.armed.window,
+      expiresAt: st.armed.expiresAt,
+      leftMs: Math.max(0, st.armed.expiresAt - Date.now()),
+    } : null
+    return {
+      enabled: this.config.autoContinueEnabled !== false && this.config.handoffEnabled !== false,
+      threshold: Number(this.config.autoContinueThreshold) || 0.75,
+      armed,
+      executing: !!st.executing,
+      rejectedEdgeAt: st.rejectedEdgeAt || 0,
+      lastRunAt: st.lastRunAt || 0,
+      lastOk: st.lastOk || null,
+      error: st.error || '',
+    }
+  }
+
+  /** 浏览器决定:agree=立即宿主执行;reject=标记该边界不再触发。 */
+  async decideAutoContinue(action, edgeAt) {
+    const st = this._autoContState || (this._autoContState = {})
+    const armedEdge = st.armed && st.armed.edgeAt
+    if (action === 'reject') {
+      if (armedEdge !== undefined && armedEdge !== null) st.rejectedEdgeAt = armedEdge
+      st.armed = null
+      diag('auto-continue rejected at edge ' + String(armedEdge))
+      return { ok: true, rejected: true }
+    }
+    if (action === 'agree') {
+      if (st.executing) return { ok: false, error: 'already executing' }
+      if (!st.armed) return { ok: false, error: 'no pending auto-continue' }
+      edgeAt = edgeAt || st.armed.edgeAt
+      if (edgeAt !== st.armed.edgeAt) return { ok: false, error: 'stale edge' }
+      return this.hostAutoContinue()
+    }
+    return { ok: false, error: 'unknown action' }
+  }
+
   /** 官方 token-meter 公式(dsh-context 移植版):文本 ≈ ceil(字符/4)+4 角色框定;忠实于 dsh-token-meter/estimate.ts 的文本分支。 */
   estimateSessionTokens(messages) {
     let tokens = 0
@@ -5868,7 +6017,13 @@ export function apply(ctx, config) {
         // 最后活动时间写入该 agent 自己的 runtime(不再落到 currentRuntime()/default)
         try { engine.runtimeFor(agent).lastActiveAt = Date.now() } catch (e) {}
         // M-CM4 水位感知:每轮测量会话消息体量,越阈值→advisory+自动骨架账本(异步,不阻塞收尾)
-        try { void engine.checkWaterLevel(agent) } catch (e) {}
+        try { void engine.checkWaterLevel(agent).then(function () {
+          // M-CM6-C 宿主兜底:轮末测量完成后若达标 → arm 倒计时(浏览器活着时由它展示确认卡;被节流/关闭则宿主到期自执行)
+          try {
+            const rt2 = engine.runtimeFor(agent)
+            engine.armAutoContinue(agent, { ratio: rt2.waterLevel, tokens: rt2.waterLevelTokens, window: rt2.waterLevelWindow, source: rt2.waterLevelSource })
+          } catch (eArm) {}
+        }) } catch (e) {}
         // 全局活动戳同步更新(暂离检测统揽全局,见 tickTime)
         engine._globalLastActiveAt = Date.now()
         try { engine.ingestAgentLifecycle(agent, 'agent/turn-stopping', { turn: payload && payload.turn, payload: { turn: payload && payload.turn } }) } catch (e) {}
@@ -5899,6 +6054,9 @@ export function apply(ctx, config) {
         // M7.5:pre-step 边界先冲刷 CoT 缓冲——保证本轮 context_push 的 window 携带最新思维链
         try { engine.flushReasoningBuffer(rt) } catch (_) {}
         engine.ingestAgentLifecycle(agent, 'agent/pre-step', { turn: payload && payload.turn, step: payload && payload.step, payload: { turn: payload && payload.turn, step: payload && payload.step } })
+        // M-CM6-A·水位 v3(2026-09-08):官方压缩在 pre-step 就动手,交接测量必须站同一条边界
+        // (否则某轮把水位从 <阈值 推到 ≥0.8 时,官方先压缩、白板账本来不及写)。异步不阻塞放行。
+        try { engine.checkWaterLevelAtStep(agent) } catch (eWL) {}
         // M6-3:pre-step 时序(§8)——校验 cursor/index/TTL 后 claim packet,等待渲染面消费
         try { if (engine._activationHost) engine._activationHost.onPreStep(agent) } catch (_) {}
         // 只刷新顶层会话:子代理(自动沉淀/固化的 subagent)session 无 cwd,刷新会把 state 切到错误工作区
@@ -6366,6 +6524,29 @@ export function apply(ctx, config) {
         } catch (e) { return writeJson(res, 500, { error: String(e && e.message ? e.message : e) }) }
       },
     },
+    {
+      kind: 'exact',
+      path: API['auto-continue-state'],
+      handler: async (req, res) => {
+        // M-CM6-C·宿主兜底状态(GET;loopback):浏览器 AutoContinueHost 轮询此端点展示确认卡/倒计时/执行结果。
+        if (!isLoopbackRequest(req)) return writeJson(res, 403, { error: 'forbidden: loopback-only' })
+        try { return writeJson(res, 200, engine.autoContinueState()) } catch (e) { return writeJson(res, 500, { error: String(e && e.message ? e.message : e) }) }
+      },
+    },
+    {
+      kind: 'exact',
+      path: API['auto-continue-decide'],
+      handler: async (req, res) => {
+        // M-CM6-C·宿主兜底决定(POST;loopback):agree=宿主立即执行接续;reject=本边界不再触发。
+        if (!isLoopbackRequest(req)) return writeJson(res, 403, { error: 'forbidden: loopback-only' })
+        if ((req.method || 'POST') !== 'POST') return writeJson(res, 405, { error: 'method not allowed' })
+        try {
+          const body = await readJsonBody(req).catch(() => ({}))
+          const r = await engine.decideAutoContinue(body && body.action, body && body.edgeAt)
+          return writeJson(res, r && r.ok ? 200 : 400, r || { ok: false, error: 'no result' })
+        } catch (e) { return writeJson(res, 500, { error: String(e && e.message ? e.message : e) }) }
+      },
+    },
     {
       kind: 'exact',
       path: API['subagent-gc'],
@@ -7166,7 +7347,7 @@ export function apply(ctx, config) {
     })()
   }, 5 * 60 * 1000)
   // 心跳独立 15 秒一次(对齐 polling-lease 心跳节奏),证明轮询机制活着
-  const heartbeatTimer = setInterval(() => { void writeHeartbeat(); try { engine.tickTime() } catch (e) {}; try { void engine.subagentGcSweep() } catch (e) {} }, 15000)
+  const heartbeatTimer = setInterval(() => { void writeHeartbeat(); try { engine.tickTime() } catch (e) {}; try { void engine.subagentGcSweep() } catch (e) {}; try { void engine.tickAutoContinue() } catch (e) {} }, 15000)
   void writeHeartbeat() // 立即心跳一次:重启后马上可见轮询存活
 
   // ---------- 注册与清理 ----------

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@a9i5k4/dsh-auto-memory",
   "description": "Proactive associative memory for DSH: zero-prompt recall injected before the model speaks, three-layer auto-consolidation, skill crystallization, and Astra-style context management - handoff ledgers, PLAN whiteboard, water-level sensing. Local-first, model-agnostic, zero deps. 主动联想记忆+Astra 式上下文管理:自动唤回/自动沉淀/技能固化/交接账本与白板跨窗口续命/水位感知。",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "type": "module",
   "main": "lib/index.js",
   "exports": {