@raolin2025/claude-code-node 2.5.2 → 2.6.2

package/src/core/cli.js

@@ -4,7 +4,7 @@
  * 
  * v1.2: 增加 Unix socket 服务，让 cc-notify 能发现并转发消息
  */
-import { createInterface } from 'readline'
+import * as readline from 'readline'
 import { createServer as createNetServer } from 'net'
 import { writeFileSync, unlinkSync, existsSync, mkdirSync, readFileSync, chmodSync } from 'fs'
 import { join } from 'path'
@@ -16,7 +16,10 @@ import { TokenBudget } from './token-budget.js'
 import { ChannelManager } from '../channel/index.js'
 import { CostTracker } from './cost-tracker.js'
 import { autoCompact } from './compact.js'
+import { isLocalLlmServer } from '../utils/index.js'
 import { SOCK_DIR, SOCK_PATH, CC_NODE_PID } from './paths.js'
+import { TelegramListener } from '../channel/tg-listener.js'
+import { fetchViaSocks5 } from '../channel/tg-proxy.js'
 
 // ============================================================
 // Unix Socket — 让 cc-notify 能发现 cc-node
@@ -314,7 +317,7 @@ const DETAILED_HELP = {
 
   compact: "/compact\n  Manually trigger context compression.\n  Compresses the conversation history to fit within the token budget.\n  Keeps recent turns intact, compresses older ones.\n\n  Typically triggered automatically at 80% budget usage.",
 
-  cd:      "/cd <path>\n  Change the working directory of cc-node.\n  Affects all subsequent tool executions (Bash, Read, Write, etc.).\n\n  Without path: show the current working directory.\n\n  Example: /cd /home/raolin/projects\n  Example: /cd ..",
+  cd:      "/cd <path>\n  Change the working directory of cc-node.\n  Affects all subsequent tool executions (Bash, Read, Write, etc.).\n\n  Without path: show the current working directory.\n\n  Example: /cd /home/yourname/projects\n  Example: /cd ..",
 
   allow:   "/allow [tool|all|reset]\n  Manage tool permissions for this session.\n\n  Options:\n    <tool>   — allow a specific tool (e.g. Bash, Write, Read)\n    all      — automatically allow ALL remaining tools for this session\n    reset    — reset to ask mode (ask for each tool)\n    (no arg) — same as /allow all\n\n  When asked to confirm a tool, you can also type:\n    y — allow this once\n    a — allow all for the rest of the session\n\n  Example: /allow Bash\n  Example: /allow all\n  Example: /allow reset",
 
@@ -351,6 +354,8 @@ function parseArgs(argv) {
       case '--resume': case '-r': args.resume = argv[++i]; break
       case '--verbose': case '-v': args.verbose = true; break
       case '--no-stream': args.noStream = true; break
+      case '--stdio': args.stdio = true; break
+      case '--with-notify': args.withNotify = true; break
       case '--version':
         const pkg = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'))
         console.log(pkg.version)
@@ -369,6 +374,8 @@ Options:
   --version                 Show version
   -v, --verbose             Verbose mode
   --no-stream               Disable streaming
+  --with-notify             Start built-in channel listener (Telegram)
+                            (replaces cc-notify daemon — no external script needed)
   -h, --help                Show this help
 
 Environment variables:
@@ -404,19 +411,35 @@ Unix Socket (for cc-notify):
 export async function main() {
   const cliArgs = parseArgs(process.argv)
 
+  // P1: stdio 服务器模式（JSON-RPC 2.0 over NDJSON，供桥接层/外部客户端接入）
+  if (cliArgs.stdio) {
+    const { StdioServer } = await import('../stdio/server.js')
+    const server = new StdioServer({ cliArgs })
+    server.start()
+    return
+  }
+
   const config = new Config()
   await config.load(process.cwd())
 
   const apiBase = cliArgs.apiBase || config.get('apiBase') || process.env.LLM_API_BASE || ''
+  // apiBase 指向自建本地服务（Ollama / llama.cpp / vLLM 等）时允许缺省 apiKey
+  const localApiBase = isLocalLlmServer(apiBase)
   let model = cliArgs.model || config.get('model') || ''
   // 未指定模型 → 自动从 API 拉取模型列表让用户选择
+  // 本地自建服务即使无 key 也尝试拉取（这些服务通常无需认证）
   if (!model && apiBase) {
     const apiKeyForModels = cliArgs.apiKey || config.get('apiKey') || process.env.LLM_API_KEY || process.env.DEEPSEEK_API_KEY || ''
-    if (apiKeyForModels) {
+    if (apiKeyForModels || localApiBase) {
       try {
         const modelsUrl = apiBase.replace(/\/+$/, '') + '/models'
         console.log('⚠️  未指定模型，正在从 API 获取可用模型列表...')
-        const res = await fetch(modelsUrl, { headers: { 'Authorization': `Bearer ${apiKeyForModels}` } })
+        const res = await fetch(modelsUrl, {
+          headers: {
+            'Content-Type': 'application/json',
+            ...(apiKeyForModels ? { 'Authorization': `Bearer ${apiKeyForModels}` } : {}),
+          },
+        })
         if (res.ok) {
           const data = await res.json()
           const models = data.data || []
@@ -428,7 +451,7 @@ export async function main() {
             })
             console.log('输入编号选择，或直接输入模型名（回车跳过用 deepseek-chat）:')
             // 用 readline 等待输入（此时 REPL 还没启动，需要临时创建）
-            const tmpRl = createInterface({ input: process.stdin, output: process.stdout })
+            const tmpRl = readline.createInterface({ input: process.stdin, output: process.stdout })
             const answer = await new Promise(resolve => tmpRl.question('> ', resolve))
             tmpRl.close()
             const num = parseInt(answer, 10)
@@ -541,52 +564,35 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
   // REPL 模式 — 启动 Unix socket 让 cc-notify 能发现
   startSocketServer(engine, session, sessionManager, channelManager, verbose)
 
-  const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: '> ' })
-
-  // 将 readline 注入引擎配置，用于 ask 模式确认和 AskUserQuestion 工具
-  if (permissionMode === 'ask') {
-    engine.config.onConfirmTool = async (toolName, input) => {
-      // 如果已经启用会话全局自动允许，直接通过
-      if (engine.permissionChecker.sessionAllowAll) return true
-
-      const snippet = JSON.stringify(input).slice(0, 120) || '(no params)'
-      return new Promise((resolve) => {
-        rl.question(`\n⚠️  Allow tool "${toolName}"?\n   Input: ${snippet}\n   (y/N/a) a=all session `, (answer) => {
-          const a = answer.toLowerCase()
-          if (a === 'a') {
-            engine.permissionChecker.allowAllForSession()
-            resolve(true)
-          } else {
-            resolve(a === 'y')
-          }
-        })
-      })
-    }
-  }
-  engine.config.readline = rl
-
-  console.log(buildBanner({ model, permissionMode, session, maxTokens: tokenBudget.maxTokens }))
-  console.log(`Model: ${model} | Permission: ${permissionMode} | Tools: ${registry.getNames().join(', ')}`)
-  console.log(`Socket: ${SOCK_PATH} (cc-notify can connect)`)
-  if (channelManager.list().length > 0) {
-    const chList = channelManager.list().join(', ')
-    const def = channelManager.defaultChannel ? ` (default: ${channelManager.defaultChannel})` : ''
-    console.log(`Channels: ${chList}${def}`)
+  // ============================================================
+  // REPL 输入处理
+  //
+  // 使用标准 readline 的 line 事件（terminal: true）实现输入读取：
+  //   - 字符回显、退格删除、行回绕、方向键历史由 readline 原生处理，
+  //     行为与 v2.5 一致，避免手动 keypress 回显导致的显示错乱。
+  //   - Enter 提交；Ctrl+C 退出。
+  //   - 非 TTY（管道/重定向）模式复用同一 readline 接口。
+  // ============================================================
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout, prompt: '> ' })
+
+  // 显示提示符
+  function showPrompt() {
+    rl.prompt()
   }
-  console.log()
-  rl.prompt()
 
-  // REPL 消息处理包装（留作扩展点）
-  async function processInput(input) {
-    return engine.processMessage(input)
-  }
+  // Telegram 双向通道（可选）：tgListener 监听 Telegram 消息，tgChatId 记录回复目标
+  let tgListener = null
+  let tgChatId = null
+  let tgReplyTarget = null
 
-  rl.on('line', async (line) => {
-    const input = line.trim()
-    if (!input) { rl.prompt(); return }
+  // 处理输入行
+  // source: 'cli' 来自终端输入, 'telegram' 来自 Telegram
+  async function processInputLine(input, source = 'cli', tgChatId = null) {
+    const trimmed = input.trim()
+    if (!trimmed) { showPrompt(); return }
 
-    if (input.startsWith('/')) {
-      const [cmd, ...rest] = input.slice(1).split(' ')
+    if (trimmed.startsWith('/')) {
+      const [cmd, ...rest] = trimmed.slice(1).split(' ')
       switch (cmd) {
         case 'help':
           if (rest[0]) {
@@ -604,11 +610,18 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
         case 'models': {
           const apiBase = engine.config.apiBase
           const apiKey = engine.config.apiKey
-          if (!apiKey) { console.log('❌ API key not configured'); break }
+          // 自建本地服务（Ollama/llama.cpp/vLLM）无需 apiKey 也能拉取模型列表
+          const localServer = isLocalLlmServer(apiBase)
+          if (!apiKey && !localServer) { console.log('❌ API key not configured'); break }
           const modelsUrl = apiBase.replace(/\/+$/, '') + '/models'
           console.log(`📡 Fetching models from ${modelsUrl}...`)
           try {
-            const res = await fetch(modelsUrl, { headers: { 'Authorization': `Bearer ${apiKey}` } })
+            const res = await fetch(modelsUrl, {
+              headers: {
+                'Content-Type': 'application/json',
+                ...(apiKey ? { 'Authorization': `Bearer ${apiKey}` } : {}),
+              },
+            })
             if (!res.ok) { console.log(`❌ API error: ${res.status}`); break }
             const data = await res.json()
             const models = data.data || []
@@ -656,7 +669,6 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
           }
           const target = rest.join(' ')
           let sessionId = target
-          // 支持数字序号选择（从 /sessions 列表中）
           if (/^\d+$/.test(target)) {
             const idx = parseInt(target, 10) - 1
             const list = await sessionManager.list()
@@ -671,19 +683,16 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
             console.log(`❌ Session not found: ${sessionId}`)
             break
           }
-          // 恢复会话内容
           session.id = loaded.id
           session.title = loaded.title
           session.messages = loaded.messages
           session.state = loaded.state || {}
-          // 恢复引擎消息历史
           engine.state.messages = loaded.messages.map(m => ({
             role: m.role,
             content: m.content,
             toolCalls: m.toolCalls,
             toolCallId: m.toolCallId,
           }))
-          // 恢复计数和预算
           engine.state.turnCount = loaded.state?.turnCount || 0
           if (engine.tokenBudget && loaded.state?.budgetUsed != null) {
             engine.tokenBudget.used = loaded.state.budgetUsed
@@ -791,7 +800,7 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
         default:
           console.log(`Unknown command: /${cmd}. Type /help for available commands.`)
       }
-      rl.prompt()
+      showPrompt()
       return
     }
 
@@ -803,26 +812,179 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
       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) {
         console.log(engine.costTracker.formatShort())
       }
+      // 将 AI 回复同步发送到 Telegram（镜像 CLI 显示）
+      if (tgListener?.bot && result?.response) {
+        await sendTelegram(result.response, tgChatId || null)
+      }
     } catch (err) {
       console.error(`\nError: ${err.message}\n`)
+      if (tgListener?.bot) {
+        await sendTelegram(`❌ Error: ${err.message}`, tgChatId || null)
+      }
       if (channelManager.list().length > 0) {
         await channelManager.sendTemplate('error', {
           task: input.slice(0, 80), error: err.message.slice(0, 200),
         }).catch(() => {})
       }
     }
-    rl.prompt()
+    showPrompt()
+  }
+
+  // 发送文本到 Telegram（支持分片，>4000 字符自动拆分）
+  async function sendTelegram(text, chatId = null) {
+    try {
+      const target = chatId || tgChatId
+      if (!target) return
+      const MAX_LEN = 4000
+      if (text.length <= MAX_LEN) {
+        await tgListener.bot.sendMessage(target, text, { parseMode: 'HTML' })
+      } else {
+        const parts = []
+        let cur = ''
+        for (const line of text.split('\n')) {
+          if (cur.length + line.length > 3800) { parts.push(cur); cur = line }
+          else { cur += (cur ? '\n' : '') + line }
+        }
+        if (cur) parts.push(cur)
+        for (let i = 0; i < parts.length; i++) {
+          const header = i > 0 ? `📎 (${i + 1}/${parts.length})\n` : ''
+          await tgListener.bot.sendMessage(target, header + parts[i], { parseMode: 'HTML' })
+          await new Promise(r => setTimeout(r, 300))
+        }
+      }
+    } catch (e) {
+      console.error(`[TG] send failed: ${e.message}`)
+    }
+  }
+
+  // REPL 主循环 — 由 readline 原生处理回显、退格、行回绕与 Enter 提交
+  rl.on('line', (line) => {
+    processInputLine(line)
   })
 
-  rl.on('close', () => { console.log('\nGoodbye!'); process.exit(0) })
+  // 将 readline 注入引擎配置，用于 ask 模式确认和 AskUserQuestion 工具
+  if (permissionMode === 'ask') {
+    engine.config.onConfirmTool = async (toolName, input) => {
+      // 如果已经启用会话全局自动允许，直接通过
+      if (engine.permissionChecker.sessionAllowAll) return true
+
+      const snippet = JSON.stringify(input).slice(0, 120) || '(no params)'
+      return new Promise((resolve) => {
+        rl.question(`\n⚠️  Allow tool "${toolName}"?\n   Input: ${snippet}\n   (y/N/a) a=all session `, (answer) => {
+          const a = answer.toLowerCase()
+          if (a === 'a') {
+            engine.permissionChecker.allowAllForSession()
+            resolve(true)
+          } else {
+            resolve(a === 'y')
+          }
+        })
+      })
+    }
+  }
+  engine.config.readline = rl
+
+  // ============================================================
+  // Telegram 双向通道启动（可选）
+  // 配置了 CC_NODE_CHANNEL_TELEGRAM_TOKEN 或 config 中 telegram 时启用：
+  //  - CLI 的 AI 回复会同步镜像发送到 Telegram
+  //  - Telegram 消息会作为 REPL 输入，与 CLI 共享同一个引擎和对话记忆
+  // ============================================================
+  const tgToken = process.env.CC_NODE_CHANNEL_TELEGRAM_TOKEN || config.get('channels')?.telegram?.token || ''
+  if (tgToken) {
+    try {
+      tgListener = new TelegramListener({
+        channels: {
+          telegram: {
+            token: tgToken,
+            proxy: process.env.CC_NODE_CHANNEL_TELEGRAM_PROXY || config.get('channels')?.telegram?.proxy || '',
+            apiBase: process.env.CC_NODE_CHANNEL_TELEGRAM_API_BASE || config.get('channels')?.telegram?.apiBase || '',
+          },
+        },
+      })
+      tgListener.start(async (msg) => {
+        // Telegram 消息 → 复用 REPL 引擎处理（共享同一份对话记忆）
+        tgChatId = msg.chatId || tgChatId
+        tgReplyTarget = msg.replyTo || null
+        const text = msg.text || msg.callbackData || ''
+        if (!text) return
+        // 命令由 listener 内部处理，普通消息转给引擎
+        if (!text.startsWith('/')) {
+          await processInputLine(text, 'telegram', msg.chatId)
+        }
+      }).catch(e => console.error(`[TG] listener error: ${e.message}`))
+      console.log(`✅ Telegram channel ready (bot ${tgToken.slice(0, 12)}...)`)
+    } catch (e) {
+      console.error(`[TG] init failed: ${e.message}`)
+    }
+  }
+
+  // ============================================================
+  // --with-notify: 内置频道监听器（替代 cc-notify 守护进程）
+  // 当 cc-node 启动时同时启动 Telegram 监听器，
+  // 无需外部 bash 脚本，跨平台（Windows/Linux/macOS）都能用。
+  // ============================================================
+  if (cliArgs.withNotify) {
+    const { startBuiltinListeners } = await import('../channel/notify-daemon.js')
+    // 启动内部的 notify 监听器（不 fork 新进程，直接在当前进程运行）
+    const builtinNotify = await startBuiltinListeners({
+      channels: config.get('channels') || {},
+      defaultChannel: config.get('defaultChannel') || process.env.CC_NODE_CHANNEL_DEFAULT || null,
+      onMessage: async (msg) => {
+        // 来自外部的消息 → 转发到 REPL 引擎
+        const text = msg.text || ''
+        if (text && !text.startsWith('/')) {
+          await processInputLine(text, msg.channel || 'external', msg.chatId)
+        }
+      },
+    })
+    console.log('📡 Built-in channel listeners started (--with-notify)')
+  }
+
+  console.log(buildBanner({ model, permissionMode, session, maxTokens: tokenBudget.maxTokens }))
+  console.log(`Model: ${model} | Permission: ${permissionMode} | Tools: ${registry.getNames().join(', ')}`)
+  console.log(`Socket: ${SOCK_PATH} (cc-notify can connect)`)
+  if (channelManager.list().length > 0) {
+    const chList = channelManager.list().join(', ')
+    const def = channelManager.defaultChannel ? ` (default: ${channelManager.defaultChannel})` : ''
+    console.log(`Channels: ${chList}${def}`)
+  }
+  console.log()
+  // 显示初始提示符
+  showPrompt()
+
+  // REPL 消息处理包装（留作扩展点）
+  async function processInput(input) {
+    return engine.processMessage(input)
+  }
+}
+
+// ============================================================
+// 全局退出处理 — 回收 stdin 的 raw mode
+// ============================================================
+function cleanupStdin() {
+  try {
+    if (process.stdin.isTTY) process.stdin.setRawMode(false)
+    process.stdin.removeAllListeners('keypress')
+  } catch {}
 }
+
+process.on('SIGINT', () => {
+  cleanupStdin()
+  process.exit(0)
+})
+process.on('SIGTERM', () => {
+  cleanupStdin()
+  process.exit(0)
+})
+process.on('exit', () => {
+  cleanupStdin()
+})

package/src/core/index.js

@@ -1,3 +1,5 @@
+export { UserMessage, AssistantMessage, ToolCall } from "../types/index.js"
+
 /**
  * 核心模块统一导出
  */

package/src/core/query-engine.js

@@ -17,6 +17,7 @@ import { parseStream, parseNonStreamResponse } from './streaming.js'
 import { autoCompact } from './compact.js'
 import { CostTracker } from './cost-tracker.js'
 import { EnhancedPermissionChecker } from '../security/enhanced-permission.js'
+import { isLocalLlmServer, buildAuthHeaders } from '../utils/index.js'
 
 /**
  * 配置选项
@@ -44,6 +45,7 @@ export class QueryEngineConfig {
     this.initialMessages = options.initialMessages || []
     this.onConfirmTool = options.onConfirmTool || null  // ask 模式确认回调
     this.readline = options.readline || null              // 用于 AskUserQuestion 工具
+    this.onDelta = options.onDelta || null                // 流式增量回调 {type:'text'|'reasoning', text}（供 VS Code 扩展等 UI 消费）
   }
 }
 
@@ -65,15 +67,17 @@ export class QueryEngine {
 
   /**
    * 主入口 — 处理用户消息
+   * @param {string} userInput 文本
+   * @param {string[]} [images] 图片 URL（data URL / http），视觉模型用
    */
-  async processMessage(userInput) {
+  async processMessage(userInput, images = []) {
     if (this.state.isRunning) {
       throw new Error('引擎正在运行中，请等待当前回合完成')
     }
     this.state.isRunning = true
     this.state.turnCount++
     this.abortController = new AbortController()
-    const userMsg = new UserMessage(userInput)
+    const userMsg = new UserMessage(userInput, images)
     this.state.messages.push(userMsg)
 
     // M3: 自动上下文压缩
@@ -165,7 +169,7 @@ export class QueryEngine {
       if (msg.role === 'system') {
         request.push({ role: 'system', content: msg.content })
       } else if (msg.role === 'user') {
-        request.push({ role: 'user', content: this._formatContent(msg.content) })
+        request.push({ role: 'user', content: this._buildUserContent(msg) })
       } else if (msg.role === 'assistant') {
         // 构建 assistant 消息基础
         const asstMsg = {
@@ -265,7 +269,9 @@ export class QueryEngine {
     const apiKey = this.config.apiKey
     const apiBase = this.config.apiBase
 
-    if (!apiKey) {
+    // apiBase 指向自建本地服务（Ollama / llama.cpp / vLLM 等）时，允许缺省 apiKey
+    const isLocalServer = isLocalLlmServer(apiBase)
+    if (!isLocalServer && !apiKey) {
       throw new Error(
         `未设置 API Key。请设置以下环境变量之一:\n` +
         `  LLM_API_KEY=xxx (通用，推荐)\n` +
@@ -331,7 +337,7 @@ export class QueryEngine {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
-            'Authorization': `Bearer ${apiKey}`,
+            ...buildAuthHeaders(apiBase, apiKey),
           },
           body: JSON.stringify(body),
           signal: this.abortController?.signal,
@@ -399,9 +405,18 @@ export class QueryEngine {
     try {
       for await (const event of parseStream(response)) {
         if (event.type === 'text') {
-          // 实时输出到终端
-          process.stdout.write(event.text)
+          // 实时输出（有 onDelta 回调时交给调用方，如 VS Code 扩展；否则写终端）
+          if (typeof this.config.onDelta === 'function') {
+            this.config.onDelta({ type: 'text', text: event.text })
+          } else {
+            process.stdout.write(event.text)
+          }
           currentText += event.text
+        } else if (event.type === 'reasoning') {
+          // 推理内容（thinking）同样支持回调
+          if (typeof this.config.onDelta === 'function') {
+            this.config.onDelta({ type: 'reasoning', text: event.text })
+          }
         } else if (event.type === 'tool_use') {
           // 收集工具调用
           result.toolCalls.push(new ToolCall(
@@ -425,8 +440,8 @@ export class QueryEngine {
       }
     }
 
-    // 流式输出后换行
-    if (currentText) process.stdout.write('\n')
+    // 流式输出后换行（仅终端直写模式；onDelta 回调模式由调用方处理，避免污染协议流）
+    if (currentText && typeof this.config.onDelta !== 'function') process.stdout.write('\n')
 
     return result
   }
@@ -439,6 +454,22 @@ export class QueryEngine {
     return String(content)
   }
 
+  /**
+   * 构建用户消息 content（支持多模态：文本 + 图片）
+   * 有 images 时输出 OpenAI 兼容 content 数组；否则纯文本（向后兼容）
+   */
+  _buildUserContent(msg) {
+    const text = this._formatContent(msg.content)
+    const images = msg.images && msg.images.length ? msg.images : []
+    if (images.length === 0) return text
+    const parts = []
+    if (text) parts.push({ type: 'text', text })
+    for (const url of images) {
+      parts.push({ type: 'image_url', image_url: { url } })
+    }
+    return parts
+  }
+
   /** 取消当前运行 */
   abort() {
     this.abortController?.abort()