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
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import { resolvePaths } from '../paths.js';
|
|
3
|
+
import { readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
4
|
+
import { parseQuotaCommand } from '../stats/quota-query.js';
|
|
5
|
+
import { daemonUnavailableMessage, queryDaemon, wantsHelp } from './help.js';
|
|
6
|
+
const HELP = `用法: ec quota status [--self <agent-aid>] [--peer <aid|channel#id>] [--format text|json]
|
|
7
|
+
|
|
8
|
+
查询 Agent 预算及对端的角色费用配额(上限、已用、剩余、周期、独立/共享、是否受限)。
|
|
9
|
+
查看或修改角色额度规则使用 ec role quota show|set|disable|inherit。
|
|
10
|
+
托管会话默认当前 Agent 和当前对端;宿主终端必须指定 --self,省略 --peer 时只查 Agent。
|
|
11
|
+
Owner/Admin 可查询指定对端;普通对端只可查询当前关系,不返回 Agent 总用量。
|
|
12
|
+
群聊默认查询当前发言人在本群生效的角色额度。
|
|
13
|
+
角色额度与一般预算分别返回,币种与计费口径不混算;-1 表示不限额。
|
|
14
|
+
|
|
15
|
+
ec quota status
|
|
16
|
+
ec quota status --peer alice.agentid.cn --format json
|
|
17
|
+
ec quota status --self bot.agentid.cn --format json`;
|
|
18
|
+
export async function cmdQuota(args) {
|
|
19
|
+
if (!args.length || wantsHelp(args)) {
|
|
20
|
+
console.log(HELP);
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const json = args.some((arg, index) => arg === '--format=json' || arg === '--format' && args[index + 1] === 'json');
|
|
24
|
+
try {
|
|
25
|
+
parseQuotaCommand(args);
|
|
26
|
+
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
27
|
+
const delegationToken = readDelegationCredential();
|
|
28
|
+
const managed = sessionId !== undefined || delegationToken !== undefined;
|
|
29
|
+
if (managed && (!sessionId || !delegationToken))
|
|
30
|
+
throw Object.assign(new Error('Current task delegation is required'), { code: 'DELEGATION_REQUIRED' });
|
|
31
|
+
let controlToken;
|
|
32
|
+
if (!managed) {
|
|
33
|
+
try {
|
|
34
|
+
controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();
|
|
35
|
+
}
|
|
36
|
+
catch { }
|
|
37
|
+
}
|
|
38
|
+
const { response, transportError } = await queryDaemon(resolvePaths().socket, {
|
|
39
|
+
type: 'quota.op', argv: ['quota', ...args],
|
|
40
|
+
...(managed ? { sessionId, delegationToken } : { controlToken }),
|
|
41
|
+
}, 30_000);
|
|
42
|
+
if (!response)
|
|
43
|
+
throw Object.assign(new Error(daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon')), { code: 'DAEMON_UNAVAILABLE' });
|
|
44
|
+
if (!response.ok || !response.result)
|
|
45
|
+
throw Object.assign(new Error(response.error ?? 'Quota query failed'), { code: response.code ?? 'QUOTA_QUERY_FAILED' });
|
|
46
|
+
if (json)
|
|
47
|
+
console.log(JSON.stringify(response.result, null, 2));
|
|
48
|
+
else
|
|
49
|
+
console.log(formatQuota(response.result));
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
const failure = { ok: false, code: error.code ?? 'QUOTA_QUERY_FAILED', error: error.message ?? String(error) };
|
|
53
|
+
if (json)
|
|
54
|
+
console.log(JSON.stringify(failure));
|
|
55
|
+
else
|
|
56
|
+
console.error(`❌ [${failure.code}] ${failure.error}`);
|
|
57
|
+
process.exitCode = 1;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
export function formatQuota(result) {
|
|
61
|
+
const lines = [`Agent: ${result.selfAid}`];
|
|
62
|
+
const amount = (value, currency) => value < 0 ? '不限额' : `${value.toFixed(4)} ${currency}`;
|
|
63
|
+
const budget = (status) => {
|
|
64
|
+
for (const [label, limit, used, remaining] of [
|
|
65
|
+
['日预算', status.daily_limit_usd, status.daily_used_usd, status.daily_remaining_usd],
|
|
66
|
+
['月预算', status.monthly_limit_usd, status.monthly_used_usd, status.monthly_remaining_usd],
|
|
67
|
+
])
|
|
68
|
+
lines.push(` ${label}: 上限 ${amount(limit, 'USD')} / 已用 ${amount(used, 'USD')} / 剩余 ${amount(remaining, 'USD')}`);
|
|
69
|
+
};
|
|
70
|
+
if (result.agent.budget)
|
|
71
|
+
budget(result.agent.budget);
|
|
72
|
+
else
|
|
73
|
+
lines.push(' Agent 总预算用量: 仅 Owner/Admin 可见');
|
|
74
|
+
if (result.relation) {
|
|
75
|
+
const relation = result.relation;
|
|
76
|
+
const quota = relation.roleQuota;
|
|
77
|
+
lines.push(`对端: ${relation.peerKey}${relation.chatType === 'group' ? ` / 发言人 ${relation.actorId}` : ''}`);
|
|
78
|
+
lines.push(` 角色: ${quota.role} / ${quota.scope === 'role' ? '同角色共享额度' : '每个对端独立额度'}`);
|
|
79
|
+
lines.push(` 角色限额: ${quota.enabled ? '启用' : '不限制'}${quota.reason ? ` (${quota.reason})` : ''}`);
|
|
80
|
+
lines.push(` 上限 ${amount(quota.limit_amount, quota.currency)} / 已用 ${amount(quota.used_amount, quota.currency)} / 剩余 ${amount(quota.remaining_amount, quota.currency)}`);
|
|
81
|
+
lines.push(` 重置周期: ${quota.reset_mode} / 计费: ${quota.cost_basis}`);
|
|
82
|
+
if (relation.budget) {
|
|
83
|
+
lines.push(' 对端生效的一般预算(按 Agent 总用量计算):');
|
|
84
|
+
budget(relation.budget);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
lines.push(`当前是否被额度阻止: ${result.hard_blocked ? '是' : '否'}`);
|
|
88
|
+
return lines.join('\n');
|
|
89
|
+
}
|
package/dist/cli/role.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
1
2
|
import { resolvePaths } from '../paths.js';
|
|
2
3
|
import { executeResolvedRoleCommand, resolveRoleCommand, } from '../config/role-command-service.js';
|
|
3
4
|
import { applyApprovedRoleAssignment } from '../core/command/role-menu.js';
|
|
@@ -11,26 +12,50 @@ export async function cmdRole(args) {
|
|
|
11
12
|
return;
|
|
12
13
|
}
|
|
13
14
|
const json = getArgValue(args, '--format') === 'json';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const result = await runManaged(args
|
|
15
|
+
try {
|
|
16
|
+
if (process.env.EVOLCORE_SESSION_ID !== undefined || readDelegationCredential()) {
|
|
17
|
+
const result = await runManaged(args);
|
|
17
18
|
output(result, json);
|
|
19
|
+
return;
|
|
18
20
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
const resolved = resolveRoleCommand(args);
|
|
22
|
+
if (!resolved.ok)
|
|
23
|
+
fail(resolved.reason, resolved.code);
|
|
24
|
+
const selfAid = resolved.command.selfAid;
|
|
25
|
+
const quota = resolved.command.kind === 'quota';
|
|
26
|
+
if (quota) {
|
|
27
|
+
let controlToken;
|
|
28
|
+
try {
|
|
29
|
+
controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();
|
|
30
|
+
}
|
|
31
|
+
catch { }
|
|
32
|
+
const { response, transportError } = await queryDaemon(resolvePaths().socket, {
|
|
33
|
+
type: 'role.op', argv: ['role', ...args], controlToken,
|
|
34
|
+
}, 10_000);
|
|
35
|
+
if (!response)
|
|
36
|
+
fail(daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'), 'DAEMON_UNAVAILABLE');
|
|
37
|
+
if (!response.ok || !response.result)
|
|
38
|
+
fail(response.error || 'role operation failed', response.code, response.data);
|
|
39
|
+
output(response.result, json);
|
|
40
|
+
return;
|
|
22
41
|
}
|
|
23
|
-
|
|
42
|
+
const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
|
|
43
|
+
const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment, {
|
|
44
|
+
self: selfAid, actorRole: 'owner', actorAid,
|
|
45
|
+
});
|
|
46
|
+
if (!result.ok)
|
|
47
|
+
fail(result.error, result.code, result.data);
|
|
48
|
+
output(result, json);
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
const failure = { ok: false, code: err.code ?? 'ROLE_OPERATION_FAILED', error: err.message ?? String(err),
|
|
52
|
+
...(err.data !== undefined ? { data: err.data } : {}) };
|
|
53
|
+
if (json)
|
|
54
|
+
output(failure, true);
|
|
55
|
+
else
|
|
56
|
+
console.error(`❌ [${failure.code}] ${failure.error}`);
|
|
57
|
+
process.exitCode = 1;
|
|
24
58
|
}
|
|
25
|
-
const resolved = resolveRoleCommand(args);
|
|
26
|
-
if (!resolved.ok)
|
|
27
|
-
fail(resolved.reason, resolved.code);
|
|
28
|
-
const selfAid = resolved.command.selfAid;
|
|
29
|
-
const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
|
|
30
|
-
const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment);
|
|
31
|
-
if (!result.ok)
|
|
32
|
-
fail(result.error, result.code, result.data);
|
|
33
|
-
output(result, json);
|
|
34
59
|
}
|
|
35
60
|
function output(value, json) {
|
|
36
61
|
if (json)
|
|
@@ -38,7 +63,7 @@ function output(value, json) {
|
|
|
38
63
|
else
|
|
39
64
|
console.log(JSON.stringify(value, null, 2));
|
|
40
65
|
}
|
|
41
|
-
async function runManaged(args
|
|
66
|
+
async function runManaged(args) {
|
|
42
67
|
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
43
68
|
const delegationToken = readDelegationCredential();
|
|
44
69
|
if (!delegationToken)
|
|
@@ -70,10 +95,30 @@ function printHelp() {
|
|
|
70
95
|
ec role list [--status pending|approved|rejected|expired] [--self <agent-aid>]
|
|
71
96
|
ec role approve <request-id> [--reason '<text>'] [--self <agent-aid>]
|
|
72
97
|
ec role reject <request-id> [--reason '<text>'] [--self <agent-aid>]
|
|
98
|
+
ec role quota show <role-id> [--self <agent-aid>] [--format json]
|
|
99
|
+
ec role quota set <role-id> [额度选项] [--self <agent-aid>]
|
|
100
|
+
ec role quota disable <role-id> [--self <agent-aid>]
|
|
101
|
+
ec role quota inherit <role-id> [--self <agent-aid>]
|
|
102
|
+
|
|
103
|
+
额度选项(仅修改明确传入的字段):
|
|
104
|
+
--enabled true|false 启用或关闭角色用量配额
|
|
105
|
+
--limit <amount|unlimited> 金额上限;0 表示阻止使用,unlimited 表示不限
|
|
106
|
+
--currency CNY|USD 人民币或美元
|
|
107
|
+
--reset daily|weekly|monthly|never 重置周期
|
|
108
|
+
--cost-basis gateway|official 网关价或官方价
|
|
109
|
+
--scope subject|role 每个对端独立额度或同角色共享额度
|
|
73
110
|
|
|
74
111
|
说明:
|
|
75
112
|
申请不会立即改变权限,只记录一条待审批请求,交由本 Agent 的 owner 审批。
|
|
76
113
|
approve / reject 只能由本 Agent 的 owner 执行;审批通过后才写入关系角色。
|
|
114
|
+
quota 管理角色定义 usageLimits,不是消息准入频率 access.requestLimit。
|
|
115
|
+
quota show 查看角色额度规则及继承结果;查询具体对端已用和剩余使用 ec quota status。
|
|
116
|
+
quota set 不自动启用限制;需要时明确传 --enabled true。disable 保留金额等设置。
|
|
117
|
+
inherit 删除角色自己的额度覆盖,恢复使用 member 额度;set 会将当前继承值物化为本角色配置。
|
|
118
|
+
owner/admin 不受角色配额限制;自定义角色没有显式额度时继承 member。
|
|
119
|
+
quota 设置属于角色定义管理,仅 DaemonOwner 或已有可信 /fa 授权任务可执行。
|
|
120
|
+
Owner/Admin 保留当前 Agent 的查询权限;普通 Owner 只能分配已有角色,不能修改额度。
|
|
121
|
+
DaemonOwner 和可信 /fa 可管理同一 daemon 的其他本机 Agent,无需兼任目标 Agent Owner。
|
|
77
122
|
|
|
78
123
|
Options:
|
|
79
124
|
--self <agent-aid> 本端 agent AID;省略时从当前运行环境推断
|
|
@@ -17,6 +17,7 @@ const HELP = `ec services — 服务路由运维
|
|
|
17
17
|
ec services ledger <包名> [--tail N] [--aid <aid>] 台账
|
|
18
18
|
ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
|
|
19
19
|
ec services doctor [<包名>] [--aid <aid>] 诊断
|
|
20
|
+
ec services repair-acl [--aid <aid>] 收紧 services/ 的 NTFS ACL(幂等,仅 Windows)
|
|
20
21
|
ec services reload [--aid <aid>] 重载(全部包)
|
|
21
22
|
ec services enable / disable [--aid <aid>] 总闸
|
|
22
23
|
ec services rules show [<type>] [--aid <aid>] 调用准入规则
|
package/dist/cli/stats.js
CHANGED
|
@@ -26,7 +26,7 @@ ec stats — Token 用量与费用统计
|
|
|
26
26
|
--session <id> 指定会话
|
|
27
27
|
|
|
28
28
|
聚合粒度:
|
|
29
|
-
--by hour|day|week|month|model|peer|agent
|
|
29
|
+
--by hour|day|week|month|model|peer|agent|provider
|
|
30
30
|
|
|
31
31
|
快捷视图:
|
|
32
32
|
--session <id> 单个会话明细
|
|
@@ -252,7 +252,7 @@ export async function handleStats(args) {
|
|
|
252
252
|
// 全量重建日聚合表(运维兜底/排查),不依赖时间范围。
|
|
253
253
|
if (flags.rebuild) {
|
|
254
254
|
const { rebuildDailyRollup, getDb } = await import('../stats/db.js');
|
|
255
|
-
const { resolvePrices } = await import('../stats/
|
|
255
|
+
const { resolvePrices } = await import('../stats/model-resolver.js');
|
|
256
256
|
const startedAt = Date.now();
|
|
257
257
|
// 步骤1:回填 usage_events 的 cost 字段(只处理 cost_official_usd IS NULL 的行)
|
|
258
258
|
console.log(`${CYAN}正在回填历史事件的费用数据...${RESET}`);
|
|
@@ -680,7 +680,7 @@ export async function handleStats(args) {
|
|
|
680
680
|
const totCacheAll = totIn + totCacheRead;
|
|
681
681
|
const sessionCacheHitRate = totCacheAll > 0 ? totCacheRead / totCacheAll : 0;
|
|
682
682
|
// model_spec
|
|
683
|
-
const { resolveModelSpec } = await import('../stats/
|
|
683
|
+
const { resolveModelSpec } = await import('../stats/model-resolver.js');
|
|
684
684
|
const spec = resolveModelSpec(home, last.model);
|
|
685
685
|
const result = {
|
|
686
686
|
turn: {
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import crypto from 'node:crypto';
|
|
2
4
|
import { authorizeLocalCommand } from './task-context.js';
|
|
3
|
-
import { agentWorkspaceDir } from '../paths.js';
|
|
5
|
+
import { agentOutputDir, agentWorkspaceDir, resolvePaths } from '../paths.js';
|
|
6
|
+
import { ipcQuery } from '../ipc.js';
|
|
7
|
+
import { readDelegationCredential, hashCurrentDelegatedCommand } from '../core/auth/agent-delegation.js';
|
|
8
|
+
import { publishOutputCard, removeOutputCard } from '../outputs/cards.js';
|
|
4
9
|
import { readTeamWorkspaceNavigation, upsertTeamWorkspaceNavigation, removeTeamWorkspaceNavigation, updateTeamWorkspaceNavigation, } from '../core/command/team-workspace-store.js';
|
|
5
10
|
import { readTeamMembers, updateTeamMembers } from '../core/command/team-workspace-team.js';
|
|
6
11
|
import { TeamWorkspaceBootstrapService, TeamWorkspaceInitializer } from '../core/command/team-workspace-bootstrap.js';
|
|
@@ -11,8 +16,10 @@ const USAGE = `用法: ec team workspace init [--workspace <绝对路径>]
|
|
|
11
16
|
ec team navigation update --replace-json <entries-json> [--expected-revision <n>]
|
|
12
17
|
ec team members show
|
|
13
18
|
ec team members update --members-json <aids-json>
|
|
19
|
+
ec team cards publish --file <card.json>
|
|
20
|
+
ec team cards remove --id <card-id>
|
|
14
21
|
|
|
15
|
-
所有命令只输出 JSON
|
|
22
|
+
所有命令只输出 JSON;cards 命令只允许当前 Agent Owner 的 AUN 私聊托管会话。`;
|
|
16
23
|
class TeamWorkspaceCommandError extends Error {
|
|
17
24
|
code;
|
|
18
25
|
constructor(code, message) {
|
|
@@ -55,6 +62,23 @@ function expectedRevision(args, current) {
|
|
|
55
62
|
return revision;
|
|
56
63
|
}
|
|
57
64
|
function output(value) { process.stdout.write(`${JSON.stringify(value, null, 2)}\n`); }
|
|
65
|
+
async function publishCardChanged(aid, id, revision) {
|
|
66
|
+
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
67
|
+
const delegationToken = sessionId ? readDelegationCredential() : undefined;
|
|
68
|
+
if (sessionId && !delegationToken)
|
|
69
|
+
return false;
|
|
70
|
+
try {
|
|
71
|
+
const response = await ipcQuery(resolvePaths().socket, {
|
|
72
|
+
type: 'events.op', argv: ['native-publish', 'team.output-cards.changed', '--aid', aid,
|
|
73
|
+
'--data', JSON.stringify({ sourceAid: aid, revision, cursor: `${revision}.1`, id })],
|
|
74
|
+
...(sessionId && delegationToken ? { sessionId, delegationToken, delegationCommandHash: hashCurrentDelegatedCommand() } : {}),
|
|
75
|
+
}, 5_000, { throwOnError: false });
|
|
76
|
+
return response?.ok === true;
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
58
82
|
function assertOwnerContext(context) {
|
|
59
83
|
if (context.channel !== 'aun' || context.chatType !== 'private' || context.peerRole !== 'owner' || !context.selfAid || !context.peerId) {
|
|
60
84
|
throw new TeamWorkspaceCommandError('NOT_ALLOWED', 'Team workspace commands require the current Agent Owner in an AUN private chat');
|
|
@@ -74,6 +98,36 @@ export async function cmdTeamWorkspace(rawArgs) {
|
|
|
74
98
|
try {
|
|
75
99
|
const context = await authorizeLocalCommand(['team', ...rawArgs]);
|
|
76
100
|
assertOwnerContext(context);
|
|
101
|
+
if (rawArgs[0] === 'cards' && rawArgs[1] === 'publish') {
|
|
102
|
+
assertFlags(rawArgs.slice(2), ['--file']);
|
|
103
|
+
const fileIndex = rawArgs.indexOf('--file');
|
|
104
|
+
if (rawArgs.length !== 4 || fileIndex < 0)
|
|
105
|
+
throw new TeamWorkspaceCommandError('INVALID_ARGUMENT', USAGE);
|
|
106
|
+
const source = path.resolve(rawArgs[fileIndex + 1]);
|
|
107
|
+
let manifest;
|
|
108
|
+
try {
|
|
109
|
+
manifest = JSON.parse(fs.readFileSync(source, 'utf8'));
|
|
110
|
+
}
|
|
111
|
+
catch {
|
|
112
|
+
throw new TeamWorkspaceCommandError('INVALID_CARD', `Cannot read a valid card JSON file: ${source}`);
|
|
113
|
+
}
|
|
114
|
+
const card = publishOutputCard(context.selfAid, manifest, agentOutputDir);
|
|
115
|
+
const notified = await publishCardChanged(context.selfAid, card.id, card.version);
|
|
116
|
+
output({ ok: true, id: card.id, version: card.version, path: path.relative(agentOutputDir(context.selfAid), path.join(agentOutputDir(context.selfAid), '.cards', `${card.id}.json`)).split(path.sep).join('/'), notified });
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
if (rawArgs[0] === 'cards' && rawArgs[1] === 'remove') {
|
|
120
|
+
assertFlags(rawArgs.slice(2), ['--id']);
|
|
121
|
+
const idIndex = rawArgs.indexOf('--id');
|
|
122
|
+
if (rawArgs.length !== 4 || idIndex < 0)
|
|
123
|
+
throw new TeamWorkspaceCommandError('INVALID_ARGUMENT', USAGE);
|
|
124
|
+
const id = rawArgs[idIndex + 1];
|
|
125
|
+
const removed = removeOutputCard(context.selfAid, id, agentOutputDir);
|
|
126
|
+
const revision = crypto.createHash('sha256').update(`${context.selfAid}:${id}:${Date.now()}`).digest('hex').slice(0, 24);
|
|
127
|
+
const notified = removed && await publishCardChanged(context.selfAid, id, revision);
|
|
128
|
+
output({ ok: true, id, removed, notified: notified || false });
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
77
131
|
if (rawArgs[0] === 'workspace' && rawArgs[1] === 'init') {
|
|
78
132
|
const pathIndex = rawArgs.indexOf('--workspace');
|
|
79
133
|
const workspace = pathIndex >= 0 ? rawArgs[pathIndex + 1] : undefined;
|
|
@@ -5,7 +5,7 @@ import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-p
|
|
|
5
5
|
import { isMainSessionThreadId, resolveThreadRef } from '../core/thread/topic-id.js';
|
|
6
6
|
import { parseTimeArg, TIME_ARG_FORMATS } from './cli-argv.js';
|
|
7
7
|
import { readTaskRuntimeContextFromEnv } from './task-context.js';
|
|
8
|
-
const TOPIC_STATUSES = ['
|
|
8
|
+
const TOPIC_STATUSES = ['active', 'closed', 'archived'];
|
|
9
9
|
const SORT_ORDERS = ['recent', 'created'];
|
|
10
10
|
const HELP_TEXT = `
|
|
11
11
|
用法: ec thread <command> [options]
|
|
@@ -17,8 +17,7 @@ const HELP_TEXT = `
|
|
|
17
17
|
history <ref> 读取话题历史消息
|
|
18
18
|
create <peer> --name 新建话题(对端类型按关系证据自动识别,--group/--private 可覆盖)
|
|
19
19
|
rename <ref> <名称> 修改话题名称(仅本端)
|
|
20
|
-
|
|
21
|
-
status <ref> <状态> 更新话题业务状态
|
|
20
|
+
status <ref> <状态> 更新话题状态(active|closed|archived)
|
|
22
21
|
delete <ref> 删除话题(session 文件移入 _trash)
|
|
23
22
|
summary show <ref> 查看当前 summary
|
|
24
23
|
summary set <ref> <内容> --name <新标题|-> 写入 summary(--name 必填;- 表示不改名)
|
|
@@ -39,9 +38,7 @@ const HELP_TEXT = `
|
|
|
39
38
|
main:<aidA>:<aidB> 主话题
|
|
40
39
|
|
|
41
40
|
list 选项:
|
|
42
|
-
--status <s> 过滤状态 (
|
|
43
|
-
--label <l> 过滤标签
|
|
44
|
-
--unlabeled 仅未标记话题
|
|
41
|
+
--status <s> 过滤状态 (active|closed|archived)
|
|
45
42
|
--sort recent|created 排序方式(默认 recent)
|
|
46
43
|
--page <n> 页码
|
|
47
44
|
--limit <n> 每页条数
|
|
@@ -68,14 +65,13 @@ summary set 选项:
|
|
|
68
65
|
|
|
69
66
|
create 选项:
|
|
70
67
|
--name <名称> 话题名称(必填)
|
|
71
|
-
--
|
|
72
|
-
--status <状态> 初始状态(默认 pending)
|
|
68
|
+
--status <状态> 初始状态(默认 active)
|
|
73
69
|
--group 群话题(默认私聊)
|
|
74
70
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
状态值: active | closed | archived
|
|
72
|
+
active 默认。正常讨论,收到消息即处理。
|
|
73
|
+
closed 模型判定讨论完毕。收到新消息自动回退 active。
|
|
74
|
+
archived 不再响应。收到消息回复"话题已归档"(群聊静默丢弃)。
|
|
79
75
|
|
|
80
76
|
--format json 以 JSON 格式输出
|
|
81
77
|
--self <selfAid> 宿主终端必填,指定本端 AID;托管会话由运行时注入,不写
|
|
@@ -142,16 +138,12 @@ function printEmptyThreadList(result, echoSelf) {
|
|
|
142
138
|
const filters = [];
|
|
143
139
|
if (result.status)
|
|
144
140
|
filters.push(`--status ${result.status}`);
|
|
145
|
-
if (result.label)
|
|
146
|
-
filters.push(`--label "${result.label}"`);
|
|
147
|
-
if (result.unlabeled)
|
|
148
|
-
filters.push('--unlabeled');
|
|
149
141
|
console.log(` 原因: 该对端共 ${result.peerTopicCount} 个话题,均不匹配${filters.length ? ' ' + filters.join(' ') : '当前过滤条件'}`);
|
|
150
142
|
console.log(` 下一步: ec thread list ${peer}${self} # 去掉过滤条件`);
|
|
151
143
|
return;
|
|
152
144
|
}
|
|
153
145
|
if (result.hasMainChat) {
|
|
154
|
-
console.log(' 原因:
|
|
146
|
+
console.log(' 原因: 该对端只有主话题往来,没有独立话题;主话题不参与状态过滤');
|
|
155
147
|
console.log(` 下一步: ec thread history ${peer}${self}`);
|
|
156
148
|
return;
|
|
157
149
|
}
|
|
@@ -202,7 +194,7 @@ function printItem(item, opts) {
|
|
|
202
194
|
// 打印的就是可直接作为 `--thread` 的值:话题是 threadId,主话题是
|
|
203
195
|
// `main:<aid>:<aid>`。不再拼 `<peer>/` 前缀——那种写法从不可消费。
|
|
204
196
|
console.log(`${obj.threadId}${running}${internal}`);
|
|
205
|
-
//
|
|
197
|
+
// 名称只放名称本身:状态单独一行,避免污染标题(标题会被 summary set --name 引用)。
|
|
206
198
|
// 主话题加 `[主话题]` 前缀,与话题区分开;前缀只在展示层加,
|
|
207
199
|
// 不进索引与 session 的 name 字段,避免被 summary set --name 当成真实标题。
|
|
208
200
|
const namePrefix = isMainSessionThreadId(obj.threadId) ? '[主话题] ' : '';
|
|
@@ -212,10 +204,8 @@ function printItem(item, opts) {
|
|
|
212
204
|
console.log(` 名称: ${namePrefix}${displayName}`);
|
|
213
205
|
if (isMainSessionThreadId(String(obj.threadId)))
|
|
214
206
|
console.log(' 状态: 不适用(主话题没有业务状态)');
|
|
215
|
-
else if (obj.topicStatus)
|
|
207
|
+
else if (obj.topicStatus && obj.topicStatus !== 'active')
|
|
216
208
|
console.log(` 状态: ${obj.topicStatus}`);
|
|
217
|
-
if (obj.label)
|
|
218
|
-
console.log(` 标签: ${obj.label}`);
|
|
219
209
|
if (obj.createdAt)
|
|
220
210
|
console.log(` 创建: ${new Date(obj.createdAt).toLocaleString('zh-CN')}`);
|
|
221
211
|
// list 场景下 lastActiveAt 已由消息日志派生,故称"活跃";show 场景下它仍是索引里的
|
|
@@ -279,8 +269,7 @@ function printItem(item, opts) {
|
|
|
279
269
|
const selfArg = opts?.echoSelf ? ` --self ${opts.echoSelf}` : '';
|
|
280
270
|
const sortArg = result.sort ? ` --sort ${result.sort}` : ' --sort recent';
|
|
281
271
|
const statusArg = result.status ? ` --status ${result.status}` : '';
|
|
282
|
-
|
|
283
|
-
console.log(`下一页: ec thread list ${peerArg}${selfArg} --page ${nextPage} --limit ${result.limit}${sortArg}${statusArg}${labelArg}`);
|
|
272
|
+
console.log(`下一页: ec thread list ${peerArg}${selfArg} --page ${nextPage} --limit ${result.limit}${sortArg}${statusArg}`);
|
|
284
273
|
}
|
|
285
274
|
return;
|
|
286
275
|
}
|
|
@@ -366,11 +355,9 @@ export async function runThreadCommand(args) {
|
|
|
366
355
|
process.exitCode = 1;
|
|
367
356
|
return;
|
|
368
357
|
}
|
|
369
|
-
const label = argValue(args, '--label');
|
|
370
|
-
const unlabeled = hasFlag(args, '--unlabeled');
|
|
371
358
|
const page = argValue(args, '--page') ? Number(argValue(args, '--page')) : undefined;
|
|
372
359
|
const limit = argValue(args, '--limit') ? Number(argValue(args, '--limit')) : undefined;
|
|
373
|
-
const resp = await sendOp({ op: 'list', selfAid, peer, status: statusVal,
|
|
360
|
+
const resp = await sendOp({ op: 'list', selfAid, peer, status: statusVal, sort: sortVal, page, limit });
|
|
374
361
|
if (!resp.ok) {
|
|
375
362
|
console.error(`✗ ${resp.error}`);
|
|
376
363
|
process.exitCode = 1;
|
|
@@ -460,14 +447,13 @@ export async function runThreadCommand(args) {
|
|
|
460
447
|
process.exitCode = 1;
|
|
461
448
|
return;
|
|
462
449
|
}
|
|
463
|
-
const label = argValue(args, '--label');
|
|
464
450
|
const topicStatus = argValue(args, '--status');
|
|
465
451
|
// 对端类型:显式 --group / --private 优先;都不写时 daemon 侧按关系证据
|
|
466
452
|
// 推断(这里不能自行补值——daemon 会用 argv 重建请求,两者必须一致)。
|
|
467
453
|
const peerKind = hasFlag(args, '--group')
|
|
468
454
|
? 'group'
|
|
469
455
|
: hasFlag(args, '--private') ? 'private' : undefined;
|
|
470
|
-
const resp = await sendOp({ op: 'create', selfAid, peer, name,
|
|
456
|
+
const resp = await sendOp({ op: 'create', selfAid, peer, name, topicStatus, peerKind });
|
|
471
457
|
if (!resp.ok) {
|
|
472
458
|
console.error(`✗ ${resp.error}`);
|
|
473
459
|
process.exitCode = 1;
|
|
@@ -503,27 +489,6 @@ export async function runThreadCommand(args) {
|
|
|
503
489
|
printResult(resp.result, jsonFormat);
|
|
504
490
|
break;
|
|
505
491
|
}
|
|
506
|
-
case 'label': {
|
|
507
|
-
const ref = args[1];
|
|
508
|
-
if (!ref) {
|
|
509
|
-
console.error('用法: ec thread label <ref> <标签>');
|
|
510
|
-
process.exitCode = 1;
|
|
511
|
-
return;
|
|
512
|
-
}
|
|
513
|
-
const target = resolveRef(ref);
|
|
514
|
-
if (!target)
|
|
515
|
-
return;
|
|
516
|
-
const { peer, threadId } = target;
|
|
517
|
-
const label = hasFlag(args, '--clear') ? null : args[2] ?? null;
|
|
518
|
-
const resp = await sendOp({ op: 'label', selfAid, peer, threadId, label });
|
|
519
|
-
if (!resp.ok) {
|
|
520
|
-
console.error(`✗ ${resp.error}`);
|
|
521
|
-
process.exitCode = 1;
|
|
522
|
-
return;
|
|
523
|
-
}
|
|
524
|
-
console.log(label === null ? '✓ 标签已清除' : `✓ 标签设为: ${label}`);
|
|
525
|
-
break;
|
|
526
|
-
}
|
|
527
492
|
case 'status': {
|
|
528
493
|
const ref = args[1];
|
|
529
494
|
const statusVal = args[2];
|
|
@@ -590,7 +555,7 @@ export async function runThreadCommand(args) {
|
|
|
590
555
|
}
|
|
591
556
|
else {
|
|
592
557
|
if (missing > 0) {
|
|
593
|
-
console.warn(`⚠ [严重] ${missing} 条话题 session 文件缺失——rebuild 后这些话题的 rename/
|
|
558
|
+
console.warn(`⚠ [严重] ${missing} 条话题 session 文件缺失——rebuild 后这些话题的 rename/status 改动将回退`);
|
|
594
559
|
}
|
|
595
560
|
if (stale > 0) {
|
|
596
561
|
console.warn(`⚠ [轻微] ${stale} 条话题属性与 session 文件最后一行不一致(写盘时序),rebuild-index 可修复`);
|
|
@@ -623,7 +588,7 @@ export async function runThreadCommand(args) {
|
|
|
623
588
|
}
|
|
624
589
|
else {
|
|
625
590
|
if (missing > 0) {
|
|
626
|
-
console.warn(`⚠ [严重] ${missing} 条话题 session 文件缺失——rebuild 后这些话题的 rename/
|
|
591
|
+
console.warn(`⚠ [严重] ${missing} 条话题 session 文件缺失——rebuild 后这些话题的 rename/status 改动将回退`);
|
|
627
592
|
}
|
|
628
593
|
if (stale > 0) {
|
|
629
594
|
console.warn(`⚠ [轻微] ${stale} 条话题属性与 session 文件最后一行不一致(写盘时序),rebuild-index 可修复`);
|
package/dist/config/boot-log.js
CHANGED
|
@@ -15,9 +15,8 @@ import { logger } from '../utils/logger.js';
|
|
|
15
15
|
import { autoMigrateIfNeeded } from '../config-store.js';
|
|
16
16
|
import { ConfigTarget, initConfigManager, notifyConfigWrite } from './config-manager.js';
|
|
17
17
|
import { ensureRoleConfigV4OnStartup, ensureRoleConfigV5OnStartup } from './role-migration-startup.js';
|
|
18
|
-
import { ensureAccessPolicyMigrationOnStartup, ensureAgentModelProviderMigrationOnStartup, ensureAgentOnlyModelMigrationOnStartup, ensureAuxiliaryModelMigrationOnStartup, ensurePeerFileRenameOnStartup, ensureStartupConfigCompatibilityMigrationOnStartup, ensureProviderServiceTypeMigrationOnStartup, ensureProviderIdentityMigrationOnStartup, ensureRelationConfigVersionMigrationOnStartup, invalidateMigrationReadCache, withMigrationReadCache, } from './schema-migration.js';
|
|
18
|
+
import { ensureAccessPolicyMigrationOnStartup, ensureAgentModelProviderMigrationOnStartup, ensureAgentOnlyModelMigrationOnStartup, ensureAuxiliaryModelMigrationOnStartup, ensurePeerFileRenameOnStartup, ensurePeerStateOnStartup, ensureStartupConfigCompatibilityMigrationOnStartup, ensureProviderServiceTypeMigrationOnStartup, ensureProviderIdentityMigrationOnStartup, ensureRelationConfigVersionMigrationOnStartup, invalidateMigrationReadCache, withMigrationReadCache, } from './schema-migration.js';
|
|
19
19
|
import { ensureContactBookV2OnStartup } from './peer-book-v2-startup.js';
|
|
20
|
-
import { synchronizeAllManagementPeersSync } from './peer-book-store.js';
|
|
21
20
|
import { readInstalledEvolcoreVersion, readFastaunVersion } from '../utils/evolcore-version.js';
|
|
22
21
|
import { readCurrent, readWVersion, writeWVersion, materializeVersion, listAllVersions, diffVersions, snapshot, isConfigSnapshotsEnabled, ensureStartupConfigSnapshot, incrementSuccessCount, retentionCleanup, writeSnapshotConfigFile, removeSnapshotConfigFile, snapshotManagesFile, } from './snapshot.js';
|
|
23
22
|
const MAX_LINES = 300;
|
|
@@ -162,6 +161,8 @@ export async function prepareStartupConfig(recoverRoleMutations, onStep) {
|
|
|
162
161
|
logger.info(message);
|
|
163
162
|
console.error(message);
|
|
164
163
|
}
|
|
164
|
+
step('peerState');
|
|
165
|
+
await ensurePeerStateOnStartup();
|
|
165
166
|
step('contactBook');
|
|
166
167
|
const contactMigration = await ensureContactBookV2OnStartup();
|
|
167
168
|
if (contactMigration) {
|
|
@@ -170,13 +171,6 @@ export async function prepareStartupConfig(recoverRoleMutations, onStep) {
|
|
|
170
171
|
logger.info(message);
|
|
171
172
|
console.error(message);
|
|
172
173
|
}
|
|
173
|
-
step('syncContacts');
|
|
174
|
-
const synchronizedContacts = synchronizeAllManagementPeersSync();
|
|
175
|
-
if (synchronizedContacts > 0) {
|
|
176
|
-
const message = `✓ Contact management identities synchronized: ${synchronizedContacts} agent(s)`;
|
|
177
|
-
logger.info(message);
|
|
178
|
-
console.error(message);
|
|
179
|
-
}
|
|
180
174
|
}
|
|
181
175
|
export async function initializeStartupConfig(abort) {
|
|
182
176
|
try {
|
|
@@ -32,12 +32,10 @@ export function getBuiltinRolesConfig() {
|
|
|
32
32
|
*/
|
|
33
33
|
export function getManagementCommandPermissions(role) {
|
|
34
34
|
return {
|
|
35
|
-
'
|
|
36
|
-
'
|
|
37
|
-
'
|
|
38
|
-
'
|
|
39
|
-
'role.assign': { allow: true, scopes: ['agent'] },
|
|
40
|
-
'role.revoke': { allow: true, scopes: ['agent'] },
|
|
35
|
+
'agent.access.read': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true } },
|
|
36
|
+
'agent.access.write': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true } },
|
|
37
|
+
'role.assign': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
|
|
38
|
+
'role.revoke': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
|
|
41
39
|
'role.policy.read': { allow: true, scopes: ['agent'] },
|
|
42
40
|
'role.relation.read': { allow: true, scopes: ['agent'] },
|
|
43
41
|
'agent.baseagent.update': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
|
|
@@ -57,7 +55,7 @@ export function getManagementCommandPermissions(role) {
|
|
|
57
55
|
'config.get': { allow: true, scopes: ['agent', 'relation'] },
|
|
58
56
|
'config.set': { allow: true, scopes: ['agent', 'relation'] },
|
|
59
57
|
'config.unset': { allow: true, scopes: ['agent', 'relation'] },
|
|
60
|
-
'role.policy.write': { allow:
|
|
58
|
+
'role.policy.write': { allow: false, dangerous: true, scopes: ['agent'] },
|
|
61
59
|
'ec.aid.show': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
|
|
62
60
|
'ec.aid.list': { allow: true, dangerous: true, scopes: ['agent'], constraints: { requireAgentOwner: true } },
|
|
63
61
|
'ec.aid.lookup': { allow: true, scopes: ['agent'] },
|