orchestrating 0.1.33 → 0.1.35

package/bin/orch

@@ -243,14 +243,177 @@ if (firstArg === "logout") {
 }
 
 if (firstArg === "daemon") {
-  // Parse daemon flags: orch daemon [--projects <path>]
   const daemonArgs = process.argv.slice(3);
+  const pidFile = path.join(os.homedir(), ".orch-daemon.pid");
+
+  // orch daemon --stop
+  if (daemonArgs.includes("--stop")) {
+    if (existsSync(pidFile)) {
+      const pid = parseInt(readFileSync(pidFile, "utf-8").trim(), 10);
+      try {
+        process.kill(pid, "SIGTERM");
+        unlinkSync(pidFile);
+        console.log(`Daemon stopped (pid ${pid}).`);
+      } catch {
+        unlinkSync(pidFile);
+        console.log("Daemon was not running. Cleaned up pid file.");
+      }
+    } else {
+      console.log("No daemon running.");
+    }
+    process.exit(0);
+  }
+
+  // orch daemon --status
+  if (daemonArgs.includes("--status")) {
+    if (existsSync(pidFile)) {
+      const pid = parseInt(readFileSync(pidFile, "utf-8").trim(), 10);
+      try {
+        process.kill(pid, 0); // Check if process exists
+        console.log(`Daemon running (pid ${pid}).`);
+      } catch {
+        console.log("Daemon not running (stale pid file).");
+      }
+    } else {
+      console.log("Daemon not running.");
+    }
+    process.exit(0);
+  }
+
+  // Parse flags
   let projectsDir = null;
+  const background = daemonArgs.includes("--background") || daemonArgs.includes("-b");
   for (let di = 0; di < daemonArgs.length; di++) {
     if ((daemonArgs[di] === "--projects" || daemonArgs[di] === "-d") && daemonArgs[di + 1]) {
       projectsDir = daemonArgs[++di];
     }
   }
+
+  // orch daemon --enable — register as system service (survives reboot)
+  if (daemonArgs.includes("--enable")) {
+    const orchBin = process.argv[1] || execSync("which orch", { encoding: "utf-8" }).trim();
+    const nodeBin = process.execPath;
+    let extraArgs = "";
+    if (projectsDir) extraArgs = ` --projects ${projectsDir}`;
+
+    if (process.platform === "darwin") {
+      // macOS: launchd plist
+      const plistDir = path.join(os.homedir(), "Library", "LaunchAgents");
+      const plistPath = path.join(plistDir, "ing.orchestrat.daemon.plist");
+      mkdirSync(plistDir, { recursive: true });
+      const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>ing.orchestrat.daemon</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${nodeBin}</string>
+    <string>${orchBin}</string>
+    <string>daemon</string>${projectsDir ? `\n    <string>--projects</string>\n    <string>${projectsDir}</string>` : ""}
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${path.join(os.homedir(), ".orch-daemon.log")}</string>
+  <key>StandardErrorPath</key>
+  <string>${path.join(os.homedir(), ".orch-daemon.log")}</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>${process.env.PATH}</string>
+  </dict>
+</dict>
+</plist>`;
+      writeFileSync(plistPath, plist);
+      execSync(`launchctl load -w "${plistPath}"`);
+      console.log("Daemon enabled — will start on login and auto-restart.");
+      console.log(`Logs: ~/.orch-daemon.log`);
+      console.log(`Disable: orch daemon --disable`);
+    } else {
+      // Linux: systemd user service
+      const serviceDir = path.join(os.homedir(), ".config", "systemd", "user");
+      const servicePath = path.join(serviceDir, "orch-daemon.service");
+      mkdirSync(serviceDir, { recursive: true });
+      const service = `[Unit]
+Description=orchestrat.ing daemon
+After=network.target
+
+[Service]
+ExecStart=${nodeBin} ${orchBin} daemon${extraArgs}
+Restart=always
+RestartSec=5
+Environment=PATH=${process.env.PATH}
+
+[Install]
+WantedBy=default.target
+`;
+      writeFileSync(servicePath, service);
+      execSync("systemctl --user daemon-reload");
+      execSync("systemctl --user enable --now orch-daemon.service");
+      // Enable lingering so user services run without active login session
+      try { execSync(`loginctl enable-linger ${os.userInfo().username}`); } catch {}
+      console.log("Daemon enabled — will start on boot and auto-restart.");
+      console.log(`Logs: journalctl --user -u orch-daemon -f`);
+      console.log(`Disable: orch daemon --disable`);
+    }
+    process.exit(0);
+  }
+
+  // orch daemon --disable — remove system service
+  if (daemonArgs.includes("--disable")) {
+    if (process.platform === "darwin") {
+      const plistPath = path.join(os.homedir(), "Library", "LaunchAgents", "ing.orchestrat.daemon.plist");
+      if (existsSync(plistPath)) {
+        try { execSync(`launchctl unload "${plistPath}"`); } catch {}
+        unlinkSync(plistPath);
+        console.log("Daemon disabled — removed from login items.");
+      } else {
+        console.log("Daemon was not enabled.");
+      }
+    } else {
+      const servicePath = path.join(os.homedir(), ".config", "systemd", "user", "orch-daemon.service");
+      if (existsSync(servicePath)) {
+        try { execSync("systemctl --user disable --now orch-daemon.service"); } catch {}
+        unlinkSync(servicePath);
+        execSync("systemctl --user daemon-reload");
+        console.log("Daemon disabled — removed systemd service.");
+      } else {
+        console.log("Daemon was not enabled.");
+      }
+    }
+    process.exit(0);
+  }
+
+  // orch daemon --background — fork and exit
+  if (background) {
+    const orchPath = fileURLToPath(import.meta.url);
+    const fwdArgs = ["daemon"];
+    if (projectsDir) fwdArgs.push("--projects", projectsDir);
+    const logFile = path.join(os.homedir(), ".orch-daemon.log");
+    const out = (await import("fs")).openSync(logFile, "a");
+    const child = spawn(process.execPath, [orchPath, ...fwdArgs], {
+      stdio: ["ignore", out, out],
+      detached: true,
+      env: { ...process.env },
+    });
+    child.unref();
+    writeFileSync(pidFile, String(child.pid));
+    console.log(`Daemon started in background (pid ${child.pid}).`);
+    console.log(`Logs: ${logFile}`);
+    console.log(`Stop: orch daemon --stop`);
+    process.exit(0);
+  }
+
+  // Foreground — write pid file for --stop/--status
+  writeFileSync(pidFile, String(process.pid));
+  process.on("exit", () => { try { unlinkSync(pidFile); } catch {} });
+  process.on("SIGTERM", () => process.exit(0));
+  process.on("SIGINT", () => process.exit(0));
+
   await handleDaemon(projectsDir);
   // handleDaemon runs forever (or exits on fatal error)
 }
@@ -309,7 +472,7 @@ async function handleDaemon(projectsDir) {
 
   process.stderr.write(`${GREEN}${PREFIX} Listening for remote sessions as "${hostname}"${RESET}\n`);
   process.stderr.write(`${DIM}${PREFIX} Projects: ${scanRoot} (${directories.length} dirs)${RESET}\n`);
-  process.stderr.write(`${DIM}${PREFIX} Tip: Use 'nohup orch daemon &' to run in background${RESET}\n`);
+  process.stderr.write(`${DIM}${PREFIX} Tip: Use 'orch daemon -b' to run in background${RESET}\n`);
 
   let reconnecting = false;
   const recentRequests = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrating",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Stream terminal sessions to the orchestrat.ing dashboard",
   "type": "module",
   "bin": {