Surface remote websocket close codes

Author: SqlRush

cmd/claude/main.go

@@ -888,6 +888,7 @@ func runDaemonRemoteStream(ctx context.Context, runner conversation.Runner, now
 	pumpState.FrameCount = result.FrameCount
 	pumpState.ConnectCount = result.ConnectCount
 	pumpState.ReconnectCount = result.ReconnectCount
+	pumpState.CloseCode = result.CloseCode
 	pumpState.LastPollAt = time.Now().UTC().Format(time.RFC3339Nano)
 	pumpState.StreamEndedAt = pumpState.LastPollAt
 	pumpState.StreamStopReason = daemonRemoteStreamStopReason(ctx, streamOptions, result)
@@ -906,6 +907,7 @@ func runDaemonRemoteStream(ctx context.Context, runner conversation.Runner, now
 	structured["frame_count"] = pumpState.FrameCount
 	structured["connect_count"] = pumpState.ConnectCount
 	structured["reconnect_count"] = pumpState.ReconnectCount
+	structured["close_code"] = pumpState.CloseCode
 	structured["stream_started_at"] = pumpState.StreamStartedAt
 	structured["stream_ended_at"] = pumpState.StreamEndedAt
 	structured["stream_stop_reason"] = pumpState.StreamStopReason
@@ -1075,6 +1077,7 @@ func runDaemonRemotePoll(ctx context.Context, runner conversation.Runner, now ti
 		LastCursor:     previous.LastCursor,
 		LastPollAt:     now.UTC().Format(time.RFC3339Nano),
 		StatusCode:     remoteFetch.StatusCode,
+		CloseCode:      remoteFetch.CloseCode,
 		FrameCount:     remoteFetch.FrameCount,
 		ConnectCount:   remoteFetch.ConnectCount,
 		ReconnectCount: remoteFetch.ReconnectCount,
@@ -1096,6 +1099,7 @@ func runDaemonRemotePoll(ctx context.Context, runner conversation.Runner, now ti
 		structured["poll_url"] = pumpState.PollURL
 		structured["websocket_url"] = pumpState.WebSocketURL
 		structured["status_code"] = remoteFetch.StatusCode
+		structured["close_code"] = remoteFetch.CloseCode
 		structured["frame_count"] = remoteFetch.FrameCount
 		structured["connect_count"] = remoteFetch.ConnectCount
 		structured["reconnect_count"] = remoteFetch.ReconnectCount
@@ -1122,6 +1126,7 @@ func runDaemonRemotePoll(ctx context.Context, runner conversation.Runner, now ti
 	structured["websocket_url"] = pumpState.WebSocketURL
 	structured["last_cursor"] = pumpState.LastCursor
 	structured["status_code"] = pumpState.StatusCode
+	structured["close_code"] = pumpState.CloseCode
 	structured["frame_count"] = pumpState.FrameCount
 	structured["connect_count"] = pumpState.ConnectCount
 	structured["reconnect_count"] = pumpState.ReconnectCount
@@ -1143,6 +1148,7 @@ type daemonRemoteFetch struct {
 	Transport      string
 	StatusCode     int
 	NextCursor     string
+	CloseCode      int
 	FrameCount     int
 	ConnectCount   int
 	ReconnectCount int
@@ -1170,6 +1176,7 @@ func fetchDaemonRemoteEvents(ctx context.Context, registration remotepkg.Registr
 			FrameCount:     ws.FrameCount,
 			ConnectCount:   ws.ConnectCount,
 			ReconnectCount: ws.ReconnectCount,
+			CloseCode:      ws.CloseCode,
 			Events:         ws.Events,
 			Error:          ws.Error,
 		}

cmd/claude/main_test.go

@@ -429,7 +429,7 @@ func TestRunDaemonRemotePollPrefersWebSocket(t *testing.T) {
 		}},
 	}
 	result := runDaemonRemotePoll(context.Background(), runner, time.Unix(200, 0).UTC())
-	if result.StructuredContent["runtime_state"] != remotepkg.PumpRunning || result.StructuredContent["transport"] != "websocket" || result.StructuredContent["frame_count"] != 1 || result.StructuredContent["connect_count"] != 1 || result.StructuredContent["delivered_count"] != 1 || result.StructuredContent["error_count"] != 0 {
+	if result.StructuredContent["runtime_state"] != remotepkg.PumpRunning || result.StructuredContent["transport"] != "websocket" || result.StructuredContent["frame_count"] != 1 || result.StructuredContent["connect_count"] != 1 || result.StructuredContent["close_code"] != 1000 || result.StructuredContent["delivered_count"] != 1 || result.StructuredContent["error_count"] != 0 {
 		t.Fatalf("websocket poll = %#v", result.StructuredContent)
 	}
 	if len(auths) != 1 || auths[0] != "Bearer ws-token" {
@@ -439,7 +439,7 @@ func TestRunDaemonRemotePollPrefersWebSocket(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if pump.Transport != "websocket" || pump.FrameCount != 1 || pump.ConnectCount != 1 || pump.DeliveredCount != 1 || strings.Contains(pump.WebSocketURL, "token=secret") {
+	if pump.Transport != "websocket" || pump.FrameCount != 1 || pump.ConnectCount != 1 || pump.CloseCode != 1000 || pump.DeliveredCount != 1 || strings.Contains(pump.WebSocketURL, "token=secret") {
 		t.Fatalf("pump = %#v", pump)
 	}
 	resume, err := manager.ResumeContext("agent/remote-lead", 3)

docs/cc-100-roadmap.md

@@ -115,7 +115,7 @@ M10 补充：remote settings 新增 `registrationUrl`/`authToken`，`advanced.br
 
 M10 补充：新增 session-scoped `remote-pump.json` 和 daemon remote 消息泵；daemon tick 会在 ScheduleCron due tick 后优先读取 registered `websocket_url`，通过 Bearer auth 建立 WebSocket、读取单帧事件并复用 poll 解码/`RemoteTrigger` 注入路径；无 WebSocket 或 WebSocket 失败且存在 poll URL 时回退到带 cursor 的 poll 拉取。pump 状态会记录 transport、websocket/poll URL 脱敏值、cursor、HTTP status、event/delivered/duplicate/error 计数，`/status show remote` 可审计当前传输。完整 CCR WebSocket 常驻持久 stream 和云端协议 hardening 仍未完成。
 
-M10 补充：remote WebSocket pump 现在支持单次 tick 内读取多帧事件，并在握手/读帧失败或非正常 close 时按可配置 backoff 重连；daemon 默认读取最多 8 帧、最多重连 2 次，并把 frame/connect/reconnect 计数写入 `remote-pump.json` 和 `/status show remote`。完整 CCR 云端 WebSocket 常驻持久 stream 与更深协议 hardening 仍未完成。
+M10 补充：remote WebSocket pump 现在支持单次 tick 内读取多帧事件，并在握手/读帧失败或非正常 close 时按可配置 backoff 重连；daemon 默认读取最多 8 帧、最多重连 2 次，并把 frame/connect/reconnect 计数和 WebSocket close code 写入 `remote-pump.json` 和 `/status show remote`。完整 CCR 云端 WebSocket 常驻持久 stream 与更深协议 hardening 仍未完成。
 
 M10 补充：`internal/remote` 新增 callback 型 `StreamWebSocketEvents` primitive，可保持 WebSocket 连接逐帧解码并把事件批次交给调用方，支持 context 取消、可选帧上限、handler 错误传播、异常 close/读错后的 backoff 重连以及 `ReconnectAttempts < 0` 无限重连语义；该能力为 daemon 常驻 stream 托管接线打底。完整云端协议 hardening 仍未完成。
 

docs/claude-code-go-rewrite-plan.md

@@ -746,7 +746,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：bridge direct server 新增 `GET /remote-service` discovery endpoint 和 WebSocket `remote_status` action，返回同一份 session-scoped remote service manifest；bridge manifest、direct `/manifest` 响应和 `/status show bridge` 同步暴露 `remote_service` capability，远端控制端可通过 HTTP 或已鉴权 WebSocket 查询 bridge/daemon 服务状态。完整 CCR 云端注册和消息泵仍未完成。
 - 本轮补充：remote settings 新增 `registrationUrl`/`authToken`，`advanced.bridge=true` 写出 remote service manifest 后会把 manifest POST 到注册 URL，并将 registered/failed/disabled、HTTP status、远端 session/websocket/poll 信息写入 session-scoped `remote-registration.json`；`/status show remote` 可审计注册状态且不泄露 token/query。完整 CCR 云端长连接仍未完成。
 - 本轮补充：新增 session-scoped `remote-pump.json` 和 daemon remote 消息泵；daemon tick 会在 ScheduleCron due tick 后优先读取 registered `websocket_url`，通过 Bearer auth 建立 WebSocket、读取单帧事件并复用 poll 解码/`RemoteTrigger` 注入路径；无 WebSocket 或 WebSocket 失败且存在 poll URL 时回退到带 cursor 的 poll 拉取。pump 状态会记录 transport、websocket/poll URL 脱敏值、cursor、HTTP status、event/delivered/duplicate/error 计数，`/status show remote` 可审计当前传输。完整 CCR WebSocket 常驻持久 stream 和云端协议 hardening 仍未完成。
-- 本轮补充：remote WebSocket pump 现在支持单次 tick 内读取多帧事件，并在握手/读帧失败或非正常 close 时按可配置 backoff 重连；daemon 默认读取最多 8 帧、最多重连 2 次，并把 frame/connect/reconnect 计数写入 `remote-pump.json` 和 `/status show remote`。完整 CCR 云端 WebSocket 常驻持久 stream 与更深协议 hardening 仍未完成。
+- 本轮补充：remote WebSocket pump 现在支持单次 tick 内读取多帧事件，并在握手/读帧失败或非正常 close 时按可配置 backoff 重连；daemon 默认读取最多 8 帧、最多重连 2 次，并把 frame/connect/reconnect 计数和 WebSocket close code 写入 `remote-pump.json` 和 `/status show remote`。完整 CCR 云端 WebSocket 常驻持久 stream 与更深协议 hardening 仍未完成。
 - 本轮补充：`internal/remote` 新增 callback 型 `StreamWebSocketEvents` primitive，可保持 WebSocket 连接逐帧解码并把事件批次交给调用方，支持 context 取消、可选帧上限、handler 错误传播、异常 close/读错后的 backoff 重连以及 `ReconnectAttempts < 0` 无限重连语义；该能力为 daemon 常驻 stream 托管接线打底。完整云端协议 hardening 仍未完成。
 - 本轮补充：`--daemon` 常驻模式现在会在初始 tick 后启动 remote WebSocket stream goroutine，按 heartbeat 间隔重试注册状态，复用 `StreamWebSocketEvents` 和 `RemoteTrigger` delivery/dedupe，把推送事件实时注入 running team，并在 `remote-pump.json` 中持续更新 `websocket_stream` transport、frame/connect/reconnect、delivered/duplicate/error 计数；daemon heartbeat/tick 在已注册 `websocket_url` 时会跳过短 WebSocket 读取，避免 stream 和 tick 双连接/重复写 pump state，poll-only 注册仍走原 tick 路径；daemon stop/context cancel 会取消 stream，并在 pump state 与 `/status show remote` 中记录 stream start/end/stop reason。完整云端协议 hardening 仍未完成。
 - 本轮补充：remote poll/WebSocket 共用解码器现在兼容 `data`、`event`、`remote_event`、`delivery`、`payload` 包裹的单条事件，以及这些 wrapper 下的 `events/items/messages/deliveries` 列表；云端可以用 envelope 协议携带 cursor 和事件内容，而无需强制把事件字段铺在顶层。更深的鉴权刷新、ack/lease 和服务端协议协商仍未完成。

internal/conversation/run.go

@@ -1885,6 +1885,9 @@ func formatRemotePump(state remotepkg.PumpState) []string {
 	parts = append(parts, fmt.Sprintf("delivered %d", state.DeliveredCount))
 	parts = append(parts, fmt.Sprintf("duplicates %d", state.DuplicateCount))
 	parts = append(parts, fmt.Sprintf("errors %d", state.ErrorCount))
+	if state.CloseCode > 0 {
+		parts = append(parts, fmt.Sprintf("close %d", state.CloseCode))
+	}
 	if state.StreamStartedAt != "" {
 		parts = append(parts, "stream started "+state.StreamStartedAt)
 	}

internal/conversation/run_test.go

@@ -2829,6 +2829,7 @@ func TestRunnerExecutesStatusShowSectionsWithoutQuery(t *testing.T) {
 		StreamEndedAt:    "2026-06-17T10:08:00Z",
 		StreamStopReason: "context_cancelled",
 		StatusCode:       http.StatusOK,
+		CloseCode:        1000,
 		FrameCount:       2,
 		ConnectCount:     1,
 		ReconnectCount:   1,
@@ -2978,6 +2979,7 @@ func TestRunnerExecutesStatusShowSectionsWithoutQuery(t *testing.T) {
 		"Remote environment: env-status",
 		"Remote registration: registered: url https://remote.example/register: status 202: remote session remote-status: websocket wss://remote.example/ws: poll https://remote.example/poll",
 		"Remote pump: running: transport websocket: websocket wss://remote.example/ws: poll https://remote.example/poll: cursor cursor-2: status 200: frames 2: connects 1: reconnects 1: events 3: delivered 2: duplicates 1: errors 0",
+		"close 1000",
 		"stream started 2026-06-17T10:03:00Z: stream ended 2026-06-17T10:08:00Z: stream stop context_cancelled",
 		"Remote services: 2",
 		"- bridge: running: endpoint http://127.0.0.1:8888: websocket ws://127.0.0.1:8888/ws: token required: commands 2: capabilities websocket_protocol, remote_trigger, remote_service",

internal/remote/pump.go

@@ -37,6 +37,7 @@ type PumpState struct {
 	StreamEndedAt    string       `json:"stream_ended_at,omitempty"`
 	StreamStopReason string       `json:"stream_stop_reason,omitempty"`
 	StatusCode       int          `json:"status_code,omitempty"`
+	CloseCode        int          `json:"close_code,omitempty"`
 	FrameCount       int          `json:"frame_count,omitempty"`
 	ConnectCount     int          `json:"connect_count,omitempty"`
 	ReconnectCount   int          `json:"reconnect_count,omitempty"`

internal/remote/pump_test.go

@@ -121,6 +121,7 @@ func TestWriteAndLoadPumpState(t *testing.T) {
 		StreamStartedAt:  "2026-06-17T10:00:00Z",
 		StreamEndedAt:    "2026-06-17T10:05:00Z",
 		StreamStopReason: "max_frames",
+		CloseCode:        1000,
 		FrameCount:       2,
 		ConnectCount:     1,
 		ReconnectCount:   1,
@@ -134,7 +135,7 @@ func TestWriteAndLoadPumpState(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if loaded.SessionID != "sess_remote" || loaded.RuntimeState != PumpRunning || loaded.Transport != "websocket" || loaded.WebSocketURL != "wss://remote/ws" || loaded.LastCursor != "cursor-1" || loaded.StreamStartedAt != "2026-06-17T10:00:00Z" || loaded.StreamEndedAt != "2026-06-17T10:05:00Z" || loaded.StreamStopReason != "max_frames" || loaded.FrameCount != 2 || loaded.ConnectCount != 1 || loaded.ReconnectCount != 1 || loaded.LastPollAt == "" {
+	if loaded.SessionID != "sess_remote" || loaded.RuntimeState != PumpRunning || loaded.Transport != "websocket" || loaded.WebSocketURL != "wss://remote/ws" || loaded.LastCursor != "cursor-1" || loaded.StreamStartedAt != "2026-06-17T10:00:00Z" || loaded.StreamEndedAt != "2026-06-17T10:05:00Z" || loaded.StreamStopReason != "max_frames" || loaded.CloseCode != 1000 || loaded.FrameCount != 2 || loaded.ConnectCount != 1 || loaded.ReconnectCount != 1 || loaded.LastPollAt == "" {
 		t.Fatalf("loaded = %#v", loaded)
 	}
 	data, err := json.Marshal(loaded)