@plumpslabs/fennec-cli 1.13.6 → 1.13.8

package/dist/index.js

@@ -2091,7 +2091,7 @@ function hexColor(color) {
 }
 var fennecOrange2 = hexColor("#FF6432");
 var fennecGold = hexColor("#FFB347");
-var VERSION = "1.13.6";
+var VERSION = "1.13.8";
 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",
@@ -4240,36 +4241,18 @@ async function killCommand(args2) {
     const trackedMatch = tracked.find((t) => t.name === rawTarget);
     if (trackedMatch) {
       if (!isTrackedRunning(trackedMatch)) {
+        removeTrackedByPid(trackedMatch.pid);
         console.error(`
-  ${pc8.yellow("\u26A0")} ${pc8.bold(rawTarget)} ${pc8.dim("is already stopped (no running process to kill)")}`);
-        console.error(`  ${pc8.dim("Use")} ${pc8.cyan("fennec spawn")} ${pc8.dim("to resume")}`);
-        process.exit(0);
+  ${pc8.green("\u2713")} ${pc8.bold(rawTarget)} ${pc8.dim("removed from tracked apps (was already stopped)")}`);
+        console.error();
+        return;
       }
       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 confirmed = force || await confirmPrompt(`Kill ${pc8.bold(displayName)} with ${pc8.yellow(signal)}?`, false);
@@ -4623,35 +4606,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}`);
@@ -4663,35 +4638,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)}`);
   }
 }