@dmsdc-ai/aigentry-telepty 0.5.2 → 0.5.3

package/cli.js

@@ -1273,6 +1273,10 @@ async function main() {
     let wsReady = false;
     let reconnectAttempts = 0;
     let reconnectTimer = null;
+    // BUG-C: the daemon mints a per-owner token on each owner claim/reclaim and pushes it here.
+    // We echo it on the teardown DELETE so the daemon can tell our (current-owner) exit apart
+    // from a stale/displaced owner's exit and avoid the shared-fate teardown.
+    let currentOwnerToken = null;
     let lastInjectTextTime = 0;
     const MAX_RECONNECT_DELAY = 30000;
 
@@ -1318,6 +1322,10 @@ async function main() {
       daemonWs.on('message', (message) => {
         try {
           const msg = JSON.parse(message);
+          if (msg.type === 'owner_token') {
+            currentOwnerToken = msg.token || null;
+            return;
+          }
           if (msg.type === 'inject') {
             const chunks = [];
             const rawData = typeof msg.data === 'string' ? msg.data : String(msg.data ?? '');
@@ -1430,7 +1438,12 @@ async function main() {
       // Purge bridge mailbox on clean exit (undelivered messages are stale)
       try { bridgeMailbox.purge(bridgeTarget); } catch {}
       process.stdout.write(`\x1b]0;\x07`);
-      fetchWithAuth(`${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}`, { method: 'DELETE' }).catch(() => {});
+      // BUG-C: carry our owner token so the daemon destroys only on the CURRENT owner's exit;
+      // a stale/displaced owner's DELETE (mismatched token) must not tear down the live owner.
+      const deleteUrl = currentOwnerToken
+        ? `${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}?owner_token=${encodeURIComponent(currentOwnerToken)}`
+        : `${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}`;
+      fetchWithAuth(deleteUrl, { method: 'DELETE' }).catch(() => {});
       if (reconnectTimer) clearTimeout(reconnectTimer);
       try {
         daemonWs.close();

package/daemon.js

@@ -2757,6 +2757,18 @@ app.delete('/api/sessions/:id', (req, res) => {
   const session = sessions[resolvedId];
   const id = resolvedId;
   if (session.isClosing) return res.json({ success: true, status: 'closing' });
+  // BUG-C (shared-fate): a wrapped session can be co-bound by a stale/displaced owner bridge
+  // (duplicate --id). A DELETE carrying a token that is NOT the current owner's, while a live
+  // owner ws is still open, is that stale bridge exiting — it must NOT tear down the live owner.
+  // Detach-only (no-op): leave the record and every client untouched. Tokenless callers
+  // (operator `telepty delete`, ghost clean) and matching-token current-owner exits are
+  // unaffected. Forceful kills go through POST /:id/kill (teardownSessionById), not here.
+  const ownerToken = req.query.owner_token;
+  if (session.type === 'wrapped'
+      && ownerToken && session.ownerToken && ownerToken !== session.ownerToken
+      && isOpenWebSocket(session.ownerWs)) {
+    return res.json({ success: true, status: 'stale-detached' });
+  }
   try {
     session.isClosing = true;
     if (session.type === 'wrapped') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "daemon.js",
   "bin": {
     "aigentry-telepty": "install.js",

package/src/transport/websocket.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const crypto = require('node:crypto');
 const { WebSocketServer } = require('ws');
 
 function isOpenWebSocket(ws) {
@@ -107,6 +108,13 @@ function installWebSocketTransport(deps) {
         activeSession.ownerWs.terminate();
       }
       activeSession.ownerWs = ws;
+      // BUG-C: mint a fresh per-owner token on every claim/reclaim and push it to this owner.
+      // The token is the exact "are-you-the-current-owner" discriminator the DELETE guard uses
+      // to suppress a stale/displaced owner's teardown (shared-fate fix). Reclaim refreshes it,
+      // so the live current owner always holds the current token while a displaced owner keeps a
+      // stale one.
+      activeSession.ownerToken = crypto.randomUUID();
+      try { ws.send(JSON.stringify({ type: 'owner_token', token: activeSession.ownerToken })); } catch {}
       markSessionConnected(activeSession);
       initializeBootstrapState(activeSession);
       console.log(`[WS] Wrap owner ${isOwnerConnect && activeSession.clients.size > 1 ? 're-' : ''}connected for session ${sessionId} (Total: ${activeSession.clients.size})`);