claude-coder 1.9.0 → 1.9.2

package/src/common/interaction.js

@@ -1,170 +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,
-};
+'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,
+};

package/src/common/logging.js

@@ -1,78 +1,78 @@
-'use strict';
-
-const { localTimestamp } = require('./utils');
-
-/**
- * 处理 SDK 消息并写入日志流
- * @param {object} message - SDK 消息对象
- * @param {import('fs').WriteStream} logStream - 日志写入流
- * @param {object} indicator - Indicator 实例（可选）
- */
-function logMessage(message, logStream, indicator) {
-  if (message.type === 'assistant' && message.message?.content) {
-    for (const block of message.message.content) {
-      if (block.type === 'text' && block.text) {
-        if (indicator) indicator.updateActivity();
-        process.stdout.write(block.text);
-        if (logStream) logStream.write(block.text);
-      }
-      if (block.type === 'tool_use' && logStream) {
-        logStream.write(`[TOOL_USE] ${block.name}: ${JSON.stringify(block.input).slice(0, 300)}\n`);
-      }
-    }
-  }
-
-  if (message.type === 'tool_result') {
-    if (indicator) indicator.updateActivity();
-    if (logStream) {
-      const isErr = message.is_error || false;
-      const content = typeof message.content === 'string'
-        ? message.content.slice(0, 500)
-        : JSON.stringify(message.content).slice(0, 500);
-      if (isErr) {
-        logStream.write(`[TOOL_ERROR] ${content}\n`);
-      }
-    }
-  }
-}
-
-/**
- * 从消息列表中提取结果消息
- * @param {Array} messages - 消息列表
- * @returns {object|null} 结果消息
- */
-function extractResult(messages) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    if (messages[i].type === 'result') return messages[i];
-  }
-  return null;
-}
-
-/**
- * 从消息列表中提取结果文本
- * @param {Array} messages - 消息列表
- * @returns {string} 结果文本
- */
-function extractResultText(messages) {
-  const result = extractResult(messages);
-  return result?.result || '';
-}
-
-/**
- * 写入 session 分隔符到日志
- * @param {import('fs').WriteStream} logStream - 日志写入流
- * @param {number} sessionNum - session 编号
- * @param {string} label - 标签
- */
-function writeSessionSeparator(logStream, sessionNum, label) {
-  const sep = '='.repeat(60);
-  logStream.write(`\n${sep}\n[Session ${sessionNum}] ${label} ${localTimestamp()}\n${sep}\n`);
-}
-
-module.exports = {
-  logMessage,
-  localTimestamp,
-  extractResult,
-  extractResultText,
-  writeSessionSeparator,
+'use strict';
+
+const { localTimestamp } = require('./utils');
+
+/**
+ * 处理 SDK 消息并写入日志流
+ * @param {object} message - SDK 消息对象
+ * @param {import('fs').WriteStream} logStream - 日志写入流
+ * @param {object} indicator - Indicator 实例（可选）
+ */
+function logMessage(message, logStream, indicator) {
+  if (message.type === 'assistant' && message.message?.content) {
+    for (const block of message.message.content) {
+      if (block.type === 'text' && block.text) {
+        if (indicator) indicator.updateActivity();
+        process.stdout.write(block.text);
+        if (logStream) logStream.write(block.text);
+      }
+      if (block.type === 'tool_use' && logStream) {
+        logStream.write(`[TOOL_USE] ${block.name}: ${JSON.stringify(block.input).slice(0, 300)}\n`);
+      }
+    }
+  }
+
+  if (message.type === 'tool_result') {
+    if (indicator) indicator.updateActivity();
+    if (logStream) {
+      const isErr = message.is_error || false;
+      const content = typeof message.content === 'string'
+        ? message.content.slice(0, 500)
+        : JSON.stringify(message.content).slice(0, 500);
+      if (isErr) {
+        logStream.write(`[TOOL_ERROR] ${content}\n`);
+      }
+    }
+  }
+}
+
+/**
+ * 从消息列表中提取结果消息
+ * @param {Array} messages - 消息列表
+ * @returns {object|null} 结果消息
+ */
+function extractResult(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].type === 'result') return messages[i];
+  }
+  return null;
+}
+
+/**
+ * 从消息列表中提取结果文本
+ * @param {Array} messages - 消息列表
+ * @returns {string} 结果文本
+ */
+function extractResultText(messages) {
+  const result = extractResult(messages);
+  return result?.result || '';
+}
+
+/**
+ * 写入 session 分隔符到日志
+ * @param {import('fs').WriteStream} logStream - 日志写入流
+ * @param {number} sessionNum - session 编号
+ * @param {string} label - 标签
+ */
+function writeSessionSeparator(logStream, sessionNum, label) {
+  const sep = '='.repeat(60);
+  logStream.write(`\n${sep}\n[Session ${sessionNum}] ${label} ${localTimestamp()}\n${sep}\n`);
+}
+
+module.exports = {
+  logMessage,
+  localTimestamp,
+  extractResult,
+  extractResultText,
+  writeSessionSeparator,
 };

