Feat: Adopt ChatID of PicoClaw

Author: xxx7xxxx

Makefile

@@ -23,7 +23,7 @@ TARGET_ARCH ?= $(shell $(GO) env GOARCH)
 CLI_BIN ?= $(BIN_DIR)/csgclaw-cli
 
 IMAGE ?= opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/picoclaw
-TAG ?= 2026.4.27.0
+TAG ?= 2026.5.27
 LOCAL_IMAGE ?= picoclaw:local
 
 .DEFAULT_GOAL := build-all

docs/api.md

@@ -1058,9 +1058,11 @@ Example request body:
 }
 ```
 
-`thread_root_id` is optional. When present, the bot response is sent as a reply
-inside that IM thread. The detailed response behavior depends on the
-compatibility bridge implementation.
+`thread_root_id`, `topic_id`, and `context.topic_id` are optional thread/topic
+identifiers. When one is present, the bot response is sent as a reply inside
+that IM thread. When all are omitted, the response is sent as a top-level room/DM
+message; the server does not infer a thread from the bot's most recent room
+event.
 
 PicoClaw outbound message shape is also accepted:
 

docs/api.zh.md

@@ -1051,7 +1051,10 @@ prompt context 使用；它不是 thread reply 列表。PicoClaw 原生 client 
 }
 ```
 
-`thread_root_id` 可选；传入时 bot 响应会发送到该 IM thread 中。具体响应由兼容桥实现决定。
+`thread_root_id`、`topic_id` 和 `context.topic_id` 都是可选的 thread/topic
+标识；传入任一字段时 bot 响应会发送到该 IM thread 中。全部省略时，
+响应会作为 room/DM 顶层消息发送；服务端不会根据 bot 在房间中最近收到的
+事件推断 thread。
 
 也接受 PicoClaw outbound message 形态：
 

docs/im-threads.md

@@ -158,7 +158,9 @@ Thread-aware bot events may include:
 Bot sends may include either CSGClaw fields (`room_id`, `text`,
 `thread_root_id`) or PicoClaw outbound fields (`chat_id`, `content`,
 `context.topic_id`). When a thread root/topic is present, the message is sent as
-a reply in that thread.
+a reply in that thread. Bot sends that omit `thread_root_id`, `topic_id`, and
+`context.topic_id` are treated as top-level room/DM messages; CSGClaw does not
+infer a thread from the bot's most recent room event.
 
 This maps to PicoClaw/topic isolation requirements: a runtime should treat
 `room_id` as the normal conversation key and `room_id:thread_root_id` as the

docs/im-threads.zh.md

@@ -148,7 +148,9 @@ Thread-aware bot event 可能包含：
 Bot send 可以传入 CSGClaw 字段（`room_id`、`text`、`thread_root_id`），
 也可以传入 PicoClaw outbound 字段（`chat_id`、`content`、
 `context.topic_id`）。存在 thread root/topic 时，消息会作为该 thread 内的
-reply 发送。
+reply 发送。如果 bot send 同时省略 `thread_root_id`、`topic_id` 和
+`context.topic_id`，CSGClaw 会按 room/DM 顶层消息处理，不会根据该 bot 在
+房间中最近收到的事件推断 thread。
 
 这对应 PicoClaw/topic 隔离需求：runtime 应把 `room_id` 视为普通会话 key，
 把 `room_id:thread_root_id` 视为 thread 会话 key。生成的 PicoClaw config

go.mod

@@ -5,10 +5,10 @@ go 1.26.2
 require github.com/larksuite/oapi-sdk-go/v3 v3.5.3
 
 require (
-	github.com/go-chi/chi/v5 v5.2.5
 	github.com/gin-gonic/gin v1.10.1
-	github.com/router-for-me/CLIProxyAPI/v6 v6.9.40
+	github.com/go-chi/chi/v5 v5.2.5
 	github.com/pelletier/go-toml/v2 v2.2.2
+	github.com/router-for-me/CLIProxyAPI/v6 v6.10.9
 	golang.org/x/term v0.37.0
 )
 

go.sum

@@ -75,8 +75,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo=
 github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
-github.com/router-for-me/CLIProxyAPI/v6 v6.9.40 h1:DM3Prm8+pxzMrh6UfHdbYvnEU/8ZOxDZOMQFooJw1Rw=
-github.com/router-for-me/CLIProxyAPI/v6 v6.9.40/go.mod h1:P1jsIPFXorYGuS2N/3BlZYkpRKi/z7+oR3+1tdG0u4k=
+github.com/router-for-me/CLIProxyAPI/v6 v6.10.9 h1:pGteumLPbwMXtruCTkLbsIgFa0WVlXsyDF7B8drAArs=
+github.com/router-for-me/CLIProxyAPI/v6 v6.10.9/go.mod h1:P1jsIPFXorYGuS2N/3BlZYkpRKi/z7+oR3+1tdG0u4k=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=

