clawborrator-cli 0.0.24 → 0.0.26

package/dist-bundled/claw.cjs

@@ -6920,7 +6920,7 @@ var GREEN = "\x1B[32m";
 function ts() {
   return (/* @__PURE__ */ new Date()).toLocaleTimeString();
 }
-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)").action(async (ref) => {
+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)").action(async (ref, opts) => {
   const cfg = loadConfig();
   if (!cfg.pat) {
     console.error("error: not logged in. run `claw login`.");
@@ -6963,7 +6963,9 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       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:`);
+        const usedQualified = ref.includes("/");
+        const advice = usedQualified ? `'${ref}' is ambiguous even within owner \u2014 multiple sessions share the same routing name. Re-run with a session UUID:` : `'${ref}' is ambiguous \u2014 re-run with the qualified @owner/slug form, or with a UUID if even that collides:`;
+        console.error(`error: ${advice}`);
         for (const c of e.candidates) {
           console.error(`  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${c.cwd ?? ""}`);
         }
@@ -6973,6 +6975,27 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
       process.exit(2);
     }
   }
+  const limitArg = String(opts.limit ?? "50").toLowerCase();
+  const historyLimit = limitArg === "all" ? 5e3 : limitArg === "0" ? 0 : Math.max(0, parseInt(limitArg, 10) || 0);
+  if (historyLimit > 0) {
+    const kindsParam = opts.opMessages === false ? "&kinds=event" : "";
+    try {
+      const tl = await api.get(`/api/v1/sessions/${encodeURIComponent(sessionId)}/timeline?limit=${historyLimit}${kindsParam}`);
+      if (tl.items.length > 0) {
+        console.log(`${DIM2}\u2500\u2500\u2500 history (${tl.items.length} item${tl.items.length === 1 ? "" : "s"}) \u2500\u2500\u2500${RESET2}`);
+        for (const item of tl.items) {
+          if (item.kind === "event") {
+            renderEvent(item.event, myLogin);
+          } else {
+            console.log(`${DIM2}[${shortTs(item.ts)}]${RESET2} ${GREEN}@${item.authorLogin}${RESET2}  ${item.text}`);
+          }
+        }
+        console.log(`${DIM2}\u2500\u2500\u2500 live \u2500\u2500\u2500${RESET2}`);
+      }
+    } catch (e) {
+      console.error(`${DIM2}(history fetch failed: ${e?.message ?? String(e)} \u2014 continuing live)${RESET2}`);
+    }
+  }
   const wsUrl = cfg.hubUrl.replace(/^http/i, "ws") + "/cli";
   const ws = new wrapper_default(wsUrl, {
     headers: { Authorization: `Bearer ${cfg.pat}` }
@@ -7098,9 +7121,11 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
           }
           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}`);
+            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}`);
             for (const c of liveMatches) {
-              console.error(`  ${DIM2}${c.id.slice(0, 8)}\u2026${RESET2}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${DIM2}${c.cwd ?? ""}${RESET2}`);
+              console.error(`  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${DIM2}${c.cwd ?? ""}${RESET2}`);
             }
             return;
           }
@@ -7336,9 +7361,10 @@ async function resolveSessionId(idOrName) {
     return picked.id;
   } catch (e) {
     if (e instanceof AmbiguousError) {
+      const usedQualified = idOrName.includes("/");
+      const advice = usedQualified ? `'${idOrName}' is ambiguous even within owner \u2014 multiple sessions share the same routing name (different cwds with matching basenames). Re-run with a UUID:` : `'${idOrName}' is ambiguous \u2014 re-run with the qualified @owner/slug form, or with a UUID if even that collides:`;
       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")
+        advice + "\n" + e.candidates.map((c) => `  ${c.id}  @${c.startedByLogin}/${(c.routingName ?? "").replace(/^@/, "")}  ${c.cwd ?? ""}`).join("\n")
       );
       err.code = "CLW_AMBIGUOUS";
       throw err;
@@ -7763,7 +7789,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.24");
+program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.26");
 program2.addCommand(loginCmd);
 program2.addCommand(logoutCmd);
 program2.addCommand(whoamiCmd);

package/package.json

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