luckytri 1.0.8 → 1.0.9

package/server/core/reply-delivery.js

@@ -9,10 +9,25 @@ import {
 } from "./response-validator.js";
 import { deliver, sleep } from "./message-scheduler.js";
 import { leaks } from "../mind/guard.js";
-import { conversationGrounding } from "./conversation-grounding.js";
+import { interestTerms } from "../mind/attention.js";
+import {
+  bubblePreference,
+  conversationGrounding,
+} from "./conversation-grounding.js";
 import { initiativeAudience } from "../mind/conversation-origin.js";
-import { readerQuestions, READER_CHECK, INTENT_CHECK } from "./reader-check.js";
+import {
+  readerQuestions,
+  readerCheckPrompt,
+  INTENT_CHECK,
+} from "./reader-check.js";
 import { currentExchange } from "./dialogue-context.js";
+import {
+  claimsLivedAction,
+  EXPRESSION_GROUNDING,
+} from "../mind/expression-grounding.js";
+
+const replyFormatFeedback =
+  /(?:看着|看起来|读起来).{0,8}(?:累|太长|太多)|(?:你|你们).{0,12}(?:可以|能不能|别|不要).{0,12}(?:一段|一条|一句|合在一起|拆|少发|少说)|(?:一小节|一段|一条|一句).{0,12}(?:发|说|回|拆|累)|(?:太抽象|太人机|太机械|复读|看不懂|说人话|别拆|不要拆)/;
 function isFormatError(error) {
   return (
     error instanceof SyntaxError ||
@@ -22,6 +37,48 @@ function isFormatError(error) {
   );
 }
 
+export function filterTranscriptContradictedIssues(issues, snapshot) {
+  const messages = (snapshot.messages || []).filter(
+    (message) => message.role === "user",
+  );
+  const transcriptTerms = interestTerms(
+    messages.map((message) => message.text),
+  );
+  const absentEvidence =
+    /(?:当前|现有|此前|前文|对话|上下文|原话|原文|消息|记录).{0,20}(?:没有|未|并没有|不在)|(?:没有|并没有|未|无人).{0,24}(?:这句话|这句|提到|说过|出现|提供|给出|片段|原文|上下文|记录)/u;
+  const quotedPhrases = (issue) => {
+    const phrases = [];
+    for (const [open, close] of [
+      ["“", "”"],
+      ["‘", "’"],
+      ["「", "」"],
+      ["『", "』"],
+      ['"', '"'],
+    ]) {
+      let from = 0;
+      while (from < issue.length) {
+        const start = issue.indexOf(open, from);
+        if (start < 0) break;
+        const end = issue.indexOf(close, start + open.length);
+        if (end < 0) break;
+        const phrase = issue.slice(start + open.length, end).trim();
+        if (phrase.length >= 3) phrases.push(phrase);
+        from = start + open.length;
+      }
+    }
+    return phrases;
+  };
+  return (issues || []).filter((issue) => {
+    if (!absentEvidence.test(issue)) return true;
+    return !quotedPhrases(issue).some((phrase) => {
+      if (messages.some((message) => (message.text || "").includes(phrase)))
+        return true;
+      const terms = interestTerms([phrase]);
+      return [...terms].filter((term) => transcriptTerms.has(term)).length >= 2;
+    });
+  });
+}
+
 // Owns this part of the lifecycle; the facade keeps the shared runtime state.
 export class ReplyDelivery {
   constructor(owner) {
@@ -55,7 +112,10 @@ export class ReplyDelivery {
         (m) =>
           c.privateChat ||
           targetUsers.has(m.userId) ||
-          (m.replyId && snapshot.batch.some((b) => b.platformId === m.replyId)),
+          m.relation === "direct" ||
+          (m.replyId &&
+            snapshot.batch.some((b) => b.platformId === m.replyId)) ||
+          replyFormatFeedback.test(m.text || ""),
       );
     const audienceCurrent = () =>
       !snapshot.initiative ||
@@ -135,7 +195,15 @@ export class ReplyDelivery {
           issues,
           { plain },
         );
-        return normalizeResponse(raw, turn, fallbackText);
+        return normalizeResponse(
+          raw,
+          {
+            ...turn,
+            maxBubbles:
+              bubblePreference(snapshot) === "single" ? 1 : turn.maxBubbles,
+          },
+          fallbackText,
+        );
       } catch (error) {
         if (!isFormatError(error)) throw error;
         if (snapshot.initiative) throw error;
@@ -183,7 +251,22 @@ export class ReplyDelivery {
       );
     const needsDeepCheck = (response) =>
       readerQuestions(snapshot, turn).length > 0 ||
+      (turn.contribution?.kind === "question" &&
+        snapshot.messages
+          .filter((m) => m.role === "assistant")
+          .slice(-3)
+          .some((m) => /[?？]/.test(m.text || ""))) ||
       currentExchange(snapshot).thirdPartyClaims.length > 0 ||
+      response.bubbles.some((line) =>
+        /你(?:的|在|给|付|掏).{0,12}(?:账单|费用|钱|token)|(?:烧|花|扣|付).{0,6}你.{0,6}(?:钱|token)|账单.{0,8}你/i.test(
+          line,
+        ),
+      ) ||
+      response.bubbles.some((line) =>
+        /我.{0,20}(?:只(?:能|有)|才(?:能|有)).{0,15}(?:回|输入|消息|开口)|(?:没人|没有人).{0,12}(?:递话|说话|叫我).{0,12}(?:我.{0,5})?(?:不会|不|才)/.test(
+          line,
+        ),
+      ) ||
       response.bubbles.some((line) =>
         /(?:我|刚才|刚刚|刚还|今天|昨天|之前).{0,25}(?:读过|读了|读完|翻开|在翻|写完|完成了|看完了)/.test(
           line,
@@ -250,6 +333,35 @@ export class ReplyDelivery {
               snapshot.batch.some((m) => m.relation === "unresolved")))));
     const deepCheck = async (response) => {
       try {
+        // An old expression can already contain a fictional action. Check
+        // the actual words again against activity records, without giving
+        // that draft or its own earlier explanations the role of evidence.
+        if (
+          snapshot.initiative &&
+          claimsLivedAction(response.bubbles.join("\n")) &&
+          !(
+            trace.experienceReview?.ok === true &&
+            trace.experienceReview.words.join("\n") ===
+              response.bubbles.join("\n")
+          )
+        ) {
+          const lived = await models.call(
+            model,
+            "validation",
+            EXPRESSION_GROUNDING,
+            {
+              candidate: { words: response.bubbles },
+              currentLife: snapshot.inner?.currentLife || {},
+              notes: [],
+              self: [],
+            },
+            trace,
+          );
+          if (lived.ok !== true)
+            return [
+              `主动消息声称的新行动尚无实际活动记录支持：${lived.reason || "没有核实该行动"}`,
+            ];
+        }
         const checked = await models.call(
           model,
           "validation",
@@ -263,7 +375,7 @@ export class ReplyDelivery {
             },
             response,
             experienceEvidence:
-              "自己的旧回复可能误报经历，不单独证明实际读过、做完或正在做。声称具体活动须核对currentLife的真实作品、阅读与动作证据；待办和愿望不能证明执行。自己此刻的想法与感受不需要外部动作证明。普通问候不用补答已经换了话题的旧任务。",
+              "自己的旧回复与expression草稿都可能误报经历，不单独证明实际读过、做完或正在做。sourceMaterial里的earlier_thought只证明当时想过。声称具体活动须核对currentLife的真实作品、阅读与动作证据；待办和愿望不能证明执行。自己此刻的想法与感受不需要外部动作证明。普通问候不用补答已经换了话题的旧任务。",
             replyFocus: replyFocus(snapshot, turn),
             thirdPartyClaims: currentExchange(snapshot).thirdPartyClaims,
             imageEvidence: c.generationImages.length
@@ -320,9 +432,10 @@ export class ReplyDelivery {
           const reader = await models.call(
             model,
             "validation",
-            READER_CHECK,
+            readerCheckPrompt(turn),
             {
               questions: readerQuestions(snapshot, turn),
+              choice: turn.choice,
               reply: response.bubbles,
             },
             trace,
@@ -332,10 +445,14 @@ export class ReplyDelivery {
               (issue) => `给提问者的解释仍没说清：${issue}`,
             );
         }
-        return checked.ok
+        const issues = filterTranscriptContradictedIssues(
+          checked.issues,
+          snapshot,
+        );
+        return checked.ok || (checked.issues.length > 0 && !issues.length)
           ? []
-          : checked.issues.length
-            ? checked.issues
+          : issues.length
+            ? issues
             : ["与天性或语境不一致"];
       } catch (error) {
         trace.steps.push(
@@ -359,16 +476,18 @@ export class ReplyDelivery {
       if (outdated()) return staleExit();
       issues = await deepCheck(response);
     }
-    const rewriteLimit = snapshot.initiative || c.pressure >= 0.85 ? 1 : 2;
+    const rewriteLimit = c.pressure >= 0.85 ? 1 : 2;
+    const repairConstraints = new Set();
     for (let attempt = 0; issues.length && attempt < rewriteLimit; attempt++) {
       (trace.revisions ||= []).push({
         draft: response.bubbles,
         issues: [...issues],
       });
       trace.validation = issues;
+      for (const issue of issues) repairConstraints.add(issue);
       if (outdated()) return staleExit();
       response = await makeResponse(
-        issues,
+        [...repairConstraints],
         response,
         !snapshot.initiative && attempt === rewriteLimit - 1,
       );
@@ -378,6 +497,28 @@ export class ReplyDelivery {
         issues = await deepCheck(response);
       }
     }
+    // Deleting an unnecessary final bubble can retain a valid answer. It
+    // never bypasses factual, privacy or comprehension checks, and crisis
+    // responses keep their complete support rather than being shortened.
+    if (issues.length && response.bubbles.length > 1 && !turn.crisis?.clear) {
+      for (let count = response.bubbles.length - 1; count > 0; count--) {
+        const prefix = {
+          ...response,
+          bubbles: response.bubbles.slice(0, count),
+        };
+        const remaining = check(prefix);
+        if (remaining.length) continue;
+        if (outdated()) return staleExit();
+        const reviewed = needsDeepCheck(prefix) ? await deepCheck(prefix) : [];
+        if (reviewed.length) continue;
+        response = prefix;
+        issues = [];
+        trace.steps.push(
+          "删去未通过检查的多余末尾气泡，保留已通过全部校验的原答复",
+        );
+        break;
+      }
+    }
     // Removing a rejected suffix is a mechanical repair with no new factual
     // claims. Preserve the answer, then run every check again.
     if (issues.some((issue) => issue.startsWith("不要把hh反复当句尾装饰"))) {

package/server/core/repository.js

@@ -30,6 +30,39 @@ export function migrateCore(store) {
     CREATE TABLE IF NOT EXISTS core_context_summaries (id TEXT PRIMARY KEY, session_id TEXT NOT NULL, level INTEGER NOT NULL, first_seq INTEGER NOT NULL, last_seq INTEGER NOT NULL, first_time INTEGER, last_time INTEGER, created INTEGER NOT NULL, data TEXT NOT NULL);
     CREATE INDEX IF NOT EXISTS core_context_summaries_session ON core_context_summaries(session_id,first_seq);
   `);
+  const savedModelsRow = db
+    .prepare("SELECT value FROM core_config WHERE id=?")
+    .get("models");
+  if (savedModelsRow) {
+    let savedModels;
+    try {
+      savedModels = JSON.parse(savedModelsRow.value);
+    } catch {
+      savedModels = null;
+    }
+    if (Array.isArray(savedModels)) {
+      const unavailablePresetIds = new Set([
+        "opencode-zen-space-bunny-free",
+        "opencode-zen-step-5-preview-free",
+      ]);
+      const unavailableZenModels = new Set([
+        "space-bunny-free",
+        "step-5-preview-free",
+      ]);
+      const availableModels = savedModels.filter(
+        (model) =>
+          !(
+            unavailablePresetIds.has(model?.id) ||
+            (model?.provider === "opencode-zen" &&
+              unavailableZenModels.has(model?.model))
+          ),
+      );
+      if (availableModels.length !== savedModels.length)
+        db.prepare(
+          "UPDATE core_config SET value=?,version=version+1 WHERE id=?",
+        ).run(JSON.stringify(availableModels), "models");
+    }
+  }
   // A saved persona or prompt may intentionally use an older name. Leave it
   // intact; fresh workspaces receive the LuckyTri defaults from the store.
   if (!db.prepare("SELECT id FROM core_config WHERE id='migration-v1'").get()) {

package/server/core/response-generator.js

@@ -2,6 +2,7 @@ import { replyFocus } from "./conversation-cues.js";
 import { wordingNotes } from "./turn.js";
 import { initiativeContext } from "./initiative-context.js";
 import { currentExchange, dialogueContext } from "./dialogue-context.js";
+import { bubblePreference } from "./conversation-grounding.js";
 
 // Puts an already chosen answer into words again: used when the turn came
 // back without words or the first draft failed a check.
@@ -76,14 +77,22 @@ export async function generate(
       issues,
       ...(explain
         ? {
-            explanationTask:
-              "重新读current和相关原话，依据确实提供的记录，用最直接的一两句回答当前问题或表达自己的具体反应。不维护旧解释，不加入无关旧事，不把修正写成认错流程或‘没理清’的状态报告；确实缺事实时说清缺的是哪部分。解释故事不把作者本人当小说人物。",
+            explanationTask: ["feeling", "greeting"].includes(
+              decision.understanding?.kind,
+            )
+              ? "重新读current。这轮是在表达感受或亲近，用自己此刻真实想说的一两句回应这个人；不分析他的措辞，不宣布接收了什么，不催他交代旧进度，也不用新的问题填空。可以轻松，也可以保留自己的态度，不要求迎合或表演亲密。"
+              : decision.understanding?.kind === "proposal"
+                ? "重新读current的新提议。表达自己的真实兴趣、顾虑或一个具体点子；没有说要改编旧作，就不要替对方定成改编或维护旧稿排期。愿不愿意由自己选择，不需要承诺交付或让对方先定方案。"
+                : "重新读current和相关原话，依据确实提供的记录，用最直接的一两句回答当前问题或表达自己的具体反应。不维护旧解释，不加入无关旧事，不把修正写成认错流程或‘没理清’的状态报告；确实缺事实时说清缺的是哪部分。解释故事不把作者本人当小说人物。",
           }
         : {}),
       imageGuide,
       replyFocus: replyFocus(snapshot, decision),
       guidance: wordingNotes(decision, snapshot),
-      maxBubbles: decision.maxBubbles ?? 2,
+      maxBubbles:
+        bubblePreference(snapshot) === "single"
+          ? 1
+          : (decision.maxBubbles ?? 3),
       ...(!snapshot.initiative ? { exchange: currentExchange(snapshot) } : {}),
     },
     trace,

package/server/core/response-validator.js

@@ -13,6 +13,7 @@ import {
   recentOwnMessages,
   routineSocialReply,
 } from "./conversation-grounding.js";
+import { joinBubbleParts } from "./turn.js";
 const norm = (s) => s.toLowerCase().replace(/[\s\p{P}\p{S}]/gu, "");
 export function wrongIdentityClaim(text, snapshot) {
   const name = snapshot.persona?.name;
@@ -118,7 +119,17 @@ export function attributesOwnWordsToThem(text, snapshot) {
 // The reviewer judges one reply; it needs the turn and its recent lead-in,
 // not the summaries, recall or the rest of the transcript.
 export function reviewContext(snapshot, decision = {}, response = {}) {
-  if (snapshot.initiative) return initiativeContext(snapshot);
+  if (snapshot.initiative) {
+    const { self: _self, inner, ...context } = initiativeContext(snapshot);
+    // Wishes, moods and impressions explain why she wants to make contact;
+    // they cannot establish what this recipient actually said or did.
+    return {
+      ...context,
+      relationships: inner?.relationships,
+      continuity: inner?.continuity,
+      currentLife: inner?.currentLife,
+    };
+  }
   const {
     persona: _persona,
     sourceRows: _sourceRows,
@@ -187,8 +198,12 @@ export function normalizeResponse(result, decision, fallback = "嗯") {
   bubbles = bubbles
     .filter((x) => typeof x === "string")
     .map((x) => x.trim())
-    .filter(Boolean)
-    .slice(0, maxBubbles);
+    .filter(Boolean);
+  if (bubbles.length > maxBubbles)
+    bubbles =
+      maxBubbles === 1
+        ? [joinBubbleParts(bubbles)]
+        : bubbles.slice(0, maxBubbles);
   if (!bubbles.length) bubbles = [fallback];
   return {
     ...(result && typeof result === "object" ? result : {}),

package/server/core/turn-processor.js

@@ -1,6 +1,7 @@
 import { parseSessionKey } from "../channels/session-key.js";
 import { initiativeContext, initiativeSnapshot } from "./initiative-context.js";
 import { withFallback } from "./model-manager.js";
+import { activityRecallCue } from "../mind/time/activity-recall.js";
 import { replyPrompt, prompts } from "./persona-manager.js";
 import { buildContext, perceive } from "./context-builder.js";
 import {
@@ -195,15 +196,23 @@ export class TurnProcessor {
         this.owner.models,
         this.owner.fallbackFor(policy, model, trace),
       );
-      resolved ||= perceive(
+      resolved = perceive(
         this.owner.repo,
         session,
         watermark,
         eventMode,
         nature.name,
+        { resolved, sentBefore: live ? now : 0 },
       );
       const batchIds = batch.map((m) => m.seq);
       const window = resolved.filter((m) => !m.referenceOnly).slice(-60);
+      const cues = batch.map((m) => ({
+        id: m.seq,
+        role: m.role,
+        speaker: m.userId,
+        userId: m.userId,
+        text: m.text || "",
+      }));
       // The speakers in this batch are the people whose history matters now.
       // Pulling everyone from a long room window made unrelated plans compete
       // with the exchange actually taking place.
@@ -266,14 +275,27 @@ export class TurnProcessor {
         kind: privateChat ? "private" : "group",
         people,
         cue: batch.map((m) => ({
-          role: m.role,
-          userId: m.userId,
-          text: m.text || "",
+          ...cues.find((row) => row.id === m.seq),
           relation: resolved.find((line) => line.id === m.seq)?.relation,
           mentioned: m.mentioned === true,
         })),
         now,
       });
+      const botSpeakers = new Set(
+        (view.inner?.relationships?.known || [])
+          .filter((relationship) => relationship.kind === "bot")
+          .map((relationship) => String(relationship.subjectId)),
+      );
+      const activityCue = activityRecallCue(cues, window, {
+        excludedSpeakers: botSpeakers,
+      });
+      if (activityCue !== cues)
+        view.inner.currentLife = this.owner.mind.time.view({
+          session: preview?.viewSession || session,
+          now,
+          cue: cues,
+          activityCue,
+        });
       const snapshot = ownInitiative
         ? initiativeSnapshot(session, window, nature, now, policy.timeZone)
         : buildContext(