luckytri 1.0.7 → 1.0.9

package/server/mind/time/tasks.js

@@ -8,6 +8,7 @@ import { deadlineAt, taskSchedule, spokenDate } from "./schedule.js";
 import { DeliveryLinks } from "./delivery-links.js";
 import { activityPresentation } from "./presentation.js";
 import { activityLabel, classifyActivity, isExecutable } from "./kinds.js";
+import { awaitsTextInput, nextReadingChunk } from "./reading-input.js";
 
 export const TASK_STATES = [
   "todo",
@@ -105,10 +106,13 @@ export class Tasks {
     const privateRoots = this.time.mind.meetings.privateRoots(refs, now);
     session = privateRoots[0] || session;
     if (privateRoots.length && discretion !== "secret") discretion = "private";
+    const inferred = classifyActivity(title);
     const type =
-      activity && (ACTIVITY_LABELS[activity] || isExecutable(activity))
-        ? activity
-        : classifyActivity(title);
+      awaitsTextInput(title) && inferred === "read"
+        ? "read"
+        : activity && (ACTIVITY_LABELS[activity] || isExecutable(activity))
+          ? activity
+          : inferred;
     subject =
       intentRecipient(this.db, { session, subject, title, sources: refs }) ||
       null;
@@ -207,6 +211,22 @@ export class Tasks {
       { sources: refs },
       now,
     );
+    if (type === "read" && awaitsTextInput(title)) {
+      this.db.prepare("UPDATE mind_time_tasks SET checkpoint=? WHERE id=?").run(
+        JSON.stringify({
+          awaitedText: true,
+          expectedTextTitle: intent.topic,
+          awaitedAfter: now,
+        }),
+        id,
+      );
+      this.wait(
+        this.get(id),
+        "等待约定的正文或资料",
+        Number.MAX_SAFE_INTEGER,
+        now,
+      );
+    }
     return { id };
   }
   sync(now = this.time.now()) {
@@ -326,6 +346,22 @@ export class Tasks {
     return ids;
   }
   ready(now = this.time.now()) {
+    for (const row of this.db
+      .prepare(
+        "SELECT * FROM mind_time_tasks WHERE state='waiting' AND activity='read' AND json_extract(checkpoint,'$.awaitedText')=1 AND json_extract(checkpoint,'$.mergedInto') IS NULL",
+      )
+      .all()) {
+      const task = decode(row);
+      if (
+        this.time.allowed(task, now) &&
+        nextReadingChunk(this.time.mind, task, now)
+      )
+        this.control(
+          task.id,
+          { action: "resume", reason: "约定的正文已可阅读" },
+          now,
+        );
+    }
     return this.db
       .prepare(
         "SELECT * FROM mind_time_tasks WHERE state IN ('todo','scheduled','waiting','paused') AND ready_at<=? AND next_step<=? AND activity!='unknown' AND json_extract(checkpoint,'$.mergedInto') IS NULL ORDER BY priority DESC,created LIMIT 100",

package/server/mind/time/works.js

@@ -1,6 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { evidence, hasCredential, parse, text } from "../util.js";
 import { activityPresentation, gameText } from "./presentation.js";
+import { interestTerms } from "../attention.js";
+import { belongsToGame } from "./material-relevance.js";
+import { gameTopic } from "./intent.js";
 
 const decode = (row) =>
   row
@@ -145,7 +148,7 @@ export class Works {
           : row,
       );
   }
-  get(id, version) {
+  get(id, version, { before = Number.MAX_SAFE_INTEGER } = {}) {
     const work = this.db
       .prepare("SELECT * FROM mind_time_works WHERE id=?")
       .get(id);
@@ -156,9 +159,9 @@ export class Works {
     const saved = v
       ? this.db
           .prepare(
-            "SELECT reason FROM mind_time_events WHERE kind='draft' AND json_extract(data,'$.workId')=? AND json_extract(data,'$.version')=? ORDER BY id DESC LIMIT 1",
+            "SELECT reason FROM mind_time_events WHERE kind='draft' AND json_extract(data,'$.workId')=? AND json_extract(data,'$.version')=? AND created<=? ORDER BY id DESC LIMIT 1",
           )
-          .get(id, v.version)
+          .get(id, v.version, before)
       : null;
     return v
       ? {
@@ -170,7 +173,9 @@ export class Works {
             ? saved.reason === "保存完成稿"
               ? "complete"
               : "draft"
-            : work.state,
+            : work.updated > before
+              ? "draft"
+              : work.state,
           sources: parse(v.sources, []),
           provenance: parse(v.provenance, {}),
           versions: this.db
@@ -396,9 +401,19 @@ export class Works {
   }
   fragments({ session, now = this.time.now(), cue = [] } = {}) {
     const words = (Array.isArray(cue) ? cue : [cue])
-      .map((v) => (typeof v === "string" ? v : JSON.stringify(v)))
+      .map((v) => (typeof v === "string" ? v : v?.text || ""))
       .join(" ");
-    return this.list({ limit: 30 })
+    const terms = interestTerms([words]);
+    // Search the work catalogue, not just the two newest activities. Select
+    // the version that existed at the requested time, including in replays.
+    return this.db
+      .prepare(
+        `SELECT w.*,COALESCE(p.kind,(SELECT kind FROM mind_creations WHERE id=w.legacy_creation)) kind,p.title project_title,p.bible,v.version,v.title,v.created version_created,v.summary,v.sources,v.provenance,length(v.content) characters
+      FROM mind_time_works w LEFT JOIN mind_time_projects p ON p.id=w.project_id
+      JOIN mind_time_versions v ON v.work_id=w.id AND v.version=(SELECT max(h.version) FROM mind_time_versions h WHERE h.work_id=w.id AND h.created<=?)
+      WHERE w.created<=? ORDER BY v.created DESC`,
+      )
+      .all(now, now)
       .filter(
         (w) =>
           w.created <= now &&
@@ -410,29 +425,104 @@ export class Works {
       )
       .map((w) => ({
         ...w,
-        score: [...new Set(words.match(/[\p{L}\p{N}]{2,}/gu) || [])].filter(
-          (term) =>
-            (w.title + " " + w.project_title + " " + w.summary).includes(term),
-        ).length,
+        score: [...interestTerms([w.title, w.project_title, w.summary])]
+          .filter((term) => terms.has(term))
+          .reduce(
+            (total, term) => total + (/^[a-z][a-z0-9]{2,}$/.test(term) ? 8 : 1),
+            0,
+          ),
       }))
-      .sort((a, b) => b.score - a.score || b.updated - a.updated)
-      .slice(0, 2)
+      .sort(
+        (a, b) => b.score - a.score || b.version_created - a.version_created,
+      )
+      .filter((w, index, rows) =>
+        rows[0]?.score >= 2 ? w.score >= 2 : index < 2,
+      )
+      .filter((w) => this.materialSupported(w))
+      .slice(0, 3)
       .map((w) => ({
         id: w.id,
         title: w.title,
-        state: w.state,
+        state: this.get(w.id, w.version, { before: now }).state,
         kind: w.kind,
         version: w.version,
         ordinal: w.ordinal,
         summary: text(w.summary, 180),
-        fragment: text(this.get(w.id).content, 240),
+        fragment: text(this.get(w.id, w.version).content, 300),
         ...(w.kind === "game"
           ? {
               experienceMode: "reference",
-              provenance: this.get(w.id).provenance,
+              provenance: this.get(w.id, w.version).provenance,
             }
           : {}),
         characters: w.characters,
       }));
   }
+
+  activityEvidence({ session, now = this.time.now(), cue = [] } = {}) {
+    const terms = interestTerms(
+      (Array.isArray(cue) ? cue : [cue]).map((v) =>
+        typeof v === "string"
+          ? v
+          : v?.role === "assistant" && !v.activityEvidence
+            ? ""
+            : v?.text || "",
+      ),
+    );
+    if (!terms.size) return [];
+    // A private conversation can motivate her own reading. Its contents and
+    // promises stay private; absence from the public fragments must not erase
+    // the fact that the reading took place. Search may also use a same-speaker
+    // reply delivered in this room to resolve an implicit follow-up.
+    return this.db
+      .prepare(
+        `SELECT w.id,w.title,w.discretion,w.session_id,p.kind,p.title project_title,p.bible,v.created,v.provenance,v.sources
+      FROM mind_time_works w JOIN mind_time_projects p ON p.id=w.project_id
+      JOIN mind_time_versions v ON v.work_id=w.id AND v.version=(SELECT max(h.version) FROM mind_time_versions h WHERE h.work_id=w.id AND h.created<=?)
+      WHERE w.created<=? AND p.kind='game' AND w.discretion!='secret' ORDER BY v.created DESC`,
+      )
+      .all(now, now)
+      .filter((w) => {
+        const shared = [...interestTerms([w.title, w.project_title])].filter(
+          (term) => terms.has(term),
+        );
+        return (
+          (shared.length >= 2 ||
+            shared.some((term) => /^[a-z][a-z0-9]{2,}$/.test(term))) &&
+          this.time.allowed({ ...w, sources: parse(w.sources, []) }, now) &&
+          this.materialSupported(w)
+        );
+      })
+      .slice(0, 3)
+      .map((w) => ({
+        title: w.title,
+        activity: "阅读游戏资料并写笔记",
+        experienceMode: "reference",
+        ...(w.session_id !== session && w.discretion !== "open"
+          ? { privateOrigin: true }
+          : {}),
+        instruction:
+          "仅用于核对自己确有这项阅读和笔记，不能据此否认从未发生；这里不提供私下正文、发起人、约定或对话。只能自然回应本轮对方已经提到的阅读本身，不披露私下内容。",
+      }));
+  }
+
+  materialSupported(work) {
+    const project = work.kind ? null : this.project(work.project_id);
+    if ((work.kind || project?.kind) !== "game") return true;
+    const ids = parse(work.provenance, {}).sourceIds;
+    const topic =
+      parse(work.bible, {}).topic ||
+      project?.bible?.topic ||
+      gameTopic(work.project_title || project?.title);
+    // Missing old provenance is unknown, not evidence that reading never took
+    // place. Known references all belonging to another subject are different.
+    if (!Array.isArray(ids) || !ids.length || !topic) return true;
+    const source = this.db.prepare(
+      "SELECT title,url,content FROM mind_time_sources WHERE id=?",
+    );
+    return ids.some((id) => {
+      const row = source.get(id);
+      return row && belongsToGame(row, topic);
+    });
+  }
 }

package/server/mind/view.js

@@ -6,7 +6,10 @@ import { describeFace } from "./faces.js";
 import { SELF_KINDS } from "./self.js";
 import { DAY, text } from "./util.js";
 import { relationshipHistory } from "./relationship-context.js";
-import { fixedReplyHabit } from "../core/conversation-grounding.js";
+import {
+  fixedReplyHabit,
+  conversationalMemory,
+} from "../core/conversation-grounding.js";
 
 const FORGOTTEN = "（很久没想起了）";
 
@@ -92,7 +95,14 @@ function feedback(mind, session, now) {
 // so anything this batch of messages brings back to mind belongs there.
 export function innerView(
   mind,
-  { session, kind = "group", people = [], cue = [], now = Date.now() },
+  {
+    session,
+    kind = "group",
+    people = [],
+    cue = [],
+    activityCue = cue,
+    now = Date.now(),
+  },
 ) {
   const nature = mind.nature.current(now);
   const affect = mind.affect.state(now, { nature, room: session });
@@ -172,9 +182,14 @@ export function innerView(
       ? {
           here: describeFace({
             ...face,
-            notes: face.notes.filter((note) =>
-              spoken(`${note.content} ${note.why}`),
-            ),
+            notes: face.notes
+              .map((note) => ({
+                ...note,
+                content: conversationalMemory(note.content),
+              }))
+              .filter(
+                (note) => note.content && spoken(`${note.content} ${note.why}`),
+              ),
             role: spoken(face.role),
             tone: spoken(face.tone),
             aspiration: spoken(face.aspiration),
@@ -240,7 +255,11 @@ export function innerView(
   const thoughts = relevantContext(
     mind.thoughts
       .open({ now, limit: 400, session })
-      .filter((t) => mind.meetings.sayable(t.content, session)),
+      .filter(
+        (t) =>
+          !fixedReplyHabit(t.content) &&
+          mind.meetings.sayable(t.content, session),
+      ),
     { cues, limit: 3, requireOverlap: cue.length > 0 },
   );
   const heard = feedback(mind, session, now);
@@ -257,6 +276,7 @@ export function innerView(
   });
   const wills = mind.meetings.traces({ session, before: now, limit: 2 });
   const will = wills
+    .filter((row) => !fixedReplyHabit(row.text))
     .map((row) =>
       row.living ? row.text : `${text(row.content, 28)}：${row.text}`,
     )
@@ -272,8 +292,8 @@ export function innerView(
     affect.cause && mind.meetings.sayable(affect.cause, session)
       ? text(affect.cause, 40)
       : "";
-  const withLines = withWhom.filter((line) =>
-    mind.meetings.sayable(line, session),
+  const withLines = withWhom.filter(
+    (line) => !fixedReplyHabit(line) && mind.meetings.sayable(line, session),
   );
   const expectingLines = expecting.filter((line) =>
     mind.meetings.sayable(line, session),
@@ -287,7 +307,7 @@ export function innerView(
     self,
     affect: cause ? affect : { ...affect, cause: "" },
     inner: {
-      currentLife: mind.time.view({ session, now, cue }),
+      currentLife: mind.time.view({ session, now, cue, activityCue }),
       state: `${affect.phaseLabel}，精力${affect.energyLabel}，心情${affect.mood}${cause ? `（${cause}）` : ""}${affect.lately ? `，${affect.lately}` : ""}`,
       ...(persons.length ? { people: persons } : {}),
       ...(relationships.known.length ? { relationships } : {}),