add trigger comment into prompt

Author: wwcchh0123

internal/code/claude_docker.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/qiniu/codeagent/internal/config"
 	"github.com/qiniu/codeagent/pkg/models"
@@ -125,17 +124,6 @@ func NewClaudeDocker(workspace *models.Workspace, cfg *config.Config) (Code, err
 		args = append(args, "-e", fmt.Sprintf("GH_TOKEN=%s", cfg.GitHub.GHToken))
 	}
 
-	// 设置 Claude CLI 配置目录，避免权限问题
-	args = append(args, "-e", "HOME=/home/codeagent")
-	args = append(args, "-e", "CLAUDE_CONFIG_DIR=/home/codeagent/.claude")
-	args = append(args, "-e", "XDG_CONFIG_HOME=/home/codeagent/.config")
-
-	// 不在容器启动时强制用户，而是在执行命令时设置
-	// 这样可以避免容器镜像中没有 codeagent 用户的问题
-
-	// 创建必要的目录
-	args = append(args, "--init")
-
 	// 添加容器镜像
 	args = append(args, cfg.Claude.ContainerImage)
 
@@ -165,13 +153,6 @@ func NewClaudeDocker(workspace *models.Workspace, cfg *config.Config) (Code, err
 
 	log.Infof("docker container started successfully")
 
-	// 确保容器内的目录结构正确，避免 Claude CLI 权限问题
-	setupCmd := exec.Command("docker", "exec", containerName,
-		"sh", "-c", "mkdir -p /home/codeagent/.config /home/codeagent/.claude && chmod -R 755 /home/codeagent")
-	if err := setupCmd.Run(); err != nil {
-		log.Warnf("Failed to setup container directories: %v", err)
-	}
-
 	return &claudeCode{
 		containerName: containerName,
 		configGen:     configGen,
@@ -224,52 +205,19 @@ func (c *claudeCode) executeClaudeWithMCP(message string) (*Response, error) {
 	// 修复容器内文件权限，确保所有用户都可以读取
 	log.Infof("Step 2.1: Fixing file permissions in container")
 
-	// 首先尝试设置文件为全局可读 (更宽松的权限)
-	chmodCmd := exec.Command("docker", "exec", c.containerName, "chmod", "644", "/tmp/mcp-config.json")
+	// 首先尝试设置文件为全局可读
+	chmodCmd := exec.Command("docker", "exec", c.containerName, "chmod", "755", "/tmp/mcp-config.json")
 	if err := chmodCmd.Run(); err != nil {
 		log.Warnf("Failed to chmod MCP config file: %v", err)
-
-		// 如果 chmod 失败，尝试更宽松的权限
-		chmodAllCmd := exec.Command("docker", "exec", c.containerName, "chmod", "666", "/tmp/mcp-config.json")
-		if err := chmodAllCmd.Run(); err != nil {
-			log.Warnf("Failed to chmod 666 MCP config file: %v", err)
-
-			// 最后的尝试：检查文件是否已经可读
-			testReadCmd := exec.Command("docker", "exec", c.containerName, "test", "-r", "/tmp/mcp-config.json")
-			if err := testReadCmd.Run(); err != nil {
-				return nil, fmt.Errorf("MCP config file is not readable: %w", err)
-			}
-			log.Infof("MCP config file is already readable, continuing...")
-		} else {
-			log.Infof("Fixed MCP config file permissions with chmod 666")
-		}
-	} else {
-		log.Infof("Fixed MCP config file permissions with chmod 644")
-	}
-
-	// 3. 确保MCP服务器二进制文件权限正确并启动MCP服务器（后台运行）
-	log.Infof("Step 3: Starting MCP server in container")
-
-	log.Infof("Step 3.1: Starting MCP server daemon")
-	mcpServerCmd := []string{
-		"exec", "-d", c.containerName,
-		"/usr/local/bin/mcp-server",
 	}
-
-	startServerCmd := exec.Command("docker", mcpServerCmd...)
-	log.Infof("Running command: docker %s", strings.Join(mcpServerCmd, " "))
-	if err := startServerCmd.Run(); err != nil {
-		return nil, fmt.Errorf("failed to start MCP server in container: %w", err)
+	// 检查文件是否已经可读
+	testReadCmd := exec.Command("docker", "exec", c.containerName, "test", "-r", "/tmp/mcp-config.json")
+	if err := testReadCmd.Run(); err != nil {
+		return nil, fmt.Errorf("MCP config file is not readable: %w", err)
 	}
 
-	log.Infof("MCP server started in container")
-
-	// 4. 等待MCP服务器启动
-	log.Infof("Step 4: Waiting for MCP server to be ready")
-	time.Sleep(2 * time.Second)
-
-	// 5. 执行Claude CLI with MCP
-	log.Infof("Step 5: Executing Claude CLI with MCP configuration")
+	// 3. 执行Claude CLI with MCP
+	log.Infof("Step 3: Executing Claude CLI with MCP configuration")
 	args := []string{
 		"exec",
 		"-e", "HOME=/home/codeagent", // 设置环境变量

internal/context/generator.go

@@ -216,11 +216,11 @@ func (g *DefaultPromptGenerator) GenerateToolsList(ctx *EnhancedContext, mode st
 
 	// MCP工具（始终可用）
 	mcpTools := []string{
-		"github-files_read_file",
-		"github-files_write_file",
-		"github-files_search_files",
-		"github-comments_update_comment",
-		"github-comments_create_comment",
+		"mcp__github_files__read_repository_file",
+		"mcp__github_files__write_repository_file",
+		"mcp__github_files__search_files",
+		"mcp__github_comments__update_comment",
+		"mcp__github_comments__create_comment",
 	}
 	tools = append(tools, mcpTools...)
 
@@ -229,9 +229,9 @@ func (g *DefaultPromptGenerator) GenerateToolsList(ctx *EnhancedContext, mode st
 	case "Continue", "Fix", "Code":
 		// 开发模式需要完整的工具集
 		additionalTools := []string{
-			"github-files_commit_files",
-			"github-files_create_branch",
-			"github-files_list_files",
+			"mcp__github_files__commit_files",
+			"mcp__github_files__create_branch",
+			"mcp__github_files__get_file_tree",
 		}
 		tools = append(tools, additionalTools...)
 

internal/context/template_generator.go

@@ -163,6 +163,10 @@ func (g *TemplatePromptGenerator) buildVariables(ctx *EnhancedContext, mode stri
 		vars["TRIGGER_DISPLAY_NAME"] = fmt.Sprintf("%v", triggerDisplayName)
 	}
 
+	if triggerComment, ok := ctx.Metadata["trigger_comment"]; ok {
+		vars["TRIGGER_COMMENT"] = fmt.Sprintf("%v", triggerComment)
+	}
+
 	return vars
 }
 
@@ -389,6 +393,9 @@ Images have been downloaded from GitHub comments and saved to disk. Their file p
 <claude_comment_id>$CLAUDE_COMMENT_ID</claude_comment_id>
 <trigger_username>$TRIGGER_USERNAME</trigger_username>
 <trigger_display_name>$TRIGGER_DISPLAY_NAME</trigger_display_name>
+<trigger_comment>
+$TRIGGER_COMMENT
+</trigger_comment>
 
 <direct_prompt>
 IMPORTANT: The following are direct instructions from the user that MUST take precedence over all other instructions and context. These instructions should guide your behavior and actions above any other considerations:
@@ -442,7 +449,7 @@ Follow these steps:
    - Mark this todo as complete in the comment by checking the box: - [x].
 
 3. Understand the Request:
-   - Extract the actual question or request from the <trigger_comment> tag above.
+   - Extract the actual question or request from the <direct_prompt> tag above.
    - CRITICAL: If other users requested changes in other comments, DO NOT implement those changes unless the trigger comment explicitly asks you to implement them.
    - Only follow the instructions in the trigger comment - all other comments are just for context.
    - IMPORTANT: Always check for and follow the repository's CLAUDE.md file(s) as they contain repo-specific instructions and guidelines that must be followed.
@@ -464,6 +471,7 @@ Follow these steps:
       - Reference specific code with inline formatting or code blocks.
       - Include relevant file paths and line numbers when applicable.
       - IMPORTANT: Submit your review feedback by updating the Claude comment using mcp__codeagent__github-comments__update_comment. This will be displayed as your PR review.
+	  - IMPORTANT: Before submission, be sure to add a prompt to manually re-execute the code review at the end, and use friendly guiding language to remind users to enter /review in the comment section
 
    B. For Straightforward Changes:
       - Use file system tools to make the change locally.

internal/modes/review_handler.go

@@ -133,7 +133,7 @@ func (rh *ReviewHandler) handlePREvent(ctx context.Context, event *models.PullRe
 		xl.Infof("Auto-reviewing PR #%d", event.PullRequest.GetNumber())
 
 		// 执行自动代码审查
-		return rh.processCodeReview(ctx, event, client)
+		return rh.processCodeReview(ctx, event, client, nil)
 
 	case "closed":
 		return rh.handlePRClosed(ctx, event, client)
@@ -207,7 +207,7 @@ func (rh *ReviewHandler) handlePRClosed(ctx context.Context, event *models.PullR
 }
 
 // processCodeReview PR自动代码审查方法
-func (rh *ReviewHandler) processCodeReview(ctx context.Context, prEvent *models.PullRequestContext, client *ghclient.Client) error {
+func (rh *ReviewHandler) processCodeReview(ctx context.Context, prEvent *models.PullRequestContext, client *ghclient.Client, triggerComment *string) error {
 	xl := xlog.NewWith(ctx)
 	xl.Infof("Starting automatic code review for PR")
 
@@ -258,7 +258,7 @@ func (rh *ReviewHandler) processCodeReview(ctx context.Context, prEvent *models.
 
 	// 5. 构建审查上下文和提示词
 	xl.Infof("Building review context and prompt")
-	prompt, err := rh.buildReviewPrompt(ctx, prEvent, commentID)
+	prompt, err := rh.buildReviewPrompt(ctx, prEvent, commentID, triggerComment)
 	if err != nil {
 		xl.Errorf("Failed to build enhanced prompt : %v", err)
 	}
@@ -283,7 +283,7 @@ func (rh *ReviewHandler) processCodeReview(ctx context.Context, prEvent *models.
 }
 
 // buildReviewPrompt 构建代码审查提示词
-func (rh *ReviewHandler) buildReviewPrompt(ctx context.Context, prEvent *models.PullRequestContext, commentID int64) (string, error) {
+func (rh *ReviewHandler) buildReviewPrompt(ctx context.Context, prEvent *models.PullRequestContext, commentID int64, triggerComment *string) (string, error) {
 	xl := xlog.NewWith(ctx)
 
 	if prEvent == nil {
@@ -309,15 +309,22 @@ func (rh *ReviewHandler) buildReviewPrompt(ctx context.Context, prEvent *models.
 		Timestamp: time.Now(),
 		Subject:   prEvent,
 		Code:      codeCtx, // 确保代码上下文被设置
-		Metadata: map[string]interface{}{
-			"pr_number":            prEvent.PullRequest.GetNumber(),
-			"pr_title":             prEvent.PullRequest.GetTitle(),
-			"pr_body":              prEvent.PullRequest.GetBody(),
-			"repository":           prEvent.PullRequest.GetBase().GetRepo().GetFullName(),
-			"trigger_username":     "system", // 自动审查
-			"trigger_display_name": "CodeAgent Auto Review",
-			"claude_comment_id":    commentID,
-		},
+		Metadata: func() map[string]interface{} {
+			metadata := map[string]interface{}{
+				"pr_number":            prEvent.PullRequest.GetNumber(),
+				"pr_title":             prEvent.PullRequest.GetTitle(),
+				"pr_body":              prEvent.PullRequest.GetBody(),
+				"repository":           prEvent.PullRequest.GetBase().GetRepo().GetFullName(),
+				"trigger_username":     prEvent.Sender.GetLogin(),
+				"trigger_display_name": prEvent.Sender.GetLogin(),
+				"claude_comment_id":    commentID,
+			}
+
+			if triggerComment != nil && *triggerComment != "" {
+				metadata["trigger_comment"] = *triggerComment
+			}
+			return metadata
+		}(),
 	}
 
 	// 使用模板生成器的Review模式生成提示词
@@ -387,6 +394,7 @@ func (rh *ReviewHandler) ProcessManualCodeReview(ctx context.Context, event *mod
 		return fmt.Errorf("failed to get PR information: %w", err)
 	}
 
+	triggerComment := event.Comment.GetBody()
 	// 3. 构造 PullRequestContext
 	prEvent := &models.PullRequestContext{
 		BaseContext: models.BaseContext{
@@ -402,5 +410,5 @@ func (rh *ReviewHandler) ProcessManualCodeReview(ctx context.Context, event *mod
 	}
 
 	// 4. 调用统一的代码审查逻辑
-	return rh.processCodeReview(ctx, prEvent, client)
+	return rh.processCodeReview(ctx, prEvent, client, &triggerComment)
 }