claude-coder 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-coder",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Claude Coder — Autonomous coding agent harness powered by Claude Code SDK. Scan, plan, code, validate, git-commit in a loop.",
   "bin": {
     "claude-coder": "bin/cli.js"
@@ -36,7 +36,7 @@
     "node": ">=18.0.0"
   },
   "peerDependencies": {
-    "@anthropic-ai/claude-agent-sdk": ">=0.14.0"
+    "@anthropic-ai/claude-agent-sdk": ">=0.1.0"
   },
   "dependencies": {}
 }

package/src/runner.js

@@ -12,14 +12,28 @@ const { runCodingSession, runViewSession, runAddSession } = require('./session')
 
 const MAX_RETRY = 3;
 
-function requireSdk() {
-  try {
-    require.resolve('@anthropic-ai/claude-agent-sdk');
-  } catch {
-    console.error('错误：未找到 @anthropic-ai/claude-agent-sdk');
-    console.error('请先安装：npm install -g @anthropic-ai/claude-agent-sdk');
-    process.exit(1);
+async function requireSdk() {
+  const pkgName = '@anthropic-ai/claude-agent-sdk';
+  const attempts = [
+    () => { require.resolve(pkgName); return true; },
+    () => {
+      const { createRequire } = require('module');
+      createRequire(__filename).resolve(pkgName);
+      return true;
+    },
+    () => {
+      const prefix = execSync('npm prefix -g', { encoding: 'utf8' }).trim();
+      const sdkPath = path.join(prefix, 'lib', 'node_modules', pkgName);
+      if (fs.existsSync(sdkPath)) return true;
+      throw new Error('not found');
+    },
+  ];
+  for (const attempt of attempts) {
+    try { if (attempt()) return; } catch { /* try next */ }
   }
+  console.error(`错误：未找到 ${pkgName}`);
+  console.error(`请先安装：npm install -g ${pkgName}`);
+  process.exit(1);
 }
 
 function getHead() {
@@ -199,7 +213,7 @@ async function run(requirement, opts = {}) {
       return;
     }
 
-    requireSdk();
+    await requireSdk();
     const scanResult = await scan(requirement, { projectRoot });
     if (!scanResult.success) {
       console.log('');
@@ -215,7 +229,7 @@ async function run(requirement, opts = {}) {
   }
 
   // Coding loop
-  if (!dryRun) requireSdk();
+  if (!dryRun) await requireSdk();
   log('info', `开始编码循环 (最多 ${maxSessions} 个会话) ...`);
   console.log('');
 
@@ -319,7 +333,7 @@ async function run(requirement, opts = {}) {
 }
 
 async function view(requirement, opts = {}) {
-  requireSdk();
+  await requireSdk();
   const projectRoot = getProjectRoot();
   ensureLoopDir();
 
@@ -331,7 +345,7 @@ async function view(requirement, opts = {}) {
 }
 
 async function add(instruction, opts = {}) {
-  requireSdk();
+  await requireSdk();
   const p = paths();
   const projectRoot = getProjectRoot();
   ensureLoopDir();

package/src/session.js

@@ -6,12 +6,75 @@ const { paths, loadConfig, buildEnvVars, getAllowedTools, log } = require('./con
 const { Indicator, inferPhaseStep } = require('./indicator');
 const { buildSystemPrompt, buildCodingPrompt, buildScanPrompt, buildViewPrompt, buildAddPrompt } = require('./prompts');
 
+let _sdkModule = null;
+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 { execSync } = require('child_process');
+      const prefix = execSync('npm prefix -g', { encoding: 'utf8' }).trim();
+      const sdkPath = path.join(prefix, 'lib', 'node_modules', pkgName, 'sdk.mjs');
+      return import(sdkPath);
+    },
+  ];
+
+  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);
+}
+
 function applyEnvConfig(config) {
   Object.assign(process.env, buildEnvVars(config));
 }
 
+function buildQueryOptions(config, opts = {}) {
+  const base = {
+    allowedTools: getAllowedTools(config),
+    permissionMode: 'bypassPermissions',
+    allowDangerouslySkipPermissions: true,
+    cwd: opts.projectRoot || process.cwd(),
+    env: buildEnvVars(config),
+    settingSources: ['project'],
+  };
+  if (config.model) base.model = config.model;
+  return base;
+}
+
+function extractResult(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].type === 'result') return messages[i];
+  }
+  return null;
+}
+
+function logMessage(message, logStream) {
+  if (message.type === 'assistant' && message.message?.content) {
+    for (const block of message.message.content) {
+      if (block.type === 'text' && block.text) {
+        process.stdout.write(block.text);
+        if (logStream) logStream.write(block.text);
+      }
+    }
+  }
+}
+
 async function runCodingSession(sessionNum, opts = {}) {
-  const { query } = require('@anthropic-ai/claude-agent-sdk');
+  const sdk = await loadSDK();
   const config = loadConfig();
   applyEnvConfig(config);
   const indicator = new Indicator();
@@ -26,46 +89,34 @@ async function runCodingSession(sessionNum, opts = {}) {
   indicator.start(sessionNum);
 
   try {
-    const session = query({
-      prompt,
-      options: {
-        systemPrompt,
-        allowedTools: getAllowedTools(config),
-        permissionMode: 'bypassPermissions',
-        verbose: true,
-        cwd: opts.projectRoot || process.cwd(),
-        timeout_ms: config.timeoutMs,
-        hooks: {
-          PreToolUse: [{
-            matcher: '*',
-            callback: (event) => {
-              inferPhaseStep(indicator, event.tool_name, event.tool_input);
-              return { decision: 'allow' };
-            }
-          }]
-        }
-      }
-    });
+    const queryOpts = buildQueryOptions(config, opts);
+    queryOpts.systemPrompt = systemPrompt;
+    queryOpts.hooks = {
+      PreToolUse: [{
+        matcher: '*',
+        hooks: [async (input) => {
+          inferPhaseStep(indicator, input.tool_name, input.tool_input);
+          return {};
+        }]
+      }]
+    };
+
+    const session = sdk.query({ prompt, options: queryOpts });
 
-    let result;
+    const collected = [];
     for await (const message of session) {
-      if (message.content) {
-        const text = typeof message.content === 'string'
-          ? message.content
-          : JSON.stringify(message.content);
-        process.stdout.write(text);
-        logStream.write(text);
-      }
-      result = message;
+      collected.push(message);
+      logMessage(message, logStream);
     }
 
     logStream.end();
     indicator.stop();
 
+    const result = extractResult(collected);
     return {
       exitCode: 0,
-      cost: result?.total_cost_usd || null,
-      tokenUsage: result?.message?.usage || null,
+      cost: result?.total_cost_usd ?? null,
+      tokenUsage: result?.usage ?? null,
       logFile,
     };
   } catch (err) {
@@ -83,7 +134,7 @@ async function runCodingSession(sessionNum, opts = {}) {
 }
 
 async function runScanSession(requirement, opts = {}) {
-  const { query } = require('@anthropic-ai/claude-agent-sdk');
+  const sdk = await loadSDK();
   const config = loadConfig();
   applyEnvConfig(config);
   const indicator = new Indicator();
@@ -100,45 +151,33 @@ async function runScanSession(requirement, opts = {}) {
   log('info', `正在调用 Claude Code 执行项目扫描（${projectType}项目）...`);
 
   try {
-    const session = query({
-      prompt,
-      options: {
-        systemPrompt,
-        allowedTools: getAllowedTools(config),
-        permissionMode: 'bypassPermissions',
-        verbose: true,
-        cwd: opts.projectRoot || process.cwd(),
-        timeout_ms: config.timeoutMs,
-        hooks: {
-          PreToolUse: [{
-            matcher: '*',
-            callback: (event) => {
-              inferPhaseStep(indicator, event.tool_name, event.tool_input);
-              return { decision: 'allow' };
-            }
-          }]
-        }
-      }
-    });
+    const queryOpts = buildQueryOptions(config, opts);
+    queryOpts.systemPrompt = systemPrompt;
+    queryOpts.hooks = {
+      PreToolUse: [{
+        matcher: '*',
+        hooks: [async (input) => {
+          inferPhaseStep(indicator, input.tool_name, input.tool_input);
+          return {};
+        }]
+      }]
+    };
+
+    const session = sdk.query({ prompt, options: queryOpts });
 
-    let result;
+    const collected = [];
     for await (const message of session) {
-      if (message.content) {
-        const text = typeof message.content === 'string'
-          ? message.content
-          : JSON.stringify(message.content);
-        process.stdout.write(text);
-        logStream.write(text);
-      }
-      result = message;
+      collected.push(message);
+      logMessage(message, logStream);
     }
 
     logStream.end();
     indicator.stop();
 
+    const result = extractResult(collected);
     return {
       exitCode: 0,
-      cost: result?.total_cost_usd || null,
+      cost: result?.total_cost_usd ?? null,
       logFile,
     };
   } catch (err) {
@@ -150,7 +189,7 @@ async function runScanSession(requirement, opts = {}) {
 }
 
 async function runViewSession(requirement, opts = {}) {
-  const { query } = require('@anthropic-ai/claude-agent-sdk');
+  const sdk = await loadSDK();
   const p = paths();
   const config = loadConfig();
   applyEnvConfig(config);
@@ -172,25 +211,13 @@ async function runViewSession(requirement, opts = {}) {
   }
 
   try {
-    const session = query({
-      prompt,
-      options: {
-        systemPrompt,
-        allowedTools: getAllowedTools(config),
-        permissionMode: 'bypassPermissions',
-        verbose: true,
-        cwd: opts.projectRoot || process.cwd(),
-        timeout_ms: config.timeoutMs,
-      }
-    });
+    const queryOpts = buildQueryOptions(config, opts);
+    queryOpts.systemPrompt = systemPrompt;
+
+    const session = sdk.query({ prompt, options: queryOpts });
 
     for await (const message of session) {
-      if (message.content) {
-        const text = typeof message.content === 'string'
-          ? message.content
-          : JSON.stringify(message.content);
-        process.stdout.write(text);
-      }
+      logMessage(message, null);
     }
   } catch (err) {
     log('error', `观测模式错误: ${err.message}`);
@@ -198,7 +225,7 @@ async function runViewSession(requirement, opts = {}) {
 }
 
 async function runAddSession(instruction, opts = {}) {
-  const { query } = require('@anthropic-ai/claude-agent-sdk');
+  const sdk = await loadSDK();
   const config = loadConfig();
   applyEnvConfig(config);
 
@@ -210,26 +237,13 @@ async function runAddSession(instruction, opts = {}) {
   const logStream = fs.createWriteStream(logFile, { flags: 'a' });
 
   try {
-    const session = query({
-      prompt,
-      options: {
-        systemPrompt,
-        allowedTools: getAllowedTools(config),
-        permissionMode: 'bypassPermissions',
-        verbose: true,
-        cwd: opts.projectRoot || process.cwd(),
-        timeout_ms: config.timeoutMs,
-      }
-    });
+    const queryOpts = buildQueryOptions(config, opts);
+    queryOpts.systemPrompt = systemPrompt;
+
+    const session = sdk.query({ prompt, options: queryOpts });
 
     for await (const message of session) {
-      if (message.content) {
-        const text = typeof message.content === 'string'
-          ? message.content
-          : JSON.stringify(message.content);
-        process.stdout.write(text);
-        logStream.write(text);
-      }
+      logMessage(message, logStream);
     }
 
     logStream.end();