@decentnetwork/beagle 0.1.86 → 0.1.88

package/dist/cli.js

@@ -145,6 +145,12 @@ async function main() {
         makeEmbedded: openEmbedded,
         makeDaemon: () => makeDaemonHost(decentlanCarrierDir(args.configDir)),
         onChange: (state) => console.log(`[LAN] backend is now: ${state}`),
+        // `--backend` has to reach the watcher, or it only ever pinned the FIRST
+        // choice: this wrapper re-detected on a 1500ms timer and overrode it a
+        // second and a half later. That is why `--backend embedded` did not
+        // protect Beagle Desktop on Windows, and why `--backend daemon` on 245
+        // still fell back and took the identity lock.
+        force: args.backend,
     });
     // If this machine also runs a dora, surface its allocation table.
     const doraCandidates = args.doraDir

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.85";
+window.__DK_UI_VERSION="0.1.87";
 "use strict";
 (() => {
   // packages/beagle-ui/dist/beagle-ui.js
@@ -561,6 +561,9 @@ window.__DK_UI_VERSION="0.1.85";
       const ta = a.lastTs || 0, tb = b.lastTs || 0;
       if (ta !== tb)
         return tb - ta;
+      const aa = a.acceptedAt || 0, ba = b.acceptedAt || 0;
+      if (aa !== ba)
+        return ba - aa;
       return String(a.alias || a.userId || "").localeCompare(String(b.alias || b.userId || ""));
     });
     const online = peers.filter((p) => p.online).length;
@@ -4317,8 +4320,9 @@ ${peer.address}`
   Object.assign(window, { useTweaks });
   function ownershipFix(info) {
     const r = String(info && info.selfUpdateBlocked || "");
-    const at = r.indexOf("sudo chown");
-    return at >= 0 ? r.slice(at) : 'sudo chown -R $(id -u):$(id -g) "$(npm prefix -g)/lib/node_modules/@decentnetwork"';
+    const at = r.indexOf("sudo npm i -g");
+    const end = at >= 0 ? r.indexOf(".", at) : -1;
+    return at >= 0 ? r.slice(at, end > at ? end : void 0) : "sudo npm i -g @decentnetwork/beagle@latest";
   }
   function dkParseDeepLinkAddress() {
     try {
@@ -4860,7 +4864,7 @@ ${peer.address}`
       lineHeight: 1.6,
       borderLeft: "2px solid var(--danger)",
       paddingLeft: 10
