evolcore 0.0.45 → 0.0.46
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/CHANGELOG.md +75 -0
- package/bin/ecmsg.js +33 -23
- package/dist/ability/application-service.js +1 -2
- package/dist/ability/package.js +28 -0
- package/dist/agent-template/jobs.js +158 -36
- package/dist/agent-template/runtime.js +401 -34
- package/dist/agent-template/service.js +764 -369
- package/dist/agent-template/tool-runner.js +35 -17
- package/dist/agent-template/types.js +7 -4
- package/dist/agents/baseagent.js +10 -9
- package/dist/agents/claude-runner.js +13 -5
- package/dist/agents/codex/app-server-client.js +2 -4
- package/dist/agents/codex/diagnostics.js +18 -1
- package/dist/agents/codex-runner.js +3 -1
- package/dist/agents/ecagent-runner.js +3 -1
- package/dist/agents/gemini-runner.js +2 -1
- package/dist/aun/menu/client.js +142 -182
- package/dist/aun/rpc/client.js +33 -17
- package/dist/aun/service-proxy.js +6 -23
- package/dist/channels/aun.js +656 -112
- package/dist/cli/agent-create.js +37 -10
- package/dist/cli/agent-template.js +105 -84
- package/dist/cli/agent.js +31 -18
- package/dist/cli/daemon-commands.js +15 -17
- package/dist/cli/daemon-lifecycle-client.js +40 -18
- package/dist/cli/directory.js +12 -4
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/events-command.js +2 -1
- package/dist/cli/init.js +50 -20
- package/dist/cli/integrity-command.js +2 -0
- package/dist/cli/managed-command-guard.js +20 -1
- package/dist/cli/menu-client.js +7 -5
- package/dist/cli/restart-monitor.js +33 -20
- package/dist/cli/services-command.js +28 -5
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +20 -2
- package/dist/config/peer-book-store.js +152 -120
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +1 -1
- package/dist/config/provider-identity.js +10 -4
- package/dist/config/provider-ipc-service.js +10 -2
- package/dist/config/provider-local-sync.js +2 -2
- package/dist/config/providers-config.js +95 -10
- package/dist/config/providers-import.js +4 -6
- package/dist/config/providers.js +14 -3
- package/dist/config/role-store.js +1 -1
- package/dist/config-store.js +9 -1
- package/dist/core/agent-application-service.js +56 -29
- package/dist/core/agent-create-status.js +3 -1
- package/dist/core/agent-creation-claim.js +1 -0
- package/dist/core/agent-ipc-registration.js +2 -2
- package/dist/core/agent-reload-coordinator.js +38 -1
- package/dist/core/agent-runtime.js +85 -38
- package/dist/core/auth/agent-delegation.js +5 -0
- package/dist/core/auth/operation-authorizer.js +1 -1
- package/dist/core/auth/operation-catalog.js +3 -3
- package/dist/core/bootstrap-service.js +3 -0
- package/dist/core/capability/capability-manager.js +3 -1
- package/dist/core/channel-loader.js +29 -3
- package/dist/core/channel-runtime.js +1 -1
- package/dist/core/command/agent-control.js +6 -5
- package/dist/core/command/agent-template-menu.js +32 -97
- package/dist/core/command/eventcenter-menu.js +61 -13
- package/dist/core/command/menu-catalog.js +11 -4
- package/dist/core/command/menu-handler.js +35 -8
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/team-workspace-bootstrap.js +1 -2
- package/dist/core/command/team-workspace-management-store.js +83 -0
- package/dist/core/command/team-workspace-management.js +1 -2
- package/dist/core/command/team-workspace-team.js +26 -3
- package/dist/core/daemon-control.js +3 -4
- package/dist/core/daemon-lifecycle.js +146 -110
- package/dist/core/evolagent-registry.js +42 -0
- package/dist/core/evolagent.js +2 -1
- package/dist/core/file-integrity/read.js +9 -16
- package/dist/core/file-integrity/store.js +94 -34
- package/dist/core/handoff/dispatcher.js +33 -7
- package/dist/core/handoff/runtime.js +8 -0
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +3 -0
- package/dist/core/message/aun-ipc-sender.js +109 -7
- package/dist/core/message/contact-admission.js +6 -2
- package/dist/core/message/message-bridge.js +13 -0
- package/dist/core/message/message-queue.js +131 -30
- package/dist/core/message/pending-hints.js +8 -0
- package/dist/core/message/response-engine.js +48 -2
- package/dist/core/message/send-routing.js +3 -12
- package/dist/core/model/catalog-service.js +13 -0
- package/dist/core/model/model-catalog.js +57 -18
- package/dist/core/pack-auth.js +163 -31
- package/dist/core/pack-install.js +42 -1
- package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
- package/dist/core/permission/ec-command-parser.js +3 -1
- package/dist/core/permission/shell-environment.js +23 -0
- package/dist/core/rate-window.js +6 -1
- package/dist/core/session/session-idle-monitor.js +0 -1
- package/dist/core/session/session-manager.js +14 -0
- package/dist/core/session/session-title.js +26 -6
- package/dist/core/skill/index-generator.js +3 -4
- package/dist/core/thread/thread-service.js +0 -1
- package/dist/core/thread/topic-id.js +8 -0
- package/dist/directory/owner-directory-admission.js +17 -0
- package/dist/directory/owner-directory-cache.js +3 -1
- package/dist/directory/owner-directory-markdown.js +145 -23
- package/dist/directory/owner-directory-policy.js +23 -0
- package/dist/directory/owner-directory-query-operation.js +20 -6
- package/dist/directory/owner-directory-search.js +47 -0
- package/dist/eck/message-renderer.js +171 -32
- package/dist/ecweb/basic-settings-service.js +7 -3
- package/dist/ecweb/providers-service.js +17 -10
- package/dist/ecweb/runtime/lifecycle.js +1 -1
- package/dist/ecweb/runtime/supervisor.js +77 -35
- package/dist/event-center/admission-materializer.js +1 -1
- package/dist/event-center/bus-gate.js +48 -4
- package/dist/event-center/bus-host.js +3 -3
- package/dist/event-center/center-config.js +57 -28
- package/dist/event-center/dispatcher.js +8 -0
- package/dist/event-center/event-log.js +69 -27
- package/dist/event-center/index-generator.js +6 -1
- package/dist/event-center/ipc-operation.js +66 -25
- package/dist/event-center/pack-loader.js +12 -55
- package/dist/event-center/pack-manager.js +5 -3
- package/dist/event-center/registry.js +48 -52
- package/dist/event-center/runtime.js +219 -81
- package/dist/event-center/script-runner.js +18 -7
- package/dist/event-center/types.js +9 -1
- package/dist/event-center/validation.js +33 -4
- package/dist/index.js +96 -42
- package/dist/ipc.js +33 -7
- package/dist/product.js +1 -0
- package/dist/proxy/manager.js +52 -11
- package/dist/proxy/service-supervisor.js +265 -67
- package/dist/services/dispatcher.js +26 -3
- package/dist/services/idempotency.js +128 -0
- package/dist/services/identity.js +3 -27
- package/dist/services/index-generator.js +5 -1
- package/dist/services/index.js +244 -45
- package/dist/services/ipc-operation.js +164 -20
- package/dist/services/pack-manager.js +37 -9
- package/dist/services/router.js +100 -31
- package/dist/services/script-runner.js +15 -4
- package/dist/services/service-payload.js +50 -2
- package/dist/services/validation.js +107 -3
- package/dist/trigger/scheduler.js +14 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/utils/cross-platform.js +35 -11
- package/dist/utils/error-utils.js +13 -1
- package/dist/utils/instance-registry.js +33 -35
- package/dist/utils/process-introspect.js +35 -20
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/windows-shell-trust.js +174 -68
- package/kits/docs/context-assembly.md +3 -3
- package/kits/docs/evolcore/agent.md +28 -10
- package/kits/docs/evolcore/config.md +22 -0
- package/kits/docs/evolcore/directory.md +46 -12
- package/kits/docs/evolcore/event-center.md +6 -6
- package/kits/docs/evolcore/group-collaboration.md +1 -1
- package/kits/docs/evolcore/menu-client.md +7 -5
- package/kits/docs/evolcore/menu-protocol.md +5 -3
- package/kits/docs/evolcore/msg.md +10 -3
- package/kits/docs/evolcore/provider.md +7 -3
- package/kits/docs/evolcore/services.md +145 -12
- package/kits/docs/evolcore/thread-chain.md +17 -9
- package/kits/docs/prompt-loading-architecture.md +4 -4
- package/kits/eck_message_manifest.json +46 -3
- package/kits/rules/04-relation.md +10 -2
- package/kits/rules/06-channel.md +2 -1
- package/kits/schemas/providers.schema.2.json +1 -0
- package/kits/skills/ec-group/SKILL.md +4 -0
- package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
- package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
- package/kits/skills/thread-ops/SKILL.md +8 -5
- package/kits/templates/message-fragments/group-batch-item.md +3 -0
- package/kits/templates/message-fragments/group-batch.md +1 -0
- package/kits/templates/message-fragments/item-group.md +4 -0
- package/kits/templates/message-fragments/item-private.md +4 -0
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +11 -7
- package/package.json +3 -2
- package/scripts/agent-template/index.mjs +9 -4
- package/scripts/agent-template/inspect.mjs +16 -9
- package/scripts/agent-template/shared/plan.mjs +3 -33
- package/scripts/agent-template/shared/template-contract.mjs +186 -3
- package/scripts/agent-template/shared/template-package.mjs +119 -10
- package/scripts/agent-template/shared/template-runtime.mjs +49 -6
- package/scripts/agent-template/shared/template.mjs +5 -5
- package/scripts/agent-template/team-pack.mjs +245 -0
- package/scripts/agent-template/team-preview.mjs +111 -0
- package/scripts/aid-batch/identity-batch.mjs +143 -0
- package/dist/ability/versions.js +0 -32
- package/dist/aun/model-headers.js +0 -17
- package/dist/channels/builtin-plugins.js +0 -19
- package/dist/core/command/team-workspace-initializer.js +0 -2
- package/dist/core/command/team-workspace-job-store.js +0 -88
- package/dist/core/command/team-workspace-management-service.js +0 -2
- package/dist/core/contact-bind-registry.js +0 -27
- package/dist/event-center/ledger.js +0 -52
- package/dist/services/reply.js +0 -55
- package/kits/templates/message-fragments/item.md +0 -3
- package/scripts/agent-template/pack.mjs +0 -169
|
@@ -1,6 +1,73 @@
|
|
|
1
1
|
import { isDeepStrictEqual } from 'node:util';
|
|
2
2
|
import { isIP } from 'node:net';
|
|
3
3
|
import { normalizeProviderDomain, providerIdentity } from './provider-identity.js';
|
|
4
|
+
/** Tokenize model patterns without interpreting regex or filesystem glob syntax. */
|
|
5
|
+
function modelPatternTokens(pattern) {
|
|
6
|
+
const tokens = [];
|
|
7
|
+
for (let i = 0; i < pattern.length; i++) {
|
|
8
|
+
const char = pattern[i];
|
|
9
|
+
if (char === '\\' && ['*', '?', '\\'].includes(pattern[i + 1]))
|
|
10
|
+
tokens.push('literal:' + pattern[++i]);
|
|
11
|
+
else
|
|
12
|
+
tokens.push(char === '*' || char === '?' ? char : 'literal:' + char);
|
|
13
|
+
}
|
|
14
|
+
return tokens;
|
|
15
|
+
}
|
|
16
|
+
export function isProviderModelPattern(pattern) {
|
|
17
|
+
return modelPatternTokens(pattern).some(token => token === '*' || token === '?');
|
|
18
|
+
}
|
|
19
|
+
export function providerModelLiteralId(pattern) {
|
|
20
|
+
return modelPatternTokens(pattern).map(token => token.startsWith('literal:') ? token.slice(8) : token).join('');
|
|
21
|
+
}
|
|
22
|
+
export function providerModelPatternMatches(pattern, model) {
|
|
23
|
+
// Iterative glob matching: no regular expression backtracking on configured patterns.
|
|
24
|
+
const tokens = modelPatternTokens(pattern);
|
|
25
|
+
let p = 0;
|
|
26
|
+
let m = 0;
|
|
27
|
+
let star = -1;
|
|
28
|
+
let retry = 0;
|
|
29
|
+
while (m < model.length) {
|
|
30
|
+
if (tokens[p] === '?' || tokens[p] === 'literal:' + model[m]) {
|
|
31
|
+
p++;
|
|
32
|
+
m++;
|
|
33
|
+
}
|
|
34
|
+
else if (tokens[p] === '*') {
|
|
35
|
+
star = p++;
|
|
36
|
+
retry = m;
|
|
37
|
+
}
|
|
38
|
+
else if (star !== -1) {
|
|
39
|
+
p = star + 1;
|
|
40
|
+
m = ++retry;
|
|
41
|
+
}
|
|
42
|
+
else
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
while (tokens[p] === '*')
|
|
46
|
+
p++;
|
|
47
|
+
return p === tokens.length;
|
|
48
|
+
}
|
|
49
|
+
export function providerModelEnabled(model, models = {}, policy) {
|
|
50
|
+
if (!policy)
|
|
51
|
+
return !Object.hasOwn(models, model) || models[model].enabled !== false;
|
|
52
|
+
const defaultEnabled = policy !== 'denylist';
|
|
53
|
+
const exact = Object.entries(models).find(([id]) => !isProviderModelPattern(id) && providerModelPatternMatches(id, model));
|
|
54
|
+
if (exact)
|
|
55
|
+
return exact[1].enabled ?? defaultEnabled;
|
|
56
|
+
if (policy === 'manual')
|
|
57
|
+
return false;
|
|
58
|
+
const matches = Object.entries(models).filter(([pattern]) => isProviderModelPattern(pattern)
|
|
59
|
+
&& providerModelPatternMatches(pattern, model));
|
|
60
|
+
return matches.length ? matches.every(([, value]) => value.enabled ?? defaultEnabled) : policy === 'denylist';
|
|
61
|
+
}
|
|
62
|
+
export function assertProviderModelAllowed(model, provider) {
|
|
63
|
+
if (!providerModelEnabled(model, provider.modelOverrides, provider.modelPolicy)) {
|
|
64
|
+
if (!provider.modelPolicy)
|
|
65
|
+
throw new Error(`Model ${model} is disabled for provider ${provider.providerId}`);
|
|
66
|
+
throw Object.assign(new Error(`Provider model policy rejected: Model ${model} is disabled for provider ${provider.providerId}(模型未获允许)`), {
|
|
67
|
+
code: 'PROVIDER_MODEL_NOT_ALLOWED',
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
}
|
|
4
71
|
const PROHIBITED_PATH_SEGMENTS = new Set(['__proto__', 'prototype', 'constructor']);
|
|
5
72
|
const MULTIPART_DOMAIN_SUFFIXES = new Set(['com.cn', 'net.cn', 'org.cn', 'gov.cn', 'co.uk', 'org.uk', 'ac.uk', 'com.au', 'net.au', 'co.jp', 'co.nz']);
|
|
6
73
|
const PROVIDER_ENV_REFERENCE = /^\$(?:([A-Za-z_][A-Za-z0-9_]*)|\{([A-Za-z_][A-Za-z0-9_]*)\})$/u;
|
|
@@ -149,8 +216,14 @@ function modelOverride(value, field) {
|
|
|
149
216
|
function serviceConfig(value, field, serviceType) {
|
|
150
217
|
if (!isRecord(value))
|
|
151
218
|
throw new Error(`${field} must be an object`);
|
|
152
|
-
assertFields(value, ['path', 'style', 'models'], field);
|
|
219
|
+
assertFields(value, ['path', 'style', 'models', 'modelPolicy'], field);
|
|
153
220
|
const result = {};
|
|
221
|
+
if (value.modelPolicy !== undefined) {
|
|
222
|
+
if (typeof value.modelPolicy !== 'string' || !['allowlist', 'denylist', 'manual'].includes(value.modelPolicy)) {
|
|
223
|
+
throw new Error(`${field}.modelPolicy must be allowlist, denylist or manual`);
|
|
224
|
+
}
|
|
225
|
+
result.modelPolicy = value.modelPolicy;
|
|
226
|
+
}
|
|
154
227
|
if (value.path !== undefined) {
|
|
155
228
|
if (typeof value.path !== 'string')
|
|
156
229
|
throw new Error(`${field}.path must be a string`);
|
|
@@ -169,11 +242,16 @@ function serviceConfig(value, field, serviceType) {
|
|
|
169
242
|
if (!modelId.trim() || PROHIBITED_PATH_SEGMENTS.has(modelId))
|
|
170
243
|
throw new Error(`${field}.models contains an invalid model ID`);
|
|
171
244
|
const normalized = modelOverride(override, `${field}.models.${modelId}`);
|
|
245
|
+
if (result.modelPolicy && isProviderModelPattern(modelId)) {
|
|
246
|
+
if (result.modelPolicy === 'manual')
|
|
247
|
+
throw new Error(`${field}.models: manual requires exact model IDs`);
|
|
248
|
+
assertFields(override, ['enabled'], `${field}.models.${modelId}`);
|
|
249
|
+
}
|
|
172
250
|
const supportsImageInput = ['text', 'claude', 'codex'].includes(serviceType);
|
|
173
251
|
const imageMembership = !supportsImageInput && normalized.imageIn !== undefined;
|
|
174
252
|
if (!supportsImageInput)
|
|
175
253
|
delete normalized.imageIn;
|
|
176
|
-
if (Object.keys(normalized).length || !Object.keys(override).length || imageMembership)
|
|
254
|
+
if (result.modelPolicy || Object.keys(normalized).length || !Object.keys(override).length || imageMembership)
|
|
177
255
|
result.models[modelId] = normalized;
|
|
178
256
|
}
|
|
179
257
|
if (!Object.keys(result.models).length)
|
|
@@ -319,6 +397,7 @@ export function resolveProviderService(providerId, serviceType, config, defaultS
|
|
|
319
397
|
headers: provider.common.headers,
|
|
320
398
|
queryParams: provider.common.queryParams,
|
|
321
399
|
modelOverrides: service.models ?? {},
|
|
400
|
+
...(service.modelPolicy ? { modelPolicy: service.modelPolicy } : {}),
|
|
322
401
|
};
|
|
323
402
|
}
|
|
324
403
|
export function resolveProviderServiceForBaseagent(providerId, baseagent, preferredServiceType, config) {
|
|
@@ -328,6 +407,10 @@ export function resolveProviderServiceForBaseagent(providerId, baseagent, prefer
|
|
|
328
407
|
return resolveProviderService(providerId, serviceType, config, 'openai-compatible');
|
|
329
408
|
}
|
|
330
409
|
export function resolveProviderModelOverrides(providerId, serviceType, config, baseagent) {
|
|
410
|
+
return resolveProviderModelSettings(providerId, serviceType, config, baseagent).models ?? {};
|
|
411
|
+
}
|
|
412
|
+
/** Resolve policy for offline write validation without expanding connection secrets. */
|
|
413
|
+
export function resolveProviderModelSettings(providerId, serviceType, config, baseagent) {
|
|
331
414
|
providerId = resolveProviderId(providerId, config);
|
|
332
415
|
assertSafeRegistrySegment(serviceType, 'service type');
|
|
333
416
|
const provider = Object.hasOwn(config.providers, providerId) ? config.providers[providerId] : undefined;
|
|
@@ -342,7 +425,7 @@ export function resolveProviderModelOverrides(providerId, serviceType, config, b
|
|
|
342
425
|
if (fixedStyle && service.style && service.style !== fixedStyle) {
|
|
343
426
|
throw new Error(`Provider ${providerId} service ${serviceType} must use style ${fixedStyle}`);
|
|
344
427
|
}
|
|
345
|
-
return service
|
|
428
|
+
return service;
|
|
346
429
|
}
|
|
347
430
|
export function providerIsConfigured(config) {
|
|
348
431
|
return config?.provider !== undefined;
|
|
@@ -367,11 +450,10 @@ export function resolveServiceSelection(selections, serviceType, resolve) {
|
|
|
367
450
|
const providerId = nonEmpty(selection.provider, `Services.${serviceType}.provider`);
|
|
368
451
|
const model = nonEmpty(selection.model, `Services.${serviceType}.model`);
|
|
369
452
|
const resolved = resolve(providerId, providerServiceTypeForPurpose(serviceType));
|
|
370
|
-
|
|
371
|
-
throw new Error(`Model ${model} is disabled for provider ${providerId}`);
|
|
453
|
+
assertProviderModelAllowed(model, resolved);
|
|
372
454
|
return { ...resolved, model, effort: selection.effort };
|
|
373
455
|
}
|
|
374
|
-
export function assertProviderSelectionWrite(next, previous, inherited, resolveModelOverrides) {
|
|
456
|
+
export function assertProviderSelectionWrite(next, previous, inherited, resolveModelOverrides, resolveModelId = (_p, _s, _b, model) => model) {
|
|
375
457
|
for (const [baseagent, block] of Object.entries(next.baseagents ?? {})) {
|
|
376
458
|
if (!isRecord(block))
|
|
377
459
|
continue;
|
|
@@ -388,7 +470,9 @@ export function assertProviderSelectionWrite(next, previous, inherited, resolveM
|
|
|
388
470
|
const serviceType = providerServiceTypeForBaseagent(baseagent);
|
|
389
471
|
if (selection.provider !== undefined) {
|
|
390
472
|
const modelOverrides = resolveModelOverrides(selection.provider, serviceType, baseagent);
|
|
391
|
-
|
|
473
|
+
const model = selection.model && modelOverrides.modelPolicy
|
|
474
|
+
? resolveModelId(selection.provider, serviceType, baseagent, selection.model) : selection.model;
|
|
475
|
+
if (model && !providerModelEnabled(model, modelOverrides.models, modelOverrides.modelPolicy)) {
|
|
392
476
|
throw new Error(`Model ${selection.model} is disabled for provider ${selection.provider}`);
|
|
393
477
|
}
|
|
394
478
|
}
|
|
@@ -397,7 +481,8 @@ export function assertProviderSelectionWrite(next, previous, inherited, resolveM
|
|
|
397
481
|
if (!providerId || typeof candidate?.model !== 'string')
|
|
398
482
|
continue;
|
|
399
483
|
const modelOverrides = resolveModelOverrides(providerId, serviceType, baseagent);
|
|
400
|
-
|
|
484
|
+
const model = modelOverrides.modelPolicy ? resolveModelId(providerId, serviceType, baseagent, candidate.model) : candidate.model;
|
|
485
|
+
if (!providerModelEnabled(model, modelOverrides.models, modelOverrides.modelPolicy)) {
|
|
401
486
|
throw new Error(`Model ${candidate.model} is disabled for provider ${providerId}`);
|
|
402
487
|
}
|
|
403
488
|
}
|
|
@@ -430,7 +515,7 @@ export function assertProviderSelectionWrite(next, previous, inherited, resolveM
|
|
|
430
515
|
const modelOverrides = providerId
|
|
431
516
|
? resolveModelOverrides(providerId, providerServiceTypeForPurpose(serviceType))
|
|
432
517
|
: undefined;
|
|
433
|
-
if (model && modelOverrides
|
|
518
|
+
if (model && modelOverrides && !providerModelEnabled(model, modelOverrides.models, modelOverrides.modelPolicy)) {
|
|
434
519
|
throw new Error(`Model ${model} is disabled for provider ${providerId}`);
|
|
435
520
|
}
|
|
436
521
|
for (const candidate of Array.isArray(effective.fallback) ? effective.fallback : []) {
|
|
@@ -438,7 +523,7 @@ export function assertProviderSelectionWrite(next, previous, inherited, resolveM
|
|
|
438
523
|
if (!providerId || typeof candidate?.model !== 'string')
|
|
439
524
|
continue;
|
|
440
525
|
const candidateOverrides = resolveModelOverrides(providerId, providerServiceTypeForPurpose(serviceType));
|
|
441
|
-
if (
|
|
526
|
+
if (!providerModelEnabled(candidate.model, candidateOverrides.models, candidateOverrides.modelPolicy)) {
|
|
442
527
|
throw new Error(`Model ${candidate.model} is disabled for provider ${providerId}`);
|
|
443
528
|
}
|
|
444
529
|
}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { resolveAnthropicConfig, resolveGoogleConfig, resolveOpenaiConfig, } from '../agents/baseagent.js';
|
|
2
2
|
import { ConfigTarget, read } from './config-manager.js';
|
|
3
|
+
import { resolveProjectDefaultPath } from '../utils/project-path.js';
|
|
3
4
|
import { providerNameFromBaseUrlIfStatic, providerServiceTypeForBaseagent, validateProvidersFile } from './providers-config.js';
|
|
4
|
-
const IMPORTABLE_BASEAGENTS = ['claude', 'codex', 'gemini'
|
|
5
|
+
export const IMPORTABLE_BASEAGENTS = ['claude', 'codex', 'gemini'];
|
|
5
6
|
function resolveConnection(baseagent, config, projectPath) {
|
|
6
7
|
if (baseagent === 'claude')
|
|
7
8
|
return resolveAnthropicConfig(config, config.agents?.claude, { projectPath });
|
|
8
9
|
if (baseagent === 'codex')
|
|
9
10
|
return resolveOpenaiConfig(config, config.agents?.codex);
|
|
10
|
-
if (baseagent === 'ecagent')
|
|
11
|
-
return resolveEcagentConfig(config, config.agents?.ecagent);
|
|
12
11
|
return {
|
|
13
12
|
...resolveGoogleConfig(config, { ...config.agents?.gemini, cliPath: config.agents?.gemini?.cliPath || 'gemini' }),
|
|
14
13
|
baseUrl: process.env.GOOGLE_GEMINI_BASE_URL || 'https://generativelanguage.googleapis.com/v1beta',
|
|
@@ -21,14 +20,13 @@ export function providerFromBaseagent(baseagent) {
|
|
|
21
20
|
const source = read(ConfigTarget.Defaults, undefined, { cache: false });
|
|
22
21
|
const serviceType = providerServiceTypeForBaseagent(selected);
|
|
23
22
|
const config = { agents: {} };
|
|
24
|
-
const connection = resolveConnection(selected, config, source?.projects?.defaultPath);
|
|
23
|
+
const connection = resolveConnection(selected, config, resolveProjectDefaultPath(source?.projects?.defaultPath));
|
|
25
24
|
if (!connection.apiKey?.trim() || /your-|placeholder|<redacted>/u.test(connection.apiKey))
|
|
26
25
|
throw new Error('Source baseagent has no valid API key / token');
|
|
27
26
|
const defaultBaseUrls = {
|
|
28
27
|
claude: 'https://api.anthropic.com',
|
|
29
28
|
codex: 'https://api.openai.com/v1',
|
|
30
29
|
gemini: 'https://generativelanguage.googleapis.com/v1beta',
|
|
31
|
-
ecagent: DEFAULT_ECAGENT_BASE_URL,
|
|
32
30
|
};
|
|
33
31
|
const provider = {
|
|
34
32
|
common: {
|
package/dist/config/providers.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { resolvePaths } from '../paths.js';
|
|
2
2
|
import { ConfigTarget, read, write } from './config-manager.js';
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import { resolveProviderSelectionModel } from '../core/model/model-catalog.js';
|
|
4
|
+
import { assertProviderModelAllowed, assertProviderSelectionWrite as validateSelectionWrite, resolveProviderModelSettings as resolveModelOverrides, resolveProviderService as resolveService, resolveProviderServiceForBaseagent as resolveServiceForBaseagent, resolveServiceSelection as resolveSelection, resolveProviderId as resolveId, } from './providers-config.js';
|
|
5
|
+
export { assertProviderModelAllowed, providerModelEnabled, providerModelPatternMatches, providerModelLiteralId, isProviderModelPattern, providerIsConfigured, providerServiceTypeForBaseagent, providerServiceTypesForBaseagent, providerServiceTypeForPurpose, validateProvidersFile, } from './providers-config.js';
|
|
5
6
|
export function readProvidersFile(file = resolvePaths().providersConfig) {
|
|
6
7
|
return read(ConfigTarget.Providers, { providerFile: file }) ?? { providers: {} };
|
|
7
8
|
}
|
|
@@ -20,6 +21,16 @@ export function resolveProviderServiceForBaseagent(providerId, baseagent, prefer
|
|
|
20
21
|
export function resolveServiceSelection(selections, serviceType) {
|
|
21
22
|
return resolveSelection(selections, serviceType, resolveProviderService);
|
|
22
23
|
}
|
|
24
|
+
/** New dispatch restrictions are opt-in; legacy selections keep their existing execution path. */
|
|
25
|
+
export function hasExplicitProviderModelPolicy(providerId, serviceType, baseagent) {
|
|
26
|
+
return resolveModelOverrides(providerId, serviceType, readProvidersFile(), baseagent).modelPolicy !== undefined;
|
|
27
|
+
}
|
|
28
|
+
export function assertExplicitProviderModelAllowed(model, providerId, serviceType, baseagent) {
|
|
29
|
+
const settings = resolveModelOverrides(providerId, serviceType, readProvidersFile(), baseagent);
|
|
30
|
+
if (!settings.modelPolicy)
|
|
31
|
+
return;
|
|
32
|
+
assertProviderModelAllowed(model, { providerId, modelOverrides: settings.models ?? {}, modelPolicy: settings.modelPolicy });
|
|
33
|
+
}
|
|
23
34
|
export function assertProviderSelectionWrite(next, previous = {}, inherited = {}) {
|
|
24
|
-
validateSelectionWrite(next, previous, inherited, (providerId, serviceType, baseagent) => resolveModelOverrides(providerId, serviceType, readProvidersFile(), baseagent));
|
|
35
|
+
validateSelectionWrite(next, previous, inherited, (providerId, serviceType, baseagent) => resolveModelOverrides(providerId, serviceType, readProvidersFile(), baseagent), (providerId, serviceType, baseagent, model) => resolveProviderSelectionModel(providerId, serviceType, baseagent, model));
|
|
25
36
|
}
|
|
@@ -132,7 +132,7 @@ function readRegistry(selfAid, diagnostics) {
|
|
|
132
132
|
roleId: selected,
|
|
133
133
|
file: path.relative(resolvePaths().root, file),
|
|
134
134
|
message: `defaultRoles.${scene} references invalid or unregistered role ${selected}; ${scene === 'internalContact'
|
|
135
|
-
? 'internal-contact default role is disabled' :
|
|
135
|
+
? 'internal-contact default role is disabled' : 'using visitor fallback'}`,
|
|
136
136
|
});
|
|
137
137
|
if (scene !== 'internalContact')
|
|
138
138
|
defaultRoles[scene] = null;
|
package/dist/config-store.js
CHANGED
|
@@ -32,6 +32,7 @@ import { parseStableSemver } from './utils/stable-semver.js';
|
|
|
32
32
|
import { isSupportedBaseagent } from './agents/baseagent.js';
|
|
33
33
|
import { normalizeDaemonServices } from './config/daemon-services.js';
|
|
34
34
|
import { currentVersion } from './config/schema-registry.js';
|
|
35
|
+
import { assertProjectPathReference } from './utils/project-path.js';
|
|
35
36
|
import { assertOwnerConfigRecord } from './config/owner-config.js';
|
|
36
37
|
const SERVICE_METADATA_SENSITIVE_KEY = /(?:^|[_-])(endpoint|url|uri|token|access[_-]?token|authorization|cookie|secret|password|private[_-]?key|key|cert|certificate)(?:$|[_-])/i;
|
|
37
38
|
function assertLocalServiceEndpoint(value, fieldPath) {
|
|
@@ -354,10 +355,15 @@ export function loadDefaults() {
|
|
|
354
355
|
if (typeof raw.$schema_version !== 'number') {
|
|
355
356
|
logger.warn(`[config] ${p}: missing $schema_version, treating as ${CONFIG_SCHEMA_VERSION}`);
|
|
356
357
|
}
|
|
357
|
-
|
|
358
|
+
// Like Provider connection references, project paths stay literal until used.
|
|
359
|
+
// Other fields retain the legacy expansion behavior for compatibility.
|
|
360
|
+
const { projects, ...rest } = stripLegacyAunGatewayConfig(raw, p, message => logger.warn(message));
|
|
361
|
+
return { ...expandEnvRefs(rest), ...(projects === undefined ? {} : { projects }) };
|
|
358
362
|
}
|
|
359
363
|
export function saveDefaults(value) {
|
|
360
364
|
assertNoLegacyAunGatewayConfig(value, resolvePaths().defaultsConfig);
|
|
365
|
+
if (typeof value.projects?.defaultPath === 'string')
|
|
366
|
+
assertProjectPathReference(value.projects.defaultPath);
|
|
361
367
|
backupDefaults(resolvePaths().defaultsConfig);
|
|
362
368
|
atomicWriteJson(resolvePaths().defaultsConfig, stripLegacyAunGatewayConfig(value, resolvePaths().defaultsConfig, message => logger.warn(message)));
|
|
363
369
|
}
|
|
@@ -392,6 +398,8 @@ function backupDefaults(filePath) {
|
|
|
392
398
|
export function saveDefaultsSafe(patch) {
|
|
393
399
|
const p = resolvePaths().defaultsConfig;
|
|
394
400
|
assertNoLegacyAunGatewayConfig(patch, p);
|
|
401
|
+
if (typeof patch.projects?.defaultPath === 'string')
|
|
402
|
+
assertProjectPathReference(patch.projects.defaultPath);
|
|
395
403
|
let existing = null;
|
|
396
404
|
try {
|
|
397
405
|
existing = atomicReadJson(p);
|
|
@@ -44,6 +44,21 @@ function errorFrom(error, fallback = 'agent operation failed') {
|
|
|
44
44
|
...(busyCount === undefined ? {} : { busyCount }),
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
+
/** Only ENOENT permits orphan cleanup; unreadable or invalid configs remain errors. */
|
|
48
|
+
function assertAgentConfigMissing(aid) {
|
|
49
|
+
const file = path.join(resolvePaths().agentsDir, aid, 'config.json');
|
|
50
|
+
for (const candidate of [file, `${file}_`]) {
|
|
51
|
+
try {
|
|
52
|
+
fs.readFileSync(candidate);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
if (error.code === 'ENOENT')
|
|
56
|
+
continue;
|
|
57
|
+
throw error;
|
|
58
|
+
}
|
|
59
|
+
throw Object.assign(new Error(`Agent "${aid}" configuration exists; retry the operation`), { code: 'CONFLICT' });
|
|
60
|
+
}
|
|
61
|
+
}
|
|
47
62
|
/**
|
|
48
63
|
* Core-owned agent application facade. It contains no role resolution: callers
|
|
49
64
|
* must authorize the operation before invoking it. External CLI callers use
|
|
@@ -267,13 +282,14 @@ export class AgentApplicationService {
|
|
|
267
282
|
async enable(aid, force = false) {
|
|
268
283
|
return await this.setEnabled(aid, true, force);
|
|
269
284
|
}
|
|
270
|
-
async disable(aid, force = false) {
|
|
271
|
-
return await this.setEnabled(aid, false, force);
|
|
285
|
+
async disable(aid, force = false, guard) {
|
|
286
|
+
return await this.setEnabled(aid, false, force, guard);
|
|
272
287
|
}
|
|
273
|
-
async setEnabled(aid, enabled, force) {
|
|
288
|
+
async setEnabled(aid, enabled, force, guard) {
|
|
274
289
|
let config;
|
|
275
290
|
try {
|
|
276
291
|
await this.deps.beforeAgentOperation?.(aid);
|
|
292
|
+
guard?.();
|
|
277
293
|
if (enabled)
|
|
278
294
|
assertAgentAidAvailable(aid);
|
|
279
295
|
config = loadAgent(aid);
|
|
@@ -281,10 +297,35 @@ export class AgentApplicationService {
|
|
|
281
297
|
catch (error) {
|
|
282
298
|
return errorFrom(error, 'failed to read agent config');
|
|
283
299
|
}
|
|
284
|
-
if (!config)
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
300
|
+
if (!config) {
|
|
301
|
+
try {
|
|
302
|
+
assertAgentConfigMissing(aid);
|
|
303
|
+
if (enabled || !this.deps.registry.get(aid)) {
|
|
304
|
+
return { ok: false, error: `Agent "${aid}" not found`, code: 'NOT_FOUND' };
|
|
305
|
+
}
|
|
306
|
+
await this.initialization?.cancel(aid);
|
|
307
|
+
await this.deps.unload(aid, {
|
|
308
|
+
force,
|
|
309
|
+
prepare: async () => {
|
|
310
|
+
guard?.();
|
|
311
|
+
assertAgentConfigMissing(aid);
|
|
312
|
+
},
|
|
313
|
+
});
|
|
314
|
+
return { ok: true, aid, enabled: false, reloaded: true, configMissing: true };
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
return errorFrom(error, 'failed to unload orphaned agent');
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
if (!enabled) {
|
|
321
|
+
try {
|
|
322
|
+
await this.initialization?.cancel(aid);
|
|
323
|
+
guard?.();
|
|
324
|
+
}
|
|
325
|
+
catch (error) {
|
|
326
|
+
return errorFrom(error, 'agent changed before disable');
|
|
327
|
+
}
|
|
328
|
+
}
|
|
288
329
|
const previousEnabled = config.enabled;
|
|
289
330
|
try {
|
|
290
331
|
if (enabled) {
|
|
@@ -307,6 +348,7 @@ export class AgentApplicationService {
|
|
|
307
348
|
else
|
|
308
349
|
config.enabled = previousEnabled;
|
|
309
350
|
try {
|
|
351
|
+
guard?.();
|
|
310
352
|
saveAgent(config);
|
|
311
353
|
}
|
|
312
354
|
catch (error) {
|
|
@@ -322,28 +364,13 @@ export class AgentApplicationService {
|
|
|
322
364
|
async delete(aid, purge = false) {
|
|
323
365
|
try {
|
|
324
366
|
await this.deps.beforeAgentOperation?.(aid);
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
const configPath = path.join(agentDir, 'config.json');
|
|
333
|
-
if (!fs.existsSync(configPath))
|
|
334
|
-
return { ok: false, error: `Agent "${aid}" not found`, code: 'NOT_FOUND' };
|
|
335
|
-
try {
|
|
336
|
-
await removeAgentFiles(aid, purge);
|
|
337
|
-
notifyConfigWrite(ConfigTarget.Agent, { self: aid });
|
|
338
|
-
let stopped = false;
|
|
339
|
-
try {
|
|
340
|
-
const result = await this.resync();
|
|
341
|
-
if (result.ok)
|
|
342
|
-
stopped = result.results.some(item => item.includes(aid));
|
|
343
|
-
}
|
|
344
|
-
catch (error) {
|
|
345
|
-
logger.warn(`[agent-service] resync after delete ${aid} failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
346
|
-
}
|
|
367
|
+
await this.initialization?.cancel(aid);
|
|
368
|
+
const stopped = await this.deps.unload(aid, {
|
|
369
|
+
prepare: async () => {
|
|
370
|
+
await removeAgentFiles(aid, purge);
|
|
371
|
+
notifyConfigWrite(ConfigTarget.Agent, { self: aid });
|
|
372
|
+
},
|
|
373
|
+
});
|
|
347
374
|
return { ok: true, aid, purged: purge, stopped };
|
|
348
375
|
}
|
|
349
376
|
catch (error) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/** Agent 创建状态、初始化进度投影与删除后的磁盘清理。 */
|
|
2
2
|
import fs from 'fs';
|
|
3
|
+
import { templateInstallationGate } from '../agent-template/jobs.js';
|
|
3
4
|
import path from 'path';
|
|
4
5
|
import { randomUUID } from 'node:crypto';
|
|
5
6
|
import { creationOwnershipBinding } from './ownership/owner-resolver.js';
|
|
@@ -163,7 +164,8 @@ export function initializationCreateProgress(record, lifecycle, configOperationI
|
|
|
163
164
|
if (!record || record.mode !== 'one_shot')
|
|
164
165
|
return undefined;
|
|
165
166
|
const targetChanged = record.status === 'complete' && lifecycle === 'active' && configOperationId !== record.operationId;
|
|
166
|
-
const ready = record.status === 'complete' && lifecycle === 'active' && record.ownerConfirmed === true && !targetChanged
|
|
167
|
+
const ready = record.status === 'complete' && lifecycle === 'active' && record.ownerConfirmed === true && !targetChanged
|
|
168
|
+
&& !templateInstallationGate(record.plan.aid, record.teamJobId).blocked;
|
|
167
169
|
const failed = record.status === 'failed' || record.status === 'cancelled' || targetChanged;
|
|
168
170
|
// The SDK may need Owner consensus to publish the first valid agent.md. Keep
|
|
169
171
|
// that wait on the existing card-upload row until the profile is verified.
|
|
@@ -138,6 +138,7 @@ function claimAgentCreationLocked(request) {
|
|
|
138
138
|
...(request.ownerAid ? { ownerAid: request.ownerAid } : {}),
|
|
139
139
|
...(request.clientRequestId ? { clientRequestId: request.clientRequestId } : {}),
|
|
140
140
|
...(request.fingerprint ? { fingerprint: request.fingerprint } : {}),
|
|
141
|
+
...(request.teamJobId ? { teamJobId: request.teamJobId } : {}),
|
|
141
142
|
pid: process.pid,
|
|
142
143
|
host: os.hostname(),
|
|
143
144
|
startedAt: now,
|
|
@@ -44,7 +44,7 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
|
|
|
44
44
|
try {
|
|
45
45
|
const { parseTemplateCommand } = await import('../cli/agent-template.js');
|
|
46
46
|
const parsed = parseTemplateCommand(argv.slice(2));
|
|
47
|
-
templateOperation = 'agent.template.' + (parsed.action
|
|
47
|
+
templateOperation = 'agent.template.' + (parsed.action);
|
|
48
48
|
}
|
|
49
49
|
catch (error) {
|
|
50
50
|
return fail(error.code ?? 'INVALID_ARGUMENT', error.message);
|
|
@@ -144,7 +144,7 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
|
|
|
144
144
|
try {
|
|
145
145
|
const { executeTemplateCommand } = await import('../cli/agent-template.js');
|
|
146
146
|
const result = await executeTemplateCommand(delegation.grant.actorId, argv.slice(2));
|
|
147
|
-
return
|
|
147
|
+
return { ok: true, result };
|
|
148
148
|
}
|
|
149
149
|
catch (error) {
|
|
150
150
|
return fail(error.code ?? 'INVALID_ARGUMENT', error.message);
|
|
@@ -12,12 +12,43 @@ export class AgentReloadBusyError extends Error {
|
|
|
12
12
|
export class AgentReloadCoordinator {
|
|
13
13
|
deps;
|
|
14
14
|
inFlight = new Map();
|
|
15
|
+
held = new Map();
|
|
15
16
|
constructor(deps) {
|
|
16
17
|
this.deps = deps;
|
|
17
18
|
}
|
|
18
19
|
busyCount(aid) {
|
|
19
20
|
return Math.max(0, this.deps.getBusyCount(aid));
|
|
20
21
|
}
|
|
22
|
+
/** Reserve immediately, without waiting behind a running mutation or runner load. */
|
|
23
|
+
async acquireForMutation(aid, token) {
|
|
24
|
+
if (!token || this.held.has(aid) || this.inFlight.has(aid))
|
|
25
|
+
throw new AgentReloadBusyError(aid, 1);
|
|
26
|
+
this.held.set(aid, token);
|
|
27
|
+
let release = undefined;
|
|
28
|
+
try {
|
|
29
|
+
release = await this.deps.acquireWorkGate?.(aid, token);
|
|
30
|
+
const busy = this.busyCount(aid);
|
|
31
|
+
if (busy)
|
|
32
|
+
throw new AgentReloadBusyError(aid, busy);
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
try {
|
|
36
|
+
await release?.();
|
|
37
|
+
}
|
|
38
|
+
finally {
|
|
39
|
+
if (this.held.get(aid) === token)
|
|
40
|
+
this.held.delete(aid);
|
|
41
|
+
}
|
|
42
|
+
throw error;
|
|
43
|
+
}
|
|
44
|
+
return async () => {
|
|
45
|
+
if (this.held.get(aid) !== token)
|
|
46
|
+
return;
|
|
47
|
+
await release?.();
|
|
48
|
+
if (this.held.get(aid) === token)
|
|
49
|
+
this.held.delete(aid);
|
|
50
|
+
};
|
|
51
|
+
}
|
|
21
52
|
runExclusive(aid, operation, options = {}) {
|
|
22
53
|
return this.runRunnerOperation(aid, async () => {
|
|
23
54
|
const releaseWorkGate = await this.deps.acquireWorkGate?.(aid);
|
|
@@ -36,8 +67,14 @@ export class AgentReloadCoordinator {
|
|
|
36
67
|
}
|
|
37
68
|
/** Serialize runner creation with mutations, without rejecting the task that requested it as busy. */
|
|
38
69
|
runRunnerOperation(aid, operation) {
|
|
70
|
+
if (this.held.has(aid))
|
|
71
|
+
return Promise.reject(new AgentReloadBusyError(aid, 1));
|
|
39
72
|
const previous = this.inFlight.get(aid) ?? Promise.resolve();
|
|
40
|
-
const pending = previous.catch(() => undefined).then(
|
|
73
|
+
const pending = previous.catch(() => undefined).then(() => {
|
|
74
|
+
if (this.held.has(aid))
|
|
75
|
+
throw new AgentReloadBusyError(aid, 1);
|
|
76
|
+
return operation();
|
|
77
|
+
});
|
|
41
78
|
this.inFlight.set(aid, pending);
|
|
42
79
|
return pending.finally(() => {
|
|
43
80
|
if (this.inFlight.get(aid) === pending)
|