@bolloon/bolloon-agent 0.3.26 → 0.3.28

package/dist/web/client.js

@@ -1689,7 +1689,72 @@
       v3GlobalEventSource.onmessage = (e) => {
         try {
           const msg = JSON.parse(e.data);
-          if (msg.type === "remote-chat-reply") {
+          if (msg.type === "remote-chat-sent") {
+            console.log("[v3] \u6536\u5230 remote-chat-sent:", msg.channelId, "|", String(msg.text || "").slice(0, 30));
+            try {
+              const pk = msg.fromPublicKey;
+              const cid = msg.channelId;
+              if (pk && cid && msg.text) {
+                const key = `bolloon.rcmCache.${pk}.${cid}`;
+                let arr = [];
+                try {
+                  const raw = localStorage.getItem(key);
+                  if (raw) arr = JSON.parse(raw);
+                } catch {
+                  arr = [];
+                }
+                if (!Array.isArray(arr)) arr = [];
+                const entry = { type: "user", content: msg.text, timestamp: (/* @__PURE__ */ new Date()).toISOString(), source: "local-sent" };
+                const dup = arr.some((m) => m.type === "user" && m.content === entry.content && m.source === "local-sent");
+                if (!dup) {
+                  arr.push(entry);
+                  try {
+                    localStorage.setItem(key, JSON.stringify(arr.slice(-200)));
+                  } catch {
+                  }
+                }
+              }
+            } catch {
+            }
+            const log = document.getElementById("rcm-log");
+            if (!log) return;
+            const modal = document.getElementById("remote-chat-modal");
+            const openChannelId = modal ? modal.dataset.channelId : null;
+            if (openChannelId && openChannelId !== msg.channelId) return;
+            const prefix = `\u{1F464} \u6211 \u2192 \u8FDC\u7AEF${msg.peerName ? ` ${msg.peerName}` : ""}
+
+`;
+            addMessage2(prefix + (msg.text || ""), "user", false, log);
+            if (msg.queued) {
+              const qEl = document.createElement("div");
+              qEl.className = "remote-chat-sysmsg remote-chat-sysmsg-info";
+              qEl.textContent = "\u{1F4E4} \u5BF9\u65B9\u4E0D\u5728\u7EBF, \u6D88\u606F\u5DF2\u5165\u961F, \u4E0A\u7EBF\u540E\u81EA\u52A8\u9001\u8FBE";
+              log.appendChild(qEl);
+            }
+            log.scrollTop = log.scrollHeight;
+          } else if (msg.type === "remote-chat-step") {
+            const log = document.getElementById("rcm-log");
+            if (!log) return;
+            const modal = document.getElementById("remote-chat-modal");
+            const openChannelId = modal ? modal.dataset.channelId : null;
+            if (openChannelId && openChannelId !== msg.channelId) return;
+            let liveEl = document.getElementById("rcm-thinking-live-local");
+            if (!liveEl) {
+              liveEl = document.createElement("div");
+              liveEl.id = "rcm-thinking-live-local";
+              liveEl.className = "remote-chat-sysmsg remote-chat-sysmsg-info";
+              log.appendChild(liveEl);
+            }
+            if (msg.stepType === "step_start") {
+              liveEl.textContent = `\u{1F527} \u672C\u5730\u667A\u80FD\u4F53\u6B63\u5728\u8C03\u7528\u5DE5\u5177: ${msg.tool || "..."}`;
+            } else if (msg.stepType === "step_done") {
+              liveEl.textContent = `\u2705 \u672C\u5730\u5DE5\u5177\u8C03\u7528\u5B8C\u6210: ${msg.tool || ""}`;
+            } else if (msg.stepType === "step_error") {
+              liveEl.textContent = `\u274C \u672C\u5730\u5DE5\u5177\u8C03\u7528\u5931\u8D25: ${msg.tool || ""}`;
+              liveEl.className = "remote-chat-sysmsg remote-chat-sysmsg-error";
+            }
+            log.scrollTop = log.scrollHeight;
+          } else if (msg.type === "remote-chat-reply") {
             const log = document.getElementById("rcm-log");
             const thinkingEl = document.getElementById("rcm-thinking");
             if (thinkingEl) thinkingEl.style.display = "none";
@@ -1793,15 +1858,25 @@
               }
             }
           } else if (msg.type === "cross-mention-received") {
+            const log = document.getElementById("rcm-log");
+            const rcmModal = document.getElementById("remote-chat-modal");
+            const rcmOpenId = rcmModal ? rcmModal.dataset.channelId : null;
+            if (log && (!msg.targetChannelId || !rcmOpenId || rcmOpenId === msg.targetChannelId)) {
+              const fromTxt = msg.source === "ai-mention-remote" ? `\u8FDC\u7AEF\u667A\u80FD\u4F53 ${msg.originChannelName ? `(${msg.originChannelName})` : ""}` : `${msg.originChannelName} (\u672C\u5730)`;
+              addMessage2(`\u{1F4E1} ${fromTxt}
+
+${msg.text || ""}`, "ai", false, log);
+              log.scrollTop = log.scrollHeight;
+            }
             const allModals = document.querySelectorAll('.rcm-mention-toast, [id^="rcm-log"]');
-            for (const log of allModals) {
-              if (!log.id) continue;
+            for (const logEl of allModals) {
+              if (!logEl.id) continue;
               const toast = document.createElement("div");
               toast.style.cssText = "margin:6px 0;padding:8px 10px;background:#fce7f3;border-left:3px solid #ec4899;border-radius:4px;font-size:12px;color:#831843;";
               const fromTxt = msg.source === "ai-mention-remote" ? `\u8FDC\u7AEF\u8282\u70B9 ${(msg.fromPublicKey || "").substring(0, 8)}\u2026 \u7684 ${msg.originChannelName}` : `${msg.originChannelName} (\u672C\u5730)`;
               toast.innerHTML = `\u{1F4E1} <b>${fromTxt}</b> @-mention \u2192 \u5F53\u524D channel: <i>${escapeHtml2((msg.text || "").slice(0, 100))}</i>${msg.text && msg.text.length > 100 ? "\u2026" : ""}`;
-              log.appendChild(toast);
-              log.scrollTop = log.scrollHeight;
+              logEl.appendChild(toast);
+              logEl.scrollTop = logEl.scrollHeight;
             }
           } else if (msg.type === "remote-channel-update") {
             const peerId = msg.peerId;
@@ -4971,7 +5046,7 @@ ${data.error || "channel not found"}`, "error");
   function openRemoteChannelChat(peerPublicKey, channelId, channelName) {
     document.getElementById("remote-chat-modal")?.remove();
     const html = `
-    <div id="remote-chat-modal" class="remote-chat-overlay">
+    <div id="remote-chat-modal" class="remote-chat-overlay" data-channel-id="${escapeHtml2(channelId)}" data-peer-id="${escapeHtml2(peerPublicKey)}">
       <div class="remote-chat-shell">
         <div class="remote-chat-header">
           <div style="flex:1;min-width:0;">
@@ -5093,7 +5168,11 @@ ${data.error || "channel not found"}`, "error");
           const type = m.type === "user" ? "user" : "ai";
           let prefix = "";
           if (m.type === "user") {
-            if (m.source === "remote") {
+            if (m.source === "local-sent") {
+              prefix = `\u{1F464} \u6211 \u2192 \u8FDC\u7AEF
+
+`;
+            } else if (m.source === "remote") {
               prefix = `\u{1F310} \u8FDC\u7AEF\u8BBF\u5BA2${m.fromPublicKey ? " (" + m.fromPublicKey.substring(0, 8) + "\u2026)" : ""}
 
 `;
@@ -5103,9 +5182,19 @@ ${data.error || "channel not found"}`, "error");
 `;
             }
           } else {
-            prefix = `\u{1F916} A \u7684 LLM
+            if (m.source === "remote-reply") {
+              prefix = `\u{1F916} \u8FDC\u7AEF\u56DE\u590D
+
+`;
+            } else if (m.source === "ai-mention-remote") {
+              prefix = `\u{1F4E1} \u8FDC\u7AEF\u667A\u80FD\u4F53 ${m.originChannelName ? `(${m.originChannelName})` : ""}
 
 `;
+            } else {
+              prefix = `\u{1F916} A \u7684 LLM
+
+`;
+            }
           }
           addMessage2(prefix + (m.content || ""), type, false, log);
         }
