@ours.network/cli 0.4.2 → 0.6.0

package/dist/{chunk-VGWQD7CJ.js → chunk-RJWUCR3R.js}

@@ -13,7 +13,7 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-YSHMCQ2B.js";
+} from "./chunk-SDNTPCKW.js";
 
 // src/help.ts
 var pad = (value, width = 32) => value.length >= width ? `${value} ` : value.padEnd(width);

package/dist/{chunk-YSHMCQ2B.js → chunk-SDNTPCKW.js}

@@ -42,14 +42,14 @@ var COMMAND_GROUPS = {
       "install-service": {
         kind: "daemon",
         handler: "install-service",
-        summary: "Install and enable the Linux user systemd service.",
-        effects: "Changes ~/.config/systemd/user/ours.service and runs systemctl --user. Requires --yes unless --dry-run is used; --force may replace only an existing unowned unit.",
+        summary: "Install and enable the per-user boot service (Linux systemd, macOS launchd).",
+        effects: "Changes ~/.config/systemd/user/ours.service and runs systemctl --user on Linux, or ~/Library/LaunchAgents and launchctl on macOS. Requires --yes unless --dry-run is used; --force may replace only an existing unowned unit.",
         example: "ours daemon install-service --dry-run --json"
       },
       "uninstall-service": {
         kind: "daemon",
         handler: "uninstall-service",
-        summary: "Disable and remove the Linux user systemd service owned by this CLI.",
+        summary: "Disable and remove the per-user boot service owned by this CLI.",
         effects: "Changes the user service manager. Requires --yes unless --dry-run is used and refuses to remove an unowned unit.",
         example: "ours daemon uninstall-service --dry-run --json"
       },

package/dist/chunk-TNNBVUKK.js

@@ -0,0 +1,241 @@
+import {
+  instanceNameFromStateDir,
+  labelForStateDir,
+  serviceDescription,
+  unitNameForStateDir
+} from "./chunk-UZQWSOUB.js";
+
+// src/service.ts
+import { execFile as nodeExecFile } from "node:child_process";
+import { promisify } from "node:util";
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+var execFile = promisify(nodeExecFile);
+var MARKER = "# Managed by @ours.network/cli";
+var PLIST_MARKER = "<!-- Managed by @ours.network/cli -->";
+var SERVICE_NAME = "ours.service";
+var defaultDeps = {
+  platform: process.platform,
+  run: async (command, args) => {
+    await execFile(command, args, { windowsHide: true });
+  },
+  uid: process.getuid?.()
+};
+function systemdEscapeArgument(value) {
+  if (/[\n\r]/.test(value)) throw new Error("service arguments must not contain newlines");
+  return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%")}"`;
+}
+function systemdUnescapeArgument(value) {
+  const trimmed = value.trim();
+  if (!trimmed.startsWith('"') || !trimmed.endsWith('"') || trimmed.length < 2) return void 0;
+  return trimmed.slice(1, -1).replaceAll("%%", "%").replaceAll('\\"', '"').replaceAll("\\\\", "\\");
+}
+function bakedStateDir(unit) {
+  for (const line of unit.split("\n")) {
+    if (!line.startsWith("Environment=OURS_STATE_DIR=")) continue;
+    return systemdUnescapeArgument(line.slice("Environment=OURS_STATE_DIR=".length));
+  }
+  return void 0;
+}
+function describeConflict(existing, serviceFile, stateDir, verb = "overwrite") {
+  if (!existing.managed) {
+    return {
+      kind: "unmanaged",
+      serviceFile,
+      message: verb === "remove" ? `${serviceFile} is not managed by @ours.network/cli; refusing to remove it` : `${serviceFile} is not managed by @ours.network/cli; refusing to overwrite it without --force`
+    };
+  }
+  const owner = existing.owner;
+  if (owner !== void 0 && owner !== stateDir) {
+    return {
+      kind: "other-state-dir",
+      serviceFile,
+      owner,
+      message: `${serviceFile} is the boot service for the daemon at ${owner}, not ${stateDir}; refusing to ${verb} it without --force`
+    };
+  }
+  return void 0;
+}
+function resolveStateDir(context) {
+  return resolve(context.stateDir ?? join(context.homeDir ?? homedir(), ".ours"));
+}
+function readSystemdUnit(previous) {
+  return { managed: previous.startsWith(MARKER), owner: bakedStateDir(previous) };
+}
+function createLinuxUserSystemdAdapter(deps = defaultDeps) {
+  if (deps.platform !== "linux") throw new Error(`service management is not supported on ${deps.platform}; use an external launcher for \`ours daemon serve\``);
+  return {
+    name: "systemd-user",
+    async install(context) {
+      const home = context.homeDir ?? homedir();
+      const stateDir = resolveStateDir(context);
+      const unitName = unitNameForStateDir(stateDir);
+      const serviceFile = join(home, ".config", "systemd", "user", unitName);
+      const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
+      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
+      if (unitConfig) args.push("--config", unitConfig);
+      const environment = `Environment=OURS_STATE_DIR=${systemdEscapeArgument(stateDir)}
+`;
+      const unit = `${MARKER}
+[Unit]
+Description=${serviceDescription(instanceNameFromStateDir(stateDir).name)}
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=${args.map(systemdEscapeArgument).join(" ")}
+${environment}Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=default.target
+`;
+      if (existsSync(serviceFile)) {
+        const previous = readFileSync(serviceFile, "utf8");
+        const conflict = describeConflict(readSystemdUnit(previous), serviceFile, stateDir);
+        if (conflict && !context.force) {
+          if (!context.dryRun) throw new Error(conflict.message);
+          return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: true, conflict };
+        }
+        if (previous === unit) return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: context.dryRun === true };
+      }
+      const commands = [["systemctl", "--user", "daemon-reload"], ["systemctl", "--user", "enable", "--now", unitName]];
+      if (!context.dryRun) {
+        mkdirSync(dirname(serviceFile), { recursive: true });
+        writeFileSync(serviceFile, unit, { mode: 420 });
+        for (const [command, ...args2] of commands) await deps.run(command, args2);
+      }
+      return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands, changed: true, dryRun: context.dryRun === true };
+    },
+    async uninstall(context) {
+      const home = context.homeDir ?? homedir();
+      const stateDir = resolveStateDir(context);
+      const unitName = unitNameForStateDir(stateDir);
+      const serviceFile = join(home, ".config", "systemd", "user", unitName);
+      if (!existsSync(serviceFile)) return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: context.dryRun === true };
+      const previous = readFileSync(serviceFile, "utf8");
+      const existing = readSystemdUnit(previous);
+      const conflict = describeConflict(existing, serviceFile, stateDir, "remove");
+      if (conflict && !(context.force && existing.managed)) {
+        if (!context.dryRun) throw new Error(conflict.message);
+        return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: true, conflict };
+      }
+      const commands = [["systemctl", "--user", "disable", "--now", unitName], ["systemctl", "--user", "daemon-reload"]];
+      if (!context.dryRun) {
+        await deps.run(commands[0][0], commands[0].slice(1));
+        unlinkSync(serviceFile);
+        await deps.run(commands[1][0], commands[1].slice(1));
+      }
+      return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands, changed: true, dryRun: context.dryRun === true };
+    }
+  };
+}
+function xmlText(value) {
+  return String(value).replace(/[&<>"']/g, (character) => ({
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&apos;"
+  })[character]);
+}
+function xmlUntext(value) {
+  return value.replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&quot;", '"').replaceAll("&apos;", "'").replaceAll("&amp;", "&");
+}
+function bakedStateDirFromPlist(plist) {
+  const match = /<key>OURS_STATE_DIR<\/key><string>([^<]*)<\/string>/.exec(plist);
+  return match ? xmlUntext(match[1]) : void 0;
+}
+function readLaunchdPlist(previous) {
+  const managed = previous.split("\n")[1] === PLIST_MARKER;
+  return { managed, owner: bakedStateDirFromPlist(previous) };
+}
+function createMacosUserLaunchdAdapter(deps = defaultDeps) {
+  if (deps.platform !== "darwin") throw new Error(`service management is not supported on ${deps.platform}; use an external launcher for \`ours daemon serve\``);
+  const domain = `gui/${deps.uid ?? process.getuid?.() ?? 0}`;
+  const plan = (context) => {
+    const home = context.homeDir ?? homedir();
+    const stateDir = resolveStateDir(context);
+    const unitName = labelForStateDir(stateDir);
+    return { stateDir, unitName, serviceFile: join(home, "Library", "LaunchAgents", `${unitName}.plist`) };
+  };
+  return {
+    name: "launchd-user",
+    async install(context) {
+      const { stateDir, unitName, serviceFile } = plan(context);
+      const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
+      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
+      if (unitConfig) args.push("--config", unitConfig);
+      const unit = `<?xml version="1.0" encoding="UTF-8"?>
+${PLIST_MARKER}
+<!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>${xmlText(unitName)}</string>
+  <key>ProgramArguments</key>
+  <array>
+${args.map((argument) => `    <string>${xmlText(argument)}</string>`).join("\n")}
+  </array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>OURS_STATE_DIR</key><string>${xmlText(stateDir)}</string>
+  </dict>
+  <key>RunAtLoad</key><true/>
+  <key>KeepAlive</key><true/>
+</dict>
+</plist>
+`;
+      if (existsSync(serviceFile)) {
+        const previous = readFileSync(serviceFile, "utf8");
+        const conflict = describeConflict(readLaunchdPlist(previous), serviceFile, stateDir);
+        if (conflict && !context.force) {
+          if (!context.dryRun) throw new Error(conflict.message);
+          return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: true, conflict };
+        }
+        if (previous === unit) return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: context.dryRun === true };
+      }
+      const commands = [["launchctl", "bootout", domain, serviceFile], ["launchctl", "bootstrap", domain, serviceFile]];
+      if (!context.dryRun) {
+        mkdirSync(dirname(serviceFile), { recursive: true });
+        writeFileSync(serviceFile, unit, { mode: 420 });
+        await deps.run(commands[0][0], commands[0].slice(1)).catch(() => {
+        });
+        await deps.run(commands[1][0], commands[1].slice(1));
+      }
+      return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands, changed: true, dryRun: context.dryRun === true };
+    },
+    async uninstall(context) {
+      const { stateDir, unitName, serviceFile } = plan(context);
+      if (!existsSync(serviceFile)) return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: context.dryRun === true };
+      const previous = readFileSync(serviceFile, "utf8");
+      const existing = readLaunchdPlist(previous);
+      const conflict = describeConflict(existing, serviceFile, stateDir, "remove");
+      if (conflict && !(context.force && existing.managed)) {
+        if (!context.dryRun) throw new Error(conflict.message);
+        return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: true, conflict };
+      }
+      const commands = [["launchctl", "bootout", domain, serviceFile]];
+      if (!context.dryRun) {
+        await deps.run(commands[0][0], commands[0].slice(1)).catch(() => {
+        });
+        unlinkSync(serviceFile);
+      }
+      return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands, changed: true, dryRun: context.dryRun === true };
+    }
+  };
+}
+function createServiceAdapter(deps = defaultDeps) {
+  if (deps.platform === "linux") return createLinuxUserSystemdAdapter(deps);
+  if (deps.platform === "darwin") return createMacosUserLaunchdAdapter(deps);
+  throw new Error(`service management is not supported on ${deps.platform}; use an external launcher for \`ours daemon serve\``);
+}
+
+export {
+  SERVICE_NAME,
+  bakedStateDir,
+  createLinuxUserSystemdAdapter,
+  bakedStateDirFromPlist,
+  createMacosUserLaunchdAdapter,
+  createServiceAdapter
+};

