Merge branch 'develop' into interactionimage

Author: denizekiz

.github/workflows/integrationTests.yaml

@@ -3,7 +3,7 @@ on:
     push:
         branches:
             - "*"
-    pull_request_target:
+    pull_request:
         branches:
             - "*"
 
@@ -33,12 +33,9 @@ jobs:
             - name: Build packages
               run: pnpm build
 
-            - name: Check for API key
-              run: |
-                  if [ -z "$OPENAI_API_KEY" ]; then
-                      echo "Error: OPENAI_API_KEY is not set."
-                      exit 1
-                  fi
-
             - name: Run integration tests
-              run: pnpm run integrationTests
+              env:
+                  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+                  COINBASE_COMMERCE_KEY: ${{ secrets.COINBASE_COMMERCE_KEY }}
+              run: |
+                  pnpm run integrationTests

packages/client-twitter/src/post.ts

@@ -8,6 +8,7 @@ import {
     stringToUuid,
     TemplateType,
     UUID,
+    truncateToCompleteSentence,
 } from "@elizaos/core";
 import { elizaLogger } from "@elizaos/core";
 import { ClientBase } from "./base.ts";
@@ -77,40 +78,6 @@ Tweet:
 # Respond with qualifying action tags only. Default to NO action unless extremely confident of relevance.` +
     postActionResponseFooter;
 
