merge(data): 並行鎖／consolidate 保護／情緒校驗／speechLint 誤殺修正

scripts/persona.mjs

@@ -902,6 +902,21 @@ commands.consolidate = ({ flags }) => {
   const today = pl.nowIso().slice(0, 10);
   let existing = {};
   if (fs.existsSync(file)) [existing] = pl.parseFrontMatter(fs.readFileSync(file, "utf8"));
+  // slugify 會把標點吃掉：「我的貓」「我的貓？」「我的貓!!」全都落在 `我的貓.md` 上。
+  // 以前直接覆蓋，只留下舊檔的 first_seen／recall_count，內文靜默被換成別則記憶。
+  // 這裡改成擋下來：不同的 --name 撞到同一個檔就 die，並給一個沒被占用的檔名。
+  const priorTitle = existing.title ?? existing.name ?? null;
+  if (priorTitle !== null && priorTitle !== rawName && !flags.force) {
+    let alt = name;
+    for (let i = 2; i < 100 && fs.existsSync(path.join(pl.longTermDir(slug), `${alt}.md`)); i += 1) {
+      alt = `${name}-${i}`;
+    }
+    die(
+      `\`${file}\` 已經是「${priorTitle}」的長期記憶，但這次的 --name 是「${rawName}」——` +
+        `兩個名字 slugify 之後都是 \`${name}\`，寫下去會把舊的內文換掉。\n` +
+        `　換個名字（例如 \`--name ${alt}\`），或確定要覆蓋同一則就加 --force。`,
+    );
+  }
   let body = str(flags.body);
   if (flags["body-file"]) body = fs.readFileSync(str(flags["body-file"]), "utf8");
   if (!body.trim()) die("需要 `--body` 或 `--body-file`。");
@@ -914,6 +929,8 @@ commands.consolidate = ({ flags }) => {
   const front = [
     "---",
     `name: ${name}`,
+    // 原本的 --name（沒被 slugify 吃掉的那個）。下次撞名時就是靠這行認出「不是同一則」。
+    `title: ${rawName.replace(/[\r\n]+/g, " ").replace(/-{3,}/g, "—").trim().slice(0, 120)}`,
     `type: ${type}`,
     `about: [${csv(flags.about).join(", ") || "user"}]`,
     `topics: [${csv(flags.topics).join(", ")}]`,
@@ -933,10 +950,13 @@ commands.consolidate = ({ flags }) => {
   const total = pl.rebuildIndex(slug);
   const forget = num(flags.forget, null);
   if (forget !== null) {
-    const rows = pl.readJsonl(pl.shortTermPath(slug));
-    const keep = rows.filter((r) => Number(r.salience || 0) >= forget);
-    pl.writeText(pl.shortTermPath(slug), keep.map((r) => JSON.stringify(r)).join("\n") + (keep.length ? "\n" : ""));
-    say(`  短期記憶已淘汰顯著度 < ${forget} 的項目，剩 ${keep.length} 筆。`);
+    // 跟 prune 套同一層保護：承諾、界線與今天的紀錄不能被固化順手洗掉（R4）
+    const cut = pl.forgetShortTerm(slug, forget);
+    say(`  短期記憶已淘汰顯著度 < ${forget} 的項目，剩 ${cut.kept} 筆。`);
+    if (cut.protected) {
+      say(`  其中 ${cut.protected} 筆低於門檻但受保護，沒有刪：` +
+        `顯著度 ≥ ${pl.SHORT_TERM_PROTECT_SALIENCE}、intent=commit，或 ${pl.SHORT_TERM_PROTECT_HOURS} 小時內。`);
+    }
   }
   ok(`長期記憶 \`${name}\` 已寫入（共 ${total} 則），INDEX.md 已重建。`);
   pushWikiLater(slug, session, flags); // 固化＝Wiki 區（低頻設定）該更新了
@@ -962,12 +982,6 @@ commands.emotion = ({ flags }) => {
   const session = requireSession(flags);
   const slug = hostOf(flags, session);
   const [, role] = requireMember(slug, session, Boolean(flags["as-guest"]));
-  let state = pl.decayEmotion(pl.loadEmotion(slug));
-  if (flags.baseline) {
-    for (const [key, value] of Object.entries(parseDeltas(flags.baseline))) {
-      if (key in pl.EMOTIONS) state.baseline[key] = pl.clamp(value);
-    }
-  }
   // 讀對方那句話的情緒訊號（不改狀態，只回報；`--read` 可以單獨拿來測詞表）
   const readText = str(flags.read);
   const read = readText ? pl.readUserEmotion(readText) : null;
@@ -995,26 +1009,44 @@ commands.emotion = ({ flags }) => {
     ]);
     return;
   }
+  if (flags.apply && role === "guest") die("guest（sub agent）不得改寫人格的情緒狀態。");
+  // 親近度會放大或縮小衝擊：同一句話，從枕邊人跟從生人嘴裡出來不一樣
+  const rel = flags.apply ? pl.relationGain(slug, str(flags.from) || null) : null;
+  let deltas = null;
+  let state;
+  if (role === "guest") {
+    // guest 不寫回，所以也不需要鎖
+    state = pl.decayEmotion(pl.loadEmotion(slug));
+  } else {
+    // 讀 → 衰減 → 套用 → 寫回整段在檔案鎖裡：並行的 `--apply` 才不會互相覆蓋
+    state = pl.updateEmotion(slug, (s) => {
+      s = pl.decayEmotion(s);
+      if (flags.baseline) {
+        for (const [key, value] of Object.entries(parseDeltas(flags.baseline))) {
+          if (key in pl.EMOTIONS) s.baseline[key] = pl.clamp(value);
+        }
+      }
+      if (flags.apply) {
+        const raw = parseDeltas(flags.apply);
+        deltas = rel.gain === 1
+          ? raw
+          : Object.fromEntries(Object.entries(raw).map(([k, v]) => [k, Math.round(v * rel.gain * 100) / 100]));
+        s = pl.applyEmotion(s, deltas, str(flags.trigger));
+        if (rel.gain !== 1) {
+          s.last_trigger = s.last_trigger || {};
+          s.last_trigger.relation_gain = { who: rel.name, closeness: rel.closeness, gain: rel.gain };
+        }
+      }
+      return s;
+    });
+  }
   if (flags.apply) {
-    if (role === "guest") die("guest（sub agent）不得改寫人格的情緒狀態。");
-    const raw = parseDeltas(flags.apply);
-    // 親近度會放大或縮小衝擊：同一句話，從枕邊人跟從生人嘴裡出來不一樣
-    const rel = pl.relationGain(slug, str(flags.from) || null);
-    const deltas = rel.gain === 1
-      ? raw
-      : Object.fromEntries(Object.entries(raw).map(([k, v]) => [k, Math.round(v * rel.gain * 100) / 100]));
-    state = pl.applyEmotion(state, deltas, str(flags.trigger));
-    if (rel.gain !== 1) {
-      state.last_trigger = state.last_trigger || {};
-      state.last_trigger.relation_gain = { who: rel.name, closeness: rel.closeness, gain: rel.gain };
-    }
     pl.recordFelt(slug, { mine: state.last_trigger?.deltas || null, note: str(flags.trigger) });
     pl.appendJsonl(pl.journalPath(slug), {
       ts: pl.nowIso(), kind: "emotion", trigger: str(flags.trigger),
       deltas, applied: state.last_trigger?.deltas || {}, levels: state.levels, mood: pl.mood(state),
     });
   }
-  if (role !== "guest") pl.writeJson(pl.emotionPath(slug), state);
   const m = pl.mood(state);
   const row = (key) =>
     `    ${pl.EMOTIONS[key].zh} ${key.padEnd(13)}${String(state.levels[key]).padStart(6)}（基線 ${state.baseline[key]}）`;