fix:兼容性修复

Author: wwcchh0123

cmd/server/config.yaml

@@ -3,11 +3,32 @@ server:
   webhook_secret: "1234567890"
 
 github:
-  #token: "1234567890"
-  webhook_url: "http://localhost:8888/hook"
+  # 可选：保留 PAT 作为回退方案
+  token: "ghp_your_personal_access_token"
+  
+  # GitHub App 配置 / GitHub App Configuration
+  app:
+    app_id: 1032243
+    
+    # 私钥配置（三种方式，按优先级顺序）/ Private key configuration (3 methods, in priority order):
+    
+    # 方式1：文件路径（推荐，最高优先级）/ Method 1: File path (recommended, highest priority)
+    private_key_path: "/Users/xxxxx.private-key.pem"
+    
+    # 方式2：环境变量名（中等优先级）/ Method 2: Environment variable name (medium priority)
+    # private_key_env: "GITHUB_APP_PRIVATE_KEY"
+    
+    # 方式3：直接内容（最低优先级，生产环境不推荐）/ Method 3: Direct content (lowest priority, not recommended for production)
+    # private_key: |
+    #   -----BEGIN RSA PRIVATE KEY-----
+    #   MIIEpAIBAAKCAQEA...
+    #   -----END RSA PRIVATE KEY-----
+  
+  # 认证模式（可选）
+  auth_mode: "token"  # auto（默认）| app | token
 
 workspace:
-  base_dir: "/Users/jicarl/codeagent"
+  base_dir: "/tmp/codeagent"
   cleanup_after: "24h"
 
 claude:

internal/agent/agent.go

@@ -35,7 +35,7 @@ func New(cfg *config.Config, workspaceManager *workspace.Manager) *Agent {
 		return nil
 	}
 
