@raolin2025/claude-code-node 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raolin2025/claude-code-node",
-  "version": "2.0.0",
+  "version": "2.1.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/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) {

package/src/core/query-engine.js

@@ -43,6 +43,8 @@ export class QueryEngineConfig {
     this.costTracker = options.costTracker || null
     this.tokenBudget = options.tokenBudget || null
     this.initialMessages = options.initialMessages || []
+    this.onConfirmTool = options.onConfirmTool || null  // ask 模式确认回调
+    this.readline = options.readline || null              // 用于 AskUserQuestion 工具
   }
 }
 
@@ -196,39 +198,61 @@ export class QueryEngine {
 
 
   /**
-   * 执行工具调用
+   * 执行工具调用 — 两阶段策略
+   * 阶段1（串行）：安全检查 + ask 模式确认（需要用户交互，必须串行）
+   * 阶段2（并行）：批准后的工具并行执行，互不依赖的工具同时跑
    */
   async _executeToolCalls(toolCalls) {
-    const results = []
+    // 阶段1：串行安全检查
+    const approved = []
     for (const tc of toolCalls) {
-      // 安全检查
       const permResult = await this.permissionChecker.check(tc.name, tc.input)
       if (!permResult.allowed) {
-        results.push(new ToolResult(tc.id, `工具调用被安全策略拒绝: ${tc.name} — ${permResult.reason || ""}`, true))
-        results[results.length - 1].toolName = tc.name
-        continue
+        if (permResult.requiresConfirmation && this.config.onConfirmTool) {
+          const confirmed = await this.config.onConfirmTool(tc.name, tc.input)
+          if (!confirmed) {
+            approved.push({ tc, error: '用户未确认' })
+            continue
+          }
+        } else {
+          approved.push({ tc, error: `安全策略拒绝: ${permResult.reason || ""}` })
+          continue
+        }
       }
 
-      // 查找工具
       const tool = this.config.tools.find(t => t.name === tc.name)
       if (!tool) {
-        results.push(new ToolResult(tc.id, `未找到工具: ${tc.name}`, true))
-        results[results.length - 1].toolName = tc.name
+        approved.push({ tc, error: `未找到工具: ${tc.name}` })
         continue
       }
 
+      approved.push({ tc, tool })
+    }
+
+    // 阶段2：并行执行已批准的工具
+    const execPromises = approved.map(async (item) => {
+      if (item.error) {
+        const r = new ToolResult(item.tc.id, item.error, true)
+        r.toolName = item.tc.name
+        return r
+      }
+      const { tc, tool } = item
+      tc.status = 'running'
       try {
-        tc.status = 'running'
-        const content = await tool.handler(tc.input, { cwd: this.config.cwd, engine: this })
+        const content = await tool.handler(tc.input, { cwd: this.config.cwd, engine: this, readline: this.config.readline })
         tc.status = 'done'
-        results.push(new ToolResult(tc.id, typeof content === 'string' ? content : JSON.stringify(content), false))
-        results[results.length - 1].toolName = tc.name
+        const r = new ToolResult(tc.id, typeof content === 'string' ? content : JSON.stringify(content), false)
+        r.toolName = tc.name
+        return r
       } catch (err) {
         tc.status = 'error'
-        results.push(new ToolResult(tc.id, `工具执行错误: ${err.message}`, true))
-        results[results.length - 1].toolName = tc.name
+        const r = new ToolResult(tc.id, `工具执行错误: ${err.message}`, true)
+        r.toolName = tc.name
+        return r
       }
-    }
+    })
+
+    const results = await Promise.all(execPromises)
     return results
   }
 
