evolcore 0.0.43-test.8 → 0.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +75 -0
- package/bin/ecmsg.js +33 -23
- package/dist/ability/application-service.js +1 -2
- package/dist/ability/package.js +28 -0
- package/dist/agent-template/jobs.js +158 -36
- package/dist/agent-template/runtime.js +401 -34
- package/dist/agent-template/service.js +764 -369
- package/dist/agent-template/tool-runner.js +35 -17
- package/dist/agent-template/types.js +7 -4
- package/dist/agents/baseagent.js +10 -9
- package/dist/agents/claude-runner.js +13 -5
- package/dist/agents/codex/app-server-client.js +2 -4
- package/dist/agents/codex/diagnostics.js +18 -1
- package/dist/agents/codex-runner.js +3 -1
- package/dist/agents/ecagent-runner.js +3 -1
- package/dist/agents/gemini-runner.js +2 -1
- package/dist/aun/menu/client.js +142 -182
- package/dist/aun/rpc/client.js +33 -17
- package/dist/aun/service-proxy.js +6 -23
- package/dist/channels/aun.js +656 -112
- package/dist/cli/agent-create.js +37 -10
- package/dist/cli/agent-template.js +105 -84
- package/dist/cli/agent.js +31 -18
- package/dist/cli/daemon-commands.js +15 -17
- package/dist/cli/daemon-lifecycle-client.js +40 -18
- package/dist/cli/directory.js +12 -4
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/events-command.js +2 -1
- package/dist/cli/init.js +50 -20
- package/dist/cli/integrity-command.js +2 -0
- package/dist/cli/managed-command-guard.js +20 -1
- package/dist/cli/menu-client.js +7 -5
- package/dist/cli/restart-monitor.js +33 -20
- package/dist/cli/services-command.js +28 -5
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +20 -2
- package/dist/config/peer-book-store.js +152 -120
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +1 -1
- package/dist/config/provider-identity.js +10 -4
- package/dist/config/provider-ipc-service.js +10 -2
- package/dist/config/provider-local-sync.js +2 -2
- package/dist/config/providers-config.js +95 -10
- package/dist/config/providers-import.js +4 -6
- package/dist/config/providers.js +14 -3
- package/dist/config/role-store.js +1 -1
- package/dist/config-store.js +9 -1
- package/dist/core/agent-application-service.js +56 -29
- package/dist/core/agent-create-status.js +3 -1
- package/dist/core/agent-creation-claim.js +1 -0
- package/dist/core/agent-ipc-registration.js +2 -2
- package/dist/core/agent-reload-coordinator.js +38 -1
- package/dist/core/agent-runtime.js +85 -38
- package/dist/core/auth/agent-delegation.js +5 -0
- package/dist/core/auth/operation-authorizer.js +1 -1
- package/dist/core/auth/operation-catalog.js +3 -3
- package/dist/core/bootstrap-service.js +3 -0
- package/dist/core/capability/capability-manager.js +3 -1
- package/dist/core/channel-loader.js +29 -3
- package/dist/core/channel-runtime.js +1 -1
- package/dist/core/command/agent-control.js +6 -5
- package/dist/core/command/agent-template-menu.js +32 -97
- package/dist/core/command/eventcenter-menu.js +61 -13
- package/dist/core/command/menu-catalog.js +11 -4
- package/dist/core/command/menu-handler.js +35 -8
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/team-workspace-bootstrap.js +1 -2
- package/dist/core/command/team-workspace-management-store.js +83 -0
- package/dist/core/command/team-workspace-management.js +1 -2
- package/dist/core/command/team-workspace-team.js +26 -3
- package/dist/core/daemon-control.js +3 -4
- package/dist/core/daemon-lifecycle.js +146 -110
- package/dist/core/evolagent-registry.js +42 -0
- package/dist/core/evolagent.js +2 -1
- package/dist/core/file-integrity/read.js +9 -16
- package/dist/core/file-integrity/store.js +94 -34
- package/dist/core/handoff/dispatcher.js +33 -7
- package/dist/core/handoff/runtime.js +8 -0
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +3 -0
- package/dist/core/message/aun-ipc-sender.js +109 -7
- package/dist/core/message/contact-admission.js +6 -2
- package/dist/core/message/message-bridge.js +13 -0
- package/dist/core/message/message-queue.js +131 -30
- package/dist/core/message/pending-hints.js +8 -0
- package/dist/core/message/response-engine.js +48 -2
- package/dist/core/message/send-routing.js +3 -12
- package/dist/core/model/catalog-service.js +13 -0
- package/dist/core/model/model-catalog.js +57 -18
- package/dist/core/pack-auth.js +163 -31
- package/dist/core/pack-install.js +42 -1
- package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
- package/dist/core/permission/ec-command-parser.js +3 -1
- package/dist/core/permission/shell-environment.js +23 -0
- package/dist/core/rate-window.js +6 -1
- package/dist/core/session/session-idle-monitor.js +0 -1
- package/dist/core/session/session-manager.js +14 -0
- package/dist/core/session/session-title.js +26 -6
- package/dist/core/skill/index-generator.js +3 -4
- package/dist/core/thread/thread-service.js +0 -1
- package/dist/core/thread/topic-id.js +8 -0
- package/dist/directory/owner-directory-admission.js +17 -0
- package/dist/directory/owner-directory-cache.js +3 -1
- package/dist/directory/owner-directory-markdown.js +145 -23
- package/dist/directory/owner-directory-policy.js +23 -0
- package/dist/directory/owner-directory-query-operation.js +20 -6
- package/dist/directory/owner-directory-search.js +47 -0
- package/dist/eck/message-renderer.js +171 -32
- package/dist/ecweb/basic-settings-service.js +7 -3
- package/dist/ecweb/providers-service.js +17 -10
- package/dist/ecweb/runtime/lifecycle.js +1 -1
- package/dist/ecweb/runtime/supervisor.js +77 -35
- package/dist/event-center/admission-materializer.js +1 -1
- package/dist/event-center/bus-gate.js +48 -4
- package/dist/event-center/bus-host.js +3 -3
- package/dist/event-center/center-config.js +57 -28
- package/dist/event-center/dispatcher.js +8 -0
- package/dist/event-center/event-log.js +69 -27
- package/dist/event-center/index-generator.js +6 -1
- package/dist/event-center/ipc-operation.js +66 -25
- package/dist/event-center/pack-loader.js +12 -55
- package/dist/event-center/pack-manager.js +5 -3
- package/dist/event-center/registry.js +48 -52
- package/dist/event-center/runtime.js +219 -81
- package/dist/event-center/script-runner.js +18 -7
- package/dist/event-center/types.js +9 -1
- package/dist/event-center/validation.js +33 -4
- package/dist/index.js +96 -42
- package/dist/ipc.js +33 -7
- package/dist/product.js +1 -0
- package/dist/proxy/manager.js +52 -11
- package/dist/proxy/service-supervisor.js +265 -67
- package/dist/services/dispatcher.js +26 -3
- package/dist/services/idempotency.js +128 -0
- package/dist/services/identity.js +3 -27
- package/dist/services/index-generator.js +5 -1
- package/dist/services/index.js +244 -45
- package/dist/services/ipc-operation.js +164 -20
- package/dist/services/pack-manager.js +37 -9
- package/dist/services/router.js +100 -31
- package/dist/services/script-runner.js +15 -4
- package/dist/services/service-payload.js +50 -2
- package/dist/services/validation.js +107 -3
- package/dist/trigger/scheduler.js +14 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/utils/cross-platform.js +35 -11
- package/dist/utils/error-utils.js +13 -1
- package/dist/utils/instance-registry.js +33 -35
- package/dist/utils/process-introspect.js +35 -20
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/windows-shell-trust.js +174 -68
- package/kits/docs/context-assembly.md +3 -3
- package/kits/docs/evolcore/agent.md +28 -10
- package/kits/docs/evolcore/config.md +22 -0
- package/kits/docs/evolcore/directory.md +46 -12
- package/kits/docs/evolcore/event-center.md +6 -6
- package/kits/docs/evolcore/group-collaboration.md +1 -1
- package/kits/docs/evolcore/menu-client.md +7 -5
- package/kits/docs/evolcore/menu-protocol.md +5 -3
- package/kits/docs/evolcore/msg.md +10 -3
- package/kits/docs/evolcore/provider.md +7 -3
- package/kits/docs/evolcore/services.md +145 -12
- package/kits/docs/evolcore/thread-chain.md +17 -9
- package/kits/docs/prompt-loading-architecture.md +4 -4
- package/kits/eck_message_manifest.json +46 -3
- package/kits/rules/04-relation.md +10 -2
- package/kits/rules/06-channel.md +2 -1
- package/kits/schemas/providers.schema.2.json +1 -0
- package/kits/skills/ec-group/SKILL.md +4 -0
- package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
- package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
- package/kits/skills/thread-ops/SKILL.md +8 -5
- package/kits/templates/message-fragments/group-batch-item.md +3 -0
- package/kits/templates/message-fragments/group-batch.md +1 -0
- package/kits/templates/message-fragments/item-group.md +4 -0
- package/kits/templates/message-fragments/item-private.md +4 -0
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +11 -7
- package/package.json +3 -2
- package/scripts/agent-template/index.mjs +9 -4
- package/scripts/agent-template/inspect.mjs +16 -9
- package/scripts/agent-template/shared/plan.mjs +3 -33
- package/scripts/agent-template/shared/template-contract.mjs +186 -3
- package/scripts/agent-template/shared/template-package.mjs +119 -10
- package/scripts/agent-template/shared/template-runtime.mjs +49 -6
- package/scripts/agent-template/shared/template.mjs +5 -5
- package/scripts/agent-template/team-pack.mjs +245 -0
- package/scripts/agent-template/team-preview.mjs +111 -0
- package/scripts/aid-batch/identity-batch.mjs +143 -0
- package/dist/ability/versions.js +0 -32
- package/dist/aun/model-headers.js +0 -17
- package/dist/channels/builtin-plugins.js +0 -19
- package/dist/core/command/team-workspace-initializer.js +0 -2
- package/dist/core/command/team-workspace-job-store.js +0 -88
- package/dist/core/command/team-workspace-management-service.js +0 -2
- package/dist/core/contact-bind-registry.js +0 -27
- package/dist/event-center/ledger.js +0 -52
- package/dist/services/reply.js +0 -55
- package/kits/templates/message-fragments/item.md +0 -3
- package/scripts/agent-template/pack.mjs +0 -169
|
@@ -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)
|
package/dist/core/pack-auth.js
CHANGED
|
@@ -1,26 +1,48 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 事件包 / 服务包运维命令的授权判定。
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* 权限模型(四档操作 × 两类目标):
|
|
5
5
|
*
|
|
6
|
-
* |
|
|
7
|
-
* | ---
|
|
8
|
-
* |
|
|
9
|
-
* |
|
|
10
|
-
* |
|
|
6
|
+
* | 操作 | 自己 AID | 本机其他 AID |
|
|
7
|
+
* | --- | --- | --- |
|
|
8
|
+
* | `view` 查看 | member 及以上 | member 及以上 + 同 Owner |
|
|
9
|
+
* | `manage` 管理 | owner / admin | daemonOwner + fullaccess + 同 Owner |
|
|
10
|
+
* | `switch` 总闸 | daemonOwner + fullaccess | daemonOwner + fullaccess + 同 Owner |
|
|
11
|
+
* | `call` 调用 | 准入决定(本机不判)| 准入决定(本机不判) |
|
|
11
12
|
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
13
|
+
* 「daemonOwner + fullaccess」判两件事,缺一不可:
|
|
14
|
+
* ① 本次执行是真正的 fullaccess(`isTrustedFullAccessRuntimeContext` 的结论,
|
|
15
|
+
* 由 IPC 层算好传进来,见 `ipc.ts` 的 `packCaller`);
|
|
16
|
+
* ② 给它授权的那个身份本身是本机 daemon owner(`authorizedBy ∈ daemonOwners`)。
|
|
17
|
+
* 只判 ① 等于"谁都能自己开一个 fullaccess 会话",只判 ② 等于"daemon owner
|
|
18
|
+
* 名下的普通会话也能管理",两者都不是权限模型的意图。
|
|
14
19
|
*
|
|
15
|
-
* 为什么跨 AID
|
|
16
|
-
*
|
|
17
|
-
*
|
|
20
|
+
* 为什么跨 AID 要额外要求同 Owner:`pack add` 等于给目标 agent 安装一段以后
|
|
21
|
+
* 以它的身份执行的代码。同 AID 是"自己装给自己的",跨 AID 则是"用别人的身份
|
|
22
|
+
* 执行"。daemonOwner 说明"这台机器是我的",同 Owner 说明"这两个 agent 都是我
|
|
23
|
+
* 的"——一台机器上可能挂着多个 Owner 的 agent,前者不能推出后者。
|
|
18
24
|
*
|
|
19
25
|
* 为什么不读 `/public` 或名录里的转发关系:那些都是会被拷贝、会变的展示信息;
|
|
20
26
|
* 协议 owner 归属(`ownerResolver`)才是唯一可信判据。
|
|
21
27
|
*/
|
|
22
|
-
import { getProtocolOwner } from './ownership/owner-resolver.js';
|
|
28
|
+
import { getDaemonOwners, getProtocolOwner } from './ownership/owner-resolver.js';
|
|
29
|
+
import { getRoleRank } from '../config/roles.js';
|
|
30
|
+
import { ROLE_RANKS } from '../config/role-ranks.js';
|
|
23
31
|
const MANAGING_ROLES = new Set(['owner', 'admin']);
|
|
32
|
+
/**
|
|
33
|
+
* 查看档的角色下限:member(rank 300)及以上。
|
|
34
|
+
*
|
|
35
|
+
* 不能直接用 `getRoleRank(role) >= ROLE_RANKS.member`:`expectedRoleRank` 对任何
|
|
36
|
+
* 未列出的取值都回落到 `custom`(500),于是 `'none'`、空串、拼错的名字全都
|
|
37
|
+
* 排在 member 之上——那会把"无有效关系角色"判成可读。`none` 必须显式拒绝,
|
|
38
|
+
* 其余走等级比较(自定义角色按模板里配的 rank)。
|
|
39
|
+
*/
|
|
40
|
+
function canView(caller) {
|
|
41
|
+
const role = caller.peerRole;
|
|
42
|
+
if (!role || role === 'none')
|
|
43
|
+
return false;
|
|
44
|
+
return getRoleRank(role, caller.selfAid) >= ROLE_RANKS.member;
|
|
45
|
+
}
|
|
24
46
|
export function authorizePackTarget(input) {
|
|
25
47
|
// 主机终端:人自己在操作,OS 账户可读 control.token 就是信任边界。
|
|
26
48
|
if (input.caller.kind === 'local-control')
|
|
@@ -29,28 +51,63 @@ export function authorizePackTarget(input) {
|
|
|
29
51
|
if (!selfAid) {
|
|
30
52
|
return { allowed: false, code: 'NOT_ALLOWED', error: '当前任务身份不可用;托管会话需要 sessionId 与 delegationToken' };
|
|
31
53
|
}
|
|
32
|
-
|
|
54
|
+
// 对端调用的放行由对端的准入与 rules 决定,不是本机权限问题。
|
|
55
|
+
if (input.operation === 'call')
|
|
33
56
|
return { allowed: true };
|
|
34
|
-
const role = input.caller.peerRole;
|
|
35
57
|
if (input.targetAid === selfAid) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
58
|
+
switch (input.operation) {
|
|
59
|
+
case 'view':
|
|
60
|
+
return canView(input.caller)
|
|
61
|
+
? { allowed: true }
|
|
62
|
+
: {
|
|
63
|
+
allowed: false,
|
|
64
|
+
code: 'ROLE_ACCESS_DENIED',
|
|
65
|
+
error: `查看本机事件/服务包需要 member 及以上身份(当前 ${input.caller.peerRole ?? 'none'})`,
|
|
66
|
+
};
|
|
67
|
+
case 'manage':
|
|
68
|
+
return MANAGING_ROLES.has(input.caller.peerRole ?? '')
|
|
69
|
+
? { allowed: true }
|
|
70
|
+
: {
|
|
71
|
+
allowed: false,
|
|
72
|
+
code: 'ROLE_ACCESS_DENIED',
|
|
73
|
+
error: `管理本机事件/服务包需要 owner 或 admin 身份(当前 ${input.caller.peerRole ?? 'none'})`,
|
|
74
|
+
};
|
|
75
|
+
case 'switch':
|
|
76
|
+
return requireDaemonOwnerFullAccess(input.caller, '开关本机服务总闸需要 daemonOwner 身份的 fullaccess 执行');
|
|
77
|
+
}
|
|
43
78
|
}
|
|
44
|
-
// 跨 AID
|
|
45
|
-
|
|
79
|
+
// ── 跨 AID ──
|
|
80
|
+
const selfOwner = getProtocolOwner(selfAid);
|
|
81
|
+
const targetOwner = getProtocolOwner(input.targetAid);
|
|
82
|
+
// 跨 AID 查看:先过角色下限(member+),再看归属。顺序不能反——先查归属
|
|
83
|
+
// 会给低角色调用方一个可区分的错误码,等于泄露"这两个 agent 是否同 Owner"。
|
|
84
|
+
if (input.operation === 'view' && !canView(input.caller)) {
|
|
46
85
|
return {
|
|
47
86
|
allowed: false,
|
|
48
87
|
code: 'ROLE_ACCESS_DENIED',
|
|
49
|
-
error:
|
|
88
|
+
error: `查看其它 agent 的事件/服务包需要 member 及以上身份(当前 ${input.caller.peerRole ?? 'none'})`,
|
|
50
89
|
};
|
|
51
90
|
}
|
|
52
|
-
|
|
53
|
-
|
|
91
|
+
if (input.operation === 'view') {
|
|
92
|
+
if (!selfOwner || !targetOwner) {
|
|
93
|
+
return {
|
|
94
|
+
allowed: false,
|
|
95
|
+
code: 'OWNERSHIP_UNAVAILABLE',
|
|
96
|
+
error: `查看其它 agent 的事件/服务包需要双方都有协议 owner 归属(self=${selfOwner ?? 'none'}, target=${targetOwner ?? 'none'})`,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
return selfOwner === targetOwner
|
|
100
|
+
? { allowed: true }
|
|
101
|
+
: {
|
|
102
|
+
allowed: false,
|
|
103
|
+
code: 'CROSS_AGENT_DENIED',
|
|
104
|
+
error: `查看其它 agent 的事件/服务包要求两个 agent 属于同一个 Owner(self owner=${selfOwner}, target owner=${targetOwner})`,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
// manage / switch:daemonOwner + fullaccess + 同 Owner,三者缺一不可。
|
|
108
|
+
const elevated = requireDaemonOwnerFullAccess(input.caller, '跨 AID 管理事件/服务包需要 daemonOwner 身份的 fullaccess 执行');
|
|
109
|
+
if (!elevated.allowed)
|
|
110
|
+
return elevated;
|
|
54
111
|
if (!selfOwner || !targetOwner) {
|
|
55
112
|
return {
|
|
56
113
|
allowed: false,
|
|
@@ -85,10 +142,85 @@ export function authorizePackTarget(input) {
|
|
|
85
142
|
}
|
|
86
143
|
return { allowed: true };
|
|
87
144
|
}
|
|
88
|
-
/**
|
|
89
|
-
|
|
90
|
-
|
|
145
|
+
/**
|
|
146
|
+
* 「daemonOwner + fullaccess」的完整判定。
|
|
147
|
+
*
|
|
148
|
+
* 两个条件分开检查,错误码也分开——排查时"没开 fullaccess"和"授权者不是
|
|
149
|
+
* daemon owner"是两件完全不同的事。
|
|
150
|
+
*/
|
|
151
|
+
function requireDaemonOwnerFullAccess(caller, context) {
|
|
152
|
+
if (caller.fullAccess !== true) {
|
|
153
|
+
return {
|
|
154
|
+
allowed: false,
|
|
155
|
+
code: 'FULLACCESS_REQUIRED',
|
|
156
|
+
error: `${context}(当前会话不是 fullaccess 执行)`,
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
const authorizer = caller.authorizedBy;
|
|
160
|
+
if (!authorizer || !getDaemonOwners().includes(authorizer)) {
|
|
161
|
+
return {
|
|
162
|
+
allowed: false,
|
|
163
|
+
code: 'DAEMON_OWNER_REQUIRED',
|
|
164
|
+
error: `${context}(授权者 ${authorizer ?? 'none'} 不是本机 daemon owner)`,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
return { allowed: true };
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* 逐个操作声明权限,不按命令名前缀归类。
|
|
171
|
+
*
|
|
172
|
+
* 以前是 `command === 'pack' || command === 'rules'`,把 `rules show` 和
|
|
173
|
+
* `pack list` 一起判成了管理命令——两个都只读,托管 member 却查不到自己的
|
|
174
|
+
* 规则表和包清单。改成按完整操作名查表后,四档边界写在数据里。
|
|
175
|
+
*
|
|
176
|
+
* 未列出的键一律按 `manage` 处理,新加命令忘了登记只会收紧、不会放开。
|
|
177
|
+
*/
|
|
178
|
+
const PACK_OPERATIONS = {
|
|
179
|
+
events: {
|
|
180
|
+
status: 'view',
|
|
181
|
+
ledger: 'view',
|
|
182
|
+
tail: 'view',
|
|
183
|
+
doctor: 'view',
|
|
184
|
+
// reload 只重扫磁盘、重建订阅,不引入新权限。
|
|
185
|
+
reload: 'view',
|
|
186
|
+
// publish 只能发 `pack.json` 里 owner 已声明的事件(runtime.publish 校验),
|
|
187
|
+
// 等于执行已授权动作;跨 AID 的接收方准入另行判定。
|
|
188
|
+
publish: 'call',
|
|
189
|
+
'rules:show': 'view',
|
|
190
|
+
'rules:add': 'manage',
|
|
191
|
+
'rules:remove': 'manage',
|
|
192
|
+
'pack:list': 'view',
|
|
193
|
+
'pack:add': 'manage',
|
|
194
|
+
'pack:remove': 'manage',
|
|
195
|
+
'pack:enable': 'manage',
|
|
196
|
+
'pack:disable': 'manage',
|
|
197
|
+
},
|
|
198
|
+
services: {
|
|
199
|
+
status: 'view',
|
|
200
|
+
types: 'view',
|
|
201
|
+
ledger: 'view',
|
|
202
|
+
tail: 'view',
|
|
203
|
+
doctor: 'view',
|
|
204
|
+
reload: 'view',
|
|
205
|
+
// call/describe/schema 的放行由对端准入决定,不是本机权限问题。
|
|
206
|
+
describe: 'call',
|
|
207
|
+
schema: 'call',
|
|
208
|
+
call: 'call',
|
|
209
|
+
// AID 级总闸:整机是否对外提供本 AID 的服务。
|
|
210
|
+
enable: 'switch',
|
|
211
|
+
disable: 'switch',
|
|
212
|
+
'pack:list': 'view',
|
|
213
|
+
'pack:add': 'manage',
|
|
214
|
+
'pack:remove': 'manage',
|
|
215
|
+
'pack:enable': 'manage',
|
|
216
|
+
'pack:disable': 'manage',
|
|
217
|
+
},
|
|
218
|
+
};
|
|
219
|
+
/** `pack` 需要带上子动作(list/add/remove/enable/disable),其余命令名本身就是操作键。 */
|
|
220
|
+
export function packOperationKey(command, action) {
|
|
221
|
+
return command === 'pack' ? `pack:${action ?? ''}` : command;
|
|
91
222
|
}
|
|
92
|
-
|
|
93
|
-
|
|
223
|
+
/** 查表得出该命令的操作档位;未登记的一律 `manage`(fail-closed)。 */
|
|
224
|
+
export function packOperation(domain, command, action) {
|
|
225
|
+
return PACK_OPERATIONS[domain][packOperationKey(command, action)] ?? 'manage';
|
|
94
226
|
}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import fs from 'node:fs';
|
|
13
13
|
import path from 'node:path';
|
|
14
|
+
import { atomicWriteJson } from '../utils/atomic-write.js';
|
|
14
15
|
/** 包安装期间的运行时产物:不该被拷进新包,也不该被 `pack add` 覆盖。 */
|
|
15
16
|
const PACK_RUNTIME_ENTRIES = new Set(['ledger.jsonl', '.idempotency.jsonl', 'logs', '.state.json', '.index.md']);
|
|
16
17
|
/** 包名:英文短横线/下划线,防止 `..` 或路径分隔符把写入引出目标根。 */
|
|
@@ -78,12 +79,16 @@ export function installPack(request) {
|
|
|
78
79
|
const files = collectFiles(sourceDir);
|
|
79
80
|
fs.mkdirSync(targetRoot, { recursive: true });
|
|
80
81
|
// 残留目录(只有 logs/ 等运行时产物):原地写回,不删目录也不动归档日志。
|
|
82
|
+
//
|
|
83
|
+
// `.archived` 标记必须一并删掉:两个加载器见到它就直接跳过(pack-loader /
|
|
84
|
+
// pack-manager),留着它会让"文件都装回来了但包永远不加载",表现像包坏了。
|
|
81
85
|
if (fs.existsSync(targetDir)) {
|
|
82
86
|
for (const relative of files) {
|
|
83
87
|
const destination = path.join(targetDir, relative);
|
|
84
88
|
fs.mkdirSync(path.dirname(destination), { recursive: true });
|
|
85
89
|
fs.copyFileSync(path.join(sourceDir, relative), destination);
|
|
86
90
|
}
|
|
91
|
+
fs.rmSync(path.join(targetDir, PACK_ARCHIVED_MARKER), { force: true });
|
|
87
92
|
return { pack: name, dir: targetDir, files: files.length, intoArchived: true, ...(migratedFrom ? { migratedFrom } : {}) };
|
|
88
93
|
}
|
|
89
94
|
// 首次安装:写临时目录再整体 rename,避免中途失败留下半个包。
|
|
@@ -174,7 +179,43 @@ export function removePack(options) {
|
|
|
174
179
|
fs.rmSync(targetDir, { recursive: true, force: true });
|
|
175
180
|
return { pack: options.pack, dir: targetDir, removed: true };
|
|
176
181
|
}
|
|
177
|
-
/**
|
|
182
|
+
/**
|
|
183
|
+
* 单包启停:改 `pack.json` 的 `enabled` 字段,其余字段原样保留。
|
|
184
|
+
*
|
|
185
|
+
* 与 `installPack` / `removePack` 同属 daemon 代写——`agents/<aid>/{events,services}`
|
|
186
|
+
* 是 L 类受保护路径,agent 自己写不了。
|
|
187
|
+
*
|
|
188
|
+
* 只改这一个字段、整份重写其余内容:`name` / `description` / `listen` /
|
|
189
|
+
* `requires` 等都由包作者维护,命令不该碰。缺省语义对齐加载器——`enabled`
|
|
190
|
+
* 未写等于开启(`raw.enabled !== false`),所以 `enable` 写 `true` 而不是删字段,
|
|
191
|
+
* 文件内容始终是显式的。
|
|
192
|
+
*/
|
|
193
|
+
export function setPackEnabled(options) {
|
|
194
|
+
assertPackName(options.pack);
|
|
195
|
+
const dir = path.join(path.resolve(options.targetRoot), options.pack);
|
|
196
|
+
const manifestPath = path.join(dir, options.manifestFile);
|
|
197
|
+
let raw;
|
|
198
|
+
try {
|
|
199
|
+
raw = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
|
|
200
|
+
}
|
|
201
|
+
catch (error) {
|
|
202
|
+
const code = error.code;
|
|
203
|
+
throw Object.assign(new Error(code === 'ENOENT'
|
|
204
|
+
? `pack not found: ${options.pack} (missing ${options.manifestFile} in ${dir})`
|
|
205
|
+
: `cannot read ${options.manifestFile} for ${options.pack}: ${error instanceof Error ? error.message : String(error)}`), { code: code === 'ENOENT' ? 'PACK_NOT_FOUND' : 'PACK_MANIFEST_UNREADABLE' });
|
|
206
|
+
}
|
|
207
|
+
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
|
|
208
|
+
throw Object.assign(new Error(`${options.manifestFile} for ${options.pack} is not a JSON object`), {
|
|
209
|
+
code: 'PACK_MANIFEST_INVALID',
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
const record = raw;
|
|
213
|
+
// 未写 `enabled` 时按加载器口径视为开启(`raw.enabled !== false`)。
|
|
214
|
+
const previous = record.enabled !== false;
|
|
215
|
+
record.enabled = options.enabled;
|
|
216
|
+
atomicWriteJson(manifestPath, record);
|
|
217
|
+
return { pack: options.pack, dir, enabled: options.enabled, previous };
|
|
218
|
+
}
|
|
178
219
|
export function listPackDirs(targetRoot, manifestFile) {
|
|
179
220
|
let entries;
|
|
180
221
|
try {
|