@agentunion/kite 1.2.0 → 1.3.0

package/extensions/agents/assistant/server.py

@@ -1,8 +1,6 @@
 """
-Assistant HTTP server.
-Exposes /health and /status endpoints.
-Connects to Event Hub via WebSocket for event publishing and subscription.
-Sends periodic heartbeat to Registry and test events to Event Hub.
+Assistant WebSocket client.
+Connects to Kernel via WebSocket JSON-RPC 2.0 for event publishing and subscription.
 """
 
 import asyncio
@@ -11,127 +9,101 @@ import time
 import uuid
 from datetime import datetime, timezone
 
-import httpx
 import websockets
-from fastapi import FastAPI
 
 
 class AssistantServer:
 
-    def __init__(self, token: str = "", registry_url: str = "",
-                 event_hub_ws: str = "", boot_t0: float = 0):
+    def __init__(self, token: str = "", kernel_port: int = 0, boot_t0: float = 0):
         self.token = token
-        self.registry_url = registry_url
-        self.event_hub_ws = event_hub_ws
+        self.kernel_port = kernel_port
         self.boot_t0 = boot_t0
         self._ws_task: asyncio.Task | None = None
-        self._heartbeat_task: asyncio.Task | None = None
         self._test_task: asyncio.Task | None = None
         self._ws: object | None = None
         self._ready_sent = False
         self._shutting_down = False
-        self._uvicorn_server = None  # set by entry.py for graceful shutdown
         self._start_time = time.time()
-        self.app = self._create_app()
-
-    def _create_app(self) -> FastAPI:
-        app = FastAPI(title="Kite Assistant", docs_url=None, redoc_url=None)
-        server = self
-
-        @app.on_event("startup")
-        async def _startup():
-            server._heartbeat_task = asyncio.create_task(server._heartbeat_loop())
-            if server.event_hub_ws:
-                server._ws_task = asyncio.create_task(server._ws_loop())
-            server._test_task = asyncio.create_task(server._test_event_loop())
-
-        @app.on_event("shutdown")
-        async def _shutdown():
-            if server._heartbeat_task:
-                server._heartbeat_task.cancel()
-            if server._ws_task:
-                server._ws_task.cancel()
-            if server._test_task:
-                server._test_task.cancel()
-            if server._ws:
-                await server._ws.close()
-            print("[assistant] Shutdown complete")
-
-        @app.get("/health")
-        async def health():
-            return {
-                "status": "healthy",
-                "details": {
-                    "event_hub_connected": server._ws is not None,
-                    "uptime_seconds": round(time.time() - server._start_time),
-                },
-            }
 
-        @app.get("/status")
-        async def status():
-            return {
-                "module": "assistant",
-                "status": "running",
-                "event_hub_connected": server._ws is not None,
-                "uptime_seconds": round(time.time() - server._start_time),
-            }
+    async def run(self):
+        """Main entry point: start WebSocket loop and test event loop."""
+        if self.kernel_port:
+            self._ws_task = asyncio.create_task(self._ws_loop())
+        self._test_task = asyncio.create_task(self._test_event_loop())
+
+        # Wait for tasks to complete
+        tasks = [t for t in [self._ws_task, self._test_task] if t]
+        if tasks:
+            await asyncio.gather(*tasks, return_exceptions=True)
 
-        return app
+        print("[assistant] Shutdown complete")
 
-    # ── Event Hub WebSocket client ──
+    # ── Kernel WebSocket client ──
 
     async def _ws_loop(self):
-        """Connect to Event Hub, subscribe, and listen. Reconnect on failure."""
-        retry_delay = 0.5  # start with 0.5s
-        max_delay = 30  # cap at 30s
+        """Connect to Kernel, subscribe, register, and listen. Reconnect on failure."""
+        retry_delay = 0.5
+        max_delay = 30
         while not self._shutting_down:
             try:
                 await self._ws_connect()
             except asyncio.CancelledError:
                 return
-                retry_delay = 0.5  # reset on successful connection
             except Exception as e:
-                print(f"[assistant] Event Hub connection error: {e}, retrying in {retry_delay:.1f}s")
+                print(f"[assistant] Kernel connection error: {e}, retrying in {retry_delay:.1f}s")
             self._ws = None
             if self._shutting_down:
                 return
             await asyncio.sleep(retry_delay)
