@sessionbus/dsh 0.1.0-pre.10 → 0.1.0-pre.12

package/README.md

@@ -62,6 +62,12 @@ when given a launch token. Install the selected launcher alongside `dsh` at the
 host level and put their shared `node_modules/.bin` on the daemon service's
 `PATH`; the `dashi` launcher resolves its child `dsh` by name.
 
+Without an explicit socket, peers use `$XDG_RUNTIME_DIR/sessionbus/presence.sock`
+or `/tmp/sessionbus-<uid>/presence.sock`, matching the daemon's discovery rule.
+Set `SESSIONBUS_DSH_TRACE=1` to write one-line mode, readiness, root-lifecycle,
+publication-gate, and socket-connection diagnostics to stderr; tracing is off
+by default.
+
 Uninstall without invoking DSH by running the installed bin from the profile:
 
 ```sh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sessionbus/dsh",
-  "version": "0.1.0-pre.10",
+  "version": "0.1.0-pre.12",
   "type": "commonjs",
   "main": "plugin.cjs",
   "exports": "./plugin.cjs",

package/plugin.cjs

@@ -1,6 +1,6 @@
 "use strict";
 
-const os = require("node:os");
+const net = require("node:net");
 const path = require("node:path");
 const kit = require("@sessionbus/kit");
 const version = require("./package.json").version;
@@ -66,10 +66,13 @@ function readConfiguration(ctx, config = {}, ambient = process.env) {
   if (config.mode !== undefined && config.mode !== mode) throw new Error(`mode ${config.mode} conflicts with launch environment`);
   let groups = mode === "lane" ? [] : Object.hasOwn(config, "groups") ? config.groups : JSON.parse(value("SESSIONBUS_GROUPS") || "[]");
   if (!Array.isArray(groups) || groups.some((group) => !text(group)) || new Set(groups).size !== groups.length) throw new Error("groups are invalid");
-  const socket = Object.hasOwn(config, "socket") ? config.socket : value("SESSIONBUS_SOCKET") || path.join(value("XDG_STATE_HOME") || path.join(value("HOME") || os.homedir(), ".local/state"), "sessionbus/run/presence.sock");
+  const explicitSocket = Object.hasOwn(config, "socket") ? config.socket : value("SESSIONBUS_SOCKET");
+  const socket = explicitSocket ? path.resolve(explicitSocket) : value("XDG_RUNTIME_DIR")
+    ? path.resolve(value("XDG_RUNTIME_DIR"), "sessionbus/presence.sock")
+    : path.join("/tmp", `sessionbus-${process.getuid()}`, "presence.sock");
   const localKey = Object.hasOwn(config, "local_key") ? config.local_key : value("SESSIONBUS_LOCAL_KEY");
   if (!text(socket) || localKey !== undefined && !text(localKey)) throw new Error("connection settings are invalid");
-  return { settings: { mode, product: config.product, groups: [...groups], socket, localKey }, token };
+  return { settings: { mode, product: config.product, groups: [...groups], socket, localKey }, token, trace: value("SESSIONBUS_DSH_TRACE") === "1" };
 }
 
 function captureContext(ctx) {
@@ -285,26 +288,54 @@ function createRuntime(ctx, config, dependencies, prepared) {
   let launchToken = configured.token;
   const native = new NativeSession(ctx, dependencies.createUserMessage);
   const peers = new Map();
+  const publicationErrors = new WeakSet();
   let worker;
   let workerExit = Promise.resolve();
   let ready = false;
   let warned = false;
   const warn = (error) => { if (active() && !warned) { warned = true; dependencies.stderr(`sessionbus: ${clean(error)}\n`); } };
+  const trace = (message) => { if (configured.trace && active()) dependencies.stderr(`sessionbus trace: ${message}\n`); };
   const root = (agent) => ctx.agents.roots().includes(agent);
+  trace(`mode=${values.mode} ready=false socket=${values.socket}`);
+  const publicationError = (agent, error, record) => {
+    if (record && peers.get(agent) === record) {
+      record.peer?.shutdown();
+      peers.delete(agent);
+      // Leave it unpublished; a later title change may naturally call present() again.
+    }
+    if (active() && !publicationErrors.has(agent)) {
+      publicationErrors.add(agent);
+      dependencies.stderr(`sessionbus: ${clean(error)}\n`);
+    }
+  };
   const present = (agent) => {
-    if (values.mode !== "peer" || !ready || !root(agent) || peers.has(agent)) return;
+    const isRoot = root(agent);
+    const reason = values.mode !== "peer" ? "not-peer" : !ready ? "not-ready" : !isRoot ? "not-root" : peers.has(agent) ? "published" : "publish";
+    trace(`present id=${agent?.session?.id || agent?.id || "unknown"} root=${isRoot} reason=${reason}`);
+    if (reason !== "publish") return;
     try {
       const current = identity(ctx, agent, values.product, values.groups);
-      if (!current) return;
-      const peer = dependencies.connectPeer(current, (cancel, request) => native.deliver(cancel, request, agent), connectionEnvironment(values));
-      peers.set(agent, { peer, identity: current, rehello: Promise.resolve() });
-    } catch (error) { warn(error); }
+      if (!current) { trace(`present id=${agent?.id || "unknown"} root=${isRoot} reason=no-session-id`); return; }
+      const record = { peer: undefined, identity: current, rehello: Promise.resolve() };
+      const peer = dependencies.connectPeer(current, (cancel, request) => native.deliver(cancel, request, agent), connectionEnvironment(values), {
+        connect: (socket) => {
+          trace(`connect id=${current.session_id} socket=${socket}`);
+          const stream = net.createConnection(socket);
+          stream.once("connect", () => trace(`connect id=${current.session_id} state=connected`));
+          stream.once("error", (error) => publicationError(agent, error, record));
+          return stream;
+        },
+      });
+      record.peer = peer;
+      peers.set(agent, record);
+      void peer.closed?.then(() => { if (peer.error) publicationError(agent, peer.error, record); });
+    } catch (error) { publicationError(agent, error); }
   };
   const forget = (agent) => { peers.get(agent)?.peer.shutdown(); peers.delete(agent); };
   let removeCreated = () => {}, removeDisposed = () => {}, removeTitle = () => {};
   if (values.mode === "peer") {
-    removeCreated = ctx.on("agent/created", ({ agent }) => present(agent));
-    removeDisposed = ctx.on("agent/disposed", ({ agent }) => forget(agent));
+    removeCreated = ctx.on("agent/created", ({ agent }) => { trace(`agent/created id=${agent?.session?.id || agent?.id || "unknown"} scope=global`); present(agent); }, { global: true });
+    removeDisposed = ctx.on("agent/disposed", ({ agent }) => { trace(`agent/disposed id=${agent?.session?.id || agent?.id || "unknown"} scope=global`); forget(agent); }, { global: true });
     removeTitle = ctx.on("session/event", (session, event) => {
       if (event.type !== "session/title") return;
       const agent = ctx.agents.get(session.id);
@@ -348,6 +379,7 @@ function createRuntime(ctx, config, dependencies, prepared) {
   });
   const start = () => {
     ready = true;
+    trace(`mode=${values.mode} ready=true`);
     if (values.mode === "lane") {
       const environment = connectionEnvironment(values, launchToken);
       launchToken = undefined;
@@ -370,6 +402,7 @@ function createRuntime(ctx, config, dependencies, prepared) {
   };
   const removeReady = ctx.appReady.onReady(start);
   const close = () => {
+    trace(`mode=${values.mode} ready=false reason=close`);
     removeReady(); removeCreated(); removeDisposed(); removeTitle(); removeCommand(); removeGrant(); removeTool();
     for (const agent of peers.keys()) forget(agent);
     worker?.shutdown(); native.removeEvents();