@ours.network/cli 2.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.

package/dist/{boot-LJ2V4NSS.js → boot-Y3GXCN6X.js}

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

package/dist/{chunk-NRPPG3WH.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-YCC24SVU.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,

package/dist/{chunk-LJ35FDQH.js → chunk-IL724CY2.js}

@@ -89,7 +89,7 @@ function createStartupProgressReporter(stateDir, opts = {}) {
 }
 
 // ../../src/runtime/env.ts
-var VERSION = true ? "3.0.1" : "0.0.0-dev";
+var VERSION = true ? "3.0.2" : "0.0.0-dev";
 var CONFIG = loadConfig();
 var STATE_DIR = CONFIG.stateDir;
 var BROKER_URL = CONFIG.brokerUrl;
@@ -639,12 +639,30 @@ function listIncomingMessages(id) {
 function takeUnreadMessages(id, input = {}) {
   const db = openHistory(id);
   const limit = batchLimit(input.limit);
+  const requested = input.wire_ids;
   return db.transaction(() => {
-    const rows = db.prepare(`
-      SELECT * FROM messages
-      WHERE direction = 'in' AND inbox_state = 'unread'
-      ORDER BY seq ASC LIMIT ?
-    `).all(limit);
+    let rows;
+    if (requested !== void 0) {
+      if (requested.length < 1 || requested.length > MAX_BATCH) {
+        throw new Error(`wire_ids must contain 1-${MAX_BATCH} items`);
+      }
+      if (new Set(requested).size !== requested.length) {
+        throw new Error("wire_ids must not contain duplicates");
+      }
+      const get = db.prepare(`
+        SELECT * FROM messages WHERE wire_id = ? AND direction = 'in' AND inbox_state = 'unread'
+      `);
+      rows = requested.map((wireId) => get.get(wireId)).filter((row) => !!row);
+      if (rows.length !== requested.length) {
+        throw new Error("selected message wire_id is unknown, stale, or no longer unread");
+      }
+    } else {
+      rows = db.prepare(`
+        SELECT * FROM messages
+        WHERE direction = 'in' AND inbox_state = 'unread'
+        ORDER BY seq ASC LIMIT ?
+      `).all(limit);
+    }
     const mark = db.prepare(`
       UPDATE messages SET inbox_state = 'read'
       WHERE seq = ? AND direction = 'in' AND inbox_state = 'unread'
@@ -729,6 +747,14 @@ function getMessageHistoryItem(id, wireId) {
   const row = openHistory(id).prepare("SELECT * FROM messages WHERE wire_id = ?").get(wireId);
   return row ? messageFromRow(row) : null;
 }
+function getMessageHistorySummary(id, input) {
+  const row = openHistory(id).prepare(`
+    SELECT COUNT(*) AS total,
+           SUM(CASE WHEN direction = 'in' AND inbox_state = 'unread' THEN 1 ELSE 0 END) AS unread
+    FROM messages WHERE peer_cid = ?
+  `).get(input.peer_cid);
+  return { total: Number(row.total), unread: Number(row.unread ?? 0) };
+}
 function listFileHistory(id, query = {}) {
   const db = openHistory(id);
   const limit = batchLimit(query.limit);
@@ -2942,6 +2968,7 @@ export {
   takeUnreadFiles,
   listMessageHistory,
   getMessageHistoryItem,
+  getMessageHistorySummary,
   listFileHistory,
   getFileHistoryItem,
   FILE_SELECTION_CAP,

package/dist/{chunk-TNNBVUKK.js → chunk-NBAZ2NEL.js}

@@ -73,7 +73,7 @@ function createLinuxUserSystemdAdapter(deps = defaultDeps) {
       const unitName = unitNameForStateDir(stateDir);
       const serviceFile = join(home, ".config", "systemd", "user", unitName);
       const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
-      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
+      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve", "--managed"];
       if (unitConfig) args.push("--config", unitConfig);
       const environment = `Environment=OURS_STATE_DIR=${systemdEscapeArgument(stateDir)}
 `;
@@ -165,7 +165,7 @@ function createMacosUserLaunchdAdapter(deps = defaultDeps) {
     async install(context) {
       const { stateDir, unitName, serviceFile } = plan(context);
       const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
-      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
+      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve", "--managed"];
       if (unitConfig) args.push("--config", unitConfig);
       const unit = `<?xml version="1.0" encoding="UTF-8"?>
 ${PLIST_MARKER}

package/dist/{chunk-NWRXKQBD.js → chunk-VA6UQKYN.js}

@@ -8,7 +8,7 @@ var COMMAND_GROUPS = {
         kind: "daemon",
         handler: "serve",
         summary: "Run the daemon in the foreground until interrupted.",
-        effects: "Starts a daemon in this process. --managed also writes the CLI-owned PID record used by stop and restart.",
+        effects: "Starts a daemon in this process. --managed writes process metadata for compatibility and cleanup.",
         example: "ours daemon serve --config /etc/ours/config.json"
       },
       start: {
@@ -21,21 +21,21 @@ var COMMAND_GROUPS = {
       stop: {
         kind: "daemon",
         handler: "stop",
-        summary: "Stop a daemon previously started by this CLI.",
-        effects: "Signals only a process corroborated by the selected daemon and CLI-owned PID record; it refuses to signal externally managed daemons.",
+        summary: "Stop the selected ours daemon.",
+        effects: "Signals the process identity reported by the selected valid ours daemon.",
         example: "ours daemon stop --config /etc/ours/config.json"
       },
       restart: {
         kind: "daemon",
         handler: "restart",
-        summary: "Stop and start a CLI-managed daemon.",
-        effects: "Uses the same ownership checks as stop, then starts a detached replacement.",
+        summary: "Stop and start the selected ours daemon.",
+        effects: "Stops the selected valid ours daemon, then starts a detached replacement.",
         example: "ours daemon restart --config /etc/ours/config.json"
       },
       status: {
         kind: "daemon",
         handler: "status",
-        summary: "Report whether the selected daemon is running and CLI-managed.",
+        summary: "Report whether the selected ours daemon is running.",
         effects: "Read-only. Exit status is 0 when running and 3 when stopped.",
         example: "ours daemon status --json"
       },

package/dist/{chunk-FKSRG5UJ.js → chunk-VFAC74XR.js}

@@ -13,7 +13,7 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-NWRXKQBD.js";
+} from "./chunk-VA6UQKYN.js";
 
 // src/help.ts
 var pad = (value, width = 32) => value.length >= width ? `${value} ` : value.padEnd(width);
@@ -109,7 +109,7 @@ function nativeDaemonOptions(action) {
     ["--identity NAME", "Compatibility-only/ignored by daemon lifecycle and service commands."],
     ["--json", action === "serve" ? "Compatibility-only/ignored because serve runs until interrupted." : "Write one JSON result to stdout."],
     ["--yes", service.has(action) ? "Confirm the service-manager change; not needed with --dry-run." : "Compatibility-only/ignored for this action."],
-    ["--managed", action === "serve" ? "Write the CLI-owned PID record after the foreground daemon starts." : "Compatibility-only/ignored for this action."],
+    ["--managed", action === "serve" ? "Write daemon process metadata after the foreground daemon starts." : "Compatibility-only/ignored for this action."],
     ["--dry-run", service.has(action) ? "Return the planned service-manager changes without writing or running systemctl." : "Compatibility-only/ignored for this action."],
     ["--force", install ? "Allow replacement of an existing user unit not marked as CLI-managed." : "Compatibility-only/ignored for this action."],
     ["--help", "Show this help and exit without starting, stopping, probing, or installing anything."]

package/dist/commands.d.ts

@@ -30,7 +30,7 @@ export declare const COMMAND_GROUPS: {
                 readonly kind: "daemon";
                 readonly handler: "serve";
                 readonly summary: "Run the daemon in the foreground until interrupted.";
-                readonly effects: "Starts a daemon in this process. --managed also writes the CLI-owned PID record used by stop and restart.";
+                readonly effects: "Starts a daemon in this process. --managed writes process metadata for compatibility and cleanup.";
                 readonly example: "ours daemon serve --config /etc/ours/config.json";
             };
             readonly start: {
@@ -43,21 +43,21 @@ export declare const COMMAND_GROUPS: {
             readonly stop: {
                 readonly kind: "daemon";
                 readonly handler: "stop";
-                readonly summary: "Stop a daemon previously started by this CLI.";
-                readonly effects: "Signals only a process corroborated by the selected daemon and CLI-owned PID record; it refuses to signal externally managed daemons.";
+                readonly summary: "Stop the selected ours daemon.";
+                readonly effects: "Signals the process identity reported by the selected valid ours daemon.";
                 readonly example: "ours daemon stop --config /etc/ours/config.json";
             };
             readonly restart: {
                 readonly kind: "daemon";
                 readonly handler: "restart";
-                readonly summary: "Stop and start a CLI-managed daemon.";
-                readonly effects: "Uses the same ownership checks as stop, then starts a detached replacement.";
+                readonly summary: "Stop and start the selected ours daemon.";
+                readonly effects: "Stops the selected valid ours daemon, then starts a detached replacement.";
                 readonly example: "ours daemon restart --config /etc/ours/config.json";
             };
             readonly status: {
                 readonly kind: "daemon";
                 readonly handler: "status";
-                readonly summary: "Report whether the selected daemon is running and CLI-managed.";
+                readonly summary: "Report whether the selected ours daemon is running.";
                 readonly effects: "Read-only. Exit status is 0 when running and 3 when stopped.";
                 readonly example: "ours daemon status --json";
             };

package/dist/commands.js

@@ -4,7 +4,7 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-NWRXKQBD.js";
+} from "./chunk-VA6UQKYN.js";
 export {
   COMMAND_GROUPS,
   DESTRUCTIVE_OPERATIONS,

package/dist/{daemon-YCC24SVU.js → daemon-A2L6UMGZ.js}

@@ -204,7 +204,7 @@ async function releaseHeld(lock) {
 async function bootKernel() {
   const { lock, acquired } = await ensureLock();
   try {
-    const { bootWrapper } = await import("./boot-LJ2V4NSS.js");
+    const { bootWrapper } = await import("./boot-Y3GXCN6X.js");
     await bootWrapper();
   } catch (error) {
     if (acquired) await releaseHeld(lock);
@@ -214,7 +214,7 @@ async function bootKernel() {
 async function startDaemon(opts = {}) {
   const { lock, acquired } = await ensureLock();
   try {
-    const runtime = await import("./server-2RIEOKDA.js");
+    const runtime = await import("./server-6BZCHN6Q.js");
     const { onRuntimeLoaded, ...daemonOptions } = opts;
     onRuntimeLoaded?.();
     const handle = await runtime.startDaemon({

package/dist/help.js

@@ -3,10 +3,10 @@ import {
   helpRequestPath,
   renderHelp,
   renderTopHelp
-} from "./chunk-FKSRG5UJ.js";
+} from "./chunk-VFAC74XR.js";
 import "./chunk-MS4TDUZY.js";
 import "./chunk-6NFATG6P.js";
-import "./chunk-NWRXKQBD.js";
+import "./chunk-VA6UQKYN.js";
 export {
   helpHint,
   helpRequestPath,

package/dist/lifecycle.d.ts

@@ -2,6 +2,8 @@ import { spawn as nodeSpawn, type ChildProcess } from 'node:child_process';
 import type { DaemonInfo, ResolvedDaemonConfig } from '@ours.network/sdk/client';
 import { type SelectionOptions } from './connection.js';
 export declare const MANAGED_PID_FILE = "ours-cli-daemon.json";
+/** PID file written by the pre-split @ours.network/mcp CLI. Retained only for cleanup. */
+export declare const LEGACY_MANAGED_PID_FILE = "daemon.pid";
 export declare const DAEMON_LOG_FILE = "ours-cli-daemon.log";
 interface ManagedRecord {
     version: 1;
@@ -27,6 +29,7 @@ export interface LifecycleDeps {
     delay(ms: number): Promise<void>;
     cliPath: string;
 }
+export declare function readLegacyManagedPid(stateDir: string): number | null;
 export declare function readManagedRecord(stateDir: string): ManagedRecord | null;
 export declare function writeManagedRecord(stateDir: string, port: number): string;
 export declare function inspectDaemon(config: ResolvedDaemonConfig, deps?: LifecycleDeps): Promise<DaemonStatus>;

package/dist/lifecycle.js

@@ -1,18 +1,22 @@
 import {
   DAEMON_LOG_FILE,
+  LEGACY_MANAGED_PID_FILE,
   MANAGED_PID_FILE,
   inspectDaemon,
+  readLegacyManagedPid,
   readManagedRecord,
   serveDaemon,
   startDaemonManaged,
   stopDaemonManaged,
   writeManagedRecord
-} from "./chunk-NRPPG3WH.js";
+} from "./chunk-DTN7MN44.js";
 import "./chunk-6K2JBKHI.js";
 export {
   DAEMON_LOG_FILE,
+  LEGACY_MANAGED_PID_FILE,
   MANAGED_PID_FILE,
   inspectDaemon,
+  readLegacyManagedPid,
   readManagedRecord,
   serveDaemon,
   startDaemonManaged,

package/dist/main.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-YC7QBGVC.js";
 import {
   createServiceAdapter
-} from "./chunk-TNNBVUKK.js";
+} from "./chunk-NBAZ2NEL.js";
 import {
   instanceNameFromStateDir
 } from "./chunk-UZQWSOUB.js";
@@ -17,7 +17,7 @@ import {
   helpHint,
   helpRequestPath,
   renderHelp
-} from "./chunk-FKSRG5UJ.js";
+} from "./chunk-VFAC74XR.js";
 import {
   invokeOperation,
   isOperationName,
@@ -37,13 +37,13 @@ import {
   IDENTITY_PREBIND_EXCEPTIONS,
   commandSpec,
   isCommandGroup
-} from "./chunk-NWRXKQBD.js";
+} from "./chunk-VA6UQKYN.js";
 import {
   inspectDaemon,
   serveDaemon,
   startDaemonManaged,
   stopDaemonManaged
-} from "./chunk-NRPPG3WH.js";
+} from "./chunk-DTN7MN44.js";
 import {
   attachClient,
   defaultConfigPath,
@@ -54,7 +54,7 @@ import {
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
-var CLI_VERSION = false ? "0.0.0-dev" : "2.0.1";
+var CLI_VERSION = false ? "0.0.0-dev" : "2.0.2";
 var COMMON_VALUES = /* @__PURE__ */ new Set(["--endpoint", "--port", "--state-dir", "--config", "--identity"]);
 var COMMON_BOOLEANS = /* @__PURE__ */ new Set(["--json", "--yes", "--help"]);
 function selectionFrom(values) {

package/dist/{server-2RIEOKDA.js → server-6BZCHN6Q.js}

@@ -29,6 +29,7 @@ import {
   findIdentityFile,
   getFileHistoryItem,
   getMessageHistoryItem,
+  getMessageHistorySummary,
   hashLeaseToken,
   identities,
   isSelectableWireId,
@@ -78,7 +79,7 @@ import {
   withScope,
   withScopeAsync,
   writeTempMetaFile
-} from "./chunk-LJ35FDQH.js";
+} from "./chunk-IL724CY2.js";
 import {
   buildIdentityFile,
   writeIdentityFile
@@ -1482,6 +1483,14 @@ function getHistoryItem(ctx, input) {
     throw errTool("get_history_item", String(error));
   }
 }
+function getHistorySummary(ctx, input) {
+  const id = requireBound(ctx);
+  try {
+    return getMessageHistorySummary(id, input);
+  } catch (error) {
+    throw errTool("get_history_summary", String(error));
+  }
+}
 function listFiles(ctx, query = {}) {
   const id = requireBound(ctx);
   try {
@@ -1539,6 +1548,7 @@ var API_OPERATIONS = {
   getMessages: op(getMessages),
   listHistory: op(listHistory),
   getHistoryItem: op(getHistoryItem),
+  getHistorySummary: op(getHistorySummary),
   listFiles: op(listFiles),
   getFileInfo: op(getFileInfo),
   // ----- files (Task 12) -----------------------------------------------------

package/dist/service.js

@@ -5,7 +5,7 @@ import {
   createLinuxUserSystemdAdapter,
   createMacosUserLaunchdAdapter,
   createServiceAdapter
-} from "./chunk-TNNBVUKK.js";
+} from "./chunk-NBAZ2NEL.js";
 import "./chunk-UZQWSOUB.js";
 export {
   SERVICE_NAME,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Transport-neutral operator CLI for the ours shared daemon",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",