-            retry_delay = min(retry_delay * 2, max_delay)  # exponential backoff
+            retry_delay = min(retry_delay * 2, max_delay)
 
     async def _ws_connect(self):
-        """Single WebSocket session: connect, subscribe, receive loop."""
-        url = f"{self.event_hub_ws}?token={self.token}&id=assistant"
-        print(f"[assistant] WS connecting to {self.event_hub_ws}")
+        """Single WebSocket session: connect, subscribe, register, ready, receive loop."""
+        url = f"ws://127.0.0.1:{self.kernel_port}/ws?token={self.token}&id=assistant"
+        print(f"[assistant] Connecting to Kernel (port {self.kernel_port})")
         async with websockets.connect(url, open_timeout=3, ping_interval=None, ping_timeout=None, close_timeout=10) as ws:
             self._ws = ws
             elapsed = time.monotonic() - self.boot_t0 if self.boot_t0 else 0
             elapsed_str = f" ({elapsed:.1f}s)" if elapsed else ""
-            print(f"[assistant] Connected to Event Hub{elapsed_str}")
+            print(f"[assistant] Connected to Kernel{elapsed_str}")
 
-            # Subscribe to module lifecycle events + shutdown
-            await ws.send(json.dumps({
-                "type": "subscribe",
+            # Step 1: Subscribe to events (先订阅)
+            await self._rpc_call(ws, "event.subscribe", {
                 "events": ["module.started", "module.stopped", "module.shutdown"],
-            }))
+            })
+
+            # Step 2: Register to Kernel (再注册)
+            await self._rpc_call(ws, "registry.register", {
+                "module_id": "assistant",
+                "module_type": "agent",
+                "name": "Assistant",
+                "events_publish": {
+                    "assistant.test": {},
+                },
+                "events_subscribe": [
+                    "module.started",
+                    "module.stopped",
+                    "module.shutdown",
+                ],
+            })
 
-            # Send module.ready (once) so Launcher knows we're up
+            # Step 3: Publish module.ready (once)
             if not self._ready_sent:
-                ready_msg = {
-                    "type": "event",
+                await self._rpc_call(ws, "event.publish", {
                     "event_id": str(uuid.uuid4()),
                     "event": "module.ready",
-                    "source": "assistant",
-                    "timestamp": datetime.now(timezone.utc).isoformat(),
                     "data": {
                         "module_id": "assistant",
                         "graceful_shutdown": True,
                     },
-                }
-                await ws.send(json.dumps(ready_msg))
+                })
                 self._ready_sent = True
                 elapsed = time.monotonic() - self.boot_t0 if self.boot_t0 else 0
                 elapsed_str = f" ({elapsed:.1f}s)" if elapsed else ""
-                print(f"[assistant] module.ready sent{elapsed_str}")
+                print(f"[assistant] module.ready published{elapsed_str}")
+
+            # Reset retry delay on successful connection
+            retry_delay = 0.5
 
             # Receive loop
             async for raw in ws:
@@ -141,18 +113,22 @@ class AssistantServer:
                     continue
 
                 try:
-                    msg_type = msg.get("type", "")
-                    if msg_type == "event":
-                        event_name = msg.get("event", "")
+                    has_method = "method" in msg
+                    has_id = "id" in msg
+
+                    if has_method and not has_id:
+                        # JSON-RPC Notification (event delivery)
+                        params = msg.get("params", {})
+                        event_name = params.get("event", "")
                         if event_name == "module.shutdown":
-                            target = (msg.get("data") if isinstance(msg.get("data"), dict) else {}).get("module_id", "")
+                            data = params.get("data", {})
+                            target = data.get("module_id", "")
                             if target == "assistant":
                                 await self._handle_shutdown(ws)
                                 return
-                    elif msg_type == "ack":
-                        pass  # publish confirmed
-                    elif msg_type == "error":
-                        print(f"[assistant] Event Hub error: {msg.get('message')}")
+                    elif not has_method and has_id:
+                        # JSON-RPC Response (to our RPC calls)
+                        pass
                 except Exception as e:
                     print(f"[assistant] 事件处理异常（已忽略）: {e}")
 
@@ -162,64 +138,49 @@ class AssistantServer:
         self._shutting_down = True
 
         # Step 1: Send ack
