imtoagent 0.3.5 → 0.3.6

package/bin/imtoagent-real

@@ -5,14 +5,16 @@
 // Available after npm install -g imtoagent:
 //   imtoagent setup    — interactive setup wizard
 //   imtoagent start    — start gateway in background
+//   imtoagent run      — start gateway in foreground
 //   imtoagent stop     — stop gateway
 //   imtoagent status   — check running status
 //   imtoagent restore  — hot reload
-//   imtoagent daemon   — foreground daemon (auto-restart + logs)
+//   imtoagent daemon   — foreground daemon (auto-restart, for launchd/systemd)
 // ================================================================
 
 import * as fs from 'fs';
 import * as path from 'path';
+import { spawn, execSync } from 'child_process';
 import { getDataDir } from '../modules/utils/paths';
 
 const PID_FILE = '/tmp/imtoagent.pid';
@@ -29,6 +31,9 @@ switch (command) {
   case 'start':
     await cmdStart();
     break;
+  case 'run':
+    await cmdRun();
+    break;
   case 'stop':
     await cmdStop();
     break;
@@ -42,14 +47,12 @@ switch (command) {
     await cmdDaemon();
     break;
   case undefined: {
-    // No command → auto-enter setup if not configured, show help otherwise
     const dataDir = getDataDir();
     const configPath = path.join(dataDir, 'config.json');
     let needsSetup = !fs.existsSync(configPath);
     if (!needsSetup) {
       try {
         const raw = fs.readFileSync(configPath, 'utf-8');
-        // If config still has YOUR_ placeholders, setup is incomplete
         needsSetup = /YOUR_[A-Z_]+/.test(raw);
       } catch { needsSetup = true; }
     }
@@ -81,11 +84,12 @@ imtoagent — IM ↔ Agent Unified Gateway
 
 Usage:
   imtoagent setup     Interactive setup wizard
-  imtoagent start     Start gateway in background
+  imtoagent start     Start gateway in background (returns immediately)
+  imtoagent run       Start gateway in foreground (Ctrl+C to stop)
   imtoagent stop      Stop gateway
   imtoagent status    Check running status
   imtoagent restore   Hot reload
-  imtoagent daemon    Foreground daemon (auto-restart + logs, for launchd/systemd)
+  imtoagent daemon    Foreground daemon with auto-restart (for launchd/systemd)
 
 Data directory: ${getDataDir()}
 `);
@@ -100,7 +104,22 @@ async function cmdSetup() {
 }
 
 // ================================================================
-// start — launch in background
+// Shared: build gateway launch args
+// ================================================================
+function getGatewayArgs() {
+  const pkgDir = path.resolve(import.meta.dirname, '..');
+  const indexFile = path.join(pkgDir, 'index.ts');
+  return { execPath: process.execPath, args: ['run', indexFile] };
+}
+
+function ensureLogDir(dataDir: string) {
+  const logsDir = path.join(dataDir, 'logs');
+  if (!fs.existsSync(logsDir)) fs.mkdirSync(logsDir, { recursive: true });
+  return path.join(logsDir, 'imtoagent.log');
+}
+
+// ================================================================
+// start — background mode (spawn detached, log to file, return immediately)
 // ================================================================
 async function cmdStart() {
   // Check if already running
@@ -112,12 +131,10 @@ async function cmdStart() {
       console.error(`   Run "imtoagent stop" to stop first`);
       process.exit(1);
     } catch {
-      // Stale PID file, clean up
       fs.unlinkSync(PID_FILE);
     }
   }
 
-  // Check if config exists
   const dataDir = getDataDir();
   const configPath = path.join(dataDir, 'config.json');
   if (!fs.existsSync(configPath)) {
@@ -125,7 +142,7 @@ async function cmdStart() {
     process.exit(1);
   }
 
-  // Check if configured backends are installed
+  // Backend check (non-blocking)
   try {
     const { checkBackend } = await import('../modules/utils/backend-check');
     const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
@@ -140,25 +157,89 @@ async function cmdStart() {
     }
     if (missingBackends.length > 0) {
       console.error(`\n⚠️  The following backends are configured but not installed, messages will fail after gateway starts:`);
-      for (const b of missingBackends) {
-        console.error(`   ❌ ${b}`);
-      }
+      for (const b of missingBackends) console.error(`   ❌ ${b}`);
       console.error(`\nPlease install the missing backends, or run "imtoagent setup" to reconfigure.\n`);
-      // Don't force exit, let user start gateway and install backends later
     }
   } catch {
     // Check failure doesn't block startup
   }
 
-  console.log('🚀 Starting imtoagent gateway...');
+  const logFile = ensureLogDir(dataDir);
+
+  console.log('🚀 Starting imtoagent gateway (background)...');
   console.log(`   Data directory: ${dataDir}`);
-  console.log(`   Config file: ${configPath}`);
+  console.log(`   Log file: ${logFile}`);
 
-  // Launch in background using Bun.spawn
-  const pkgDir = path.resolve(import.meta.dirname, '..');
-  const indexFile = path.join(pkgDir, 'index.ts');
+  const { execPath, args } = getGatewayArgs();
+  const cmdLine = `"${execPath}" run "${path.resolve(import.meta.dirname, '..', 'index.ts')}"`;
+
+  // Use a shell to launch the gateway in background — avoids event-loop blockers
+  const shellCmd = `IMTOAGENT_HOME="${dataDir}" ${cmdLine} >> "${logFile}" 2>&1 &
+PID=$!
+echo $PID`;
 
-  const child = Bun.spawn([process.execPath, 'run', indexFile], {
+  const { execSync } = await import('child_process');
+  const pidStr = execSync(shellCmd, {
+    cwd: dataDir,
+    env: { ...process.env, IMTOAGENT_HOME: dataDir },
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  }).trim();
+  const gatewayPid = parseInt(pidStr.split('\n').pop()!);
+
+  fs.writeFileSync(PID_FILE, String(gatewayPid));
+  console.log(`✅ Gateway started (PID=${gatewayPid})`);
+
+  // Wait for startup verification
+  await new Promise(r => setTimeout(r, 3000));
+  try {
+    process.kill(gatewayPid, 0);
+    console.log('✅ Gateway is running');
+  } catch {
+    console.error('❌ Gateway failed to start, check logs:');
+    if (fs.existsSync(logFile)) {
+      console.log(fs.readFileSync(logFile, 'utf-8').slice(-2000));
+    }
+    fs.unlinkSync(PID_FILE);
+    process.exit(1);
+  }
+
+  // Explicitly exit — Bun may keep event loop alive due to inherited stdio
+  process.exit(0);
+}
+
+// ================================================================
+// run — foreground mode (real-time logs, Ctrl+C to stop)
+// ================================================================
+async function cmdRun() {
+  const dataDir = getDataDir();
+  const configPath = path.join(dataDir, 'config.json');
+  if (!fs.existsSync(configPath)) {
+    console.error('❌ No config file found. Please run "imtoagent setup" first');
+    process.exit(1);
+  }
+
+  const logFile = ensureLogDir(dataDir);
+
+  // Warn if already running in background
+  if (fs.existsSync(PID_FILE)) {
+    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8').trim());
+    try {
+      process.kill(pid, 0);
+      console.log(`⚠️  Gateway is already running in background (PID=${pid})`);
+      console.log(`   Run "imtoagent stop" first, or this may conflict.\n`);
+    } catch {
+      fs.unlinkSync(PID_FILE);
+    }
+  }
+
+  const { execPath, args } = getGatewayArgs();
+
+  console.log('🚀 Starting imtoagent gateway (foreground mode)...');
+  console.log('   Press Ctrl+C to stop');
+  console.log('');
+
+  const child = Bun.spawn([execPath, ...args], {
     cwd: dataDir,
     env: { ...process.env, IMTOAGENT_HOME: dataDir },
     stdout: 'pipe',
@@ -166,16 +247,10 @@ async function cmdStart() {
   });
 
   fs.writeFileSync(PID_FILE, String(child.pid));
-  console.log(`✅ Gateway started (PID=${child.pid})`);
 
-  // Redirect background logs to logs/
-  const logsDir = path.join(dataDir, 'logs');
-  if (!fs.existsSync(logsDir)) fs.mkdirSync(logsDir, { recursive: true });
-  const logFile = path.join(logsDir, 'imtoagent.log');
+  const logStream = fs.createWriteStream(logFile, { flags: 'a' });
 
-  // Start log collection
-  (async () => {
-    const logStream = fs.createWriteStream(logFile, { flags: 'a' });
+  const pumpOut = (async () => {
     for await (const chunk of child.stdout as any) {
       const line = new TextDecoder().decode(chunk);
       process.stdout.write(line);
@@ -183,8 +258,7 @@ async function cmdStart() {
     }
   })().catch(() => {});
 
-  (async () => {
-    const logStream = fs.createWriteStream(logFile, { flags: 'a' });
+  const pumpErr = (async () => {
     for await (const chunk of child.stderr as any) {
       const line = new TextDecoder().decode(chunk);
       process.stderr.write(line);
@@ -192,18 +266,24 @@ async function cmdStart() {
     }
   })().catch(() => {});
 
-  // Wait for startup verification (check PID survives 5s)
-  await new Promise(r => setTimeout(r, 3000));
-  try {
-    process.kill(child.pid, 0);
-    console.log('✅ Gateway is running');
-  } catch {
-    console.error('❌ Gateway failed to start, check logs:');
-    if (fs.existsSync(logFile)) {
-      console.log(fs.readFileSync(logFile, 'utf-8').slice(-2000));
-    }
-    fs.unlinkSync(PID_FILE);
-    process.exit(1);
+  // Ctrl+C → SIGTERM to child
+  const cleanup = () => {
+    console.log('\n🛑 Stopping gateway...');
+    try { process.kill(child.pid, 'SIGTERM'); } catch {}
+  };
+  process.on('SIGINT', cleanup);
+  process.on('SIGTERM', cleanup);
+
+  const exitCode = await child.exited;
+  await Promise.allSettled([pumpOut, pumpErr]);
+  logStream.end();
+
+  try { fs.unlinkSync(PID_FILE); } catch {}
+
+  if (exitCode === 0) {
+    console.log('✅ Gateway exited cleanly');
+  } else {
+    console.log(`⚠️  Gateway exited with code ${exitCode}`);
   }
 }
 
@@ -222,7 +302,6 @@ async function cmdStop() {
     console.log(`⏹  Stopping gateway (PID=${pid})...`);
     process.kill(pid, 'SIGTERM');
 
-    // Wait for process to exit
     for (let i = 0; i < 20; i++) {
       try {
         process.kill(pid, 0);
@@ -232,7 +311,6 @@ async function cmdStop() {
       }
     }
 
-    // Check if still running
     try {
       process.kill(pid, 0);
       console.log('⚠️  Process not responding, force killing...');
@@ -256,7 +334,6 @@ async function cmdStatus() {
   console.log(`\n📊 imtoagent Status`);
   console.log(`   Data directory: ${dataDir}`);
 
-  // Process status
   if (fs.existsSync(PID_FILE)) {
     const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8').trim());
     try {
@@ -269,7 +346,6 @@ async function cmdStatus() {
     console.log(`   Process: ⏸  Not running`);
   }
 
-  // Config file
   const configPath = path.join(dataDir, 'config.json');
   if (fs.existsSync(configPath)) {
     try {
@@ -286,7 +362,6 @@ async function cmdStatus() {
     console.log(`   Config: ❌ Not found (run "imtoagent setup")`);
   }
 
-  // Log file
   const logFile = path.join(dataDir, 'logs', 'imtoagent.log');
   if (fs.existsSync(logFile)) {
     const stats = fs.statSync(logFile);
@@ -320,13 +395,7 @@ async function cmdRestore() {
 }
 
 // ================================================================
-// daemon — foreground daemon mode (auto-restart + logs + graceful shutdown)
-// ================================================================
-// Design:
-//   - Runs in foreground, managed by launchd / systemd etc.
-//   - Auto-restarts on crash (exponential backoff, max 30s)
-//   - Graceful shutdown on SIGTERM/SIGINT, no restart
-//   - Logs written to ~/.imtoagent/logs/imtoagent.log
+// daemon — foreground daemon with auto-restart (for launchd/systemd)
 // ================================================================
 async function cmdDaemon(): Promise<void> {
   const dataDir = getDataDir();
@@ -337,21 +406,15 @@ async function cmdDaemon(): Promise<void> {
     process.exit(1);
   }
 
-  const logsDir = path.join(dataDir, 'logs');
-  if (!fs.existsSync(logsDir)) fs.mkdirSync(logsDir, { recursive: true });
-  const logFile = path.join(logsDir, 'imtoagent.log');
-
-  const pkgDir = path.resolve(import.meta.dirname, '..');
-  const indexFile = path.join(pkgDir, 'index.ts');
+  const logFile = ensureLogDir(dataDir);
+  const { execPath, args } = getGatewayArgs();
 
   console.log(`🛡  imtoagent Daemon Mode`);
   console.log(`   Data directory: ${dataDir}`);
   console.log(`   Log file: ${logFile}`);
   console.log(`   Press Ctrl+C to stop\n`);
 
-  // Graceful shutdown flag
   let shuttingDown = false;
-
   const shutdown = () => {
     if (shuttingDown) return;
     shuttingDown = true;
@@ -362,15 +425,13 @@ async function cmdDaemon(): Promise<void> {
   process.on('SIGINT', shutdown);
 
   let retryDelay = 0;
-  const MAX_RETRY_DELAY = 30_000; // 30s cap
+  const MAX_RETRY_DELAY = 30_000;
 
   while (!shuttingDown) {
-    // No delay on first run, exponential backoff after
     if (retryDelay > 0) {
       console.log(`   Waiting ${retryDelay / 1000}s before restart...`);
       await new Promise<void>(resolve => {
         const timer = setTimeout(resolve, retryDelay);
-        // Exit immediately if shutdown signal received during wait
         const check = setInterval(() => {
           if (shuttingDown) {
             clearTimeout(timer);
@@ -382,56 +443,39 @@ async function cmdDaemon(): Promise<void> {
       if (shuttingDown) break;
     }
 
-    const logStream = fs.createWriteStream(logFile, { flags: 'a' });
+    // Open log fd for child stdout/stderr
+    const logFd = fs.openSync(logFile, 'a');
 
-    const child = Bun.spawn([process.execPath, 'run', indexFile], {
+    const child = spawn(execPath, args, {
       cwd: dataDir,
       env: { ...process.env, IMTOAGENT_HOME: dataDir },
-      stdout: 'pipe',
-      stderr: 'pipe',
+      detached: true,
+      stdio: ['ignore', logFd, logFd],
     });
 
     const childPid = child.pid;
     fs.writeFileSync(PID_FILE, String(childPid));
     console.log(`[${new Date().toISOString()}] 🚀 Starting gateway (PID=${childPid})`);
 
-    // Log collection
-    const pumpStdout = (async () => {
-      for await (const chunk of child.stdout as any) {
-        const line = new TextDecoder().decode(chunk);
-        process.stdout.write(line);
-        logStream.write(line);
-      }
-    })().catch(() => {});
-
-    const pumpStderr = (async () => {
-      for await (const chunk of child.stderr as any) {
-        const line = new TextDecoder().decode(chunk);
-        process.stderr.write(line);
-        logStream.write(line);
-      }
-    })().catch(() => {});
-
-    // Wait for child process to exit
-    const exitCode = await child.exited;
-    await Promise.allSettled([pumpStdout, pumpStderr]);
-    logStream.end();
+    let childExitCode: number | null = null;
+    await new Promise<void>(resolve => {
+      child.on('exit', (code) => { childExitCode = code; resolve(); });
+      child.on('error', () => resolve());
+    });
 
+    fs.closeSync(logFd);
     try { fs.unlinkSync(PID_FILE); } catch {}
 
     if (shuttingDown) break;
 
-    // Determine if restart needed
-    if (exitCode === 0) {
+    if (childExitCode === 0) {
       console.log(`[${new Date().toISOString()}] ⏹  Gateway exited cleanly (code=0), not restarting`);
       break;
     }
 
-    // Crash → exponential backoff restart
     retryDelay = retryDelay === 0 ? 3_000 : Math.min(retryDelay * 2, MAX_RETRY_DELAY);
-    console.log(`[${new Date().toISOString()}] ⚠️  Gateway crashed (code=${exitCode}), restarting in ${retryDelay / 1000}s`);
+    console.log(`[${new Date().toISOString()}] ⚠️  Gateway crashed (code=${childExitCode}), restarting in ${retryDelay / 1000}s`);
   }
 
   console.log('👋 Daemon stopped');
 }
-

package/bin/imtoagent.cjs

@@ -3,7 +3,7 @@
 "use strict";
 var path = require("path");
 var fs = require("fs");
-var spawnSync = require("child_process").spawnSync;
+var spawn = require("child_process").spawn;
 
 var candidates = [
   process.env.BUN_BIN,
@@ -12,7 +12,7 @@ var candidates = [
   "/opt/homebrew/bin/bun",
 ];
 try {
-  var r = spawnSync("which", ["bun"]);
+  var r = require("child_process").spawnSync("which", ["bun"]);
   if (r.status === 0) candidates.unshift(r.stdout.toString().trim());
 } catch (e) {}
 
@@ -32,8 +32,16 @@ if (!bunPath) {
 
 var pkgDir = path.resolve(__dirname, "..");
 var real = path.join(pkgDir, "bin", "imtoagent-real");
-var result = spawnSync(bunPath, [real].concat(process.argv.slice(2)), {
+var child = spawn(bunPath, [real].concat(process.argv.slice(2)), {
   stdio: "inherit",
   env: Object.assign({}, process.env),
 });
-process.exit(result.status || 0);
+
+child.on("exit", function (code) {
+  process.exit(code || 0);
+});
+
+child.on("error", function (err) {
+  console.error("❌ Failed to start imtoagent:", err.message);
+  process.exit(1);
+});

package/modules/agent/codex-adapter.ts

@@ -88,7 +88,7 @@ async function spawnCodexResume(cwd: string, threadId: string, prompt: string):
   try {
     [stdout, stderr] = await Promise.all([
       new Response(child.stdout).text().catch((e: any) => { throw new Error(`stdout read failed: ${e?.message || e}`); }),
-      new Response(child.stderr).text().catch((e: any) => { throw new Error(`stderr read failed: ${e?.message || e}`; }),
+      new Response(child.stderr).text().catch((e: any) => { throw new Error(`stderr read failed: ${e?.message || e}`); }),
     ]);
   } catch (ioErr: any) {
     try { child.kill('SIGKILL'); } catch {}

package/package.json

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