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