@ours.network/install 0.18.0-nightly.4 → 0.18.0-nightly.6

package/lib/target.mjs

@@ -1,6 +1,6 @@
 // ours-install v3 — argument handling and daemon detection.
 //
-// Spec: installer-spec-v3 §§1-3. Everything here is PURE: the orchestrator
+// Pure argument handling and daemon-target selection. The orchestrator
 // injects the probe, the file reads and the port check, so the whole decision
 // table is testable without a socket, a daemon or a filesystem.
 //
@@ -19,17 +19,15 @@ export const FREE_PORT_SPAN = 1000;
 
 // Ports that are other components' DEFAULTS, not facts about the machine: 3051
 // is the Telegram connector's, 3052 is cowork's loopback console. The free-port
-// search skips them; an explicit --port is still honoured as typed (spec §2).
+// search skips them; an explicit --port is still honoured exactly as typed.
 //
-// NOTE, deliberately not silently reconciled: lib/logic.mjs's RESERVED_PORTS is
-// [3051] on this branch, while spec §2 states [3051, 3052] citing the
-// dev4/version-plumbing branch. This constant follows the spec. The two should
-// be merged once someone decides whether cowork's 3052 belongs in the shipped
-// list — flagged rather than assumed.
+// Keep both component defaults out of automatic selection: 3051 belongs to the
+// Telegram connector and 3052 to cowork. Explicit operator selections remain
+// valid.
 export const INSTALL_RESERVED_PORTS = [3051, 3052];
 
 // The CLI-owned PID record that proves a daemon belongs to a state directory
-// even when nothing is recorded in its config (spec §1).
+// even when nothing is recorded in its config.
 export const CLI_PID_RECORD = 'ours-cli-daemon.json';
 // The SAME record, written by a different daemon. `ours daemon start` writes
 // ours-cli-daemon.json; prerelease ours-mcp wrote daemon.pid (packages/core
@@ -77,7 +75,7 @@ export function samePath(a, b) {
 }
 
 // -----------------------------------------------------------------------------
-// §2 — arguments
+// Arguments
 // -----------------------------------------------------------------------------
 
 const VALUE_FLAGS = new Set(['--state-dir', '--port']);
@@ -143,14 +141,14 @@ export function parseInstallArgs(argv = [], env = {}, { home = homedir() } = {})
 }
 
 // -----------------------------------------------------------------------------
