@ours.network/cli 0.4.0 → 0.4.1

package/dist/{chunk-SSUJ5QGC.js → chunk-227DBTDK.js}

@@ -35,6 +35,25 @@ function bakedStateDir(unit) {
   }
   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"));
 }
@@ -68,12 +87,10 @@ WantedBy=default.target
 `;
       if (existsSync(serviceFile)) {
         const previous = readFileSync(serviceFile, "utf8");
-        if (!previous.startsWith(MARKER) && !context.force) {
-          throw new Error(`${serviceFile} is not managed by @ours.network/cli; refusing to overwrite it without --force`);
-        }
-        const owner = previous.startsWith(MARKER) ? bakedStateDir(previous) : void 0;
-        if (owner !== void 0 && owner !== stateDir && !context.force) {
-          throw new Error(`${serviceFile} is the boot service for the daemon at ${owner}, not ${stateDir}; refusing to overwrite it without --force`);
+        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 };
       }
@@ -92,10 +109,10 @@ WantedBy=default.target
       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");
-      if (!previous.startsWith(MARKER)) throw new Error(`${serviceFile} is not managed by @ours.network/cli; refusing to remove it`);
-      const owner = bakedStateDir(previous);
-      if (owner !== void 0 && owner !== stateDir && !context.force) {
-        throw new Error(`${serviceFile} is the boot service for the daemon at ${owner}, not ${stateDir}; refusing to remove it without --force`);
+      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) {

package/dist/main.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-YC7QBGVC.js";
 import {
   createLinuxUserSystemdAdapter
-} from "./chunk-SSUJ5QGC.js";
+} from "./chunk-227DBTDK.js";
 import {
   instanceNameFromStateDir
 } from "./chunk-3RLAHOPS.js";
@@ -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.0";
+var CLI_VERSION = false ? "0.0.0-dev" : "0.4.1";
 var COMMON_VALUES = /* @__PURE__ */ new Set(["--endpoint", "--port", "--state-dir", "--config", "--identity"]);
 var COMMON_BOOLEANS = /* @__PURE__ */ new Set(["--json", "--yes", "--help"]);
 function selectionFrom(values) {

package/dist/service.d.ts

@@ -12,10 +12,24 @@ export interface ServicePlan {
     stateDir: string;
     /** The config file the unit's ExecStart selects, or undefined when it selects none. */
     configPath?: string;
+    /**
+     * Set ONLY on a --dry-run that found something in the way. A real run throws
+     * on the same condition; a preview reports it, because a preview that raises
+     * on the one case it exists to preview is not a preview.
+     */
+    conflict?: ServiceConflict;
     commands: string[][];
     changed: boolean;
     dryRun: boolean;
 }
+/** Why a run would refuse to touch the unit file that is already there. */
+export interface ServiceConflict {
+    kind: 'unmanaged' | 'other-state-dir';
+    serviceFile: string;
+    /** For 'other-state-dir': the state directory the existing unit belongs to. */
+    owner?: string;
+    message: string;
+}
 export interface ServiceContext {
     cliPath: string;
     configPath?: string;

package/dist/service.js

@@ -2,7 +2,7 @@ import {
   SERVICE_NAME,
   bakedStateDir,
   createLinuxUserSystemdAdapter
-} from "./chunk-SSUJ5QGC.js";
+} from "./chunk-227DBTDK.js";
 import "./chunk-3RLAHOPS.js";
 export {
   SERVICE_NAME,

package/package.json

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