@cogitator-ai/swarms 0.4.20 → 0.6.0

package/dist/communication/redis-event-emitter.js

@@ -1,4 +1,5 @@
 import { nanoid } from 'nanoid';
+import { invokeSafely } from '../utils/invoke.js';
 const ATOMIC_PUSH_TRIM_SCRIPT = `
 local key = KEYS[1]
 local maxEvents = tonumber(ARGV[1])
@@ -6,6 +7,17 @@ redis.call('RPUSH', key, ARGV[2])
 redis.call('LTRIM', key, -maxEvents, -1)
 return 1
 `;
+function parseSwarmEvent(raw) {
+    try {
+        const parsed = JSON.parse(raw);
+        if (typeof parsed.type !== 'string' || typeof parsed.timestamp !== 'number')
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
 export class RedisSwarmEventEmitter {
     redis;
     subscriber;
@@ -15,6 +27,7 @@ export class RedisSwarmEventEmitter {
     handlers = new Map();
     localEvents = [];
     instanceId = nanoid(12);
+    initialized = false;
     constructor(options) {
         this.redis = options.redis;
         this.subscriber = options.redis.duplicate();
@@ -28,61 +41,68 @@ export class RedisSwarmEventEmitter {
     channelKey() {
         return `${this.keyPrefix}:${this.swarmId}:events:live`;
     }
+    handleRemoteEvent = (_channel, messageJson) => {
+        try {
+            const envelope = JSON.parse(messageJson);
+            if (envelope._sid === this.instanceId)
+                return;
+            this.recordLocally(envelope.e);
+            this.notifyHandlers(envelope.e);
+        }
+        catch (error) {
+            console.warn('[RedisSwarmEventEmitter] Failed to parse message:', error);
+        }
+    };
     async initialize() {
-        await this.subscriber.subscribe(this.channelKey());
-        this.subscriber.on('message', (_channel, messageJson) => {
-            try {
-                const envelope = JSON.parse(messageJson);
-                if (envelope._sid === this.instanceId)
-                    return;
-                const event = envelope.e;
-                this.localEvents.push(event);
-                if (this.localEvents.length > this.maxEvents) {
-                    this.localEvents = this.localEvents.slice(-this.maxEvents);
-                }
-                this.notifyHandlers(event);
-            }
-            catch (error) {
-                console.warn('[RedisSwarmEventEmitter] Failed to parse message:', error);
-            }
-        });
+        if (this.initialized)
+            return;
+        this.initialized = true;
+        this.subscriber.on('message', this.handleRemoteEvent);
+        try {
+            await this.subscriber.subscribe(this.channelKey());
+        }
+        catch (error) {
+            this.subscriber.off('message', this.handleRemoteEvent);
+            this.initialized = false;
+            throw error;
+        }
     }
     on(event, handler) {
-        if (!this.handlers.has(event)) {
-            this.handlers.set(event, new Set());
+        let handlers = this.handlers.get(event);
+        if (!handlers) {
+            handlers = new Set();
+            this.handlers.set(event, handlers);
         }
-        this.handlers.get(event).add(handler);
+        handlers.add(handler);
         return () => this.off(event, handler);
     }
     once(event, handler) {
         const wrapper = (e) => {
             this.off(event, wrapper);
-            void Promise.resolve(handler(e)).catch((error) => {
-                console.warn('[RedisSwarmEventEmitter] Once handler error:', error);
-            });
+            invokeSafely(handler, [e], '[RedisSwarmEventEmitter] Once handler error');
         };
         return this.on(event, wrapper);
     }
+    /**
+     * Emit an event: local handlers are notified synchronously, persistence and
+     * cross-node publication happen in the background.
+     */
     emit(event, data, agentName) {
-        void this.emitAsync(event, data, agentName).catch((error) => {
+        const swarmEvent = this.createEvent(event, data, agentName);
+        this.recordLocally(swarmEvent);
+        this.notifyHandlers(swarmEvent);
+        void this.persistAndPublish(swarmEvent).catch((error) => {
             console.warn('[RedisSwarmEventEmitter] Emit error:', error);
         });
     }
+    /**
+     * Emit an event and wait until it is persisted in Redis and published to other nodes.
+     */
     async emitAsync(event, data, agentName) {
-        const swarmEvent = {
-            type: event,
-            timestamp: Date.now(),
-            agentName,
-            data,
-        };
-        this.localEvents.push(swarmEvent);
-        if (this.localEvents.length > this.maxEvents) {
-            this.localEvents = this.localEvents.slice(-this.maxEvents);
-        }
-        const eventJson = JSON.stringify(swarmEvent);
-        await this.redis.eval(ATOMIC_PUSH_TRIM_SCRIPT, 1, this.eventsKey(), String(this.maxEvents), eventJson);
-        const envelope = JSON.stringify({ _sid: this.instanceId, e: swarmEvent });
-        await this.redis.publish(this.channelKey(), envelope);
+        const swarmEvent = this.createEvent(event, data, agentName);
+        this.recordLocally(swarmEvent);
+        this.notifyHandlers(swarmEvent);
+        await this.persistAndPublish(swarmEvent);
     }
     off(event, handler) {
         const handlers = this.handlers.get(event);
@@ -106,7 +126,13 @@ export class RedisSwarmEventEmitter {
     }
     async getEventsAsync() {
         const raw = await this.redis.lrange(this.eventsKey(), 0, -1);
-        return raw.map((r) => JSON.parse(r));
+        const events = [];
+        for (const entry of raw) {
+            const parsed = parseSwarmEvent(entry);
+            if (parsed)
+                events.push(parsed);
+        }
+        return events;
     }
     getEventsByType(type) {
         return this.localEvents.filter((e) => e.type === type);
@@ -122,26 +148,42 @@ export class RedisSwarmEventEmitter {
         this.localEvents = [];
     }
     async close() {
-        this.subscriber.removeAllListeners('message');
+        this.subscriber.off('message', this.handleRemoteEvent);
+        this.initialized = false;
+        if (this.subscriber.status === 'end')
+            return;
+        if (this.subscriber.status === 'wait') {
+            this.subscriber.disconnect();
+            return;
+        }
         await this.subscriber.unsubscribe();
         await this.subscriber.quit();
     }
+    createEvent(event, data, agentName) {
+        return {
+            type: event,
+            timestamp: Date.now(),
+            agentName,
+            data,
+        };
+    }
+    recordLocally(event) {
+        this.localEvents.push(event);
+        if (this.localEvents.length > this.maxEvents) {
+            this.localEvents = this.localEvents.slice(-this.maxEvents);
+        }
+    }
+    async persistAndPublish(event) {
+        await this.redis.eval(ATOMIC_PUSH_TRIM_SCRIPT, 1, this.eventsKey(), String(this.maxEvents), JSON.stringify(event));
+        const envelope = { _sid: this.instanceId, e: event };
+        await this.redis.publish(this.channelKey(), JSON.stringify(envelope));
+    }
     notifyHandlers(event) {
-        const handlers = this.handlers.get(event.type);
-        if (handlers) {
-            for (const handler of handlers) {
-                void Promise.resolve(handler(event)).catch((error) => {
-                    console.warn('[RedisSwarmEventEmitter] Handler error:', error);
-                });
-            }
+        for (const handler of [...(this.handlers.get(event.type) ?? [])]) {
+            invokeSafely(handler, [event], '[RedisSwarmEventEmitter] Handler error');
         }
-        const wildcardHandlers = this.handlers.get('*');
-        if (wildcardHandlers) {
-            for (const handler of wildcardHandlers) {
-                void Promise.resolve(handler(event)).catch((error) => {
-                    console.warn('[RedisSwarmEventEmitter] Wildcard handler error:', error);
-                });
-            }
+        for (const handler of [...(this.handlers.get('*') ?? [])]) {
+            invokeSafely(handler, [event], '[RedisSwarmEventEmitter] Wildcard handler error');
         }
     }
 }

package/dist/communication/redis-event-emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-event-emitter.js","sourceRoot":"","sources":["../../src/communication/redis-event-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgBhC,MAAM,uBAAuB,GAAG;;;;;;CAM/B,CAAC;AAEF,MAAM,OAAO,sBAAsB;IACzB,KAAK,CAAQ;IACb,UAAU,CAAQ;IAClB,OAAO,CAAS;IAChB,SAAS,CAAS;IAClB,SAAS,CAAS;IAClB,QAAQ,GAAG,IAAI,GAAG,EAAgD,CAAC;IACnE,WAAW,GAAiB,EAAE,CAAC;IACtB,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IAEzC,YAAY,OAAiC;QAC3C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;IAC7C,CAAC;IAEO,SAAS;QACf,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,SAAS,CAAC;IACpD,CAAC;IAEO,UAAU;QAChB,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,cAAc,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE;YACtD,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAoC,CAAC;gBAC5E,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU;oBAAE,OAAO;gBAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC;gBACzB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC7C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC7D,CAAC;gBACD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,EAAE,CAAC,KAA2B,EAAE,OAA0B;QACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEvC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,KAA2B,EAAE,OAA0B;QAC1D,MAAM,OAAO,GAAsB,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACzB,KAAK,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/C,OAAO,CAAC,IAAI,CAAC,8CAA8C,EAAE,KAAK,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,KAAqB,EAAE,IAAc,EAAE,SAAkB;QAC5D,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1D,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAqB,EAAE,IAAc,EAAE,SAAkB;QACvE,MAAM,UAAU,GAAe;YAC7B,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,SAAS;YACT,IAAI;SACL,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CACnB,uBAAuB,EACvB,CAAC,EACD,IAAI,CAAC,SAAS,EAAE,EAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EACtB,SAAS,CACV,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,KAA2B,EAAE,OAA0B;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,KAAsB;QACvC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAe,CAAC,CAAC;IACrD,CAAC;IAED,eAAe,CAAC,IAAoB;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,gBAAgB,CAAC,SAAiB;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;IACnE,CAAC;IAED,WAAW;QACT,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAEO,cAAc,CAAC,KAAiB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,KAAK,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACnD,OAAO,CAAC,IAAI,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;gBACjE,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;gBACvC,KAAK,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACnD,OAAO,CAAC,IAAI,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;gBAC1E,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"redis-event-emitter.js","sourceRoot":"","sources":["../../src/communication/redis-event-emitter.ts"],"names":[],"mappings":"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"}

package/dist/communication/redis-message-bus.d.ts

@@ -1,36 +1,41 @@
-import type { MessageBus, MessageBusConfig, SwarmMessage } from '@cogitator-ai/types';
+import type { MessageBusConfig, SwarmMessage } from '@cogitator-ai/types';
 import type { Redis } from 'ioredis';
+import { type MessageListener, type ReadTrackingMessageBus } from './message-bus.js';
 export interface RedisMessageBusOptions {
     redis: Redis;
     swarmId: string;
     keyPrefix?: string;
 }
-export declare class RedisMessageBus implements MessageBus {
+export declare class RedisMessageBus implements ReadTrackingMessageBus {
     private redis;
     private subscriber;
     private swarmId;
     private keyPrefix;
     private config;
     private subscriptions;
-    private agentMessageCounts;
+    private state;
     private localCache;
     private readonly instanceId;
+    private initialized;
     constructor(config: MessageBusConfig, options: RedisMessageBusOptions);
     private messagesKey;
     private channelKey;
+    private readonly handleRemoteMessage;
     initialize(): Promise<void>;
     send(message: Omit<SwarmMessage, 'id' | 'timestamp'>): Promise<SwarmMessage>;
     broadcast(from: string, content: string, channel?: string): Promise<void>;
-    subscribe(agentName: string, handler: (msg: SwarmMessage) => void): () => void;
+    subscribe(agentName: string, handler: MessageListener): () => void;
+    onMessage(listener: MessageListener): () => void;
     getMessages(agentName: string, limit?: number): SwarmMessage[];
     getConversation(agent1: string, agent2: string): SwarmMessage[];
     getAllMessages(): SwarmMessage[];
     getUnreadMessages(agentName: string): SwarmMessage[];
+    markAsRead(agentName: string, messageIds: readonly string[]): void;
     clear(): void;
-    resetTurnCounts(): void;
+    resetTurnCounts(agentName?: string): void;
     close(): Promise<void>;
     syncFromRedis(): Promise<void>;
+    private appendToCache;
     private trimLocalCache;
-    private notifySubscribers;
 }
 //# sourceMappingURL=redis-message-bus.d.ts.map

package/dist/communication/redis-message-bus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-message-bus.d.ts","sourceRoot":"","sources":["../../src/communication/redis-message-bus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAuD;IAC5E,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;gBAE7B,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,sBAAsB;IAQrE,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,UAAU;IAIZ,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB3B,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAiD5E,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/E,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI;IAiB9E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE;IAW9D,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAM/D,cAAc,IAAI,YAAY,EAAE;IAIhC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;IAMpD,KAAK,IAAI,IAAI;IAQb,eAAe,IAAI,IAAI;IAIjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAKpC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,iBAAiB;CAsB1B"}
+{"version":3,"file":"redis-message-bus.d.ts","sourceRoot":"","sources":["../../src/communication/redis-message-bus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAiBD,qBAAa,eAAgB,YAAW,sBAAsB;IAC5D,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAA2C;IAChE,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IACzC,OAAO,CAAC,WAAW,CAAS;gBAEhB,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,sBAAsB;IAQrE,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAelC;IAEI,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAmC5E,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/E,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,IAAI;IAIlE,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAIhD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE;IAW9D,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAM/D,cAAc,IAAI,YAAY,EAAE;IAIhC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;IAMpD,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAIlE,KAAK,IAAI,IAAI;IAQb,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAInC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAYtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;CAQvB"}

package/dist/communication/redis-message-bus.js

@@ -1,4 +1,16 @@
 import { nanoid } from 'nanoid';
+import { MessageBusState, addSubscription, isMessageForAgent, notifyMessageSubscribers, } from './message-bus.js';
+function parseSwarmMessage(raw) {
+    try {
+        const parsed = JSON.parse(raw);
+        if (typeof parsed.id !== 'string' || typeof parsed.from !== 'string')
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
 export class RedisMessageBus {
     redis;
     subscriber;
@@ -6,9 +18,10 @@ export class RedisMessageBus {
     keyPrefix;
     config;
     subscriptions = new Map();
-    agentMessageCounts = new Map();
+    state = new MessageBusState('[RedisMessageBus]');
     localCache = [];
     instanceId = nanoid(12);
+    initialized = false;
     constructor(config, options) {
         this.config = config;
         this.redis = options.redis;
@@ -22,22 +35,32 @@ export class RedisMessageBus {
     channelKey(target) {
         return `${this.keyPrefix}:${this.swarmId}:channel:${target}`;
     }
+    handleRemoteMessage = (_pattern, _channel, messageJson) => {
+        try {
+            const envelope = JSON.parse(messageJson);
+            if (envelope._sid === this.instanceId)
+                return;
+            this.appendToCache(envelope.m);
+            notifyMessageSubscribers(this.subscriptions, envelope.m, '[RedisMessageBus]');
+            this.state.notifyListeners(envelope.m);
+        }
+        catch (error) {
+            console.warn('[RedisMessageBus] Failed to parse message:', error);
+        }
+    };
     async initialize() {
-        await this.subscriber.psubscribe(`${this.keyPrefix}:${this.swarmId}:channel:*`);
-        this.subscriber.on('pmessage', (_pattern, _channel, messageJson) => {
-            try {
-                const envelope = JSON.parse(messageJson);
-                if (envelope._sid === this.instanceId)
-                    return;
-                const message = envelope.m;
-                this.localCache.push(message);
-                this.trimLocalCache();
-                this.notifySubscribers(message);
-            }
-            catch (error) {
-                console.warn('[RedisMessageBus] Failed to parse message:', error);
-            }
-        });
+        if (this.initialized)
+            return;
+        this.initialized = true;
+        this.subscriber.on('pmessage', this.handleRemoteMessage);
+        try {
+            await this.subscriber.psubscribe(`${this.keyPrefix}:${this.swarmId}:channel:*`);
+        }
+        catch (error) {
+            this.subscriber.off('pmessage', this.handleRemoteMessage);
+            this.initialized = false;
+            throw error;
+        }
     }
     async send(message) {
         if (!this.config.enabled) {
@@ -46,34 +69,23 @@ export class RedisMessageBus {
         if (this.config.maxMessageLength && message.content.length > this.config.maxMessageLength) {
             throw new Error(`Message exceeds max length of ${this.config.maxMessageLength} characters`);
         }
-        if (this.config.maxMessagesPerTurn) {
-            const count = this.agentMessageCounts.get(message.from) ?? 0;
-            if (count >= this.config.maxMessagesPerTurn) {
-                throw new Error(`Agent ${message.from} exceeded max messages per turn (${this.config.maxMessagesPerTurn})`);
-            }
-            this.agentMessageCounts.set(message.from, count + 1);
-        }
         if (this.config.maxTotalMessages && this.localCache.length >= this.config.maxTotalMessages) {
             throw new Error(`Max total messages (${this.config.maxTotalMessages}) reached`);
         }
+        this.state.consumeTurnQuota(this.config, message.from);
         const fullMessage = {
             ...message,
             swarmId: this.swarmId,
             id: `msg_${nanoid(12)}`,
             timestamp: Date.now(),
         };
-        const messageJson = JSON.stringify(fullMessage);
-        this.localCache.push(fullMessage);
-        this.trimLocalCache();
-        this.notifySubscribers(fullMessage);
-        void this.redis.rpush(this.messagesKey(), messageJson).catch((error) => {
-            console.warn('[RedisMessageBus] RPUSH error:', error);
-        });
+        this.appendToCache(fullMessage);
+        notifyMessageSubscribers(this.subscriptions, fullMessage, '[RedisMessageBus]');
+        this.state.notifyListeners(fullMessage);
         const target = fullMessage.to === 'broadcast' ? 'broadcast' : fullMessage.to;
-        const envelope = JSON.stringify({ _sid: this.instanceId, m: fullMessage });
-        void this.redis.publish(this.channelKey(target), envelope).catch((error) => {
-            console.warn('[RedisMessageBus] Publish error:', error);
-        });
+        const envelope = { _sid: this.instanceId, m: fullMessage };
+        await this.redis.rpush(this.messagesKey(), JSON.stringify(fullMessage));
+        await this.redis.publish(this.channelKey(target), JSON.stringify(envelope));
         return fullMessage;
     }
     async broadcast(from, content, channel) {
@@ -87,19 +99,10 @@ export class RedisMessageBus {
         });
     }
     subscribe(agentName, handler) {
-        if (!this.subscriptions.has(agentName)) {
-            this.subscriptions.set(agentName, new Set());
-        }
-        this.subscriptions.get(agentName).add(handler);
-        return () => {
-            const handlers = this.subscriptions.get(agentName);
-            if (handlers) {
-                handlers.delete(handler);
-                if (handlers.size === 0) {
-                    this.subscriptions.delete(agentName);
-                }
-            }
-        };
+        return addSubscription(this.subscriptions, agentName, handler);
+    }
+    onMessage(listener) {
+        return this.state.onMessage(listener);
     }
     getMessages(agentName, limit) {
         const relevant = this.localCache.filter((m) => m.to === agentName || m.to === 'broadcast' || m.from === agentName);
@@ -115,53 +118,61 @@ export class RedisMessageBus {
         return [...this.localCache];
     }
     getUnreadMessages(agentName) {
-        return this.localCache.filter((m) => (m.to === agentName || m.to === 'broadcast') && m.from !== agentName);
+        return this.localCache.filter((m) => isMessageForAgent(m, agentName) && !this.state.isRead(agentName, m.id));
+    }
+    markAsRead(agentName, messageIds) {
+        this.state.markAsRead(agentName, messageIds);
     }
     clear() {
         this.localCache = [];
-        this.agentMessageCounts.clear();
+        this.state.clear();
         void this.redis.del(this.messagesKey()).catch((error) => {
             console.warn('[RedisMessageBus] Clear error:', error);
         });
     }
-    resetTurnCounts() {
-        this.agentMessageCounts.clear();
+    resetTurnCounts(agentName) {
+        this.state.resetTurnCounts(agentName);
     }
     async close() {
+        this.subscriber.off('pmessage', this.handleRemoteMessage);
+        this.initialized = false;
+        if (this.subscriber.status === 'end')
+            return;
+        if (this.subscriber.status === 'wait') {
+            this.subscriber.disconnect();
+            return;
+        }
         await this.subscriber.punsubscribe();
         await this.subscriber.quit();
     }
     async syncFromRedis() {
         const rawMessages = await this.redis.lrange(this.messagesKey(), 0, -1);
-        this.localCache = rawMessages.map((raw) => JSON.parse(raw));
-    }
-    trimLocalCache() {
-        if (this.config.maxTotalMessages && this.localCache.length > this.config.maxTotalMessages) {
-            this.localCache = this.localCache.slice(-this.config.maxTotalMessages);
-        }
-    }
-    notifySubscribers(message) {
-        if (message.to !== 'broadcast') {
-            const handlers = this.subscriptions.get(message.to);
-            if (handlers) {
-                for (const handler of handlers) {
-                    void Promise.resolve(handler(message)).catch((error) => {
-                        console.warn('[RedisMessageBus] Handler error:', error);
-                    });
-                }
+        const messages = [];
+        for (const raw of rawMessages) {
+            const parsed = parseSwarmMessage(raw);
+            if (parsed) {
+                messages.push(parsed);
             }
-        }
-        else {
-            for (const [agentName, handlers] of this.subscriptions) {
-                if (agentName !== message.from) {
-                    for (const handler of handlers) {
-                        void Promise.resolve(handler(message)).catch((error) => {
-                            console.warn('[RedisMessageBus] Broadcast handler error:', error);
-                        });
-                    }
-                }
+            else {
+                console.warn('[RedisMessageBus] Skipping malformed message in Redis history');
             }
         }
+        this.localCache = messages;
+        this.trimLocalCache();
+    }
+    appendToCache(message) {
+        if (this.localCache.some((m) => m.id === message.id))
+            return;
+        this.localCache.push(message);
+        this.trimLocalCache();
+    }
+    trimLocalCache() {
+        const max = this.config.maxTotalMessages;
+        if (!max || this.localCache.length <= max)
+            return;
+        const dropped = this.localCache.slice(0, this.localCache.length - max);
+        this.localCache = this.localCache.slice(-max);
+        this.state.forgetMessages(dropped.map((m) => m.id));
     }
 }
 //# sourceMappingURL=redis-message-bus.js.map

package/dist/communication/redis-message-bus.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-message-bus.js","sourceRoot":"","sources":["../../src/communication/redis-message-bus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis-message-bus.js","sourceRoot":"","sources":["../../src/communication/redis-message-bus.ts"],"names":[],"mappings":"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"}

package/dist/coordinator.d.ts

@@ -1,48 +1,14 @@
 /**
- * SwarmCoordinator - Execution engine for multi-agent swarms
+ * SwarmCoordinator - In-process execution engine for multi-agent swarms
  */
 import type { Cogitator } from '@cogitator-ai/core';
-import type { SwarmConfig, SwarmAgent, SwarmAgentMetadata, RunResult, MessageBus, Blackboard, SwarmEventEmitter, SwarmCoordinatorInterface } from '@cogitator-ai/types';
-export declare class SwarmCoordinator implements SwarmCoordinatorInterface {
+import type { SwarmConfig, RunResult } from '@cogitator-ai/types';
+import { SwarmEventEmitterImpl, InMemoryMessageBus, InMemoryBlackboard } from './communication/index.js';
+import { BaseSwarmCoordinator, type AgentRunRequest } from './base-coordinator.js';
+export { computeBackoffDelay, type SwarmRunScope, type AgentRunRequest } from './base-coordinator.js';
+export declare class SwarmCoordinator extends BaseSwarmCoordinator<InMemoryMessageBus, InMemoryBlackboard, SwarmEventEmitterImpl> {
     private cogitator;
-    private config;
-    private agents;
-    private _messageBus;
-    private _blackboard;
-    private _events;
-    private resourceTracker;
-    private circuitBreaker?;
-    private aborted;
-    private paused;
-    private swarmId;
-    private _saveHistory;
     constructor(cogitator: Cogitator, config: SwarmConfig);
-    private initializeAgents;
-    get messageBus(): MessageBus;
-    get blackboard(): Blackboard;
-    get events(): SwarmEventEmitter;
-    setSaveHistory(value: boolean): void;
-    getSwarmId(): string;
-    getAgent(name: string): SwarmAgent | undefined;
-    getAgents(): SwarmAgent[];
-    getAgentsByRole(role: SwarmAgentMetadata['role']): SwarmAgent[];
-    runAgent(agentName: string, input: string, context?: Record<string, unknown>, failoverChain?: Set<string>): Promise<RunResult>;
-    runAgentsParallel(agents: {
-        name: string;
-        input: string;
-        context?: Record<string, unknown>;
-    }[], maxConcurrency?: number): Promise<Map<string, RunResult>>;
-    private handleAgentError;
-    private retryAgentRun;
-    private setAgentState;
-    getResourceUsage(): import("@cogitator-ai/types").SwarmResourceUsage;
-    pause(): void;
-    resume(): void;
-    abort(): void;
-    isAborted(): boolean;
-    isPaused(): boolean;
-    reset(): void;
-    private buildIncomingMessagesContext;
-    private buildNegotiationContext;
+    protected executeRun(request: AgentRunRequest): Promise<RunResult>;
 }
 //# sourceMappingURL=coordinator.d.ts.map