luckytri 1.0.8 → 1.1.0

package/server/mind/time/activity-recall.js

@@ -0,0 +1,65 @@
+const OWN_REFERENCE =
+  /你.{0,16}(?:不是说|明明说|说过|提过|答应过)|你跟.{0,16}(?:说|提过|答应过)|(?:上次|之前|刚才|昨天).{0,18}(?:你|我).{0,10}(?:说|提|答应)/;
+
+// A same-person follow-up may point to what she just said without repeating
+// a work's title. Use only replies actually addressed to this speaker as extra
+// search terms; the private reply itself never enters the memory result.
+export function activityRecallCue(
+  batch = [],
+  messages = [],
+  { excludedSpeakers = new Set() } = {},
+) {
+  const current = batch.filter(
+    (message) =>
+      message.role === "user" &&
+      !excludedSpeakers.has(String(message.speaker ?? message.userId ?? "")) &&
+      OWN_REFERENCE.test(message.text || ""),
+  );
+  if (!current.length) return batch;
+
+  const speakers = new Set(
+    current
+      .map((message) => String(message.speaker ?? message.userId ?? ""))
+      .filter(Boolean),
+  );
+  if (!speakers.size) return batch;
+  const byId = new Map(
+    messages.map((message) => [Number(message.seq ?? message.id), message]),
+  );
+  const cutoff = Math.min(
+    ...batch
+      .map((message) => Number(message.id ?? message.seq))
+      .filter(Number.isFinite),
+  );
+  const now = Math.max(
+    ...batch.map((message) => Number(message.time)).filter(Number.isFinite),
+  );
+  const replies = messages.filter((message) => {
+    if (message.role !== "assistant" || message.referenceOnly) return false;
+    if (Number.isFinite(message.id ?? message.seq) && Number.isFinite(cutoff)) {
+      const id = Number(message.id ?? message.seq);
+      if (
+        id >= cutoff &&
+        (!Number.isFinite(message.time) || message.time > now)
+      )
+        return false;
+    }
+    const targets = [
+      ...(Array.isArray(message.replyTargets) ? message.replyTargets : []),
+      ...(Array.isArray(message.replyTargetIds)
+        ? message.replyTargetIds.map((id) => byId.get(Number(id)))
+        : []),
+    ];
+    return targets.some((target) =>
+      speakers.has(String(target?.speaker ?? target?.userId ?? "")),
+    );
+  });
+  return [
+    ...batch,
+    ...replies.slice(-2).map((message) => ({
+      role: "assistant",
+      activityEvidence: true,
+      text: message.text || "",
+    })),
+  ];
+}

package/server/mind/time/index.js

@@ -422,7 +422,7 @@ export class TimeSystem {
       }),
     };
   }
-  view({ session, now = this.now(), cue = [] } = {}) {
+  view({ session, now = this.now(), cue = [], activityCue = cue } = {}) {
     const primary = this.primary(),
       task = primary?.created <= now ? primary : null;
     let current =
@@ -548,7 +548,11 @@ export class TimeSystem {
           plannedFor: this.planView(row),
         })),
       works: this.works.fragments({ session, now, cue }),
-      activityRecall: this.works.activityEvidence({ session, now, cue }),
+      activityRecall: this.works.activityEvidence({
+        session,
+        now,
+        cue: activityCue,
+      }),
       ...(() => {
         const actions = this.db
           .prepare(

package/server/mind/time/tasks.js

@@ -212,16 +212,14 @@ export class Tasks {
       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.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),
         "等待约定的正文或资料",
@@ -511,6 +509,34 @@ export class Tasks {
       this.db.exec("RELEASE arrange_task");
     }
   }
+  // The earliest start at or after `startAt` that does not overlap anything
+  // at least as important. `acceptable` can reject a start, such as one that
+  // falls while she sleeps. Returns null when nothing fits within a week.
+  freeStart(
+    id,
+    startAt,
+    durationMinutes,
+    now = this.time.now(),
+    { acceptable = () => true, step = 15 * 60000 } = {},
+  ) {
+    const task = this.get(id);
+    if (!task) return null;
+    const length = durationMinutes * 60000;
+    const blocking = this.slots(now).filter(
+      (slot) => slot.id !== id && slot.priority >= task.priority,
+    );
+    let start = Math.max(now, startAt);
+    const limit = now + 7 * 86400000;
+    for (let guard = 0; guard < 2000 && start <= limit; guard++) {
+      const overlap = blocking.find(
+        (slot) => slot.startAt < start + length && slot.endAt > start,
+      );
+      if (overlap) start = overlap.endAt;
+      else if (!acceptable(start)) start += step;
+      else return start;
+    }
+    return null;
+  }
   slots(now = this.time.now()) {
     return this.db
       .prepare(