@raolin2025/claude-code-node 2.6.8 → 2.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raolin2025/claude-code-node",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Node.js AI Code Agent CLI - Zero dependencies, pure JavaScript, security hardened, multi-channel notifications, Telegram & QQ Bot remote programming, rich media upload, multi-account management",
   "type": "module",
   "main": "src/core/index.js",

package/src/channel/tg-listener.js

@@ -419,8 +419,11 @@ export class TelegramListener {
       if (reply) {
         // 如果回复很长，分多条发送
         await this._sendLongMessage(chatId, reply, { replyTo: msg.message_id })
+        return
       }
-      return
+      // _handleCommand 返回 null = 未知命令（如 /stop、/resume 等）
+      // 需要转发给 cc-node 的 processInputLine 处理，不能吞掉。
+      // 落到下方普通消息分支继续转发。
     }
 
     // 处理普通消息 — 转发给 cc-node

package/src/core/cli.js

@@ -281,6 +281,7 @@ Commands:
   /session       — Show session info
   /sessions      — List all sessions
   /clear         — Clear conversation
+  /stop          — Stop current AI work (when stuck/long)
   /config KEY    — Show config value
   /budget        — Show token budget
   /channel CMD   — Manage notification channels (list|send|test)
@@ -315,6 +316,8 @@ const DETAILED_HELP = {
 
   clear:  "/clear\n  Clear the current conversation context.\n  Starts a fresh session. Previous messages are not sent to the API anymore.\n\n  Note: Does not delete saved sessions.",
 
+  stop:  "/stop\n  Stop the currently running AI work.\n  Use when the AI appears stuck or takes too long to respond.\n  Sends an abort signal to interrupt the current task.\n  After stopping, you can issue a new command.",
+
   config:  "/config [key]\n  Without key: show the entire config as JSON.\n  With a key path: show the value for that specific path.\n\n  Example: /config\n  Example: /config model",
 
   budget:  "/budget\n  Show token budget usage for the current session.\n  Displays how many tokens have been used vs the limit.",
@@ -750,6 +753,15 @@ const systemPrompt = cliArgs.systemPrompt || DEFAULT_SYSTEM_PROMPT
           session = await sessionManager.create()
           console.log('Conversation cleared')
           break
+        case 'stop':
+          // 停止当前正在运行的 AI 工作（如卡死 / 长时间无响应时）
+          if (engine.state.isRunning) {
+            engine.abort()
+            console.log('⏹️  已发送停止信号，正在中止当前工作...')
+          } else {
+            console.log('（当前没有正在运行的任务）')
+          }
+          break
         case 'config':
           if (rest[0]) {
             const val = config.get(rest.join(' '))

package/src/tools/bash.js

@@ -3,6 +3,7 @@
  * 对应原版: src/tools/BashTool/
  */
 import { spawn } from 'child_process'
+import { existsSync } from 'node:fs'
 import { ToolDef } from '../types/index.js'
 import { checkBashSafety } from '../security/bash-guard.js'
 
@@ -51,8 +52,35 @@ Usage:
     }
 
     return new Promise((resolve, reject) => {
-      const shell = process.env.SHELL || '/bin/bash'
-      const proc = spawn(shell, ['-c', command], {
+      // 跨平台 shell 选择：
+      // - Windows: 优先用 Git Bash（如已安装），否则用 cmd.exe /c
+      // - 其他平台: 用 SHELL 环境变量或默认 /bin/bash
+      const isWindows = process.platform === 'win32'
+      let shell, shellArgs
+      if (isWindows) {
+        // 检测 Git Bash 是否可用
+        const gitBashCandidates = [
+          process.env.GIT_BASH,
+          'C:\\Program Files\\Git\\bin\\bash.exe',
+          'C:\\Program Files (x86)\\Git\\bin\\bash.exe',
+        ].filter(Boolean)
+        let gitBash = null
+        try {
+          gitBash = gitBashCandidates.find((p) => existsSync(p)) || null
+        } catch {}
+        if (gitBash) {
+          shell = gitBash
+          shellArgs = ['-c', command]
+        } else {
+          // 无 Git Bash → 用 cmd.exe
+          shell = process.env.ComSpec || 'cmd.exe'
+          shellArgs = ['/c', command]
+        }
+      } else {
+        shell = process.env.SHELL || '/bin/bash'
+        shellArgs = ['-c', command]
+      }
+      const proc = spawn(shell, shellArgs, {
         cwd,
         env: { ...process.env, ...extraEnv },
         stdio: ['pipe', 'pipe', 'pipe'],