Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ import { it as test } from "vitest";

import { formatHelpText, parseArgs } from "./build-llama-cpp-dflash.mjs";

test("help advertises supported fused targets but not Android fused targets", () => {
test("help advertises supported fused targets but not mobile fused targets", () => {
const helpText = formatHelpText();
assert.match(helpText, /linux-aarch64-cuda-fused/);
assert.match(helpText, /ios-arm64-metal-fused/);
assert.match(helpText, /ios-arm64-simulator-metal-fused/);
assert.match(helpText, /darwin-arm64-metal-fused/);
assert.doesNotMatch(helpText, /android-arm64-cpu-fused/);
assert.doesNotMatch(helpText, /android-x86_64-cpu-fused/);
assert.doesNotMatch(helpText, /ios-arm64-metal-fused/);
assert.doesNotMatch(helpText, /ios-arm64-simulator-metal-fused/);
});

test("unsupported Android fused targets fail closed with explicit diagnostics", () => {
test("unsupported mobile fused targets fail closed with explicit diagnostics", () => {
const cases = [
["android-arm64-cpu-fused", /Android fused FFI is not wired/],
["android-arm64-vulkan-fused", /Android fused FFI is not wired/],
Expand All @@ -24,6 +25,8 @@ test("unsupported Android fused targets fail closed with explicit diagnostics",
"android-x86_64-vulkan-fused",
/Android x86_64 fused FFI is not a dflash target/,
],
["ios-arm64-metal-fused", /iOS fused FFI is not wired/],
["ios-arm64-simulator-metal-fused", /iOS fused FFI is not wired/],
];

for (const [target, pattern] of cases) {
Expand Down
12 changes: 0 additions & 12 deletions packages/app-core/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ const fileDir = path.dirname(fileURLToPath(import.meta.url));
const monorepoRoot = path.resolve(fileDir, "../..");
const appCoreSrc = path.join(fileDir, "src");
const agentSrc = path.join(monorepoRoot, "packages/agent/src");
const pluginWorkerRuntimeSrc = path.join(
monorepoRoot,
"packages/plugin-worker-runtime/src",
);
const uiDir = path.join(monorepoRoot, "packages/ui");
const sharedSrc = path.join(monorepoRoot, "packages/shared/src");
const coreSrc = path.join(monorepoRoot, "packages/core/src");
Expand Down Expand Up @@ -476,14 +472,6 @@ export default defineConfig({
find: /^@elizaos\/plugin-x402$/,
replacement: path.join(pluginX402Src, "index.ts"),
},
{
find: /^@elizaos\/plugin-worker-runtime$/,
replacement: path.join(pluginWorkerRuntimeSrc, "index.ts"),
},
{
find: /^@elizaos\/plugin-worker-runtime\/(.+)$/,
replacement: path.join(pluginWorkerRuntimeSrc, "$1"),
},
{
find: /^@elizaos\/plugin-browser$/,
replacement: path.join(pluginBrowserBridgeSrc, "index.ts"),
Expand Down
23 changes: 23 additions & 0 deletions packages/core/src/__tests__/service-type-collisions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ const duplicateServiceTypeAllowlist = new Map<string, AllowlistEntry>([
]),
},
],
[
"capability-router",
{
reason:
"Capability routing is mid-migration: the core canonical service and the legacy agent remote/E2B routers share the slot until callers finish moving to RuntimeCapabilityService.",
classes: new Set([
"packages/core/src/services/runtime-capability-service.ts:RuntimeCapabilityService",
"packages/agent/src/services/e2b-capability-router.ts:E2BRemoteCapabilityRouterService",
"packages/agent/src/services/remote-capability-router.ts:RemoteCapabilityRouterService",
]),
},
],
[
"discord-local",
{
Expand All @@ -85,6 +97,17 @@ const duplicateServiceTypeAllowlist = new Map<string, AllowlistEntry>([
]),
},
],
[
"xr-session",
{
reason:
"Hearwear and XR expose the same session service contract while those plugins converge; they are alternative providers, not services enabled together.",
classes: new Set([
"plugins/plugin-hearwear/src/services/xr-session-service.ts:XRSessionService",
"plugins/plugin-xr/src/services/xr-session-service.ts:XRSessionService",
]),
},
],
[
"workflow_credential_provider",
{
Expand Down
Loading