clawborrator-cli 0.0.28 → 0.0.30

package/dist-bundled/claw.cjs

@@ -67595,6 +67595,65 @@ function ts() {
 }
 var markdownEnabled = true;
 var debugMode = false;
+var statusEnabled = true;
+var working = false;
+var rlRef = null;
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var spinnerFrame = 0;
+var spinnerTimer = null;
+var PROMPT_BASE = `${DIM2}>${RESET2} `;
+function buildPrompt() {
+  if (!working) return PROMPT_BASE;
+  return `${AMBER}${SPINNER_FRAMES[spinnerFrame]}${RESET2} ${PROMPT_BASE}`;
+}
+function refreshPrompt() {
+  if (!rlRef) return;
+  rlRef.setPrompt(buildPrompt());
+  const r = rlRef;
+  if (typeof r._refreshLine === "function") r._refreshLine();
+  else rlRef.prompt(true);
+}
+function startWorking() {
+  if (working) return;
+  working = true;
+  if (!statusEnabled || !process.stdout.isTTY) {
+    refreshPrompt();
+    return;
+  }
+  if (spinnerTimer) return;
+  spinnerTimer = setInterval(() => {
+    spinnerFrame = (spinnerFrame + 1) % SPINNER_FRAMES.length;
+    refreshPrompt();
+  }, 80);
+  refreshPrompt();
+}
+function stopWorking() {
+  if (!working) return;
+  working = false;
+  if (spinnerTimer) {
+    clearInterval(spinnerTimer);
+    spinnerTimer = null;
+  }
+  refreshPrompt();
+}
+function say(line) {
+  if (!process.stdout.isTTY || !rlRef) {
+    console.log(line);
+    return;
+  }
+  process.stdout.write("\r\x1B[K");
+  console.log(line);
+  refreshPrompt();
+}
+function sayErr(line) {
+  if (!process.stdout.isTTY || !rlRef) {
+    console.error(line);
+    return;
+  }
+  process.stdout.write("\r\x1B[K");
+  console.error(line);
+  refreshPrompt();
+}
 var md = new Marked();
 md.use(markedTerminal({
   width: process.stdout.columns ?? 100,
@@ -67613,17 +67672,18 @@ function renderMarkdown(text) {
 }
 function emitChatLine(prefix, body) {
   if (!body.includes("\n")) {
-    console.log(`${prefix}  ${body}`);
+    say(`${prefix}  ${body}`);
     return;
   }
-  console.log(prefix);
+  say(prefix);
   for (const line of body.split("\n")) {
-    console.log(`  ${line}`);
+    say(`  ${line}`);
   }
 }
-var sessionAttach = new Command("attach").description("open a TUI on a session \u2014 see the chat stream, post op-messages").argument("<ref>", "session UUID or @routingName (e.g. @driver)").option("--limit <n>", 'history items to load before the live stream begins. 0 = none. "all" = up to 5000. default 50.', "50").option("--no-op-messages", "exclude op-messages from the history backlog (live ones still arrive once attached)").option("--no-markdown", "render assistant_text and reply payloads as raw text instead of formatted markdown").option("--debug", "after every rendered event, print its full JSON payload (truncated at 2 KB) \u2014 surfaces fields the renderer normally hides (e.g., SubagentStop's last_assistant_message, PreToolUse tool_input details)").action(async (ref, opts) => {
+var sessionAttach = new Command("attach").description("open a TUI on a session \u2014 see the chat stream, post op-messages").argument("<ref>", "session UUID or @routingName (e.g. @driver)").option("--limit <n>", 'history items to load before the live stream begins. 0 = none. "all" = up to 5000. default 50.', "50").option("--no-op-messages", "exclude op-messages from the history backlog (live ones still arrive once attached)").option("--no-markdown", "render assistant_text and reply payloads as raw text instead of formatted markdown").option("--debug", "after every rendered event, print its full JSON payload (truncated at 2 KB) \u2014 surfaces fields the renderer normally hides (e.g., SubagentStop's last_assistant_message, PreToolUse tool_input details)").option("--no-status", 'disable the animated "claude working" dot at the bottom of the TUI (useful for piped output or rough-ANSI terminals)').action(async (ref, opts) => {
   if (opts.markdown === false) markdownEnabled = false;
   if (opts.debug) debugMode = true;
+  if (opts.status === false) statusEnabled = false;
   const cfg = loadConfig();
   if (!cfg.pat) {
     console.error("error: not logged in. run `claw login`.");
@@ -67706,7 +67766,7 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
   let mySubscription = false;
   const pendingPerms = [];
   ws.on("open", () => {
-    console.log(`${DIM2}[${ts()}]${RESET2} connected to ${cfg.hubUrl}`);
+    say(`${DIM2}[${ts()}]${RESET2} connected to ${cfg.hubUrl}`);
     const sub = { type: "subscribe", sessionId };
     ws.send(JSON.stringify(sub));
   });
@@ -67726,22 +67786,30 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     printInbound(msg, myLogin);
     if (msg.type === "subscribed") {
       mySubscription = true;
-      console.log(`${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}`);
+      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) => {
-    console.log(`${DIM2}[${ts()}] disconnected (${code}${reason ? ": " + reason.toString() : ""})${RESET2}`);
+    stopWorking();
+    say(`${DIM2}[${ts()}] disconnected (${code}${reason ? ": " + reason.toString() : ""})${RESET2}`);
     process.exit(0);
   });
   ws.on("error", (err) => {
-    console.error(`${RED}ws error: ${err.message}${RESET2}`);
+    sayErr(`${RED}ws error: ${err.message}${RESET2}`);
+  });
+  const rl = (0, import_node_readline2.createInterface)({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: process.stdout.isTTY ? true : false,
+    prompt: PROMPT_BASE
   });
-  const rl = (0, import_node_readline2.createInterface)({ input: process.stdin, terminal: false });
+  rlRef = rl;
+  if (process.stdout.isTTY) rl.prompt(true);
   rl.on("line", (raw) => {
     const text = raw.trim();
     if (!text) return;
     if (!mySubscription) {
-      console.log(`${DIM2}(not subscribed yet \u2014 waiting...)${RESET2}`);
+      say(`${DIM2}(not subscribed yet \u2014 waiting...)${RESET2}`);
       return;
     }
     if (text === "/q" || text === "/quit") {
@@ -67751,7 +67819,7 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     if (text === "/y" || text === "/yes" || text === "/n" || text === "/no") {
       const pending = pendingPerms[pendingPerms.length - 1];
       if (!pending) {
-        console.log(`${DIM2}(no pending permission to act on)${RESET2}`);
+        say(`${DIM2}(no pending permission to act on)${RESET2}`);
         return;
       }
       const decision = text === "/y" || text === "/yes" ? "allow" : "deny";
@@ -67768,7 +67836,7 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     if (text === "/m" || text.startsWith("/m ")) {
       const opText = text.slice(2).trim();
       if (!opText) {
-        console.log(`${DIM2}usage: /m <text> (sends as op-message; bare text is a prompt)${RESET2}`);
+        say(`${DIM2}usage: /m <text> (sends as op-message; bare text is a prompt)${RESET2}`);
         return;
       }
       const out2 = { type: "op_message", sessionId, text: opText };
@@ -67778,16 +67846,16 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     if (text === "/p" || text.startsWith("/p ")) {
       const promptText = text.slice(2).trim();
       if (!promptText) {
-        console.log(`${DIM2}usage: /p <text> (or just type \u2014 bare text is a prompt now)${RESET2}`);
+        say(`${DIM2}usage: /p <text> (or just type \u2014 bare text is a prompt now)${RESET2}`);
         return;
       }
       const out2 = { type: "prompt", sessionId, text: promptText };
       ws.send(JSON.stringify(out2));
-      console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt sent${RESET2}  ${promptText}`);
+      say(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt sent${RESET2}  ${promptText}`);
       return;
     }
     if (text.startsWith("/")) {
-      console.log(`${DIM2}unknown slash-command: ${text} (try /m /y /n /q)${RESET2}`);
+      say(`${DIM2}unknown slash-command: ${text} (try /m /y /n /q)${RESET2}`);
       return;
     }
     const xMatch = /^(@[A-Za-z0-9._\-/]+)\s+([\s\S]+)$/.exec(text);
@@ -67795,7 +67863,7 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       const targetRef = xMatch[1];
       const promptText = xMatch[2].trim();
       if (!promptText) {
-        console.log(`${DIM2}usage: ${targetRef} <prompt>${RESET2}`);
+        say(`${DIM2}usage: ${targetRef} <prompt>${RESET2}`);
         return;
       }
       (async () => {
@@ -67819,16 +67887,16 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
             if (mine.length > 0) candidates = mine;
           }
           if (candidates.length === 0) {
-            console.error(`${RED}error: no session ${targetRef} (try \`claw session list\` in another terminal)${RESET2}`);
+            sayErr(`${RED}error: no session ${targetRef} (try \`claw session list\` in another terminal)${RESET2}`);
             return;
           }
           const liveMatches = candidates.filter((c) => c.connected);
           if (liveMatches.length > 1) {
             const usedQualified = targetRef.includes("/");
             const advice = usedQualified ? `'${targetRef}' is ambiguous even within owner \u2014 re-issue using a session UUID:` : `'${targetRef}' is ambiguous \u2014 use the qualified form @owner/slug, or a UUID if the qualified form still collides:`;
-            console.error(`${RED}error: ${advice}${RESET2}`);
+            sayErr(`${RED}error: ${advice}${RESET2}`);
             for (const c of liveMatches) {
-              console.error(`  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${DIM2}${c.cwd ?? ""}${RESET2}`);
+              sayErr(`  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${DIM2}${c.cwd ?? ""}${RESET2}`);
             }
             return;
           }
@@ -67837,23 +67905,19 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
             type: "prompt",
             sessionId: match.id,
             text: promptText,
-            // Source-session tag so the hub can persist the eventual
-            // reply against THIS session's events history and surface
-            // it to source Claude via channel notification (the same
-            // shape route_to_peer's reply path uses).
             sourceSessionId: sessionId
           };
           ws.send(JSON.stringify(out2));
-          console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt \u2192 ${targetRef}${RESET2}  ${promptText}`);
+          say(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt \u2192 ${targetRef}${RESET2}  ${promptText}`);
         } catch (e) {
-          console.error(`${RED}error: ${e?.message ?? String(e)}${RESET2}`);
+          sayErr(`${RED}error: ${e?.message ?? String(e)}${RESET2}`);
         }
       })();
       return;
     }
     const out = { type: "prompt", sessionId, text };
     ws.send(JSON.stringify(out));
-    console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt${RESET2}  ${text}`);
+    say(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt${RESET2}  ${text}`);
   });
   process.on("SIGINT", () => {
     ws.close(1e3, "sigint");
@@ -67868,26 +67932,26 @@ function printInbound(msg, myLogin) {
       break;
     }
     case "op_message": {
-      console.log(`${DIM2}[${shortTs(msg.ts)}]${RESET2} ${GREEN}@${msg.authorLogin}${RESET2}  ${msg.text}`);
+      say(`${DIM2}[${shortTs(msg.ts)}]${RESET2} ${GREEN}@${msg.authorLogin}${RESET2}  ${msg.text}`);
       break;
     }
     case "permission_request": {
-      console.log(`${RED}[!] ${shortTs(msg.ts)}${RESET2}  approval needed: ${BOLD2}${msg.tool}${RESET2} \u2014 ${msg.inputPreview}`);
+      say(`${RED}[!] ${shortTs(msg.ts)}${RESET2}  approval needed: ${BOLD2}${msg.tool}${RESET2} \u2014 ${msg.inputPreview}`);
       break;
     }
     case "permission_resolved": {
       const dec = msg.decision === "allow" ? `${GREEN}allowed${RESET2}` : msg.decision === "deny" ? `${RED}denied${RESET2}` : `${DIM2}expired${RESET2}`;
-      console.log(`${DIM2}[${ts()}]${RESET2} permission ${msg.requestId} ${dec} by @${msg.resolverLogin ?? "?"}`);
+      say(`${DIM2}[${ts()}]${RESET2} permission ${msg.requestId} ${dec} by @${msg.resolverLogin ?? "?"}`);
       break;
     }
     case "presence": {
-      console.log(`${DIM2}[${ts()}] presence: ${msg.attached.map((l) => "@" + l).join(", ") || "(empty)"}${RESET2}`);
+      say(`${DIM2}[${ts()}] presence: ${msg.attached.map((l) => "@" + l).join(", ") || "(empty)"}${RESET2}`);
       break;
     }
     case "ack":
       break;
     case "error":
-      console.error(`${RED}error (${msg.code}): ${msg.message}${RESET2}`);
+      sayErr(`${RED}error (${msg.code}): ${msg.message}${RESET2}`);
       break;
   }
 }
@@ -67913,7 +67977,7 @@ function maybeDebugDump(p) {
   const TRUNC = 2e3;
   if (json.length > TRUNC) json = json.slice(0, TRUNC) + "\n... [truncated, payload was " + json.length + " bytes]";
   for (const line of json.split("\n")) {
-    console.log(`  ${DIM2}${line}${RESET2}`);
+    say(`  ${DIM2}${line}${RESET2}`);
   }
 }
 function renderEvent(ev, myLogin) {
@@ -67930,12 +67994,15 @@ function renderEvent(ev, myLogin) {
   }
 }
 function renderEventBody(ev, ts2, p, myLogin) {
+  if (ev.kind === "chat" && ev.type === "prompt") startWorking();
+  else if (ev.kind === "tail" && ev.type === "PreToolUse") startWorking();
+  else if (ev.kind === "tail" && ev.type === "Stop") stopWorking();
   if (ev.kind === "chat") {
     if (ev.type === "prompt") {
       const text = String(p.text ?? p.prompt ?? "").trim() || JSON.stringify(p).slice(0, 200);
       const source = String(p.source ?? "cli");
       const label = source === "operator" ? `${BOLD2}@${String(p.authorLogin ?? "remote")} \u203A${RESET2}` : `${BOLD2}(cli) \u203A${RESET2}`;
-      console.log(`${DIM2}[${ts2}]${RESET2} ${label} ${text}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${label} ${text}`);
       return;
     }
     if (ev.type === "assistant_text") {
@@ -67944,7 +68011,7 @@ function renderEventBody(ev, ts2, p, myLogin) {
       const tag2 = isPlaceholder ? `${DIM2}claude \xB7 thinking${RESET2}` : `${AMBER}claude${RESET2}`;
       const prefix = `${DIM2}[${ts2}]${RESET2} ${tag2}`;
       if (isPlaceholder) {
-        console.log(`${prefix}  ${DIM2}${text}${RESET2}`);
+        say(`${prefix}  ${DIM2}${text}${RESET2}`);
         return;
       }
       emitChatLine(prefix, renderMarkdown(text));
@@ -67956,37 +68023,37 @@ function renderEventBody(ev, ts2, p, myLogin) {
       emitChatLine(`${DIM2}[${ts2}]${RESET2} ${tag2}`, renderMarkdown(text));
       return;
     }
-    console.log(`${DIM2}[${ts2}]${RESET2} ${AMBER}[chat:${ev.type}]${RESET2} ${previewPayload(p)}`);
+    say(`${DIM2}[${ts2}]${RESET2} ${AMBER}[chat:${ev.type}]${RESET2} ${previewPayload(p)}`);
     return;
   }
   switch (ev.type) {
     case "PreToolUse": {
       const tool = String(p.tool_name ?? p.toolName ?? p.tool ?? "?");
       const input = renderToolInput(p);
-      console.log(`${DIM2}[${ts2}]${RESET2} ${BLUE}\u2192 ${tool}${RESET2} ${DIM2}${input}${RESET2}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${BLUE}\u2192 ${tool}${RESET2} ${DIM2}${input}${RESET2}`);
       return;
     }
     case "PostToolUse": {
       const tool = String(p.tool_name ?? p.toolName ?? p.tool ?? "?");
       const out = stringifyToolResponse(p.tool_response ?? p.toolResponse ?? p.outputPreview ?? p.output);
       const ok = p.ok === false ? `${RED}\u2717${RESET2}` : `${BLUE}\u2713${RESET2}`;
-      console.log(`${DIM2}[${ts2}]${RESET2} ${ok} ${tool}${out ? "  " + DIM2 + truncate(out, 200) + RESET2 : ""}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${ok} ${tool}${out ? "  " + DIM2 + truncate(out, 200) + RESET2 : ""}`);
       return;
     }
     case "PostToolUseFailure": {
       const tool = String(p.tool_name ?? p.toolName ?? p.tool ?? "?");
       const err = stringifyToolResponse(p.error ?? p.message ?? p.tool_response);
-      console.log(`${DIM2}[${ts2}]${RESET2} ${RED}\u2717 ${tool}${RESET2}  ${RED}${truncate(err, 200)}${RESET2}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${RED}\u2717 ${tool}${RESET2}  ${RED}${truncate(err, 200)}${RESET2}`);
       return;
     }
     case "Stop":
-      console.log(`${DIM2}[${ts2}]  \u2014 turn end \u2014${RESET2}`);
+      say(`${DIM2}[${ts2}]  \u2014 turn end \u2014${RESET2}`);
       return;
     case "SessionStart":
-      console.log(`${DIM2}[${ts2}]  \u25B8 session start${RESET2}`);
+      say(`${DIM2}[${ts2}]  \u25B8 session start${RESET2}`);
       return;
     case "SessionEnd":
-      console.log(`${DIM2}[${ts2}]  \u25C2 session end${RESET2}`);
+      say(`${DIM2}[${ts2}]  \u25C2 session end${RESET2}`);
       return;
     case "TaskCreated":
     case "SubagentStart":
@@ -67994,16 +68061,16 @@ function renderEventBody(ev, ts2, p, myLogin) {
     case "TaskCompleted": {
       const which = ev.type;
       const desc = String(p.description ?? p.agentType ?? "");
-      console.log(`${DIM2}[${ts2}] ${BLUE}\u21AA ${which}${RESET2}${desc ? " " + desc : ""}`);
+      say(`${DIM2}[${ts2}] ${BLUE}\u21AA ${which}${RESET2}${desc ? " " + desc : ""}`);
       return;
     }
     case "Notification": {
       const msg = String(p.message ?? p.text ?? "").trim();
-      console.log(`${DIM2}[${ts2}]${RESET2} ${BOLD2}\u{1F514}${RESET2} ${msg || JSON.stringify(p).slice(0, 200)}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${BOLD2}\u{1F514}${RESET2} ${msg || JSON.stringify(p).slice(0, 200)}`);
       return;
     }
     default:
-      console.log(`${DIM2}[${ts2}]${RESET2} ${BLUE}[${ev.type}]${RESET2} ${previewPayload(p)}`);
+      say(`${DIM2}[${ts2}]${RESET2} ${BLUE}[${ev.type}]${RESET2} ${previewPayload(p)}`);
   }
 }
 function stringifyToolResponse(v) {
@@ -68517,7 +68584,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.28");
+program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.30");
 program2.addCommand(loginCmd);
 program2.addCommand(logoutCmd);
 program2.addCommand(whoamiCmd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawborrator-cli",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "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",
@@ -50,6 +50,7 @@
     "esbuild": "^0.24.2",
     "marked": "^14.1.3",
     "marked-terminal": "^7.2.1",
+    "ora": "^8.1.1",
     "tsx": "^4.19.1",
     "typescript": "^5.6.2",
     "ws": "^8.18.0"