mcp-agents-memory 0.9.20 → 0.9.22

package/README.ko.md

@@ -106,7 +106,7 @@
   mcp-agents-memory coldpath    # MCP 서버 없이 Cold Path 워커만 도는 데몬 (systemd 권장)
   ```
   데몬은 PostgreSQL advisory lock으로 **싱글톤** 보장 — 인스턴스가 몇 개든 락을 잡은 1개만 처리한다(중복 방지·자동 failover).
-- **버즈 (선택)**: `mcp-agents-memory buzz-ingest`는 지정한 신원이 멤버인 버즈 방의 채팅을 공식 `buzz` CLI로 한 건씩 메모리에 옮긴다. 타이머로 돌리고, 설정은 CHANGELOG 0.9.20 참고.
+- **버즈 (선택)**: `mcp-agents-memory buzz-ingest`는 지정한 신원이 멤버인 버즈 방의 채팅을 공식 `buzz` CLI로 한 건씩 메모리에 옮긴다. 인용된 글이 전부 행으로 들어오면 캡처된 버즈 턴의 이전 대화 인용도 걷어낸다(원문은 `raw_message`, 끄려면 `--no-reclean`). 타이머로 돌리고, 설정은 CHANGELOG 0.9.20–0.9.21 참고.
 
 ### Cold Path LLM 백엔드 (config로 교체)
 

package/README.md

@@ -107,7 +107,7 @@ When several machines share **one** database, the Cold Path (tagging / profiling
   mcp-agents-memory coldpath    # Cold Path worker only, no MCP server (systemd recommended)
   ```
   The daemon is a **singleton** via a PostgreSQL advisory lock — no matter how many instances exist, only the one holding the lock processes (dedup + automatic failover).
-- **Buzz (optional)**: `mcp-agents-memory buzz-ingest` copies chat messages from the Buzz rooms a given identity is a member of into memory, one row per message, through the official `buzz` CLI. Run it from a timer; see CHANGELOG 0.9.20 for the settings.
+- **Buzz (optional)**: `mcp-agents-memory buzz-ingest` copies chat messages from the Buzz rooms a given identity is a member of into memory, one row per message, through the official `buzz` CLI. It also strips the quoted history from captured Buzz turns once every quoted message exists as a row (the original stays in `raw_message`; `--no-reclean` turns this off). Run it from a timer; see CHANGELOG 0.9.20–0.9.21 for the settings.
 
 ### Cold Path LLM backend
 

package/build/index.js

@@ -32762,17 +32762,19 @@ function locateBuzzContext(text) {
   }
   return CONTEXT_OPEN.test(rest.slice(pos, pos + 12)) ? { rest, pos } : null;
 }
