Merge branch 'develop' into develop

Author: wtfsayo

.env.example

@@ -257,6 +257,13 @@ TOGETHER_API_KEY=               # Together API Key
 #### Crypto Plugin Configurations ####
 ######################################
 
+# CoinMarketCap / CMC
+COINMARKETCAP_API_KEY=
+
+# CoinGecko
+COINGECKO_API_KEY=
+COINGECKO_PRO_API_KEY=
+
 # EVM
 EVM_PRIVATE_KEY=
 EVM_PROVIDER_URL=
@@ -434,6 +441,8 @@ GIPHY_API_KEY=
 # OpenWeather
 OPEN_WEATHER_API_KEY=           # OpenWeather API key
 
+
+
 # EchoChambers Configuration
 ECHOCHAMBERS_API_URL=http://127.0.0.1:3333
 ECHOCHAMBERS_API_KEY=testingkey0011

.github/workflows/pnpm-lockfile-check.yml

@@ -2,7 +2,7 @@ name: Pnpm Lockfile Check
 
 on:
     pull_request:
-        branches: ["*"]
+        branches: [main]
 
 jobs:
     check-lockfile:
@@ -38,4 +38,4 @@ jobs:
                           owner: context.repo.owner,
                           repo: context.repo.repo,
                           body: '❌ The pnpm-lockfile is out of date. Please run `pnpm install --no-frozen-lockfile` and commit the updated pnpm-lock.yaml file.'
-                      })
+                      })

agent/package.json

@@ -34,14 +34,15 @@
         "@elizaos/plugin-0g": "workspace:*",
         "@elizaos/plugin-abstract": "workspace:*",
         "@elizaos/plugin-aptos": "workspace:*",
+        "@elizaos/plugin-coingecko": "workspace:*",
         "@elizaos/plugin-coinmarketcap": "workspace:*",
+        "@elizaos/plugin-coingecko": "workspace:*",
         "@elizaos/plugin-binance": "workspace:*",
         "@elizaos/plugin-avail": "workspace:*",
         "@elizaos/plugin-bootstrap": "workspace:*",
         "@elizaos/plugin-cosmos": "workspace:*",
         "@elizaos/plugin-intiface": "workspace:*",
         "@elizaos/plugin-coinbase": "workspace:*",
-        "@elizaos/plugin-coinprice": "workspace:*",
         "@elizaos/plugin-conflux": "workspace:*",
         "@elizaos/plugin-evm": "workspace:*",
         "@elizaos/plugin-echochambers": "workspace:*",
@@ -73,6 +74,7 @@
         "@elizaos/plugin-3d-generation": "workspace:*",
         "@elizaos/plugin-fuel": "workspace:*",
         "@elizaos/plugin-avalanche": "workspace:*",
+        "@elizaos/plugin-video-generation": "workspace:*",
         "@elizaos/plugin-web-search": "workspace:*",
         "@elizaos/plugin-letzai": "workspace:*",
         "@elizaos/plugin-thirdweb": "workspace:*",
@@ -94,4 +96,4 @@
         "ts-node": "10.9.2",
         "tsup": "8.3.5"
     }
-}
+}

agent/src/index.ts

@@ -53,7 +53,7 @@ import {
     webhookPlugin,
 } from "@elizaos/plugin-coinbase";
 import { coinmarketcapPlugin } from "@elizaos/plugin-coinmarketcap";
-import { coinPricePlugin } from "@elizaos/plugin-coinprice";
+import { coingeckoPlugin } from "@elizaos/plugin-coingecko";
 import { confluxPlugin } from "@elizaos/plugin-conflux";
 import { createCosmosPlugin } from "@elizaos/plugin-cosmos";
 import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
@@ -68,17 +68,18 @@ import { nearPlugin } from "@elizaos/plugin-near";
 import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
 import { createNodePlugin } from "@elizaos/plugin-node";
 import { obsidianPlugin } from "@elizaos/plugin-obsidian";
+import { sgxPlugin } from "@elizaos/plugin-sgx";
 import { solanaPlugin } from "@elizaos/plugin-solana";
 import { solanaAgentkitPlguin } from "@elizaos/plugin-solana-agentkit";
 import { storyPlugin } from "@elizaos/plugin-story";
 import { suiPlugin } from "@elizaos/plugin-sui";
-import { sgxPlugin } from "@elizaos/plugin-sgx";
 import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
 import { teeLogPlugin } from "@elizaos/plugin-tee-log";
 import { teeMarlinPlugin } from "@elizaos/plugin-tee-marlin";
 import { tonPlugin } from "@elizaos/plugin-ton";
 import { webSearchPlugin } from "@elizaos/plugin-web-search";
 
+import { coingeckoPlugin } from "@elizaos/plugin-coingecko";
 import { giphyPlugin } from "@elizaos/plugin-giphy";
 import { letzAIPlugin } from "@elizaos/plugin-letzai";
 import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
@@ -141,10 +142,6 @@ function tryLoadFile(filePath: string): string | null {
     }
 }
 
