export work cleanup

Author: ponderingdemocritus

core/src/actions/ask_claude.ts core/src/actions/askClaude.ts

@@ -19,7 +19,7 @@ export const claudeHandlerTemplate = `{{attachments}}
 
 # Instructions: Claude, I need your help in assisting the user with their last request. Please provide a helpful, thorough response. I have no arms, so you'll have to write out any implements and take care not to omit or leave TODOs for later. Also, please don't acknowledge the request, just do it.`;
 
-export default {
+export const askClaude: Action = {
     name: "ASK_CLAUDE",
     similes: ["CLAUDE", "CALL_CLAUDE", "ANTHROPIC", "SONNET", "OPUS"],
     description:

core/src/actions/continue.ts

@@ -30,7 +30,7 @@ Based on the following conversation, should {{agentName}} continue? YES or NO
 
 Should {{agentName}} continue? ` + booleanFooter;
 
-export default {
+export const continueAction: Action = {
     name: "CONTINUE",
     similes: ["ELABORATE", "KEEP_TALKING"],
     description:

core/src/actions/follow_room.ts core/src/actions/followRoom.ts

@@ -24,7 +24,7 @@ Respond with YES if:
 Otherwise, respond with NO.
 ` + booleanFooter;
 
-export default {
+export const followRoom: Action = {
     name: "FOLLOW_ROOM",
     similes: [
         "FOLLOW_CHAT",

core/src/actions/ignore.ts

@@ -5,7 +5,7 @@ import {
     type Action,
 } from "../core/types.ts";
 
-export default {
+export const ignore: Action = {
     name: "IGNORE",
     similes: ["STOP_TALKING", "STOP_CHATTING", "STOP_CONVERSATION"],
     validate: async (_runtime: IAgentRuntime, _message: Memory) => {

core/src/actions/imageGeneration.ts

@@ -7,7 +7,7 @@ import {
 } from "../core/types.ts";
 import { generateCaption, generateImage } from "./imageGenerationUtils.ts";
 
-export default {
+export const imageGeneration: Action = {
     name: "IMAGE_GEN",
     similes: ["GENERATE_IMAGE", "CREATE_IMAGE", "MAKE_PICTURE"],
     description: "Generate an image based on a prompt",

core/src/actions/index.ts

@@ -1,16 +1,16 @@
-export * from "./ask_claude.ts";
-export * from "./follow_room.ts";
+export * from "./askClaude.ts";
+export * from "./followRoom.ts";
 export * from "./imageGeneration.ts";
-export * from "./mute_room.ts";
+export * from "./muteRoom.ts";
 export * from "./swap.ts";
-export * from "./unfollow_room.ts";
-export * from "./unmute_room.ts";
-export * from "./mute_room.ts";
+export * from "./unfollowRoom.ts";
+export * from "./unmuteRoom.ts";
+export * from "./muteRoom.ts";
 export * from "./continue.ts";
-export * from "./follow_room.ts";
+export * from "./followRoom.ts";
 export * from "./ignore.ts";
 export * from "./imageGenerationUtils.ts";
 export * from "./pumpfun.ts";
 export * from "./swap.ts";
-export * from "./swapUtils.ts";
-export * from "./take_order.ts";
+export * from "./takeOrder.ts";
+export * from "./none.ts";

core/src/actions/mute_room.ts core/src/actions/muteRoom.ts

@@ -25,7 +25,7 @@ Respond with YES if:
 Otherwise, respond with NO.
 ` + booleanFooter;
 
-export default {
+export const muteRoom: Action = {
     name: "MUTE_ROOM",
     similes: [
         "MUTE_CHAT",

core/src/actions/none.ts

@@ -5,7 +5,7 @@ import {
     type Action,
 } from "../core/types.ts";
 
-export default {
+export const none: Action = {
     name: "NONE",
     similes: [
         "NO_ACTION",

core/src/actions/swap.ts

@@ -41,7 +41,7 @@ async function promptConfirmation(): Promise<boolean> {
     return confirmSwap;
 }
 
-export default {
+export const executeSwap: Action = {
     name: "EXECUTE_SWAP",
     similes: ["SWAP_TOKENS", "TOKEN_SWAP", "TRADE_TOKENS", "EXCHANGE_TOKENS"],
     validate: async (runtime: IAgentRuntime, message: Memory) => {

core/src/actions/take_order.ts core/src/actions/takeOrder.ts

@@ -24,7 +24,7 @@ Respond with YES if:
 Otherwise, respond with NO.
 ` + booleanFooter;
 
-export default {
+export const unfollowRoom: Action = {
     name: "UNFOLLOW_ROOM",
     similes: [
         "UNFOLLOW_CHAT",

core/src/actions/unfollow_room.ts core/src/actions/unfollowRoom.ts

@@ -24,7 +24,7 @@ Respond with YES if:
 Otherwise, respond with NO.
 ` + booleanFooter;
 
-export default {
+export const unmuteRoom: Action = {
     name: "UNMUTE_ROOM",
     similes: [
         "UNMUTE_CHAT",

core/src/actions/unmute_room.ts core/src/actions/unmuteRoom.ts

@@ -1,11 +1,12 @@
 import { names, uniqueNamesGenerator } from "unique-names-generator";
 import { Action, ActionExample } from "./types.ts";
 
-// import cont from "../actions/continue.ts";
-import ignore from "../actions/ignore.ts";
-import none from "../actions/none.ts";
+import * as DefaultActions from "../actions/index.ts";
 
-export const defaultActions: Action[] = [/* cont, */ ignore, none];
+export const defaultActions: Action[] = [
+    DefaultActions.ignore,
+    DefaultActions.none,
+];
 
 /**
  * Composes a set of example conversations based on provided actions and a specified count.

core/src/core/actions.ts

@@ -1,7 +1,7 @@
-import time from "../providers/time.ts";
+import { timeProvider } from "../providers/time.ts";
 import { IAgentRuntime, State, type Memory, type Provider } from "./types.ts";
 
-export const defaultProviders: Provider[] = [time];
+export const defaultProviders: Provider[] = [timeProvider];
 
 /**
  * Formats provider outputs into a string which can be injected into the context.

core/src/core/providers.ts

@@ -2,37 +2,26 @@
 export * from "./actions/index.ts";
 export * from "./clients/index.ts";
 export * from "./adapters/index.ts";
+export * from "./providers/index.ts";
+
+import * as Action from "./actions/index.ts";
+import * as Client from "./clients/index.ts";
+import * as Adapter from "./adapters/index.ts";
+import * as Provider from "./providers/index.ts";
 
 import Database from "better-sqlite3";
 import fs from "fs";
 import yargs from "yargs";
-import askClaude from "./actions/ask_claude.ts";
-import follow_room from "./actions/follow_room.ts";
-import imageGeneration from "./actions/imageGeneration.ts";
-import mute_room from "./actions/mute_room.ts";
-import swap from "./actions/swap.ts";
-import unfollow_room from "./actions/unfollow_room.ts";
-import unmute_room from "./actions/unmute_room.ts";
-import { PostgresDatabaseAdapter } from "./adapters/postgres.ts";
-import { SqliteDatabaseAdapter } from "./adapters/sqlite.ts";
-import DirectClient from "./clients/direct/index.ts";
-import { DiscordClient } from "./clients/discord/index.ts";
-import { TelegramClient } from "./clients/telegram/src/index.ts"; // Added Telegram import
-import { TwitterGenerationClient } from "./clients/twitter/generate.ts";
-import { TwitterInteractionClient } from "./clients/twitter/interactions.ts";
-import { TwitterSearchClient } from "./clients/twitter/search.ts";
+
 import { wait } from "./clients/twitter/utils.ts";
 import { defaultActions } from "./core/actions.ts";
 import defaultCharacter from "./core/defaultCharacter.ts";
 import { AgentRuntime } from "./core/runtime.ts";
 import settings from "./core/settings.ts";
 import { Character, IAgentRuntime, ModelProvider } from "./core/types.ts"; // Added IAgentRuntime
-import boredomProvider from "./providers/boredom.ts";
-import timeProvider from "./providers/time.ts";
-import walletProvider from "./providers/wallet.ts";
+
 import readline from "readline";
-import orderbook from "./providers/order_book.ts";
-import tokenProvider from "./providers/token.ts";
+
 interface Arguments {
     character?: string;
     characters?: string;
@@ -76,7 +65,7 @@ const characterPaths = argv.characters?.split(",").map((path) => path.trim());
 
 const characters = [];
 
-const directClient = new DirectClient();
+const directClient = new Client.DirectClient();
 directClient.start(3000);
 
 if (characterPaths?.length > 0) {
@@ -112,11 +101,11 @@ async function startAgent(character: Character) {
     let db;
     if (process.env.POSTGRES_URL) {
         // const db = new SqliteDatabaseAdapter(new Database("./db.sqlite"));
-        db = new PostgresDatabaseAdapter({
+        db = new Adapter.PostgresDatabaseAdapter({
             connectionString: process.env.POSTGRES_URL,
         });
     } else {
-        db = new SqliteDatabaseAdapter(new Database("./db.sqlite"));
+        db = new Adapter.SqliteDatabaseAdapter(new Database("./db.sqlite"));
         // Debug adapter
         // const loggingDb = createLoggingDatabaseAdapter(db);
     }
@@ -127,16 +116,20 @@ async function startAgent(character: Character) {
         modelProvider: character.modelProvider,
         evaluators: [],
         character,
-        providers: [timeProvider, boredomProvider, walletProvider],
+        providers: [
+            Provider.timeProvider,
+            Provider.boredomProvider,
+            Provider.walletProvider,
+        ],
         actions: [
             ...defaultActions,
-            askClaude,
-            follow_room,
-            unfollow_room,
-            unmute_room,
-            mute_room,
-            imageGeneration,
-            swap,
+            Action.askClaude,
+            Action.followRoom,
+            Action.unfollowRoom,
+            Action.unmuteRoom,
+            Action.muteRoom,
+            Action.imageGeneration,
+            Action.executeSwap,
         ],
     });
 
@@ -147,17 +140,17 @@ async function startAgent(character: Character) {
         evaluators: [],
         character,
         providers: [
-            timeProvider,
-            boredomProvider,
-            walletProvider,
-            orderbook,
-            tokenProvider,
+            Provider.timeProvider,
+            Provider.boredomProvider,
+            Provider.walletProvider,
+            Provider.orderBookProvider,
+            Provider.tokenProvider,
         ],
         actions: [...defaultActions],
     });
 
     function startDiscord(runtime: IAgentRuntime) {
-        const discordClient = new DiscordClient(runtime);
+        const discordClient = new Client.DiscordClient(runtime);
         return discordClient;
     }
 
@@ -177,7 +170,7 @@ async function startAgent(character: Character) {
 
         try {
             console.log("Creating new TelegramClient instance...");
-            const telegramClient = new TelegramClient(runtime, botToken);
+            const telegramClient = new Client.TelegramClient(runtime, botToken);
 
             console.log("Calling start() on TelegramClient...");
             await telegramClient.start();
@@ -197,13 +190,17 @@ async function startAgent(character: Character) {
 
     async function startTwitter(runtime) {
         console.log("Starting search client");
-        const twitterSearchClient = new TwitterSearchClient(runtime);
+        const twitterSearchClient = new Client.TwitterSearchClient(runtime);
         await wait();
         console.log("Starting interaction client");
-        const twitterInteractionClient = new TwitterInteractionClient(runtime);
+        const twitterInteractionClient = new Client.TwitterInteractionClient(
+            runtime
+        );
         await wait();
         console.log("Starting generation client");
-        const twitterGenerationClient = new TwitterGenerationClient(runtime);
+        const twitterGenerationClient = new Client.TwitterGenerationClient(
+            runtime
+        );
 
         return {
             twitterInteractionClient,

core/src/index.ts

@@ -272,7 +272,7 @@ const negativeWords = [
     "fuck up",
 ];
 
-const boredom: Provider = {
+const boredomProvider: Provider = {
     get: async (runtime: IAgentRuntime, message: Memory, state?: State) => {
         const agentId = runtime.agentId;
         const agentName = state?.agentName || "The agent";
@@ -340,4 +340,4 @@ const boredom: Provider = {
     },
 };
 
-export default boredom;
+export { boredomProvider };

core/src/providers/boredom.ts

@@ -0,0 +1,6 @@
+export * from "./boredom.ts";
+export * from "./time.ts";
+export * from "./wallet.ts";
+export * from "./orderBook.ts";
+export * from "./token.ts";
+export * from "./balances.ts";

core/src/providers/index.ts

@@ -11,7 +11,7 @@ interface Order {
     price: number;
 }
 
-const orderbook: Provider = {
+const orderBookProvider: Provider = {
     get: async (runtime: IAgentRuntime, message: Memory, _state?: State) => {
         const userId = message.userId;
 
@@ -40,4 +40,4 @@ const orderbook: Provider = {
     },
 };
 
-export default orderbook;
+export { orderBookProvider };

core/src/providers/order_book.ts core/src/providers/orderBook.ts

@@ -1,6 +1,6 @@
 import { IAgentRuntime, Memory, Provider, State } from "../core/types.ts";
 
-const time: Provider = {
+const timeProvider: Provider = {
     get: async (_runtime: IAgentRuntime, _message: Memory, _state?: State) => {
         const currentDate = new Date();
         const currentTime = currentDate.toLocaleTimeString("en-US");
@@ -9,4 +9,4 @@ const time: Provider = {
     },
 };
 
-export default time;
+export { timeProvider };

core/src/providers/time.ts

@@ -756,4 +756,4 @@ const tokenProvider: Provider = {
     },
 };
 
-export default tokenProvider;
+export { tokenProvider };

core/src/providers/token.ts

@@ -285,4 +285,4 @@ const walletProvider: Provider = {
 };
 
 // Module exports
-export default walletProvider;
+export { walletProvider };