@snowyroad/arp 0.3.3 → 0.3.4

package/dist/cli.js

@@ -680,6 +680,33 @@ function redactConfig(cfg) {
 import { randomUUID } from "crypto";
 
 // src/untrusted.ts
+function untrusted(s) {
+  return s;
+}
+function rawUntrusted(u) {
+  return u;
+}
+function utext(strings, ...values) {
+  let out = strings[0];
+  for (let i = 0; i < values.length; i++) out += String(values[i]) + strings[i + 1];
+  return out;
+}
+function joinUntrusted(parts, sep2) {
+  return parts.join(sep2);
+}
+function firstNonEmpty(parts, fallback) {
+  for (const p of parts) if (p !== "") return p;
+  return fallback;
+}
+function hasText(u) {
+  return u !== "";
+}
+function isBlankText(u) {
+  return u.trim() === "";
+}
+function sameText(u, s) {
+  return u === s;
+}
 var MARKER_RE = /<<<(?=[\s\u200B-\u200D\u2060\uFEFF]*(?:END[\s\u200B-\u200D\u2060\uFEFF]+)?UNTRUSTED)/gi;
 function neutralizeMarkers(content) {
   return content.replace(MARKER_RE, "<<\\<");
@@ -690,7 +717,7 @@ function sanitizeLabel(label) {
 function fence(label, content) {
   const l = sanitizeLabel(label);
   return `<<<UNTRUSTED ${l}>>>
-${neutralizeMarkers(content)}
+${neutralizeMarkers(rawUntrusted(content))}
 <<<END UNTRUSTED ${l}>>>`;
 }
 function untrustedPreamble(mode) {
@@ -774,24 +801,24 @@ function normalizeRosterEntry(name, memberDescription, card) {
     if (typeof card.description === "string" && card.description) description = card.description;
     if (Array.isArray(card.skills)) skills = card.skills.map((s) => s && typeof s.name === "string" ? s.name : "").filter(Boolean);
   }
-  return { name, description, skills };
+  return { name: untrusted(name), description: untrusted(description), skills: skills.map(untrusted) };
 }
 function assembleRosterFacts(entries, selfName) {
-  const peers = entries.filter((e) => e.name !== selfName);
+  const peers = entries.filter((e) => !sameText(e.name, selfName));
   if (peers.length === 0) return "";
   const lines = peers.map((p) => {
-    const desc = p.description ? `: ${p.description}` : "";
-    const skills = p.skills.length ? ` [skills: ${p.skills.join(", ")}]` : "";
-    return `- ${p.name}${desc}${skills}`;
+    const desc = hasText(p.description) ? utext`: ${p.description}` : "";
+    const skills = p.skills.length ? utext` [skills: ${joinUntrusted(p.skills, ", ")}]` : "";
+    return utext`- ${p.name}${desc}${skills}`;
   });
   return `Also in this channel:
-${fence("peer roster", lines.join("\n"))}`;
+${fence("peer roster", joinUntrusted(lines, "\n"))}`;
 }
 
 // src/channelContext.ts
 function buildChannelContext(input) {
   let out = "";
-  if (input.memory.trim()) {
+  if (!isBlankText(input.memory)) {
     out += `## Channel Memory (shared context for this channel)
 ${fence("channel memory", input.memory)}
 ---
@@ -799,8 +826,7 @@ ${fence("channel memory", input.memory)}
 `;
   }
   if (input.pins.length > 0) {
-    const sections = input.pins.map((p) => fence("pinned file", `\u{1F4CC} ${p.label}
-${p.content}`));
+    const sections = input.pins.map((p) => fence("pinned file", utext`📌 ${p.label}\n${p.content}`));
     out += `## Pinned Files (from GitHub)
 ${sections.join("\n\n")}
 ---
@@ -810,10 +836,10 @@ ${sections.join("\n\n")}
   if (input.topics.length > 0) {
     const lines = input.topics.map((t) => {
       const count = t.count != null ? ` (${t.count} messages)` : "";
-      return `- ${t.title}${count}`;
+      return utext`- ${t.title}${count}`;
     });
     out += `## Channel Topics
-${fence("channel topic titles", lines.join("\n"))}
+${fence("channel topic titles", joinUntrusted(lines, "\n"))}
 ---
 
 `;
@@ -825,21 +851,21 @@ ${fence("channel topic titles", lines.join("\n"))}
 function isAddressed(content, agentName) {
   const name = agentName.trim();
   if (!name) return false;
-  const c = content.toLowerCase();
+  const c = rawUntrusted(content).toLowerCase();
   const forms = /* @__PURE__ */ new Set([name.toLowerCase(), name.toLowerCase().replace(/\s+/g, "_")]);
   for (const f of forms) if (c.includes("@" + f)) return true;
   return false;
 }
 function classifyCatchUp(messages, agentName, nowMs, opts) {
-  const inWindow = messages.filter((m) => {
-    const t = Date.parse(m.createdAt);
-    return Number.isFinite(t) ? t >= nowMs - opts.ttlMs : true;
+  const mentions = messages.filter((m) => {
+    if (m.seq <= opts.deliveredMaxSeq) return false;
+    const t = Date.parse(rawUntrusted(m.createdAt));
+    const withinTtl = Number.isFinite(t) ? t >= nowMs - opts.ttlMs : true;
+    if (!withinTtl) return false;
+    return !sameText(m.senderName, agentName) && isAddressed(m.content, agentName);
   });
-  const mentions = inWindow.filter(
-    (m) => m.senderName !== agentName && isAddressed(m.content, agentName)
-  );
   const capped = mentions.slice(-opts.maxMentions);
-  return { context: inWindow, mentions: capped };
+  return { context: messages, mentions: capped };
 }
 
 // src/relayClient.ts
@@ -857,6 +883,7 @@ var MAX_BACKFILL_CHARS_PER_CATCHUP = 2e6;
 var MAX_BACKFILL_CHARS_PER_CONNECTION = 8e6;
 var MAX_CONCURRENT_CATCHUPS = 3;
 var GAP_RESUME_MIN_INTERVAL_MS = 5e3;
+var REBUILD_LOOKBACK_SEQS = 100;
 function clampContent(s) {
   if (s.length <= MAX_MESSAGE_CONTENT_CHARS) return s;
   return `${s.slice(0, MAX_MESSAGE_CONTENT_CHARS)}
@@ -904,6 +931,8 @@ var RelayClient = class {
   graceTimer = null;
   confirmed = false;
   // single-shot: onReady has fired (relay accepted the agent)
+  reconnectAnnounced = false;
+  // per-connection: "reconnected" printed for this connection
   catchUpCbs = [];
   caughtUp = /* @__PURE__ */ new Set();
   // channels caught up this connection
@@ -995,6 +1024,7 @@ var RelayClient = class {
     this.caughtUp.clear();
     this.backfillCharsThisConn = 0;
     this.connectedAt = Date.now();
+    this.reconnectAnnounced = false;
     this.heartbeatTimer = setInterval(() => this.send({ type: "ping" }), HEARTBEAT_MS);
     this.armWatchdog();
     this.stableTimer = setTimeout(() => {
@@ -1005,13 +1035,20 @@ var RelayClient = class {
     this.graceTimer = setTimeout(() => this.confirmReady(), AUTH_GRACE_MS);
     this.onConnected();
   }
-  /** Single-shot: fires onReady at most once, on the FIRST successful connect. */
+  /** Fires onReady at most once, on the FIRST successful connect; on later
+   *  connections it announces the reconnect instead (once per connection). */
   confirmReady() {
     if (this.graceTimer) {
       clearTimeout(this.graceTimer);
       this.graceTimer = null;
     }
-    if (this.confirmed) return;
+    if (this.confirmed) {
+      if (!this.reconnectAnnounced) {
+        this.reconnectAnnounced = true;
+        console.log("[arp-bridge] reconnected");
+      }
+      return;
+    }
     this.confirmed = true;
     this.readyCb?.();
   }
@@ -1064,12 +1101,12 @@ var RelayClient = class {
           id: String(m.id ?? ""),
           seq,
           channelId,
-          content,
-          senderId: String(m.agentId ?? ""),
-          senderName: String(m.agentName ?? ""),
+          content: untrusted(content),
+          senderId: untrusted(String(m.agentId ?? "")),
+          senderName: untrusted(String(m.agentName ?? "")),
           senderType: String(m.messageType ?? m.type ?? ""),
           // relay live/resume key is messageType; history path uses type
-          createdAt: String(m.createdAt ?? ""),
+          createdAt: untrusted(String(m.createdAt ?? "")),
           isHistory: false
           // shape parity with live messages; the caller decides how to handle them
         });
@@ -1086,10 +1123,10 @@ var RelayClient = class {
   }
   /** Run a catch-up with bounded concurrency (BRIDGE-12): at most
    *  MAX_CONCURRENT_CATCHUPS paginated backfill loops in flight; extras queue FIFO. */
-  scheduleCatchUp(channelId, afterSeq) {
+  scheduleCatchUp(channelId, afterSeq, deliveredMaxSeq) {
     const run = () => {
       this.activeCatchUps++;
-      void this.catchUp(channelId, afterSeq).finally(() => {
+      void this.catchUp(channelId, afterSeq, deliveredMaxSeq).finally(() => {
         this.activeCatchUps--;
         const next = this.catchUpWaiters.shift();
         if (next) next();
@@ -1104,14 +1141,15 @@ var RelayClient = class {
   }
   /** Offline-rejoin catch-up: classify the missed window and hand it to onCatchUp once.
    *  Does NOT route through emitInbound/onInbound to avoid per-message passive submits. */
-  async catchUp(channelId, afterSeq) {
+  async catchUp(channelId, afterSeq, deliveredMaxSeq) {
     const missed = await this.fetchAfterSeq(channelId, afterSeq);
     if (missed.length === 0) return;
     for (const m of missed) if (m.id) this.markSeen(channelId, m.id);
     this.bumpCursor(channelId, missed[missed.length - 1].seq);
     const result = classifyCatchUp(missed, this.cfg.agentName, Date.now(), {
       ttlMs: this.cfg.catchUpTtlMs,
-      maxMentions: this.cfg.catchUpMaxMentions
+      maxMentions: this.cfg.catchUpMaxMentions,
+      deliveredMaxSeq
     });
     this.catchUpCbs.forEach((cb) => cb(channelId, result));
   }
@@ -1189,7 +1227,7 @@ var RelayClient = class {
   }
   onMessage(raw) {
     this.armWatchdog();
-    if (!this.confirmed) this.confirmReady();
+    this.confirmReady();
     let msg;
     try {
       msg = JSON.parse(raw);
@@ -1255,10 +1293,11 @@ var RelayClient = class {
           for (const [ch, seqRaw] of Object.entries(resume)) {
             const seq = Number(seqRaw);
             if (Number.isFinite(seq) && seq > this.cursorOf(ch)) this.cursors.set(ch, seq);
-            const floor = this.cursorOf(ch);
-            if (!this.caughtUp.has(ch) && floor > 0) {
+            const deliveredMax = this.cursorOf(ch);
+            if (!this.caughtUp.has(ch) && deliveredMax > 0) {
               this.caughtUp.add(ch);
-              this.scheduleCatchUp(ch, floor);
+              const rebuildFloor = Math.max(0, deliveredMax - REBUILD_LOOKBACK_SEQS);
+              this.scheduleCatchUp(ch, rebuildFloor, deliveredMax);
             }
           }
         }
@@ -1279,13 +1318,13 @@ var RelayClient = class {
       id: String(m.id ?? ""),
       seq: Number(m.seq ?? 0),
       channelId,
-      content: clampContent(String(m.content ?? "")),
+      content: untrusted(clampContent(String(m.content ?? ""))),
       // bound per-message memory/prompt size (BRIDGE-09)
-      senderId: String(m.agentId ?? ""),
-      senderName: String(m.agentName ?? ""),
+      senderId: untrusted(String(m.agentId ?? "")),
+      senderName: untrusted(String(m.agentName ?? "")),
       senderType: String(m.messageType ?? m.type ?? ""),
       // relay live/resume key is messageType; history path uses type
-      createdAt: String(m.createdAt ?? ""),
+      createdAt: untrusted(String(m.createdAt ?? "")),
       isHistory: Boolean(msg.isHistory)
     };
     const gapDetected = !inbound.isHistory && this.cursorOf(channelId) > 0 && inbound.seq > this.cursorOf(channelId) + 1;
@@ -1305,8 +1344,8 @@ var RelayClient = class {
     if (!flowId) return;
     const rawHistory = kind === "synthesis" || kind === "direction" ? msg.flowHistory ?? msg.messages ?? [] : msg.recentMessages ?? [];
     const history = (Array.isArray(rawHistory) ? rawHistory : []).map((e) => ({
-      agentName: String(e.agentName ?? ""),
-      content: clampContent(String(e.content ?? "")),
+      agentName: untrusted(String(e.agentName ?? "")),
+      content: untrusted(clampContent(String(e.content ?? ""))),
       // bound per-entry size (BRIDGE-09)
       messageType: e.messageType ?? e.type,
       turnNumber: e.turnNumber,
@@ -1316,11 +1355,11 @@ var RelayClient = class {
       kind,
       flowId,
       channelId: String(msg.channelId ?? ""),
-      topic: String(msg.topic ?? ""),
-      rolePrompt: typeof msg.rolePrompt === "string" ? msg.rolePrompt : void 0,
-      contextPrompt: typeof msg.contextPrompt === "string" ? msg.contextPrompt : void 0,
-      synthesisPrompt: typeof msg.synthesisPrompt === "string" ? msg.synthesisPrompt : void 0,
-      candidates: Array.isArray(msg.candidates) ? msg.candidates : void 0,
+      topic: untrusted(String(msg.topic ?? "")),
+      rolePrompt: typeof msg.rolePrompt === "string" ? untrusted(msg.rolePrompt) : void 0,
+      contextPrompt: typeof msg.contextPrompt === "string" ? untrusted(msg.contextPrompt) : void 0,
+      synthesisPrompt: typeof msg.synthesisPrompt === "string" ? untrusted(msg.synthesisPrompt) : void 0,
+      candidates: Array.isArray(msg.candidates) ? msg.candidates.map((c) => untrusted(String(c ?? ""))) : void 0,
       history
     };
     this.flowCbs.forEach((cb) => cb(signal));
@@ -1455,22 +1494,22 @@ var RelayClient = class {
       console.warn("[arp-bridge] flow post failed:", sanitizeForTty(String(err)));
     }
   }
-  /** Channel memory text ("" if none or on error — never throws). */
+  /** Channel memory text (empty if none or on error — never throws). Branded (H2-4). */
   async fetchChannelMemory(channelId) {
     const ch = this.pathId(channelId, "channelId");
-    if (!ch) return "";
+    if (!ch) return untrusted("");
     const url = `${this.cfg.relayHttpUrl}/channels/${ch}/memory`;
     try {
       const res = await this.deps.fetchFn(url, { headers: { Authorization: `Bearer ${this.cfg.token}` } });
       if (!res.ok) {
         console.warn("[arp-bridge] memory HTTP", res.status);
-        return "";
+        return untrusted("");
       }
       const data = await res.json();
-      return typeof data?.content === "string" ? data.content : "";
+      return untrusted(typeof data?.content === "string" ? data.content : "");
     } catch (err) {
       console.warn("[arp-bridge] memory fetch failed:", sanitizeForTty(String(err)));
-      return "";
+      return untrusted("");
     }
   }
   /** Channel topics with message counts ([] if none or on error). The relay returns
@@ -1488,7 +1527,7 @@ var RelayClient = class {
       const data = await res.json();
       const topics = data?.topics ?? [];
       const counts = data?.messageCounts ?? {};
-      return topics.filter((t) => typeof t?.title === "string").map((t) => ({ title: t.title, count: typeof counts[t.id] === "number" ? counts[t.id] : null }));
+      return topics.filter((t) => typeof t?.title === "string").map((t) => ({ title: untrusted(t.title), count: typeof counts[t.id] === "number" ? counts[t.id] : null }));
     } catch (err) {
       console.warn("[arp-bridge] topics fetch failed:", sanitizeForTty(String(err)));
       return [];
@@ -1507,7 +1546,10 @@ var RelayClient = class {
       }
       const data = await res.json();
       const pins = data?.pins ?? [];
-      return pins.filter((p) => p?.injectContext && typeof p.cachedContent === "string" && p.cachedContent.trim()).map((p) => ({ label: p.displayName || `${p.repoUrl ?? ""}/${p.filePath ?? ""}`, content: p.cachedContent }));
+      return pins.filter((p) => p?.injectContext && typeof p.cachedContent === "string" && p.cachedContent.trim()).map((p) => ({
+        label: untrusted(p.displayName || `${p.repoUrl ?? ""}/${p.filePath ?? ""}`),
+        content: untrusted(p.cachedContent)
+      }));
     } catch (err) {
       console.warn("[arp-bridge] pins fetch failed:", sanitizeForTty(String(err)));
       return [];
@@ -1541,8 +1583,8 @@ var RelayClient = class {
       const data = await res.json();
       const list = Array.isArray(data) ? data : data.messages ?? [];
       return list.map((e) => ({
-        agentName: String(e.agentName ?? ""),
-        content: String(e.content ?? ""),
+        agentName: untrusted(String(e.agentName ?? "")),
+        content: untrusted(String(e.content ?? "")),
         messageType: e.messageType ?? e.type,
         turnNumber: e.turnNumber,
         createdAt: e.createdAt
@@ -1557,15 +1599,15 @@ var RelayClient = class {
 // src/flow.ts
 function renderFlowHistory(entries) {
   if (entries.length === 0) return "";
-  const lines = entries.map((e) => `${e.agentName || "someone"}: ${e.content}`);
+  const lines = entries.map((e) => utext`${firstNonEmpty([e.agentName], "someone")}: ${e.content}`);
   return `DISCUSSION HISTORY:
-${fence("flow discussion history", lines.join("\n"))}
+${fence("flow discussion history", joinUntrusted(lines, "\n"))}
 
 `;
 }
 function buildFlowPrompt(signal, agentName, channelId, toolMode = "readonly") {
   if (signal.kind === "direction") {
-    const candidates = (signal.candidates ?? []).join(", ");
+    const candidates = joinUntrusted(signal.candidates ?? [], ", ");
     const history2 = renderFlowHistory(signal.history);
     const hasHistory = history2 !== "";
     const preamble = hasHistory ? [``, history2.trimEnd(), ``, `Read the conversation above and decide who should speak next.`] : [``, `No turns have been taken yet \u2014 choose who should speak FIRST.`];
@@ -1577,7 +1619,7 @@ function buildFlowPrompt(signal, agentName, channelId, toolMode = "readonly") {
       fence("flow topic", signal.topic),
       ...preamble,
       `Available participants:`,
-      fence("flow participant names", candidates || "(none online)"),
+      fence("flow participant names", firstNonEmpty([candidates], "(none online)")),
       ``,
       `Reply with ONLY the name of the single participant who should speak next,`,
       `or reply with ONLY the word END to conclude the discussion and move to synthesis.`,
@@ -1679,7 +1721,7 @@ ${toolStatusLine(this.toolMode)}
    */
   async submit(msg) {
     if (!this.session) throw new Error("ChannelSession not started");
-    const who = msg.senderName || msg.senderId || "someone";
+    const who = firstNonEmpty([msg.senderName, msg.senderId], "someone");
     const facts = assembleRosterFacts(this.roster, this.agentName);
     const rosterBlock = facts ? `${facts}
 
@@ -1750,14 +1792,17 @@ ${fence("channel message", msg.content)}
   async submitCatchUp(result) {
     if (!this.session) throw new Error("ChannelSession not started");
     if (result.context.length === 0) return;
-    const transcript = result.context.map((m) => `[${m.createdAt}] ${m.senderName || m.senderId || "someone"}: ${m.content}`).join("\n");
+    const transcript = joinUntrusted(
+      result.context.map((m) => utext`[${m.createdAt}] ${firstNonEmpty([m.senderName, m.senderId], "someone")}: ${m.content}`),
+      "\n"
+    );
     if (result.mentions.length === 0) {
       if (!this.session.converseLocal) return;
       this.beacon?.begin();
       try {
         await this.session.converseLocal(capPrompt(
-          this.promptHead() + `You just reconnected to ARP channel ${this.channelId} after being away. Here is what you missed (context only, do NOT reply to it):
-` + fence("missed channel messages", transcript)
+          this.promptHead() + `You just (re)connected to ARP channel ${this.channelId}. Here is recent channel history for context \u2014 you may have already seen some of it. Absorb it so you can follow back-references in later messages; do NOT reply to it:
+` + fence("recent channel history", transcript)
         ));
       } finally {
         this.beacon?.end();
@@ -1765,7 +1810,10 @@ ${fence("channel message", msg.content)}
       return;
     }
     const channelContext = this.fetchContext ? await this.fetchContext() : "";
-    const addressed = result.mentions.map((m) => `[${m.createdAt}] ${m.senderName || m.senderId || "someone"}: ${m.content}`).join("\n");
+    const addressed = joinUntrusted(
+      result.mentions.map((m) => utext`[${m.createdAt}] ${firstNonEmpty([m.senderName, m.senderId], "someone")}: ${m.content}`),
+      "\n"
+    );
     const head = this.promptHead() + channelContext + `You are ${this.agentName}. You just reconnected to ARP channel ${this.channelId} after being away. While you were gone, the channel said (context):
 ${fence("missed channel messages", transcript)}
 
@@ -2613,8 +2661,8 @@ async function startBridge(cfg, relay, deps) {
   }
   relay.onInbound((m) => {
     if (m.isHistory) return;
-    if (m.senderId && m.senderId === cfg.agentUuid || m.senderName && m.senderName === cfg.agentName) return;
-    if (!m.content.trim()) return;
+    if (hasText(m.senderId) && sameText(m.senderId, cfg.agentUuid) || hasText(m.senderName) && sameText(m.senderName, cfg.agentName)) return;
+    if (isBlankText(m.content)) return;
     ensureSession(m.channelId).then((s) => s.submit(m)).catch((e) => console.warn(`[arp-bridge] inbound routing failed for channel ${sanitizeForTty(m.channelId)}:`, sanitizeForTty(String(e))));
   });
   relay.onFlowSignal((signal) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/arp",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Connect your own coding agent (Claude Code, Codex, Gemini, Grok) to an Agent Relay Protocol channel and collaborate with other agents and humans.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "SnowyRoad",
@@ -20,6 +20,7 @@
   "engines": {
     "node": ">=20"
   },
+  "packageManager": "pnpm@9.15.4",
   "bin": {
     "arp": "dist/cli.js"
   },
@@ -39,16 +40,19 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "0.24.0",
-    "@anthropic-ai/claude-agent-sdk": "0.1.77",
-    "ws": "8.21.0"
+    "@agentclientprotocol/sdk": "0.25.1",
+    "@anthropic-ai/claude-agent-sdk": "0.3.177",
+    "@anthropic-ai/sdk": "0.104.1",
+    "@modelcontextprotocol/sdk": "1.29.0",
+    "ws": "8.21.0",
+    "zod": "4.4.3"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
+    "@types/node": "^25.9.3",
     "@types/ws": "^8.5.12",
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
-    "typescript": "^5.6.0",
+    "typescript": "^6.0.3",
     "vitest": "^2.1.0"
   }
 }