clawborrator-cli 0.0.23 → 0.0.24

package/dist-bundled/claw.cjs

@@ -6844,7 +6844,7 @@ var whoamiCmd = new Command("whoami").description("show the currently authentica
 });
 
 // src/commands/session-attach.ts
-var import_node_readline = require("node:readline");
+var import_node_readline2 = require("node:readline");
 
 // ../node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -6857,13 +6857,65 @@ var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
-// src/commands/session-attach.ts
+// src/util/disambiguate.ts
+var import_node_readline = require("node:readline");
 var RESET = "\x1B[0m";
 var DIM = "\x1B[2m";
+var BOLD = "\x1B[1m";
+var AmbiguousError = class extends Error {
+  constructor(candidates, input) {
+    super(`ambiguous reference '${input}' \u2014 multiple online sessions match`);
+    this.candidates = candidates;
+    this.input = input;
+  }
+  code = "CLW_AMBIGUOUS";
+};
+async function pickCandidate(input, candidates) {
+  if (candidates.length === 1) return candidates[0];
+  const live = candidates.filter((c) => c.connected);
+  if (live.length <= 1) {
+    return live[0] ?? candidates[0];
+  }
+  if (!process.stdin.isTTY || !process.stderr.isTTY) {
+    throw new AmbiguousError(live, input);
+  }
+  process.stderr.write(`${BOLD}'${input}' is ambiguous \u2014 pick a session:${RESET}
+`);
+  for (let i = 0; i < live.length; i++) {
+    const c = live[i];
+    const qualified = c.routingName ? `@${c.startedByLogin}/${c.routingName.replace(/^@/, "")}` : `(no routing name)`;
+    const cwd = c.cwd ? `  ${DIM}${c.cwd}${RESET}` : "";
+    const host = c.host ? `  ${DIM}${c.host}${RESET}` : "";
+    process.stderr.write(`  ${BOLD}${i + 1}${RESET}. ${qualified}${host}${cwd}
+`);
+    process.stderr.write(`     ${DIM}id ${c.id}${RESET}
+`);
+  }
+  process.stderr.write(`  ${BOLD}q${RESET}. cancel
+`);
+  const rl = (0, import_node_readline.createInterface)({ input: process.stdin, output: process.stderr });
+  const answer = await new Promise((resolve3) => {
+    rl.question(`pick [1-${live.length}]: `, resolve3);
+  });
+  rl.close();
+  const trimmed = answer.trim().toLowerCase();
+  if (trimmed === "q" || trimmed === "quit" || trimmed === "") {
+    throw new Error("cancelled");
+  }
+  const idx = parseInt(trimmed, 10);
+  if (!Number.isInteger(idx) || idx < 1 || idx > live.length) {
+    throw new Error(`invalid selection '${answer}'`);
+  }
+  return live[idx - 1];
+}
+
+// src/commands/session-attach.ts
+var RESET2 = "\x1B[0m";
+var DIM2 = "\x1B[2m";
 var AMBER = "\x1B[33m";
 var BLUE = "\x1B[36m";
 var RED = "\x1B[31m";
-var BOLD = "\x1B[1m";
+var BOLD2 = "\x1B[1m";
 var GREEN = "\x1B[32m";
 function ts() {
   return (/* @__PURE__ */ new Date()).toLocaleTimeString();
@@ -6906,7 +6958,20 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       console.error(`error: no session with routing name ${label} (run \`claw session list\` to see what's available)`);
       process.exit(2);
     }
