* 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>
152 lines
4.8 KiB
TypeScript
152 lines
4.8 KiB
TypeScript
import type { WSContext } from "hono/ws";
|
|
import {
|
|
findAcpConnectionByAgentId,
|
|
sendToAgentWs,
|
|
} from "./acp-ws-handler";
|
|
import { getAcpEventBus } from "./event-bus";
|
|
import type { SessionEvent } from "./event-bus";
|
|
import { log, error as logError } from "../logger";
|
|
|
|
// Per-relay connection state
|
|
interface RelayConnectionEntry {
|
|
agentId: string;
|
|
unsub: (() => void) | null;
|
|
keepalive: ReturnType<typeof setInterval> | null;
|
|
ws: WSContext;
|
|
openTime: number;
|
|
}
|
|
|
|
const relayConnections = new Map<string, RelayConnectionEntry>(); // key: relayWsId
|
|
|
|
const RELAY_KEEPALIVE_INTERVAL_MS = 20_000;
|
|
|
|
/** Send a JSON message to relay WS */
|
|
function sendToRelayWs(ws: WSContext, msg: object): void {
|
|
if (ws.readyState !== 1) return;
|
|
try {
|
|
ws.send(JSON.stringify(msg));
|
|
} catch (err) {
|
|
logError("[ACP-Relay] send error:", err);
|
|
}
|
|
}
|
|
|
|
/** Called from onOpen — finds target agent and bridges connection */
|
|
export function handleRelayOpen(ws: WSContext, relayWsId: string, agentId: string): void {
|
|
log(`[ACP-Relay] Relay connection opened: relayWsId=${relayWsId} agentId=${agentId}`);
|
|
|
|
// Check if agent is online
|
|
const agentConn = findAcpConnectionByAgentId(agentId);
|
|
if (!agentConn) {
|
|
log(`[ACP-Relay] Agent ${agentId} not found or offline`);
|
|
sendToRelayWs(ws, { type: "error", message: "Agent not found or offline" });
|
|
ws.close(4004, "agent not found");
|
|
return;
|
|
}
|
|
|
|
// Keepalive interval
|
|
const keepalive = setInterval(() => {
|
|
const entry = relayConnections.get(relayWsId);
|
|
if (!entry || entry.ws.readyState !== 1) {
|
|
clearInterval(keepalive);
|
|
return;
|
|
}
|
|
sendToRelayWs(entry.ws, { type: "keep_alive" });
|
|
}, RELAY_KEEPALIVE_INTERVAL_MS);
|
|
|
|
// Subscribe to channel group EventBus — forward agent responses to frontend
|
|
const channelGroupId = agentConn.channelGroupId;
|
|
const bus = getAcpEventBus(channelGroupId);
|
|
const unsub = bus.subscribe((event: SessionEvent) => {
|
|
if (ws.readyState !== 1) return;
|
|
if (event.direction !== "inbound") return;
|
|
// Handle agent disconnect specially: send status to frontend
|
|
if (event.type === "agent_disconnect") {
|
|
sendToRelayWs(ws, { type: "status", payload: { connected: false } });
|
|
return;
|
|
}
|
|
// Forward agent responses to the frontend WebSocket
|
|
sendToRelayWs(ws, event.payload as object);
|
|
});
|
|
|
|
relayConnections.set(relayWsId, {
|
|
agentId,
|
|
unsub,
|
|
keepalive,
|
|
ws,
|
|
openTime: Date.now(),
|
|
});
|
|
|
|
// Don't send a synthetic status message here!
|
|
// The frontend sends a "connect" command, which acp-link processes
|
|
// and responds with a real status message including capabilities.
|
|
// Sending a fake status would make the frontend think it's connected
|
|
// before the agent process is actually ready.
|
|
|
|
log(`[ACP-Relay] Relay established: relayWsId=${relayWsId} → agentId=${agentId}`);
|
|
}
|
|
|
|
/** Called from onMessage — forwards frontend messages to acp-link */
|
|
export function handleRelayMessage(ws: WSContext, relayWsId: string, data: string): void {
|
|
const entry = relayConnections.get(relayWsId);
|
|
if (!entry) return;
|
|
|
|
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-Relay] parse error:", line);
|
|
continue;
|
|
}
|
|
|
|
// Ignore keepalive responses
|
|
if (msg.type === "keep_alive") continue;
|
|
|
|
// Forward to acp-link agent
|
|
const sent = sendToAgentWs(entry.agentId, msg);
|
|
if (!sent) {
|
|
sendToRelayWs(ws, { type: "error", message: "Agent connection lost" });
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Called from onClose — cleans up relay connection */
|
|
export function handleRelayClose(ws: WSContext, relayWsId: string, code?: number, reason?: string): void {
|
|
const entry = relayConnections.get(relayWsId);
|
|
if (!entry) return;
|
|
|
|
const duration = Math.round((Date.now() - entry.openTime) / 1000);
|
|
log(`[ACP-Relay] Connection closed: relayWsId=${relayWsId} agentId=${entry.agentId} code=${code ?? "none"} reason=${reason || "(none)"} duration=${duration}s`);
|
|
|
|
if (entry.unsub) {
|
|
entry.unsub();
|
|
}
|
|
if (entry.keepalive) {
|
|
clearInterval(entry.keepalive);
|
|
}
|
|
|
|
relayConnections.delete(relayWsId);
|
|
}
|
|
|
|
/** Close all relay connections (for graceful shutdown) */
|
|
export function closeAllRelayConnections(): void {
|
|
if (relayConnections.size === 0) return;
|
|
|
|
log(`[ACP-Relay] Closing ${relayConnections.size} relay connection(s)...`);
|
|
for (const [relayWsId, entry] of relayConnections) {
|
|
try {
|
|
if (entry.unsub) entry.unsub();
|
|
if (entry.keepalive) clearInterval(entry.keepalive);
|
|
if (entry.ws.readyState === 1) {
|
|
entry.ws.close(1001, "server_shutdown");
|
|
}
|
|
} catch {
|
|
// ignore errors during shutdown
|
|
}
|
|
}
|
|
relayConnections.clear();
|
|
log("[ACP-Relay] All relay connections closed");
|
|
}
|