-/**
- * Truncate text to fit within the Twitter character limit, ensuring it ends at a complete sentence.
- */
-function truncateToCompleteSentence(
-    text: string,
-    maxTweetLength: number
-): string {
-    if (text.length <= maxTweetLength) {
-        return text;
-    }
-
-    // Attempt to truncate at the last period within the limit
-    const lastPeriodIndex = text.lastIndexOf(".", maxTweetLength - 1);
-    if (lastPeriodIndex !== -1) {
-        const truncatedAtPeriod = text.slice(0, lastPeriodIndex + 1).trim();
-        if (truncatedAtPeriod.length > 0) {
-            return truncatedAtPeriod;
-        }
-    }
-
-    // If no period, truncate to the nearest whitespace within the limit
-    const lastSpaceIndex = text.lastIndexOf(" ", maxTweetLength - 1);
-    if (lastSpaceIndex !== -1) {
-        const truncatedAtSpace = text.slice(0, lastSpaceIndex).trim();
-        if (truncatedAtSpace.length > 0) {
-            return truncatedAtSpace + "...";
-        }
-    }
-
-    // Fallback: Hard truncate and add ellipsis
-    const hardTruncated = text.slice(0, maxTweetLength - 3).trim();
-    return hardTruncated + "...";
-}
-
 interface PendingTweet {
     cleanedContent: string;
     roomId: UUID;
@@ -399,7 +366,6 @@ export class TwitterPostClient {
 
     async handleNoteTweet(
         client: ClientBase,
-        runtime: IAgentRuntime,
         content: string,
         tweetId?: string
     ) {
@@ -465,11 +431,7 @@ export class TwitterPostClient {
             let result;
 
             if (cleanedContent.length > DEFAULT_MAX_TWEET_LENGTH) {
-                result = await this.handleNoteTweet(
-                    client,
-                    runtime,
-                    cleanedContent
-                );
+                result = await this.handleNoteTweet(client, cleanedContent);
             } else {
                 result = await this.sendStandardTweet(client, cleanedContent);
             }
@@ -1204,7 +1166,6 @@ export class TwitterPostClient {
             if (replyText.length > DEFAULT_MAX_TWEET_LENGTH) {
                 result = await this.handleNoteTweet(
                     this.client,
-                    this.runtime,
                     replyText,
                     tweet.id
                 );

packages/core/src/parsing.ts

@@ -205,3 +205,37 @@ export const parseActionResponseFromText = (
 
     return { actions };
 };
+
+/**
+ * Truncate text to fit within the character limit, ensuring it ends at a complete sentence.
+ */
+export function truncateToCompleteSentence(
+    text: string,
+    maxLength: number
+): string {
+    if (text.length <= maxLength) {
+        return text;
+    }
+
+    // Attempt to truncate at the last period within the limit
+    const lastPeriodIndex = text.lastIndexOf(".", maxLength - 1);
+    if (lastPeriodIndex !== -1) {
+        const truncatedAtPeriod = text.slice(0, lastPeriodIndex + 1).trim();
+        if (truncatedAtPeriod.length > 0) {
+            return truncatedAtPeriod;
+        }
+    }
+
+    // If no period, truncate to the nearest whitespace within the limit
+    const lastSpaceIndex = text.lastIndexOf(" ", maxLength - 1);
+    if (lastSpaceIndex !== -1) {
+        const truncatedAtSpace = text.slice(0, lastSpaceIndex).trim();
+        if (truncatedAtSpace.length > 0) {
+            return truncatedAtSpace + "...";
+        }
+    }
+
+    // Fallback: Hard truncate and add ellipsis
+    const hardTruncated = text.slice(0, maxLength - 3).trim();
+    return hardTruncated + "...";
+}

packages/plugin-autonome/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@elizaos/plugin-autonome",
-    "version": "0.1.7-alpha.1",
+    "version": "0.1.7",
     "main": "dist/index.js",
     "type": "module",
     "types": "dist/index.d.ts",

packages/plugin-autonome/src/actions/launchAgent.ts

@@ -95,6 +95,7 @@ export default {
             creationMethod: 2,
             envList: {},
             templateId: "Eliza",
+        };
 
         const sendPostRequest = async () => {
             try {
@@ -169,4 +170,5 @@ export default {
             },
         ],
     ] as ActionExample[][],
-} as Action;
+} satisfies Action;
+

packages/plugin-autonome/tsup.config.ts

@@ -15,15 +15,5 @@ export default defineConfig({
         "https",
         "http",
         "agentkeepalive",
-        "safe-buffer",
-        "base-x",
-        "bs58",
-        "borsh",
-        "@solana/buffer-layout",
-        "stream",
-        "buffer",
-        "querystring",
-        "amqplib",
-        // Add other modules you want to externalize
     ],
 });

packages/plugin-coinbase/src/plugins/commerce.ts

@@ -82,7 +82,7 @@ export async function getAllCharges(apiKey: string) {
 // Function to fetch details of a specific charge
 export async function getChargeDetails(apiKey: string, chargeId: string) {
     elizaLogger.debug("Starting getChargeDetails function");
-    const getUrl = `${url}${chargeId}`;
+    const getUrl = `${url}/${chargeId}`;
 
     try {
         const response = await fetch(getUrl, {
@@ -204,8 +204,8 @@ export const createCoinbaseChargeAction: Action = {
                     text: `Charge created successfully: ${chargeResponse.hosted_url}`,
                     attachments: [
                         {
-                            id: crypto.randomUUID(),
-                            url: chargeResponse.id,
+                            id: chargeResponse.id,
+                            url: chargeResponse.hosted_url,
                             title: "Coinbase Commerce Charge",
                             description: `Charge ID: ${chargeResponse.id}`,
                             text: `Pay here: ${chargeResponse.hosted_url}`,
@@ -351,6 +351,7 @@ export const getAllChargesAction: Action = {
             callback(
                 {
                     text: `Successfully fetched all charges. Total charges: ${charges.length}`,
+                    attachments: charges,
                 },
                 []
             );
@@ -439,17 +440,20 @@ export const getChargeDetailsAction: Action = {
 
             elizaLogger.info("Fetched charge details:", chargeDetails);
 
+            const chargeData = chargeDetails.data;
+
             callback(
                 {
                     text: `Successfully fetched charge details for ID: ${charge.id}`,
                     attachments: [
                         {
-                            id: crypto.randomUUID(),
-                            url: chargeDetails.hosted_url,
+                            id: chargeData.id,
+                            url: chargeData.hosted_url,
                             title: `Charge Details for ${charge.id}`,
-                            description: `Details: ${JSON.stringify(chargeDetails, null, 2)}`,
                             source: "coinbase",
-                            text: "",
+                            description: JSON.stringify(chargeDetails, null, 2),
+                            text: `Pay here: ${chargeData.hosted_url}`,
+                            contentType: "application/json",
                         },
                     ],
                 },