Accept remote event wrappers

Author: SqlRush

docs/cc-100-roadmap.md

@@ -121,6 +121,8 @@ M10 补充：`internal/remote` 新增 callback 型 `StreamWebSocketEvents` primi
 
 M10 补充：`--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 仍未完成。
 
+M10 补充：remote poll/WebSocket 共用解码器现在兼容 `data`、`event`、`remote_event`、`delivery`、`payload` 包裹的单条事件，以及这些 wrapper 下的 `events/items/messages/deliveries` 列表；云端可以用 envelope 协议携带 cursor 和事件内容，而无需强制把事件字段铺在顶层。更深的鉴权刷新、ack/lease 和服务端协议协商仍未完成。
+
 M7 补充：interaction script paste payload 现在接受 ClipboardItem 风格的 `items[].getAsString`/`get_as_string` 以及 `stringData`/`textData` 文本字段，DOM clipboard 录制脚本可直接恢复 pasted text。
 
 M7 补充：scripted task runtime payload 和 task expectation 现在接受 `taskID`、`jobId`、`runId`、`label`、`displayName`、`phase`、`taskState`、`message`、`currentStep`、`percent`/`percentage`/`pct` 等相邻字段，并支持数字 task ID 与数字字符串 progress。

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

@@ -749,6 +749,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：remote WebSocket pump 现在支持单次 tick 内读取多帧事件，并在握手/读帧失败或非正常 close 时按可配置 backoff 重连；daemon 默认读取最多 8 帧、最多重连 2 次，并把 frame/connect/reconnect 计数写入 `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 和服务端协议协商仍未完成。
 
 ### M11: Bridge 和高级集成
 

internal/remote/pump.go

@@ -145,16 +145,21 @@ func DecodePollEvents(data []byte) ([]PollEvent, string, error) {
 	case map[string]any:
 		cursor := firstString(value, "next_cursor", "nextCursor", "cursor", "after", "after_id", "afterId")
 		if nested, ok := firstAny(value, "events", "items", "messages", "deliveries", "data"); ok {
-			if nestedMap, ok := nested.(map[string]any); ok {
-				if nestedEvents, ok := firstAny(nestedMap, "events", "items", "messages", "deliveries"); ok {
-					nested = nestedEvents
-				}
-				if cursor == "" {
-					cursor = firstString(nestedMap, "next_cursor", "nextCursor", "cursor", "after", "after_id", "afterId")
-				}
+			events, nestedCursor, decoded := decodePollEventValue(nested)
+			if cursor == "" {
+				cursor = nestedCursor
 			}
-			if list, ok := nested.([]any); ok {
-				return decodePollEventList(list), cursor, nil
+			if decoded && (len(events) > 0 || nestedCursor != "") {
+				return events, cursor, nil
+			}
+		}
+		if nested, ok := firstAny(value, "event", "remote_event", "remoteEvent", "delivery", "payload"); ok {
+			events, nestedCursor, decoded := decodePollEventValue(nested)
+			if cursor == "" {
+				cursor = nestedCursor
+			}
+			if decoded && (len(events) > 0 || nestedCursor != "") {
+				return events, cursor, nil
 			}
 		}
 		if event, ok := decodePollEventMap(value); ok {
@@ -166,6 +171,30 @@ func DecodePollEvents(data []byte) ([]PollEvent, string, error) {
 	}
 }
 
+func decodePollEventValue(value any) ([]PollEvent, string, bool) {
+	switch typed := value.(type) {
+	case []any:
+		return decodePollEventList(typed), "", true
+	case map[string]any:
+		cursor := firstString(typed, "next_cursor", "nextCursor", "cursor", "after", "after_id", "afterId")
+		if nested, ok := firstAny(typed, "events", "items", "messages", "deliveries"); ok {
+			events, nestedCursor, decoded := decodePollEventValue(nested)
+			if cursor == "" {
+				cursor = nestedCursor
+			}
+			if decoded {
+				return events, cursor, true
+			}
+		}
+		if event, ok := decodePollEventMap(typed); ok {
+			return []PollEvent{event}, cursor, true
+		}
+		return nil, cursor, cursor != ""
+	default:
+		return nil, "", false
+	}
+}
+
 func WritePumpState(path string, state PumpState) error {
 	if path == "" {
 		return os.ErrInvalid

internal/remote/pump_test.go

@@ -64,6 +64,27 @@ func TestDecodePollEventsAcceptsNestedDataAndArray(t *testing.T) {
 	if cursor != "" || len(events) != 1 || events[0].EventID != "evt-single" || events[0].Message != "single payload" {
 		t.Fatalf("single events=%#v cursor=%q", events, cursor)
 	}
+	events, cursor, err = DecodePollEvents([]byte(`{"cursor":"c4","data":{"id":"evt-data","team":"team","payload":{"message":"data payload"}}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cursor != "c4" || len(events) != 1 || events[0].EventID != "evt-data" || events[0].Message != "data payload" {
+		t.Fatalf("data wrapper events=%#v cursor=%q", events, cursor)
+	}
+	events, cursor, err = DecodePollEvents([]byte(`{"type":"remote_trigger","event":{"delivery_id":"evt-event","team_id":"team","target":"coordinator","message":"event wrapper"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cursor != "" || len(events) != 1 || events[0].EventID != "evt-event" || events[0].Target != "coordinator" || events[0].Message != "event wrapper" {
+		t.Fatalf("event wrapper events=%#v cursor=%q", events, cursor)
+	}
+	events, cursor, err = DecodePollEvents([]byte(`{"kind":"delivery","payload":{"id":"evt-payload","team_id":"team","event_type":"deploy","message":"payload wrapper"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cursor != "" || len(events) != 1 || events[0].EventID != "evt-payload" || events[0].Event != "deploy" || events[0].Message != "payload wrapper" {
+		t.Fatalf("payload wrapper events=%#v cursor=%q", events, cursor)
+	}
 	events, cursor, err = DecodePollEvents([]byte(`{"cursor":"c3","message":"ok"}`))
 	if err != nil {
 		t.Fatal(err)