ai-terminal-remote-bot 1.0.13 → 1.0.15

package/cli.js

@@ -8,7 +8,7 @@
 import { readFileSync, writeFileSync, unlinkSync, existsSync, openSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
-import { spawn, execSync } from 'child_process';
+import { spawn } from 'child_process';
 import { loadConfig, configExists, CONFIG_DIR } from './src/config.mjs';
 import { runSetup } from './src/setup.mjs';
 import { startServer } from './src/server.mjs';
@@ -42,46 +42,32 @@ function isRunning(pid) {
 }
 
 function stopBot() {
-  let stopped = false;
-
-  // Kill by PID file first
   const pid = readPid();
-  if (pid && isRunning(pid)) {
-    try { process.kill(pid, 'SIGKILL'); stopped = true; } catch {}
+  if (!pid || !isRunning(pid)) {
+    console.log(t('cli.botNotRunning'));
+    return false;
   }
-  try { unlinkSync(PID_FILE); } catch {}
-
-  // Also kill any remaining processes matching our CLI
   try {
-    const pids = execSync('pgrep -f "ai-terminal-remote-bot" 2>/dev/null', { encoding: 'utf8' }).trim().split('\n');
-    for (const p of pids) {
-      const n = parseInt(p);
-      if (n && n !== process.pid) {
-        try { process.kill(n, 'SIGKILL'); stopped = true; } catch {}
-      }
-    }
-  } catch {}
-
-  if (stopped) {
+    process.kill(pid, 'SIGTERM');
+    try { unlinkSync(PID_FILE); } catch {}
     console.log(t('cli.botStopped'));
-  } else {
-    console.log(t('cli.botNotRunning'));
+    return true;
+  } catch (err) {
+    console.error(t('cli.botStopFailed', { pid, error: err.message }));
+    return false;
   }
-  return stopped;
 }
 
 function startDaemon() {
-  // Kill any orphaned processes first
-  try {
-    const pids = execSync('pgrep -f "ai-terminal-remote-bot.*--daemon" 2>/dev/null', { encoding: 'utf8' }).trim().split('\n');
-    for (const p of pids) {
-      const n = parseInt(p);
-      if (n && n !== process.pid) {
-        try { process.kill(n, 'SIGKILL'); } catch {}
-      }
-    }
-  } catch {}
-  try { unlinkSync(PID_FILE); } catch {}
+  const pid = readPid();
+  if (pid && isRunning(pid)) {
+    console.log(t('cli.botAlreadyRunning', { pid }));
+    return;
+  }
+  // Clean stale PID file
+  if (pid) {
+    try { unlinkSync(PID_FILE); } catch {}
+  }
 
   const logFd = openSync(LOG_FILE, 'a');
   const child = spawn(process.execPath, ['--disable-warning=DEP0040', fileURLToPath(import.meta.url), '--daemon'], {
@@ -135,24 +121,21 @@ if (!configExists()) {
 const config = loadConfig();
 initI18n(config.language);
 
-// --stop / stop
-if (args.includes('--stop') || args.includes('stop')) {
+// --stop
+if (args.includes('--stop')) {
   stopBot();
   process.exit(0);
 }
 
-// --restart / restart
-if (args.includes('--restart') || args.includes('restart')) {
+// --restart
+if (args.includes('--restart')) {
   stopBot();
-  // Wait for processes to die
-  const { setTimeout: sleep } = await import('timers/promises');
-  await sleep(1500);
   startDaemon();
   process.exit(0);
 }
 
-// --status / status
-if (args.includes('--status') || args.includes('status')) {
+// --status
+if (args.includes('--status')) {
   const pid = readPid();
   if (pid && isRunning(pid)) {
     console.log(t('cli.botRunning', { pid }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-terminal-remote-bot",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Secure remote terminal bot with Claude Code integration",
   "type": "module",
   "bin": {