@elizaos/agent 2.0.0-alpha.154 → 2.0.0-alpha.156
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/apps/app-lifeops/src/actions/life.d.ts.map +1 -1
- package/apps/app-lifeops/src/actions/life.js +20 -4
- package/package.json +4 -4
- package/packages/agent/src/api/plugin-routes.d.ts.map +1 -1
- package/packages/agent/src/api/plugin-routes.js +50 -0
- package/packages/typescript/src/plugin.d.ts.map +1 -1
- package/packages/typescript/src/plugin.js +10 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/actions/life.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EAMP,MAAM,eAAe,CAAC;AAqCvB,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,qBAAqB,CAAC;AAqC7B,KAAK,aAAa,GAAG,sBAAsB,CAAC;AA6M5C,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAoE5D;
|
|
1
|
+
{"version":3,"file":"life.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/actions/life.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EAMP,MAAM,eAAe,CAAC;AAqCvB,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,qBAAqB,CAAC;AAqC7B,KAAK,aAAa,GAAG,sBAAsB,CAAC;AA6M5C,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAoE5D;AA2zED,eAAO,MAAM,UAAU,EAAE,MAAM,GAAG;IAChC,8BAA8B,CAAC,EAAE,OAAO,CAAC;CA8lD1C,CAAC"}
|
|
@@ -753,6 +753,10 @@ function formatOccurrenceDisambiguationLabel(occurrence) {
|
|
|
753
753
|
? `${occurrence.title} (${hints.join(", ")})`
|
|
754
754
|
: occurrence.title;
|
|
755
755
|
}
|
|
756
|
+
function narrowOccurrenceCandidates(matches) {
|
|
757
|
+
const actionableMatches = matches.filter((occurrence) => occurrence.state === "visible" || occurrence.state === "snoozed");
|
|
758
|
+
return actionableMatches.length > 0 ? actionableMatches : matches;
|
|
759
|
+
}
|
|
756
760
|
async function resolveOccurrence(service, target, domain) {
|
|
757
761
|
if (!target)
|
|
758
762
|
return { match: null, ambiguousCandidates: [] };
|
|
@@ -772,9 +776,13 @@ async function resolveOccurrence(service, target, domain) {
|
|
|
772
776
|
return { match: exactMatches[0], ambiguousCandidates: [] };
|
|
773
777
|
}
|
|
774
778
|
if (exactMatches.length > 1) {
|
|
779
|
+
const narrowedMatches = narrowOccurrenceCandidates(exactMatches);
|
|
780
|
+
if (narrowedMatches.length === 1) {
|
|
781
|
+
return { match: narrowedMatches[0], ambiguousCandidates: [] };
|
|
782
|
+
}
|
|
775
783
|
return {
|
|
776
784
|
match: null,
|
|
777
|
-
ambiguousCandidates:
|
|
785
|
+
ambiguousCandidates: narrowedMatches.map(formatOccurrenceDisambiguationLabel),
|
|
778
786
|
};
|
|
779
787
|
}
|
|
780
788
|
// Substring matches — disambiguate when multiple
|
|
@@ -783,8 +791,12 @@ async function resolveOccurrence(service, target, domain) {
|
|
|
783
791
|
return { match: substringMatches[0], ambiguousCandidates: [] };
|
|
784
792
|
}
|
|
785
793
|
if (substringMatches.length > 1) {
|
|
794
|
+
const narrowedSubstringMatches = narrowOccurrenceCandidates(substringMatches);
|
|
795
|
+
if (narrowedSubstringMatches.length === 1) {
|
|
796
|
+
return { match: narrowedSubstringMatches[0], ambiguousCandidates: [] };
|
|
797
|
+
}
|
|
786
798
|
// Prefer startsWith over generic includes
|
|
787
|
-
const startsWithMatches =
|
|
799
|
+
const startsWithMatches = narrowedSubstringMatches.filter((o) => normalizeTitle(o.title).startsWith(normalized));
|
|
788
800
|
if (startsWithMatches.length === 1) {
|
|
789
801
|
return { match: startsWithMatches[0], ambiguousCandidates: [] };
|
|
790
802
|
}
|
|
@@ -797,7 +809,7 @@ async function resolveOccurrence(service, target, domain) {
|
|
|
797
809
|
// Still ambiguous — return candidates for the caller to list
|
|
798
810
|
return {
|
|
799
811
|
match: null,
|
|
800
|
-
ambiguousCandidates:
|
|
812
|
+
ambiguousCandidates: narrowedSubstringMatches.map(formatOccurrenceDisambiguationLabel),
|
|
801
813
|
};
|
|
802
814
|
}
|
|
803
815
|
const targetTokens = normalized.split(/\s+/).filter(Boolean);
|
|
@@ -810,9 +822,13 @@ async function resolveOccurrence(service, target, domain) {
|
|
|
810
822
|
return { match: tokenSetMatches[0], ambiguousCandidates: [] };
|
|
811
823
|
}
|
|
812
824
|
if (tokenSetMatches.length > 1) {
|
|
825
|
+
const narrowedTokenSetMatches = narrowOccurrenceCandidates(tokenSetMatches);
|
|
826
|
+
if (narrowedTokenSetMatches.length === 1) {
|
|
827
|
+
return { match: narrowedTokenSetMatches[0], ambiguousCandidates: [] };
|
|
828
|
+
}
|
|
813
829
|
return {
|
|
814
830
|
match: null,
|
|
815
|
-
ambiguousCandidates:
|
|
831
|
+
ambiguousCandidates: narrowedTokenSetMatches.map(formatOccurrenceDisambiguationLabel),
|
|
816
832
|
};
|
|
817
833
|
}
|
|
818
834
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elizaos/agent",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.156",
|
|
4
4
|
"description": "Standalone elizaOS-based agent and backend server package.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -451,15 +451,15 @@
|
|
|
451
451
|
"@elizaos/app-steward": "^0.0.0",
|
|
452
452
|
"@elizaos/app-task-coordinator": "^0.0.0",
|
|
453
453
|
"@elizaos/app-training": "^0.0.1",
|
|
454
|
-
"@elizaos/core": "^2.0.0-alpha.
|
|
454
|
+
"@elizaos/core": "^2.0.0-alpha.156",
|
|
455
455
|
"@elizaos/plugin-agent-orchestrator": "^0.6.2-alpha.0",
|
|
456
456
|
"@elizaos/plugin-ollama": "^2.0.0-alpha.14",
|
|
457
457
|
"@elizaos/plugin-pdf": "^2.0.0-alpha.18",
|
|
458
458
|
"@elizaos/plugin-solana": "1.2.6",
|
|
459
459
|
"@elizaos/plugin-sql": "^2.0.0-alpha.19",
|
|
460
460
|
"@elizaos/plugin-wechat": "github:milady-ai/plugin-wechat",
|
|
461
|
-
"@elizaos/shared": "^2.0.0-alpha.
|
|
462
|
-
"@elizaos/skills": "^2.0.0-alpha.
|
|
461
|
+
"@elizaos/shared": "^2.0.0-alpha.156",
|
|
462
|
+
"@elizaos/skills": "^2.0.0-alpha.156",
|
|
463
463
|
"@hapi/boom": "^10.0.1",
|
|
464
464
|
"@noble/curves": "^2.0.1",
|
|
465
465
|
"@whiskeysockets/baileys": "7.0.0-rc.9",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/plugin-routes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/plugin-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,47 @@ function optionalPluginListId(npmName) {
|
|
|
14
14
|
return npmName.replace("@elizaos/plugin-", "");
|
|
15
15
|
}
|
|
16
16
|
const pluginsListInFlight = new WeakMap();
|
|
17
|
+
function readCompatEnabledFromConfig(config, pluginId) {
|
|
18
|
+
const asRecord = (value) => {
|
|
19
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
return value;
|
|
23
|
+
};
|
|
24
|
+
const legacyStreaming = asRecord(config.streaming);
|
|
25
|
+
const container = asRecord(config.connectors)?.[pluginId] ?? legacyStreaming?.[pluginId];
|
|
26
|
+
const value = asRecord(container)?.enabled;
|
|
27
|
+
return typeof value === "boolean" ? value : null;
|
|
28
|
+
}
|
|
29
|
+
function buildCoreToggleDiagnostics(config, npmName) {
|
|
30
|
+
const pluginId = optionalPluginListId(npmName);
|
|
31
|
+
const isOptional = OPTIONAL_CORE_PLUGINS.includes(npmName);
|
|
32
|
+
if (!isOptional) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
const allowList = new Set(config.plugins?.allow ?? []);
|
|
36
|
+
const enabledAllowList = allowList.has(npmName) || allowList.has(pluginId);
|
|
37
|
+
const entryEnabledRaw = config.plugins?.entries?.[pluginId]?.enabled;
|
|
38
|
+
const enabledEntries = typeof entryEnabledRaw === "boolean" ? entryEnabledRaw : null;
|
|
39
|
+
const enabledCompat = readCompatEnabledFromConfig(config, pluginId);
|
|
40
|
+
const driftFlags = [];
|
|
41
|
+
if (enabledEntries !== null && enabledEntries !== enabledAllowList) {
|
|
42
|
+
driftFlags.push("entries_vs_allowlist");
|
|
43
|
+
}
|
|
44
|
+
if (enabledEntries !== null &&
|
|
45
|
+
enabledCompat !== null &&
|
|
46
|
+
enabledEntries !== enabledCompat) {
|
|
47
|
+
driftFlags.push("entries_vs_compat");
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
pluginId,
|
|
51
|
+
npmName,
|
|
52
|
+
enabled_allowlist: enabledAllowList,
|
|
53
|
+
enabled_entries: enabledEntries,
|
|
54
|
+
enabled_compat: enabledCompat,
|
|
55
|
+
drift_flags: driftFlags,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
17
58
|
// ---------------------------------------------------------------------------
|
|
18
59
|
// Route handler
|
|
19
60
|
// ---------------------------------------------------------------------------
|
|
@@ -1130,6 +1171,15 @@ export async function handlePluginRoutes(ctx) {
|
|
|
1130
1171
|
loadedPackages: runtimeApply.loadedPackages,
|
|
1131
1172
|
unloadedPackages: runtimeApply.unloadedPackages,
|
|
1132
1173
|
reloadedPackages: runtimeApply.reloadedPackages,
|
|
1174
|
+
diagnostics: (() => {
|
|
1175
|
+
const diagnostic = buildCoreToggleDiagnostics(state.config, body.npmName);
|
|
1176
|
+
return diagnostic && diagnostic.drift_flags.length > 0
|
|
1177
|
+
? {
|
|
1178
|
+
withDrift: true,
|
|
1179
|
+
plugin: diagnostic,
|
|
1180
|
+
}
|
|
1181
|
+
: undefined;
|
|
1182
|
+
})(),
|
|
1133
1183
|
message: runtimeApply.requiresRestart
|
|
1134
1184
|
? `${shortId} ${body.enabled ? "enabled" : "disabled"}. Restart required.`
|
|
1135
1185
|
: `${shortId} ${body.enabled ? "enabled" : "disabled"}.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../typescript/src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../typescript/src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAqCtC,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiF3E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAkB9D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG;IAChD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CACjB,CAsDA;AAED,wBAAsB,oBAAoB,CACzC,UAAU,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6DxB;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED,wBAAgB,yBAAyB,CACxC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,GAAE,OAAe,GACzB,MAAM,EAAE,CAuFV;AAED,wBAAsB,UAAU,CAC/B,YAAY,EAAE,MAAM,GAAG,MAAM,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AAiFD,wBAAsB,cAAc,CACnC,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAC5B,UAAU,GAAE,OAAe,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAyBnB"}
|
|
@@ -9,6 +9,12 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
9
9
|
import { logger } from "./logger";
|
|
10
10
|
import { detectEnvironment } from "./utils/environment";
|
|
11
11
|
const attemptedInstalls = new Set();
|
|
12
|
+
function getBunRuntime() {
|
|
13
|
+
const bunRuntime = globalThis.Bun;
|
|
14
|
+
return bunRuntime && typeof bunRuntime.spawn === "function"
|
|
15
|
+
? bunRuntime
|
|
16
|
+
: null;
|
|
17
|
+
}
|
|
12
18
|
function isAutoInstallAllowed() {
|
|
13
19
|
if (process.env.ELIZA_NO_AUTO_INSTALL === "true")
|
|
14
20
|
return false;
|
|
@@ -33,12 +39,13 @@ export async function tryInstallPlugin(pluginName) {
|
|
|
33
39
|
return false;
|
|
34
40
|
}
|
|
35
41
|
attemptedInstalls.add(pluginName);
|
|
36
|
-
|
|
42
|
+
const bunRuntime = getBunRuntime();
|
|
43
|
+
if (!bunRuntime) {
|
|
37
44
|
logger.warn({ src: "core:plugin", pluginName }, "Bun runtime not available, cannot auto-install");
|
|
38
45
|
return false;
|
|
39
46
|
}
|
|
40
47
|
try {
|
|
41
|
-
const check =
|
|
48
|
+
const check = bunRuntime.spawn(["bun", "--version"], {
|
|
42
49
|
stdout: "pipe",
|
|
43
50
|
stderr: "pipe",
|
|
44
51
|
});
|
|
@@ -53,7 +60,7 @@ export async function tryInstallPlugin(pluginName) {
|
|
|
53
60
|
return false;
|
|
54
61
|
}
|
|
55
62
|
logger.info({ src: "core:plugin", pluginName }, "Auto-installing missing plugin");
|
|
56
|
-
const install =
|
|
63
|
+
const install = bunRuntime.spawn(["bun", "add", pluginName], {
|
|
57
64
|
cwd: process.cwd(),
|
|
58
65
|
env: process.env,
|
|
59
66
|
stdout: "inherit",
|