@ours.network/install 1.0.0 → 1.1.0

package/README.md

@@ -34,7 +34,8 @@ connector from another daemon still require explicit confirmation.
 - Installs `@ours.network/cli`, `@ours.network/mcp`,
   `@ours.network/tg-connector`, `@ours.network/cowork`, and
   `@ours.network/fleet` on one release channel.
-- Configures, starts, and enables the single shared daemon.
+- Configures, starts, and enables the single shared daemon with a CLI-managed
+  user systemd service on Linux or LaunchAgent on macOS.
 - Creates the daemon's Human identity (historically called the root identity),
   or preserves the existing one on a re-run.
 - Installs the ours plugin into safely detected Claude Code, Codex, and Hermes

package/install.sh

@@ -40,13 +40,13 @@ PKG="${OURS_INSTALL_PKG:-@ours.network/install}"
 NPM_BIN="${OURS_NPM:-npm}"
 
 # --- 1) Node.js + npm check + friendly guidance ------------------------------------------------
-# The installer needs Node.js ≥ 20 (and npm to fetch the command). If missing, don't fail
+# The installer needs Node.js ≥ 22 (and npm to fetch the command). If missing, don't fail
 # cryptically: explain what Node is and how to get it for this OS, point at nodejs.org, and exit
 # cleanly (0) so a piped run ends gracefully rather than with a scary non-zero error.
 if ! command -v node >/dev/null 2>&1 || ! command -v "$NPM_BIN" >/dev/null 2>&1; then
   os="$(uname -s 2>/dev/null || echo unknown)"
   printf '\n'
-  say "ours needs Node.js (version 20 or newer, which includes npm) — it isn't installed yet."
+  say "ours needs Node.js (version 22 or newer, which includes npm) — it isn't installed yet."
   say "Node.js is a common, free runtime; here's how to get it:"
   case "$os" in
     Darwin)

package/lib/orchestrate.mjs

