@longleash/cli 0.1.0-rc.6 → 0.1.0-rc.8

package/bin/longleash.mjs

@@ -1816,8 +1816,8 @@ StartLimitBurst=5
 [Service]
 Type=simple
 ExecStart=${systemdQuote(paths.wrapper)} run
-EnvironmentFile=${systemdQuote(paths.environment)}
-WorkingDirectory=${systemdQuote(home)}
+EnvironmentFile=${systemdPath(paths.environment)}
+WorkingDirectory=${systemdPath(home)}
 UMask=0077
 Restart=on-failure
 RestartSec=5s
@@ -1879,7 +1879,7 @@ function startService(context = {}) {
   assertServiceInstallation(resolved);
   if (resolved.platform === "darwin") {
     if (launchdLoaded(resolved)) requireSuccess(resolved, "/bin/launchctl", ["kickstart", "-k", serviceTarget(resolved)]);
-    else requireSuccess(resolved, "/bin/launchctl", ["bootstrap", launchDomain(resolved), resolved.paths.definition]);
+    else bootstrapLaunchAgent(resolved);
   } else {
     requireSuccess(resolved, "systemctl", ["--user", "start", SYSTEMD_UNIT]);
   }
@@ -1904,7 +1904,7 @@ function restartService(context = {}) {
   assertServiceInstallation(resolved);
   if (resolved.platform === "darwin") {
     if (launchdLoaded(resolved)) requireSuccess(resolved, "/bin/launchctl", ["kickstart", "-k", serviceTarget(resolved)]);
-    else requireSuccess(resolved, "/bin/launchctl", ["bootstrap", launchDomain(resolved), resolved.paths.definition]);
+    else bootstrapLaunchAgent(resolved);
   } else {
     requireSuccess(resolved, "systemctl", ["--user", "restart", SYSTEMD_UNIT]);
   }
@@ -1960,27 +1960,52 @@ function installLaunchAgent(context) {
     writeManagedAtomically(context.paths.definition, content, 384, (temporary) => {
       requireSuccess(context, "/usr/bin/plutil", ["-lint", temporary]);
     });
-    requireSuccess(context, "/bin/launchctl", ["bootstrap", launchDomain(context), context.paths.definition]);
+    bootstrapLaunchAgent(context);
   } catch (error) {
     restore(context.paths.definition, previous);
     if (previous !== null && wasLoaded) run(context, "/bin/launchctl", ["bootstrap", launchDomain(context), context.paths.definition]);
     throw error;
   }
 }
+function bootstrapLaunchAgent(context) {
+  const args = ["bootstrap", launchDomain(context), context.paths.definition];
+  const first = run(context, "/bin/launchctl", args);
+  if (first.status === 0 || launchdLoaded(context)) return;
+  run(context, "/bin/launchctl", ["bootout", serviceTarget(context)]);
+  const retry = run(context, "/bin/launchctl", args);
+  if (retry.status === 0 || launchdLoaded(context)) return;
+  const failure = commandError("/bin/launchctl", args, retry);
+  const firstDetail = (first.stderr || first.stdout).trim().replace(/\s+/g, " ").slice(0, 240);
+  throw new Error(
+    `${failure.message} launchd still rejected the managed job after one stale-state recovery attempt${firstDetail ? ` (first response: ${firstDetail})` : ""}. Run \`longleash service logs\` for daemon output.`
+  );
+}
 function installSystemdService(context) {
   if (!context.paths.environment) throw new Error("The Linux service environment path is missing.");
   const previousUnit = snapshot(context.paths.definition);
   const previousEnvironment = snapshot(context.paths.environment);
+  const wasEnabled = run(context, "systemctl", ["--user", "is-enabled", "--quiet", SYSTEMD_UNIT]).status === 0;
+  const wasActive = run(context, "systemctl", ["--user", "is-active", "--quiet", SYSTEMD_UNIT]).status === 0;
   try {
     writeManagedAtomically(context.paths.environment, renderSystemdEnvironment(context.paths, context.env), 384);
     writeManagedAtomically(context.paths.definition, renderSystemdUnit(context.paths, context.home), 384);
     requireSuccess(context, "systemctl", ["--user", "daemon-reload"]);
-    requireSuccess(context, "systemctl", ["--user", "enable", "--now", SYSTEMD_UNIT]);
+    if (wasActive) {
+      if (!wasEnabled) requireSuccess(context, "systemctl", ["--user", "enable", SYSTEMD_UNIT]);
+      requireSuccess(context, "systemctl", ["--user", "restart", SYSTEMD_UNIT]);
+    } else {
+      requireSuccess(context, "systemctl", ["--user", "enable", "--now", SYSTEMD_UNIT]);
+    }
   } catch (error) {
     restore(context.paths.environment, previousEnvironment);
     restore(context.paths.definition, previousUnit);
     run(context, "systemctl", ["--user", "daemon-reload"]);
-    if (previousUnit !== null) run(context, "systemctl", ["--user", "enable", "--now", SYSTEMD_UNIT]);
+    if (previousUnit !== null) {
+      if (wasEnabled) run(context, "systemctl", ["--user", "enable", SYSTEMD_UNIT]);
+      else run(context, "systemctl", ["--user", "disable", SYSTEMD_UNIT]);
+      if (wasActive) run(context, "systemctl", ["--user", "restart", SYSTEMD_UNIT]);
+      else run(context, "systemctl", ["--user", "stop", SYSTEMD_UNIT]);
+    }
     throw error;
   }
 }
@@ -2102,6 +2127,12 @@ function systemdQuote(value) {
   if (/[\0\r\n]/.test(value)) throw new Error("Service paths may not contain control characters.");
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/%/g, "%%")}"`;
 }
+function systemdPath(value) {
+  if (/[\u0000-\u0008\u000a-\u001f\u007f-\u009f]/.test(value)) {
+    throw new Error("Service paths may not contain control characters.");
+  }
+  return value.replace(/%/g, "%%").replace(/\\/g, "\\x5c").replace(/ /g, "\\x20").replace(/\t/g, "\\x09").replace(/"/g, "\\x22").replace(/'/g, "\\x27");
+}
 function environmentQuote(value) {
   if (/[\0\r\n]/.test(value)) throw new Error("Service environment values may not contain control characters.");
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@longleash/cli",
-  "version": "0.1.0-rc.6",
+  "version": "0.1.0-rc.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@longleash/cli",
-      "version": "0.1.0-rc.6",
+      "version": "0.1.0-rc.8",
       "license": "MIT",
       "os": [
         "darwin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@longleash/cli",
-  "version": "0.1.0-rc.6",
+  "version": "0.1.0-rc.8",
   "description": "Securely control Claude Code and Codex sessions on your laptop from your phone.",
   "license": "MIT",
   "type": "module",