Skip to content

Commit 548eeb8

Browse files
authored
Merge branch 'develop' into develop
2 parents 3fc02e5 + d666e48 commit 548eeb8

File tree

36 files changed

+4772
-934
lines changed

36 files changed

+4772
-934
lines changed

.env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ SUPABASE_ANON_KEY=
1919
REMOTE_CHARACTER_URLS=
2020

2121
# Logging
22-
DEFAULT_LOG_LEVEL=info
23-
LOG_JSON_FORMAT= # Print everything in logger as json; false by default
22+
DEFAULT_LOG_LEVEL=warn
23+
LOG_JSON_FORMAT=false # Print everything in logger as json; false by default
2424

2525
###############################
2626
#### Client Configurations ####

.github/workflows/smoke-tests.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,17 @@ on:
1010
jobs:
1111
smoke-tests:
1212
runs-on: ubuntu-latest
13-
container:
14-
image: node:23-bullseye
1513
steps:
1614
- uses: actions/checkout@v4
1715

18-
- name: Cache pnpm
19-
uses: actions/cache@v4
16+
- uses: pnpm/action-setup@v3
2017
with:
21-
path: |
22-
~/.pnpm-store
23-
**/node_modules
24-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
25-
restore-keys: ${{ runner.os }}-pnpm-
18+
version: 9.15.0
2619

27-
- name: Setup pnpm
28-
uses: pnpm/action-setup@v3
20+
- uses: actions/setup-node@v4
2921
with:
30-
version: 9.15.0
22+
node-version: "23.3.0"
23+
cache: "pnpm"
3124

3225
- name: Run smoke tests
3326
run: pnpm run smokeTests

agent/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@elizaos/plugin-node": "workspace:*",
6464
"@elizaos/plugin-solana": "workspace:*",
6565
"@elizaos/plugin-injective": "workspace:*",
66-
"@elizaos/plugin-solana-agentkit": "workspace:*",
66+
"@elizaos/plugin-solana-agent-kit": "workspace:*",
6767
"@elizaos/plugin-squid-router": "workspace:*",
6868
"@elizaos/plugin-autonome": "workspace:*",
6969
"@elizaos/plugin-starknet": "workspace:*",

agent/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ import { openWeatherPlugin } from "@elizaos/plugin-open-weather";
8585
import { quaiPlugin } from "@elizaos/plugin-quai";
8686
import { sgxPlugin } from "@elizaos/plugin-sgx";
8787
import { solanaPlugin } from "@elizaos/plugin-solana";
88-
import { solanaAgentkitPlugin } from "@elizaos/plugin-solana-agentkit";
88+
import { solanaAgentkitPlugin } from "@elizaos/plugin-solana-agent-kit";
8989
import { squidRouterPlugin } from "@elizaos/plugin-squid-router";
9090
import { stargazePlugin } from "@elizaos/plugin-stargaze";
9191
import { storyPlugin } from "@elizaos/plugin-story";
@@ -197,7 +197,7 @@ export async function loadCharacterFromOnchain(): Promise<Character[]> {
197197
const jsonText = onchainJson;
198198

199199
console.log("JSON:", jsonText);
200-
if (jsonText == "null") return [];
200+
if (!jsonText) return [];
201201
const loadedCharacters = [];
202202
try {
203203
const character = JSON.parse(jsonText);
@@ -1200,7 +1200,7 @@ const startAgents = async () => {
12001200
characters = await loadCharacterFromOnchain();
12011201
}
12021202

1203-
if ((onchainJson == "null" && charactersArg) || hasValidRemoteUrls()) {
1203+
if ((!onchainJson && charactersArg) || hasValidRemoteUrls()) {
12041204
characters = await loadCharacters(charactersArg);
12051205
}
12061206

client/src/routes/overview.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import { type UUID } from "@elizaos/core";
77
export default function AgentRoute() {
88
const { agentId } = useParams<{ agentId: UUID }>();
99

10-
if (!agentId) return <div>No data.</div>;
11-
1210
const query = useQuery({
1311
queryKey: ["agent", agentId],
14-
queryFn: () => apiClient.getAgent(agentId),
12+
queryFn: () => apiClient.getAgent(agentId ?? ""),
1513
refetchInterval: 5_000,
14+
enabled: Boolean(agentId),
1615
});
1716

17+
if (!agentId) return <div>No data.</div>;
18+
1819
const character = query?.data?.character;
1920

2021
if (!character) return null;

packages/client-discord/src/actions/summarize_conversation.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const dateRangeTemplate = `# Messages we are summarizing (the conversatio
2828
{{recentMessages}}
2929
3030
# Instructions: {{senderName}} is requesting a summary of the conversation. Your goal is to determine their objective, along with the range of dates that their request covers.
31-
The "objective" is a detailed description of what the user wants to summarize based on the conversation. If they just ask for a general summary, you can either base it off the converation if the summary range is very recent, or set the object to be general, like "a detailed summary of the conversation between all users".
31+
The "objective" is a detailed description of what the user wants to summarize based on the conversation. If they just ask for a general summary, you can either base it off the conversation if the summary range is very recent, or set the object to be general, like "a detailed summary of the conversation between all users".
3232
The "start" and "end" are the range of dates that the user wants to summarize, relative to the current time. The start and end should be relative to the current time, and measured in seconds, minutes, hours and days. The format is "2 days ago" or "3 hours ago" or "4 minutes ago" or "5 seconds ago", i.e. "<integer> <unit> ago".
3333
If you aren't sure, you can use a default range of "0 minutes ago" to "2 hours ago" or more. Better to err on the side of including too much than too little.
3434

packages/plugin-birdeye/src/actions/token-search-symbol.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const tokenSearchSymbolAction = {
9090
)
9191
);
9292

93-
// get filter the resuls to only include the token results and then filter the results to only include the ones that match the symbol
93+
// get filter the results to only include the token results and then filter the results to only include the ones that match the symbol
9494
const validResults = results.map((r, i) =>
9595
r.data.items
9696
.filter((item) => item.type === "token" && item.result)

packages/plugin-bootstrap/src/providers/boredom.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ const cringeWords = [
215215
"uncharted",
216216
"multifaceted",
217217
"comprehensive",
218-
"multi-dimentional",
218+
"multi-dimensional",
219219
"explore",
220220
"elevate",
221221
"leverage",

0 commit comments

Comments
 (0)