Merge branch 'develop' into fix_discord_ci

Author: monilpat

agent/src/index.ts

@@ -578,6 +578,11 @@ const startAgents = async () => {
     } catch (error) {
         elizaLogger.error("Error starting agents:", error);
     }
+    // upload some agent functionality into directClient
+    directClient.startAgent = async character => {
+      // wrap it so we don't have to inject directClient later
+      return startAgent(character, directClient)
+    };
 
     function chat() {
         const agentId = characters[0].name ?? "Agent";

packages/client-auto/src/index.ts

@@ -1,4 +1,4 @@
-import { Client, IAgentRuntime } from "@ai16z/eliza";
+import { Client, IAgentRuntime, elizaLogger } from "@ai16z/eliza";
 
 export class AutoClient {
     interval: NodeJS.Timeout;
@@ -10,7 +10,7 @@ export class AutoClient {
         // start a loop that runs every x seconds
         this.interval = setInterval(
             async () => {
-                console.log("running auto client...");
+                elizaLogger.log("running auto client...");
             },
             60 * 60 * 1000
         ); // 1 hour in milliseconds

packages/client-direct/src/api.ts

@@ -2,17 +2,25 @@ import express from "express";
 import bodyParser from "body-parser";
 import cors from "cors";
 
-import { AgentRuntime } from "@ai16z/eliza";
+import {
+    AgentRuntime,
+    elizaLogger,
+    validateCharacterConfig,
+} from "@ai16z/eliza";
 
 import { REST, Routes } from "discord.js";
 
-export function createApiRouter(agents: Map<string, AgentRuntime>) {
+export function createApiRouter(agents: Map<string, AgentRuntime>, directClient) {
     const router = express.Router();
 
     router.use(cors());
     router.use(bodyParser.json());
     router.use(bodyParser.urlencoded({ extended: true }));
 
+    router.get("/", (req, res) => {
+        res.send("Welcome, this is the REST API!");
+    });
+
     router.get("/hello", (req, res) => {
         res.json({ message: "Hello World!" });
     });
@@ -21,6 +29,7 @@ export function createApiRouter(agents: Map<string, AgentRuntime>) {
         const agentsList = Array.from(agents.values()).map((agent) => ({
             id: agent.agentId,
             name: agent.character.name,
+            clients: Object.keys(agent.clients),
         }));
         res.json({ agents: agentsList });
     });
@@ -40,6 +49,43 @@ export function createApiRouter(agents: Map<string, AgentRuntime>) {
         });
     });
 
+    router.post("/agents/:agentId/set", async (req, res) => {
+        const agentId = req.params.agentId;
+        console.log('agentId', agentId)
+        let agent:AgentRuntime = agents.get(agentId);
+
+        // update character
+        if (agent) {
+            // stop agent
+            agent.stop()
+            directClient.unregisterAgent(agent)
+            // if it has a different name, the agentId will change
+        }
+
+        // load character from body
+        const character = req.body
+        try {
+          validateCharacterConfig(character)
+        } catch(e) {
+          elizaLogger.error(`Error parsing character: ${e}`);
+          res.status(400).json({
+            success: false,
+            message: e.message,
+          });
+          return;
+        }
+
+        // start it up (and register it)
+        agent = await directClient.startAgent(character)
+        elizaLogger.log(`${character.name} started`)
+
+        res.json({
+            id: character.id,
+            character: character,
+        });
+    });
+
+
     router.get("/agents/:agentId/channels", async (req, res) => {
         const agentId = req.params.agentId;
         const runtime = agents.get(agentId);

packages/client-direct/src/index.ts

@@ -51,17 +51,11 @@ Note that {{agentName}} is capable of reading/seeing/hearing various forms of me
 # Instructions: Write the next message for {{agentName}}.
 ` + messageCompletionFooter;
 
-export interface SimliClientConfig {
-    apiKey: string;
-    faceID: string;
-    handleSilence: boolean;
-    videoRef: any;
-    audioRef: any;
-}
 export class DirectClient {
     public app: express.Application;
-    private agents: Map<string, AgentRuntime>;
+    private agents: Map<string, AgentRuntime>; // container management
     private server: any; // Store server instance
+    public startAgent: Function; // Store startAgent functor
 
     constructor() {
         elizaLogger.log("DirectClient constructor");
@@ -72,7 +66,7 @@ export class DirectClient {
         this.app.use(bodyParser.json());
         this.app.use(bodyParser.urlencoded({ extended: true }));
 
-        const apiRouter = createApiRouter(this.agents);
+        const apiRouter = createApiRouter(this.agents, this);
         this.app.use(apiRouter);
 
         // Define an interface that extends the Express Request interface
@@ -338,7 +332,7 @@ export class DirectClient {
                         fileResponse.headers
                             .get("content-disposition")
                             ?.split("filename=")[1]
-                            ?.replace(/"/g, "") || "default_name.txt";
+                            ?.replace(/"/g, /* " */ "") || "default_name.txt";
 
                     console.log("Saving as:", fileName);
 
@@ -378,6 +372,7 @@ export class DirectClient {
         );
     }
 
+    // agent/src/index.ts:startAgent calls this
     public registerAgent(runtime: AgentRuntime) {
         this.agents.set(runtime.agentId, runtime);
     }
@@ -388,7 +383,7 @@ export class DirectClient {
 
     public start(port: number) {
         this.server = this.app.listen(port, () => {
-            elizaLogger.success(`Server running at http://localhost:${port}/`);
+            elizaLogger.success(`REST API bound to 0.0.0.0:${port}. If running locally, access it at http://localhost:${port}.`);
         });
 
         // Handle graceful shutdown
@@ -430,7 +425,7 @@ export const DirectClientInterface: Client = {
         client.start(serverPort);
         return client;
     },
-    stop: async (_runtime: IAgentRuntime, client?: any) => {
+    stop: async (_runtime: IAgentRuntime, client?: Client) => {
         if (client instanceof DirectClient) {
             client.stop();
         }

packages/core/src/types.ts

@@ -611,6 +611,7 @@ export enum Clients {
     TWITTER = "twitter",
     TELEGRAM = "telegram",
     FARCASTER = "farcaster",
+    AUTO = "auto",
 }
 /**
  * Configuration for an agent character

pnpm-lock.yaml

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Strict mode, exit on error, undefined variables, and pipe failures
+set -euo pipefail
+
 # Print some information about the environment to aid in case of troubleshooting
 
 echo "node version:"
@@ -27,60 +30,63 @@ if (( CURRENT_NODE_VERSION < REQUIRED_NODE_VERSION )); then
 fi
 
 # Autodetect project directory relative to this script's path
-PROJECT_DIR="$0"
-while [ -h "$PROJECT_DIR" ]; do
-    ls=$(ls -ld "$PROJECT_DIR")
-    link=$(expr "$ls" : '.*-> \(.*\)$')
-    if expr "$link" : '/.*' > /dev/null; then
-        PROJECT_DIR="$link"
-    else
-        PROJECT_DIR="$(dirname "$PROJECT_DIR")/$link"
-    fi
-done
-PROJECT_DIR="$(dirname "$PROJECT_DIR")/.."
-PROJECT_DIR="$(cd "$PROJECT_DIR"; pwd)"
+PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
-cd $PROJECT_DIR
+cd "$PROJECT_DIR"
 
 cp .env.example .env
 
 pnpm install -r
 
 pnpm build
 
+# Create temp file and ensure cleanup
 OUTFILE="$(mktemp)"
-echo $OUTFILE
+trap 'rm -f "$OUTFILE"' EXIT
+echo "Using temporary output file: $OUTFILE"
+
+# Add timeout configuration
+TIMEOUT=30
+INTERVAL=0.5
+TIMER=0
+
 (
-  # Wait for the ready message
+  # Wait for the ready message with timeout
   while true; do
+    if [[ $TIMER -ge $TIMEOUT ]]; then
+      echo "Error: Timeout waiting for application to start after $TIMEOUT seconds"
+      kill $$
+      exit 1
+    fi
+
     if grep -q "Chat started" "$OUTFILE"; then
       echo "exit"; sleep 2
       break
     fi
-    sleep 0.5
+
+    sleep $INTERVAL
+    TIMER=$(echo "$TIMER + $INTERVAL" | bc)
   done
 ) | pnpm start --character=characters/trump.character.json > "$OUTFILE" &
 
 # Wait for process to finish
 wait $!
 RESULT=$?
+
 echo "----- OUTPUT START -----"
 cat "$OUTFILE"
 echo "----- OUTPUT END -----"
 
 # Check the exit code of the last command
 if [[ $RESULT -ne 0 ]]; then
-    echo "Error: 'start' command exited with an error."
+    echo "Error: 'start' command exited with an error (code: $RESULT)"
     exit 1
 fi
 
-# Check if output.txt contains "Terminating and cleaning up resources..."
+# Check if output contains expected termination message
 if grep -q "Terminating and cleaning up resources..." "$OUTFILE"; then
     echo "Script completed successfully."
 else
-    echo "Error: The output does not contain the expected string."
+    echo "Error: The output does not contain the expected termination message."
     exit 1
-fi
-
-# Clean up
-rm "$OUTFILE"
+fi