claude-coder 1.8.3 → 1.9.0

package/src/core/go.js

@@ -3,20 +3,15 @@
 const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
-const { runSession } = require('./session');
-const { buildQueryOptions } = require('./query');
 const { buildSystemPrompt } = require('./prompts');
-const { log, loadConfig } = require('../common/config');
+const { log } = require('../common/config');
 const { assets } = require('../common/assets');
 const { extractResultText } = require('../common/logging');
-const { loadState } = require('./harness');
+const { loadState, saveState } = require('./state');
+const { Session } = require('./session');
 
 const GO_DIR_NAME = 'go';
 
-function getRecipesDir() {
-  return path.join(assets.projectRoot || process.cwd(), '.claude-coder', 'recipes');
-}
-
 // ─── Go State (harness_state.json → go section) ──────────
 
 function loadGoState() {
@@ -27,13 +22,13 @@ function loadGoState() {
 function saveGoState(goData) {
   const state = loadState();
   state.go = { ...state.go, ...goData };
-  assets.writeJson('harnessState', state);
+  saveState(state);
 }
 
 // ─── Prompt Builder ───────────────────────────────────────
 
 function buildGoPrompt(instruction, opts = {}) {
-  const recipesAbsPath = getRecipesDir();
+  const recipesAbsPath = assets.recipesDir();
   const goState = loadGoState();
 
   const inputSection = opts.reqFile
@@ -173,86 +168,49 @@ function writeGoFile(content) {
   return filePath;
 }
 
-// ─── Session Execution ───────────────────────────────────
+// ─── Main Entry ──────────────────────────────────────────
+
+async function executeGo(config, input, opts = {}) {
+  const instruction = input || '';
+
+  if (opts.reset) {
+    saveGoState({});
+    log('ok', 'Go 记忆已重置');
+    return;
+  }
+
+  if (opts.reqFile) {
+    log('info', `需求文件: ${opts.reqFile}`);
+  }
 
-async function _executeGoSession(instruction, opts = {}) {
   const isAutoMode = !!(instruction || opts.reqFile);
+  const mode = isAutoMode ? '自动' : '对话';
+  log('info', `Go 模式: ${mode}`);
+
   const ts = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 12);
 
-  return runSession('go', {
-    opts,
-    sessionNum: 0,
+  const result = await Session.run('go', config, {
     logFileName: `go_${ts}.log`,
     label: isAutoMode ? 'go_auto' : 'go_dialogue',
 
-    async execute(sdk, ctx) {
+    async execute(session) {
       log('info', isAutoMode ? '正在分析需求并组装方案...' : '正在启动对话式需求收集...');
 
       const prompt = buildGoPrompt(instruction, opts);
-      const queryOpts = buildQueryOptions(ctx.config, opts);
+      const queryOpts = session.buildQueryOptions(opts);
       queryOpts.systemPrompt = buildSystemPrompt('go');
       queryOpts.permissionMode = 'plan';
-      queryOpts.hooks = ctx.hooks;
-      queryOpts.abortController = ctx.abortController;
 
       if (isAutoMode) {
         queryOpts.disallowedTools = ['askUserQuestion'];
       }
 
-      const collected = await ctx.runQuery(sdk, prompt, queryOpts);
-      const content = extractGoContent(collected);
+      const { messages } = await session.runQuery(prompt, queryOpts);
+      const content = extractGoContent(messages);
 
-      return { content, collected };
+      return { content, collected: messages };
     },
   });
-}
-
-// ─── Main Entry ──────────────────────────────────────────
-
-async function run(input, opts = {}) {
-  const instruction = input || '';
-
-  assets.ensureDirs();
-
-  const config = loadConfig();
-  if (!opts.model) {
-    opts.model = config.defaultOpus || config.model;
-  }
-
-  const displayModel = opts.model || config.model || '(default)';
-  log('ok', `模型配置已加载: ${config.provider || 'claude'} (go 使用: ${displayModel})`);
-
-  const recipesDir = getRecipesDir();
-  if (!fs.existsSync(recipesDir) || fs.readdirSync(recipesDir).length === 0) {
-    log('error', `食谱目录为空或不存在: ${recipesDir}`);
-    log('info', '请先运行 claude-coder init 初始化项目（会自动部署食谱）');
-    process.exit(1);
-  }
-
-  // --reset: 清空 go 记忆
-  if (opts.reset) {
-    saveGoState({});
-    log('ok', 'Go 记忆已重置');
-    return;
-  }
-
-  // -r: 读取需求文件，自动模式
-  if (opts.readFile) {
-    const reqPath = path.resolve(assets.projectRoot, opts.readFile);
-    if (!fs.existsSync(reqPath)) {
-      log('error', `文件不存在: ${reqPath}`);
-      process.exit(1);
-    }
-    opts.reqFile = reqPath;
-    log('info', `需求文件: ${reqPath}`);
-  }
-
-  // 确定模式
-  const mode = (instruction || opts.reqFile) ? '自动' : '对话';
-  log('info', `Go 模式: ${mode}`);
-
-  // 执行 go session
-  const result = await _executeGoSession(instruction, opts);
 
   if (!result.content) {
     log('error', '无法从 AI 输出中提取方案内容');
@@ -260,7 +218,6 @@ async function run(input, opts = {}) {
     return;
   }
 
-  // 预览 + 确认 + 补充
   const { confirmed, supplement } = await previewAndConfirm(result.content);
   if (!confirmed) {
     log('info', '已取消');
@@ -272,11 +229,9 @@ async function run(input, opts = {}) {
     finalContent += `\n\n## 补充要求\n\n${supplement}`;
   }
 
-  // 写入 .claude-coder/go/
   const filePath = writeGoFile(finalContent);
   log('ok', `方案已保存: ${filePath}`);
 
-  // 保存记忆到 harness_state.json
   const domain = extractDomainFromContent(finalContent);
   const components = extractComponentsFromContent(finalContent);
   const history = (loadGoState().history || []).slice(-9);
@@ -295,16 +250,15 @@ async function run(input, opts = {}) {
     history,
   });
 
-  // 询问是否继续到 plan
   console.log('');
   const shouldPlan = await promptProceedToPlan();
   if (shouldPlan) {
     log('info', '开始生成计划并分解任务...');
-    const { run: planRun } = require('./plan');
-    await planRun('', { reqFile: filePath, ...opts });
+    const { executePlan } = require('./plan');
+    await executePlan(config, '', { reqFile: filePath });
   } else {
     log('info', `方案已保存，稍后可使用: claude-coder plan -r ${filePath}`);
   }
 }
 
-module.exports = { run };
+module.exports = { executeGo };

package/src/core/hooks.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const { inferPhaseStep } = require('../common/indicator');
 const { log } = require('../common/config');
-const { EDIT_THRESHOLD, FILES } = require('../common/constants');
+const { EDIT_THRESHOLD } = require('../common/constants');
 const { createAskUserQuestionHook } = require('../common/interaction');
 const { assets } = require('../common/assets');
 const { localTimestamp } = require('../common/utils');
@@ -13,13 +13,12 @@ const { localTimestamp } = require('../common/utils');
 // ─────────────────────────────────────────────────────────────
 
 const DEFAULT_EDIT_THRESHOLD = EDIT_THRESHOLD;
-const SESSION_RESULT_FILENAME = FILES.SESSION_RESULT;
 
 // Feature name constants
 const FEATURES = Object.freeze({
   GUIDANCE: 'guidance',
   EDIT_GUARD: 'editGuard',
-  COMPLETION: 'completion',
+  STOP: 'stop',
   STALL: 'stall',
   INTERACTION: 'interaction',
 });
@@ -249,19 +248,6 @@ function logToolCall(logStream, input) {
   }
 }
 
-function isSessionResultWrite(toolName, toolInput) {
-  if (toolName === 'Write') {
-    const target = toolInput?.file_path || toolInput?.path || '';
-    return target.endsWith(SESSION_RESULT_FILENAME);
-  }
-  if (toolName === 'Bash' || toolName === 'Shell') {
-    const cmd = toolInput?.command || '';
-    if (!cmd.includes(SESSION_RESULT_FILENAME)) return false;
-    return />\s*[^\s]*session_result/.test(cmd);
-  }
-  return false;
-}
-
 // ─────────────────────────────────────────────────────────────
 // Module Factories
 // ─────────────────────────────────────────────────────────────
@@ -315,40 +301,18 @@ function createEditGuardModule(options) {
 }
 
 /**
- * Create stall detection module (includes completion timeout handling)
+ * Create stall detection module (idle timeout only)
  */
 function createStallModule(indicator, logStream, options) {
   let stallDetected = false;
   let stallChecker = null;
   const timeoutMs = options.stallTimeoutMs || 1200000;
-  const completionTimeoutMs = options.completionTimeoutMs || 300000;
   const abortController = options.abortController;
-  let completionDetectedAt = 0;
 
   const checkStall = () => {
     const now = Date.now();
     const idleMs = now - indicator.lastActivityTime;
 
-    // Priority: completion timeout
-    if (completionDetectedAt > 0) {
-      const sinceCompletion = now - completionDetectedAt;
-      if (sinceCompletion > completionTimeoutMs && !stallDetected) {
-        stallDetected = true;
-        const shortMin = Math.ceil(completionTimeoutMs / 60000);
-        const actualMin = Math.floor(sinceCompletion / 60000);
-        log('warn', `\nsession_result 已写入 ${actualMin} 分钟，超过 ${shortMin} 分钟上限，自动中断`);
-        if (logStream) {
-          logStream.write(`\n[${localTimestamp()}] STALL: session_result 写入后 ${actualMin} 分钟（上限 ${shortMin} 分钟），自动中断\n`);
-        }
-        if (abortController) {
-          abortController.abort();
-          log('warn', '\n已发送中断信号');
-        }
-      }
-      return;
-    }
-
-    // Normal stall detection
     if (idleMs > timeoutMs && !stallDetected) {
       stallDetected = true;
       const idleMin = Math.floor(idleMs / 60000);
@@ -366,39 +330,34 @@ function createStallModule(indicator, logStream, options) {
   stallChecker = setInterval(checkStall, 30000);
 
   return {
-    setCompletionDetected: () => { completionDetectedAt = Date.now(); },
-    onCompletionDetected: () => {
-      completionDetectedAt = Date.now();
-      const shortMin = Math.ceil(completionTimeoutMs / 60000);
-      indicator.setCompletionDetected(shortMin);
-      log('info', '');
-      log('info', `检测到 session_result 写入，${shortMin} 分钟内模型未终止将自动中断`);
-      if (logStream) {
-        logStream.write(`\n[${localTimestamp()}] COMPLETION_DETECTED: session_result.json written, ${shortMin}min grace period\n`);
-      }
-    },
     cleanup: () => { if (stallChecker) clearInterval(stallChecker); },
     isStalled: () => stallDetected
   };
 }
 
 /**
- * Create completion detection module (PostToolUse hook)
- * endTool() resets toolRunning and refreshes lastActivityTime (countdown reset)
+ * Create Stop hook — per-turn activity logger.
+ * Stop fires on EVERY model response turn (not just session end).
+ * For session completion detection, use the result message (SDKResultMessage.subtype).
  */
-function createCompletionModule(indicator, stallModule) {
-  return {
-    hook: async (input, _toolUseID, _context) => {
-      indicator.endTool();
-      indicator.updatePhase('thinking');
-      indicator.updateStep('');
-      indicator.toolTarget = '';
-
-      if (isSessionResultWrite(input.tool_name, input.tool_input)) {
-        stallModule.onCompletionDetected();
-      }
-      return {};
+function createStopHook(logStream) {
+  return async (_input) => {
+    if (logStream?.writable) {
+      logStream.write(`[${localTimestamp()}] STOP: turn completed\n`);
     }
+    return {};
+  };
+}
+
+/**
+ * Create PostToolUse hook — resets tool running state and activity timer.
+ * Unified for all session types (replaces the former createCompletionModule).
+ */
+function createEndToolHook(indicator) {
+  return async (_input, _toolUseID, _context) => {
+    indicator.endTool();
+    indicator.updatePhase('thinking');
+    return {};
   };
 }
 
@@ -428,13 +387,13 @@ function createLoggingHook(indicator, logStream) {
 // ─────────────────────────────────────────────────────────────
 
 const FEATURE_MAP = {
-  coding: [FEATURES.GUIDANCE, FEATURES.EDIT_GUARD, FEATURES.COMPLETION, FEATURES.STALL],
-  plan: [FEATURES.STALL],
-  plan_interactive: [FEATURES.STALL, FEATURES.INTERACTION],
-  scan: [FEATURES.STALL],
-  add: [FEATURES.STALL],
-  simplify: [FEATURES.STALL, FEATURES.INTERACTION],
-  go: [FEATURES.STALL, FEATURES.INTERACTION],
+  coding: [FEATURES.GUIDANCE, FEATURES.EDIT_GUARD, FEATURES.STOP, FEATURES.STALL],
+  plan: [FEATURES.STOP, FEATURES.STALL],
+  plan_interactive: [FEATURES.STOP, FEATURES.STALL, FEATURES.INTERACTION],
+  scan: [FEATURES.STOP, FEATURES.STALL],
+  add: [FEATURES.STOP, FEATURES.STALL],
+  simplify: [FEATURES.STOP, FEATURES.STALL, FEATURES.INTERACTION],
+  go: [FEATURES.STOP, FEATURES.STALL, FEATURES.INTERACTION],
   custom: null
 };
 
@@ -452,12 +411,12 @@ function createHooks(type, indicator, logStream, options = {}) {
     modules.stall = createStallModule(indicator, logStream, options);
   }
 
-  if (features.includes(FEATURES.EDIT_GUARD)) {
-    modules.editGuard = createEditGuardModule(options);
+  if (features.includes(FEATURES.STOP)) {
+    modules.stopHook = createStopHook(logStream);
   }
 
-  if (features.includes(FEATURES.COMPLETION) && modules.stall) {
-    modules.completion = createCompletionModule(indicator, modules.stall);
+  if (features.includes(FEATURES.EDIT_GUARD)) {
+    modules.editGuard = createEditGuardModule(options);
   }
 
   if (features.includes(FEATURES.GUIDANCE)) {
@@ -484,15 +443,10 @@ function createHooks(type, indicator, logStream, options = {}) {
     preToolUseHooks.push(modules.interaction.hook);
   }
 
-  // Assemble PostToolUse hooks (always include endTool for countdown reset)
-  const postToolUseHooks = [];
-  if (modules.completion) {
-    postToolUseHooks.push(modules.completion.hook);
-  } else {
-    postToolUseHooks.push(createFailureHook(indicator));
-  }
+  // PostToolUse: unified endTool for all session types
+  const endToolHook = createEndToolHook(indicator);
 
-  // PostToolUseFailure hook: ensure endTool even on tool errors
+  // PostToolUseFailure: ensure endTool even on tool errors
   const failureHook = createFailureHook(indicator);
 
   // Build hooks object
@@ -500,11 +454,24 @@ function createHooks(type, indicator, logStream, options = {}) {
   if (preToolUseHooks.length > 0) {
     hooks.PreToolUse = [{ matcher: '*', hooks: preToolUseHooks }];
   }
-  if (postToolUseHooks.length > 0) {
-    hooks.PostToolUse = [{ matcher: '*', hooks: postToolUseHooks }];
-  }
+  hooks.PostToolUse = [{ matcher: '*', hooks: [endToolHook] }];
   hooks.PostToolUseFailure = [{ matcher: '*', hooks: [failureHook] }];
 
+  // Stop hook: per-turn activity logger
+  if (modules.stopHook) {
+    hooks.Stop = [{ hooks: [modules.stopHook] }];
+  }
+
+  // SessionStart hook: log query lifecycle
+  const sessionStartHook = async (input) => {
+    indicator.updateActivity();
+    if (logStream?.writable) {
+      logStream.write(`[${localTimestamp()}] SESSION_START: source=${input.source || 'unknown'}\n`);
+    }
+    return {};
+  };
+  hooks.SessionStart = [{ hooks: [sessionStartHook] }];
+
   // Cleanup functions
   const cleanupFns = [];
   if (modules.stall) {
@@ -514,7 +481,7 @@ function createHooks(type, indicator, logStream, options = {}) {
   return {
     hooks,
     cleanup: () => cleanupFns.forEach(fn => fn()),
-    isStalled: () => modules.stall?.isStalled() || false
+    isStalled: () => modules.stall?.isStalled() || false,
   };
 }
 
@@ -527,8 +494,8 @@ module.exports = {
   GuidanceInjector,
   createGuidanceModule,
   createEditGuardModule,
-  createCompletionModule,
+  createStopHook,
+  createEndToolHook,
   createStallModule,
   FEATURES,
-  isSessionResultWrite,
 };