Skip to content

Commit ec7d874

Browse files
author
Shaw
committed
Merge remote-tracking branch 'origin/develop' into shaw/release-followup-platform-fixes-final
# Conflicts: # packages/scripts/audit-capability-router-live-ci.ts
2 parents 533bfd1 + 40c744d commit ec7d874

157 files changed

Lines changed: 10131 additions & 276402 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.

‎bun.lock‎

Lines changed: 32 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,13 +439,16 @@
439439
"@radix-ui/react-switch": "^1.2.6",
440440
"@radix-ui/react-tabs": "^1.1.13",
441441
"@radix-ui/react-tooltip": "^1.2.8",
442+
"abitype": "1.2.3",
442443
"class-variance-authority": "^0.7.1",
443444
"clsx": "^2.1.1",
444445
"elysia": "^1.4.21",
446+
"eventsource-parser": "^1.1.2",
445447
"hono": "^4.12.18",
446448
"node-edge-tts": "^1.2.9",
447449
"pg": "^8.20.0",
448-
"tailwind-merge": "^3.0.0",
450+
"robot3": "^0.4.1",
451+
"tailwind-merge": "3.4.0",
449452
"zod": "^4.4.3"
450453
}
451454
}

‎packages/agent/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"format": "bunx @biomejs/biome format src",
4646
"format:fix": "bunx @biomejs/biome format --write src",
4747
"pack:dry-run": "cd dist && npm pack --dry-run",
48-
"test": "vitest run --config vitest.config.ts",
48+
"test": "bunx vitest run --config vitest.config.ts",
4949
"test:remote-capabilities": "cd ../.. && bunx vitest run packages/agent/src/services/remote-plugin-adapter.test.ts packages/agent/src/services/remote-capability-router.test.ts packages/agent/src/services/remote-capability-endpoint-provider.test.ts packages/agent/src/services/remote-capability-endpoint-conformance.test.ts packages/agent/src/services/remote-capability-cloud-sandbox.test.ts packages/agent/src/services/remote-capability-live-report.test.ts packages/agent/src/api/remote-capability-routes.test.ts packages/agent/src/__tests__/views-registry-integration.test.ts packages/core/src/capabilities/index.test.ts --coverage.enabled=false",
5050
"test:remote-capabilities:source-build": "cd ../.. && bunx vitest run packages/agent/src/services/remote-plugin-adapter.test.ts -t \"builds a remote plugin from source|loads a built remote plugin from a separate capability server process\" --coverage.enabled=false",
5151
"test:remote-capabilities:docker": "cd ../.. && ELIZA_REMOTE_CAPABILITY_DOCKER_SMOKE=1 bunx vitest run packages/agent/src/services/remote-plugin-adapter.test.ts -t \"Docker container capability server\" --coverage.enabled=false",

‎packages/agent/src/api/registry-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as ethers from "ethers";
1313
import type { TxService } from "./tx-service.ts";
1414

1515
// ── ABI ──────────────────────────────────────────────────────────────────
16-
// Matches ElizaAgentRegistry.sol. Babylon-compatible core interface plus
16+
// Matches ElizaAgentRegistry.sol. Feed-compatible core interface plus
1717
// registerAgentFor() and ERC721URIStorage tokenURI.
1818

