dsh-session-guard 0.1.5-beta.1 → 0.3.0

package/src/wiring.js

@@ -21,6 +21,7 @@ import { msUntilOffPeak, shouldPause } from './time.js'
  * @param {object} deps.ctx host context
  * @param {()=>object} deps.getSettings 读实时配置
  * @param {{stopNextTurn:Function, resume:Function}} deps.gate 会话门
+ * @param {ReturnType<import('./step-gate.js').createStepGate>} [deps.stepGate] step 级门控（v0.2.0）
  * @param {object} [deps.logger]
  * @param {()=>Date} [deps.clock]
  * @param {typeof setTimeout} [deps.setTimer]
@@ -31,6 +32,7 @@ export function createWiring({
   ctx,
   getSettings,
   gate,
+  stepGate,
   logger,
   clock = () => new Date(),
   setTimer = setTimeout,
@@ -110,16 +112,24 @@ export function createWiring({
 
   /**
    * 高峰期目标从官方变为非官方 → 恢复本插件因入峰而暂停的会话（spec 需求 5）。
-   * 只对 `pausedByPeak` 里的会话生效（不碰用户手动暂停的）；受 `deferredResume` 约束；
+   * v0.2.0：先释放 step 门控（幂等，无门则 no-op）；turn 级只对 `pausedByPeak` 里的
+   * 会话生效（不碰用户手动暂停的）；受 `deferredResume` 约束；
    * 用 queueMicrotask 跳出当前事件派发，避免 resume→followup→事件 的重入。
    */
   function maybeAutoResume(sessionId, rec) {
-    if (!pausedByPeak.has(sessionId)) return
     const cfg = safeCfg()
     if (cfg.providerGuard !== true || cfg.deferredResume === false) return
     if (!shouldPause(cfg, clock()).pause) return
     const cls = directory.classify(rec.provider)
     if (cls.official) return
+    // step 门控：目标转非官方 → 放行被挂起的 step（step gate 自身按目标判定，无需 pausedByPeak）
+    if (stepGate) {
+      const r = stepGate.release(sessionId, 'non-official')
+      if (r && r.released === true) {
+        logger?.info?.(`[session-guard] target switched to non-official "${rec.provider}" (matchedBy=${cls.matchedBy}) — releasing step gate for ${sessionId}`)
+      }
+    }
+    if (!pausedByPeak.has(sessionId)) return
     pausedByPeak.delete(sessionId)
     logger?.info?.(`[session-guard] target switched to non-official "${rec.provider}" (matchedBy=${cls.matchedBy}) — auto-resuming ${sessionId}`)
     queueMicrotask(() => {
@@ -143,6 +153,8 @@ export function createWiring({
     const agents = ctx && ctx.agents
     if (!agents) return { paused: [], skipped: [] }
     const roots = typeof agents.roots === 'function' ? agents.roots() : typeof agents.list === 'function' ? agents.list() : []
+    // Q1-A：step 级门控开启时，入峰不再 turn 级暂停——会话跑到下一个 pre-step 边界自动拉门。
+    const stepLevel = cfg.stepLevelPause === true && !!stepGate
     const paused = []
     const skipped = []
     for (const agent of Array.isArray(roots) ? roots : []) {
@@ -157,6 +169,12 @@ export function createWiring({
         skipped.push({ sessionId: id, why: 'non-official', provider: targets.providerOf(id) })
         continue
       }
+      if (stepLevel) {
+        // 新一轮高峰：清掉上一轮的 bypass，让 step 门重新生效。
+        stepGate.clearBypass(id)
+        paused.push({ sessionId: id, via: 'stepGate', ok: true })
+        continue
+      }
       try {
         const r = await gate.stopNextTurn(id, { mode: cfg.pauseMode, reason: cfg.pauseReason })
         if (!r || r.ok !== false) pausedByPeak.add(id)
@@ -165,7 +183,7 @@ export function createWiring({
         warn(`stopNextTurn failed for ${id}: ${String(e && e.message || e)}`)
       }
     }
-    logger?.info?.(`[session-guard] peak entered — paused ${paused.length} session(s): ${JSON.stringify(paused)}; skipped ${JSON.stringify(skipped)}`)
+    logger?.info?.(`[session-guard] peak entered — ${stepLevel ? 'step-level gate armed for' : 'paused'} ${paused.length} session(s): ${JSON.stringify(paused)}; skipped ${JSON.stringify(skipped)}`)
     return { paused, skipped }
   }
 
@@ -188,12 +206,18 @@ export function createWiring({
     }
   }
 
-  /** 退峰：先放行挂起的请求，再决定 error 模式续跑 / 恢复暂停的会话。 */
+  /** 退峰：先释放 step 门（回合原地续跑），再放行挂起的请求、恢复暂停的会话。 */
   async function onLeavePeak(cfg) {
     if (releaseTimer !== null) {
       clearTimer(releaseTimer)
       releaseTimer = null
     }
+    // 0) step 级门控：先放行被挂起的 step —— 回合本来就还开着，无需 followup。
+    if (stepGate) {
+      const releasedSteps = stepGate.releaseAll('off-peak')
+      stepGate.clearAllBypass()
+      if (releasedSteps.length > 0) logger?.info?.(`[session-guard] peak left — released ${releasedSteps.length} step gate(s): ${JSON.stringify(releasedSteps)}`)
+    }
     // 1) 先取延后记录快照（releaseAll 会清空），再放行全部挂起。
     const deferredSnapshot = deferrals.deferredList()
     const { released } = deferrals.releaseAll('off-peak')
@@ -237,6 +261,19 @@ export function createWiring({
     return guard.install()
   }
 
+  /**
+   * 安装 step 级门控（`agent/pre-step` waterfall，v0.2.0）。
+   * disposer 释放全部挂起门，避免卸载后 Promise 悬挂。
+   */
+  function installStepGuard() {
+    if (!stepGate || !ctx || typeof ctx.on !== 'function') return () => {}
+    const off = ctx.on('agent/pre-step', (payload, next) => stepGate.hold(payload, next))
+    return () => {
+      if (typeof off === 'function') off()
+      stepGate.releaseAll('disposed')
+    }
+  }
+
   /** 插件卸载：清定时器 + 拒绝全部挂起（不泄漏 promise）。 */
   function dispose() {
     if (releaseTimer !== null) {
@@ -244,6 +281,10 @@ export function createWiring({
       releaseTimer = null
     }
     pausedByPeak.clear()
+    if (stepGate) {
+      stepGate.releaseAll('disposed')
+      stepGate.clearAllBypass()
+    }
     deferrals.rejectAll('disposed')
   }
 
@@ -258,6 +299,7 @@ export function createWiring({
     scheduleRelease,
     shouldPauseSession,
     installGuard,
+    installStepGuard,
     dispose,
   }
 }