@raolin2025/claude-code-node 2.0.0 → 2.2.0

package/src/git/utils/diff-parser.js

@@ -0,0 +1,330 @@
+/**
+ * Diff 解析器 - 解析 GitHub unified diff format
+ * 支持行级别定位，为 PR 评论提供 position
+ */
+
+/**
+ * 解析 diff 字符串
+ * @param {string} diff - 原始 diff 内容
+ * @returns {Array<DiffHunk>} hunk 数组
+ */
+export function parseDiff(diff) {
+  const hunks = []
+  const lines = diff.split('\n')
+  let currentHunk = null
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+
+    // Hunk header: @@ -oldStart,oldCount +newStart,newCount @@
+    const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/)
+    if (hunkMatch) {
+      if (currentHunk) {
+        hunks.push(currentHunk)
+      }
+      currentHunk = {
+        oldStart: parseInt(hunkMatch[1], 10),
+        oldCount: parseInt(hunkMatch[2] || '1', 10),
+        newStart: parseInt(hunkMatch[3], 10),
+        newCount: parseInt(hunkMatch[4] || '1', 10),
+        lines: [],
+        headerLine: line
+      }
+      continue
+    }
+
+    if (currentHunk) {
+      const diffLine = parseDiffLine(line, currentHunk)
+      currentHunk.lines.push(diffLine)
+    }
+  }
+
+  if (currentHunk) {
+    hunks.push(currentHunk)
+  }
+
+  return hunks
+}
+
+/**
+ * 解析单行 diff
+ */
+function parseDiffLine(line, hunk) {
+  const type = line[0]
+  const content = line.slice(1)
+
+  // 计算行号
+  let oldLineNum = null
+  let newLineNum = null
+
+  if (type === '+' && hunk.oldStart !== null) {
+    newLineNum = hunk.newStart + (hunk.newLineCount || 0)
+    hunk.newLineCount = (hunk.newLineCount || 0) + 1
+  } else if (type === '-' && hunk.oldStart !== null) {
+    oldLineNum = hunk.oldStart + (hunk.oldLineCount || 0)
+    hunk.oldLineCount = (hunk.oldLineCount || 0) + 1
+  } else if (type === ' ') {
+    // context line
+    const oldCount = hunk.oldLineCount || 0
+    const newCount = hunk.newLineCount || 0
+    oldLineNum = hunk.oldStart + oldCount
+    newLineNum = hunk.newStart + newCount
+    hunk.oldLineCount = oldCount + 1
+    hunk.newLineCount = newCount + 1
+  }
+
+  return {
+    type, // ' ' | '+' | '-'
+    content,
+    oldLineNum,
+    newLineNum,
+    raw: line
+  }
+}
+
+/**
+ * 在 diff 中查找文件对应的所有 hunk
+ * @param {Array<DiffHunk>} hunks
+ * @param {string} filePath - 文件路径
+ * @returns {Array<DiffHunk>} 该文件的所有 hunk
+ */
+export function getHunksForFile(hunks, filePath) {
+  // 实际 diff 中，每个文件的开头会有:
+  // --- a/path/to/file
+  // +++ b/path/to/file
+  // 然后跟上多个 @@ headers
+  // 简化版：我们假设调用者已经根据文件筛选了 hunks
+  // 完整版需要扫描整个 diff 找到文件边界
+
+  // 这里我们使用简化的方法：传入的 hunks 已经是该文件的所有 hunk
+  return hunks
+}
+
+/**
+ * 根据新文件行号计算在 diff 中的 position
+ * GitHub API 的 position 是从文件 diff 开始处计数的行号（包含 hunk headers）
+ *
+ * @param {Array<DiffHunk>} hunks - 该文件的所有 hunk
+ * @param {number} lineNum - 新文件中的行号
+ * @returns {number} position (null if not found)
+ */
+export function getPositionInDiff(hunks, lineNum) {
+  let position = 0
+
+  for (const hunk of hunks) {
+    // hunk header 占 1 行
+    position += 1
+
+    for (const line of hunk.lines) {
+      position += 1
+
+      const isLineMatch = (
+        (line.type === '+' || line.type === ' ') &&
+        line.newLineNum === lineNum
+      )
+
+      if (isLineMatch) {
+        return position
+      }
+    }
+  }
+
+  return null // 该行不在 diff 中（可能是未修改的行）
+}
+
+/**
+ * 构建 PR 评论的 payload
+ * @param {string} body - 评论内容
+ * @param {string} path - 文件路径
+ * @param {number} position - diff position
+ * @param {string} commitId - commit SHA（可选）
+ */
+export function buildCommentPayload(body, path, position, commitId = null) {
+  const payload = {
+    body,
+    path,
+    position
+  }
+  if (commitId) {
+    payload.commit_id = commitId
+  }
+  return payload
+}
+
+/**
+ * Diff Hunk 数据结构
+ * @typedef {Object} DiffHunk
+ * @property {number} oldStart
+ * @property {number} oldCount
+ * @property {number} newStart
+ * @property {number} newCount
+ * @property {string} headerLine
+ * @property {Array<DiffLine>} lines
+ */
+
+/**
+ * Diff Line 数据结构
+ * @typedef {Object} DiffLine
+ * @property {string} type - ' ', '+', '-'
+ * @property {string} content - 行内容
+ * @property {number|null} oldLineNum
+ * @property {number|null} newLineNum
+ * @property {string} raw - 原始行
+ */
+
+/**
+ * 将 diff 按文件分割
+ * @param {string} diff
+ * @returns {Map<string, Array<DiffHunk>}} 文件路径 → hunk 数组
+ */
+export function splitDiffByFile(diff) {
+  const fileMap = new Map()
+  const lines = diff.split('\n')
+
+  let currentFile = null
+  let currentHunk = null
+  let fileStartLine = 0
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+
+    // 检测文件边界
+    // --- a/path/to/file
+    // +++ b/path/to/file
+    const oldFileMatch = line.match(/^--- a\/(.+)/)
+    const newFileMatch = lines[i + 1]?.match(/^\+\+\+ b\/(.+)/)
+
+    if (oldFileMatch && newFileMatch) {
+      // 切换到新文件
+      if (currentFile && currentHunk) {
+        fileMap.get(currentFile).push(currentHunk)
+      }
+
+      // 新文件的路径（来自 b/ 侧）
+      currentFile = newFileMatch[1]
+      if (!fileMap.has(currentFile)) {
+        fileMap.set(currentFile, [])
+      }
+
+      fileStartLine = i + 2 // 跳过 ---/+++ 行
+      i++ // 跳过 +++ 行
+      currentHunk = { file: currentFile, hunks: [], startLine: fileStartLine }
+      continue
+    }
+
+    // Hunk header
+    const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/)
+    if (hunkMatch && currentFile !== null) {
+      // 保存上一个 hunk
+      if (currentHunk && currentHunk.hunks.length > 0) {
+        fileMap.get(currentFile).push(currentHunk)
+      }
+
+      // 开始新 hunk
+      currentHunk = {
+        oldStart: parseInt(hunkMatch[1], 10),
+        oldCount: parseInt(hunkMatch[2] || '1', 10),
+        newStart: parseInt(hunkMatch[3], 10),
+        newCount: parseInt(hunkMatch[4] || '1', 10),
+        lines: [],
+        headerLine: line,
+        file: currentFile,
+        startLine: i
+      }
+      fileMap.get(currentFile).push(currentHunk)
+      continue
+    }
+
+    // diff 内容行
+    if (currentHunk) {
+      const diffLine = parseDiffLine(line, currentHunk)
+      currentHunk.lines.push(diffLine)
+    }
+  }
+
+  // 保存最后一个 hunk
+  if (currentHunk && currentHunk.lines.length > 0) {
+    fileMap.get(currentFile)?.push(currentHunk)
+  }
+
+  return fileMap
+}
+
+/**
+ * 验证文件路径是否存在
+ * @param {Map<string, Array>} fileMap
+ * @param {string} path
+ */
+export function fileExistsInDiff(fileMap, path) {
+  return fileMap.has(path)
+}
+
+/**
+ * 获取文件的所有 hunks（包含 empty hunks）
+ */
+export function getHunksForFileRaw(fileMap, filePath) {
+  return fileMap.get(filePath) || []
+}
+
+/**
+ * 统计文件修改情况
+ * @param {Array} hunks
+ * @returns {{ additions: number, deletions: number, changes: number }}
+ */
+export function countFileChanges(hunks) {
+  let additions = 0
+  let deletions = 0
+
+  for (const hunk of hunks) {
+    for (const line of hunk.lines) {
+      if (line.type === '+') additions++
+      else if (line.type === '-') deletions++
+    }
+  }
+
+  return {
+    additions,
+    deletions,
+    changes: additions + deletions
+  }
+}
+
+// 测试辅助函数：打印解析结果
+export function debugPrintHunks(hunks) {
+  for (const hunk of hunks) {
+    console.log(`Hunk: @@ -${hunk.oldStart},${hunk.oldCount} +${hunk.newStart},${hunk.newCount} @@`)
+    for (const line of hunk.lines) {
+      const marker = line.type === ' ' ? ' ' : line.type
+      console.log(`  ${marker} ${line.newLineNum || ''} | ${line.content}`)
+    }
+  }
+}
+
+/**
+ * 实用函数：将行号映射为 GitHub API 的 position
+ * 注意：position 是从 diff 文件开头计数的行号（包括 @@ headers）
+ */
+export function mapLineToPosition(diffText, filePath, lineNum) {
+  const fileMap = splitDiffByFile(diffText)
+  const hunks = getHunksForFileRaw(fileMap, filePath)
+  return getPositionInDiff(hunks, lineNum)
+}
+
+/**
+ * 实用函数：找出 diff 中新增的代码块的位置范围
+ */
+export function findAddedLines(hunks) {
+  const ranges = []
+  for (const hunk of hunks) {
+    for (const line of hunk.lines) {
+      if (line.type === '+' && line.newLineNum) {
+        ranges.push({
+          start: line.newLineNum,
+          end: line.newLineNum,
+          content: line.content
+        })
+      }
+    }
+  }
+  return ranges
+}

