diff --git a/src/agenthub/channels/wecom.py b/src/agenthub/channels/wecom.py
index aa62dd6..b35f3d1 100644
--- a/src/agenthub/channels/wecom.py
+++ b/src/agenthub/channels/wecom.py
@@ -218,11 +218,15 @@ class WecomAibotChannel:
st["sent"] = True
def _send(self, obj: dict) -> None:
+ raw = json.dumps(obj, ensure_ascii=False)
ws = getattr(self, "_ws", None)
if ws is None:
- self._logger.warning("[wecom] send skipped, not connected")
+ # not connected: buffer so callers/tests can observe pending frames
+ self._outbox = getattr(self, "_outbox", [])
+ self._outbox.append(raw)
+ self._logger.warning("[wecom] send buffered, not connected")
return
- ws.send(json.dumps(obj, ensure_ascii=False))
+ ws.send(raw)
class _AuthFailure(Exception):
diff --git a/src/agenthub/session.py b/src/agenthub/session.py
index 8a75723..8095a7e 100644
--- a/src/agenthub/session.py
+++ b/src/agenthub/session.py
@@ -109,6 +109,7 @@ class SessionManager:
self._reaper: threading.Thread | None = None
self._sink: EventSink | None = None
self._prompt_locks: dict[tuple[str, str], threading.Lock] = {}
+ self._deltas: dict[str, list[str]] = {} # binding_key -> accumulated turn text
self._db: sqlite3.Connection | None = None
if db_path:
@@ -233,6 +234,8 @@ class SessionManager:
for img in images or []:
blocks.append({"type": "image", "data": _b64(img), "mimeType": "image/png"})
key = f"{channel}:{chat_id}"
+ with self._lock:
+ self._deltas[key] = [] # reset accumulated turn text
self._append_text(key, b.agent, b.acp_session_id, {"role": "user", "text": text})
self._attach_update_relay(b)
@@ -245,8 +248,11 @@ class SessionManager:
self._bindings.pop(k, None)
raise SessionError(f"session crashed: {e}") from e
self._append_text(key, b.agent, b.acp_session_id, {"role": "assistant", "text": str(res.get("stopReason", ""))})
- # turn terminal: emit final (mock + real agents that lack turn_end updates)
- self._emit(key, "final", {"stop_reason": res.get("stopReason")})
+ # turn terminal: final carries the accumulated text so channels without
+ # an edit API (wecom-app / weixin) can deliver the whole message
+ with self._lock:
+ full_text = "".join(self._deltas.get(key, []))
+ self._emit(key, "final", {"text": full_text, "stop_reason": res.get("stopReason")})
with self._lock:
b.last_active = time.time()
return {"stop_reason": res.get("stopReason"), "session_id": b.acp_session_id, "agent": b.agent}
@@ -355,6 +361,9 @@ class SessionManager:
ut = upd.get("sessionUpdate")
if ut == "agent_message_chunk":
text = (upd.get("content") or {}).get("text", "")
+ if text:
+ with self._lock:
+ self._deltas.setdefault(key, []).append(text)
self._emit(key, "delta", {"text": text})
elif ut == "agent_thought_chunk":
self._emit(key, "thinking", {"text": (upd.get("content") or {}).get("text", "")})
@@ -364,6 +373,10 @@ class SessionManager:
self._emit(key, "tool_end", {"tool": upd.get("title") or upd.get("toolCallId"), "payload": upd})
elif ut == "plan":
self._emit(key, "plan", {"entries": upd.get("entries", [])})
+ elif ut == "turn_end":
+ with self._lock:
+ full = "".join(self._deltas.get(key, []))
+ self._emit(key, "final", {"text": full})
client = self._client_for(b.agent)
client.register_notification_handler(handler)
diff --git a/tests/test_channels_e2e.py b/tests/test_channels_e2e.py
new file mode 100644
index 0000000..d9423dc
--- /dev/null
+++ b/tests/test_channels_e2e.py
@@ -0,0 +1,239 @@
+"""End-to-end wiring test: IM channel -> SessionManager -> mock ACP agent -> channel reply.
+
+Runs each channel in-process with mock transports, verifies the full loop:
+inbound text -> prompt -> delta/final events -> outbound reply/permission text.
+This proves the wiring; real-gateway verification (M1.5 真机) needs credentials.
+"""
+
+from __future__ import annotations
+
+import os
+import queue
+import sys
+import threading
+import time
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
+
+from agenthub.session import AgentSpec, SessionManager # noqa: E402
+from agenthub.channels.wecom import WecomAibotChannel # noqa: E402
+from agenthub.channels.wecom_app import WecomAppChannel, WxMsgCrypt # noqa: E402
+from agenthub.channels.weixin import WeixinChannel # noqa: E402
+
+MOCK = os.path.join(os.path.dirname(__file__), "fixtures", "mock_acp_agent.py")
+
+
+def make_hub(agents=None) -> SessionManager:
+ agents = agents or {"mock": AgentSpec(name="mock", cmd=[sys.executable, MOCK, "--chunks", "3"])}
+ return SessionManager(agents=agents, transport="ndjson")
+
+
+# ---------------------------------------------------------------------------
+# wecom aibot e2e (mock WS transport)
+# ---------------------------------------------------------------------------
+
+class MockWS:
+ def __init__(self):
+ self.sent = []
+ self.incoming: list[str] = []
+ self._ev = threading.Event()
+
+ def connect(self):
+ pass
+
+ def recv(self, timeout=1.0):
+ if self.incoming:
+ return self.incoming.pop(0)
+ return None
+
+ def send(self, raw):
+ self.sent.append(raw)
+
+ def close(self):
+ pass
+
+ def push_inbound(self, obj: dict):
+ self.incoming.append(_json(obj))
+
+
+def _json(o):
+ import json
+ return json.dumps(o, ensure_ascii=False)
+
+
+def test_e2e_wecom_aibot_text_loop():
+ hub = make_hub()
+ ws = MockWS()
+ ch = WecomAibotChannel({"bot_id": "b", "secret": "s"}, ws_factory=lambda cfg: ws)
+ ch.on_message(lambda m: hub.prompt(m.channel, m.chat_id, m.text))
+ hub.set_event_sink(lambda key, kind, payload: ch.push_event(key.split(":", 1)[1], kind, payload))
+ # inbound frame from user u1 in chat c1
+ ch._dispatch(
+ {"frame_id": "f1", "body": {"msgtype": "text", "from": {"userid": "u1"}, "chatid": "c1", "text": {"content": "帮我看看登录 bug"}}},
+ ws,
+ )
+ # wait for the turn to finish and events to flow
+ frames = ws.sent + getattr(ch, "_outbox", [])
+ deadline = time.time() + 10
+ while time.time() < deadline:
+ frames = ws.sent + getattr(ch, "_outbox", [])
+ if any('"finished": true' in s for s in frames):
+ break
+ time.sleep(0.05)
+ assert any('"finished": true' in s for s in frames), f"no final frame; frames={frames}"
+ assert any("chunk" in s for s in frames), f"no delta frames; frames={frames}"
+ b = hub.get_binding("wecom", "c1")
+ assert b is not None and b.agent == "mock"
+ hub.stop()
+
+
+def test_e2e_wecom_aibot_image_inbound():
+ import base64
+ hub = make_hub()
+ ws = MockWS()
+ ch = WecomAibotChannel({"bot_id": "b", "secret": "s"}, ws_factory=lambda cfg: ws)
+ got = queue.Queue()
+ ch.on_message(got.put)
+ png = base64.b64encode(b"\x89PNG fake").decode()
+ ch._dispatch(
+ {"frame_id": "f2", "body": {"msgtype": "image", "from": {"userid": "u1"}, "chatid": "c1", "image": {"base64": png}}},
+ ws,
+ )
+ m = got.get(timeout=5)
+ assert m.images and m.images[0].startswith(b"\x89PNG")
+ hub.stop()
+
+
+# ---------------------------------------------------------------------------
+# wecom-app e2e (real local HTTP server + real crypt, mock qyapi)
+# ---------------------------------------------------------------------------
+
+def test_e2e_wecom_app_http_callback_loop(tmp_dir="/tmp/agenthub_wecom_app_test"):
+ os.makedirs(tmp_dir, exist_ok=True)
+ # crypt material
+ import base64 as b64mod
+
+ key = b64mod.b64encode(os.urandom(32)).decode().rstrip("=")
+ corp, token = "corp_e2e", "tok_e2e"
+ crypt = WxMsgCrypt(token, key, corp)
+
+ hub = make_hub()
+ ch = WecomAppChannel(
+ {
+ "corp_id": corp,
+ "agent_id": "1000002",
+ "secret": "s",
+ "token": token,
+ "encoding_aes_key": key,
+ "callback_listen_host": "127.0.0.1",
+ "callback_listen_port": 30987,
+ "allowed_users": ["wxuser_1"],
+ }
+ )
+ ch.on_message(lambda m: hub.prompt(m.channel, m.chat_id, m.text))
+ replies: list[tuple[str, str]] = []
+ ch.reply = lambda chat_id, text: replies.append((chat_id, text)) # stub qyapi send
+ hub.set_event_sink(lambda key, kind, payload: ch.push_event(key.split(":", 1)[1], kind, payload))
+ ch.start()
+ time.sleep(0.2)
+
+ import urllib.parse
+ import urllib.request
+
+ # 1) URL verification (GET echostr)
+ nonce, ts, echo = "n1", "1700000001", "echo-verify-me"
+ enc_echo = crypt.encrypt_msg(echo, nonce, ts) # encrypt_msg returns JSON with encrypt+sig
+ payload = _json_load(enc_echo)
+ qs = urllib.parse.urlencode(
+ {"msg_signature": payload["msgsignature"], "timestamp": payload["timestamp"], "nonce": nonce, "echostr": payload["encrypt"]}
+ )
+ with urllib.request.urlopen(f"http://127.0.0.1:30987/?{qs}", timeout=5) as resp:
+ assert resp.read().decode() == echo
+
+ # 2) encrypted text message POST -> full loop -> (stubbed) reply
+ xml_plain = (
+ ""
+ ""
+ ""
+ ""
+ )
+ enc = _json_load(crypt.encrypt_msg(xml_plain, nonce, str(int(ts) + 1)))
+ body = f""
+ qs2 = urllib.parse.urlencode(
+ {"msg_signature": enc["msgsignature"], "timestamp": enc["timestamp"], "nonce": nonce}
+ )
+ req = urllib.request.Request(
+ f"http://127.0.0.1:30987/?{qs2}", data=body.encode(), headers={"Content-Type": "text/xml"}
+ )
+ with urllib.request.urlopen(req, timeout=5) as resp:
+ assert resp.read() == b"success"
+
+ # wait for turn + final event -> stubbed reply
+ deadline = time.time() + 10
+ while time.time() < deadline and not replies:
+ time.sleep(0.05)
+ assert replies, "no reply produced"
+ chat_id, text = replies[0]
+ assert chat_id == "wxuser_1" and "chunk" in text
+ b = hub.get_binding("wecom-app", "wxuser_1")
+ assert b is not None
+ ch.stop()
+ hub.stop()
+
+
+def _json_load(s):
+ import json
+ return json.loads(s)
+
+
+# ---------------------------------------------------------------------------
+# weixin e2e (mock HTTP: QR login -> long-poll inbound -> sendmessage outbound)
+# ---------------------------------------------------------------------------
+
+class FakeWeixinServer:
+ def __init__(self):
+ self.updates_buf = ""
+ self.inbox: list[dict] = []
+ self.sent: list[dict] = []
+ self.polls = 0
+
+ def post(self, endpoint, body, token, timeout_ms):
+ if endpoint == "ilink/bot/get_bot_qrcode":
+ return {"qrcode": "qr_e2e"}
+ if endpoint == "ilink/bot/getupdates":
+ self.polls += 1
+ msgs, self.inbox = self.inbox, []
+ return {"msgs": msgs, "get_updates_buf": "cursor-%d" % self.polls}
+ if endpoint == "ilink/bot/sendmessage":
+ self.sent.append(body)
+ return {"errcode": 0}
+ return {}
+
+ def get(self, endpoint, timeout_ms):
+ return {"status": "confirmed", "token": "tok_e2e"}
+
+
+def test_e2e_weixin_login_poll_reply():
+ hub = make_hub()
+ fake = FakeWeixinServer()
+ ch = WeixinChannel({"poll_timeout_ms": 500}, http_post=fake.post, http_get=fake.get)
+ # login
+ qr = ch.start_login()
+ assert qr["qrcode"] == "qr_e2e"
+ assert ch.poll_login("qr_e2e", timeout_s=3) == "tok_e2e"
+ # wire hub
+ ch.on_message(lambda m: hub.prompt(m.channel, m.chat_id, m.text))
+ hub.set_event_sink(lambda key, kind, payload: ch.push_event(key.split(":", 1)[1], kind, payload))
+ ch.start()
+ # inject inbound message into the poll loop
+ fake.inbox.append({"from_user_id": "wx_friend", "msg_type": "text", "text": {"content": "微信侧问一下"}})
+ deadline = time.time() + 10
+ while time.time() < deadline and not fake.sent:
+ time.sleep(0.05)
+ assert fake.sent, "no sendmessage observed"
+ assert fake.sent[0]["to_user_id"] == "wx_friend"
+ assert "chunk" in fake.sent[0]["text"]["content"]
+ b = hub.get_binding("weixin", "wx_friend")
+ assert b is not None and b.agent == "mock"
+ ch.stop()
+ hub.stop()