@openclawcity/become 1.0.26 → 1.0.29

package/dist/cli.js

@@ -642,16 +642,50 @@ function injectSkillsIntoMessages(messages, skillText) {
 }
 
 // src/proxy/detector.ts
-var CHANNEL_PATTERN = /^\[([^\]]+)\s+says?\]:\s*/;
-var DM_PATTERN = /^DM\s+from\s+([^:]+):\s*/;
-var BUILDING_PATTERN = /^([a-zA-Z0-9]+[-_][a-zA-Z0-9_.-]+)\s+in\s+[^:]+:\s*/;
+var OCC_DM_PATTERN = /^\[DM from ([^\]]+)\]:/m;
+var OCC_MENTION_PATTERN = /^\[([^\]]+) mentioned you in building chat\]:/m;
+var OCC_ZONE_CHAT_PATTERN = /^\[([^\]]+) in zone chat\]:/m;
+var OCC_PROPOSAL_PATTERN = /^\[([^\]]+) (?:sent you a proposal|accepted your proposal)\]:/m;
+var OCC_CONVERSATION_REQUEST = /^\[([^\]]+) wants to start a conversation with you\]:/m;
+var GENERIC_CHANNEL_PATTERN = /^\[([^\]]+)\s+says?\]:\s*/m;
+var GENERIC_DM_PATTERN = /^DM\s+from\s+([^:]+):\s*/m;
+var BUILDING_PATTERN = /^([a-zA-Z0-9]+[-_][a-zA-Z0-9_.-]+)\s+in\s+[^:]+:\s*/m;
 var REVIEW_KEYWORDS = ["strengths:", "weaknesses:", "verdict:", "assessment:", "suggestions:"];
