@modusensus/dsh-mneme 0.8.8 → 0.8.9

package/src/peak-hours.js

@@ -1,117 +1,117 @@
-// 高峰时段（peak hours）解析与判定——纯函数模块，零依赖。
-//
-// 从 summarize.js 抽出（PR #320 review）：#316 之后 summarize.js 反向依赖
-// dream.js（withEffortFallback 复用），dream 镜像错峰时再 import summarize
-// 会成真循环。时段调度本来就不是蒸馏的私有语义，独立成模块后两侧都从这里
-// import，循环消失。re-export 兼容留在 summarize.js，调用方零改动。
-//
-// Issue #239（第 4 项，错峰队列）：高峰时段解析与判定。纯函数、可单测——排程
-// 判断不绑死真实时钟，测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
-// spec 语法：`[<星期> ]<时段>[,<时段>...]`，星期前缀可省（省 = 每天）：
-//   "09:00-18:00"                        每天 09:00-18:00
-//   "mon-fri 08:00-12:00,14:00-18:00"    工作日两段（ISO 1=周一…7=周日，也认 mon..sun）
-//   "sat,sun 23:00-06:00"                周末跨零点段
-// 时间取宿主本地时区。任一写法非法 → 整串视为未配置（返回 null）：排程是省钱手段，
-// 绝不该因为写错格式把蒸馏/巩固停掉。
-const DAY_NAMES = { mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6, sun: 7 };
-
-function parseDayToken(token) {
-  const days = new Set();
-  const normalize = (value) => (/^\d$/.test(value) ? Number(value) : DAY_NAMES[value] ?? null);
-  for (const piece of token.split(",")) {
-    const matched = /^([a-z]{3}|\d)(?:-([a-z]{3}|\d))?$/.exec(piece.trim().toLowerCase());
-    if (!matched) return null;
-    const from = normalize(matched[1]);
-    const to = matched[2] === undefined ? from : normalize(matched[2]);
-    if (from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7) return null;
-    // 支持跨周环绕（fri-mon）：从 from 起逐天推进到 to，最多绕一圈。
-    for (let day = from; ; day = (day % 7) + 1) {
-      days.add(day);
-      if (day === to) break;
-    }
-  }
-  return days.size > 0 ? [...days].sort((a, b) => a - b) : null;
-}
-
-/** JS 的 getDay() 是 0=周日…6=周六；这里统一成 ISO（1=周一…7=周日）。 */
-function isoDay(date) {
-  const day = date.getDay();
-  return day === 0 ? 7 : day;
-}
-
-export function parsePeakSpec(spec) {
-  if (typeof spec !== "string" || spec.trim() === "") return null;
-  let rest = spec.trim();
-  let days = null;
-  // 星期前缀 = 第一个空白之前的部分，但**头段含冒号就不是前缀**（那是时段本身，
-  // 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格）。前缀解析失败一律按未配置处理，
-  // 不做猜测——宁可不省，也不能误停。
-  const sep = rest.search(/\s/);
-  if (sep > 0) {
-    const head = rest.slice(0, sep);
-    if (!head.includes(":")) {
-      days = parseDayToken(head);
-      if (days === null) return null;
-      rest = rest.slice(sep).trim();
-    }
-  }
-  const windows = [];
-  for (const part of rest.split(",")) {
-    const matched = /^\s*(\d{1,2}):(\d{2})\s*-\s*(\d{1,2}):(\d{2})\s*$/.exec(part);
-    if (!matched) return null;
-    const [sh, sm, eh, em] = [Number(matched[1]), Number(matched[2]), Number(matched[3]), Number(matched[4])];
-    if (sh > 23 || eh > 23 || sm > 59 || em > 59) return null;
-    const start = sh * 60 + sm;
-    const end = eh * 60 + em;
-    if (start === end) return null;
-    windows.push({ start, end });
-  }
-  return windows.length > 0 ? { days, windows } : null;
-}
-
-/**
- * 该时刻是否落在高峰内。跨零点段（start > end）按「窗口所属的那一天」认星期：
- * `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口，仍算高峰。
- */
-export function isInPeakWindow(date, spec) {
-  const parsed = parsePeakSpec(spec);
-  if (!parsed) return false;
-  const minutes = date.getHours() * 60 + date.getMinutes();
-  const today = isoDay(date);
-  const yesterday = today === 1 ? 7 : today - 1;
-  const allowed = (day) => !parsed.days || parsed.days.includes(day);
-  return parsed.windows.some(({ start, end }) => {
-    if (start < end) return minutes >= start && minutes < end && allowed(today);
-    return (minutes >= start && allowed(today)) || (minutes < end && allowed(yesterday));
-  });
-}
-
-/**
- * 高峰内则返回「距当前最近的一个高峰结束时刻」（择时补跑用），否则 null。
- * 落在多个时段重叠处时取最早结束的那个——早跑不亏，晚跑才亏。
- */
-export function nextOffPeakAt(date, spec) {
-  const parsed = parsePeakSpec(spec);
-  if (!parsed) return null;
-  const minutes = date.getHours() * 60 + date.getMinutes();
-  const today = isoDay(date);
-  const yesterday = today === 1 ? 7 : today - 1;
-  const allowed = (day) => !parsed.days || parsed.days.includes(day);
-  let bestDelta = null;
-  const consider = (delta) => {
-    if (bestDelta === null || delta < bestDelta) bestDelta = delta;
-  };
-  for (const { start, end } of parsed.windows) {
-    if (start < end) {
-      if (minutes >= start && minutes < end && allowed(today)) consider(end - minutes);
-      continue;
-    }
-    if (minutes >= start && allowed(today)) consider((1440 - minutes) + end);
-    else if (minutes < end && allowed(yesterday)) consider(end - minutes);
-  }
-  if (bestDelta === null) return null;
-  const at = new Date(date.getTime());
-  at.setSeconds(0, 0);
-  at.setMinutes(at.getMinutes() + bestDelta);
-  return at;
-}
+// 高峰时段（peak hours）解析与判定——纯函数模块，零依赖。
+//
+// 从 summarize.js 抽出（PR #320 review）：#316 之后 summarize.js 反向依赖
+// dream.js（withEffortFallback 复用），dream 镜像错峰时再 import summarize
+// 会成真循环。时段调度本来就不是蒸馏的私有语义，独立成模块后两侧都从这里
+// import，循环消失。re-export 兼容留在 summarize.js，调用方零改动。
+//
+// Issue #239（第 4 项，错峰队列）：高峰时段解析与判定。纯函数、可单测——排程
+// 判断不绑死真实时钟，测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
+// spec 语法：`[<星期> ]<时段>[,<时段>...]`，星期前缀可省（省 = 每天）：
+//   "09:00-18:00"                        每天 09:00-18:00
+//   "mon-fri 08:00-12:00,14:00-18:00"    工作日两段（ISO 1=周一…7=周日，也认 mon..sun）
+//   "sat,sun 23:00-06:00"                周末跨零点段
+// 时间取宿主本地时区。任一写法非法 → 整串视为未配置（返回 null）：排程是省钱手段，
+// 绝不该因为写错格式把蒸馏/巩固停掉。
+const DAY_NAMES = { mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6, sun: 7 };
+
+function parseDayToken(token) {
+  const days = new Set();
+  const normalize = (value) => (/^\d$/.test(value) ? Number(value) : DAY_NAMES[value] ?? null);
+  for (const piece of token.split(",")) {
+    const matched = /^([a-z]{3}|\d)(?:-([a-z]{3}|\d))?$/.exec(piece.trim().toLowerCase());
+    if (!matched) return null;
+    const from = normalize(matched[1]);
+    const to = matched[2] === undefined ? from : normalize(matched[2]);
+    if (from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7) return null;
+    // 支持跨周环绕（fri-mon）：从 from 起逐天推进到 to，最多绕一圈。
+    for (let day = from; ; day = (day % 7) + 1) {
+      days.add(day);
+      if (day === to) break;
+    }
+  }
+  return days.size > 0 ? [...days].sort((a, b) => a - b) : null;
+}
+
+/** JS 的 getDay() 是 0=周日…6=周六；这里统一成 ISO（1=周一…7=周日）。 */
+function isoDay(date) {
+  const day = date.getDay();
+  return day === 0 ? 7 : day;
+}
+
+export function parsePeakSpec(spec) {
+  if (typeof spec !== "string" || spec.trim() === "") return null;
+  let rest = spec.trim();
+  let days = null;
+  // 星期前缀 = 第一个空白之前的部分，但**头段含冒号就不是前缀**（那是时段本身，
+  // 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格）。前缀解析失败一律按未配置处理，
+  // 不做猜测——宁可不省，也不能误停。
+  const sep = rest.search(/\s/);
+  if (sep > 0) {
+    const head = rest.slice(0, sep);
+    if (!head.includes(":")) {
+      days = parseDayToken(head);
+      if (days === null) return null;
+      rest = rest.slice(sep).trim();
+    }
+  }
+  const windows = [];
+  for (const part of rest.split(",")) {
+    const matched = /^\s*(\d{1,2}):(\d{2})\s*-\s*(\d{1,2}):(\d{2})\s*$/.exec(part);
+    if (!matched) return null;
+    const [sh, sm, eh, em] = [Number(matched[1]), Number(matched[2]), Number(matched[3]), Number(matched[4])];
+    if (sh > 23 || eh > 23 || sm > 59 || em > 59) return null;
+    const start = sh * 60 + sm;
+    const end = eh * 60 + em;
+    if (start === end) return null;
+    windows.push({ start, end });
+  }
+  return windows.length > 0 ? { days, windows } : null;
+}
+
+/**
+ * 该时刻是否落在高峰内。跨零点段（start > end）按「窗口所属的那一天」认星期：
+ * `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口，仍算高峰。
+ */
+export function isInPeakWindow(date, spec) {
+  const parsed = parsePeakSpec(spec);
+  if (!parsed) return false;
+  const minutes = date.getHours() * 60 + date.getMinutes();
+  const today = isoDay(date);
+  const yesterday = today === 1 ? 7 : today - 1;
+  const allowed = (day) => !parsed.days || parsed.days.includes(day);
+  return parsed.windows.some(({ start, end }) => {
+    if (start < end) return minutes >= start && minutes < end && allowed(today);
+    return (minutes >= start && allowed(today)) || (minutes < end && allowed(yesterday));
+  });
+}
+
+/**
+ * 高峰内则返回「距当前最近的一个高峰结束时刻」（择时补跑用），否则 null。
+ * 落在多个时段重叠处时取最早结束的那个——早跑不亏，晚跑才亏。
+ */
+export function nextOffPeakAt(date, spec) {
+  const parsed = parsePeakSpec(spec);
+  if (!parsed) return null;
+  const minutes = date.getHours() * 60 + date.getMinutes();
+  const today = isoDay(date);
+  const yesterday = today === 1 ? 7 : today - 1;
+  const allowed = (day) => !parsed.days || parsed.days.includes(day);
+  let bestDelta = null;
+  const consider = (delta) => {
+    if (bestDelta === null || delta < bestDelta) bestDelta = delta;
+  };
+  for (const { start, end } of parsed.windows) {
+    if (start < end) {
+      if (minutes >= start && minutes < end && allowed(today)) consider(end - minutes);
+      continue;
+    }
+    if (minutes >= start && allowed(today)) consider((1440 - minutes) + end);
+    else if (minutes < end && allowed(yesterday)) consider(end - minutes);
+  }
+  if (bestDelta === null) return null;
+  const at = new Date(date.getTime());
+  at.setSeconds(0, 0);
+  at.setMinutes(at.getMinutes() + bestDelta);
+  return at;
+}

