mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-18 14:25:51 +00:00
* 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>
259 lines
8.4 KiB
TypeScript
259 lines
8.4 KiB
TypeScript
import { createLogger } from "./logger.js";
|
|
|
|
export interface RcsUpstreamConfig {
|
|
rcsUrl: string; // e.g. "http://localhost:3000"
|
|
apiToken: string;
|
|
agentName: string;
|
|
channelGroupId?: string;
|
|
capabilities?: Record<string, unknown>;
|
|
maxSessions?: number;
|
|
}
|
|
|
|
/**
|
|
* RCS upstream client — connects acp-link to a Remote Control Server.
|
|
*
|
|
* Lifecycle:
|
|
* 1. connect() — opens WS to RCS
|
|
* 2. Sends register message
|
|
* 3. Waits for registered response
|
|
* 4. Forwards all ACP events via send()
|
|
* 5. Reconnects with exponential backoff on failure
|
|
*/
|
|
export class RcsUpstreamClient {
|
|
private static log = createLogger("rcs-upstream");
|
|
private ws: WebSocket | null = null;
|
|
private registered = false;
|
|
private reconnectAttempts = 0;
|
|
private closed = false;
|
|
private readonly maxReconnectDelay = 30_000;
|
|
private readonly baseReconnectDelay = 1_000;
|
|
/** Agent ID obtained from REST registration */
|
|
private agentId: string | null = null;
|
|
/** Session ID from REST registration (ACP agents auto-create a session) */
|
|
private sessionId: string | undefined;
|
|
|
|
/** Handler for incoming ACP messages from RCS relay */
|
|
private messageHandler: ((message: Record<string, unknown>) => void) | null = null;
|
|
|
|
constructor(private config: RcsUpstreamConfig) {}
|
|
|
|
/** Get the agent ID from REST registration */
|
|
getAgentId(): string | null {
|
|
return this.agentId;
|
|
}
|
|
|
|
/** Set handler for incoming ACP messages from RCS relay */
|
|
setMessageHandler(handler: (message: Record<string, unknown>) => void): void {
|
|
this.messageHandler = handler;
|
|
}
|
|
|
|
/** Register via REST API before establishing WS connection */
|
|
private async registerViaRest(): Promise<string> {
|
|
const baseUrl = this.config.rcsUrl
|
|
.replace(/^ws:\/\//, "http://")
|
|
.replace(/^wss:\/\//, "https://")
|
|
.replace(/\/acp\/ws.*$/, "")
|
|
.replace(/\/$/, "");
|
|
|
|
const url = `${baseUrl}/v1/environments/bridge`;
|
|
RcsUpstreamClient.log.info({ url }, "REST register");
|
|
|
|
const resp = await fetch(url, {
|
|
method: "POST",
|
|
headers: {
|
|
"Content-Type": "application/json",
|
|
"Authorization": `Bearer ${this.config.apiToken}`,
|
|
},
|
|
body: JSON.stringify({
|
|
machine_name: this.config.agentName,
|
|
worker_type: "acp",
|
|
bridge_id: this.config.channelGroupId || undefined,
|
|
max_sessions: this.config.maxSessions,
|
|
capabilities: this.config.capabilities,
|
|
}),
|
|
});
|
|
|
|
if (!resp.ok) {
|
|
const text = await resp.text();
|
|
throw new Error(`REST register failed (${resp.status}): ${text}`);
|
|
}
|
|
|
|
const data = await resp.json() as { environment_id: string; environment_secret: string; status: string; session_id?: string };
|
|
this.agentId = data.environment_id;
|
|
this.sessionId = data.session_id;
|
|
RcsUpstreamClient.log.info({ agentId: this.agentId, sessionId: this.sessionId }, "REST register success");
|
|
return data.environment_id;
|
|
}
|
|
|
|
/** Normalize RCS URL: accept http(s) base URL and convert to ws(s) + /acp/ws path */
|
|
private buildWsUrl(): string {
|
|
let raw = this.config.rcsUrl;
|
|
raw = raw.replace(/^http:\/\//, "ws://").replace(/^https:\/\//, "wss://");
|
|
const url = new URL(raw);
|
|
const path = url.pathname.replace(/\/+$/, "");
|
|
if (!path || path === "/") {
|
|
url.pathname = "/acp/ws";
|
|
}
|
|
if (this.config.apiToken) {
|
|
url.searchParams.set("token", this.config.apiToken);
|
|
}
|
|
return url.toString();
|
|
}
|
|
|
|
/** Open connection to RCS: REST register → WS identify */
|
|
async connect(): Promise<void> {
|
|
if (this.closed) return;
|
|
|
|
// Step 1: REST registration
|
|
try {
|
|
await this.registerViaRest();
|
|
} catch (err) {
|
|
RcsUpstreamClient.log.error({ err }, "REST registration failed");
|
|
if (!this.closed) {
|
|
this.scheduleReconnect();
|
|
}
|
|
return;
|
|
}
|
|
|
|
// Step 2: WebSocket connection with identify
|
|
const wsUrl = this.buildWsUrl();
|
|
RcsUpstreamClient.log.info({ url: wsUrl }, "connecting WS");
|
|
|
|
return new Promise((resolve, reject) => {
|
|
try {
|
|
this.ws = new WebSocket(wsUrl);
|
|
|
|
this.ws.onopen = () => {
|
|
RcsUpstreamClient.log.debug("ws open — sending identify");
|
|
this.ws!.send(
|
|
JSON.stringify({
|
|
type: "identify",
|
|
agent_id: this.agentId,
|
|
}),
|
|
);
|
|
};
|
|
|
|
this.ws.onmessage = (event) => {
|
|
let data: Record<string, unknown>;
|
|
try {
|
|
data = JSON.parse(event.data as string);
|
|
} catch {
|
|
RcsUpstreamClient.log.warn({ raw: String(event.data).slice(0, 200) }, "invalid JSON from server");
|
|
return;
|
|
}
|
|
|
|
if (data.type === "identified") {
|
|
RcsUpstreamClient.log.info({ agent_id: data.agent_id, channel_group_id: data.channel_group_id }, "identified");
|
|
this.registered = true;
|
|
this.reconnectAttempts = 0;
|
|
const webBase = this.config.rcsUrl
|
|
.replace(/^ws:\/\//, "http://")
|
|
.replace(/^wss:\/\//, "https://")
|
|
.replace(/\/acp\/ws.*$/, "")
|
|
.replace(/\/$/, "");
|
|
console.log();
|
|
if (this.sessionId) {
|
|
console.log(` 🔗 Dashboard: ${webBase}/code/?sid=${this.sessionId}`);
|
|
} else {
|
|
console.log(` 🔗 Dashboard: ${webBase}/code/`);
|
|
}
|
|
if (this.agentId) {
|
|
console.log(` Agent ID: ${this.agentId}`);
|
|
}
|
|
console.log();
|
|
resolve();
|
|
} else if (data.type === "registered") {
|
|
// Legacy fallback: server still uses old register flow
|
|
RcsUpstreamClient.log.info({ agent_id: data.agent_id }, "registered (legacy)");
|
|
this.agentId = (data.agent_id as string) || this.agentId;
|
|
this.registered = true;
|
|
this.reconnectAttempts = 0;
|
|
resolve();
|
|
} else if (data.type === "error") {
|
|
RcsUpstreamClient.log.error({ message: data.message }, "server error");
|
|
if (!this.registered) {
|
|
reject(new Error(data.message as string));
|
|
}
|
|
} else if (data.type === "keep_alive") {
|
|
// ignore keepalive
|
|
} else {
|
|
// Forward ACP protocol messages to handler (for RCS relay support)
|
|
RcsUpstreamClient.log.debug({ type: data.type }, "forwarding to relay handler");
|
|
this.messageHandler?.(data);
|
|
}
|
|
};
|
|
|
|
this.ws.onerror = () => {
|
|
// onclose fires after onerror with the actual close code, so we log there
|
|
if (!this.registered) {
|
|
reject(new Error("WebSocket connection failed"));
|
|
}
|
|
};
|
|
|
|
this.ws.onclose = (event) => {
|
|
RcsUpstreamClient.log.info({ code: event.code, reason: event.reason || undefined }, "ws closed");
|
|
this.registered = false;
|
|
this.ws = null;
|
|
if (!this.closed) {
|
|
this.scheduleReconnect();
|
|
}
|
|
};
|
|
} catch (err) {
|
|
RcsUpstreamClient.log.error({ err }, "connect threw");
|
|
reject(err);
|
|
}
|
|
});
|
|
}
|
|
|
|
/** Send an ACP message to RCS for broadcast */
|
|
send(message: object): void {
|
|
if (!this.ws || this.ws.readyState !== WebSocket.OPEN || !this.registered) {
|
|
return;
|
|
}
|
|
try {
|
|
this.ws.send(JSON.stringify(message));
|
|
} catch (err) {
|
|
RcsUpstreamClient.log.error({ err }, "send failed");
|
|
}
|
|
}
|
|
|
|
/** Check if registered with RCS */
|
|
isRegistered(): boolean {
|
|
return this.registered && this.ws !== null && this.ws.readyState === WebSocket.OPEN;
|
|
}
|
|
|
|
/** Close the RCS connection permanently */
|
|
async close(): Promise<void> {
|
|
this.closed = true;
|
|
this.registered = false;
|
|
if (this.ws) {
|
|
this.ws.close(1000, "client shutdown");
|
|
this.ws = null;
|
|
}
|
|
RcsUpstreamClient.log.info("closed");
|
|
}
|
|
|
|
private scheduleReconnect(): void {
|
|
if (this.closed) return;
|
|
|
|
const delay = Math.min(
|
|
this.baseReconnectDelay * 2 ** this.reconnectAttempts,
|
|
this.maxReconnectDelay,
|
|
);
|
|
const jitter = delay * Math.random() * 0.2;
|
|
const actualDelay = delay + jitter;
|
|
this.reconnectAttempts++;
|
|
|
|
RcsUpstreamClient.log.warn({ attempt: this.reconnectAttempts, delayMs: Math.round(actualDelay) }, "reconnecting");
|
|
|
|
setTimeout(async () => {
|
|
if (this.closed) return;
|
|
try {
|
|
await this.connect();
|
|
} catch {
|
|
// connect() itself logs the error; nothing to add here
|
|
}
|
|
}, actualDelay);
|
|
}
|
|
}
|