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
|
@@ -35,6 +35,8 @@ import { summarizeToolInputForDisplay, toolInputForDisplay } from '../../utils/t
|
|
|
35
35
|
import { agentDataDir, agentDir as resolveAgentDir, agentMdPath, agentSoulDir, getPackageRoot, resolveRoot, resolvePaths, debugSessionsDir } from '../../paths.js';
|
|
36
36
|
import { renderKitSections, resolveSessionManifest, DEFAULT_MANIFEST_FILE } from '../../eck/kit-renderer.js';
|
|
37
37
|
import { renderMessageBody } from '../../eck/message-renderer.js';
|
|
38
|
+
import { readLocalSelfIdentity } from '../../services/identity.js';
|
|
39
|
+
import { isOwnerDirectoryContact } from '../../directory/owner-directory-admission.js';
|
|
38
40
|
import { syncGroupRulesContext } from '../../eck/group-rules-sync.js';
|
|
39
41
|
import { claimHints, commitHintClaim, releaseHintClaim, peekHints, hintsToSubMessages, composeHintFallback, OBSERVER_HINT_FAILURE_MESSAGES, } from './pending-hints.js';
|
|
40
42
|
import { createRootCausation, deriveCausation, normalizeCausation } from '../causation/context.js';
|
|
@@ -1204,7 +1206,8 @@ const FULL_ACCESS_MESSAGE_PROMPT_CONTEXT = '【当前权限模式提升为fullac
|
|
|
1204
1206
|
function insertMessagePromptContext(prompt, context, userContent) {
|
|
1205
1207
|
if (!context)
|
|
1206
1208
|
return prompt;
|
|
1207
|
-
|
|
1209
|
+
// 信封:`‹YYYY-MM-DD HH:mm:ss 偏移 …›`;批次逐行是 `‹HH:mm:ss …›`,不含日期。
|
|
1210
|
+
const headers = [...prompt.matchAll(/‹\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [^\n]*›/gu)];
|
|
1208
1211
|
const renderedHeader = headers[0];
|
|
1209
1212
|
const headerEnd = renderedHeader
|
|
1210
1213
|
? (renderedHeader.index ?? 0) + renderedHeader[0].length
|
|
@@ -1213,6 +1216,13 @@ function insertMessagePromptContext(prompt, context, userContent) {
|
|
|
1213
1216
|
const remainder = prompt.slice(headerEnd).replace(/^\n+/u, '');
|
|
1214
1217
|
return `${prompt.slice(0, headerEnd)}\n${context}${remainder ? `\n${remainder}` : ''}`;
|
|
1215
1218
|
}
|
|
1219
|
+
// 群聊批次:首行是 `[… · 群聊] …` 批次头,没有 `‹日期…›` 信封;插在批次头之后。
|
|
1220
|
+
const batchHeader = /^\[[^\]\n]*·\s*群聊\][^\n]*/mu.exec(prompt);
|
|
1221
|
+
if (batchHeader && batchHeader.index !== undefined) {
|
|
1222
|
+
const end = batchHeader.index + batchHeader[0].length;
|
|
1223
|
+
const remainder = prompt.slice(end).replace(/^\n+/u, '');
|
|
1224
|
+
return `${prompt.slice(0, end)}\n${context}${remainder ? `\n${remainder}` : ''}`;
|
|
1225
|
+
}
|
|
1216
1226
|
if (userContent?.trim()) {
|
|
1217
1227
|
const contentStart = prompt.indexOf(userContent);
|
|
1218
1228
|
if (contentStart >= 0) {
|
|
@@ -3737,6 +3747,7 @@ export class ResponseEngine {
|
|
|
3737
3747
|
const registrySelfName = selfAid ? this.agentRegistry?.resolveDisplayName?.(selfAid) : undefined;
|
|
3738
3748
|
const adapterSelfName = typeof adapterAny._selfName === 'function' ? adapterAny._selfName() : undefined;
|
|
3739
3749
|
const selfName = registrySelfName ?? adapterSelfName;
|
|
3750
|
+
const selfIdentity = selfAid ? readLocalSelfIdentity(selfAid) : undefined;
|
|
3740
3751
|
// 跨话题自派(source=self-address):信封头仍显示 from=本端,但关系身份必须落回
|
|
3741
3752
|
// 话题对端。否则 actorId/peerKey 都变成自己:角色掉到 none、权限 readonly,
|
|
3742
3753
|
// 回复也会发给自己(投递失败后还被静默吞掉)。群会话不走这条(跨话题自派不适用群)。
|
|
@@ -3814,6 +3825,15 @@ export class ResponseEngine {
|
|
|
3814
3825
|
?? (peerRoleDetail
|
|
3815
3826
|
? (peerRoleDetail.effectiveRole ?? 'none')
|
|
3816
3827
|
: (session.identity?.role ?? 'none'));
|
|
3828
|
+
// 「与发言人」角色:群聊只认发言人本人的关系(relation-actor / agent-owner),
|
|
3829
|
+
// 没有就降级 visitor;私聊里发言人就是对端,与 peerRole 一致。
|
|
3830
|
+
const speakerRelation = (configChatType === 'group' && configChannelType === 'aun')
|
|
3831
|
+
? (peerRoleDetail && (peerRoleDetail.source === 'relation-actor'
|
|
3832
|
+
|| peerRoleDetail.source === 'agent-owner'
|
|
3833
|
+
|| peerRoleDetail.source === 'internal-contact-default')
|
|
3834
|
+
? (peerRoleDetail.effectiveRole ?? 'visitor')
|
|
3835
|
+
: (isOwnerDirectoryContact(selfAid || '', configActorId || '') ? 'member' : 'visitor'))
|
|
3836
|
+
: peerRole;
|
|
3817
3837
|
let effectiveAgentConfigError;
|
|
3818
3838
|
const effectiveAgentConfig = (() => {
|
|
3819
3839
|
try {
|
|
@@ -5461,6 +5481,13 @@ export class ResponseEngine {
|
|
|
5461
5481
|
sessionType: renderedSessionType,
|
|
5462
5482
|
memoryMode,
|
|
5463
5483
|
selfName: selfName || undefined,
|
|
5484
|
+
// 本端名片 type/exttype(信封 self 标签用);读本地 agent.md,缺失按 agent。
|
|
5485
|
+
selfType: selfIdentity?.type || 'agent',
|
|
5486
|
+
selfExttype: selfIdentity?.exttype || undefined,
|
|
5487
|
+
// 群聊:本端在当前群的成员角色(供 [relation] 段注入「我的群角色」)。
|
|
5488
|
+
myGroupRole: message.myGroupRole || undefined,
|
|
5489
|
+
// 本轮主发言人与本端的关系角色(供 [relation] 段注入「与发言人」)。
|
|
5490
|
+
speakerRelation,
|
|
5464
5491
|
agentMdPath: selfAid ? agentMdPath(selfAid) : undefined,
|
|
5465
5492
|
lifecycle,
|
|
5466
5493
|
isBootstrapping,
|
|
@@ -5625,6 +5652,14 @@ export class ResponseEngine {
|
|
|
5625
5652
|
? (message.selfAID || message.peerId) : message.peerId,
|
|
5626
5653
|
peerName: message.source === 'self-address' ? undefined : (peerName || undefined),
|
|
5627
5654
|
peerType: message.source === 'self-address' ? 'agent' : message.peerType,
|
|
5655
|
+
peerExttype: message.source === 'self-address' ? undefined : message.peerExttype,
|
|
5656
|
+
messageId: message.messageId,
|
|
5657
|
+
groupRole: message.groupRole,
|
|
5658
|
+
isMentioned: message.isMentioned,
|
|
5659
|
+
senderCtx: message.senderCtx,
|
|
5660
|
+
speakerRelation: String(speakerRelation ?? 'visitor'),
|
|
5661
|
+
originThreadId: message.originThreadId,
|
|
5662
|
+
originPeer: message.originPeer,
|
|
5628
5663
|
selfAddressed: message.source === 'self-address' || undefined,
|
|
5629
5664
|
peerRole: systemSessionMarker ? undefined : (message.batchRole || session.identity?.role || 'none'),
|
|
5630
5665
|
sameDevice: message.sameDevice, sameNetwork: message.sameNetwork, sameEgressIp: message.sameEgressIp,
|
|
@@ -5674,7 +5709,15 @@ export class ResponseEngine {
|
|
|
5674
5709
|
return [...threadContextItems, ...items];
|
|
5675
5710
|
}
|
|
5676
5711
|
}
|
|
5677
|
-
|
|
5712
|
+
// 本轮注入了委托提醒:同一条 inbox 条目也是本轮对端消息的跨话题来源,
|
|
5713
|
+
// 让消息信封能标 `跨话题委托` + `话题:`(与提醒同源)。
|
|
5714
|
+
const delegationOrigin = threadContextItems.find(item => item.threadContext)?.threadContext;
|
|
5715
|
+
const withOrigin = (items) => delegationOrigin
|
|
5716
|
+
? items.map(item => (item.kind || item.selfAddressed)
|
|
5717
|
+
? item
|
|
5718
|
+
: { ...item, originThreadId: delegationOrigin.originThreadId, originPeer: delegationOrigin.originPeer })
|
|
5719
|
+
: items;
|
|
5720
|
+
return [...threadContextItems, ...withOrigin(rawPeerItems)];
|
|
5678
5721
|
})();
|
|
5679
5722
|
// 将匹配的 pending hint 暂时 claim,排在真实消息之前;渲染或启动
|
|
5680
5723
|
// 失败时释放 claim,只有 runner 接受 prompt 后才持久化 consumed。
|
|
@@ -5978,6 +6021,9 @@ export class ResponseEngine {
|
|
|
5978
6021
|
return prepared;
|
|
5979
6022
|
},
|
|
5980
6023
|
} };
|
|
6024
|
+
if (message.source === 'owner-inject' && ownerHintClaim) {
|
|
6025
|
+
this.messageQueue?.prepareObserverHintExecution(session.id);
|
|
6026
|
+
}
|
|
5981
6027
|
const rawStream = await agent.runQuery(session.id, capsuleInput.prompt, absoluteProjectPath, runAgentSessionId, runnerImages, effectiveSystemPrompt, this.sessionManager, attemptOverride, runtimeEnv);
|
|
5982
6028
|
// A provider may resolve an alias or report a more precise model at
|
|
5983
6029
|
// completion. Update before the renderer flushes the final output.
|
|
@@ -18,18 +18,11 @@
|
|
|
18
18
|
* I5 跨话题必有复查周期(缺省补默认);同话题永不建复查
|
|
19
19
|
* I6 加密默认 auto;只有目标对端是 AUN 时才能加密
|
|
20
20
|
*/
|
|
21
|
-
import { canonicalizeMainTopicId, formatMainTopicId, isMainTopicId, mainTopicPeer, normalizeTopicAid, } from '../thread/topic-id.js';
|
|
21
|
+
import { canonicalizeMainTopicId, formatMainTopicId, isExternalTopicThreadId, isMainTopicId, mainTopicPeer, normalizeTopicAid, } from '../thread/topic-id.js';
|
|
22
22
|
// ── 常量 ────────────────────────────────────────────────────────────────
|
|
23
23
|
/** 跨话题缺省复查周期(plan 假设 A1)。改这里即可调整全局节奏。 */
|
|
24
24
|
export const DEFAULT_CROSS_TOPIC_CHECK_EVERY = '20m';
|
|
25
25
|
export const DEFAULT_CROSS_TOPIC_CHECK_EVERY_MS = 20 * 60_000;
|
|
26
|
-
/**
|
|
27
|
-
* 话题 id 形态:`thread-<ms>-<4位序号>-<4位hex>`。
|
|
28
|
-
*
|
|
29
|
-
* 与 `thread-service.ts` 的 THREAD_ID_RE 保持一致(那个常量未导出,且该模块
|
|
30
|
-
* 依赖 fs,不能被纯函数引用)。两侧改动必须同步。
|
|
31
|
-
*/
|
|
32
|
-
const THREAD_TOPIC_ID_RE = /^thread-[0-9]+-[0-9a-f]{4}-[0-9a-f]{4}$/;
|
|
33
26
|
/** 时长语法:`<正整数><d|h|m|s>`。与 trigger/parser.ts 的 parseDuration 同口径。 */
|
|
34
27
|
const DURATION_RE = /^([1-9]\d*)([dhms])$/;
|
|
35
28
|
// ── 基础工具 ────────────────────────────────────────────────────────────
|
|
@@ -45,10 +38,8 @@ export function parseDurationToMs(value) {
|
|
|
45
38
|
: unit === 'm' ? 60_000 : 1_000;
|
|
46
39
|
return amount * multiplier;
|
|
47
40
|
}
|
|
48
|
-
/**
|
|
49
|
-
export
|
|
50
|
-
return typeof value === 'string' && THREAD_TOPIC_ID_RE.test(value);
|
|
51
|
-
}
|
|
41
|
+
/** 兼容既有调用名;外部话题格式统一由 topic-id 定义。 */
|
|
42
|
+
export const isThreadTopicId = isExternalTopicThreadId;
|
|
52
43
|
/**
|
|
53
44
|
* 对端等值判定的规范形态。
|
|
54
45
|
*
|
|
@@ -4,6 +4,7 @@ import path from 'node:path';
|
|
|
4
4
|
import { appendRequestPath, appendV1RequestPath } from '../../agents/request-identity.js';
|
|
5
5
|
import { atomicReadJson, atomicWriteJson } from '../../utils/atomic-write.js';
|
|
6
6
|
import { parseModelId } from './context-window-suffix.js';
|
|
7
|
+
import { providerModelLiteralId } from '../../config/providers-config.js';
|
|
7
8
|
/** 单页请求的超时(含响应体读取)。多页目录里每页各自享有这个预算。 */
|
|
8
9
|
export const CATALOG_PAGE_TIMEOUT_MS = 4_000;
|
|
9
10
|
/** 整条路由(含全部分页)的总期限,兜住慢网关无限翻页。 */
|
|
@@ -271,12 +272,16 @@ export class ModelCatalogService {
|
|
|
271
272
|
return snapshot;
|
|
272
273
|
}
|
|
273
274
|
peek(context) {
|
|
275
|
+
if (context.modelPolicy === 'manual')
|
|
276
|
+
return this.manual(context);
|
|
274
277
|
const fallback = context.providerId
|
|
275
278
|
? this.make(context, 'gateway', 'fallback', [], [{ code: 'GATEWAY_UNAVAILABLE', message: '当前服务商尚无成功模型目录' }])
|
|
276
279
|
: this.make(context, 'builtin', 'fallback', this.legacyBuiltins(context), [{ code: 'BUILTIN', message: '内置候选,未经当前连接验证' }]);
|
|
277
280
|
return this.present(structuredClone(this.latest.get(this.key(context)) ?? this.previous(context) ?? fallback), context);
|
|
278
281
|
}
|
|
279
282
|
async get(context, refresh = false) {
|
|
283
|
+
if (context.modelPolicy === 'manual')
|
|
284
|
+
return this.manual(context);
|
|
280
285
|
const key = this.key(context);
|
|
281
286
|
const previous = this.latest.get(key) ?? this.previous(context);
|
|
282
287
|
let pending = this.inflight.get(key);
|
|
@@ -300,6 +305,14 @@ export class ModelCatalogService {
|
|
|
300
305
|
return this.present(structuredClone(await pending), context);
|
|
301
306
|
}
|
|
302
307
|
clear() { this.latest.clear(); this.successes.clear(); }
|
|
308
|
+
manual(context) {
|
|
309
|
+
const models = Object.entries(context.modelOverrides ?? {}).map(([id, override]) => ({
|
|
310
|
+
id: providerModelLiteralId(id), manual: true, verification: 'unverified',
|
|
311
|
+
...(typeof override.name === 'string' && override.name ? { displayName: override.name } : {}),
|
|
312
|
+
...(typeof override.imageIn === 'boolean' ? { imageIn: override.imageIn } : {}),
|
|
313
|
+
}));
|
|
314
|
+
return this.present(this.make(context, 'manual', 'fresh', models, []), context);
|
|
315
|
+
}
|
|
303
316
|
make(context, source, freshness, models, diagnostics) {
|
|
304
317
|
const fetchedAt = new Date(this.now()).toISOString();
|
|
305
318
|
// A revision identifies the connection's model/capability set. Fetch time
|
|
@@ -13,7 +13,8 @@ import net from 'node:net';
|
|
|
13
13
|
import fs from 'node:fs';
|
|
14
14
|
import { getWindowsInstanceSocketPathCandidates, resolvePaths } from '../../paths.js';
|
|
15
15
|
import { ModelCatalogService, adaptCatalogModels, adaptServiceCatalogModels, catalogEfforts, catalogHash, resolveCatalogModel } from './catalog-service.js';
|
|
16
|
-
import { providerIsConfigured, providerServiceTypesForBaseagent, resolveProviderService, resolveProviderServiceForBaseagent } from '../../config/providers.js';
|
|
16
|
+
import { assertProviderModelAllowed, readProvidersFile, providerModelEnabled, providerModelLiteralId, isProviderModelPattern, providerIsConfigured, providerServiceTypesForBaseagent, resolveProviderService, resolveProviderServiceForBaseagent } from '../../config/providers.js';
|
|
17
|
+
import { resolveProviderModelSettings } from '../../config/providers-config.js';
|
|
17
18
|
export * from './catalog-service.js';
|
|
18
19
|
let daemonOwner = false;
|
|
19
20
|
export function setModelCatalogDaemonOwner(value) { daemonOwner = value; }
|
|
@@ -102,10 +103,13 @@ export async function getProviderCatalog(providerId, serviceType, refresh = fals
|
|
|
102
103
|
const present = (snapshot) => {
|
|
103
104
|
if (management)
|
|
104
105
|
return snapshot;
|
|
105
|
-
|
|
106
|
+
if (selected.modelPolicy)
|
|
107
|
+
return applyProviderModelOverrides({ ...snapshot,
|
|
108
|
+
models: adaptProviderCatalogModels(snapshot.models, selected, baseagent) }, selected.modelOverrides, selected.modelPolicy);
|
|
109
|
+
const overridden = applyProviderModelOverrides(snapshot, selected.modelOverrides, selected.modelPolicy);
|
|
106
110
|
return { ...overridden, models: adaptProviderCatalogModels(overridden.models, selected, baseagent) };
|
|
107
111
|
};
|
|
108
|
-
if (!daemonOwner) {
|
|
112
|
+
if (!daemonOwner && selected.modelPolicy !== 'manual') {
|
|
109
113
|
const snapshot = await queryDaemonCatalog(undefined, undefined, refresh, { providerId, serviceType: effectiveServiceType });
|
|
110
114
|
if (snapshot)
|
|
111
115
|
return present(snapshot);
|
|
@@ -159,6 +163,7 @@ export function resolveCatalogContext(self, ba) {
|
|
|
159
163
|
: provider.headers,
|
|
160
164
|
queryParams: provider.queryParams,
|
|
161
165
|
modelOverrides: provider.modelOverrides,
|
|
166
|
+
modelPolicy: provider.modelPolicy,
|
|
162
167
|
});
|
|
163
168
|
return context;
|
|
164
169
|
}
|
|
@@ -174,7 +179,7 @@ export async function getBaseagentCatalog(baseagent, options = {}) {
|
|
|
174
179
|
/** Used by the IPC handler and the owner process. Never calls IPC recursively. */
|
|
175
180
|
export async function getLocalCatalog(self, ba, refresh = false) {
|
|
176
181
|
const context = resolveCatalogContext(self, ba);
|
|
177
|
-
return applyProviderModelOverrides(await service.get(context, refresh), context.modelOverrides);
|
|
182
|
+
return applyProviderModelOverrides(await service.get(context, refresh), context.modelOverrides, context.modelPolicy);
|
|
178
183
|
}
|
|
179
184
|
export async function getCatalog(self, ba, refresh = false) {
|
|
180
185
|
if (!daemonOwner) {
|
|
@@ -192,28 +197,58 @@ export function getRunnerCatalog(baseagent, self, connection) {
|
|
|
192
197
|
return getProviderCatalog(connection.providerId, connection.providerServiceType, false, false, baseagent);
|
|
193
198
|
}
|
|
194
199
|
const context = { ...connection, scope: '<defaults>', baseagent };
|
|
195
|
-
return service.get(context).then(snapshot => applyProviderModelOverrides(snapshot, context.modelOverrides));
|
|
200
|
+
return service.get(context).then(snapshot => applyProviderModelOverrides(snapshot, context.modelOverrides, context.modelPolicy));
|
|
196
201
|
}
|
|
197
202
|
export function peekRunnerCatalog(baseagent, self, connection) {
|
|
198
203
|
const context = self ? resolveCatalogContext(self, baseagent) : {
|
|
199
204
|
...(connection.providerId !== undefined ? resolveProviderServiceForBaseagent(connection.providerId, baseagent, connection.providerServiceType) : connection), scope: '<defaults>', baseagent,
|
|
200
205
|
};
|
|
201
|
-
return applyProviderModelOverrides(service.peek(context), context.modelOverrides);
|
|
206
|
+
return applyProviderModelOverrides(service.peek(context), context.modelOverrides, context.modelPolicy);
|
|
207
|
+
}
|
|
208
|
+
/** Resolve saved aliases from the raw cached directory; never starts a network refresh. */
|
|
209
|
+
export function resolveProviderSelectionModel(providerId, _serviceType, baseagent, model) {
|
|
210
|
+
if (baseagent !== 'claude' || !/^(opus|sonnet|haiku)$/u.test(model))
|
|
211
|
+
return model;
|
|
212
|
+
try {
|
|
213
|
+
const provider = resolveProviderServiceForBaseagent(providerId, baseagent);
|
|
214
|
+
const raw = service.peek({ ...provider, scope: '<providers>', baseagent: 'claude' });
|
|
215
|
+
return resolveCatalogModel(raw, model);
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
// An unavailable connection cannot make an offline write fetch a catalog.
|
|
219
|
+
return model;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
/** Recheck current Provider policy before dispatch, including already configured models. */
|
|
223
|
+
export async function assertRunnerModelAllowed(baseagent, model, connection) {
|
|
224
|
+
if (!connection.providerId)
|
|
225
|
+
return;
|
|
226
|
+
const settings = resolveProviderModelSettings(connection.providerId, connection.providerServiceType ?? baseagent, readProvidersFile(), connection.providerServiceType ? undefined : baseagent);
|
|
227
|
+
if (!settings.modelPolicy)
|
|
228
|
+
return;
|
|
229
|
+
const provider = resolveProviderServiceForBaseagent(connection.providerId, baseagent, connection.providerServiceType);
|
|
230
|
+
let canonical = model;
|
|
231
|
+
if (baseagent === 'claude' && /^(opus|sonnet|haiku)$/u.test(model)) {
|
|
232
|
+
const raw = await getProviderCatalog(provider.providerId, provider.serviceType, false, true);
|
|
233
|
+
canonical = resolveCatalogModel({ ...raw, models: adaptCatalogModels(raw.models, baseagent) }, model);
|
|
234
|
+
}
|
|
235
|
+
assertProviderModelAllowed(canonical, provider);
|
|
202
236
|
}
|
|
203
237
|
export async function getModelEfforts(model, self, ba) {
|
|
204
238
|
const baseagent = ba || activeBaseagent(self);
|
|
205
239
|
return catalogEfforts(await getCatalog(self, baseagent), model, baseagent);
|
|
206
240
|
}
|
|
207
241
|
export function clearModelCatalogCache() { service.clear(); clearRuntimeBaseagentModelDefaults(); }
|
|
208
|
-
export function applyProviderModelOverrides(snapshot, overrides) {
|
|
209
|
-
if (!overrides || Object.keys(overrides).length === 0)
|
|
242
|
+
export function applyProviderModelOverrides(snapshot, overrides, policy) {
|
|
243
|
+
if (!policy && (!overrides || Object.keys(overrides).length === 0))
|
|
210
244
|
return snapshot;
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
.map(([
|
|
245
|
+
overrides ??= {};
|
|
246
|
+
const exactOverrides = policy ? Object.fromEntries(Object.entries(overrides)
|
|
247
|
+
.filter(([id]) => !isProviderModelPattern(id)).map(([id, entry]) => [providerModelLiteralId(id), entry])) : overrides;
|
|
214
248
|
const listed = new Set(snapshot.models.map(model => model.id));
|
|
215
|
-
const manualModels = Object.entries(
|
|
216
|
-
.filter(([id, override]) =>
|
|
249
|
+
const manualModels = Object.entries(exactOverrides)
|
|
250
|
+
.filter(([id, override]) => (policy === 'manual' || (!policy && override.manual === true))
|
|
251
|
+
&& !listed.has(id) && providerModelEnabled(id, overrides, policy))
|
|
217
252
|
.map(([id, override]) => ({
|
|
218
253
|
id,
|
|
219
254
|
verification: 'unverified',
|
|
@@ -221,10 +256,12 @@ export function applyProviderModelOverrides(snapshot, overrides) {
|
|
|
221
256
|
...(typeof override.name === 'string' && override.name ? { displayName: override.name } : {}),
|
|
222
257
|
...(typeof override.imageIn === 'boolean' ? { imageIn: override.imageIn } : {}),
|
|
223
258
|
}));
|
|
224
|
-
const
|
|
225
|
-
.filter(model =>
|
|
259
|
+
const sourceModels = policy === 'manual'
|
|
260
|
+
? snapshot.models.filter(model => Object.hasOwn(exactOverrides, model.aliasFor ?? model.id)) : snapshot.models;
|
|
261
|
+
const models = [...sourceModels, ...manualModels]
|
|
262
|
+
.filter(model => providerModelEnabled(model.aliasFor ?? model.id, overrides, policy))
|
|
226
263
|
.map(model => {
|
|
227
|
-
const override =
|
|
264
|
+
const override = exactOverrides[model.aliasFor ?? model.id];
|
|
228
265
|
if (!override)
|
|
229
266
|
return model;
|
|
230
267
|
const result = { ...model };
|
|
@@ -234,11 +271,13 @@ export function applyProviderModelOverrides(snapshot, overrides) {
|
|
|
234
271
|
result.displayName = override.name;
|
|
235
272
|
if (typeof override.imageIn === 'boolean')
|
|
236
273
|
result.imageIn = override.imageIn;
|
|
237
|
-
if (override.manual === true)
|
|
274
|
+
if (policy === 'manual' || (!policy && override.manual === true))
|
|
238
275
|
result.manual = true;
|
|
239
276
|
return result;
|
|
240
277
|
});
|
|
241
|
-
|
|
278
|
+
const revision = policy ? catalogHash({ revision: snapshot.revision, policy, overrides, models })
|
|
279
|
+
: catalogHash({ revision: snapshot.revision, models });
|
|
280
|
+
return { ...snapshot, revision, models };
|
|
242
281
|
}
|
|
243
282
|
export function modelMatches(agent, candidate, current) {
|
|
244
283
|
if (!current)
|
|
@@ -646,7 +646,7 @@ export class OwnerResolver {
|
|
|
646
646
|
logger.warn(`[ownership] Failed to persist rejected binding for ${task.sub_aid}: ${reason}`);
|
|
647
647
|
}
|
|
648
648
|
}
|
|
649
|
-
async bind(subjectAid, ownerAid, isCurrent) {
|
|
649
|
+
async bind(subjectAid, ownerAid, isCurrent, onSubmissionStart) {
|
|
650
650
|
this.assertAid(subjectAid);
|
|
651
651
|
this.assertAid(ownerAid);
|
|
652
652
|
if (ownerAid === subjectAid)
|
|
@@ -661,11 +661,22 @@ export class OwnerResolver {
|
|
|
661
661
|
if (subject.binding) {
|
|
662
662
|
if (subject.binding.ownerAid !== ownerAid)
|
|
663
663
|
throw new OwnershipError('BIND_CONFLICT', 'Another owner binding is in progress');
|
|
664
|
+
if (onSubmissionStart) {
|
|
665
|
+
if (subject.binding.submission.started)
|
|
666
|
+
onSubmissionStart();
|
|
667
|
+
else
|
|
668
|
+
subject.binding.submission.listeners.add(onSubmissionStart);
|
|
669
|
+
}
|
|
664
670
|
return subject.binding.promise;
|
|
665
671
|
}
|
|
666
672
|
const previousTask = subject.view.task;
|
|
667
|
-
const
|
|
668
|
-
|
|
673
|
+
const submission = { started: false, listeners: new Set(onSubmissionStart ? [onSubmissionStart] : []) };
|
|
674
|
+
const promise = this.submitBinding(subjectAid, ownerAid, subject, assertCurrent, () => {
|
|
675
|
+
submission.started = true;
|
|
676
|
+
for (const listener of submission.listeners)
|
|
677
|
+
listener();
|
|
678
|
+
});
|
|
679
|
+
subject.binding = { ownerAid, promise, submission };
|
|
669
680
|
try {
|
|
670
681
|
const result = await promise;
|
|
671
682
|
const task = result.task;
|
|
@@ -943,14 +954,14 @@ export class OwnerResolver {
|
|
|
943
954
|
this.configuredOwners.clear();
|
|
944
955
|
this.configuredOwnerFileRevision.clear();
|
|
945
956
|
}
|
|
946
|
-
async submitBinding(subjectAid, ownerAid, subject, assertCurrent) {
|
|
957
|
+
async submitBinding(subjectAid, ownerAid, subject, assertCurrent, onSubmissionStart) {
|
|
947
958
|
const generation = subject.generation;
|
|
948
959
|
let replaced = false;
|
|
949
960
|
subject.view = { ...subject.view, requestedOwnerAid: ownerAid, requestStatus: 'requesting', task: undefined };
|
|
950
961
|
try {
|
|
951
962
|
await this.assertAgentOwner(subjectAid, ownerAid);
|
|
952
963
|
assertCurrent();
|
|
953
|
-
const local = await this.tryLocalBind(subjectAid, ownerAid, assertCurrent);
|
|
964
|
+
const local = await this.tryLocalBind(subjectAid, ownerAid, assertCurrent, onSubmissionStart);
|
|
954
965
|
if (local) {
|
|
955
966
|
if (subject.client && subject.generation !== generation) {
|
|
956
967
|
throw new OwnershipError('CLIENT_REPLACED', 'Subject SDK client changed during local binding');
|
|
@@ -988,6 +999,7 @@ export class OwnerResolver {
|
|
|
988
999
|
}
|
|
989
1000
|
this.applyConsensus(subjectAid, subject, current);
|
|
990
1001
|
assertCurrent();
|
|
1002
|
+
onSubmissionStart?.();
|
|
991
1003
|
const task = this.task(await client.bindOwneraid(ownerAid));
|
|
992
1004
|
if (attached && (subject.client !== client || subject.generation !== generation)) {
|
|
993
1005
|
replaced = true;
|
|
@@ -1333,7 +1345,7 @@ export class OwnerResolver {
|
|
|
1333
1345
|
catch { }
|
|
1334
1346
|
}
|
|
1335
1347
|
}
|
|
1336
|
-
async tryLocalBind(subjectAid, ownerAid, assertCurrent) {
|
|
1348
|
+
async tryLocalBind(subjectAid, ownerAid, assertCurrent, onSubmissionStart) {
|
|
1337
1349
|
let store;
|
|
1338
1350
|
let ownerClient;
|
|
1339
1351
|
let subClient;
|
|
@@ -1352,6 +1364,7 @@ export class OwnerResolver {
|
|
|
1352
1364
|
|| !['agent', 'human'].includes(ownerClient.getType()) || subClient.getType() !== 'agent')
|
|
1353
1365
|
return undefined;
|
|
1354
1366
|
assertCurrent();
|
|
1367
|
+
onSubmissionStart?.();
|
|
1355
1368
|
invoked = true;
|
|
1356
1369
|
const task = this.task(await ownerClient.bindSubaid(subjectAid));
|
|
1357
1370
|
if (!task || task.operation !== 'bind' || task.sub_aid !== subjectAid || task.owner_aid !== ownerAid
|
|
@@ -1525,10 +1538,14 @@ export class OwnerResolver {
|
|
|
1525
1538
|
}
|
|
1526
1539
|
notify(subjectAid, ownerAid) {
|
|
1527
1540
|
for (const listener of this.listeners) {
|
|
1528
|
-
queueMicrotask(() => {
|
|
1529
|
-
listener
|
|
1530
|
-
|
|
1531
|
-
|
|
1541
|
+
queueMicrotask(() => {
|
|
1542
|
+
if (!this.listeners.has(listener))
|
|
1543
|
+
return;
|
|
1544
|
+
try {
|
|
1545
|
+
listener(subjectAid, ownerAid);
|
|
1546
|
+
}
|
|
1547
|
+
catch { }
|
|
1548
|
+
});
|
|
1532
1549
|
}
|
|
1533
1550
|
}
|
|
1534
1551
|
invalidateRelatedSubjects(changedAid, targetAid) {
|