+var SKIP_PATTERNS = [
+  /^\[Your human owner says\]:/m,
+  /^\[Your human set a new mission/m,
+  /^\[HEARTBEAT/m,
+  /^\[Someone left you a voice message\]/m
+];
+var OPENCLAW_SENDER_PATTERN = /"sender_id":\s*"([^"]+)".*?"sender":\s*"([^"]+)"/s;
+var OPENCLAW_SKIP_SENDERS = /* @__PURE__ */ new Set(["city", "owner", "system"]);
 function detectAgentConversation(messages) {
   const negative = { isAgentToAgent: false };
   if (!messages || messages.length === 0) return negative;
   for (const msg of messages) {
     if (msg.role !== "user" && msg.role !== "assistant") continue;
-    const content = typeof msg.content === "string" ? msg.content : "";
+    const content = contentToString(msg.content);
+    if (!content) continue;
+    if (SKIP_PATTERNS.some((p) => p.test(content))) continue;
+    if (content.includes("untrusted metadata") || content.includes("sender_id")) {
+      const senderMatch = content.match(OPENCLAW_SENDER_PATTERN);
+      if (senderMatch) {
+        const [, senderId, senderName] = senderMatch;
+        if (!OPENCLAW_SKIP_SENDERS.has(senderId) && !OPENCLAW_SKIP_SENDERS.has(senderName.toLowerCase())) {
+          let exchangeType = "chat";
+          if (content.includes("[DM from")) exchangeType = "dm";
+          else if (content.includes("mentioned you")) exchangeType = "mention";
+          else if (content.includes("proposal")) exchangeType = "proposal";
+          else if (content.includes("zone chat")) exchangeType = "chat";
+          return {
+            isAgentToAgent: true,
+            otherAgentId: senderName,
+            exchangeType
+          };
+        }
+      }
+      continue;
+    }
     if (msg.name && msg.role === "user") {
       return {
         isAgentToAgent: true,
@@ -659,7 +693,47 @@ function detectAgentConversation(messages) {
         exchangeType: "chat"
       };
     }
-    const channelMatch = content.match(CHANNEL_PATTERN);
+    const dmMatch = content.match(OCC_DM_PATTERN);
+    if (dmMatch) {
+      return {
+        isAgentToAgent: true,
+        otherAgentId: dmMatch[1].trim(),
+        exchangeType: "dm"
+      };
+    }
+    const mentionMatch = content.match(OCC_MENTION_PATTERN);
+    if (mentionMatch) {
+      return {
+        isAgentToAgent: true,
+        otherAgentId: mentionMatch[1].trim(),
+        exchangeType: "mention"
+      };
+    }
+    const zoneMatch = content.match(OCC_ZONE_CHAT_PATTERN);
+    if (zoneMatch) {
+      return {
+        isAgentToAgent: true,
+        otherAgentId: zoneMatch[1].trim(),
+        exchangeType: "chat"
+      };
+    }
+    const proposalMatch = content.match(OCC_PROPOSAL_PATTERN);
+    if (proposalMatch) {
+      return {
+        isAgentToAgent: true,
+        otherAgentId: proposalMatch[1].trim(),
+        exchangeType: "proposal"
+      };
+    }
+    const convMatch = content.match(OCC_CONVERSATION_REQUEST);
+    if (convMatch) {
+      return {
+        isAgentToAgent: true,
+        otherAgentId: convMatch[1].trim(),
+        exchangeType: "dm"
+      };
+    }
+    const channelMatch = content.match(GENERIC_CHANNEL_PATTERN);
     if (channelMatch) {
       return {
         isAgentToAgent: true,
@@ -667,11 +741,11 @@ function detectAgentConversation(messages) {
         exchangeType: "channel"
       };
     }
-    const dmMatch = content.match(DM_PATTERN);
-    if (dmMatch) {
+    const genericDmMatch = content.match(GENERIC_DM_PATTERN);
+    if (genericDmMatch) {
       return {
         isAgentToAgent: true,
-        otherAgentId: dmMatch[1].trim(),
+        otherAgentId: genericDmMatch[1].trim(),
         exchangeType: "dm"
       };
     }
@@ -698,10 +772,17 @@ function detectAgentConversation(messages) {
 function extractExchangeText(messages) {
   return messages.filter((m) => m.role === "user" || m.role === "assistant").map((m) => {
     const speaker = m.name ?? m.role;
-    const content = typeof m.content === "string" ? m.content : "";
+    const content = contentToString(m.content);
     return `[${speaker}]: ${content}`;
   }).join("\n").slice(0, 6e3);
 }
+function contentToString(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
+  }
+  return "";
+}
 
 // src/proxy/extractor.ts
 var LessonExtractor = class {
@@ -826,8 +907,9 @@ function createProxyServer(config, analyzer, overrideUpstreamUrl) {
       if (Array.isArray(messages)) {
         for (const m of messages) {
           if (m.role === "user" || m.role === "system") {
-            const preview = typeof m.content === "string" ? m.content.slice(0, 200) : "(non-string)";
-            console.log(`[become] msg ${m.role}${m.name ? ` name=${m.name}` : ""}: ${preview.replace(/\n/g, "\\n")}`);
+            const text = extractText(m.content);
+            const preview = text.slice(0, 300).replace(/\n/g, "\\n");
+            console.log(`[become] msg ${m.role}${m.name ? ` name=${m.name}` : ""}: ${preview}`);
           }
         }
       }
@@ -875,7 +957,6 @@ function createProxyServer(config, analyzer, overrideUpstreamUrl) {
         }
         if (config.auto_extract && extractor && Array.isArray(messages)) {
           extractor.extract(messages).then(() => {
-            stats.lessons_extracted++;
           }).catch(() => {
           });
         }
@@ -884,7 +965,6 @@ function createProxyServer(config, analyzer, overrideUpstreamUrl) {
         res.end(Buffer.from(responseBuffer));
         if (config.auto_extract && extractor && Array.isArray(messages)) {
           extractor.extract(messages).then(() => {
-            stats.lessons_extracted++;
           }).catch(() => {
           });
         }
@@ -952,6 +1032,13 @@ function buildUpstreamHeaders(config, incomingHeaders) {
   if (typeof accept === "string") headers["Accept"] = accept;
   return headers;
 }
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
+  }
+  return "";
+}
 
 // src/dashboard/server.ts
 import { createServer as createServer2 } from "http";