@@ -5123,12 +5212,33 @@ ${data.error || "channel not found"}`, "error");
         writeRcmCache(cacheMsgs);
       } catch {
       }
+      try {
+        const cachedAll = readRcmCache();
+        const localSent = cachedAll.filter((m) => m.source === "local-sent");
+        if (localSent.length > 0) {
+          const remoteContents = new Set(msgs.map((m) => m.content));
+          for (const m of localSent) {
+            if (remoteContents.has(m.content)) continue;
+            const dup = Array.from(log.querySelectorAll(".message-user")).some(
+              (el) => (el.textContent || "").includes(m.content)
+            );
+            if (dup) continue;
+            addMessage2(`\u{1F464} \u6211 \u2192 \u8FDC\u7AEF
+
+${m.content}`, "user", false, log);
+          }
+          setTimeout(() => {
+            log.scrollTop = log.scrollHeight;
+          }, 50);
+        }
+      } catch {
+      }
     }
     const doSend = async () => {
       const text = inputEl.value.trim();
       if (!text) return;
       append(text, "user");
-      cacheRemoteMessage(peerPublicKey, channelId, { type: "user", content: text, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+      cacheRemoteMessage(peerPublicKey, channelId, { type: "user", content: text, timestamp: (/* @__PURE__ */ new Date()).toISOString(), source: "local-sent" });
       inputEl.value = "";
       sendBtn2.disabled = true;
       sendBtn2.textContent = "...";

package/dist/web/server-storage.js

@@ -24,13 +24,20 @@ export function getLastChannelsWriteAt() {
 }
 /** 对 channels 执行原子化的 read-modify-write, 自带互斥锁 */
 export async function updateChannels(fn) {
-    channelsLock = channelsLock.then(async () => {
+    const run = channelsLock.then(async () => {
         const chs = await rawLoadChannels();
         const result = fn(chs);
         await rawSaveChannels(result);
         return result;
     });
-    return channelsLock;
+    // 2026-08-02 fix: 失败不毒化锁链 — 之前 channelsLock = channelsLock.then(...),
+    //   某次 fn 抛错 → 整个链变 rejected → 之后所有 updateChannels 直接 reject,
+    //   fn 不再执行 → UI 创建 channel 偶发"不落盘" (静默丢失).
+    channelsLock = run.catch((e) => {
+        console.error('[updateChannels] 失败 (已隔离, 不影响后续操作):', e?.message || e);
+        return undefined;
+    });
+    return run;
 }
 async function rawLoadChannels() {
     try {