@scrylog/cli 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrylog/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Terminal dashboard for monitoring tmux sessions running AI coding agents",
   "license": "MIT",
   "type": "module",

package/src/service/manager.ts

@@ -1,5 +1,6 @@
 import { existsSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join } from "node:path";
 import { getResolvedConfigPath } from "../shared/config";
 import {
   ensureParentDir,
@@ -9,7 +10,7 @@ import {
   getSystemdUnitPath,
   getUserUid,
 } from "../shared/paths";
-import { IS_LINUX, IS_MAC, IS_WSL } from "../shared/platform";
+import { IS_LINUX, IS_MAC, IS_WSL, whichCommand } from "../shared/platform";
 import { maybeRunCommand } from "../shared/utils";
 
 export interface ServiceStatus {
@@ -52,13 +53,18 @@ function daemonScriptPath(): string {
   return join(import.meta.dir, "../daemon/index.ts");
 }
 
-function daemonExec(configPath?: string): string[] {
+export function resolveDaemonExec(configPath?: string, daemonPath = whichCommand("scrylogd")): string[] {
   const resolvedConfigPath = getResolvedConfigPath(configPath);
+  if (daemonPath) {
+    return [daemonPath, "--config", resolvedConfigPath];
+  }
   return [process.execPath, "run", daemonScriptPath(), "--config", resolvedConfigPath];
 }
 
 export function renderLaunchAgentPlist(configPath?: string): string {
-  const [execPath, runArg, scriptPath, configFlag, resolvedConfigPath] = daemonExec(configPath);
+  const args = resolveDaemonExec(configPath);
+  const programArguments = args.map((arg) => `      <string>${xmlEscape(arg)}</string>`).join("\n");
+  const path = launchdPath(args);
   return `<?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">
@@ -67,12 +73,13 @@ export function renderLaunchAgentPlist(configPath?: string): string {
     <string>${getServiceLabel()}</string>
     <key>ProgramArguments</key>
     <array>
-      <string>${execPath}</string>
-      <string>${runArg}</string>
-      <string>${scriptPath}</string>
-      <string>${configFlag}</string>
-      <string>${resolvedConfigPath}</string>
+${programArguments}
     </array>
+    <key>EnvironmentVariables</key>
+    <dict>
+      <key>PATH</key>
+      <string>${xmlEscape(path)}</string>
+    </dict>
     <key>RunAtLoad</key>
     <true/>
     <key>KeepAlive</key>
@@ -83,13 +90,13 @@ export function renderLaunchAgentPlist(configPath?: string): string {
 }
 
 export function renderSystemdUserUnit(configPath?: string): string {
-  const [execPath, runArg, scriptPath, configFlag, resolvedConfigPath] = daemonExec(configPath);
+  const args = resolveDaemonExec(configPath);
   return `[Unit]
 Description=scrylog daemon
 After=default.target
 
 [Service]
-ExecStart=${shellQuote(execPath)} ${shellQuote(runArg)} ${shellQuote(scriptPath)} ${shellQuote(configFlag)} ${shellQuote(resolvedConfigPath)}
+ExecStart=${args.map(shellQuote).join(" ")}
 Restart=on-failure
 RestartSec=3
 
@@ -240,3 +247,36 @@ class UnsupportedServiceManager implements ServiceManager {
 function shellQuote(value: string): string {
   return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
+
+function launchdPath(args: string[]): string {
+  const commandPath = args[0];
+  const candidates = [
+    commandPath && isAbsolute(commandPath) ? dirname(commandPath) : undefined,
+    isAbsolute(process.execPath) ? dirname(process.execPath) : undefined,
+    process.env.PATH,
+    join(homedir(), ".bun", "bin"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    "/usr/bin",
+    "/bin",
+    "/usr/sbin",
+    "/sbin",
+  ];
+
+  const paths = new Set<string>();
+  for (const candidate of candidates) {
+    for (const part of candidate?.split(":") ?? []) {
+      if (part) paths.add(part);
+    }
+  }
+  return Array.from(paths).join(":");
+}
+
+function xmlEscape(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}