claude-coder 1.8.4 → 1.9.0

package/src/commands/setup.js

@@ -20,7 +20,7 @@ const {
 } = require('./setup-modules');
 
 const PRESERVED_KEYS = [
-  'SESSION_STALL_TIMEOUT', 'SESSION_COMPLETION_TIMEOUT',
+  'SESSION_STALL_TIMEOUT',
   'SESSION_MAX_TURNS', 'SIMPLIFY_INTERVAL', 'SIMPLIFY_COMMITS',
 ];
 
@@ -61,10 +61,10 @@ async function setup() {
     writeConfig(envPath, configResult.lines);
     ensureGitignore();
 
-    if (mcpConfig.enabled && mcpConfig.mode) {
+    if (mcpConfig.tool) {
       const { updateMcpConfig } = require('./auth');
       const mcpPath = assets.path('mcpConfig');
-      updateMcpConfig(mcpPath, mcpConfig.mode);
+      updateMcpConfig(mcpPath, mcpConfig.tool, mcpConfig.mode);
     }
 
     console.log('');
@@ -98,7 +98,7 @@ async function setup() {
     console.log('');
     console.log('  1) 切换模型提供商');
     console.log('  2) 更新 API Key');
-    console.log('  3) 配置 MCP');
+    console.log('  3) 配置浏览器测试工具');
     console.log('  4) 配置安全限制');
     console.log('  5) 配置自动审查');
     console.log('  6) 完全重新配置');
@@ -119,8 +119,8 @@ async function setup() {
         const configResult = await selectProvider(rl, existing);
         preserveSafetyConfig(configResult.lines, existing);
         appendMcpConfig(configResult.lines, {
-          enabled: existing.MCP_PLAYWRIGHT === 'true',
-          mode: existing.MCP_PLAYWRIGHT_MODE || null,
+          tool: existing.WEB_TEST_TOOL || '',
+          mode: existing.WEB_TEST_MODE || '',
         });
         writeConfig(envPath, configResult.lines);
         log('ok', `已切换到: ${configResult.summary}`);
@@ -150,10 +150,10 @@ async function setup() {
         appendMcpConfig(configResult.lines, mcpConfig);
         writeConfig(envPath, configResult.lines);
 
-        if (mcpConfig.enabled && mcpConfig.mode) {
+        if (mcpConfig.tool) {
           const { updateMcpConfig } = require('./auth');
           const mcpPath = assets.path('mcpConfig');
-          updateMcpConfig(mcpPath, mcpConfig.mode);
+          updateMcpConfig(mcpPath, mcpConfig.tool, mcpConfig.mode);
         }
 
         log('ok', '配置已更新');

package/src/common/assets.js

@@ -26,7 +26,7 @@ const REGISTRY = new Map([
   // Other Templates
   ['testRule',       { file: 'test_rule.md',               kind: 'template' }],
   ['guidance',       { file: 'guidance.json',              kind: 'template' }],
-  ['playwright',     { file: 'playwright.md',              kind: 'template' }],
+  ['webTesting',     { file: 'web-testing.md',              kind: 'template' }],
   ['bashProcess',    { file: 'bash-process.md',            kind: 'template' }],
   ['requirements',   { file: 'requirements.example.md',    kind: 'template' }],
 
@@ -226,6 +226,15 @@ class AssetManager {
     return deployed;
   }
 
+  recipesDir() {
+    this._ensureInit();
+    const projectRecipes = path.join(this.loopDir, 'recipes');
+    if (fs.existsSync(projectRecipes) && fs.readdirSync(projectRecipes).length > 0) {
+      return projectRecipes;
+    }
+    return BUNDLED_RECIPES_DIR;
+  }
+
   clearCache() {
     this.cache.clear();
   }

package/src/common/config.js

@@ -54,8 +54,8 @@ function loadConfig() {
     authToken: env.ANTHROPIC_AUTH_TOKEN || '',
     model: env.ANTHROPIC_MODEL || '',
     timeoutMs: parseInt(env.API_TIMEOUT_MS, 10) || 3000000,
-    mcpPlaywright: env.MCP_PLAYWRIGHT === 'true',
-    playwrightMode: env.MCP_PLAYWRIGHT_MODE || 'persistent',
+    webTestTool: env.WEB_TEST_TOOL || '',
+    webTestMode: env.WEB_TEST_MODE || 'persistent',
     disableNonessential: env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC || '',
     effortLevel: env.CLAUDE_CODE_EFFORT_LEVEL || '',
     defaultOpus: env.ANTHROPIC_DEFAULT_OPUS_MODEL || '',

package/src/common/indicator.js

@@ -1,70 +1,52 @@
 'use strict';
 
 const { COLOR } = require('./config');
-const { localTimestamp, truncatePath } = require('./utils');
+const { localTimestamp, truncateMiddle } = require('./utils');
 
 const SPINNERS = ['⠋', '⠙', '⠸', '⠴', '⠦', '⠇'];
 
+function termCols() {
+  return process.stderr.columns
+    || process.stdout.columns
+    || parseInt(process.env.COLUMNS, 10)
+    || 70;
+}
+
 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;
+    this.projectRoot = '';
   }
 
-  start(sessionNum, stallTimeoutMin) {
+  start(sessionNum, stallTimeoutMin, projectRoot) {
     this.sessionNum = sessionNum;
     this.startTime = Date.now();
     this.lastActivityTime = Date.now();
     if (stallTimeoutMin > 0) this.stallTimeoutMin = stallTimeoutMin;
+    if (projectRoot) this.projectRoot = projectRoot;
     this.timer = setInterval(() => this._render(), 1000);
   }
 
   stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
-    }
+    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();
-  }
+  updatePhase(phase) { this.phase = phase; }
+  updateActivity() { this.lastActivityTime = Date.now(); }
 
-  startTool(name) {
+  startTool() {
     this.toolRunning = true;
     this.toolStartTime = Date.now();
-    this.currentToolName = name;
     this.lastActivityTime = Date.now();
   }
 
@@ -77,13 +59,13 @@ class Indicator {
   pauseRendering() { this._paused = true; }
   resumeRendering() { this._paused = false; }
 
-  getStatusLine() {
-    const clock = localTimestamp();
+  _render() {
+    if (this._paused) return;
+    this.spinnerIndex++;
     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}`;
@@ -91,132 +73,188 @@ class Indicator {
     const idleMs = Date.now() - this.lastActivityTime;
     const idleMin = Math.floor(idleMs / 60000);
 
-    let line = `${spinner} [Session ${this.sessionNum}] ${clock} ${phaseLabel} ${mm}:${ss}`;
+    let line = `${spinner} S${this.sessionNum} ${mm}:${ss} ${phaseLabel}`;
     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}`;
+        const sec = Math.floor((Date.now() - this.toolStartTime) / 1000);
+        line += ` ${COLOR.yellow}工具执行中 ${Math.floor(sec / 60)}:${String(sec % 60).padStart(2, '0')}${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}`;
+        line += ` ${COLOR.red}${idleMin}分无响应${COLOR.reset}`;
       }
     }
-    return line;
+    process.stderr.write(`\r\x1b[K${line}`);
   }
+}
 
-  _render() {
-    if (this._paused) return;
-    this.spinnerIndex++;
-    process.stderr.write(`\r\x1b[K${this.getStatusLine()}`);
+// ─── Path helpers ────────────────────────────────────────
+
+function normalizePath(raw, projectRoot) {
+  if (!raw) return '';
+  if (projectRoot && raw.startsWith(projectRoot)) {
+    const rel = raw.slice(projectRoot.length);
+    return rel.startsWith('/') ? rel.slice(1) : rel;
   }
+  const home = process.env.HOME || '';
+  if (home && raw.startsWith(home)) return '~' + raw.slice(home.length);
+  const parts = raw.split('/').filter(Boolean);
+  return parts.length > 3 ? '.../' + parts.slice(-3).join('/') : raw;
 }
 
-function extractFileTarget(toolInput) {
-  const raw = typeof toolInput === 'object'
-    ? (toolInput.file_path || toolInput.path || '')
-    : '';
-  if (!raw) return '';
-  return raw.split('/').slice(-2).join('/');
+function stripAbsolutePaths(str, projectRoot) {
+  let result = str;
+  if (projectRoot) {
+    result = result.replace(new RegExp(projectRoot.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '/?', 'g'), './');
+  }
+  const home = process.env.HOME || '';
+  if (home) {
+    result = result.replace(new RegExp(home.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '/?', 'g'), '~/');
+  }
+  return result;
 }
 
-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 extractTarget(input, projectRoot) {
+  if (!input || typeof input !== 'object') return '';
+  const filePath = input.file_path || input.path || '';
+  if (filePath) return normalizePath(filePath, projectRoot);
+  const cmd = input.command || '';
+  if (cmd) return stripAbsolutePaths(extractBashCore(cmd), projectRoot);
+  const pattern = input.pattern || '';
+  if (pattern) return `pattern: ${pattern}`;
+  return '';
 }
 
-function extractMcpTarget(toolInput) {
-  if (!toolInput || typeof toolInput !== 'object') return '';
-  return String(toolInput.url || toolInput.text || toolInput.element || '').slice(0, 60);
+// ─── Bash helpers ────────────────────────────────────────
+
+function extractBashLabel(cmd) {
+  if (cmd.includes('git ')) return 'Git';
+  if (/\b(npm|pnpm|yarn|pip)\b/.test(cmd)) return cmd.match(/\b(npm|pnpm|yarn|pip)\b/)[0];
+  if (/\b(sleep|Start-Sleep|timeout\s+\/t)\b/i.test(cmd)) return '等待';
+  if (cmd.includes('curl')) return '网络';
+  if (/\b(pytest|jest|test)\b/.test(cmd)) return '测试';
+  if (/\b(python|node)\s/.test(cmd)) return '执行';
+  return '执行';
 }
 
-/**
- * 提取 Bash 命令的主体部分（移除管道、重定向等）
- * 正确处理引号内的内容，不会错误分割引号内的分隔符
- */
-function extractBashTarget(cmd) {
-  // 移除开头的 cd xxx && 部分
-  let clean = cmd.replace(/^(?:cd\s+\S+\s*&&\s*)+/g, '').trim();
+function extractCurlUrl(cmd) {
+  const m = cmd.match(/https?:\/\/\S+/);
+  return m ? m[0].replace(/['";)}\]>]+$/, '') : null;
+}
 
-  // 临时替换引号内的分隔符为占位符
-  const unescape = (s) => s.replace(/\x00/g, ';');
+function extractBashCore(cmd) {
+  let clean = cmd.replace(/^(?:(?:cd|source|export)\s+\S+\s*&&\s*)+/g, '').trim();
   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];
+  clean = clean.replace(/\x00/g, ';').trim();
+  clean = clean.replace(/\s*<<\s*['"]?\w+['"]?\s*$/, '');
+  return clean;
+}
+
+// ─── inferPhaseStep: 输出永久工具行 ─────────────────────
 
-  // 还原占位符
-  return unescape(clean).trim();
+function formatElapsed(indicator) {
+  const elapsed = Math.floor((Date.now() - indicator.startTime) / 1000);
+  const mm = String(Math.floor(elapsed / 60)).padStart(2, '0');
+  const ss = String(elapsed % 60).padStart(2, '0');
+  return `${mm}:${ss}`;
 }
 
+const CODING_TOOLS = /^(write|edit|multiedit|str_replace_editor|strreplace)$/;
+const READ_TOOLS = /^(read|glob|grep|ls)$/;
+
 function inferPhaseStep(indicator, toolName, toolInput) {
   const name = (toolName || '').toLowerCase();
+  const displayName = toolName || name;
+  const pr = indicator.projectRoot || '';
+  const cols = termCols();
+
+  indicator.startTool();
 
-  indicator.startTool(toolName);
+  let step, target;
 
-  if (name === 'write' || name === 'edit' || name === 'multiedit' || name === 'str_replace_editor' || name === 'strreplace') {
+  if (CODING_TOOLS.test(name)) {
     indicator.updatePhase('coding');
-    indicator.updateStep('编辑文件');
-    indicator.toolTarget = extractFileTarget(toolInput);
+    step = displayName;
+    target = normalizePath(
+      (typeof toolInput === 'object' ? (toolInput.file_path || toolInput.path || '') : ''), pr
+    );
   } 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') {
+    step = displayName;
+    const url = (label === '网络') ? extractCurlUrl(cmd) : null;
+    target = url || stripAbsolutePaths(extractBashCore(cmd), pr);
+    if (['测试', '执行'].includes(label)) indicator.updatePhase('coding');
+  } else if (READ_TOOLS.test(name)) {
     indicator.updatePhase('thinking');
-    indicator.updateStep('读取文件');
-    indicator.toolTarget = extractFileTarget(toolInput);
+    step = displayName;
+    target = extractTarget(toolInput, pr);
   } else if (name === 'task') {
     indicator.updatePhase('thinking');
-    indicator.updateStep('子 Agent 搜索');
-    indicator.toolTarget = '';
+    step = displayName;
+    target = '';
   } else if (name === 'websearch' || name === 'webfetch') {
     indicator.updatePhase('thinking');
-    indicator.updateStep('查阅文档');
-    indicator.toolTarget = '';
+    step = displayName;
+    target = '';
   } else if (name.startsWith('mcp__')) {
     indicator.updatePhase('coding');
-    const action = name.split('__').pop() || name;
-    indicator.updateStep(`浏览器: ${action}`);
-    indicator.toolTarget = extractMcpTarget(toolInput);
+    step = name.split('__').pop() || displayName;
+    target = typeof toolInput === 'object'
+      ? String(toolInput.url || toolInput.text || toolInput.element || '').slice(0, 60)
+      : '';
   } else {
-    indicator.updateStep('工具调用');
-    indicator.toolTarget = '';
+    step = displayName;
+    target = '';
   }
 
-  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);
+  const time = localTimestamp();
+  const el = formatElapsed(indicator);
+  let line = `  ${COLOR.dim}${time}${COLOR.reset} ${COLOR.dim}${el}${COLOR.reset} ${step}`;
+  if (target) {
+    const maxTarget = Math.max(10, cols - displayWidth(stripAnsi(line)) - 3);
+    line += ` ${truncateMiddle(target, maxTarget)}`;
+  }
+  process.stderr.write(`\r\x1b[K${clampLine(line, cols)}\n`);
+}
+
+// ─── Terminal width helpers ──────────────────────────────
+
+function stripAnsi(str) {
+  return str.replace(/\x1b\[[^m]*m/g, '');
+}
+
+function isWideChar(cp) {
+  return (cp >= 0x4E00 && cp <= 0x9FFF)
+    || (cp >= 0x3400 && cp <= 0x4DBF)
+    || (cp >= 0x3000 && cp <= 0x30FF)
+    || (cp >= 0xF900 && cp <= 0xFAFF)
+    || (cp >= 0xFF01 && cp <= 0xFF60)
+    || (cp >= 0xFFE0 && cp <= 0xFFE6)
+    || (cp >= 0xAC00 && cp <= 0xD7AF)
+    || (cp >= 0x20000 && cp <= 0x2FA1F);
+}
+
+function displayWidth(str) {
+  let w = 0;
+  for (const ch of str) {
+    w += isWideChar(ch.codePointAt(0)) ? 2 : 1;
+  }
+  return w;
+}
+
+function clampLine(line, cols) {
+  const max = cols - 1;
+  if (displayWidth(stripAnsi(line)) <= max) return line;
+  let w = 0, cut = 0, esc = false;
+  for (let i = 0; i < line.length; i++) {
+    if (line[i] === '\x1b') esc = true;
+    if (esc) { if (line[i] === 'm') esc = false; continue; }
+    const cw = isWideChar(line.codePointAt(i)) ? 2 : 1;
+    if (w + cw >= max) { cut = i; break; }
+    w += cw;
   }
-  indicator.appendActivity(toolName, summary);
+  return line.slice(0, cut) + '…' + COLOR.reset;
 }
 
 module.exports = { Indicator, inferPhaseStep };

package/src/common/utils.js

@@ -56,6 +56,17 @@ function truncatePath(path, maxLen) {
   return truncatedDir + '/' + fileName;
 }
 
+/**
+ * 命令字符串截断：保留头部，超长时截断
+ * @param {string} cmd - 命令字符串
+ * @param {number} maxLen - 最大长度
+ * @returns {string}
+ */
+function truncateCommand(cmd, maxLen) {
+  if (!cmd || cmd.length <= maxLen) return cmd || '';
+  return cmd.slice(0, maxLen - 1) + '…';
+}
+
 // ─────────────────────────────────────────────────────────────
 // Git 工具
 // ─────────────────────────────────────────────────────────────
@@ -112,12 +123,17 @@ function appendGitignore(projectRoot, entry) {
 }
 
 /**
- * 确保 .gitignore 包含 claude-coder 的敏感文件条目
+ * 确保 .gitignore 包含 claude-coder 的忽略规则
+ * 使用通配符忽略整个目录，仅白名单放行需要版本控制的文件
  * @param {string} projectRoot - 项目根目录
  * @returns {boolean} 是否有新增
  */
 function ensureGitignore(projectRoot) {
-  const patterns = ['.claude-coder/.env', '.claude-coder/.runtime/'];
+  const patterns = [
+    '.claude-coder/*',
+    '!.claude-coder/tasks.json',
+    '!.claude-coder/project_profile.json',
+  ];
   let added = false;
   for (const p of patterns) {
     if (appendGitignore(projectRoot, p)) added = true;
@@ -129,18 +145,51 @@ function ensureGitignore(projectRoot) {
 // 进程工具
 // ─────────────────────────────────────────────────────────────
 
-/**
- * 休眠
- * @param {number} ms - 毫秒
- * @returns {Promise<void>}
- */
 function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+// ─────────────────────────────────────────────────────────────
+// 项目服务管理
+// ─────────────────────────────────────────────────────────────
+
+function tryPush(projectRoot) {
+  const { log } = require('./config');
+  try {
+    const remotes = execSync('git remote', { cwd: projectRoot, encoding: 'utf8' }).trim();
+    if (!remotes) return;
+    log('info', '正在推送代码...');
+    execSync('git push', { cwd: projectRoot, stdio: 'inherit' });
+    log('ok', '推送成功');
+  } catch {
+    log('warn', '推送失败 (请检查网络或权限)，继续执行...');
+  }
+}
+
+function killServices(projectRoot) {
+  const { log } = require('./config');
+  const { assets } = require('./assets');
+  const profile = assets.readJson('profile', null);
+  if (!profile) return;
+  const ports = (profile.services || []).map(s => s.port).filter(Boolean);
+  if (ports.length === 0) return;
+
+  for (const port of ports) {
+    try {
+      if (process.platform === 'win32') {
+        const out = execSync(`netstat -ano | findstr :${port} | findstr LISTENING`, { encoding: 'utf8', stdio: 'pipe' }).trim();
+        const pids = [...new Set(out.split('\n').map(l => l.trim().split(/\s+/).pop()).filter(Boolean))];
+        for (const pid of pids) { try { execSync(`taskkill /F /T /PID ${pid}`, { stdio: 'pipe' }); } catch { /* ignore */ } }
+      } else {
+        execSync(`lsof -ti :${port} | xargs kill -9 2>/dev/null`, { stdio: 'pipe' });
+      }
+    } catch { /* no process on port */ }
+  }
+  log('info', `已停止端口 ${ports.join(', ')} 上的服务`);
+}
 
 // ─────────────────────────────────────────────────────────────
-// 日志工具 - 统一的日志处理
+// 日志工具
 // ─────────────────────────────────────────────────────────────
 function localTimestamp() {
   const d = new Date();
@@ -153,10 +202,13 @@ function localTimestamp() {
 module.exports = {
   truncateMiddle,
   truncatePath,
+  truncateCommand,
   getGitHead,
   isGitRepo,
   appendGitignore,
   ensureGitignore,
   sleep,
+  tryPush,
+  killServices,
   localTimestamp,
 };

package/src/core/coding.js

@@ -1,55 +1,33 @@
-"use strict";
-
-const { runSession } = require("./session");
-const { buildQueryOptions } = require("./query");
-const { buildSystemPrompt, buildCodingContext } = require("./prompts");
-const { extractResult } = require("../common/logging");
-const { log } = require("../common/config");
-
-/**
- * 内部：运行编码 Session
- */
-async function runCodingSession(sessionNum, opts = {}) {
-  const taskId = opts.taskId || "unknown";
+'use strict';
+
+const { buildSystemPrompt, buildCodingContext } = require('./prompts');
+const { Session } = require('./session');
+const { log } = require('../common/config');
+
+async function executeCoding(config, sessionNum, opts = {}) {
+  const taskId = opts.taskId || 'unknown';
   const dateStr = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 12);
 
-  return runSession("coding", {
-    opts,
+  return Session.run('coding', config, {
     sessionNum,
     logFileName: `${taskId}_session_${sessionNum}_${dateStr}.log`,
     label: `coding task=${taskId}`,
 
-    async execute(sdk, ctx) {
+    async execute(session) {
       const prompt = buildCodingContext(sessionNum, opts);
-      const queryOpts = buildQueryOptions(ctx.config, opts);
+      const queryOpts = session.buildQueryOptions(opts);
       queryOpts.systemPrompt = buildSystemPrompt('coding');
-      queryOpts.hooks = ctx.hooks;
-      queryOpts.abortController = ctx.abortController;
       queryOpts.disallowedTools = ['askUserQuestion'];
 
-      const collected = await ctx.runQuery(sdk, prompt, queryOpts);
-      const result = extractResult(collected);
-      const subtype = result?.subtype || "unknown";
+      const { subtype, cost, usage } = await session.runQuery(prompt, queryOpts);
 
-      if (subtype !== "success" && subtype !== "unknown") {
-        log(
-          "warn",
-          `session 结束原因: ${subtype} (turns: ${result?.num_turns ?? "?"})`,
-        );
-      }
-      if (ctx.logStream.writable) {
-        ctx.logStream.write(
-          `[${new Date().toISOString()}] SESSION_END subtype=${subtype} turns=${result?.num_turns ?? "?"} cost=${result?.total_cost_usd ?? "?"}\n`,
-        );
+      if (subtype && subtype !== 'success' && subtype !== 'unknown') {
+        log('warn', `session 结束原因: ${subtype}`);
       }
 
-      return {
-        cost: result?.total_cost_usd ?? null,
-        tokenUsage: result?.usage ?? null,
-        subtype,
-      };
+      return { cost, tokenUsage: usage, subtype: subtype || 'unknown' };
     },
   });
 }
 
-module.exports = { runCodingSession };
+module.exports = { executeCoding };