@elizaos/core 1.6.4-alpha.17 → 1.6.4-alpha.19

package/dist/node/index.node.js

@@ -44796,6 +44796,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({
@@ -46136,8 +46154,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()
       };
@@ -46146,7 +46177,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 = {
@@ -47807,5 +47838,5 @@ export {
   AgentRuntime
 };
 
-//# debugId=4E565CEFA615D99864756E2164756E21
+//# debugId=FE7D7B8D69AC4A2264756E2164756E21
 //# sourceMappingURL=index.node.js.map