claudemesh-cli 0.6.4 → 0.6.6

package/dist/index.js

@@ -47468,15 +47468,15 @@ class BrokerClient {
   outbound = [];
   pushHandlers = new Set;
   pushBuffer = [];
-  listPeersResolvers = [];
-  stateResolvers = [];
-  stateListResolvers = [];
-  memoryStoreResolvers = [];
-  memoryRecallResolvers = [];
+  listPeersResolvers = new Map;
+  stateResolvers = new Map;
+  stateListResolvers = new Map;
+  memoryStoreResolvers = new Map;
+  memoryRecallResolvers = new Map;
   stateChangeHandlers = new Set;
   sessionPubkey = null;
   sessionSecretKey = null;
-  grantFileAccessResolvers = [];
+  grantFileAccessResolvers = new Map;
   closed = false;
   reconnectAttempt = 0;
   helloTimer = null;
@@ -47503,6 +47503,9 @@ class BrokerClient {
   getSessionSecretKey() {
     return this.sessionSecretKey;
   }
+  makeReqId() {
+    return Math.random().toString(36).slice(2) + Date.now().toString(36);
+  }
   async connect() {
     if (this.closed)
       throw new Error("client is closed");
@@ -47656,15 +47659,12 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.listPeersResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_peers" }));
-      setTimeout(() => {
-        const idx = this.listPeersResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.listPeersResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.listPeersResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.listPeersResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_peers", _reqId: reqId }));
     });
   }
   async setSummary(summary) {
@@ -47691,60 +47691,48 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.stateResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "get_state", key }));
-      setTimeout(() => {
-        const idx = this.stateResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.stateResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.stateResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.stateResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "get_state", key, _reqId: reqId }));
     });
   }
   async listState() {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.stateListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_state" }));
-      setTimeout(() => {
-        const idx = this.stateListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.stateListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.stateListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.stateListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_state", _reqId: reqId }));
     });
   }
   async remember(content, tags) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.memoryStoreResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "remember", content, tags }));
-      setTimeout(() => {
-        const idx = this.memoryStoreResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.memoryStoreResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.memoryStoreResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.memoryStoreResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "remember", content, tags, _reqId: reqId }));
     });
   }
   async recall(query) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.memoryRecallResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "recall", query }));
-      setTimeout(() => {
-        const idx = this.memoryRecallResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.memoryRecallResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.memoryRecallResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.memoryRecallResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "recall", query, _reqId: reqId }));
     });
   }
   async forget(memoryId) {
@@ -47752,81 +47740,69 @@ class BrokerClient {
       return;
     this.ws.send(JSON.stringify({ type: "forget", memoryId }));
   }
-  messageStatusResolvers = [];
-  fileUrlResolvers = [];
-  fileListResolvers = [];
-  fileStatusResolvers = [];
-  vectorStoredResolvers = [];
-  vectorResultsResolvers = [];
-  collectionListResolvers = [];
-  graphResultResolvers = [];
-  contextListResolvers = [];
-  contextResultsResolvers = [];
-  taskCreatedResolvers = [];
-  taskListResolvers = [];
-  meshQueryResolvers = [];
-  meshSchemaResolvers = [];
-  streamCreatedResolvers = [];
-  streamListResolvers = [];
+  messageStatusResolvers = new Map;
+  fileUrlResolvers = new Map;
+  fileListResolvers = new Map;
+  fileStatusResolvers = new Map;
+  vectorStoredResolvers = new Map;
+  vectorResultsResolvers = new Map;
+  collectionListResolvers = new Map;
+  graphResultResolvers = new Map;
+  contextListResolvers = new Map;
+  contextResultsResolvers = new Map;
+  taskCreatedResolvers = new Map;
+  taskListResolvers = new Map;
+  meshQueryResolvers = new Map;
+  meshSchemaResolvers = new Map;
+  streamCreatedResolvers = new Map;
+  streamListResolvers = new Map;
   streamDataHandlers = new Set;
   async messageStatus(messageId) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.messageStatusResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "message_status", messageId }));
