@raolin2025/claude-code-node 2.0.0 → 2.2.0

package/README.md

@@ -111,6 +111,7 @@ cc-node --resume session-1747000000000-abc123
 | **Grep** | 内容搜索（rg/grep） | `always-allow` | — |
 | **WebFetch** | 抓取网页内容 | `ask` | ✅ SSRF 防护 |
 | **WebSearch** | 网页搜索 | `ask` | 需要 API Key |
+| **GitTool** | GitHub PR 自动化（审查/合并/评论） | `high` | ✅ 预检查 |
 | **AskUserQuestion** | 向用户提问 | `always-allow` | — |
 
 [![npm version](https://img.shields.io/npm/v/@raolin2025/claude-code-node.svg)](https://www.npmjs.com/package/@raolin2025/claude-code-node) [![GitHub](https://img.shields.io/badge/GitHub-bg1avd%2Fclaude--code--node-blue)](https://github.com/bg1avd/claude-code-node) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@@ -429,3 +430,119 @@ sudo systemctl start cc-notify
 # 查看日志
 journalctl -u cc-notify -f
 ```
+
+## 🔧 GitTool - PR 自动化管理
+
+GitTool 是 GitHub PR 自动化管理工具，支持查看、审查、合并 PR，以及批量操作和智能分析。
+
+### 前置配置
+
+```bash
+# 1. 创建 GitHub Personal Access Token (classic, 有 repo 权限)
+export GITHUB_TOKEN=ghp_xxx
+
+# 2. 设置仓库信息
+export GITHUB_OWNER=your_org
+export GITHUB_REPO=your_repo
+
+# 可选：启用 LLM 智能分析
+export DEEPSEEK_API_KEY=sk-xxx
+export DEEPSEEK_API_BASE=https://api.deepseek.com/v1
+```
+
+或在 `~/.claude-code/config.json` 中配置：
+
+```json
+{
+  "github": {
+    "owner": "your_org",
+    "repo": "your_repo"
+  },
+  "llm": {
+    "apiKey": "sk-xxx",
+    "apiBase": "https://api.deepseek.com/v1",
+    "model": "deepseek-chat"
+  },
+  "reviewRules": {
+    "checks": {
+      "codeQuality": true,
+      "security": true,
+      "tests": true,
+      "docs": true
+    }
+  }
+}
+```
+
+### 使用示例
+
+在 REPL 中调用 GitTool：
+
+```
+/GitTool list-prs
+/GitTool review-pr 123 --auto-comment false
+/GitTool check-mergeable 123
+/GitTool approve 123 "Looks good"
+/GitTool merge-pr 123 --method squash
+```
+
+命令行脚本（`test-git-tool.mjs`）:
+
+```bash
+# 列出 PR
+node test-git-tool.mjs list
+
+# 审查 PR（规则检查，无 LLM）
+node test-git-tool.mjs review 123
+
+# 使用 LLM 智能分析
+DEEPSEEK_API_KEY=sk-xxx node test-git-tool.mjs review-llm 123
+
+# 检查可合并性
+node test-git-tool.mjs check-mergeable 123
+
+# Approve PR
+node test-git-tool.mjs approve 123 "Approved"
+
+# 提交审查意见
+node test-git-tool.mjs comment 123 "Please add tests"
+
+# 行级评论（自动计算 diff position）
+node test-git-tool.mjs comment 123 "Fix needed" --path src/index.js --line 42
+```
+
+### 自动化工作流
+
+- **每日自动审查**: 设置 cron 运行 `auto-review-all`
+- **自动合并**: 为满足条件的 PR 添加 `auto-merge` 标签，运行 `auto-merge-eligible`
+- **集成 OpenClaw Heartbeat**: 通过 `cron` 工具定期执行
+
+```bash
+# 每天 10:00 自动审查所有 PR
+cron add "0 10 * * *" "session:git-automation" \
+  --payload '{"kind":"agentTurn","message":"/GitTool auto-review-all"}'
+```
+
+### 合并策略
+
+PRMergePolicy 支持以下检查（可配置）：
+
+- ✅ 最少 Approvals 数量
+- ✅ CI 状态全部通过
+- ✅ 无 `changes_requested`
+- ✅ 分支保护规则
+- ✅ 自动合并标签（如 `auto-merge`）
+- ✅ 合并冲突检测
+
+### 安全与权限
+
+- GitTool 工具注册为 `high` 权限级别（合并操作需要确认）
+- 操作会被记录在审计日志中
+- 禁止合并到受保护分支（main/master）
+
+### 与 OpenClaw 集成
+
+- GitTool 已内置到 cc-node 工具集中
+- 可通过 `/tools` 查看
+- 审查结果可与 QQ/Telegram 通道集成，发送通知
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raolin2025/claude-code-node",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Node.js AI Code Agent CLI - Zero dependencies, pure JavaScript, security hardened, multi-channel notifications",
   "type": "module",
   "main": "src/index.js",

package/src/__tests__/git-tool.integration.test.js

@@ -0,0 +1,89 @@
+/**
+ * GitTool 集成测试
+ * 测试工具在真实环境中的集成情况
+ */
+
+import { test, describe, beforeEach } from 'node:test'
+import assert from 'node:assert'
+
+// 模拟 GitHub API 响应
+function mockGitHubAPI() {
+  return {
+    token: 'mock-token',
+    owner: 'test-owner',
+    repo: 'test-repo',
+    baseUrl: 'https://api.github.com',
+    request: async (endpoint, options = {}) => {
+      if (endpoint.includes('/pulls')) {
+        return [{ number: 1, title: 'Test PR', state: 'open', user: { login: 'tester' } }]
+      }
+      if (endpoint.includes('/pulls/1')) {
+        return {
+          number: 1,
+          title: 'Test PR',
+          body: 'Test',
+          user: { login: 'tester' },
+          head: { ref: 'feature', sha: 'abc123' },
+          base: { ref: 'main' },
+          mergeable: true,
+          changed_files: 1,
+          additions: 1,
+          deletions: 0,
+          labels: []
+        }
+      }
+      return {}
+    }
+  }
+}
+
+// 导入 GitTool 类
+import { GitTool } from '../tools/git-tool.js'
+
+describe('GitTool Integration', () => {
+  let tool
+
+  beforeEach(() => {
+    // 创建 GitTool 实例，使用 mock 配置
+    tool = new GitTool({
+      owner: 'test-owner',
+      repo: 'test-repo',
+      token: 'mock-token'
+    })
+    // 注入 mock 的 GitHub API
+    tool.github = mockGitHubAPI()
+  })
+
+  test('should list PRs', async () => {
+    const result = await tool.execute({ action: 'list-prs', limit: 10 })
+    assert.ok(result.count >= 0)
+    assert.ok(Array.isArray(result.prs))
+  })
+
+  test('should get PR details', async () => {
+    const result = await tool.execute({ action: 'get-pr', prNumber: 1 })
+    assert.strictEqual(result.number, 1)
+    assert.ok(result.title.length > 0)
+  })
+
+  test('should check mergeable', async () => {
+    const result = await tool.execute({ action: 'check-mergeable', prNumber: 1 })
+    assert.ok('mergeable' in result)
+    assert.ok('checks' in result)
+    assert.ok('violations' in result)
+  })
+
+  test('should validate parameters before execution', async () => {
+    await assert.rejects(
+      tool.execute({ action: 'list-prs', state: 'invalid' }),
+      /Invalid enum value/
+    )
+  })
+
+  test('should handle unknown action', async () => {
+    await assert.rejects(
+      tool.execute({ action: 'unknown-action' }),
+      /Unknown action/
+    )
+  })
+})

package/src/__tests__/git-tool.test.js

@@ -0,0 +1,144 @@
+/**
+ * GitTool 单元测试
+ */
+
+import { test, describe } from 'node:test'
+import assert from 'node:assert'
+
+import { gitTool, createToolDef, GitTool } from '../tools/git-tool.js'
+import { parseDiff, splitDiffByFile, getPositionInDiff } from '../git/utils/diff-parser.js'
+
+// ============================================
+// Diff Parser Tests
+// ============================================
+describe('Diff Parser', () => {
+  const sampleDiff = `diff --git a/src/index.js b/src/index.js
+--- a/src/index.js
++++ b/src/index.js
+@@ -1,5 +1,5 @@
+ function add(a, b) {
+-  return a + b
++  return a + b + 0
+ }
+ module.exports = { add }
+ `
+
+  test('parseDiff should parse hunk headers', () => {
+    const hunks = parseDiff(sampleDiff)
+    assert.strictEqual(hunks.length, 1)
+    assert.strictEqual(hunks[0].oldStart, 1)
+    assert.strictEqual(hunks[0].newStart, 1)
+  })
+
+  test('splitDiffByFile should return file map with correct file', () => {
+    const fileMap = splitDiffByFile(sampleDiff)
+    assert.ok(fileMap.has('src/index.js'), 'Missing src/index.js in fileMap')
+    const hunks = fileMap.get('src/index.js')
+    assert.ok(Array.isArray(hunks))
+    assert.ok(hunks.length >= 1, `Expected at least 1 hunk, got ${hunks.length}`)
+  })
+
+  test('getPositionInDiff should calculate position for added line', () => {
+    const fileMap = splitDiffByFile(sampleDiff)
+    const hunks = fileMap.get('src/index.js')
+
+    // The line "  return a + b + 0" is at new line 2
+    const position = getPositionInDiff(hunks, 2)
+    assert.ok(position !== null, 'Position should not be null for existing line')
+    assert.ok(position > 1, `Position ${position} should be > 1`)
+  })
+})
+
+// ============================================
+// GitTool ToolDef Tests
+// ============================================
+describe('GitTool ToolDef', () => {
+  test('should have correct name', () => {
+    assert.strictEqual(gitTool.name, 'GitTool')
+  })
+
+  test('should have description', () => {
+    assert.ok(typeof gitTool.description === 'string' && gitTool.description.length > 10)
+  })
+
+  test('should have parameters schema', () => {
+    const params = gitTool.parameters
+    assert.strictEqual(params.type, 'object')
+    assert.ok('action' in params.properties)
+    assert.ok('prNumber' in params.properties)
+  })
+
+  test('should require action parameter', () => {
+    const required = gitTool.parameters.required
+    assert.ok(Array.isArray(required))
+    assert.ok(required.includes('action'))
+  })
+
+  test('should support all expected actions', () => {
+    const actions = gitTool.parameters.properties.action.enum
+    const expected = [
+      'list-prs', 'get-pr', 'review-pr', 'merge-pr',
+      'comment', 'approve', 'request-changes',
+      'check-mergeable', 'auto-review-all', 'auto-merge-eligible'
+    ]
+    expected.forEach(a => assert.ok(actions.includes(a), `Missing action: ${a}`))
+  })
+
+  test('should have high permission level', () => {
+    assert.strictEqual(gitTool.permissionLevel, 'high')
+  })
+
+  test('should have handler function', () => {
+    assert.ok(typeof gitTool.handler === 'function')
+  })
+})
+
+// ============================================
+// GitTool Factory Tests
+// ============================================
+describe('GitTool Factory', () => {
+  test('createToolDef should return ToolDef instance with handler', () => {
+    const toolDef = createToolDef({})
+    assert.ok(toolDef instanceof Object)
+    assert.ok(typeof toolDef.handler === 'function')
+    assert.strictEqual(toolDef.name, 'GitTool')
+  })
+
+  test('GitTool class should be instantiable with config', () => {
+    const instance = new GitTool({ owner: 'test', repo: 'test' })
+    assert.ok(instance instanceof GitTool)
+    assert.ok(typeof instance.execute === 'function')
+  })
+})
+
+// ============================================
+// Parameter Validation Tests
+// ============================================
+describe('Parameter Validation', () => {
+  test('comment action should validate prNumber and body before GitHub init', async () => {
+    // Pass dummy token to bypass GitHub token check early
+    const tool = new GitTool({
+      owner: 'test',
+      repo: 'test',
+      token: 'dummy'
+    })
+
+    await assert.rejects(
+      tool.execute({ action: 'comment' }),
+      /prNumber and body required/
+    )
+  })
+
+  test('merge-pr action should validate prNumber', async () => {
+    const tool = new GitTool({
+      owner: 'test',
+      repo: 'test',
+      token: 'dummy'
+    })
+
+    await assert.rejects(
+      tool.execute({ action: 'merge-pr' }),
+      /prNumber required/
+    )
+  })
+})

package/src/channel/notify-daemon.js

@@ -491,28 +491,31 @@ async function main() {
   // 确保 socket 目录存在
   mkdirSync(SOCK_DIR, { recursive: true });
 
-  // v1.1: PID file lock — atomic create, prevent multiple instances
-  try {
-    const fd = openSync(config.pidFile, "wx");
-    writeFileSync(fd, String(process.pid));
-    closeSync(fd);
-  } catch (err) {
-    if (err.code === "EEXIST") {
+  // M9 fix: PID file lock — atomic create with retry, no unlink+write race
+  let pidAcquired = false;
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      const fd = openSync(config.pidFile, "wx");
+      writeFileSync(fd, String(process.pid));
+      closeSync(fd);
+      pidAcquired = true;
+      break;
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
       const oldPid = parseInt(readFileSync(config.pidFile, "utf8").trim(), 10);
       try {
         process.kill(oldPid, 0);
         console.error("cc-notify already running (PID " + oldPid + "). Use --stop first.");
         process.exit(1);
       } catch {
-        try {
-          unlinkSync(config.pidFile);
-        } catch {}
-        writeFileSync(config.pidFile, String(process.pid));
+        try { unlinkSync(config.pidFile); } catch {}
+        if (attempt < 2) await sleep(100);
       }
-    } else {
-      throw err;
     }
   }
+  if (!pidAcquired) {
+    writeFileSync(config.pidFile, String(process.pid));
+  }
 
   const cleanup = () => {
     log("Shutting down...");

package/src/core/cli.js

@@ -138,6 +138,7 @@ Commands:
   /channel CMD   — Manage notification channels (list|send|test)
   /cost          — Show API cost report
   /compact       — Manually compact conversation context
+  /allow [tool]  — Allow a tool for the current session (default: all)
   /exit          — Exit (also Ctrl+C)
   /quit          — Same as /exit
 `
@@ -241,6 +242,8 @@ export async function main() {
     session = await sessionManager.create()
   }
 
+  // M1 fix: tokenBudget 必须在 engineConfig 之前定义，否则 TDZ ReferenceError
+  const tokenBudget = new TokenBudget({ maxTokens: config.get('maxBudgetTokens') || 200_000 })
   const costTracker = new CostTracker({ model })
 
   const engineConfig = new QueryEngineConfig({
@@ -252,11 +255,17 @@ export async function main() {
   })
   const engine = new QueryEngine(engineConfig)
 
-  // M5: 恢复会话历史和状态
+  // M5: 恢复会话历史和状态 — 完整恢复所有角色（含 tool_calls、tool 结果）
   if (session?.messages?.length) {
     for (const msg of session.messages) {
-      if (msg.role === 'user') engine.state.messages.push({ role: 'user', content: msg.content })
-      else if (msg.role === 'assistant') engine.state.messages.push({ role: 'assistant', content: msg.content })
+      const entry = { role: msg.role, content: msg.content }
+      if (msg.role === 'assistant' && msg.toolCalls?.length > 0) {
+        entry.toolCalls = msg.toolCalls
+      }
+      if (msg.role === 'tool' && msg.tool_call_id) {
+        entry.tool_call_id = msg.tool_call_id
+      }
+      engine.state.messages.push(entry)
     }
     // 恢复 turn count
     if (session.state?.turnCount) engine.state.turnCount = session.state.turnCount
@@ -268,7 +277,6 @@ export async function main() {
     }
   }
 
-  const tokenBudget = new TokenBudget({ maxTokens: config.get('maxBudgetTokens') || 200_000 })
 
   const channelManager = new ChannelManager({
     channels: config.get('channels') || {},
@@ -277,8 +285,16 @@ export async function main() {
 
   // 一次性输入模式
   if (cliArgs.oneShot) {
+    // 一次性模式下用户已明确表达了执行意图，自动批准所有工具调用
+    if (engine.permissionChecker.mode === 'ask') {
+      engine.config.onConfirmTool = async () => true
+    }
     const result = await engine.processMessage(cliArgs.oneShot)
     console.log(result.response)
+    // 保存会话
+    session = await sessionManager.create(`one-shot: ${cliArgs.oneShot.slice(0, 50)}`)
+    await sessionManager.appendMessage({ role: 'user', content: cliArgs.oneShot })
+    await sessionManager.appendMessage({ role: 'assistant', content: result.response })
     if (channelManager.list().length > 0) {
       await channelManager.sendTemplate('task-done', {
         task: cliArgs.oneShot.slice(0, 80),
@@ -293,6 +309,19 @@ export async function main() {
 
   const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: '> ' })
 
+  // 将 readline 注入引擎配置，用于 ask 模式确认和 AskUserQuestion 工具
+  if (permissionMode === 'ask') {
+    engine.config.onConfirmTool = async (toolName, input) => {
+      return new Promise((resolve) => {
+        const snippet = JSON.stringify(input).slice(0, 120) || '(no params)'
+        rl.question(`\n⚠️  Allow tool "${toolName}"?\n   Input: ${snippet}\n   (y/N) `, (answer) => {
+          resolve(answer.toLowerCase().startsWith('y'))
+        })
+      })
+    }
+  }
+  engine.config.readline = rl
+
   console.log(BANNER)
   console.log(`Model: ${model} | Permission: ${permissionMode} | Tools: ${registry.getNames().join(', ')}`)
   console.log(`Socket: ${SOCK_PATH} (cc-notify can connect)`)
@@ -304,7 +333,7 @@ export async function main() {
   console.log()
   rl.prompt()
 
-  // 共享的消息处理函数（REPL 和 socket 都用）
+  // REPL 消息处理包装（留作扩展点）
   async function processInput(input) {
     return engine.processMessage(input)
   }
@@ -380,6 +409,12 @@ export async function main() {
           }
           break
         }
+        case 'allow': {
+          const allowTool = rest.join(' ') || '*'
+          engine.permissionChecker.allowForSession(allowTool, '*')
+          console.log(`✅ Tool "${allowTool}" allowed for this session`)
+          break
+        }
         case 'cost':
           console.log(engine.costTracker.formatReport())
           break
@@ -415,6 +450,11 @@ export async function main() {
       console.log()
       await sessionManager.appendMessage({ role: 'user', content: input })
       await sessionManager.appendMessage({ role: 'assistant', content: result.response })
+      // 保存引擎状态到会话
+      session.state = session.state || {}
+      session.state.turnCount = engine.state.turnCount
+      session.state.costHistory = engine.costTracker.history.slice(-50)
+      await sessionManager.save(session)
       if (verbose) console.log(`[Turns: ${result.turns} | Tools: ${result.toolResults.length}]`)
       // 显示费用（即使非 verbose 也显示）
       if (engine.costTracker && engine.costTracker.totalApiCalls > 0) {