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

package/dist/entrypoints/cli.js

@@ -4422,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 + ")")}`);
@@ -4448,45 +4467,69 @@ 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_HTTP3
-        });
-        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_HTTP3;
@@ -9876,4 +9919,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=E76259A581E1545264756E2164756E21
+//# debugId=CB53B1FA4B95E06264756E2164756E21