package/dist/{chunk-3RLAHOPS.js → chunk-UZQWSOUB.js}

@@ -1,6 +1,7 @@
 // src/service-instance.ts
 import { basename, resolve } from "node:path";
 var DEFAULT_SYSTEMD_UNIT = "ours.service";
+var DEFAULT_LAUNCHD_LABEL = "solutions.adaptframework.ours";
 var INSTANCE_RE = /^[A-Za-z0-9](?:[A-Za-z0-9_-]{0,30}[A-Za-z0-9])?$/;
 function normalizeInstanceName(raw) {
   const s = typeof raw === "string" ? raw.trim() : "";
@@ -22,6 +23,11 @@ function systemdUnitName(instance = "") {
   if (!ok || !name) return DEFAULT_SYSTEMD_UNIT;
   return `ours-${name}.service`;
 }
+function launchdLabel(instance = "") {
+  const { ok, name } = normalizeInstanceName(instance);
+  if (!ok || !name) return DEFAULT_LAUNCHD_LABEL;
+  return `${DEFAULT_LAUNCHD_LABEL}.${name}`;
+}
 function serviceDescription(instance = "") {
   const { ok, name } = normalizeInstanceName(instance);
   return ok && name ? `ours daemon (instance "${name}")` : "ours shared daemon";
@@ -46,12 +52,20 @@ function unitNameForStateDir(stateDir) {
   if (!ok) throw new Error(reason);
   return systemdUnitName(name);
 }
+function labelForStateDir(stateDir) {
+  const { ok, name, reason } = instanceNameFromStateDir(stateDir);
+  if (!ok) throw new Error(reason);
+  return launchdLabel(name);
+}
 
 export {
   DEFAULT_SYSTEMD_UNIT,
+  DEFAULT_LAUNCHD_LABEL,
   normalizeInstanceName,
   systemdUnitName,
+  launchdLabel,
   serviceDescription,
   instanceNameFromStateDir,
-  unitNameForStateDir
+  unitNameForStateDir,
+  labelForStateDir
 };

package/dist/commands.d.ts

@@ -64,14 +64,14 @@ export declare const COMMAND_GROUPS: {
             readonly 'install-service': {
                 readonly kind: "daemon";
                 readonly handler: "install-service";
-                readonly summary: "Install and enable the Linux user systemd service.";
-                readonly effects: "Changes ~/.config/systemd/user/ours.service and runs systemctl --user. Requires --yes unless --dry-run is used; --force may replace only an existing unowned unit.";
+                readonly summary: "Install and enable the per-user boot service (Linux systemd, macOS launchd).";
+                readonly effects: "Changes ~/.config/systemd/user/ours.service and runs systemctl --user on Linux, or ~/Library/LaunchAgents and launchctl on macOS. Requires --yes unless --dry-run is used; --force may replace only an existing unowned unit.";
                 readonly example: "ours daemon install-service --dry-run --json";
             };
             readonly 'uninstall-service': {
                 readonly kind: "daemon";
                 readonly handler: "uninstall-service";
-                readonly summary: "Disable and remove the Linux user systemd service owned by this CLI.";
+                readonly summary: "Disable and remove the per-user boot service owned by this CLI.";
                 readonly effects: "Changes the user service manager. Requires --yes unless --dry-run is used and refuses to remove an unowned unit.";
                 readonly example: "ours daemon uninstall-service --dry-run --json";
             };

package/dist/commands.js

@@ -4,7 +4,7 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-YSHMCQ2B.js";
+} from "./chunk-SDNTPCKW.js";
 export {
   COMMAND_GROUPS,
   DESTRUCTIVE_OPERATIONS,

package/dist/help.js

@@ -3,10 +3,10 @@ import {
   helpRequestPath,
   renderHelp,
   renderTopHelp
-} from "./chunk-VGWQD7CJ.js";
+} from "./chunk-RJWUCR3R.js";
 import "./chunk-QRNZFPNJ.js";
 import "./chunk-6NFATG6P.js";
-import "./chunk-YSHMCQ2B.js";
+import "./chunk-SDNTPCKW.js";
 export {
   helpHint,
   helpRequestPath,

package/dist/main.js

@@ -4,11 +4,11 @@ import {
   writeResult
 } from "./chunk-YC7QBGVC.js";
 import {
-  createLinuxUserSystemdAdapter
-} from "./chunk-227DBTDK.js";
+  createServiceAdapter
+} from "./chunk-TNNBVUKK.js";
 import {
   instanceNameFromStateDir
-} from "./chunk-3RLAHOPS.js";
+} from "./chunk-UZQWSOUB.js";
 import {
   setupConfig,
   showConfig
@@ -17,7 +17,7 @@ import {
   helpHint,
   helpRequestPath,
   renderHelp
-} from "./chunk-VGWQD7CJ.js";
+} from "./chunk-RJWUCR3R.js";
 import {
   invokeOperation,
   isOperationName,
@@ -38,7 +38,7 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-YSHMCQ2B.js";
+} from "./chunk-SDNTPCKW.js";
 import {
   inspectDaemon,
   serveDaemon,
@@ -55,7 +55,7 @@ import {
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
-var CLI_VERSION = false ? "0.0.0-dev" : "0.4.2";
+var CLI_VERSION = false ? "0.0.0-dev" : "0.6.0";
 var COMMON_VALUES = /* @__PURE__ */ new Set(["--endpoint", "--port", "--state-dir", "--config", "--identity"]);
 var COMMON_BOOLEANS = /* @__PURE__ */ new Set(["--json", "--yes", "--help"]);
 function selectionFrom(values) {
@@ -227,7 +227,7 @@ async function runDaemon(args, io) {
     const derived = instanceNameFromStateDir(target.stateDir);
     if (!derived.ok) throw new CliUsageError(derived.reason ?? `cannot derive a service name from ${target.stateDir}`);
     assertPortAgrees(selection.port, target);
-    const adapter = createLinuxUserSystemdAdapter();
+    const adapter = createServiceAdapter();
     const context = { cliPath: process.argv[1], configPath: target.unitConfigPath, stateDir: target.stateDir, dryRun, force: flags.booleans.has("--force") };
     const result = handler === "install-service" ? await adapter.install(context) : await adapter.uninstall(context);
     writeResult(io, result, json, handler);

package/dist/service-instance.d.ts

@@ -1,4 +1,5 @@
 export declare const DEFAULT_SYSTEMD_UNIT = "ours.service";
+export declare const DEFAULT_LAUNCHD_LABEL = "solutions.adaptframework.ours";
 export interface InstanceResult {
     ok: boolean;
     /** '' means "the default, unnamed daemon" — the historical single-unit behaviour. */
@@ -7,6 +8,8 @@ export interface InstanceResult {
 }
 export declare function normalizeInstanceName(raw: unknown): InstanceResult;
 export declare function systemdUnitName(instance?: string): string;
+export declare function launchdLabel(instance?: string): string;
 export declare function serviceDescription(instance?: string): string;
 export declare function instanceNameFromStateDir(stateDir: string): InstanceResult;
 export declare function unitNameForStateDir(stateDir: string): string;
+export declare function labelForStateDir(stateDir: string): string;

package/dist/service-instance.js

@@ -1,14 +1,20 @@
 import {
+  DEFAULT_LAUNCHD_LABEL,
   DEFAULT_SYSTEMD_UNIT,
   instanceNameFromStateDir,
+  labelForStateDir,
+  launchdLabel,
   normalizeInstanceName,
   serviceDescription,
   systemdUnitName,
   unitNameForStateDir
-} from "./chunk-3RLAHOPS.js";
+} from "./chunk-UZQWSOUB.js";
 export {
+  DEFAULT_LAUNCHD_LABEL,
   DEFAULT_SYSTEMD_UNIT,
   instanceNameFromStateDir,
+  labelForStateDir,
+  launchdLabel,
   normalizeInstanceName,
   serviceDescription,
   systemdUnitName,

package/dist/service.d.ts

@@ -47,6 +47,12 @@ export interface ServiceContext {
 export interface ServiceDeps {
     platform: NodeJS.Platform;
     run(command: string, args: string[]): Promise<void>;
+    /**
+     * launchd only — the uid whose GUI domain the agent is bootstrapped into.
+     * Injected rather than read from `process.getuid()` so the domain a plan
+     * targets is assertable off macOS, where the rest of this file is developed.
+     */
+    uid?: number;
 }
 export interface ServiceAdapter {
     readonly name: string;
@@ -58,4 +64,28 @@ export interface ServiceAdapter {
  * unit written before this CLI baked one in.
  */
 export declare function bakedStateDir(unit: string): string | undefined;
+/**
+ * What an already-present service definition says about itself, in the terms
+ * the guard needs: did this CLI write it, and which daemon is it for. Reading
+ * it is per-format; judging it is not, which is what keeps the systemd and
+ * launchd guards from drifting into two different sets of refusals.
+ */
+export interface ExistingDefinition {
+    managed: boolean;
+    /** The baked state directory, or undefined for a definition that bakes none. */
+    owner?: string;
+}
 export declare function createLinuxUserSystemdAdapter(deps?: ServiceDeps): ServiceAdapter;
+/**
+ * The state directory a CLI-managed launchd agent was installed for. The plist
+ * counterpart of `bakedStateDir`, and the reason a label — which is not
+ * injective over state directories — is still enough to find its daemon.
+ */
+export declare function bakedStateDirFromPlist(plist: string): string | undefined;
+export declare function createMacosUserLaunchdAdapter(deps?: ServiceDeps): ServiceAdapter;
+/**
+ * The adapter for the platform this CLI is running on. The two factories keep
+ * refusing every platform but their own — the selector is the only thing that
+ * is allowed to know which platform maps to which service manager.
+ */
+export declare function createServiceAdapter(deps?: ServiceDeps): ServiceAdapter;

package/dist/service.js

@@ -1,11 +1,17 @@
 import {
   SERVICE_NAME,
   bakedStateDir,
-  createLinuxUserSystemdAdapter
-} from "./chunk-227DBTDK.js";
-import "./chunk-3RLAHOPS.js";
+  bakedStateDirFromPlist,
+  createLinuxUserSystemdAdapter,
+  createMacosUserLaunchdAdapter,
+  createServiceAdapter
+} from "./chunk-TNNBVUKK.js";
+import "./chunk-UZQWSOUB.js";
 export {
   SERVICE_NAME,
   bakedStateDir,
-  createLinuxUserSystemdAdapter
+  bakedStateDirFromPlist,
+  createLinuxUserSystemdAdapter,
+  createMacosUserLaunchdAdapter,
+  createServiceAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/cli",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "Transport-neutral operator CLI for the ours shared daemon",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",

package/dist/chunk-227DBTDK.js

@@ -1,132 +0,0 @@
-import {
-  instanceNameFromStateDir,
-  serviceDescription,
-  unitNameForStateDir
-} from "./chunk-3RLAHOPS.js";
-
-// src/service.ts
-import { execFile as nodeExecFile } from "node:child_process";
-import { promisify } from "node:util";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-var execFile = promisify(nodeExecFile);
-var MARKER = "# Managed by @ours.network/cli";
-var SERVICE_NAME = "ours.service";
-var defaultDeps = {
-  platform: process.platform,
-  run: async (command, args) => {
-    await execFile(command, args, { windowsHide: true });
-  }
-};
-function systemdEscapeArgument(value) {
-  if (/[\n\r]/.test(value)) throw new Error("service arguments must not contain newlines");
-  return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%")}"`;
-}
-function systemdUnescapeArgument(value) {
-  const trimmed = value.trim();
-  if (!trimmed.startsWith('"') || !trimmed.endsWith('"') || trimmed.length < 2) return void 0;
-  return trimmed.slice(1, -1).replaceAll("%%", "%").replaceAll('\\"', '"').replaceAll("\\\\", "\\");
-}
-function bakedStateDir(unit) {
-  for (const line of unit.split("\n")) {
-    if (!line.startsWith("Environment=OURS_STATE_DIR=")) continue;
-    return systemdUnescapeArgument(line.slice("Environment=OURS_STATE_DIR=".length));
-  }
-  return void 0;
-}
-function describeConflict(previous, serviceFile, stateDir, verb = "overwrite") {
-  if (!previous.startsWith(MARKER)) {
-    return {
-      kind: "unmanaged",
-      serviceFile,
-      message: verb === "remove" ? `${serviceFile} is not managed by @ours.network/cli; refusing to remove it` : `${serviceFile} is not managed by @ours.network/cli; refusing to overwrite it without --force`
-    };
-  }
-  const owner = bakedStateDir(previous);
-  if (owner !== void 0 && owner !== stateDir) {
-    return {
-      kind: "other-state-dir",
-      serviceFile,
-      owner,
-      message: `${serviceFile} is the boot service for the daemon at ${owner}, not ${stateDir}; refusing to ${verb} it without --force`
-    };
-  }
-  return void 0;
-}
-function resolveStateDir(context) {
-  return resolve(context.stateDir ?? join(context.homeDir ?? homedir(), ".ours"));
-}
-function createLinuxUserSystemdAdapter(deps = defaultDeps) {
-  if (deps.platform !== "linux") throw new Error(`service management is not supported on ${deps.platform}; use an external launcher for \`ours daemon serve\``);
-  return {
-    name: "systemd-user",
-    async install(context) {
-      const home = context.homeDir ?? homedir();
-      const stateDir = resolveStateDir(context);
-      const unitName = unitNameForStateDir(stateDir);
-      const serviceFile = join(home, ".config", "systemd", "user", unitName);
-      const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
-      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
-      if (unitConfig) args.push("--config", unitConfig);
-      const environment = `Environment=OURS_STATE_DIR=${systemdEscapeArgument(stateDir)}
-`;
-      const unit = `${MARKER}
-[Unit]
-Description=${serviceDescription(instanceNameFromStateDir(stateDir).name)}
-After=network-online.target
-
-[Service]
-Type=simple
-ExecStart=${args.map(systemdEscapeArgument).join(" ")}
-${environment}Restart=on-failure
-RestartSec=2
-
-[Install]
-WantedBy=default.target
-`;
-      if (existsSync(serviceFile)) {
-        const previous = readFileSync(serviceFile, "utf8");
-        const conflict = describeConflict(previous, serviceFile, stateDir);
-        if (conflict && !context.force) {
-          if (!context.dryRun) throw new Error(conflict.message);
-          return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: true, conflict };
-        }
-        if (previous === unit) return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: context.dryRun === true };
-      }
-      const commands = [["systemctl", "--user", "daemon-reload"], ["systemctl", "--user", "enable", "--now", unitName]];
-      if (!context.dryRun) {
-        mkdirSync(dirname(serviceFile), { recursive: true });
-        writeFileSync(serviceFile, unit, { mode: 420 });
-        for (const [command, ...args2] of commands) await deps.run(command, args2);
-      }
-      return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands, changed: true, dryRun: context.dryRun === true };
-    },
-    async uninstall(context) {
-      const home = context.homeDir ?? homedir();
-      const stateDir = resolveStateDir(context);
-      const unitName = unitNameForStateDir(stateDir);
-      const serviceFile = join(home, ".config", "systemd", "user", unitName);
-      if (!existsSync(serviceFile)) return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: context.dryRun === true };
-      const previous = readFileSync(serviceFile, "utf8");
-      const conflict = describeConflict(previous, serviceFile, stateDir, "remove");
-      if (conflict && !(context.force && previous.startsWith(MARKER))) {
-        if (!context.dryRun) throw new Error(conflict.message);
-        return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: true, conflict };
-      }
-      const commands = [["systemctl", "--user", "disable", "--now", unitName], ["systemctl", "--user", "daemon-reload"]];
-      if (!context.dryRun) {
-        await deps.run(commands[0][0], commands[0].slice(1));
-        unlinkSync(serviceFile);
-        await deps.run(commands[1][0], commands[1].slice(1));
-      }
-      return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands, changed: true, dryRun: context.dryRun === true };
-    }
-  };
-}
-
-export {
-  SERVICE_NAME,
-  bakedStateDir,
-  createLinuxUserSystemdAdapter
-};