@@ -2,6 +2,12 @@ import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22import { clusterMemories , findPotentialConflicts , cosineSimilarity } from "./dream/clustering.js" ;
33import { clusterByTag , intersectEvidence } from "./dream/narratives.js" ;
44import { scopeKeyOf } from "./scope.js" ;
5+ // Issue #239(第 4 项)镜像到巩固:错峰时段解析与「最近的高峰结束时刻」从独立的
6+ // 零依赖模块 peak-hours.js 取(该模块从 summarize.js 抽出,PR #320 review)——
7+ // 不另写一份解析器,两份实现漂移会让「同一个时段串在两处行为不同」,那比没有
8+ // 这个功能更糟。此前直接 import summarize.js,#316 后 summarize 反向依赖 dream
9+ // (withEffortFallback 复用),会成真循环,故抽模块。
10+ import { isInPeakWindow , nextOffPeakAt } from "./peak-hours.js" ;
511import { createHash , randomUUID } from "node:crypto" ;
612import { STR , langOf } from "./lang.js" ;
713export { validateDecisions , applyDecisions , withEffortFallback , describeStreamFailure , resolveDreamEffort , resolveRoute } ;
@@ -750,8 +756,12 @@ export async function maintainIndexAfterDream(decisions, service, semantic) {
750756 if ( embedder . modelHash ) vectorIndex . markModel ?. ( embedder . modelHash , embedder . dimension ) ;
751757}
752758
753- export function createDreamScheduler ( { onRun, thresholdCount = 10 , thresholdChars = 5000 , delayMs = 2000 , minIntervalMs = 0 , logger, semantic = null , lastRunAtSeed = 0 } ) {
759+ export function createDreamScheduler ( { onRun, thresholdCount = 10 , thresholdChars = 5000 , delayMs = 2000 , minIntervalMs = 0 , logger, semantic = null , lastRunAtSeed = 0 , peakHours = "" , peakMaxDeferMinutes = 120 , auditPeakSkip = null , now = ( ) => Date . now ( ) , setTimeoutFn = setTimeout , clearTimeoutFn = clearTimeout } ) {
754760 let pendingTimer = null ;
761+ // Issue #239(第 4 项)镜像到巩固:高峰顺延定时器。与 pendingTimer 分开——两者
762+ // 语义不同(一个是「马上要跑」,一个是「等出高峰再跑」),合成一个变量会让
763+ // maybeSchedule 的守卫在顺延期间把新的写入触发误当成「已有待跑」而吞掉。
764+ let deferTimer = null ;
755765 let running = false ;
756766 let disposed = false ;
757767 let baseline = { count : 0 , chars : 0 } ;
@@ -772,51 +782,103 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
772782 }
773783
774784 function maybeSchedule ( service ) {
775- if ( disposed || running || pendingTimer ) return false ;
785+ if ( disposed || running || pendingTimer || deferTimer ) return false ;
776786 // Issue #89(请求 2):最小触发间隔闸门。
777- if ( minIntervalMs > 0 && Date . now ( ) - lastRunAt < minIntervalMs ) return false ;
787+ if ( minIntervalMs > 0 && now ( ) - lastRunAt < minIntervalMs ) return false ;
778788 const { trigger, count, chars } = shouldTrigger ( service ) ;
779789 if ( ! trigger ) return false ;
780- pendingTimer = setTimeout ( ( ) => {
790+ // Issue #239(第 4 项,错峰队列)镜像到巩固:命中高峰就不调模型。与蒸馏的差别
791+ // 在于巩固是**全局单实例**(蒸馏按会话各挂一个定时器),所以这里只需要一个
792+ // deferTimer,且不需要 deferredRuns 那套按会话去重。
793+ // baseline 刻意不刷新:阈值继续累积,留到非高峰一次性巩固(一次大 run 比多次
794+ // 小 run 省)。审计只登记一行 skip——「为什么不再做梦了」必须对用户可观测。
795+ if ( isInPeakWindow ( new Date ( now ( ) ) , peakHours ) ) {
796+ try {
797+ auditPeakSkip ?. ( { count, chars } ) ;
798+ } catch ( error ) {
799+ // 记账是 best-effort:写审计行失败只 warn,绝不反噬调度本身。
800+ logger ?. warn ?. ( `dsh-mneme dream: peak-hours audit failed: ${ String ( error ) } ` ) ;
801+ }
802+ scheduleDeferredRun ( service ) ;
803+ return false ;
804+ }
805+ pendingTimer = setTimeoutFn ( ( ) => {
781806 pendingTimer = null ;
782- running = true ;
783- lastRunAt = Date . now ( ) ;
784- // Defer the onRun invocation so a synchronous throw cannot escape the
785- // timer callback (which would crash the process) and skip the teardown.
786- // Errors are logged, never swallowed silently. inFlight lets dispose()
787- // await the running consolidation before the caller closes the store.
788- inFlight = Promise . resolve ( )
789- . then ( ( ) => ( onRun ? onRun ( ) : Promise . resolve ( { ok : true , skipped : true } ) ) )
790- . then ( ( result ) => {
791- // Refresh the baseline only for a successful run (design §5.3: an
792- // LLM failure must not move the baseline, so the next write can
793- // immediately re-trigger a retry). A `{ok:false}` result or a throw
794- // keeps the old baseline. A run that reports nothing is treated as
795- // completed without failure (no-op hooks / minimal test doubles).
796- if ( result && result . ok ) {
797- try {
798- baseline = shouldTrigger ( service ) ;
799- } catch ( error ) {
800- // Store closed mid-flight: keep the last known baseline.
801- logger ?. warn ?. ( `dsh-mneme dream: baseline refresh failed: ${ String ( error ) } ` ) ;
802- }
803- }
804- } )
805- . catch ( ( error ) => {
806- logger ?. warn ?. ( `dsh-mneme dream: run failed: ${ error ?. message ?? error } ` ) ;
807- // Failed runs do not refresh the baseline.
808- } )
809- . finally ( ( ) => {
810- running = false ;
811- inFlight = null ;
812- } ) ;
807+ startRun ( service ) ;
813808 } , delayMs ) ;
814809 return true ;
815810 }
816811
812+ /**
813+ * Issue #239:高峰内择时补跑——挂到「距当前最近的一个高峰结束时刻」,被
814+ * peakMaxDeferMinutes 截断时到点照跑(bypassPeak),长高峰不会把巩固饿死。
815+ * 定时器 unref:不阻止宿主退出。重复触发不叠加(deferTimer 已在 maybeSchedule
816+ * 的守卫里,这里再判一次以防从其它路径进来)。
817+ */
818+ function scheduleDeferredRun ( service ) {
819+ if ( disposed || deferTimer ) return ;
820+ const at = nextOffPeakAt ( new Date ( now ( ) ) , peakHours ) ;
821+ if ( ! at ) return ;
822+ const maxDeferMs = ( peakMaxDeferMinutes ?? 0 ) * 60000 ;
823+ let delay = Math . max ( 0 , at . getTime ( ) - now ( ) ) ;
824+ const capped = maxDeferMs > 0 && delay > maxDeferMs ;
825+ if ( capped ) delay = maxDeferMs ;
826+ deferTimer = setTimeoutFn ( ( ) => {
827+ deferTimer = null ;
828+ if ( disposed ) return ;
829+ // 截断放行时仍在高峰:不再重新顺延(否则长高峰里会无限顺延,等于把巩固
830+ // 关掉)。直接开跑,与蒸馏的 bypassPeak 同口径。
831+ if ( ! capped && isInPeakWindow ( new Date ( now ( ) ) , peakHours ) ) {
832+ // 理论上到点已出高峰;时钟跳变/时段串被改小可能落回高峰内,此时再顺延一次。
833+ scheduleDeferredRun ( service ) ;
834+ return ;
835+ }
836+ logger ?. info ?. ( `dsh-mneme dream: peak-hours deferred run firing (capped=${ capped } , delayMs=${ delay } )` ) ;
837+ startRun ( service ) ;
838+ } , delay ) ;
839+ deferTimer . unref ?. ( ) ;
840+ }
841+
842+ /**
843+ * 真正开跑。抽出来是因为两条路径都要用:写入触发的正常路径,与高峰顺延后的
844+ * 补跑路径。onRun 的调用刻意放在 Promise 里——同步抛出的异常若逃出 timer 回调
845+ * 会直接崩掉进程并跳过收尾。inFlight 让 dispose() 能等完这一轮再关库。
846+ */
847+ function startRun ( service ) {
848+ running = true ;
849+ lastRunAt = now ( ) ;
850+ inFlight = Promise . resolve ( )
851+ . then ( ( ) => ( onRun ? onRun ( ) : Promise . resolve ( { ok : true , skipped : true } ) ) )
852+ . then ( ( result ) => {
853+ // Refresh the baseline only for a successful run (design §5.3: an
854+ // LLM failure must not move the baseline, so the next write can
855+ // immediately re-trigger a retry). A `{ok:false}` result or a throw
856+ // keeps the old baseline. A run that reports nothing is treated as
857+ // completed without failure (no-op hooks / minimal test doubles).
858+ if ( result && result . ok ) {
859+ try {
860+ baseline = shouldTrigger ( service ) ;
861+ } catch ( error ) {
862+ // Store closed mid-flight: keep the last known baseline.
863+ logger ?. warn ?. ( `dsh-mneme dream: baseline refresh failed: ${ String ( error ) } ` ) ;
864+ }
865+ }
866+ } )
867+ . catch ( ( error ) => {
868+ logger ?. warn ?. ( `dsh-mneme dream: run failed: ${ error ?. message ?? error } ` ) ;
869+ // Failed runs do not refresh the baseline.
870+ } )
871+ . finally ( ( ) => {
872+ running = false ;
873+ inFlight = null ;
874+ } ) ;
875+ }
876+
817877 async function dispose ( ) {
818878 disposed = true ;
819- if ( pendingTimer ) { clearTimeout ( pendingTimer ) ; pendingTimer = null ; }
879+ if ( pendingTimer ) { clearTimeoutFn ( pendingTimer ) ; pendingTimer = null ; }
880+ // Issue #239:高峰顺延定时器同样要清,否则进程关闭后仍会触发一次巩固。
881+ if ( deferTimer ) { clearTimeoutFn ( deferTimer ) ; deferTimer = null ; }
820882 // An in-flight run is left to complete naturally (its LLM calls are
821883 // already paid for and aborting would discard the work). Await it so the
822884 // caller can close the store only after every write has landed.
0 commit comments