From 62773ab2e5ee68de2205a03a29303cab06f92ee9 Mon Sep 17 00:00:00 2001 From: OpenBot Date: Tue, 6 Oct 2026 16:00:54 +0800 Subject: [PATCH] feat(runtime): wire channels + session manager into a runnable service - runtime.py: config load (JSONC tolerated) -> SessionManager + channels, inbound prompts run in worker threads (receive loop never stalls), prompt errors surfaced to the chat via final event, SIGTERM/SIGINT stop - __main__/entry point forward to runtime.main - tests: 43 passed --- src/agenthub/__main__.py | 5 +- src/agenthub/runtime.py | 141 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 src/agenthub/runtime.py diff --git a/src/agenthub/__main__.py b/src/agenthub/__main__.py index 300bbe7..3a7b9a4 100644 --- a/src/agenthub/__main__.py +++ b/src/agenthub/__main__.py @@ -1,7 +1,6 @@ -"""CLI 入口(M0: 仅骨架)。""" +"""CLI 入口:转发到 runtime.main(真正实现在 runtime.py)。""" -def main() -> None: - raise SystemExit("agenthub: implementation pending (see docs/DESIGN.md milestones)") +from .runtime import main if __name__ == "__main__": main() diff --git a/src/agenthub/runtime.py b/src/agenthub/runtime.py new file mode 100644 index 0000000..0ec49cb --- /dev/null +++ b/src/agenthub/runtime.py @@ -0,0 +1,141 @@ +"""agenthub runtime: wires IM channels + (optional NATS) to the SessionManager. + +Bootstrap order: + config.json -> channels + SessionManager -> event sink wiring -> start + +Usage: + agenthub --config /etc/agenthub/config.json +""" + +from __future__ import annotations + +import argparse +import json +import logging +import os +import signal +import sys +import threading +from typing import Any + +from .channels.wecom import WecomAibotChannel +from .channels.wecom_app import WecomAppChannel +from .channels.weixin import WeixinChannel +from .session import AgentSpec, SessionManager + +log = logging.getLogger("agenthub") + + +def load_config(path: str) -> dict[str, Any]: + with open(path) as f: + text = f.read() + # tolerate JSONC (comments) like opencode does + import re + + text = re.sub(r"^\s*//.*$", "", text, flags=re.M) + return json.loads(text) + + +def build_manager(cfg: dict[str, Any]) -> SessionManager: + agents = { + name: AgentSpec( + name=name, + cmd=spec["cmd"], + cwd_whitelist=spec.get("cwd_whitelist", []), + default_model=spec.get("default_model"), + ) + for name, spec in cfg.get("agents", {}).items() + } + if not agents: + raise SystemExit("config: no agents defined") + sess = cfg.get("session", {}) + db_path = sess.get("db_path") # missing -> in-memory + return SessionManager( + agents=agents, + idle_ttl_s=float(sess.get("idle_ttl_s", 1800)), + max_sessions=int(sess.get("max_sessions", 8)), + db_path=db_path, + ) + + +def build_channels(cfg: dict[str, Any], mgr: SessionManager) -> list: + channels: list = [] + ccfg = cfg.get("channels", {}) + + def sink_and_inbound(ch): + # hub events -> channel outbound; channel inbound -> hub prompt + ch.on_message( + lambda m: _safe_prompt(mgr, ch.name, m.chat_id, m.text, m.images) + ) + mgr.set_event_sink( + lambda key, kind, payload: _safe_event(ch, key, kind, payload) + ) + channels.append(ch) + + if "wecom" in ccfg: + sink_and_inbound(WecomAibotChannel(ccfg["wecom"])) + if "wecom-app" in ccfg: + sink_and_inbound(WecomAppChannel(ccfg["wecom-app"])) + if "weixin" in ccfg: + sink_and_inbound(WeixinChannel(ccfg["weixin"])) + return channels + + +def _safe_prompt(mgr: SessionManager, channel: str, chat_id: str, text: str, images=None) -> None: + def run(): + try: + mgr.prompt(channel, chat_id, text, images=images) + except Exception as e: # noqa: BLE001 + log.error(f"[{channel}:{chat_id}] prompt failed: {e}") + # surface the failure into the chat via the sink path (best effort) + try: + mgr._emit(f"{channel}:{chat_id}", "final", {"text": f"出错了:{e}"}) + except Exception: # noqa: BLE001 + pass + + # prompt blocks for the whole turn; run in worker thread so the channel + # receive loop never stalls + threading.Thread(target=run, name=f"prompt-{channel}-{chat_id}", daemon=True).start() + + +def _safe_event(ch, key: str, kind: str, payload: dict[str, Any]) -> None: + try: + chat_id = key.split(":", 1)[1] + ch.push_event(chat_id, kind, payload) + except Exception as e: # noqa: BLE001 + log.warning(f"[{ch.name}] push_event {kind} failed: {e}") + + +def main(argv: list[str] | None = None) -> None: + ap = argparse.ArgumentParser(prog="agenthub") + ap.add_argument("--config", default=os.environ.get("AGENTHUB_CONFIG", "config.json")) + args = ap.parse_args(argv) + + logging.basicConfig( + level=os.environ.get("AGENTHUB_LOG", "INFO"), + format="%(asctime)s %(levelname)s %(name)s: %(message)s", + ) + cfg = load_config(args.config) + mgr = build_manager(cfg) + chans = build_channels(cfg, mgr) + if not chans: + log.warning("no IM channels configured; running session manager only") + + mgr.start() + for ch in chans: + ch.start() + log.info(f"channel started: {ch.name}") + + stop = threading.Event() + signal.signal(signal.SIGTERM, lambda *_: stop.set()) + signal.signal(signal.SIGINT, lambda *_: stop.set()) + log.info("agenthub running; Ctrl-C to stop") + stop.wait() + log.info("shutting down") + for ch in chans: + ch.stop() + mgr.stop() + + +if __name__ == "__main__": + main()