Merge branch 'develop' into odi-fix2

Author: odilitime

.devcontainer/devcontainer.json

@@ -10,8 +10,8 @@
     },
     "privileged": true,
     "runArgs": [
-        "-p=3000:3000", // Add port for server api
-        "-p=5173:5173", // Add port for client
+        "-p 3000:3000", // Add port for server api
+        "-p 5173:5173", // Add port for client
         //"--volume=/usr/lib/wsl:/usr/lib/wsl", // uncomment for WSL
         //"--volume=/mnt/wslg:/mnt/wslg", // uncomment for WSL
         "--gpus=all", // ! uncomment for vGPU
@@ -35,4 +35,4 @@
         }
     },
     "features": {}
-}
+}

.env.example

@@ -352,6 +352,21 @@ SMALL_LMSTUDIO_MODEL=  # Default: hermes-3-llama-3.1-8b
 MEDIUM_LMSTUDIO_MODEL= # Default: hermes-3-llama-3.1-8b
 LARGE_LMSTUDIO_MODEL=  # Default: hermes-3-llama-3.1-8b
 
+# Secret AI Configuration
+SECRET_AI_API_KEY=            # Secret AI API Key
+SECRET_AI_URL=                # Default: https://ai1.scrtlabs.com:21434
+SMALL_SECRET_AI_MODEL=        # Default: deepseek-r1:70b
+MEDIUM_SECRET_AI_MODEL=       # Default: deepseek-r1:70b
+LARGE_SECRET_AI_MODEL=        # Default: deepseek-r1:70b
+
+# NEAR AI (https://near.ai) Configuration
+NEARAI_API_URL=      # Default: https://api.near.ai/v1
+NEARAI_API_KEY=      # NEAR AI API Key (optional). If you have run `nearai login` with NEAR AI CLI, the API key will be parsed from `~/.nearai/config.json`: https://docs.near.ai/agents/quickstart/
+NEARAI_MODEL=
+SMALL_NEARAI_MODEL=  # Default: fireworks::accounts/fireworks/models/llama-v3p2-3b-instruct
+MEDIUM_NEARAI_MODEL= # Default: fireworks::accounts/fireworks/models/llama-v3p1-70b-instruct
+LARGE_NEARAI_MODEL=  # Default: fireworks::accounts/fireworks/models/llama-v3p1-405b-instruct
+
 # Remaining Provider Configurations
 GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
 ALI_BAILIAN_API_KEY=          # Ali Bailian API Key
@@ -423,7 +438,7 @@ ABSTRACT_RPC_URL=https://api.testnet.abs.xyz
 # Starknet Configuration
 STARKNET_ADDRESS=
 STARKNET_PRIVATE_KEY=
-STARKNET_RPC_URL=
+STARKNET_RPC_URL=https://rpc.starknet-testnet.lava.build
 
 # Lens Network Configuration
 LENS_ADDRESS=
@@ -555,7 +570,7 @@ NEAR_WALLET_SECRET_KEY= # NEAR Wallet Secret Key
 NEAR_WALLET_PUBLIC_KEY= # NEAR Wallet Public Key
 NEAR_ADDRESS=
 NEAR_SLIPPAGE=1
-NEAR_RPC_URL=https://rpc.testnet.near.org
+NEAR_RPC_URL=https://near-testnet.lava.build
 NEAR_NETWORK=testnet # or mainnet
 
 # ZKsync Era Configuration
@@ -970,7 +985,6 @@ BUNDLE_EXECUTOR_ADDRESS=          # Address of the bundle executor contract
 DESK_EXCHANGE_PRIVATE_KEY=                  # Required for trading and cancelling orders
 DESK_EXCHANGE_NETWORK=                      # "mainnet" or "testnet
 
-
 # Compass plugin configuration
 COMPASS_WALLET_PRIVATE_KEY=
 COMPASS_ARBITRUM_RPC_URL=
@@ -981,3 +995,6 @@ COMPASS_BASE_RPC_URL=
 DATA_API_KEY=           # Your d.a.t.a API key
 DATA_AUTH_TOKEN=       # Your d.a.t.a auth token
 
+# NKN Configuration
+NKN_CLIENT_PRIVATE_KEY=           # Required, NKN client private key
+NKN_CLIENT_ID=                    # Optional, NKN client ID

.npmrc

@@ -1,2 +1 @@
-node-linker=hoisted
-frozen-lockfile=true
+frozen-lockfile=true

README.md

