evolcore 0.0.45 → 0.0.47
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 +113 -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 +22 -6
- package/dist/agents/codex/app-server-client.js +34 -27
- 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/group/fs-download.js +1 -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 +675 -120
- package/dist/channels/daemon.js +1 -1
- 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 +42 -56
- package/dist/cli/daemon-lifecycle-client.js +55 -19
- 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-channel.js +2 -2
- package/dist/cli/init.js +57 -21
- 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 +135 -46
- package/dist/cli/services-command.js +28 -5
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +49 -19
- package/dist/config/peer-book-store.js +167 -127
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +158 -6
- 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/schema-migration.js +123 -16
- package/dist/config/schema-registry.js +6 -2
- 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 +91 -43
- package/dist/core/auth/agent-delegation.js +13 -3
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +2 -2
- 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 +39 -12
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/slash-handler.js +4 -6
- 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-bootstrap.js +11 -9
- package/dist/core/daemon-control.js +4 -7
- package/dist/core/daemon-lifecycle.js +189 -143
- package/dist/core/evolagent-registry.js +50 -2
- 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/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/initialization/service.js +22 -4
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +7 -3
- package/dist/core/memory/consolidation.js +6 -6
- 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/ownership/owner-resolver.js +27 -10
- 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/relation/peer-identity.js +5 -1
- package/dist/core/relation/same-owner-proof.js +2 -1
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/session-file-health.js +36 -7
- 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/task/task-image-resources.js +1 -1
- 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 +65 -16
- package/dist/ecweb/runtime/supervisor.js +79 -50
- 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 +132 -75
- package/dist/ipc.js +35 -8
- 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 +18 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/trigger/state.js +7 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +59 -16
- package/dist/utils/error-utils.js +26 -1
- package/dist/utils/instance-registry.js +94 -35
- package/dist/utils/process-introspect.js +187 -27
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/upgrade-jobs.js +4 -4
- 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/aid.md +3 -1
- 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 +17 -5
- 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
|
@@ -2,8 +2,144 @@ import fs from 'node:fs';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { isDeepStrictEqual } from 'node:util';
|
|
4
4
|
import { providerIdentity } from './provider-identity.js';
|
|
5
|
-
import { initializationRuntimePlan, providerEnvironmentVariable } from './providers-config.js';
|
|
5
|
+
import { initializationRuntimePlan, providerEnvironmentVariable, providerServiceTypeForBaseagent, providerServiceTypeForPurpose, resolveProviderId, } from './providers-config.js';
|
|
6
6
|
import { validateProvidersFile } from './providers-config.js';
|
|
7
|
+
import { loadSchema } from './schema-registry.js';
|
|
8
|
+
/** Validate the complete in-memory result before snapshots, journals or configuration writes. */
|
|
9
|
+
export function validateProviderIdentityMigrationPlan(plan) {
|
|
10
|
+
const invalid = (detail) => {
|
|
11
|
+
throw Object.assign(new Error(`Provider migration validation failed: ${detail}; no configuration was changed`), {
|
|
12
|
+
code: 'PROVIDER_MIGRATION_INVALID',
|
|
13
|
+
});
|
|
14
|
+
};
|
|
15
|
+
const registry = validateProvidersFile(plan.registry);
|
|
16
|
+
const endpoint = (provider, serviceType) => {
|
|
17
|
+
const base = provider.common.baseUrl;
|
|
18
|
+
const servicePath = provider.services?.[serviceType]?.path || '.';
|
|
19
|
+
if (providerEnvironmentVariable(base))
|
|
20
|
+
return JSON.stringify([base, servicePath]);
|
|
21
|
+
const url = new URL(servicePath, base.endsWith('/') ? base : `${base}/`);
|
|
22
|
+
if (url.origin !== new URL(base).origin)
|
|
23
|
+
invalid(`service ${serviceType} leaves its Provider origin`);
|
|
24
|
+
return url.href.replace(/\/+$/u, '');
|
|
25
|
+
};
|
|
26
|
+
for (const [id, source] of Object.entries(plan.sourceRegistry.providers)) {
|
|
27
|
+
const targetId = resolveProviderId(plan.providerMapping[id] ?? id, registry);
|
|
28
|
+
const target = registry.providers[targetId];
|
|
29
|
+
if (!target)
|
|
30
|
+
invalid(`Provider ${id} has no migration target`);
|
|
31
|
+
for (const field of ['apiKey', 'headers', 'queryParams']) {
|
|
32
|
+
if (!isDeepStrictEqual(source.common[field], target.common[field]))
|
|
33
|
+
invalid(`Provider ${id} common.${field} changed`);
|
|
34
|
+
}
|
|
35
|
+
for (const [serviceType, service] of Object.entries(source.services ?? {})) {
|
|
36
|
+
const migrated = target.services?.[serviceType];
|
|
37
|
+
if (!migrated || endpoint(source, serviceType) !== endpoint(target, serviceType)
|
|
38
|
+
|| !isDeepStrictEqual({ ...service, path: undefined }, { ...migrated, path: undefined })) {
|
|
39
|
+
invalid(`Provider ${id} service ${serviceType} changed its endpoint or settings`);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
const after = new Map(plan.changes.map(change => [change.file, change.after]));
|
|
44
|
+
const parse = (text, file) => {
|
|
45
|
+
try {
|
|
46
|
+
const value = JSON.parse(text.replace(/^\uFEFF/u, ''));
|
|
47
|
+
if (value && typeof value === 'object' && !Array.isArray(value))
|
|
48
|
+
return value;
|
|
49
|
+
}
|
|
50
|
+
catch { /* Report the location without exposing JSON fragments containing credentials. */ }
|
|
51
|
+
return invalid(`invalid configuration object in ${file}`);
|
|
52
|
+
};
|
|
53
|
+
const checkReferences = (value, location, serviceType, baseagent, previous) => {
|
|
54
|
+
if (!value || typeof value !== 'object')
|
|
55
|
+
return;
|
|
56
|
+
const selection = value;
|
|
57
|
+
if (typeof selection.provider === 'string') {
|
|
58
|
+
const id = resolveProviderId(selection.provider, registry);
|
|
59
|
+
const provider = registry.providers[id];
|
|
60
|
+
if (!provider)
|
|
61
|
+
invalid(`missing Provider at ${location}.provider`);
|
|
62
|
+
const service = baseagent ? providerServiceTypeForBaseagent(baseagent, provider) : serviceType;
|
|
63
|
+
if (service && !Object.hasOwn(provider.services ?? {}, service))
|
|
64
|
+
invalid(`missing service at ${location}.provider`);
|
|
65
|
+
const oldId = previous && typeof previous === 'object'
|
|
66
|
+
? previous.provider : undefined;
|
|
67
|
+
if (typeof oldId === 'string') {
|
|
68
|
+
const sourceId = resolveProviderId(oldId, plan.sourceRegistry);
|
|
69
|
+
const source = plan.sourceRegistry.providers[sourceId];
|
|
70
|
+
if (source && resolveProviderId(plan.providerMapping[sourceId] ?? sourceId, registry) === id) {
|
|
71
|
+
const sourceService = baseagent ? providerServiceTypeForBaseagent(baseagent, source) : serviceType;
|
|
72
|
+
if (sourceService && service && source.services?.[sourceService]
|
|
73
|
+
&& (endpoint(source, sourceService) !== endpoint(provider, service)
|
|
74
|
+
|| !isDeepStrictEqual({ ...source.services[sourceService], path: undefined }, { ...provider.services?.[service], path: undefined }))) {
|
|
75
|
+
invalid(`service selection changed at ${location}.provider`);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
for (const [key, child] of Object.entries(value)) {
|
|
81
|
+
const oldChild = previous && typeof previous === 'object' ? previous[key] : undefined;
|
|
82
|
+
checkReferences(child, `${location}.${key}`, serviceType, baseagent, oldChild);
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
const files = new Map(plan.expected.map(item => [item.file, item.before]));
|
|
86
|
+
for (const change of plan.changes)
|
|
87
|
+
files.set(change.file, change.before);
|
|
88
|
+
for (const [file, before] of files) {
|
|
89
|
+
const text = after.get(file) ?? before;
|
|
90
|
+
if (text === null)
|
|
91
|
+
continue;
|
|
92
|
+
const value = parse(text, file);
|
|
93
|
+
const original = before === null ? undefined : parse(before, file);
|
|
94
|
+
const parts = path.relative(plan.home, file).split(path.sep);
|
|
95
|
+
if (parts.length === 1 && parts[0] === 'providers.json') {
|
|
96
|
+
if (!isDeepStrictEqual(validateProvidersFile(value), registry))
|
|
97
|
+
invalid('planned Provider registry differs from its file');
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
let schemaName;
|
|
101
|
+
if (parts[0] === 'agents' && parts[1] === 'defaults.json')
|
|
102
|
+
schemaName = 'defaults';
|
|
103
|
+
else if (parts[0] === 'agents' && parts.at(-1) === 'config.json') {
|
|
104
|
+
schemaName = parts[2] === 'relations' ? 'relation-config' : 'agent-config';
|
|
105
|
+
}
|
|
106
|
+
if (schemaName) {
|
|
107
|
+
const version = typeof value.$schema_version === 'number' ? value.$schema_version : undefined;
|
|
108
|
+
const schema = loadSchema(schemaName, version);
|
|
109
|
+
if (!schema.validate(value)) {
|
|
110
|
+
const issues = (schema.validate.errors ?? []).map(error => `${error.instancePath || '/'} ${error.keyword}`);
|
|
111
|
+
invalid(`${file} does not match ${schemaName} schema: ${issues.join('; ')}`);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
for (const key of ['baseagents', 'agents', 'Services']) {
|
|
115
|
+
const selections = value[key];
|
|
116
|
+
if (!selections || typeof selections !== 'object')
|
|
117
|
+
continue;
|
|
118
|
+
for (const [name, selection] of Object.entries(selections)) {
|
|
119
|
+
const previous = original?.[key];
|
|
120
|
+
checkReferences(selection, `${file}:${key}.${name}`, key === 'Services' ? providerServiceTypeForPurpose(name) : undefined, key === 'Services' ? undefined : name, previous?.[name]);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
checkReferences(value.decision_model, `${file}:decision_model`, 'decision', undefined, original?.decision_model);
|
|
124
|
+
const record = parts.at(-1) === 'initialization.json' ? value
|
|
125
|
+
: value.creation && typeof value.creation === 'object' ? value.creation : undefined;
|
|
126
|
+
if (record?.plan && typeof record.plan === 'object' && !Array.isArray(record.plan)) {
|
|
127
|
+
const originalRecord = parts.at(-1) === 'initialization.json' ? original
|
|
128
|
+
: original?.creation;
|
|
129
|
+
if (!isDeepStrictEqual(record.plan, originalRecord?.plan))
|
|
130
|
+
invalid(`frozen initialization plan changed in ${file}`);
|
|
131
|
+
const runtime = initializationRuntimePlan(record);
|
|
132
|
+
const previous = originalRecord?.plan
|
|
133
|
+
? initializationRuntimePlan(originalRecord) : undefined;
|
|
134
|
+
checkReferences(runtime, `${file}:plan`, undefined, runtime.baseagent, previous);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
checkReferences(value.plan, `${file}:plan`);
|
|
138
|
+
}
|
|
139
|
+
checkReferences(value.providerIds && typeof value.providerIds === 'object'
|
|
140
|
+
? Object.values(value.providerIds).map(provider => ({ provider })) : undefined, `${file}:providerIds`);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
7
143
|
export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
8
144
|
home = path.resolve(home);
|
|
9
145
|
const changes = [];
|
|
@@ -16,13 +152,24 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
16
152
|
throw new Error('Provider migration does not follow configuration symlinks');
|
|
17
153
|
const text = fs.readFileSync(file, 'utf8');
|
|
18
154
|
expected.push({ file, before: text });
|
|
19
|
-
|
|
155
|
+
let value;
|
|
156
|
+
try {
|
|
157
|
+
value = JSON.parse(text.charCodeAt(0) === 0xfeff ? text.slice(1) : text);
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
throw Object.assign(new Error(`Provider migration could not parse configuration JSON: ${file}`, { cause: error }), {
|
|
161
|
+
code: 'PROVIDER_CONFIG_INVALID',
|
|
162
|
+
});
|
|
163
|
+
}
|
|
20
164
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
21
165
|
throw new Error('Provider migration requires object configurations');
|
|
22
166
|
return { text, value: value };
|
|
23
167
|
};
|
|
24
168
|
if (!fs.existsSync(providerFile) && !registry)
|
|
25
|
-
return {
|
|
169
|
+
return {
|
|
170
|
+
home, changes, summary, pending, expected, registry: { providers: {} },
|
|
171
|
+
sourceRegistry: { providers: {} }, providerMapping: {},
|
|
172
|
+
};
|
|
26
173
|
const original = fs.existsSync(providerFile) ? readJson(providerFile) : { text: null, value: { providers: {} } };
|
|
27
174
|
if (original.text === null)
|
|
28
175
|
expected.push({ file: providerFile, before: null });
|
|
@@ -62,7 +209,7 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
62
209
|
: isDeepStrictEqual(existing.path, service.path);
|
|
63
210
|
if (!sameEndpoint)
|
|
64
211
|
conflicts.push(`services.${serviceType}.path`);
|
|
65
|
-
for (const field of ['style', 'models']) {
|
|
212
|
+
for (const field of ['style', 'models', 'modelPolicy']) {
|
|
66
213
|
if (!isDeepStrictEqual(existing[field], service[field]))
|
|
67
214
|
conflicts.push(`services.${serviceType}.${field}`);
|
|
68
215
|
}
|
|
@@ -72,7 +219,9 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
72
219
|
services[serviceType] = service;
|
|
73
220
|
}
|
|
74
221
|
if (conflicts.length) {
|
|
75
|
-
|
|
222
|
+
const message = `Provider migration conflict between ${providerIds.join(', ')} (${target.domain}): `
|
|
223
|
+
+ `${conflicts.join(', ')} differ; no configuration was changed`;
|
|
224
|
+
throw Object.assign(new Error(message), {
|
|
76
225
|
code: 'PROVIDER_CONFLICT',
|
|
77
226
|
data: { kind: 'provider_migration_conflict', providerIds, domain: target.domain, fields: conflicts },
|
|
78
227
|
});
|
|
@@ -139,7 +288,10 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
139
288
|
const finish = () => {
|
|
140
289
|
if (!isDeepStrictEqual(original.value, normalizedRegistry))
|
|
141
290
|
queue(providerFile, original.text, normalizedRegistry);
|
|
142
|
-
|
|
291
|
+
const plan = { home, changes, summary, pending, expected, registry: normalizedRegistry,
|
|
292
|
+
sourceRegistry: source, providerMapping: aliases };
|
|
293
|
+
validateProviderIdentityMigrationPlan(plan);
|
|
294
|
+
return plan;
|
|
143
295
|
};
|
|
144
296
|
if (!Object.keys(aliases).length)
|
|
145
297
|
return finish();
|
|
@@ -3,14 +3,20 @@ import { isIP } from 'node:net';
|
|
|
3
3
|
import { domainToASCII } from 'node:url';
|
|
4
4
|
import { registrableProviderDomain } from '../utils/public-suffix.js';
|
|
5
5
|
export function normalizeProviderDomain(value) {
|
|
6
|
-
|
|
6
|
+
const hostname = typeof value === 'string' ? value.trim() : '';
|
|
7
|
+
const ipv6 = hostname.startsWith('[') && hostname.endsWith(']') ? hostname.slice(1, -1) : hostname;
|
|
8
|
+
if (!ipv6.includes('%') && isIP(ipv6) === 6)
|
|
9
|
+
return new URL(`http://[${ipv6}]`).hostname;
|
|
10
|
+
if (!hostname || /[\s/\\:@?#%]/u.test(hostname)) {
|
|
7
11
|
throw Object.assign(new Error('Provider domain must be a hostname without a scheme, port or path'), { code: 'PROVIDER_DOMAIN_INVALID' });
|
|
8
12
|
}
|
|
9
|
-
const domain = domainToASCII(
|
|
13
|
+
const domain = domainToASCII(hostname.replace(/\.$/u, '')).toLowerCase();
|
|
14
|
+
if (domain === 'localhost' || isIP(domain) === 4)
|
|
15
|
+
return domain;
|
|
10
16
|
const labels = domain.split('.');
|
|
11
|
-
if (domain.length > 253 || labels.length < 2
|
|
17
|
+
if (domain.length > 253 || labels.length < 2
|
|
12
18
|
|| labels.some(label => label.length > 63 || !/^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/u.test(label))) {
|
|
13
|
-
throw Object.assign(new Error('Provider domain must be a valid DNS hostname'), { code: 'PROVIDER_DOMAIN_INVALID' });
|
|
19
|
+
throw Object.assign(new Error('Provider domain must be a valid DNS hostname, IP address or localhost'), { code: 'PROVIDER_DOMAIN_INVALID' });
|
|
14
20
|
}
|
|
15
21
|
const registrable = registrableProviderDomain(domain);
|
|
16
22
|
if (!registrable)
|
|
@@ -4,6 +4,7 @@ import { TextDecoder } from 'node:util';
|
|
|
4
4
|
import { auditCommandAuthorization } from '../core/auth/authorization-audit.js';
|
|
5
5
|
import { createProvider, parseProviderImport, readProvidersSnapshot, updateProvider } from './providers-management.js';
|
|
6
6
|
import { resolveProviderId } from './providers-config.js';
|
|
7
|
+
import { normalizeProviderDomain } from './provider-identity.js';
|
|
7
8
|
export const PROVIDER_INPUT_LIMIT = 1024 * 1024;
|
|
8
9
|
export function providerArgumentError(message) {
|
|
9
10
|
throw Object.assign(new Error(message), { code: 'INVALID_ARGUMENT' });
|
|
@@ -73,11 +74,18 @@ export function providerFailure(error) {
|
|
|
73
74
|
return { ok: false, code: 'NOT_FOUND', error: 'Provider not found' };
|
|
74
75
|
if (failure?.code === 'PROVIDER_CONFLICT' && failure.data && typeof failure.data === 'object') {
|
|
75
76
|
const details = failure.data;
|
|
77
|
+
let domain;
|
|
78
|
+
try {
|
|
79
|
+
domain = normalizeProviderDomain(details.domain);
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
domain = undefined;
|
|
83
|
+
}
|
|
76
84
|
if (details.kind === 'provider_migration_conflict'
|
|
77
85
|
&& Array.isArray(details.providerIds) && details.providerIds.length >= 2 && details.providerIds.length <= 100
|
|
78
86
|
&& details.providerIds.every(value => typeof value === 'string' && /^[A-Za-z0-9_-]{1,128}$/u.test(value))
|
|
79
87
|
&& typeof details.domain === 'string' && details.domain.length <= 253
|
|
80
|
-
&&
|
|
88
|
+
&& domain === details.domain
|
|
81
89
|
&& Array.isArray(details.fields) && details.fields.length > 0 && details.fields.length <= 100
|
|
82
90
|
&& details.fields.every(value => typeof value === 'string' && value.length <= 160
|
|
83
91
|
&& /^(?:common\.(?:baseUrl|apiKey|headers|queryParams)|services\.[A-Za-z0-9_-]+\.(?:path|style|models))$/u.test(value))) {
|
|
@@ -90,7 +98,7 @@ export function providerFailure(error) {
|
|
|
90
98
|
PROVIDER_ID_COLLISION: 'Provider ID hash collision or reserved legacy ID; no ID was reassigned',
|
|
91
99
|
PROVIDER_CONFLICT: 'Provider domain already exists; update or explicitly merge the existing Provider',
|
|
92
100
|
PROVIDER_DOMAIN_REQUIRED: 'Provider domain is required when common.baseUrl is an environment reference',
|
|
93
|
-
PROVIDER_DOMAIN_INVALID: 'Provider domain must be a valid DNS hostname without a scheme, port or path',
|
|
101
|
+
PROVIDER_DOMAIN_INVALID: 'Provider domain must be a valid DNS hostname, IP address or localhost without a scheme, port or path',
|
|
94
102
|
PROVIDER_DOMAIN_MISMATCH: 'Provider domain must match the normalized common.baseUrl hostname',
|
|
95
103
|
PROVIDER_DOMAIN_IMMUTABLE: 'Provider domain is immutable; create a different Provider',
|
|
96
104
|
PROVIDER_ENV_BASE_URL_MISSING: 'A Provider base URL environment variable is unset or empty in the daemon; no configuration was changed',
|
|
@@ -4,7 +4,7 @@ import { resolvePaths } from '../paths.js';
|
|
|
4
4
|
import { previewProviderCatalog } from '../core/model/model-catalog.js';
|
|
5
5
|
import { ConfigTarget, notifyConfigWrite, validateConfig } from './config-manager.js';
|
|
6
6
|
import { loadSchema } from './schema-registry.js';
|
|
7
|
-
import { providerEnvironmentVariable, resolveProviderId, resolveProviderServiceForBaseagent, validateProvidersFile } from './providers-config.js';
|
|
7
|
+
import { providerModelEnabled, providerEnvironmentVariable, resolveProviderId, resolveProviderServiceForBaseagent, validateProvidersFile } from './providers-config.js';
|
|
8
8
|
import { providerIdentity } from './provider-identity.js';
|
|
9
9
|
import { listBaseagentImportSources, providerFromBaseagent } from './providers-import.js';
|
|
10
10
|
import { importBaseagentProviderIntoRegistry } from './providers-management.js';
|
|
@@ -93,7 +93,7 @@ export async function syncLocalProviders() {
|
|
|
93
93
|
if (catalog.source !== 'gateway' || catalog.freshness !== 'fresh') {
|
|
94
94
|
throw Object.assign(new Error('A fresh Provider model catalog is required; no configuration was changed'), { code: 'PROVIDER_CATALOG_UNAVAILABLE' });
|
|
95
95
|
}
|
|
96
|
-
const model = selectDeepseekFlashModel(catalog.models.filter(entry =>
|
|
96
|
+
const model = selectDeepseekFlashModel(catalog.models.filter(entry => providerModelEnabled(entry.aliasFor ?? entry.id, connection.modelOverrides, connection.modelPolicy)));
|
|
97
97
|
if (!model) {
|
|
98
98
|
throw Object.assign(new Error('The preferred Provider has no enabled DeepSeek Flash model; no configuration was changed'), { code: 'PROVIDER_MODEL_NOT_FOUND' });
|
|
99
99
|
}
|
|
@@ -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;
|