-      setTimeout(() => {
-        const idx = this.messageStatusResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.messageStatusResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.messageStatusResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.messageStatusResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "message_status", messageId, _reqId: reqId }));
     });
   }
   async getFile(fileId) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.fileUrlResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "get_file", fileId }));
-      setTimeout(() => {
-        const idx = this.fileUrlResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.fileUrlResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.fileUrlResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.fileUrlResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "get_file", fileId, _reqId: reqId }));
     });
   }
   async listFiles(query, from) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.fileListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_files", query, from }));
-      setTimeout(() => {
-        const idx = this.fileListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.fileListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.fileListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.fileListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_files", query, from, _reqId: reqId }));
     });
   }
   async fileStatus(fileId) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.fileStatusResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "file_status", fileId }));
-      setTimeout(() => {
-        const idx = this.fileStatusResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.fileStatusResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.fileStatusResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.fileStatusResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "file_status", fileId, _reqId: reqId }));
     });
   }
   async deleteFile(fileId) {
@@ -47867,46 +47843,36 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return false;
     return new Promise((resolve) => {
-      const resolvers = this.grantFileAccessResolvers;
-      resolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "grant_file_access", fileId, peerPubkey, sealedKey }));
-      setTimeout(() => {
-        const idx = resolvers.indexOf(resolve);
-        if (idx !== -1) {
-          resolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.grantFileAccessResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.grantFileAccessResolvers.delete(reqId))
           resolve(false);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "grant_file_access", fileId, peerPubkey, sealedKey, _reqId: reqId }));
     });
   }
   async vectorStore(collection, text, metadata) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.vectorStoredResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "vector_store", collection, text, metadata }));
-      setTimeout(() => {
-        const idx = this.vectorStoredResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.vectorStoredResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.vectorStoredResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.vectorStoredResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "vector_store", collection, text, metadata, _reqId: reqId }));
     });
   }
   async vectorSearch(collection, query, limit) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.vectorResultsResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "vector_search", collection, query, limit }));
-      setTimeout(() => {
-        const idx = this.vectorResultsResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.vectorResultsResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.vectorResultsResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.vectorResultsResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "vector_search", collection, query, limit, _reqId: reqId }));
     });
   }
   async vectorDelete(collection, id) {
@@ -47918,45 +47884,36 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.collectionListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_collections" }));
-      setTimeout(() => {
-        const idx = this.collectionListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.collectionListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.collectionListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.collectionListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_collections", _reqId: reqId }));
     });
   }
   async graphQuery(cypher) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.graphResultResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "graph_query", cypher }));
-      setTimeout(() => {
-        const idx = this.graphResultResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.graphResultResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.graphResultResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.graphResultResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "graph_query", cypher, _reqId: reqId }));
     });
   }
   async graphExecute(cypher) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.graphResultResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "graph_execute", cypher }));
-      setTimeout(() => {
-        const idx = this.graphResultResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.graphResultResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.graphResultResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.graphResultResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "graph_execute", cypher, _reqId: reqId }));
     });
   }
   async shareContext(summary, filesRead, keyFindings, tags) {
@@ -47968,85 +47925,70 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.contextResultsResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "get_context", query }));
-      setTimeout(() => {
-        const idx = this.contextResultsResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.contextResultsResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.contextResultsResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.contextResultsResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "get_context", query, _reqId: reqId }));
     });
   }
   async listContexts() {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.contextListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_contexts" }));
-      setTimeout(() => {
-        const idx = this.contextListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.contextListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.contextListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.contextListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_contexts", _reqId: reqId }));
     });
   }
   async createTask(title, assignee, priority, tags) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.taskCreatedResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "create_task", title, assignee, priority, tags }));