package/src/mcp/client.js

@@ -212,7 +212,7 @@ export class MCPClient {
   }
 
   /** 发送 JSON-RPC 请求 */
-  _sendRequest(method, params) {
+  _sendRequest(method, params, timeoutMs = 30000) {
     return new Promise((resolve, reject) => {
       const id = nextId()
       const message = JSON.stringify({
@@ -222,11 +222,19 @@ export class MCPClient {
         params,
       })
 
-      this.pending.set(id, { resolve, reject })
+      // M8 fix: 请求超时保护，防止 MCP 服务器无响应时永远挂起
+      const timer = setTimeout(() => {
+        if (this.pending.has(id)) {
+          this.pending.delete(id)
+          reject(new Error(`MCP request timeout: ${method} (${timeoutMs}ms)`))
+        }
+      }, timeoutMs)
+      this.pending.set(id, { resolve, reject, timer })
 
       // 每条消息以换行符分隔
       this.process.stdin.write(message + '\n', (err) => {
         if (err) {
+          clearTimeout(timer)
           this.pending.delete(id)
           reject(new Error(`Failed to send message: ${err.message}`))
         }
@@ -255,8 +263,10 @@ export class MCPClient {
         const message = JSON.parse(line)
 
         if (message.id && this.pending.has(message.id)) {
-          const { resolve, reject } = this.pending.get(message.id)
+          const { resolve, reject, timer } = this.pending.get(message.id)
           this.pending.delete(message.id)
+          // M8 fix: 清除超时定时器
+          if (timer) clearTimeout(timer)
 
           if (message.error) {
             reject(new Error(message.error.message || 'MCP error'))

package/src/security/path-guard.js

@@ -8,6 +8,7 @@
  * - 双重编码绕过检测（%252e 等）
  */
 import { resolve, normalize, isAbsolute, relative, sep } from 'path'
+import { realpathSync } from 'fs'
 
 /**
  * 敏感路径列表 — 禁止读写
@@ -53,7 +54,16 @@ export function sanitizePath(filePath, cwd = process.cwd()) {
   // 如果是相对路径，基于 cwd 解析
   const absPath = isAbsolute(decoded) ? decoded : resolve(cwd, decoded)
   // 规范化：消除 .. 和 .
-  return normalize(absPath)
+  const normalized = normalize(absPath)
+
+  // M6 fix: 解析符号链接，防止通过 symlink 绕过路径安全检查
+  // 例如: /tmp/link → /etc/shadow
+  try {
+    return realpathSync(normalized)
+  } catch {
+    // 文件不存在时 realpathSync 会抛错，返回规范化路径即可
+    return normalized
+  }
 }
 
 /**

package/src/tools/git-tool.js

@@ -0,0 +1,308 @@
+/**
+ * GitTool - GitHub PR 自动化管理工具
+ * 符合 ToolDef 接口规范
+ */
+
+import { GitHubAPI, createGitHubAPI } from '../git/github-api.js'
+import { PRReviewer } from '../git/pr-reviewer.js'
+import { PRMergePolicy } from '../git/pr-merge-policy.js'
+import { ToolDef } from '../types/index.js'
+
+const TOOL_NAME = 'GitTool'
+const TOOL_DESCRIPTION = `
+GitHub PR 自动化管理工具。
+
+前置条件:
+- 设置 GITHUB_TOKEN 环境变量（有 repo 权限）
+- 设置 GITHUB_OWNER 和 GITHUB_REPO（或在 ~/.claude-code/config.json 中配置）
+- 可选：DEEPSEEK_API_KEY for LLM 智能分析
+
+主要功能:
+- 列出 PR（list-prs）
+- 获取 PR 详情（get-pr）
+- 自动审查（review-pr）：代码质量、安全、测试、文档
+- 智能合并（merge-pr）：策略检查
+- 评论、approve、request changes
+- 批量操作（auto-review-all, auto-merge-eligible）
+`
+
+const TOOL_PARAMETERS = {
+  type: 'object',
+  properties: {
+    action: {
+      type: 'string',
+      enum: [
+        'list-prs',
+        'get-pr',
+        'review-pr',
+        'merge-pr',
+        'auto-review-all',
+        'comment',
+        'approve',
+        'request-changes',
+        'check-mergeable',
+        'auto-merge-eligible'
+      ],
+      description: '要执行的操作'
+    },
+    owner: { type: 'string', description: 'GitHub repository owner' },
+    repo: { type: 'string', description: 'GitHub repository name' },
+    prNumber: { type: 'number', description: 'PR number' },
+    state: { type: 'string', enum: ['open', 'closed', 'all'], description: 'PR state filter' },
+    head: { type: 'string', description: 'Filter by head branch' },
+    base: { type: 'string', description: 'Filter by base branch' },
+    labels: { type: 'array', items: { type: 'string' }, description: 'Label filter' },
+    limit: { type: 'number', description: 'Max PRs to fetch' },
+    checks: {
+      type: 'array',
+      items: { type: 'string', enum: ['code-quality', 'security', 'tests', 'docs', 'complexity', 'duplication'] },
+      description: '检查项列表'
+    },
+    analyzeLLM: { type: 'boolean', description: '是否使用 LLM 智能分析' },
+    commentThreshold: { type: 'string', enum: ['INFO', 'WARNING', 'ERROR'], description: '评论阈值' },
+    autoComment: { type: 'boolean', description: '是否自动发表审查评论' },
+    method: { type: 'string', enum: ['merge', 'squash', 'rebase'], description: 'Merge method' },
+    body: { type: 'string', description: 'Comment body' },
+    label: { type: 'string', description: 'Label filter for batch operations' }
+  },
+  required: ['action']
+}
+
+/**
+ * 内部 GitTool 类（无状态）
+ */
+class GitTool {
+  constructor(config = {}) {
+    this.config = config
+    this.github = null
+    this.reviewer = null
+    this.mergePolicy = null
+  }
+
+  ensureGitHubClient(options = {}) {
+    if (this.github) return
+
+    const owner = options.owner || this.config.owner || this._readConfig('github.owner')
+    const repo = options.repo || this.config.repo || this._readConfig('github.repo')
+
+    if (!owner || !repo) {
+      throw new Error('GitHub owner and repo required. Set in config or pass as parameters.')
+    }
+
+    this.github = createGitHubAPI({
+      token: process.env.GITHUB_TOKEN,
+      owner,
+      repo,
+      baseUrl: this.config.baseUrl
+    })
+
+    const policyConfig = this.config.mergePolicy || {}
+    this.reviewer = new PRReviewer(this.github, this.config.reviewRules, {
+      enableLLM: this.config.enableLLM,
+      apiConfig: this.config.llm
+    })
+    this.mergePolicy = new PRMergePolicy(this.github, policyConfig)
+  }
+
+  async execute(params) {
+    const { action } = params
+    switch (action) {
+      case 'list-prs': return this.listPRs(params)
+      case 'get-pr': return this.getPR(params)
+      case 'review-pr': return this.reviewPR(params)
+      case 'merge-pr': return this.mergePR(params)
+      case 'auto-review-all': return this.autoReviewAll(params)
+      case 'comment': return this.comment(params)
+      case 'approve': return this.approve(params)
+      case 'request-changes': return this.requestChanges(params)
+      case 'check-mergeable': return this.checkMergeable(params)
+      case 'auto-merge-eligible': return this.autoMergeEligible(params)
+      default: throw new Error(`Unknown action: ${action}`)
+    }
+  }
+
+  async listPRs({ state = 'open', head, base, labels, limit = 50 }) {
+    this.ensureGitHubClient()
+    if (labels && !Array.isArray(labels)) {
+      throw new Error('labels must be an array of strings')
+    }
+    const query = { state, per_page: Math.min(limit, 100) }
+    if (head) query.head = head
+    if (base) query.base = base
+    if (labels?.length) query.labels = labels.join(',')
+    const prs = await this.github.listPRs(query)
+    const prList = Array.isArray(prs) ? prs : []
+    return {
+      count: prList.length,
+      prs: prList.map(pr => ({
+        number: pr.number,
+        title: pr.title,
+        state: pr.state,
+        user: pr.user?.login,
+        head: pr.head?.ref,
+        base: pr.base?.ref,
+        createdAt: pr.created_at,
+        updatedAt: pr.updated_at,
+        comments: pr.comments,
+        labels: pr.labels?.map(l => l.name) || []
+      }))
+    }
+  }
+
+  async getPR({ prNumber }) {
+    this.ensureGitHubClient()
+    const pr = await this.github.getPR(prNumber)
+    const files = await this.github.getPRFiles(prNumber)
+    const reviews = await this.github.listReviews(prNumber)
+    return {
+      number: pr.number,
+      title: pr.title,
+      body: pr.body,
+      user: pr.user?.login,
+      head: pr.head?.ref,
+      base: pr.base?.ref,
+      mergeable: pr.mergeable,
+      changedFiles: pr.changed_files,
+      additions: pr.additions,
+      deletions: pr.deletions,
+      files: files.map(f => ({ filename: f.filename, additions: f.additions, deletions: f.deletions })),
+      reviews: reviews.map(r => ({ user: r.user?.login, state: r.state }))
+    }
+  }
+
+  async reviewPR({ prNumber, checks, analyzeLLM = true, commentThreshold = 'WARNING', autoComment = false }) {
+    this.ensureGitHubClient()
+    const reviewRules = {}
+    if (checks) {
+      reviewRules.checks = {}
+      checks.forEach(c => reviewRules.checks[c] = true)
+    }
+    const reviewer = new PRReviewer(this.github, reviewRules, {
+      enableLLM: this.config.enableLLM,
+      apiConfig: this.config.llm
+    })
+    const result = await reviewer.reviewPR(prNumber, { analyzeLLM, commentThreshold })
+    if (autoComment && result.comments.length > 0) {
+      const pr = await this.github.getPR(prNumber)
+      const summary = result.comments.find(c => !c.position)
+      if (summary) {
+        await this.github.createReview(prNumber, summary.body)
+      }
+    }
+    return result
+  }
+
+  async mergePR({ prNumber, method }) {
+    if (!prNumber) throw new Error('prNumber required')
+    this.ensureGitHubClient()
+    return await this.mergePolicy.merge(prNumber, { method })
+  }
+
+  async autoReviewAll({ labelFilter, limit = 50 }) {
+    this.ensureGitHubClient()
+    const prs = await this.github.listPRs({ state: 'open', per_page: limit })
+    const results = []
+    const prList = Array.isArray(prs) ? prs : []
+    for (const pr of prList) {
+      if (labelFilter && !pr.labels?.some(l => l.name === labelFilter)) continue
+      try {
+        const review = await this.reviewer.reviewPR(pr.number, { commentThreshold: 'WARNING' })
+        results.push({ prNumber: pr.number, title: pr.title, findings: review.findings.length, status: 'reviewed' })
+      } catch (e) {
+        results.push({ prNumber: pr.number, title: pr.title, status: 'error', error: e.message })
+      }
+    }
+    return { total: prList.length, reviewed: results.filter(r => r.status === 'reviewed').length, errors: results.filter(r => r.status === 'error'), details: results }
+  }
+
+  async comment({ prNumber, body, path, line }) {
+    if (!prNumber || !body) throw new Error('prNumber and body required')
+    this.ensureGitHubClient()
+
+    if (path && line) {
+      // Get PR diff, parse and find the position for the specific line
+      const pr = await this.github.getPR(prNumber)
+      const diffText = await this.github.getPRDiff(prNumber)
+
+      // Import diff parser dynamically (ESM)
+      const { splitDiffByFile, getPositionInDiff, getHunksForFileRaw } = await import('../git/utils/diff-parser.js')
+
+      const fileMap = splitDiffByFile(diffText)
+      const hunks = getHunksForFileRaw(fileMap, path)
+
+      if (!hunks || hunks.length === 0) {
+        throw new Error('File ' + path + ' not found in PR diff')
+      }
+
+      const position = getPositionInDiff(hunks, line)
+      if (position === null) {
+        throw new Error('Line ' + line + ' not found in diff for ' + path)
+      }
+
+      // Use latest commit SHA as commit_id
+      const commitId = pr.head?.sha || null
+
+      return await this.github.createComment(prNumber, body, { path, position, commitId })
+    }
+
+    return await this.github.createReview(prNumber, body)
+  }
+
+  async approve({ prNumber, body }) {
+    this.ensureGitHubClient()
+    if (!prNumber) throw new Error('prNumber required')
+    return await this.github.approvePR(prNumber, body || 'Approved')
+  }
+
+  async requestChanges({ prNumber, body }) {
+    this.ensureGitHubClient()
+    if (!prNumber) throw new Error('prNumber required')
+    return await this.github.requestChanges(prNumber, body || 'Changes requested')
+  }
+
+  async checkMergeable({ prNumber }) {
+    this.ensureGitHubClient()
+    return await this.mergePolicy.checkMergeable(prNumber)
+  }
+
+  async autoMergeEligible({ label = 'auto-merge', limit = 50 }) {
+    this.ensureGitHubClient()
+    const prs = await this.github.listPRs({ state: 'open', per_page: limit, labels: label })
+    const eligible = []
+    const prList = Array.isArray(prs) ? prs : []
+    for (const pr of prList) {
+      try {
+        const check = await this.mergePolicy.checkMergeable(pr.number)
+        if (check.mergeable) eligible.push({ pr, check })
+      } catch (e) {
+        console.error(`Check failed for PR ${pr.number}:`, e.message)
+      }
+    }
+    return { label, total: prList.length, eligible: eligible.length, items: eligible.map(e => ({ number: e.pr.number, title: e.pr.title })) }
+  }
+
+  _readConfig(path) {
+    try {
+      const configPath = `${process.env.HOME}/.claude-code/config.json`
+      const data = require('fs').readFileSync(configPath, 'utf-8')
+      const config = JSON.parse(data)
+      return path.split('.').reduce((obj, key) => obj?.[key], config)
+    } catch { return null }
+  }
+}
+
+/**
+ * ToolDef 工厂函数
+ */
+function createToolDef(config = {}) {
+  const tool = new GitTool(config)
+  return new ToolDef(TOOL_NAME, TOOL_DESCRIPTION, TOOL_PARAMETERS, (input, ctx) => tool.execute(input), 'high')
+}
+
+/**
+ * 导出 ToolDef 实例
+ */
+export const gitTool = createToolDef()
+
+export { GitTool, createToolDef }
+export default gitTool