dsh-multigameassistant 2.0.0 → 2.0.1

package/lib/game-intel.js

@@ -7,26 +7,28 @@ import {
   GAME_MANIFEST_FILE,
   GameManifest,
   parseGameManifest
-} from "./chunk-7XMNAHZ2.js";
+} from "./chunk-J46OASOG.js";
 import {
   sessionConversations
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
 import {
   GAMES_CAPABILITY,
   GamesSettings,
+  OWN_IMAGE,
+  SHOT_IMAGE,
   external_exports,
   taskMessage
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/game-intel/lib/index.js
 import { createHash } from "node:crypto";
-import { mkdir as mkdir2, readdir, readFile as readFile2, writeFile } from "node:fs/promises";
-import { join as join2 } from "node:path";
+import { mkdir as mkdir2, readdir, readFile as readFile2, rm, writeFile } from "node:fs/promises";
+import { isAbsolute, join as join2, resolve } from "node:path";
 import { Service } from "@deepseek-ai/cordis";
 
 // packages/game-intel/lib/calendar.js
@@ -162,6 +164,7 @@ var KEEP_UNDATED_MS = 14 * MS.DAY;
 var MISMATCH_MS = 30 * MS.HOUR;
 var DEFAULT_SETTINGS = { report: { enabled: true, at: "09:00", games: [], soonDays: 3, ai: true }, followed: [] };
 var AGENT_PAGE = { id: "agent", name: "agent \u67E5\u5230\u7684\u7F51\u9875" };
+var OWN_FIELDS = ["name", "startsAt", "endsAt", "kind", "description", "url", "cover"];
 var StoredSchema = external_exports.object({
   activities: external_exports.array(external_exports.looseObject({ id: external_exports.string(), game: external_exports.string(), name: external_exports.string() })).default([]),
   refreshed: external_exports.record(external_exports.string(), external_exports.object({ at: external_exports.number(), ok: external_exports.boolean(), count: external_exports.number(), detail: external_exports.string().optional() })).default({}),
@@ -345,7 +348,7 @@ var Calendar = class {
       delete item.facts[source.id];
       this.#derive(item, timeZone);
     }
-    this.#items = this.#items.filter((a) => a.game !== game || Object.keys(a.facts).length > 0 || a.screen !== void 0);
+    this.#items = this.#items.filter((a) => a.game !== game || this.#sourced(a) || a.mine !== void 0);
     this.#prune(now);
     this.#saved.refreshed[game] = { at: now, ok: true, count: events.length };
     await this.save();
@@ -369,7 +372,8 @@ var Calendar = class {
    * time, checked against the site's end); from a web page (`site`) it is
    * that page's word on the event (the user's page it came from, else
    * "agent 查到的网页"), kept beside the data sites' and used where they say
-   * nothing.
+   * nothing. `shot`: the screenshot read from the screen, already kept
+   * (`shot:<file>`): the evidence, and the picture where no source has one.
    * @returns the events written, with how each was matched.
    */
   async applyRead(game, from, events, context) {
@@ -397,11 +401,13 @@ var Calendar = class {
           ...event.cover !== void 0 && /^https:\/\/\S+$/.test(event.cover) ? { cover: event.cover } : {}
         };
       } else {
+        const image = context.shot ?? item.screen?.image;
         item.screen = {
           at: now,
           ...event.remaining === void 0 ? {} : { remaining: event.remaining },
           ...end === void 0 ? {} : { endsAt: end },
-          evidence: false,
+          evidence: context.shot !== void 0,
+          ...image === void 0 ? {} : { image },
           ...context.sessionId === void 0 ? {} : { sessionId: context.sessionId }
         };
         if (event.todo !== void 0)
@@ -414,14 +420,121 @@ var Calendar = class {
           delete item.progress;
       }
       this.#derive(item, timeZone);
-      if (from === "screen" && context.evidence !== void 0)
-        item.screen.evidence = await context.evidence(this.#public(item)).catch(() => false);
       written.push({ activity: this.#public(item), matched: existing !== void 0 });
     }
     this.#prune(now);
     await this.save();
     return written;
   }
+  /**
+   * The user's own word on an event (`target.id`), or an event of their own
+   * (a `name` and no id; one of that name already in the calendar is that
+   * one). Fields equal to what the sources say are not kept, so a later
+   * refresh still moves them; on an event only the user has, every field is.
+   * @returns the event; undefined when there is no event with that id in that game.
+   * @throws Error when a new one has no name.
+   */
+  async saveOwn(target, patch, now, timeZone) {
+    let item;
+    if (target.id !== void 0) {
+      item = this.#items.find((a) => a.id === target.id && a.game === target.game);
+      if (item === void 0)
+        return void 0;
+    } else {
+      const name = typeof patch.name === "string" ? patch.name.trim() : "";
+      if (name === "")
+        throw new Error("\u65B0\u6D3B\u52A8\u8981\u6709\u540D\u5B57");
+      item = this.#items.find((a) => a.game === target.game && a.names.some((n) => idKey(n) === idKey(name))) ?? this.#create(target.game, name);
+    }
+    const mine = { ...item.mine };
+    delete mine.at;
+    for (const key of OWN_FIELDS) {
+      const value = patch[key];
+      if (value === void 0)
+        continue;
+      if (value === null || typeof value === "string" && value.trim() === "")
+        delete mine[key];
+      else
+        mine[key] = typeof value === "string" ? value.trim() : value;
+    }
+    if (mine.startsAt !== void 0 && mine.endsAt !== void 0 && mine.endsAt <= mine.startsAt)
+      throw new Error("\u7ED3\u675F\u65F6\u95F4\u8981\u665A\u4E8E\u5F00\u59CB\u65F6\u95F4");
+    if (this.#sourced(item)) {
+      const base = structuredClone(item);
+      delete base.mine;
+      this.#derive(base, timeZone);
+      for (const key of OWN_FIELDS)
+        if (mine[key] !== void 0 && mine[key] === base[key])
+          delete mine[key];
+    }
+    if (Object.keys(mine).length === 0)
+      delete item.mine;
+    else
+      item.mine = { ...mine, at: now };
+    if (mine.name !== void 0)
+      item.names = unique([...item.names, mine.name]);
+    if (patch.todo !== void 0)
+      item.todo = unique(patch.todo.map((t) => t.trim()).filter((t) => t !== "" && !item.done.includes(t)));
+    if (!this.#sourced(item) && item.mine === void 0) {
+      this.#items = this.#items.filter((a) => a !== item);
+      await this.save();
+      return void 0;
+    }
+    this.#derive(item, timeZone);
+    await this.save();
+    return this.#public(item);
+  }
+  /**
+   * Take back what the user wrote on an event: the sources' word shows again;
+   * an event only the user had goes.
+   * @returns the event as it is now; undefined when it went (or was not there).
+   */
+  async resetOwn(id, timeZone) {
+    const item = this.#items.find((a) => a.id === id);
+    if (item === void 0)
+      return void 0;
+    delete item.mine;
+    if (!this.#sourced(item)) {
+      this.#items = this.#items.filter((a) => a !== item);
+      await this.save();
+      return void 0;
+    }
+    this.#derive(item, timeZone);
+    await this.save();
+    return this.#public(item);
+  }
+  /** The pictures the user added that an event still shows (`own:<file>`). */
+  ownImages() {
+    const out = /* @__PURE__ */ new Set();
+    for (const a of this.#items)
+      if (a.mine?.cover?.startsWith("own:") === true)
+        out.add(a.mine.cover);
+    return out;
+  }
+  /** The screenshots an event was read from that are still kept (`shot:<file>`). */
+  shotImages() {
+    const out = /* @__PURE__ */ new Set();
+    for (const a of this.#items)
+      if (a.screen?.image !== void 0)
+        out.add(a.screen.image);
+    return out;
+  }
+  /**
+   * Screenshots kept before they were pictures (one file per event): now
+   * kept as `shot:<file>`, by event id.
+   */
+  async adoptShots(shots, timeZone) {
+    if (shots.size === 0)
+      return;
+    for (const item of this.#items) {
+      const shot = shots.get(item.id);
+      if (shot === void 0 || item.screen === void 0)
+        continue;
+      item.screen.image = shot;
+      this.#derive(item, timeZone(item.game));
+    }
+    await this.save();
+  }
   async remove(id) {
     const before = this.#items.length;
     this.#items = this.#items.filter((a) => a.id !== id);
@@ -447,6 +560,10 @@ var Calendar = class {
     const running = loose.find((a) => (a.startsAt ?? 0) <= now && now <= (a.endsAt ?? Infinity));
     return running ?? loose[0];
   }
+  /** Some source (a data site, a web page, the game screen) knows it. */
+  #sourced(item) {
+    return Object.keys(item.facts).length > 0 || item.screen !== void 0;
+  }
   #create(game, name) {
     let id = `${game}/${idKey(name)}`;
     for (let n = 2; this.#items.some((a) => a.id === id); n++)
@@ -484,7 +601,23 @@ var Calendar = class {
       delete item.site;
     else
       item.site = { source: primary.id, name: primary.fact.name, at: primary.fact.at };
+    const mine = item.mine;
+    if (mine?.name !== void 0) {
+      if (item.name !== mine.name)
+        item.baseName = item.name;
+      item.name = mine.name;
+    } else if (item.baseName !== void 0) {
+      item.name = item.baseName;
+      delete item.baseName;
+    }
+    for (const key of ["startsAt", "endsAt", "kind", "description", "url", "cover"])
+      if (mine?.[key] !== void 0)
+        set(key, mine[key]);
+    if (item.cover === void 0 && item.screen?.image !== void 0)
+      item.cover = item.screen.image;
     delete item.mismatch;
+    if (mine?.endsAt !== void 0)
+      return;
     const siteEnd = site?.fact.endsAt;
     if (site === void 0 || siteEnd === void 0)
       return;
@@ -502,6 +635,8 @@ var Calendar = class {
   #prune(now) {
     this.#items = this.#items.filter((a) => {
       if (a.endsAt === void 0) {
+        if (a.mine !== void 0)
+          return true;
         const seen = [a.screen?.at, ...Object.values(a.facts).map((f) => f.at)].filter((t) => t !== void 0);
         return (seen.length === 0 ? now : Math.max(...seen)) + KEEP_UNDATED_MS > now;
       }
@@ -509,9 +644,10 @@ var Calendar = class {
     });
   }
   #public(item) {
-    const { names: _names, facts, ...activity } = item;
+    const { names: _names, facts, mine, baseName: _baseName, ...activity } = item;
     const sources = Object.entries(facts).map(([id, f]) => ({ id, name: f.name, at: f.at, web: f.web, ...f.endsAt === void 0 ? {} : { endsAt: f.endsAt } }));
-    return structuredClone({ ...activity, ...sources.length === 0 ? {} : { sources } });
+    const own = mine === void 0 ? void 0 : { at: mine.at, fields: OWN_FIELDS.filter((k) => mine[k] !== void 0) };
+    return structuredClone({ ...activity, ...sources.length === 0 ? {} : { sources }, ...own === void 0 ? {} : { own } });
   }
 };
 function migrate(item) {
@@ -988,6 +1124,7 @@ function followedManifest(game) {
 }
 
 // packages/game-intel/lib/tools.js
+var OWN_KEYS = { name: "name", starts_at: "startsAt", ends_at: "endsAt", kind: "kind", description: "description", url: "url", image: "cover" };
 function parse(schema, args) {
   const parsed = schema.safeParse(args);
   if (!parsed.success)
@@ -1022,7 +1159,10 @@ function gameTools(deps) {
       ...a.startsAt !== void 0 && a.startsAt > now ? { starts: shortDate(a.startsAt, timeZone) } : {},
       ends: a.endsAt === void 0 ? "\u672A\u77E5" : `${shortDate(a.endsAt, timeZone)}\uFF08${leftText(a.endsAt, now)}\uFF09`,
       ...a.shopEndsAt === void 0 ? {} : { shop_ends: shortDate(a.shopEndsAt, timeZone) },
-      dates_from: a.site?.name ?? (a.screen !== void 0 ? "\u6E38\u620F\u753B\u9762" : "\u672A\u77E5"),
+      dates_from: a.own?.fields.some((f) => f === "startsAt" || f === "endsAt") === true ? "\u7528\u6237\u81EA\u5DF1\u586B\u7684" : a.site?.name ?? (a.screen !== void 0 ? "\u6E38\u620F\u753B\u9762" : "\u672A\u77E5"),
+      ...a.own === void 0 ? {} : { set_by_user: a.own.fields.map((f) => Object.entries(OWN_KEYS).find(([, v]) => v === f)[0]), ...a.sources === void 0 && a.screen === void 0 ? { added_by_user: true } : {} },
+      ...a.kind === void 0 ? {} : { kind: a.kind },
+      ...a.cover === void 0 ? {} : { image: a.cover.startsWith("own:") ? "\u7528\u6237\u7684\u56FE\u7247" : a.cover.startsWith("shot:") ? "\u6E38\u620F\u622A\u56FE\uFF08\u6CA1\u6709\u522B\u7684\u56FE\u65F6\u7528\u5B83\uFF09" : a.cover },
       ...a.screen === void 0 ? {} : { read_in_game: shortDate(a.screen.at, timeZone), ...a.progress === void 0 ? {} : { progress: a.progress } },
       // The checklist (from the game screen or kept by the user on the board), and the user's own "done".
       ...a.todo.length + a.done.length === 0 ? {} : { todo: a.todo, done: a.done },
@@ -1207,6 +1347,87 @@ function gameTools(deps) {
         };
       }
     }),
+    tool({
+      name: "game_activity_save",
+      description: [
+        "\u66FF\u7528\u6237\u624B\u52A8\u6DFB\u52A0\u4E00\u4E2A\u6D3B\u52A8\uFF0C\u6216\u6539\u4E00\u4E2A\u5DF2\u6709\u6D3B\u52A8\uFF08id \u4ECE game_activities \u67E5\uFF09\u3002\u7528\u6237\u8BF4\u300C\u5E2E\u6211\u52A0\u4E00\u4E2A XX \u6D3B\u52A8\u300D\u300C\u628A XX \u7684\u7ED3\u675F\u65F6\u95F4\u6539\u6210\u2026\u300D\u300C\u7ED9\u8FD9\u4E2A\u6D3B\u52A8\u6362\u5F20\u56FE\u300D\u65F6\u7528\u3002",
+        "\u5199\u8FDB\u53BB\u7684\u5B57\u6BB5\u662F\u7528\u6237\u81EA\u5DF1\u7684\u8BF4\u6CD5\uFF1A\u6BD4\u6570\u636E\u7AD9\u548C\u7F51\u9875\u4F18\u5148\uFF0C\u5237\u65B0\u4E0D\u4F1A\u6539\u6389\u4E5F\u4E0D\u4F1A\u5220\u6389\uFF1B\u548C\u6765\u6E90\u4E00\u6837\u7684\u503C\u4E0D\u5355\u72EC\u4FDD\u5B58\u3002\u8BFB\u5230\u7684\u7F51\u9875\u6216\u6E38\u620F\u753B\u9762\u7528 game_record\uFF0C\u4E0D\u8981\u7528\u8FD9\u4E2A\u3002",
+        "image \u53EF\u4EE5\u662F\u56FE\u7247\u7F51\u5740\uFF08https\uFF0C\u4F1A\u4E0B\u8F7D\u4FDD\u5B58\uFF09\u3001\u672C\u673A\u56FE\u7247\u6587\u4EF6\u8DEF\u5F84\uFF08\u76F8\u5BF9\u8DEF\u5F84\u6309\u5DE5\u4F5C\u533A\uFF09\u3001\u6216 screenshot\uFF08\u8FD9\u4E2A\u5BF9\u8BDD\u6700\u8FD1\u4E00\u5F20\u622A\u56FE\uFF09\u3002clear \u91CC\u7684\u5B57\u6BB5\u6536\u56DE\u7528\u6237\u7684\u503C\uFF0C\u6062\u590D\u6210\u6765\u6E90\u7684\u3002"
+      ].join(""),
+      properties: {
+        game: GAME,
+        id: { type: "string", description: "\u8981\u6539\u7684\u6D3B\u52A8 id\uFF08\u4E0D\u586B\u5C31\u662F\u65B0\u52A0\uFF1B\u540C\u540D\u7684\u5DF2\u6709\u6D3B\u52A8\u4F1A\u5F53\u6210\u540C\u4E00\u4E2A\uFF09\u3002" },
+        name: { type: "string", description: "\u6D3B\u52A8\u540D\uFF1B\u65B0\u52A0\u65F6\u5FC5\u586B\u3002" },
+        starts_at: { type: "string", description: "\u5F00\u59CB\u65F6\u95F4\uFF0C\u5199\u6210 2026/10/25 04:00 \u6216 10/25 04:00\uFF08\u6E38\u620F\u670D\u52A1\u5668\u65F6\u95F4\uFF09\u3002" },
+        ends_at: { type: "string", description: "\u7ED3\u675F\u65F6\u95F4\uFF0C\u5199\u6CD5\u540C\u4E0A\u3002" },
+        kind: { type: "string", description: "\u7C7B\u578B\uFF08\u53EF\u9009\uFF09\uFF0C\u4F8B\u5982\u300CSideStory\u300D\u300C\u7B7E\u5230\u300D\u300C\u9650\u65F6\u5546\u5E97\u300D\u3002" },
+        description: { type: "string", description: "\u8BF4\u660E\uFF08\u53EF\u9009\uFF09\uFF0C500 \u5B57\u4EE5\u5185\u3002" },
+        url: { type: "string", description: "\u6D3B\u52A8\u9875\u9762\u5730\u5740\uFF08\u53EF\u9009\uFF09\u3002" },
+        image: { type: "string", description: "\u6D3B\u52A8\u5361\u7247\u7684\u56FE\u7247\uFF1Ahttps \u56FE\u7247\u7F51\u5740\u3001\u672C\u673A\u56FE\u7247\u6587\u4EF6\u8DEF\u5F84\uFF0C\u6216 screenshot\u3002" },
+        todo: { type: "array", items: { type: "string" }, description: "\u8981\u505A\u7684\u4E8B\uFF08\u53EF\u9009\uFF0C\u66FF\u6362\u539F\u6765\u6CA1\u505A\u5B8C\u7684\u6E05\u5355\uFF09\uFF0C\u4F8B\u5982\u300C\u6D3B\u52A8\u5546\u5E97\u6362\u5B8C\u300D\u3002" },
+        clear: { type: "array", items: { type: "string", enum: Object.keys(OWN_KEYS) }, description: "\u6536\u56DE\u7528\u6237\u586B\u8FC7\u7684\u8FD9\u4E9B\u5B57\u6BB5\uFF08\u6062\u590D\u6210\u6765\u6E90\u7684\u503C\uFF09\u3002" }
+      },
+      required: ["game"],
+      kind: "other",
+      title: (a) => `${typeof a["id"] === "string" ? "\u4FEE\u6539" : "\u6DFB\u52A0"}\u6D3B\u52A8\uFF1A${String(a["name"] ?? a["id"] ?? "")}`,
+      execute: async (args, exec) => {
+        const a = parse(external_exports.object({
+          game: external_exports.string(),
+          id: external_exports.string().nullish(),
+          name: external_exports.string().max(60).nullish(),
+          starts_at: external_exports.string().nullish(),
+          ends_at: external_exports.string().nullish(),
+          kind: external_exports.string().max(20).nullish(),
+          description: external_exports.string().max(500).nullish(),
+          url: external_exports.string().regex(/^https?:\/\/\S+$/, "\u53EA\u80FD\u662F http \u6216 https \u7F51\u5740").nullish(),
+          image: external_exports.string().nullish(),
+          todo: external_exports.array(external_exports.string().min(1).max(80)).max(30).nullish(),
+          clear: external_exports.array(external_exports.enum(Object.keys(OWN_KEYS))).nullish()
+        }), args);
+        const game = known(a.game);
+        if (a.id == null && (a.name == null || a.name.trim() === ""))
+          throw new Error("\u65B0\u52A0\u6D3B\u52A8\u8981\u5199 name\uFF1B\u6539\u5DF2\u6709\u7684\u6D3B\u52A8\u8981\u5199 id\uFF08game_activities \u53EF\u67E5\uFF09");
+        const when = (text, what) => {
+          if (text == null)
+            return void 0;
+          const at = parseDateText(text, game.timezone, deps.now());
+          if (at == null)
+            throw new Error(`${what}\u300C${text}\u300D\u770B\u4E0D\u61C2\uFF1A\u5199\u6210 2026/10/25 04:00 \u6216 10/25 04:00`);
+          return at;
+        };
+        const patch = {
+          ...a.name == null ? {} : { name: a.name },
+          ...a.starts_at == null ? {} : { startsAt: when(a.starts_at, "\u5F00\u59CB\u65F6\u95F4") },
+          ...a.ends_at == null ? {} : { endsAt: when(a.ends_at, "\u7ED3\u675F\u65F6\u95F4") },
+          ...a.kind == null ? {} : { kind: a.kind },
+          ...a.description == null ? {} : { description: a.description },
+          ...a.url == null ? {} : { url: a.url },
+          ...a.todo == null ? {} : { todo: a.todo }
+        };
+        for (const key of a.clear ?? [])
+          patch[OWN_KEYS[key]] = null;
+        const sessionId = exec.agent?.session.id;
+        const activity = await deps.saveActivity(game.id, a.id ?? void 0, patch, a.image ?? void 0, sessionId);
+        return { saved: brief(activity, game.timezone), note: a.id == null ? "\u5DF2\u52A0\u5230\u6D3B\u52A8\u65E5\u5386\uFF1B\u6E38\u620F\u9875\u548C\u65E5\u62A5\u91CC\u90FD\u80FD\u770B\u5230" : "\u5DF2\u6539\u597D" };
+      }
+    }),
+    tool({
+      name: "game_activity_remove",
+      description: "\u53BB\u6389\u6D3B\u52A8\uFF1Awhat=mine \u53EA\u6536\u56DE\u7528\u6237\u81EA\u5DF1\u586B\u7684\u5185\u5BB9\uFF08\u540D\u5B57\u3001\u65F6\u95F4\u3001\u56FE\u7247\u7B49\u6062\u590D\u6210\u6765\u6E90\u7684\uFF1B\u53EA\u6709\u7528\u6237\u586B\u7684\u6D3B\u52A8\u4F1A\u6574\u4E2A\u53BB\u6389\uFF09\uFF1Bwhat=all \u628A\u6D3B\u52A8\u4ECE\u65E5\u5386\u53BB\u6389\uFF08\u6570\u636E\u7AD9\u8FD8\u5217\u7740\u7684\u8BDD\uFF0C\u4E0B\u6B21\u5237\u65B0\u4F1A\u518D\u51FA\u73B0\uFF09\u3002\u53EA\u5728\u7528\u6237\u8981\u6C42\u65F6\u7528\u3002",
+      properties: {
+        id: { type: "string", description: "\u6D3B\u52A8 id\uFF08game_activities \u53EF\u67E5\uFF09\u3002" },
+        what: { type: "string", enum: ["mine", "all"], description: "mine\uFF1A\u53EA\u6536\u56DE\u7528\u6237\u586B\u7684\uFF1Ball\uFF1A\u6574\u4E2A\u53BB\u6389\uFF08\u9ED8\u8BA4\uFF09\u3002" }
+      },
+      required: ["id"],
+      kind: "other",
+      title: (a) => `${a["what"] === "mine" ? "\u6062\u590D" : "\u53BB\u6389"}\u6D3B\u52A8\uFF1A${String(a["id"] ?? "")}`,
+      execute: async (args) => {
+        const a = parse(external_exports.object({ id: external_exports.string(), what: external_exports.enum(["mine", "all"]).nullish() }), args);
+        const activity = await deps.removeActivity(a.id, a.what ?? "all");
+        const game = activity === void 0 ? void 0 : deps.games().find((g) => g.id === activity.game);
+        return activity === void 0 || game === void 0 ? { removed: a.id } : { restored: brief(activity, game.timezone) };
+      }
+    }),
     tool({
       name: "game_launch",
       description: "\u6E38\u620F\u6CA1\u5F00\u65F6\u542F\u52A8\u5B83\uFF1A\u7528\u73A9\u5B83\u7684\u811A\u672C\u5728\u300C\u542F\u52A8\u6E38\u620F\u300D\u91CC\u7684\u8BBE\u7F6E\uFF08\u6A21\u62DF\u5668\u91CC\u7684\u6E38\u620F\u4F1A\u5148\u542F\u52A8\u6A21\u62DF\u5668\uFF1BPC \u7248\u6253\u5F00\u8BBE\u7F6E\u597D\u7684\u7A0B\u5E8F\u6216\u542F\u52A8\u5668\uFF09\uFF0C\u5DF2\u7ECF\u5F00\u7740\u5C31\u4EC0\u4E48\u90FD\u4E0D\u505A\u3002\u6709\u811A\u672C\u6B63\u5728\u7528\u8FD9\u53F0\u6A21\u62DF\u5668\u6216\u9F20\u6807\u952E\u76D8\u65F6\u4F1A\u62D2\u7EDD\u3002\u542F\u52A8\u540E\u622A\u56FE\u786E\u8BA4\uFF1A\u5173\u6389\u516C\u544A\u548C\u66F4\u65B0\u63D0\u793A\uFF0C\u542F\u52A8\u5668\u9700\u8981\u70B9\u300C\u5F00\u59CB\u6E38\u620F\u300D\u5C31\u70B9\uFF1B\u8981\u8F93\u5165\u8D26\u53F7\u5BC6\u7801\u6216\u9A8C\u8BC1\u7801\u65F6\u505C\u4E0B\u4EA4\u7ED9\u7528\u6237\u3002",
@@ -1318,6 +1539,7 @@ var AdgGameIntel = class extends Service {
     this.ready = (async () => {
       await calendar.load();
       await this.loadGames(log);
+      await this.adoptEvidence().catch((error) => log.warn(`old screenshots not converted: ${String(error)}`));
       daily.start();
     })();
     ctx.effect(() => () => this.daily.stop(), "adg-game-intel daily report");
@@ -1379,6 +1601,18 @@ var AdgGameIntel = class extends Service {
         add: async (manifest, guide) => {
           await this.ready;
           return this.addGame(manifest, guide);
+        },
+        saveActivity: async (game, id, patch, image, sessionId) => {
+          await this.ready;
+          return this.saveActivity(game, id, patch, image === void 0 ? void 0 : await this.imageFrom(image, sessionId));
+        },
+        removeActivity: async (id, what) => {
+          await this.ready;
+          if (what === "mine")
+            return this.resetActivity(id);
+          if (!await this.removeActivity(id))
+            throw new Error("\u6CA1\u6709\u8FD9\u4E2A\u6D3B\u52A8\uFF08\u53EF\u80FD\u5DF2\u7ECF\u7ED3\u675F\u88AB\u6E05\u6389\u4E86\uFF09");
+          return void 0;
         }
       }))
         registered.push(agent.tools.register({ ...tool2, execute: async (args, exec) => {
@@ -1430,9 +1664,13 @@ var AdgGameIntel = class extends Service {
             return settings;
           },
           "games/evidence": async (params) => {
+            await this.ready;
             const id = params.activityId;
-            if (calendar.get(id)?.screen?.evidence !== true)
+            const screen = calendar.get(id)?.screen;
+            if (screen?.evidence !== true)
               throw new Error("\u8FD9\u4E2A\u6D3B\u52A8\u6CA1\u6709\u4FDD\u5B58\u622A\u56FE");
+            if (screen.image !== void 0)
+              return this.picture(screen.image);
             return { mediaType: "image/png", data: (await readFile2(this.evidenceFile(id))).toString("base64") };
           },
           "games/image": async (params) => {
@@ -1491,9 +1729,18 @@ var AdgGameIntel = class extends Service {
           },
           "games/activity/remove": async (params) => {
             await this.ready;
-            await calendar.remove(params.activityId);
-            changed();
+            await this.removeActivity(params.activityId);
             return {};
+          },
+          "games/activity/save": async (params) => {
+            await this.ready;
+            const { game, activityId, image, todo, ...fields } = params;
+            return this.saveActivity(game, activityId, { ...fields, ...todo === void 0 ? {} : { todo } }, image === void 0 ? void 0 : Buffer.from(image.data, "base64"));
+          },
+          "games/activity/reset": async (params) => {
+            await this.ready;
+            const activity = await this.resetActivity(params.activityId);
+            return activity === void 0 ? {} : { activity };
           }
         }
       });
@@ -1508,6 +1755,14 @@ var AdgGameIntel = class extends Service {
    * gave are fetched: this is not a general-purpose proxy.
    */
   async picture(url) {
+    if (OWN_IMAGE.test(url) || SHOT_IMAGE.test(url)) {
+      const [kind, file] = url.split(":");
+      const mediaType2 = IMAGE_TYPES.find(([ext2]) => file.endsWith(`.${ext2}`))[1];
+      const bytes2 = await readFile2(join2(this.imageDir(kind), file)).catch(() => {
+        throw new Error("\u8FD9\u5F20\u56FE\u7247\u5DF2\u7ECF\u4E0D\u5728\u4E86");
+      });
+      return { mediaType: mediaType2, data: bytes2.toString("base64") };
+    }
     if (!this.calendar.pictures().has(url) && !this.games.some((g) => g.manifest.art === url))
       throw new Error("\u8FD9\u5F20\u56FE\u7247\u4E0D\u662F\u6570\u636E\u7AD9\u6216\u6E38\u620F\u5305\u7ED9\u7684\u5730\u5740");
     const name = createHash("sha256").update(url).digest("hex").slice(0, 32);
@@ -1584,6 +1839,96 @@ var AdgGameIntel = class extends Service {
     await this.loadGames(this.log);
     this.changed(gameId);
   }
+  // ── the user's own events ──
+  /**
+   * Add an event of the user's own, or write their word on one (see
+   * `Calendar.saveOwn`); `image`: a new picture, kept under
+   * `<data>/games/images/own/`. @throws Error with what is wrong.
+   */
+  async saveActivity(gameId, activityId, patch, image) {
+    const { manifest } = this.game(gameId);
+    if (activityId !== void 0 && this.calendar.get(activityId)?.game !== manifest.id)
+      throw new Error(`${manifest.name}\u6CA1\u6709\u6D3B\u52A8\u300C${activityId}\u300D\uFF08\u53EF\u80FD\u5DF2\u7ECF\u7ED3\u675F\u88AB\u6E05\u6389\u4E86\uFF1Bgame_activities \u53EF\u67E5\uFF09`);
+    const cover = image === void 0 ? patch.cover : await this.keepImage(image);
+    const activity = await this.calendar.saveOwn({ game: manifest.id, id: activityId }, { ...patch, ...cover === void 0 ? {} : { cover } }, this.clock.now(), manifest.timezone);
+    await this.sweepImages();
+    this.changed(manifest.id);
+    if (activity === void 0)
+      throw new Error("\u4EC0\u4E48\u90FD\u6CA1\u7559\u4E0B\uFF1A\u8FD9\u4E2A\u6D3B\u52A8\u53EA\u6709\u4F60\u586B\u7684\u5185\u5BB9\uFF0C\u6E05\u7A7A\u540E\u5C31\u4ECE\u65E5\u5386\u53BB\u6389\u4E86");
+    return activity;
+  }
+  /** Take back what the user wrote on an event. @returns it as it is now; undefined when it went. */
+  async resetActivity(activityId) {
+    const before = this.calendar.get(activityId);
+    if (before === void 0)
+      throw new Error("\u6CA1\u6709\u8FD9\u4E2A\u6D3B\u52A8\uFF08\u53EF\u80FD\u5DF2\u7ECF\u7ED3\u675F\u88AB\u6E05\u6389\u4E86\uFF09");
+    const timezone = this.games.find((g) => g.manifest.id === before.game)?.manifest.timezone ?? "Asia/Shanghai";
+    const activity = await this.calendar.resetOwn(activityId, timezone);
+    await this.sweepImages();
+    this.changed(before.game);
+    return activity;
+  }
+  async removeActivity(activityId) {
+    const removed = await this.calendar.remove(activityId);
+    await this.sweepImages();
+    this.changed();
+    return removed;
+  }
+  /**
+   * A picture for an event, as the agent names it: an http(s) address (fetched
+   * now and kept, so it stays when the page goes), a file on this computer
+   * (a path relative to the workspace is fine), or `screenshot`, the last
+   * screenshot of this conversation.
+   */
+  async imageFrom(source, sessionId) {
+    const from = source.trim();
+    if (from === "screenshot") {
+      const shot = sessionId === void 0 ? void 0 : this.ctx.get("adgIntervene")?.lastShot(sessionId);
+      if (shot === void 0)
+        throw new Error("\u8FD9\u4E2A\u5BF9\u8BDD\u8FD8\u6CA1\u6709\u622A\u56FE\uFF1A\u5148\u7528 screen_capture \u622A\u4E00\u5F20");
+      return shot;
+    }
+    if (/^https?:\/\//i.test(from)) {
+      const response = await fetch(from, { signal: AbortSignal.timeout(2e4), headers: { accept: "image/*", "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) MultiGameAssistant" } });
+      if (!response.ok)
+        throw new Error(`\u56FE\u7247\u8BFB\u4E0D\u5230\uFF1AHTTP ${response.status}`);
+      return Buffer.from(await response.arrayBuffer());
+    }
+    const path = from.replace(/^file:\/\/\/?/i, "");
+    const workspace = this.ctx.get("adgGateway")?.workspaceDir();
+    const full = isAbsolute(path) || workspace === void 0 ? path : resolve(workspace, path);
+    return readFile2(full).catch(() => {
+      throw new Error(`\u8BFB\u4E0D\u5230\u56FE\u7247\u6587\u4EF6\uFF1A${full}`);
+    });
+  }
+  /**
+   * Keep a picture the user added (`own`) or a screenshot an event was read
+   * from (`shot`), named by its content. @returns its address (`own:<hash>.<ext>`).
+   */
+  async keepImage(bytes, kind = "own") {
+    if (kind === "own" && bytes.length > MAX_IMAGE_BYTES)
+      throw new Error("\u56FE\u7247\u592A\u5927\uFF08\u6700\u591A 8 MB\uFF09");
+    const ext = imageType(bytes);
+    if (ext === void 0)
+      throw new Error("\u4E0D\u662F\u652F\u6301\u7684\u56FE\u7247\uFF08png\u3001jpg\u3001gif\u3001webp\u3001avif\uFF09");
+    const file = `${createHash("sha256").update(bytes).digest("hex").slice(0, 32)}.${ext}`;
+    const dir = this.imageDir(kind);
+    await mkdir2(dir, { recursive: true });
+    await writeFile(join2(dir, file), bytes);
+    return `${kind}:${file}`;
+  }
+  imageDir(kind) {
+    return join2(this.dir, "images", kind === "own" ? "own" : "shots");
+  }
+  /** Pictures the user added, and screenshots, that no event has any more. */
+  async sweepImages() {
+    for (const [kind, used] of [["own", this.calendar.ownImages()], ["shot", this.calendar.shotImages()]]) {
+      const dir = this.imageDir(kind);
+      const files = await readdir(dir).catch(() => []);
+      await Promise.all(files.filter((f) => !used.has(`${kind}:${f}`)).map((f) => rm(join2(dir, f), { force: true }).catch(() => {
+      })));
+    }
+  }
   /**
    * The scripts that play each game: the ones its pack lists, and installed
    * scripts whose id, name, repository or pack names it (script-match.ts),
@@ -1715,6 +2060,7 @@ var AdgGameIntel = class extends Service {
       results.push({ game: manifest.id, ok: failures.length === 0 || count > 0, count, ...failures.length === 0 ? {} : { detail: failures.join("\uFF1B") } });
       this.changed(manifest.id);
     }
+    await this.sweepImages();
     return results;
   }
   // ── what the agent read ──
@@ -1731,21 +2077,38 @@ var AdgGameIntel = class extends Service {
         return { ...event, source: { id: link.id, name: link.name } };
       return host === void 0 ? event : { ...event, source: { id: "agent", name: `${host}\uFF08agent \u67E5\u5230\uFF09` } };
     });
-    const written = await this.calendar.applyRead(gameId, from, credited, {
-      now: this.clock.now(),
-      timeZone: manifest.timezone,
-      sessionId,
-      ...shot === void 0 ? {} : {
-        evidence: async (activity) => {
-          await mkdir2(join2(this.dir, "evidence"), { recursive: true });
-          await writeFile(this.evidenceFile(activity.id), shot);
-          return true;
-        }
-      }
+    const kept = shot === void 0 ? void 0 : await this.keepImage(shot, "shot").catch((error) => {
+      this.log.warn(`screenshot not kept: ${error instanceof Error ? error.message : String(error)}`);
+      return void 0;
     });
+    const written = await this.calendar.applyRead(gameId, from, credited, { now: this.clock.now(), timeZone: manifest.timezone, sessionId, shot: kept });
+    await this.sweepImages();
     this.changed(gameId);
     return written;
   }
+  /**
+   * Screenshots kept before they were pictures: one file per event under
+   * `evidence/`. Each becomes a `shot:` picture (and its event's background).
+   */
+  async adoptEvidence() {
+    const shots = /* @__PURE__ */ new Map();
+    for (const a of this.calendar.list()) {
+      if (a.screen?.evidence !== true || a.screen.image !== void 0)
+        continue;
+      const file = this.evidenceFile(a.id);
+      const bytes = await readFile2(file).catch(() => void 0);
+      if (bytes === void 0)
+        continue;
+      const kept = await this.keepImage(bytes, "shot").catch(() => void 0);
+      if (kept === void 0)
+        continue;
+      shots.set(a.id, kept);
+      await rm(file, { force: true }).catch(() => {
+      });
+    }
+    await this.calendar.adoptShots(shots, (game) => this.games.find((g) => g.manifest.id === game)?.manifest.timezone ?? "Asia/Shanghai");
+  }
+  /** Where a screenshot was kept before `shot:` pictures. */
   evidenceFile(activityId) {
     return join2(this.dir, "evidence", `${activityId.replace(/[^\p{L}\p{N}-]+/gu, "_")}.png`);
   }
@@ -1945,6 +2308,20 @@ ${guide.trim()}
     return { channels, text };
   }
 };
+function imageType(bytes) {
+  const ascii = (from, to) => String.fromCharCode(...bytes.subarray(from, to));
+  if (bytes[0] === 137 && ascii(1, 4) === "PNG")
+    return "png";
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255)
+    return "jpg";
+  if (ascii(0, 4) === "GIF8")
+    return "gif";
+  if (ascii(0, 4) === "RIFF" && ascii(8, 12) === "WEBP")
+    return "webp";
+  if (ascii(4, 8) === "ftyp" && /^avi[fs]$/.test(ascii(8, 12)))
+    return "avif";
+  return void 0;
+}
 function hostName(url) {
   try {
     return new URL(url).hostname.replace(/^www\./, "");
@@ -1968,11 +2345,13 @@ export {
   DEFAULT_SETTINGS,
   DailyReport,
   GAME_ROLE,
+  OWN_FIELDS,
   buildReport,
   daysLeft,
   lib_default as default,
   gameTools,
   idKey,
+  imageType,
   leftText,
   localDay,
   nameKey,

package/lib/gateway.js

@@ -17,9 +17,9 @@ import {
   copyLabel,
   lib_default,
   streamFacts
-} from "./chunk-2DZ75ANX.js";
+} from "./chunk-ZQ6KFVEO.js";
 import "./chunk-CCAB6XXZ.js";
-import "./chunk-BL6OSR2I.js";
+import "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 export {
   AGENT_PRESET,

package/lib/guard.js

@@ -1,7 +1,7 @@
 import { createRequire as __adgCreateRequire } from 'node:module'; import { dirname as __adgDirname } from 'node:path'; import { fileURLToPath as __adgFileURLToPath } from 'node:url'; const require = __adgCreateRequire(import.meta.url); const __filename = __adgFileURLToPath(import.meta.url); const __dirname = __adgDirname(__filename);
 import {
   GUARD_CAPABILITY
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/guard/lib/index.js

package/lib/intervene.js

@@ -2,8 +2,8 @@ import { createRequire as __adgCreateRequire } from 'node:module'; import { dirn
 import {
   finalText,
   sessionConversations
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
@@ -11,7 +11,7 @@ import {
   INTERVENE_CAPABILITY,
   UPDATE_RULE,
   external_exports
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/intervene/lib/index.js