@cosmicstack/mercury-agent 1.0.4 → 1.0.6

package/dist/index.js

@@ -2409,27 +2409,53 @@ var CLIChannel = class extends BaseChannel {
       this.endOutput();
       return full2;
     }
-    process.stdout.write("\x1B7");
-    console.log("");
-    console.log(chalk3.cyan(`  ${this.agentName}:`));
-    console.log("");
+    const startTime = Date.now();
+    const headerLines = ["", chalk3.cyan(`  ${this.agentName}:`), ""];
+    for (const line of headerLines) {
+      console.log(line);
+    }
+    const indent = "  ";
+    const cols = process.stdout.columns || 80;
+    const contentCols = Math.max(1, cols - indent.length);
+    let visualLines = headerLines.length;
+    let pendingIndent = true;
+    let lineLen = 0;
     let full = "";
     for await (const chunk of content) {
-      process.stdout.write(chunk);
       full += chunk;
+      for (let i = 0; i < chunk.length; i++) {
+        const ch = chunk[i];
+        if (ch === "\n") {
+          visualLines += Math.max(1, Math.ceil((lineLen + indent.length) / cols));
+          process.stdout.write("\n");
+          lineLen = 0;
+          pendingIndent = true;
+        } else {
+          if (pendingIndent) {
+            process.stdout.write(indent);
+            pendingIndent = false;
+          }
+          process.stdout.write(ch);
+          lineLen++;
+        }
+      }
     }