@@ -204,3 +204,58 @@ We now have a [paper](https://arxiv.org/pdf/2501.06781) you can cite for the Eli
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=elizaos/eliza&type=Date)](https://star-history.com/#elizaos/eliza&Date)
+
+## 🛠️ System Requirements
+
+### Minimum Requirements
+- CPU: Dual-core processor
+- RAM: 4GB
+- Storage: 1GB free space
+- Internet connection: Broadband (1 Mbps+)
+
+### Software Requirements
+- Python 2.7+ (3.8+ recommended)
+- Node.js 23+
+- pnpm
+- Git
+
+### Optional Requirements
+- GPU: For running local LLM models
+- Additional storage: For document storage and memory
+- Higher RAM: For running multiple agents
+
+## 📁 Project Structure
+```
+eliza/
+├── packages/
+│   ├── core/           # Core Eliza functionality
+│   ├── clients/        # Client implementations
+│   └── actions/        # Custom actions
+├── docs/              # Documentation
+├── scripts/           # Utility scripts
+└── examples/          # Example implementations
+```
+
+## 🤝 Contributing
+
+We welcome contributions! Here's how you can help:
+
+### Getting Started
+1. Fork the repository
+2. Create a new branch: `git checkout -b feature/your-feature-name`
+3. Make your changes
+4. Run tests: `pnpm test`
+5. Submit a pull request
+
+### Types of Contributions
+- 🐛 Bug fixes
+- ✨ New features
+- 📚 Documentation improvements
+- 🌍 Translations
+- 🧪 Test improvements
+
+### Code Style
+- Follow the existing code style
+- Add comments for complex logic
+- Update documentation for changes
+- Add tests for new features

agent/src/index.ts

@@ -1,17 +1,17 @@
 import { DirectClient } from "@elizaos/client-direct";
 import {
+    type Adapter,
     AgentRuntime,
     CacheManager,
     CacheStore,
     type Character,
+    type ClientInstance,
     DbCacheAdapter,
     elizaLogger,
     FsCacheAdapter,
     type IAgentRuntime,
     type IDatabaseAdapter,
     type IDatabaseCacheAdapter,
-    type ClientInstance,
-    type Adapter,
     ModelProviderName,
     parseBooleanFromText,
     settings,
@@ -24,6 +24,7 @@ import { bootstrapPlugin } from "@elizaos/plugin-bootstrap";
 
 import fs from "fs";
 import net from "net";
+import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
 import yargs from "yargs";
@@ -367,6 +368,7 @@ async function handlePluginImporting(plugins: string[]) {
                     const functionName =
                         plugin
                             .replace("@elizaos/plugin-", "")
+                            .replace("@elizaos-plugins/plugin-", "")
                             .replace(/-./g, (x) => x[1].toUpperCase()) +
                         "Plugin"; // Assumes plugin function is camelCased with Plugin suffix
                     return (
@@ -400,7 +402,10 @@ export function getTokenForProvider(
         case ModelProviderName.LMSTUDIO:
             return "";
         case ModelProviderName.GAIANET:
-            return "";
+            return (
+                character.settings?.secrets?.GAIA_API_KEY ||
+                settings.GAIA_API_KEY
+            );
         case ModelProviderName.BEDROCK:
             return "";
         case ModelProviderName.OPENAI:
@@ -541,6 +546,23 @@ export function getTokenForProvider(
                 character.settings?.secrets?.LIVEPEER_GATEWAY_URL ||
                 settings.LIVEPEER_GATEWAY_URL
             );
+        case ModelProviderName.SECRETAI:
+            return (
+                character.settings?.secrets?.SECRET_AI_API_KEY ||
+                settings.SECRET_AI_API_KEY
+            );
+        case ModelProviderName.NEARAI:
+            try {
+                const config = JSON.parse(fs.readFileSync(path.join(os.homedir(), '.nearai/config.json'), 'utf8'));
+                return JSON.stringify(config?.auth);
+            } catch (e) {
+                elizaLogger.warn(`Error loading NEAR AI config: ${e}`);
+            }
+            return (
+                character.settings?.secrets?.NEARAI_API_KEY ||
+                settings.NEARAI_API_KEY
+            );
+
         default:
             const errorMessage = `Failed to get token - unsupported model provider: ${provider}`;
             elizaLogger.error(errorMessage);
@@ -798,10 +820,8 @@ const startAgents = async () => {
     }
 
     // upload some agent functionality into directClient
-    // XXX TODO: is this still used?
+    // This is used in client-direct/api.ts at "/agents/:agentId/set" route to restart an agent
     directClient.startAgent = async (character) => {
-        throw new Error('not implemented');
-
         // Handle plugins
         character.plugins = await handlePluginImporting(character.plugins);
 
@@ -834,12 +854,12 @@ if (
     parseBooleanFromText(process.env.PREVENT_UNHANDLED_EXIT)
 ) {
     // Handle uncaught exceptions to prevent the process from crashing
-    process.on("uncaughtException", function (err) {
+    process.on("uncaughtException", (err) => {
         console.error("uncaughtException", err);
     });
 
     // Handle unhandled rejections to prevent the process from crashing
-    process.on("unhandledRejection", function (err) {
+    process.on("unhandledRejection", (err) => {
         console.error("unhandledRejection", err);
     });
 }

client/src/lib/api.ts

@@ -1,8 +1,10 @@
 import type { UUID, Character } from "@elizaos/core";
 
-const BASE_URL = `${import.meta.env.VITE_SERVER_URL}:${
-    import.meta.env.VITE_SERVER_PORT
-}`;
+const BASE_URL =
+    import.meta.env.VITE_SERVER_BASE_URL ||
+    `${import.meta.env.VITE_SERVER_URL}:${import.meta.env.VITE_SERVER_PORT}`;
+
+console.log({ BASE_URL });
 
 const fetcher = async ({
     url,

client/src/lib/info.json

@@ -1 +1 @@
-{"version": "0.25.6-alpha.1"}
+{"version": "0.25.7"}

client/vite.config.ts

@@ -25,6 +25,9 @@ export default defineConfig(({ mode }) => {
             "import.meta.env.VITE_SERVER_URL": JSON.stringify(
                 env.SERVER_URL || "http://localhost"
             ),
+            "import.meta.env.VITE_SERVER_BASE_URL": JSON.stringify(
+                env.SERVER_BASE_URL
+            )
         },
         build: {
             outDir: "dist",