-function isAllStrings(arr: unknown[]): boolean {
-    return Array.isArray(arr) && arr.every((item) => typeof item === "string");
-}
-
 export async function loadCharacters(
     charactersArg: string
 ): Promise<Character[]> {
@@ -230,16 +227,9 @@ export async function loadCharacters(
                 }
 
                 // Handle plugins
-                if (isAllStrings(character.plugins)) {
-                    elizaLogger.info("Plugins are: ", character.plugins);
-                    const importedPlugins = await Promise.all(
-                        character.plugins.map(async (plugin) => {
-                            const importedPlugin = await import(plugin);
-                            return importedPlugin.default;
-                        })
-                    );
-                    character.plugins = importedPlugins;
-                }
+                character.plugins = await handlePluginImporting(
+                    character.plugins
+                );
 
                 loadedCharacters.push(character);
                 elizaLogger.info(
@@ -262,6 +252,36 @@ export async function loadCharacters(
     return loadedCharacters;
 }
 
+async function handlePluginImporting(plugins: string[]) {
+    if (plugins.length > 0) {
+        elizaLogger.info("Plugins are: ", plugins);
+        const importedPlugins = await Promise.all(
+            plugins.map(async (plugin) => {
+                try {
+                    const importedPlugin = await import(plugin);
+                    const functionName =
+                        plugin
+                            .replace("@elizaos/plugin-", "")
+                            .replace(/-./g, (x) => x[1].toUpperCase()) +
+                        "Plugin"; // Assumes plugin function is camelCased with Plugin suffix
+                    return (
+                        importedPlugin.default || importedPlugin[functionName]
+                    );
+                } catch (importError) {
+                    elizaLogger.error(
+                        `Failed to import plugin: ${plugin}`,
+                        importError
+                    );
+                    return []; // Return null for failed imports
+                }
+            })
+        );
+        return importedPlugins;
+    } else {
+        return [];
+    }
+}
+
 export function getTokenForProvider(
     provider: ModelProviderName,
     character: Character
@@ -608,7 +628,6 @@ export async function createAgent(
                 ? confluxPlugin
                 : null,
             nodePlugin,
-            coinPricePlugin,
             getSecret(character, "TAVILY_API_KEY") ? webSearchPlugin : null,
             getSecret(character, "SOLANA_PUBLIC_KEY") ||
             (getSecret(character, "WALLET_PUBLIC_KEY") &&
@@ -668,9 +687,9 @@ export async function createAgent(
                 : []),
             ...(teeMode !== TEEMode.OFF && walletSecretSalt ? [teePlugin] : []),
             getSecret(character, "SGX") ? sgxPlugin : null,
-            (getSecret(character, "ENABLE_TEE_LOG") &&
-                ((teeMode !== TEEMode.OFF && walletSecretSalt) ||
-                    getSecret(character, "SGX")))
+            getSecret(character, "ENABLE_TEE_LOG") &&
+            ((teeMode !== TEEMode.OFF && walletSecretSalt) ||
+                getSecret(character, "SGX"))
                 ? teeLogPlugin
                 : null,
             getSecret(character, "COINBASE_API_KEY") &&
@@ -679,7 +698,10 @@ export async function createAgent(
                 ? webhookPlugin
                 : null,
             goatPlugin,
-            getSecret(character, "COINGECKO_API_KEY") ? coingeckoPlugin : null,
+            getSecret(character, "COINGECKO_API_KEY") ||
+            getSecret(character, "COINGECKO_PRO_API_KEY")
+            ? coingeckoPlugin
+            : null,
             getSecret(character, "EVM_PROVIDER_URL") ? goatPlugin : null,
             getSecret(character, "ABSTRACT_PRIVATE_KEY")
                 ? abstractPlugin
@@ -918,7 +940,10 @@ const startAgents = async () => {
     }
 
     // upload some agent functionality into directClient
-    directClient.startAgent = async (character: Character) => {
+    directClient.startAgent = async (character) => {
+        // Handle plugins
+        character.plugins = await handlePluginImporting(character.plugins);
+
         // wrap it so we don't have to inject directClient later
         return startAgent(character, directClient);
     };

packages/client-telegram/src/messageManager.ts

@@ -507,7 +507,7 @@ export class MessageManager {
 
         // Check if team member has direct interest first
         if (
-            this.runtime.character.clientConfig?.discord?.isPartOfTeam &&
+            this.runtime.character.clientConfig?.telegram?.isPartOfTeam &&
             !this._isTeamLeader() &&
             this._isRelevantToTeamMember(messageText, chatId)
         ) {

packages/client-twitter/src/plugins/SttTtsSpacesPlugin.ts

@@ -28,6 +28,9 @@ interface PluginConfig {
  *   - On speaker mute -> flush STT -> GPT -> TTS -> push to Janus
  */
 export class SttTtsPlugin implements Plugin {
+    name = "SttTtsPlugin";
+    description = "Speech-to-text (OpenAI) + conversation + TTS (ElevenLabs)";
+
     private space?: Space;
     private janus?: JanusClient;