Skip to content

Commit 1a43637

Browse files
authored
Merge branch 'main' into feat/issue-templates
2 parents 12cdff0 + 3350664 commit 1a43637

17 files changed

Lines changed: 774 additions & 302 deletions

‎dsh-mneme/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,8 @@ dsh web
347347
| `dreamSummaryProvider` / `dreamSummaryModel` | 空 | 总览(dream_summarize)专用模型路由(留空 = 沿用 `dreamProvider`/`dreamModel`)。consolidate 有窗口(`dreamMaxSnapshotSize`)而总览输入随库增长,ctx 需求差数倍——用小 ctx 模型跑巩固时把总览指到大 ctx 模型(issue #258) |
348348
| `dreamSummaryMaxInputs` | `0` | 总览输入条数硬上限(0 = 不设上限):超过时按 `updated_at` 倒序只保留最新 N 条进总览,防小 ctx 模型被全库输入撑爆;总览口径脚注的条数随实际输入变化 |
349349
| `dreamMinIntervalMinutes` | `0` | autoDream 最小触发间隔(0-10080,0=不限):失败/degraded run 也占用 |
350+
| `dreamPeakHours` | 空 | 巩固侧高峰时段(本地时间,与 `summarizePeakHours` **同一份语法**):空=关;命中时不调模型、baseline 不刷新(阈值继续累积,留到非高峰一次性巩固)、登记 `skipped`/`peak-hours` 审计并顺延到最近的高峰结束时刻。适合「白天要留算力给交互、巩固挪到夜里」的场景(#239 第 4 项镜像到巩固) |
351+
| `dreamPeakMaxDeferMinutes` | `120` | 巩固侧高峰顺延上限(0-1440 分钟,0=不设上限):到点仍处高峰就照常跑,避免长高峰把巩固饿死(#239) |
350352
| `dreamNarrativeEnabled` | `false` | 叙述条总开关(#164 对齐,v0.8.4):按共享 tag 主题簇合成叙述 + evidence 证据链,注入候选排除(按需检索,常驻位只留 dream 总览);也走 feature_flags 白名单,lightMode 强制关 |
351353
| `dreamNarrativeMinCluster` | `3` | 主题簇合成叙述的最小成员数(2-20,v0.8.4) |
352354
| `apiToken` | 空 | 可选 API 鉴权 token;设置后写操作与密钥接口要求 `Authorization: Bearer <apiToken>` |

‎dsh-mneme/lib/client.js‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,10 @@ window.__ModuleLoader__.load({
465465
"memory.features.dreamProvider": "巩固模型 Provider",
466466
"memory.features.dreamModel": "巩固用模型名",
467467
"memory.features.dreamModelHint": "留空 = 跟随主对话模型;只影响记忆巩固(autoDream)用的模型",
468+
"memory.features.dreamPeakHours": "高峰时段(不做梦)",
469+
"memory.features.dreamPeakHours.hint": "空 = 关闭。逗号分隔、可带星期前缀、支持跨零点,如 09:00-18:00 或 mon-fri 08:00-12:00,14:00-18:00。命中时段不调模型,顺延到最近的高峰结束时刻补跑(最多顺延 dreamPeakMaxDeferMinutes 分钟,避免长高峰把巩固饿死)",
470+
"memory.features.summarizePeakHours": "高峰时段(不蒸馏)",
471+
"memory.features.summarizePeakHours.hint": "空 = 关闭。与上方巩固侧同一份时段语法;命中时蒸馏顺延到非高峰、窗口累积后一次蒸",
468472
"memory.features.sleepProvider": "睡眠 Provider",
469473
"memory.features.sleepModel": "睡眠模型",
470474
"memory.features.sleepModelHint": "留空 = 用巩固模型或当前模型;建议选非思考模型",
@@ -862,6 +866,10 @@ window.__ModuleLoader__.load({
862866
"memory.features.dreamProvider": "Consolidation provider",
863867
"memory.features.dreamModel": "Consolidation model",
864868
"memory.features.dreamModelHint": "Leave empty to follow the main conversation model; only affects autoDream consolidation",
869+
"memory.features.dreamPeakHours": "Peak hours (no dreaming)",
870+
"memory.features.dreamPeakHours.hint": "Empty = off. Comma-separated windows, optional weekday prefix, midnight-crossing allowed — e.g. 09:00-18:00 or mon-fri 08:00-12:00,14:00-18:00. Inside these windows no LLM call is made; the run is deferred to the nearest peak-end (capped by dreamPeakMaxDeferMinutes so an all-day peak cannot starve consolidation)",
871+
"memory.features.summarizePeakHours": "Peak hours (no distillation)",
872+
"memory.features.summarizePeakHours.hint": "Empty = off. Same window syntax as the consolidation side above; inside a peak, distillation is deferred and the window accumulates for one bigger run",
865873
"memory.features.sleepProvider": "Sleep provider",
866874
"memory.features.sleepModel": "Sleep model",
867875
"memory.features.sleepModelHint": "Leave empty to reuse the consolidation model; a non-reasoning model is recommended",
@@ -1960,7 +1968,10 @@ window.__ModuleLoader__.load({
19601968
const FEATURE_ADVANCED_BOOLS = ["hybridInject", "selectiveInjectEnabled", "adaptiveThresholdEnabled", "reflectionUpdateEnabled", "reflectionFailureTracking", "conflictFreezeEnabled", "trustEpistemicWeighting"];
19611969
// 字符串键(blur/Enter 提交,空串合法 = 跟随默认):巩固模型与语义
19621970
// 检索路线。embedProvider 是枚举,用下拉单独渲染。
1963-
const FEATURE_STRINGS = ["dreamProvider", "dreamModel", "sleepProvider", "sleepModel", "entityExtractionProvider", "entityExtractionModel", "localEmbedModel", "ollamaBaseUrl", "ollamaModel"];
1971+
const FEATURE_STRINGS = ["dreamProvider", "dreamModel", "sleepProvider", "sleepModel", "entityExtractionProvider", "entityExtractionModel", "localEmbedModel", "ollamaBaseUrl", "ollamaModel",
1972+
// Issue #239 第 4 项:错峰时段串(巩固侧与蒸馏侧)。此前只有后端白名单、
1973+
// 面板调不到——两个错峰键一个能调一个不能比都不给更让人困惑。
1974+
"dreamPeakHours", "summarizePeakHours"];
19641975
const EMBED_PROVIDERS = ["openai", "local", "ollama"];
19651976
// 实体抽取思考强度(issue #109):与后端 FEATURE_FLAG_ENUMS 枚举对齐。
19661977
const ENTITY_REASONING = ["none", "low", "medium", "high"];
@@ -2222,7 +2233,11 @@ window.__ModuleLoader__.load({
22222233
Array.isArray(routes)
22232234
? routeSelects("dreamProvider", "dreamModel", dreamTest, setDreamTest, "dreamReasoningEffort")
22242235
: h(react.Fragment, null, strRow("dreamProvider"), strRow("dreamModel")),
2225-
h("div", { className: "mneme-featsubhint" }, t("memory.features.dreamModelHint"))
2236+
h("div", { className: "mneme-featsubhint" }, t("memory.features.dreamModelHint")),
2237+
// Issue #239 第 4 项镜像到巩固:高峰时段串(空 = 关闭)。放在 autoDream
2238+
// 子块内——它是巩固的排程,开关关掉时不该还在界面上留着可编辑的输入框。
2239+
strRow("dreamPeakHours"),
2240+
h("div", { className: "mneme-featsubhint" }, t("memory.features.dreamPeakHours.hint"))
22262241
);
22272242

22282243
// 睡眠模型:sleepModeEnabled 开着才展开(sleepProvider/sleepModel 随本版
@@ -2266,7 +2281,11 @@ window.__ModuleLoader__.load({
22662281
},
22672282
SUMMARIZE_REASONING.map((r) => h("option", { key: r, value: r }, t(`memory.features.summarizeReasoningEffort.${r}`))))
22682283
),
2269-
h("div", { className: "mneme-featsubhint" }, t("memory.features.summarizeReasoningEffort.hint"))
2284+
h("div", { className: "mneme-featsubhint" }, t("memory.features.summarizeReasoningEffort.hint")),
2285+
// Issue #239 第 4 项:蒸馏侧错峰时段串(空 = 关闭)。与思考强度同处一个
2286+
// autoSummarize 子块——两处错峰开关都能在面板上调(巩固侧见 dreamSub)。
2287+
strRow("summarizePeakHours"),
2288+
h("div", { className: "mneme-featsubhint" }, t("memory.features.summarizePeakHours.hint"))
22702289
);
22712290

22722291
if (error && !state) return h("section", { className: "mneme-set-card" },

‎dsh-mneme/lib/config.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,22 @@ export const Config = z.object({
145145
// 起算,失败/degraded 的 run 也占用间隔;间隔内的触发请求静默跳过,下一次
146146
// 写入事件会重新评估。
147147
dreamMinIntervalMinutes: z.natural().min(0).max(10080).default(0),
148+
// Issue #239(第 4 项,错峰队列)镜像到巩固:高峰期不做梦。与
149+
// summarizePeakHours 同一份时段语法(复用 src/summarize.js 的 parsePeakSpec /
150+
// isInPeakWindow / nextOffPeakAt,不另写解析器):逗号分隔、可带星期前缀、支持
151+
// 跨零点。空串 = 关闭,行为与现状逐字节一致。
152+
// "09:00-18:00" 每天 09:00-18:00
153+
// "mon-fri 08:00-12:00,14:00-18:00" 工作日两段(按高峰计费的供应商即此形态)
154+
// 为什么巩固比蒸馏更该有这道闸:单次巩固的输入是整窗快照(dreamMaxSnapshotSize
155+
// 条),实测一次 run 的 LLM 时长可达数分钟量级,撞上高峰时既贵又慢;而它由写入
156+
// 事件触发、没有天然的「等到空闲再跑」路径。命中高峰时:不调 LLM、不刷新
157+
// baseline(阈值继续累积,留到非高峰一次性巩固),登记一行 status='skipped' /
158+
// error_message='peak-hours' 审计,并按下面的上限择时补跑。任一写法非法则整串
159+
// 按「未配置」处理——排程是省钱手段,绝不该因为写错格式把巩固停掉。
160+
dreamPeakHours: z.string().default(""),
161+
// 高峰顺延上限(分钟,0 = 不设上限):到点仍处高峰就照常跑,避免整天高峰把巩固
162+
// 饿死。默认 120,与 summarizePeakMaxDeferMinutes 对齐。仅在时段串非空时生效。
163+
dreamPeakMaxDeferMinutes: z.natural().min(0).max(1440).default(120),
148164
// 巩固模型路由(settings panel「巩固模型」/ dreamProvider+dreamModel):
149165
// dream 的记忆沉淀专用 LLM 路由,显式配置优先于 agent 默认模型(config-first,
150166
// Issue #25)。模型分类声明:

‎dsh-mneme/lib/dream.js‎

Lines changed: 98 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22
import { clusterMemories, findPotentialConflicts, cosineSimilarity } from "./dream/clustering.js";
33
import { clusterByTag, intersectEvidence } from "./dream/narratives.js";
44
import { 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";
511
import { createHash, randomUUID } from "node:crypto";
612
import { STR, langOf } from "./lang.js";
713
export { 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.

‎dsh-mneme/lib/index.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,32 @@ export const apply = (ctx, config) => {
494494
logger: ctx.logger,
495495
semantic: { embedder, vectorIndex },
496496
lastRunAtSeed: store.lastDreamRunAt("auto"),
497+
// Issue #239(第 4 项)镜像到巩固:高峰期不做梦,顺延到最近的高峰结束时刻。
498+
peakHours: cfg.dreamPeakHours ?? "",
499+
peakMaxDeferMinutes: cfg.dreamPeakMaxDeferMinutes ?? 120,
500+
// 跳过时的审计行在这里落地(调度器只拿到 service,拿不到 config 的
501+
// llmAudit 开关与巩固模型路由)。口径与 runAuditedLlm 一致:审计关掉就
502+
// 不写;写失败只 warn,绝不反噬调度(CONTRIBUTING 的 fail-safe 硬约定)。
503+
auditPeakSkip: ({ count, chars }) => {
504+
if (cfg?.llmAudit?.enabled === false || typeof service?.saveLlmAudit !== "function") return;
505+
const modelId = cfg.dreamProvider && cfg.dreamModel ? `${cfg.dreamProvider}:${cfg.dreamModel}` : "";
506+
service.saveLlmAudit({
507+
timestamp: new Date().toISOString(),
508+
trigger_source: "autoDream",
509+
operation_type: "dream_consolidate",
510+
model_id: modelId,
511+
input_tokens: 0,
512+
output_tokens: 0,
513+
total_tokens: 0,
514+
cost_usd: 0,
515+
duration_ms: 0,
516+
status: "skipped",
517+
error_message: "peak-hours",
518+
related_memory_ids: [],
519+
// 观测用:跳过时窗口里积了多少(阈值继续累积,不是丢弃)。
520+
metadata: JSON.stringify({ count, chars })
521+
});
522+
},
497523
onRun: () => (dream ? dream.runDream(ctx, service, cfg) : Promise.resolve({ ok: true, skipped: true }))
498524
});
499525
service.setDreamHook(() => dream.maybeSchedule(service));

0 commit comments

Comments
 (0)