Merge branch 'develop' into twitter-convo

Author: shakkernerd

.env.example

@@ -340,3 +340,7 @@ STORY_PRIVATE_KEY= # Story private key
 STORY_API_BASE_URL= # Story API base URL
 STORY_API_KEY= # Story API key
 PINATA_JWT= # Pinata JWT for uploading files to IPFS
+
+# Cronos zkEVM
+CRONOSZKEVM_ADDRESS=
+CRONOSZKEVM_PRIVATE_KEY=

.gitignore

@@ -45,7 +45,6 @@ packages/core/src/providers/cache
 packages/core/src/providers/cache/*
 cache/*
 packages/plugin-coinbase/src/plugins/transactions.csv
-packages/plugin-coinbase/package-lock.json
 
 tsup.config.bundled_*.mjs
 

agent/package.json

@@ -53,6 +53,8 @@
         "@elizaos/plugin-near": "workspace:*",
         "@elizaos/plugin-zksync-era": "workspace:*",
         "@elizaos/plugin-twitter": "workspace:*",
+        "@elizaos/plugin-cronoszkevm": "workspace:*",
+        "@elizaos/plugin-3d-generation": "workspace:*",
         "readline": "1.3.0",
         "ws": "8.18.0",
         "yargs": "17.7.2"

agent/src/index.ts

@@ -46,6 +46,7 @@ import { evmPlugin } from "@elizaos/plugin-evm";
 import { storyPlugin } from "@elizaos/plugin-story";
 import { flowPlugin } from "@elizaos/plugin-flow";
 import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
+import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
 import { multiversxPlugin } from "@elizaos/plugin-multiversx";
 import { nearPlugin } from "@elizaos/plugin-near";
 import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
@@ -55,6 +56,7 @@ import { suiPlugin } from "@elizaos/plugin-sui";
 import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
 import { tonPlugin } from "@elizaos/plugin-ton";
 import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
+import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
 import { abstractPlugin } from "@elizaos/plugin-abstract";
 import Database from "better-sqlite3";
 import fs from "fs";
@@ -178,6 +180,25 @@ export async function loadCharacters(
                 const character = JSON.parse(content);
                 validateCharacterConfig(character);
 
+                // .id isn't really valid
+                const characterId = character.id || character.name;
+                const characterPrefix = `CHARACTER.${characterId.toUpperCase().replace(/ /g, "_")}.`;
+
+                const characterSettings = Object.entries(process.env)
+                    .filter(([key]) => key.startsWith(characterPrefix))
+                    .reduce((settings, [key, value]) => {
+                        const settingKey = key.slice(characterPrefix.length);
+                        return { ...settings, [settingKey]: value };
+                    }, {});
+
+                if (Object.keys(characterSettings).length > 0) {
+                    character.settings = character.settings || {};
+                    character.settings.secrets = {
+                        ...characterSettings,
+                        ...character.settings.secrets,
+                    };
+                }
+
                 // Handle plugins
                 if (isAllStrings(character.plugins)) {
                     elizaLogger.info("Plugins are: ", character.plugins);
@@ -516,6 +537,7 @@ export async function createAgent(
             getSecret(character, "HEURIST_API_KEY")
                 ? imageGenerationPlugin
                 : null,
+            getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
             ...(getSecret(character, "COINBASE_API_KEY") &&
             getSecret(character, "COINBASE_PRIVATE_KEY")
                 ? [
@@ -544,6 +566,9 @@ export async function createAgent(
             getSecret(character, "APTOS_PRIVATE_KEY") ? aptosPlugin : null,
             getSecret(character, "MVX_PRIVATE_KEY") ? multiversxPlugin : null,
             getSecret(character, "ZKSYNC_PRIVATE_KEY") ? zksyncEraPlugin : null,
+            getSecret(character, "CRONOSZKEVM_PRIVATE_KEY")
+                ? cronosZkEVMPlugin
+                : null,
             getSecret(character, "TON_PRIVATE_KEY") ? tonPlugin : null,
             getSecret(character, "SUI_PRIVATE_KEY") ? suiPlugin : null,
             getSecret(character, "STORY_PRIVATE_KEY") ? storyPlugin : null,

client/src/Chat.tsx

@@ -1,55 +1,75 @@
-import { useState } from "react";
+import { useRef, useState } from "react";
 import { useParams } from "react-router-dom";
 import { useMutation } from "@tanstack/react-query";
-import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
+import { ImageIcon } from "lucide-react";
+import { Input } from "@/components/ui/input";
 import "./App.css";
+import path from "path";
 
 type TextResponse = {
     text: string;
     user: string;
+    attachments?: { url: string; contentType: string; title: string }[];
 };
 
 export default function Chat() {
     const { agentId } = useParams();
     const [input, setInput] = useState("");
     const [messages, setMessages] = useState<TextResponse[]>([]);
+    const [selectedFile, setSelectedFile] = useState<File | null>(null);
+    const fileInputRef = useRef<HTMLInputElement>(null);
 
     const mutation = useMutation({
         mutationFn: async (text: string) => {
+            const formData = new FormData();
+            formData.append("text", text);
+            formData.append("userId", "user");
+            formData.append("roomId", `default-room-${agentId}`);
+
+            if (selectedFile) {
+                formData.append("file", selectedFile);
+            }
+
             const res = await fetch(`/api/${agentId}/message`, {
                 method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                    text,
-                    userId: "user",
-                    roomId: `default-room-${agentId}`,
-                }),
+                body: formData,
             });
             return res.json() as Promise<TextResponse[]>;
         },
         onSuccess: (data) => {
             setMessages((prev) => [...prev, ...data]);
+            setSelectedFile(null);
         },
     });
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
-        if (!input.trim()) return;
+        if (!input.trim() && !selectedFile) return;
 
         // Add user message immediately to state
         const userMessage: TextResponse = {
             text: input,
             user: "user",
+            attachments: selectedFile ? [{ url: URL.createObjectURL(selectedFile), contentType: selectedFile.type, title: selectedFile.name }] : undefined,
         };
         setMessages((prev) => [...prev, userMessage]);
 
         mutation.mutate(input);
         setInput("");
     };
 
+    const handleFileSelect = () => {
+        fileInputRef.current?.click();
+    };
+
+    const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (file && file.type.startsWith('image/')) {
+            setSelectedFile(file);
+        }
+    };
+
     return (
         <div className="flex flex-col h-screen max-h-screen w-full">
             <div className="flex-1 min-h-0 overflow-y-auto p-4">
@@ -58,7 +78,7 @@ export default function Chat() {
                         messages.map((message, index) => (
                             <div
                                 key={index}
-                                className={`flex ${
+                                className={`text-left flex ${
                                     message.user === "user"
                                         ? "justify-end"
                                         : "justify-start"
@@ -72,7 +92,22 @@ export default function Chat() {
                                     }`}
                                 >
                                     {message.text}
-                                </div>
+                                    {message.attachments?.map((attachment, i) => (
+                                        attachment.contentType.startsWith('image/') && (
+                                            <img
+                                                key={i}
+                                                src={message.user === "user"
+                                                    ? attachment.url
+                                                    : attachment.url.startsWith('http')
+                                                        ? attachment.url
+                                                        : `http://localhost:3000/media/generated/${attachment.url.split('/').pop()}`
+                                                }
+                                                alt={attachment.title || "Attached image"}
+                                                className="mt-2 max-w-full rounded-lg"
+                                            />
+                                        )
+                                    ))}
+                                 </div>
                             </div>
                         ))
                     ) : (
@@ -86,17 +121,38 @@ export default function Chat() {
             <div className="border-t p-4 bg-background">
                 <div className="max-w-3xl mx-auto">
                     <form onSubmit={handleSubmit} className="flex gap-2">
+                        <input
+                            type="file"
+                            ref={fileInputRef}
+                            onChange={handleFileChange}
+                            accept="image/*"
+                            className="hidden"
+                        />
                         <Input
                             value={input}
                             onChange={(e) => setInput(e.target.value)}
                             placeholder="Type a message..."
                             className="flex-1"
                             disabled={mutation.isPending}
                         />
+                        <Button
+                            type="button"
+                            variant="outline"
+                            size="icon"
+                            onClick={handleFileSelect}
+                            disabled={mutation.isPending}
+                        >
+                            <ImageIcon className="h-4 w-4" />
+                        </Button>
                         <Button type="submit" disabled={mutation.isPending}>
                             {mutation.isPending ? "..." : "Send"}
                         </Button>
                     </form>
+                    {selectedFile && (
+                        <div className="mt-2 text-sm text-muted-foreground">
+                            Selected file: {selectedFile.name}
+                        </div>
+                    )}
                 </div>
             </div>
         </div>

docs/README.md

@@ -67,7 +67,7 @@ You can run Grok models by setting the `XAI_MODEL` environment variable to `grok
 
 ### Run with OpenAI
 
-You can run OpenAI models by setting the `XAI_MODEL` environment variable to `gpt-4o-mini` or `gpt-4o`
+You can run OpenAI models by setting the `XAI_MODEL` environment variable to `gpt-4-mini` or `gpt-4o`
 
 ## Additional Requirements