-      setTimeout(() => {
-        const idx = this.taskCreatedResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.taskCreatedResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.taskCreatedResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.taskCreatedResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "create_task", title, assignee, priority, tags, _reqId: reqId }));
     });
   }
   async claimTask(id) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return;
-    this.ws.send(JSON.stringify({ type: "claim_task", id }));
+    this.ws.send(JSON.stringify({ type: "claim_task", taskId: id }));
   }
   async completeTask(id, result) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return;
-    this.ws.send(JSON.stringify({ type: "complete_task", id, result }));
+    this.ws.send(JSON.stringify({ type: "complete_task", taskId: id, result }));
   }
   async listTasks(status, assignee) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.taskListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_tasks", status, assignee }));
-      setTimeout(() => {
-        const idx = this.taskListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.taskListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.taskListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.taskListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_tasks", status, assignee, _reqId: reqId }));
     });
   }
   async meshQuery(sql) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.meshQueryResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "mesh_query", sql }));
-      setTimeout(() => {
-        const idx = this.meshQueryResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.meshQueryResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.meshQueryResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.meshQueryResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "mesh_query", sql, _reqId: reqId }));
     });
   }
   async meshExecute(sql) {
@@ -48058,30 +48000,24 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.meshSchemaResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "mesh_schema" }));
-      setTimeout(() => {
-        const idx = this.meshSchemaResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.meshSchemaResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.meshSchemaResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.meshSchemaResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "mesh_schema", _reqId: reqId }));
     });
   }
   async createStream(name) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.streamCreatedResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "create_stream", name }));