internal/api/bot_compat.go

@@ -360,9 +360,6 @@ func (h *Handler) handleBotSendMessage(w http.ResponseWriter, r *http.Request, b
 	roomID := req.ResolvedRoomID()
 	text := req.ResolvedText()
 	threadRootID := req.ResolvedThreadRootID()
-	if threadRootID == "" && h.botBridge != nil {
-		threadRootID = h.botBridge.ThreadRootForReply(botID, roomID)
-	}
 
 	message, err := h.im.DeliverMessage(im.DeliverMessageRequest{
 		RoomID:       roomID,

internal/api/handler_test.go

@@ -3334,7 +3334,7 @@ func TestHandleBotSendMessageRequiresIMService(t *testing.T) {
 	}
 }
 
-func TestHandleBotSendMessageDefaultsToRecentThreadScope(t *testing.T) {
+func TestHandleBotSendMessageDoesNotInferRecentThreadScope(t *testing.T) {
 	now := time.Now().UTC()
 	imSvc := im.NewServiceFromBootstrap(im.Bootstrap{
 		CurrentUserID: "u-admin",
@@ -3418,58 +3418,8 @@ func TestHandleBotSendMessageDefaultsToRecentThreadScope(t *testing.T) {
 	if reply.ID == "" {
 		t.Fatalf("sent message %q not found in room messages", sent.MessageID)
 	}
-	if reply.RelatesTo == nil || reply.RelatesTo.RelType != im.RelationTypeThread || reply.RelatesTo.EventID != "msg-root" {
-		t.Fatalf("reply.RelatesTo = %+v, want m.thread -> msg-root", reply.RelatesTo)
-	}
-
-	topLevel, err := imSvc.CreateMessage(im.CreateMessageRequest{
-		RoomID:   "room-1",
-		SenderID: "u-admin",
-		Content:  "top-level follow-up",
-	})
-	if err != nil {
-		t.Fatalf("CreateMessage(top-level follow-up) error = %v", err)
-	}
-	room, ok = imSvc.Room("room-1")
-	if !ok {
-		t.Fatal("Room(room-1) = false before top-level publish, want room")
-	}
-	bridge.PublishMessageEvent(room, sender, topLevel)
-	select {
-	case evt := <-events:
-		if evt.ThreadRootID != "" {
-			t.Fatalf("top-level bot event ThreadRootID = %q, want empty", evt.ThreadRootID)
-		}
-		bridge.Ack("u-manager", evt.MessageID)
-	case <-time.After(time.Second):
-		t.Fatal("PublishMessageEvent() timed out waiting for top-level event")
-	}
-
-	req = httptest.NewRequest(http.MethodPost, "/api/bots/u-manager/messages/send", strings.NewReader(`{"room_id":"room-1","text":"top-level answer"}`))
-	rec = httptest.NewRecorder()
-	srv.Routes().ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("top-level response status = %d, want %d; body=%s", rec.Code, http.StatusOK, rec.Body.String())
-	}
-	if err := json.NewDecoder(rec.Body).Decode(&sent); err != nil {
-		t.Fatalf("decode top-level send response: %v", err)
-	}
-	messages, err = imSvc.ListMessagesWithOptions("room-1", im.ListMessagesOptions{IncludeThreadReplies: true})
-	if err != nil {
-		t.Fatalf("ListMessagesWithOptions() after top-level response error = %v", err)
-	}
-	reply = im.Message{}
-	for _, message := range messages {
-		if message.ID == sent.MessageID {
-			reply = message
-			break
-		}
-	}
-	if reply.ID == "" {
-		t.Fatalf("top-level sent message %q not found in room messages", sent.MessageID)
-	}
 	if reply.RelatesTo != nil {
-		t.Fatalf("top-level reply.RelatesTo = %+v, want nil after top-level event reset", reply.RelatesTo)
+		t.Fatalf("reply.RelatesTo = %+v, want nil when bot send omits explicit thread/topic", reply.RelatesTo)
 	}
 }
 

internal/cliproxy/auth.go

@@ -606,7 +606,7 @@ func shouldKeepExistingAuth(path string, incoming map[string]any) bool {
 		return false
 	}
 	if disabled, _ := existing["disabled"].(bool); disabled {
-		return false
+		return true
 	}
 	if authMetadataEquivalent(existing, incoming) {
 		return true