1 files changed, 25 insertions, 5 deletions

diff --git a/packages/meshbay-cli/src/meshbay_cli/client/groups.py b/packages/meshbay-cli/src/meshbay_cli/client/groups.py
index ac738f3..4288c32 100644
--- a/packages/meshbay-cli/src/meshbay_cli/client/groups.py
+++ b/packages/meshbay-cli/src/meshbay_cli/client/groups.py
@@ -7,12 +7,15 @@ import time
 from ..errors import NODE, CliError
 from .account import Account
 from .paths import handle
-from .session import DeviceLinkPending, GroupSession, NodeKeyChanged, connect
+from .session import DeviceLinkPending, GroupSession, NodeKeyChanged, NodeRefusal, connect
 
 # How often a machine waiting for its approval tries the node again. Each try is
 # one offer: well inside what the hub admits per account and per node.
 LINK_POLL = 10
 
+# Join refusals about the account rather than the node: every node gives them.
+ACCOUNT_REFUSALS = frozenset({"code_required", "code_invalid"})
+
 log = logging.getLogger(__name__)
 
 
@@ -20,22 +23,38 @@ async def my_groups(account: Account) -> list[dict]:
     return await account.call(account.hub.my_groups)
 
 
-async def open_group(account: Account, group: dict) -> GroupSession:
+async def open_group(account: Account, group: dict, *, join_code: str | None = None,
+                     node_pk: str | None = None) -> GroupSession:
     """
     A session with a node serving `group`: the pinned one first, then the others
     in the hub's order. A node whose key changed stops everything — that is an
     alarm, not a reason to quietly try its neighbour.
+
+    `join_code` goes in the join; `node_pk` restricts the tries to that node — an
+    invitation link's code is for the node the link names and no other.
     """
     nodes = await account.call(account.hub.group_nodes, group["id"])
+    if node_pk:
+        nodes = [n for n in nodes if n.get("pk_node") == node_pk]
+        if not nodes:
+            raise CliError(NODE, f"The node the invitation names for {handle(group)} "
+                                 "is not online.")
     if not nodes:
         raise CliError(NODE, f"No node serving {handle(group)} is online.")
     nodes = sorted(nodes, key=lambda n: account.pin(n["node_id"]) is None)
     failures = []
     for node in nodes:
         try:
-            return await _connect_linking(account, group, node)
+            return await _connect_linking(account, group, node, join_code)
         except (NodeKeyChanged, DeviceLinkPending):
             raise
+        except NodeRefusal as e:
+            # A refusal about this account — a code to give — is the same answer
+            # from every node; trying the next would only bury it.
+            if e.refusal_code in ACCOUNT_REFUSALS or len(nodes) == 1:
+                raise
+            log.info("node %s: %s", node["node_id"], e.message)
+            failures.append(f"{node['node_id']}: {e.message}")
         except CliError as e:
             if e.code != NODE or len(nodes) == 1:
                 raise
@@ -45,7 +64,8 @@ async def open_group(account: Account, group: dict) -> GroupSession:
                          + "\n  ".join(failures))
 
 
-async def _connect_linking(account: Account, group: dict, node: dict) -> GroupSession:
+async def _connect_linking(account: Account, group: dict, node: dict,
+                           join_code: str | None = None) -> GroupSession:
     """
     `connect`, and — when this machine is waiting to be approved as a device on
     that node — the wait: the code is shown once (`account.on_device_code`), and
@@ -55,7 +75,7 @@ async def _connect_linking(account: Account, group: dict, node: dict) -> GroupSe
     shown = False
     while True:
         try:
-            return await connect(account, group["id"], node)
+            return await connect(account, group["id"], node, join_code)
         except DeviceLinkPending as pending:
             hook = account.on_device_code
             wait = hook(group, pending, first=not shown) if hook else False