-      setTimeout(() => {
-        const idx = this.streamCreatedResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.streamCreatedResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.streamCreatedResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.streamCreatedResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "create_stream", name, _reqId: reqId }));
     });
   }
   async publish(stream, data) {
@@ -48103,15 +48039,12 @@ class BrokerClient {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return [];
     return new Promise((resolve) => {
-      this.streamListResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "list_streams" }));
-      setTimeout(() => {
-        const idx = this.streamListResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.streamListResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.streamListResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.streamListResolvers.delete(reqId))
           resolve([]);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "list_streams", _reqId: reqId }));
     });
   }
   onStreamData(handler) {
@@ -48122,20 +48055,17 @@ class BrokerClient {
     this.stateChangeHandlers.add(handler);
     return () => this.stateChangeHandlers.delete(handler);
   }
-  meshInfoResolvers = [];
+  meshInfoResolvers = new Map;
   async meshInfo() {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       return null;
     return new Promise((resolve) => {
-      this.meshInfoResolvers.push(resolve);
-      this.ws.send(JSON.stringify({ type: "mesh_info" }));
-      setTimeout(() => {
-        const idx = this.meshInfoResolvers.indexOf(resolve);
-        if (idx !== -1) {
-          this.meshInfoResolvers.splice(idx, 1);
+      const reqId = this.makeReqId();
+      this.meshInfoResolvers.set(reqId, { resolve, timer: setTimeout(() => {
+        if (this.meshInfoResolvers.delete(reqId))
           resolve(null);
-        }
-      }, 5000);
+      }, 5000) });
+      this.ws.send(JSON.stringify({ type: "mesh_info", _reqId: reqId }));
     });
   }
   close() {
@@ -48151,7 +48081,26 @@ class BrokerClient {
     }
     this.setConnStatus("closed");
   }
+  resolveFromMap(map2, reqId, value) {
+    let entry = reqId ? map2.get(reqId) : undefined;
+    if (!entry) {
+      const first = map2.entries().next().value;
+      if (first) {
+        entry = first[1];
+        map2.delete(first[0]);
+      }
+    } else {
+      map2.delete(reqId);
+    }
+    if (entry) {
+      clearTimeout(entry.timer);
+      entry.resolve(value);
+      return true;
+    }
+    return false;
+  }
   handleServerMessage(msg) {
+    const msgReqId = msg._reqId;
     if (msg.type === "ack") {
       const pending = this.pendingSends.get(String(msg.id ?? ""));
       if (pending) {
@@ -48165,9 +48114,7 @@ class BrokerClient {
     }
     if (msg.type === "peers_list") {
       const peers = msg.peers ?? [];
-      const resolver = this.listPeersResolvers.shift();
-      if (resolver)
-        resolver(peers);
+      this.resolveFromMap(this.listPeersResolvers, msgReqId, peers);
       return;
     }
     if (msg.type === "push") {
@@ -48221,26 +48168,21 @@ class BrokerClient {
       return;
     }
     if (msg.type === "state_result") {
-      const resolver = this.stateResolvers.shift();
-      if (resolver) {
-        if (msg.key) {
-          resolver({
-            key: String(msg.key),
-            value: msg.value,
-            updatedBy: String(msg.updatedBy ?? ""),
-            updatedAt: String(msg.updatedAt ?? "")
-          });
-        } else {
-          resolver(null);
-        }
+      if (msg.key) {
+        this.resolveFromMap(this.stateResolvers, msgReqId, {
+          key: String(msg.key),
+          value: msg.value,
+          updatedBy: String(msg.updatedBy ?? ""),
+          updatedAt: String(msg.updatedAt ?? "")
+        });
+      } else {
+        this.resolveFromMap(this.stateResolvers, msgReqId, null);
       }
       return;
     }
     if (msg.type === "state_list") {
       const entries = msg.entries ?? [];
-      const resolver = this.stateListResolvers.shift();
-      if (resolver)
-        resolver(entries);
+      this.resolveFromMap(this.stateListResolvers, msgReqId, entries);
       return;
     }
     if (msg.type === "state_change") {
@@ -48257,147 +48199,107 @@ class BrokerClient {
       return;
     }
     if (msg.type === "memory_stored") {
-      const resolver = this.memoryStoreResolvers.shift();
-      if (resolver)
-        resolver(msg.id ? String(msg.id) : null);
+      this.resolveFromMap(this.memoryStoreResolvers, msgReqId, msg.id ? String(msg.id) : null);
       return;
     }
     if (msg.type === "memory_results") {
       const memories = msg.memories ?? [];
-      const resolver = this.memoryRecallResolvers.shift();
-      if (resolver)
-        resolver(memories);
+      this.resolveFromMap(this.memoryRecallResolvers, msgReqId, memories);
       return;
     }
     if (msg.type === "message_status_result") {
-      const resolver = this.messageStatusResolvers.shift();
-      if (resolver)
-        resolver(msg);
+      this.resolveFromMap(this.messageStatusResolvers, msgReqId, msg);
       return;
     }
     if (msg.type === "file_url") {
-      const resolver = this.fileUrlResolvers.shift();
-      if (resolver) {
-        if (msg.url) {
-          resolver({
-            url: String(msg.url),
-            name: String(msg.name ?? ""),
-            encrypted: msg.encrypted ? true : undefined,
-            sealedKey: msg.sealedKey ? String(msg.sealedKey) : undefined
-          });
-        } else {
-          resolver(null);
-        }
+      if (msg.url) {
+        this.resolveFromMap(this.fileUrlResolvers, msgReqId, {
+          url: String(msg.url),
+          name: String(msg.name ?? ""),
+          encrypted: msg.encrypted ? true : undefined,
+          sealedKey: msg.sealedKey ? String(msg.sealedKey) : undefined
+        });
+      } else {
+        this.resolveFromMap(this.fileUrlResolvers, msgReqId, null);
       }
       return;
     }
     if (msg.type === "file_list") {
       const files = msg.files ?? [];
-      const resolver = this.fileListResolvers.shift();
-      if (resolver)
-        resolver(files);
+      this.resolveFromMap(this.fileListResolvers, msgReqId, files);
       return;
     }
     if (msg.type === "file_status_result") {
       const accesses = msg.accesses ?? [];
-      const resolver = this.fileStatusResolvers.shift();
-      if (resolver)
-        resolver(accesses);
+      this.resolveFromMap(this.fileStatusResolvers, msgReqId, accesses);
       return;
     }
     if (msg.type === "grant_file_access_ok") {
-      const resolver = this.grantFileAccessResolvers.shift();
-      if (resolver)
-        resolver(true);
+      this.resolveFromMap(this.grantFileAccessResolvers, msgReqId, true);
       return;
     }
     if (msg.type === "vector_stored") {
-      const resolver = this.vectorStoredResolvers.shift();
-      if (resolver)
-        resolver(msg.id ? String(msg.id) : null);
+      this.resolveFromMap(this.vectorStoredResolvers, msgReqId, msg.id ? String(msg.id) : null);
       return;
     }
     if (msg.type === "vector_results") {
       const results = msg.results ?? [];
-      const resolver = this.vectorResultsResolvers.shift();
-      if (resolver)
-        resolver(results);
+      this.resolveFromMap(this.vectorResultsResolvers, msgReqId, results);
       return;
     }
     if (msg.type === "collection_list") {
       const collections = msg.collections ?? [];
-      const resolver = this.collectionListResolvers.shift();
-      if (resolver)
-        resolver(collections);
+      this.resolveFromMap(this.collectionListResolvers, msgReqId, collections);
       return;
     }
     if (msg.type === "graph_result") {
-      const rows = msg.rows ?? [];
-      const resolver = this.graphResultResolvers.shift();
-      if (resolver)
-        resolver(rows);
+      const rows = msg.records ?? [];
+      this.resolveFromMap(this.graphResultResolvers, msgReqId, rows);
       return;
     }
     if (msg.type === "context_list") {
       const contexts = msg.contexts ?? [];
-      const resolver = this.contextListResolvers.shift();
-      if (resolver)
-        resolver(contexts);
+      this.resolveFromMap(this.contextListResolvers, msgReqId, contexts);
       return;
     }
     if (msg.type === "context_results") {
       const contexts = msg.contexts ?? [];
-      const resolver = this.contextResultsResolvers.shift();
-      if (resolver)
-        resolver(contexts);
+      this.resolveFromMap(this.contextResultsResolvers, msgReqId, contexts);
       return;
     }
     if (msg.type === "task_created") {
-      const resolver = this.taskCreatedResolvers.shift();
-      if (resolver)
-        resolver(msg.id ? String(msg.id) : null);
+      this.resolveFromMap(this.taskCreatedResolvers, msgReqId, msg.id ? String(msg.id) : null);
       return;
     }
     if (msg.type === "task_list") {
       const tasks = msg.tasks ?? [];
-      const resolver = this.taskListResolvers.shift();
-      if (resolver)
-        resolver(tasks);
+      this.resolveFromMap(this.taskListResolvers, msgReqId, tasks);
       return;
     }
     if (msg.type === "mesh_query_result") {
-      const resolver = this.meshQueryResolvers.shift();
-      if (resolver) {
-        if (msg.columns) {
-          resolver({
-            columns: msg.columns ?? [],
-            rows: msg.rows ?? [],
-            rowCount: msg.rowCount ?? 0
-          });
-        } else {
-          resolver(null);
-        }
+      if (msg.columns) {
+        this.resolveFromMap(this.meshQueryResolvers, msgReqId, {
+          columns: msg.columns ?? [],
+          rows: msg.rows ?? [],
+          rowCount: msg.rowCount ?? 0
+        });
+      } else {
+        this.resolveFromMap(this.meshQueryResolvers, msgReqId, null);
       }
       return;
     }
     if (msg.type === "mesh_schema_result") {
       const tables = msg.tables ?? [];
-      const resolver = this.meshSchemaResolvers.shift();
-      if (resolver)
-        resolver(tables);
+      this.resolveFromMap(this.meshSchemaResolvers, msgReqId, tables);
       return;
     }
     if (msg.type === "stream_created") {
-      const resolver = this.streamCreatedResolvers.shift();
-      if (resolver)
-        resolver(msg.id ? String(msg.id) : null);
+      this.resolveFromMap(this.streamCreatedResolvers, msgReqId, msg.id ? String(msg.id) : null);
       return;
     }
     if (msg.type === "stream_list") {
       const streams = msg.streams ?? [];
-      const resolver = this.streamListResolvers.shift();
-      if (resolver)
-        resolver(streams);
+      this.resolveFromMap(this.streamListResolvers, msgReqId, streams);
       return;
     }
     if (msg.type === "stream_data") {
@@ -48414,14 +48316,13 @@ class BrokerClient {
       return;
     }
     if (msg.type === "mesh_info_result") {
-      const resolver = this.meshInfoResolvers.shift();
-      if (resolver)
-        resolver(msg);
+      this.resolveFromMap(this.meshInfoResolvers, msgReqId, msg);
       return;
     }
     if (msg.type === "error") {
       this.debug(`broker error: ${msg.code} ${msg.message}`);
       const id = msg.id ? String(msg.id) : null;
+      let handledByPendingSend = false;
       if (id) {
         const pending = this.pendingSends.get(id);
         if (pending) {
@@ -48430,6 +48331,43 @@ class BrokerClient {
             error: `${msg.code}: ${msg.message}`
           });
           this.pendingSends.delete(id);
+          handledByPendingSend = true;
+        }
+      }
+      if (!handledByPendingSend) {
+        const allMaps = [
+          [this.stateResolvers, null],
+          [this.stateListResolvers, []],
+          [this.memoryStoreResolvers, null],
+          [this.memoryRecallResolvers, []],
+          [this.fileUrlResolvers, null],
+          [this.fileListResolvers, []],
+          [this.fileStatusResolvers, []],
+          [this.graphResultResolvers, []],
+          [this.vectorStoredResolvers, null],
+          [this.vectorResultsResolvers, []],
+          [this.taskListResolvers, []],
+          [this.meshQueryResolvers, null],
+          [this.contextResultsResolvers, []],
+          [this.contextListResolvers, []],
+          [this.streamListResolvers, []],
+          [this.messageStatusResolvers, null],
+          [this.grantFileAccessResolvers, false],
+          [this.collectionListResolvers, []],
+          [this.meshSchemaResolvers, []],
+          [this.taskCreatedResolvers, null],
+          [this.streamCreatedResolvers, null],
+          [this.listPeersResolvers, []],
+          [this.meshInfoResolvers, null]
+        ];
+        for (const [map2, defaultVal] of allMaps) {
+          const first = map2.entries().next().value;
+          if (first) {
+            map2.delete(first[0]);
+            clearTimeout(first[1].timer);
+            first[1].resolve(defaultVal);
+            break;
+          }
         }
       }
     }
@@ -48777,10 +48715,15 @@ ${peerLines.join(`
         const { id } = args ?? {};
         if (!id)
           return text("message_status: `id` required", true);
-        const client = allClients()[0];
-        if (!client)
+        const clients2 = allClients();
+        if (!clients2.length)
           return text("message_status: not connected", true);
-        const result = await client.messageStatus(id);
+        let result = null;
+        for (const c of clients2) {
+          result = await c.messageStatus(id);
+          if (result)
+            break;
+        }
         if (!result)
           return text(`Message ${id} not found or timed out.`);
         const recipientLines = result.recipients.map((r) => `  - ${r.name} (${r.pubkey.slice(0, 12)}…): ${r.status}`);
@@ -50458,7 +50401,7 @@ init_config();
 // package.json
 var package_default = {
   name: "claudemesh-cli",
-  version: "0.6.4",
+  version: "0.6.6",
   description: "Claude Code MCP client for claudemesh — peer mesh messaging between Claude sessions.",
   keywords: [
     "claude-code",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudemesh-cli",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Claude Code MCP client for claudemesh — peer mesh messaging between Claude sessions.",
   "keywords": [
     "claude-code",