Skip to content

Commit 8a33187

Browse files
author
Shaw
committed
Merge PR #7826: fix(release): restore desktop release inputs
2 parents 760978d + b3dc80a commit 8a33187

45 files changed

Lines changed: 598 additions & 150 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: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/agent/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@
315315
"jsdom": "^29.0.0",
316316
"json5": "^2.2.3",
317317
"minimisted": "^2.0.0",
318+
"onnxruntime-web": "1.26.0",
318319
"pako": "^1.0.10",
319320
"pg": "^8.16.3",
320321
"pify": "^4.0.1",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ parts:
127127
const keep = new Set([
128128
"plugin-agent-skills",
129129
"plugin-anthropic",
130+
"plugin-aosp-local-inference",
130131
"plugin-browser",
131132
"plugin-capacitor-bridge",
132133
"plugin-elizacloud",
@@ -493,6 +494,7 @@ parts:
493494
--filter=@elizaos/app-core \
494495
--filter=@elizaos/agent \
495496
--filter=@elizaos/plugin-agent-skills \
497+
--filter=@elizaos/plugin-aosp-local-inference \
496498
--filter=@elizaos/plugin-browser \
497499
--filter=@elizaos/plugin-elizamaker \
498500
--filter=@elizaos/plugin-imessage \

packages/app-core/src/registry/smartglasses-registry.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { describe, expect, it } from "vitest";
12
import { readFileSync } from "node:fs";
23
import { join } from "node:path";
3-
import { describe, expect, it } from "vitest";
44
import { loadRegistryFromRawEntries } from "./loader";
55
import { registryEntrySchema } from "./schema";
66

packages/cloud-api/v1/_container-control-plane-forward.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ async function forwardControlPlaneRequest(
4242
headers.set("x-forwarded-proto", sourceUrl.protocol.replace(":", ""));
4343

4444
const internalToken = readStringEnv(c, ["CONTAINER_CONTROL_PLANE_TOKEN"]);
45-
if (internalToken)
45+
if (internalToken) {
4646
headers.set("x-container-control-plane-token", internalToken);
47+
headers.set("authorization", `Bearer ${internalToken}`);
48+
}
4749

4850
const databaseUrl = readStringEnv(c, ["DATABASE_URL"]);
4951
if (databaseUrl) headers.set("x-eliza-cloud-database-url", databaseUrl);

packages/cloud-api/webhooks/bluebubbles/route.test.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ const routePhoneMessage = mock(async () => ({
1010
type RegisterPhoneGatewayDeviceResult = {
1111
id: string | null;
1212
registered: boolean;
13-
skippedReason?: string;
13+
skippedReason?: "missing_phone_number" | "table_missing" | "write_failed";
1414
};
1515

16+
const registeredGatewayDevice = (): RegisterPhoneGatewayDeviceResult => ({
17+
id: "gateway-device-1",
18+
registered: true,
19+
});
20+
1621
const registerPhoneGatewayDevice = mock(
17-
async (): Promise<RegisterPhoneGatewayDeviceResult> => ({
18-
id: "gateway-device-1",
19-
registered: true,
20-
}),
22+
async (): Promise<RegisterPhoneGatewayDeviceResult> =>
23+
registeredGatewayDevice(),
2124
);
2225

2326
mock.module("@/lib/services/agent-gateway-router", () => ({
@@ -83,10 +86,9 @@ describe("BlueBubbles webhook", () => {
8386
organizationId: "org-1",
8487
}));
8588
registerPhoneGatewayDevice.mockClear();
86-
registerPhoneGatewayDevice.mockImplementation(async () => ({
87-
id: "gateway-device-1",
88-
registered: true,
89-
}));
89+
registerPhoneGatewayDevice.mockImplementation(async () =>
90+
registeredGatewayDevice(),
91+
);
9092
});
9193

9294
test("rejects requests without the shared gateway secret", async () => {

packages/cloud-shared/src/lib/services/agent-gateway-router.test.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,28 @@ mock.module("../../db/schemas", () => ({
100100
created_at: "created_at",
101101
},
102102
appRequests: {},
103+
appAnalytics: {},
104+
apps: {},
103105
appUsers: {},
106+
adminUsers: {},
107+
containers: {},
108+
conversations: {},
109+
elizaRoomCharactersTable: {},
110+
invoices: {},
111+
mcpPricingTypeEnum: {},
112+
mcpStatusEnum: {},
113+
mcpUsage: {},
114+
moderationViolations: {},
115+
organizationEncryptionKeys: {},
116+
organizations: {},
104117
phoneGatewayDevices: {},
118+
userCharacters: {},
119+
userMcps: {},
120+
userModerationStatus: {},
121+
users: {},
122+
vertexModelAssignments: {},
123+
vertexTunedModels: {},
124+
vertexTuningJobs: {},
105125
}));
106126

107127
mock.module("./agent-gateway-relay", () => ({

packages/cloud-shared/src/lib/services/eliza-app/onboarding-chat.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,13 @@ export async function runOnboardingChat(input: OnboardingChatInput): Promise<Onb
433433
};
434434

435435
if (!requiresLogin && session.userId && session.organizationId) {
436-
provisioning = preferredNameCaptured
437-
? await ensureElizaAppProvisioning({
438-
userId: session.userId,
439-
organizationId: session.organizationId,
440-
})
441-
: await getElizaAppProvisioningStatus(session.organizationId);
436+
provisioning =
437+
(userMessage || input.authenticatedUser) && preferredNameCaptured
438+
? await ensureElizaAppProvisioning({
439+
userId: session.userId,
440+
organizationId: session.organizationId,
441+
})
442+
: await getElizaAppProvisioningStatus(session.organizationId);
442443
session.agentId = provisioning.agentId ?? session.agentId;
443444
}
444445

packages/cloud-shared/src/lib/services/eliza-app/provisioning.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ mock.module("../provisioning-jobs", () => ({
5757
},
5858
}));
5959

60-
const { ensureElizaAppProvisioning } = await import("./provisioning.ts?test=provisioning");
60+
const { ensureElizaAppProvisioning } = await import(
61+
`./provisioning.ts?test=provisioning-${Date.now()}`
62+
);
6163

6264
describe("ensureElizaAppProvisioning", () => {
6365
beforeEach(() => {

packages/cloud-shared/src/lib/services/message-router/index.test.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,29 @@ mock.module("../../../db/schemas", () => ({
3737
},
3838
agentPhoneNumbers: {},
3939
appRequests: {},
40+
appAnalytics: {},
41+
apps: {},
4042
appUsers: {},
43+
adminUsers: {},
44+
containers: {},
45+
conversations: {},
46+
elizaRoomCharactersTable: {},
47+
invoices: {},
48+
mcpPricingTypeEnum: {},
49+
mcpStatusEnum: {},
50+
mcpUsage: {},
51+
moderationViolations: {},
52+
organizationEncryptionKeys: {},
53+
organizations: {},
4154
phoneMessageLog: {},
4255
phoneGatewayDevices: {},
56+
userCharacters: {},
57+
userMcps: {},
58+
userModerationStatus: {},
59+
users: {},
60+
vertexModelAssignments: {},
61+
vertexTunedModels: {},
62+
vertexTuningJobs: {},
4363
}));
4464

4565
mock.module("../secrets", () => ({

0 commit comments

Comments
 (0)