evolcore 0.0.43-test.4 → 0.0.43-test.6
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 +93 -0
- package/bin/ecmsg.js +437 -91
- package/dist/agents/baseagent-availability.js +19 -4
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +14 -3
- package/dist/agents/codex-runner.js +18 -23
- package/dist/aun/aid/agentmd.js +25 -0
- package/dist/aun/aid/control-aid.js +15 -0
- package/dist/aun/aid/identity.js +8 -0
- package/dist/aun/aid/ownership-operation.js +12 -3
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +99 -23
- package/dist/channels/daemon.js +2 -2
- package/dist/cli/agent-create.js +19 -7
- package/dist/cli/aid-bind-command.js +3 -0
- package/dist/cli/aun-commands.js +19 -4
- package/dist/cli/code-stats.js +451 -213
- package/dist/cli/ctl-command.js +1 -3
- package/dist/cli/daemon-commands.js +42 -4
- package/dist/cli/directory.js +3 -1
- package/dist/cli/ecmsg-gateway.js +206 -0
- package/dist/cli/index.js +6 -0
- package/dist/cli/init.js +120 -13
- package/dist/cli/provider-command.js +82 -5
- package/dist/cli/restart-monitor.js +35 -24
- package/dist/cli/stats.js +8 -1
- package/dist/cli/task-context.js +41 -1
- package/dist/cli/watch-logs.js +6 -4
- package/dist/config/boot-log.js +16 -3
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-manager.js +5 -14
- package/dist/config/daemon-services.js +1 -0
- package/dist/config/peer-role-resolver.js +6 -6
- package/dist/config/provider-identity-migration.js +277 -0
- package/dist/config/provider-identity.js +37 -0
- package/dist/config/provider-ipc-service.js +40 -3
- package/dist/config/provider-local-sync.js +155 -0
- package/dist/config/providers-config.js +45 -4
- package/dist/config/providers-management.js +242 -76
- package/dist/config/providers.js +4 -1
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +143 -86
- package/dist/config/snapshot.js +70 -41
- package/dist/core/agent-runtime.js +48 -9
- package/dist/core/auth/auth-gateway.js +5 -3
- package/dist/core/auth/delegation-diagnostics.js +6 -2
- package/dist/core/auth/operation-authorizer.js +3 -1
- package/dist/core/auth/operation-catalog.js +6 -4
- package/dist/core/baseagent-loader.js +114 -11
- package/dist/core/channel-loader.js +36 -13
- package/dist/core/channel-runtime.js +112 -42
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +16 -11
- package/dist/core/command/menu-handler.js +8 -3
- package/dist/core/command/menu-protocol.js +80 -7
- package/dist/core/command/provider-menu.js +4 -2
- package/dist/core/command/role-menu.js +29 -17
- package/dist/core/command/slash-handler.js +52 -16
- package/dist/core/daemon-control.js +42 -15
- package/dist/core/daemon-lifecycle.js +411 -67
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +139 -45
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +7 -6
- package/dist/core/ipc-registration.js +5 -4
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/message/aun-ipc-sender.js +83 -5
- package/dist/core/message/message-admission.js +2 -0
- package/dist/core/message/message-bridge.js +53 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +33 -25
- package/dist/core/message/send-options.js +40 -0
- package/dist/core/message/send-routing.js +320 -0
- package/dist/core/ownership/owner-resolver.js +112 -8
- package/dist/core/permission/ec-command-parser.js +159 -16
- package/dist/core/permission/readonly-shell-query.js +66 -7
- package/dist/core/permission/tool-error-code.js +13 -1
- package/dist/core/permission/tool-policy.js +74 -20
- package/dist/core/relation/same-owner-proof.js +131 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-fs-store.js +164 -3
- package/dist/core/session/session-idle-monitor.js +103 -17
- package/dist/core/session/session-manager.js +105 -18
- package/dist/core/thread/thread-route.js +5 -2
- package/dist/directory/owner-directory-admission.js +26 -1
- package/dist/directory/owner-directory-cache.js +739 -109
- package/dist/directory/owner-directory-markdown.js +146 -36
- package/dist/directory/owner-directory-query-operation.js +6 -3
- package/dist/directory/owner-directory-scope.js +12 -0
- package/dist/directory/owner-directory-search.js +5 -1
- package/dist/directory/owner-directory-store.js +28 -0
- package/dist/ecweb/basic-settings-service.js +15 -1
- package/dist/ecweb/message-context-service.js +2 -2
- package/dist/ecweb/providers-service.js +3 -1
- package/dist/ecweb/runtime/lifecycle.js +26 -15
- package/dist/ecweb/runtime/supervisor.js +120 -51
- package/dist/index.js +551 -250
- package/dist/paths.js +2 -1
- package/dist/proxy/manager.js +40 -17
- package/dist/proxy/service-supervisor.js +67 -33
- package/dist/response-system/engines/v1/proactive-flow.js +4 -0
- package/dist/trigger/application-service.js +4 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +4 -0
- package/dist/trigger/feedback.js +26 -2
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +81 -8
- package/dist/trigger/system-definitions.js +2 -2
- package/dist/trigger/validation.js +4 -0
- package/dist/utils/autostart.js +2 -2
- package/dist/utils/cross-platform.js +188 -12
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +64 -1
- package/dist/utils/public-suffix.js +5811 -0
- package/dist/utils/startup-trace.js +160 -19
- package/dist/utils/windows-autostart.js +41 -7
- package/ecagent/dist/harness/env/nodejs.js +46 -2
- package/kits/docs/aun/ABILITY_CALLING.md +6 -6
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/channels/feishu.md +2 -2
- package/kits/docs/context-assembly.md +20 -4
- package/kits/docs/evolcore/INDEX.md +5 -3
- package/kits/docs/evolcore/agent.md +2 -2
- package/kits/docs/evolcore/aid.md +8 -2
- package/kits/docs/evolcore/ctl.md +15 -5
- package/kits/docs/evolcore/directory.md +48 -15
- package/kits/docs/evolcore/group.md +8 -8
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +32 -3
- package/kits/docs/evolcore/msg.md +38 -30
- package/kits/docs/evolcore/provider.md +57 -5
- package/kits/docs/evolcore/response.md +2 -2
- package/kits/docs/evolcore/thread-chain.md +11 -13
- package/kits/docs/evolcore/tool-authorization.md +17 -0
- package/kits/docs/evolcore/trigger.md +2 -2
- package/kits/docs/identity/ROLE_DETAIL.md +1 -1
- package/kits/docs/prompt-loading-architecture.md +30 -20
- package/kits/eck_manifest.auxiliary.json +5 -5
- package/kits/eck_manifest.json +44 -32
- package/kits/eck_manifest.memory.json +18 -18
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/01-overview.md +1 -1
- package/kits/rules/06-channel.md +7 -8
- package/kits/schemas/_meta.json +7 -1
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/providers.schema.2.json +74 -0
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/aid-ability/SKILL.md +7 -7
- package/kits/skills/ec-agent-create/SKILL.md +1 -0
- package/kits/skills/ec-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +3 -10
- package/kits/skills/ec-trigger/SKILL.md +9 -9
- package/kits/skills/ec-trigger/references/examples.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +5 -5
- package/kits/templates/system-fragments/commands.md +7 -6
- package/kits/templates/system-fragments/directory-contacts.md +10 -3
- package/kits/templates/system-fragments/personal-assistant.md +22 -3
- package/kits/templates/system-fragments/reply.md +48 -28
- package/kits/templates/system-fragments/session.md +3 -10
- package/kits/templates/system-fragments/thread.md +5 -5
- package/package.json +4 -4
|
@@ -5,7 +5,7 @@ import { ConfigTarget, read, resolveEffectiveWithSources, write } from '../../co
|
|
|
5
5
|
import { getBuiltinRolesConfig, getRoleDefinition, isValidUserRoleName, readRolesConfig, } from '../../config/roles.js';
|
|
6
6
|
import { BUILTIN_USER_ROLES, MANAGEMENT_ROLES, expectedRoleRank, isManagementRole } from '../../config/builtin-roles.js';
|
|
7
7
|
import { checkRoleAccess, isStaticAgentOwner, resolvePeerRoleDetail } from '../../config/peer-role-resolver.js';
|
|
8
|
-
import {
|
|
8
|
+
import { prepareSameOwnerProof } from '../relation/same-owner-proof.js';
|
|
9
9
|
import { relationFieldWriteOperation, resolveRoleFieldPermission, } from '../../config/config-field-policy.js';
|
|
10
10
|
import { evaluateRoleOperationCapability } from '../auth/operation-authorizer.js';
|
|
11
11
|
import { listOperations } from '../auth/operation-catalog.js';
|
|
@@ -477,19 +477,31 @@ function updateDefaultRoles(context, args, value) {
|
|
|
477
477
|
const self = context.self;
|
|
478
478
|
if (!isObject(value))
|
|
479
479
|
throw invalidJsonType(self, 'defaultRoles', 'object');
|
|
480
|
-
|
|
481
|
-
|
|
480
|
+
// 旧键名兼容:已上线的 App 仍可能发 `defaultRoles.paTeam`。必须在
|
|
481
|
+
// assertOnlyKeys 之前改名,否则旧客户端会被 unknown-key 直接拒掉。
|
|
482
|
+
// 两个键同时出现时以新键为准。
|
|
483
|
+
let fields = value;
|
|
484
|
+
if (Object.prototype.hasOwnProperty.call(fields, 'paTeam')) {
|
|
485
|
+
const legacy = fields.paTeam;
|
|
486
|
+
const renamed = { ...fields };
|
|
487
|
+
delete renamed.paTeam;
|
|
488
|
+
if (!Object.prototype.hasOwnProperty.call(renamed, 'internalContact'))
|
|
489
|
+
renamed.internalContact = legacy;
|
|
490
|
+
fields = renamed;
|
|
491
|
+
}
|
|
492
|
+
assertOnlyKeys(fields, ['private', 'group', 'internalContact'], 'defaultRoles', self);
|
|
493
|
+
if (!Object.prototype.hasOwnProperty.call(fields, 'private') || !Object.prototype.hasOwnProperty.call(fields, 'group')) {
|
|
482
494
|
throw validationFailed(self, undefined, [{ field: 'defaultRoles', code: 'MISSING_FIELD', message: 'private and group are required' }]);
|
|
483
495
|
}
|
|
484
496
|
const registry = readRoleRegistry(self);
|
|
485
497
|
const nextDefaults = {
|
|
486
|
-
private: validateAssignableRole(
|
|
487
|
-
group: validateAssignableRole(
|
|
488
|
-
|
|
489
|
-
?
|
|
498
|
+
private: validateAssignableRole(fields.private, self, 'defaultRoles.private'),
|
|
499
|
+
group: validateAssignableRole(fields.group, self, 'defaultRoles.group'),
|
|
500
|
+
internalContact: validateAssignableRole(Object.prototype.hasOwnProperty.call(fields, 'internalContact')
|
|
501
|
+
? fields.internalContact ?? 'member' : registry.defaultRoles.internalContact ?? 'member', self, 'defaultRoles.internalContact'),
|
|
490
502
|
};
|
|
491
503
|
assertPolicyRevision(self, args);
|
|
492
|
-
const changesAdminDefault = ['private', 'group', '
|
|
504
|
+
const changesAdminDefault = ['private', 'group', 'internalContact'].some(scene => registry.defaultRoles[scene] !== nextDefaults[scene]
|
|
493
505
|
&& (registry.defaultRoles[scene] === 'admin' || nextDefaults[scene] === 'admin'));
|
|
494
506
|
if (!isDaemonOwnerControl(context) && context.actorRole !== 'owner' && changesAdminDefault) {
|
|
495
507
|
throw roleError('NOT_ALLOWED', 'Only an owner can set or replace an admin default role', self, {
|
|
@@ -744,10 +756,10 @@ async function deleteRole(context, args) {
|
|
|
744
756
|
const registry = readRoleRegistry(self);
|
|
745
757
|
const nextRegistry = clone(registry);
|
|
746
758
|
nextRegistry.roles = nextRegistry.roles.filter(item => item !== roleId);
|
|
747
|
-
for (const scene of ['private', 'group', '
|
|
748
|
-
const current = scene === '
|
|
759
|
+
for (const scene of ['private', 'group', 'internalContact']) {
|
|
760
|
+
const current = scene === 'internalContact' ? nextRegistry.defaultRoles[scene] ?? 'member' : nextRegistry.defaultRoles[scene];
|
|
749
761
|
if (current === roleId)
|
|
750
|
-
nextRegistry.defaultRoles[scene] = replacement ?? (scene === '
|
|
762
|
+
nextRegistry.defaultRoles[scene] = replacement ?? (scene === 'internalContact' ? 'member' : null);
|
|
751
763
|
}
|
|
752
764
|
const changes = [
|
|
753
765
|
{
|
|
@@ -779,7 +791,7 @@ async function assignmentInventory(context, args, policyRevision) {
|
|
|
779
791
|
const items = [];
|
|
780
792
|
if (args?.includeDefaults !== false) {
|
|
781
793
|
const defaults = effectiveDefaultRoles(self);
|
|
782
|
-
for (const scene of ['private', 'group', '
|
|
794
|
+
for (const scene of ['private', 'group', 'internalContact']) {
|
|
783
795
|
const roleId = defaults[scene];
|
|
784
796
|
if (roleId && (!roleFilter || roleFilter === roleId)) {
|
|
785
797
|
items.push({ target: { kind: 'default', scene }, roleId, relationRevision: null });
|
|
@@ -824,7 +836,7 @@ async function targetSnapshot(context, args, policyRevision) {
|
|
|
824
836
|
? normalized
|
|
825
837
|
: await validateTargetExists(context, normalized, { allowAuthenticatedPrivateActor: true });
|
|
826
838
|
if (target.kind === 'private')
|
|
827
|
-
await
|
|
839
|
+
await prepareSameOwnerProof(self, target.peerAid);
|
|
828
840
|
const relation = readRelation(target.peerKey, self);
|
|
829
841
|
const roleView = targetRoleView(self, target, relation?.config ?? null);
|
|
830
842
|
const override = target.kind === 'private'
|
|
@@ -1312,7 +1324,7 @@ function readAgent(self) {
|
|
|
1312
1324
|
}
|
|
1313
1325
|
function effectiveDefaultRoles(self) {
|
|
1314
1326
|
const defaults = readRolesConfig(self).defaultRoles ?? {};
|
|
1315
|
-
return { private: defaults.private ?? null, group: defaults.group ?? null,
|
|
1327
|
+
return { private: defaults.private ?? null, group: defaults.group ?? null, internalContact: defaults.internalContact ?? 'member' };
|
|
1316
1328
|
}
|
|
1317
1329
|
function policyDocument(agent) {
|
|
1318
1330
|
const store = readRoleStore(agent.aid);
|
|
@@ -1494,7 +1506,7 @@ function relationTargetKind(self, config, channelId, known = { groups: new Set()
|
|
|
1494
1506
|
}
|
|
1495
1507
|
function countRoleUsage(self, relations, roleId) {
|
|
1496
1508
|
const configuredDefaults = effectiveDefaultRoles(self);
|
|
1497
|
-
const defaultScenes = ['private', 'group', '
|
|
1509
|
+
const defaultScenes = ['private', 'group', 'internalContact'].filter(scene => configuredDefaults[scene] === roleId);
|
|
1498
1510
|
let privateRelations = 0;
|
|
1499
1511
|
let groupRelations = 0;
|
|
1500
1512
|
for (const relation of relations) {
|
|
@@ -1532,8 +1544,8 @@ function validateRoleDomainTransactionChanges(self, registry, changes) {
|
|
|
1532
1544
|
})));
|
|
1533
1545
|
}
|
|
1534
1546
|
const validatedRegistry = registry;
|
|
1535
|
-
for (const scene of ['private', 'group', '
|
|
1536
|
-
const roleId = scene === '
|
|
1547
|
+
for (const scene of ['private', 'group', 'internalContact']) {
|
|
1548
|
+
const roleId = scene === 'internalContact' ? validatedRegistry.defaultRoles[scene] ?? 'member' : validatedRegistry.defaultRoles[scene];
|
|
1537
1549
|
if (roleId !== null && (roleId === 'owner' || !validatedRegistry.roles.includes(roleId))) {
|
|
1538
1550
|
throw validationFailed(self, roleId, [{ field: `defaultRoles.${scene}`, code: 'INVALID_ROLE',
|
|
1539
1551
|
message: 'Default role must reference an assignable registered role' }]);
|
|
@@ -25,7 +25,7 @@ import { authorizationNextStep, formatAuthorizationDenial } from '../auth/author
|
|
|
25
25
|
import { resolvePermissionMode, writeAgentModelConfig } from '../model/config-scope.js';
|
|
26
26
|
import { formatPeerKey } from '../relation/peer-identity.js';
|
|
27
27
|
import { writeChatmodeConfig } from './chatmode-config.js';
|
|
28
|
-
import {
|
|
28
|
+
import { prepareSameOwnerProof } from '../relation/same-owner-proof.js';
|
|
29
29
|
import { auditFullAccessEvent } from '../auth/authorization-audit.js';
|
|
30
30
|
import { isMainSession, isTopicSession, isTopicThreadId, sessionTopicThreadId } from '../thread/topic-id.js';
|
|
31
31
|
import { modelMatches, getCatalog, assertCatalogSelectable, resolveCatalogModel, CONFIGURABLE_EFFORTS, configurableEfforts } from '../model/model-catalog.js';
|
|
@@ -41,7 +41,7 @@ import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage, isP
|
|
|
41
41
|
import { scanInstances } from '../../utils/instance-registry.js';
|
|
42
42
|
import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, parseFullAccessCommand, probeSessionActivity, } from './slash-gate.js';
|
|
43
43
|
import { MAX_AUN_ATTACHMENT_SIZE } from '../../aun/msg/upload.js';
|
|
44
|
-
import { DEFAULT_SESSION_LOOP_SECONDS, MAX_SESSION_LOOP_SECONDS, MIN_SESSION_LOOP_SECONDS, refreshSessionLoopTarget, resolveCurrentSessionLoopTarget, resolveSessionLoopTarget, sessionLoopPayload, validateIdleSeconds, writeSessionLoopConfig, } from '../session/session-idle-monitor.js';
|
|
44
|
+
import { DEFAULT_SESSION_LOOP_SECONDS, MAX_SESSION_LOOP_PROMPT_LENGTH, MAX_SESSION_LOOP_SECONDS, MIN_SESSION_LOOP_SECONDS, refreshSessionLoopTarget, resolveCurrentSessionLoopTarget, resolveSessionLoopTarget, sessionLoopPayload, validateIdleSeconds, writeSessionLoopConfig, } from '../session/session-idle-monitor.js';
|
|
45
45
|
const allEfforts = CONFIGURABLE_EFFORTS;
|
|
46
46
|
const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
|
|
47
47
|
function formatSessionPolicyStatus(name, scope, enabled, updated = false) {
|
|
@@ -424,7 +424,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
424
424
|
includeDaemon: /^\/(?:restart|upgrade|update|reload|pair|fa|fullaccess|diag)(?:\s|$)/i.test(normalizedContent),
|
|
425
425
|
});
|
|
426
426
|
if (this.resolveChannelType(channel) === 'aun' && narrowedChatType === 'private') {
|
|
427
|
-
await
|
|
427
|
+
await prepareSameOwnerProof(selfAID ?? this.agentRegistry?.resolveByChannel(channel)?.aid ?? this.resolveSelfAID(channel), userId);
|
|
428
428
|
}
|
|
429
429
|
const identityConversationId = narrowedChatType === 'group' ? channelId : userId;
|
|
430
430
|
const resolvedIdentity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, narrowedChatType, identityConversationId);
|
|
@@ -580,12 +580,21 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
580
580
|
const isCmd = isRecognizedSlashCommand(normalizedContent);
|
|
581
581
|
if (!isCmd)
|
|
582
582
|
return undefined;
|
|
583
|
-
if (
|
|
583
|
+
if (/^\/loop(?:\s|$)/.test(normalizedContent)) {
|
|
584
584
|
const rawArgs = normalizedContent.slice('/loop'.length).trim();
|
|
585
585
|
const parts = rawArgs ? rawArgs.split(/\s+/) : [];
|
|
586
|
-
|
|
586
|
+
const controlCommand = rawArgs === '' || rawArgs === 'on' || rawArgs === 'off'
|
|
587
|
+
|| /^(?:on|off)\s/.test(rawArgs);
|
|
588
|
+
if (controlCommand && (parts.length > 2 || (parts.length > 0 && !['on', 'off'].includes(parts[0])))) {
|
|
587
589
|
return { kind: 'command.error', text: `❌ 用法: /loop | /loop on [${MIN_SESSION_LOOP_SECONDS}-${MAX_SESSION_LOOP_SECONDS}] | /loop off` };
|
|
588
590
|
}
|
|
591
|
+
const oncePrompt = controlCommand ? undefined : rawArgs;
|
|
592
|
+
if (oncePrompt && source === 'card-trigger') {
|
|
593
|
+
return { kind: 'command.error', text: '❌ /loop <提示词> 只能由用户直接发送' };
|
|
594
|
+
}
|
|
595
|
+
if (oncePrompt && oncePrompt.length > MAX_SESSION_LOOP_PROMPT_LENGTH) {
|
|
596
|
+
return { kind: 'command.error', text: `❌ /loop 提示词不能超过 ${MAX_SESSION_LOOP_PROMPT_LENGTH} 个字符` };
|
|
597
|
+
}
|
|
589
598
|
const route = {
|
|
590
599
|
channel,
|
|
591
600
|
channelId,
|
|
@@ -603,7 +612,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
603
612
|
const message = error instanceof Error ? error.message : String(error);
|
|
604
613
|
return { kind: 'command.error', text: `❌ ${message}${code ? ` (${code})` : ''}` };
|
|
605
614
|
}
|
|
606
|
-
const operation = parts.length === 0 ? 'session.loop.current' : 'session.loop.update';
|
|
615
|
+
const operation = !oncePrompt && parts.length === 0 ? 'session.loop.current' : 'session.loop.update';
|
|
607
616
|
const denied = await authorizeIntent({
|
|
608
617
|
intent: { operation, scope: 'relation', source: 'slash', args: { sessionId: target.session.id, peer: target.peerKey, value: parts[0] } },
|
|
609
618
|
identity,
|
|
@@ -621,10 +630,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
621
630
|
try {
|
|
622
631
|
const current = await refreshSessionLoopTarget(this.sessionManager, route, target);
|
|
623
632
|
const payload = sessionLoopPayload(current);
|
|
633
|
+
const once = payload.once;
|
|
624
634
|
return {
|
|
625
635
|
kind: 'system.notice',
|
|
626
636
|
text: formatSessionPolicyStatus('idle 触发', current.level, payload.value === true)
|
|
627
|
-
+ (payload.value ? `(${payload.idleSeconds} 秒)` : '')
|
|
637
|
+
+ (payload.value ? `(${payload.idleSeconds} 秒)` : '')
|
|
638
|
+
+ (once ? `;单次:待执行(${once.idleSeconds} 秒);提示词:${once.promptPreview}` : ';单次:无'),
|
|
628
639
|
subtype: 'session.loop.current',
|
|
629
640
|
};
|
|
630
641
|
}
|
|
@@ -638,6 +649,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
638
649
|
return { kind: 'command.error', text: '❌ /loop off 不接受秒数' };
|
|
639
650
|
next = { enabled: false };
|
|
640
651
|
}
|
|
652
|
+
else if (oncePrompt) {
|
|
653
|
+
next = { enabled: true, idleSeconds: DEFAULT_SESSION_LOOP_SECONDS };
|
|
654
|
+
}
|
|
641
655
|
else {
|
|
642
656
|
const seconds = parts.length === 2
|
|
643
657
|
? /^[1-9]\d*$/.test(parts[1]) ? validateIdleSeconds(Number(parts[1])) : undefined
|
|
@@ -648,16 +662,33 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
648
662
|
}
|
|
649
663
|
try {
|
|
650
664
|
const latest = await refreshSessionLoopTarget(this.sessionManager, route, target);
|
|
665
|
+
if (oncePrompt) {
|
|
666
|
+
this.assertSessionLoopTrigger(latest.session, true);
|
|
667
|
+
this.sessionManager.updateSessionLoopOnce(latest.session.id, {
|
|
668
|
+
idleSeconds: DEFAULT_SESSION_LOOP_SECONDS,
|
|
669
|
+
prompt: oncePrompt,
|
|
670
|
+
}, { peerId: authSubject.principalId ?? userId,
|
|
671
|
+
encrypted: replyContext?.metadata?.encrypted ?? this.sessionManager.getSessionEncrypt(latest.session.id) });
|
|
672
|
+
if (this.shouldSuppressCardTriggerResult(source, channel))
|
|
673
|
+
return null;
|
|
674
|
+
return {
|
|
675
|
+
kind: 'system.notice',
|
|
676
|
+
text: `✅ 单次 idle 触发(${latest.level})已安排;闲置时长:${DEFAULT_SESSION_LOOP_SECONDS} 秒;提示词:${oncePrompt.replace(/\s+/g, ' ').slice(0, 120)}`,
|
|
677
|
+
subtype: 'session.loop.once.updated',
|
|
678
|
+
};
|
|
679
|
+
}
|
|
651
680
|
if (next.enabled)
|
|
652
681
|
this.assertSessionLoopTrigger(latest.session);
|
|
653
682
|
const updated = writeSessionLoopConfig(this.sessionManager, latest, next);
|
|
683
|
+
if (!next.enabled)
|
|
684
|
+
this.sessionManager.consumeSessionLoopOnce(updated.session.id);
|
|
654
685
|
const payload = sessionLoopPayload(updated);
|
|
655
686
|
if (this.shouldSuppressCardTriggerResult(source, channel))
|
|
656
687
|
return null;
|
|
657
688
|
return {
|
|
658
689
|
kind: 'system.notice',
|
|
659
690
|
text: formatSessionPolicyStatus('idle 触发', updated.level, payload.value === true, true)
|
|
660
|
-
+ (payload.value ? `(${payload.idleSeconds} 秒)` : ''),
|
|
691
|
+
+ (payload.value ? `(${payload.idleSeconds} 秒)` : ';已取消待执行的单次触发'),
|
|
661
692
|
subtype: 'session.loop.updated',
|
|
662
693
|
};
|
|
663
694
|
}
|
|
@@ -865,7 +896,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
865
896
|
' /baseagent - 查看 Agent 后端',
|
|
866
897
|
' /perm - 查看权限模式',
|
|
867
898
|
' /mention - 查看群聊 @ 处理模式',
|
|
868
|
-
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
899
|
+
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off|<提示词>]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
869
900
|
' /ask <选项> - 回答待处理问题',
|
|
870
901
|
' /pause - 在下一次工具调用前暂停任务',
|
|
871
902
|
' /resume - 继续已暂停的任务',
|
|
@@ -912,7 +943,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
912
943
|
'',
|
|
913
944
|
'💬 聊天设置:',
|
|
914
945
|
...(canReadChatmode || canSetChatmode ? [` /chatmode${canSetChatmode ? ` [${chatmodeChoices}]` : ''} - 查看${canSetChatmode ? '或切换' : ''}会话模式`] : []),
|
|
915
|
-
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
946
|
+
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off|<提示词>]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
916
947
|
...(canReadMentionmode || canSetMentionmode ? [` /mention${canSetMentionmode ? ' [mention-only|disabled]' : ''} - 查看${canSetMentionmode ? '或切换' : ''}群聊 @ 处理模式`] : []),
|
|
917
948
|
] : []),
|
|
918
949
|
...(canReadPermission || canAnswerPermission ? [
|
|
@@ -957,7 +988,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
957
988
|
'💬 聊天设置:',
|
|
958
989
|
` /chatmode${canSetChatmode ? ` [${chatmodeChoices}]` : ''} - 查看${canSetChatmode ? '或切换' : ''}会话模式`,
|
|
959
990
|
] : []),
|
|
960
|
-
...(canReadLoop ? ['', ` /loop${canUpdateLoop ? ' [on [seconds]|off]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
991
|
+
...(canReadLoop ? ['', ` /loop${canUpdateLoop ? ' [on [seconds]|off|<提示词>]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
961
992
|
...(canReadPermission || canAnswerPermission ? [
|
|
962
993
|
'',
|
|
963
994
|
'🔐 权限管理:',
|
|
@@ -1005,7 +1036,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1005
1036
|
' /activity [all|text|none] - 查看/控制中间输出显示模式',
|
|
1006
1037
|
...(canReadChatmode || canSetChatmode ? [` /chatmode${canSetChatmode ? ` [${chatmodeChoices}]` : ''} - 查看${canSetChatmode ? '/切换' : ''}会话模式(被动响应或主动推进)`] : []),
|
|
1007
1038
|
...(canReadMentionmode || canSetMentionmode ? [` /mention${canSetMentionmode ? ' [mention-only|disabled]' : ''} - 查看${canSetMentionmode ? '/切换' : ''}群聊 @ 处理模式`] : []),
|
|
1008
|
-
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
1039
|
+
...(canReadLoop ? [` /loop${canUpdateLoop ? ' [on [seconds]|off|<提示词>]' : ''} - 查看${canUpdateLoop ? '或设置' : ''}当前会话的单次闲置触发`] : []),
|
|
1009
1040
|
'',
|
|
1010
1041
|
'🧠 上下文:',
|
|
1011
1042
|
' /memory - 记忆概览与维护',
|
|
@@ -1088,8 +1119,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1088
1119
|
const canUpdateLoop = canAccessSlashOperation('session.loop.update', 'relation');
|
|
1089
1120
|
const loopHelp = canReadLoop || canUpdateLoop ? [{
|
|
1090
1121
|
command: '/loop',
|
|
1091
|
-
...(canUpdateLoop ? { args: '[on [seconds]|off]' } : {}),
|
|
1092
|
-
description: '
|
|
1122
|
+
...(canUpdateLoop ? { args: '[on [seconds]|off|<提示词>]' } : {}),
|
|
1123
|
+
description: '查看或设置闲置触发;自定义提示词闲置 300 秒后单次执行',
|
|
1093
1124
|
category: '聊天设置',
|
|
1094
1125
|
roles: [identity.role],
|
|
1095
1126
|
}] : [];
|
|
@@ -4036,7 +4067,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
4036
4067
|
}
|
|
4037
4068
|
return { kind: 'command.error', text: '❌ 当前话题会话不存在或归属已变化' };
|
|
4038
4069
|
}
|
|
4039
|
-
return
|
|
4070
|
+
return outcome.value.startsWith('❌')
|
|
4071
|
+
? { kind: 'command.result', text: outcome.value }
|
|
4072
|
+
: { kind: 'system.notice', text: outcome.value, subtype: 'session.rewound' };
|
|
4040
4073
|
}
|
|
4041
4074
|
const rewindBaseagent = session.baseagent;
|
|
4042
4075
|
if (!rewindBaseagent) {
|
|
@@ -4050,7 +4083,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
4050
4083
|
return { kind: 'command.error', text: `❌ 当前 Agent (${rewindAgent.name}) 不支持 /rewind` };
|
|
4051
4084
|
}
|
|
4052
4085
|
await interruptPausedSessionBeforeReplacement(session);
|
|
4053
|
-
|
|
4086
|
+
const rewindResult = await this.handleRewind(session, rewindAgent, turnNum, mode);
|
|
4087
|
+
return rewindResult.startsWith('❌')
|
|
4088
|
+
? { kind: 'command.result', text: rewindResult }
|
|
4089
|
+
: { kind: 'system.notice', text: rewindResult, subtype: 'session.rewound' };
|
|
4054
4090
|
}
|
|
4055
4091
|
// /repair 命令:检查并修复会话文件
|
|
4056
4092
|
if (normalizedContent === '/repair') {
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { AUNChannel } from '../channels/aun.js';
|
|
4
|
+
import { resolveControlMenuAuthorization } from './command/menu-handler.js';
|
|
4
5
|
import { ServiceProxyManager } from '../proxy/manager.js';
|
|
5
6
|
import { formatPairingCodeMessage } from '../ecweb/pairing.js';
|
|
6
7
|
import { remoteAccessService } from './auth/remote-access-store.js';
|
|
7
8
|
import { authorizationDenialData, formatAuthorizationDenial } from './auth/authorization-denial.js';
|
|
8
9
|
import { controlReplyContext } from './message/outbound.js';
|
|
9
|
-
import { enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, hasValidMenuId, logMenuRequestCompleted, logMenuRequestReceived, MENU_RESPONSE_MAX_BYTES, MENU_RESPONSE_SAFETY_MARGIN_BYTES, MenuRequestDeduper, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, } from './command/menu-protocol.js';
|
|
10
|
+
import { deliverMenuResponse, enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, hasValidMenuId, logMenuRequestCompleted, logMenuRequestReceived, logMenuResponseRetry, MENU_RESPONSE_MAX_BYTES, MENU_RESPONSE_SAFETY_MARGIN_BYTES, MenuRequestDeduper, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, beginMenuDeliveryTiming, } from './command/menu-protocol.js';
|
|
10
11
|
import { isProcessLevelOwner } from './command/command-handler.js';
|
|
11
12
|
import { onShutdown } from '../utils/cross-platform.js';
|
|
12
13
|
import { logger } from '../utils/logger.js';
|
|
@@ -15,7 +16,7 @@ import { ownerResolver, OWNERSHIP_AUTHORIZATION_MAX_AGE_MS, OWNERSHIP_CACHE_MAX_
|
|
|
15
16
|
import { subscribeUpgradeJob } from '../utils/upgrade-jobs.js';
|
|
16
17
|
import { ecwebInitializationService } from './initialization/service.js';
|
|
17
18
|
const controlMenuDeduper = new MenuRequestDeduper();
|
|
18
|
-
export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, ecwebSupervisor, onServiceProxyManager, }) {
|
|
19
|
+
export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, ecwebSupervisor, onServiceProxyManager, connectChannel, startupTrace, waitForServices, }) {
|
|
19
20
|
if (!daemonCfg.aid)
|
|
20
21
|
return undefined;
|
|
21
22
|
const aunPath = resolvePaths().root;
|
|
@@ -32,19 +33,22 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
32
33
|
aunTrace: daemonCfg.debug?.aunTrace,
|
|
33
34
|
aunSdkLog: daemonCfg.debug?.aunSdkLog,
|
|
34
35
|
});
|
|
35
|
-
const serviceProxyManager = new ServiceProxyManager({ providerAid: daemonCfg.aid, controlChannel, ecwebSupervisor: ecwebSupervisor ?? undefined });
|
|
36
|
+
const serviceProxyManager = new ServiceProxyManager({ providerAid: daemonCfg.aid, controlChannel, ecwebSupervisor: ecwebSupervisor ?? undefined, startupTrace });
|
|
36
37
|
onServiceProxyManager?.(serviceProxyManager);
|
|
37
|
-
|
|
38
|
-
|
|
38
|
+
let stopping = false;
|
|
39
|
+
onShutdown(() => { stopping = true; return serviceProxyManager.stop(); });
|
|
40
|
+
const startServices = async () => {
|
|
41
|
+
if (waitForServices && !await waitForServices())
|
|
42
|
+
return;
|
|
43
|
+
if (!stopping)
|
|
44
|
+
await serviceProxyManager.start();
|
|
45
|
+
};
|
|
46
|
+
const proxyStartup = startupTrace
|
|
47
|
+
? startupTrace.track('daemon.serviceProxyStart', startServices)
|
|
48
|
+
: startServices();
|
|
49
|
+
void proxyStartup.catch((error) => {
|
|
39
50
|
logger.warn(`ServiceProxy manager 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
40
51
|
});
|
|
41
|
-
const controlConnectPromise = controlChannel.connect()
|
|
42
|
-
.then(() => {
|
|
43
|
-
logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`);
|
|
44
|
-
})
|
|
45
|
-
.catch((e) => {
|
|
46
|
-
logger.warn(`控制 AID 首连失败(后台自动重连,不影响 daemon 主流程): ${e?.message || e}`);
|
|
47
|
-
});
|
|
48
52
|
controlChannel.onMessage(async (opts) => {
|
|
49
53
|
const text = (opts.content || '').trim();
|
|
50
54
|
let activeMenuRequest;
|
|
@@ -79,9 +83,24 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
79
83
|
id: response.id,
|
|
80
84
|
...(response.name ? { name: response.name } : {}),
|
|
81
85
|
};
|
|
86
|
+
const owners = getProcessOwners().join('\u0000');
|
|
87
|
+
const deliveryTiming = beginMenuDeliveryTiming(menuTiming);
|
|
88
|
+
let deliveryOutcome;
|
|
82
89
|
try {
|
|
83
|
-
await
|
|
84
|
-
|
|
90
|
+
await deliverMenuResponse(async () => {
|
|
91
|
+
Object.assign(timedResponse, withMenuProcessingTime(timedResponse, menuTiming));
|
|
92
|
+
await controlChannel.sendStructuredOrThrow(opts.channelId, timedResponse, menuResponseContext());
|
|
93
|
+
}, {
|
|
94
|
+
canRetry: () => {
|
|
95
|
+
if (!controlChannel.getStatus().connected || getProcessOwners().join('\u0000') !== owners)
|
|
96
|
+
return false;
|
|
97
|
+
return !!response.error || resolveControlMenuAuthorization({ peerId: opts.peerId,
|
|
98
|
+
owners: getProcessOwners(), auth: { encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders } }).allowed;
|
|
99
|
+
},
|
|
100
|
+
onRetry: (attempt, error, delay) => logMenuResponseRetry(request, menuFlowContext, attempt, delay, error),
|
|
101
|
+
onComplete: outcome => { deliveryOutcome = outcome; },
|
|
102
|
+
});
|
|
103
|
+
logMenuRequestCompleted(request, timedResponse, menuFlowContext, { delivery: 'sent', ...deliveryOutcome, ...deliveryTiming() });
|
|
85
104
|
menuCompletionLogged = true;
|
|
86
105
|
}
|
|
87
106
|
catch (error) {
|
|
@@ -89,6 +108,8 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
89
108
|
delivery: 'failed',
|
|
90
109
|
reason: 'transport-error',
|
|
91
110
|
transportError: error,
|
|
111
|
+
...deliveryOutcome,
|
|
112
|
+
...deliveryTiming(),
|
|
92
113
|
});
|
|
93
114
|
menuCompletionLogged = true;
|
|
94
115
|
throw error;
|
|
@@ -217,6 +238,12 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
217
238
|
logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
|
|
218
239
|
}
|
|
219
240
|
});
|
|
220
|
-
|
|
241
|
+
// Install the control handler before admitting the first SDK connection.
|
|
242
|
+
void (connectChannel ? connectChannel(controlChannel) : controlChannel.connect())
|
|
243
|
+
.then(started => { if (started !== false)
|
|
244
|
+
logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`); })
|
|
245
|
+
.catch((e) => {
|
|
246
|
+
logger.warn(`控制 AID 首连失败(后台自动重连,不影响 daemon 主流程): ${e?.message || e}`);
|
|
247
|
+
});
|
|
221
248
|
return controlChannel;
|
|
222
249
|
}
|