-        await self._publish_event({
+        await self._rpc_call(ws, "event.publish", {
+            "event_id": str(uuid.uuid4()),
             "event": "module.shutdown.ack",
             "data": {"module_id": "assistant", "estimated_cleanup": 2},
         })
         print("[assistant] shutdown ack sent")
 
         # Step 2: Cleanup (cancel background tasks)
-        if self._heartbeat_task:
-            self._heartbeat_task.cancel()
         if self._test_task:
             self._test_task.cancel()
 
         # Step 3: Send ready (before closing WS!)
-        await self._publish_event({
+        await self._rpc_call(ws, "event.publish", {
+            "event_id": str(uuid.uuid4()),
             "event": "module.shutdown.ready",
             "data": {"module_id": "assistant"},
         })
-        print("[assistant] Shutdown complete")
+        print("[assistant] Shutdown ready sent")
 
-        # Step 4: Trigger uvicorn exit (WS will close when uvicorn shuts down)
-        if self._uvicorn_server:
-            self._uvicorn_server.should_exit = True
+        # Step 4: Exit process
+        import sys
+        sys.exit(0)
+
+    async def _rpc_call(self, ws, method: str, params: dict = None):
+        """Send a JSON-RPC 2.0 request."""
+        msg = {"jsonrpc": "2.0", "id": str(uuid.uuid4()), "method": method}
+        if params:
+            msg["params"] = params
+        await ws.send(json.dumps(msg))
 
     async def _publish_event(self, event: dict):
-        """Publish an event to Event Hub via WebSocket."""
+        """Publish an event via JSON-RPC event.publish."""
         if not self._ws:
             return
-        msg = {
-            "type": "event",
-            "event_id": str(uuid.uuid4()),
-            "event": event.get("event", ""),
-            "source": "assistant",
-            "timestamp": datetime.now(timezone.utc).isoformat(),
-            "data": event.get("data", {}),
-        }
         try:
-            await self._ws.send(json.dumps(msg))
+            await self._rpc_call(self._ws, "event.publish", {
+                "event_id": str(uuid.uuid4()),
+                "event": event.get("event", ""),
+                "data": event.get("data", {}),
+            })
         except Exception as e:
             print(f"[assistant] Failed to publish event: {e}")
 
-    # ── Heartbeat to Registry ──
-
-    async def _heartbeat_loop(self):
-        """Send heartbeat to Registry every 30 seconds."""
-        while True:
-            await asyncio.sleep(30)
-            try:
-                async with httpx.AsyncClient() as client:
-                    await client.post(
-                        f"{self.registry_url}/modules",
-                        json={"action": "heartbeat", "module_id": "assistant"},
-                        headers={"Authorization": f"Bearer {self.token}"},
-                        timeout=5,
-                    )
-                print("[assistant] heartbeat sent")
-            except Exception:
-                pass
-
     # ── Test event loop ──
 
     async def _test_event_loop(self):

package/extensions/channels/acp_channel/entry.py

@@ -1,21 +1,19 @@
 """
 ACP Channel entry point.
-Reads boot_info from stdin, registers to Registry, starts acp_channel service.
+Reads boot_info from stdin, connects to Kernel via WebSocket JSON-RPC 2.0.
 """
 
+import asyncio
 import builtins
 import json
 import os
-import socket
+import re
 import sys
 import threading
-import re
 import time
+import traceback
 from datetime import datetime, timezone
 
-import httpx
-import uvicorn
-
 
 # ── Safe stdout/stderr: ignore BrokenPipeError after Launcher closes stdio ──
 
@@ -240,59 +238,24 @@ def _fmt_elapsed(t0: float) -> str:
     return f"{d:.0f}s"
 
 
-def _get_free_port() -> int:
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.bind(("127.0.0.1", 0))
-        return s.getsockname()[1]
-
-
-def _register_to_registry(client: httpx.Client, token: str, registry_url: str, port: int):
-    payload = {
-        "action": "register",
-        "module_id": "acp_channel",
-        "module_type": "channel",
-        "name": "ACP Channel",
-        "api_endpoint": f"http://127.0.0.1:{port}",
-        "health_endpoint": "/health",
-        "events_publish": {
-            "acp_channel.test": {"description": "Test event from acp_channel module"},
-        },
-        "events_subscribe": [
-            "module.started",
-            "module.stopped",
-            "module.shutdown",
-        ],
-    }
-    headers = {"Authorization": f"Bearer {token}"}
-    try:
-        resp = client.post(f"{registry_url}/modules", json=payload, headers=headers)
-        if resp.status_code == 200:
-            pass  # timing printed in main()
-        else:
-            print(f"[acp_channel] WARNING: Registry returned {resp.status_code}")
-    except Exception as e:
-        print(f"[acp_channel] WARNING: Registry registration failed: {e}")
-
+def _read_stdin_kite_message(expected_type: str, timeout: float = 10) -> dict | None:
+    """Read a single kite message of expected type from stdin with timeout."""
+    result = [None]
 
-def _get_event_hub_ws(client: httpx.Client, token: str, registry_url: str) -> str:
-    """Discover Event Hub WebSocket endpoint from Registry, with retry."""
-    import time
-    headers = {"Authorization": f"Bearer {token}"}
-    deadline = time.time() + 10
-    while time.time() < deadline:
+    def _read():
         try:
-            resp = client.get(
-                f"{registry_url}/get/event_hub.metadata.ws_endpoint",
-                headers=headers,
-            )
-            if resp.status_code == 200:
-                val = resp.json()
-                if val:
-                    return val
+            line = sys.stdin.readline().strip()
+            if line:
+                msg = json.loads(line)
+                if isinstance(msg, dict) and msg.get("kite") == expected_type:
+                    result[0] = msg
         except Exception:
             pass
-        time.sleep(0.2)
-    return ""
+
+    t = threading.Thread(target=_read, daemon=True)
+    t.start()
+    t.join(timeout=timeout)
+    return result[0]
 
 
 def main():
@@ -334,42 +297,28 @@ def main():
     except Exception:
         pass
 
-    # Read registry_port from environment variable
-    registry_port = int(os.environ.get("KITE_REGISTRY_PORT", "0"))
+    # Read kernel_port: env first (fast path), stdin fallback (parallel start)
+    kernel_port = int(os.environ.get("KITE_KERNEL_PORT", "0"))
+    if not kernel_port:
+        msg = _read_stdin_kite_message("kernel_port", timeout=10)
+        if msg:
+            kernel_port = int(msg.get("kernel_port", 0))
 
-    if not token or not registry_port:
-        print("[acp_channel] ERROR: Missing token or KITE_REGISTRY_PORT")
+    if not token or not kernel_port:
+        print("[acp_channel] ERROR: Missing token or kernel_port")
         sys.exit(1)
 
-    print(f"[acp_channel] Token received ({len(token)} chars), registry port: {registry_port} ({_fmt_elapsed(_t0)})")
-
-    registry_url = f"http://127.0.0.1:{registry_port}"
-    port = _get_free_port()
-
-    # Register and discover Event Hub synchronously before starting uvicorn
-    client = httpx.Client(timeout=5)
-    _register_to_registry(client, token, registry_url, port)
-    print(f"[acp_channel] Registered to Registry ({_fmt_elapsed(_t0)})")
-    event_hub_ws = _get_event_hub_ws(client, token, registry_url)
-    if not event_hub_ws:
-        print("[acp_channel] WARNING: Could not discover Event Hub WS, events disabled")
-    else:
-        print(f"[acp_channel] Discovered Event Hub: {event_hub_ws}")
-    client.close()
+    print(f"[acp_channel] Token received ({len(token)} chars), kernel port: {kernel_port} ({_fmt_elapsed(_t0)})")
 
     server = AcpChannelServer(
         token=token,
-        registry_url=registry_url,
-        event_hub_ws=event_hub_ws,
+        kernel_port=kernel_port,
         boot_t0=_t0,
     )
 
-    print(f"[acp_channel] Starting on port {port} ({_fmt_elapsed(_t0)})")
+    print(f"[acp_channel] Starting ({_fmt_elapsed(_t0)})")
     try:
-        config = uvicorn.Config(server.app, host="127.0.0.1", port=port, log_level="warning")
-        uvi_server = uvicorn.Server(config)
-        server._uvicorn_server = uvi_server
-        uvi_server.run()
+        asyncio.run(server.run())
     except Exception as e:
         _write_crash(type(e), e, e.__traceback__, severity="critical", handled=True)
         _print_crash_summary(type(e), e.__traceback__)

package/extensions/channels/acp_channel/module.md

@@ -19,4 +19,4 @@ subscriptions:
 ACP 协议通道模块，负责接入外部消息通道。
 
 - 消息接入 — 通过 ACP 协议接收和发送消息
-- 事件通知 — 通过 Event Hub 发布通道状态事件
+- 事件通知 — 通过 Kernel 发布通道状态事件