-    } }, T.updNoPerm || "Automatic updates cannot write the global npm directory \u2014 this is what a first install with sudo leaves behind. Run this once and it never comes back:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", gap: 6, alignItems: "center", marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: {
+    } }, T.updNoPerm || "This install lives under a system-owned prefix, so updating it is a privileged operation and this button cannot do it. Run it in a terminal:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", gap: 6, alignItems: "center", marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: {
       flex: 1,
       minWidth: 0,
       fontFamily: "var(--mono)",
@@ -4872,7 +4876,7 @@ ${peer.address}`
       padding: "8px 10px",
       userSelect: "all",
       wordBreak: "break-all"
-    } }, ownershipFix(info)), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy(ownershipFix(info)) })), /* @__PURE__ */ React.createElement("div", { style: { marginTop: 6, fontSize: 11.5, color: "var(--faint)" } }, T.updNoPermAlt || "It touches only the directory, not the programs inside it. If you would rather not change anything under /usr/local, the alternative is to move npm out of it: `npm config set prefix ~/.npm-global`, then put `~/.npm-global/bin` first on your PATH.")), phase === "idle" && appBehind && info.mode === "dev" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updDev || "Running from a source checkout \u2014 update with:", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("code", { style: { fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)" } }, "git pull && npm run build")), phase === "idle" && appBehind && info.mode === "unknown" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updUnknown || "Update now runs the global install. If that is not how this was installed, run:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/beagle@latest"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/beagle@latest") }))), phase === "idle" && appBehind && info.mode === "npx" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updNpx || "Running via npx \u2014 restarting picks up the latest version automatically."), daemonPeerBehind && phase === "idle" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updPeerDaemon || "The peer version belongs to the running agentnet daemon, not to this app. Update it with:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/lan@latest && agentnet restart"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/lan@latest && agentnet restart") }))), lanBehind && phase === "idle" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updLanNote || "agentnet (lan): one click reinstalls it and asks the running daemon to restart itself. Manual equivalent:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/lan@latest && agentnet restart"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/lan@latest && agentnet restart") }))), phase === "lan-done" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--online)" } }, T.updLanDone || "lan updated \u2014 daemon restarted with the new version \u2713"), phase === "lan-norestart" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--warn, #f59e0b)" } }, T.updLanNoRestart || "lan updated, but the daemon was not running (or refused) \u2014 the new version applies on its next start."), phase === "running" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updBusy || "Updating\u2026 (about a minute)"), phase === "done" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--online)" } }, T.updDone || "Updated \u2014 restart to apply."), phase === "restarting" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updRestarting || "Restarting\u2026 this page reloads when it\u2019s back. (If beagle was started by hand in a terminal, run it again.)"), phase === "error" && (() => {
+    } }, ownershipFix(info)), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy(ownershipFix(info)) })), /* @__PURE__ */ React.createElement("div", { style: { marginTop: 6, fontSize: 11.5, color: "var(--faint)" } }, T.updNoPermAlt || "Do not widen permissions there to make this button work \u2014 a group-writable bin directory lets any admin user replace programs that root later runs. For one-click updates, move npm out of the system prefix instead: `npm config set prefix ~/.npm-global`, then put `~/.npm-global/bin` first on your PATH.")), phase === "idle" && appBehind && info.mode === "dev" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updDev || "Running from a source checkout \u2014 update with:", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("code", { style: { fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)" } }, "git pull && npm run build")), phase === "idle" && appBehind && info.mode === "unknown" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updUnknown || "Update now runs the global install. If that is not how this was installed, run:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/beagle@latest"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/beagle@latest") }))), phase === "idle" && appBehind && info.mode === "npx" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updNpx || "Running via npx \u2014 restarting picks up the latest version automatically."), daemonPeerBehind && phase === "idle" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updPeerDaemon || "The peer version belongs to the running agentnet daemon, not to this app. Update it with:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/lan@latest && agentnet restart"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/lan@latest && agentnet restart") }))), lanBehind && phase === "idle" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updLanNote || "agentnet (lan): one click reinstalls it and asks the running daemon to restart itself. Manual equivalent:", /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, marginTop: 6 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, "npm i -g @decentnetwork/lan@latest && agentnet restart"), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy("npm i -g @decentnetwork/lan@latest && agentnet restart") }))), phase === "lan-done" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--online)" } }, T.updLanDone || "lan updated \u2014 daemon restarted with the new version \u2713"), phase === "lan-norestart" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--warn, #f59e0b)" } }, T.updLanNoRestart || "lan updated, but the daemon was not running (or refused) \u2014 the new version applies on its next start."), phase === "running" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updBusy || "Updating\u2026 (about a minute)"), phase === "done" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--online)" } }, T.updDone || "Updated \u2014 restart to apply."), phase === "restarting" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updRestarting || "Restarting\u2026 this page reloads when it\u2019s back. (If beagle was started by hand in a terminal, run it again.)"), phase === "error" && (() => {
       const m = /`([^`]+)`/.exec(err || "");
       return /* @__PURE__ */ React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 8 } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--danger)", wordBreak: "break-word" } }, m ? err.replace("`" + m[1] + "`", "") : err), m && /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8 } }, /* @__PURE__ */ React.createElement("code", { style: { flex: 1, minWidth: 0, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", background: "var(--panel-2)", border: "1px solid var(--line)", borderRadius: 8, padding: "8px 10px", userSelect: "all", wordBreak: "break-all" } }, m[1]), /* @__PURE__ */ React.createElement(Btn, { size: "sm", icon: "copy", title: T.copy || "Copy", onClick: () => dkCopy(m[1]) })), m && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 11.5, color: "var(--dim)" } }, T.updManualHint || "Run it in a terminal, then click Restart to apply."));
     })(), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", justifyContent: "flex-end", gap: 8 } }, (phase === "idle" || phase === "error" || phase === "lan-done" || phase === "lan-norestart") && btn(phase === "idle" ? T.updLater || "Later" : T.receivedClose || "Close", onClose), phase === "idle" && lanBehind && btn(T.updLanNow || "Update lan", doLanUpdate, !appBehind), phase === "idle" && appBehind && (info.mode === "global" || info.mode === "unknown") && btn(T.updNow || "Update now", doUpdate, true), phase === "idle" && appBehind && info.mode === "npx" && btn(T.updRestart || "Restart", doRestart, true), phase === "error" && btn(T.updRestart || "Restart", doRestart, true), phase === "done" && btn(T.updRestart || "Restart", doRestart, true))));

