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
|
@@ -98,6 +98,11 @@ export function classifyAunPayloadForLog(payload) {
|
|
|
98
98
|
return { msgType: 'text', content };
|
|
99
99
|
}
|
|
100
100
|
const record = payload;
|
|
101
|
+
// Card submissions may carry credentials, including replies to expired cards
|
|
102
|
+
// after a restart. Never rely on the live card registry or caller flags to redact.
|
|
103
|
+
if (record.type === 'action_card_reply') {
|
|
104
|
+
return { msgType: 'action_card_reply', payloadType: 'action_card_reply', content: '[卡片回复]' };
|
|
105
|
+
}
|
|
101
106
|
const rawType = typeof record.type === 'string' && record.type.trim()
|
|
102
107
|
? record.type.trim()
|
|
103
108
|
: undefined;
|
|
@@ -329,6 +334,30 @@ export function appendMessageLog(chatDir, entry) {
|
|
|
329
334
|
}
|
|
330
335
|
notifyInbound(chatDir, entry);
|
|
331
336
|
}
|
|
337
|
+
/** Durable replay history deduplication across daemon restarts. */
|
|
338
|
+
export function appendInboundMessageLogOnce(chatDir, entry, operationId) {
|
|
339
|
+
const file = messageLogPath(chatDir);
|
|
340
|
+
let lines = [];
|
|
341
|
+
try {
|
|
342
|
+
lines = fs.readFileSync(file, 'utf8').split('\n');
|
|
343
|
+
}
|
|
344
|
+
catch (error) {
|
|
345
|
+
if (error.code !== 'ENOENT')
|
|
346
|
+
throw error;
|
|
347
|
+
}
|
|
348
|
+
for (const line of lines) {
|
|
349
|
+
let previous;
|
|
350
|
+
try {
|
|
351
|
+
previous = JSON.parse(line);
|
|
352
|
+
}
|
|
353
|
+
catch {
|
|
354
|
+
continue;
|
|
355
|
+
}
|
|
356
|
+
if (previous.dir === 'in' && previous.operationId === operationId)
|
|
357
|
+
return;
|
|
358
|
+
}
|
|
359
|
+
appendMessageLogStrict(chatDir, { ...entry, operationId }, true);
|
|
360
|
+
}
|
|
332
361
|
/** Strict conversation-history append used by handoff reply binding. */
|
|
333
362
|
export function appendMessageLogStrict(chatDir, entry, durable = false) {
|
|
334
363
|
if (isTransientProtocolMessage(entry))
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CONTACT_RECEIPT_TTL_MS, trustedContactInboundDelivery } from './contact-pending-inbound.js';
|
|
1
2
|
import path from 'path';
|
|
2
3
|
import fs from 'fs';
|
|
3
4
|
import { logger } from '../../utils/logger.js';
|
|
@@ -9,12 +10,15 @@ import { isTopicThreadId, normalizeTopicAid, safeFormatMainTopicId } from '../th
|
|
|
9
10
|
/** Validate before either classification or restoration can rewrite the snapshot. */
|
|
10
11
|
export function parseQueueSnapshot(value) {
|
|
11
12
|
const file = value;
|
|
12
|
-
if (!file || ![1, 2, 3].includes(file.version) || !Array.isArray(file.queues)
|
|
13
|
+
if (!file || ![1, 2, 3, 4].includes(file.version) || !Array.isArray(file.queues)
|
|
13
14
|
|| (file.active !== undefined && !Array.isArray(file.active))
|
|
14
|
-
|| (file.version
|
|
15
|
+
|| (file.version >= 3 && (!Array.isArray(file.recoveryIndexedAids)
|
|
15
16
|
|| file.recoveryIndexedAids.some(aid => typeof aid !== 'string' || !aid) || !Array.isArray(file.active)))) {
|
|
16
17
|
throw new Error('invalid message queue snapshot');
|
|
17
18
|
}
|
|
19
|
+
if (file.version === 4 && (!Array.isArray(file.contactReceipts) || file.contactReceipts.some(receipt => !receipt || !/^[a-f0-9]{64}$/.test(receipt.key) || !Number.isFinite(receipt.acceptedAt)
|
|
20
|
+
|| !['queued', 'handled'].includes(receipt.outcome))))
|
|
21
|
+
throw new Error('invalid contact receipts');
|
|
18
22
|
const validPart = (part) => !!part && typeof part.projectPath === 'string'
|
|
19
23
|
&& !!part.projectPath && !!part.message && typeof part.message === 'object'
|
|
20
24
|
&& typeof part.message.channel === 'string' && typeof part.message.channelId === 'string';
|
|
@@ -28,7 +32,7 @@ export function parseQueueSnapshot(value) {
|
|
|
28
32
|
return file;
|
|
29
33
|
}
|
|
30
34
|
export function hasIndexedRecovery(file, aid) {
|
|
31
|
-
return file?.version
|
|
35
|
+
return (file?.version ?? 0) >= 3 && file?.recoveryIndexedAids?.includes(aid) === true;
|
|
32
36
|
}
|
|
33
37
|
const DEFAULT_AGENT_NAME = '<unknown>';
|
|
34
38
|
const RESTART_RESUME_CONTENT = 'evolcore 服务已重启,请继续之前未完成的任务。';
|
|
@@ -60,6 +64,15 @@ export class MessageQueue {
|
|
|
60
64
|
* 打乱既有调度顺序。
|
|
61
65
|
*/
|
|
62
66
|
interruptingMessages = new Map();
|
|
67
|
+
/**
|
|
68
|
+
* 回队批次的打断者 ID:queueKey → messageId,由 disposeInterruptedBatch 在
|
|
69
|
+
* requeued_pre_submit 时写入,下一次 dequeue 取走(一次性)。
|
|
70
|
+
*
|
|
71
|
+
* 不能直接读 interruptingMessages:那个 map 在中断批次的 finally 里就被清掉了,
|
|
72
|
+
* 而回队的旧输入要到下一轮 processNext 才出队。渲染层据此把中断插入标记挂到
|
|
73
|
+
* 打断者身上,而不是被中断的旧输入。
|
|
74
|
+
*/
|
|
75
|
+
requeuedByInterrupt = new Map();
|
|
63
76
|
eventBus;
|
|
64
77
|
recentMessageIds = new Set();
|
|
65
78
|
DEDUP_WINDOW = 60_000; // 1 分钟窗口
|
|
@@ -78,6 +91,42 @@ export class MessageQueue {
|
|
|
78
91
|
blockedReason;
|
|
79
92
|
wasObserverHintConsumed;
|
|
80
93
|
recoveryIndexedAids = [];
|
|
94
|
+
contactReceipts = new Map();
|
|
95
|
+
contactReceiptsLoaded = false;
|
|
96
|
+
contactDeliveryReceipt(key) {
|
|
97
|
+
if (!this.persistencePath)
|
|
98
|
+
throw new Error('durable contact queue unavailable');
|
|
99
|
+
if (!this.contactReceiptsLoaded) {
|
|
100
|
+
let snapshot;
|
|
101
|
+
try {
|
|
102
|
+
snapshot = parseQueueSnapshot(JSON.parse(fs.readFileSync(this.persistencePath, 'utf8')));
|
|
103
|
+
}
|
|
104
|
+
catch (error) {
|
|
105
|
+
if (error.code !== 'ENOENT')
|
|
106
|
+
throw error;
|
|
107
|
+
}
|
|
108
|
+
for (const receipt of snapshot?.contactReceipts ?? [])
|
|
109
|
+
this.contactReceipts.set(receipt.key, receipt);
|
|
110
|
+
this.contactReceiptsLoaded = true;
|
|
111
|
+
}
|
|
112
|
+
return this.contactReceipts.get(key);
|
|
113
|
+
}
|
|
114
|
+
finishContactDelivery(delivery) {
|
|
115
|
+
if (!trustedContactInboundDelivery(delivery))
|
|
116
|
+
throw new Error('untrusted contact delivery');
|
|
117
|
+
const previous = this.contactDeliveryReceipt(delivery.key);
|
|
118
|
+
if (previous) {
|
|
119
|
+
delivery.receipt = previous;
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const receipt = { key: delivery.key, acceptedAt: Date.now(), outcome: 'handled' };
|
|
123
|
+
this.contactReceipts.set(delivery.key, receipt);
|
|
124
|
+
if (!this.persistQueuesSync()) {
|
|
125
|
+
this.contactReceipts.delete(delivery.key);
|
|
126
|
+
throw new Error('failed to persist contact terminal outcome');
|
|
127
|
+
}
|
|
128
|
+
delivery.receipt = receipt;
|
|
129
|
+
}
|
|
81
130
|
blockedQueues = new Map();
|
|
82
131
|
readinessRetry;
|
|
83
132
|
shutdownPromise;
|
|
@@ -838,8 +887,13 @@ export class MessageQueue {
|
|
|
838
887
|
});
|
|
839
888
|
}
|
|
840
889
|
fs.mkdirSync(path.dirname(this.persistencePath), { recursive: true });
|
|
890
|
+
for (const [key, receipt] of this.contactReceipts) {
|
|
891
|
+
if (receipt.acceptedAt + CONTACT_RECEIPT_TTL_MS <= Date.now())
|
|
892
|
+
this.contactReceipts.delete(key);
|
|
893
|
+
}
|
|
841
894
|
const data = {
|
|
842
|
-
version:
|
|
895
|
+
version: 4,
|
|
896
|
+
contactReceipts: [...this.contactReceipts.values()],
|
|
843
897
|
recoveryIndexedAids: this.recoveryIndexedAids,
|
|
844
898
|
updatedAt: Date.now(),
|
|
845
899
|
queues: buckets,
|
|
@@ -967,7 +1021,10 @@ export class MessageQueue {
|
|
|
967
1021
|
}
|
|
968
1022
|
}
|
|
969
1023
|
const parsed = parseQueueSnapshot(captured);
|
|
970
|
-
this.recoveryIndexedAids = parsed.version
|
|
1024
|
+
this.recoveryIndexedAids = parsed.version >= 3 ? [...parsed.recoveryIndexedAids] : [];
|
|
1025
|
+
for (const receipt of parsed.contactReceipts ?? [])
|
|
1026
|
+
this.contactReceipts.set(receipt.key, receipt);
|
|
1027
|
+
this.contactReceiptsLoaded = true;
|
|
971
1028
|
// Version-1 snapshots did not carry per-item enqueue times. Preserve
|
|
972
1029
|
// their last durable snapshot time instead of making restored history
|
|
973
1030
|
// look newly queued at the moment of daemon restart.
|
|
@@ -1086,14 +1143,24 @@ export class MessageQueue {
|
|
|
1086
1143
|
// broadcast object must be cloned per agent before dedup/cancel logic.
|
|
1087
1144
|
message = { ...message, selfAID: options.selfAID };
|
|
1088
1145
|
}
|
|
1146
|
+
const contactDelivery = trustedContactInboundDelivery(options?.contactDelivery);
|
|
1147
|
+
if (contactDelivery) {
|
|
1148
|
+
const receipt = this.contactDeliveryReceipt(contactDelivery.key);
|
|
1149
|
+
if (receipt) {
|
|
1150
|
+
contactDelivery.receipt = receipt;
|
|
1151
|
+
options?.onPersisted?.();
|
|
1152
|
+
return;
|
|
1153
|
+
}
|
|
1154
|
+
contactDelivery.validate();
|
|
1155
|
+
}
|
|
1089
1156
|
// 消息去重检查
|
|
1090
|
-
if (message.source !== 'owner-inject' && !this.shouldProcess(sessionKey, message, options?.selfAID)) {
|
|
1157
|
+
if (!contactDelivery && message.source !== 'owner-inject' && !this.shouldProcess(sessionKey, message, options?.selfAID)) {
|
|
1091
1158
|
options?.onPersisted?.();
|
|
1092
1159
|
return Promise.resolve();
|
|
1093
1160
|
}
|
|
1094
1161
|
// 拦截器检查:AskUserQuestion 等场景的一次性消息拦截
|
|
1095
1162
|
const interceptor = this.interceptors.get(sessionKey);
|
|
1096
|
-
const canAnswerInteraction = !message.executionPermissionOverride && (message.source === undefined
|
|
1163
|
+
const canAnswerInteraction = !contactDelivery && !message.executionPermissionOverride && (message.source === undefined
|
|
1097
1164
|
|| message.source === 'user'
|
|
1098
1165
|
|| message.source === 'card-trigger');
|
|
1099
1166
|
if (interceptor && canAnswerInteraction) {
|
|
@@ -1208,7 +1275,23 @@ export class MessageQueue {
|
|
|
1208
1275
|
abortHandler();
|
|
1209
1276
|
return;
|
|
1210
1277
|
}
|
|
1278
|
+
let contactReceipt;
|
|
1279
|
+
if (contactDelivery) {
|
|
1280
|
+
try {
|
|
1281
|
+
contactDelivery.validate();
|
|
1282
|
+
}
|
|
1283
|
+
catch (error) {
|
|
1284
|
+
queue.splice(queue.indexOf(queuedItem), 1);
|
|
1285
|
+
this.logicalQueue.removeProcessed(queueKey, message.messageId ? [message.messageId] : []);
|
|
1286
|
+
rejectOnce(error);
|
|
1287
|
+
return;
|
|
1288
|
+
}
|
|
1289
|
+
contactReceipt = { key: contactDelivery.key, sessionId: sessionKey, acceptedAt: Date.now(), outcome: 'queued' };
|
|
1290
|
+
this.contactReceipts.set(contactDelivery.key, contactReceipt);
|
|
1291
|
+
}
|
|
1211
1292
|
if (!this.persistQueues()) {
|
|
1293
|
+
if (contactDelivery)
|
|
1294
|
+
this.contactReceipts.delete(contactDelivery.key);
|
|
1212
1295
|
const index = queue.indexOf(queuedItem);
|
|
1213
1296
|
if (index >= 0)
|
|
1214
1297
|
queue.splice(index, 1);
|
|
@@ -1217,6 +1300,8 @@ export class MessageQueue {
|
|
|
1217
1300
|
rejectOnce(new Error('failed to persist message queue'));
|
|
1218
1301
|
return;
|
|
1219
1302
|
}
|
|
1303
|
+
if (contactDelivery && contactReceipt)
|
|
1304
|
+
contactDelivery.receipt = contactReceipt;
|
|
1220
1305
|
// A duplicate must not re-enter a runner after the queue entry has
|
|
1221
1306
|
// survived its write-ahead snapshot. Keep this separate from the queue
|
|
1222
1307
|
// snapshot because deduplication must survive task completion.
|
|
@@ -1226,14 +1311,20 @@ export class MessageQueue {
|
|
|
1226
1311
|
options?.onPersisted?.();
|
|
1227
1312
|
}
|
|
1228
1313
|
catch (error) {
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1314
|
+
if (contactDelivery) {
|
|
1315
|
+
// Persistence is already committed; a diagnostic/release callback must not retract acceptance.
|
|
1316
|
+
logger.warn('[Queue] Contact onPersisted callback failed:', error);
|
|
1317
|
+
}
|
|
1318
|
+
else {
|
|
1319
|
+
const index = queue.indexOf(queuedItem);
|
|
1320
|
+
if (index >= 0)
|
|
1321
|
+
queue.splice(index, 1);
|
|
1322
|
+
this.logicalQueue.removeProcessed(queueKey, message.messageId ? [message.messageId] : []);
|
|
1323
|
+
this.forgetProcessed(sessionKey, message);
|
|
1324
|
+
this.persistQueues();
|
|
1325
|
+
rejectOnce(error);
|
|
1326
|
+
return;
|
|
1327
|
+
}
|
|
1237
1328
|
}
|
|
1238
1329
|
if (options?.resolveOnPersist)
|
|
1239
1330
|
resolveOnce();
|
|
@@ -1367,6 +1458,14 @@ export class MessageQueue {
|
|
|
1367
1458
|
const pendingBeforeDequeue = queue.slice();
|
|
1368
1459
|
const items = this.dequeueGreedy(queue, sessionId);
|
|
1369
1460
|
const merged = items.length === 1 ? items[0] : this.mergeItems(items);
|
|
1461
|
+
// 批次里若有「打断了上一轮」的那条,把它的 ID 带下去:渲染层据此把中断插入标记
|
|
1462
|
+
// 挂到打断者身上。未提交的旧输入回队后与打断者同批(disposeInterruptedBatch),
|
|
1463
|
+
// 只按顺序取第一条会把标记错挂在被中断的那条旧消息上。
|
|
1464
|
+
const interruptingId = this.requeuedByInterrupt.get(queueKey);
|
|
1465
|
+
if (interruptingId) {
|
|
1466
|
+
this.requeuedByInterrupt.delete(queueKey); // 一次性:只标记紧接的这批
|
|
1467
|
+
merged.message.interruptedByMessageId = interruptingId;
|
|
1468
|
+
}
|
|
1370
1469
|
const rawItems = items.flatMap(item => this.partsOf(item).map(part => this.itemFromPart(part)));
|
|
1371
1470
|
const rawParts = rawItems.map(item => this.partFromItem(item));
|
|
1372
1471
|
// activeItem 复用已合并的 message,仅额外持有 parts 用于持久化和撤回定位(不重复 merge)
|
|
@@ -1496,6 +1595,10 @@ export class MessageQueue {
|
|
|
1496
1595
|
logger.info(`[Queue] pre-submit requeue skipped: key=${queueKey} other pending=${pendingWithoutInterrupt.length}`);
|
|
1497
1596
|
return 'none';
|
|
1498
1597
|
}
|
|
1598
|
+
// 记下打断者:回队批次里既有被中断的旧输入,也有打断它的那条新消息,
|
|
1599
|
+
// 渲染层只按顺序取第一条会把标记挂错对象(见 Message.interruptedByMessageId)。
|
|
1600
|
+
if (interrupting?.messageId)
|
|
1601
|
+
this.requeuedByInterrupt.set(queueKey, interrupting.messageId);
|
|
1499
1602
|
queue.unshift(...requeued);
|
|
1500
1603
|
// 按物理顺序重建逻辑队列,避免把旧输入追加到新消息之后,导致 FIFO
|
|
1501
1604
|
// 在下一次 reorderPhysical 时颠倒回队消息与打断消息的顺序。
|
|
@@ -1583,6 +1686,7 @@ export class MessageQueue {
|
|
|
1583
1686
|
|| !!message.executionPermissionOverride
|
|
1584
1687
|
|| !!message.handoffDelivery
|
|
1585
1688
|
|| !!message.triggerMeta
|
|
1689
|
+
|| !!message.selfAddressedMeta
|
|
1586
1690
|
|| !!message.causation?.trigger?.path.length;
|
|
1587
1691
|
}
|
|
1588
1692
|
isOriginHandoff(message) {
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { sessionLocalTopicId, sessionTopicThreadId } from '../thread/topic-id.js';
|
|
2
2
|
import { renderCommandCardAsText, renderActionAsText } from '../interaction-router.js';
|
|
3
3
|
export const DEFAULT_NOOP_SENTINEL = '[[NOOP]]';
|
|
4
|
+
/** Only internal task sources may opt into silent completion. */
|
|
5
|
+
export function messageNoopSentinel(message) {
|
|
6
|
+
if (message.source === 'trigger')
|
|
7
|
+
return message.triggerMeta?.noopSentinel;
|
|
8
|
+
if (message.source === 'self-address')
|
|
9
|
+
return message.selfAddressedMeta?.noopSentinel;
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
4
12
|
export function isNoopText(text, sentinel = DEFAULT_NOOP_SENTINEL) {
|
|
5
13
|
return sentinel.length > 0 && text.trimStart().startsWith(sentinel);
|
|
6
14
|
}
|