Skip to content

Commit a24aa16

Browse files
author
Shaw
committed
Merge branch 'develop' of https://github.com/elizaOS/eliza into develop
2 parents 53a04ad + 5fac840 commit a24aa16

163 files changed

Lines changed: 7994 additions & 1157 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/mobile-build-smoke.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@ jobs:
4545
skip-avatar-clone: "true"
4646
no-vision-deps: "true"
4747

48+
- name: Generate protobuf types
49+
# Restores the step that was on the last green Mobile Build Smoke
50+
# run (52ab686a, 2026-05-09). Without these generated types in
51+
# `packages/core/src/types/generated/`, `@elizaos/core`'s build
52+
# fails downstream, which cascades into `@elizaos/shared` and
53+
# vite config resolution.
54+
run: |
55+
if [ -d packages/schemas ] && [ -f packages/schemas/buf.gen.yaml ] && [ ! -d packages/core/src/types/generated ]; then
56+
cd packages/schemas
57+
node node_modules/@bufbuild/buf/install.js 2>/dev/null || true
58+
bunx @bufbuild/buf@1.67.0 generate
59+
fi
60+
61+
- name: Build Vite config package deps
62+
# vite.config.ts imports dist-only workspace packages
63+
# (`@elizaos/shared` and `@elizaos/ui/config/app-config`), and the
64+
# app aliases plugin-browser source which imports `@elizaos/vault`.
65+
# Build those package chains before Vite evaluates/bundles the app.
66+
run: bun turbo run build --filter=@elizaos/ui --filter=@elizaos/vault
67+
4868
- name: Build iOS simulator app
4969
run: node --max-old-space-size=8192 packages/app-core/scripts/run-mobile-build.mjs ios
5070
env:
@@ -158,6 +178,26 @@ jobs:
158178
skip-avatar-clone: "true"
159179
no-vision-deps: "true"
160180

181+
- name: Generate protobuf types
182+
# Restores the step that was on the last green Mobile Build Smoke
183+
# run (52ab686a, 2026-05-09). Without these generated types in
184+
# `packages/core/src/types/generated/`, `@elizaos/core`'s build
185+
# fails downstream, which cascades into `@elizaos/shared` and
186+
# vite config resolution.
187+
run: |
188+
if [ -d packages/schemas ] && [ -f packages/schemas/buf.gen.yaml ] && [ ! -d packages/core/src/types/generated ]; then
189+
cd packages/schemas
190+
node node_modules/@bufbuild/buf/install.js 2>/dev/null || true
191+
bunx @bufbuild/buf@1.67.0 generate
192+
fi
193+
194+
- name: Build Vite config package deps
195+
# vite.config.ts imports dist-only workspace packages
196+
# (`@elizaos/shared` and `@elizaos/ui/config/app-config`), and the
197+
# app aliases plugin-browser source which imports `@elizaos/vault`.
198+
# Build those package chains before Vite evaluates/bundles the app.
199+
run: bun turbo run build --filter=@elizaos/ui --filter=@elizaos/vault
200+
161201
- name: Accept Android SDK licenses
162202
run: yes | sdkmanager --licenses >/dev/null 2>&1 || true
163203

bun.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloud/bun.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloud/packages/tests/unit/advertising-provider-contracts.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe("advertising provider contracts", () => {
8181
new Response(JSON.stringify({ data: [{ id: "adset-1", name: "Ad Set" }] }), {
8282
status: 200,
8383
headers: { "content-type": "application/json" },
84-
})) as typeof fetch;
84+
})) as unknown as typeof fetch;
8585

