@elizaos/core 1.6.4-alpha.2 → 1.6.4-alpha.21

package/dist/elizaos.d.ts

@@ -1,4 +1,51 @@
-import type { Character, IAgentRuntime, UUID, Memory, State, Plugin, RuntimeSettings } from './types';
+import type { Character, IAgentRuntime, UUID, Memory, State, Plugin, RuntimeSettings, Content } from './types';
+import type { MessageProcessingResult } from './services/message-service';
+/**
+ * Options for sending a message to an agent
+ */
+export interface SendMessageOptions {
+    /**
+     * Called when the agent generates a response (ASYNC MODE)
+     * If provided, method returns immediately (fire & forget)
+     * If not provided, method waits for response (SYNC MODE)
+     */
+    onResponse?: (content: Content) => Promise<void>;
+    /**
+     * Called if an error occurs during processing
+     */
+    onError?: (error: Error) => Promise<void>;
+    /**
+     * Called when processing is complete
+     */
+    onComplete?: () => Promise<void>;
+    /**
+     * Maximum number of retries for failed messages
+     */
+    maxRetries?: number;
+    /**
+     * Timeout duration in milliseconds
+     */
+    timeoutDuration?: number;
+    /**
+     * Enable multi-step message processing
+     */
+    useMultiStep?: boolean;
+    /**
+     * Maximum multi-step iterations
+     */
+    maxMultiStepIterations?: number;
+}
+/**
+ * Result of sending a message to an agent
+ */
+export interface SendMessageResult {
+    /** ID of the user message */
+    messageId: UUID;
+    /** The user message that was created */
+    userMessage: Memory;
+    /** Processing result (only in SYNC mode) */
+    result?: MessageProcessingResult;
+}
 /**
  * Batch operation for sending messages
  */