1919
const REGISTRY_ABI = [

‎packages/agent/src/api/views-routes.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
type IAgentRuntime,
2727
logger,
2828
type RouteRequestMeta,
29+
type ViewType,
2930
} from "@elizaos/core";
3031
import { type RouteHelpers, readJsonBody } from "@elizaos/shared";
3132
import {
@@ -45,12 +46,16 @@ import {
4546
} from "./views-registry.ts";
4647
import { viewSearchIndex } from "./views-search-index.ts";
4748

48-
function parseViewTypeParam(value: string | null): "gui" | "tui" | undefined {
49-
return value === "gui" || value === "tui" ? value : undefined;
49+
function parseViewTypeParam(value: string | null): ViewType | undefined {
50+
return value === "gui" || value === "tui" || value === "xr"
51+
? (value as ViewType)
52+
: undefined;
5053
}
5154

52-
function parseViewTypeValue(value: unknown): "gui" | "tui" | undefined {
53-
return value === "gui" || value === "tui" ? value : undefined;
55+
function parseViewTypeValue(value: unknown): ViewType | undefined {
56+
return value === "gui" || value === "tui" || value === "xr"
57+
? (value as ViewType)
58+
: undefined;
5459
}
5560

5661
function contentTypeForViewAsset(assetPath: string): string {
@@ -185,7 +190,7 @@ export interface CurrentViewState {
185190
viewId: string;
186191
viewPath: string | null;
187192
viewLabel: string;
188-
viewType: "gui" | "tui" | "xr";
193+
viewType: ViewType;
189194
action?: string;
190195
updatedAt: string;
191196
}

‎packages/agent/src/external-modules.d.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -675,13 +675,13 @@ declare module "@elizaos/ui" {
675675
export type AppOperatorSurfaceProps = AnyValue;
676676
export type AppRunSummary = AnyValue;
677677
export type AppSessionJsonValue = AnyValue;
678-
export type BabylonActivityItem = AnyValue;
679-
export type BabylonAgentGoal = AnyValue;
680-
export type BabylonAgentStatus = AnyValue;
681-
export type BabylonChatMessage = AnyValue;
682-
export type BabylonPredictionMarket = AnyValue;
683-
export type BabylonTeamAgent = AnyValue;
684-
export type BabylonWallet = AnyValue;
678+
export type FeedActivityItem = AnyValue;
679+
export type FeedAgentGoal = AnyValue;
680+
export type FeedAgentStatus = AnyValue;
681+
export type FeedChatMessage = AnyValue;
682+
export type FeedPredictionMarket = AnyValue;
683+
export type FeedTeamAgent = AnyValue;
684+
export type FeedWallet = AnyValue;
685685
export type GameOperatorAction = AnyValue;
686686
export type GameOperatorEvent = AnyValue;
687687
export type OverlayApp = AnyValue;

‎packages/agent/vitest.config.ts‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,42 @@ export default defineConfig({
5050
find: /^@elizaos\/tui\/(.+)$/,
5151
replacement: path.join(monorepoRoot, "packages/tui/src/$1"),
5252
},
53+
// Explicitly pin react/react-dom to the workspace copies in the bun-managed
54+
// flat hoisted structure. Without this, bun's module resolver can walk up
55+
// to parent directories and pick up a different react version (e.g., a
56+
// react@19.2.6 from ~/.../milaidy/node_modules when the workspace has
57+
// react@19.2.5), which breaks the React hook dispatcher interface.
58+
// These MUST come before ...baseAliases because the base config's
59+
// resolveInstalledPackageRoot("react") walks up to the parent repo and
60+
// picks up react@19.2.6, producing a wrong alias that would otherwise win.
61+
{
62+
find: /^react$/,
63+
replacement: path.join(
64+
repoRoot,
65+
"node_modules/.bun/node_modules/react/index.js",
66+
),
67+
},
68+
{
69+
find: /^react\/jsx-runtime$/,
70+
replacement: path.join(
71+
repoRoot,
72+
"node_modules/.bun/node_modules/react/jsx-runtime.js",
73+
),
74+
},
75+
{
76+
find: /^react-dom$/,
77+
replacement: path.join(
78+
repoRoot,
79+
"node_modules/.bun/node_modules/react-dom/index.js",
80+
),
81+
},
82+
{
83+
find: /^react-dom\/client$/,
84+
replacement: path.join(
85+
repoRoot,
86+
"node_modules/.bun/node_modules/react-dom/client.js",
87+
),
88+
},
5389
...baseAliases,
5490
{
5591
find: /^@elizaos\/vault$/,
@@ -59,14 +95,6 @@ export default defineConfig({
5995
find: /^@elizaos\/vault\/(.+)$/,
6096
replacement: path.join(monorepoRoot, "packages/vault/src/$1"),
6197
},
62-
{
63-
find: /^@elizaos\/tui$/,
64-
replacement: path.join(monorepoRoot, "packages/tui/src/index.ts"),
65-
},
66-
{
67-
find: /^@elizaos\/tui\/(.+)$/,
68-
replacement: path.join(monorepoRoot, "packages/tui/src/$1"),
69-
},
7098
{
7199
find: /^@elizaos\/plugin-cli$/,
72100
replacement: path.join(
@@ -78,22 +106,6 @@ export default defineConfig({
78106
"index.ts",
79107
),
80108
},
81-
{
82-
find: /^react$/,
83-
replacement: path.join(repoRoot, "node_modules/react"),
84-
},
85-
{
86-
find: /^react\/jsx-runtime$/,
87-
replacement: path.join(repoRoot, "node_modules/react/jsx-runtime.js"),
88-
},
89-
{
90-
find: /^react-dom$/,
91-
replacement: path.join(repoRoot, "node_modules/react-dom"),
92-
},
93-
{
94-
find: /^react-dom\/client$/,
95-
replacement: path.join(repoRoot, "node_modules/react-dom/client.js"),
96-
},
97109
],
98110
},
99111
test: {
@@ -105,7 +117,7 @@ export default defineConfig({
105117
hookTimeout: 120_000,
106118
server: {
107119
deps: {
108-
inline: [/@elizaos\//],
120+
inline: [/@elizaos\//, /\/plugins\/plugin-/],
109121
},
110122
},
111123
include: ["src/**/*.test.{ts,tsx}", "test/**/*.test.{ts,tsx}"],

‎packages/app-core/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"sms-gateway:doctor": "node ./scripts/install-android-sms-gateway.mjs --doctor",
5252
"sms-gateway:homepage": "node ./scripts/check-homepage-public-readiness.mjs",
5353
"sms-gateway:install": "node ./scripts/install-android-sms-gateway.mjs --wait-device 300 --grant-role --clear-logcat --watch-logs 60",
54+
"sms-gateway:pair": "node ./scripts/install-android-sms-gateway.mjs --pair auto --connect auto --wait-device 60 --grant-role --clear-logcat --watch-logs 60",
5455
"sms-gateway:readiness": "node ./scripts/check-sms-gateway-readiness.mjs",
5556
"sms-gateway:verify:cloud-onboarding": "node ./scripts/verify-cloud-sms-onboarding-flow.mjs",
5657
"sms-gateway:verify:bluebubbles": "node ./scripts/verify-bluebubbles-gateway-e2e.mjs",

‎packages/app-core/packaging/snap/snapcraft.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ parts:
511511
--filter=@elizaos/plugin-wallet-ui \
512512
--filter=@elizaos/plugin-wechat \
513513
--filter=@elizaos/plugin-whatsapp \
514-
--filter=@elizaos/scenario-runner/schema
514+
--filter=@elizaos/scenario-runner
515515
rm -rf node_modules/@types
516516
rm -rf "$SNAP_BUILD_TYPES_DIR"
517517

‎packages/app-core/platforms/android/app/src/main/AndroidManifest.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<package android:name="com.google.android.apps.healthdata" />
66
</queries>
77

8+
<uses-feature
9+
android:name="android.hardware.telephony"
10+
android:required="false" />
11+
812
<application
913
android:allowBackup="true"
1014
android:icon="@mipmap/ic_launcher"
@@ -76,6 +80,56 @@
7680
</intent-filter>
7781
</receiver>
7882

83+
<receiver
84+
android:name=".ElizaSmsReceiver"
85+
android:exported="true"
86+
android:permission="android.permission.BROADCAST_SMS">
87+
<intent-filter>
88+
<action android:name="android.provider.Telephony.SMS_DELIVER" />
89+
</intent-filter>
90+
</receiver>
91+
92+
<receiver
93+
android:name=".ElizaMmsReceiver"
94+
android:exported="true"
95+
android:permission="android.permission.BROADCAST_WAP_PUSH">
96+
<intent-filter>
97+
<action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
98+
<data android:mimeType="application/vnd.wap.mms-message" />
99+
</intent-filter>
100+
</receiver>
101+
102+
<service
103+
android:name=".ElizaSmsGatewayService"
104+
android:exported="false" />
105+
106+
<service
107+
android:name=".ElizaRespondViaMessageService"
108+
android:exported="true"
109+
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
110+
<intent-filter>
111+
<action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
112+
<data android:scheme="sms" />
113+
<data android:scheme="smsto" />
114+
<data android:scheme="mms" />
115+
<data android:scheme="mmsto" />
116+
</intent-filter>
117+
</service>
118+
119+
<activity
120+
android:name=".ElizaSmsComposeActivity"
121+
android:exported="true"
122+
android:theme="@style/AppTheme.NoActionBar">
123+
<intent-filter>
124+
<action android:name="android.intent.action.SENDTO" />
125+
<category android:name="android.intent.category.DEFAULT" />
126+
<data android:scheme="sms" />
127+
<data android:scheme="smsto" />
128+
<data android:scheme="mms" />
129+
<data android:scheme="mmsto" />
130+
</intent-filter>
131+
</activity>
132+
79133
<provider
80134
android:name="androidx.core.content.FileProvider"
81135
android:authorities="${applicationId}.fileprovider"
@@ -92,6 +146,11 @@
92146
<uses-permission android:name="android.permission.INTERNET" />
93147
<uses-permission android:name="android.permission.RECORD_AUDIO" />
94148
<uses-permission android:name="android.permission.CAMERA" />
149+
<uses-permission android:name="android.permission.READ_SMS" />
150+
<uses-permission android:name="android.permission.SEND_SMS" />
151+
<uses-permission android:name="android.permission.RECEIVE_SMS" />
152+
<uses-permission android:name="android.permission.RECEIVE_MMS" />
153+
<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
95154
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
96155
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
97156
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />

0 commit comments

Comments
 (0)