8686
const { metaAdsProvider } = await import(
8787
`../../lib/services/advertising/providers/meta.ts?case=${Date.now()}`

cloud/packages/tests/unit/x402-payment-requests.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
22

33
const PAYMENT_ID = "x402_request_test";
44

5-
function payment(overrides: Partial<Record<string, unknown>> = {}) {
5+
function paymentFixture(overrides: Partial<Record<string, unknown>> = {}) {
66
return {
77
id: PAYMENT_ID,
88
organization_id: "org-x402",
@@ -44,8 +44,8 @@ async function loadService() {
4444
).href
4545
);
4646
return mod.x402PaymentRequestsService as {
47-
toView: (payment: ReturnType<typeof payment>) => Record<string, unknown>;
48-
toPublicView: (payment: ReturnType<typeof payment>) => Record<string, unknown>;
47+
toView: (payment: ReturnType<typeof paymentFixture>) => Record<string, unknown>;
48+
toPublicView: (payment: ReturnType<typeof paymentFixture>) => Record<string, unknown>;
4949
settle: (
5050
id: string,
5151
paymentPayloadInput: unknown,
@@ -59,8 +59,8 @@ describe("x402 payment requests", () => {
5959

6060
test("redacts callback URLs from public status views", async () => {
6161
const service = await loadService();
62-
const privateView = service.toView(payment());
63-
const publicView = service.toPublicView(payment());
62+
const privateView = service.toView(paymentFixture());
63+
const publicView = service.toPublicView(paymentFixture());
6464

6565
expect(privateView.callbackUrl).toBe("https://app.example.com/private/callback");
6666
expect(publicView.callbackUrl).toBeUndefined();
@@ -75,14 +75,14 @@ describe("x402 payment requests", () => {
7575

7676
mock.module("@/db/repositories/crypto-payments", () => ({
7777
cryptoPaymentsRepository: {
78-
findById: async () => payment(),
78+
findById: async () => paymentFixture(),
7979
markAsConfirmed: async () => {
8080
markAsConfirmedCalls += 1;
81-
return payment();
81+
return paymentFixture();
8282
},
8383
update: async () => {
8484
updateCalls += 1;
85-
return payment();
85+
return paymentFixture();
8686
},
8787
},
8888
}));
@@ -129,7 +129,7 @@ describe("x402 payment requests", () => {
129129
const redeemableCalls: unknown[] = [];
130130
let appCounterUpdated = false;
131131

132-
const pendingPayment = payment({
132+
const pendingPayment = paymentFixture({
133133
status: "pending",
134134
transaction_hash: null,
135135
confirmed_at: null,

cloud/services/tunnel-proxy/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25.3
55
require tailscale.com v1.90.8
66

77
require (
8-
filippo.io/edwards25519 v1.1.0 // indirect
8+
filippo.io/edwards25519 v1.1.1 // indirect
99
github.com/akutz/memconn v0.1.0 // indirect
1010
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
1111
github.com/coder/websocket v1.8.12 // indirect
@@ -36,14 +36,14 @@ require (
3636
github.com/x448/float16 v0.8.4 // indirect
3737
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
3838
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
39-
golang.org/x/crypto v0.38.0 // indirect
39+
golang.org/x/crypto v0.45.0 // indirect
4040
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
41-
golang.org/x/net v0.40.0 // indirect
41+
golang.org/x/net v0.47.0 // indirect
4242
golang.org/x/oauth2 v0.30.0 // indirect
43-
golang.org/x/sync v0.14.0 // indirect
44-
golang.org/x/sys v0.33.0 // indirect
45-
golang.org/x/term v0.32.0 // indirect
46-
golang.org/x/text v0.25.0 // indirect
43+
golang.org/x/sync v0.18.0 // indirect
44+
golang.org/x/sys v0.38.0 // indirect
45+
golang.org/x/term v0.37.0 // indirect
46+
golang.org/x/text v0.31.0 // indirect
4747
golang.org/x/time v0.11.0 // indirect
4848
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
4949
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect

cloud/services/tunnel-proxy/go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
9fans.net/go v0.0.8-0.20250307142834-96bdba94b63f h1:1C7nZuxUMNz7eiQALRfiqNOm04+m3edWlRff/BYHf0Q=
22
9fans.net/go v0.0.8-0.20250307142834-96bdba94b63f/go.mod h1:hHyrZRryGqVdqrknjq5OWDLGCTJ2NeEvtrpR96mjraM=
3-
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
4-
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3+
filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
4+
filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
55
filippo.io/mkcert v1.4.4 h1:8eVbbwfVlaqUM7OwuftKc2nuYOoTDQWqsoXmzoXZdbc=
66
filippo.io/mkcert v1.4.4/go.mod h1:VyvOchVuAye3BoUsPUOOofKygVwLV2KQMVFJNRq+1dA=
77
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
@@ -172,35 +172,35 @@ go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4
172172
go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g=
173173
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
174174
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
175-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
176-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
175+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
176+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
177177
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs=
178178
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo=
179179
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8=
180180
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
181181
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
182182
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
183-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
184-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
185-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
186-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
183+
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
184+
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
185+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
186+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
187187
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
188188
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
189189
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
190-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
191-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
190+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
191+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
192192
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
193193
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
194-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
195-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
196-
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
197-
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
198-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
199-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
194+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
195+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
196+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
197+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
198+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
199+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
200200
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
201201
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
202-
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
203-
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
202+
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
203+
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
204204
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
205205
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
206206
golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE=

cloud/tsconfig.test.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"esModuleInterop": true,
1010
"module": "esnext",
1111
"moduleResolution": "bundler",
12+
"allowImportingTsExtensions": true,
1213
"resolveJsonModule": true,
1314
"isolatedModules": true,
1415
"jsx": "react-jsx",
@@ -20,6 +21,8 @@
2021
"@/types/*": ["./packages/types/*"],
2122
"@/components/*": ["./packages/ui/src/components/*"],
2223
"@elizaos/cloud-ui": ["./packages/ui/src/index.ts"],
24+
"@elizaos/core": ["../packages/core/src/index.node.ts"],
25+
"@elizaos/core/*": ["../packages/core/src/*"],
2326
"drizzle-orm": ["./node_modules/drizzle-orm"],
2427
"drizzle-orm/*": ["./node_modules/drizzle-orm/*"],
2528
"@/*": ["./*"]

0 commit comments

Comments
 (0)