imtoagent 0.3.18 → 0.3.20

package/index.ts

@@ -3,6 +3,7 @@
 // ============================================================
 
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
 
 // ===== 重启信号文件路径（统一固定，不依赖 getDataDir） =====
@@ -315,7 +316,7 @@ class Bot {
     this.backend = cfg.backend;
     this.appId = cfg.appId;
     this.appSecret = cfg.appSecret;
-    this.defaultCwd = cfg.cwd || globalConfig.system?.defaultProjectDir || '/Users/keyi/Projects';
+    this.defaultCwd = cfg.cwd || globalConfig.system?.defaultProjectDir || path.join(os.homedir(), 'Projects');
     this.config = globalConfig;
 
     // Bot 级模型配置
@@ -874,7 +875,7 @@ async function main() {
     process.exit(0);
   }
 
-  const DEFAULT_PROJECT_DIR = config.system?.defaultProjectDir || '/Users/keyi/Projects';
+  const DEFAULT_PROJECT_DIR = config.system?.defaultProjectDir || path.join(os.homedir(), 'Projects');
 
   if (config.modelAliases) sharedState.modelAliases = config.modelAliases;
   const { providers: _providers, defaultModel: DEFAULT_MODEL_SPEC } = loadProviders();

package/modules/agent/claude-adapter.ts

@@ -69,7 +69,7 @@ export class ClaudeAdapter implements AgentAdapter {
   private ctx: ClaudeAdapterContext;
   private activeControllers: AbortController[] = [];
   /** 单次调用最大超时（毫秒），0 = 不限制 */
-  static MAX_CALL_TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟
+  static MAX_CALL_TIMEOUT_MS = 15 * 60 * 1000; // 15 分钟
 
   constructor(ctx: ClaudeAdapterContext) {
     this.ctx = ctx;

package/modules/agent/opencode-adapter.ts

@@ -64,12 +64,12 @@ async function ocSendPrompt(
   initialText: string,
   system: string,
   defaultModel: { providerID: string; modelID: string },
-  onTool?: (name: string, args: Record<string, any>) => void,
+  onProgress?: (text: string) => void,
   cancelSignal?: AbortSignal
 ): Promise<{ response: string; toolCalls: Array<{ name: string; summary: string }> }> {
   const MAX_TURNS = 50;
-  const TURN_TIMEOUT = 300_000;  // 5 min per turn
-  const MAX_DURATION = 600_000;  // total timeout 10 min
+  const TURN_TIMEOUT = 900_000;  // 15 min per turn
+  const MAX_DURATION = 3_600_000;  // total timeout 60 min
   const startTime = Date.now();
 
   let promptText = initialText;
@@ -79,7 +79,8 @@ async function ocSendPrompt(
 
   while (turn < MAX_TURNS) {
     if (Date.now() - startTime > MAX_DURATION) {
-      console.error('[OpenCodeAdapter] Task timed out (10min)');
+      console.error(`[OpenCodeAdapter] Task timed out (${MAX_DURATION / 60000}min)`);
+      if (onProgress) onProgress('⚠️ 任务超时，已停止');
       break;
     }
     turn++;
@@ -130,7 +131,7 @@ async function ocSendPrompt(
         const summary = args.command || args.cmd || args.file_path || args.query
           || JSON.stringify(args).slice(0, 80);
         allToolCalls.push({ name, summary });
-        if (onTool) onTool(name, args);
+        if (onProgress) onProgress(`🔧 正在执行: ${name} — ${summary.slice(0, 60)}`);
         console.log(`[OpenCodeAdapter] 🔧 turn ${turn}: ${name} ${summary.slice(0, 60)}`);
       }
     }
@@ -138,6 +139,7 @@ async function ocSendPrompt(
     // 有文本回复 → 任务完成（OpenCode 内部已完成多轮 agent loop）
     if (hasText) {
       console.log(`[OpenCodeAdapter] ✅ completed at turn ${turn}/${MAX_TURNS}`);
+      if (onProgress) onProgress(`✅ 第 ${turn} 轮处理完成`);
       break;
     }
 
@@ -147,7 +149,8 @@ async function ocSendPrompt(
       break;
     }
 
-    // 仅有 tool_call 无文本 → OpenCode 无法自行执行，推进下一轮
+    // 仅有 tool_call 无文本 → 推进下一轮
+    if (onProgress) onProgress(`⏳ 第 ${turn}/${MAX_TURNS} 轮，继续推进...`);
     promptText = 'Continue executing, complete remaining tasks';
   }
 
@@ -215,16 +218,18 @@ export class OpenCodeAdapter implements AgentAdapter {
     console.log(`[OpenCodeAdapter] 📝 system prompt built (${systemPrompt.length} chars)`);
 
     // 发送 prompt（多轮循环：自动推进 tool_call → 纯文本响应）
+    // 注意：ocSendPrompt 不直接依赖 ctx，由 handleMessage 传入 onProgress 回调
+    const onProgress = async (text: string) => {
+      try { await input.sendProgress?.(text); } catch {}
+    };
+
     const { response, toolCalls } = await ocSendPrompt(
       serverUrl,
       sessionAny.ocSessionId,
       effectiveText,
       systemPrompt,
       defaultModel,
-      // onTool 回调：适配器层不依赖外部 ctx，直接记日志
-      (name, args) => {
-        // 工具调用日志由 Runtime 层统一格式化
-      },
+      onProgress,
       input.cancelSignal
     );
 
@@ -281,19 +286,34 @@ export async function startOpenCodeServer(): Promise<void> {
 
   console.log(`[OpenCodeAdapter] Using opencode binary: ${ocBinPath}`);
 
-  const child = Bun.spawn(
-    [ocBinPath, 'serve', '--port', String(OC_PORT), '--hostname', '127.0.0.1'],
-    {
-      cwd: getDataDir(),
-      env: {
-        ...process.env,
-        // 环形通信无需真实 key，但 OpenCode 的 Anthropic provider 要求此变量存在
-        ANTHROPIC_API_KEY: 'imtoagent-local',
+  const dataDir = getDataDir();
+  if (!fs.existsSync(dataDir)) {
+    console.log(`[OpenCodeAdapter] Creating data directory: ${dataDir}`);
+    fs.mkdirSync(dataDir, { recursive: true });
+  }
+  console.log(`[OpenCodeAdapter] Working directory: ${dataDir}`);
+
+  let child;
+  try {
+    child = Bun.spawn(
+      [ocBinPath, 'serve', '--port', String(OC_PORT), '--hostname', '127.0.0.1'],
+      {
+        cwd: dataDir,
+        env: {
+          ...process.env,
+          // 环形通信无需真实 key，但 OpenCode 的 Anthropic provider 要求此变量存在
+          ANTHROPIC_API_KEY: 'imtoagent-local',
+        },
+        stdout: 'pipe',
+        stderr: 'pipe',
       },
-      stdout: 'pipe',
-      stderr: 'pipe',
-    },
-  );
+    );
+  } catch (err: any) {
+    console.error(`[OpenCodeAdapter] Failed to start opencode serve: ${err.message}`);
+    console.error(`  Binary: ${ocBinPath}`);
+    console.error(`  Work dir: ${dataDir} (exists: ${fs.existsSync(dataDir)})`);
+    throw new Error(`opencode serve failed: ${err.message}`);
+  }
 
   // 后台收集日志
   (async () => {

package/modules/core/runtime.ts

@@ -157,6 +157,7 @@ export class AgentRuntime {
           systemPrompt: ctx.systemPrompt,
           model: ctx.model,
           cancelSignal: ctx.cancelSignal,
+          sendProgress: (t: string) => ctx.sendProgress(t),
         };
 
         const output = await adapter.handleMessage(input);

package/modules/core/types.ts

@@ -115,6 +115,8 @@ export interface AgentInput {
   model: string;
   /** 外部取消信号（用于 /stop 等中断命令） */
   cancelSignal?: AbortSignal;
+  /** 进度回调（适配器向用户发送中间状态，如工具调用、思考进度） */
+  sendProgress?: (text: string) => Promise<void>;
 }
 
 /** Agent 输出 */

package/modules/utils/paths.ts

@@ -39,8 +39,8 @@ export function getDataDir(): string {
   // ====== 第 1 步：查找已有的配置文件 ======
   const candidates: { dir: string; label: string }[] = [];
 
-  // IMTOAGENT_HOME（优先检查，但不强制）
-  if (envHome && fs.existsSync(path.join(envHome, 'config.json'))) {
+  // IMTOAGENT_HOME（优先检查，但不强制；目录不存在则忽略）
+  if (envHome && fs.existsSync(envHome) && fs.existsSync(path.join(envHome, 'config.json'))) {
     candidates.push({ dir: envHome, label: 'IMTOAGENT_HOME' });
   }
 
@@ -83,7 +83,7 @@ function initDataDir(dotDir: string, envHome: string): string {
   let sourceDir: string | null = null;
   let sourceLabel = '';
 
-  if (envHome && fs.existsSync(path.join(envHome, 'config.json'))) {
+  if (envHome && fs.existsSync(envHome) && fs.existsSync(path.join(envHome, 'config.json'))) {
     sourceDir = envHome;
     sourceLabel = 'IMTOAGENT_HOME';
   } else if (fs.existsSync(path.join(process.cwd(), 'config.json'))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imtoagent",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "IM ↔ Agent 统一网关 — 飞书/Telegram/微信/企业微信对接 Claude Code/Codex/OpenCode",
   "type": "module",
   "bin": {