Accept wrapped remote registration responses

Author: SqlRush

docs/cc-100-roadmap.md

@@ -113,6 +113,8 @@ M10 补充：bridge direct server 新增 `GET /remote-service` discovery endpoin
 
 M10 补充：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 云端长连接仍未完成。
 
+M10 补充：remote registration 响应解析现在会先读取顶层字段，再递归解包 `data`、`session`、`remote_session`、`registration`、`result`、`payload` wrapper，兼容云端把 remote session、registration id、websocket/poll endpoint 放在 envelope 内返回。更深的注册协议协商和租约刷新仍未完成。
+
 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 计数和 WebSocket close code 写入 `remote-pump.json` 和 `/status show remote`。完整 CCR 云端 WebSocket 常驻持久 stream 与更深协议 hardening 仍未完成。

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

@@ -745,6 +745,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：bridge direct WebSocket JSON 通道新增 `hello`/`health`/`manifest` action，`hello` 会返回 protocol version、session、command count、capabilities 和可用 action 列表；bridge manifest 同时暴露 `websocket_protocol` capability，远端长连接客户端可在同一连接内完成能力握手。完整 CCR 云端长连接服务仍未完成。
 - 本轮补充：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 云端长连接仍未完成。
+- 本轮补充：remote registration 响应解析现在会先读取顶层字段，再递归解包 `data`、`session`、`remote_session`、`registration`、`result`、`payload` wrapper，兼容云端把 remote session、registration id、websocket/poll endpoint 放在 envelope 内返回。更深的注册协议协商和租约刷新仍未完成。
 - 本轮补充：新增 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 计数和 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 仍未完成。

internal/remote/registration.go

@@ -187,11 +187,37 @@ func applyRegistrationResponse(state *RegistrationState, body []byte) {
 		state.Message = strings.TrimSpace(string(body))
 		return
 	}
-	state.RemoteSessionID = firstString(raw, "remote_session_id", "remoteSessionId", "session_id", "sessionId")
-	state.RegistrationID = firstString(raw, "registration_id", "registrationId", "id")
-	state.WebSocketURL = firstString(raw, "websocket_url", "websocketUrl", "web_socket_url", "ws_url", "wsUrl")
-	state.PollURL = firstString(raw, "poll_url", "pollUrl", "events_url", "eventsUrl")
-	state.Message = firstString(raw, "message", "status", "detail")
+	applyRegistrationResponseFields(state, raw)
+	applyNestedRegistrationResponseFields(state, raw)
+}
+
+func applyRegistrationResponseFields(state *RegistrationState, raw map[string]any) {
+	if state.RemoteSessionID == "" {
+		state.RemoteSessionID = firstString(raw, "remote_session_id", "remoteSessionId", "session_id", "sessionId")
+	}
+	if state.RegistrationID == "" {
+		state.RegistrationID = firstString(raw, "registration_id", "registrationId", "id")
+	}
+	if state.WebSocketURL == "" {
+		state.WebSocketURL = firstString(raw, "websocket_url", "websocketUrl", "web_socket_url", "ws_url", "wsUrl")
+	}
+	if state.PollURL == "" {
+		state.PollURL = firstString(raw, "poll_url", "pollUrl", "events_url", "eventsUrl")
+	}
+	if state.Message == "" {
+		state.Message = firstString(raw, "message", "status", "detail")
+	}
+}
+
+func applyNestedRegistrationResponseFields(state *RegistrationState, raw map[string]any) {
+	for _, key := range []string{"data", "session", "remote_session", "remoteSession", "registration", "result", "payload"} {
+		nested, ok := raw[key].(map[string]any)
+		if !ok {
+			continue
+		}
+		applyRegistrationResponseFields(state, nested)
+		applyNestedRegistrationResponseFields(state, nested)
+	}
 }
 
 func firstString(values map[string]any, keys ...string) string {

internal/remote/registration_test.go

@@ -56,6 +56,39 @@ func TestRegisterManifestPostsServiceManifest(t *testing.T) {
 	}
 }
 
+func TestRegisterManifestAcceptsWrappedResponse(t *testing.T) {
+	now := time.Date(2026, 6, 17, 11, 3, 0, 0, time.UTC)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("content-type", "application/json")
+		_, _ = w.Write([]byte(`{
+			"message":"registered",
+			"data":{
+				"sessionId":"remote-wrapped",
+				"registration":{
+					"id":"reg-wrapped",
+					"web_socket_url":"wss://remote/wrapped/ws",
+					"eventsUrl":"https://remote/wrapped/events",
+					"detail":"nested detail"
+				}
+			}
+		}`))
+	}))
+	defer server.Close()
+
+	state := RegisterManifest(context.Background(), RegistrationOptions{
+		RegistrationURL: server.URL + "/register",
+		Manifest: Manifest{
+			SessionID:     "sess_wrapped",
+			EnvironmentID: "env-prod",
+			Services:      []Service{{Name: "daemon", RuntimeState: "running"}},
+		},
+		Now: now,
+	})
+	if state.RuntimeState != RegistrationRegistered || state.RemoteSessionID != "remote-wrapped" || state.RegistrationID != "reg-wrapped" || state.WebSocketURL != "wss://remote/wrapped/ws" || state.PollURL != "https://remote/wrapped/events" || state.Message != "registered" {
+		t.Fatalf("registration state = %#v", state)
+	}
+}
+
 func TestRegisterManifestHandlesDisabledAndFailedState(t *testing.T) {
 	now := time.Date(2026, 6, 17, 11, 5, 0, 0, time.UTC)
 	manifest := Manifest{SessionID: "sess_remote", EnvironmentID: "env-prod"}