@botcord/daemon 0.2.45 → 0.2.47

package/dist/gateway/runtimes/openclaw-acp.js

@@ -601,10 +601,22 @@ function normalizeAssistantText(text) {
     if (!finalMatch && selected.trimStart().toLowerCase().startsWith("<think")) {
         return "";
     }
-    return selected
+    return stripLeadingBoundaryResidue(selected
         .replace(/<think[^>]*>[\s\S]*?<\/think>/gi, "")
         .replace(/<\/?final>/gi, "")
-        .trim();
+        .trim());
+}
+function stripLeadingBoundaryResidue(text) {
+    if (!text.startsWith("<"))
+        return text;
+    // Keep real HTML/XML-ish tags and common comparison operators. A lone
+    // leading "<" before normal prose can be left behind when ACP streams a
+    // structural marker boundary separately from the final assistant text.
+    if (/^<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s|>|\/>)/.test(text))
+        return text;
+    if (/^<(?:\s|=|<)/.test(text))
+        return text;
+    return text.slice(1).trimStart();
 }
 function createAssistantTextFilter() {
     let pending = "";

package/dist/turn-text.js

@@ -5,15 +5,18 @@ const GROUP_HINT = '[In group chats, do NOT reply unless you are explicitly ment
 const DIRECT_HINT = '[If the conversation has naturally concluded or no response is needed, ' +
     'reply with exactly "NO_REPLY" and nothing else.]';
 /**
- * Reminder appended to every wrapped (non-owner-chat) inbound message. The
- * dispatcher discards `result.text` for any room that is not `rm_oc_*`, so
- * the agent must call the `botcord_send` tool (or the `botcord send` CLI
- * via Bash) to actually deliver a reply. Plain assistant text in those
- * rooms is logged and dropped.
+ * Reminder appended to wrapped BotCord network rooms that are not owner-chat.
+ * The dispatcher discards `result.text` for those rooms, so the agent must
+ * call the `botcord_send` tool (or the `botcord send` CLI via Bash) to
+ * actually deliver a reply. Plain assistant text in those rooms is logged
+ * and dropped.
  */
 const NON_OWNER_REPLY_HINT = "[This room is NOT owner-chat. Plain text output WILL NOT be sent. " +
     "To reply, call the `botcord_send` tool, or run " +
     '`botcord send --room <room_id> --text "..."` via Bash.]';
+const THIRD_PARTY_REPLY_HINT = "[This is a third-party gateway chat. Reply normally in your final assistant " +
+    "message; BotCord daemon will deliver that text through the same channel. " +
+    "No extra send tool is required for this chat.]";
 /**
  * Read the BotCord envelope type from a raw inbound message. Returns
  * `undefined` when the message didn't come from the BotCord channel or the
@@ -28,6 +31,15 @@ function readEnvelopeType(raw) {
     const t = env.type;
     return typeof t === "string" ? t : undefined;
 }
+function isThirdPartyConversation(conversationId) {
+    return (conversationId.startsWith("telegram:") ||
+        conversationId.startsWith("wechat:"));
+}
+function replyDeliveryHint(msg) {
+    return isThirdPartyConversation(msg.conversation.id)
+        ? THIRD_PARTY_REPLY_HINT
+        : NON_OWNER_REPLY_HINT;
+}
 /**
  * Read the `raw.batch` array emitted by the BotCord channel when inbox
  * drain groups multiple messages for the same `(room, topic)`. Returns the
@@ -127,7 +139,7 @@ export function composeBotCordUserTurn(msg) {
         "",
         hint,
         "",
-        NON_OWNER_REPLY_HINT,
+        replyDeliveryHint(msg),
     ];
     if (contactRequestHint) {
         lines.push("", contactRequestHint);
@@ -178,7 +190,7 @@ function composeBatchedTurn(msg, batch) {
         "",
         hint,
         "",
-        NON_OWNER_REPLY_HINT,
+        replyDeliveryHint(msg),
     ];
     if (contactRequestSenders.length > 0) {
         // Dedup + list — multiple distinct senders show as "A, B".

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.45",
+  "version": "0.2.47",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {

package/src/__tests__/openclaw-acp.test.ts

@@ -265,6 +265,88 @@ describe("OpenclawAcpAdapter.run", () => {
     );
   });
 
+  it("strips a lone leading ACP boundary marker from final prompt text", async () => {
+    const child = new FakeChild();
+    const adapter = new OpenclawAcpAdapter({ spawnFn: makeSpawn(child) });
+    const gateway: ResolvedOpenclawGateway = {
+      name: "local",
+      url: "ws://127.0.0.1:1",
+      openclawAgent: "main",
+    };
+
+    child.stdin.on("data", (chunk: Buffer) => {
+      for (const line of chunk.toString("utf8").split("\n").filter(Boolean)) {
+        const frame = JSON.parse(line);
+        if (frame.method === "initialize") {
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { protocolVersion: 1 } }) + "\n");
+        } else if (frame.method === "session/new") {
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { sessionId: "sid-boundary" } }) + "\n");
+        } else if (frame.method === "session/prompt") {
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { text: "<你好！终于可以正常交流了。" } }) + "\n");
+        }
+      }
+    });
+
+    const res = await adapter.run({
+      text: "hi",
+      sessionId: null,
+      cwd: "/tmp",
+      accountId: "ag_alice",
+      signal: new AbortController().signal,
+      trustLevel: "owner",
+      gateway,
+    });
+
+    expect(res.text).toBe("你好！终于可以正常交流了。");
+  });
+
+  it("strips a lone leading ACP boundary marker from streamed fallback text", async () => {
+    const child = new FakeChild();
+    const adapter = new OpenclawAcpAdapter({ spawnFn: makeSpawn(child) });
+    const gateway: ResolvedOpenclawGateway = {
+      name: "local",
+      url: "ws://127.0.0.1:1",
+      openclawAgent: "main",
+    };
+
+    child.stdin.on("data", (chunk: Buffer) => {
+      for (const line of chunk.toString("utf8").split("\n").filter(Boolean)) {
+        const frame = JSON.parse(line);
+        if (frame.method === "initialize") {
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { protocolVersion: 1 } }) + "\n");
+        } else if (frame.method === "session/new") {
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { sessionId: "sid-stream-boundary" } }) + "\n");
+        } else if (frame.method === "session/prompt") {
+          for (const text of ["<", "好！终于可以正常交流了。"]) {
+            child.stdout.write(
+              JSON.stringify({
+                jsonrpc: "2.0",
+                method: "session/update",
+                params: {
+                  sessionId: "sid-stream-boundary",
+                  update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text } },
+                },
+              }) + "\n",
+            );
+          }
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { stopReason: "end_turn" } }) + "\n");
+        }
+      }
+    });
+
+    const res = await adapter.run({
+      text: "hi",
+      sessionId: null,
+      cwd: "/tmp",
+      accountId: "ag_alice",
+      signal: new AbortController().signal,
+      trustLevel: "owner",
+      gateway,
+    });
+
+    expect(res.text).toBe("好！终于可以正常交流了。");
+  });
+
   it("respawns the pooled child when gateway.url or gateway.token changes under the same name", async () => {
     function newChild(): FakeChild {
       const c = new FakeChild();

package/src/__tests__/turn-text.test.ts

@@ -68,6 +68,43 @@ describe("composeBotCordUserTurn", () => {
     expect(out).not.toContain("do NOT reply unless");
   });
 
+  it("keeps the botcord_send delivery hint for non-owner BotCord rooms", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        conversation: { id: "rm_dm_xxx", kind: "direct" },
+        sender: { id: "ag_peer", kind: "agent" },
+      }),
+    );
+    expect(out).toContain("Plain text output WILL NOT be sent");
+    expect(out).toContain("botcord_send");
+  });
+
+  it("does not tell Telegram chats to use botcord_send", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        channel: "gw_telegram_123",
+        conversation: { id: "telegram:user:7904063707", kind: "direct" },
+        sender: { id: "telegram:user:7904063707", name: "danny_aaas", kind: "user" },
+      }),
+    );
+    expect(out).toContain("third-party gateway chat");
+    expect(out).toContain("Reply normally in your final assistant message");
+    expect(out).not.toContain("Plain text output WILL NOT be sent");
+    expect(out).not.toContain("botcord_send");
+  });
+
+  it("does not tell WeChat chats to use botcord_send", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        channel: "gw_wechat_123",
+        conversation: { id: "wechat:user:wxl_alice", kind: "direct" },
+        sender: { id: "wechat:user:wxl_alice", name: "Alice", kind: "user" },
+      }),
+    );
+    expect(out).toContain("third-party gateway chat");
+    expect(out).not.toContain("botcord_send");
+  });
+
   it("passes owner-chat messages through verbatim (no wrapper, no hint)", () => {
     const out = composeBotCordUserTurn(
       makeMessage({

package/src/gateway/runtimes/openclaw-acp.ts

@@ -709,10 +709,20 @@ function normalizeAssistantText(text: string | undefined): string {
   if (!finalMatch && selected.trimStart().toLowerCase().startsWith("<think")) {
     return "";
   }
-  return selected
+  return stripLeadingBoundaryResidue(selected
     .replace(/<think[^>]*>[\s\S]*?<\/think>/gi, "")
     .replace(/<\/?final>/gi, "")
-    .trim();
+    .trim());
+}
+
+function stripLeadingBoundaryResidue(text: string): string {
+  if (!text.startsWith("<")) return text;
+  // Keep real HTML/XML-ish tags and common comparison operators. A lone
+  // leading "<" before normal prose can be left behind when ACP streams a
+  // structural marker boundary separately from the final assistant text.
+  if (/^<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s|>|\/>)/.test(text)) return text;
+  if (/^<(?:\s|=|<)/.test(text)) return text;
+  return text.slice(1).trimStart();
 }
 
 function createAssistantTextFilter(): {

package/src/turn-text.ts

@@ -35,16 +35,20 @@ const DIRECT_HINT =
   'reply with exactly "NO_REPLY" and nothing else.]';
 
 /**
- * Reminder appended to every wrapped (non-owner-chat) inbound message. The
- * dispatcher discards `result.text` for any room that is not `rm_oc_*`, so
- * the agent must call the `botcord_send` tool (or the `botcord send` CLI
- * via Bash) to actually deliver a reply. Plain assistant text in those
- * rooms is logged and dropped.
+ * Reminder appended to wrapped BotCord network rooms that are not owner-chat.
+ * The dispatcher discards `result.text` for those rooms, so the agent must
+ * call the `botcord_send` tool (or the `botcord send` CLI via Bash) to
+ * actually deliver a reply. Plain assistant text in those rooms is logged
+ * and dropped.
  */
 const NON_OWNER_REPLY_HINT =
   "[This room is NOT owner-chat. Plain text output WILL NOT be sent. " +
   "To reply, call the `botcord_send` tool, or run " +
   '`botcord send --room <room_id> --text "..."` via Bash.]';
+const THIRD_PARTY_REPLY_HINT =
+  "[This is a third-party gateway chat. Reply normally in your final assistant " +
+  "message; BotCord daemon will deliver that text through the same channel. " +
+  "No extra send tool is required for this chat.]";
 
 /**
  * Read the BotCord envelope type from a raw inbound message. Returns
@@ -59,6 +63,19 @@ function readEnvelopeType(raw: unknown): string | undefined {
   return typeof t === "string" ? t : undefined;
 }
 
+function isThirdPartyConversation(conversationId: string): boolean {
+  return (
+    conversationId.startsWith("telegram:") ||
+    conversationId.startsWith("wechat:")
+  );
+}
+
+function replyDeliveryHint(msg: GatewayInboundMessage): string {
+  return isThirdPartyConversation(msg.conversation.id)
+    ? THIRD_PARTY_REPLY_HINT
+    : NON_OWNER_REPLY_HINT;
+}
+
 /** Minimal shape of one batched inbound entry. Matches the BotCord channel
  * `BatchedInboxRaw.batch[]` elements but expressed structurally so the
  * composer doesn't import channel internals. */
@@ -182,7 +199,7 @@ export function composeBotCordUserTurn(msg: GatewayInboundMessage): string {
     "",
     hint,
     "",
-    NON_OWNER_REPLY_HINT,
+    replyDeliveryHint(msg),
   ];
   if (contactRequestHint) {
     lines.push("", contactRequestHint);
@@ -243,7 +260,7 @@ function composeBatchedTurn(
     "",
     hint,
     "",
-    NON_OWNER_REPLY_HINT,
+    replyDeliveryHint(msg),
   ];
 
   if (contactRequestSenders.length > 0) {