evolcore 0.0.47 → 0.0.48
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 +56 -1
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +139 -39
- package/dist/agent-template/service.js +66 -13
- package/dist/agents/baseagent.js +60 -20
- package/dist/agents/claude-runner.js +34 -17
- package/dist/agents/codex-runner.js +31 -16
- package/dist/agents/ecagent-runner.js +7 -4
- package/dist/agents/gemini-runner.js +5 -2
- package/dist/agents/runner-types.js +5 -21
- package/dist/aun/aid/agentmd.js +5 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +81 -24
- package/dist/channels/daemon.js +9 -25
- package/dist/cli/aun-commands.js +86 -51
- package/dist/cli/code-stats.js +19 -8
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +44 -43
- package/dist/cli/directory.js +7 -1
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +2 -8
- package/dist/cli/init-channel.js +4 -6
- package/dist/cli/init.js +72 -50
- package/dist/cli/invoke-command.js +1 -1
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/role.js +61 -17
- package/dist/cli/stats.js +3 -3
- package/dist/cli/thread-command.js +16 -51
- package/dist/config/boot-log.js +3 -9
- package/dist/config/builtin-roles.js +5 -7
- package/dist/config/config-manager.js +2 -6
- package/dist/config/daemon-services.js +30 -3
- package/dist/config/gateway-config.js +2 -2
- package/dist/config/invoke-ipc-service.js +6 -4
- package/dist/config/peer-bind-code.js +3 -4
- package/dist/config/peer-book-store.js +62 -229
- package/dist/config/peer-book.js +26 -27
- package/dist/config/peer-role-resolver.js +16 -1
- package/dist/config/provider-identity-migration.js +4 -1
- package/dist/config/provider-ipc-service.js +56 -11
- package/dist/config/provider-menu-request.js +24 -5
- package/dist/config/provider-templates.js +127 -0
- package/dist/config/providers-config.js +59 -8
- package/dist/config/providers-management.js +467 -49
- package/dist/config/role-command-service.js +248 -1
- package/dist/config/schema-migration.js +105 -4
- package/dist/core/agent-application-service.js +6 -1
- package/dist/core/agent-runtime.js +4 -0
- package/dist/core/auth/agent-delegation.js +2 -1
- package/dist/core/auth/auth-gateway.js +2 -1
- package/dist/core/auth/delegation-authorization.js +3 -0
- package/dist/core/auth/operation-authorizer.js +25 -0
- package/dist/core/auth/operation-catalog.js +28 -64
- package/dist/core/capability/providers/codex-capability-provider.js +7 -8
- package/dist/core/channel-loader.js +18 -0
- package/dist/core/command/agent-control.js +32 -0
- package/dist/core/command/command-handler.js +81 -85
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +61 -149
- package/dist/core/command/menu-protocol.js +7 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/role-menu.js +47 -23
- package/dist/core/command/slash-handler.js +26 -43
- package/dist/core/command/team-workspace-items.js +81 -12
- package/dist/core/command/team-workspace-team.js +9 -71
- package/dist/core/command/topic-slash.js +9 -30
- package/dist/core/daemon-bootstrap.js +8 -1
- package/dist/core/daemon-control.js +7 -7
- package/dist/core/evolagent-registry.js +14 -1
- package/dist/core/file-integrity/store.js +2 -0
- package/dist/core/handoff/runtime.js +37 -1
- package/dist/core/inference/text-inference.js +3 -1
- package/dist/core/initialization/service.js +11 -6
- package/dist/core/interaction-router.js +3 -0
- package/dist/core/invoke/executors/text.js +72 -19
- package/dist/core/ipc-registration.js +2 -1
- package/dist/core/message/aun-ipc-sender.js +165 -55
- package/dist/core/message/im-renderer.js +1 -1
- package/dist/core/message/message-bridge.js +51 -334
- package/dist/core/message/message-log.js +5 -0
- package/dist/core/message/message-queue.js +22 -0
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +429 -116
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/ownership/owner-resolver.js +328 -50
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/relation/peer-identity.js +23 -1
- package/dist/core/relation/same-owner-proof.js +81 -112
- package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
- package/dist/core/session/session-file-health.js +13 -7
- package/dist/core/session/session-fs-store.js +91 -35
- package/dist/core/session/session-manager.js +68 -24
- package/dist/core/session/session-mapper.js +14 -34
- package/dist/core/session/session-transcript.js +5 -1
- package/dist/core/task/task-activity-store.js +84 -0
- package/dist/core/task/task-recovery-service.js +12 -0
- package/dist/core/thread/command-parser.js +7 -12
- package/dist/core/thread/thread-context-storage.js +3 -2
- package/dist/core/thread/thread-operation.js +2 -13
- package/dist/core/thread/thread-service.js +15 -46
- package/dist/directory/owner-directory-admission.js +1 -1
- package/dist/directory/owner-directory-cache.js +45 -28
- package/dist/directory/owner-directory-markdown.js +13 -1
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/eck/message-renderer.js +84 -24
- package/dist/ecweb/basic-settings-service.js +3 -1
- package/dist/ecweb/message-context-service.js +1 -1
- package/dist/ecweb/pairing.js +4 -3
- package/dist/ecweb/providers-service.js +26 -1
- package/dist/ecweb/runtime/lifecycle.js +18 -8
- package/dist/ecweb/runtime/proxy-access.js +74 -0
- package/dist/ecweb/runtime/supervisor.js +4 -2
- package/dist/event-center/registry.js +13 -2
- package/dist/event-center/runtime.js +103 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +92 -59
- package/dist/ipc.js +13 -2
- package/dist/outputs/events.js +62 -0
- package/dist/outputs/protocol.js +102 -0
- package/dist/outputs/service.js +279 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +89 -4
- package/dist/services/ipc-operation.js +4 -15
- package/dist/services/pack-manager.js +12 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/role-budget.js +5 -2
- package/dist/stats/writer.js +10 -6
- package/dist/trigger/audit.js +7 -0
- package/dist/trigger/authorization.js +105 -11
- package/dist/trigger/feedback.js +10 -0
- package/dist/trigger/history.js +37 -11
- package/dist/trigger/ipc-service.js +12 -1
- package/dist/trigger/manager.js +1 -0
- package/dist/trigger/scheduler.js +7 -5
- package/dist/trigger/script-executor.js +2 -1
- package/dist/trigger/script-sandbox.js +9 -3
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/cross-platform.js +73 -26
- package/dist/utils/error-dict.json +94 -4
- package/dist/utils/error-utils.js +27 -4
- package/dist/utils/evolcore-version.js +36 -65
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/process-introspect.js +12 -7
- package/dist/utils/process-tree.js +50 -2
- package/dist/utils/windows-shell-trust.js +2 -0
- package/dist/workbench/protocol.js +80 -0
- package/dist/workbench/service.js +359 -0
- package/ecagent/dist/types.d.ts +6 -2
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -2
- package/kits/docs/evolcore/config.md +12 -0
- package/kits/docs/evolcore/directory.md +22 -3
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +123 -3
- package/kits/docs/evolcore/role.md +80 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/team-workspace.md +1 -1
- package/kits/docs/evolcore/thread-chain.md +14 -15
- package/kits/docs/evolcore/tool-authorization.md +5 -0
- package/kits/docs/evolcore/trigger.md +10 -0
- package/kits/eck_message_manifest.json +12 -0
- package/kits/provider-templates.json +1213 -0
- package/kits/rules/04-relation.md +3 -3
- package/kits/schemas/_meta.json +14 -2
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/ec-group/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +19 -72
- package/kits/skills/ec-provider/SKILL.md +221 -0
- package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +34 -21
- package/kits/templates/message-fragments/group-batch-item.md +1 -1
- package/kits/templates/message-fragments/group-batch.md +1 -1
- package/kits/templates/message-fragments/inject-default.md +1 -1
- package/kits/templates/message-fragments/interrupt-insert.md +1 -0
- package/kits/templates/message-fragments/item-group.md +1 -1
- package/kits/templates/message-fragments/item-private.md +1 -1
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/message-fragments/trigger-session.md +1 -1
- package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
- package/kits/templates/roles/admin.json +2 -19
- package/kits/templates/roles/member.json +0 -3
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +3 -3
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +1 -1
- package/kits/templates/system-fragments/thread.md +6 -5
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +4 -1
- package/scripts/agent-template/shared/common.mjs +2 -3
- package/scripts/agent-template/shared/template-contract.mjs +2 -1
- package/scripts/agent-template/shared/template-package.mjs +9 -2
- package/scripts/agent-template/shared/template-runtime.mjs +20 -5
- package/scripts/agent-template/team-pack.mjs +6 -3
- package/dist/cli/peer.js +0 -127
- package/dist/config/peer-operation-service.js +0 -132
- package/dist/config/peer-request-service.js +0 -532
- package/dist/core/command/connect-menu.js +0 -624
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createHash } from 'node:crypto';
|
|
1
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
2
2
|
import { isDeepStrictEqual } from 'node:util';
|
|
3
3
|
import fs from 'node:fs';
|
|
4
4
|
import path, { posix } from 'node:path';
|
|
@@ -9,6 +9,388 @@ import { readProvidersFile, validateProvidersFile } from './providers.js';
|
|
|
9
9
|
import { initializationRuntimePlan, providerEnvironmentVariable, providerNameFromBaseUrlIfStatic, resolveProviderId, resolveProviderService, resolveProviderServiceForBaseagent, validateProviderName } from './providers-config.js';
|
|
10
10
|
import { providerIdentity } from './provider-identity.js';
|
|
11
11
|
import { planProviderIdentityMigration } from './provider-identity-migration.js';
|
|
12
|
+
import { isInteractionSendAccepted, sendInteractionPayload } from '../core/message/message-utils.js';
|
|
13
|
+
import { providerServiceCredentials, providerServiceTypeForBaseagent } from './providers-config.js';
|
|
14
|
+
import { generateProviderTemplate, parseProviderTemplateInput } from './provider-templates.js';
|
|
15
|
+
/** Shared template preview/merge; raw credentials never belong in a public response. */
|
|
16
|
+
export function prepareProviderTemplate(templateId, value, file = resolvePaths().providersConfig, draft) {
|
|
17
|
+
const input = parseProviderTemplateInput(value);
|
|
18
|
+
const registry = readProvidersFile(file);
|
|
19
|
+
let generated = generateProviderTemplate(templateId, input);
|
|
20
|
+
const identity = providerIdentity(generated.provider);
|
|
21
|
+
let existing = Object.entries(registry.providers).find(([, provider]) => providerIdentity(provider).domain === identity.domain);
|
|
22
|
+
if (draft) {
|
|
23
|
+
const previous = registry.providers[resolveProviderId(draft.providerId, registry)];
|
|
24
|
+
const provider = resolveDraftProvider(draft.value, previous, draft.imports);
|
|
25
|
+
if (providerIdentity(provider).domain !== identity.domain)
|
|
26
|
+
throw new Error('Template and draft domains differ');
|
|
27
|
+
existing = [draft.providerId, provider];
|
|
28
|
+
}
|
|
29
|
+
if (existing && generated.product === 'api' && input.serviceTypes === undefined
|
|
30
|
+
&& Object.keys(existing[1].services ?? {}).some(type => ['claude', 'codex', 'ecagent', 'gemini'].includes(type))) {
|
|
31
|
+
generated = generateProviderTemplate(templateId, input, ['text']);
|
|
32
|
+
}
|
|
33
|
+
const selected = Object.keys(generated.provider.services ?? {});
|
|
34
|
+
const provider = existing ? mergeImportedProvider(existing[1], generated.provider, new Set(selected), true) : generated.provider;
|
|
35
|
+
const normalized = validateProvidersFile({ providers: { draft: provider } }).providers.draft;
|
|
36
|
+
// Resolve each service to enforce the same origin and credential constraints before preview/save.
|
|
37
|
+
for (const type of Object.keys(normalized.services ?? {}))
|
|
38
|
+
resolveProviderService('draft', type, { providers: { draft: normalized } });
|
|
39
|
+
return { ...generated, provider: normalized, incoming: generated.provider, providerId: existing?.[0] ?? identity.providerId,
|
|
40
|
+
existing: !!existing, conflicts: selected.filter(type => Object.hasOwn(existing?.[1].services ?? {}, type)),
|
|
41
|
+
serviceTypes: selected, revision: providersRevision(registry), before: existing?.[1] };
|
|
42
|
+
}
|
|
43
|
+
export async function applyProviderTemplate(input, file = resolvePaths().providersConfig) {
|
|
44
|
+
const config = parseProviderTemplateInput(input.config);
|
|
45
|
+
if (!config.apiKey)
|
|
46
|
+
throw new Error('A product API key is required');
|
|
47
|
+
const draft = prepareProviderTemplate(input.templateId, config, file);
|
|
48
|
+
if (input.providerId !== undefined) {
|
|
49
|
+
const targetId = resolveProviderId(input.providerId, readProvidersFile(file));
|
|
50
|
+
if (!draft.existing || targetId !== draft.providerId)
|
|
51
|
+
throw new Error('Template domain does not match the target Provider');
|
|
52
|
+
const data = await updateProvider({ providerId: targetId, revision: input.revision ?? draft.revision, value: draft.provider }, file);
|
|
53
|
+
return { ...data, providerId: targetId };
|
|
54
|
+
}
|
|
55
|
+
if (draft.existing)
|
|
56
|
+
throw Object.assign(new Error('Provider domain already exists; explicitly update the existing Provider'), {
|
|
57
|
+
code: 'PROVIDER_CONFLICT', statusCode: 409,
|
|
58
|
+
data: { kind: 'provider_domain_exists', providerId: draft.providerId, domain: draft.provider.domain },
|
|
59
|
+
});
|
|
60
|
+
return createProvider({ revision: input.revision ?? draft.revision, value: draft.provider }, file);
|
|
61
|
+
}
|
|
62
|
+
export function previewProviderTemplate(templateId, config, context) {
|
|
63
|
+
const draft = prepareProviderTemplate(templateId, config, undefined, context);
|
|
64
|
+
const services = Object.keys(draft.provider.services ?? {}).map(serviceType => {
|
|
65
|
+
const connection = resolveProviderService('draft', serviceType, { providers: { draft: draft.provider } });
|
|
66
|
+
return { serviceType, style: connection.style, baseUrl: connection.baseUrl, catalogBaseUrl: connection.catalogBaseUrl,
|
|
67
|
+
credentialSource: Object.hasOwn(draft.provider.services[serviceType], 'apiKey') ? 'service' : 'common' };
|
|
68
|
+
});
|
|
69
|
+
return { templateId: draft.templateId, templateRevision: draft.templateRevision, revision: draft.revision,
|
|
70
|
+
providerId: draft.providerId, existing: draft.existing, conflicts: draft.conflicts, serviceTypes: draft.serviceTypes,
|
|
71
|
+
services,
|
|
72
|
+
provider: previewProviderValue(draft.provider).provider,
|
|
73
|
+
before: draft.before ? previewProviderValue(draft.before).provider : undefined,
|
|
74
|
+
references: draft.existing ? providerReferences(draft.providerId, resolvePaths().providersConfig) : [],
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
/** Capture facts before an attempt; never infer a service or protocol from error text. */
|
|
78
|
+
export function providerConnectionContext(baseagent, providerId, nativeBaseUrl, nativeApiKey, nativeMetadata) {
|
|
79
|
+
if (!['claude', 'codex', 'gemini', 'ecagent'].includes(baseagent))
|
|
80
|
+
return undefined;
|
|
81
|
+
const registry = readProvidersFile();
|
|
82
|
+
const id = providerId ? resolveProviderId(providerId, registry) : undefined;
|
|
83
|
+
const provider = id ? registry.providers[id] : undefined;
|
|
84
|
+
if (id && !provider)
|
|
85
|
+
return undefined;
|
|
86
|
+
const serviceType = providerServiceTypeForBaseagent(baseagent, provider);
|
|
87
|
+
const service = provider?.services?.[serviceType];
|
|
88
|
+
if (provider && !service)
|
|
89
|
+
return undefined;
|
|
90
|
+
const style = ['claude', 'codex', 'gemini'].includes(serviceType) ? serviceType
|
|
91
|
+
: service?.style ?? 'openai-compatible';
|
|
92
|
+
const raw = provider?.common.baseUrl ?? nativeBaseUrl;
|
|
93
|
+
const variable = raw ? providerEnvironmentVariable(raw) : undefined;
|
|
94
|
+
let baseUrl = variable ? process.env[variable]?.trim() : raw;
|
|
95
|
+
if (baseUrl) {
|
|
96
|
+
try {
|
|
97
|
+
const url = new URL(baseUrl);
|
|
98
|
+
if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password || url.search || url.hash)
|
|
99
|
+
baseUrl = undefined;
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
baseUrl = undefined;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
// A legacy unresolved reference without a hostname cannot establish which
|
|
106
|
+
// existing Provider identity the submitted URL is allowed to repair.
|
|
107
|
+
if (provider && !baseUrl && !provider.domain)
|
|
108
|
+
return undefined;
|
|
109
|
+
return { providerId: id, provider, baseagent, serviceType, style, path: service?.path,
|
|
110
|
+
baseUrl, nativeApiKey, nativeHeaders: nativeMetadata?.headers, nativeQueryParams: nativeMetadata?.queryParams,
|
|
111
|
+
environmentRevision: providerEnvironmentRevision(provider), revision: providersRevision(registry) };
|
|
112
|
+
}
|
|
113
|
+
/** Raw references can stay unchanged while the effective endpoint or key changes. */
|
|
114
|
+
function providerEnvironmentRevision(provider) {
|
|
115
|
+
const connections = [provider?.common, ...Object.values(provider?.services ?? {})];
|
|
116
|
+
return createHash('sha256').update(JSON.stringify(connections.map(connection => ['baseUrl', 'apiKey'].map(field => {
|
|
117
|
+
const raw = connection?.[field];
|
|
118
|
+
const variable = raw ? providerEnvironmentVariable(raw) : undefined;
|
|
119
|
+
return variable ? process.env[variable] : raw;
|
|
120
|
+
})))).digest('hex');
|
|
121
|
+
}
|
|
122
|
+
/** Known protocol authentication fields must not keep overriding the repaired key. */
|
|
123
|
+
function replaceConnectionKey(provider, apiKey, serviceType) {
|
|
124
|
+
const target = serviceType ? provider.services?.[serviceType] : provider.common;
|
|
125
|
+
if (!target)
|
|
126
|
+
throw new Error('Provider repair service no longer exists');
|
|
127
|
+
if (serviceType) {
|
|
128
|
+
const effective = providerServiceCredentials(provider, serviceType);
|
|
129
|
+
if (effective.headers)
|
|
130
|
+
target.headers = { ...effective.headers };
|
|
131
|
+
if (effective.queryParams)
|
|
132
|
+
target.queryParams = { ...effective.queryParams };
|
|
133
|
+
}
|
|
134
|
+
target.apiKey = apiKey;
|
|
135
|
+
for (const name of Object.keys(target.headers ?? {})) {
|
|
136
|
+
const lower = name.toLowerCase();
|
|
137
|
+
if (lower === 'authorization' && /^Bearer\s/iu.test(target.headers[name])) {
|
|
138
|
+
target.headers[name] = `Bearer ${apiKey}`;
|
|
139
|
+
}
|
|
140
|
+
else if (['x-api-key', 'x-goog-api-key', 'api-key'].includes(lower)) {
|
|
141
|
+
target.headers[name] = apiKey;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
for (const name of Object.keys(target.queryParams ?? {})) {
|
|
145
|
+
if (['key', 'api_key', 'apikey', 'access_token'].includes(name.toLowerCase())) {
|
|
146
|
+
target.queryParams[name] = apiKey;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
/** Daemon-only staged connection repair. No answer is persisted until all fields are collected. */
|
|
151
|
+
export class ProviderConnectionQuestions {
|
|
152
|
+
router;
|
|
153
|
+
pending = new Map();
|
|
154
|
+
constructor(router) {
|
|
155
|
+
this.router = router;
|
|
156
|
+
}
|
|
157
|
+
async present(input) {
|
|
158
|
+
const { context, session, message, adapter, rule } = input;
|
|
159
|
+
if (rule.action !== 'ask' || !rule.question || !adapter.capabilities?.interaction || message.peerType !== 'human'
|
|
160
|
+
|| message.chatType === 'group' || (message.channelType ?? message.channel.split('#')[0]) !== 'aun'
|
|
161
|
+
|| !message.peerId || !(await input.authorize()))
|
|
162
|
+
return false;
|
|
163
|
+
const key = `${context.providerId ?? session.id}:${context.serviceType}`;
|
|
164
|
+
const previous = this.pending.get(key);
|
|
165
|
+
if (previous) {
|
|
166
|
+
if (await previous.isCurrent().catch(() => false))
|
|
167
|
+
return true;
|
|
168
|
+
await previous.cancel();
|
|
169
|
+
}
|
|
170
|
+
if (!(await input.isCurrent()) || providersRevision(readProvidersFile()) !== context.revision
|
|
171
|
+
|| providerEnvironmentRevision(context.provider) !== context.environmentRevision)
|
|
172
|
+
return false;
|
|
173
|
+
// Authorization/binding checks yield. Recheck before claiming the pending slot.
|
|
174
|
+
if (this.pending.has(key))
|
|
175
|
+
return true;
|
|
176
|
+
const fields = new Set(rule.question.fields);
|
|
177
|
+
const supplied = (field) => {
|
|
178
|
+
const raw = field === 'baseUrl' ? context.baseUrl : context.provider
|
|
179
|
+
? providerServiceCredentials(context.provider, context.serviceType).apiKey : context.nativeApiKey;
|
|
180
|
+
const variable = raw ? providerEnvironmentVariable(raw) : undefined;
|
|
181
|
+
return variable ? process.env[variable] : raw;
|
|
182
|
+
};
|
|
183
|
+
for (const field of rule.question.includeMissing ?? [])
|
|
184
|
+
if (!supplied(field)?.trim())
|
|
185
|
+
fields.add(field);
|
|
186
|
+
// The endpoint must be known before a credential is collected.
|
|
187
|
+
const remaining = ['baseUrl', 'apiKey'].filter(field => fields.has(field));
|
|
188
|
+
const staged = {};
|
|
189
|
+
const token = Symbol(key);
|
|
190
|
+
let closed = false;
|
|
191
|
+
let activeId;
|
|
192
|
+
let deadline = Infinity;
|
|
193
|
+
const live = (id) => !closed && Date.now() < deadline && this.pending.get(key)?.token === token
|
|
194
|
+
&& (id === undefined || activeId === id);
|
|
195
|
+
const finish = () => {
|
|
196
|
+
closed = true;
|
|
197
|
+
delete staged.apiKey;
|
|
198
|
+
delete staged.baseUrl;
|
|
199
|
+
if (this.pending.get(key)?.token === token)
|
|
200
|
+
this.pending.delete(key);
|
|
201
|
+
};
|
|
202
|
+
const envelope = { ...input.envelope, replyContext: { ...input.envelope.replyContext,
|
|
203
|
+
delivery: { chatType: 'private' }, metadata: { ...input.envelope.replyContext?.metadata, encrypted: true } } };
|
|
204
|
+
const notice = async (text) => {
|
|
205
|
+
await adapter.send(envelope, { kind: 'system.notice', text, subtype: 'provider_connection' });
|
|
206
|
+
};
|
|
207
|
+
const valid = async (id) => live(id) && await input.authorize()
|
|
208
|
+
&& live(id) && await input.isCurrent() && live(id)
|
|
209
|
+
&& providersRevision(readProvidersFile()) === context.revision
|
|
210
|
+
&& providerEnvironmentRevision(context.provider) === context.environmentRevision;
|
|
211
|
+
this.pending.set(key, { token,
|
|
212
|
+
isCurrent: () => activeId ? valid(activeId) : Promise.resolve(false),
|
|
213
|
+
cancel: async () => {
|
|
214
|
+
if (activeId)
|
|
215
|
+
await this.router.cancel(activeId, 'connection_changed');
|
|
216
|
+
finish();
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
const next = async (hint) => {
|
|
220
|
+
if (!live())
|
|
221
|
+
return false;
|
|
222
|
+
const field = remaining[0];
|
|
223
|
+
const id = `pcq-${randomUUID()}`;
|
|
224
|
+
activeId = id;
|
|
225
|
+
deadline = Date.now() + 15 * 60_000;
|
|
226
|
+
const target = context.provider?.name ?? context.providerId ?? '当前模型连接';
|
|
227
|
+
const interaction = {
|
|
228
|
+
type: 'interaction', id, channelId: message.channelId, sessionId: session.id,
|
|
229
|
+
initiatorId: message.peerId, blocking: false, sensitive: true, expiresAt: deadline,
|
|
230
|
+
kind: { kind: 'action', title: field === 'baseUrl' ? '补充服务地址' : '更新 API Key / Token',
|
|
231
|
+
body: `${target}\n${hint ?? rule.message ?? '请补充连接信息'}\n`
|
|
232
|
+
+ (field === 'baseUrl' ? '请输入完整 baseURL;已有服务路径保持不变。'
|
|
233
|
+
: `服务地址:${staged.baseUrl ?? context.baseUrl ?? '未配置'}\n请输入 API Key / Token,仅保存到宿主服务商配置。`),
|
|
234
|
+
buttons: [{ key: 'cancel', label: '取消' }], allowCustomInput: true },
|
|
235
|
+
};
|
|
236
|
+
this.router.register(id, session.id, async (action, values) => {
|
|
237
|
+
if (!live(id))
|
|
238
|
+
return false;
|
|
239
|
+
if (action === 'cancel' || action === 'dismiss' || values?.behavior === 'dismiss') {
|
|
240
|
+
finish();
|
|
241
|
+
return true;
|
|
242
|
+
}
|
|
243
|
+
if (!(await valid(id))) {
|
|
244
|
+
if (live(id)) {
|
|
245
|
+
finish();
|
|
246
|
+
await notice('连接配置或管理权限已变化,请重新发起。');
|
|
247
|
+
}
|
|
248
|
+
return true;
|
|
249
|
+
}
|
|
250
|
+
const raw = action === '_custom_input' ? values?.custom_text : undefined;
|
|
251
|
+
const value = typeof raw === 'string' ? raw.trim() : '';
|
|
252
|
+
let acceptable = !!value && value.length <= (field === 'baseUrl' ? 4096 : 16384)
|
|
253
|
+
&& !/[\r\n\0]/u.test(value) && value !== PROVIDER_SECRET_MASK && !providerEnvironmentVariable(value);
|
|
254
|
+
if (field === 'baseUrl' && acceptable) {
|
|
255
|
+
try {
|
|
256
|
+
const parsed = new URL(value);
|
|
257
|
+
acceptable = ['http:', 'https:'].includes(parsed.protocol) && !parsed.username && !parsed.password
|
|
258
|
+
&& !parsed.search && !parsed.hash;
|
|
259
|
+
if (acceptable && context.provider) {
|
|
260
|
+
const identity = providerIdentity({ ...context.provider,
|
|
261
|
+
common: { ...context.provider.common, baseUrl: value } });
|
|
262
|
+
acceptable = identity.domain === providerIdentity(context.provider).domain;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
catch {
|
|
266
|
+
acceptable = false;
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
else if (acceptable) {
|
|
270
|
+
try {
|
|
271
|
+
new Headers({ authorization: `Bearer ${value}` });
|
|
272
|
+
}
|
|
273
|
+
catch {
|
|
274
|
+
acceptable = false;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
if (!acceptable) {
|
|
278
|
+
await next(field === 'baseUrl' ? '地址无效,请重新填写;已有服务商不能更换域名。'
|
|
279
|
+
: '密钥格式无效,请填写原始的单行 API Key / Token。');
|
|
280
|
+
return true;
|
|
281
|
+
}
|
|
282
|
+
staged[field] = value;
|
|
283
|
+
remaining.shift();
|
|
284
|
+
if (remaining.length) {
|
|
285
|
+
await next();
|
|
286
|
+
return true;
|
|
287
|
+
}
|
|
288
|
+
let saved = false;
|
|
289
|
+
try {
|
|
290
|
+
// Validate the entire candidate and CAS-write through existing Provider management.
|
|
291
|
+
const candidate = context.provider ? structuredClone(context.provider) : {
|
|
292
|
+
name: `${context.baseagent} API`,
|
|
293
|
+
common: { baseUrl: staged.baseUrl ?? context.baseUrl ?? '',
|
|
294
|
+
...(context.nativeApiKey ? { apiKey: context.nativeApiKey } : {}),
|
|
295
|
+
...(context.nativeHeaders ? { headers: { ...context.nativeHeaders } } : {}),
|
|
296
|
+
...(context.nativeQueryParams ? { queryParams: { ...context.nativeQueryParams } } : {}) },
|
|
297
|
+
services: { [context.serviceType]: { style: context.style, path: context.path ?? '' } },
|
|
298
|
+
};
|
|
299
|
+
if (staged.baseUrl)
|
|
300
|
+
candidate.common.baseUrl = staged.baseUrl;
|
|
301
|
+
if (staged.apiKey)
|
|
302
|
+
replaceConnectionKey(candidate, staged.apiKey, context.provider ? context.serviceType : undefined);
|
|
303
|
+
let providerId = context.providerId;
|
|
304
|
+
if (providerId) {
|
|
305
|
+
await updateProvider({ providerId, revision: context.revision, value: candidate });
|
|
306
|
+
saved = true;
|
|
307
|
+
}
|
|
308
|
+
else {
|
|
309
|
+
providerId = (await createProvider({ revision: context.revision, value: candidate })).providerId;
|
|
310
|
+
saved = true;
|
|
311
|
+
try {
|
|
312
|
+
await input.bindCreated(providerId);
|
|
313
|
+
}
|
|
314
|
+
catch {
|
|
315
|
+
finish();
|
|
316
|
+
await notice('服务商已保存,但原连接已变化,未绑定。请在模型设置中选择服务商。');
|
|
317
|
+
return true;
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
const verified = await input.verify(providerId, context.serviceType).catch(() => false);
|
|
321
|
+
if (!live(id))
|
|
322
|
+
return true;
|
|
323
|
+
await notice(verified ? '服务商连接已保存,目标模型调用验证通过。' : '服务商连接已保存,目标模型调用暂未验证通过,请检查模型及凭据后重试。');
|
|
324
|
+
const canRetry = live(id);
|
|
325
|
+
finish();
|
|
326
|
+
if (verified && canRetry && input.retry) {
|
|
327
|
+
try {
|
|
328
|
+
await this.offerRetry(input, envelope, providerId);
|
|
329
|
+
}
|
|
330
|
+
catch {
|
|
331
|
+
await notice('连接已保存,请重新发送原请求继续。');
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
catch {
|
|
336
|
+
finish();
|
|
337
|
+
await notice(saved ? '服务商连接已保存,后续验证或提示未完成,请在管理界面检查。'
|
|
338
|
+
: '服务商连接未保存,配置已变化或输入不符合要求,请重新发起。').catch(() => undefined);
|
|
339
|
+
}
|
|
340
|
+
return true;
|
|
341
|
+
}, { blocking: false, requireEncrypted: true, initiatorId: message.peerId,
|
|
342
|
+
initiatorChannelKey: adapter.channelKey, timeoutMs: 15 * 60_000,
|
|
343
|
+
onCancel: async () => {
|
|
344
|
+
if (activeId === id)
|
|
345
|
+
finish();
|
|
346
|
+
await adapter.invalidateInteraction?.(id, 'cancelled');
|
|
347
|
+
} });
|
|
348
|
+
const receipt = await sendInteractionPayload(adapter, { ...envelope, operationId: id }, interaction, '请通过加密卡片补充服务商连接;不支持卡片时请使用宿主管理界面。');
|
|
349
|
+
if (!isInteractionSendAccepted(receipt)) {
|
|
350
|
+
await this.router.cancel(id, 'delivery_failed');
|
|
351
|
+
return false;
|
|
352
|
+
}
|
|
353
|
+
return true;
|
|
354
|
+
};
|
|
355
|
+
try {
|
|
356
|
+
return await next();
|
|
357
|
+
}
|
|
358
|
+
catch {
|
|
359
|
+
if (activeId)
|
|
360
|
+
await this.router.cancel(activeId, 'delivery_failed');
|
|
361
|
+
finish();
|
|
362
|
+
return false;
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
async offerRetry(input, envelope, providerId) {
|
|
366
|
+
const id = `pcq-${randomUUID()}`;
|
|
367
|
+
let active = true;
|
|
368
|
+
const expiresAt = Date.now() + 15 * 60_000;
|
|
369
|
+
const revision = providersRevision(readProvidersFile());
|
|
370
|
+
const environmentRevision = providerEnvironmentRevision(readProvidersFile().providers[providerId]);
|
|
371
|
+
const request = { type: 'interaction', id, sessionId: input.session.id,
|
|
372
|
+
channelId: input.message.channelId, initiatorId: input.message.peerId, blocking: false, sensitive: true,
|
|
373
|
+
expiresAt,
|
|
374
|
+
kind: { kind: 'action', title: '连接已修复', body: '可重新执行原请求,或关闭此卡片。',
|
|
375
|
+
buttons: [{ key: 'retry', label: '重试原请求' }, { key: 'cancel', label: '关闭' }] } };
|
|
376
|
+
this.router.register(id, input.session.id, async (action) => {
|
|
377
|
+
if (action !== 'retry')
|
|
378
|
+
return true;
|
|
379
|
+
if (!(await input.authorize()) || !(await input.isCurrent())
|
|
380
|
+
|| !active || Date.now() >= expiresAt
|
|
381
|
+
|| providersRevision(readProvidersFile()) !== revision || !readProvidersFile().providers[providerId]
|
|
382
|
+
|| providerEnvironmentRevision(readProvidersFile().providers[providerId]) !== environmentRevision)
|
|
383
|
+
return false;
|
|
384
|
+
await input.retry?.();
|
|
385
|
+
return true;
|
|
386
|
+
}, { blocking: false, requireEncrypted: true, initiatorId: input.message.peerId,
|
|
387
|
+
initiatorChannelKey: input.adapter.channelKey, timeoutMs: 15 * 60_000,
|
|
388
|
+
onCancel: async () => { active = false; await input.adapter.invalidateInteraction?.(id, 'cancelled'); } });
|
|
389
|
+
const receipt = await sendInteractionPayload(input.adapter, { ...envelope, operationId: id }, request, '连接已保存,请重新发送原请求继续。');
|
|
390
|
+
if (!isInteractionSendAccepted(receipt))
|
|
391
|
+
await this.router.cancel(id, 'delivery_failed');
|
|
392
|
+
}
|
|
393
|
+
}
|
|
12
394
|
export const PROVIDER_SECRET_MASK = '<redacted>';
|
|
13
395
|
function providerReferences(providerId, providerFile) {
|
|
14
396
|
const registry = readProvidersFile(providerFile);
|
|
@@ -126,25 +508,39 @@ export function readProviderForExport(providerId, serviceType, file = resolvePat
|
|
|
126
508
|
if (!provider)
|
|
127
509
|
throw Object.assign(new Error('Provider not found'), { statusCode: 404 });
|
|
128
510
|
const exported = structuredClone(provider);
|
|
511
|
+
if (serviceType !== undefined) {
|
|
512
|
+
if (!exported.services?.[serviceType])
|
|
513
|
+
throw Object.assign(new Error('Service type not found'), { statusCode: 404 });
|
|
514
|
+
exported.services = { [serviceType]: exported.services[serviceType] };
|
|
515
|
+
// A service export must not include another product's inherited credentials.
|
|
516
|
+
for (const field of ['apiKey', 'headers', 'queryParams']) {
|
|
517
|
+
const effective = providerServiceCredentials(provider, serviceType)[field];
|
|
518
|
+
if (effective === undefined)
|
|
519
|
+
delete exported.common[field];
|
|
520
|
+
else
|
|
521
|
+
Object.assign(exported.common, { [field]: structuredClone(effective) });
|
|
522
|
+
}
|
|
523
|
+
}
|
|
129
524
|
if (!includeApiKey)
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
return { ...exported, services: { [serviceType]: structuredClone(service) } };
|
|
525
|
+
for (const connection of [exported.common, ...Object.values(exported.services ?? {})]) {
|
|
526
|
+
delete connection.apiKey;
|
|
527
|
+
delete connection.headers;
|
|
528
|
+
delete connection.queryParams;
|
|
529
|
+
}
|
|
530
|
+
return exported;
|
|
137
531
|
}
|
|
138
532
|
function providersSnapshot(value) {
|
|
139
533
|
const providers = structuredClone(value.providers);
|
|
140
534
|
for (const provider of Object.values(providers)) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
535
|
+
for (const connection of [provider.common, ...Object.values(provider.services ?? {})]) {
|
|
536
|
+
if (connection.apiKey && !providerEnvironmentVariable(connection.apiKey))
|
|
537
|
+
connection.apiKey = PROVIDER_SECRET_MASK;
|
|
538
|
+
for (const field of ['headers', 'queryParams']) {
|
|
539
|
+
const values = connection[field];
|
|
540
|
+
if (values)
|
|
541
|
+
for (const key of Object.keys(values))
|
|
542
|
+
values[key] = PROVIDER_SECRET_MASK;
|
|
543
|
+
}
|
|
148
544
|
}
|
|
149
545
|
}
|
|
150
546
|
return {
|
|
@@ -161,22 +557,27 @@ function retainSecrets(value, previous) {
|
|
|
161
557
|
const provider = structuredClone(value);
|
|
162
558
|
if (!provider.common || typeof provider.common !== 'object' || Array.isArray(provider.common))
|
|
163
559
|
return provider;
|
|
164
|
-
const
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
common.apiKey = previous.common.apiKey;
|
|
169
|
-
}
|
|
170
|
-
for (const field of ['headers', 'queryParams']) {
|
|
171
|
-
if (!common[field] || typeof common[field] !== 'object' || Array.isArray(common[field]))
|
|
560
|
+
const connections = [[provider.common, previous?.common],
|
|
561
|
+
...Object.entries(provider.services ?? {}).map(([type, service]) => [service, previous?.services?.[type]])];
|
|
562
|
+
for (const [common, old] of connections) {
|
|
563
|
+
if (!common || typeof common !== 'object')
|
|
172
564
|
continue;
|
|
173
|
-
|
|
174
|
-
if (
|
|
565
|
+
if (common.apiKey === PROVIDER_SECRET_MASK) {
|
|
566
|
+
if (old?.apiKey === undefined)
|
|
567
|
+
throw new Error('A replacement API key is required');
|
|
568
|
+
common.apiKey = old.apiKey;
|
|
569
|
+
}
|
|
570
|
+
for (const field of ['headers', 'queryParams']) {
|
|
571
|
+
if (!common[field] || typeof common[field] !== 'object' || Array.isArray(common[field]))
|
|
175
572
|
continue;
|
|
176
|
-
const
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
573
|
+
for (const key of Object.keys(common[field])) {
|
|
574
|
+
if (common[field][key] !== PROVIDER_SECRET_MASK)
|
|
575
|
+
continue;
|
|
576
|
+
const existing = old?.[field]?.[key];
|
|
577
|
+
if (existing === undefined)
|
|
578
|
+
throw new Error(`A replacement ${field} value is required`);
|
|
579
|
+
common[field][key] = existing;
|
|
580
|
+
}
|
|
180
581
|
}
|
|
181
582
|
}
|
|
182
583
|
return provider;
|
|
@@ -231,13 +632,15 @@ export async function updateProvider(input, file = resolvePaths().providersConfi
|
|
|
231
632
|
}
|
|
232
633
|
function rejectMaskedImportSecrets(providers) {
|
|
233
634
|
for (const [providerId, provider] of Object.entries(providers)) {
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
for (const
|
|
239
|
-
|
|
240
|
-
|
|
635
|
+
for (const connection of [provider.common, ...Object.values(provider.services ?? {})]) {
|
|
636
|
+
if (connection.apiKey === PROVIDER_SECRET_MASK) {
|
|
637
|
+
throw new Error(`Provider ${providerId} has a redacted API key; import a file with the original secret`);
|
|
638
|
+
}
|
|
639
|
+
for (const field of ['headers', 'queryParams']) {
|
|
640
|
+
for (const [key, value] of Object.entries(connection[field] ?? {})) {
|
|
641
|
+
if (value === PROVIDER_SECRET_MASK) {
|
|
642
|
+
throw new Error(`Provider ${providerId} ${field}.${key} is redacted; import a file with the original secret`);
|
|
643
|
+
}
|
|
241
644
|
}
|
|
242
645
|
}
|
|
243
646
|
}
|
|
@@ -444,24 +847,34 @@ function providerHostname(baseUrl) {
|
|
|
444
847
|
return undefined;
|
|
445
848
|
return new URL(baseUrl).hostname.toLowerCase().replace(/\.$/u, '');
|
|
446
849
|
}
|
|
447
|
-
function mergeImportedProvider(existing, imported, replaceServiceTypes = new Set()) {
|
|
850
|
+
function mergeImportedProvider(existing, imported, replaceServiceTypes = new Set(), preserveCommon = false) {
|
|
448
851
|
const services = structuredClone(existing.services || {});
|
|
852
|
+
const common = { ...existing.common,
|
|
853
|
+
...(!preserveCommon && !existing.common.apiKey?.trim() && imported.common.apiKey ? { apiKey: imported.common.apiKey } : {}),
|
|
854
|
+
};
|
|
449
855
|
const existingVariable = providerEnvironmentVariable(existing.common.baseUrl);
|
|
450
856
|
const importedVariable = providerEnvironmentVariable(imported.common.baseUrl);
|
|
857
|
+
const importService = (type) => {
|
|
858
|
+
const result = structuredClone(imported.services[type]);
|
|
859
|
+
const credentials = providerServiceCredentials(imported, type);
|
|
860
|
+
for (const field of ['apiKey', 'headers', 'queryParams']) {
|
|
861
|
+
if (result[field] === undefined && !isDeepStrictEqual(credentials[field], common[field])) {
|
|
862
|
+
Object.assign(result, { [field]: credentials[field] ?? (field === 'apiKey' ? '' : {}) });
|
|
863
|
+
}
|
|
864
|
+
}
|
|
865
|
+
return result;
|
|
866
|
+
};
|
|
451
867
|
if (existingVariable || importedVariable) {
|
|
452
868
|
if (existingVariable !== importedVariable) {
|
|
453
869
|
throw new Error('Cannot merge Providers with different environment-variable base URLs');
|
|
454
870
|
}
|
|
455
871
|
for (const [serviceType, service] of Object.entries(imported.services || {})) {
|
|
456
872
|
if (replaceServiceTypes.has(serviceType) || !Object.hasOwn(services, serviceType))
|
|
457
|
-
services[serviceType] =
|
|
873
|
+
services[serviceType] = importService(serviceType);
|
|
458
874
|
}
|
|
459
875
|
return {
|
|
460
876
|
...existing,
|
|
461
|
-
common
|
|
462
|
-
...existing.common,
|
|
463
|
-
...(!existing.common.apiKey?.trim() && imported.common.apiKey ? { apiKey: imported.common.apiKey } : {}),
|
|
464
|
-
},
|
|
877
|
+
common,
|
|
465
878
|
services,
|
|
466
879
|
};
|
|
467
880
|
}
|
|
@@ -474,14 +887,17 @@ function mergeImportedProvider(existing, imported, replaceServiceTypes = new Set
|
|
|
474
887
|
throw new Error('Cannot merge this domain: the source uses a different protocol or port');
|
|
475
888
|
}
|
|
476
889
|
const relativePath = posix.relative(baseUrl.pathname.replace(/\/+$/u, '') || '/', endpoint.pathname.replace(/\/+$/u, '') || '/');
|
|
477
|
-
services[serviceType] = { ...
|
|
890
|
+
services[serviceType] = { ...importService(serviceType), path: relativePath ? `./${relativePath}` : '' };
|
|
891
|
+
if (service.catalogPath !== undefined) {
|
|
892
|
+
const sourceBase = imported.common.baseUrl.replace(/\/+$/u, '') + '/';
|
|
893
|
+
const directory = new URL(service.catalogPath, sourceBase);
|
|
894
|
+
const relativeCatalog = posix.relative(baseUrl.pathname.replace(/\/+$/u, '') || '/', directory.pathname);
|
|
895
|
+
services[serviceType].catalogPath = relativeCatalog ? `./${relativeCatalog}` : '';
|
|
896
|
+
}
|
|
478
897
|
}
|
|
479
898
|
return {
|
|
480
899
|
...existing,
|
|
481
|
-
common
|
|
482
|
-
...existing.common,
|
|
483
|
-
...(!existing.common.apiKey?.trim() && imported.common.apiKey ? { apiKey: imported.common.apiKey } : {}),
|
|
484
|
-
},
|
|
900
|
+
common,
|
|
485
901
|
services,
|
|
486
902
|
};
|
|
487
903
|
}
|
|
@@ -490,12 +906,14 @@ function resolveDraftProvider(value, previous, imports = []) {
|
|
|
490
906
|
throw new Error('Provider imports must be an array');
|
|
491
907
|
let secretSource = previous;
|
|
492
908
|
for (const item of imports) {
|
|
493
|
-
const
|
|
909
|
+
const source = item && typeof item === 'object' && Object.hasOwn(item, 'templateProvider')
|
|
910
|
+
? item : undefined;
|
|
911
|
+
const imported = validateProvidersFile({ providers: { imported: source ? source.templateProvider : item } }).providers.imported;
|
|
494
912
|
rejectMaskedImportSecrets({ imported });
|
|
495
913
|
if (secretSource && providerIdentity(secretSource).domain !== providerIdentity(imported).domain) {
|
|
496
914
|
throw new Error('Imported Provider domain does not match the target Provider');
|
|
497
915
|
}
|
|
498
|
-
secretSource = secretSource ? mergeImportedProvider(secretSource, imported) : imported;
|
|
916
|
+
secretSource = secretSource ? mergeImportedProvider(secretSource, imported, source ? new Set(Object.keys(imported.services ?? {})) : undefined, !!source) : imported;
|
|
499
917
|
}
|
|
500
918
|
const provider = validateProvidersFile({ providers: { draft: retainSecrets(value, secretSource) } }).providers.draft;
|
|
501
919
|
if (imports.length && secretSource && providerIdentity(provider).domain !== providerIdentity(secretSource).domain) {
|