Merge branch 'develop' into 1213-fix-chat-stuck-loop-bug

Author: odilitime

.vscode/settings.json

@@ -43,5 +43,16 @@
     },
     "[shellscript]": {
         "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.patterns": {
+        "*.ts": "${capture}.js",
+        "*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
+        "*.jsx": "${capture}.js",
+        "*.tsx": "${capture}.ts",
+        "tsconfig.json": "tsconfig.*.json",
+        "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb,pnpm-workspace.yaml",
+        "README.md": "*.md",
+        "Dockerfile": "docker-compose-docs.yaml,docker-compose.yaml,Dockerfile.docs"
     }
 }

agent/src/index.ts

@@ -449,6 +449,11 @@ export function getTokenForProvider(
                 character.settings?.secrets?.INFERA_API_KEY ||
                 settings.INFERA_API_KEY
             );
+        case ModelProviderName.DEEPSEEK:
+            return (
+                character.settings?.secrets?.DEEPSEEK_API_KEY ||
+                settings.DEEPSEEK_API_KEY
+            );
         default:
             const errorMessage = `Failed to get token - unsupported model provider: ${provider}`;
             elizaLogger.error(errorMessage);

packages/client-direct/src/api.ts

@@ -6,14 +6,46 @@ import {
     AgentRuntime,
     elizaLogger,
     getEnvVariable,
+    UUID,
     validateCharacterConfig,
     ServiceType,
 } from "@elizaos/core";
 
 import { TeeLogQuery, TeeLogService } from "@elizaos/plugin-tee-log";
 import { REST, Routes } from "discord.js";
 import { DirectClient } from ".";
-import { stringToUuid } from "@elizaos/core";
+import { validateUuid } from "@elizaos/core";
+
+interface UUIDParams {
+    agentId: UUID;
+    roomId?: UUID;
+}
+
+function validateUUIDParams(
+    params: { agentId: string; roomId?: string },
+    res: express.Response
+): UUIDParams | null {
+    const agentId = validateUuid(params.agentId);
+    if (!agentId) {
+        res.status(400).json({
+            error: "Invalid AgentId format. Expected to be a UUID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+        });
+        return null;
+    }
+
+    if (params.roomId) {
+        const roomId = validateUuid(params.roomId);
+        if (!roomId) {
+            res.status(400).json({
+                error: "Invalid RoomId format. Expected to be a UUID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            });
+            return null;
+        }
+        return { agentId, roomId };
+    }
+
+    return { agentId };
+}
 
 export function createApiRouter(
     agents: Map<string, AgentRuntime>,
@@ -48,7 +80,11 @@ export function createApiRouter(
     });
 
     router.get("/agents/:agentId", (req, res) => {
-        const agentId = req.params.agentId;
+        const { agentId } = validateUUIDParams(req.params, res) ?? {
+            agentId: null,
+        };
+        if (!agentId) return;
+
         const agent = agents.get(agentId);
 
         if (!agent) {
@@ -68,8 +104,11 @@ export function createApiRouter(
     });
 
     router.post("/agents/:agentId/set", async (req, res) => {
-        const agentId = req.params.agentId;
-        console.log("agentId", agentId);
+        const { agentId } = validateUUIDParams(req.params, res) ?? {
+            agentId: null,
+        };
+        if (!agentId) return;
+
         let agent: AgentRuntime = agents.get(agentId);
 
         // update character
@@ -104,7 +143,11 @@ export function createApiRouter(
     });
 
     router.get("/agents/:agentId/channels", async (req, res) => {
-        const agentId = req.params.agentId;
+        const { agentId } = validateUUIDParams(req.params, res) ?? {
+            agentId: null,
+        };
+        if (!agentId) return;
+
         const runtime = agents.get(agentId);
 
         if (!runtime) {
@@ -130,8 +173,12 @@ export function createApiRouter(
     });
 
     router.get("/agents/:agentId/:roomId/memories", async (req, res) => {
-        const agentId = req.params.agentId;
-        const roomId = stringToUuid(req.params.roomId);
+        const { agentId, roomId } = validateUUIDParams(req.params, res) ?? {
+            agentId: null,
+            roomId: null,
+        };
+        if (!agentId || !roomId) return;
+
         let runtime = agents.get(agentId);
 
         // if runtime is null, look for runtime with the same name

packages/client-twitter/src/utils.ts

@@ -212,15 +212,18 @@ export async function sendTweet(
                 })
             );
         }
+
+        const cleanChunk = deduplicateMentions(chunk.trim())
+
         const result = await client.requestQueue.add(async () =>
             isLongTweet
                 ? client.twitterClient.sendLongTweet(
-                      chunk.trim(),
+                      cleanChunk,
                       previousTweetId,
                       mediaData
                   )
                 : client.twitterClient.sendTweet(
-                      chunk.trim(),
+                      cleanChunk,
                       previousTweetId,
                       mediaData
                   )
@@ -397,6 +400,33 @@ function splitSentencesAndWords(text: string, maxLength: number): string[] {
     return chunks;
 }
 
+function deduplicateMentions(paragraph: string) {
+    // Regex to match mentions at the beginning of the string
+  const mentionRegex = /^@(\w+)(?:\s+@(\w+))*(\s+|$)/;
+
+  // Find all matches
+  const matches = paragraph.match(mentionRegex);
+
+  if (!matches) {
+    return paragraph; // If no matches, return the original string
+  }
+
+  // Extract mentions from the match groups
+  let mentions = matches.slice(1).filter(Boolean) as string[];
+
+  // Deduplicate mentions
+  mentions = [...new Set(mentions)];
+
+  // Reconstruct the string with deduplicated mentions
+  const uniqueMentionsString = `@${mentions.join(' ')}`;
+
+  // Find where the mentions end in the original string
+  const endOfMentions = paragraph.indexOf(matches[0]) + matches[0].length;
+
+  // Construct the result by combining unique mentions with the rest of the string
+  return uniqueMentionsString + paragraph.slice(endOfMentions);
+}
+
 function restoreUrls(
     chunks: string[],
     placeholderMap: Map<string, string>

packages/core/src/uuid.ts

@@ -1,5 +1,13 @@
 import { sha1 } from "js-sha1";
 import { UUID } from "./types.ts";
+import { z } from "zod";
+
+export const uuidSchema = z.string().uuid() as z.ZodType<UUID>;
+
+export function validateUuid(value: unknown): UUID | null {
+    const result = uuidSchema.safeParse(value);
+    return result.success ? result.data : null;
+}
 
 export function stringToUuid(target: string | number): UUID {
     if (typeof target === "number") {

packages/plugin-tts/package.json

@@ -21,6 +21,7 @@
     "dependencies": {
         "@elizaos/core": "workspace:*",
         "tsup": "8.3.5",
+        "langdetect": "0.2.1",
         "whatwg-url": "7.1.0"
     },
     "scripts": {