@ours.network/cli 0.6.0 → 1.0.1

package/README.md

@@ -1,9 +1,10 @@
 # @ours.network/cli
 
-`ours` is the transport-neutral operator CLI for the shared ours daemon. It is a
-separate package above `@ours.network/sdk`: lifecycle commands call
-`startDaemon`, and network operations use `OursClient`. It has no dependency on
-`@ours.network/mcp`.
+`ours` is the transport-neutral operator CLI and lifecycle owner for the shared
+ours daemon. Its artifact bundles the SDK's package-private daemon runtime;
+network operations use the public client attach path. It has no dependency on
+`@ours.network/mcp`, and applications cannot import the runtime through an SDK
+daemon subpath.
 
 ## Install and first checks
 
@@ -91,12 +92,12 @@ and secret fields already in the file.
 ```bash
 ours config setup --port 3070 --state-dir /srv/ours-a \
   --broker-url wss://broker1.ours.network --api-visibility owner
-ours config setup --auto-start false --gc-interval-ms 3600000
+ours config setup --gc-interval-ms 3600000
 ours config setup --port 3070 --dry-run --json
 ```
 
-Supported setup fields are `brokerUrl`, `port`, `stateDir`, `gcIntervalMs`,
-`autoStart`, and `apiVisibility`. Supply credentials through an operator-owned
+Supported setup fields are `brokerUrl`, `port`, `stateDir`, `gcIntervalMs`, and
+`apiVisibility`. Supply credentials through an operator-owned
 secret mechanism or the existing SDK configuration, not CLI arguments.
 
 ## Operator commands
@@ -151,7 +152,7 @@ file fallback probes, and legacy monitoring/control-plane operations.
 
 ## Service management
 
-Linux user systemd is supported through a testable adapter:
+Linux user systemd and macOS launchd are supported through tested adapters:
 
 ```bash
 ours daemon install-service --dry-run --json
@@ -159,11 +160,10 @@ ours daemon install-service --yes
 ours daemon uninstall-service --yes
 ```
 
-The adapter owns only `~/.config/systemd/user/ours.service` files carrying its
-management marker. It refuses to overwrite or remove an unrelated unit. Other
-platforms fail explicitly; use the platform's external service manager to run
-`ours daemon serve`. Service installation is not emulated and never reports
-success on an unsupported platform.
+The adapters own only units/plists carrying their management marker and refuse
+to overwrite or remove unrelated definitions. The daemon's state-root lock is
+supported on Linux and macOS only; other platforms refuse startup explicitly
+rather than silently running without singleton protection.
 
 ## License
 

package/dist/boot-35BOHNSZ.js

@@ -0,0 +1,9 @@
+import {
+  bootWrapper,
+  wrapperBooted
+} from "./chunk-MHVYJY3H.js";
+import "./chunk-FXKFSNKS.js";
+export {
+  bootWrapper,
+  wrapperBooted
+};

package/dist/{chunk-6W3RHW3C.js → chunk-6K2JBKHI.js}

@@ -4,8 +4,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { randomBytes } from "node:crypto";
 import {
-  OursClient,
-  assertDaemonStateDir,
+  attachOursClient,
   describeDaemonConfig,
   resolveDaemonConfig
 } from "@ours.network/sdk/client";
