@cogitator-ai/swarms 0.4.20 → 0.6.0

package/dist/tools/messaging.js

@@ -3,7 +3,57 @@
  */
 import { z } from 'zod';
 import { tool } from '@cogitator-ai/core';
-export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
+import { isMessageForAgent, isReadTrackingMessageBus } from '../communication/message-bus.js';
+import { readHierarchyPolicy } from '../shared/hierarchy.js';
+/**
+ * Enforce the hierarchical communication policy published by the hierarchical strategy:
+ * workers may only talk to each other when `workerCommunication` is enabled and
+ * `routeThrough` is `'direct'`.
+ */
+export function createHierarchyMessageAuthorizer(coordinator, blackboard, currentAgent) {
+    return (to) => {
+        const policy = readHierarchyPolicy(blackboard);
+        if (!policy)
+            return null;
+        const isWorker = (name) => coordinator.getAgent(name)?.metadata.role === 'worker';
+        if (!isWorker(currentAgent))
+            return null;
+        if (to === 'broadcast') {
+            return policy.workerCommunication && policy.routeThrough === 'direct'
+                ? null
+                : `Workers cannot broadcast; send your message to ${policy.supervisor}`;
+        }
+        if (!isWorker(to))
+            return null;
+        if (!policy.workerCommunication) {
+            return `Workers cannot message each other; send your message to ${policy.supervisor}`;
+        }
+        if (policy.routeThrough !== 'direct') {
+            return `Worker messages must be routed through ${policy.supervisor}`;
+        }
+        return null;
+    };
+}
+function toMessageView(m) {
+    return {
+        id: m.id,
+        from: m.from,
+        content: m.content,
+        channel: m.channel,
+        timestamp: m.timestamp,
+        type: m.type,
+    };
+}
+export function createMessagingTools(messageBus, currentAgent, swarmId = '', options = {}) {
+    const replyTimeout = options.replyTimeout ?? 30000;
+    const markRead = (messages) => {
+        if (!isReadTrackingMessageBus(messageBus))
+            return;
+        const incoming = messages.filter((m) => isMessageForAgent(m, currentAgent));
+        if (incoming.length > 0) {
+            messageBus.markAsRead(currentAgent, incoming.map((m) => m.id));
+        }
+    };
     const sendMessage = tool({
         name: 'send_message',
         description: 'Send a message to another agent in the swarm',
@@ -17,6 +67,13 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
                 .describe('Whether to wait for a response (default: false)'),
         }),
         execute: async ({ to, message, channel, waitForReply }) => {
+            if (to === currentAgent) {
+                return { sent: false, error: 'You cannot send a message to yourself' };
+            }
+            const refusal = options.authorize?.(to);
+            if (refusal) {
+                return { sent: false, error: refusal };
+            }
             const msg = await messageBus.send({
                 swarmId,
                 from: currentAgent,
@@ -25,35 +82,15 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
                 content: message,
                 channel,
             });
-            if (waitForReply) {
-                const maxWait = 30000;
-                const pollInterval = 500;
-                let waited = 0;
-                while (waited < maxWait) {
-                    const messages = messageBus.getMessages(currentAgent);
-                    const reply = messages.find((m) => m.from === to && m.type === 'response' && m.metadata?.correlationId === msg.id);
-                    if (reply) {
-                        return {
-                            sent: true,
-                            messageId: msg.id,
-                            reply: reply.content,
-                            replyId: reply.id,
-                        };
-                    }
-                    await new Promise((r) => setTimeout(r, pollInterval));
-                    waited += pollInterval;
-                }
-                return {
-                    sent: true,
-                    messageId: msg.id,
-                    reply: null,
-                    timeout: true,
-                };
+            if (!waitForReply) {
+                return { sent: true, messageId: msg.id };
             }
-            return {
-                sent: true,
-                messageId: msg.id,
-            };
+            const reply = await waitForCorrelatedReply(messageBus, currentAgent, to, msg.id, replyTimeout);
+            if (!reply) {
+                return { sent: true, messageId: msg.id, reply: null, timeout: true };
+            }
+            markRead([reply]);
+            return { sent: true, messageId: msg.id, reply: reply.content, replyId: reply.id };
         },
     });
     const readMessages = tool({
@@ -75,17 +112,12 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
             if (channel) {
                 messages = messages.filter((m) => m.channel === channel);
             }
-            messages = messages.slice(0, limit);
+            const count = Math.max(0, Math.floor(limit));
+            messages = unreadOnly ? messages.slice(0, count) : count > 0 ? messages.slice(-count) : [];
+            markRead(messages);
             return {
                 count: messages.length,
-                messages: messages.map((m) => ({
-                    id: m.id,
-                    from: m.from,
-                    content: m.content,
-                    channel: m.channel,
-                    timestamp: m.timestamp,
-                    type: m.type,
-                })),
+                messages: messages.map(toMessageView),
             };
         },
     });