@@ -289,6 +313,12 @@ export class QueryEngine {
 
     // 带重试的 fetch
     const maxRetries = 3
+    // Jitter 退避 — 指数退避 + 随机 ±50%，防止惊群效应
+    const retryDelay = (baseMs, attempt) => {
+      const ms = baseMs * Math.pow(2, attempt - 1)
+      const jitter = ms * (0.5 + Math.random() * 0.5) // 50%-100% of base
+      return Math.round(jitter)
+    }
     let lastError = null
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
@@ -310,7 +340,7 @@ export class QueryEngine {
           const errText = await response.text()
           // 429/503 可重试
           if ((response.status === 429 || response.status === 503) && attempt < maxRetries) {
-            const waitMs = response.status === 429 ? 2000 * attempt : 1000
+            const waitMs = retryDelay(response.status === 429 ? 2000 : 1000, attempt)
             if (this.config.verbose) {
               console.error(`[retry] API ${response.status}, waiting ${waitMs}ms (attempt ${attempt}/${maxRetries})`)
             }
@@ -322,11 +352,17 @@ export class QueryEngine {
 
         // 流式或非流式处理
         if (useStream && response.body) {
-          return await this._handleStreamResponse(response)
+          const result = await this._handleStreamResponse(response)
+          if (result.usage && this.costTracker) {
+            this.costTracker.recordUsage(result.usage)
+          }
+          if (this.tokenBudget && result.usage) {
+            this.tokenBudget.recordUsage(result.usage)
+          }
+          return result
         } else {
           const data = await response.json()
           const result = parseNonStreamResponse(data)
-          // M4: 记录非流式响应费用
           if (result.usage && this.costTracker) {
             this.costTracker.recordUsage(result.usage)
           }
@@ -339,7 +375,7 @@ export class QueryEngine {
         lastError = err
         // 网络错误重试
         if (err.name !== 'AbortError' && attempt < maxRetries && !err.message.startsWith('API 错误')) {
-          const waitMs = 1000 * attempt
+          const waitMs = retryDelay(1000, attempt)
           if (this.config.verbose) {
             console.error(`[retry] Network error: ${err.message}, waiting ${waitMs}ms (attempt ${attempt}/${maxRetries})`)
           }
@@ -394,42 +430,9 @@ export class QueryEngine {
     return result
   }
 
-    /**
-   * 解析 OpenAI 兼容响应
-   */
-  _parseResponse(data) {
-    const result = { content: '', toolCalls: [] }
-    const choice = data.choices?.[0]
-    if (!choice) return result
-
-    const message = choice.message
-    if (message.content) {
-      result.content = message.content
-    }
-
-    for (const tc of (message.tool_calls || [])) {
-      let input = {}
-      try {
-        input = JSON.parse(tc.function.arguments || '{}')
-      } catch {
-        input = { _raw: tc.function.arguments }
-      }
-      result.toolCalls.push(new ToolCall(tc.id, tc.function.name, input))
-    }
-
-    // M4: 记录 API 调用费用
-    if (result.usage && this.costTracker) {
-      this.costTracker.recordUsage(result.usage)
-    }
-    if (this.tokenBudget && result.usage) {
-      this.tokenBudget.recordUsage(result.usage)
-    }
-
-    return result
-  }
-
   /** 格式化内容 */
   _formatContent(content) {
+    if (content == null) return ''
     if (typeof content === 'string') return content
     if (typeof content === 'object') return JSON.stringify(content)
     return String(content)

package/src/core/session.js

@@ -4,6 +4,7 @@
  */
 import { readFile, writeFile, mkdir, readdir, rm, chmod } from 'fs/promises'
 import { resolve, join } from 'path'
+import { randomBytes } from 'crypto'
 
 const DEFAULT_SESSIONS_DIR = '.claude-code/sessions'
 
@@ -21,7 +22,8 @@ export class SessionManager {
   /** 创建新会话 */
   async create(title = '') {
     await this.ensureDir()
-    const id = `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+    // M4 fix: 使用 crypto.randomBytes 生成不可预测的会话 ID
+    const id = `session-${Date.now()}-${randomBytes(8).toString('hex')}`
     const session = {
       id,
       title: title || `Session ${new Date().toISOString().slice(0, 19)}`,

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/web-fetch.js

@@ -35,6 +35,8 @@ function htmlToText(html) {
   return text
 }
 
+const VERSION = '2.0.0'
+
 export const webFetchTool = new ToolDef(
   'WebFetch',
   `Fetch and extract content from a URL.
@@ -69,7 +71,7 @@ Usage:
     try {
       const response = await fetch(url, {
         headers: {
-          'User-Agent': 'ClaudeCode-Node/1.0',
+          'User-Agent': `ClaudeCode-Node/${VERSION}`,
           'Accept': 'text/html,application/json,text/plain,*/*',
         },
         signal: AbortSignal.timeout(30000),