claudemesh-cli 1.0.0-alpha.13 → 1.0.0-alpha.15

package/dist/entrypoints/cli.js

@@ -4331,30 +4331,84 @@ var exports_list = {};
 __export(exports_list, {
   runList: () => runList
 });
-function runList() {
+async function runList() {
   const config = readConfig();
-  if (config.meshes.length === 0) {
-    console.log("No meshes joined yet.");
-    console.log("");
-    console.log("Join one with: claudemesh join https://claudemesh.com/join/<token>");
-    console.log(`Config file:   ${getConfigPath()}`);
+  const auth = getStoredToken();
+  let serverMeshes = [];
+  if (auth) {
+    try {
+      let userId = "";
+      try {
+        const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
+        userId = payload.sub ?? "";
+      } catch {}
+      if (userId) {
+        const res = await request({
+          path: `/cli/meshes?user_id=${userId}`,
+          baseUrl: BROKER_HTTP2
+        });
+        serverMeshes = res.meshes ?? [];
+      }
+    } catch {}
+  }
+  const localSlugs = new Set(config.meshes.map((m) => m.slug));
+  const serverSlugs = new Set(serverMeshes.map((m) => m.slug));
+  const allSlugs = new Set([...localSlugs, ...serverSlugs]);
+  if (allSlugs.size === 0) {
+    console.log(`
+  No meshes yet.
+`);
+    console.log("  Create one:  claudemesh mesh create <name>");
+    console.log(`  Join one:    claudemesh mesh add <invite-url>
+`);
     return;
   }
-  console.log(`Joined meshes (${config.meshes.length}):`);
+  console.log(`
+  Your meshes:
+`);
+  for (const slug of allSlugs) {
+    const local = config.meshes.find((m) => m.slug === slug);
+    const server = serverMeshes.find((m) => m.slug === slug);
+    const name = server?.name ?? local?.name ?? slug;
+    const role = server?.role ?? "member";
+    const isOwner = server?.is_owner ?? false;
+    const roleLabel = isOwner ? "owner" : role;
+    const memberCount = server?.member_count;
+    const activePeers = server?.active_peers ?? 0;
+    const inLocal = localSlugs.has(slug);
+    const inServer = serverSlugs.has(slug);
+    let status;
+    let icon;
+    if (inLocal && inServer) {
+      icon = green("●");
+      status = activePeers > 0 ? green(`${activePeers} online`) : dim("synced");
+    } else if (inLocal && !inServer) {
+      icon = yellow("●");
+      status = yellow("local only");
+    } else {
+      icon = dim("○");
+      status = dim("not added locally");
+    }
+    const memberInfo = memberCount ? dim(`${memberCount} member${memberCount !== 1 ? "s" : ""}`) : "";
+    const parts = [roleLabel, memberInfo, status].filter(Boolean);
+    console.log(`    ${icon} ${bold(name)}  ${dim(slug)}`);
+    console.log(`      ${parts.join("  ·  ")}`);
+  }
   console.log("");
-  for (const m of config.meshes) {
-    console.log(`  ${m.name} (${m.slug})`);
-    console.log(`    mesh id:   ${m.meshId}`);
-    console.log(`    member id: ${m.memberId}`);
-    console.log(`    pubkey:    ${m.pubkey.slice(0, 16)}…`);
-    console.log(`    broker:    ${m.brokerUrl}`);
-    console.log(`    joined:    ${m.joinedAt}`);
-    console.log("");
+  if (serverMeshes.some((m) => !localSlugs.has(m.slug))) {
+    console.log(dim("    ○ = server only — run `claudemesh mesh add` to use locally"));
   }
-  console.log(`Config: ${getConfigPath()}`);
+  console.log(dim(`    Config: ${getConfigPath()}`));
+  console.log("");
 }
+var BROKER_HTTP2;
 var init_list2 = __esm(() => {
   init_facade();
+  init_facade6();
+  init_facade3();
+  init_urls();
+  init_styles();
+  BROKER_HTTP2 = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
 });
 
 // src/commands/delete-mesh.ts
@@ -4368,19 +4422,38 @@ function prompt(question) {
   return new Promise((resolve) => {
     rl.question(question, (a) => {
       rl.close();
-      resolve(a.trim().toLowerCase());
+      resolve(a.trim());
     });
   });
 }
+function getUserId(token) {
+  try {
+    const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64url").toString());
+    return payload.sub ?? "";
+  } catch {
+    return "";
+  }
+}
+async function isOwner(slug, userId) {
+  try {
+    const res = await request({
+      path: `/cli/meshes?user_id=${userId}`,
+      baseUrl: BROKER_HTTP3
+    });
+    return res.meshes?.find((m) => m.slug === slug)?.is_owner ?? false;
+  } catch {
+    return false;
+  }
+}
 async function deleteMesh(slug, opts = {}) {
+  const config = readConfig();
   if (!slug) {
-    const config = readConfig();
     if (config.meshes.length === 0) {
-      console.error("  No meshes to delete.");
+      console.error("  No meshes to remove.");
       return EXIT.NOT_FOUND;
     }
     console.log(`
-  Select mesh to delete:
+  Select mesh to remove:
 `);
     config.meshes.forEach((m, i) => {
       console.log(`    ${bold(String(i + 1) + ")")} ${m.slug} ${dim("(" + m.name + ")")}`);
@@ -4394,48 +4467,72 @@ async function deleteMesh(slug, opts = {}) {
     }
     slug = config.meshes[idx].slug;
   }
+  const auth = getStoredToken();
+  const userId = auth ? getUserId(auth.session_token) : "";
+  const ownerCheck = userId ? await isOwner(slug, userId) : false;
   if (!opts.yes) {
     console.log(`
-  ${red("Warning:")} This will permanently delete ${bold(slug)}.`);
-    const answer = await prompt(`  Type "${slug}" to confirm: `);
-    if (answer !== slug.toLowerCase()) {
-      console.log("  Cancelled.");
-      return EXIT.USER_CANCELLED;
-    }
-  }
-  const auth = getStoredToken();
-  if (auth) {
-    try {
-      let userId = "";
-      try {
-        const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
-        userId = payload.sub ?? "";
-      } catch {}
-      if (userId) {
-        await request({
-          path: `/cli/mesh/${slug}`,
-          method: "DELETE",
-          body: { user_id: userId },
-          baseUrl: BROKER_HTTP2
-        });
-        console.log(`  ${green(icons.check)} Deleted "${slug}" from server.`);
-      }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("403")) {
-        console.log(`  ${dim("Not the owner — removing from local config only.")}`);
-      } else if (msg.includes("404")) {
-        console.log(`  ${dim("Mesh not found on server — removing locally.")}`);
-      } else {
-        console.log(`  ${dim("Could not delete from server: " + msg)}`);
+  ${bold(slug)}
+`);
+    if (ownerCheck) {
+      console.log(`    ${bold("1)")} Remove from this device only ${dim("(keep on server)")}`);
+      console.log(`    ${bold("2)")} ${red("Delete everywhere")} ${dim("(removes for all members)")}`);
+      console.log(`    ${bold("3)")} Cancel`);
+      console.log("");
+      const choice = await prompt("  Choice [1]: ") || "1";
+      if (choice === "3") {
+        console.log("  Cancelled.");
+        return EXIT.USER_CANCELLED;
+      }
+      if (choice === "2") {
+        console.log(`
+  ${red("Warning:")} This will delete ${bold(slug)} for all members.`);
+        const confirm = await prompt(`  Type "${slug}" to confirm: `);
+        if (confirm.toLowerCase() !== slug.toLowerCase()) {
+          console.log("  Cancelled.");
+          return EXIT.USER_CANCELLED;
+        }
+        try {
+          await request({
+            path: `/cli/mesh/${slug}`,
+            method: "DELETE",
+            body: { user_id: userId },
+            baseUrl: BROKER_HTTP3
+          });
+          console.log(`  ${green(icons.check)} Deleted "${slug}" from server.`);
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          console.error(`  ${icons.cross} Server delete failed: ${msg}`);
+        }
+        leaveMesh(slug);
+        console.log(`  ${green(icons.check)} Removed from local config.`);
+        return EXIT.SUCCESS;
+      }
+    } else {
+      console.log(`    ${bold("1)")} Remove from this device ${dim("(you can re-add later)")}`);
+      console.log(`    ${bold("2)")} Cancel`);
+      if (!ownerCheck && userId) {
+        console.log(dim(`
+    ${yellow(icons.warn)} Only the mesh owner can delete it from the server.`));
+      }
+      console.log("");
+      const choice = await prompt("  Choice [1]: ") || "1";
+      if (choice === "2") {
+        console.log("  Cancelled.");
+        return EXIT.USER_CANCELLED;
       }
     }
   }
-  leaveMesh(slug);
-  console.log(`  ${green(icons.check)} Removed "${slug}" from local config.`);
+  const removed = leaveMesh(slug);
+  if (removed) {
+    console.log(`  ${green(icons.check)} Removed "${slug}" from this device.`);
+    console.log(dim(`    Re-add anytime with: claudemesh mesh add <invite-url>`));
+  } else {
+    console.error(`  Mesh "${slug}" not found in local config.`);
+  }
   return EXIT.SUCCESS;
 }
-var BROKER_HTTP2;
+var BROKER_HTTP3;
 var init_delete_mesh = __esm(() => {
   init_facade();
   init_facade9();
@@ -4444,7 +4541,7 @@ var init_delete_mesh = __esm(() => {
   init_urls();
   init_styles();
   init_exit_codes();
-  BROKER_HTTP2 = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
+  BROKER_HTTP3 = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
 });
 
 // src/commands/rename.ts
@@ -8540,7 +8637,7 @@ async function runStatus() {
   const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
   const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
   const green3 = (s) => useColor ? `\x1B[32m${s}\x1B[39m` : s;
-  const red2 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
+  const red3 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
   console.log(`claudemesh status  (v${VERSION})`);
   console.log("─".repeat(60));
   const configPath = getConfigPath();
@@ -8573,7 +8670,7 @@ async function runStatus() {
     if (probe.ok) {
       console.log(green3("reachable"));
     } else {
-      console.log(red2(`unreachable (${probe.error})`));
+      console.log(red3(`unreachable (${probe.error})`));
     }
   }
   console.log("");
@@ -8587,7 +8684,7 @@ async function runStatus() {
     process.exit(0);
   } else {
     const broken = results.filter((r) => !r.reachable).length;
-    console.log(red2(`${broken} of ${results.length} mesh(es) unreachable.`));
+    console.log(red3(`${broken} of ${results.length} mesh(es) unreachable.`));
     process.exit(1);
   }
 }
@@ -8751,7 +8848,7 @@ async function runDoctor() {
   const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
   const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
   const green3 = (s) => useColor ? `\x1B[32m${s}\x1B[39m` : s;
-  const red2 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
+  const red3 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
   console.log(`claudemesh doctor  (v${VERSION})`);
   console.log("─".repeat(60));
   const checks = [
@@ -8763,7 +8860,7 @@ async function runDoctor() {
     checkKeypairs()
   ];
   for (const c of checks) {
-    const mark = c.pass ? green3("✓") : red2("✗");
+    const mark = c.pass ? green3("✓") : red3("✗");
     const detail = c.detail ? dim2(` (${c.detail})`) : "";
     console.log(`${mark} ${c.name}${detail}`);
     if (!c.pass && c.fix) {
@@ -8776,7 +8873,7 @@ async function runDoctor() {
     console.log(green3("All checks passed."));
     process.exit(0);
   } else {
-    console.log(red2(`${failing.length} check(s) failed.`));
+    console.log(red3(`${failing.length} check(s) failed.`));
     process.exit(1);
   }
 }
@@ -9616,7 +9713,7 @@ async function handleMeshSubcommand() {
     case "list":
     case "ls": {
       const { runList: runList2 } = await Promise.resolve().then(() => (init_list2(), exports_list));
-      runList2();
+      await runList2();
       break;
     }
     case "delete":
@@ -9822,4 +9919,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=D73642E29B6C764B64756E2164756E21
+//# debugId=CB53B1FA4B95E06264756E2164756E21