@@ -113,29 +160,85 @@ export declare class ElizaOS extends EventTarget {
      */
     getAgentByCharacterId(characterId: UUID): IAgentRuntime | undefined;
     /**
-     * Send a message to a specific agent - THE ONLY WAY to send messages
-     * All message sending (WebSocket, API, CLI, Tests, MessageBus) must use this method
+     * Send a message to a specific agent
+     *
+     * @param agentId - The agent ID to send the message to
+     * @param message - Partial Memory object (missing fields auto-filled)
+     * @param options - Optional callbacks and processing options
+     * @returns Promise with message ID and result
+     *
+     * @example
+     * // SYNC mode (HTTP API)
+     * const result = await elizaOS.sendMessage(agentId, {
+     *   entityId: user.id,
+     *   roomId: room.id,
+     *   content: { text: "Hello", source: 'web' }
+     * });
+     *
+     * @example
+     * // ASYNC mode (WebSocket, MessageBus)
+     * await elizaOS.sendMessage(agentId, {
+     *   entityId: user.id,
+     *   roomId: room.id,
+     *   content: { text: "Hello", source: 'websocket' }
+     * }, {
+     *   onResponse: async (response) => {
+     *     await socket.emit('message', response.text);
+     *   }
+     * });
      */
-    sendMessage(agentId: UUID, message: Memory | string, options?: {
-        userId?: UUID;
-        roomId?: UUID;
-        metadata?: Record<string, any>;
-    }): Promise<Memory[]>;
+    sendMessage(agentId: UUID, message: Partial<Memory> & {
+        entityId: UUID;
+        roomId: UUID;
+        content: Content;
+        worldId?: UUID;
+    }, options?: SendMessageOptions): Promise<SendMessageResult>;
     /**
-     * Send messages to multiple agents (batch operation)
-     * All batch message sending must use this method
+     * Send messages to multiple agents in parallel
+     *
+     * Useful for batch operations where you need to send messages to multiple agents at once.
+     * All messages are sent in parallel for maximum performance.
+     *
+     * @param messages - Array of messages to send, each with agentId and message data
+     * @returns Promise with array of results, one per message
+     *
+     * @example
+     * const results = await elizaOS.sendMessages([
+     *   {
+     *     agentId: agent1Id,
+     *     message: {
+     *       entityId: user.id,
+     *       roomId: room.id,
+     *       content: { text: "Hello Agent 1", source: "web" }
+     *     }
+     *   },
+     *   {
+     *     agentId: agent2Id,
+     *     message: {
+     *       entityId: user.id,
+     *       roomId: room.id,
+     *       content: { text: "Hello Agent 2", source: "web" }
+     *     },
+     *     options: {
+     *       onResponse: async (response) => {
+     *         console.log("Agent 2 responded:", response.text);
+     *       }
+     *     }
+     *   }
+     * ]);
      */
     sendMessages(messages: Array<{
         agentId: UUID;
-        message: Memory | string;
-        options?: {
-            userId?: UUID;
-            roomId?: UUID;
-            metadata?: Record<string, any>;
+        message: Partial<Memory> & {
+            entityId: UUID;
+            roomId: UUID;
+            content: Content;
+            worldId?: UUID;
         };
+        options?: SendMessageOptions;
     }>): Promise<Array<{
         agentId: UUID;
-        responses: Memory[];
+        result: SendMessageResult;
         error?: Error;
     }>>;
     /**

package/dist/elizaos.d.ts.map

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

package/dist/node/index.node.js

@@ -25990,7 +25990,7 @@ var getDefaultProjectName = () => {
 };
 
 // ../../node_modules/langsmith/dist/index.js
-var __version__ = "0.3.74";
+var __version__ = "0.3.75";
 
 // ../../node_modules/langsmith/dist/utils/env.js
 var globalEnv;
@@ -32234,7 +32234,7 @@ class AIMessageChunk extends BaseMessageChunk {
         invalid_tool_calls: [],
         tool_call_chunks: []
       };
-    } else if (fields.tool_call_chunks === undefined) {
+    } else if (fields.tool_call_chunks === undefined || fields.tool_call_chunks.length === 0) {
       initParams = {
         ...fields,
         tool_calls: fields.tool_calls ?? [],
@@ -32243,7 +32243,8 @@ class AIMessageChunk extends BaseMessageChunk {
         usage_metadata: fields.usage_metadata !== undefined ? fields.usage_metadata : undefined
       };
     } else {
-      const groupedToolCallChunks = fields.tool_call_chunks.reduce((acc, chunk) => {
+      const toolCallChunks = fields.tool_call_chunks ?? [];
+      const groupedToolCallChunks = toolCallChunks.reduce((acc, chunk) => {
         const matchedChunkIndex = acc.findIndex(([match]) => {
           if ("id" in chunk && chunk.id && "index" in chunk && chunk.index !== undefined) {
             return chunk.id === match.id && chunk.index === match.index;
@@ -44765,7 +44766,7 @@ class AgentRuntime {
       }
     }
   }
-  async initialize() {
+  async initialize(options) {
     try {
       const pluginRegistrationPromises = [];
       const pluginsToLoad = this.characterPlugins;
@@ -44784,9 +44785,14 @@ class AgentRuntime {
         await this.adapter.init();
       }
       this.messageService = new DefaultMessageService;
-      this.logger.info("Running plugin migrations...");
-      await this.runPluginMigrations();
-      this.logger.info("Plugin migrations completed.");
+      const skipMigrations = options?.skipMigrations ?? false;
+      if (skipMigrations) {
+        this.logger.info("Skipping plugin migrations (skipMigrations=true)");
+      } else {
+        this.logger.info("Running plugin migrations...");
+        await this.runPluginMigrations();
+        this.logger.info("Plugin migrations completed.");
+      }
       const existingAgent = await this.ensureAgentExists({
         ...this.character,
         id: this.agentId
@@ -44795,6 +44801,24 @@ class AgentRuntime {
         const errorMsg = `Agent ${this.agentId} does not exist in database after ensureAgentExists call`;
         throw new Error(errorMsg);
       }
+      if (existingAgent.settings) {
+        this.character.settings = {
+          ...existingAgent.settings,
+          ...this.character.settings
+        };
+        const dbSecrets = existingAgent.settings.secrets && typeof existingAgent.settings.secrets === "object" ? existingAgent.settings.secrets : {};
+        const settingsSecrets = this.character.settings.secrets && typeof this.character.settings.secrets === "object" ? this.character.settings.secrets : {};
+        const characterSecrets = this.character.secrets && typeof this.character.secrets === "object" ? this.character.secrets : {};
+        const mergedSecrets = {
+          ...dbSecrets,
+          ...characterSecrets,
+          ...settingsSecrets
+        };
+        if (Object.keys(mergedSecrets).length > 0) {
+          this.character.secrets = mergedSecrets;
+          this.character.settings.secrets = mergedSecrets;
+        }
+      }
       let agentEntity = await this.getEntityById(this.agentId);
       if (!agentEntity) {
         const created = await this.createEntity({
@@ -46135,8 +46159,21 @@ ${input}`;
     }
     const existingAgent = await this.adapter.getAgent(agent.id);
     if (existingAgent) {
+      const mergedSettings = {
+        ...existingAgent.settings,
+        ...agent.settings
+      };
+      const mergedSecrets = typeof existingAgent.settings?.secrets === "object" || typeof agent.settings?.secrets === "object" ? {
+        ...typeof existingAgent.settings?.secrets === "object" ? existingAgent.settings.secrets : {},
+        ...typeof agent.settings?.secrets === "object" ? agent.settings.secrets : {}
+      } : undefined;
+      if (mergedSecrets) {
+        mergedSettings.secrets = mergedSecrets;
+      }
       const updatedAgent = {
+        ...existingAgent,
         ...agent,
+        settings: mergedSettings,
         id: agent.id,
         updatedAt: Date.now()
       };
@@ -46145,7 +46182,7 @@ ${input}`;
       if (!refreshedAgent) {
         throw new Error(`Failed to retrieve agent after update: ${agent.id}`);
       }
-      this.logger.debug(`Updated existing agent ${agent.id} on restart`);
+      this.logger.debug(`Updated existing agent ${agent.id} on restart (merged ${Object.keys(existingAgent.settings || {}).length} DB settings with ${Object.keys(agent.settings || {}).length} character settings)`);
       return refreshedAgent;
     }
     const newAgent = {
@@ -46535,19 +46572,25 @@ async function loadSecretsNodeImpl(character) {
   const fs = await import("node:fs");
   const dotenv = await import("dotenv");
   const { findEnvFile: findEnvFile2 } = await Promise.resolve().then(() => (init_environment(), exports_environment));
-  if (hasCharacterSecrets(character)) {
-    return false;
-  }
   const envPath = findEnvFile2();
   if (!envPath)
     return false;
   try {
     const buf = fs.readFileSync(envPath);
-    const envSecrets = dotenv.parse(buf);
+    const envVars = dotenv.parse(buf);
     if (!character.settings) {
       character.settings = {};
     }
-    character.settings.secrets = envSecrets;
+    const existingSettings = { ...character.settings };
+    const existingSecrets = character.settings.secrets && typeof character.settings.secrets === "object" ? { ...character.settings.secrets } : {};
+    character.settings = {
+      ...envVars,
+      ...existingSettings
+    };
+    character.settings.secrets = {
+      ...envVars,
+      ...existingSecrets
+    };
     return true;
   } catch {
     return false;
@@ -47147,9 +47190,7 @@ class ElizaOS extends EventTarget {
   async addAgents(agents, options) {
     const promises = agents.map(async (agent) => {
       const character = agent.character;
-      if (!hasCharacterSecrets(character)) {
-        await setDefaultSecretsFromEnv(character);
-      }
+      await setDefaultSecretsFromEnv(character);
       const resolvedPlugins = agent.plugins ? await resolvePlugins(agent.plugins, options?.isTestMode || false) : [];
       const runtime = new AgentRuntime({
         character,
@@ -47280,31 +47321,79 @@ class ElizaOS extends EventTarget {
     if (!runtime) {
       throw new Error(`Agent ${agentId} not found`);
     }
-    const memory = typeof message === "string" ? {
-      id: v4_default(),
-      entityId: options?.userId || "system",
-      agentId,
-      roomId: options?.roomId || agentId,
-      content: { text: message },
-      createdAt: Date.now(),
-      metadata: options?.metadata
-    } : message;
-    const responses = [];
-    await runtime.processActions(memory, responses);
-    this.dispatchEvent(new CustomEvent("message:sent", {
-      detail: { agentId, message: memory, responses }
-    }));
-    return responses;
+    if (!runtime.messageService) {
+      throw new Error("messageService is not initialized on runtime");
+    }
+    const messageId = message.id || v4_default();
+    const userMessage = {
+      ...message,
+      id: messageId,
+      agentId: message.agentId || runtime.agentId,
+      createdAt: message.createdAt || Date.now(),
+      entityId: message.entityId,
+      roomId: message.roomId,
+      content: message.content
+    };
+    await runtime.ensureConnection({
+      entityId: userMessage.entityId,
+      roomId: userMessage.roomId,
+      worldId: message.worldId || userMessage.roomId,
+      source: userMessage.content.source || "unknown",
+      channelId: userMessage.roomId
+    });
+    const processingOptions = {
+      maxRetries: options?.maxRetries,
+      timeoutDuration: options?.timeoutDuration,
+      useMultiStep: options?.useMultiStep,
+      maxMultiStepIterations: options?.maxMultiStepIterations
+    };
+    const isAsyncMode = !!options?.onResponse;
+    if (isAsyncMode) {
+      const callback = async (content) => {
+        try {
+          if (options.onResponse) {
+            await options.onResponse(content);
+          }
+        } catch (error) {
+          if (options.onError) {
+            await options.onError(error instanceof Error ? error : new Error(String(error)));
+          }
+        }
+        return [];
+      };
+      runtime.messageService.handleMessage(runtime, userMessage, callback, processingOptions).then(() => {
+        if (options.onComplete)
+          options.onComplete();
+      }).catch((error) => {
+        if (options.onError)
+          options.onError(error);
+      });
+      this.dispatchEvent(new CustomEvent("message:sent", {
+        detail: { agentId, messageId, mode: "async" }
+      }));
+      return { messageId, userMessage };
+    } else {
+      const result = await runtime.messageService.handleMessage(runtime, userMessage, undefined, processingOptions);
+      if (options?.onComplete)
+        await options.onComplete();
+      this.dispatchEvent(new CustomEvent("message:sent", {
+        detail: { agentId, messageId, mode: "sync", result }
+      }));
+      return { messageId, userMessage, result };
+    }
   }
   async sendMessages(messages) {
     const results = await Promise.all(messages.map(async ({ agentId, message, options }) => {
       try {
-        const responses = await this.sendMessage(agentId, message, options);
-        return { agentId, responses };
+        const result = await this.sendMessage(agentId, message, options);
+        return { agentId, result };
       } catch (error) {
         return {
           agentId,
-          responses: [],
+          result: {
+            messageId: message.id || "",
+            userMessage: message
+          },
           error: error instanceof Error ? error : new Error(String(error))
         };
       }
@@ -47754,5 +47843,5 @@ export {
   AgentRuntime
 };
 
-//# debugId=9B89E2D616BB564964756E2164756E21
+//# debugId=7C69A32469711FD264756E2164756E21
 //# sourceMappingURL=index.node.js.map