package/src/common/sdk.js

@@ -1,51 +1,51 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { log } = require('./config');
-
-let _sdkModule = null;
-
-/**
- * 加载 Claude Agent SDK
- */
-async function loadSDK() {
-  if (_sdkModule) return _sdkModule;
-
-  const pkgName = '@anthropic-ai/claude-agent-sdk';
-  const attempts = [
-    () => import(pkgName),
-    () => {
-      const { createRequire } = require('module');
-      const resolved = createRequire(__filename).resolve(pkgName);
-      return import(resolved);
-    },
-    () => {
-      const { createRequire } = require('module');
-      const resolved = createRequire(path.join(process.cwd(), 'noop.js')).resolve(pkgName);
-      return import(resolved);
-    },
-    () => {
-      const { execSync } = require('child_process');
-      const globalRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
-      const sdkDir = path.join(globalRoot, pkgName);
-      const pkgJson = JSON.parse(fs.readFileSync(path.join(sdkDir, 'package.json'), 'utf8'));
-      const entry = pkgJson.exports?.['.'] || pkgJson.main || 'index.js';
-      const entryFile = typeof entry === 'object' ? (entry.import || entry.default || entry.node) : entry;
-      return import(path.join(sdkDir, entryFile));
-    },
-  ];
-
-  for (const attempt of attempts) {
-    try {
-      _sdkModule = await attempt();
-      return _sdkModule;
-    } catch { /* try next */ }
-  }
-
-  log('error', `未找到 ${pkgName}`);
-  log('error', `请先安装：npm install -g ${pkgName}`);
-  process.exit(1);
-}
-
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { log } = require('./config');
+
+let _sdkModule = null;
+
+/**
+ * 加载 Claude Agent SDK
+ */
+async function loadSDK() {
+  if (_sdkModule) return _sdkModule;
+
+  const pkgName = '@anthropic-ai/claude-agent-sdk';
+  const attempts = [
+    () => import(pkgName),
+    () => {
+      const { createRequire } = require('module');
+      const resolved = createRequire(__filename).resolve(pkgName);
+      return import(resolved);
+    },
+    () => {
+      const { createRequire } = require('module');
+      const resolved = createRequire(path.join(process.cwd(), 'noop.js')).resolve(pkgName);
+      return import(resolved);
+    },
+    () => {
+      const { execSync } = require('child_process');
+      const globalRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const sdkDir = path.join(globalRoot, pkgName);
+      const pkgJson = JSON.parse(fs.readFileSync(path.join(sdkDir, 'package.json'), 'utf8'));
+      const entry = pkgJson.exports?.['.'] || pkgJson.main || 'index.js';
+      const entryFile = typeof entry === 'object' ? (entry.import || entry.default || entry.node) : entry;
+      return import(path.join(sdkDir, entryFile));
+    },
+  ];
+
+  for (const attempt of attempts) {
+    try {
+      _sdkModule = await attempt();
+      return _sdkModule;
+    } catch { /* try next */ }
+  }
+
+  log('error', `未找到 ${pkgName}`);
+  log('error', `请先安装：npm install -g ${pkgName}`);
+  process.exit(1);
+}
+
 module.exports = { loadSDK };