@@ -97,7 +129,18 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
             channel: z.string().optional().describe('Optional channel for message categorization'),
         }),
         execute: async ({ message, channel }) => {
-            await messageBus.broadcast(currentAgent, message, channel);
+            const refusal = options.authorize?.('broadcast');
+            if (refusal) {
+                return { broadcasted: false, error: refusal };
+            }
+            await messageBus.send({
+                swarmId,
+                from: currentAgent,
+                to: 'broadcast',
+                type: 'notification',
+                content: message,
+                channel,
+            });
             return {
                 broadcasted: true,
                 from: currentAgent,
@@ -113,22 +156,31 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
             message: z.string().describe('The reply content'),
         }),
         execute: async ({ originalMessageId, message }) => {
-            const allMessages = messageBus.getMessages(currentAgent);
-            const original = allMessages.find((m) => m.id === originalMessageId);
+            const original = messageBus.getMessages(currentAgent).find((m) => m.id === originalMessageId);
             if (!original) {
                 return {
                     success: false,
                     error: 'Original message not found',
                 };
             }
+            if (original.from === currentAgent) {
+                return { success: false, error: 'You cannot reply to your own message' };
+            }
+            const refusal = options.authorize?.(original.from);
+            if (refusal) {
+                return { success: false, error: refusal };
+            }
             const reply = await messageBus.send({
                 swarmId,
                 from: currentAgent,
                 to: original.from,
                 type: 'response',
                 content: message,
+                replyTo: originalMessageId,
+                correlationId: originalMessageId,
                 metadata: { correlationId: originalMessageId },
             });
+            markRead([original]);
             return {
                 success: true,
                 replyId: reply.id,
@@ -143,4 +195,29 @@ export function createMessagingTools(messageBus, currentAgent, swarmId = '') {
         replyToMessage,
     };
 }
+function isReplyTo(message, from, requestId) {
+    if (message.from !== from || message.type !== 'response')
+        return false;
+    return (message.correlationId === requestId ||
+        message.replyTo === requestId ||
+        message.metadata?.correlationId === requestId);
+}
+function waitForCorrelatedReply(messageBus, currentAgent, from, requestId, timeoutMs) {
+    const existing = messageBus.getMessages(currentAgent).find((m) => isReplyTo(m, from, requestId));
+    if (existing)
+        return Promise.resolve(existing);
+    return new Promise((resolve) => {
+        const timer = setTimeout(() => {
+            unsubscribe();
+            resolve(null);
+        }, timeoutMs);
+        const unsubscribe = messageBus.subscribe(currentAgent, (message) => {
+            if (!isReplyTo(message, from, requestId))
+                return;
+            clearTimeout(timer);
+            unsubscribe();
+            resolve(message);
+        });
+    });
+}
 //# sourceMappingURL=messaging.js.map

package/dist/tools/messaging.js.map

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

package/dist/tools/negotiation.d.ts

@@ -5,7 +5,7 @@ export declare function createNegotiationTools(blackboard: Blackboard, events: S
         terms: {
             termId: string;
             label: string;
-            value: unknown;
+            value: string | number | boolean;
             negotiable: boolean;
             priority: number;
             range?: {
@@ -35,7 +35,7 @@ export declare function createNegotiationTools(blackboard: Blackboard, events: S
         modifiedTerms: {
             termId: string;
             label: string;
-            value: unknown;
+            value: string | number | boolean;
             negotiable: boolean;
             priority: number;
             range?: {
@@ -72,12 +72,16 @@ export declare function createNegotiationTools(blackboard: Blackboard, events: S
         acceptedTerms?: undefined;
         from?: undefined;
         round?: undefined;
+        fullyAccepted?: undefined;
+        awaitingAcceptanceFrom?: undefined;
     } | {
         success: boolean;
         offerId: string;
         acceptedTerms: string[];
         from: string;
         round: number;
+        fullyAccepted: boolean;
+        awaitingAcceptanceFrom: string[];
         error?: undefined;
     }>;
     rejectOffer: import("@cogitator-ai/types").Tool<{
@@ -199,14 +203,14 @@ export declare function createNegotiationTools(blackboard: Blackboard, events: S
         name: string;
         members: string[];
         combinedWeight: number;
-        status: "forming" | "active";
+        status: "active" | "forming" | "dissolved";
         error?: undefined;
     }>;
     declareInterests: import("@cogitator-ai/types").Tool<{
         interests: {
             termId: string;
             label: string;
-            value: unknown;
+            value: string | number | boolean;
             negotiable: boolean;
             priority: number;
             range?: {

package/dist/tools/negotiation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"negotiation.d.ts","sourceRoot":"","sources":["../../src/tools/negotiation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EAGjB,eAAe,EACf,WAAW,EAEX,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAqC7B,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,MAAM,EACpB,WAAW,SAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8hBhB;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"negotiation.d.ts","sourceRoot":"","sources":["../../src/tools/negotiation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EAGjB,eAAe,EACf,WAAW,EAEX,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAmD7B,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,MAAM,EACpB,WAAW,SAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAglBhB;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC"}