@@ -489,11 +489,8 @@ export async function runServicePhase(args, effects, dir, port) {
   const plan = planServiceInstall({
     stateDir: dir, home: effects.home, readText: effects.readText, platform: effects.platform?.platform,
   });
-  // NOT a refusal and NOT a failure: the daemon is running and correct, and only
-  // the boot service could not be installed — `ours daemon install-service` throws
-  // on any non-linux platform. The run CONTINUES, says so, and the summary marks
-  // it, because the person this hurts reboots in a fortnight and finds nothing
-  // listening.
+  // NOT a refusal and NOT a failure: this is retained for platforms with no CLI
+  // service adapter. Linux and macOS both take the normal install path.
   if (plan.action === 'unsupported') {
     effects.out(warn(`ours: ${plan.message}`));
     effects.out(info(`Your daemon is installed and running now. To start it after a reboot, run:  ${plan.manual.join(' ')} ${join(dir, 'config.json')}`));
@@ -507,13 +504,9 @@ export async function runServicePhase(args, effects, dir, port) {
   const adopting = plan.action === 'adopt';
   if (adopting) effects.out(info(plan.notice));
   const command = serviceInstallCommand({ stateDir: dir, adoptLegacyUnit: adopting });
-  // The unit's bytes BEFORE, so "did it change?" survives the loss of --json.
-  // `ours daemon install-service --json` used to answer that itself; ours-mcp's
-  // takes no flags and reports nothing machine-readable. Assuming `changed: true`
-  // would make every re-run claim it rewrote the unit, which turns the honest
-  // "everything already correct" line into one that never appears — a screen that
-  // is wrong in the reassuring direction. So the installer does the comparison it
-  // used to delegate: it already reads this file to classify it.
+  // The service definition's bytes BEFORE are retained for Linux's established
+  // reporting path. On Darwin the CLI's JSON result is authoritative because it
+  // owns the LaunchAgent and launchctl transaction end to end.
   const unitBefore = plan.unitPath ? effects.readText(plan.unitPath) : null;
   let outcome;
   try {
@@ -531,11 +524,13 @@ export async function runServicePhase(args, effects, dir, port) {
   // which is the safe direction for a summary line.
   const changed = args.dryRun
     ? false
-    : (() => {
-      const after = plan.unitPath ? effects.readText(plan.unitPath) : null;
-      if (unitBefore === null || after === null) return true;
-      return unitBefore !== after;
-    })();
+    : plan.platform === 'darwin'
+      ? readChanged(outcome.stdout)
+      : (() => {
+          const after = plan.unitPath ? effects.readText(plan.unitPath) : null;
+          if (unitBefore === null || after === null) return true;
+          return unitBefore !== after;
+        })();
   return { step: { id: 'service', changed, reason: changed ? undefined : 'unit unchanged' }, plan };
 }
 
@@ -724,7 +719,7 @@ export async function askBroker(args, effects) {
  * Pre-flight: the two disasters worth catching before anything is touched.
  *
  * Carried over from the v2 body deliberately. Native Windows and a Node older
- * than 20 are not "the install went badly", they are "this cannot work here",
+ * than 22 are not "the install went badly", they are "this cannot work here",
  * and finding that out after the daemon package is on disk helps nobody.
  *
  * NOT carried over: v2 also exited when no harness was found. Under v3 the
@@ -751,12 +746,9 @@ export function runPreflight(effects) {
     return { ok: false, platform: plat };
   }
   effects.out(ok(`Platform: ${plat.label} (supported)`));
-  if (effects.platform?.platform && effects.platform.platform !== 'linux') {
-    effects.out(info(`On ${plat.label} the daemon runs, but installing a BOOT SERVICE is not available — you will start it yourself after a reboot.`));
-  }
   const version = String(effects.nodeVersion ?? '0');
-  if (Number.parseInt(version.split('.')[0], 10) < 20) {
-    effects.out(warn(`Node.js ${version} — ours needs v20 or newer. Update Node and re-run.`));
+  if (Number.parseInt(version.split('.')[0], 10) < 22) {
+    effects.out(warn(`Node.js ${version} — ours needs v22 or newer. Update Node and re-run.`));
     return { ok: false, platform: plat, node: version };
   }
   effects.out(ok(`Node.js ${version}`));
@@ -1123,8 +1115,8 @@ export async function runInstall(argv, effects) {
     state: target.action === 'create' ? 'installed' : 'current',
     note: `port ${target.port}`,
   }];
-  // The skip must not read as success: same "needs attention" mark a failed
-  // component gets, so the closing screen cannot say everything is clean.
+  // A future supported runtime may still lack a CLI service adapter. Do not
+  // render that partial state as success.
   if (daemon.serviceUnsupported) {
     summary.push({
       key: 'service',

package/lib/plan.mjs

@@ -9,6 +9,7 @@ import { join, resolve, basename } from 'node:path';
 export const CLI_UNIT_MARKER = '# Managed by @ours.network/cli';
 export const SYSTEMD_USER_DIR = ['.config', 'systemd', 'user'];
 export const DEFAULT_SYSTEMD_UNIT = 'ours.service';
+export const DEFAULT_LAUNCHD_LABEL = 'solutions.adaptframework.ours';
 
 // -----------------------------------------------------------------------------
 // Which unit file does this state directory own?
@@ -46,6 +47,23 @@ export function unitPathForStateDir(stateDir, home) {
   return { ...derived, path: join(home, ...SYSTEMD_USER_DIR, derived.unit) };
 }
 
+/**
+ * Read-only launchd label derivation for accurate progress output. The CLI owns
+ * the plist path, generation, permissions, conflict handling and launchctl.
+ *
+ * SOURCE OF TRUTH IS @ours.network/cli 2.6.1 service-instance.ts. Keep this in
+ * the same table tests as the systemd derivation above.
+ */
+export function launchdLabelForStateDir(stateDir) {
+  const derived = unitNameForStateDir(stateDir);
+  if (!derived.ok) return derived;
+  return {
+    ok: true,
+    label: derived.instance ? `${DEFAULT_LAUNCHD_LABEL}.${derived.instance}` : DEFAULT_LAUNCHD_LABEL,
+    instance: derived.instance,
+  };
+}
+
 // -----------------------------------------------------------------------------
 // The unmarked-unit case — the migration blocker
 // -----------------------------------------------------------------------------
@@ -110,39 +128,28 @@ export function classifyUnit(text) {
  * default that spreads to the other cases.
  */
 export function planServiceInstall({ stateDir, home, readText, platform = 'linux' }) {
-  // THE BOOT SERVICE IS LINUX-ONLY, AND NOT BECAUSE THIS FILE SAYS SO.
-  //
-  // `ours daemon install-service` in @ours.network/cli builds its adapter with
-  // `createLinuxUserSystemdAdapter()` and no platform branch at all, and that
-  // factory's FIRST line is
-  //   if (deps.platform !== 'linux') throw new Error('service management is not
-  //   supported on <platform>; use an external launcher for `ours daemon serve`')
-  // — verified by reading the published 0.4.1 tarball, which contains zero
-  // occurrences of launchd, LaunchAgents or plist.
-  //
-  // So calling it on macOS does not degrade, it THROWS. Before this, a Mac user
-  // was told their platform was supported, watched the CLI install, the config
-  // write and the daemon start, and then got an exception and a rolled-back
-  // config. Skipping the step leaves them a working daemon and one true sentence
-  // instead — which is the whole of this change.
-  //
-  // A real launchd adapter belongs in the SDK CLI, not here. Nothing in this
-  // package can install a launchd agent, and pretending otherwise by writing a
-  // plist ourselves would put a second service implementation in a second repo.
-  // `ours daemon install-service` supports Linux/systemd only: its adapter throws
-  // for any other platform, so calling it would fail the run rather than degrade.
-  // Skip it and say so; the daemon itself is unaffected.
-  if (platform && platform !== 'linux') {
+  // @ours.network/cli 2.6.1 dispatches this same command to user systemd on
+  // Linux and launchd on macOS. Other platforms still have no service adapter.
+  if (platform && platform !== 'linux' && platform !== 'darwin') {
     return {
       action: 'unsupported',
       platform,
       reason: 'no-service-manager',
-      message: platform === 'darwin'
-        ? 'installing a boot service is not available on macOS — the ours CLI can only manage a Linux user systemd service'
-        : `installing a boot service is not available on ${platform} — the ours CLI can only manage a Linux user systemd service`,
+      message: `installing a boot service is not available on ${platform} — the ours CLI supports Linux user systemd and macOS launchd`,
       manual: ['ours', 'daemon', 'serve', '--config'],
     };
   }
+
+  if (platform === 'darwin') {
+    const derived = launchdLabelForStateDir(stateDir);
+    if (!derived.ok) {
+      return { action: 'refuse', exitCode: 2, reason: 'unusable-state-dir', message: derived.reason };
+    }
+    return {
+      action: 'install', platform, unit: derived.label, instance: derived.instance,
+    };
+  }
+
   const derived = unitPathForStateDir(stateDir, home);
   if (!derived.ok) {
     return { action: 'refuse', exitCode: 2, reason: 'unusable-state-dir', message: derived.reason };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/install",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": false,
   "description": "The all-in-one ours.network installer: one shared daemon, MCP, cowork, Telegram, Fleet, harness plugins, Human identity, stopped Fleet starter, progress UI, and guided next steps.",
   "type": "module",
@@ -25,7 +25,7 @@
     "directory": "packages/installer"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "scripts": {
     "test": "node --test"