feat: 支持 acp-link 包进行 acp 通用的 remote-control (#292)

* fix: 修复超时问题 * feat: 添加 acp-link 代码 * refactor: 样式重构完成 * feat: RCS 添加 ACP 后端支持 - 新增 ACP WebSocket handler (agent 注册、EventBus 订阅) - 新增 relay handler (前端 WS → acp-link 透传 + EventBus inbound 转发) - 新增 SSE event stream 供外部消费者订阅 channel group 事件 - ACP REST 接口无鉴权 (agents、channel-groups) - WebSocket 端点保留 token 鉴权 - SPA 路由 /acp/ 指向 acp.html Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: 添加 ACP 专属前端界面 - 新增 /acp/ SPA 页面 (agent 列表 + 实时交互) - Agent 列表按 channel group 分组，显示在线状态 - 通过 RCS WebSocket relay 与 agent 通信 - Vite multi-page 构建 (index.html + acp.html) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: acp-link 支持 RCS relay 双向通信 - rcs-upstream 新增 messageHandler 转发非控制消息 - server.ts 新增虚拟 WS + relay client state 处理 relay ACP 消息 - newSession/loadSession 补充 mcpServers 参数 - 连接成功后显示 ACP Dashboard URL Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 移除 FileExplorer 及文件操作相关代码 - 删除 FileExplorer 组件 - ACPMain 移除 Files tab，仅保留 Chat 和 History - client.ts 移除 listDir/readFile/onFileChanges 等方法 - types.ts 移除 FileItem/FileContent/FileChange 等类型 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 修复类型问题 * feat: RCS 后端统一 ACP/Bridge 注册逻辑 - store: EnvironmentRecord 增加 capabilities 字段、storeFindEnvironmentByMachineName 复用逻辑 - store: 新增 storeGetSessionOwners，支持未绑定 session 自动 claim - environment: registerEnvironment 支持 ACP 复用已有记录，返回 session_id - session: resolveOwnedWebSessionId 支持无 owner session 自动绑定 - acp-ws-handler: 新增 handleIdentify 支持 REST+WS 两步注册 - acp routes: /acp/relay 和 /acp/agents 支持 UUID 认证 - event-bus: 增加 error 类型 payload 日志 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: acp-link 改 REST 注册 + WS identify 两步流程 - rcs-upstream: 新增 registerViaRest() 通过 POST /v1/environments/bridge 注册 - rcs-upstream: WS 连接后发送 identify 替代 register，携带 agentId - rcs-upstream: 入口链接改为 /code/?sid=${sessionId} 实现用户绑定 - server: 修复心跳跳过 relay 虚拟连接的 bug - server: maxSessions 配置传入 RCS upstream Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: 前端统一 Chat 组件 + ACP 聊天界面重构 - 新增 chat/ 组件: ChatView, ChatInput, MessageBubble, ToolCallGroup, PermissionPanel, SessionSidebar, CommandMenu - ACPMain: 重构支持完整 ACP 协议交互（session/prompt/permission） - rcs-chat-adapter: 统一 bridge session SSE 适配器 - ACPClient: 增强 session 管理、permission 流程、streaming 支持 - index.css: 新增 chat 相关样式、动画、布局 - useCommands: 新增快捷命令 hook Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 删除 /acp/ 独立页面，ACP 聊天统一到 /code/:sessionId - 删除 acp.html、acp-main.tsx 入口文件和 pages/acp/ 目录 - SessionDetail: ACP session 在同一页面渲染 ACPSessionDetail 组件 - App.tsx: ?sid= 参数自动调用 apiBind 绑定用户 UUID - Dashboard: 统一 session 列表导航，ACP 显示紫色标签 - relay-client: 改用 UUID 认证替代 API token - EnvironmentList: 显示 workerType 标签（ACP Agent / Claude Code） - index.ts: 移除 /acp/ SPA 路由，vite.config 移除 acp 入口 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * build: 更新构建及测试修复 --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-06-22 16:25:51 +00:00 · 2026-04-18 17:59:29 +08:00
parent 29cc74a170
commit 34154ee3f5
142 changed files with 17847 additions and 5577 deletions
--- a/packages/remote-control-server/src/transport/acp-ws-handler.ts
+++ b/packages/remote-control-server/src/transport/acp-ws-handler.ts
@@ -0,0 +1,313 @@
+import type { WSContext } from "hono/ws";
+import { v4 as uuid } from "uuid";
+import { getAcpEventBus } from "./event-bus";
+import type { SessionEvent } from "./event-bus";
+import {
+  storeCreateEnvironment,
+  storeGetEnvironment,
+  storeMarkAcpAgentOffline,
+  storeMarkAcpAgentOnline,
+  storeUpdateEnvironment,
+} from "../store";
+import { config } from "../config";
+import { log, error as logError } from "../logger";
+
+// Per-connection state
+interface AcpConnectionEntry {
+  agentId: string | null; // Set after register message
+  channelGroupId: string;
+  unsub: (() => void) | null;
+  keepalive: ReturnType<typeof setInterval> | null;
+  ws: WSContext;
+  openTime: number;
+  lastClientActivity: number;
+  capabilities: Record<string, unknown> | null;
+}
+
+const connections = new Map<string, AcpConnectionEntry>(); // key: wsId
+
+const SERVER_KEEPALIVE_INTERVAL_MS = config.wsKeepaliveInterval * 1000;
+const CLIENT_ACTIVITY_TIMEOUT_MS = SERVER_KEEPALIVE_INTERVAL_MS * 3;
+
+/** Send a JSON message to a WS connection (NDJSON format) */
+function sendToWs(ws: WSContext, msg: object): void {
+  if (ws.readyState !== 1) return;
+  try {
+    ws.send(JSON.stringify(msg) + "\n");
+  } catch (err) {
+    logError("[ACP-WS] send error:", err);
+  }
+}
+
+/** Called from onOpen — initializes connection tracking */
+export function handleAcpWsOpen(ws: WSContext, wsId: string): void {
+  log(`[ACP-WS] Connection opened: wsId=${wsId}`);
+
+  const keepalive = setInterval(() => {
+    const entry = connections.get(wsId);
+    if (!entry || entry.ws.readyState !== 1) {
+      clearInterval(keepalive);
+      return;
+    }
+    const silenceMs = Date.now() - entry.lastClientActivity;
+    if (silenceMs > CLIENT_ACTIVITY_TIMEOUT_MS) {
+      log(`[ACP-WS] Client inactive for ${Math.round(silenceMs / 1000)}s, closing dead connection`);
+      try {
+        entry.ws.close(1000, "client inactive");
+      } catch {
+        clearInterval(keepalive);
+      }
+      return;
+    }
+    sendToWs(entry.ws, { type: "keep_alive" });
+  }, SERVER_KEEPALIVE_INTERVAL_MS);
+
+  connections.set(wsId, {
+    agentId: null,
+    channelGroupId: "",
+    unsub: null,
+    keepalive,
+    ws,
+    openTime: Date.now(),
+    lastClientActivity: Date.now(),
+    capabilities: null,
+  });
+}
+
+/** Handle register message — legacy WS-only registration (still supported) */
+function handleRegister(wsId: string, msg: Record<string, unknown>): void {
+  const entry = connections.get(wsId);
+  if (!entry) return;
+
+  if (entry.agentId) {
+    sendToWs(entry.ws, { type: "error", message: "Already registered" });
+    return;
+  }
+
+  const agentName = (msg.agent_name as string) || "unknown";
+  const capabilities = msg.capabilities as Record<string, unknown> | undefined;
+  const channelGroupId = (msg.channel_group_id as string) || `group_${uuid().replace(/-/g, "").slice(0, 12)}`;
+  const acpLinkVersion = (msg.acp_link_version as string) || null;
+  const maxSessions = typeof msg.max_sessions === "number" ? msg.max_sessions : 1;
+
+  // Create EnvironmentRecord with workerType="acp"
+  const secret = config.apiKeys[0] || "";
+  const record = storeCreateEnvironment({
+    secret,
+    machineName: agentName,
+    workerType: "acp",
+    bridgeId: channelGroupId,
+    maxSessions,
+    capabilities: capabilities || undefined,
+  } as Parameters<typeof storeCreateEnvironment>[0]);
+
+  // Store ACP-specific metadata via environment update
+  storeUpdateEnvironment(record.id, {
+    status: "active",
+  } as Parameters<typeof storeUpdateEnvironment>[1]);
+
+  entry.agentId = record.id;
+  entry.channelGroupId = channelGroupId;
+  entry.capabilities = capabilities || null;
+
+  // Subscribe to channel group EventBus — broadcast events to this WS
+  const bus = getAcpEventBus(channelGroupId);
+  const unsub = bus.subscribe((event: SessionEvent) => {
+    if (entry.ws.readyState !== 1) return;
+    if (event.direction !== "outbound") return;
+    // Forward outbound events as raw ACP messages
+    sendToWs(entry.ws, event.payload as object);
+  });
+  entry.unsub = unsub;
+
+  log(`[ACP-WS] Agent registered (legacy WS): agentId=${record.id} channelGroup=${channelGroupId} name=${agentName}`);
+  sendToWs(entry.ws, {
+    type: "registered",
+    agent_id: record.id,
+    channel_group_id: channelGroupId,
+  });
+}
+
+/** Handle identify message — binds WS to an existing agent registered via REST */
+function handleIdentify(wsId: string, msg: Record<string, unknown>): void {
+  const entry = connections.get(wsId);
+  if (!entry) return;
+
+  if (entry.agentId) {
+    sendToWs(entry.ws, { type: "error", message: "Already identified" });
+    return;
+  }
+
+  const agentId = msg.agent_id as string;
+  if (!agentId) {
+    sendToWs(entry.ws, { type: "error", message: "Missing agent_id" });
+    return;
+  }
+
+  // Look up the environment record (created via REST registration)
+  const record = storeGetEnvironment(agentId);
+  if (!record || record.workerType !== "acp") {
+    sendToWs(entry.ws, { type: "error", message: "Agent not found" });
+    return;
+  }
+
+  // Update status to active
+  storeMarkAcpAgentOnline(agentId);
+
+  const channelGroupId = record.bridgeId || `group_${uuid().replace(/-/g, "").slice(0, 12)}`;
+
+  entry.agentId = record.id;
+  entry.channelGroupId = channelGroupId;
+  entry.capabilities = record.capabilities || null;
+
+  // Subscribe to channel group EventBus — broadcast events to this WS
+  const bus = getAcpEventBus(channelGroupId);
+  const unsub = bus.subscribe((event: SessionEvent) => {
+    if (entry.ws.readyState !== 1) return;
+    if (event.direction !== "outbound") return;
+    sendToWs(entry.ws, event.payload as object);
+  });
+  entry.unsub = unsub;
+
+  log(`[ACP-WS] Agent identified (REST+WS): agentId=${record.id} channelGroup=${channelGroupId}`);
+  sendToWs(entry.ws, {
+    type: "identified",
+    agent_id: record.id,
+    channel_group_id: channelGroupId,
+  });
+}
+
+/** Called from onMessage — processes NDJSON lines */
+export function handleAcpWsMessage(ws: WSContext, wsId: string, data: string): void {
+  const entry = connections.get(wsId);
+  if (!entry) return;
+
+  entry.lastClientActivity = Date.now();
+
+  const lines = data.split("\n").filter((l) => l.trim());
+  for (const line of lines) {
+    let msg: Record<string, unknown>;
+    try {
+      msg = JSON.parse(line);
+    } catch {
+      logError("[ACP-WS] parse error:", line);
+      continue;
+    }
+
+    // Handle keepalive
+    if (msg.type === "keep_alive") {
+      // Update last activity timestamp (only if registered)
+      if (entry.agentId) {
+        storeUpdateEnvironment(entry.agentId, { lastPollAt: new Date() } as Parameters<typeof storeUpdateEnvironment>[1]);
+      }
+      continue;
+    }
+
+    // Handle registration (legacy WS-only)
+    if (msg.type === "register") {
+      handleRegister(wsId, msg);
+      continue;
+    }
+
+    // Handle identify (REST registration + WS binding)
+    if (msg.type === "identify") {
+      handleIdentify(wsId, msg);
+      continue;
+    }
+
+    // Not registered yet — reject
+    if (!entry.agentId) {
+      sendToWs(entry.ws, { type: "error", message: "Not registered. Send register message first." });
+      continue;
+    }
+
+    // Update agent activity
+    storeUpdateEnvironment(entry.agentId, { lastPollAt: new Date() } as Parameters<typeof storeUpdateEnvironment>[1]);
+
+    // Pass-through: publish to channel group EventBus as inbound
+    const bus = getAcpEventBus(entry.channelGroupId);
+    bus.publish({
+      id: uuid(),
+      sessionId: entry.channelGroupId,
+      type: (msg.type as string) || "acp_message",
+      payload: msg,
+      direction: "inbound",
+    });
+  }
+}
+
+/** Called from onClose — marks agent offline and cleans up */
+export function handleAcpWsClose(ws: WSContext, wsId: string, code?: number, reason?: string): void {
+  const entry = connections.get(wsId);
+  if (!entry) return;
+
+  const duration = Math.round((Date.now() - entry.openTime) / 1000);
+  log(`[ACP-WS] Connection closed: wsId=${wsId} agentId=${entry.agentId} code=${code ?? "none"} reason=${reason || "(none)"} duration=${duration}s`);
+
+  if (entry.unsub) {
+    entry.unsub();
+  }
+  if (entry.keepalive) {
+    clearInterval(entry.keepalive);
+  }
+
+  // Mark agent as offline (don't delete record — allow reconnect)
+  if (entry.agentId) {
+    storeMarkAcpAgentOffline(entry.agentId);
+
+    // Notify all relay connections that this agent is gone
+    if (entry.channelGroupId) {
+      const bus = getAcpEventBus(entry.channelGroupId);
+      bus.publish({
+        id: uuid(),
+        sessionId: entry.channelGroupId,
+        type: "agent_disconnect",
+        payload: { agentId: entry.agentId },
+        direction: "inbound",
+      });
+    }
+  }
+
+  connections.delete(wsId);
+}
+
+/** Find an active ACP connection by agent ID */
+export function findAcpConnectionByAgentId(agentId: string): AcpConnectionEntry | null {
+  for (const entry of connections.values()) {
+    if (entry.agentId === agentId && entry.ws.readyState === 1) {
+      return entry;
+    }
+  }
+  return null;
+}
+
+/** Send a JSON message directly to an agent's WebSocket connection */
+export function sendToAgentWs(agentId: string, msg: object): boolean {
+  const entry = findAcpConnectionByAgentId(agentId);
+  if (!entry) return false;
+  sendToWs(entry.ws, msg);
+  return true;
+}
+
+/** Gracefully close all ACP WebSocket connections */
+export function closeAllAcpConnections(): void {
+  if (connections.size === 0) return;
+
+  log(`[ACP-WS] Gracefully closing ${connections.size} ACP connection(s)...`);
+  for (const [wsId, entry] of connections) {
+    try {
+      if (entry.unsub) entry.unsub();
+      if (entry.keepalive) clearInterval(entry.keepalive);
+      if (entry.ws.readyState === 1) {
+        entry.ws.close(1001, "server_shutdown");
+      }
+      if (entry.agentId) {
+        storeMarkAcpAgentOffline(entry.agentId);
+      }
+    } catch {
+      // ignore errors during shutdown
+    }
+  }
+  connections.clear();
+  log("[ACP-WS] All connections closed");
+}