@@ -26,11 +25,11 @@ function redactedSelection(config) {
   return describeDaemonConfig(config);
 }
 async function attachClient(config, opts = {}) {
-  await assertDaemonStateDir(config, { fetch: opts.fetch });
-  return new OursClient({
-    url: config.baseUrl.value,
+  return attachOursClient({
+    endpoint: config.baseUrl.value,
+    expectStateDir: config.expectStateDir,
+    token: config.token?.value,
     leaseToken: opts.leaseToken ?? randomBytes(32).toString("hex"),
-    apiToken: config.token?.value,
     fetch: opts.fetch
   });
 }

package/dist/{chunk-G2GHHOYX.js → chunk-DRQEV4SN.js}

@@ -2,12 +2,12 @@ import {
   defaultConfigPath,
   redactedSelection,
   resolveSelection
-} from "./chunk-6W3RHW3C.js";
+} from "./chunk-6K2JBKHI.js";
 
 // src/config-command.ts
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-var SAFE_KEYS = /* @__PURE__ */ new Set(["brokerUrl", "port", "stateDir", "gcIntervalMs", "autoStart", "apiVisibility"]);
+var SAFE_KEYS = /* @__PURE__ */ new Set(["brokerUrl", "port", "stateDir", "gcIntervalMs", "apiVisibility"]);
 async function showConfig(selection) {
   const resolved = await resolveSelection(selection);
   let stored = {};

package/dist/chunk-FXKFSNKS.js

@@ -0,0 +1,166 @@
+// ../../src/config.ts
+import * as fs from "node:fs";
+import { randomBytes } from "node:crypto";
+import { homedir } from "node:os";
+import { resolve, join, dirname, basename } from "node:path";
+var API_VISIBILITIES = ["owner", "shared", "open"];
+var DEFAULT_CONFIG = {
+  brokerUrl: "wss://broker1.ours.network",
+  port: 3050,
+  stateDir: resolve(homedir(), ".ours"),
+  gcIntervalMs: 36e5,
+  apiVisibility: "owner"
+};
+function configPath() {
+  return process.env.OURS_CONFIG ?? join(homedir(), ".ours", "config.json");
+}
+function readFileConfig() {
+  let raw;
+  try {
+    raw = fs.readFileSync(configPath(), "utf8");
+  } catch {
+    return {};
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return {};
+  }
+  const out = {};
+  if (typeof parsed.brokerUrl === "string") out.brokerUrl = parsed.brokerUrl;
+  if (typeof parsed.port === "number" && Number.isFinite(parsed.port)) out.port = parsed.port;
+  if (typeof parsed.stateDir === "string") out.stateDir = resolve(parsed.stateDir);
+  if (typeof parsed.gcIntervalMs === "number" && Number.isFinite(parsed.gcIntervalMs)) {
+    out.gcIntervalMs = parsed.gcIntervalMs;
+  }
+  if (typeof parsed.apiVisibility === "string" && API_VISIBILITIES.includes(parsed.apiVisibility)) {
+    out.apiVisibility = parsed.apiVisibility;
+  }
+  if (typeof parsed.apiToken === "string" && parsed.apiToken.trim()) out.apiToken = parsed.apiToken.trim();
+  if (parsed.stt && typeof parsed.stt === "object") {
+    const s = parsed.stt;
+    const stt = {};
+    if (typeof s.provider === "string") stt.provider = s.provider;
+    if (typeof s.apiKey === "string") stt.apiKey = s.apiKey;
+    if (typeof s.model === "string") stt.model = s.model;
+    if (typeof s.baseUrl === "string") stt.baseUrl = s.baseUrl;
+    if (typeof s.language === "string") stt.language = s.language;
+    if (typeof s.maxBytes === "number" && Number.isFinite(s.maxBytes)) stt.maxBytes = s.maxBytes;
+    if (typeof s.timeoutMs === "number" && Number.isFinite(s.timeoutMs)) stt.timeoutMs = s.timeoutMs;
+    if (s.custom && typeof s.custom === "object") stt.custom = s.custom;
+    out.stt = stt;
+  }
+  return out;
+}
+function envVisibility() {
+  const v = process.env.OURS_API_VISIBILITY?.trim().toLowerCase();
+  return v && API_VISIBILITIES.includes(v) ? v : void 0;
+}
+function envInt(name) {
+  const v = process.env[name];
+  if (v === void 0) return void 0;
+  const n = parseInt(v, 10);
+  return Number.isNaN(n) ? void 0 : n;
+}
+function loadConfig() {
+  const file = readFileConfig();
+  return {
+    brokerUrl: process.env.OURS_BROKER_URL ?? file.brokerUrl ?? DEFAULT_CONFIG.brokerUrl,
+    port: envInt("OURS_PORT") ?? file.port ?? DEFAULT_CONFIG.port,
+    stateDir: resolve(process.env.OURS_STATE_DIR ?? file.stateDir ?? DEFAULT_CONFIG.stateDir),
+    gcIntervalMs: envInt("OURS_GC_INTERVAL_MS") ?? file.gcIntervalMs ?? DEFAULT_CONFIG.gcIntervalMs,
+    apiVisibility: envVisibility() ?? file.apiVisibility ?? DEFAULT_CONFIG.apiVisibility,
+    apiToken: process.env.OURS_API_TOKEN?.trim() || file.apiToken,
+    stt: sttFromEnv(file.stt)
+  };
+}
+function sttFromEnv(file) {
+  const env = {};
+  if (process.env.OURS_STT_PROVIDER?.trim()) env.provider = process.env.OURS_STT_PROVIDER.trim();
+  if (process.env.OURS_STT_API_KEY?.trim()) env.apiKey = process.env.OURS_STT_API_KEY.trim();
+  if (process.env.OURS_STT_MODEL?.trim()) env.model = process.env.OURS_STT_MODEL.trim();
+  if (process.env.OURS_STT_BASE_URL?.trim()) env.baseUrl = process.env.OURS_STT_BASE_URL.trim();
+  if (process.env.OURS_STT_LANGUAGE?.trim()) env.language = process.env.OURS_STT_LANGUAGE.trim();
+  const merged = { ...file ?? {}, ...env };
+  return Object.keys(merged).length ? merged : void 0;
+}
+var API_TOKEN_FILENAME = "daemon-token";
+function apiTokenPath(cfg) {
+  return join(cfg.stateDir, API_TOKEN_FILENAME);
+}
+function explicitApiToken(cfg) {
+  const env = process.env.OURS_API_TOKEN?.trim();
+  if (env) return env;
+  const c = cfg.apiToken?.trim();
+  return c || void 0;
+}
+function resolveApiToken(cfg, opts = {}) {
+  const env = process.env.OURS_API_TOKEN?.trim();
+  if (env) return { token: env, source: "env" };
+  const c = cfg.apiToken?.trim();
+  if (c) return { token: c, source: "config" };
+  const path = apiTokenPath(cfg);
+  try {
+    const fromFile = fs.readFileSync(path, "utf8").trim();
+    if (fromFile) return { token: fromFile, source: "file" };
+  } catch {
+  }
+  if (!opts.generate) return null;
+  const token = randomBytes(32).toString("hex");
+  try {
+    fs.mkdirSync(dirname(path), { recursive: true });
+    fs.writeFileSync(path, token + "\n", { mode: 384 });
+    fs.chmodSync(path, 384);
+  } catch {
+  }
+  return { token, source: "generated" };
+}
+var IDENTITY_FILENAME = ".ours-identity";
+function buildIdentityFile(opts) {
+  if (!opts.name.trim()) throw new Error("identity name must not be empty");
+  const obj = { identity: opts.name.trim() };
+  if (opts.force) obj.force = true;
+  obj.expose_local = opts.exposeLocal ?? true;
+  obj.local_auto_accept = opts.localAutoAccept ?? true;
+  return obj;
+}
+function resolveIdentityFilePath(target) {
+  const abs = resolve(target);
+  return basename(abs) === IDENTITY_FILENAME ? abs : join(abs, IDENTITY_FILENAME);
+}
+function writeIdentityFile(target, opts, overwrite = false) {
+  const obj = buildIdentityFile(opts);
+  const path = resolveIdentityFilePath(target);
+  if (!overwrite && fs.existsSync(path)) {
+    throw new Error(`${path} already exists \u2014 pass overwrite to replace it`);
+  }
+  fs.mkdirSync(dirname(path), { recursive: true });
+  fs.writeFileSync(path, JSON.stringify(obj, null, 2) + "\n");
+  return path;
+}
+
+// ../../src/runtime/config-drift.ts
+var FROZEN_ENV = ["OURS_STATE_DIR", "OURS_BROKER_URL", "OURS_PORT", "OURS_API_VISIBILITY", "OURS_CONFIG"];
+var envAtLoad = Object.fromEntries(
+  FROZEN_ENV.map((k) => [k, process.env[k]])
+);
+var { stateDir: loadedStateDir, brokerUrl: loadedBrokerUrl } = loadConfig();
+function assertConfigNotDrifted() {
+  const drifted = FROZEN_ENV.filter((k) => process.env[k] !== envAtLoad[k]);
+  if (drifted.length === 0) return;
+  const detail = drifted.map((k) => `${k}: was ${JSON.stringify(envAtLoad[k] ?? "(unset)")} at import, is now ${JSON.stringify(process.env[k] ?? "(unset)")}`).join("; ");
+  throw new Error(
+    `configuration changed after @ours.network/sdk was imported (${detail}). The SDK reads its config ONCE, at module load, because CONFIG and STATE_DIR back process-wide singletons that cannot be re-pointed once identities exist. Setting these after the import does not fail and does not take effect \u2014 without this check the daemon would boot against ${JSON.stringify(loadedStateDir)} and broker ${JSON.stringify(loadedBrokerUrl)} and look like it worked. Set every OURS_* config variable BEFORE the first import of this package.`
+  );
+}
+
+export {
+  loadConfig,
+  apiTokenPath,
+  explicitApiToken,
+  resolveApiToken,
+  buildIdentityFile,
+  writeIdentityFile,
+  assertConfigNotDrifted
+};