clawborrator-cli 0.0.32 → 0.0.34

package/dist-bundled/claw.cjs

@@ -67760,43 +67760,73 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     }
   }
   const wsUrl = cfg.hubUrl.replace(/^http/i, "ws") + "/cli";
-  const ws = new wrapper_default(wsUrl, {
-    headers: { Authorization: `Bearer ${cfg.pat}` }
-  });
   let mySubscription = false;
   const pendingPerms = [];
-  ws.on("open", () => {
-    say(`${DIM2}[${ts()}]${RESET2} connected to ${cfg.hubUrl}`);
-    const sub = { type: "subscribe", sessionId };
-    ws.send(JSON.stringify(sub));
-  });
-  ws.on("message", (data) => {
-    let msg;
-    try {
-      msg = JSON.parse(data.toString("utf8"));
-    } catch {
-      return;
-    }
-    if (msg.type === "permission_request") {
-      pendingPerms.push({ requestId: msg.requestId, tool: msg.tool, sessionId: msg.sessionId });
-    } else if (msg.type === "permission_resolved") {
-      const i = pendingPerms.findIndex((p) => p.requestId === msg.requestId);
-      if (i >= 0) pendingPerms.splice(i, 1);
-    }
-    printInbound(msg, myLogin);
-    if (msg.type === "subscribed") {
-      mySubscription = true;
-      say(`${DIM2}attached as ${BOLD2}${msg.role}${RESET2}${DIM2}. type for prompt \xB7 @other <text> to route \xB7 /m <text> for op-msg \xB7 /y /n on permissions \xB7 /q to quit${RESET2}`);
-    }
-  });
-  ws.on("close", (code, reason) => {
-    stopWorking();
-    say(`${DIM2}[${ts()}] disconnected (${code}${reason ? ": " + reason.toString() : ""})${RESET2}`);
-    process.exit(0);
-  });
-  ws.on("error", (err) => {
-    sayErr(`${RED}ws error: ${err.message}${RESET2}`);
-  });
+  const BACKOFF = [1e3, 2e3, 5e3, 15e3, 3e4, 6e4];
+  let ws;
+  let stopRequested = false;
+  let reconnectAttempt = 0;
+  let reconnectTimer = null;
+  function connect() {
+    ws = new wrapper_default(wsUrl, { headers: { Authorization: `Bearer ${cfg.pat}` } });
+    ws.on("open", () => {
+      if (reconnectAttempt > 0) {
+        say(`${DIM2}[${ts()}]${RESET2} ${AMBER}reconnected${RESET2} to ${cfg.hubUrl}`);
+      } else {
+        say(`${DIM2}[${ts()}]${RESET2} connected to ${cfg.hubUrl}`);
+      }
+      reconnectAttempt = 0;
+      mySubscription = false;
+      const sub = { type: "subscribe", sessionId };
+      ws.send(JSON.stringify(sub));
+    });
+    ws.on("message", (data) => {
+      let msg;
+      try {
+        msg = JSON.parse(data.toString("utf8"));
+      } catch {
+        return;
+      }
+      if (msg.type === "permission_request") {
+        pendingPerms.push({ requestId: msg.requestId, tool: msg.tool, sessionId: msg.sessionId });
+      } else if (msg.type === "permission_resolved") {
+        const i = pendingPerms.findIndex((p) => p.requestId === msg.requestId);
+        if (i >= 0) pendingPerms.splice(i, 1);
+      }
+      printInbound(msg, myLogin);
+      if (msg.type === "subscribed") {
+        mySubscription = true;
+        say(`${DIM2}attached as ${BOLD2}${msg.role}${RESET2}${DIM2}. type for prompt \xB7 @other <text> to route \xB7 /m <text> for op-msg \xB7 /y /n on permissions \xB7 /q to quit${RESET2}`);
+      }
+      if (msg.type === "error" && (msg.code === "auth_failed" || msg.code === "token_revoked")) {
+        stopRequested = true;
+      }
+    });
+    ws.on("close", (code, reason) => {
+      stopWorking();
+      if (stopRequested || code === 1e3) {
+        say(`${DIM2}[${ts()}] disconnected (${code}${reason && reason.length ? ": " + reason.toString() : ""})${RESET2}`);
+        process.exit(0);
+      }
+      if (code === 1008) {
+        sayErr(`${RED}disconnected (${code}): auth rejected \u2014 won't retry${RESET2}`);
+        process.exit(2);
+      }
+      const delay = BACKOFF[Math.min(reconnectAttempt, BACKOFF.length - 1)];
+      reconnectAttempt += 1;
+      say(`${DIM2}[${ts()}] ${AMBER}disconnected${RESET2} (${code}${reason && reason.length ? ": " + reason.toString() : ""})${DIM2} \u2014 reconnecting in ${delay / 1e3}s (attempt ${reconnectAttempt})${RESET2}`);
+      if (reconnectTimer) clearTimeout(reconnectTimer);
+      reconnectTimer = setTimeout(() => {
+        reconnectTimer = null;
+        connect();
+      }, delay);
+    });
+    ws.on("error", (err) => {
+      if (ws.readyState === wrapper_default.CLOSING || ws.readyState === wrapper_default.CLOSED) return;
+      sayErr(`${RED}ws error: ${err.message}${RESET2}`);
+    });
+  }
+  connect();
   const rl = (0, import_node_readline2.createInterface)({
     input: process.stdin,
     output: process.stdout,
@@ -67813,6 +67843,11 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       return;
     }
     if (text === "/q" || text === "/quit") {
+      stopRequested = true;
+      if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = null;
+      }
       ws.close(1e3, "user quit");
       return;
     }
