wezard 2.2.2 → 2.3.0

package/dist/daemon/jobs.js

@@ -8,16 +8,22 @@
 // 所以这里不做第二个编排器。**控制流始终留在发起那个 wizard 的上下文里** (它自己
 // spawn、自己 wait、自己汇总), 守护进程只持有一本账:
 //
-//   谁属于这个工单 · 谁是为它临时生出来的 · 收工时该收掉谁 · 群里该看见哪两条
+//   谁属于这个工单 · 谁是为它临时生出来的 · 收工时该收掉谁 · 各自落成了什么
 //
 // 这个取舍是有来由的: graph.ts 把控制流搬进了守护进程, 代价是 run 只能活在内存里,
 // reload 即丢。账本没有这个问题 —— 它是死的数据, 落盘即可; 而控制流留在 wizard
 // 那边, 重启之后它重试一次就接上了, 比恢复一个状态机简单一个数量级。
 //
-// 群里只出两条气泡 (开工 / 收工), 中间的每一次派活与回话照旧落在各自 wizard 的
-// rolepage —— 五个分身同时干活时, 十条交叉气泡里读不出结构, 两条能。
+// 工单整个是私下的: 开工、派活、回执、收工都不进群 —— 人看不懂这些过程, 结构留给
+// rolepage 的工单页读。群里只有发起者自己那一轮的最终回复, 用它自己的话收口。
 import { randomUUID } from "node:crypto";
 import { loadJsonMap } from "../shared/json-map-store.js";
+export const ACCEPTS = ["result", "artifact", "none"];
+/** 这份答复不合格的理由; 合格 = undefined。 */
+export const rejectReason = (accept, c) => accept === "none" ? undefined
+    : c.kind !== "result" || !c.text.trim() ? "没有 `RESULT:` 收口 (或 RESULT 后面是空的)"
+        : accept === "artifact" && !c.artifacts.length ? "没有列出 `ARTIFACT:` 交付物"
+            : undefined;
 /** 一个工单最多带这么多成员 —— 不是能力上限, 是"忘了收"的刹车: 每个成员都是一个
  *  tmux pane 加一份上下文, 而 fd 是有限的 (见 launchd plist 的 NumberOfFiles)。 */
 export const JOB_MEMBER_MAX = 12;