-    sessionId = candidates[0].id;
+    try {
+      const picked = await pickCandidate(ref, candidates);
+      sessionId = picked.id;
+    } catch (e) {
+      if (e instanceof AmbiguousError) {
+        console.error(`error: '${ref}' is ambiguous \u2014 multiple online sessions match. Re-run with a UUID or qualified form (e.g. @owner/slug). Candidates:`);
+        for (const c of e.candidates) {
+          console.error(`  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${c.cwd ?? ""}`);
+        }
+        process.exit(2);
+      }
+      console.error(`error: ${e?.message ?? String(e)}`);
+      process.exit(2);
+    }
   }
   const wsUrl = cfg.hubUrl.replace(/^http/i, "ws") + "/cli";
   const ws = new wrapper_default(wsUrl, {
@@ -6915,7 +6980,7 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
   let mySubscription = false;
   const pendingPerms = [];
   ws.on("open", () => {
-    console.log(`${DIM}[${ts()}]${RESET} connected to ${cfg.hubUrl}`);
+    console.log(`${DIM2}[${ts()}]${RESET2} connected to ${cfg.hubUrl}`);
     const sub = { type: "subscribe", sessionId };
     ws.send(JSON.stringify(sub));
   });
@@ -6935,22 +7000,22 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     printInbound(msg, myLogin);
     if (msg.type === "subscribed") {
       mySubscription = true;
-      console.log(`${DIM}attached as ${BOLD}${msg.role}${RESET}${DIM}. type for prompt \xB7 @other <text> to route \xB7 /m <text> for op-msg \xB7 /y /n on permissions \xB7 /q to quit${RESET}`);
+      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}`);
     }
   });
   ws.on("close", (code, reason) => {
-    console.log(`${DIM}[${ts()}] disconnected (${code}${reason ? ": " + reason.toString() : ""})${RESET}`);
+    console.log(`${DIM2}[${ts()}] disconnected (${code}${reason ? ": " + reason.toString() : ""})${RESET2}`);
     process.exit(0);
   });
   ws.on("error", (err) => {
-    console.error(`${RED}ws error: ${err.message}${RESET}`);
+    console.error(`${RED}ws error: ${err.message}${RESET2}`);
   });
-  const rl = (0, import_node_readline.createInterface)({ input: process.stdin, terminal: false });
+  const rl = (0, import_node_readline2.createInterface)({ input: process.stdin, terminal: false });
   rl.on("line", (raw) => {
     const text = raw.trim();
     if (!text) return;
     if (!mySubscription) {
-      console.log(`${DIM}(not subscribed yet \u2014 waiting...)${RESET}`);
+      console.log(`${DIM2}(not subscribed yet \u2014 waiting...)${RESET2}`);
       return;
     }
     if (text === "/q" || text === "/quit") {
@@ -6960,7 +7025,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(`${DIM}(no pending permission to act on)${RESET}`);
+        console.log(`${DIM2}(no pending permission to act on)${RESET2}`);
         return;
       }
       const decision = text === "/y" || text === "/yes" ? "allow" : "deny";
@@ -6977,7 +7042,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(`${DIM}usage: /m <text> (sends as op-message; bare text is a prompt)${RESET}`);
+        console.log(`${DIM2}usage: /m <text> (sends as op-message; bare text is a prompt)${RESET2}`);
         return;
       }
       const out2 = { type: "op_message", sessionId, text: opText };
@@ -6987,16 +7052,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(`${DIM}usage: /p <text> (or just type \u2014 bare text is a prompt now)${RESET}`);
+        console.log(`${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(`${DIM}[${ts()}]${RESET} ${AMBER}\u2192 prompt sent${RESET}  ${promptText}`);
+      console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt sent${RESET2}  ${promptText}`);
       return;
     }
     if (text.startsWith("/")) {
-      console.log(`${DIM}unknown slash-command: ${text} (try /m /y /n /q)${RESET}`);
+      console.log(`${DIM2}unknown slash-command: ${text} (try /m /y /n /q)${RESET2}`);
       return;
     }
     const xMatch = /^(@[A-Za-z0-9._\-/]+)\s+([\s\S]+)$/.exec(text);
@@ -7004,7 +7069,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(`${DIM}usage: ${targetRef} <prompt>${RESET}`);
+        console.log(`${DIM2}usage: ${targetRef} <prompt>${RESET2}`);
         return;
       }
       (async () => {
@@ -7028,7 +7093,15 @@ 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)${RESET}`);
+            console.error(`${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) {
+            console.error(`${RED}error: '${targetRef}' is ambiguous \u2014 multiple online matches. Use the qualified form:${RESET2}`);
+            for (const c of liveMatches) {
+              console.error(`  ${DIM2}${c.id.slice(0, 8)}\u2026${RESET2}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${DIM2}${c.cwd ?? ""}${RESET2}`);
+            }
             return;
           }
           const match = candidates[0];
@@ -7043,16 +7116,16 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
             sourceSessionId: sessionId
           };
           ws.send(JSON.stringify(out2));
-          console.log(`${DIM}[${ts()}]${RESET} ${AMBER}\u2192 prompt \u2192 ${targetRef}${RESET}  ${promptText}`);
+          console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt \u2192 ${targetRef}${RESET2}  ${promptText}`);
         } catch (e) {
-          console.error(`${RED}error: ${e?.message ?? String(e)}${RESET}`);
+          console.error(`${RED}error: ${e?.message ?? String(e)}${RESET2}`);
         }
       })();
       return;
     }
     const out = { type: "prompt", sessionId, text };
     ws.send(JSON.stringify(out));
