From 2abf86d54042d72d31ebb8668e13635a91f948a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Guti=C3=A9rrez?=
 <35082514+alezmad@users.noreply.github.com>
Date: Sun, 19 Apr 2026 20:11:46 +0100
Subject: [PATCH] fix(cli): short-circuit `join <slug>` when already a member
 (alpha.41)

If the arg isn't a URL and matches a mesh already in local config,
print a hint pointing at `launch --mesh <slug>` instead of treating
the slug as an invite code. Avoids the 501 invite_v2_disabled confusion
when users try to "enter" a mesh they already own.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 apps/cli/package.json         |  2 +-
 apps/cli/src/commands/join.ts | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/cli/package.json b/apps/cli/package.json
index 4e63069..ae41076 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "claudemesh-cli",
-  "version": "1.0.0-alpha.40",
+  "version": "1.0.0-alpha.41",
   "description": "Peer mesh for Claude Code sessions — CLI + MCP server.",
   "keywords": [
     "claude-code",
diff --git a/apps/cli/src/commands/join.ts b/apps/cli/src/commands/join.ts
index 36edd65..cd0865e 100644
--- a/apps/cli/src/commands/join.ts
+++ b/apps/cli/src/commands/join.ts
@@ -111,6 +111,24 @@ export async function runJoin(args: string[]): Promise<void> {
     process.exit(1);
   }
 
+  // Short-circuit: if the arg matches a mesh already in local config (slug
+  // or name), we're already joined. Don't go through the invite flow.
+  if (!link.includes("://")) {
+    const existing = readConfig().meshes.find(
+      (m) => m.slug === link || m.name === link,
+    );
+    if (existing) {
+      console.log(`Already in "${existing.slug}" on this machine.`);
+      console.log("");
+      console.log(`Use it in the current directory:`);
+      console.log(`  claudemesh launch --mesh ${existing.slug}`);
+      console.log("");
+      console.log(`Or list peers:`);
+      console.log(`  claudemesh peers --mesh ${existing.slug}`);
+      return;
+    }
+  }
+
   // Try v2 first — short code / `/i/<code>` URL.
   const v2Code = parseV2InviteInput(link);
   if (v2Code) {