@ours.network/cli 1.0.1 → 2.0.2

package/README.md

@@ -61,10 +61,11 @@ ours daemon stop
 ours daemon restart
 ```
 
-`stop` and `restart` signal a process only when all three facts agree: the
-CLI-owned PID record, the PID reported by the selected daemon, and its expected
-state directory/port. A daemon started by ours-mcp, a container, systemd, or any
-other launcher remains fully attachable, but these commands refuse to signal it.
+`stop` and `restart` control the selected daemon regardless of which CLI command
+or service launcher originally started it. The endpoint must identify itself as
+an ours daemon for the exact selected state directory; once that validation
+passes, the daemon-reported PID is authoritative. PID files are compatibility
+metadata and never an authorization or ownership gate.
 `start`, `serve`, and `restart` reject `--endpoint` because they must launch a
 locally selected daemon; this rejection happens before `restart` probes or stops
 anything.
@@ -114,9 +115,9 @@ identity     create | create-root | create-temporary | close-temporary
 profile      set-bio | set-persona
 invite       create | list | revoke | accept
 contact      list | local | policy | remove | rename | respond
-message      send | list | get | defer
-file         send | list | get | fetch | defer
-conversation show | receipts | mark-read | policy
+message      send | list | get
+file         send | list | get | fetch
+history      list | get | files | file-info
 daemon       info | identities | unread | watch
 ```
 
@@ -128,13 +129,25 @@ ours profile set-bio --identity BuildBot --bio=        # clear the bio
 ours profile set-persona --identity BuildBot --persona= # clear the persona
 ours message send --identity BuildBot --contact Peer --text "done" --json
 ours file get --identity BuildBot --wire-ids ID1,ID2 --json
-ours conversation policy --identity Human --keep-history true
+ours history list --identity Human --limit 25 --json
+ours history files --identity Human --peer-cid PEER_CID --json
 ```
 
 An explicit file retrieval accepts 1–32 unique 64-hex wire IDs. `daemon watch`
 first binds its `--identity` without force, changing the CLI lease; it can fail
 with `BOUND_ELSEWHERE` when another live session holds that identity.
 
+Message and file payloads live in identity-scoped SQLite/blob storage, not in
+the MUFL packet. `message get` and `file get` consume only the selected unread
+rows; the `history` group provides the persistent read-only view. There is no
+defer, conversation-policy, or manual mark-read command.
+
+This storage epoch requires a clean reset. Old daemon state is not migrated:
+startup refuses it without modifying it. Stop applications, optionally copy the
+old state as a manual backup, remove it yourself, and start clean. Old
+identities, contacts, invites, pending payloads, and history are not carried
+forward, and the installer never removes state automatically.
+
 Malformed JSON, unknown input fields, invalid booleans/integers, and incomplete
 file inputs fail closed before the request. Destructive identity/contact/invite
 operations require `--yes`.

package/dist/{boot-35BOHNSZ.js → boot-Y3GXCN6X.js}

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

package/dist/{chunk-QZIL3IT7.js → chunk-DTN7MN44.js}

@@ -9,6 +9,7 @@ import { spawn as nodeSpawn } from "node:child_process";
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 var MANAGED_PID_FILE = "ours-cli-daemon.json";
+var LEGACY_MANAGED_PID_FILE = "daemon.pid";
 var DAEMON_LOG_FILE = "ours-cli-daemon.log";
 var depsDefault = {
   fetch: globalThis.fetch,
@@ -19,6 +20,17 @@ var depsDefault = {
   cliPath: process.argv[1]
 };
 var pidPath = (stateDir) => join(stateDir, MANAGED_PID_FILE);
+var legacyPidPath = (stateDir) => join(stateDir, LEGACY_MANAGED_PID_FILE);
+function readLegacyManagedPid(stateDir) {
+  try {
+    const raw = readFileSync(legacyPidPath(stateDir), "utf8").trim();
+    if (!/^[0-9]+$/.test(raw)) return null;
+    const pid = Number(raw);
+    return Number.isSafeInteger(pid) && pid > 1 ? pid : null;
+  } catch {
+    return null;
+  }
+}
 function readManagedRecord(stateDir) {
   try {
     const value = JSON.parse(readFileSync(pidPath(stateDir), "utf8"));
@@ -49,7 +61,9 @@ function writeManagedRecord(stateDir, port) {
 async function inspectDaemon(config, deps = depsDefault) {
   const stateDir = resolve(config.expectStateDir);
   const record = readManagedRecord(stateDir);
-  const base = { stateDir, pidFile: pidPath(stateDir), stalePidFile: record !== null };
+  const legacyPid = readLegacyManagedPid(stateDir);
+  const hasOwnershipRecord = record !== null || legacyPid !== null;
+  const base = { stateDir, pidFile: pidPath(stateDir), stalePidFile: hasOwnershipRecord };
   let client;
   try {
     client = await attachClient(config, { fetch: deps.fetch, leaseToken: "ours-cli-status" });
@@ -71,10 +85,7 @@ async function inspectDaemon(config, deps = depsDefault) {
   if (info.name !== "ours" || !Number.isInteger(info.pid) || info.pid <= 1 || resolve(info.stateDir) !== stateDir) {
     throw new Error("the selected endpoint did not return a valid ours daemon identity");
   }
-  const selectedUrl = new URL(config.baseUrl.value);
-  const selectedPort = Number(selectedUrl.port || (selectedUrl.protocol === "https:" ? 443 : 80));
-  const managed = record !== null && record.pid === info.pid && resolve(record.stateDir) === stateDir && record.port === selectedPort;
-  return { state: "running", managed, info, ...base, stalePidFile: record !== null && !managed };
+  return { state: "running", managed: true, info, ...base, stalePidFile: false };
 }
 function childEnvironment(selection) {
   const env = { ...process.env };
@@ -87,7 +98,7 @@ function childEnvironment(selection) {
 async function serveDaemon(selection, managed = false) {
   if (selection.endpoint !== void 0) throw new Error("--endpoint selects a running daemon and cannot be used with daemon serve");
   Object.assign(process.env, childEnvironment(selection));
-  const { startDaemon } = await import("./daemon-UUG6P6GK.js");
+  const { startDaemon } = await import("./daemon-A2L6UMGZ.js");
   const handle = await startDaemon();
   if (managed) {
     const response = await fetch(`http://127.0.0.1:${handle.port}/state-dir`);
