@ours.network/install 0.16.0 → 0.17.0-nightly.10

package/lib/usage.mjs

@@ -0,0 +1,47 @@
+// ours-install v3 — the help text.
+//
+// It lives here rather than in the bin because `--help` is a behaviour with a
+// contract (the flags it names must be the flags target.mjs accepts), and a bin
+// that is three lines long cannot be the place a contract is asserted.
+
+export const USAGE = `ours-install — the unified ours.network stack installer.
+
+  Install:  npm i -g @ours.network/install && ours-install   (recommended)
+            npx @ours.network/install                          (one-off)
+
+  ours-install [--state-dir PATH] [--port N] [--dry-run] [--help] [--version]
+
+Guided setup for the whole stack: the ours daemon, its components (the MCP
+server, the Telegram connector, cowork), your harness plugins (Claude Code /
+Codex / Hermes), ours-fleet and voice transcription — then one copy-paste
+hand-off prompt. You approve each step; re-run any time to add a piece or update.
+
+  --state-dir  the daemon's STATE DIRECTORY, which is what identifies a daemon
+               (default ~/.ours). A second state directory is a second daemon.
+  --port       used only when CREATING a daemon. For a daemon that already owns
+               the state directory the port comes from its own record, and a
+               --port that disagrees with it is refused rather than corrected.
+  --dry-run    walk the whole flow and print what it WOULD do — change nothing
+  --help       show this help and exit
+  --version    print the installer version and exit
+
+Env: OURS_ASSUME_YES=1 (accept defaults, no prompts) · OURS_INSTALL_DRY_RUN=1 ·
+     OURS_CHANNEL=nightly · OURS_BROKER_URL · OURS_NPM. Docs: https://ours.network`;
+
+export const UNINSTALL_USAGE = `ours-uninstall — remove one ours daemon and what attaches to it.
+
+  ours-uninstall [--state-dir PATH] [--purge] [--dry-run] [--help] [--version]
+
+Removes the boot service, stops the daemon, and removes the global packages —
+but ONLY when no other daemon on this machine still needs them. A component
+still pointing at this daemon stops the run before anything is removed, so a
+run that refuses leaves the daemon whole rather than half-dismantled.
+
+  --state-dir  which daemon to remove (default ~/.ours). A daemon IS its state
+               directory, so this is the only thing that names one.
+  --purge      also delete the state directory itself. Never the default, never
+               done non-interactively, and it asks you to type the full path —
+               identity keys exist nowhere else and no peer can give them back.
+  --dry-run    print what it WOULD remove and remove nothing
+  --help       show this help and exit
+  --version    print the version and exit`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/install",
-  "version": "0.16.0",
+  "version": "0.17.0-nightly.10",
   "private": false,
   "description": "The unified ours.network stack installer (ours-install): one guided ~3-minute flow for ours core (the daemon) + the harness plugins (Claude Code / Codex) + ours-fleet + the Telegram connector, then a single copy-paste hand-off prompt. Self-contained (Node built-ins only); run as `ours-install` or via curl|bash (install.sh).",
   "type": "module",

package/uninstall.mjs

@@ -19,7 +19,9 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { banner, heading, c, openTty, makeWriter, closeSync } from './lib/ui.mjs';
 import { askLine, checkboxSelect } from './lib/prompt.mjs';
-import { canonHarnesses } from './lib/logic.mjs';
+import { canonHarnesses, resolveChannel } from './lib/logic.mjs';
+import { realEffects } from './lib/effects.mjs';
+import { runUninstall as runUninstallV3 } from './lib/orchestrate-uninstall.mjs';
 
 const NPM = process.env.OURS_NPM || 'npm';
 const HOME = homedir();
@@ -28,6 +30,11 @@ const CODEX_DIR = process.env.CODEX_DIR || join(HOME, '.codex');
 const SKILLS_DIR = process.env.SKILLS_DIR || join(HOME, '.agents', 'skills');
 const OURS_STATE_DIR = process.env.OURS_STATE_DIR || join(HOME, '.ours');
 const ASSUME_YES = !!process.env.OURS_ASSUME_YES;
+const packageVersion = (() => {
+  try { return JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version || ''; }
+  catch { return ''; }
+})();
+const CHANNEL = resolveChannel(process.env.OURS_CHANNEL || process.env.OURS_INSTALL_CHANNEL, packageVersion);
 
 const say = (s) => process.stdout.write(`ours: ${s}\n`);
 const line = (s = '') => process.stdout.write(`${s}\n`);
