claude-coder 1.7.0 → 1.8.0

package/src/{indicator.js → common/indicator.js}

@@ -1,217 +1,222 @@
-'use strict';
-
-const { COLOR } = require('./config');
-
-const SPINNERS = ['⠋', '⠙', '⠸', '⠴', '⠦', '⠇'];
-
-/**
- * 中间截断字符串，保留首尾
- */
-function truncateMiddle(str, maxLen) {
-  if (str.length <= maxLen) return str;
-  const startLen = Math.ceil((maxLen - 1) / 2);
-  const endLen = Math.floor((maxLen - 1) / 2);
-  return str.slice(0, startLen) + '…' + str.slice(-endLen);
-}
-
-/**
- * 路径感知截断：优先保留文件名，截断目录中间
- */
-function truncatePath(path, maxLen) {
-  if (path.length <= maxLen) return path;
-
-  const lastSlash = path.lastIndexOf('/');
-  if (lastSlash === -1) {
-    // 无路径分隔符，普通中间截断
-    return truncateMiddle(path, maxLen);
-  }
-
-  const fileName = path.slice(lastSlash + 1);
-  const dirPath = path.slice(0, lastSlash);
-
-  // 文件名本身超长，截断文件名
-  if (fileName.length >= maxLen - 2) {
-    return truncateMiddle(path, maxLen);
-  }
-
-  // 保留文件名，截断目录
-  const availableForDir = maxLen - fileName.length - 2; // -2 for '…/'
-  if (availableForDir <= 0) {
-    return '…/' + fileName.slice(0, maxLen - 2);
-  }
-
-  // 目录两端保留
-  const dirStart = Math.ceil(availableForDir / 2);
-  const dirEnd = Math.floor(availableForDir / 2);
-  const truncatedDir = dirPath.slice(0, dirStart) + '…' + (dirEnd > 0 ? dirPath.slice(-dirEnd) : '');
-
-  return truncatedDir + '/' + fileName;
-}
-
-class Indicator {
-  constructor() {
-    this.phase = 'thinking';
-    this.step = '';
-    this.toolTarget = '';
-    this.spinnerIndex = 0;
-    this.timer = null;
-    this.lastActivity = '';
-    this.lastToolTime = Date.now();
-    this.sessionNum = 0;
-    this.startTime = Date.now();
-    this.stallTimeoutMin = 30;
-  }
-
-  start(sessionNum, stallTimeoutMin) {
-    this.sessionNum = sessionNum;
-    this.startTime = Date.now();
-    if (stallTimeoutMin > 0) this.stallTimeoutMin = stallTimeoutMin;
-    this.timer = setInterval(() => this._render(), 1000);
-  }
-
-  stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
-    }
-    process.stderr.write('\r\x1b[K');
-  }
-
-  updatePhase(phase) {
-    this.phase = phase;
-  }
-
-  updateStep(step) {
-    this.step = step;
-  }
-
-  appendActivity(toolName, summary) {
-    this.lastActivity = `${toolName}: ${summary}`;
-  }
-
-  getStatusLine() {
-    const now = new Date();
-    const hh = String(now.getHours()).padStart(2, '0');
-    const mi = String(now.getMinutes()).padStart(2, '0');
-    const sc = String(now.getSeconds()).padStart(2, '0');
-    const clock = `${hh}:${mi}:${sc}`;
-
-    const elapsed = Math.floor((Date.now() - this.startTime) / 1000);
-    const mm = String(Math.floor(elapsed / 60)).padStart(2, '0');
-    const ss = String(elapsed % 60).padStart(2, '0');
-    const spinner = SPINNERS[this.spinnerIndex % SPINNERS.length];
-
-    const phaseLabel = this.phase === 'thinking'
-      ? `${COLOR.yellow}思考中${COLOR.reset}`
-      : `${COLOR.green}编码中${COLOR.reset}`;
-
-    const idleMs = Date.now() - this.lastToolTime;
-    const idleMin = Math.floor(idleMs / 60000);
-
-    let line = `${spinner} [Session ${this.sessionNum}] ${clock} ${phaseLabel} ${mm}:${ss}`;
-    if (idleMin >= 2) {
-      line += ` | ${COLOR.red}${idleMin}分无工具调用（等待模型响应, ${this.stallTimeoutMin}分钟超时自动中断）${COLOR.reset}`;
-    }
-    if (this.step) {
-      line += ` | ${this.step}`;
-      if (this.toolTarget) {
-        // 动态获取终端宽度，默认 120 适配现代终端
-        const cols = process.stderr.columns || 120;
-        const usedWidth = line.replace(/\x1b\[[^m]*m/g, '').length;
-        const availWidth = Math.max(20, cols - usedWidth - 4);
-        const target = truncatePath(this.toolTarget, availWidth);
-        line += `: ${target}`;
-      }
-    }
-    return line;
-  }
-
-  _render() {
-    this.spinnerIndex++;
-    process.stderr.write(`\r\x1b[K${this.getStatusLine()}`);
-  }
-}
-
-function extractFileTarget(toolInput) {
-  const raw = typeof toolInput === 'object'
-    ? (toolInput.file_path || toolInput.path || '')
-    : '';
-  if (!raw) return '';
-  return raw.split('/').slice(-2).join('/');
-}
-
-function extractBashLabel(cmd) {
-  if (cmd.includes('git ')) return 'Git 操作';
-  if (cmd.includes('npm ') || cmd.includes('pip ') || cmd.includes('pnpm ') || cmd.includes('yarn ')) return '安装依赖';
-  if (cmd.includes('curl') || cmd.includes('pytest') || cmd.includes('jest') || /\btest\b/.test(cmd)) return '测试验证';
-  if (cmd.includes('python ') || cmd.includes('node ')) return '执行脚本';
-  return '执行命令';
-}
-
-/**
- * 提取 Bash 命令的主体部分（移除管道、重定向等）
- * 正确处理引号内的内容，不会错误分割引号内的分隔符
- */
-function extractBashTarget(cmd) {
-  // 移除开头的 cd xxx && 部分
-  let clean = cmd.replace(/^(?:cd\s+\S+\s*&&\s*)+/g, '').trim();
-
-  // 临时替换引号内的分隔符为占位符
-  const unescape = (s) => s.replace(/\x00/g, ';');
-  clean = clean.replace(/"[^"]*"/g, m => m.replace(/[;|&]/g, '\x00'));
-  clean = clean.replace(/'[^']*'/g, m => m.replace(/[;|&]/g, '\x00'));
-
-  // 分割并取第一部分
-  clean = clean.split(/\s*(?:\|\|?|;|&&|2>&1|2>\/dev\/null|>\s*\/dev\/null)\s*/)[0];
-
-  // 还原占位符
-  return unescape(clean).trim();
-}
-
-function inferPhaseStep(indicator, toolName, toolInput) {
-  const name = (toolName || '').toLowerCase();
-
-  indicator.lastToolTime = Date.now();
-
-  if (name === 'write' || name === 'edit' || name === 'multiedit' || name === 'str_replace_editor' || name === 'strreplace') {
-    indicator.updatePhase('coding');
-    indicator.updateStep('编辑文件');
-    indicator.toolTarget = extractFileTarget(toolInput);
-  } else if (name === 'bash' || name === 'shell') {
-    const cmd = typeof toolInput === 'object' ? (toolInput.command || '') : String(toolInput || '');
-    const label = extractBashLabel(cmd);
-    indicator.updateStep(label);
-    indicator.toolTarget = extractBashTarget(cmd);
-    if (label === '测试验证' || label === '执行脚本' || label === '执行命令') {
-      indicator.updatePhase('coding');
-    }
-  } else if (name === 'read' || name === 'glob' || name === 'grep' || name === 'ls') {
-    indicator.updatePhase('thinking');
-    indicator.updateStep('读取文件');
-    indicator.toolTarget = extractFileTarget(toolInput);
-  } else if (name === 'task') {
-    indicator.updatePhase('thinking');
-    indicator.updateStep('子 Agent 搜索');
-    indicator.toolTarget = '';
-  } else if (name === 'websearch' || name === 'webfetch') {
-    indicator.updatePhase('thinking');
-    indicator.updateStep('查阅文档');
-    indicator.toolTarget = '';
-  } else {
-    indicator.updateStep('工具调用');
-    indicator.toolTarget = '';
-  }
-
-  let summary;
-  if (typeof toolInput === 'object') {
-    const target = toolInput.file_path || toolInput.path || '';
-    const cmd = toolInput.command || '';
-    const pattern = toolInput.pattern || '';
-    summary = target || (cmd ? cmd.slice(0, 200) : '') || (pattern ? `pattern: ${pattern}` : JSON.stringify(toolInput).slice(0, 200));
-  } else {
-    summary = String(toolInput || '').slice(0, 200);
-  }
-  indicator.appendActivity(toolName, summary);
-}
-
-module.exports = { Indicator, inferPhaseStep };
+'use strict';
+
+const { COLOR } = require('./config');
+const { localTimestamp, truncatePath } = require('./utils');
+
+const SPINNERS = ['⠋', '⠙', '⠸', '⠴', '⠦', '⠇'];
+
+class Indicator {
+  constructor() {
+    this.phase = 'thinking';
+    this.step = '';
+    this.toolTarget = '';
+    this.spinnerIndex = 0;
+    this.timer = null;
+    this.lastActivity = '';
+    this.lastToolTime = Date.now();
+    this.lastActivityTime = Date.now();
+    this.sessionNum = 0;
+    this.startTime = Date.now();
+    this.stallTimeoutMin = 30;
+    this.completionTimeoutMin = null;
+    this.toolRunning = false;
+    this.toolStartTime = 0;
+    this.currentToolName = '';
+    this._paused = false;
+  }
+
+  start(sessionNum, stallTimeoutMin) {
+    this.sessionNum = sessionNum;
+    this.startTime = Date.now();
+    this.lastActivityTime = Date.now();
+    if (stallTimeoutMin > 0) this.stallTimeoutMin = stallTimeoutMin;
+    this.timer = setInterval(() => this._render(), 1000);
+  }
+
+  stop() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    process.stderr.write('\r\x1b[K');
+  }
+
+  updatePhase(phase) {
+    this.phase = phase;
+  }
+
+  updateStep(step) {
+    this.step = step;
+  }
+
+  appendActivity(toolName, summary) {
+    this.lastActivity = `${toolName}: ${summary}`;
+  }
+
+  setCompletionDetected(timeoutMin) {
+    this.completionTimeoutMin = timeoutMin;
+  }
+
+  updateActivity() {
+    this.lastActivityTime = Date.now();
+  }
+
+  startTool(name) {
+    this.toolRunning = true;
+    this.toolStartTime = Date.now();
+    this.currentToolName = name;
+    this.lastActivityTime = Date.now();
+  }
+
+  endTool() {
+    if (!this.toolRunning) return;
+    this.toolRunning = false;
+    this.lastActivityTime = Date.now();
+  }
+
+  pauseRendering() { this._paused = true; }
+  resumeRendering() { this._paused = false; }
+
+  getStatusLine() {
+    const clock = localTimestamp();
+    const elapsed = Math.floor((Date.now() - this.startTime) / 1000);
+    const mm = String(Math.floor(elapsed / 60)).padStart(2, '0');
+    const ss = String(elapsed % 60).padStart(2, '0');
+    const spinner = SPINNERS[this.spinnerIndex % SPINNERS.length];
+
+    const phaseLabel = this.phase === 'thinking'
+      ? `${COLOR.yellow}思考中${COLOR.reset}`
+      : `${COLOR.green}编码中${COLOR.reset}`;
+
+    const idleMs = Date.now() - this.lastActivityTime;
+    const idleMin = Math.floor(idleMs / 60000);
+
+    let line = `${spinner} [Session ${this.sessionNum}] ${clock} ${phaseLabel} ${mm}:${ss}`;
+    if (idleMin >= 2) {
+      if (this.toolRunning) {
+        const toolSec = Math.floor((Date.now() - this.toolStartTime) / 1000);
+        const toolMm = Math.floor(toolSec / 60);
+        const toolSs = toolSec % 60;
+        line += ` | ${COLOR.yellow}工具执行中 ${toolMm}:${String(toolSs).padStart(2, '0')}${COLOR.reset}`;
+      } else if (this.completionTimeoutMin) {
+        line += ` | ${COLOR.red}${idleMin}分无响应（session_result 已写入, ${this.completionTimeoutMin}分钟超时自动中断）${COLOR.reset}`;
+      } else {
+        line += ` | ${COLOR.red}${idleMin}分无响应（等待模型响应, ${this.stallTimeoutMin}分钟超时自动中断）${COLOR.reset}`;
+      }
+    }
+    if (this.step) {
+      line += ` | ${this.step}`;
+      if (this.toolTarget) {
+        // 动态获取终端宽度，默认 120 适配现代终端
+        const cols = process.stderr.columns || 120;
+        const usedWidth = line.replace(/\x1b\[[^m]*m/g, '').length;
+        const availWidth = Math.max(20, cols - usedWidth - 4);
+        const target = truncatePath(this.toolTarget, availWidth);
+        line += `: ${target}`;
+      }
+    }
+    return line;
+  }
+
+  _render() {
+    if (this._paused) return;
+    this.spinnerIndex++;
+    process.stderr.write(`\r\x1b[K${this.getStatusLine()}`);
+  }
+}
+
+function extractFileTarget(toolInput) {
+  const raw = typeof toolInput === 'object'
+    ? (toolInput.file_path || toolInput.path || '')
+    : '';
+  if (!raw) return '';
+  return raw.split('/').slice(-2).join('/');
+}
+
+function extractBashLabel(cmd) {
+  if (cmd.includes('git ')) return 'Git 操作';
+  if (cmd.includes('npm ') || cmd.includes('pip ') || cmd.includes('pnpm ') || cmd.includes('yarn ')) return '安装依赖';
+  if (/\b(sleep|Start-Sleep|timeout\s+\/t)\b/i.test(cmd)) return '等待就绪';
+  if (cmd.includes('curl')) return '网络请求';
+  if (cmd.includes('pytest') || cmd.includes('jest') || /\btest\b/.test(cmd)) return '测试验证';
+  if (cmd.includes('python ') || cmd.includes('node ')) return '执行脚本';
+  return '执行命令';
+}
+
+function extractMcpTarget(toolInput) {
+  if (!toolInput || typeof toolInput !== 'object') return '';
+  return String(toolInput.url || toolInput.text || toolInput.element || '').slice(0, 60);
+}
+
+/**
+ * 提取 Bash 命令的主体部分（移除管道、重定向等）
+ * 正确处理引号内的内容，不会错误分割引号内的分隔符
+ */
+function extractBashTarget(cmd) {
+  // 移除开头的 cd xxx && 部分
+  let clean = cmd.replace(/^(?:cd\s+\S+\s*&&\s*)+/g, '').trim();
+
+  // 临时替换引号内的分隔符为占位符
+  const unescape = (s) => s.replace(/\x00/g, ';');
+  clean = clean.replace(/"[^"]*"/g, m => m.replace(/[;|&]/g, '\x00'));
+  clean = clean.replace(/'[^']*'/g, m => m.replace(/[;|&]/g, '\x00'));
+
+  // 分割并取第一部分
+  clean = clean.split(/\s*(?:\|\|?|;|&&|2>&1|2>\/dev\/null|>\s*\/dev\/null)\s*/)[0];
+
+  // 还原占位符
+  return unescape(clean).trim();
+}
+
+function inferPhaseStep(indicator, toolName, toolInput) {
+  const name = (toolName || '').toLowerCase();
+
+  indicator.startTool(toolName);
+
+  if (name === 'write' || name === 'edit' || name === 'multiedit' || name === 'str_replace_editor' || name === 'strreplace') {
+    indicator.updatePhase('coding');
+    indicator.updateStep('编辑文件');
+    indicator.toolTarget = extractFileTarget(toolInput);
+  } else if (name === 'bash' || name === 'shell') {
+    const cmd = typeof toolInput === 'object' ? (toolInput.command || '') : String(toolInput || '');
+    const label = extractBashLabel(cmd);
+    indicator.updateStep(label);
+    indicator.toolTarget = extractBashTarget(cmd);
+    if (label === '测试验证' || label === '执行脚本' || label === '执行命令') {
+      indicator.updatePhase('coding');
+    }
+  } else if (name === 'read' || name === 'glob' || name === 'grep' || name === 'ls') {
+    indicator.updatePhase('thinking');
+    indicator.updateStep('读取文件');
+    indicator.toolTarget = extractFileTarget(toolInput);
+  } else if (name === 'task') {
+    indicator.updatePhase('thinking');
+    indicator.updateStep('子 Agent 搜索');
+    indicator.toolTarget = '';
+  } else if (name === 'websearch' || name === 'webfetch') {
+    indicator.updatePhase('thinking');
+    indicator.updateStep('查阅文档');
+    indicator.toolTarget = '';
+  } else if (name.startsWith('mcp__')) {
+    indicator.updatePhase('coding');
+    const action = name.split('__').pop() || name;
+    indicator.updateStep(`浏览器: ${action}`);
+    indicator.toolTarget = extractMcpTarget(toolInput);
+  } else {
+    indicator.updateStep('工具调用');
+    indicator.toolTarget = '';
+  }
+
+  let summary;
+  if (typeof toolInput === 'object') {
+    const target = toolInput.file_path || toolInput.path || '';
+    const cmd = toolInput.command || '';
+    const pattern = toolInput.pattern || '';
+    summary = target || (cmd ? cmd.slice(0, 200) : '') || (pattern ? `pattern: ${pattern}` : JSON.stringify(toolInput).slice(0, 200));
+  } else {
+    summary = String(toolInput || '').slice(0, 200);
+  }
+  indicator.appendActivity(toolName, summary);
+}
+
+module.exports = { Indicator, inferPhaseStep };