@@ -125,7 +136,7 @@ async function startDaemonManaged(selection, deps = depsDefault) {
   while (deps.now() < deadline) {
     await deps.delay(100);
     const status = await inspectDaemon(config, deps);
-    if (status.state === "running" && status.managed && status.info?.pid === child.pid) return status;
+    if (status.state === "running" && status.info?.pid === child.pid) return status;
     try {
       deps.kill(child.pid, 0);
     } catch {
@@ -146,6 +157,12 @@ function removeOwnedPidFile(status) {
     } catch {
     }
   }
+  if (readLegacyManagedPid(status.stateDir) !== null) {
+    try {
+      unlinkSync(legacyPidPath(status.stateDir));
+    } catch {
+    }
+  }
 }
 async function stopDaemonManaged(config, deps = depsDefault) {
   const status = await inspectDaemon(config, deps);
@@ -153,10 +170,8 @@ async function stopDaemonManaged(config, deps = depsDefault) {
     removeOwnedPidFile(status);
     return status;
   }
-  if (!status.managed || !status.info) {
-    throw new Error("the daemon is running but was not started by @ours.network/cli; refusing to signal an external shared daemon");
-  }
-  deps.kill(status.info.pid, "SIGTERM");
+  const pid = status.info.pid;
+  deps.kill(pid, "SIGTERM");
   const deadline = deps.now() + 1e4;
   while (deps.now() < deadline) {
     await deps.delay(100);
@@ -166,12 +181,14 @@ async function stopDaemonManaged(config, deps = depsDefault) {
       return { ...current, stalePidFile: false };
     }
   }
-  throw new Error(`daemon pid ${status.info.pid} did not stop within 10 seconds`);
+  throw new Error(`daemon pid ${pid} did not stop within 10 seconds`);
 }
 
 export {
   MANAGED_PID_FILE,
+  LEGACY_MANAGED_PID_FILE,
   DAEMON_LOG_FILE,
+  readLegacyManagedPid,
   readManagedRecord,
   writeManagedRecord,
   inspectDaemon,