-    this.streamActive = false;
-    if (!full.trim()) {
-      process.stdout.write("\x1B8");
-      process.stdout.write("\x1B[J");
-      this.endOutput();
-      return full;
+    if (lineLen > 0) {
+      visualLines += Math.max(1, Math.ceil((lineLen + indent.length) / cols));
+      process.stdout.write("\n");
+    } else {
+      visualLines += 1;
     }
-    process.stdout.write("\x1B8");
+    this.streamActive = false;
+    process.stdout.write(`\x1B[${visualLines}A`);
     process.stdout.write("\x1B[J");
-    const block = this.formatBlock(this.agentName, "", full);
-    for (const line of block) {
-      console.log(line);
+    if (full.trim()) {
+      const block = this.formatBlock(this.agentName, "", full);
+      for (const line of block) {
+        console.log(line);
+      }
+      const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
+      console.log(chalk3.dim("  " + "\u2500".repeat(50 - elapsed.length - 4) + " " + elapsed + "s"));
     }
     this.endOutput();
     return full;
@@ -7491,21 +7517,20 @@ function isProcessRunning(pid) {
 function getDaemonStatus() {
   const pid = readPid();
   if (!pid) return { running: false, pid: null, logPath: logPath() };
-  return { running: isProcessRunning(pid), pid, logPath: logPath() };
-}
-function startBackground() {
-  const status = getDaemonStatus();
-  if (status.running && status.pid) {
-    console.log(chalk5.yellow(`  Mercury is already running (PID: ${status.pid})`));
-    console.log(chalk5.dim(`  Use \`mercury stop\` to stop it first.`));
-    console.log("");
-    process2.exit(1);
-  }
-  if (status.pid && !status.running) {
+  const running = isProcessRunning(pid);
+  if (!running) {
     try {
       unlinkSync4(pidPath());
     } catch {
     }
+    return { running: false, pid: null, logPath: logPath() };
+  }
+  return { running, pid, logPath: logPath() };
+}
+function ensureDaemonRunning() {
+  const status = getDaemonStatus();
+  if (status.running && status.pid) {
+    return { pid: status.pid, fresh: false };
   }
   const home = getMercuryHome();
   if (!existsSync17(home)) {
@@ -7521,13 +7546,25 @@ function startBackground() {
     windowsHide: isWin
   });
   child.unref();
+  if (!child.pid) {
+    throw new Error("Failed to spawn daemon process");
+  }
   writeFileSync12(pidPath(), String(child.pid));
-  console.log("");
-  console.log(chalk5.green(`  Mercury started in background (PID: ${child.pid})`));
-  console.log(chalk5.dim(`  Logs: ${logFile}`));
-  console.log(chalk5.dim(`  Use \`mercury stop\` to stop.`));
-  console.log(chalk5.dim(`  Use \`mercury logs\` to view logs.`));
-  console.log("");
+  return { pid: child.pid, fresh: true };
+}
+function startBackground() {
+  try {
+    const result = ensureDaemonRunning();
+    console.log("");
+    console.log(chalk5.green(`  Mercury started in background (PID: ${result.pid})`));
+    console.log(chalk5.dim(`  Logs: ${logPath()}`));
+    console.log(chalk5.dim(`  Use \`mercury stop\` to stop.`));
+    console.log(chalk5.dim(`  Use \`mercury logs\` to view logs.`));
+    console.log("");
+  } catch (err) {
+    console.log(chalk5.red(`  Failed to start: ${err.message}`));
+    process2.exit(1);
+  }
 }
 function stopDaemon() {
   const status = getDaemonStatus();
@@ -7578,11 +7615,6 @@ function restartDaemon() {
     } catch {
     }
     console.log(chalk5.green("  Mercury stopped."));
-  } else if (status.pid) {
-    try {
-      unlinkSync4(pidPath());
-    } catch {
-    }
   }
   console.log(chalk5.yellow("  Starting Mercury..."));
   startBackground();
@@ -7595,40 +7627,13 @@ function showLogs() {
     return;
   }
   const content = readFileSync11(logFile, "utf-8");
-  const lines = content.split("\n").slice(-100);
+  const lines = content.split(/\r?\n/).slice(-100);
   console.log(lines.join("\n"));
 }
 function tryAutoDaemonize() {
   try {
-    const status = getDaemonStatus();
-    if (status.running && status.pid) {
-      return true;
-    }
-    if (status.pid && !status.running) {
-      try {
-        unlinkSync4(pidPath());
-      } catch {
-      }
-    }
-    const home = getMercuryHome();
-    if (!existsSync17(home)) {
-      mkdirSync10(home, { recursive: true });
-    }
-    const logFile = logPath();
-    const isWin = process2.platform === "win32";
-    const outFd = openSync(logFile, "a");
-    const child = spawn(process2.execPath, [process2.argv[1], "start", "--daemon"], {
-      detached: true,
-      stdio: ["ignore", outFd, outFd],
-      env: { ...process2.env },
-      windowsHide: isWin
-    });
-    child.unref();
-    if (!child.pid) {
-      return false;
-    }
-    writeFileSync12(pidPath(), String(child.pid));
-    return true;
+    const result = ensureDaemonRunning();
+    return result.pid > 0;
   } catch {
     return false;
   }
@@ -8798,7 +8803,7 @@ async function configure(existingConfig) {
 }
 function autoDaemonize() {
   const daemon = getDaemonStatus();
-  if (daemon.running) {
+  if (daemon.running && daemon.pid) {
     return;
   }
   console.log(chalk7.dim("  Setting up background mode..."));
@@ -8816,7 +8821,7 @@ function autoDaemonize() {
     console.log(chalk7.green("  \u2713 Auto-starts on login. Auto-restarts on crash."));
     console.log(chalk7.dim("  Use `mercury stop` to stop. `mercury restart` to restart."));
   } else {
-    console.log(chalk7.dim("  Background mode not available. Run `mercury up` to set it up."));
+    console.log(chalk7.yellow("  Background mode not available. Run `mercury start` to set it up."));
   }
   console.log("");
 }
@@ -9006,6 +9011,22 @@ async function runAgent(isDaemon = false) {
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
+  if (!isDaemon && process.platform !== "win32") {
+    process.on("SIGHUP", () => {
+      logger.info("SIGHUP received \u2014 terminal closed. Daemonizing.");
+      try {
+        const result = tryAutoDaemonize();
+        if (result) {
+          logger.info(`Forked daemon. Foreground process exiting.`);
+        } else {
+          logger.warn("SIGHUP received but daemonization failed. Shutting down.");
+        }
+      } catch {
+        logger.warn("SIGHUP received but daemonization failed. Shutting down.");
+      }
+      process.exit(0);
+    });
+  }
 }
 var program = new Command();
 program.name("mercury").description("Mercury \u2014 Soul-driven AI agent with permission-hardened tools, token budgets, and multi-channel access.").version(pkgVersion).option("-v, --verbose", "Show debug logs").action(async () => {
@@ -9014,22 +9035,24 @@ program.name("mercury").description("Mercury \u2014 Soul-driven AI agent with pe
     autoDaemonize();
     return;
   }
+  autoDaemonize();
   await runAgent();
 });
-program.command("start").description("Start Mercury agent").option("-v, --verbose", "Show debug logs").option("-d, --detached", "Run in background (daemon mode)").option("--daemon", "Internal flag for daemon child process").action(async (opts) => {
+program.command("start").description("Start Mercury \u2014 runs as a daemon by default, use --foreground to attach to terminal").option("-v, --verbose", "Show debug logs").option("-f, --foreground", "Run in foreground (attached to terminal)").option("-d, --detached", "Run in background (daemon mode) \u2014 same as default").option("--daemon", "Internal flag for daemon child process").action(async (opts) => {
   if (opts.daemon) {
     await runWithWatchdog(() => runAgent(true));
     return;
   }
-  if (opts.detached) {
-    startBackground();
-    return;
-  }
   if (!isSetupComplete()) {
     await configure();
+    autoDaemonize();
     return;
   }
-  await runAgent();
+  if (opts.foreground) {
+    await runAgent();
+    return;
+  }
+  startBackground();
 });
 program.command("stop").description("Stop a background Mercury process").action(() => {
   stopDaemon();
@@ -9037,9 +9060,11 @@ program.command("stop").description("Stop a background Mercury process").action(
 program.command("restart").description("Restart a background Mercury process").action(() => {
   restartDaemon();
 });
-program.command("up").description("Ensure Mercury is running persistently \u2014 installs service if needed, starts daemon").action(async () => {
+program.command("up").description("Start Mercury as a persistent daemon (same as `mercury start`)").action(async () => {
   if (!isSetupComplete()) {
     await configure();
+    autoDaemonize();
+    return;
   }
   const daemon = getDaemonStatus();
   if (daemon.running && daemon.pid) {
@@ -9054,7 +9079,6 @@ program.command("up").description("Ensure Mercury is running persistently \u2014
     console.log(chalk7.cyan("  Installing Mercury as a system service..."));
     installService();
   }
-  console.log(chalk7.cyan("  Starting Mercury in background..."));
   startBackground();
 });
 program.command("logs").description("Show recent daemon logs").action(() => {