package/src/summarize.js

@@ -220,7 +220,7 @@ function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, th
   }, undefined);
   return {
     messages: lines.length
-      ? [createUserMessage({ content: [{ type: "text", text: trimTranscript(lines.join("\n"), maxChars) }], source: { kind: "plugin", plugin: "dsh-mneme" } })]
+      ? [createUserMessage({ content: [{ type: "text", text: trimTranscript(lines.join("\n"), maxChars) }], source: { kind: "plugin:dsh-mneme", plugin: "dsh-mneme" } })]
       : [],
     hasEvents: events.length > 0,
     lastSeq
@@ -495,7 +495,7 @@ export function createSummarizer(ctx, service, config, deps = {}) {
         model: route.model,
         purpose: "summarization",
         messages: [
-          { role: "system", content: [{ type: "text", text: config.codingRetrospect ? STR.prompts.codingSummary[langOf(config)] : STR.prompts.summary[langOf(config)] }], source: { kind: "plugin", plugin: "dsh-mneme" } },
+          { role: "system", content: [{ type: "text", text: config.codingRetrospect ? STR.prompts.codingSummary[langOf(config)] : STR.prompts.summary[langOf(config)] }], source: { kind: "plugin:dsh-mneme", plugin: "dsh-mneme" } },
           ...messages
         ],
         signal: controller.signal

package/test/api.test.js

@@ -1427,7 +1427,8 @@ test("POST /api/dsh-mneme/test-model succeeds and reports reply + latency", asyn
   // 0.1.6-alpha.1 起被官方 API 整单拒绝（「messages: at least one message
   // is required」），探测按钮会 502。
   assert.equal(MOCK_LLM.lastOptions.messages[0].role, "user");
-  assert.equal(MOCK_LLM.lastOptions.messages[0].source?.kind, "plugin");
+  // issue #326：kind 必须是生产者自有值，裸 "plugin" 被 DSH 0.1.7 的 V4 写入准入拒绝。
+  assert.equal(MOCK_LLM.lastOptions.messages[0].source?.kind, "plugin:dsh-mneme");
   assert.equal("reasoningEffort" in MOCK_LLM.lastOptions, false, "no effort configured -> field omitted");
 });
 

package/test/client.test.js

@@ -234,9 +234,12 @@ test("entry tracks native class, inherits native sizing, and lifts the toolbar d
 
 // Importance renders as Lucide star glyphs (the morphicons-paired data set;
 // the runtime cannot require the ESM-only morphicons engine, so the path
-// ships inline like the other stroke icons), not raw ★ text. Only the
-// drawer's edit-mode <option> labels keep the text form — SVG cannot render
-// inside <option>.
+// ships inline like the other stroke icons). Raw text stars are fully
+// retired: the drawer's edit-mode <option> select used to keep "★".repeat
+// labels (SVG cannot render inside <option>) — it is now the SVG star
+// button row, and the inline indicators (importance chips / entity meta /
+// inject preview) share the same StarGlyph, so every star in the panel has
+// one shape. (用户反馈：文本 ★ 过尖、与卡片 SVG 星不统一。)
 test("importance renders as star glyphs, not raw text stars", () => {
   assert.ok(
     clientSource.includes("STAR_PATH_D"),
@@ -247,9 +250,9 @@ test("importance renders as star glyphs, not raw text stars", () => {
     "the star-row component must exist"
   );
   assert.equal(
-    (clientSource.match(/"★"\.repeat/g) || []).length,
-    1,
-    "only the drawer edit <option> labels may keep the ★ text form"
+    (clientSource.match(/★/g) || []).length,
+    0,
+    "no raw text star may remain anywhere — every star renders through the shared SVG path"
   );
   assert.ok(
     /h\(ImportanceStars, \{ className: "mneme-dmetaval"/.test(clientSource),
@@ -259,6 +262,14 @@ test("importance renders as star glyphs, not raw text stars", () => {
     /h\(ImportanceStars, \{ value: m\.importance/.test(clientSource),
     "the card foot must render the star row"
   );
+  assert.ok(
+    /className: "mneme-staredit"/.test(clientSource),
+    "the drawer edit importance must be the SVG star button row, not a text-star <select>"
+  );
+  assert.ok(
+    /h\(StarGlyph, \{ size: 11 \}\)/.test(clientSource),
+    "inline star indicators must go through the shared StarGlyph"
+  );
 });
 
 // better-sidebar ecosystem integration is an optional capability (official

package/test/continuity.test.js

@@ -147,7 +147,7 @@ test("#249 N3：pre-step 双落点——压缩边缘落提案并往末尾追加
   assert.equal(decision.messages.length, 1, "压缩边缘 → 追加一条");
   const message = decision.messages[0];
   assert.equal(message.source.plugin, "dsh-mneme");
-  assert.equal(message.source.kind, "plugin", "插件来源会被蒸馏管线跳过，注入物不会变成记忆（也不会自我蒸馏）");
+  assert.equal(message.source.kind, "plugin:dsh-mneme", "插件来源会被蒸馏管线跳过，注入物不会变成记忆（也不会自我蒸馏）；裸 kind: \"plugin\" 被 V4 写入准入拒收（issue #326）");
   assert.ok(message.content[0].text.startsWith(CONTINUITY_NOTICE_PREFIX));
   assert.ok(message.content[0].text.includes("current_work: 把 N3 实现完"));
   const proposal = store.getContinuityProposal("s1", KIND);

package/test/llm-message-source.test.js

@@ -1,5 +1,8 @@
 import test from "node:test";
 import assert from "node:assert/strict";
+import { readdirSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
 import { createStore } from "../src/store.js";
 import { createService } from "../src/service.js";
 import { createDreamScheduler } from "../src/dream.js";
@@ -14,12 +17,15 @@ import { createVectorIndex } from "../src/vector-index.js";
 // 阶段就抛 "Cannot read properties of undefined (reading 'kind')"，四条 LLM 管线
 // （dream / sleep / summarize / entity extraction）全军覆没、耗时 0ms。
 // 这里用同等严格的桩驱动真实管线，任何新加的消息漏了 source 都会失败。
+// issue #326：kind 值必须是生产者自有 kind "plugin:dsh-mneme"——DSH 0.1.7 起的
+// V4 写入准入把裸 "plugin"（含缺失/空串）一并拒绝，注入/蒸馏会整条报
+// "format v4 message requires a producer-owned source kind"。
 function assertMessageSources(options) {
   for (const message of options.messages ?? []) {
     assert.equal(
       message.source?.kind,
-      "plugin",
-      `LLM 消息缺 source（provider 会抛 TypeError）: ${message.role} / ${String(message.content?.[0]?.text ?? "").slice(0, 40)}`
+      "plugin:dsh-mneme",
+      `LLM 消息缺 source 或 kind 不是生产者自有值（V4 会拒收）: ${message.role} / ${String(message.content?.[0]?.text ?? "").slice(0, 40)}`
     );
   }
 }
@@ -175,3 +181,27 @@ test("entity extraction: messages handed to the llm adapter carry source", async
   assert.equal(calls.length, 1, "extraction called the LLM adapter");
   store.close();
 });
+
+// ---------------------------------------------------------------- shape lock
+
+// issue #326 形状锁：任何新增的会话写入点再用裸 kind: "plugin"（V4 写入准入从
+// DSH 0.1.7 起会整条拒绝）都直接红灯。静态 grep 锁而非运行时枚举，是因为写入点
+// 散在 6 个文件 16 处，运行时桩只覆盖 LLM 管线、盖不住 api.js 的连通性探针。
+test("no writer emits the rejected bare kind: \"plugin\" (issue #326)", () => {
+  const srcDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "src");
+  const offenders = [];
+  const walk = (dir) => {
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) walk(full);
+      else if (entry.name.endsWith(".js")) offenders.push(...scanSource(readFileSync(full, "utf8"), full));
+    }
+  };
+  const scanSource = (text, file) =>
+    text.split("\n").reduce(
+      (acc, line, i) => (/kind:\s*["'`]plugin["'`]/.test(line) ? [...acc, `${file}:${i + 1}`] : acc),
+      []
+    );
+  walk(srcDir);
+  assert.deepEqual(offenders, [], `裸 kind: "plugin" 会被 V4 写入准入拒绝，改用生产者自有 kind（如 "plugin:dsh-mneme"）: ${offenders.join(", ")}`);
+});