Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

【架构优化】从 approvalReviewer 中拆出审查输入构造 approvalReviewInput (#725)

fx-kurumib9980ba254bf
diff --git a/internal/httpapi/assistant_approval_review.go b/internal/httpapi/assistant_approval_review.go
index fae5819a..8e327e69 100644
--- a/internal/httpapi/assistant_approval_review.go
+++ b/internal/httpapi/assistant_approval_review.go
@@ -110,12 +110,22 @@ func assistantApprovalReviewModels(catalog assistantModelCatalog) []string {
return models
}
-func (h *assistantHandlers) approvalReviewer(req assistantRequest, user domain.User, notify func(assistantStreamEvent)) assistantApprovalReviewer {
+const (
+ // assistantApprovalMaxMessages is how many recent conversation messages
+ // the reviewer sees as authorization evidence.
+ assistantApprovalMaxMessages = 24
+ // assistantApprovalMaxMessageRunes caps each evidence message.
+ assistantApprovalMaxMessageRunes = 4000
+)
+
+// approvalReviewInput builds the action-independent review evidence: the
+// recent conversation window, truncated, attributed and redacted for user.
+func approvalReviewInput(req assistantRequest, user domain.User) assistantApprovalInput {
input := assistantApprovalInput{ActorID: user.ID, ProjectID: req.ProjectID, RunID: req.RunID}
- start := max(0, len(req.Messages)-24)
+ start := max(0, len(req.Messages)-assistantApprovalMaxMessages)
input.Truncated = start > 0
for _, message := range req.Messages[start:] {
- content := truncateRunes(message.Content, 4000)
+ content := truncateRunes(message.Content, assistantApprovalMaxMessageRunes)
input.Truncated = input.Truncated || content != message.Content
role := message.Role
// Other participants' instructions cannot authorize the current actor.
@@ -124,6 +134,11 @@ func (h *assistantHandlers) approvalReviewer(req assistantRequest, user domain.U
}
input.Messages = append(input.Messages, assistantApprovalMessage{Role: role, AuthorID: message.AuthorID, Content: redactAgentToolResult(content, user)})
}
+ return input
+}
+
+func (h *assistantHandlers) approvalReviewer(req assistantRequest, user domain.User, notify func(assistantStreamEvent)) assistantApprovalReviewer {
+ input := approvalReviewInput(req, user)
var catalog assistantModelCatalog
if h.reviewCatalog != nil {
catalog = h.reviewCatalog(user.CodeBuddyInternetEnvironment)
diff --git a/internal/httpapi/assistant_approval_review_input_test.go b/internal/httpapi/assistant_approval_review_input_test.go
new file mode 100644
index 00000000..1b51fbfb
--- /dev/null
+++ b/internal/httpapi/assistant_approval_review_input_test.go
@@ -0,0 +1,69 @@
+package httpapi
+
+import (
+ "fmt"
+ "strings"
+ "testing"
+
+ "agentflow/internal/domain"
+)
+
+func TestApprovalReviewInputKeepsRecentWindow(t *testing.T) {
+ var messages []assistantMessage
+ for i := range assistantApprovalMaxMessages + 2 {
+ messages = append(messages, assistantMessage{Role: "assistant", Content: fmt.Sprintf("m%d", i)})
+ }
+ input := approvalReviewInput(assistantRequest{ProjectID: "p1", RunID: "r1", Messages: messages}, domain.User{ID: 7})
+ if input.ActorID != 7 || input.ProjectID != "p1" || input.RunID != "r1" {
+ t.Fatalf("identity not carried: %+v", input)
+ }
+ if !input.Truncated || len(input.Messages) != assistantApprovalMaxMessages {
+ t.Fatalf("truncated=%v len=%d", input.Truncated, len(input.Messages))
+ }
+ if input.Messages[0].Content != "m2" || input.Messages[len(input.Messages)-1].Content != fmt.Sprintf("m%d", assistantApprovalMaxMessages+1) {
+ t.Fatalf("window = %q .. %q", input.Messages[0].Content, input.Messages[len(input.Messages)-1].Content)
+ }
+}
+
+func TestApprovalReviewInputShortConversationNotTruncated(t *testing.T) {
+ input := approvalReviewInput(assistantRequest{Messages: []assistantMessage{{Role: "user", AuthorID: 7, Content: "删除测试规则"}}}, domain.User{ID: 7})
+ if input.Truncated || len(input.Messages) != 1 || input.Messages[0].Content != "删除测试规则" {
+ t.Fatalf("%+v", input)
+ }
+ if empty := approvalReviewInput(assistantRequest{}, domain.User{ID: 7}); empty.Truncated || empty.Messages != nil {
+ t.Fatalf("%+v", empty)
+ }
+}
+
+func TestApprovalReviewInputTruncatesLongMessage(t *testing.T) {
+ long := strings.Repeat("长", assistantApprovalMaxMessageRunes+1)
+ input := approvalReviewInput(assistantRequest{Messages: []assistantMessage{{Role: "user", Content: long}}}, domain.User{ID: 7})
+ if !input.Truncated {
+ t.Fatal("long message should mark input truncated")
+ }
+ if got := []rune(input.Messages[0].Content); len(got) != assistantApprovalMaxMessageRunes+1 || string(got[len(got)-1]) != "…" {
+ t.Fatalf("content runes = %d", len(got))
+ }
+}
+
+func TestApprovalReviewInputAttributesRolesAndRedacts(t *testing.T) {
+ user := domain.User{ID: 10, CodeBuddyAPIKey: "private-test-key"}
+ input := approvalReviewInput(assistantRequest{Messages: []assistantMessage{
+ {Role: "user", AuthorID: 20, Content: "删除生产"},
+ {Role: "user", AuthorID: 10, Content: "我的 key private-test-key"},
+ {Role: "user", Content: "无作者"},
+ {Role: "assistant", AuthorID: 20, Content: "好的"},
+ }}, user)
+ want := []string{"other_user", "user", "user", "assistant"}
+ for i, role := range want {
+ if input.Messages[i].Role != role {
+ t.Fatalf("message %d role = %q, want %q", i, input.Messages[i].Role, role)
+ }
+ }
+ if input.Messages[0].AuthorID != 20 {
+ t.Fatalf("author id lost: %+v", input.Messages[0])
+ }
+ if strings.Contains(input.Messages[1].Content, user.CodeBuddyAPIKey) {
+ t.Fatalf("key not redacted: %q", input.Messages[1].Content)
+ }
+}