clawnexus 0.2.8 → 0.3.1

package/dist/registry/auto-register.js

@@ -59,25 +59,38 @@ class AutoRegister extends node_events_1.EventEmitter {
             this.emit("skip", "No local OpenClaw instance detected");
             return;
         }
-        // Try agentId, then agentId-2, agentId-3, ... if name already taken by another owner
+        // Build list of base names to try: agentId first, then auto_name as fallback
+        const selfInstance = this.store.getAll().find((i) => i.is_self);
+        const autoName = selfInstance?.auto_name;
+        const bases = [agentId];
+        if (autoName && autoName !== agentId)
+            bases.push(autoName);
+        // Try each base with suffixes -1, -2, ... up to MAX_SUFFIX if taken by another owner
         const MAX_SUFFIX = 10;
         let result = null;
-        for (let i = 0; i <= MAX_SUFFIX; i++) {
-            const clawId = i === 0 ? agentId : `${agentId}-${i}`;
-            try {
-                result = await this.client.register({ claw_id: clawId });
-                break;
-            }
-            catch (err) {
-                if (err instanceof client_js_1.RegistryError && err.statusCode === 409 && i < MAX_SUFFIX) {
-                    continue; // name taken by another owner, try next suffix
+        outer: for (const base of bases) {
+            for (let i = 0; i <= MAX_SUFFIX; i++) {
+                const clawId = i === 0 ? base : `${base}-${i}`;
+                try {
+                    result = await this.client.register({ claw_id: clawId });
+                    break outer;
+                }
+                catch (err) {
+                    if (err instanceof client_js_1.RegistryError && err.statusCode === 409 && i < MAX_SUFFIX) {
+                        continue; // name taken by another owner, try next suffix
+                    }
+                    if (err instanceof client_js_1.RegistryError && err.statusCode === 409 && i === MAX_SUFFIX) {
+                        break; // exhausted suffixes for this base, try next base
+                    }
+                    this.emit("error", err);
+                    return;
                 }
-                this.emit("error", err);
-                return;
             }
         }
-        if (!result)
+        if (!result) {
+            this.emit("error", new Error(`All candidate names exhausted (bases: ${bases.join(", ")})`));
             return;
+        }
         this.registeredClawName = result.record.name;
         // Start heartbeat on first successful registration
         if (!this.heartbeatTimer) {
@@ -85,13 +98,12 @@ class AutoRegister extends node_events_1.EventEmitter {
                 this.tryRegister().catch(() => { });
             }, HEARTBEAT_INTERVAL_MS);
         }
-        // Write claw_name back to the local instance in store
-        const instances = this.store.getAll();
-        const selfInstance = instances.find((i) => i.is_self && i.agent_id === agentId);
-        if (selfInstance) {
-            selfInstance.claw_name = result.record.name;
-            selfInstance.owner_pubkey = result.record.ownerPubkey;
-            this.store.upsert(selfInstance);
+        // Write claw_name back to the local instance in store (re-fetch after possible state change)
+        const registeredSelf = this.store.getAll().find((i) => i.is_self && i.agent_id === agentId);
+        if (registeredSelf) {
+            registeredSelf.claw_name = result.record.name;
+            registeredSelf.owner_pubkey = result.record.ownerPubkey;
+            this.store.upsert(registeredSelf);
         }
         this.emit("registered", {
             action: result.action,

package/dist/relay/connector.d.ts

@@ -8,7 +8,7 @@ export interface RelayConnectorOptions {
     autoAccept?: boolean;
 }
 export declare class RelayConnector extends EventEmitter {
-    private readonly options;
+    private options;
     private ws;
     private state;
     private rooms;
@@ -17,10 +17,14 @@ export declare class RelayConnector extends EventEmitter {
     private reconnectTimer;
     private closed;
     constructor(options: RelayConnectorOptions);
+    /** Update the auth token (e.g. after token refresh). */
+    updateAuthToken(token: string): void;
     /** Connect to the relay and REGISTER this claw_id. */
     connect(): void;
     /** Disconnect and stop reconnecting. */
     disconnect(): void;
+    private pendingJoins;
+    private lastJoinTarget;
     /** Initiate a connection to a remote claw_id through the relay. */
     join(targetClawId: string): void;
     /** Send an encrypted message to a peer in a room. */

package/dist/relay/connector.js

@@ -20,6 +20,10 @@ class RelayConnector extends node_events_1.EventEmitter {
         this.options = options;
         this.keyPair = (0, crypto_js_1.generateKeyPair)();
     }
+    /** Update the auth token (e.g. after token refresh). */
+    updateAuthToken(token) {
+        this.options = { ...this.options, authToken: token };
+    }
     /** Connect to the relay and REGISTER this claw_id. */
     connect() {
         if (this.state !== "disconnected")
@@ -66,8 +70,12 @@ class RelayConnector extends node_events_1.EventEmitter {
         this.ws?.close();
         this.cleanup();
     }
+    // Tracks target claw_id for pending JOIN requests
+    pendingJoins = new Map(); // target_claw_id → target_claw_id (for JOINED room_id lookup)
+    lastJoinTarget = null;
     /** Initiate a connection to a remote claw_id through the relay. */
     join(targetClawId) {
+        this.lastJoinTarget = targetClawId;
         this.send({
             type: "JOIN",
             claw_id: this.options.clawId,
@@ -78,8 +86,10 @@ class RelayConnector extends node_events_1.EventEmitter {
     /** Send an encrypted message to a peer in a room. */
     sendData(roomId, plaintext) {
         const room = this.rooms.get(roomId);
-        if (!room || !room.session_key)
+        if (!room || !room.session_key) {
+            console.log(`[clawnexus] [Relay] sendData failed: room=${roomId} exists=${!!room} hasKey=${!!room?.session_key}`);
             return false;
+        }
         const payload = (0, crypto_js_1.encrypt)(room.session_key, plaintext);
         this.send({ type: "DATA", room_id: roomId, payload });
         return true;
@@ -98,6 +108,7 @@ class RelayConnector extends node_events_1.EventEmitter {
                 room_id: r.room_id,
                 peer_claw_id: r.peer_claw_id,
                 state: r.state,
+                has_session_key: !!r.session_key,
             })),
         };
     }
@@ -139,7 +150,7 @@ class RelayConnector extends node_events_1.EventEmitter {
                     // We are the initiator — create room entry
                     this.rooms.set(msg.room_id, {
                         room_id: msg.room_id,
-                        peer_claw_id: "", // will be known after key exchange
+                        peer_claw_id: this.lastJoinTarget ?? "",
                         state: "active",
                     });
                     // Send our public key

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export type ClawImplementation = "openclaw" | "goclaw" | "zeroclaw" | "picoclaw" | "nanoclaw" | "nanobot" | "unknown";
+export type ClawImplementation = "openclaw" | "goclaw" | "zeroclaw" | "picoclaw" | "nanoclaw" | "nanobot" | "openfang" | "unknown";
 export interface ClawInstance {
     agent_id: string;
     auto_name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawnexus",
-  "version": "0.2.8",
+  "version": "0.3.1",
   "description": "ClawNexus daemon and CLI — AI instance registry for OpenClaw",
   "license": "MIT",
   "author": "alan-silverstreams <alan@silverstream.tech>",