@bondsmith/bondsmithd 0.1.0 → 0.1.1

package/dist/index.js

@@ -10,6 +10,9 @@ import { fileURLToPath } from "url";
 // ../../packages/local-agent-protocol/src/session.ts
 var SESSION_STATUSES = ["running", "exited"];
 
+// ../../packages/local-agent-protocol/src/messages.ts
+var REPLAYED_COMMAND_MESSAGE = "command already used (replay rejected)";
+
 // ../../packages/local-agent-protocol/src/schemas.ts
 import { z as z2 } from "zod";
 
@@ -991,7 +994,7 @@ function verifyRejectionMessage(reason) {
     case "expired":
       return "command envelope expired";
     case "replayed":
-      return "command already used (replay rejected)";
+      return REPLAYED_COMMAND_MESSAGE;
     case "wrong_daemon":
       return "command not addressed to this daemon";
     case "wrong_connection":
@@ -1005,6 +1008,7 @@ var BRACKETED_PASTE_START = "\x1B[200~";
 var BRACKETED_PASTE_END = "\x1B[201~";
 function createRouterConnection(connectionAuth, send, markControllerId, ptyAttachments) {
   const outputListeners = /* @__PURE__ */ new Map();
+  const attachLocks = /* @__PURE__ */ new Map();
   const conn = {
     subscriptions: /* @__PURE__ */ new Set(),
     send,
@@ -1013,7 +1017,18 @@ function createRouterConnection(connectionAuth, send, markControllerId, ptyAttac
     },
     getOutputListener: (sessionId) => outputListeners.get(sessionId),
     connectionAuth,
-    markControllerId
+    markControllerId,
+    withAttachLock: (sessionId, fn) => {
+      const previous = attachLocks.get(sessionId) ?? Promise.resolve();
+      const next = previous.catch(() => {
+      }).then(fn);
+      attachLocks.set(
+        sessionId,
+        next.catch(() => {
+        })
+      );
+      return next;
+    }
   };
   function releaseAllSubscriptions() {
     for (const sessionId of conn.subscriptions) {
@@ -1117,36 +1132,38 @@ async function dispatch(conn, message, {
       }
       const session = getSessionOrError(sessionManager, conn, message.sessionId);
       if (!session) return;
-      const previousListener = conn.getOutputListener(message.sessionId);
-      const onData = (data) => {
-        conn.send({ type: "terminal.output", sessionId: message.sessionId, data });
-      };
-      if (previousListener && await ptyAttachments.swapListener(
-        message.sessionId,
-        session.tmuxSessionName,
-        previousListener,
-        onData
-      )) {
+      await conn.withAttachLock(message.sessionId, async () => {
+        const previousListener = conn.getOutputListener(message.sessionId);
+        const onData = (data) => {
+          conn.send({ type: "terminal.output", sessionId: message.sessionId, data });
+        };
+        if (previousListener && await ptyAttachments.swapListener(
+          message.sessionId,
+          session.tmuxSessionName,
+          previousListener,
+          onData
+        )) {
+          conn.subscriptions.add(message.sessionId);
+          conn.registerOutputListener(message.sessionId, onData);
+          conn.send({ type: "session.attached", sessionId: message.sessionId });
+          return;
+        }
+        if (previousListener) {
+          ptyAttachments.release(message.sessionId, previousListener);
+        }
+        const attached = await ptyAttachments.ensureAttached(
+          message.sessionId,
+          session.tmuxSessionName,
+          onData
+        );
+        if (!attached) {
+          conn.send(error("failed to attach to session"));
+          return;
+        }
         conn.subscriptions.add(message.sessionId);
         conn.registerOutputListener(message.sessionId, onData);
         conn.send({ type: "session.attached", sessionId: message.sessionId });
-        return;
-      }
-      if (previousListener) {
-        ptyAttachments.release(message.sessionId, previousListener);
-      }
-      const attached = await ptyAttachments.ensureAttached(
-        message.sessionId,
-        session.tmuxSessionName,
-        onData
-      );
-      if (!attached) {
-        conn.send(error("failed to attach to session"));
-        return;
-      }
-      conn.subscriptions.add(message.sessionId);
-      conn.registerOutputListener(message.sessionId, onData);
-      conn.send({ type: "session.attached", sessionId: message.sessionId });
+      });
       return;
     }
     case "session.input": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bondsmith/bondsmithd",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"private": false,
 	"description": "Local daemon for Bondsmith agent sessions — runs on the user's own machine, pairs with a Bondsmith account, and exposes tmux-backed terminal sessions to the Bondsmith web app over a signed WebSocket protocol.",
 	"homepage": "https://bondsmith.dev",