clawborrator-cli 0.0.8 → 0.0.10

package/dist-bundled/claw.cjs

@@ -6874,12 +6874,26 @@ var sessionAttach = new Command("attach").description("open a TUI on a session \
     console.error("error: not logged in. run `claw login`.");
     process.exit(2);
   }
+  const UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   let sessionId = ref;
-  if (sessionId.startsWith("@")) {
+  if (!UUID_RE2.test(sessionId)) {
+    const needle = sessionId.startsWith("@") ? sessionId : "@" + sessionId;
+    const slash = needle.indexOf("/");
+    let ownerLogin = null;
+    let slug;
+    if (slash > 0) {
+      ownerLogin = needle.slice(1, slash);
+      slug = "@" + needle.slice(slash + 1).replace(/^@/, "");
+    } else {
+      slug = needle;
+    }
     const data = await api.get("/api/v1/sessions");
-    const match = data.items.find((s) => s.routingName === sessionId);
+    const match = data.items.find(
+      (s) => s.routingName === slug && (ownerLogin === null || s.startedByLogin === ownerLogin)
+    );
     if (!match) {
-      console.error(`error: no session with routing name ${sessionId} (run \`claw session list\` to see what's available)`);
+      const label = ownerLogin ? `@${ownerLogin}/${slug.slice(1)}` : slug;
+      console.error(`error: no session with routing name ${label} (run \`claw session list\` to see what's available)`);
       process.exit(2);
     }
     sessionId = match.id;
@@ -7111,158 +7125,6 @@ function truncate(s, max) {
   return s.slice(0, max - 1) + "\u2026";
 }
 
-// src/commands/session-init.ts
-var import_node_path2 = require("node:path");
-var import_node_fs2 = require("node:fs");
-var import_node_child_process = require("node:child_process");
-var HOOK_NAMES = [
-  "SessionStart",
-  "SessionEnd",
-  "UserPromptSubmit",
-  "PreToolUse",
-  "PostToolUse",
-  "PostToolUseFailure",
-  "TaskCreated",
-  "SubagentStart",
-  "SubagentStop",
-  "TaskCompleted",
-  "Stop",
-  "Notification"
-];
-var TAG = "clawborrator-hook";
-function hookCommand(name) {
-  return `node ".claude/hooks/clawborrator-tail.mjs" ${name} #${TAG}`;
-}
-function isOurHook(h) {
-  return h.type === "command" && h.command.includes(`#${TAG}`);
-}
-function fetchHookBundle() {
-  try {
-    const stdout = (0, import_node_child_process.execFileSync)("npx", ["-y", "clawborrator-mcp", "--print-hook-file"], {
-      stdio: ["ignore", "pipe", "inherit"],
-      encoding: "utf8",
-      // npx may take a while if the cache is cold (download + extract).
-      timeout: 12e4,
-      shell: true
-      // cross-platform PATH resolution on Windows
-    });
-    if (!stdout || !stdout.trim()) {
-      throw new Error("--print-hook-file returned empty output");
-    }
-    return stdout;
-  } catch (e) {
-    throw new Error(`failed to fetch hook bundle via npx: ${e?.message ?? String(e)}`);
-  }
-}
-var sessionInit = new Command("init").description("install clawborrator hooks into <cwd>/.claude/settings.json + .claude/hooks/").option("--cwd <dir>", "project directory (defaults to current cwd)").option("--remove", "remove the clawborrator hooks (and the bundled .mjs)").option("--refresh-hook", "re-fetch the bundled hook file even if it already exists").action(async (opts) => {
-  const root = (0, import_node_path2.resolve)(opts.cwd ?? process.cwd());
-  const claudeDir = (0, import_node_path2.resolve)(root, ".claude");
-  const hooksDir = (0, import_node_path2.resolve)(claudeDir, "hooks");
-  const hookFile = (0, import_node_path2.resolve)(hooksDir, "clawborrator-tail.mjs");
-  const settings = (0, import_node_path2.resolve)(claudeDir, "settings.json");
-  if (opts.remove) {
-    removeHooks(settings, hookFile);
-    return;
-  }
-  if (!(0, import_node_fs2.existsSync)(hooksDir)) (0, import_node_fs2.mkdirSync)(hooksDir, { recursive: true });
-  if (!(0, import_node_fs2.existsSync)(hookFile) || opts.refreshHook) {
-    console.log("fetching bundled hook from npm via `npx -y clawborrator-mcp --print-hook-file`...");
-    const bundle = fetchHookBundle();
-    (0, import_node_fs2.writeFileSync)(hookFile, bundle, "utf8");
-    try {
-      (0, import_node_fs2.chmodSync)(hookFile, 493);
-    } catch {
-    }
-    console.log(`\u2713 wrote ${hookFile}  (${bundle.length} bytes)`);
-  } else {
-    console.log(`(${hookFile} already present \u2014 pass --refresh-hook to overwrite)`);
-  }
-  if (!(0, import_node_fs2.existsSync)(claudeDir)) (0, import_node_fs2.mkdirSync)(claudeDir, { recursive: true });
-  let s = {};
-  if ((0, import_node_fs2.existsSync)(settings)) {
-    try {
-      const raw = (0, import_node_fs2.readFileSync)(settings, "utf8");
-      if (raw.trim()) s = JSON.parse(raw);
-    } catch (e) {
-      console.error(`error: could not parse existing ${settings}: ${e?.message ?? e}`);
-      console.error("       fix the JSON and re-run `claw session init`");
-      process.exit(2);
-    }
-  }
-  if (!s.hooks) s.hooks = {};
-  let added = 0, alreadyPresent = 0, refreshed = 0;
-  for (const name of HOOK_NAMES) {
-    const arr = s.hooks[name] ??= [];
-    let entry = arr.find((e) => (e.matcher ?? ".*") === ".*");
-    if (!entry) {
-      entry = { matcher: ".*", hooks: [] };
-      arr.push(entry);
-    }
-    const existingIdx = entry.hooks.findIndex(isOurHook);
-    const desiredCmd = hookCommand(name);
-    if (existingIdx >= 0) {
-      if (entry.hooks[existingIdx].command !== desiredCmd) {
-        entry.hooks[existingIdx] = { type: "command", command: desiredCmd };
-        refreshed++;
-      } else {
-        alreadyPresent++;
-      }
-      continue;
-    }
-    entry.hooks.push({ type: "command", command: desiredCmd });
-    added++;
-  }
-  (0, import_node_fs2.writeFileSync)(settings, JSON.stringify(s, null, 2) + "\n");
-  if (added > 0) console.log(`\u2713 installed ${added} clawborrator hook${added === 1 ? "" : "s"} \u2192 ${settings}`);
-  if (refreshed > 0) console.log(`\u2713 refreshed ${refreshed} command line${refreshed === 1 ? "" : "s"} (e.g. updated to call the local file)`);
-  if (alreadyPresent > 0) console.log(`  (${alreadyPresent} already up-to-date, untouched)`);
-  console.log("");
-  console.log("next: drop a .mcp.json with your channel token (`claw token mint --kind=channel");
-  console.log("      --name=<label> --mcp-snippet --out=.mcp.json`), then start CC with:");
-  console.log("        claude --dangerously-load-development-channels server:clawborrator");
-  console.log("      events will flow as you prompt; watch via `claw session attach <id>`.");
-});
-function removeHooks(settingsPath, hookFile) {
-  if ((0, import_node_fs2.existsSync)(hookFile)) {
-    try {
-      (0, import_node_fs2.unlinkSync)(hookFile);
-      console.log(`\u2713 removed ${hookFile}`);
-    } catch (e) {
-      console.warn(`warning: could not delete ${hookFile}: ${e?.message ?? e}`);
-    }
-  }
-  if (!(0, import_node_fs2.existsSync)(settingsPath)) {
-    console.log("(no settings.json to clean up)");
-    return;
-  }
-  let s;
-  try {
-    const raw = (0, import_node_fs2.readFileSync)(settingsPath, "utf8");
-    s = raw.trim() ? JSON.parse(raw) : {};
-  } catch (e) {
-    console.error(`error: could not parse ${settingsPath}: ${e?.message ?? e}`);
-    process.exit(2);
-  }
-  if (!s.hooks) {
-    console.log("(no hooks block in settings.json)");
-    return;
-  }
-  let touched = 0;
-  for (const name of HOOK_NAMES) {
-    const arr = s.hooks[name];
-    if (!arr) continue;
-    for (const entry of arr) {
-      const before = entry.hooks.length;
-      entry.hooks = entry.hooks.filter((h) => !isOurHook(h));
-      if (entry.hooks.length !== before) touched++;
-    }
-    s.hooks[name] = arr.filter((e) => e.hooks.length > 0);
-    if (s.hooks[name].length === 0) delete s.hooks[name];
-  }
-  (0, import_node_fs2.writeFileSync)(settingsPath, JSON.stringify(s, null, 2) + "\n");
-  console.log(`\u2713 removed ${touched} clawborrator hook entr${touched === 1 ? "y" : "ies"} from ${settingsPath}`);
-}
-
 // src/commands/session.ts
 function fmtDuration(ms) {
   if (!Number.isFinite(ms) || ms < 0) return "\u2014";
@@ -7277,12 +7139,27 @@ function fmtDuration(ms) {
 function fmtAgo(iso) {
   return fmtDuration(Date.now() - new Date(iso).getTime());
 }
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 async function resolveSessionId(idOrName) {
-  if (!idOrName.startsWith("@")) return idOrName;
+  if (UUID_RE.test(idOrName)) return idOrName;
+  const needle = idOrName.startsWith("@") ? idOrName : "@" + idOrName;
+  const slash = needle.indexOf("/");
+  let ownerLogin = null;
+  let slug;
+  if (slash > 0) {
+    ownerLogin = needle.slice(1, slash);
+    slug = "@" + needle.slice(slash + 1).replace(/^@/, "");
+  } else {
+    slug = needle;
+  }
   const data = await api.get("/api/v1/sessions");
-  const match = data.items.find((s) => s.routingName === idOrName);
+  const match = data.items.find(
+    (s) => s.routingName === slug && (ownerLogin === null || s.startedByLogin === ownerLogin)
+  );
   if (!match) {
-    const err = new Error(`no session with routing name ${idOrName} (run \`claw session list\` to see what's available)`);
+    const err = new Error(
+      ownerLogin ? `no session @${ownerLogin}/${slug.slice(1)} (run \`claw session list\`)` : `no session with routing name ${slug} (run \`claw session list\`)`
+    );
     err.code = "CLW_NO_ROUTING_MATCH";
     throw err;
   }
@@ -7301,18 +7178,20 @@ var sessionList = new Command("list").alias("ls").description("list sessions you
   }
   for (const s of data.items) {
     const dot = s.connected ? "\u25CF" : "\u25CB";
-    const route = s.routingName ?? "(no routing name)";
+    const slug = s.routingName ?? "";
+    const qualified = slug ? `@${s.startedByLogin}/${slug.replace(/^@/, "")}` : "(no routing name)";
     const where = s.cwd ? ` ${s.cwd}` : "";
     const role = s.role.padEnd(8);
     const seen = s.connected ? "online" : `offline \xB7 ${fmtAgo(s.lastSeenAt)}`;
     const arch = s.archivedAt ? " \xB7 ARCHIVED" : "";
-    console.log(`${dot} ${route.padEnd(20)} ${role} @${s.startedByLogin}${where}  [${seen}]${arch}`);
+    console.log(`${dot} ${qualified.padEnd(28)} ${role}${where}  [${seen}]${arch}`);
     console.log(`    id: ${s.id}`);
   }
   console.log("");
-  console.log("  use: claw session attach @<routing>   OR   claw session attach <id>");
-  console.log("       claw session events <ref>        \u2014 recent hook/chat events");
-  console.log("       claw session messages <ref>      \u2014 operator-to-operator chat");
+  console.log("  attach to a session:    claw session attach <ref>");
+  console.log("  recent hook/chat:       claw session events <ref>");
+  console.log("  operator-to-op chat:    claw session messages <ref>");
+  console.log("  <ref> = UUID, @owner/slug, @slug, or bare slug");
 });
 var sessionInfo = new Command("info").description("show metadata for a single session").argument("<ref>", "session UUID or @routingName").action(async (ref) => {
   const id = await resolveSessionId(ref);
@@ -7389,11 +7268,11 @@ var sessionMessages = new Command("messages").alias("msgs").description("dump op
     console.log(`(more \u2014 older: --before ${data.firstId} \xB7 newer: --after ${data.lastId})`);
   }
 });
-var sessionCmd = new Command("session").description("manage Claude Code sessions registered with this hub").addCommand(sessionList).addCommand(sessionInfo).addCommand(sessionAttach).addCommand(sessionInit).addCommand(sessionEvents).addCommand(sessionMessages);
+var sessionCmd = new Command("session").description("manage Claude Code sessions registered with this hub").addCommand(sessionList).addCommand(sessionInfo).addCommand(sessionAttach).addCommand(sessionEvents).addCommand(sessionMessages);
 
 // src/commands/token.ts
-var import_node_fs3 = require("node:fs");
-var import_node_path3 = require("node:path");
+var import_node_fs2 = require("node:fs");
+var import_node_path2 = require("node:path");
 
 // ../shared/dist/scopes.js
 var ALL_SCOPES = [
@@ -7450,8 +7329,8 @@ var tokenMint = new Command("mint").description("create a new token").requiredOp
         }
       }, null, 2) + "\n";
       if (opts.out) {
-        const target = (0, import_node_path3.resolve)(opts.out);
-        (0, import_node_fs3.writeFileSync)(target, json, "utf8");
+        const target = (0, import_node_path2.resolve)(opts.out);
+        (0, import_node_fs2.writeFileSync)(target, json, "utf8");
         prose("");
         prose(`\u2713 wrote ${target}`);
       } else {
@@ -7597,7 +7476,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.8");
+program2.name("claw").description("clawborrator CLI \u2014 control your Claude Code sessions from the terminal").version("0.0.10");
 program2.addCommand(loginCmd);
 program2.addCommand(logoutCmd);
 program2.addCommand(whoamiCmd);

package/package.json

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