agent-comms 2.21.8 → 2.21.10

package/.claude-plugin/marketplace.json

@@ -15,7 +15,7 @@
         "url": "https://github.com/ExaDev/agent-comms.git"
       },
       "description": "Cross-harness LLM agent communication mesh — rooms, DMs, and presence",
-      "version": "2.21.8"
+      "version": "2.21.10"
     }
   ]
 }

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-comms",
   "description": "Cross-harness LLM agent communication mesh — rooms, DMs, and presence",
-  "version": "2.21.8",
+  "version": "2.21.10",
   "author": {
     "name": "ExaDev"
   },

package/README.md

@@ -2,7 +2,7 @@
 
 [![GitHub](https://img.shields.io/badge/GitHub-181717?logo=github&logoColor=white)](https://github.com/ExaDev/agent-comms)
 [![npm](https://img.shields.io/badge/npm-CB3837?logo=npm&logoColor=white)](https://www.npmjs.com/package/agent-comms)
-[![version](https://img.shields.io/badge/version-2.21.8-blue)](https://github.com/ExaDev/agent-comms/releases/tag/v2.21.8)
+[![version](https://img.shields.io/badge/version-2.21.10-blue)](https://github.com/ExaDev/agent-comms/releases/tag/v2.21.10)
 [![CI](https://img.shields.io/github/actions/workflow/status/ExaDev/agent-comms/ci.yml?branch=main)](https://github.com/ExaDev/agent-comms/actions)
 
 Cross-harness communication mesh for LLM agents: rooms, DMs, presence, and visibility over TCP with zero filesystem dependencies.

package/dist/test/mesh-store-shared.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mesh-store-shared.test.d.ts.map

package/dist/test/mesh-store-shared.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mesh-store-shared.test.d.ts","sourceRoot":"","sources":["../../src/test/mesh-store-shared.test.ts"],"names":[],"mappings":""}

package/dist/test/mesh-store-shared.test.js

@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+import { mergeMessageHistories, ROOM_TOKEN_LIFETIME_MS, } from "../core/mesh-store-shared.js";
+const DAYS = 30;
+const HOURS_PER_DAY = 24;
+const MINUTES_PER_HOUR = 60;
+const SECONDS_PER_MINUTE = 60;
+const MS_PER_SECOND = 1000;
+describe("ROOM_TOKEN_LIFETIME_MS", () => {
+    it("is exactly 30 days, in milliseconds", () => {
+        expect(ROOM_TOKEN_LIFETIME_MS).toBe(DAYS *
+            HOURS_PER_DAY *
+            MINUTES_PER_HOUR *
+            SECONDS_PER_MINUTE *
+            MS_PER_SECOND);
+    });
+});
+function msg(id, readBy = []) {
+    return { id, readBy: [...readBy] };
+}
+describe("mergeMessageHistories", () => {
+    it("appends an incoming entry the local list does not have", () => {
+        const merged = mergeMessageHistories([msg("a")], [msg("b")]);
+        expect(merged.map((m) => m.id)).toEqual(["a", "b"]);
+    });
+    it("appends multiple new entries in incoming order", () => {
+        const merged = mergeMessageHistories([msg("a")], [msg("b"), msg("c")]);
+        expect(merged.map((m) => m.id)).toEqual(["a", "b", "c"]);
+    });
+    it("preserves local ordering -- new entries are appended, not inserted", () => {
+        const merged = mergeMessageHistories([msg("a"), msg("z")], [msg("m")]);
+        expect(merged.map((m) => m.id)).toEqual(["a", "z", "m"]);
+    });
+    it("unions a new reader onto an existing entry's readBy", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"])], [msg("a", ["u2"])]);
+        expect(merged[0]?.readBy.sort()).toEqual(["u1", "u2"]);
+    });
+    it("does not duplicate a reader already present locally", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"])], [msg("a", ["u1"])]);
+        expect(merged[0]?.readBy).toEqual(["u1"]);
+    });
+    it("unions several readers from one incoming entry", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"])], [msg("a", ["u1", "u2", "u3"])]);
+        expect(merged[0]?.readBy.sort()).toEqual(["u1", "u2", "u3"]);
+    });
+    it("leaves an existing entry's readBy untouched when incoming has none", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"])], [msg("a", [])]);
+        expect(merged[0]?.readBy).toEqual(["u1"]);
+    });
+    it("does not grow the merged length for an already-known entry", () => {
+        const merged = mergeMessageHistories([msg("a")], [msg("a")]);
+        expect(merged).toHaveLength(1);
+    });
+    it("handles an empty incoming list as a no-op, returning an equivalent copy", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"])], []);
+        expect(merged).toEqual([msg("a", ["u1"])]);
+    });
+    it("handles an empty local list, returning everything incoming", () => {
+        const merged = mergeMessageHistories([], [msg("a"), msg("b")]);
+        expect(merged.map((m) => m.id)).toEqual(["a", "b"]);
+    });
+    it("merges a mix of new and existing entries in one call", () => {
+        const merged = mergeMessageHistories([msg("a", ["u1"]), msg("b", [])], [msg("a", ["u2"]), msg("c", ["u3"])]);
+        expect(merged.map((m) => m.id)).toEqual(["a", "b", "c"]);
+        expect(merged[0]?.readBy.sort()).toEqual(["u1", "u2"]);
+        expect(merged[1]?.readBy).toEqual([]);
+        expect(merged[2]?.readBy).toEqual(["u3"]);
+    });
+    it("does not mutate either input array", () => {
+        const local = [msg("a", ["u1"])];
+        const incoming = [msg("a", ["u2"]), msg("b")];
+        mergeMessageHistories(local, incoming);
+        expect(local).toEqual([msg("a", ["u1"])]);
+        expect(incoming).toEqual([msg("a", ["u2"]), msg("b")]);
+    });
+    it("does not mutate an existing local entry's own readBy array in place", () => {
+        const originalEntry = msg("a", ["u1"]);
+        const local = [originalEntry];
+        mergeMessageHistories(local, [msg("a", ["u2"])]);
+        // The merged result's entry for "a" must be a distinct object/array from the one still referenced by the caller's own original local list -- otherwise a caller holding onto its own pre-merge array would see readers silently appear in it too.
+        expect(originalEntry.readBy).toEqual(["u1"]);
+    });
+    it("unions two same-id entries within one incoming batch into a single merged entry, not a duplicate", () => {
+        // A brand-new id appearing twice in the same incoming batch is the one case where the freshly-added entry must be looked up again within the same call, not just against local's own pre-existing entries -- proves the id-to-entry index is kept in sync as new entries are added mid-merge, not only seeded from local up front.
+        const merged = mergeMessageHistories([], [msg("a", ["u1"]), msg("a", ["u2"])]);
+        expect(merged.map((m) => m.id)).toEqual(["a"]);
+        expect(merged[0]?.readBy.sort()).toEqual(["u1", "u2"]);
+    });
+});
+//# sourceMappingURL=mesh-store-shared.test.js.map

package/dist/test/mesh-store-shared.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mesh-store-shared.test.js","sourceRoot":"","sources":["../../src/test/mesh-store-shared.test.ts"],"names":[],"mappings":"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"}

package/dist/test/wire-mesh-transport-shutdown-unref.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * WireMeshTransport shutdown()/unref() -- direct mechanism assertions, split out of wire-mesh-transport.test.ts to stay under this repo's max-lines cap. Existing shutdown coverage in the sibling file proves observable, cross-peer behaviour (B sees A's session close, a second decision finds nothing pending). These tests instead assert directly on the specific cleanup mechanisms shutdown() itself performs -- the underlying Map/Set.clear() calls, timer cancellations, and listener unref() calls -- so a mutation removing one of those calls fails here even when nothing was ever added to the collection it clears, which no behavioural assertion downstream of an empty collection could otherwise observe.
+ */
+export {};
+//# sourceMappingURL=wire-mesh-transport-shutdown-unref.test.d.ts.map

package/dist/test/wire-mesh-transport-shutdown-unref.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wire-mesh-transport-shutdown-unref.test.d.ts","sourceRoot":"","sources":["../../src/test/wire-mesh-transport-shutdown-unref.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/test/wire-mesh-transport-shutdown-unref.test.js

@@ -0,0 +1,194 @@
+/**
+ * WireMeshTransport shutdown()/unref() -- direct mechanism assertions, split out of wire-mesh-transport.test.ts to stay under this repo's max-lines cap. Existing shutdown coverage in the sibling file proves observable, cross-peer behaviour (B sees A's session close, a second decision finds nothing pending). These tests instead assert directly on the specific cleanup mechanisms shutdown() itself performs -- the underlying Map/Set.clear() calls, timer cancellations, and listener unref() calls -- so a mutation removing one of those calls fails here even when nothing was ever added to the collection it clears, which no behavioural assertion downstream of an empty collection could otherwise observe.
+ */
+import * as net from "node:net";
+import { test, describe, expect, vi } from "vitest";
+import { createTlsTransport } from "wire-mesh-core/adapters/tls-transport";
+import { acceptMeshSession } from "wire-mesh-core/domain/mesh-session";
+import { generateIdentity } from "../core/identity.js";
+import { toIdentityPort } from "../core/wire-mesh-identity.js";
+import { WireMeshTransport, DOMAIN, FRAME_SCOPE, buildCommand, } from "../core/wire-mesh-transport.js";
+import { deviceIdToHex } from "wire-mesh-core/domain/device-id";
+import { waitFor } from "./test-transport.js";
+function noopEvents(overrides = {}) {
+    return {
+        onMessage: () => undefined,
+        onPeerConnected: () => undefined,
+        onPeerDisconnected: () => undefined,
+        onIntroduction: () => undefined,
+        onConnectionRequest: () => undefined,
+        onPeerList: () => undefined,
+        onPeerJoined: () => undefined,
+        onBecomeCoordinator: () => undefined,
+        onRevocationAnnounce: () => undefined,
+        onPresenceAdvert: () => undefined,
+        ...overrides,
+    };
+}
+async function findFreePort() {
+    return new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.listen(0, "127.0.0.1", () => {
+            const addr = server.address();
+            const port = typeof addr === "object" && addr !== null ? addr.port : 0;
+            server.close(() => resolve(port));
+        });
+        server.on("error", reject);
+    });
+}
+async function peerId(identity) {
+    return deviceIdToHex(Uint8Array.from(identity.deviceId));
+}
+// pendingConnections, peerSessions, coordinatorListeners -- the three Maps shutdown() clears.
+const SHUTDOWN_MAP_CLEAR_COUNT = 3;
+describe("WireMeshTransport shutdown -- direct mechanism assertions", () => {
+    test("shutdown clears every internal bookkeeping collection, even when all of them are already empty", async () => {
+        const identity = generateIdentity();
+        const transport = new WireMeshTransport(noopEvents(), identity);
+        const mapClearSpy = vi.spyOn(Map.prototype, "clear");
+        const setClearSpy = vi.spyOn(Set.prototype, "clear");
+        try {
+            await transport.shutdown();
+            // dataDials, allSessions (Sets) + pendingConnections, peerSessions, coordinatorListeners (Maps) -- five distinct collections shutdown() is documented to clear, regardless of whether any of them held anything.
+            expect(setClearSpy.mock.calls.length).toBeGreaterThanOrEqual(2);
+            expect(mapClearSpy.mock.calls.length).toBeGreaterThanOrEqual(SHUTDOWN_MAP_CLEAR_COUNT);
+        }
+        finally {
+            mapClearSpy.mockRestore();
+            setClearSpy.mockRestore();
+        }
+    });
+    test("shutdown cancels the pending-connection timeout for every still-pending connect_request, not just its own reject response", async () => {
+        const identityA = generateIdentity();
+        const identityB = generateIdentity();
+        const idB = await peerId(await toIdentityPort(identityB));
+        const requestsSeenByA = [];
+        const transportA = new WireMeshTransport(noopEvents({
+            onConnectionRequest: (h) => void requestsSeenByA.push(h),
+        }), identityA);
+        const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
+        try {
+            await transportA.becomeCoordinator("127.0.0.1", 0);
+            const [listener] = transportA.listListeners();
+            if (listener === undefined)
+                throw new Error("expected a bound listener");
+            const clientTransport = createTlsTransport({
+                certificatePem: identityB.certificate,
+                privateKeyPem: identityB.privateKey,
+            });
+            const connection = await clientTransport.connect(`127.0.0.1:${String(listener.port)}`);
+            const clientIdentityPort = await toIdentityPort(identityB);
+            const session = await acceptMeshSession(connection, clientIdentityPort, [
+                DOMAIN,
+            ]);
+            void session
+                .sendManageRequest(buildCommand({
+                method: "connect_request",
+                peerId: idB,
+                dataPort: 0,
+                name: "connector",
+                fingerprint: "",
+            }), FRAME_SCOPE)
+                .catch(() => undefined);
+            await waitFor(() => requestsSeenByA.some((h) => h.id === idB), "A observes the pending connect_request");
+            clearTimeoutSpy.mockClear();
+            await transportA.shutdown();
+            expect(clearTimeoutSpy).toHaveBeenCalled();
+            await session.close();
+        }
+        finally {
+            clearTimeoutSpy.mockRestore();
+            await transportA.shutdown();
+        }
+    });
+    test("shutdown clears the presence-readvertise interval when one was started", async () => {
+        const identity = generateIdentity();
+        const clearIntervalSpy = vi.spyOn(global, "clearInterval");
+        try {
+            const transport = new WireMeshTransport(noopEvents(), identity, undefined, undefined, () => "active");
+            clearIntervalSpy.mockClear();
+            await transport.shutdown();
+            expect(clearIntervalSpy).toHaveBeenCalledTimes(1);
+        }
+        finally {
+            clearIntervalSpy.mockRestore();
+        }
+    });
+    test("shutdown does not call clearInterval at all when no presence source was ever configured", async () => {
+        const identity = generateIdentity();
+        const clearIntervalSpy = vi.spyOn(global, "clearInterval");
+        try {
+            const transport = new WireMeshTransport(noopEvents(), identity);
+            clearIntervalSpy.mockClear();
+            await transport.shutdown();
+            expect(clearIntervalSpy).not.toHaveBeenCalled();
+        }
+        finally {
+            clearIntervalSpy.mockRestore();
+        }
+    });
+    test("a connect_request left unanswered past the configured timeout is auto-rejected with the documented error code", async () => {
+        const identityA = generateIdentity();
+        const identityB = generateIdentity();
+        const idB = await peerId(await toIdentityPort(identityB));
+        const SHORT_TIMEOUT_MS = 150;
+        const transportA = new WireMeshTransport(noopEvents(), identityA, undefined, SHORT_TIMEOUT_MS);
+        const transportB = new WireMeshTransport(noopEvents(), identityB);
+        try {
+            await transportA.becomeCoordinator("127.0.0.1", 0);
+            const [listener] = transportA.listListeners();
+            if (listener === undefined)
+                throw new Error("expected a bound listener");
+            const clientTransport = createTlsTransport({
+                certificatePem: identityB.certificate,
+                privateKeyPem: identityB.privateKey,
+            });
+            const connection = await clientTransport.connect(`127.0.0.1:${String(listener.port)}`);
+            const clientIdentityPort = await toIdentityPort(identityB);
+            const session = await acceptMeshSession(connection, clientIdentityPort, [
+                DOMAIN,
+            ]);
+            const outcome = await session.sendManageRequest(buildCommand({
+                method: "connect_request",
+                peerId: idB,
+                dataPort: 0,
+                name: "connector",
+                fingerprint: "",
+            }), FRAME_SCOPE);
+            expect(outcome).toMatchObject({ result: "error", code: "timeout" });
+            await session.close();
+        }
+        finally {
+            await transportB.shutdown();
+            await transportA.shutdown();
+        }
+    });
+});
+describe("WireMeshTransport unref", () => {
+    test("unrefs the data listener and every coordinator listener, not just one of them", async () => {
+        const identity = generateIdentity();
+        const transport = new WireMeshTransport(noopEvents(), identity);
+        const unrefSpy = vi.spyOn(net.Server.prototype, "unref");
+        try {
+            await transport.startDataServer();
+            const port = await findFreePort();
+            await transport.addListener("127.0.0.1", port, "full");
+            unrefSpy.mockClear();
+            transport.unref();
+            // The data listener plus exactly one added coordinator listener -- two distinct real net.Server instances, each individually unref'd.
+            expect(unrefSpy).toHaveBeenCalledTimes(2);
+        }
+        finally {
+            unrefSpy.mockRestore();
+            await transport.shutdown();
+        }
+    });
+    test("unref with no listeners started at all is a safe no-op, not a throw", async () => {
+        const identity = generateIdentity();
+        const transport = new WireMeshTransport(noopEvents(), identity);
+        expect(() => {
+            transport.unref();
+        }).not.toThrow();
+    });
+});
+//# sourceMappingURL=wire-mesh-transport-shutdown-unref.test.js.map

package/dist/test/wire-mesh-transport-shutdown-unref.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wire-mesh-transport-shutdown-unref.test.js","sourceRoot":"","sources":["../../src/test/wire-mesh-transport-shutdown-unref.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-comms",
-  "version": "2.21.8",
+  "version": "2.21.10",
   "description": "Cross-harness communication mesh for LLM agents — rooms, DMs, presence, and real-time push delivery over TCP",
   "type": "module",
   "packageManager": "pnpm@12.4.1+sha512.2e81e399d73fe8390dab25e06aa788ab7a5908248d2f5a370f82b481147a6a7a367bf8048f9a6fdb6460f21a66f0542dedb8b94ca2c8723596741920b1656d4c",