-// §§1, 3 — is there a daemon at this state directory?
+// Is there a daemon at this state directory?
 // -----------------------------------------------------------------------------
 
 /**
  * The port to probe first: the one recorded in <state-dir>/config.json, else the
  * built-in default. An explicit --port does NOT change where we look — the
  * question is which daemon owns this directory, and that is answered by the
- * directory's own record, not by what the operator typed (spec §2 step 2).
+ * directory's own record, not by what the operator typed.
  */
 export function candidatePort(config) {
   const recorded = config && typeof config.port === 'number' && Number.isFinite(config.port) ? config.port : null;
@@ -158,7 +156,7 @@ export function candidatePort(config) {
 }
 
 /**
- * Classify one probe result against the target state directory (spec §3).
+ * Classify one probe result against the target state directory.
  *
  *   present — an ours daemon answered and reports THIS state directory
  *   foreign — something answered, but it is not an ours daemon, or it is one
@@ -176,7 +174,11 @@ export function classifyProbe(probe, targetStateDir) {
   if (!samePath(probe.stateDir, targetStateDir)) {
     return { kind: 'foreign', reason: 'daemon owns a different state directory', stateDir: resolve(probe.stateDir) };
   }
-  return { kind: 'present', stateDir: resolve(probe.stateDir) };
+  return {
+    kind: 'present',
+    stateDir: resolve(probe.stateDir),
+    daemonVersion: typeof probe.version === 'string' ? probe.version : null,
+  };
 }
 
 /**
@@ -242,12 +244,12 @@ export async function findDaemon({ stateDir, probe, readJson, readText }) {
   }
   // A FOREIGN DAEMON ON A PORT WE GUESSED IS NOT A REASON TO REFUSE.
   //
-  // AMENDS #56. As first written, any foreign answer on the candidate port
+  // Regression guard. As first written, any foreign answer on the candidate port
   // refused the run. But a state directory with no recorded port has told us
   // nothing, so the candidate is the built-in default — which, on any machine
   // that already runs a daemon, is where the FIRST daemon answers. The result
   // was that a second daemon could never be created while the first was up:
-  // §7 coexistence was unreachable, and the refusal's own advice ("re-run with
+  // coexistence was unreachable, and the refusal's own advice ("re-run with
   // --port for a free port") could not work either, because an explicit --port
   // deliberately does not change where we look.
   //
@@ -276,7 +278,7 @@ export async function findDaemon({ stateDir, probe, readJson, readText }) {
 }
 
 // -----------------------------------------------------------------------------
-// §2 — the derived-port rule
+// Derived-port rule
 // -----------------------------------------------------------------------------
 
 /**
@@ -327,7 +329,13 @@ export async function resolveTarget({ stateDir, port = null, portExplicit = fals
         message: `--port ${port} disagrees with port ${found.port}, where the daemon for ${target} is actually running`,
       };
     }
-    return { action: 'update', port: found.port, stateDir: target, config: found.config };
+    return {
+      action: 'update',
+      port: found.port,
+      stateDir: target,
+      config: found.config,
+      daemonVersion: found.daemonVersion ?? null,
+    };
   }
 
   // Creating. Only now is a port chosen.

package/lib/uninstall.mjs

@@ -1,6 +1,6 @@
 // ours-uninstall v3 — removing ONE daemon, and the non-interactive contract.
 //
-// Spec: installer-spec-v3 §§8-9. Pure, like every other stage: the caller
+// Pure uninstall planning, like every other stage: the caller
 // injects the file reads and this returns a plan.
 //
 //   ours-uninstall [--state-dir PATH] [--purge] [--dry-run]
@@ -11,7 +11,7 @@
 // THE BIAS OF THIS WHOLE FILE IS TOWARD KEEPING THINGS. State is kept by default,
 // a component's config file is kept even when its daemon keys are removed, and
 // global packages are kept while any other daemon still needs them. The one
-// destructive operation, --purge, is separately gated (§8 step 5) because
+// destructive operation, --purge, is separately gated because
 // it deletes identity keys, and no other step here is irreversible.
 
 import { join, resolve } from 'node:path';
@@ -22,9 +22,9 @@ import { canonHarnesses } from './logic.mjs';
 /**
  * Does this directory even look like an ours state directory?
  *
- * WHY THIS EXISTS. The owner removed the "created by an installer run" gate —
- * purge means purge, on any state directory. That was a deliberate ruling and
- * this does not reintroduce it: this asks "is this a state directory at all",
+ * Purge applies to any explicitly selected ours state directory, not only one
+ * created by this installer. This does not add a provenance gate: it asks
+ * "is this a state directory at all",
  * not "is it ours". With provenance gone, the typed path would otherwise be the
  * only thing between `ours-uninstall --state-dir ~ --purge` and a deleted home
  * directory, and a typed path is no protection against a path typed exactly as
@@ -85,7 +85,7 @@ export function inspectComponentConfig(path, { readText } = {}) {
 }
 
 /**
- * §8 step 1 — refuse if a component still points at this daemon.
+ * Refuse if a component still points at this daemon.
  *
  * Read the connector's and cowork's config files; if either names this daemon's
  * endpoint or its state directory, list them and stop. Exit 2, nothing removed.
@@ -160,7 +160,7 @@ export function planComponentDetach(key, existing) {
 }
 
 /**
- * §8 steps 3-4 — the boot service, then the daemon itself.
+ * Stop the boot service, then the daemon itself.
  *
  * Both delegate their refusals rather than reimplementing them: `ours daemon
  * uninstall-service` refuses to remove a unit not marked as CLI-managed, and
@@ -186,14 +186,13 @@ export function planDaemonRemoval({ stateDir, cliStartedIt }) {
 }
 
 /**
- * §8 step 5 — state. Kept unless every gate opens.
+ * State is kept unless every purge gate opens.
  *
  *   --purge given      — never the default; deleting identity keys is opt-in.
- *   interactive        — an unattended run never deletes state (§9).
+ *   interactive        — an unattended run never deletes state.
  *   looks like a state directory — see looksLikeStateDir.
- *   typed confirmation — the full path, not a y/N. The owner removed the
- *                        provenance condition, not the deliberateness, and with
- *                        provenance gone this is the last thing standing between
+ *   typed confirmation — the full path, not a y/N. Without a provenance
+ *                        condition, this is the last thing standing between
  *                        a mistyped command and someone's identity keys.
  *
  * Returns the exact directory, never a glob or a parent, and only when every gate
@@ -219,7 +218,7 @@ export function planStatePurge({ stateDir, purge = false, assumeYes = false, exi
 }
 
 /**
- * §8 step 6 — global packages are shared. Remove them only when no OTHER state
+ * Global packages are shared. Remove them only when no other state
  * directory on this machine still has a daemon config; otherwise keep them and
  * say which daemon still needs them.
  */
@@ -257,7 +256,7 @@ export function planGlobalPackages({ stateDir, otherStateDirsWithConfig = [], pl
 }
 
 // -----------------------------------------------------------------------------
-// §8 — the harness plugins the installer wrote
+// Harness plugins written by the installer
 // -----------------------------------------------------------------------------
 
 /**
@@ -397,7 +396,7 @@ export function planPluginRemoval({ home, env = {}, exists = () => false, lastDa
 }
 
 /**
- * §8 — WHICH harnesses to detach (inventory item 9.5).
+ * Decide which harnesses to detach using the documented environment contract.
  *
  * The nightly uninstaller let the operator choose: a `checkboxSelect` picker on a
  * terminal, `OURS_UNINSTALL` without one, and NOTHING removed when it had
@@ -472,7 +471,7 @@ export function selectHarnesses(plugins, chosen) {
 }
 
 /**
- * The whole §8 order, refusing at step 1 rather than starting and stopping
+ * Preserve the full uninstall order, refusing before any mutation rather than stopping
  * half-way.
  */
 export function planUninstall({ home, env = {}, endpoint, stateDir, purge = false, assumeYes = false, confirmedComponents = [], readJson, readText, exists = () => true, cliStartedIt = true, otherStateDirsWithConfig = [], typedConfirmation = null, explicitHarnessSelection = false, platform = 'linux' }) {
@@ -528,7 +527,7 @@ export function planUninstall({ home, env = {}, endpoint, stateDir, purge = fals
 }
 
 // -----------------------------------------------------------------------------
-// §9 — the non-interactive contract
+// Non-interactive behavior
 // -----------------------------------------------------------------------------
 
 /**
@@ -565,7 +564,7 @@ export function refusalSurvivesAssumeYes(refusal) {
 }
 
 // -----------------------------------------------------------------------------
-// §9 — the OURS_UNINSTALL_* contract (inventory item 10.9)
+// Documented OURS_UNINSTALL_* environment contract
 // -----------------------------------------------------------------------------
 
 /**
@@ -592,13 +591,13 @@ export function refusalSurvivesAssumeYes(refusal) {
  *                           that matters most.
  *   OURS_UNINSTALL_TELEGRAM
  *   OURS_UNINSTALL_ROOMS    at the value `detach`, which is exactly the
- *                           confirmation §8 step 1 asks a human for and which an
+ *                           confirmation that the interactive flow asks a human for and which an
  *                           unattended run otherwise cannot give, so today the
  *                           run refuses instead of detaching.
  *
  * REFUSED
  *   OURS_UNINSTALL_DATA=yes         v3 never deletes state without a human
- *                                   present (§9), and that rule protects private
+ *                                   present; that rule protects private
  *                                   keys that exist nowhere else.
  *   OURS_UNINSTALL_PROFILE          names an entry in the daemon registry. v3
  *                                   has no registry; the selector is --state-dir.

package/lib/usage.mjs

@@ -13,8 +13,9 @@ export const USAGE = `ours-install — the unified ours.network stack installer.
 
 Progress-driven setup for the whole stack: one shared daemon, MCP, Telegram,
 cowork, detected harness plugins (Claude Code / Codex / Hermes), a Human
-identity, and ours-fleet. The daemon and cowork start; Telegram and Fleet are
-staged but stopped. The installer asks only for information it cannot infer and
+identity, and ours-fleet. The daemon, Telegram connector, and cowork shim start
+as durable services; only Fleet is staged but stopped. The installer asks only
+for information it cannot infer and
 ends with exact next commands plus a copy-paste agent hand-off prompt.
 
   --state-dir  the daemon's STATE DIRECTORY, which is what identifies a daemon

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/install",
-  "version": "0.18.0-nightly.4",
+  "version": "0.18.0-nightly.6",
   "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",