package/src/common/interaction.js

@@ -0,0 +1,170 @@
+'use strict';
+
+const readline = require('readline');
+const { COLOR } = require('./config');
+
+/**
+ * 在终端渲染一个结构化问题并收集用户选择
+ *
+ * @param {object} question - AskUserQuestion 格式的单个问题
+ * @param {string} question.question - 问题文本
+ * @param {string} question.header - 短标签
+ * @param {Array}  question.options - 选项列表 [{ label, description }]
+ * @param {boolean} question.multiSelect - 是否多选
+ * @returns {Promise<string>} 用户选择的文本
+ */
+async function renderQuestion(question) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stderr,
+    terminal: process.stdin.isTTY || false,
+  });
+
+  return new Promise(resolve => {
+    const w = (s) => process.stderr.write(s);
+
+    w(`\n${COLOR.cyan}┌─ ${question.header || '问题'} ${'─'.repeat(Math.max(0, 40 - (question.header || '').length))}${COLOR.reset}\n`);
+    w(`${COLOR.cyan}│${COLOR.reset} ${COLOR.bold}${question.question}${COLOR.reset}\n`);
+    w(`${COLOR.cyan}│${COLOR.reset}\n`);
+
+    const options = question.options || [];
+    options.forEach((opt, i) => {
+      w(`${COLOR.cyan}│${COLOR.reset}  ${COLOR.yellow}${i + 1}.${COLOR.reset} ${opt.label}\n`);
+      if (opt.description) {
+        w(`${COLOR.cyan}│${COLOR.reset}     ${COLOR.dim}${opt.description}${COLOR.reset}\n`);
+      }
+    });
+
+    w(`${COLOR.cyan}│${COLOR.reset}  ${COLOR.yellow}0.${COLOR.reset} ${COLOR.dim}其他 (自定义输入)${COLOR.reset}\n`);
+
+    if (question.multiSelect) {
+      w(`${COLOR.cyan}│${COLOR.reset}\n`);
+      w(`${COLOR.cyan}│${COLOR.reset}  ${COLOR.dim}(多选: 用逗号分隔数字, 如 1,3)${COLOR.reset}\n`);
+    }
+
+    w(`${COLOR.cyan}└${'─'.repeat(44)}${COLOR.reset}\n`);
+
+    rl.question(`  ${COLOR.green}>${COLOR.reset} `, answer => {
+      rl.close();
+
+      const trimmed = answer.trim();
+      if (!trimmed) {
+        resolve(options[0]?.label || '');
+        return;
+      }
+
+      if (trimmed === '0') {
+        const rl2 = readline.createInterface({
+          input: process.stdin,
+          output: process.stderr,
+          terminal: process.stdin.isTTY || false,
+        });
+        rl2.question(`  ${COLOR.cyan}请输入你的想法:${COLOR.reset} `, customAnswer => {
+          rl2.close();
+          resolve(customAnswer.trim() || options[0]?.label || '');
+        });
+        return;
+      }
+
+      const nums = trimmed.split(/[,，\s]+/)
+        .map(n => parseInt(n, 10))
+        .filter(n => !isNaN(n) && n >= 1 && n <= options.length);
+
+      if (nums.length > 0) {
+        const selected = nums.map(n => options[n - 1].label);
+        resolve(question.multiSelect ? selected.join(', ') : selected[0]);
+      } else {
+        resolve(trimmed);
+      }
+    });
+  });
+}
+
+/**
+ * 处理完整的 AskUserQuestion 工具调用
+ * 逐个渲染问题，收集所有答案
+ *
+ * @param {object} toolInput - AskUserQuestion 的 tool_input
+ * @param {Array}  toolInput.questions - 问题列表
+ * @returns {Promise<object>} { answers: { [question]: answer }, formatted: string }
+ */
+async function handleUserQuestions(toolInput) {
+  const questions = toolInput.questions || [];
+  if (questions.length === 0) {
+    return { answers: {}, formatted: '(no questions)' };
+  }
+
+  process.stderr.write(`\n${COLOR.magenta}╔══ 模型需要你的输入 ══════════════════════╗${COLOR.reset}\n`);
+  process.stderr.write(`${COLOR.magenta}║${COLOR.reset}  以下是模型提出的问题，请逐一回答      ${COLOR.magenta}║${COLOR.reset}\n`);
+  process.stderr.write(`${COLOR.magenta}╚══════════════════════════════════════════╝${COLOR.reset}\n`);
+
+  const answers = {};
+  for (const q of questions) {
+    const answer = await renderQuestion(q);
+    answers[q.question] = answer;
+  }
+
+  const lines = Object.entries(answers)
+    .map(([q, a]) => `Q: ${q}\nA: ${a}`)
+    .join('\n\n');
+
+  process.stderr.write(`\n${COLOR.green}✓ 已收集回答:${COLOR.reset}\n`);
+  for (const [q, a] of Object.entries(answers)) {
+    const shortQ = q.length > 50 ? q.slice(0, 50) + '...' : q;
+    process.stderr.write(`  ${COLOR.dim}${shortQ}${COLOR.reset} → ${COLOR.bold}${a}${COLOR.reset}\n`);
+  }
+  process.stderr.write('\n');
+
+  return { answers, formatted: lines };
+}
+
+/**
+ * 创建 AskUserQuestion 的 PreToolUse Hook 处理函数
+ *
+ * 工作原理：
+ * 1. 拦截模型的 AskUserQuestion 调用
+ * 2. 通过 readline 在终端展示问题
+ * 3. 收集用户答案
+ * 4. deny 工具调用，同时通过 systemMessage 将答案注入上下文
+ *
+ * @returns {Function} PreToolUse hook handler
+ */
+function createAskUserQuestionHook(indicator) {
+  return async (input, _toolUseID, _context) => {
+    if (input.tool_name !== 'AskUserQuestion') return {};
+
+    if (indicator) {
+      indicator.pauseRendering();
+      process.stderr.write('\r\x1b[K');
+    }
+
+    let formatted;
+    try {
+      ({ formatted } = await handleUserQuestions(input.tool_input));
+    } finally {
+      if (indicator) indicator.resumeRendering();
+    }
+
+    return {
+      systemMessage: [
+        'The user has answered your questions via the terminal interface.',
+        'Here are their responses:',
+        '',
+        formatted,
+        '',
+        'Proceed based on these answers. Do NOT ask the same questions again.',
+      ].join('\n'),
+      hookSpecificOutput: {
+        hookEventName: 'PreToolUse',
+        permissionDecision: 'deny',
+        permissionDecisionReason: `User answered via terminal. Answers:\n${formatted}`,
+      },
+    };
+  };
+}
+
+module.exports = {
+  renderQuestion,
+  handleUserQuestions,
+  createAskUserQuestionHook,
+};