@@ -67867,7 +67902,8 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       say(`${DIM2}unknown slash-command: ${text} (try /m /y /n /debug /q)${RESET2}`);
       return;
     }
-    const xMatch = /^(@[A-Za-z0-9._\-/]+)\s+([\s\S]+)$/.exec(text);
+    const UUID_RE_LOOSE = /^@?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    const xMatch = /^(@?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|@[A-Za-z0-9._\-/]+)\s+([\s\S]+)$/i.exec(text);
     if (xMatch) {
       const targetRef = xMatch[1];
       const promptText = xMatch[2].trim();
@@ -67875,6 +67911,19 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
         say(`${DIM2}usage: ${targetRef} <prompt>${RESET2}`);
         return;
       }
+      if (UUID_RE_LOOSE.test(targetRef)) {
+        const peerSessionId = targetRef.replace(/^@/, "");
+        const out2 = {
+          type: "prompt",
+          sessionId: peerSessionId,
+          text: promptText,
+          sourceSessionId: sessionId
+        };
+        ws.send(JSON.stringify(out2));
+        say(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt \u2192 ${peerSessionId.slice(0, 8)}\u2026${RESET2}  ${promptText}`);
+        startWorking();
+        return;
+      }
       (async () => {
         const needle = targetRef.startsWith("@") ? targetRef : "@" + targetRef;
         const slash = needle.indexOf("/");
@@ -67931,6 +67980,11 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     startWorking();
   });
   process.on("SIGINT", () => {
+    stopRequested = true;
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
     ws.close(1e3, "sigint");
   });
 });
@@ -68595,7 +68649,7 @@ var webhookCmd = new Command("webhook").description("manage webhook subscription
 
 // src/index.ts
 var program2 = new Command();
-program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.32");
+program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.34");
 program2.addCommand(loginCmd);
 program2.addCommand(logoutCmd);
 program2.addCommand(whoamiCmd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawborrator-cli",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "type": "module",
   "description": "claw — command-line client for clawborrator hub_v1. Manages PATs, channel tokens, sessions, cross-session routing, and webhooks; ships an inline TUI for live multi-operator session attach.",
   "license": "MIT",