imtoagent 0.3.17 → 0.3.19

package/index.ts

@@ -3,6 +3,7 @@
 // ============================================================
 
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
 
 // ===== 重启信号文件路径（统一固定，不依赖 getDataDir） =====
@@ -306,6 +307,8 @@ class Bot {
   sessions: Map<string, ChatSession> = new Map();
   commands: Map<string, CommandHandler> = new Map();
   adapter: AgentAdapter;
+  /** 正在执行的任务的取消信号（chatId → AbortController） */
+  activeControllers: Map<string, AbortController> = new Map();
 
   constructor(cfg: BotConfig, globalConfig: any) {
     this.id = cfg.id || cfg.name; // 后向兼容：无 id 时用 name
@@ -313,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 级模型配置
@@ -466,7 +469,7 @@ class Bot {
       let out = '📋 **CC Quick Commands**\n\n';
       out += '/status — Status\n/info — Config\n/stats — Stats\n';
       out += '/model — Model Switch\n/providers — Providers\n';
-      out += '/dir — Directory\n/clear — Clear\n';
+      out += '/dir — Directory\n/clear — Clear\n/stop — Stop current task\n';
       if (this.backend === 'claude') out += '/mode — Permission\n';
       else if (this.backend === 'codex') out += '/mode — Mode(auto/plan)\n';
       out += '/memory — Overview\n/soul — Soul\n/reload — Reload';
@@ -495,6 +498,13 @@ class Bot {
       return '✅ No active conversation';
     });
 
+    cmd('/stop', ({ chatId }) => {
+      const ctrl = this.activeControllers.get(chatId);
+      if (!ctrl) return '✅ 没有正在执行的任务';
+      ctrl.abort();
+      return '⏹️ 任务已取消';
+    });
+
     cmd('/model', ({ args }) => {
       const raw = args.trim();
       if (!raw) {
@@ -678,6 +688,8 @@ class Bot {
   // ===== 消息处理 — SDK 完整接入 =====
   async handleMessage(chatId: string, text: string, userId: string, attachments?: MessageAttachment[]) {
     activeRequests++;
+    const controller = new AbortController();
+    this.activeControllers.set(chatId, controller);
     try {
       // 限流
       const rlResult = checkRateLimit(chatId);
@@ -715,6 +727,7 @@ class Bot {
         sendProgress: async (t: string) => this.sendProgress(chatId, t),
         sendBlocks: async (blocks) => this.sendFormattedReplyDirect(chatId, blocks),
         imCaps: this.im.getCapabilities(),
+        cancelSignal: controller.signal,
       }, this.adapter, this.id);
 
       // Agent 自主重启信号检测
@@ -728,6 +741,7 @@ class Bot {
       console.error(`[${this.name}] handleMessage error: ${e.message}`);
       await this.reply(chatId, `❌ ${e.message}`);
     } finally {
+      this.activeControllers.delete(chatId);
       activeRequests--;
     }
   }
@@ -861,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/opencode-adapter.ts

@@ -64,7 +64,8 @@ async function ocSendPrompt(
   initialText: string,
   system: string,
   defaultModel: { providerID: string; modelID: string },
-  onTool?: (name: string, args: Record<string, any>) => void
+  onTool?: (name: string, args: Record<string, any>) => 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
@@ -92,15 +93,29 @@ async function ocSendPrompt(
 
     const ac = new AbortController();
     const timer = setTimeout(() => ac.abort(), TURN_TIMEOUT);
-    const res = await fetch(`${serverUrl}/session/${sessionId}/message`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-      signal: ac.signal,
-    }).finally(() => clearTimeout(timer));
-    if (!res.ok) throw new Error(`oc send prompt (turn ${turn}): ${res.status} ${await res.text()}`);
-
-    const data: OcMessage = await res.json();
+    // 组合外部取消信号（/stop）+ 本层超时
+    const signal = cancelSignal ? AbortSignal.any([ac.signal, cancelSignal]) : ac.signal;
+    let data: OcMessage;
+    try {
+      const res = await fetch(`${serverUrl}/session/${sessionId}/message`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+        signal,
+      }).finally(() => clearTimeout(timer));
+      if (!res.ok) throw new Error(`oc send prompt (turn ${turn}): ${res.status} ${await res.text()}`);
+      data = await res.json();
+    } catch (err: any) {
+      if (err?.name === 'AbortError') {
+        // 外部取消（/stop）优先于超时
+        if (cancelSignal?.aborted) {
+          console.log('[OpenCodeAdapter] ⏹️ Task cancelled by user (/stop)');
+          return { response: '⏹️ 任务已取消', toolCalls: allToolCalls };
+        }
+        throw err; // 超时等其它 AbortError 继续抛出
+      }
+      throw err;
+    }
     let hasToolCall = false;
     let hasText = false;
 
@@ -209,7 +224,8 @@ export class OpenCodeAdapter implements AgentAdapter {
       // onTool 回调：适配器层不依赖外部 ctx，直接记日志
       (name, args) => {
         // 工具调用日志由 Runtime 层统一格式化
-      }
+      },
+      input.cancelSignal
     );
 
     return {
@@ -265,19 +281,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

@@ -156,6 +156,7 @@ export class AgentRuntime {
           workingDir: ctx.workingDir,
           systemPrompt: ctx.systemPrompt,
           model: ctx.model,
+          cancelSignal: ctx.cancelSignal,
         };
 
         const output = await adapter.handleMessage(input);

package/modules/core/types.ts

@@ -113,6 +113,8 @@ export interface AgentInput {
   workingDir: string;
   systemPrompt?: string;
   model: string;
+  /** 外部取消信号（用于 /stop 等中断命令） */
+  cancelSignal?: AbortSignal;
 }
 
 /** Agent 输出 */
@@ -165,6 +167,8 @@ export interface MessageContext {
   sendBlocks?: (blocks: UnifiedBlock[]) => Promise<void>;
   /** IM 能力声明，用于 parseToBlocks 正确解析 */
   imCaps?: IMCapabilities;
+  /** 外部取消信号（用于 /stop 等中断命令） */
+  cancelSignal?: AbortSignal;
 }
 
 /** Session 管理器 */

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.17",
+  "version": "0.3.19",
   "description": "IM ↔ Agent 统一网关 — 飞书/Telegram/微信/企业微信对接 Claude Code/Codex/OpenCode",
   "type": "module",
   "bin": {