-function cleanBuzzEnvelope(message) {
+function cleanBuzzEnvelope(message, opts = {}) {
   try {
     const text = message.trimStart();
-    if (!text.startsWith("<base>")) return null;
+    const hasBase = text.startsWith("<base>");
+    if (!hasBase && !opts.baseless) return null;
     const loc = locateBuzzContext(text);
     if (!loc) return null;
     const { rest, pos } = loc;
     const bodyStart = rest.indexOf("\n", pos) + 1;
     const contextClose = rest.indexOf(CONTEXT_CLOSE, bodyStart - 1);
     if (contextClose < 0) return null;
-    const contextBody = rest.slice(bodyStart, contextClose).replace(/\r$/, "");
+    const contextBody = rest.slice(bodyStart, contextClose).replace(/\r+$/, "");
+    if (!hasBase && !(BUZZ_SCOPE.test(contextBody) && BUZZ_CHANNEL.test(contextBody))) return null;
     const tail = rest.slice(contextClose + CONTEXT_CLOSE.length);
     let turnStart = 0;
     const history = HISTORY_OPEN.exec(tail);
@@ -32798,6 +32800,37 @@ ${turnText}`;
     return null;
   }
 }
+function buzzQuotedMessages(message) {
+  try {
+    const loc = locateBuzzContext(message.trimStart());
+    if (!loc) return null;
+    const { rest, pos } = loc;
+    const contextClose = rest.indexOf(CONTEXT_CLOSE, pos);
+    if (contextClose < 0) return null;
+    const tail = rest.slice(contextClose + CONTEXT_CLOSE.length);
+    const history = HISTORY_OPEN.exec(tail);
+    if (!history) return [];
+    const closeTag = `</${history[1]}>`;
+    const close = tail.indexOf(closeTag, history[0].length);
+    if (close < 0) return null;
+    const body = tail.slice(history[0].length, close).replace(/^\r?\n/, "").replace(/\r?\n$/, "");
+    if (!body.trim()) return [];
+    const out = [];
+    for (const line of body.split(/\r?\n/)) {
+      const e = QUOTE_ENTRY.exec(line);
+      if (e && Number(e[1]) === out.length + 1) {
+        out.push({ pubkey: e[2], time: e[3], content: line.slice(e[0].length) });
+      } else if (out.length > 0) {
+        out[out.length - 1].content += "\n" + line;
+      } else {
+        return null;
+      }
+    }
+    return out;
+  } catch {
+    return null;
+  }
+}
 function buzzEmbeddingText(message) {
   try {
     if (!message.startsWith("<context>\n")) return message;
@@ -32843,7 +32876,7 @@ function venueFromBuzzMessage(message) {
     return null;
   }
 }
-var PREAMBLE_BLOCKS, HISTORY_OPEN, TURN_OPEN, TURN_IN_DROPPED, CONTEXT_OPEN, CONTEXT_CLOSE, EVENT_HEADER;
+var PREAMBLE_BLOCKS, HISTORY_OPEN, TURN_OPEN, TURN_IN_DROPPED, CONTEXT_OPEN, BUZZ_SCOPE, BUZZ_CHANNEL, CONTEXT_CLOSE, QUOTE_ENTRY, EVENT_HEADER;
 var init_buzz_envelope = __esm({
   "src/auto_save/buzz_envelope.ts"() {
     "use strict";
@@ -32852,7 +32885,10 @@ var init_buzz_envelope = __esm({
     TURN_OPEN = /^\s*<(?:what-you-were-working-on|buzz-events?|new-message-arrived-while-you-were-working)[\s>]/;
     TURN_IN_DROPPED = /(?:^|>)[ \t]*<(?:what-you-were-working-on|buzz-events?|new-message-arrived-while-you-were-working)[\s>]/m;
     CONTEXT_OPEN = /^<context>\r?\n/;
+    BUZZ_SCOPE = /^Scope: (?:thread|channel|dm)\r?\n/;
+    BUZZ_CHANNEL = /(?:^|\n)Channel: .+ \(#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\)\r?(?=\n|$)/;
     CONTEXT_CLOSE = "\n</context>";
+    QUOTE_ENTRY = /^\[(\d+)\] .*? \(([0-9a-f]{64})\) \((\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)?(?:Z|[+-]\d\d:\d\d))\): ?/;
     EVENT_HEADER = /^(?:Event ID: [0-9a-f]{64}|Kind: \d+|Time: \d{4}-\d{2}-\d{2}T\S+|--- Event \d+ \(.*\) ---|Note: A new message arrived while you were working\..*)\s*$/;
   }
 });
@@ -33328,6 +33364,102 @@ async function hideDeleted(targets, dryRun) {
   const r = await db.query(sql, [uuids]);
   return Number(r.rows[0]?.n ?? 0);
 }
+async function replaceWithCleaned(id, cleaned, original, venue) {
+  const client2 = await db.getClient();
+  try {
+    await client2.query("BEGIN");
+    await client2.query("SET LOCAL lock_timeout = '2s'");
+    const r = await client2.query(
+      `UPDATE memory
+          SET message = $2, raw_message = $3, venue = coalesce(venue, $4),
+              p_tag_id = NULL, d_tag = '{}', tag_processed = FALSE, embedding = NULL, cold_error = NULL
+        WHERE id = $1 AND raw_message IS NULL AND message = $3`,
+      [id, cleaned, original, venue]
+    );
+    await client2.query("COMMIT");
+    client2.release();
+    return (r.rowCount ?? 0) > 0;
+  } catch (err3) {
+    let broken;
+    await client2.query("ROLLBACK").catch((e) => broken = e);
+    client2.release(broken);
+    if (err3.code !== "55P03") throw err3;
+    return false;
+  }
+}
+async function healBaseEnvelopes(userId, budget, dryRun) {
+  const rows = (await db.query(
+    `SELECT id, message, device_name FROM memory
+      WHERE user_id = $1 AND role = 'user' AND raw_message IS NULL AND message ~ '^\\s*<base>'
+        AND agent_platform <> 'buzz' AND is_active AND NOT is_pinned
+      ORDER BY created_at, id`,
+    [userId]
+  )).rows;
+  const byDevice = {};
+  let healed = 0;
+  let ready = 0;
+  let rejected = 0;
+  for (const r of rows) {
+    const cleaned = cleanBuzzEnvelope(r.message);
+    if (cleaned === null) {
+      rejected++;
+      continue;
+    }
+    if (healed >= budget) {
+      ready++;
+      continue;
+    }
+    if (dryRun || await replaceWithCleaned(Number(r.id), cleaned, r.message, buzzTurnVenue(cleaned))) {
+      healed++;
+      const d = r.device_name ?? "unknown";
+      byDevice[d] = (byDevice[d] ?? 0) + 1;
+    } else {
+      ready++;
+    }
+  }
+  return { healed, byDevice, ready, rejected };
+}
+async function recleanEnvelopes(userId, budget, dryRun) {
+  const rows = (await db.query(
+    `SELECT id, message, venue FROM memory
+      WHERE user_id = $1 AND role = 'user' AND raw_message IS NULL AND message LIKE '<context>%'
+        AND agent_platform <> 'buzz' AND is_active AND NOT is_pinned
+      ORDER BY created_at, id`,
+    [userId]
+  )).rows;
+  const cands = [];
+  let stuck = 0;
+  for (const r of rows) {
+    const cleaned = cleanBuzzEnvelope(r.message, { baseless: true });
+    const quotes = buzzQuotedMessages(r.message);
+    if (cleaned === null && quotes !== null && quotes.length === 0) continue;
+    const venue = [r.venue, venueFromBuzzMessage(r.message)].find((v) => typeof v === "string" && v.startsWith("buzz")) ?? null;
+    const q = (quotes ?? []).map((x) => ({ ms: Date.parse(x.time), text: norm(x.content) }));
+    if (cleaned === null || quotes === null || !venue || q.some((x) => !Number.isFinite(x.ms))) {
+      if (venue || looksLikeBuzzTurn(r.message)) stuck++;
+      continue;
+    }
+    cands.push({ id: Number(r.id), message: r.message, cleaned, venue, quotes: q });
+  }
+  const times = [...new Set(cands.flatMap((c) => c.quotes.map((x) => x.ms)))];
+  const have = /* @__PURE__ */ new Set();
+  if (times.length) {
+    const r = await db.query(
+      `SELECT venue, created_at, raw_message FROM memory
+        WHERE user_id = $1 AND agent_platform = 'buzz' AND external_uuid LIKE 'buzz:%'
+          AND raw_message IS NOT NULL AND created_at = ANY($2::timestamptz[])`,
+      [userId, times.map((ms) => new Date(ms).toISOString())]
+    );
+    for (const row of r.rows) have.add(`${row.venue}\0${new Date(row.created_at).getTime()}\0${norm(row.raw_message)}`);
+  }
+  const ready = cands.filter((c) => c.quotes.every((x) => have.has(`${c.venue}\0${x.ms}\0${x.text}`)));
+  stuck += cands.length - ready.length;
+  let n = 0;
+  for (const c of ready.slice(0, Math.max(0, budget))) {
+    if (dryRun || await replaceWithCleaned(c.id, c.cleaned, c.message, c.venue)) n++;
+  }
+  return { recleaned: n, ready: ready.length - n, stuck };
+}
 async function runBuzzIngest(opts = {}) {
   const dryRun = opts.dryRun ?? false;
   const max = opts.max ?? 20;
@@ -33362,10 +33494,17 @@ async function runBuzzIngest(opts = {}) {
     inserted: 0,
     edited: 0,
     hidden: 0,
+    healed: 0,
+    healedByDevice: {},
+    healReady: 0,
+    healRejected: 0,
+    recleaned: 0,
+    envelopesReady: 0,
+    envelopesStuck: 0,
     byVenue: {},
     ...dryRun ? { unsupported } : {}
   };
-  const userId = dryRun ? 0 : await getDefaultUserId();
+  const userId = dryRun ? Number((await db.query(`SELECT user_id FROM users WHERE user_name = $1`, [process.env.USER_NAME ?? "hoon"])).rows[0]?.user_id ?? 0) : await getDefaultUserId();
   for (const { e, venue } of batch) {
     report.byVenue[venue] = (report.byVenue[venue] ?? 0) + 1;
     if (dryRun) {
@@ -33393,6 +33532,17 @@ async function runBuzzIngest(opts = {}) {
   }
   report.edited = await applyEdits(latestEdits(edits), dryRun);
   report.hidden = await hideDeleted([...deleteTargets], dryRun);
+  if (!opts.noReclean && userId > 0) {
+    const heal = await healBaseEnvelopes(userId, max - batch.length, dryRun);
+    report.healed = heal.healed;
+    report.healedByDevice = heal.byDevice;
+    report.healReady = heal.ready;
+    report.healRejected = heal.rejected;
+    const env = await recleanEnvelopes(userId, max - batch.length - heal.healed, dryRun);
+    report.recleaned = env.recleaned;
+    report.envelopesReady = env.ready;
+    report.envelopesStuck = env.stuck;
+  }
   return report;
 }
 function parseIngestArgs(argv) {
@@ -33400,6 +33550,7 @@ function parseIngestArgs(argv) {
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     if (a === "--dry-run") opts.dryRun = true;
+    else if (a === "--no-reclean") opts.noReclean = true;
     else if (a === "--max") {
       const v = argv[++i];
       if (v === void 0 || !/^\d+$/.test(v)) throw new Error("--max: 0 \uC774\uC0C1\uC758 \uC815\uC218");
@@ -33408,12 +33559,14 @@ function parseIngestArgs(argv) {
   }
   return opts;
 }
-var KIND_CHAT, KIND_EDIT, DELETE_KINDS, UNSUPPORTED_KINDS, PAGE, MAX_PAGES_PER_CHANNEL, LOOKBACK_SEC, HEX64, UUID, CHILD_ENV, BuzzShapeError;
+var KIND_CHAT, KIND_EDIT, DELETE_KINDS, UNSUPPORTED_KINDS, PAGE, MAX_PAGES_PER_CHANNEL, LOOKBACK_SEC, HEX64, UUID, CHILD_ENV, BuzzShapeError, norm;
 var init_buzz_ingest = __esm({
   "src/auto_save/buzz_ingest.ts"() {
     "use strict";
     init_db();
     init_hot_path();
+    init_buzz_envelope();
+    init_venue();
     init_users();
     KIND_CHAT = 9;
     KIND_EDIT = 40003;
@@ -33427,6 +33580,7 @@ var init_buzz_ingest = __esm({
     CHILD_ENV = /^(PATH|PATHEXT|HOME|USER|LANG|LC_[A-Z]+|TZ|TMPDIR|TEMP|TMP|SSL_CERT_(FILE|DIR)|NODE_EXTRA_CA_CERTS|(HTTPS?|ALL|NO)_PROXY|SYSTEMROOT|WINDIR|COMSPEC|APPDATA|LOCALAPPDATA|USERPROFILE|BUZZ_[A-Z0-9_]+)$/i;
     BuzzShapeError = class extends Error {
     };
+    norm = (s) => s.replace(/\s+/g, " ").trim();
   }
 });
 
@@ -40540,13 +40694,13 @@ function _array(Class2, element, params) {
   });
 }
 function _custom(Class2, fn, _params) {
-  const norm = normalizeParams(_params);
-  norm.abort ?? (norm.abort = true);
+  const norm2 = normalizeParams(_params);
+  norm2.abort ?? (norm2.abort = true);
   const schema = new Class2({
     type: "custom",
     check: "custom",
     fn,
-    ...norm
+    ...norm2
   });
   return schema;
 }
@@ -62135,10 +62289,12 @@ Usage:
   mcp-agents-memory coldpath        Run ONLY the cold-path worker as a standalone always-on daemon (no MCP server). For the processing/GPU machine via systemd.
   mcp-agents-memory setup           Interactive setup \u2014 write config to ~/.config/mcp-agents-memory/.env and run migrations.
   mcp-agents-memory migrate         Apply any pending DB migrations against the configured database.
-  mcp-agents-memory buzz-ingest [--dry-run] [--max N]
+  mcp-agents-memory buzz-ingest [--dry-run] [--max N] [--no-reclean]
                                     (Buzz only) Copy chat messages from the Buzz rooms the CLI identity is a member of
                                     into memory, one row per message, via the official \`buzz\` CLI. Oldest first, at most
-                                    N per run (default 20). Needs BUZZ_RELAY_URL, BUZZ_PRIVATE_KEY and BUZZ_INGEST_OWNER
+                                    N per run (default 20). With the remaining budget it also strips the quoted history
+                                    from captured Buzz turns once every quoted message exists as a row (original kept in
+                                    raw_message), and fixes Buzz envelopes an older server stored uncleaned; --no-reclean skips both. Needs BUZZ_RELAY_URL, BUZZ_PRIVATE_KEY and BUZZ_INGEST_OWNER
                                     (the memory owner's pubkeys, comma-separated) in the environment of this command only \u2014
                                     not in the shared .env; optional BUZZ_CLI.
   mcp-agents-memory help            Show this message.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-agents-memory",
-  "version": "0.9.20",
+  "version": "0.9.22",
   "description": "Long-term memory for AI agents with provenance tracking",
   "main": "build/index.js",
   "type": "module",