@@ -38,7 +45,10 @@ const YAML_END = '# <<< ours.network plugin';
 const MD_START = '<!-- >>> ours.network plugin (managed block) -->';
 const MD_END = '<!-- <<< ours.network plugin -->';
 
-const run = (bin, args) => spawnSync(bin, args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+const run = (bin, args, { env } = {}) => spawnSync(bin, args, {
+  encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'],
+  env: env ? { ...process.env, ...env } : process.env,
+});
 
 // --- safe removal helpers ----------------------------------------------------------------------
 function rmDir(d) { if (d && existsSync(d)) { rmSync(d, { recursive: true, force: true }); say(`  removed ${d}`); } }
@@ -107,10 +117,26 @@ function confirmDestructive(write, fd, what) {
 }
 
 // ===============================================================================================
-function main() {
+async function main() {
   const ttyFd = openTty();
   const write = makeWriter(ttyFd);
 
+  // ─── THE CHANNEL FORK ───────────────────────────────────────────────────────
+  // The partner to install.mjs's, and it has to move in the SAME commit. v3
+  // installing while this body uninstalls would run the old flow against state it
+  // no longer understands — the kind of half-state that only surfaces when someone
+  // tries to undo something.
+  //
+  // Before the banner, so the screen the operator sees is the one belonging to the
+  // flow that is about to run.
+  if (CHANNEL === 'nightly') {
+    const code = await runUninstallV3(process.argv.slice(2), realEffects({
+      write, ttyFd, env: process.env, version: packageVersion,
+    }));
+    finish(ttyFd);
+    process.exit(code);
+  }
+
   line(banner());
   line(c.bold('  ours.network uninstaller'));
   say('Removes only what the ours installers created. Nothing is removed until you confirm.');
@@ -195,4 +221,10 @@ function main() {
 
 function finish(ttyFd) { if (ttyFd != null) { try { closeSync(ttyFd); } catch { /* ignore */ } } }
 
-main();
+// `main` became async when the nightly fork moved in: the v3 uninstaller is async
+// all the way down. An unhandled rejection here would exit 0 with no output, so the
+// failure is caught and reported like the installer's.
+main().catch((error) => {
+  say(`unexpected error: ${String(error)}`);
+  process.exitCode = 1;
+});

package/uninstall.sh

@@ -10,10 +10,19 @@
 # explanation of what will be removed. It removes ONLY what the ours installers created; the two
 # destructive items (data dir, daemon) require an explicit typed 'yes'.
 #
-# Non-interactive env overrides (all optional) — consumed by the Node uninstaller:
-#   OURS_UNINSTALL="hermes codex"   which harness plugins to remove (space/comma; names or "all")
-#   OURS_UNINSTALL_DATA=yes         also remove the ours data dir (~/.ours) [destructive]
-#   OURS_UNINSTALL_DAEMON=yes       also stop + remove the ours-mcp daemon + its service
+# Non-interactive env overrides (all optional) — consumed by the Node uninstaller. Setting ANY of
+# the OURS_UNINSTALL* variables makes the run non-interactive; setting none leaves it unchanged.
+# Four documented variables describe things this uninstaller cannot do, and it REFUSES (exit 2,
+# nothing removed) rather than ignoring them — see the table in README.md. Full list there.
+#   OURS_UNINSTALL="hermes codex"   which harness plugins to remove (space/comma; names, "all", "none")
+#   OURS_UNINSTALL_DAEMON=yes       also stop + remove the daemon + its service + the global packages.
+#                                   Unset (or any other value) removes ONLY the plugins named above
+#                                   and leaves the daemon running.
+#   OURS_UNINSTALL_TELEGRAM=detach  detach the Telegram connector from this daemon (same for
+#   OURS_UNINSTALL_ROOMS=detach     Rooms). Without it, a run a connector still points at refuses.
+#   OURS_UNINSTALL_DATA=yes         REFUSED. State is never deleted unattended — it holds identity
+#                                   private keys. Use 'ours-uninstall --state-dir <dir> --purge'
+#                                   from a terminal and type the full path.
 #   OURS_ASSUME_YES=1               accept defaults; skip the typed confirmations (implies no tty)
 #   OURS_NPM="npm"                  npm binary to use
 #   OURS_UNINSTALLER_MJS / OURS_INSTALLER_BASE   run/fetch overrides (dev/testing)