evolcore 0.0.47 → 0.0.49
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 +90 -1
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +143 -40
- 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 +36 -17
- 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/msg/p2p.js +2 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +722 -295
- 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 +13 -2
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +9 -9
- 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/managed-command-guard.js +2 -0
- package/dist/cli/model.js +20 -5
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/quota.js +89 -0
- package/dist/cli/role.js +62 -17
- package/dist/cli/services-command.js +1 -0
- package/dist/cli/stats.js +3 -3
- package/dist/cli/team-workspace-command.js +56 -2
- 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-field-policy.js +71 -1
- package/dist/config/config-manager.js +13 -7
- 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 +67 -12
- package/dist/config/providers-management.js +477 -51
- package/dist/config/resolved-config-op.js +3 -2
- 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 +36 -26
- package/dist/core/auth/operation-authorizer.js +25 -0
- package/dist/core/auth/operation-catalog.js +37 -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/cli-intent-parser.js +13 -0
- package/dist/core/command/command-handler.js +126 -87
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +67 -150
- package/dist/core/command/menu-protocol.js +31 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/remote-shell.js +565 -0
- 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 +64 -8
- package/dist/core/daemon-lifecycle.js +16 -2
- package/dist/core/evolagent-registry.js +20 -3
- 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 +3 -1
- package/dist/core/message/aun-ipc-sender.js +279 -107
- package/dist/core/message/contact-admission.js +91 -6
- package/dist/core/message/contact-pending-inbound.js +113 -0
- package/dist/core/message/contact-thread-approval.js +212 -0
- package/dist/core/message/im-renderer.js +41 -2
- package/dist/core/message/message-admission.js +5 -39
- package/dist/core/message/message-bridge.js +140 -370
- package/dist/core/message/message-log.js +29 -0
- package/dist/core/message/message-queue.js +119 -15
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +580 -134
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/config-scope.js +6 -14
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/model/model-diagnostics.js +19 -0
- package/dist/core/model/model-fallback.js +13 -2
- package/dist/core/ownership/owner-resolver.js +328 -50
- package/dist/core/pack-auth.js +3 -0
- package/dist/core/pack-install.js +1 -1
- package/dist/core/permission/ec-command-parser.js +106 -19
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/permission/services-path-acl.js +451 -0
- package/dist/core/permission/tool-policy.js +5 -1
- package/dist/core/relation/peer-identity.js +36 -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 +13 -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/core/thread/topic-id.js +15 -0
- package/dist/directory/owner-directory-admission.js +12 -9
- package/dist/directory/owner-directory-cache.js +64 -28
- package/dist/directory/owner-directory-markdown.js +14 -2
- package/dist/directory/owner-directory-policy.js +5 -30
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/directory/owner-directory-request-operation.js +5 -2
- package/dist/eck/kit-renderer.js +1 -1
- package/dist/eck/message-renderer.js +112 -29
- 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 +36 -6
- package/dist/event-center/center-config.js +9 -5
- package/dist/event-center/dispatcher.js +10 -1
- package/dist/event-center/ipc-operation.js +19 -0
- package/dist/event-center/registry.js +29 -3
- package/dist/event-center/runtime.js +106 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +96 -59
- package/dist/ipc.js +38 -3
- package/dist/outputs/authorization.js +16 -0
- package/dist/outputs/cards.js +336 -0
- package/dist/outputs/events.js +63 -0
- package/dist/outputs/protocol.js +103 -0
- package/dist/outputs/service.js +266 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +114 -5
- package/dist/services/ipc-operation.js +88 -15
- package/dist/services/pack-manager.js +13 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/service-payload.js +13 -7
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +2 -2
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +304 -23
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/quota-query.js +95 -0
- 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 +21 -3
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/atomic-write.js +22 -8
- 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/host-info.js +100 -1
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/npm-ops.js +43 -8
- 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 +4 -2
- package/kits/docs/evolcore/aid.md +25 -0
- package/kits/docs/evolcore/config.md +16 -1
- package/kits/docs/evolcore/directory.md +30 -12
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/msg.md +9 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +124 -4
- package/kits/docs/evolcore/quota.md +54 -0
- package/kits/docs/evolcore/role.md +83 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/stats.md +2 -0
- 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 +12 -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/agent-config.schema.20.json +24 -0
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +8 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/agent-output-cards/SKILL.md +57 -0
- 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 +270 -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/roles/visitor.json +1 -0
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +4 -3
- package/kits/templates/system-fragments/directory-contacts.md +3 -4
- 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 +7 -5
- package/kits/templates/system-fragments/venue.md +11 -0
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +50 -11
- package/scripts/agent-template/shared/common.mjs +11 -6
- package/scripts/agent-template/shared/team-schema.json +6 -4
- package/scripts/agent-template/shared/template-contract.mjs +62 -11
- package/scripts/agent-template/shared/template-package.mjs +189 -21
- package/scripts/agent-template/shared/template-runtime.mjs +54 -6
- package/scripts/agent-template/shared/template.mjs +2 -2
- package/scripts/agent-template/team-pack.mjs +52 -14
- 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
|
@@ -14,7 +14,7 @@ import { agentServicesDir, resolveRoot } from '../paths.js';
|
|
|
14
14
|
import { classifyProtectedPath } from '../core/permission/protected-paths.js';
|
|
15
15
|
import { ServiceLedger } from '../core/pack-ledger.js';
|
|
16
16
|
import { ServiceMessageLog } from './message-log.js';
|
|
17
|
-
import { SERVICES_CONFIG_JSON, loadRouterConfig, ServiceRulesStore } from './router.js';
|
|
17
|
+
import { DEFAULT_ROUTER_CONFIG, SERVICES_CONFIG_JSON, loadRouterConfig, ServiceRulesStore } from './router.js';
|
|
18
18
|
import { PACK_JSON } from './pack-manager.js';
|
|
19
19
|
import { readLocalSelfIdentity } from './identity.js';
|
|
20
20
|
import { createOfflineServiceRouter, listServiceRouterAids, peekServiceRouter, } from './index.js';
|
|
@@ -23,6 +23,7 @@ import { getAunRequestRegistry } from '../core/message/aun-request-registry.js';
|
|
|
23
23
|
import { ServiceError, errorMessage } from './types.js';
|
|
24
24
|
import { authorizePackTarget, packOperation } from '../core/pack-auth.js';
|
|
25
25
|
import { installPack, listPackDirs, removePack, setPackEnabled } from '../core/pack-install.js';
|
|
26
|
+
import { hardenServicesAcl, planServicesAclRepair, readServicesAcl } from '../core/permission/services-path-acl.js';
|
|
26
27
|
const HELP = `ec services — 服务路由运维
|
|
27
28
|
|
|
28
29
|
用法:
|
|
@@ -31,6 +32,7 @@ const HELP = `ec services — 服务路由运维
|
|
|
31
32
|
ec services ledger <包名> [--tail N] [--aid <aid>] 台账
|
|
32
33
|
ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
|
|
33
34
|
ec services doctor [<包名>] [--aid <aid>] 诊断
|
|
35
|
+
ec services repair-acl [--aid <aid>] 收紧 services/ 的 NTFS ACL(幂等,仅 Windows)
|
|
34
36
|
ec services reload [--aid <aid>] 重载(全部包)
|
|
35
37
|
ec services enable / disable [--aid <aid>] 总闸
|
|
36
38
|
ec services rules show [<type>] [--aid <aid>] 调用准入规则
|
|
@@ -355,6 +357,23 @@ async function execute(deps, parsed) {
|
|
|
355
357
|
}
|
|
356
358
|
case 'doctor':
|
|
357
359
|
return { ok: true, result: { aid, findings: doctor(aid, router, parsed.pack) } };
|
|
360
|
+
case 'repair-acl': {
|
|
361
|
+
// 幂等收口:历史包(装包时还没有加固逻辑)靠这条命令补齐。
|
|
362
|
+
// 加固只改 ACL、不碰文件内容,失败也只报告不抛出。
|
|
363
|
+
const result = hardenServicesAcl(servicesDir);
|
|
364
|
+
return {
|
|
365
|
+
ok: result.errors.length === 0,
|
|
366
|
+
...(result.errors.length > 0 ? { code: 'ACL_HARDEN_FAILED', error: result.errors.join('; ') } : {}),
|
|
367
|
+
result: {
|
|
368
|
+
aid,
|
|
369
|
+
servicesDir,
|
|
370
|
+
changed: result.changed,
|
|
371
|
+
plans: result.plans
|
|
372
|
+
.filter(item => item.plan.removeSids.length > 0 || item.plan.needsDenyWrite)
|
|
373
|
+
.map(item => ({ path: item.path, removeSids: item.plan.removeSids, addDenyWrite: item.plan.needsDenyWrite })),
|
|
374
|
+
},
|
|
375
|
+
};
|
|
376
|
+
}
|
|
358
377
|
case 'reload': {
|
|
359
378
|
// 不支持单包重载:`reload()` 全量重扫。曾把位置参数原样回显成
|
|
360
379
|
// `reloaded: <包名>`,等于向调用方谎报"只重载了一个包"。
|
|
@@ -388,25 +407,14 @@ async function execute(deps, parsed) {
|
|
|
388
407
|
manifestFile: PACK_JSON,
|
|
389
408
|
legacyManifestFile: 'service.json',
|
|
390
409
|
});
|
|
391
|
-
//
|
|
392
|
-
//
|
|
393
|
-
// 不能自动开:总闸是"这个 AID 是否对外提供服务的整机决策",需要
|
|
394
|
-
// daemonOwner + fullaccess 显式执行 `ec services enable`。装包只是把文件
|
|
395
|
-
// 放到位(owner/admin 即可),自动开机等于让装包顺带绕过那道闸。
|
|
396
|
-
//
|
|
397
|
-
// 仍然落盘而不是留空:`loadRouterConfig` 对缺失文件返回缺省 enabled=false,
|
|
398
|
-
// 行为一样,但文件存在才可发现——否则用户只会看到"服务不通"。
|
|
410
|
+
// 首次装包沿用 Agent 的默认开启策略。已有配置(包括显式关闭)原样保留,
|
|
411
|
+
// 装包不能顺带修改总闸;请求仍经过准入、权限、限流与沙箱检查。
|
|
399
412
|
const routerPath = path.join(servicesDirForPack, SERVICES_CONFIG_JSON);
|
|
400
413
|
let createdRouter = false;
|
|
401
414
|
if (!fs.existsSync(routerPath)) {
|
|
402
415
|
fs.mkdirSync(servicesDirForPack, { recursive: true });
|
|
403
416
|
fs.writeFileSync(routerPath, `${JSON.stringify({
|
|
404
|
-
|
|
405
|
-
enabled: false,
|
|
406
|
-
rateLimit: {
|
|
407
|
-
builtin: { perMinute: 20, perHour: 200 },
|
|
408
|
-
service: { perMinute: 50, perHour: 1000 },
|
|
409
|
-
},
|
|
417
|
+
...DEFAULT_ROUTER_CONFIG,
|
|
410
418
|
}, null, 2)}
|
|
411
419
|
`, 'utf8');
|
|
412
420
|
createdRouter = true;
|
|
@@ -419,12 +427,19 @@ async function execute(deps, parsed) {
|
|
|
419
427
|
// 配置存在但坏了:装包成功、总闸却回落到 enabled=false,业务消息全被静默丢弃。
|
|
420
428
|
// 不替用户改文件,但必须把原因带回去。
|
|
421
429
|
const configErrors = createdRouter ? [] : loadRouterConfig(servicesDirForPack).errors;
|
|
430
|
+
// ACL 加固:新包目录与 services 根都要收口。失败不阻断安装——包已经 rename
|
|
431
|
+
// 到位,加固只是加一层兜底;把原因带回去,`doctor` 也会持续报。
|
|
432
|
+
const acl = hardenServicesAcl(servicesDirForPack);
|
|
433
|
+
if (acl.errors.length > 0) {
|
|
434
|
+
logger.warn(`[Services] services ACL hardening failed for aid=${aid}: ${acl.errors.join('; ')}`);
|
|
435
|
+
}
|
|
422
436
|
return {
|
|
423
437
|
ok: true,
|
|
424
438
|
result: {
|
|
425
439
|
aid, ...installed,
|
|
426
440
|
...(createdRouter ? { createdRouter: true } : {}),
|
|
427
441
|
...(configErrors.length > 0 ? { configErrors } : {}),
|
|
442
|
+
...(acl.errors.length > 0 ? { aclErrors: acl.errors } : {}),
|
|
428
443
|
},
|
|
429
444
|
};
|
|
430
445
|
}
|
|
@@ -653,8 +668,66 @@ function doctor(aid, router, only) {
|
|
|
653
668
|
}
|
|
654
669
|
// 6. services/ 未进 L_CLASS(由 protected-paths 的运行时常量核对)。
|
|
655
670
|
findings.push(lClassFinding());
|
|
671
|
+
// 7. ACL 兜底层:沙箱组不得对包代码与声明持有写权限。
|
|
672
|
+
findings.push(servicesAclFinding(aid, only));
|
|
656
673
|
return findings;
|
|
657
674
|
}
|
|
675
|
+
/**
|
|
676
|
+
* `services/` 的 ACL 兜底层是否生效。
|
|
677
|
+
*
|
|
678
|
+
* policy 层的写拒绝来自「没有 write 授权」,只有这一层时任何一个策略放宽都会直接
|
|
679
|
+
* 让包脚本能自改代码。这里报告的是**ACL 层有没有第二道门**:
|
|
680
|
+
* - 存在非继承的写授权(沙箱组 / 外来机器 SID)→ `warn`,给出修复命令;
|
|
681
|
+
* - 缺少 DENY(写) 兜底 → `warn`;
|
|
682
|
+
* - 非 Windows 或本机没有沙箱组 → `ok` + 说明(没有可加固对象)。
|
|
683
|
+
*/
|
|
684
|
+
function servicesAclFinding(aid, only) {
|
|
685
|
+
if (process.platform !== 'win32') {
|
|
686
|
+
return { level: 'ok', check: 'acl', detail: 'not applicable on this platform (Windows-only hardening)' };
|
|
687
|
+
}
|
|
688
|
+
const servicesDir = agentServicesDir(aid);
|
|
689
|
+
let snapshot;
|
|
690
|
+
try {
|
|
691
|
+
snapshot = readServicesAcl(servicesDir);
|
|
692
|
+
}
|
|
693
|
+
catch (error) {
|
|
694
|
+
return { level: 'warn', check: 'acl', detail: `cannot read ACL: ${errorMessage(error)}` };
|
|
695
|
+
}
|
|
696
|
+
if (!snapshot.sandboxSid) {
|
|
697
|
+
return { level: 'ok', check: 'acl', detail: 'CodexSandboxUsers group not present; sandbox scripts cannot run as a sandbox identity' };
|
|
698
|
+
}
|
|
699
|
+
const rows = snapshot.entries
|
|
700
|
+
.filter(entry => !only || sameAsPackDir(entry.path, servicesDir, only))
|
|
701
|
+
.map(entry => ({ path: entry.path, plan: planServicesAclRepair(entry.aces, snapshot) }));
|
|
702
|
+
const violations = rows.flatMap(row => row.plan.violations.map(detail => `${relativeTo(servicesDir, row.path)}: ${detail}`));
|
|
703
|
+
const missingDeny = rows.filter(row => row.plan.needsDenyWrite && samePathWith(row.path, servicesDir));
|
|
704
|
+
if (violations.length === 0 && missingDeny.length === 0) {
|
|
705
|
+
return { level: 'ok', check: 'acl', detail: 'no explicit write grant for the sandbox group; DENY(write) in place' };
|
|
706
|
+
}
|
|
707
|
+
const parts = [];
|
|
708
|
+
if (violations.length > 0)
|
|
709
|
+
parts.push(`explicit write grants: ${violations.slice(0, 5).join('; ')}${violations.length > 5 ? ` (+${violations.length - 5} more)` : ''}`);
|
|
710
|
+
if (missingDeny.length > 0)
|
|
711
|
+
parts.push('services root lacks an inheritable DENY(write) for the sandbox group');
|
|
712
|
+
return {
|
|
713
|
+
level: 'warn',
|
|
714
|
+
check: 'acl',
|
|
715
|
+
detail: `${parts.join(' / ')}. Run "ec services repair-acl${only ? '' : ` --aid ${aid}`}" to harden.`,
|
|
716
|
+
};
|
|
717
|
+
}
|
|
718
|
+
/** `packDir` 是否是 `servicesDir/<only>` 自身或其子路径。 */
|
|
719
|
+
function sameAsPackDir(candidate, servicesDir, pack) {
|
|
720
|
+
const base = path.join(servicesDir, pack).toLowerCase();
|
|
721
|
+
const value = path.resolve(candidate).toLowerCase();
|
|
722
|
+
return value === base || value.startsWith(`${base}${path.sep}`);
|
|
723
|
+
}
|
|
724
|
+
function samePathWith(left, right) {
|
|
725
|
+
return path.resolve(left).toLowerCase() === path.resolve(right).toLowerCase();
|
|
726
|
+
}
|
|
727
|
+
function relativeTo(base, target) {
|
|
728
|
+
const relative = path.relative(path.resolve(base), path.resolve(target));
|
|
729
|
+
return relative || '.';
|
|
730
|
+
}
|
|
658
731
|
/** 运行期核对 L_CLASS 是否覆盖每个 agent 的 services 目录。 */
|
|
659
732
|
function lClassFinding() {
|
|
660
733
|
try {
|
|
@@ -157,7 +157,19 @@ export function buildPackState(packs, invalidPacks, identity) {
|
|
|
157
157
|
const candidates = packs.filter(pack => pack.enabled);
|
|
158
158
|
const skippedPacks = [];
|
|
159
159
|
const activeCandidates = [];
|
|
160
|
+
const reservedOutputInvalid = [];
|
|
160
161
|
for (const pack of candidates) {
|
|
162
|
+
const reserved = pack.listen.filter(entry => entry.type === 'services.outputs.snapshot' || entry.type === 'services.outputs.list'
|
|
163
|
+
|| entry.type === 'services.outputs.detail' || entry.type === 'services.outputs.changes'
|
|
164
|
+
|| entry.type.startsWith('services.outputs.cards.')
|
|
165
|
+
|| entry.type === 'services.outputs.*' || entry.type.startsWith('services.workbench.'));
|
|
166
|
+
if (reserved.length) {
|
|
167
|
+
reservedOutputInvalid.push({
|
|
168
|
+
id: pack.id,
|
|
169
|
+
errors: [`reserved native output/workbench service type cannot be declared: ${reserved.map(entry => entry.type).join(', ')}`],
|
|
170
|
+
});
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
161
173
|
if (requiresSatisfied(pack.requires, identity))
|
|
162
174
|
activeCandidates.push(pack);
|
|
163
175
|
else
|
|
@@ -233,7 +245,7 @@ export function buildPackState(packs, invalidPacks, identity) {
|
|
|
233
245
|
activePacks,
|
|
234
246
|
skippedPacks,
|
|
235
247
|
disabledPacks,
|
|
236
|
-
invalidPacks: [...invalidPacks, ...conflictInvalid],
|
|
248
|
+
invalidPacks: [...invalidPacks, ...reservedOutputInvalid, ...conflictInvalid],
|
|
237
249
|
conflicts,
|
|
238
250
|
overlaps,
|
|
239
251
|
routeIndex,
|
package/dist/services/router.js
CHANGED
|
@@ -15,14 +15,25 @@ import { RESERVED_TYPES } from './service-payload.js';
|
|
|
15
15
|
export const SERVICES_CONFIG_JSON = 'services-config.json';
|
|
16
16
|
export const DEFAULT_ROUTER_CONFIG = {
|
|
17
17
|
v: 1,
|
|
18
|
-
enabled:
|
|
18
|
+
enabled: true,
|
|
19
19
|
rateLimit: {
|
|
20
20
|
builtin: { perMinute: 20, perHour: 200 },
|
|
21
21
|
service: { perMinute: 50, perHour: 1000 },
|
|
22
22
|
},
|
|
23
23
|
rules: {},
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
function defaultConfig(enabled = true) {
|
|
26
|
+
return {
|
|
27
|
+
...DEFAULT_ROUTER_CONFIG,
|
|
28
|
+
enabled,
|
|
29
|
+
rateLimit: {
|
|
30
|
+
builtin: { ...DEFAULT_ROUTER_CONFIG.rateLimit.builtin },
|
|
31
|
+
service: { ...DEFAULT_ROUTER_CONFIG.rateLimit.service },
|
|
32
|
+
},
|
|
33
|
+
rules: {},
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
/** 缺少配置时默认开启;显式关闭和非法/不可读配置仍关闭。 */
|
|
26
37
|
export function loadRouterConfig(servicesDir) {
|
|
27
38
|
// 旧名 router.json 一次性迁移成 services-config.json。
|
|
28
39
|
migrateLegacyFileName(servicesDir, 'router.json', SERVICES_CONFIG_JSON, 'services config');
|
|
@@ -31,8 +42,12 @@ export function loadRouterConfig(servicesDir) {
|
|
|
31
42
|
try {
|
|
32
43
|
rawText = fs.readFileSync(filePath, 'utf8');
|
|
33
44
|
}
|
|
34
|
-
catch {
|
|
35
|
-
|
|
45
|
+
catch (error) {
|
|
46
|
+
if (error.code === 'ENOENT') {
|
|
47
|
+
return { config: defaultConfig(), exists: false, errors: [] };
|
|
48
|
+
}
|
|
49
|
+
return { config: defaultConfig(false), exists: true,
|
|
50
|
+
errors: [`Cannot read ${SERVICES_CONFIG_JSON}: ${error instanceof Error ? error.message : String(error)}`] };
|
|
36
51
|
}
|
|
37
52
|
let raw;
|
|
38
53
|
try {
|
|
@@ -40,14 +55,14 @@ export function loadRouterConfig(servicesDir) {
|
|
|
40
55
|
}
|
|
41
56
|
catch (error) {
|
|
42
57
|
return {
|
|
43
|
-
config:
|
|
58
|
+
config: defaultConfig(false),
|
|
44
59
|
exists: true,
|
|
45
60
|
errors: [`${SERVICES_CONFIG_JSON} is not valid JSON: ${error instanceof Error ? error.message : String(error)}`],
|
|
46
61
|
};
|
|
47
62
|
}
|
|
48
63
|
const validated = validateRouterConfig(raw);
|
|
49
64
|
if (!validated.ok)
|
|
50
|
-
return { config:
|
|
65
|
+
return { config: defaultConfig(false), exists: true, errors: validated.errors };
|
|
51
66
|
return { config: validated.value, exists: true, errors: [] };
|
|
52
67
|
}
|
|
53
68
|
/**
|
|
@@ -75,7 +75,9 @@ export class ServiceScriptRunner {
|
|
|
75
75
|
const scriptPath = path.join(pack.paths.scriptsDir, handler.script.slice(SCRIPTS_DIR.length + 1));
|
|
76
76
|
const scriptArgs = handler.args ?? [];
|
|
77
77
|
cmd = [executable, scriptPath, ...scriptArgs].join(' ');
|
|
78
|
-
|
|
78
|
+
const built = this.buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs);
|
|
79
|
+
// Unsandboxed launches have no directory preparation or new authorization gap.
|
|
80
|
+
launch = built instanceof Promise ? await built : built;
|
|
79
81
|
if (launch.prepare) {
|
|
80
82
|
try {
|
|
81
83
|
// 探针必须设上限:沙箱 provisioning 挂住时这里会无限等待,dispatcher 的
|
|
@@ -177,15 +179,14 @@ export class ServiceScriptRunner {
|
|
|
177
179
|
permissionMode: effective,
|
|
178
180
|
};
|
|
179
181
|
const trigger = this.syntheticTrigger(pack, handler, executable);
|
|
180
|
-
|
|
182
|
+
return buildTriggerScriptLaunch({
|
|
181
183
|
trigger,
|
|
182
184
|
triggerDir: pack.dir,
|
|
183
185
|
scriptPath,
|
|
184
186
|
scriptArgs,
|
|
185
187
|
projectPath,
|
|
186
188
|
executionAuthorization: authorization,
|
|
187
|
-
});
|
|
188
|
-
return { ...launch, env: { ...launch.env, ...ecEnv } };
|
|
189
|
+
}).then(launch => ({ ...launch, env: { ...launch.env, ...ecEnv } }));
|
|
189
190
|
}
|
|
190
191
|
buildEcEnv(pack, message) {
|
|
191
192
|
return {
|
|
@@ -5,15 +5,21 @@
|
|
|
5
5
|
* 不涉及「本机有没有包能接」(那是 pack-manager 的事),也不涉及
|
|
6
6
|
* 「这条消息来自谁」(那是准入的事)。三层判据互不推导。
|
|
7
7
|
*/
|
|
8
|
-
/** 请求 type
|
|
9
|
-
const SERVICE_REQUEST = /^services(\.[A-Za-z0-9_-]+){0,
|
|
10
|
-
/** 应答 type:请求 type + .result
|
|
11
|
-
const SERVICE_RESULT = /^services(\.[A-Za-z0-9_-]+){0,
|
|
12
|
-
/** listen
|
|
13
|
-
const SERVICE_WILDCARD = /^services(\.[A-Za-z0-9_-]+){0,
|
|
8
|
+
/** 请求 type:最多三段 action 路径,例如 services.outputs.cards.snapshot。 */
|
|
9
|
+
const SERVICE_REQUEST = /^services(\.[A-Za-z0-9_-]+){0,3}$/;
|
|
10
|
+
/** 应答 type:请求 type + .result。 */
|
|
11
|
+
const SERVICE_RESULT = /^services(\.[A-Za-z0-9_-]+){0,3}\.result$/;
|
|
12
|
+
/** listen 可用的通配形式:最多两段路径后接末段整段 *。 */
|
|
13
|
+
const SERVICE_WILDCARD = /^services(\.[A-Za-z0-9_-]+){0,2}\.\*$/;
|
|
14
|
+
/** Owner-private read projections are ephemeral control replies. Business
|
|
15
|
+
* service replies keep their normal durable delivery semantics. */
|
|
16
|
+
export function isProjectionServiceResult(type) {
|
|
17
|
+
return typeof type === 'string'
|
|
18
|
+
&& /^services\.(?:outputs\.(?:(?:snapshot|list|detail|changes)|cards\.(?:snapshot|list|detail|changes))|workbench\.(?:snapshot|changes|history))\.result$/.test(type);
|
|
19
|
+
}
|
|
14
20
|
/**
|
|
15
21
|
* SERVICE_REQUEST 与 SERVICE_RESULT 有意重叠:
|
|
16
|
-
* `services.order.result`
|
|
22
|
+
* `services.order.result` 同时匹配两条;
|
|
17
23
|
* 靠 result 优先消解——先判应答,再判请求。
|
|
18
24
|
*
|
|
19
25
|
* 因此 `services.result` 既是合法请求(裸 services 的 action),也是裸 `services` 的应答;
|
package/dist/stats/budget.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
import path from 'path';
|
|
6
|
-
import { calcCost } from './
|
|
6
|
+
import { calcCost } from './model-resolver.js';
|
|
7
7
|
import { openReadonlyDb, getDbPath } from './db.js';
|
|
8
8
|
function loadBudgets(evolcoreHome) {
|
|
9
9
|
const file = path.join(evolcoreHome, 'data', 'stats', 'budgets.json');
|
|
@@ -72,7 +72,7 @@ export function getBudgetStatus(evolcoreHome, agentAid, peerKey) {
|
|
|
72
72
|
const dailyRemaining = Math.max(0, dailyLimit - dailyUsed);
|
|
73
73
|
const dailyPct = isFinite(dailyLimit) && dailyLimit > 0 ? (dailyUsed / dailyLimit) * 100 : 0;
|
|
74
74
|
const monthlyLimit = cfg.monthly_usd ?? Infinity;
|
|
75
|
-
const monthlyUsed =
|
|
75
|
+
const monthlyUsed = _calcMonthUsd(evolcoreHome, agentAid);
|
|
76
76
|
const monthlyRemaining = Math.max(0, monthlyLimit - monthlyUsed);
|
|
77
77
|
const monthlyPct = isFinite(monthlyLimit) && monthlyLimit > 0 ? (monthlyUsed / monthlyLimit) * 100 : 0;
|
|
78
78
|
// 取 daily/monthly 中更高的百分比作为整体判断依据
|
package/dist/stats/db.js
CHANGED
|
@@ -136,6 +136,8 @@ function _initTables(db) {
|
|
|
136
136
|
peer_type TEXT,
|
|
137
137
|
session_id TEXT,
|
|
138
138
|
model TEXT NOT NULL,
|
|
139
|
+
provider_id TEXT,
|
|
140
|
+
base_url TEXT,
|
|
139
141
|
billing_fn TEXT NOT NULL,
|
|
140
142
|
input_tokens INTEGER NOT NULL DEFAULT 0,
|
|
141
143
|
output_tokens INTEGER NOT NULL DEFAULT 0,
|
|
@@ -254,6 +256,8 @@ function _initTables(db) {
|
|
|
254
256
|
peer_key TEXT NOT NULL,
|
|
255
257
|
call_index INTEGER NOT NULL,
|
|
256
258
|
model TEXT NOT NULL,
|
|
259
|
+
provider_id TEXT,
|
|
260
|
+
base_url TEXT,
|
|
257
261
|
source TEXT NOT NULL DEFAULT 'request',
|
|
258
262
|
provider_thread_id TEXT,
|
|
259
263
|
request_id TEXT,
|
|
@@ -306,6 +310,15 @@ function _initTables(db) {
|
|
|
306
310
|
if (!cols.some(c => c.name === 'role')) {
|
|
307
311
|
db.exec(`ALTER TABLE usage_events ADD COLUMN role TEXT NOT NULL DEFAULT ''`);
|
|
308
312
|
}
|
|
313
|
+
// provider 维度:区分一次调用实际走的端点(官方 / 中转 / 本地代理)。
|
|
314
|
+
// 历史行为 NULL,表示“未记录”,报告按此标注。
|
|
315
|
+
if (!cols.some(c => c.name === 'provider_id')) {
|
|
316
|
+
db.exec(`ALTER TABLE usage_events ADD COLUMN provider_id TEXT`);
|
|
317
|
+
}
|
|
318
|
+
if (!cols.some(c => c.name === 'base_url')) {
|
|
319
|
+
db.exec(`ALTER TABLE usage_events ADD COLUMN base_url TEXT`);
|
|
320
|
+
}
|
|
321
|
+
db.exec(`CREATE INDEX IF NOT EXISTS idx_ue_provider_ts ON usage_events(provider_id, ts)`);
|
|
309
322
|
db.exec(`CREATE INDEX IF NOT EXISTS idx_ue_role_budget ON usage_events(agent_aid, role, usage_subject_key, ts)`);
|
|
310
323
|
}
|
|
311
324
|
catch (e) {
|
|
@@ -341,6 +354,12 @@ function _initTables(db) {
|
|
|
341
354
|
if (!cols.some(c => c.name === 'auto_compact_tokens')) {
|
|
342
355
|
db.exec(`ALTER TABLE model_calls ADD COLUMN auto_compact_tokens INTEGER`);
|
|
343
356
|
}
|
|
357
|
+
if (!cols.some(c => c.name === 'provider_id')) {
|
|
358
|
+
db.exec(`ALTER TABLE model_calls ADD COLUMN provider_id TEXT`);
|
|
359
|
+
}
|
|
360
|
+
if (!cols.some(c => c.name === 'base_url')) {
|
|
361
|
+
db.exec(`ALTER TABLE model_calls ADD COLUMN base_url TEXT`);
|
|
362
|
+
}
|
|
344
363
|
}
|
|
345
364
|
catch (e) {
|
|
346
365
|
logger.warn(`[StatsDB] model_calls context window 迁移检测失败: ${e}`);
|
package/dist/stats/index.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
export { getDb, openReadonlyDb, getStatsDir, getDbPath, closeStatsDb, archiveOldData, listArchivePaths, rebuildDailyRollup } from './db.js';
|
|
5
5
|
export { normalizeUsage } from './normalizer.js';
|
|
6
6
|
export { initializeStatsPersistence, insertUsageEvent, insertContextBreakdown, insertMessageEvent, insertActivityEvent, insertModelCalls } from './writer.js';
|
|
7
|
-
export { calcCost, resolvePriceRow, resolveCanonicalModel, registerBillingFn } from './
|
|
7
|
+
export { calcCost, resolvePriceRow, resolveCanonicalModel, registerBillingFn } from './model-resolver.js';
|
|
8
8
|
export { queryAggregated, queryTodaySummary, queryStatusActivity, queryStatusActivityByAgent, querySessionTurns, queryContextBreakdown, queryTopPeers, queryTopModels, queryMessageAggregated, queryMessageTodaySummary, queryPeerList, querySummary, queryPeerDaily, queryTaskModelCalls, querySessionModelCalls, queryTaskSummary } from './query.js';
|
|
9
9
|
export { getBudgetStatus } from './budget.js';
|
|
10
10
|
export { getRoleBudgetStatus, formatUsageSubjectKey } from './role-budget.js';
|