Consolidate packages and make nodemon work nice

Author: lalalune

.gitignore

@@ -31,4 +31,7 @@ twitter_cookies.json
 timeline_cache.json
 
 *.sqlite
-characters/
+characters/
+
+packages/core/src/providers/cache
+packages/core/src/providers/cache/*

agent/tsup.config.ts

@@ -4,23 +4,25 @@
         "preinstall": "npx only-allow pnpm",
         "build": "bash ./scripts/build.sh",
         "build-docs": "pnpm --dir docs build",
-        "start:all": "pnpm --dir agent start:all --isRoot",
-        "stop:all": "pnpm --dir agent stop:all --isRoot",
-        "start:service:all": "pnpm --dir agent start:service:all --isRoot",
-        "stop:service:all": "pnpm --dir agent stop:service:all --isRoot",
-        "start": "pnpm --dir agent start --isRoot",
-        "dev": "pnpm --dir agent dev --isRoot",
-        "lint": "pnpm --dir core lint && pnpm --dir agent lint",
+        "start:all": "pnpm --dir packages/agent start:all --isRoot",
+        "stop:all": "pnpm --dir packages/agent stop:all --isRoot",
+        "start:service:all": "pnpm --dir packages/agent start:service:all --isRoot",
+        "stop:service:all": "pnpm --dir packages/agent stop:service:all --isRoot",
+        "start": "pnpm --dir packages/agent start --isRoot",
+        "dev": "concurrently \"pnpm --dir packages/core dev\" \"sleep 3 && pnpm --dir packages/agent dev\"",
+        "lint": "pnpm --dir packages/core lint && pnpm --dir packages/agent lint",
         "prettier-check": "npx prettier --check .",
         "prettier": "npx prettier --write .",
         "clean": "bash ./scripts/clean.sh"
     },
     "devDependencies": {
+        "concurrently": "^9.1.0",
         "husky": "^9.1.6",
         "lerna": "^8.1.5",
         "only-allow": "^1.2.1",
         "prettier": "^3.3.3",
-        "typedoc": "^0.26.11"
+        "typedoc": "^0.26.11",
+        "typescript": "5.6.3"
     },
     "pnpm": {
         "overrides": {
@@ -29,8 +31,5 @@
     },
     "engines": {
         "node": ">=22"
-    },
-    "dependencies": {
-        "typescript": "5.6.3"
     }
 }

core/src/providers/cache/dexScreenerData_2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh.json

@@ -6,7 +6,7 @@
     "scripts": {
         "build": "tsup --format esm --dts",
         "start": "node --loader ts-node/esm src/index.ts",
-        "dev": "node --loader ts-node/esm src/index.ts"
+        "dev": "nodemon --watch src --watch ../core/dist --ext ts,json --exec 'node --loader ts-node/esm' src/index.ts"
     },
     "dependencies": {
         "@eliza/core": "workspace:*",

core/src/providers/cache/holderList_2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh.json

@@ -24,8 +24,6 @@ import readline from "readline";
 
 const args = parseArguments();
 
-console.log("Args are: ", args);
-
 let charactersArg = args.characters || args.character;
 
 let characters = [defaultCharacter];
@@ -34,14 +32,12 @@ if (charactersArg) {
     characters = loadCharacters(charactersArg);
 }
 
-console.log("Characters are: ", characters);
-
 const directClient = new DirectClient();
 
 const serverPort = parseInt(process.env.SERVER_PORT || "3000");
 directClient.start(serverPort);
 
-export async function createDirectRuntime(
+export async function createAgent(
     character: Character,
     db: any,
     token: string,
@@ -79,7 +75,7 @@ async function startAgent(character: Character) {
         const token = getTokenForProvider(character.modelProvider, character);
         const db = initializeDatabase();
 
-        const runtime = await createDirectRuntime(character, db, token);
+        const runtime = await createAgent(character, db, token);
 
         const clients = await initializeClients(
             character,

core/src/providers/cache/tokenSecurity_2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig.json",
+    "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "dist"
     },

core/src/providers/cache/tokenTradeData_2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh.json

@@ -9,24 +9,10 @@
         "build": "tsup --format esm --dts",
         "lint": "eslint . --fix",
         "start": "node --loader ts-node/esm src/index.ts --characters=\"../characters/blobert.character.json\"",
-        "start:arok": "node --loader ts-node/esm src/index.ts --characters=\"../characters/arok.character.json\"",
-        "start:service:ruby": "pm2 start pnpm --name=\"ruby\" --restart-delay=3000 --max-restarts=10 -- run start:ruby",
-        "stop:service:ruby": "pm2 stop ruby",
-        "start:ruby": "node --loader ts-node/esm src/index.ts --characters=\"../characters/ruby.character.json\"",
-        "start:service:trump": "pm2 start pnpm --name=\"trump\" --restart-delay=3000 --max-restarts=10 -- run start:trump",
-        "stop:service:trump": "pm2 stop trump",
-        "start:service:degen": "pm2 start pnpm --name=\"degen\" --restart-delay=3000 --max-restarts=10 -- run start:degen",
-        "stop:service:degen": "pm2 stop degen",
-        "start:degen": "node --loader ts-node/esm src/index.ts --characters=\"../characters/degenspartan.json\"",
         "start:service:all": "pm2 start pnpm --name=\"all\" --restart-delay=3000 --max-restarts=10 -- run start:all",
         "stop:service:all": "pm2 stop all",
-        "start:all": "node --loader ts-node/esm src/index.ts --characters=\"../characters/degenspartan.json\",\"../characters/ruby.character.json\",\"../characters/pmairca.json\"",
-        "start:trump": "node --loader ts-node/esm src/index.ts --characters=\"../characters/trump.character.json\"",
-        "start:service:tate": "pm2 start pnpm --name=\"tate\" --restart-delay=3000 --max-restarts=10 -- run start:tate",
-        "stop:service:tate": "pm2 stop tate",
-        "start:tate": "node --loader ts-node/esm src/index.ts --characters=\"../characters/tate.character.json\"",
-        "watch": "tsc --watch",
-        "dev": "tsc && nodemon",
+        "start:all": "node --loader ts-node/esm src/index.ts --characters=\"../characters/degenspartan.json\",\"../characters/ruby.character.json\",\"../characters/pmairca.json\"",        "watch": "tsc --watch",
+        "dev": "tsup --format esm --dts --watch",
         "build:docs": "cd docs && pnpm run build",
         "postinstall": "npx playwright install-deps && npx playwright install",
         "test": "jest --runInBand",