-	// Initialize legacy GitHub client for backward compatibility
+	// Initialize GitHub client that uses the new manager internally
 	githubClient, err := ghclient.NewClient(cfg)
 	if err != nil {
 		log.Errorf("Failed to create GitHub client: %v", err)
@@ -128,14 +128,14 @@ func (a *Agent) GetAuthInfo() interface{} {
 	if a.githubManager == nil {
 		return map[string]string{"status": "not_initialized"}
 	}
-	
+
 	authInfo := a.githubManager.GetAuthInfo()
 	return map[string]interface{}{
-		"type":         authInfo.Type,
-		"user":         authInfo.User,
-		"permissions":  authInfo.Permissions,
-		"app_id":       authInfo.AppID,
-		"configured":   a.githubManager.DetectAuthMode(),
+		"type":        authInfo.Type,
+		"user":        authInfo.User,
+		"permissions": authInfo.Permissions,
+		"app_id":      authInfo.AppID,
+		"configured":  a.githubManager.DetectAuthMode(),
 	}
 }
 
@@ -171,7 +171,7 @@ func (a *Agent) ProcessIssueCommentWithAI(ctx context.Context, event *github.Iss
 
 	// 3. Create initial PR (before code generation)
 	log.Infof("Creating initial PR")
-	pr, err := a.github.CreatePullRequest(ws)
+	pr, err := a.github.CreatePullRequestWithContext(ctx, ws)
 	if err != nil {
 		log.Errorf("Failed to create PR: %v", err)
 		return err
@@ -276,7 +276,7 @@ Brief description of changes
 	prBody += "<details><summary>Original Prompt</summary>\n\n" + codePrompt + "\n\n</details>"
 
 	log.Infof("Updating PR body")
-	if err = a.github.UpdatePullRequest(pr, prBody); err != nil {
+	if err = a.github.UpdatePullRequestWithContext(ctx, pr, prBody); err != nil {
 		log.Errorf("Failed to update PR body with execution result: %v", err)
 		return err
 	}
@@ -409,7 +409,9 @@ func (a *Agent) processPRWithArgsAndAI(ctx context.Context, event *github.IssueC
 
 	// 3. 从 GitHub API 获取完整的 PR 信息
 	log.Infof("Fetching PR information from GitHub API")
-	pr, err := a.github.GetPullRequest(repoOwner, repoName, event.Issue.GetNumber())
+
+	// 使用GitHub client获取PR信息（内部自动使用新的认证系统）
+	pr, err := a.github.GetPullRequestWithContext(ctx, repoOwner, repoName, event.Issue.GetNumber())
 	if err != nil {
 		log.Errorf("Failed to get PR #%d: %v", prNumber, err)
 		return fmt.Errorf("failed to get PR information: %w", err)
@@ -456,7 +458,7 @@ func (a *Agent) processPRWithArgsAndAI(ctx context.Context, event *github.IssueC
 
 	// 7. 获取所有PR评论历史用于构建上下文
 	log.Infof("Fetching all PR comments for historical context")
-	allComments, err := a.github.GetAllPRComments(pr)
+	allComments, err := a.github.GetAllPRCommentsWithContext(ctx, pr)
 	if err != nil {
 		log.Warnf("Failed to get PR comments for context: %v", err)
 		// 不返回错误，使用简单的prompt
@@ -516,7 +518,9 @@ func (a *Agent) processPRWithArgsAndAI(ctx context.Context, event *github.IssueC
 	// 11. 评论到 PR
 	commentBody := string(output)
 	log.Infof("Creating PR comment")
-	if err = a.github.CreatePullRequestComment(pr, commentBody); err != nil {
+
+	// 使用GitHub client创建评论（内部自动使用新的认证系统）
+	if err := a.github.CreatePullRequestCommentWithContext(ctx, pr, commentBody); err != nil {
 		log.Errorf("Failed to create PR comment: %v", err)
 		return fmt.Errorf("failed to create PR comment: %w", err)
 	}
@@ -746,7 +750,7 @@ func (a *Agent) ContinuePRFromReviewCommentWithAI(ctx context.Context, event *gi
 
 	// 6. 回复原始评论
 	commentBody := string(output)
-	if err = a.github.ReplyToReviewComment(pr, event.Comment.GetID(), commentBody); err != nil {
+	if err = a.github.ReplyToReviewCommentWithContext(ctx, pr, event.Comment.GetID(), commentBody); err != nil {
 		log.Errorf("failed to reply to review comment for continue: %v", err)
 		return err
 	}
@@ -853,7 +857,7 @@ func (a *Agent) FixPRFromReviewCommentWithAI(ctx context.Context, event *github.
 
 	// 6. 回复原始评论
 	commentBody := string(output)
-	if err = a.github.ReplyToReviewComment(pr, event.Comment.GetID(), commentBody); err != nil {
+	if err = a.github.ReplyToReviewCommentWithContext(ctx, pr, event.Comment.GetID(), commentBody); err != nil {
 		log.Errorf("failed to reply to review comment for fix: %v", err)
 		return err
 	}
@@ -890,7 +894,7 @@ func (a *Agent) ProcessPRFromReviewWithTriggerUserAndAI(ctx context.Context, eve
 	}
 
 	// 3. 获取指定 review 的所有 comments
-	reviewComments, err := a.github.GetReviewComments(pr, reviewID)
+	reviewComments, err := a.github.GetReviewCommentsWithContext(ctx, pr, reviewID)
 	if err != nil {
 		log.Errorf("Failed to get review comments: %v", err)
 		return err
@@ -1004,7 +1008,8 @@ func (a *Agent) ProcessPRFromReviewWithTriggerUserAndAI(ctx context.Context, eve
 		}
 	}
 
-	if err = a.github.CreatePullRequestComment(pr, responseBody); err != nil {
+	// 使用GitHub client创建评论（内部自动使用新的认证系统）
+	if err := a.github.CreatePullRequestCommentWithContext(ctx, pr, responseBody); err != nil {
 		log.Errorf("failed to create PR comment for batch processing result: %v", err)
 		return err
 	}

internal/agent/enhanced_agent.go

@@ -2,6 +2,7 @@ package agent
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"time"
 
@@ -40,7 +41,7 @@ func NewEnhancedAgent(cfg *config.Config, workspaceManager *workspace.Manager) (
 	xl := xlog.New("")
 	xl.Infof("NewEnhancedAgent: %+v", cfg)
 
-	// 1. 初始化GitHub客户端
+	// 1. 初始化GitHub客户端（内部使用新的认证系统）
 	githubClient, err := ghclient.NewClient(cfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create GitHub client: %w", err)
@@ -52,7 +53,7 @@ func NewEnhancedAgent(cfg *config.Config, workspaceManager *workspace.Manager) (
 	// 3. 初始化MCP管理器和服务器
 	mcpManager := mcp.NewManager()
 
-	// 注册内置MCP服务器
+	// 注册内置MCP服务器（直接使用重构后的客户端）
 	githubFiles := servers.NewGitHubFilesServer(githubClient)
 	githubComments := servers.NewGitHubCommentsServer(githubClient)
 
@@ -73,7 +74,7 @@ func NewEnhancedAgent(cfg *config.Config, workspaceManager *workspace.Manager) (
 	// 6. 初始化模式管理器
 	modeManager := modes.NewManager()
 
-	// 注册处理器（按优先级顺序）
+	// 注册处理器（按优先级顺序，直接使用重构后的客户端）
 	tagHandler := modes.NewTagHandler(cfg.CodeProvider, githubClient, workspaceManager, mcpClient, sessionManager)
 	agentHandler := modes.NewAgentHandler(githubClient, workspaceManager, mcpClient)
 	reviewHandler := modes.NewReviewHandler(githubClient, workspaceManager, mcpClient, sessionManager)
@@ -110,14 +111,22 @@ func (a *EnhancedAgent) ProcessGitHubWebhookEvent(ctx context.Context, eventType
 	startTime := time.Now()
 	xl.Infof("Processing GitHub webhook event: %s, delivery_id: %s", eventType, deliveryID)
 
-	// 1. 解析GitHub事件为类型安全的上下文
-	githubCtx, err := a.eventParser.ParseWebhookEvent(ctx, eventType, deliveryID, payload)
+	// 1. 提取 installation ID 从 payload 并添加到 context
+	ctxWithInstallation, err := a.extractInstallationIDFromPayload(ctx, payload)
+	if err != nil {
+		xl.Warnf("Failed to extract installation ID: %v", err)
+		// 不返回错误，继续处理（可能是PAT模式）
+		ctxWithInstallation = ctx
+	}
+
+	// 2. 解析GitHub事件为类型安全的上下文
+	githubCtx, err := a.eventParser.ParseWebhookEvent(ctxWithInstallation, eventType, deliveryID, payload)
 	if err != nil {
 		xl.Warnf("Failed to parse GitHub webhook event: %v", err)
 		return fmt.Errorf("failed to parse webhook event: %w", err)
 	}
 
-	return a.processGitHubContext(ctx, githubCtx, startTime)
+	return a.processGitHubContext(ctxWithInstallation, githubCtx, startTime)
 }
 
 // processGitHubContext 处理已解析的GitHub上下文
@@ -173,3 +182,43 @@ func (a *EnhancedAgent) Shutdown(ctx context.Context) error {
 	xl.Infof("Enhanced Agent shutdown completed")
 	return nil
 }
+
+// extractInstallationIDFromPayload 从 webhook payload 中提取 installation ID
+func (a *EnhancedAgent) extractInstallationIDFromPayload(ctx context.Context, payload []byte) (context.Context, error) {
+	xl := xlog.NewWith(ctx)
+
+	// 解析payload为通用map，提取installation信息
+	var data map[string]interface{}
+	if err := json.Unmarshal(payload, &data); err != nil {
+		return ctx, fmt.Errorf("failed to parse webhook payload: %w", err)
+	}
+
+	// 检查是否存在installation字段
+	if installation, ok := data["installation"]; ok {
+		if installationMap, ok := installation.(map[string]interface{}); ok {
+			if idInterface, ok := installationMap["id"]; ok {
+				var installationID int64
+				switch v := idInterface.(type) {
+				case float64:
+					installationID = int64(v)
+				case int64:
+					installationID = v
+				case int:
+					installationID = int64(v)
+				default:
+					return ctx, fmt.Errorf("invalid installation ID type: %T", v)
+				}
+
+				xl.Infof("Extracted installation ID from webhook payload: %d", installationID)
+				
+				// 将 installation ID 添加到 context
+				ctxWithInstallation := context.WithValue(ctx, "installation_id", installationID)
+				return ctxWithInstallation, nil
+			}
+		}
+	}
+
+	// 如果没有找到installation字段，返回原context（可能是PAT模式）
+	xl.Debugf("No installation ID found in webhook payload, continuing with PAT mode")
+	return ctx, fmt.Errorf("no installation found in payload")
+}