@@ -32,9 +38,17 @@ const dropStale = (map) => {
 export const loadJobStore = (filePath) => {
     const db = loadJsonMap(filePath, dropStale);
     return {
-        open: (base, owner, title) => {
+        open: (base, owner, title, { plan, expect, maxTurns, accept } = {}) => {
             const id = newId();
-            return db.set(id, { id, base, owner, title, members: [], status: "open", openedAt: Date.now() });
+            return db.set(id, { id, base, owner, title, ...(plan ? { plan } : {}), ...(accept && accept !== "result" ? { accept } : {}), ...(expect ? { expect } : {}), ...(maxTurns ? { maxTurns, turns: 0 } : {}), members: [], status: "open", openedAt: Date.now() });
+        },
+        spend: (id) => {
+            const j = db.get(id);
+            if (!j)
+                return undefined;
+            const turns = (j.turns ?? 0) + 1;
+            db.set(id, { ...j, turns });
+            return { turns, ...(j.maxTurns ? { maxTurns: j.maxTurns } : {}) };
         },
         get: db.get,
         attach: (id, member) => {
@@ -43,31 +57,56 @@ export const loadJobStore = (filePath) => {
                 return undefined;
             const rest = j.members.filter((x) => x.target !== member.target);
             const prev = j.members.find((x) => x.target === member.target);
-            return db.set(id, { ...j, members: [...rest, { ...member, spawned: member.spawned || !!prev?.spawned, at: Date.now() }] });
+            // 再派一段 (含 re 续问) = 它又在干了: 旧的定论作废, 不然「全部到齐」会提前报、
+            // close_job 会把还在干活的它收掉。
+            return db.set(id, { ...j, members: [...rest, { ...member, task: member.task || prev?.task || "", spawned: member.spawned || !!prev?.spawned, at: Date.now() }] });
+        },
+        settle: (id, target, outcome, artifacts) => {
+            const j = db.get(id);
+            if (!j || j.status !== "open" || !j.members.some((x) => x.target === target && !x.outcome))
+                return undefined;
+            return db.set(id, {
+                ...j,
+                members: j.members.map((x) => (x.target === target ? { ...x, outcome, ...(artifacts?.length ? { artifacts } : {}) } : x)),
+            });
+        },
+        tally: (id) => {
+            const j = db.get(id);
+            return j && { done: j.members.filter((x) => x.outcome).length, total: Math.max(j.members.length, j.expect ?? 0) };
         },
         close: (id, summary) => {
             const j = db.get(id);
             return j ? db.set(id, { ...j, status: "closed", closedAt: Date.now(), summary }) : undefined;
         },
+        detach: (target) => Object.values(db.all())
+            .filter((j) => j.status === "open" && j.members.some((x) => x.target === target && !x.outcome))
+            .map((j) => db.set(j.id, {
+            ...j,
+            members: j.members.map((x) => (x.target === target && !x.outcome ? { ...x, outcome: "canceled" } : x)),
+        }).id),
         openOf: (base) => Object.values(db.all()).filter((j) => j.base === base && j.status === "open").sort((a, b) => b.openedAt - a.openedAt),
         all: () => Object.values(db.all()),
     };
 };
-// ── 纯渲染 ────────────────────────────────────────────────────────────
-const firstLine = (s, max = 90) => {
-    const t = (s.split("\n")[0] ?? "").trim();
-    return t.length > max ? `${t.slice(0, max)}…` : t;
-};
-/** 开工气泡 —— 工单存在这件事本身。成员此刻还没有, 所以这一条只说要干什么。 */
-export const renderJobOpen = (job, plan) => [`📋 \`${job.id}\` 开工 · **${job.title}**`, plan.trim() ? firstLine(plan, 300) : ""].filter(Boolean).join("\n");
-/** 收工气泡 —— 谁干了什么、结论是什么。成员名字挂各自的 rolepage, 人想看某一路
- *  的来龙去脉就点进去, 不必在群里翻交叉的气泡。 */
-export const renderJobClose = (job, label, recycled) => [
-    `📋 \`${job.id}\` 收工 · **${job.title}**`,
-    ...job.members.map((mm) => `- ${label(mm.target)}${mm.task ? ` · ${firstLine(mm.task)}` : ""}`),
-    job.summary?.trim() ? `\n${job.summary.trim()}` : "",
-    recycled > 0 ? `(已回收 ${recycled} 个临时分身)` : "",
-]
-    .filter(Boolean)
-    .join("\n");
+/** 收工的工单 → 一条情景记忆 (见 wizard-memory.ts)。名字、sessionId、聊天名由调用方给:
+ *  这里不碰注册表。sid 要在回收分身**之前**取 —— 收掉之后绑定就没了, transcript 是唯一的现场。 */
+export const jobEpisode = (job, o) => ({
+    at: job.closedAt ?? Date.now(),
+    kind: "job",
+    name: o.nameOf(job.owner),
+    sid: o.sidOf(job.owner),
+    chat: o.chat,
+    job: job.id,
+    title: job.title,
+    openedAt: job.openedAt,
+    text: job.summary ?? "",
+    members: job.members.map((mm) => ({
+        name: o.nameOf(mm.target),
+        sid: o.sidOf(mm.target),
+        spawned: mm.spawned,
+        task: mm.task,
+        ...(mm.outcome ? { outcome: mm.outcome } : {}),
+        ...(mm.artifacts?.length ? { artifacts: mm.artifacts } : {}),
+    })),
+});
 //# sourceMappingURL=jobs.js.map

package/dist/daemon/jobs.js.map

@@ -1 +1 @@
-{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../../daemon/jobs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../../daemon/jobs.ts"],"names":[],"mappings":"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"}

package/dist/daemon/last-response.js

@@ -21,6 +21,11 @@ const bareFromFrame = (frame) => {
     return "";
 };
 const lastByBareId = new Map();
+// SDK 的回执失败 reject 的是回执帧 ({errcode, errmsg}) 而不是 Error —— 只读 .message 会把拒收原因记成 undefined。
+export const errText = (e) => {
+    const f = e;
+    return f?.message ?? (f?.errcode !== undefined ? `errcode=${f.errcode} ${f.errmsg ?? ""}`.trim() : String(e));
+};
 export const getLastResponse = (target) => lastByBareId.get(principalToBare(target));
 const record = (bareId, content) => {
     if (!bareId || !content)
@@ -70,7 +75,17 @@ export const installResponseTracker = (client, log) => {
             record(bareFromFrame(frame), content);
         return r;
     };
+    // reload 窗口: 新进程恢复 mirror 后立刻有终句要推, 而 WS 还没鉴权完 —— SDK 直接抛
+    // "WebSocket not connected", 那条消息就永久丢了 (近两天十几条都是这么没的)。主动推送
+    // 不赶这几秒: 先等连上再发, 等不到再照常失败。
+    const CONNECT_WAIT_MS = 30_000;
+    const untilConnected = async () => {
+        for (const t0 = Date.now(); !client.isConnected && Date.now() - t0 < CONNECT_WAIT_MS;) {
+            await new Promise((r) => setTimeout(r, 500));
+        }
+    };
     client.sendMessage = async (chatid, body) => {
+        await untilConnected();
         // Only markdown pushes carry quotable text (and are the empty-message
         // risk class); template_card / media bubbles pass through untouched.
         if (body.msgtype === "markdown") {

package/dist/daemon/last-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"last-response.js","sourceRoot":"","sources":["../../daemon/last-response.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"last-response.js","sourceRoot":"","sources":["../../daemon/last-response.ts"],"names":[],"mappings":"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"}

package/dist/daemon/memory-steward.js

@@ -1,82 +1,138 @@
 // 共享记忆的整理者 —— 群 / 工作区记忆唯一的写入者 (人除外)。
 //
-// 它不是一个常驻 wizard, 而是一条定时任务: gate 在 daemon 侧看收件箱有没有提议,
-// 有才新起一个白板 wizard 去合并, 合并完即收。整理不放进管家 (default wizard) 的
-// 上下文 —— 管家的上下文只留给名册和分派; 这是 Letta 的 sleep-time agent 与主
-// agent 分开的同一个理由: 在线的那个不该被后台活拖慢。
+// 它不是一个常驻 wizard, 也不是一条定时任务: daemon 开机就挂一个内部定时器, 每轮
+// 看收件箱有没有提议, 有才起一个白板 wizard 去合并, 合并完即收。整理不放进管家
+// (default wizard) 的上下文 —— 管家的上下文只留给名册和分派; 这是 Letta 的 sleep-time
+// agent 与主 agent 分开的同一个理由: 在线的那个不该被后台活拖慢。
 //
-// 任务文件只在缺失时写一次: 它是源码, 人和 wizard 会直接改 (换频率、改合并规则),
-// daemon 不能每次开机都覆盖回去。
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+// 不走 tasks.ts 是因为它不是谁排的日程: 任务会出现在 list_tasks / 日程里, 放枪要发
+// ⏰ 气泡, 执行体落在某个群里 —— 而整理是 daemon 自己的家务, 不该惊动任何群。所以
+// 执行体住在一个不属于任何聊天的内部 key 上 (`INTERNAL_BASE`), 私聊信封、零气泡,
+// 结果只留在它的 rolepage 和 `memory/log/` 的审计日志里。
+import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, unlinkSync } from "node:fs";
+import { dirname, join, relative } from "node:path";
 import { expandHome } from "../shared/paths.js";
+import { envelopeAttrs, renderReminder } from "../shared/reminder.js";
+import { INTERNAL_BASE, keyOf } from "../shared/session-label.js";
 import { TASKS_DIR, fileOfTaskId } from "../shared/task-file.js";
-export const STEWARD_TASK_ID = "memory-steward";
+export const STEWARD_ID = "memory-steward";
+/** 执行体的 key: 内部 base, 不进任何群的名册。每轮复用同一个 —— 同时只跑一轮。 */
+export const STEWARD_TARGET = keyOf(INTERNAL_BASE, "steward");
+export const STEWARD_EVERY_MS = 30 * 60_000;
+/** 执行体一轮的上限; 超了照样收掉, 认领留着等孤儿回收。 */
+export const STEWARD_RUN_MS = 30 * 60_000;
 // 认领 = 改名 (`x.jsonl` → `x.claimed-<ms>.jsonl`): 认领之后新来的提议落进一个新的
 // `x.jsonl`, 等下一轮, 不会和正在合并的那批搅在一起。整理者中途死掉留下的认领
 // 超过一小时再认一次 —— 按文件名里的时刻判, 不按 mtime (改名不动 mtime)。
-const source = (root) => `// wezard 定时任务 · ${STEWARD_TASK_ID}
-// 共享记忆 (群 / 工作区) 的整理者: wizard_remember({scope:"chat"|"workspace"}) 不直写记忆,
-// 只往 ${root}/inbox/ 投提议; 这条任务有提议才新起一个白板 wizard 合并进 md。
-// 这份文件就是配置, 直接改, 存盘即生效。删掉它 daemon 下次开机会按默认重建;
-// 想停用改 enabled: false。
-import { existsSync, readdirSync, renameSync } from "node:fs";
-import { join } from "node:path";
-
-const ROOT = ${JSON.stringify(root)};
-const INBOX = join(ROOT, "inbox");
-const RECLAIM_MS = 60 * 60 * 1000;
-const CLAIMED = /\\.claimed-(\\d+)\\.jsonl$/;
-
-const inboxes = () => ["chats", "workspaces"].flatMap((d) => {
-  const dir = join(INBOX, d);
-  return existsSync(dir) ? readdirSync(dir).filter((f) => f.endsWith(".jsonl")).map((f) => join(dir, f)) : [];
+const RECLAIM_MS = 60 * 60_000;
+const CLAIMED = /\.claimed-(\d+)\.jsonl$/;
+// ── 纯函数 ─────────────────────────────────────────────────────────
+const claimedAt = (f) => Number(f.match(CLAIMED)?.[1] ?? NaN);
+/** 这一轮该认领哪些: 没认领过的, 以及认领超过 `reclaimMs` 还没归档的孤儿。 */
+export const planRound = (files, now, reclaimMs = RECLAIM_MS) => ({
+    fresh: files.filter((f) => !CLAIMED.test(f)),
+    orphaned: files.filter((f) => CLAIMED.test(f) && now - claimedAt(f) > reclaimMs),
 });
-
-export default {
-  note: "有新的群/工作区记忆提议就合并进共享记忆",
-  fresh: true,
-  enabled: true,
-  when: ({ every }) => every(30),
-
-  gate: async ({ now, log }) => {
-    const t = now.getTime();
-    const all = inboxes();
-    // 重新认领的孤儿也换上这一刻的时间戳, 否则它下一轮还算孤儿, 会被再派一遍。
-    const claim = (f) => {
-      const c = f.replace(CLAIMED, ".jsonl").replace(/\\.jsonl$/, ".claimed-" + t + ".jsonl");
-      renameSync(f, c);
-      return c;
-    };
-    const fresh = all.filter((f) => !CLAIMED.test(f));
-    const orphaned = all.filter((f) => t - Number(f.match(CLAIMED)?.[1] ?? t) > RECLAIM_MS);
-    const files = [...fresh, ...orphaned].map(claim);
-    log("claimed=" + fresh.length + " orphaned=" + orphaned.length);
-    if (!files.length) return false;
-    return { vars: { files: files.map((f) => "- " + f).join("\\n") } };
-  },
-
-  prompt: [
-    "整理 wezard 的共享记忆。下面每个文件是一个收件箱, 一行一条别的 wizard 提交的提议 (json: at 时刻, by 提议者, note 要记住的一句, forget 要删掉的那条里的一个子串):",
-    "{{files}}",
+/** 认领后的文件名。孤儿也换上这一刻的时间戳, 否则它下一轮还算孤儿, 会被再派一遍。 */
+export const claimedName = (f, t) => f.replace(CLAIMED, ".jsonl").replace(/\.jsonl$/, `.claimed-${t}.jsonl`);
+/** 收件箱 → 它要并进的那份 md: 去掉 `/inbox/`, `.claimed-<ms>.jsonl` → `.md`。 */
+export const mdOfInbox = (root, f) => join(root, relative(join(root, "inbox"), f)).replace(CLAIMED, ".md").replace(/\.jsonl$/, ".md");
+/** 收件箱 → 审计日志: `log/<chats|workspaces>/<同名>.jsonl`。 */
+export const logOfInbox = (root, f) => join(root, "log", relative(join(root, "inbox"), f)).replace(CLAIMED, ".jsonl");
+const pairLines = (root, refsOf) => (f) => {
+    const md = mdOfInbox(root, f);
+    const refs = refsOf?.(md) ?? [];
+    return [`- ${f} → ${md}`, ...(refs.length ? [`  只读参考: ${refs.join(" , ")}`] : [])];
+};
+export const stewardPrompt = (root, files, refsOf) => [
+    "整理 wezard 的共享记忆。下面每一行是一对 收件箱 → 记忆 md; 收件箱一行一条别的 wizard 提交的提议 (json: at 时刻, by 提议者, note 要记住的一句, forget 要删掉的那条里的一个子串):",
+    ...files.flatMap(pairLines(root, refsOf)),
     "",
-    "每个收件箱对应一份记忆 md: 路径去掉 /inbox/, 再把 .claimed-<数字>.jsonl 换成 .md (例: " + ROOT + "/inbox/chats/x.claimed-1.jsonl → " + ROOT + "/chats/x.md; 不存在就新建)。对每一份:",
-    "1. 读 md 全文和收件箱的全部提议。",
-    "2. 逐条决定: 新增 / 改写已有的那条 (新的更准, 或推翻了旧的) / 删除 (forget 命中, 或已被推翻、过时) / 不动 (重复, 或只是某次任务的临时状态, 不值得跨会话记住)。",
-    "3. 重写 md: 每条一行 \\"- 一句话\\", 相近的合并, 同主题的放一起, 全文控制在 3000 字以内。人手写的内容与格式保留, 除非提议明确推翻它。",
-    "4. 写完把收件箱归档进审计日志再删掉: cat <收件箱> >> " + ROOT + "/log/<chats 或 workspaces>/<同名>.jsonl && rm <收件箱> (log 目录不存在就先建)。",
+    "md 不存在就新建。对每一对:",
+    "1. 读 md 全文和收件箱的全部提议; 带「只读参考」的, 把参考文件也读了 (不存在就跳过) —— 那是已经生效的规矩, 你不改它。",
+    "2. 逐条决定: 新增 / 改写已有的那条 (新的更准, 或推翻了旧的) / 删除 (forget 命中, 或已被推翻、过时) / 不动 (重复, 或只是某次任务的临时状态, 不值得跨会话记住, 或参考文件里已经写了)。跟参考文件矛盾的提议不收进 md (参考文件是人写的, 优先), 记作冲突。",
+    "3. 重写 md: 每条一行 \"- 一句话\", 相近的合并, 同主题的放一起, 全文控制在 3000 字以内。人手写的内容与格式保留, 除非提议明确推翻它。",
     "",
-    "只动上面列出的收件箱和它们对应的 md / log, 别的一概不碰。全部处理完用一行 RESULT: 汇报每份记忆 新增/改写/删除 各几条。",
-  ].join("\\n"),
+    "只动上面列出的 md, 收件箱和参考文件只读不改 (归档由守护进程在你收工后做), 别的一概不碰。全部处理完用一行 RESULT: 汇报每份记忆 新增/改写/删除 各几条; 有冲突的, 在 RESULT 之前每条一行 `冲突: <md> · <提议原文> ↔ <参考文件>`。",
+].join("\n");
+/** 私聊信封: 这一轮不属于任何群, 回复哪儿也不发。 */
+export const stewardEnvelope = () => renderReminder({ ...envelopeAttrs.task(STEWARD_ID), scope: "private" }, [
+    "这一轮是守护进程内建的共享记忆整理放进来的, 不属于任何群、没有人在等 —— 照常执行, 回复只留在 rolepage, 不要 notify / tell_peer 任何人。",
+]);
+// ── 边界 IO ────────────────────────────────────────────────────────
+const inboxes = (root) => ["chats", "workspaces"].flatMap((d) => {
+    const dir = join(root, "inbox", d);
+    return existsSync(dir) ? readdirSync(dir).filter((f) => f.endsWith(".jsonl")).map((f) => join(dir, f)) : [];
+});
+const claim = (t) => (f) => {
+    const c = claimedName(f, t);
+    renameSync(f, c);
+    return c;
 };
-`;
-/** 缺了就写一份默认的整理任务; 已有就不碰 (那是别人可能改过的源码)。 */
-export const ensureStewardTask = (memoryRoot, tasksDir = TASKS_DIR) => {
-    const dir = expandHome(tasksDir);
-    const file = fileOfTaskId(dir, STEWARD_TASK_ID);
-    if (existsSync(file))
-        return file;
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(file, source(memoryRoot));
-    return file;
+const contentOf = (f) => (existsSync(f) ? readFileSync(f, "utf8") : "");
+const archive = (root) => (f) => {
+    if (!existsSync(f))
+        return;
+    const dest = logOfInbox(root, f);
+    mkdirSync(dirname(dest), { recursive: true });
+    appendFileSync(dest, readFileSync(f));
+    unlinkSync(f);
+};
+/** 老版本把整理者写成了一条定时任务。改名停用而不是删 —— 那份文件人可能改过;
+ *  留着它就是两路并跑。返回停用后的路径, 没有就 undefined。 */
+export const retireStewardTask = (tasksDir = TASKS_DIR) => {
+    const file = fileOfTaskId(expandHome(tasksDir), STEWARD_ID);
+    if (!existsSync(file))
+        return undefined;
+    const to = `${file}.retired`;
+    renameSync(file, to);
+    return to;
+};
+export const startSteward = ({ root, log, run, everyMs = STEWARD_EVERY_MS, refsOf, onMerged }) => {
+    let running = false;
+    const round = async () => {
+        if (running)
+            return;
+        running = true;
+        try {
+            const t = Date.now();
+            const { fresh, orphaned } = planRound(inboxes(root), t);
+            if (!fresh.length && !orphaned.length)
+                return;
+            const files = [...fresh, ...orphaned].map(claim(t));
+            log.info({ fresh: fresh.length, orphaned: orphaned.length }, "memory steward: claimed");
+            // 同一份 md 可能对着两个收件箱 (新提议 + 孤儿), 去重后再拍快照。
+            const mds = [...new Set(files.map((f) => mdOfInbox(root, f)))];
+            const before = new Map(mds.map((md) => [md, contentOf(md)]));
+            const r = await run(stewardPrompt(root, files, refsOf));
+            if (!r.ok) {
+                log.warn({ reason: r.reason, files }, "memory steward: run did not finish, claims left for reclaim");
+                return;
+            }
+            files.forEach(archive(root));
+            const changed = mds.filter((md) => contentOf(md) !== before.get(md));
+            log.info({ archived: files.length, changed }, "memory steward: merged");
+            if (changed.length) {
+                try {
+                    onMerged?.(changed);
+                }
+                catch (e) {
+                    log.warn({ err: e.message }, "memory steward: onMerged threw");
+                }
+            }
+        }
+        catch (e) {
+            log.warn({ err: e.message }, "memory steward: round failed");
+        }
+        finally {
+            running = false;
+        }
+    };
+    // 开机后先跑一轮: 定时器随每次 reload 重新计时, 频繁 reload 时只靠间隔会一直轮不到。
+    const first = setTimeout(() => { void round(); }, 60_000);
+    const timer = setInterval(() => { void round(); }, everyMs);
+    first.unref();
+    timer.unref();
+    return { stop: () => { clearTimeout(first); clearInterval(timer); } };
 };
 //# sourceMappingURL=memory-steward.js.map

package/dist/daemon/memory-steward.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-steward.js","sourceRoot":"","sources":["../../daemon/memory-steward.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,EAAE;AACF,sDAAsD;AACtD,wDAAwD;AACxD,wDAAwD;AACxD,iCAAiC;AACjC,EAAE;AACF,kDAAkD;AAClD,sBAAsB;AACtB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEhD,gEAAgE;AAChE,+CAA+C;AAC/C,iDAAiD;AACjD,MAAM,MAAM,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,oBAAoB,eAAe;;QAEpE,IAAI;;;;;;eAMG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8ClC,CAAC;AAEF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,WAAmB,SAAS,EAAU,EAAE;IAC5F,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAChD,IAAI,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"memory-steward.js","sourceRoot":"","sources":["../../daemon/memory-steward.ts"],"names":[],"mappings":"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"}