evolcore 0.0.45 → 0.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +75 -0
- package/bin/ecmsg.js +33 -23
- package/dist/ability/application-service.js +1 -2
- package/dist/ability/package.js +28 -0
- package/dist/agent-template/jobs.js +158 -36
- package/dist/agent-template/runtime.js +401 -34
- package/dist/agent-template/service.js +764 -369
- package/dist/agent-template/tool-runner.js +35 -17
- package/dist/agent-template/types.js +7 -4
- package/dist/agents/baseagent.js +10 -9
- package/dist/agents/claude-runner.js +13 -5
- package/dist/agents/codex/app-server-client.js +2 -4
- package/dist/agents/codex/diagnostics.js +18 -1
- package/dist/agents/codex-runner.js +3 -1
- package/dist/agents/ecagent-runner.js +3 -1
- package/dist/agents/gemini-runner.js +2 -1
- package/dist/aun/menu/client.js +142 -182
- package/dist/aun/rpc/client.js +33 -17
- package/dist/aun/service-proxy.js +6 -23
- package/dist/channels/aun.js +656 -112
- package/dist/cli/agent-create.js +37 -10
- package/dist/cli/agent-template.js +105 -84
- package/dist/cli/agent.js +31 -18
- package/dist/cli/daemon-commands.js +15 -17
- package/dist/cli/daemon-lifecycle-client.js +40 -18
- package/dist/cli/directory.js +12 -4
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/events-command.js +2 -1
- package/dist/cli/init.js +50 -20
- package/dist/cli/integrity-command.js +2 -0
- package/dist/cli/managed-command-guard.js +20 -1
- package/dist/cli/menu-client.js +7 -5
- package/dist/cli/restart-monitor.js +33 -20
- package/dist/cli/services-command.js +28 -5
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +20 -2
- package/dist/config/peer-book-store.js +152 -120
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +1 -1
- package/dist/config/provider-identity.js +10 -4
- package/dist/config/provider-ipc-service.js +10 -2
- package/dist/config/provider-local-sync.js +2 -2
- package/dist/config/providers-config.js +95 -10
- package/dist/config/providers-import.js +4 -6
- package/dist/config/providers.js +14 -3
- package/dist/config/role-store.js +1 -1
- package/dist/config-store.js +9 -1
- package/dist/core/agent-application-service.js +56 -29
- package/dist/core/agent-create-status.js +3 -1
- package/dist/core/agent-creation-claim.js +1 -0
- package/dist/core/agent-ipc-registration.js +2 -2
- package/dist/core/agent-reload-coordinator.js +38 -1
- package/dist/core/agent-runtime.js +85 -38
- package/dist/core/auth/agent-delegation.js +5 -0
- package/dist/core/auth/operation-authorizer.js +1 -1
- package/dist/core/auth/operation-catalog.js +3 -3
- package/dist/core/bootstrap-service.js +3 -0
- package/dist/core/capability/capability-manager.js +3 -1
- package/dist/core/channel-loader.js +29 -3
- package/dist/core/channel-runtime.js +1 -1
- package/dist/core/command/agent-control.js +6 -5
- package/dist/core/command/agent-template-menu.js +32 -97
- package/dist/core/command/eventcenter-menu.js +61 -13
- package/dist/core/command/menu-catalog.js +11 -4
- package/dist/core/command/menu-handler.js +35 -8
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/team-workspace-bootstrap.js +1 -2
- package/dist/core/command/team-workspace-management-store.js +83 -0
- package/dist/core/command/team-workspace-management.js +1 -2
- package/dist/core/command/team-workspace-team.js +26 -3
- package/dist/core/daemon-control.js +3 -4
- package/dist/core/daemon-lifecycle.js +146 -110
- package/dist/core/evolagent-registry.js +42 -0
- package/dist/core/evolagent.js +2 -1
- package/dist/core/file-integrity/read.js +9 -16
- package/dist/core/file-integrity/store.js +94 -34
- package/dist/core/handoff/dispatcher.js +33 -7
- package/dist/core/handoff/runtime.js +8 -0
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +3 -0
- package/dist/core/message/aun-ipc-sender.js +109 -7
- package/dist/core/message/contact-admission.js +6 -2
- package/dist/core/message/message-bridge.js +13 -0
- package/dist/core/message/message-queue.js +131 -30
- package/dist/core/message/pending-hints.js +8 -0
- package/dist/core/message/response-engine.js +48 -2
- package/dist/core/message/send-routing.js +3 -12
- package/dist/core/model/catalog-service.js +13 -0
- package/dist/core/model/model-catalog.js +57 -18
- package/dist/core/pack-auth.js +163 -31
- package/dist/core/pack-install.js +42 -1
- package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
- package/dist/core/permission/ec-command-parser.js +3 -1
- package/dist/core/permission/shell-environment.js +23 -0
- package/dist/core/rate-window.js +6 -1
- package/dist/core/session/session-idle-monitor.js +0 -1
- package/dist/core/session/session-manager.js +14 -0
- package/dist/core/session/session-title.js +26 -6
- package/dist/core/skill/index-generator.js +3 -4
- package/dist/core/thread/thread-service.js +0 -1
- package/dist/core/thread/topic-id.js +8 -0
- package/dist/directory/owner-directory-admission.js +17 -0
- package/dist/directory/owner-directory-cache.js +3 -1
- package/dist/directory/owner-directory-markdown.js +145 -23
- package/dist/directory/owner-directory-policy.js +23 -0
- package/dist/directory/owner-directory-query-operation.js +20 -6
- package/dist/directory/owner-directory-search.js +47 -0
- package/dist/eck/message-renderer.js +171 -32
- package/dist/ecweb/basic-settings-service.js +7 -3
- package/dist/ecweb/providers-service.js +17 -10
- package/dist/ecweb/runtime/lifecycle.js +1 -1
- package/dist/ecweb/runtime/supervisor.js +77 -35
- package/dist/event-center/admission-materializer.js +1 -1
- package/dist/event-center/bus-gate.js +48 -4
- package/dist/event-center/bus-host.js +3 -3
- package/dist/event-center/center-config.js +57 -28
- package/dist/event-center/dispatcher.js +8 -0
- package/dist/event-center/event-log.js +69 -27
- package/dist/event-center/index-generator.js +6 -1
- package/dist/event-center/ipc-operation.js +66 -25
- package/dist/event-center/pack-loader.js +12 -55
- package/dist/event-center/pack-manager.js +5 -3
- package/dist/event-center/registry.js +48 -52
- package/dist/event-center/runtime.js +219 -81
- package/dist/event-center/script-runner.js +18 -7
- package/dist/event-center/types.js +9 -1
- package/dist/event-center/validation.js +33 -4
- package/dist/index.js +96 -42
- package/dist/ipc.js +33 -7
- package/dist/product.js +1 -0
- package/dist/proxy/manager.js +52 -11
- package/dist/proxy/service-supervisor.js +265 -67
- package/dist/services/dispatcher.js +26 -3
- package/dist/services/idempotency.js +128 -0
- package/dist/services/identity.js +3 -27
- package/dist/services/index-generator.js +5 -1
- package/dist/services/index.js +244 -45
- package/dist/services/ipc-operation.js +164 -20
- package/dist/services/pack-manager.js +37 -9
- package/dist/services/router.js +100 -31
- package/dist/services/script-runner.js +15 -4
- package/dist/services/service-payload.js +50 -2
- package/dist/services/validation.js +107 -3
- package/dist/trigger/scheduler.js +14 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/utils/cross-platform.js +35 -11
- package/dist/utils/error-utils.js +13 -1
- package/dist/utils/instance-registry.js +33 -35
- package/dist/utils/process-introspect.js +35 -20
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/windows-shell-trust.js +174 -68
- package/kits/docs/context-assembly.md +3 -3
- package/kits/docs/evolcore/agent.md +28 -10
- package/kits/docs/evolcore/config.md +22 -0
- package/kits/docs/evolcore/directory.md +46 -12
- package/kits/docs/evolcore/event-center.md +6 -6
- package/kits/docs/evolcore/group-collaboration.md +1 -1
- package/kits/docs/evolcore/menu-client.md +7 -5
- package/kits/docs/evolcore/menu-protocol.md +5 -3
- package/kits/docs/evolcore/msg.md +10 -3
- package/kits/docs/evolcore/provider.md +7 -3
- package/kits/docs/evolcore/services.md +145 -12
- package/kits/docs/evolcore/thread-chain.md +17 -9
- package/kits/docs/prompt-loading-architecture.md +4 -4
- package/kits/eck_message_manifest.json +46 -3
- package/kits/rules/04-relation.md +10 -2
- package/kits/rules/06-channel.md +2 -1
- package/kits/schemas/providers.schema.2.json +1 -0
- package/kits/skills/ec-group/SKILL.md +4 -0
- package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
- package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
- package/kits/skills/thread-ops/SKILL.md +8 -5
- package/kits/templates/message-fragments/group-batch-item.md +3 -0
- package/kits/templates/message-fragments/group-batch.md +1 -0
- package/kits/templates/message-fragments/item-group.md +4 -0
- package/kits/templates/message-fragments/item-private.md +4 -0
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +11 -7
- package/package.json +3 -2
- package/scripts/agent-template/index.mjs +9 -4
- package/scripts/agent-template/inspect.mjs +16 -9
- package/scripts/agent-template/shared/plan.mjs +3 -33
- package/scripts/agent-template/shared/template-contract.mjs +186 -3
- package/scripts/agent-template/shared/template-package.mjs +119 -10
- package/scripts/agent-template/shared/template-runtime.mjs +49 -6
- package/scripts/agent-template/shared/template.mjs +5 -5
- package/scripts/agent-template/team-pack.mjs +245 -0
- package/scripts/agent-template/team-preview.mjs +111 -0
- package/scripts/aid-batch/identity-batch.mjs +143 -0
- package/dist/ability/versions.js +0 -32
- package/dist/aun/model-headers.js +0 -17
- package/dist/channels/builtin-plugins.js +0 -19
- package/dist/core/command/team-workspace-initializer.js +0 -2
- package/dist/core/command/team-workspace-job-store.js +0 -88
- package/dist/core/command/team-workspace-management-service.js +0 -2
- package/dist/core/contact-bind-registry.js +0 -27
- package/dist/event-center/ledger.js +0 -52
- package/dist/services/reply.js +0 -55
- package/kits/templates/message-fragments/item.md +0 -3
- package/scripts/agent-template/pack.mjs +0 -169
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
1
2
|
import { resolveAunSendDevice } from '../../aun/ability-device-routing.js';
|
|
2
3
|
import crypto from 'crypto';
|
|
3
4
|
import { authorizeDelegatedAunMsgSend, delegationFailureDetailCode, hasTrustedFullAccessDelegation, } from '../auth/agent-delegation.js';
|
|
@@ -12,16 +13,21 @@ import { normalizeAunMentionEntries, withAunAttention } from '../../aun/msg/ment
|
|
|
12
13
|
import { resolveManagedSendArgv } from '../../cli/aun-commands.js';
|
|
13
14
|
import { readTriggerLocalFile, resolveAttachmentLocalPath } from '../../trigger/local-files.js';
|
|
14
15
|
import { TriggerDefinitionManager } from '../../trigger/manager.js';
|
|
15
|
-
import { sameGroupAid } from '../../aun/group/identity.js';
|
|
16
|
+
import { normalizeGroupAid, sameGroupAid } from '../../aun/group/identity.js';
|
|
16
17
|
import { resolveThreadRouteTarget } from '../thread/thread-route.js';
|
|
17
18
|
import { isTopicThreadId, parseMainTopicId, safeFormatMainTopicId, sessionLocalTopicId } from '../thread/topic-id.js';
|
|
18
19
|
import { ThreadService } from '../thread/thread-service.js';
|
|
19
20
|
import { buildEnvelope } from './message-utils.js';
|
|
20
21
|
import { sessionTopicThreadId } from '../thread/topic-id.js';
|
|
21
22
|
import { getAunRequestRegistry, requestDiagnostics, requestTtlSeconds } from './aun-request-registry.js';
|
|
22
|
-
import { parseJsonObjectArgument } from '../permission/ec-command-parser.js';
|
|
23
|
-
import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
|
|
23
|
+
import { canonicalizeEvolcoreCommandArgv, parseJsonObjectArgument } from '../permission/ec-command-parser.js';
|
|
24
|
+
import { formatPeerKey, parsePeerKey, readAunPeerKind, resolveAunPeerKind } from '../relation/peer-identity.js';
|
|
24
25
|
import { logger } from '../../utils/logger.js';
|
|
26
|
+
import { MESSAGE_CLI_BIN } from '../../product.js';
|
|
27
|
+
import { buildDownstreamArgv, expandGroupBase, parseGatewayArgs } from '../../cli/ecmsg-gateway.js';
|
|
28
|
+
import { resolveSendRoute } from './send-routing.js';
|
|
29
|
+
import { agentDir } from '../../paths.js';
|
|
30
|
+
import { chatDirPath, readAllJsonlLines } from '../session/session-fs-store.js';
|
|
25
31
|
const TASK_ID_MESSAGE_PAYLOAD_TYPES = new Set(['text', 'link', 'image', 'video', 'voice', 'file']);
|
|
26
32
|
function normalizeAid(value) {
|
|
27
33
|
return String(value ?? '').trim().replace(/^@/, '').toLowerCase();
|
|
@@ -353,13 +359,18 @@ async function deliverSelfAddressed(input) {
|
|
|
353
359
|
const storedPeerName = String(session.metadata?.peerName || '').trim();
|
|
354
360
|
const topicPeerName = storedPeerName && storedPeerName !== params.aid ? storedPeerName : topicPeerId;
|
|
355
361
|
const topicPeerType = String(session.metadata?.peerType || '').trim() || undefined;
|
|
362
|
+
const targetThreadId = sessionTopicThreadId(session) ?? '';
|
|
363
|
+
// 来源话题与目标话题不同才标「跨话题自派」;同话题自派不标。
|
|
364
|
+
const originThreadId = input.originThreadId && input.originThreadId !== targetThreadId
|
|
365
|
+
? input.originThreadId : undefined;
|
|
356
366
|
const message = {
|
|
357
367
|
channel: session.channel,
|
|
358
368
|
channelType: session.channelType,
|
|
359
369
|
channelId: session.channelId,
|
|
360
370
|
selfAID: params.aid,
|
|
361
371
|
baseagent: session.baseagent,
|
|
362
|
-
threadId:
|
|
372
|
+
threadId: targetThreadId,
|
|
373
|
+
...(originThreadId ? { originThreadId, originPeer: input.originPeer } : {}),
|
|
363
374
|
chatType: session.chatType === 'group' ? 'group' : 'private',
|
|
364
375
|
peerId: topicPeerId,
|
|
365
376
|
peerName: topicPeerName,
|
|
@@ -379,6 +390,17 @@ async function deliverSelfAddressed(input) {
|
|
|
379
390
|
// visitor,与任务实际以 owner 权限运行矛盾,模型会误判自己没有权限。
|
|
380
391
|
let enqueueRole;
|
|
381
392
|
if (session.chatType !== 'group') {
|
|
393
|
+
try {
|
|
394
|
+
// 先刷新同归属证明:角色解析要求 qualification === matched,而这份证明
|
|
395
|
+
// 只有 30s 有效期。不先刷新的话,第一次解析会落到 visitor 兜底并把对端
|
|
396
|
+
// 加入 knownTeams;之后缓存一过期,同归属分支就要求 matched,拿不到直接
|
|
397
|
+
// 判 none,任务被拒。这就是“第一次成功、过一会儿再派就失败”的原因。
|
|
398
|
+
const { prepareSameOwnerProof } = await import('../relation/same-owner-proof.js');
|
|
399
|
+
await prepareSameOwnerProof(params.aid, session.channelId);
|
|
400
|
+
}
|
|
401
|
+
catch {
|
|
402
|
+
// 证明刷新失败不阻塞解析,下面按兜底处理。
|
|
403
|
+
}
|
|
382
404
|
try {
|
|
383
405
|
const { resolvePeerRoleDetail } = await import('../../config/peer-role-resolver.js');
|
|
384
406
|
enqueueRole = resolvePeerRoleDetail({
|
|
@@ -395,6 +417,12 @@ async function deliverSelfAddressed(input) {
|
|
|
395
417
|
// 角色解析失败按缺省处理,不影响投递。
|
|
396
418
|
}
|
|
397
419
|
}
|
|
420
|
+
// 自派是本地任务,不能因为对端角色解析失败被挡死:解析不到(含长驻进程里
|
|
421
|
+
// 归属证明缓存态导致的 null)就退回内置 visitor,与普通私聊的缺省一致。
|
|
422
|
+
if (session.chatType !== 'group' && !enqueueRole) {
|
|
423
|
+
logger.warn('[AUN] self-dispatch role unresolved; falling back to visitor');
|
|
424
|
+
enqueueRole = 'visitor';
|
|
425
|
+
}
|
|
398
426
|
try {
|
|
399
427
|
await input.messageQueue.enqueue(session.id, message, session.projectPath, {
|
|
400
428
|
interruptible: false,
|
|
@@ -436,6 +464,71 @@ function targetTopicLabel(topicId) {
|
|
|
436
464
|
return topicId;
|
|
437
465
|
return 'main';
|
|
438
466
|
}
|
|
467
|
+
/** Resolve gateway options only from an authenticated task and local topic evidence. */
|
|
468
|
+
async function resolveGatewaySend(argv, grant, runtime) {
|
|
469
|
+
if (argv[1] !== 'send' || grant.channelType !== 'aun' || !runtime) {
|
|
470
|
+
throw new Error('An active AUN task is required for gateway sends');
|
|
471
|
+
}
|
|
472
|
+
const parsed = parseGatewayArgs(canonicalizeEvolcoreCommandArgv(argv).slice(3));
|
|
473
|
+
if (!parsed.ok)
|
|
474
|
+
throw new Error(parsed.error);
|
|
475
|
+
const { route: options, text, passthrough } = parsed;
|
|
476
|
+
const currentPeer = parsePeerKey(grant.peerKey).channelId;
|
|
477
|
+
const resolveKind = async (target) => {
|
|
478
|
+
if (normalizeAid(target) === normalizeAid(currentPeer))
|
|
479
|
+
return grant.chatType;
|
|
480
|
+
if (normalizeAid(target) === normalizeAid(grant.selfAid))
|
|
481
|
+
return grant.chatType;
|
|
482
|
+
const local = readAunPeerKind(grant.selfAid, target)?.kind;
|
|
483
|
+
if (local === 'private' || local === 'group')
|
|
484
|
+
return local;
|
|
485
|
+
try {
|
|
486
|
+
const remote = (await resolveAunPeerKind(grant.selfAid, target))?.kind;
|
|
487
|
+
return remote === 'group' ? 'group' : 'private';
|
|
488
|
+
}
|
|
489
|
+
catch {
|
|
490
|
+
return 'private';
|
|
491
|
+
}
|
|
492
|
+
};
|
|
493
|
+
const kinds = new Map();
|
|
494
|
+
if (options.to) {
|
|
495
|
+
options.to = expandGroupBase(grant.selfAid, options.to, normalizeGroupAid);
|
|
496
|
+
kinds.set(options.to, await resolveKind(options.to));
|
|
497
|
+
}
|
|
498
|
+
const mainPeer = options.thread ? parseMainTopicId(options.thread) : undefined;
|
|
499
|
+
if (mainPeer) {
|
|
500
|
+
const peer = mainPeer.aidA === grant.selfAid ? mainPeer.aidB : mainPeer.aidA;
|
|
501
|
+
kinds.set(peer, await resolveKind(peer));
|
|
502
|
+
}
|
|
503
|
+
const deps = {
|
|
504
|
+
resolveThread: threadId => {
|
|
505
|
+
const entry = ThreadService.findThreadById(grant.selfAid, threadId);
|
|
506
|
+
return entry ? { threadId: entry.threadId, selfAid: grant.selfAid,
|
|
507
|
+
peer: { channelType: entry.channelType ?? 'aun', peerKind: entry.peerKind, id: entry.peer } } : undefined;
|
|
508
|
+
},
|
|
509
|
+
resolveTarget: id => ({ channelType: 'aun', peerKind: kinds.get(id) ?? 'private', id }),
|
|
510
|
+
resolvePeerKind: id => kinds.get(id),
|
|
511
|
+
mainSessionExists: peer => !!ThreadService.findMainSessionEntry(grant.selfAid, peer.id),
|
|
512
|
+
resolveLastTopicEncrypt: threadId => {
|
|
513
|
+
const entry = ThreadService.findThreadById(grant.selfAid, threadId);
|
|
514
|
+
if (!entry)
|
|
515
|
+
return undefined;
|
|
516
|
+
const chatDir = chatDirPath(path.dirname(agentDir(grant.selfAid)), entry.channelType ?? 'aun', entry.peer, grant.selfAid);
|
|
517
|
+
const lines = readAllJsonlLines(path.join(chatDir, 'messages.jsonl'));
|
|
518
|
+
return lines.reverse().find(line => line.threadId === threadId)?.encrypt;
|
|
519
|
+
},
|
|
520
|
+
};
|
|
521
|
+
const route = resolveSendRoute({ ...options,
|
|
522
|
+
encrypt: options.encrypt,
|
|
523
|
+
inboundTriggered: runtime.inboundEncrypted !== undefined,
|
|
524
|
+
inboundEncrypted: runtime.inboundEncrypted === true, }, {
|
|
525
|
+
selfAid: grant.selfAid, channelType: grant.channelType, chatType: grant.chatType,
|
|
526
|
+
peerId: currentPeer, threadId: isTopicThreadId(runtime.threadId) ? runtime.threadId : undefined,
|
|
527
|
+
}, deps);
|
|
528
|
+
if (!route.ok)
|
|
529
|
+
throw Object.assign(new Error(route.message), { code: route.code });
|
|
530
|
+
return { route, argv: buildDownstreamArgv(route, text, passthrough) };
|
|
531
|
+
}
|
|
439
532
|
export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, sessionManager, messageQueue, createCrossThreadReviewTrigger, }) {
|
|
440
533
|
ipcServer.setAunRequestGetExecutor(async (params) => {
|
|
441
534
|
if (!params.sessionId || !params.delegationToken) {
|
|
@@ -471,7 +564,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
471
564
|
return request ? { ok: true, request: request }
|
|
472
565
|
: { ok: false, code: 'REQUEST_NOT_FOUND', error: `request not found: ${params.requestId}` };
|
|
473
566
|
});
|
|
474
|
-
const sender = async (params) => {
|
|
567
|
+
const sender = async (params, inspectedGrant) => {
|
|
475
568
|
let textFile;
|
|
476
569
|
let payloadFile;
|
|
477
570
|
try {
|
|
@@ -490,7 +583,8 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
490
583
|
return { ok: false, code: 'DELEGATION_REQUIRED', error: 'Origin session is required', sent: false };
|
|
491
584
|
}
|
|
492
585
|
// 先核验原始命令和会话凭据,再使用 grant 补全路由;这里不消费审批。
|
|
493
|
-
const authorization =
|
|
586
|
+
const authorization = inspectedGrant ? { ok: true, grant: inspectedGrant }
|
|
587
|
+
: agentDelegationRegistry.validateForContext(params.delegationToken, params.originSessionId, params.delegationCommandHash);
|
|
494
588
|
if (!authorization.ok) {
|
|
495
589
|
return {
|
|
496
590
|
ok: false,
|
|
@@ -502,6 +596,12 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
502
596
|
};
|
|
503
597
|
}
|
|
504
598
|
const grant = authorization.grant;
|
|
599
|
+
if (params.argv[0] === MESSAGE_CLI_BIN) {
|
|
600
|
+
const resolved = await resolveGatewaySend(params.argv, grant, responseEngine.getTaskRuntimeContext(params.originSessionId));
|
|
601
|
+
// 只变更执行参数,审批仍绑定网关的原始命令;下游继续校验目标并消费一次审批。
|
|
602
|
+
const result = await sender({ ...params, argv: resolved.argv }, grant);
|
|
603
|
+
return { ...result, send_route: resolved.route };
|
|
604
|
+
}
|
|
505
605
|
const command = resolveManagedSendArgv(params.argv, {
|
|
506
606
|
selfAid: grant.selfAid,
|
|
507
607
|
peerId: grant.channelType === 'aun' && grant.chatType === 'private'
|
|
@@ -965,7 +1065,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
965
1065
|
return { ok: true, request_id: preparedRequest.requestId, request_state: request.state,
|
|
966
1066
|
...(request.responsePayload ? { response: request.responsePayload } : {}),
|
|
967
1067
|
...(request.responses ? { responses: request.responses } : {}),
|
|
968
|
-
...(request ? { request_diagnostics: requestDiagnostics(request) } : {}),
|
|
1068
|
+
...(request ? { request_diagnostics: { ...requestDiagnostics(request) } } : {}),
|
|
969
1069
|
transport_error: transportError, retryable: false, sent: true };
|
|
970
1070
|
}
|
|
971
1071
|
return { ...sent, ok: false, request_id: preparedRequest.requestId, request_state: request?.state ?? 'failed' };
|
|
@@ -994,6 +1094,8 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
994
1094
|
channelInstances,
|
|
995
1095
|
content: params.log?.content ?? classifyAunPayloadForLog(payload).content,
|
|
996
1096
|
encrypted: encrypt,
|
|
1097
|
+
originThreadId: runtime?.threadId,
|
|
1098
|
+
originPeer: runtime?.peerId,
|
|
997
1099
|
});
|
|
998
1100
|
if (delivered.deliveryError)
|
|
999
1101
|
sent.self_delivery_error = delivered.deliveryError;
|
|
@@ -182,7 +182,7 @@ function withContactStateLock(selfAid, name, action) {
|
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
/** The successful snapshot is read once; allow flags cannot bypass scope or denial. */
|
|
185
|
-
export function evaluateAppContactAdmission(selfAid, aid, now = Date.now()) {
|
|
185
|
+
export function evaluateAppContactAdmission(selfAid, aid, now = Date.now(), options = {}) {
|
|
186
186
|
if (!isValidAid(selfAid) || !isValidAid(aid))
|
|
187
187
|
return { allow: false, reason: 'unavailable' };
|
|
188
188
|
const binding = currentContactBinding(selfAid);
|
|
@@ -202,8 +202,12 @@ export function evaluateAppContactAdmission(selfAid, aid, now = Date.now()) {
|
|
|
202
202
|
invalidateGrants(selfAid, binding, aid);
|
|
203
203
|
return { allow: false, reason: 'scope_extension' };
|
|
204
204
|
}
|
|
205
|
-
|
|
205
|
+
// 临时授权的有效期很短(默认分钟级)。长效规则不该跟着它抖动,服务调用属
|
|
206
|
+
// 长效口径,所以传 `includeTemporary: false` 跳过这一步——与事件订阅的
|
|
207
|
+
// 准入快照刻意不读临时授权同理。
|
|
208
|
+
if (options.includeTemporary !== false && hasTemporaryContactGrant(selfAid, aid, binding, now)) {
|
|
206
209
|
return { allow: true, reason: 'temporary' };
|
|
210
|
+
}
|
|
207
211
|
if (member.entry)
|
|
208
212
|
return { allow: true, reason: 'contact' };
|
|
209
213
|
// 未命中名录的陌生人不属于内外部联系人,只接受总开关或单独授权。
|
|
@@ -1578,6 +1578,12 @@ export class MessageBridge {
|
|
|
1578
1578
|
gatewaySeq: msg.gatewaySeq,
|
|
1579
1579
|
peerId: msg.peerId, peerName: msg.peerName,
|
|
1580
1580
|
peerType: msg.peerType,
|
|
1581
|
+
peerExttype: msg.peerExttype,
|
|
1582
|
+
groupRole: msg.groupRole,
|
|
1583
|
+
groupRoles: msg.groupRoles,
|
|
1584
|
+
myGroupRole: msg.myGroupRole,
|
|
1585
|
+
speakerRelation: msg.speakerRelation,
|
|
1586
|
+
senderCtx: msg.senderCtx,
|
|
1581
1587
|
sameDevice: msg.sameDevice,
|
|
1582
1588
|
sameNetwork: msg.sameNetwork,
|
|
1583
1589
|
sameEgressIp: msg.sameEgressIp,
|
|
@@ -1605,6 +1611,13 @@ export class MessageBridge {
|
|
|
1605
1611
|
fullMessage.sourceMessageIds = autoResult.batch.flatMap(item => item.messageId ? [item.messageId] : []);
|
|
1606
1612
|
fullMessage.items = autoResult.batch.map(item => ({
|
|
1607
1613
|
peerId: item.sender, peerName: item.value.peerName, peerType: item.value.peerType,
|
|
1614
|
+
peerExttype: item.value.peerExttype,
|
|
1615
|
+
messageId: item.messageId,
|
|
1616
|
+
groupRole: item.value.groupRole ?? item.value.groupRoles?.[String(item.sender).toLowerCase()],
|
|
1617
|
+
isMentioned: item.value.isMentioned,
|
|
1618
|
+
senderCtx: item.value.senderCtx,
|
|
1619
|
+
speakerRelation: item.value.speakerRelation
|
|
1620
|
+
?? (effectiveChannelType === 'aun' ? 'visitor' : (item.role ?? 'visitor')),
|
|
1608
1621
|
peerRole: item.role, content: item.content,
|
|
1609
1622
|
mentions: item.value.mentions, mentionAids: item.value.mentionAids,
|
|
1610
1623
|
images: item.value.images, timestamp: item.receivedAt,
|
|
@@ -6,6 +6,30 @@ import { normalizeCausation } from '../causation/context.js';
|
|
|
6
6
|
import { KeyedFairMutex } from '../handoff/mutex.js';
|
|
7
7
|
import { ExecutionTimeoutError, OrphanedTargetSessionError, isExecutionFailure } from '../../utils/error-utils.js';
|
|
8
8
|
import { isTopicThreadId, normalizeTopicAid, safeFormatMainTopicId } from '../thread/topic-id.js';
|
|
9
|
+
/** Validate before either classification or restoration can rewrite the snapshot. */
|
|
10
|
+
export function parseQueueSnapshot(value) {
|
|
11
|
+
const file = value;
|
|
12
|
+
if (!file || ![1, 2, 3].includes(file.version) || !Array.isArray(file.queues)
|
|
13
|
+
|| (file.active !== undefined && !Array.isArray(file.active))
|
|
14
|
+
|| (file.version === 3 && (!Array.isArray(file.recoveryIndexedAids)
|
|
15
|
+
|| file.recoveryIndexedAids.some(aid => typeof aid !== 'string' || !aid) || !Array.isArray(file.active)))) {
|
|
16
|
+
throw new Error('invalid message queue snapshot');
|
|
17
|
+
}
|
|
18
|
+
const validPart = (part) => !!part && typeof part.projectPath === 'string'
|
|
19
|
+
&& !!part.projectPath && !!part.message && typeof part.message === 'object'
|
|
20
|
+
&& typeof part.message.channel === 'string' && typeof part.message.channelId === 'string';
|
|
21
|
+
for (const bucket of [...file.queues, ...(file.active ?? [])]) {
|
|
22
|
+
if (!bucket || typeof bucket.queueKey !== 'string' || !bucket.queueKey || !Array.isArray(bucket.items)
|
|
23
|
+
|| bucket.items.some(item => !validPart(item)
|
|
24
|
+
|| (item.parts !== undefined && (!Array.isArray(item.parts) || item.parts.some(part => !validPart(part)))))) {
|
|
25
|
+
throw new Error('invalid message queue bucket');
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return file;
|
|
29
|
+
}
|
|
30
|
+
export function hasIndexedRecovery(file, aid) {
|
|
31
|
+
return file?.version === 3 && file.recoveryIndexedAids?.includes(aid) === true;
|
|
32
|
+
}
|
|
9
33
|
const DEFAULT_AGENT_NAME = '<unknown>';
|
|
10
34
|
const RESTART_RESUME_CONTENT = 'evolcore 服务已重启,请继续之前未完成的任务。';
|
|
11
35
|
export class MessageQueue {
|
|
@@ -41,6 +65,7 @@ export class MessageQueue {
|
|
|
41
65
|
DEDUP_WINDOW = 60_000; // 1 分钟窗口
|
|
42
66
|
interceptors = new Map();
|
|
43
67
|
mutedAgents = new Set(); // 禁言的 agent:消息照常入队,但不取出给大模型
|
|
68
|
+
agentHolds = new Map();
|
|
44
69
|
persistencePath;
|
|
45
70
|
dedupPath;
|
|
46
71
|
dedupTtlMs;
|
|
@@ -51,6 +76,8 @@ export class MessageQueue {
|
|
|
51
76
|
droppedTriggerSessionIds = new Set();
|
|
52
77
|
shuttingDown = false;
|
|
53
78
|
blockedReason;
|
|
79
|
+
wasObserverHintConsumed;
|
|
80
|
+
recoveryIndexedAids = [];
|
|
54
81
|
blockedQueues = new Map();
|
|
55
82
|
readinessRetry;
|
|
56
83
|
shutdownPromise;
|
|
@@ -60,6 +87,7 @@ export class MessageQueue {
|
|
|
60
87
|
constructor(handler, options) {
|
|
61
88
|
this.handler = handler;
|
|
62
89
|
this.blockedReason = options?.blockedReason;
|
|
90
|
+
this.wasObserverHintConsumed = options?.wasObserverHintConsumed;
|
|
63
91
|
this.persistencePath = options?.persistencePath;
|
|
64
92
|
this.dedupPath = options?.dedupPath
|
|
65
93
|
?? (this.persistencePath ? `${this.persistencePath}.dedup.json` : undefined);
|
|
@@ -187,6 +215,28 @@ export class MessageQueue {
|
|
|
187
215
|
return;
|
|
188
216
|
}
|
|
189
217
|
}
|
|
218
|
+
/** Persist the exact hint target before its separate ledger records consumption. */
|
|
219
|
+
prepareObserverHintExecution(sessionId) {
|
|
220
|
+
for (const [key, item] of this.activeBatches) {
|
|
221
|
+
if (!this.matchesSession(key, sessionId) || item.message.source !== 'owner-inject')
|
|
222
|
+
continue;
|
|
223
|
+
const state = this.activeStates.get(key);
|
|
224
|
+
state.hintExecution = true;
|
|
225
|
+
if (!this.persistQueuesSync()) {
|
|
226
|
+
state.hintExecution = false;
|
|
227
|
+
throw new Error('Failed to persist observer hint execution');
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
/** Only call after legacy recovery has been registered successfully. */
|
|
232
|
+
completeRecoveryIndex(aids) {
|
|
233
|
+
const previous = this.recoveryIndexedAids;
|
|
234
|
+
this.recoveryIndexedAids = [...new Set([...previous, ...aids])].sort();
|
|
235
|
+
if (this.persistQueuesSync())
|
|
236
|
+
return true;
|
|
237
|
+
this.recoveryIndexedAids = previous;
|
|
238
|
+
return false;
|
|
239
|
+
}
|
|
190
240
|
/**
|
|
191
241
|
* 注册一次性消息拦截器:下一条来自 sessionKey 的消息不入队、不触发 interrupt,
|
|
192
242
|
* 直接传给 handler。用于 AskUserQuestion 的"手动输入"场景。
|
|
@@ -779,23 +829,18 @@ export class MessageQueue {
|
|
|
779
829
|
});
|
|
780
830
|
}
|
|
781
831
|
for (const [queueKey, item] of this.activeBatches.entries()) {
|
|
782
|
-
|
|
832
|
+
const hintExecution = this.activeStates.get(queueKey)?.hintExecution;
|
|
833
|
+
if (item.message.source === 'owner-inject' && !hintExecution)
|
|
783
834
|
continue;
|
|
784
835
|
activeBuckets.push({
|
|
785
836
|
queueKey,
|
|
786
|
-
items: [this.serializeItem(item)],
|
|
837
|
+
items: [{ ...this.serializeItem(item), ...(hintExecution ? { hintExecution: true } : {}) }],
|
|
787
838
|
});
|
|
788
839
|
}
|
|
789
840
|
fs.mkdirSync(path.dirname(this.persistencePath), { recursive: true });
|
|
790
|
-
if (buckets.length === 0 && activeBuckets.length === 0) {
|
|
791
|
-
try {
|
|
792
|
-
fs.unlinkSync(this.persistencePath);
|
|
793
|
-
}
|
|
794
|
-
catch { }
|
|
795
|
-
return true;
|
|
796
|
-
}
|
|
797
841
|
const data = {
|
|
798
|
-
version:
|
|
842
|
+
version: 3,
|
|
843
|
+
recoveryIndexedAids: this.recoveryIndexedAids,
|
|
799
844
|
updatedAt: Date.now(),
|
|
800
845
|
queues: buckets,
|
|
801
846
|
active: activeBuckets,
|
|
@@ -862,9 +907,17 @@ export class MessageQueue {
|
|
|
862
907
|
const queue = this.queues.get(bucket.queueKey);
|
|
863
908
|
const sessionKey = this.sessionKeyFromQueueKey(bucket.queueKey);
|
|
864
909
|
let restored = 0;
|
|
865
|
-
for (const
|
|
910
|
+
for (const original of bucket.items) {
|
|
911
|
+
let item = original;
|
|
866
912
|
if (!item?.message || !item.projectPath)
|
|
867
913
|
continue;
|
|
914
|
+
if (item.message.source === 'owner-inject') {
|
|
915
|
+
if (!item.hintExecution || !this.wasObserverHintConsumed?.(item.message))
|
|
916
|
+
continue;
|
|
917
|
+
// The hint was already consumed. Resume its exact Session without replaying the hint.
|
|
918
|
+
item = { ...item, parts: undefined, message: { ...item.message, source: 'recovery',
|
|
919
|
+
observerHintId: undefined, observerHintRequestId: undefined } };
|
|
920
|
+
}
|
|
868
921
|
const rawParts = Array.isArray(item.parts) && item.parts.length > 0
|
|
869
922
|
? item.parts.filter(part => part?.message && part.projectPath && this.shouldRestoreMessage(part.message, sessionKey))
|
|
870
923
|
: this.shouldRestoreMessage(item.message, sessionKey) ? [item] : [];
|
|
@@ -897,17 +950,24 @@ export class MessageQueue {
|
|
|
897
950
|
restoredKeys.add(bucket.queueKey);
|
|
898
951
|
return restored;
|
|
899
952
|
}
|
|
900
|
-
restorePersisted(startProcessing = true) {
|
|
901
|
-
if (!this.persistencePath
|
|
953
|
+
restorePersisted(startProcessing = true, snapshot) {
|
|
954
|
+
if (!this.persistencePath)
|
|
902
955
|
return 0;
|
|
903
956
|
let restored = 0;
|
|
904
957
|
try {
|
|
905
|
-
|
|
906
|
-
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
958
|
+
let captured = snapshot;
|
|
959
|
+
if (captured === undefined) {
|
|
960
|
+
try {
|
|
961
|
+
captured = JSON.parse(fs.readFileSync(this.persistencePath, 'utf-8'));
|
|
962
|
+
}
|
|
963
|
+
catch (error) {
|
|
964
|
+
if (error.code === 'ENOENT')
|
|
965
|
+
return 0;
|
|
966
|
+
throw error;
|
|
967
|
+
}
|
|
910
968
|
}
|
|
969
|
+
const parsed = parseQueueSnapshot(captured);
|
|
970
|
+
this.recoveryIndexedAids = parsed.version === 3 ? [...parsed.recoveryIndexedAids] : [];
|
|
911
971
|
// Version-1 snapshots did not carry per-item enqueue times. Preserve
|
|
912
972
|
// their last durable snapshot time instead of making restored history
|
|
913
973
|
// look newly queued at the moment of daemon restart.
|
|
@@ -948,7 +1008,8 @@ export class MessageQueue {
|
|
|
948
1008
|
}
|
|
949
1009
|
}
|
|
950
1010
|
}
|
|
951
|
-
this.
|
|
1011
|
+
if (!this.persistQueuesSync())
|
|
1012
|
+
throw new Error('Failed to persist restored message queue');
|
|
952
1013
|
this.persistDurableDedup();
|
|
953
1014
|
if (restored > 0) {
|
|
954
1015
|
logger.info(`[Queue] Restored ${restored} persisted message(s) from ${this.persistencePath}`);
|
|
@@ -962,6 +1023,8 @@ export class MessageQueue {
|
|
|
962
1023
|
}
|
|
963
1024
|
catch (error) {
|
|
964
1025
|
logger.error('[Queue] Failed to restore persisted queue:', error);
|
|
1026
|
+
// Do not start a partially restored queue or certify its recovery coverage.
|
|
1027
|
+
throw error;
|
|
965
1028
|
}
|
|
966
1029
|
return restored;
|
|
967
1030
|
}
|
|
@@ -1156,7 +1219,7 @@ export class MessageQueue {
|
|
|
1156
1219
|
}
|
|
1157
1220
|
// A duplicate must not re-enter a runner after the queue entry has
|
|
1158
1221
|
// survived its write-ahead snapshot. Keep this separate from the queue
|
|
1159
|
-
// snapshot because
|
|
1222
|
+
// snapshot because deduplication must survive task completion.
|
|
1160
1223
|
if (message.source !== 'owner-inject')
|
|
1161
1224
|
this.rememberDurably(sessionKey, message, options?.selfAID);
|
|
1162
1225
|
try {
|
|
@@ -1276,7 +1339,7 @@ export class MessageQueue {
|
|
|
1276
1339
|
}
|
|
1277
1340
|
// 禁言:消息留在队列里,暂停消费(解禁后由 unmuteAgent 重新触发 processNext)
|
|
1278
1341
|
const headAgent = queue[0].agentName || DEFAULT_AGENT_NAME;
|
|
1279
|
-
if (this.
|
|
1342
|
+
if (this.isAgentMuted(headAgent)) {
|
|
1280
1343
|
logger.info(`[Queue] processNext: agent ${headAgent} muted, pausing key=${queueKey} (${queue.length} pending, ${this.queueRawMessageCount(queue)} raw)`);
|
|
1281
1344
|
this.processing.delete(queueKey);
|
|
1282
1345
|
this.processingAgent.delete(queueKey);
|
|
@@ -1301,14 +1364,8 @@ export class MessageQueue {
|
|
|
1301
1364
|
}
|
|
1302
1365
|
this.blockedQueues.delete(queueKey);
|
|
1303
1366
|
// 贪心合并:群聊按完整时间线,旧路径/私聊按 peerId
|
|
1367
|
+
const pendingBeforeDequeue = queue.slice();
|
|
1304
1368
|
const items = this.dequeueGreedy(queue, sessionId);
|
|
1305
|
-
// 同步逻辑队列:移除所有被合并处理的消息
|
|
1306
|
-
if (items.length > 0) {
|
|
1307
|
-
const processedIds = items.map(item => item.message.messageId).filter((id) => !!id);
|
|
1308
|
-
if (processedIds.length > 0) {
|
|
1309
|
-
this.logicalQueue.removeProcessed(queueKey, processedIds);
|
|
1310
|
-
}
|
|
1311
|
-
}
|
|
1312
1369
|
const merged = items.length === 1 ? items[0] : this.mergeItems(items);
|
|
1313
1370
|
const rawItems = items.flatMap(item => this.partsOf(item).map(part => this.itemFromPart(part)));
|
|
1314
1371
|
const rawParts = rawItems.map(item => this.partFromItem(item));
|
|
@@ -1347,7 +1404,22 @@ export class MessageQueue {
|
|
|
1347
1404
|
const rejects = rawItems.map(i => i.reject);
|
|
1348
1405
|
this.activeBatches.set(queueKey, activeItem);
|
|
1349
1406
|
this.processingStartTime.set(queueKey, Date.now());
|
|
1350
|
-
this.
|
|
1407
|
+
if (!this.persistQueuesSync()) {
|
|
1408
|
+
// Keep the last durable pending snapshot authoritative; never execute an unrecorded batch.
|
|
1409
|
+
this.activeBatches.delete(queueKey);
|
|
1410
|
+
this.activeStates.delete(queueKey);
|
|
1411
|
+
this.processingStartTime.delete(queueKey);
|
|
1412
|
+
queue.splice(0, queue.length, ...pendingBeforeDequeue);
|
|
1413
|
+
this.processing.delete(queueKey);
|
|
1414
|
+
this.processingAgent.delete(queueKey);
|
|
1415
|
+
this.blockedQueues.set(queueKey, 'queue persistence');
|
|
1416
|
+
this.retryBlockedQueues();
|
|
1417
|
+
return;
|
|
1418
|
+
}
|
|
1419
|
+
// Remove logical FIFO entries only after the active snapshot is durable.
|
|
1420
|
+
const processedIds = items.map(item => item.message.messageId).filter((id) => !!id);
|
|
1421
|
+
if (processedIds.length > 0)
|
|
1422
|
+
this.logicalQueue.removeProcessed(queueKey, processedIds);
|
|
1351
1423
|
logger.info(`[Queue] processing batch: key=${queueKey} items=${rawItems.length} pending=${queue.length} rawPending=${this.queueRawMessageCount(queue)} batchRole=${merged.message.batchRole ?? '<mixed>'} peer=${activeState.peerId ?? '<multi>'} msg=${merged.message.messageId ?? '<none>'} sourceIds=${Array.from(activeMessageIds).join(',')}`);
|
|
1352
1424
|
try {
|
|
1353
1425
|
await this.handler(merged.message);
|
|
@@ -1643,6 +1715,14 @@ export class MessageQueue {
|
|
|
1643
1715
|
peerId: selfAddressed ? (m.selfAID || m.peerId) : m.peerId,
|
|
1644
1716
|
peerName: selfAddressed ? undefined : m.peerName,
|
|
1645
1717
|
peerType: selfAddressed ? 'agent' : m.peerType,
|
|
1718
|
+
peerExttype: selfAddressed ? undefined : m.peerExttype,
|
|
1719
|
+
messageId: m.messageId,
|
|
1720
|
+
groupRole: m.groupRole,
|
|
1721
|
+
isMentioned: m.isMentioned,
|
|
1722
|
+
senderCtx: m.senderCtx,
|
|
1723
|
+
speakerRelation: m.speakerRelation,
|
|
1724
|
+
originThreadId: m.originThreadId,
|
|
1725
|
+
originPeer: m.originPeer,
|
|
1646
1726
|
selfAddressed: selfAddressed || undefined,
|
|
1647
1727
|
peerRole: item.role,
|
|
1648
1728
|
sameDevice: m.sameDevice, sameNetwork: m.sameNetwork, sameEgressIp: m.sameEgressIp,
|
|
@@ -2123,6 +2203,27 @@ export class MessageQueue {
|
|
|
2123
2203
|
unmuteAgent(agentName) {
|
|
2124
2204
|
if (!this.mutedAgents.delete(agentName))
|
|
2125
2205
|
return;
|
|
2206
|
+
this.resumeAgentQueue(agentName);
|
|
2207
|
+
}
|
|
2208
|
+
/** Scoped holds cannot be removed by another operation's unmute or release. */
|
|
2209
|
+
holdAgent(agentName, token) {
|
|
2210
|
+
const holds = this.agentHolds.get(agentName) ?? new Set();
|
|
2211
|
+
holds.add(token);
|
|
2212
|
+
this.agentHolds.set(agentName, holds);
|
|
2213
|
+
let released = false;
|
|
2214
|
+
return () => {
|
|
2215
|
+
if (released)
|
|
2216
|
+
return;
|
|
2217
|
+
released = true;
|
|
2218
|
+
holds.delete(token);
|
|
2219
|
+
if (!holds.size && this.agentHolds.get(agentName) === holds)
|
|
2220
|
+
this.agentHolds.delete(agentName);
|
|
2221
|
+
this.resumeAgentQueue(agentName);
|
|
2222
|
+
};
|
|
2223
|
+
}
|
|
2224
|
+
resumeAgentQueue(agentName) {
|
|
2225
|
+
if (this.isAgentMuted(agentName))
|
|
2226
|
+
return;
|
|
2126
2227
|
logger.info(`[Queue] Unmuted agent ${agentName}, resuming queued messages`);
|
|
2127
2228
|
for (const [key, queue] of this.queues) {
|
|
2128
2229
|
if (queue.length > 0 && !this.processing.has(key)) {
|
|
@@ -2133,7 +2234,7 @@ export class MessageQueue {
|
|
|
2133
2234
|
}
|
|
2134
2235
|
}
|
|
2135
2236
|
isAgentMuted(agentName) {
|
|
2136
|
-
return this.mutedAgents.has(agentName);
|
|
2237
|
+
return this.mutedAgents.has(agentName) || !!this.agentHolds.get(agentName)?.size;
|
|
2137
2238
|
}
|
|
2138
2239
|
beginAgentInterrupt(agentName) {
|
|
2139
2240
|
let interrupted = 0;
|
|
@@ -369,6 +369,14 @@ export function commitHintClaim(claim, ts = Date.now()) {
|
|
|
369
369
|
return false;
|
|
370
370
|
}
|
|
371
371
|
}
|
|
372
|
+
/** Check one known target; startup must not enumerate historical Sessions for a queued execution. */
|
|
373
|
+
export function wasInterruptHintConsumed(sessionsDir, message) {
|
|
374
|
+
if (!message.selfAID || !message.observerHintId)
|
|
375
|
+
return false;
|
|
376
|
+
const fp = hintsPath(sessionsDir, 'aun', message.channelId, message.selfAID, message.channel);
|
|
377
|
+
return readEvents(fp).some(event => event.action === 'consumed' && event.targetId === message.observerHintId
|
|
378
|
+
&& eventChatType(event) === normChatType(message.chatType) && normThread(event.threadId) === normThread(message.threadId));
|
|
379
|
+
}
|
|
372
380
|
export function hintsToSubMessages(hints) {
|
|
373
381
|
return hints.map(h => ({
|
|
374
382
|
kind: 'owner-hint',
|