claudemesh-cli 1.0.0 → 1.0.2

package/dist/entrypoints/cli.js

@@ -88,7 +88,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.0.0", env;
+var URLS, VERSION = "1.0.2", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -1150,6 +1150,7 @@ class BrokerClient {
     return this._serviceCatalog;
   }
   closed = false;
+  terminalClose = null;
   reconnectAttempt = 0;
   helloTimer = null;
   reconnectTimer = null;
@@ -1277,12 +1278,22 @@ class BrokerClient {
         }
         this.handleServerMessage(msg);
       };
-      const onClose = () => {
+      const onClose = (code, reasonBuf) => {
         if (this.helloTimer)
           clearTimeout(this.helloTimer);
         this.helloTimer = null;
         if (this.ws === ws)
           this.ws = null;
+        const reason = reasonBuf?.toString("utf-8") ?? "";
+        if (code === 4001 || code === 4002) {
+          this.closed = true;
+          this.setConnStatus("closed");
+          this.terminalClose = { code, reason };
+          if (this._status !== "open") {
+            reject(new Error(`ws terminal close ${code}: ${reason || "session ended"}`));
+          }
+          return;
+        }
         if (this._status !== "open" && this._status !== "reconnecting") {
           reject(new Error("ws closed before hello_ack"));
         }
@@ -2965,6 +2976,9 @@ class BrokerClient {
     }
     if (msg.type === "error") {
       this.debug(`broker error: ${msg.code} ${msg.message}`);
+      if (msg.code === "revoked") {
+        this.terminalClose = { code: 4002, reason: String(msg.message ?? "revoked") };
+      }
       const id = msg.id ? String(msg.id) : null;
       let handledByPendingSend = false;
       if (id) {
@@ -3156,6 +3170,75 @@ var init_facade8 = __esm(() => {
   init_errors3();
 });
 
+// src/ui/render.ts
+var OUT, ERR, INDENT = "  ", render;
+var init_render = __esm(() => {
+  init_styles();
+  OUT = process.stdout;
+  ERR = process.stderr;
+  render = {
+    blank() {
+      OUT.write(`
+`);
+    },
+    ok(msg, detail) {
+      const d = detail ? ` ${dim("(" + detail + ")")}` : "";
+      OUT.write(`${INDENT}${green(icons.check)} ${msg}${d}
+`);
+    },
+    warn(msg, hint) {
+      OUT.write(`${INDENT}${yellow(icons.warn)} ${msg}
+`);
+      if (hint)
+        OUT.write(`${INDENT}  ${dim(hint)}
+`);
+    },
+    err(msg, hint) {
+      ERR.write(`${INDENT}${red(icons.cross)} ${msg}
+`);
+      if (hint)
+        ERR.write(`${INDENT}  ${dim(hint)}
+`);
+    },
+    info(msg) {
+      OUT.write(`${INDENT}${msg}
+`);
+    },
+    section(title) {
+      OUT.write(`
+${INDENT}${dim("—")} ${clay(title)}
+
+`);
+    },
+    heading(title) {
+      OUT.write(`${INDENT}${bold(title)}
+`);
+    },
+    kv(pairs, opts) {
+      const pad = opts?.padTo ?? Math.max(...pairs.map(([k]) => k.length)) + 2;
+      for (const [k, v] of pairs) {
+        OUT.write(`${INDENT}${dim(k.padEnd(pad, " "))}${v}
+`);
+      }
+    },
+    code(snippet) {
+      for (const line of snippet.split(`
+`)) {
+        OUT.write(`${INDENT}  ${cyan(line)}
+`);
+      }
+    },
+    link(url) {
+      OUT.write(`${INDENT}${clay(url)}
+`);
+    },
+    hint(msg) {
+      OUT.write(`${INDENT}${dim(icons.arrow + " " + msg)}
+`);
+    }
+  };
+});
+
 // src/ui/screen.ts
 import { createInterface as createInterface2 } from "node:readline";
 function termSize() {
@@ -3512,7 +3595,7 @@ async function runLaunch(flags, rawArgs) {
     claudeArgs: claudePassthrough
   };
   if (args.joinLink) {
-    console.log("Joining mesh...");
+    render.info(dim("Joining mesh…"));
     const invite = await parseInviteLink(args.joinLink);
     const keypair = await generateKeypair();
     const displayName2 = args.name ?? process.env.USER ?? process.env.USERNAME ?? hostname2();
@@ -3537,7 +3620,7 @@ async function runLaunch(flags, rawArgs) {
     });
     const { writeConfig: writeConfig2 } = await Promise.resolve().then(() => (init_facade(), exports_facade));
     writeConfig2(config2);
-    console.log(`✓ Joined "${invite.payload.mesh_slug}"${enroll.alreadyMember ? " (already member)" : ""}`);
+    render.ok(`joined ${bold(invite.payload.mesh_slug)}`, enroll.alreadyMember ? "already member" : undefined);
   }
   const config = readConfig();
   let justSynced = false;
@@ -3608,14 +3691,14 @@ async function runLaunch(flags, rawArgs) {
 `);
   }
   if (config.meshes.length === 0) {
-    console.error("No meshes joined. Run `claudemesh join <url>` or use --join <url>.");
+    render.err("No meshes joined.", "Run `claudemesh join <url>` or use --join <url>.");
     process.exit(1);
   }
   let mesh;
   if (args.meshSlug) {
     const found = config.meshes.find((m) => m.slug === args.meshSlug);
     if (!found) {
-      console.error(`Mesh "${args.meshSlug}" not found. Joined: ${config.meshes.map((m) => m.slug).join(", ")}`);
+      render.err(`Mesh "${args.meshSlug}" not found.`, `Joined: ${config.meshes.map((m) => m.slug).join(", ")}`);
       process.exit(1);
     }
     mesh = found;
@@ -3838,9 +3921,9 @@ async function runLaunch(flags, rawArgs) {
   if (result.error) {
     const err = result.error;
     if (err.code === "ENOENT") {
-      console.error("✗ `claude` not found on PATH. Install Claude Code first.");
+      render.err("`claude` not found on PATH.", "Install Claude Code first.");
     } else {
-      console.error(`✗ failed to launch claude: ${err.message}`);
+      render.err(`failed to launch claude: ${err.message}`);
     }
     process.exit(1);
   }
@@ -3855,6 +3938,7 @@ var init_launch = __esm(() => {
   init_facade6();
   init_facade5();
   init_facade8();
+  init_render();
   init_styles();
   init_screen();
   init_spinner();
@@ -3904,13 +3988,13 @@ function prompt(question) {
   });
 }
 async function loginWithToken() {
-  console.log(`
-  Paste a token from ${dim(URLS.API_BASE + "/token")}`);
-  console.log(`  ${dim("Generate one in your browser, then paste it here.")}
-`);
+  render.blank();
+  render.info(`Paste a token from ${dim(URLS.API_BASE + "/token")}`);
+  render.info(dim("Generate one in your browser, then paste it here."));
+  render.blank();
   const token = await prompt("  Token: ");
   if (!token) {
-    console.error(`  ${icons.cross} No token provided.`);
+    render.err("No token provided.");
     return EXIT.AUTH_FAILED;
   }
   let user = { id: "", display_name: "", email: "" };
@@ -3919,7 +4003,7 @@ async function loginWithToken() {
     if (parts[1]) {
       const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString());
       if (payload.exp && payload.exp < Date.now() / 1000) {
-        console.error(`  ${icons.cross} Token expired. Generate a new one.`);
+        render.err("Token expired.", "Generate a new one.");
         return EXIT.AUTH_FAILED;
       }
       user = {
@@ -3929,11 +4013,11 @@ async function loginWithToken() {
       };
     }
   } catch {
-    console.error(`  ${icons.cross} Invalid token format.`);
+    render.err("Invalid token format.");
     return EXIT.AUTH_FAILED;
   }
   storeToken({ session_token: token, user, token_source: "manual" });
-  console.log(`  ${green(icons.check)} Signed in as ${user.display_name || user.email || "user"}.`);
+  render.ok(`signed in as ${bold(user.display_name || user.email || "user")}`);
   return EXIT.SUCCESS;
 }
 async function syncMeshes(token) {
@@ -3941,7 +4025,7 @@ async function syncMeshes(token) {
     const meshes = await exports_my.getMeshes(token);
     if (meshes.length > 0) {
       const names = meshes.map((m) => m.slug).join(", ");
-      console.log(`  ${green(icons.check)} Synced ${meshes.length} mesh${meshes.length === 1 ? "" : "es"}: ${names}`);
+      render.ok(`synced ${meshes.length} mesh${meshes.length === 1 ? "" : "es"}`, names);
     }
   } catch {}
 }
@@ -3949,23 +4033,27 @@ async function login() {
   const existing = getStoredToken();
   if (existing) {
     const name = existing.user.display_name || existing.user.email || "unknown";
-    console.log(`
-  Already signed in as ${bold(name)}.`);
-    console.log("");
-    console.log(`    ${bold("1)")} Continue as ${name}`);
-    console.log(`    ${bold("2)")} Sign in via browser`);
-    console.log(`    ${bold("3)")} Paste a token from ${dim("claudemesh.com/token")}`);
-    console.log(`    ${bold("4)")} Sign out`);
-    console.log("");
+    render.blank();
+    render.info(`Already signed in as ${bold(name)}.`);
+    render.blank();
+    process.stdout.write(`    ${bold("1)")} Continue as ${name}
+`);
+    process.stdout.write(`    ${bold("2)")} Sign in via browser
+`);
+    process.stdout.write(`    ${bold("3)")} Paste a token from ${dim("claudemesh.com/token")}
+`);
+    process.stdout.write(`    ${bold("4)")} Sign out
+`);
+    render.blank();
     const choice = await prompt("  Choice [1]: ") || "1";
     if (choice === "1") {
-      console.log(`
-  ${green(icons.check)} Continuing as ${name}.`);
+      render.blank();
+      render.ok(`continuing as ${bold(name)}`);
       return EXIT.SUCCESS;
     }
     if (choice === "4") {
       clearToken();
-      console.log(`  ${green(icons.check)} Signed out.`);
+      render.ok("signed out");
       return EXIT.SUCCESS;
     }
     if (choice === "3") {
@@ -3973,14 +4061,16 @@ async function login() {
       return loginWithToken();
     }
     clearToken();
-    console.log(`  ${dim("Signing in…")}`);
+    render.info(dim("Signing in…"));
   } else {
-    console.log(`
-  ${bold("claudemesh")} — sign in to connect your terminal`);
-    console.log("");
-    console.log(`    ${bold("1)")} Sign in via browser ${dim("(opens automatically)")}`);
-    console.log(`    ${bold("2)")} Paste a token from ${dim("claudemesh.com/token")}`);
-    console.log("");
+    render.blank();
+    render.heading(`${bold("claudemesh")} — sign in to connect your terminal`);
+    render.blank();
+    process.stdout.write(`    ${bold("1)")} Sign in via browser ${dim("(opens automatically)")}
+`);
+    process.stdout.write(`    ${bold("2)")} Paste a token from ${dim("claudemesh.com/token")}
+`);
+    render.blank();
     const choice = await prompt("  Choice [1]: ") || "1";
     if (choice === "2") {
       return loginWithToken();
@@ -3988,91 +4078,23 @@ async function login() {
   }
   try {
     const result = await loginWithDeviceCode();
-    console.log(`  ${green(icons.check)} Signed in as ${result.user.display_name}.`);
+    render.ok(`signed in as ${bold(result.user.display_name)}`);
     await syncMeshes(result.session_token);
     return EXIT.SUCCESS;
   } catch (err) {
-    console.error(`  ${icons.cross} Login failed: ${err instanceof Error ? err.message : err}`);
+    render.err(`Login failed: ${err instanceof Error ? err.message : err}`);
     return EXIT.AUTH_FAILED;
   }
 }
 var init_login = __esm(() => {
   init_facade6();
   init_facade3();
+  init_render();
   init_styles();
   init_exit_codes();
   init_urls();
 });
 
-// src/ui/render.ts
-var OUT, ERR, INDENT = "  ", render;
-var init_render = __esm(() => {
-  init_styles();
-  OUT = process.stdout;
-  ERR = process.stderr;
-  render = {
-    blank() {
-      OUT.write(`
-`);
-    },
-    ok(msg, detail) {
-      const d = detail ? ` ${dim("(" + detail + ")")}` : "";
-      OUT.write(`${INDENT}${green(icons.check)} ${msg}${d}
-`);
-    },
-    warn(msg, hint) {
-      OUT.write(`${INDENT}${yellow(icons.warn)} ${msg}
-`);
-      if (hint)
-        OUT.write(`${INDENT}  ${dim(hint)}
-`);
-    },
-    err(msg, hint) {
-      ERR.write(`${INDENT}${red(icons.cross)} ${msg}
-`);
-      if (hint)
-        ERR.write(`${INDENT}  ${dim(hint)}
-`);
-    },
-    info(msg) {
-      OUT.write(`${INDENT}${msg}
-`);
-    },
-    section(title) {
-      OUT.write(`
-${INDENT}${dim("—")} ${clay(title)}
-
-`);
-    },
-    heading(title) {
-      OUT.write(`${INDENT}${bold(title)}
-`);
-    },
-    kv(pairs, opts) {
-      const pad = opts?.padTo ?? Math.max(...pairs.map(([k]) => k.length)) + 2;
-      for (const [k, v] of pairs) {
-        OUT.write(`${INDENT}${dim(k.padEnd(pad, " "))}${v}
-`);
-      }
-    },
-    code(snippet) {
-      for (const line of snippet.split(`
-`)) {
-        OUT.write(`${INDENT}  ${cyan(line)}
-`);
-      }
-    },
-    link(url) {
-      OUT.write(`${INDENT}${clay(url)}
-`);
-    },
-    hint(msg) {
-      OUT.write(`${INDENT}${dim(icons.arrow + " " + msg)}
-`);
-    }
-  };
-});
-
 // src/commands/welcome.ts
 var exports_welcome = {};
 __export(exports_welcome, {
@@ -4237,17 +4259,17 @@ __export(exports_new, {
 });
 async function newMesh(name, opts) {
   if (!name) {
-    console.error("  Usage: claudemesh mesh create <name>");
+    render.err("Usage: claudemesh create <name>");
     return EXIT.INVALID_ARGS;
   }
   if (!getStoredToken()) {
-    console.log(dim(`  Not signed in — starting login…
-`));
+    render.info(dim("not signed in — starting login…"));
+    render.blank();
     const { login: login2 } = await Promise.resolve().then(() => (init_login(), exports_login));
     const loginResult = await login2();
     if (loginResult !== EXIT.SUCCESS)
       return loginResult;
-    console.log("");
+    render.blank();
   }
   try {
     const result = await createMesh2(name, {
@@ -4256,22 +4278,24 @@ async function newMesh(name, opts) {
     });
     if (opts.json) {
       console.log(JSON.stringify({ schema_version: "1.0", ...result }, null, 2));
-    } else {
-      console.log(`
-  ${green(icons.check)} Created "${result.slug}" (id: ${result.id})`);
-      console.log(`  ${green(icons.check)} You're the owner`);
-      console.log(`  ${green(icons.check)} Joined locally`);
-      console.log(`
-  Share with: claudemesh mesh share
-`);
+      return EXIT.SUCCESS;
     }
+    render.section(`created ${bold(result.slug)}`);
+    render.kv([
+      ["id", dim(result.id)],
+      ["role", clay("owner")],
+      ["local", "joined"]
+    ]);
+    render.blank();
+    render.hint(`share with: ${bold("claudemesh share")}`);
+    render.blank();
     return EXIT.SUCCESS;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     if (msg.includes("409") || msg.includes("already exists")) {
-      console.error(`  ${icons.cross} A mesh with this name already exists. Try a different name.`);
+      render.err("A mesh with this name already exists.", "Try a different name.");
     } else {
-      console.error(`  ${icons.cross} Failed: ${msg}`);
+      render.err(`Failed: ${msg}`);
     }
     return EXIT.INTERNAL_ERROR;
   }
@@ -4279,6 +4303,7 @@ async function newMesh(name, opts) {
 var init_new = __esm(() => {
   init_facade10();
   init_facade6();
+  init_render();
   init_styles();
   init_exit_codes();
 });
@@ -4723,24 +4748,20 @@ async function runList() {
   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>
-`);
+    render.section("no meshes yet");
+    render.info(`${dim("create one:")}  ${bold("claudemesh create")} ${clay("<name>")}`);
+    render.info(`${dim("join one:")}    ${bold("claudemesh")} ${clay("<invite-url>")}`);
+    render.blank();
     return;
   }
-  console.log(`
-  Your meshes:
-`);
+  render.section(`your meshes (${allSlugs.size})`);
   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 roleLabel = isOwner ? clay("owner") : dim(role);
     const memberCount = server?.member_count;
     const activePeers = server?.active_peers ?? 0;
     const inLocal = localSlugs.has(slug);
@@ -4759,15 +4780,18 @@ async function runList() {
     }
     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("  ·  ")}`);
+    process.stdout.write(`    ${icon} ${bold(name)}  ${dim(slug)}
+`);
+    process.stdout.write(`      ${parts.join(dim("  ·  "))}
+`);
   }
-  console.log("");
+  process.stdout.write(`
+`);
   if (serverMeshes.some((m) => !localSlugs.has(m.slug))) {
-    console.log(dim("    ○ = server only — run `claudemesh mesh add` to use locally"));
+    render.hint(`${dim("○")}  = server only — run ${bold("claudemesh join")} to use locally`);
   }
-  console.log(dim(`    Config: ${getConfigPath()}`));
-  console.log("");
+  render.hint(`config: ${dim(getConfigPath())}`);
+  render.blank();
 }
 var BROKER_HTTP4;
 var init_list2 = __esm(() => {
@@ -4776,6 +4800,7 @@ var init_list2 = __esm(() => {
   init_facade3();
   init_urls();
   init_styles();
+  init_render();
   BROKER_HTTP4 = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
 });
 
@@ -4802,11 +4827,12 @@ function getUserId(token) {
     return "";
   }
 }
-async function isOwner(slug, userId) {
+async function isOwner(slug, auth) {
   try {
     const res = await request({
-      path: `/cli/meshes?user_id=${userId}`,
-      baseUrl: BROKER_HTTP5
+      path: `/cli/meshes`,
+      baseUrl: BROKER_HTTP5,
+      token: auth.session_token
     });
     return res.meshes?.find((m) => m.slug === slug)?.is_owner ?? false;
   } catch {
@@ -4817,86 +4843,88 @@ async function deleteMesh(slug, opts = {}) {
   const config = readConfig();
   if (!slug) {
     if (config.meshes.length === 0) {
-      console.error("  No meshes to remove.");
+      render.err("No meshes to remove.");
       return EXIT.NOT_FOUND;
     }
-    console.log(`
-  Select mesh to remove:
-`);
+    render.section("select mesh to remove");
     config.meshes.forEach((m, i) => {
-      console.log(`    ${bold(String(i + 1) + ")")} ${m.slug} ${dim("(" + m.name + ")")}`);
+      process.stdout.write(`    ${bold(String(i + 1) + ")")} ${clay(m.slug)} ${dim("(" + m.name + ")")}
+`);
     });
-    console.log("");
-    const choice = await prompt3("  Choice: ");
+    render.blank();
+    const choice = await prompt3(`  ${dim("choice:")} `);
     const idx = parseInt(choice, 10) - 1;
     if (idx < 0 || idx >= config.meshes.length) {
-      console.log("  Cancelled.");
+      render.info(dim("cancelled."));
       return EXIT.USER_CANCELLED;
     }
     slug = config.meshes[idx].slug;
   }
   const auth = getStoredToken();
   const userId = auth ? getUserId(auth.session_token) : "";
-  const ownerCheck = userId ? await isOwner(slug, userId) : false;
+  const ownerCheck = auth ? await isOwner(slug, auth) : false;
   if (!opts.yes) {
-    console.log(`
-  ${bold(slug)}
-`);
+    render.section(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 prompt3("  Choice [1]: ") || "1";
+      process.stdout.write(`    ${bold("1)")} remove from this device only ${dim("(keep on server)")}
+`);
+      process.stdout.write(`    ${bold("2)")} ${red("delete everywhere")} ${dim("(removes for all members)")}
+`);
+      process.stdout.write(`    ${bold("3)")} cancel
+`);
+      render.blank();
+      const choice = await prompt3(`  ${dim("choice [1]:")} `) || "1";
       if (choice === "3") {
-        console.log("  Cancelled.");
+        render.info(dim("cancelled."));
         return EXIT.USER_CANCELLED;
       }
       if (choice === "2") {
-        console.log(`
-  ${red("Warning:")} This will delete ${bold(slug)} for all members.`);
-        const confirm = await prompt3(`  Type "${slug}" to confirm: `);
+        render.blank();
+        render.warn(`this will delete ${bold(slug)} for all members.`);
+        const confirm = await prompt3(`  ${dim(`type "${slug}" to confirm:`)} `);
         if (confirm.toLowerCase() !== slug.toLowerCase()) {
-          console.log("  Cancelled.");
+          render.info(dim("cancelled."));
           return EXIT.USER_CANCELLED;
         }
         try {
           await request({
             path: `/cli/mesh/${slug}`,
             method: "DELETE",
-            body: { user_id: userId },
-            baseUrl: BROKER_HTTP5
+            baseUrl: BROKER_HTTP5,
+            token: auth?.session_token,
+            body: { user_id: userId }
           });
-          console.log(`  ${green(icons.check)} Deleted "${slug}" from server.`);
+          render.ok(`deleted ${bold(slug)} from server.`);
         } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
-          console.error(`  ${icons.cross} Server delete failed: ${msg}`);
+          render.err(`server delete failed: ${err instanceof Error ? err.message : String(err)}`);
         }
         leaveMesh(slug);
-        console.log(`  ${green(icons.check)} Removed from local config.`);
+        render.ok("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.`));
+      process.stdout.write(`    ${bold("1)")} remove from this device ${dim("(you can re-add later)")}
+`);
+      process.stdout.write(`    ${bold("2)")} cancel
+`);
+      if (userId) {
+        render.blank();
+        render.warn("only the mesh owner can delete it from the server.");
       }
-      console.log("");
-      const choice = await prompt3("  Choice [1]: ") || "1";
+      render.blank();
+      const choice = await prompt3(`  ${dim("choice [1]:")} `) || "1";
       if (choice === "2") {
-        console.log("  Cancelled.");
+        render.info(dim("cancelled."));
         return EXIT.USER_CANCELLED;
       }
     }
   }
   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>`));
+    render.ok(`removed ${bold(slug)} from this device.`);
+    render.hint(`re-add anytime with: ${bold("claudemesh")} ${clay("<invite-url>")}`);
   } else {
-    console.error(`  Mesh "${slug}" not found in local config.`);
+    render.err(`mesh "${slug}" not found in local config.`);
   }
   return EXIT.SUCCESS;
 }
@@ -4907,6 +4935,7 @@ var init_delete_mesh = __esm(() => {
   init_facade6();
   init_facade3();
   init_urls();
+  init_render();
   init_styles();
   init_exit_codes();
   BROKER_HTTP5 = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
@@ -6164,6 +6193,25 @@ async function withMesh(opts, fn) {
     await client.connect();
     const result = await fn(client, mesh);
     return result;
+  } catch (e) {
+    if (client.terminalClose) {
+      const { code, reason } = client.terminalClose;
+      if (code === 4002) {
+        console.error(`
+  ✘ ${reason}
+`);
+      } else if (code === 4001) {
+        console.error(`
+  ✘ Kicked from this mesh. Run \`claudemesh\` to rejoin.
+`);
+      } else {
+        console.error(`
+  ✘ Broker closed connection: ${reason}
+`);
+      }
+      process.exit(1);
+    }
+    throw e;
   } finally {
     client.close();
   }
@@ -6176,7 +6224,8 @@ var init_connect = __esm(() => {
 // src/commands/kick.ts
 var exports_kick = {};
 __export(exports_kick, {
-  runKick: () => runKick
+  runKick: () => runKick,
+  runDisconnect: () => runDisconnect
 });
 function parseStaleMs(input) {
   const m = input.match(/^(\d+)(s|m|h)$/);
@@ -6192,36 +6241,63 @@ function parseStaleMs(input) {
     return val * 3600000;
   return null;
 }
-async function runKick(target, opts = {}) {
+function buildPayload(kind, target, opts) {
+  if (opts.all)
+    return { type: kind, all: true };
+  if (opts.stale) {
+    const ms = parseStaleMs(opts.stale);
+    if (!ms)
+      return { error: `Invalid stale duration: "${opts.stale}". Use e.g. 30m, 1h, 300s.` };
+    return { type: kind, stale: ms };
+  }
+  if (target)
+    return { type: kind, target };
+  return { error: `Usage: claudemesh ${kind} <peer> | --stale 30m | --all` };
+}
+async function runDisconnect(target, opts = {}) {
   const config = readConfig();
   const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
   if (!meshSlug) {
     render.err("No mesh joined.");
     return EXIT.NOT_FOUND;
   }
+  const built = buildPayload("disconnect", target, opts);
+  if ("error" in built) {
+    render.err(String(built.error));
+    return EXIT.INVALID_ARGS;
+  }
   return await withMesh({ meshSlug }, async (client) => {
-    let payload;
-    if (opts.all) {
-      payload = { type: "kick", all: true };
-    } else if (opts.stale) {
-      const ms = parseStaleMs(opts.stale);
-      if (!ms) {
-        render.err(`Invalid stale duration: "${opts.stale}". Use e.g. 30m, 1h, 300s.`);
-        return EXIT.INVALID_ARGS;
-      }
-      payload = { type: "kick", stale: ms };
-    } else if (target) {
-      payload = { type: "kick", target };
-    } else {
-      render.err("Usage: claudemesh kick <peer> | --stale 30m | --all");
-      return EXIT.INVALID_ARGS;
+    const result = await client.sendAndWait(built);
+    const peers = result?.affected ?? result?.kicked ?? [];
+    if (peers.length === 0)
+      render.info("No peers matched.");
+    else {
+      render.ok(`Disconnected ${peers.length} peer(s): ${peers.join(", ")}`);
+      render.hint("They will auto-reconnect within seconds. For a session-ending kick, use `claudemesh kick`.");
     }
-    const result = await client.sendAndWait(payload);
-    const kicked = result?.kicked ?? [];
-    if (kicked.length === 0) {
+    return EXIT.SUCCESS;
+  });
+}
+async function runKick(target, opts = {}) {
+  const config = readConfig();
+  const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
+  if (!meshSlug) {
+    render.err("No mesh joined.");
+    return EXIT.NOT_FOUND;
+  }
+  const built = buildPayload("kick", target, opts);
+  if ("error" in built) {
+    render.err(String(built.error));
+    return EXIT.INVALID_ARGS;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    const result = await client.sendAndWait(built);
+    const peers = result?.affected ?? result?.kicked ?? [];
+    if (peers.length === 0)
       render.info("No peers matched.");
-    } else {
-      render.ok(`Kicked ${kicked.length} peer(s): ${kicked.join(", ")}`);
+    else {
+      render.ok(`Kicked ${peers.length} peer(s): ${peers.join(", ")}`);
+      render.hint("Their Claude Code session ended. They can rejoin anytime by running `claudemesh`.");
     }
     return EXIT.SUCCESS;
   });
@@ -6461,12 +6537,10 @@ __export(exports_state, {
   runStateGet: () => runStateGet
 });
 async function runStateGet(flags, key) {
-  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
-  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
   await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
     const entry = await client.getState(key);
     if (!entry) {
-      console.log(dim2(`(not set)`));
+      render.info(dim("(not set)"));
       return;
     }
     if (flags.json) {
@@ -6474,8 +6548,8 @@ async function runStateGet(flags, key) {
       return;
     }
     const val = typeof entry.value === "string" ? entry.value : JSON.stringify(entry.value);
-    console.log(val);
-    console.log(dim2(`  set by ${entry.updatedBy} at ${new Date(entry.updatedAt).toLocaleString()}`));
+    render.info(val);
+    render.info(dim(`  set by ${entry.updatedBy} at ${new Date(entry.updatedAt).toLocaleString()}`));
   });
 }
 async function runStateSet(flags, key, value) {
@@ -6487,13 +6561,10 @@ async function runStateSet(flags, key, value) {
   }
   await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
     await client.setState(key, parsed);
-    console.log(`✓ ${key} = ${JSON.stringify(parsed)}`);
+    render.ok(`${bold(key)} = ${JSON.stringify(parsed)}`);
   });
 }
 async function runStateList(flags) {
-  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
-  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
-  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
   await withMesh({ meshSlug: flags.mesh ?? null }, async (client, mesh) => {
     const entries = await client.listState();
     if (flags.json) {
@@ -6501,18 +6572,23 @@ async function runStateList(flags) {
       return;
     }
     if (entries.length === 0) {
-      console.log(dim2(`No state on mesh "${mesh.slug}".`));
+      render.info(dim(`No state on mesh "${mesh.slug}".`));
       return;
     }
+    render.section(`state (${entries.length})`);
     for (const e of entries) {
       const val = typeof e.value === "string" ? e.value : JSON.stringify(e.value);
-      console.log(`${bold2(e.key)}: ${val}`);
-      console.log(dim2(`  ${e.updatedBy} · ${new Date(e.updatedAt).toLocaleString()}`));
+      process.stdout.write(`  ${bold(e.key)}: ${val}
+`);
+      process.stdout.write(`    ${dim(e.updatedBy + "  ·  " + new Date(e.updatedAt).toLocaleString())}
+`);
     }
   });
 }
 var init_state = __esm(() => {
   init_connect();
+  init_render();
+  init_styles();
 });
 
 // src/commands/info.ts
@@ -6576,7 +6652,7 @@ __export(exports_remember, {
 async function remember(content, opts = {}) {
   const client = allClients()[0];
   if (!client) {
-    console.error("Not connected to any mesh.");
+    render.err("Not connected to any mesh.");
     return EXIT.NETWORK_ERROR;
   }
   const tags = opts.tags?.split(",").map((t) => t.trim()).filter(Boolean);
@@ -6586,14 +6662,16 @@ async function remember(content, opts = {}) {
     return EXIT.SUCCESS;
   }
   if (id) {
-    console.log(`✓ Remembered (${id.slice(0, 8)})`);
+    render.ok("remembered", dim(id.slice(0, 8)));
     return EXIT.SUCCESS;
   }
-  console.error("✗ Failed to store memory");
+  render.err("failed to store memory");
   return EXIT.INTERNAL_ERROR;
 }
 var init_remember = __esm(() => {
   init_facade8();
+  init_render();
+  init_styles();
   init_exit_codes();
 });
 
@@ -6605,7 +6683,7 @@ __export(exports_recall, {
 async function recall(query, opts = {}) {
   const client = allClients()[0];
   if (!client) {
-    console.error("Not connected to any mesh.");
+    render.err("Not connected to any mesh.");
     return EXIT.NETWORK_ERROR;
   }
   const memories = await client.recall(query);
@@ -6614,20 +6692,25 @@ async function recall(query, opts = {}) {
     return EXIT.SUCCESS;
   }
   if (memories.length === 0) {
-    console.log(dim("No memories found."));
+    render.info(dim("no memories found."));
     return EXIT.SUCCESS;
   }
+  render.section(`memories (${memories.length})`);
   for (const m of memories) {
-    const tags = m.tags.length ? dim(` [${m.tags.join(", ")}]`) : "";
-    console.log(`${bold(m.id.slice(0, 8))}${tags}`);
-    console.log(`  ${m.content}`);
-    console.log(dim(`  ${m.rememberedBy} · ${new Date(m.rememberedAt).toLocaleString()}`));
-    console.log("");
+    const tags = m.tags.length ? dim(` [${m.tags.map((t) => clay(t)).join(dim(", "))}]`) : "";
+    process.stdout.write(`  ${bold(m.id.slice(0, 8))}${tags}
+`);
+    process.stdout.write(`    ${m.content}
+`);
+    process.stdout.write(`    ${dim(m.rememberedBy + "  ·  " + new Date(m.rememberedAt).toLocaleString())}
+
+`);
   }
   return EXIT.SUCCESS;
 }
 var init_recall = __esm(() => {
   init_facade8();
+  init_render();
   init_styles();
   init_exit_codes();
 });
@@ -6674,9 +6757,6 @@ function parseDeliverAt(flags) {
   return null;
 }
 async function runRemind(flags, positional) {
-  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
-  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
-  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
   const action = positional[0];
   if (action === "list") {
     await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
@@ -6686,15 +6766,18 @@ async function runRemind(flags, positional) {
         return;
       }
       if (scheduled.length === 0) {
-        console.log(dim2("No pending reminders."));
+        render.info(dim("No pending reminders."));
         return;
       }
+      render.section(`reminders (${scheduled.length})`);
       for (const m of scheduled) {
         const when = new Date(m.deliverAt).toLocaleString();
-        const to = m.to === client.getSessionPubkey() ? dim2("(self)") : m.to;
-        console.log(`  ${bold2(m.id.slice(0, 8))} → ${to} at ${when}`);
-        console.log(`  ${dim2(m.message.slice(0, 80))}`);
-        console.log("");
+        const to = m.to === client.getSessionPubkey() ? dim("(self)") : m.to;
+        process.stdout.write(`  ${bold(m.id.slice(0, 8))} ${dim("→")} ${to} ${dim("at")} ${when}
+`);
+        process.stdout.write(`    ${dim(m.message.slice(0, 80))}
+
+`);
       }
     });
     return;
@@ -6702,15 +6785,15 @@ async function runRemind(flags, positional) {
   if (action === "cancel") {
     const id = positional[1];
     if (!id) {
-      console.error("Usage: claudemesh remind cancel <id>");
+      render.err("Usage: claudemesh remind cancel <id>");
       process.exit(1);
     }
     await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
       const ok = await client.cancelScheduled(id);
       if (ok)
-        console.log(`✓ Cancelled ${id}`);
+        render.ok(`cancelled ${bold(id.slice(0, 8))}`);
       else {
-        console.error(`✗ Not found or already fired: ${id}`);
+        render.err(`not found or already fired: ${id}`);
         process.exit(1);
       }
     });
@@ -6718,17 +6801,17 @@ async function runRemind(flags, positional) {
   }
   const message = action ?? positional.join(" ");
   if (!message) {
-    console.error("Usage: claudemesh remind <message> --in <duration>");
-    console.error("       claudemesh remind <message> --at <time>");
-    console.error('       claudemesh remind <message> --cron "0 */2 * * *"');
-    console.error("       claudemesh remind list");
-    console.error("       claudemesh remind cancel <id>");
+    render.err("Usage: claudemesh remind <message> --in <duration>");
+    render.info(dim("       claudemesh remind <message> --at <time>"));
+    render.info(dim('       claudemesh remind <message> --cron "0 */2 * * *"'));
+    render.info(dim("       claudemesh remind list"));
+    render.info(dim("       claudemesh remind cancel <id>"));
     process.exit(1);
   }
   const isCron = !!flags.cron;
   const deliverAt = isCron ? 0 : parseDeliverAt(flags);
   if (!isCron && deliverAt === null) {
-    console.error('Specify when: --in <duration> (e.g. "2h", "30m"), --at <time> (e.g. "15:00"), or --cron <expression>');
+    render.err("Specify when", 'use --in <duration> (e.g. "2h", "30m"), --at <time> (e.g. "15:00"), or --cron <expression>');
     process.exit(1);
   }
   await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
@@ -6740,7 +6823,7 @@ async function runRemind(flags, positional) {
         const peers = await client.listPeers();
         const match = peers.find((p) => p.displayName.toLowerCase() === flags.to.toLowerCase());
         if (!match) {
-          console.error(`Peer "${flags.to}" not found. Online: ${peers.map((p) => p.displayName).join(", ") || "(none)"}`);
+          render.err(`Peer "${flags.to}" not found`, `online: ${peers.map((p) => p.displayName).join(", ") || "(none)"}`);
           process.exit(1);
         }
         targetSpec = match.pubkey;
@@ -6750,7 +6833,7 @@ async function runRemind(flags, positional) {
     }
     const result = await client.scheduleMessage(targetSpec, message, deliverAt ?? 0, false, flags.cron);
     if (!result) {
-      console.error("✗ Broker did not acknowledge — check connection");
+      render.err("Broker did not acknowledge — check connection");
       process.exit(1);
     }
     if (flags.json) {
@@ -6760,15 +6843,17 @@ async function runRemind(flags, positional) {
     const toLabel = !flags.to || flags.to === "self" ? "yourself" : flags.to;
     if (isCron) {
       const nextFire = new Date(result.deliverAt).toLocaleString();
-      console.log(`✓ Recurring reminder set (${result.scheduledId.slice(0, 8)}): "${message}" → ${toLabel} — cron: ${flags.cron}, next fire: ${nextFire}`);
+      render.ok(`recurring reminder set`, `${result.scheduledId.slice(0, 8)}  ·  ${clay(message)} → ${toLabel}  ·  cron ${flags.cron}  ·  next ${nextFire}`);
     } else {
       const when = new Date(result.deliverAt).toLocaleString();
-      console.log(`✓ Reminder set (${result.scheduledId.slice(0, 8)}): "${message}" → ${toLabel} at ${when}`);
+      render.ok(`reminder set`, `${result.scheduledId.slice(0, 8)}  ·  ${clay(message)} → ${toLabel} at ${when}`);
     }
   });
 }
 var init_remind = __esm(() => {
   init_connect();
+  init_render();
+  init_styles();
 });
 
 // src/commands/profile.ts
@@ -6908,20 +6993,21 @@ async function whoami(opts) {
     return EXIT.SUCCESS;
   }
   if (!result.signed_in) {
-    console.log(`  Not signed in. Run \`claudemesh login\` to sign in.`);
+    render.err("Not signed in", "Run `claudemesh login` to sign in.");
     return EXIT.AUTH_FAILED;
   }
-  console.log(`
-  Signed in as ${result.user.display_name} (${result.user.email})`);
-  console.log(`  Token source: ${result.token_source} ${dim("(~/.claudemesh/auth.json)")}`);
-  if (result.meshes) {
-    console.log(`  Meshes: ${result.meshes.owned} owned, ${result.meshes.guest} guest`);
-  }
-  console.log();
+  render.section("whoami");
+  render.kv([
+    ["user", `${bold(result.user.display_name)} ${dim(`(${result.user.email})`)}`],
+    ["token", `${result.token_source} ${dim("(~/.claudemesh/auth.json)")}`],
+    ...result.meshes ? [["meshes", `${result.meshes.owned} owned · ${result.meshes.guest} guest`]] : []
+  ]);
+  render.blank();
   return EXIT.SUCCESS;
 }
 var init_whoami = __esm(() => {
   init_facade6();
+  init_render();
   init_styles();
   init_exit_codes();
 });
@@ -7137,16 +7223,15 @@ function installStatusLine() {
 function runInstall(args = []) {
   const skipHooks = args.includes("--no-hooks");
   const wantStatusLine = args.includes("--status-line");
-  console.log("claudemesh install");
-  console.log("------------------");
+  render.section("claudemesh install");
   const entry = resolveEntry();
   const isBundled = entry.endsWith("/dist/index.js") || entry.endsWith("\\dist\\index.js");
   if (!isBundled && !bunAvailable()) {
-    console.error("✗ `bun` is not on PATH. Install Bun first: https://bun.com");
+    render.err("`bun` is not on PATH.", "Install Bun first: https://bun.com");
     process.exit(1);
   }
   if (!existsSync5(entry)) {
-    console.error(`✗ MCP entry not found at ${entry}`);
+    render.err(`MCP entry not found at ${entry}`);
     process.exit(1);
   }
   const desired = buildMcpEntry(entry);
@@ -7155,56 +7240,53 @@ function runInstall(args = []) {
   const verifyServers = verify2.mcpServers ?? {};
   const stored = verifyServers[MCP_NAME];
   if (!stored || !entriesEqual(stored, desired)) {
-    console.error(`✗ post-write verification failed — ${CLAUDE_CONFIG} may be corrupt`);
+    render.err("post-write verification failed", `${CLAUDE_CONFIG} may be corrupt`);
     process.exit(1);
   }
-  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
-  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
-  const yellow2 = (s) => useColor ? `\x1B[33m${s}\x1B[39m` : s;
-  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
-  console.log(`✓ MCP server "${MCP_NAME}" ${action}`);
-  console.log(dim2(`  config:  ${CLAUDE_CONFIG}`));
-  console.log(dim2(`  command: ${desired.command}${desired.args?.length ? " " + desired.args.join(" ") : ""}`));
+  render.ok(`MCP server "${bold(MCP_NAME)}" ${action}`);
+  render.kv([
+    ["config", dim(CLAUDE_CONFIG)],
+    ["command", dim(`${desired.command}${desired.args?.length ? " " + desired.args.join(" ") : ""}`)]
+  ]);
   try {
     const { added, unchanged } = installAllowedTools();
     if (added.length > 0) {
-      console.log(`✓ allowedTools: ${added.length} claudemesh tools pre-approved${unchanged > 0 ? `, ${unchanged} already present` : ""}`);
-      console.log(dim2(`  This lets claudemesh tools run without --dangerously-skip-permissions.`));
-      console.log(dim2(`  Your existing allowedTools entries were preserved.`));
+      render.ok(`allowedTools: ${added.length} claudemesh tools pre-approved`, unchanged > 0 ? `${unchanged} already present` : undefined);
+      render.info(dim("This lets claudemesh tools run without --dangerously-skip-permissions."));
+      render.info(dim("Your existing allowedTools entries were preserved."));
     } else {
-      console.log(`✓ allowedTools: all ${unchanged} claudemesh tools already pre-approved`);
+      render.ok(`allowedTools: all ${unchanged} claudemesh tools already pre-approved`);
     }
-    console.log(dim2(`  config:  ${CLAUDE_SETTINGS}`));
+    render.info(dim(`  config:  ${CLAUDE_SETTINGS}`));
   } catch (e) {
-    console.error(`⚠  allowedTools update failed: ${e instanceof Error ? e.message : String(e)}`);
+    render.warn(`allowedTools update failed: ${e instanceof Error ? e.message : String(e)}`);
   }
   if (!skipHooks) {
     try {
       const { added, unchanged } = installHooks();
       if (added > 0) {
-        console.log(`✓ Hooks registered (Stop + UserPromptSubmit) → ${added} added, ${unchanged} already present`);
+        render.ok(`Hooks registered (Stop + UserPromptSubmit)`, `${added} added, ${unchanged} already present`);
       } else {
-        console.log(`✓ Hooks already registered (${unchanged} present)`);
+        render.ok(`Hooks already registered`, `${unchanged} present`);
       }
-      console.log(dim2(`  config:  ${CLAUDE_SETTINGS}`));
+      render.info(dim(`  config:  ${CLAUDE_SETTINGS}`));
     } catch (e) {
-      console.error(`⚠  hook registration failed: ${e instanceof Error ? e.message : String(e)}`);
-      console.error("   (MCP is still installed — hooks just skip. Retry with --no-hooks to suppress.)");
+      render.warn(`hook registration failed: ${e instanceof Error ? e.message : String(e)}`, "MCP is still installed — hooks just skip. Retry with --no-hooks to suppress.");
     }
   } else {
-    console.log(dim2("· Hooks skipped (--no-hooks)"));
+    render.info(dim("· Hooks skipped (--no-hooks)"));
   }
   if (wantStatusLine) {
     try {
       const { installed } = installStatusLine();
       if (installed) {
-        console.log(`✓ Claude Code statusLine → \`claudemesh status-line\``);
-        console.log(dim2(`  Shows: ◇ <mesh> · <online>/<total> online · <you>`));
+        render.ok(`Claude Code statusLine → ${clay("claudemesh status-line")}`);
+        render.info(dim("  Shows: ◇ <mesh> · <online>/<total> online · <you>"));
       } else {
-        console.log(dim2("· statusLine already set to a custom command — left alone"));
+        render.info(dim("· statusLine already set to a custom command — left alone"));
       }
     } catch (e) {
-      console.error(`⚠  statusLine install failed: ${e instanceof Error ? e.message : String(e)}`);
+      render.warn(`statusLine install failed: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
   let hasMeshes = false;
@@ -7212,57 +7294,58 @@ function runInstall(args = []) {
     const meshConfig = readConfig();
     hasMeshes = meshConfig.meshes.length > 0;
   } catch {}
-  console.log("");
-  console.log(yellow2(bold2("⚠  RESTART CLAUDE CODE")) + yellow2(" for MCP tools to appear."));
+  render.blank();
+  render.warn(`${bold("RESTART CLAUDE CODE")} ${yellow("for MCP tools to appear.")}`);
   if (!hasMeshes) {
-    console.log("");
-    console.log(yellow2("No meshes joined.") + " To connect with peers:");
-    console.log(`  ${bold2("claudemesh <invite-url>")}` + dim2("   — joins + launches in one step"));
-    console.log(`  ${dim2("Create one at")} ${bold2("https://claudemesh.com/dashboard")}`);
+    render.blank();
+    render.info(`${yellow("No meshes joined.")} To connect with peers:`);
+    render.info(`  ${bold("claudemesh <invite-url>")}${dim("   — joins + launches in one step")}`);
+    render.info(`  ${dim("Create one at")} ${bold("https://claudemesh.com/dashboard")}`);
   } else {
-    console.log("");
-    console.log(`Next: ${bold2("claudemesh")}` + dim2("   — launch with your joined mesh"));
+    render.blank();
+    render.info(`Next: ${bold("claudemesh")}${dim("   — launch with your joined mesh")}`);
   }
-  console.log("");
-  console.log(dim2("Optional:"));
-  console.log(dim2(`  claudemesh url-handler install   # click-to-launch from email`));
-  console.log(dim2(`  claudemesh install --status-line # live peer count in Claude Code`));
-  console.log(dim2(`  claudemesh completions zsh       # shell completions`));
+  render.blank();
+  render.info(dim("Optional:"));
+  render.info(dim(`  claudemesh url-handler install   # click-to-launch from email`));
+  render.info(dim(`  claudemesh install --status-line # live peer count in Claude Code`));
+  render.info(dim(`  claudemesh completions zsh       # shell completions`));
 }
 function runUninstall() {
-  console.log("claudemesh uninstall");
-  console.log("--------------------");
+  render.section("claudemesh uninstall");
   if (removeMcpServer()) {
-    console.log(`✓ MCP server "${MCP_NAME}" removed`);
+    render.ok(`MCP server "${bold(MCP_NAME)}" removed`);
   } else {
-    console.log(`· MCP server "${MCP_NAME}" not present`);
+    render.info(dim(`· MCP server "${MCP_NAME}" not present`));
   }
   try {
     const removed = uninstallAllowedTools();
     if (removed > 0) {
-      console.log(`✓ allowedTools: ${removed} claudemesh tools removed`);
+      render.ok(`allowedTools: ${removed} claudemesh tools removed`);
     } else {
-      console.log("· No claudemesh allowedTools to remove");
+      render.info(dim("· No claudemesh allowedTools to remove"));
     }
   } catch (e) {
-    console.error(`⚠  allowedTools removal failed: ${e instanceof Error ? e.message : String(e)}`);
+    render.warn(`allowedTools removal failed: ${e instanceof Error ? e.message : String(e)}`);
   }
   try {
     const removed = uninstallHooks();
     if (removed > 0) {
-      console.log(`✓ Hooks removed (${removed} entries)`);
+      render.ok(`Hooks removed`, `${removed} entries`);
     } else {
-      console.log("· No claudemesh hooks to remove");
+      render.info(dim("· No claudemesh hooks to remove"));
     }
   } catch (e) {
-    console.error(`⚠  hook removal failed: ${e instanceof Error ? e.message : String(e)}`);
+    render.warn(`hook removal failed: ${e instanceof Error ? e.message : String(e)}`);
   }
-  console.log("");
-  console.log("Restart Claude Code to drop the MCP connection + hooks.");
+  render.blank();
+  render.info("Restart Claude Code to drop the MCP connection + hooks.");
 }
 var MCP_NAME = "claudemesh", CLAUDE_CONFIG, CLAUDE_SETTINGS, HOOK_COMMAND_STOP = "claudemesh hook idle", HOOK_COMMAND_USER_PROMPT = "claudemesh hook working", HOOK_MARKER = "claudemesh hook ", CLAUDEMESH_TOOLS;
 var init_install = __esm(() => {
   init_facade();
+  init_render();
+  init_styles();
   CLAUDE_CONFIG = join4(homedir4(), ".claude.json");
   CLAUDE_SETTINGS = join4(homedir4(), ".claude", "settings.json");
   CLAUDEMESH_TOOLS = [
@@ -7331,7 +7414,7 @@ async function uninstall() {
         delete servers.claudemesh;
         writeFileSync6(PATHS.CLAUDE_JSON, JSON.stringify(config, null, 2) + `
 `, "utf-8");
-        console.log(`  ${green(icons.check)} Removed MCP server from ~/.claude.json`);
+        render.ok("removed MCP server", dim("~/.claude.json"));
         removed++;
       }
     } catch {}
@@ -7361,19 +7444,20 @@ async function uninstall() {
         if (removedHooks > 0) {
           writeFileSync6(PATHS.CLAUDE_SETTINGS, JSON.stringify(config, null, 2) + `
 `, "utf-8");
-          console.log(`  ${green(icons.check)} Removed ${removedHooks} claudemesh hook(s) from settings.json`);
+          render.ok(`removed ${removedHooks} claudemesh hook${removedHooks === 1 ? "" : "s"}`, dim("settings.json"));
           removed++;
         }
       }
     } catch {}
   }
   if (removed === 0) {
-    console.log("  Nothing to remove — claudemesh was not installed.");
+    render.info(dim("Nothing to remove — claudemesh was not installed."));
   }
   return EXIT.SUCCESS;
 }
 var init_uninstall = __esm(() => {
   init_paths();
+  init_render();
   init_styles();
   init_exit_codes();
 });
@@ -7603,7 +7687,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 red3 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
+  const red2 = (s) => useColor ? `\x1B[31m${s}\x1B[39m` : s;
   console.log(`claudemesh doctor  (v${VERSION})`);
   console.log("─".repeat(60));
   const checks = [
@@ -7617,7 +7701,7 @@ async function runDoctor() {
     await checkNpmLatest()
   ];
   for (const c of checks) {
-    const mark = c.pass ? green3("✓") : red3("✗");
+    const mark = c.pass ? green3("✓") : red2("✗");
     const detail = c.detail ? dim2(` (${c.detail})`) : "";
     console.log(`${mark} ${c.name}${detail}`);
     if (!c.pass && c.fix) {
@@ -7630,7 +7714,7 @@ async function runDoctor() {
     console.log(green3("All checks passed."));
     process.exit(0);
   } else {
-    console.log(red3(`${failing.length} check(s) failed.`));
+    console.log(red2(`${failing.length} check(s) failed.`));
     process.exit(1);
   }
 }
@@ -8208,7 +8292,7 @@ complete -c claudemesh -l join -d 'invite url'
 }
 async function runCompletions(shell) {
   if (!shell) {
-    console.error("Usage: claudemesh completions <bash|zsh|fish>");
+    render.err("Usage: claudemesh completions <bash|zsh|fish>");
     return EXIT.INVALID_ARGS;
   }
   switch (shell.toLowerCase()) {
@@ -8222,13 +8306,14 @@ async function runCompletions(shell) {
       process.stdout.write(fish());
       return EXIT.SUCCESS;
     default:
-      console.error(`Unsupported shell: ${shell}. Use bash, zsh, or fish.`);
+      render.err(`Unsupported shell: ${shell}`, "use bash, zsh, or fish.");
       return EXIT.INVALID_ARGS;
   }
 }
 var COMMANDS, FLAGS;
 var init_completions = __esm(() => {
   init_exit_codes();
+  init_render();
   COMMANDS = [
     "create",
     "new",
@@ -8311,26 +8396,22 @@ function safetyNumber(myPubkey, peerPubkey) {
   return groups.join(" ");
 }
 async function runVerify(target, opts = {}) {
-  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
-  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
-  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
-  const clay2 = (s) => useColor ? `\x1B[38;2;217;119;87m${s}\x1B[39m` : s;
   const config = readConfig();
   const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
   if (!meshSlug) {
-    console.error("  No meshes joined. Run `claudemesh join <url>` first.");
+    render.err("No meshes joined.", "Run `claudemesh join <url>` first.");
     return EXIT.NOT_FOUND;
   }
   const mesh = config.meshes.find((m) => m.slug === meshSlug);
   if (!mesh) {
-    console.error(`  Mesh "${meshSlug}" not found locally.`);
+    render.err(`Mesh "${meshSlug}" not found locally.`);
     return EXIT.NOT_FOUND;
   }
   return await withMesh({ meshSlug }, async (client) => {
     const peers = await client.listPeers();
     const targets = target ? peers.filter((p) => p.displayName === target || p.pubkey === target || p.pubkey.startsWith(target)) : peers;
     if (targets.length === 0) {
-      console.error(`  No peer matching "${target ?? "(all)"}" on mesh ${meshSlug}.`);
+      render.err(`No peer matching "${target ?? "(all)"}" on mesh ${meshSlug}.`);
       return EXIT.NOT_FOUND;
     }
     if (opts.json) {
@@ -8342,19 +8423,20 @@ async function runVerify(target, opts = {}) {
       })), null, 2));
       return EXIT.SUCCESS;
     }
-    console.log("");
-    console.log(`  ${dim2("— safety numbers on")} ${bold2(meshSlug)}`);
-    console.log("");
+    render.section(`safety numbers on ${meshSlug}`);
     for (const p of targets) {
       const sn = safetyNumber(mesh.pubkey, p.pubkey);
-      console.log(`  ${bold2(p.displayName)}`);
-      console.log(`  ${clay2(sn)}`);
-      console.log(`  ${dim2(`pubkey ${p.pubkey.slice(0, 16)}…`)}`);
-      console.log("");
+      process.stdout.write(`  ${bold(p.displayName)}
+`);
+      process.stdout.write(`  ${clay(sn)}
+`);
+      process.stdout.write(`  ${dim(`pubkey ${p.pubkey.slice(0, 16)}…`)}
+
+`);
     }
-    console.log(dim2("  Compare these digits with your peer (phone, in person, not chat)."));
-    console.log(dim2("  If they match on both sides, the channel is not being intercepted."));
-    console.log("");
+    render.hint("Compare these digits with your peer (phone, in person — not chat).");
+    render.hint("If they match on both sides, the channel is not being intercepted.");
+    render.blank();
     return EXIT.SUCCESS;
   });
 }
@@ -8362,6 +8444,8 @@ var init_verify = __esm(() => {
   init_connect();
   init_facade();
   init_exit_codes();
+  init_render();
+  init_styles();
 });
 
 // src/commands/url-handler.ts
@@ -8423,10 +8507,9 @@ EOF
   chmodSync4(shimPath, 493);
   const lsreg = spawnSync5("/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister", ["-f", appDir], { encoding: "utf-8" });
   if (lsreg.status !== 0) {
-    console.log("  ⚠ lsregister returned non-zero; scheme may not activate until Finder rescans.");
+    render.warn("lsregister returned non-zero", "scheme may not activate until Finder rescans.");
   }
-  console.log(`  ✓ Registered claudemesh:// scheme on macOS`);
-  console.log(`    app bundle: ${appDir}`);
+  render.ok("registered claudemesh:// scheme on macOS", dim(appDir));
   return EXIT.SUCCESS;
 }
 function installLinux() {
@@ -8447,12 +8530,11 @@ NoDisplay=true
   writeFileSync7(desktopPath, desktop);
   const xdg1 = spawnSync5("xdg-mime", ["default", "claudemesh.desktop", "x-scheme-handler/claudemesh"], { encoding: "utf-8" });
   if (xdg1.status !== 0) {
-    console.log("  ⚠ xdg-mime not available — skipped mime default registration");
+    render.warn("xdg-mime not available — skipped mime default registration");
   }
   const xdg2 = spawnSync5("update-desktop-database", [appsDir], { encoding: "utf-8" });
   xdg2.status;
-  console.log(`  ✓ Registered claudemesh:// scheme on Linux`);
-  console.log(`    desktop entry: ${desktopPath}`);
+  render.ok("registered claudemesh:// scheme on Linux", dim(desktopPath));
   return EXIT.SUCCESS;
 }
 function installWindows() {
@@ -8472,29 +8554,29 @@ function installWindows() {
 `));
   const res = spawnSync5("reg.exe", ["import", regPath], { encoding: "utf-8" });
   if (res.status !== 0) {
-    console.log(`  ⚠ reg.exe import failed. Manual: double-click ${regPath}`);
+    render.warn("reg.exe import failed", `manual: double-click ${regPath}`);
     return EXIT.INTERNAL_ERROR;
   }
-  console.log(`  ✓ Registered claudemesh:// scheme on Windows`);
+  render.ok("registered claudemesh:// scheme on Windows");
   return EXIT.SUCCESS;
 }
 function uninstallDarwin() {
   const appDir = join6(homedir6(), "Library", "Application Support", "claudemesh", "ClaudemeshHandler.app");
   if (existsSync13(appDir))
     rmSync2(appDir, { recursive: true, force: true });
-  console.log("  ✓ Removed claudemesh:// handler on macOS");
+  render.ok("removed claudemesh:// handler on macOS");
   return EXIT.SUCCESS;
 }
 function uninstallLinux() {
   const desktopPath = join6(homedir6(), ".local", "share", "applications", "claudemesh.desktop");
   if (existsSync13(desktopPath))
     rmSync2(desktopPath, { force: true });
-  console.log("  ✓ Removed claudemesh:// handler on Linux");
+  render.ok("removed claudemesh:// handler on Linux");
   return EXIT.SUCCESS;
 }
 function uninstallWindows() {
   spawnSync5("reg.exe", ["delete", "HKCU\\Software\\Classes\\claudemesh", "/f"], { encoding: "utf-8" });
-  console.log("  ✓ Removed claudemesh:// handler on Windows");
+  render.ok("removed claudemesh:// handler on Windows");
   return EXIT.SUCCESS;
 }
 async function runUrlHandler(action) {
@@ -8515,14 +8597,16 @@ async function runUrlHandler(action) {
     if (p === "win32")
       return uninstallWindows();
   } else {
-    console.error("Usage: claudemesh url-handler <install|uninstall>");
+    render.err("Usage: claudemesh url-handler <install|uninstall>");
     return EXIT.INVALID_ARGS;
   }
-  console.error(`Unsupported platform: ${p}`);
+  render.err(`Unsupported platform: ${p}`);
   return EXIT.INTERNAL_ERROR;
 }
 var init_url_handler = __esm(() => {
   init_exit_codes();
+  init_render();
+  init_styles();
 });
 
 // src/commands/status-line.ts
@@ -12240,9 +12324,8 @@ __export(exports_seed_test_mesh, {
 function runSeedTestMesh(args) {
   const [brokerUrl, meshId, memberId, pubkey, slug] = args;
   if (!brokerUrl || !meshId || !memberId || !pubkey || !slug) {
-    console.error("Usage: claudemesh seed-test-mesh <broker-ws-url> <mesh-id> <member-id> <pubkey> <slug>");
-    console.error("");
-    console.error('Example: claudemesh seed-test-mesh "ws://localhost:7900/ws" mesh-123 member-abc aaa..aaa smoke-test');
+    render.err("Usage: claudemesh seed-test-mesh <broker-ws-url> <mesh-id> <member-id> <pubkey> <slug>");
+    render.info(dim('Example: claudemesh seed-test-mesh "ws://localhost:7900/ws" mesh-123 member-abc aaa..aaa smoke-test'));
     process.exit(1);
   }
   const config = readConfig();
@@ -12258,11 +12341,13 @@ function runSeedTestMesh(args) {
     joinedAt: new Date().toISOString()
   });
   writeConfig(config);
-  console.log(`Seeded mesh "${slug}" (${meshId}) into local config.`);
-  console.log(`Run \`claudemesh mcp\` to connect, or register with Claude Code via \`claudemesh install\`.`);
+  render.ok(`seeded ${bold(slug)}`, dim(meshId));
+  render.hint(`run ${bold("claudemesh mcp")} to connect, or register with Claude Code via ${bold("claudemesh install")}`);
 }
 var init_seed_test_mesh = __esm(() => {
   init_facade();
+  init_render();
+  init_styles();
 });
 
 // src/cli/argv.ts
@@ -12412,9 +12497,10 @@ Mesh
   claudemesh delete [slug]         delete a mesh (alias: rm)
   claudemesh rename <slug> <name>  rename a mesh
   claudemesh share [email]         share mesh (invite link / send email)
-  claudemesh kick <peer>           disconnect a peer (can reconnect)
-  claudemesh kick --stale 30m      disconnect idle peers (> duration)
-  claudemesh kick --all            disconnect everyone except you
+  claudemesh disconnect <peer>     soft disconnect (peer auto-reconnects)
+  claudemesh kick <peer>           end session (peer must manually rejoin)
+  claudemesh kick --stale 30m      kick peers idle > duration
+  claudemesh kick --all            kick everyone except yourself
   claudemesh ban <peer>            kick + permanently revoke (can't rejoin)
   claudemesh unban <peer>          lift a ban
   claudemesh bans                  list banned members
@@ -12556,6 +12642,11 @@ async function main() {
       process.exit(await invite2(positionals[0], { mesh: flags.mesh, json: !!flags.json }));
       break;
     }
+    case "disconnect": {
+      const { runDisconnect: runDisconnect2 } = await Promise.resolve().then(() => (init_kick(), exports_kick));
+      process.exit(await runDisconnect2(positionals[0], { mesh: flags.mesh, stale: flags.stale, all: !!flags.all }));
+      break;
+    }
     case "kick": {
       const { runKick: runKick2 } = await Promise.resolve().then(() => (init_kick(), exports_kick));
       process.exit(await runKick2(positionals[0], { mesh: flags.mesh, stale: flags.stale, all: !!flags.all }));
@@ -12763,4 +12854,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=BE63FC7A7529110A64756E2164756E21
+//# debugId=80234995420998CA64756E2164756E21