package/dist/embedded-host.js

@@ -103,12 +103,18 @@ export class EmbeddedHost {
             // Infinity - Infinity = NaN, and the tie-break would only still work
             // by accident of NaN being falsy.
             last.has(f.carrierId) ? -last.get(f.carrierId).ts : Number.MAX_SAFE_INTEGER,
+            // Among friends you have never messaged, NEWEST FRIENDSHIP first.
+            // Alphabetical put someone you accepted ten seconds ago wherever their
+            // name happened to land — usually far down a 50-name list, so accepting
+            // a request looked like nothing had happened. The one friend you are
+            // most likely to open is the one you just added.
+            -(f.acceptedAt ?? 0),
             (f.name || f.carrierId).toLowerCase(),
         ];
         return [...friends].sort((a, b) => {
-            const [ap, at, an] = rank(a);
-            const [bp, bt, bn] = rank(b);
-            return ap - bp || at - bt || an.localeCompare(bn);
+            const [ap, at, aa, an] = rank(a);
+            const [bp, bt, ba, bn] = rank(b);
+            return ap - bp || at - bt || aa - ba || an.localeCompare(bn);
         });
     }
     get downloadsDir() {

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export { startBeagleServer, type BeagleServerOptions } from "./server.js";
 export { openPeerHost, defaultConfigDir, decentlanCarrierDir, type PeerHost, type BackendKind } from "./peer-host.js";
-export { ipcCall, ipcSocketPath, daemonIsRunning, type IpcRequest, type IpcResponse, type IpcOp } from "./ipc.js";
+export { ipcCall, ipcSocketPath, probeDaemon, daemonSocketMayExist, type IpcRequest, type IpcResponse, type IpcOp } from "./ipc.js";

package/dist/index.js

@@ -2,4 +2,4 @@
 // server and the backend abstraction are exported so it can be embedded.
 export { startBeagleServer } from "./server.js";
 export { openPeerHost, defaultConfigDir, decentlanCarrierDir } from "./peer-host.js";
-export { ipcCall, ipcSocketPath, daemonIsRunning } from "./ipc.js";
+export { ipcCall, ipcSocketPath, probeDaemon, daemonSocketMayExist } from "./ipc.js";

package/dist/ipc.d.ts

@@ -43,6 +43,39 @@ export declare function ipcSocketPath(dataDir: string, platform?: NodeJS.Platfor
 /** fs.existsSync is meaningful for Unix-domain sockets but always false for
  *  Windows named pipes, so on Windows we connect and let net report. */
 export declare function ipcSocketSupportsFsExistenceCheck(platform?: NodeJS.Platform): boolean;
-export declare function daemonIsRunning(dataDir: string): boolean;
+/** How long the liveness probe waits for a connect before calling it dead.
+ *  Local IPC: a listening socket accepts in microseconds, so this is a
+ *  generous ceiling that still keeps the 1500ms watch tick honest. */
+export declare const DAEMON_PROBE_TIMEOUT_MS = 400;
+/**
+ * Is a decentlan daemon actually LISTENING for this identity?
+ *
+ * The only trustworthy answer is a connection. The previous check asked the
+ * filesystem, which cannot answer on either platform:
+ *
+ *   - Windows named pipes never appear to `existsSync`, so the old code
+ *     returned a hard-coded `true` — "can't tell; try it". Every beagle on
+ *     Windows therefore believed in a daemon that was not there, handed its
+ *     identity to a pipe nobody served, and failed every peer op with
+ *     `connect ENOENT \\.\pipe\agentnet-…`. That one wrong default is why
+ *     add-friend, renaming and .beagles.eth registration were all broken.
+ *   - On Unix a `daemon.sock` left behind by a crashed daemon exists just as
+ *     firmly as a live one, so the same promotion happened there too, only
+ *     rarer.
+ *
+ * Connecting costs a round trip to a local socket and removes both. It is the
+ * same code on every platform, which is the real win: no branch that only one
+ * of us can test.
+ */
+export declare function probeDaemon(dataDir: string, timeoutMs?: number): Promise<boolean>;
+/**
+ * Sync, best-effort: could a daemon socket be there?
+ *
+ * Only for callers that genuinely cannot await. It answers `false` when it
+ * cannot tell — the opposite of the old default, and the whole point. A `true`
+ * from this is still only a hint; confirm with {@link probeDaemon} before
+ * handing an identity to anything.
+ */
+export declare function daemonSocketMayExist(dataDir: string): boolean;
 /** One request, one newline-delimited JSON response. */
 export declare function ipcCall(dataDir: string, req: IpcRequest, timeoutMs?: number): Promise<IpcResponse>;

package/dist/ipc.js

@@ -27,9 +27,65 @@ export function ipcSocketPath(dataDir, platform = process.platform) {
 export function ipcSocketSupportsFsExistenceCheck(platform = process.platform) {
     return platform !== "win32";
 }
-export function daemonIsRunning(dataDir) {
+/** How long the liveness probe waits for a connect before calling it dead.
+ *  Local IPC: a listening socket accepts in microseconds, so this is a
+ *  generous ceiling that still keeps the 1500ms watch tick honest. */
+export const DAEMON_PROBE_TIMEOUT_MS = 400;
+/**
+ * Is a decentlan daemon actually LISTENING for this identity?
+ *
+ * The only trustworthy answer is a connection. The previous check asked the
+ * filesystem, which cannot answer on either platform:
+ *
+ *   - Windows named pipes never appear to `existsSync`, so the old code
+ *     returned a hard-coded `true` — "can't tell; try it". Every beagle on
+ *     Windows therefore believed in a daemon that was not there, handed its
+ *     identity to a pipe nobody served, and failed every peer op with
+ *     `connect ENOENT \\.\pipe\agentnet-…`. That one wrong default is why
+ *     add-friend, renaming and .beagles.eth registration were all broken.
+ *   - On Unix a `daemon.sock` left behind by a crashed daemon exists just as
+ *     firmly as a live one, so the same promotion happened there too, only
+ *     rarer.
+ *
+ * Connecting costs a round trip to a local socket and removes both. It is the
+ * same code on every platform, which is the real win: no branch that only one
+ * of us can test.
+ */
+export function probeDaemon(dataDir, timeoutMs = DAEMON_PROBE_TIMEOUT_MS) {
+    const sockPath = ipcSocketPath(dataDir);
+    // A cheap negative where the filesystem CAN answer. Never a positive: an
+    // existing socket file is not a listening daemon, which was the second bug.
+    if (ipcSocketSupportsFsExistenceCheck() && !existsSync(sockPath)) {
+        return Promise.resolve(false);
+    }
+    return new Promise((resolve) => {
+        const sock = createConnection(sockPath);
+        let settled = false;
+        const finish = (alive) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            sock.destroy();
+            resolve(alive);
+        };
+        const timer = setTimeout(() => finish(false), timeoutMs);
+        timer.unref?.();
+        sock.on("connect", () => finish(true));
+        sock.on("error", () => finish(false));
+    });
+}
+/**
+ * Sync, best-effort: could a daemon socket be there?
+ *
+ * Only for callers that genuinely cannot await. It answers `false` when it
+ * cannot tell — the opposite of the old default, and the whole point. A `true`
+ * from this is still only a hint; confirm with {@link probeDaemon} before
+ * handing an identity to anything.
+ */
+export function daemonSocketMayExist(dataDir) {
     if (!ipcSocketSupportsFsExistenceCheck())
-        return true; // can't tell; try it
+        return false;
     return existsSync(ipcSocketPath(dataDir));
 }
 /** One request, one newline-delimited JSON response. */

package/dist/lan-handoff.d.ts

@@ -1,7 +1,11 @@
 import { type IpcRequest, type IpcResponse } from "./ipc.js";
 import { Logger } from "./logger.js";
-import type { PeerHost } from "./peer-host.js";
-export type HandoffState = "embedded" | "releasing" | "daemon";
+import type { BackendKind, PeerHost } from "./peer-host.js";
+export type HandoffState = "embedded" | "releasing" | "daemon" | "waiting";
+/** How long a vanished daemon is treated as "restarting" before auto mode
+ *  gives up on it and takes the identity back. `agentnet restart` and a
+ *  launchd/systemd kickstart are both back well inside this. */
+export declare const DAEMON_GRACE_MS: number;
 export interface SwitchableHostOptions {
     dataDir: string;
     /** Build a fresh embedded host. Called on first start and on every fallback,
@@ -11,6 +15,14 @@ export interface SwitchableHostOptions {
     makeDaemon: () => PeerHost;
     onChange?: (state: HandoffState, host: PeerHost | null) => void;
     log?: Logger;
+    /** The backend the user pinned with `--backend`, if any. A forced backend is
+     *  never switched away from automatically — in EITHER direction. Auto mode
+     *  (undefined) keeps the full state machine. */
+    force?: BackendKind;
+    /** Grace period before auto mode falls back from a vanished daemon. */
+    graceMs?: number;
+    /** Liveness probe, injectable for tests. Defaults to a real connect. */
+    probe?: (dataDir: string) => Promise<boolean>;
 }
 /**
  * A PeerHost whose backend can change under it.

package/dist/lan-handoff.js

@@ -13,12 +13,16 @@
 // `releasing` is the honest name for the middle state: our peer is down and the
 // daemon is not up yet, so messaging is offline and the UI must say so. Hiding
 // that gap would make dropped messages look like a network fault.
-import { daemonIsRunning } from "./ipc.js";
+import { probeDaemon } from "./ipc.js";
 import { Logger } from "./logger.js";
 /** How often we look for the daemon socket appearing or vanishing. */
 const WATCH_INTERVAL_MS = 1500;
 /** How long we stay in `releasing` before giving up and coming back. */
 const RELEASE_TIMEOUT_MS = 10 * 60 * 1000;
+/** How long a vanished daemon is treated as "restarting" before auto mode
+ *  gives up on it and takes the identity back. `agentnet restart` and a
+ *  launchd/systemd kickstart are both back well inside this. */
+export const DAEMON_GRACE_MS = 60 * 1000;
 /**
  * A PeerHost whose backend can change under it.
  *
@@ -34,11 +38,16 @@ export class SwitchablePeerHost {
     #timer = null;
     #releaseDeadline = 0;
     #busy = false;
+    /** When the daemon was first seen missing, 0 while it is present. Drives the
+     *  grace period; reset the moment it answers again. */
+    #daemonMissingSince = 0;
+    #probe;
     constructor(initial, opts) {
         this.#inner = initial;
         this.#state = initial.kind === "daemon" ? "daemon" : "embedded";
         this.#opts = opts;
         this.#log = opts.log ?? new Logger({ prefix: "LAN" });
+        this.#probe = opts.probe ?? ((dir) => probeDaemon(dir));
         this.#watch();
     }
     get kind() {
@@ -62,7 +71,9 @@ export class SwitchablePeerHost {
             // freezing, which reads as a bug rather than as "you have a step to do".
             return {
                 ok: false,
-                error: "Beagle released its peer and is waiting for the decentlan daemon to start. Messaging resumes when it does.",
+                error: this.#state === "waiting"
+                    ? "The decentlan daemon is restarting. Beagle is holding this identity for it and will re-attach automatically."
+                    : "Beagle released its peer and is waiting for the decentlan daemon to start. Messaging resumes when it does.",
             };
         }
         return this.#inner.call(req);
@@ -122,7 +133,39 @@ export class SwitchablePeerHost {
     async #tick() {
         if (this.#busy)
             return;
-        const daemonUp = daemonIsRunning(this.#opts.dataDir);
+        const daemonUp = await this.#probe(this.#opts.dataDir);
+        if (daemonUp)
+            this.#daemonMissingSince = 0;
+        else if (this.#daemonMissingSince === 0)
+            this.#daemonMissingSince = Date.now();
+        // A tick can await; make sure nothing started while we were probing.
+        if (this.#busy)
+            return;
+        // `--backend daemon` means "this box's identity belongs to the daemon".
+        // Honour that at RUNTIME too, not just at startup. Falling back here is
+        // what deadlocked 245 twice: the embedded peer took <dataDir>/daemon.pid,
+        // launchd then could not restart the daemon (it refuses when a live
+        // process holds the identity), and the "way back" could never fire because
+        // it waits for a daemon that our own lock is keeping down. `waiting` is
+        // the honest state — no peer, no lock, ops rejected with a reason — and it
+        // costs a minute of messaging instead of needing a human to kill beagle
+        // and rm the pidfile.
+        if (this.#opts.force === "daemon") {
+            if (this.#state === "daemon" && !daemonUp) {
+                this.#log.info("the daemon went away — waiting for it to come back (forced daemon backend)");
+                const old = this.#inner;
+                this.#inner = null;
+                this.#setState("waiting");
+                await old?.stop();
+                return;
+            }
+            if (this.#state === "waiting" && daemonUp) {
+                this.#log.info("the daemon is back — re-attaching");
+                this.#inner = this.#opts.makeDaemon();
+                this.#setState("daemon");
+            }
+            return;
+        }
         if (this.#state === "releasing") {
             if (daemonUp) {
                 this.#busy = true;
@@ -143,7 +186,18 @@ export class SwitchablePeerHost {
         // The daemon went away (stopped, uninstalled, crashed). Take the identity
         // back so messaging keeps working — a user who stops the LAN service should
         // not silently lose chat.
+        //
+        // But WAIT first. A daemon that was here a second ago is far more often
+        // restarting than gone: `agentnet restart` is the documented upgrade step,
+        // and a supervisor kickstart looks identical. Grabbing the identity lock in
+        // that gap is what stops the daemon coming back at all, so the fast path
+        // was the deadlock. One minute of the daemon's own downtime is cheap; the
+        // deadlock cost 20 minutes and a human.
         if (this.#state === "daemon" && !daemonUp) {
+            const downMs = Date.now() - this.#daemonMissingSince;
+            const graceMs = this.#opts.graceMs ?? DAEMON_GRACE_MS;
+            if (downMs < graceMs)
+                return; // probably a restart — say nothing, just wait
             await this.#backToEmbedded("the daemon is no longer running");
             return;
         }
@@ -155,7 +209,12 @@ export class SwitchablePeerHost {
         // was running the whole time, invisible to it. The version panel then
         // reported the APP's peer as the daemon's, so an update that had actually
         // landed looked like it had not.
-        if (this.#state === "embedded" && daemonUp) {
+        //
+        // Not when the user pinned `--backend embedded`, though. That flag used to
+        // stop at startup: cli.ts wrapped the forced host in this watcher, which
+        // promoted it right back. Beagle Desktop passes `--backend embedded` and
+        // was demoted within 1.5s anyway — on Windows to a pipe nobody served.
+        if (this.#state === "embedded" && daemonUp && this.#opts.force !== "embedded") {
             await this.#backToDaemon();
         }
     }
@@ -189,6 +248,19 @@ export class SwitchablePeerHost {
             return;
         this.#busy = true;
         try {
+            // Last look before we commit. makeEmbedded() takes <dataDir>/daemon.pid,
+            // and that write is the point of no return: from then on the daemon
+            // cannot start, so it cannot prove us wrong. Rather than thread a probe
+            // into acquireIdentityLock — which would have to be sync, and a sync
+            // check is exactly what could not answer on Windows — close the window
+            // here, where the decision is actually made and awaiting is free.
+            if (await this.#probe(this.#opts.dataDir)) {
+                this.#log.info("the daemon answered after all — staying off the identity lock");
+                this.#daemonMissingSince = 0;
+                this.#inner = this.#opts.makeDaemon();
+                this.#setState("daemon");
+                return;
+            }
             this.#log.info(`falling back to the embedded peer: ${why}`);
             this.#inner = null;
             this.#inner = await this.#opts.makeEmbedded();

package/dist/peer-host.js

@@ -21,7 +21,7 @@ import { homedir } from "node:os";
 import { resolve } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import yaml from "js-yaml";
-import { daemonIsRunning, ipcCall, ipcSocketPath } from "./ipc.js";
+import { ipcCall, ipcSocketPath, probeDaemon } from "./ipc.js";
 /** Where decentlan keeps its Carrier identity and daemon socket. Beagle reuses
  *  this identity when it exists so a user's friends carry over — the whole
  *  point of the split is that it is the same node, not a new one. */
@@ -73,7 +73,7 @@ export function makeDaemonHost(dataDir) {
  */
 export async function openPeerHost(opts) {
     const dataDir = decentlanCarrierDir(opts.configDir);
-    if (opts.force !== "embedded" && daemonIsRunning(dataDir)) {
+    if (opts.force !== "embedded" && (await probeDaemon(dataDir))) {
         return { host: new DaemonHost(dataDir), why: `decentlan daemon at ${dataDir}` };
     }
     if (opts.force === "daemon") {
@@ -91,7 +91,7 @@ export async function openPeerHost(opts) {
         const waitMs = Math.max(0, opts.waitForDaemonMs ?? 60_000);
         const deadline = Date.now() + waitMs;
         let waited = false;
-        while (!daemonIsRunning(dataDir)) {
+        while (!(await probeDaemon(dataDir))) {
             if (Date.now() >= deadline) {
                 throw new Error(`--backend daemon was requested but no decentlan daemon appeared within ${Math.round(waitMs / 1000)}s ` +
                     `(looked for ${ipcSocketPath(dataDir)}).`);

package/dist/server.js

@@ -350,11 +350,14 @@ async function npmGlobalInstall(pkg) {
     return { ok: false, error: `npm not found — update manually: npm i -g ${pkg}@latest` };
 }
 /**
- * Whether this process could write the global npm scope directory.
+ * Whether this process could perform a global update at all.
  *
- * Checked up front so the update card can say "you need to run this once"
- * rather than offering a button that fails. The check is a real access() on
- * the directory npm would have to rename, not a guess from the uid.
+ * Checked up front so the card can say what is actually true instead of
+ * offering a button that fails. A real access() on each directory npm has to
+ * write, not a guess from the uid: the package dir it rewrites, the bin dir it
+ * re-links through, and the cache it downloads into. Checking only the first
+ * reported "you can update" on a machine that then failed on the bin links,
+ * and then again on the cache.
  */
 async function globalNpmWritable() {
     try {
@@ -366,15 +369,8 @@ async function globalNpmWritable() {
             return { ok: true }; // nothing installed there yet
         const { access } = await import("node:fs/promises");
         const { constants } = await import("node:fs");
-        // BOTH, and both as directories. npm rewrites the package directory and
-        // re-links the binaries, and either one being unwritable stops the update.
-        // Checking only the scope reported "you can update" on a machine that then
-        // failed on the bin links.
         await access(scope, constants.W_OK);
         await access(join(prefix, "bin"), constants.W_OK);
-        // And the cache. A root-owned ~/.npm fails the install just as hard, and
-        // reporting "you can update" because the other two were fine is the same
-        // false promise this check exists to stop making.
         const cache = await npmCacheDir();
         if (cache && existsSync(cache))
             await access(cache, constants.W_OK);
@@ -385,49 +381,40 @@ async function globalNpmWritable() {
     }
 }
 /**
- * The one-time fix for a global npm dir this user cannot write.
+ * What to tell someone whose global npm directory this process cannot write.
  *
- * Almost always the result of a first install done with `sudo npm i -g`: the
- * scope directory ends up root-owned, and every later update — including this
- * app's own — dies renaming it. Telling people to sudo again works once and
- * rebuilds the trap. Hand them the command that ends it instead, with the real
- * paths for THIS machine.
+ * NOT a permission change. Two earlier versions of this were.
+ *
+ * The first said `sudo npm i -g`, which works and leaves the package directory
+ * root-owned, so the next unprivileged update fails identically — the advice
+ * was what kept people in the loop.
+ *
+ * The second said `chgrp -R admin` plus `chmod -R g+w` on the bin directory.
+ * On the machine it was run on that made node, npm, docker and kubectl
+ * writable by every admin user, while the daemon runs as root out of that same
+ * /usr/local/bin/node — a root escalation traded for a convenience button. The
+ * user stopped it before it did any harm, and was right to.
+ *
+ * A root-owned prefix is not a misconfiguration to repair. It is the machine
+ * saying installs there are privileged. So: say the button cannot do it, give
+ * the command to run by hand, and name the one change that removes the problem
+ * without weakening anything — moving npm's prefix into $HOME.
  */
 async function globalNpmOwnershipHint(pkg) {
     const prefix = await npmGlobalPrefix();
     if (!prefix) {
-        return `no write access to the global npm dir. \`sudo npm i -g ${pkg}@latest\` would work but leaves it root-owned, so the next update fails the same way — fix the ownership once instead.`;
+        return `no write access to the global npm directory — update in a terminal with \`sudo npm i -g ${pkg}@latest\`.`;
     }
     const scope = join(prefix, "lib", "node_modules", "@decentnetwork");
-    const bin = join(prefix, "bin");
-    // Both DIRECTORIES, not the files inside them. Replacing a package directory
-    // or a bin symlink is a rename, and rename needs write permission on the
-    // CONTAINING directory — naming the symlinks themselves does nothing when
-    // their parent is root-owned. An earlier version of this hint listed
-    // bin/agentnet and bin/beagle and left people exactly as stuck, one error
-    // further along: the scope chown succeeded and npm then failed on the bin
-    // links instead.
     const cache = await npmCacheDir();
-    // Three places, because a sudo install poisons three: the package directory
-    // it rewrites, the bin directory it re-links through, and the cache it
-    // downloads into. Fixing them one at a time just moves the error along —
-    // watched exactly that happen on one machine, three rounds, each ending in a
-    // different npm message.
-    //
-    // The bin line is deliberately narrow, and an earlier version of it was not.
-    // It said `chgrp -R admin` plus `chmod -R g+w`, which hands every admin user
-    // write access to every binary in a shared directory — a way to replace
-    // something another user, or root, will run. Creating or replacing a symlink
-    // needs write on the CONTAINING directory and nothing else, so: no -R, no
-    // group bit, no touching the files inside. Mode stays 755 and only this user
-    // gains write.
-    //
-    // The cleaner answer for anyone willing to change their PATH is not to touch
-    // /usr/local at all — `npm config set prefix ~/.npm-global` and put its bin
-    // first. That needs more than one line, so the card says it in prose.
-    return (`no write access to ${scope}. This is what a first install with sudo leaves behind, and ` +
-        `\`sudo npm i -g\` would rebuild it — run this ONCE and updates never need sudo again: ` +
-        `sudo chown -R $(id -u):$(id -g) ${scope}${cache ? ` ${cache}` : ""} && sudo chown $(id -u) ${bin}`);
+    const cacheNote = cache
+        ? ` If npm also complains about its cache, that one IS yours to fix: sudo chown -R $(id -u):$(id -g) ${cache}.`
+        : "";
+    return (`${scope} belongs to root, so updates here are privileged and this button cannot perform them. ` +
+        `Update in a terminal: sudo npm i -g ${pkg}@latest.${cacheNote} ` +
+        `For one-click updates instead, move npm out of the system prefix — ` +
+        `\`npm config set prefix ~/.npm-global\`, then put ~/.npm-global/bin first on PATH. ` +
+        `Do not widen permissions under ${prefix} to make this button work.`);
 }
 /** `npm config get cache`, or undefined if npm cannot be reached. */
 async function npmCacheDir() {
@@ -1988,6 +1975,11 @@ export function startBeagleServer(opts) {
                         // be ordered, which is why the sidebar never reordered on new
                         // activity.
                         lastTs: lm?.ts ?? 0,
+                        // When the friendship was established. The sidebar sorts by last
+                        // message and falls back to this, so a friend you just accepted —
+                        // who by definition has no messages — lands at the top of the
+                        // no-history group instead of alphabetically halfway down it.
+                        acceptedAt: f.lastSeen ?? 0,
                         wire: "163",
                         avatarUrl: ensPub.get(uid)?.avatarUrl ?? null,
                         // What they advertised over Carrier wins over the directory: it is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.86",
+  "version": "0.1.88",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",
@@ -21,6 +21,7 @@
   "scripts": {
     "build": "npm run build -w @decentnetwork/beagle-ui && tsc -p tsconfig.json && chmod +x dist/cli.js && node scripts/build-ui.mjs",
     "typecheck": "tsc --noEmit",
+    "test": "tsc -p tsconfig.test.json && node --test .test-build/test/*.test.js",
     "clean": "rm -rf dist",
     "start": "node dist/cli.js"
   },
@@ -34,7 +35,7 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@decentnetwork/beagle-ui": "^0.2.6",
+    "@decentnetwork/beagle-ui": "^0.2.7",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.11.0",
     "@types/yargs": "^17.0.32",