-    console.log(`${DIM}[${ts()}]${RESET} ${AMBER}\u2192 prompt${RESET}  ${text}`);
+    console.log(`${DIM2}[${ts()}]${RESET2} ${AMBER}\u2192 prompt${RESET2}  ${text}`);
   });
   process.on("SIGINT", () => {
     ws.close(1e3, "sigint");
@@ -7067,26 +7140,26 @@ function printInbound(msg, myLogin) {
       break;
     }
     case "op_message": {
-      console.log(`${DIM}[${shortTs(msg.ts)}]${RESET} ${GREEN}@${msg.authorLogin}${RESET}  ${msg.text}`);
+      console.log(`${DIM2}[${shortTs(msg.ts)}]${RESET2} ${GREEN}@${msg.authorLogin}${RESET2}  ${msg.text}`);
       break;
     }
     case "permission_request": {
-      console.log(`${RED}[!] ${shortTs(msg.ts)}${RESET}  approval needed: ${BOLD}${msg.tool}${RESET} \u2014 ${msg.inputPreview}`);
+      console.log(`${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${RESET}` : msg.decision === "deny" ? `${RED}denied${RESET}` : `${DIM}expired${RESET}`;
-      console.log(`${DIM}[${ts()}]${RESET} permission ${msg.requestId} ${dec} by @${msg.resolverLogin ?? "?"}`);
+      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 ?? "?"}`);
       break;
     }
     case "presence": {
-      console.log(`${DIM}[${ts()}] presence: ${msg.attached.map((l) => "@" + l).join(", ") || "(empty)"}${RESET}`);
+      console.log(`${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}${RESET}`);
+      console.error(`${RED}error (${msg.code}): ${msg.message}${RESET2}`);
       break;
   }
 }
@@ -7109,58 +7182,58 @@ function renderEvent(ev, myLogin) {
       const text = String(p.text ?? p.prompt ?? "").trim() || JSON.stringify(p).slice(0, 200);
       const source = String(p.source ?? "cli");
       if (source === "operator" && myLogin && p.authorLogin === myLogin) return;
-      const label = source === "operator" ? `${BOLD}@${String(p.authorLogin ?? "remote")} \u203A${RESET}` : `${BOLD}(cli) \u203A${RESET}`;
-      console.log(`${DIM}[${ts2}]${RESET} ${label} ${text}`);
+      const label = source === "operator" ? `${BOLD2}@${String(p.authorLogin ?? "remote")} \u203A${RESET2}` : `${BOLD2}(cli) \u203A${RESET2}`;
+      console.log(`${DIM2}[${ts2}]${RESET2} ${label} ${text}`);
       return;
     }
     if (ev.type === "assistant_text") {
       const text = String(p.text ?? "").trim();
       const isPlaceholder = !!p.placeholder;
-      const tag = isPlaceholder ? `${DIM}claude \xB7 thinking${RESET}` : `${AMBER}claude${RESET}`;
-      console.log(`${DIM}[${ts2}]${RESET} ${tag}  ${isPlaceholder ? DIM + text + RESET : text}`);
+      const tag = isPlaceholder ? `${DIM2}claude \xB7 thinking${RESET2}` : `${AMBER}claude${RESET2}`;
+      console.log(`${DIM2}[${ts2}]${RESET2} ${tag}  ${isPlaceholder ? DIM2 + text + RESET2 : text}`);
       return;
     }
     if (ev.type === "reply") {
       const text = String(p.text ?? "").trim();
       if (p.source === "peer-reply" && p.peerLogin) {
-        console.log(`${DIM}[${ts2}]${RESET} ${AMBER}${String(p.peerLogin)} answered${RESET}  ${text}`);
+        console.log(`${DIM2}[${ts2}]${RESET2} ${AMBER}${String(p.peerLogin)} answered${RESET2}  ${text}`);
         return;
       }
-      const tag = p.chatId ? `${AMBER}claude${RESET} ${DIM}(reply to ${String(p.chatId).slice(0, 8)})${RESET}` : `${AMBER}claude${RESET}`;
-      console.log(`${DIM}[${ts2}]${RESET} ${tag}  ${text}`);
+      const tag = p.chatId ? `${AMBER}claude${RESET2} ${DIM2}(reply to ${String(p.chatId).slice(0, 8)})${RESET2}` : `${AMBER}claude${RESET2}`;
+      console.log(`${DIM2}[${ts2}]${RESET2} ${tag}  ${text}`);
       return;
     }
-    console.log(`${DIM}[${ts2}]${RESET} ${AMBER}[chat:${ev.type}]${RESET} ${previewPayload(p)}`);
+    console.log(`${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(`${DIM}[${ts2}]${RESET} ${BLUE}\u2192 ${tool}${RESET} ${DIM}${input}${RESET}`);
+      console.log(`${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${RESET}` : `${BLUE}\u2713${RESET}`;
-      console.log(`${DIM}[${ts2}]${RESET} ${ok} ${tool}${out ? "  " + DIM + truncate(out, 200) + RESET : ""}`);
+      const ok = p.ok === false ? `${RED}\u2717${RESET2}` : `${BLUE}\u2713${RESET2}`;
+      console.log(`${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(`${DIM}[${ts2}]${RESET} ${RED}\u2717 ${tool}${RESET}  ${RED}${truncate(err, 200)}${RESET}`);
+      console.log(`${DIM2}[${ts2}]${RESET2} ${RED}\u2717 ${tool}${RESET2}  ${RED}${truncate(err, 200)}${RESET2}`);
       return;
     }
     case "Stop":
-      console.log(`${DIM}[${ts2}]  \u2014 turn end \u2014${RESET}`);
+      console.log(`${DIM2}[${ts2}]  \u2014 turn end \u2014${RESET2}`);
       return;
     case "SessionStart":
-      console.log(`${DIM}[${ts2}]  \u25B8 session start${RESET}`);
+      console.log(`${DIM2}[${ts2}]  \u25B8 session start${RESET2}`);
       return;
     case "SessionEnd":
-      console.log(`${DIM}[${ts2}]  \u25C2 session end${RESET}`);
+      console.log(`${DIM2}[${ts2}]  \u25C2 session end${RESET2}`);
       return;
     case "TaskCreated":
     case "SubagentStart":
@@ -7168,16 +7241,16 @@ function renderEvent(ev, myLogin) {
     case "TaskCompleted": {
       const which = ev.type;
       const desc = String(p.description ?? p.agentType ?? "");
-      console.log(`${DIM}[${ts2}] ${BLUE}\u21AA ${which}${RESET}${desc ? " " + desc : ""}`);
+      console.log(`${DIM2}[${ts2}] ${BLUE}\u21AA ${which}${RESET2}${desc ? " " + desc : ""}`);
       return;
     }
     case "Notification": {
       const msg = String(p.message ?? p.text ?? "").trim();
-      console.log(`${DIM}[${ts2}]${RESET} ${BOLD}\u{1F514}${RESET} ${msg || JSON.stringify(p).slice(0, 200)}`);
+      console.log(`${DIM2}[${ts2}]${RESET2} ${BOLD2}\u{1F514}${RESET2} ${msg || JSON.stringify(p).slice(0, 200)}`);
       return;
     }
     default:
-      console.log(`${DIM}[${ts2}]${RESET} ${BLUE}[${ev.type}]${RESET} ${previewPayload(p)}`);
+      console.log(`${DIM2}[${ts2}]${RESET2} ${BLUE}[${ev.type}]${RESET2} ${previewPayload(p)}`);
   }
 }
 function stringifyToolResponse(v) {
@@ -7258,7 +7331,20 @@ async function resolveSessionId(idOrName) {
     err.code = "CLW_NO_ROUTING_MATCH";
     throw err;
   }
-  return candidates[0].id;
+  try {
+    const picked = await pickCandidate(idOrName, candidates);
+    return picked.id;
+  } catch (e) {
+    if (e instanceof AmbiguousError) {
+      const err = new Error(
+        `ambiguous reference '${idOrName}' \u2014 multiple online sessions match. Re-run with a UUID or qualified form. Candidates:
+` + e.candidates.map((c) => `  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${c.cwd ?? ""}`).join("\n")
+      );
+      err.code = "CLW_AMBIGUOUS";
+      throw err;
+    }
+    throw e;
+  }
 }
 var sessionList = new Command("list").alias("ls").description("list sessions you can see").option("--connected", "only sessions whose channel WS is currently open").option("--all", "include archived sessions").action(async (opts) => {
   const qs = new URLSearchParams();
@@ -7677,7 +7763,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.23");
+program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.24");
 program2.addCommand(loginCmd);
 program2.addCommand(logoutCmd);
 program2.addCommand(whoamiCmd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawborrator-cli",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "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",