@plumpslabs/fennec-cli 1.13.5 → 1.13.7

package/dist/index.js

@@ -2091,7 +2091,7 @@ function hexColor(color) {
 }
 var fennecOrange2 = hexColor("#FF6432");
 var fennecGold = hexColor("#FFB347");
-var VERSION = "1.13.5";
+var VERSION = "1.13.7";
 var cachedBanner = null;
 var cachedCompact = null;
 function generateBanner() {
@@ -2242,13 +2242,14 @@ var COMMANDS = {
   kill: {
     name: "kill",
     usage: "kill <pid|name|all>",
-    summary: "Kill a process by PID, name, or kill all user processes",
-    description: "Permanently removes a tracked app (unlike `stop`, which keeps it). Prompts before killing.",
+    summary: "Kill a Fennec-tracked process (by PID, tracked name, or all tracked)",
+    description: "Permanently removes a tracked app (unlike `stop`, which keeps it). By NAME it only matches Fennec-tracked apps \u2014 use an explicit PID to kill a system process. Prompts before killing.",
     options: [
       ["--signal <sig>", "Signal to send (default: SIGTERM). e.g. SIGKILL, SIGINT"],
-      ["--all, -a", "Kill all user processes (asks for confirmation)"]
+      ["--all, -a", "Kill ALL tracked apps (asks for confirmation)"],
+      ["-y, --yes", "Skip the confirmation prompt"]
     ],
-    examples: ["kill web", "kill 12345 --signal SIGKILL", "kill all"]
+    examples: ["kill web", "kill 12345 --signal SIGKILL", "kill all -y"]
   },
   supervisor: {
     name: "supervisor",
@@ -4216,8 +4217,9 @@ async function killCommand(args2) {
   const signalIndex = args2.indexOf("--signal");
   const signalRaw = signalIndex !== -1 ? args2[signalIndex + 1] : "SIGTERM";
   const signal = signalRaw ?? "SIGTERM";
+  const force = args2.includes("-y") || args2.includes("--yes");
   if (rawTarget === "all" || args2.includes("--all") || args2.includes("-a")) {
-    await killAll(signal);
+    await killAll(signal, force);
     return;
   }
   if (!rawTarget) {
@@ -4247,31 +4249,11 @@ async function killCommand(args2) {
       targetPid = trackedMatch.pid;
       displayName = `${trackedMatch.name} (PID ${targetPid})`;
     } else {
-      const currentPid = process.pid;
-      let matches = getSystemProcesses({ name: rawTarget, userOnly: true, sortBy: "cpu" });
-      matches = matches.filter((m) => m.pid !== currentPid);
-      if (matches.length === 0) {
-        console.error(renderError("Process not found", `No running process matching "${rawTarget}"`));
-        process.exit(1);
-      }
-      if (matches.length > 1) {
-        console.error(`
-  ${pc8.bold(`Multiple processes match "${rawTarget}":`)}`);
-        const selected = await selectPrompt("Select which to kill:", matches.map((p, i) => ({ value: String(i), label: `${p.name} (PID ${p.pid})`, description: `${p.command.slice(0, 80)} \u2014 CPU: ${p.cpuPercent}% MEM: ${p.memPercent}%` })));
-        if (selected === null) {
-          console.error(`  ${pc8.dim("Cancelled")}`);
-          return;
-        }
-        const idx = parseInt(selected, 10);
-        targetPid = matches[idx].pid;
-        displayName = `${matches[idx].name} (PID ${targetPid})`;
-      } else {
-        targetPid = matches[0].pid;
-        displayName = `${matches[0].name} (PID ${targetPid})`;
-      }
+      console.error(renderError("Not tracked", `No tracked process named "${rawTarget}".
+Use ${pc8.cyan(`fennec kill <pid>`)} to kill a system process by its PID.`));
+      process.exit(1);
     }
   }
-  const force = args2.includes("-y") || args2.includes("--yes");
   const confirmed = force || await confirmPrompt(`Kill ${pc8.bold(displayName)} with ${pc8.yellow(signal)}?`, false);
   if (!confirmed) {
     console.error(`  ${pc8.dim("Cancelled")}`);
@@ -4304,36 +4286,35 @@ async function killCommand(args2) {
     console.error(renderError("Permission denied", "Try running with sudo or use a different signal."));
   }
 }
-async function killAll(signal) {
-  const userProcs = getSystemProcesses({ userOnly: true, sortBy: "cpu", limit: 200 });
-  if (userProcs.length === 0) {
-    console.error(`  ${pc8.dim("No user processes to kill.")}`);
+async function killAll(signal, force) {
+  const tracked = readTracked();
+  const running = tracked.filter((t) => isTrackedRunning(t));
+  if (running.length === 0) {
+    console.error(`  ${pc8.dim("No running tracked apps to kill.")}`);
     return;
   }
   console.error(`
-  ${pc8.bold(`Kill ${userProcs.length} user processes?`)}`);
-  console.error(`  ${pc8.dim("This will stop ALL your running processes.")}`);
-  console.error(`  ${pc8.yellow("\u26A0 System processes will not be affected.")}
+  ${pc8.bold(`Kill ${running.length} tracked app(s)?`)}`);
+  console.error(`  ${pc8.dim("This stops every Fennec-tracked running process only \u2014 other processes are untouched.")}
 `);
-  const confirmed = await confirmPrompt(`${pc8.red("Are you sure?")} ${pc8.dim("This cannot be undone")}`, false);
+  const confirmed = force || await confirmPrompt(`${pc8.red("Are you sure?")} ${pc8.dim("This cannot be undone")}`, false);
   if (!confirmed) {
     console.error(`  ${pc8.dim("Cancelled.")}`);
     return;
   }
-  const spinner = createSpinner(`Killing ${userProcs.length} processes...`);
+  const spinner = createSpinner(`Killing ${running.length} tracked app(s)...`);
   let killed = 0, failed = 0;
-  for (const proc of userProcs) {
-    if (killProcess(proc.pid, signal)) {
+  for (const t of running) {
+    if (killProcess(t.pid, signal)) {
       killed++;
-      removeTrackedByPid(proc.pid);
+      removeTrackedByPid(t.pid);
     } else {
       failed++;
     }
-    if (killed % 10 === 0) await new Promise((r) => setTimeout(r, 50));
   }
-  await new Promise((r) => setTimeout(r, 500));
-  killed > 0 ? spinner.succeed(`${killed} process(es) killed`) : spinner.fail("Failed to kill processes");
-  if (failed > 0) console.error(`  ${pc8.yellow(`${failed} process(es) could not be killed`)} ${pc8.dim("(try with sudo)")}`);
+  await new Promise((r) => setTimeout(r, 300));
+  killed > 0 ? spinner.succeed(`${killed} tracked app(s) killed`) : spinner.fail("Failed to kill apps");
+  if (failed > 0) console.error(`  ${pc8.yellow(`${failed} app(s) could not be killed`)}`);
 }
 
 // src/commands/stop.ts
@@ -4624,35 +4605,27 @@ import { mkdirSync as mkdirSync6 } from "fs";
 import { resolve as resolve6 } from "path";
 import { homedir as homedir4 } from "os";
 async function restartCommand(args2) {
-  const name = args2[0];
-  if (!name) {
-    console.error(renderError("Missing process name/pid", "Usage: fennec restart <name|pid>"));
+  const raw = args2[0];
+  if (!raw) {
+    console.error(renderError("Missing process name/pid", "Usage: fennec restart <name|pid> [-y]"));
     process.exit(1);
   }
   const tracked = readTracked();
-  let trackedEntry = tracked.find((t) => t.name === name);
-  let targetPid;
-  if (trackedEntry) {
-    targetPid = trackedEntry.pid;
-  } else {
-    const pid = parseInt(name, 10);
-    if (!isNaN(pid) && String(pid) === name) {
-      targetPid = pid;
-    } else {
-      const processes = getSystemProcesses({ name, userOnly: true, limit: 1 });
-      if (processes.length === 0) {
-        console.error(renderError("Process not found", `No process matching "${name}"`));
-        process.exit(1);
-      }
-      targetPid = processes[0].pid;
-    }
+  const pidNum = parseInt(raw, 10);
+  const trackedEntry = tracked.find((t) => t.name === raw) ?? (!isNaN(pidNum) && String(pidNum) === raw ? tracked.find((t) => t.pid === pidNum) : void 0);
+  if (!trackedEntry) {
+    console.error(renderError("Not tracked", `No tracked process named or with PID "${raw}".
+fennec restart only re-spawns Fennec-tracked apps (from their saved config).`));
+    process.exit(1);
   }
-  const confirmed = await confirmPrompt(`Restart ${pc11.bold(`${name} (PID ${targetPid})`)}?`, false);
+  const targetPid = trackedEntry.pid;
+  const force = args2.includes("-y") || args2.includes("--yes");
+  const confirmed = force || await confirmPrompt(`Restart ${pc11.bold(`${trackedEntry.name} (PID ${targetPid})`)}?`, false);
   if (!confirmed) {
     console.error(`  ${pc11.dim("Cancelled")}`);
     return;
   }
-  const spinner = createSpinner(`Stopping PID ${targetPid}...`);
+  const spinner = createSpinner(`Stopping ${trackedEntry.name} (PID ${targetPid})...`);
   const killed = killProcess(targetPid, "SIGTERM");
   if (!killed) {
     spinner.fail(`Failed to stop PID ${targetPid}`);
@@ -4664,35 +4637,31 @@ async function restartCommand(args2) {
     killProcess(targetPid, "SIGKILL");
     await new Promise((r) => setTimeout(r, 500));
   }
-  spinner.succeed(`${name} stopped`);
-  if (trackedEntry) {
-    const respawnSpinner = createSpinner(`Re-spawning ${trackedEntry.name}...`);
-    try {
-      const cmdParts = resolveArgs(trackedEntry);
-      const logDir = resolve6(homedir4(), ".fennec", "logs");
-      mkdirSync6(logDir, { recursive: true });
-      const logFilePath = resolve6(logDir, `${trackedEntry.name}.log`);
-      const child = spawnDaemon({ cmdParts, name: trackedEntry.name, cwd: trackedEntry.cwd, logFilePath, env: buildSpawnEnv(trackedEntry.env), logMode: trackedEntry.logMode });
-      removeTrackedByPid(targetPid);
-      addTracked({
-        name: trackedEntry.name,
-        pid: child.pid ?? 0,
-        command: trackedEntry.command,
-        args: cmdParts,
-        port: trackedEntry.port,
-        cwd: trackedEntry.cwd,
-        env: trackedEntry.env,
-        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        autoRestart: trackedEntry.autoRestart,
-        logMode: trackedEntry.logMode
-      });
-      respawnSpinner.succeed(`${trackedEntry.name} restarted (PID: ${child.pid})`);
-    } catch (error) {
-      respawnSpinner.fail(`Failed to re-spawn ${trackedEntry.name}: ${String(error)}`);
-      console.error(`  ${pc11.dim("Config preserved. Re-run manually:")} ${renderCommand(trackedEntry.command)}`);
-    }
-  } else {
-    console.error(`  ${pc11.dim("No tracked config found. Re-run manually:")} ${renderCommand(name)}`);
+  spinner.succeed(`${trackedEntry.name} stopped`);
+  const respawnSpinner = createSpinner(`Re-spawning ${trackedEntry.name}...`);
+  try {
+    const cmdParts = resolveArgs(trackedEntry);
+    const logDir = resolve6(homedir4(), ".fennec", "logs");
+    mkdirSync6(logDir, { recursive: true });
+    const logFilePath = resolve6(logDir, `${trackedEntry.name}.log`);
+    const child = spawnDaemon({ cmdParts, name: trackedEntry.name, cwd: trackedEntry.cwd, logFilePath, env: buildSpawnEnv(trackedEntry.env), logMode: trackedEntry.logMode });
+    removeTrackedByPid(targetPid);
+    addTracked({
+      name: trackedEntry.name,
+      pid: child.pid ?? 0,
+      command: trackedEntry.command,
+      args: cmdParts,
+      port: trackedEntry.port,
+      cwd: trackedEntry.cwd,
+      env: trackedEntry.env,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      autoRestart: trackedEntry.autoRestart,
+      logMode: trackedEntry.logMode
+    });
+    respawnSpinner.succeed(`${trackedEntry.name} restarted (PID: ${child.pid})`);
+  } catch (error) {
+    respawnSpinner.fail(`Failed to re-spawn ${trackedEntry.name}: ${String(error)}`);
+    console.error(`  ${pc11.dim("Config preserved. Re-run manually:")} ${renderCommand(trackedEntry.command)}`);
   }
 }