@botcord/daemon 0.2.46 → 0.2.48

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

@@ -601,10 +601,24 @@ 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 (startsWithRealAngleSyntax(text))
+        return text;
+    return text.slice(1).trimStart();
+}
+function startsWithRealAngleSyntax(text) {
+    return (/^<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s|>|\/>)/.test(text) ||
+        /^<(?:\s|=|<)/.test(text));
 }
 function createAssistantTextFilter() {
     let pending = "";
@@ -709,7 +723,19 @@ function createAssistantTextFilter() {
             if (!flush && knownPrefixes.some((prefix) => prefix.startsWith(lower))) {
                 return out;
             }
-            out += "<";
+            if (!flush && pending === "<") {
+                return out;
+            }
+            if (!startsWithRealAngleSyntax(pending)) {
+                pending = pending.slice(1).trimStart();
+                continue;
+            }
+            if (seenFinal) {
+                out += "<";
+            }
+            else {
+                fallback += "<";
+            }
             pending = pending.slice(1);
         }
         if (flush && !seenFinal && fallback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.46",
+  "version": "0.2.48",
   "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,178 @@ 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 blocks: any[] = [];
+    const res = await adapter.run({
+      text: "hi",
+      sessionId: null,
+      cwd: "/tmp",
+      accountId: "ag_alice",
+      signal: new AbortController().signal,
+      trustLevel: "owner",
+      gateway,
+      onBlock: (b) => blocks.push(b),
+    });
+
+    expect(res.text).toBe("好！终于可以正常交流了。");
+    const assistantChunks = blocks
+      .filter((b) => b.kind === "assistant_text")
+      .map((b) => b.raw.params.update.content[0].text);
+    expect(assistantChunks).toEqual(["好！终于可以正常交流了。"]);
+  });
+
+  it("preserves real leading angle syntax in 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-angle" } }) + "\n");
+        } else if (frame.method === "session/prompt") {
+          for (const text of ["<", "b>bold</b> and ", "<", " 5"]) {
+            child.stdout.write(
+              JSON.stringify({
+                jsonrpc: "2.0",
+                method: "session/update",
+                params: {
+                  sessionId: "sid-angle",
+                  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("<b>bold</b> and < 5");
+  });
+
+  it("forwards slash-command user text to session/prompt unchanged", 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",
+    };
+    let promptPayload: any = null;
+
+    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-slash" } }) + "\n");
+        } else if (frame.method === "session/prompt") {
+          promptPayload = frame.params.prompt;
+          child.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: frame.id, result: { text: "ok" } }) + "\n");
+        }
+      }
+    });
+
+    await adapter.run({
+      text: "/start",
+      sessionId: null,
+      cwd: "/tmp",
+      accountId: "ag_alice",
+      signal: new AbortController().signal,
+      trustLevel: "owner",
+      gateway,
+    });
+
+    expect(promptPayload).toEqual([{ type: "text", text: "/start" }]);
+  });
+
   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/gateway/runtimes/openclaw-acp.ts

@@ -709,10 +709,26 @@ 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 (startsWithRealAngleSyntax(text)) return text;
+  return text.slice(1).trimStart();
+}
+
+function startsWithRealAngleSyntax(text: string): boolean {
+  return (
+    /^<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s|>|\/>)/.test(text) ||
+    /^<(?:\s|=|<)/.test(text)
+  );
 }
 
 function createAssistantTextFilter(): {
@@ -820,7 +836,18 @@ function createAssistantTextFilter(): {
         return out;
       }
 
-      out += "<";
+      if (!flush && pending === "<") {
+        return out;
+      }
+      if (!startsWithRealAngleSyntax(pending)) {
+        pending = pending.slice(1).trimStart();
+        continue;
+      }
+      if (seenFinal) {
+        out += "<";
+      } else {
+        fallback += "<";
+      }
       pending = pending.slice(1);
     }
     if (flush && !seenFinal && fallback) {