evolcore 0.0.43-test.3 → 0.0.43-test.5
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 +82 -0
- package/bin/ecmsg.js +492 -0
- package/bin/install-codex-managed-hooks.mjs +130 -8
- package/dist/ability/application-service.js +37 -0
- package/dist/ability/resources.js +28 -0
- package/dist/ability/runtime.js +6 -1
- package/dist/agents/claude-runner.js +7 -5
- package/dist/agents/codex/app-server-client.js +0 -12
- package/dist/agents/codex-runner.js +12 -54
- package/dist/agents/ecagent-runner.js +130 -35
- package/dist/aun/aid/agentmd.js +56 -12
- 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/menu/client.js +8 -7
- package/dist/aun/menu/index.js +1 -1
- package/dist/aun/menu/transport.js +8 -5
- package/dist/aun/service-proxy.js +3 -0
- package/dist/channels/aun.js +56 -22
- package/dist/channels/daemon.js +12 -4
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +32 -8
- package/dist/cli/agent.js +9 -3
- package/dist/cli/aid-bind-command.js +3 -0
- package/dist/cli/aun-commands.js +12 -5
- package/dist/cli/code-stats.js +451 -213
- package/dist/cli/ctl-command.js +1 -3
- package/dist/cli/daemon-commands.js +42 -21
- package/dist/cli/directory.js +7 -8
- package/dist/cli/ecmsg-gateway.js +204 -0
- package/dist/cli/getmeta-command.js +2 -1
- package/dist/cli/index.js +6 -0
- package/dist/cli/init.js +58 -18
- package/dist/cli/provider-command.js +82 -5
- package/dist/cli/restart-monitor.js +11 -19
- package/dist/cli/stats.js +8 -1
- package/dist/cli/task-context.js +3 -0
- package/dist/cli/trigger-command.js +20 -14
- package/dist/config/boot-log.js +23 -2
- package/dist/config/config-field-policy.js +2 -0
- package/dist/config/config-manager.js +13 -17
- package/dist/config/daemon-services.js +1 -0
- package/dist/config/peer-role-resolver.js +6 -6
- package/dist/config/provider-identity-migration.js +202 -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 +153 -0
- package/dist/config/providers-config.js +32 -4
- package/dist/config/providers-management.js +144 -68
- package/dist/config/providers.js +4 -1
- package/dist/config/role-schema.js +3 -3
- package/dist/config/schema-migration.js +188 -3
- package/dist/core/agent-application-service.js +11 -0
- package/dist/core/agent-ipc-registration.js +2 -0
- package/dist/core/agent-runtime.js +45 -11
- package/dist/core/auth/auth-gateway.js +8 -6
- package/dist/core/auth/delegation-diagnostics.js +6 -2
- package/dist/core/auth/operation-authorizer.js +5 -2
- package/dist/core/auth/operation-catalog.js +6 -4
- package/dist/core/baseagent-loader.js +11 -3
- package/dist/core/bootstrap-service.js +8 -0
- package/dist/core/channel-loader.js +61 -23
- package/dist/core/command/agent-control.js +4 -1
- package/dist/core/command/chatmode-config.js +46 -0
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +16 -20
- package/dist/core/command/daemon-diagnostics.js +2 -1
- package/dist/core/command/menu-catalog.js +1 -1
- package/dist/core/command/menu-handler.js +16 -16
- package/dist/core/command/menu-protocol.js +4 -2
- package/dist/core/command/provider-menu.js +4 -2
- package/dist/core/command/role-menu.js +2 -2
- package/dist/core/command/slash-handler.js +56 -42
- package/dist/core/daemon-lifecycle.js +35 -17
- package/dist/core/event-catalog.js +19 -0
- package/dist/core/evolagent-registry.js +3 -0
- package/dist/core/handoff/runtime.js +9 -3
- package/dist/core/initialization/service.js +4 -3
- package/dist/core/ipc-registration.js +6 -0
- package/dist/core/message/aun-ipc-sender.js +81 -3
- package/dist/core/message/im-renderer.js +24 -19
- package/dist/core/message/message-admission.js +13 -2
- package/dist/core/message/response-engine.js +40 -41
- package/dist/core/message/send-options.js +40 -0
- package/dist/core/message/send-routing.js +310 -0
- package/dist/core/model/model-capabilities.js +37 -0
- package/dist/core/model/model-catalog.js +6 -2
- package/dist/core/ownership/owner-resolver.js +117 -14
- package/dist/core/permission/ec-command-parser.js +195 -27
- 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/plugin-lifecycle.js +6 -2
- package/dist/core/relation/pa-team.js +7 -2
- package/dist/core/relation/same-owner-proof.js +131 -0
- package/dist/core/session/session-idle-monitor.js +94 -16
- package/dist/core/session/session-manager.js +69 -16
- package/dist/core/thread/thread-route.js +5 -2
- package/dist/directory/owner-directory-cache.js +690 -99
- package/dist/directory/owner-directory-markdown.js +146 -36
- package/dist/directory/owner-directory-query-operation.js +7 -9
- 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 +38 -5
- package/dist/ecweb/runtime/supervisor.js +157 -49
- package/dist/index.js +202 -38
- package/dist/paths.js +2 -1
- package/dist/proxy/manager.js +2 -0
- package/dist/proxy/service-supervisor.js +379 -143
- package/dist/response-system/engines/v1/proactive-flow.js +4 -0
- package/dist/trigger/application-service.js +1 -0
- package/dist/trigger/audit.js +3 -2
- package/dist/trigger/authorization.js +2 -3
- package/dist/trigger/event-source.js +4 -0
- package/dist/trigger/feedback.js +26 -2
- package/dist/trigger/history.js +4 -3
- package/dist/trigger/ipc-service.js +24 -19
- package/dist/trigger/manager.js +3 -5
- package/dist/trigger/parser.js +4 -21
- package/dist/trigger/patch.js +3 -15
- package/dist/trigger/scheduler.js +48 -13
- package/dist/trigger/system-definitions.js +2 -2
- package/dist/trigger/validation.js +4 -13
- package/dist/utils/autostart.js +2 -2
- package/dist/utils/cross-platform.js +36 -8
- package/dist/utils/error-utils.js +8 -0
- package/dist/utils/macos-autostart.js +31 -0
- package/dist/utils/model-prices.jsonl +15 -8
- package/dist/utils/process-introspect.js +21 -1
- package/dist/utils/public-suffix.js +5811 -0
- package/dist/utils/startup-trace.js +7 -1
- package/dist/utils/windows-autostart.js +42 -7
- package/ecagent/dist/harness/compaction/branch-summarization.js +1 -1
- package/ecagent/dist/harness/compaction/compaction.js +4 -4
- package/ecagent/dist/harness/env/nodejs.js +46 -2
- package/kits/docs/aun/ABILITY_CALLING.md +3 -3
- 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 +3 -2
- package/kits/docs/evolcore/agent.md +2 -2
- package/kits/docs/evolcore/aid.md +8 -2
- package/kits/docs/evolcore/ctl.md +13 -4
- package/kits/docs/evolcore/directory.md +48 -15
- package/kits/docs/evolcore/file-navigation.md +63 -49
- package/kits/docs/evolcore/group.md +6 -6
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +33 -3
- package/kits/docs/evolcore/model.md +5 -3
- package/kits/docs/evolcore/msg.md +28 -27
- package/kits/docs/evolcore/provider.md +39 -5
- package/kits/docs/evolcore/response.md +3 -1
- package/kits/docs/evolcore/thread-chain.md +12 -14
- package/kits/docs/evolcore/tool-authorization.md +21 -1
- package/kits/docs/evolcore/trigger.md +12 -9
- 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 +28 -49
- package/kits/eck_manifest.memory.json +18 -18
- package/kits/rules/01-overview.md +43 -45
- package/kits/rules/02-navigation.md +44 -53
- package/kits/rules/03-identity.md +21 -25
- package/kits/rules/04-relation.md +23 -33
- package/kits/rules/05-venue.md +24 -25
- package/kits/rules/06-channel.md +3 -3
- package/kits/schemas/_meta.json +20 -27
- package/kits/schemas/agent-config.schema.19.json +10 -6
- package/kits/schemas/providers.schema.2.json +74 -0
- package/kits/schemas/relation-config.schema.12.json +2 -2
- package/kits/schemas/role-config.schema.2.json +5 -5
- package/kits/schemas/role-registry.schema.1.json +1 -1
- package/kits/skills/ec-agent-create/SKILL.md +1 -0
- package/kits/skills/ec-service-proxy/SKILL.md +3 -0
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/ec-trigger/references/examples.md +1 -1
- package/kits/templates/system-fragments/channel.md +5 -5
- package/kits/templates/system-fragments/commands.md +3 -2
- package/kits/templates/system-fragments/directory-contacts.md +10 -3
- package/kits/templates/system-fragments/identity.md +0 -1
- package/kits/templates/system-fragments/personal-assistant.md +22 -3
- package/kits/templates/system-fragments/reply.md +47 -28
- package/kits/templates/system-fragments/session.md +2 -9
- package/kits/templates/system-fragments/thread.md +5 -5
- package/package.json +17 -13
- package/kits/schemas/agent-config.schema.20.json +0 -925
- package/kits/schemas/relation-config.schema.13.json +0 -289
- package/kits/schemas/role-config.schema.3.json +0 -1038
|
@@ -10,6 +10,20 @@ import { createRootCausation } from '../causation/context.js';
|
|
|
10
10
|
export const DEFAULT_SESSION_LOOP_SECONDS = 300;
|
|
11
11
|
export const MIN_SESSION_LOOP_SECONDS = 30;
|
|
12
12
|
export const MAX_SESSION_LOOP_SECONDS = 86400;
|
|
13
|
+
export const MAX_SESSION_LOOP_PROMPT_LENGTH = 4096;
|
|
14
|
+
export function normalizeSessionLoopOnceConfig(value) {
|
|
15
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
16
|
+
return undefined;
|
|
17
|
+
const raw = value;
|
|
18
|
+
if (Object.keys(raw).some(key => key !== 'idleSeconds' && key !== 'prompt'))
|
|
19
|
+
return undefined;
|
|
20
|
+
if (!isValidIdleSeconds(raw.idleSeconds) || typeof raw.prompt !== 'string')
|
|
21
|
+
return undefined;
|
|
22
|
+
const prompt = raw.prompt.trim();
|
|
23
|
+
if (!prompt || prompt.length > MAX_SESSION_LOOP_PROMPT_LENGTH)
|
|
24
|
+
return undefined;
|
|
25
|
+
return { idleSeconds: raw.idleSeconds, prompt };
|
|
26
|
+
}
|
|
13
27
|
export function normalizeSessionLoopConfig(value) {
|
|
14
28
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
15
29
|
return undefined;
|
|
@@ -64,6 +78,16 @@ export function readSessionLoopConfigForSession(session) {
|
|
|
64
78
|
const target = resolveSessionLoopTarget(session);
|
|
65
79
|
return target ? readSessionLoopConfig(target) : undefined;
|
|
66
80
|
}
|
|
81
|
+
export function readSessionLoopOnceConfig(session) {
|
|
82
|
+
const request = session.metadata?.sessionLoopOnce;
|
|
83
|
+
if (!request || typeof request.requestId !== 'string' || !request.requestId.trim()
|
|
84
|
+
|| typeof request.peerId !== 'string' || !request.peerId.trim()
|
|
85
|
+
|| !Number.isFinite(request.requestedAt))
|
|
86
|
+
return undefined;
|
|
87
|
+
const config = normalizeSessionLoopOnceConfig({ idleSeconds: request.idleSeconds, prompt: request.prompt });
|
|
88
|
+
return config ? { ...config, requestId: request.requestId, requestedAt: request.requestedAt, peerId: request.peerId,
|
|
89
|
+
...(typeof request.encrypted === 'boolean' ? { encrypted: request.encrypted } : {}) } : undefined;
|
|
90
|
+
}
|
|
67
91
|
export function updateRelationSessionLoop(session, config) {
|
|
68
92
|
const target = resolveSessionLoopTarget(session);
|
|
69
93
|
if (!target || target.level !== 'relation-main')
|
|
@@ -117,11 +141,19 @@ export function writeSessionLoopConfig(store, target, config) {
|
|
|
117
141
|
}
|
|
118
142
|
export function sessionLoopPayload(target) {
|
|
119
143
|
const config = readSessionLoopConfig(target);
|
|
144
|
+
const once = readSessionLoopOnceConfig(target.session);
|
|
120
145
|
return {
|
|
121
146
|
target: { level: target.level, sessionId: target.session.id },
|
|
122
147
|
sessionId: target.session.id,
|
|
123
148
|
value: config?.enabled === true,
|
|
124
149
|
...(config?.enabled ? { idleSeconds: config.idleSeconds } : {}),
|
|
150
|
+
...(once ? {
|
|
151
|
+
once: {
|
|
152
|
+
pending: true,
|
|
153
|
+
idleSeconds: once.idleSeconds,
|
|
154
|
+
promptPreview: once.prompt.replace(/\s+/g, ' ').slice(0, 120),
|
|
155
|
+
},
|
|
156
|
+
} : {}),
|
|
125
157
|
};
|
|
126
158
|
}
|
|
127
159
|
export function sessionLoopError(code, message) {
|
|
@@ -159,7 +191,8 @@ export class SessionIdleMonitor {
|
|
|
159
191
|
return;
|
|
160
192
|
this.refreshSessionIdleTriggerIds();
|
|
161
193
|
const triggerPath = event.causation?.trigger?.path ?? [];
|
|
162
|
-
if (triggerPath.some(node => this.knownSessionIdleTriggerIds.has(node.triggerId))
|
|
194
|
+
if (triggerPath.some(node => this.knownSessionIdleTriggerIds.has(node.triggerId))
|
|
195
|
+
&& this.sessions.get(event.sessionId)?.emitted !== false) {
|
|
163
196
|
this.taskEncryption.delete(event.sessionId);
|
|
164
197
|
return;
|
|
165
198
|
}
|
|
@@ -176,6 +209,8 @@ export class SessionIdleMonitor {
|
|
|
176
209
|
onTaskStarted = (event) => {
|
|
177
210
|
if (event.type !== 'task:started' || !event.sessionId)
|
|
178
211
|
return;
|
|
212
|
+
this.clearTimers(event.sessionId);
|
|
213
|
+
this.generations.set(event.sessionId, (this.generations.get(event.sessionId) ?? 0) + 1);
|
|
179
214
|
if (typeof event.encrypt === 'boolean')
|
|
180
215
|
this.taskEncryption.set(event.sessionId, event.encrypt);
|
|
181
216
|
else
|
|
@@ -199,7 +234,7 @@ export class SessionIdleMonitor {
|
|
|
199
234
|
};
|
|
200
235
|
onSessionLoopChanged = (event) => {
|
|
201
236
|
if (event.type === 'session:loop-changed')
|
|
202
|
-
void this.refreshSession(event.sessionId, event.timestamp);
|
|
237
|
+
void this.refreshSession(event.sessionId, event.timestamp, true);
|
|
203
238
|
};
|
|
204
239
|
constructor(options) {
|
|
205
240
|
this.options = options;
|
|
@@ -226,7 +261,20 @@ export class SessionIdleMonitor {
|
|
|
226
261
|
this.active = true;
|
|
227
262
|
this.refreshSessionIdleTriggerIds();
|
|
228
263
|
for (const sessionId of this.sessions.keys())
|
|
264
|
+
void this.restorePendingSession(sessionId);
|
|
265
|
+
}
|
|
266
|
+
async restorePendingSession(sessionId) {
|
|
267
|
+
try {
|
|
268
|
+
const session = await this.options.getSessionById(sessionId);
|
|
269
|
+
const state = this.sessions.get(sessionId);
|
|
270
|
+
const pending = session && readSessionLoopOnceConfig(session);
|
|
271
|
+
if (state && pending && state.onceRequestId === pending.requestId)
|
|
272
|
+
state.emitted = false;
|
|
229
273
|
this.scheduleSession(sessionId);
|
|
274
|
+
}
|
|
275
|
+
catch (error) {
|
|
276
|
+
this.warn(`Failed to restore pending idle check for ${sessionId}`, error);
|
|
277
|
+
}
|
|
230
278
|
}
|
|
231
279
|
/**
|
|
232
280
|
* 重新采集 session:idle trigger 身份。
|
|
@@ -238,6 +286,11 @@ export class SessionIdleMonitor {
|
|
|
238
286
|
refreshTriggerIdentities() {
|
|
239
287
|
this.refreshSessionIdleTriggerIds();
|
|
240
288
|
}
|
|
289
|
+
isCurrentLoopOnceEvent(sessionId, requestId, generation) {
|
|
290
|
+
const state = this.sessions.get(sessionId);
|
|
291
|
+
return this.active && state?.emitted === true && state.onceRequestId === requestId
|
|
292
|
+
&& (this.generations.get(sessionId) ?? 0) === generation;
|
|
293
|
+
}
|
|
241
294
|
/** Re-read relation configuration and re-arm every restored/current session. */
|
|
242
295
|
refresh() {
|
|
243
296
|
if (!this.active)
|
|
@@ -248,10 +301,15 @@ export class SessionIdleMonitor {
|
|
|
248
301
|
this.scheduleSession(sessionId);
|
|
249
302
|
}
|
|
250
303
|
}
|
|
251
|
-
async refreshSession(sessionId, changedAt = this.now()) {
|
|
252
|
-
|
|
253
|
-
if (!state
|
|
254
|
-
|
|
304
|
+
async refreshSession(sessionId, changedAt = this.now(), force = false) {
|
|
305
|
+
let state = this.sessions.get(sessionId);
|
|
306
|
+
if (!state) {
|
|
307
|
+
state = { lastEndedAt: changedAt, armedAt: changedAt, emitted: false };
|
|
308
|
+
this.sessions.set(sessionId, state);
|
|
309
|
+
this.persistState();
|
|
310
|
+
}
|
|
311
|
+
this.clearTimers(sessionId);
|
|
312
|
+
this.generations.set(sessionId, (this.generations.get(sessionId) ?? 0) + 1);
|
|
255
313
|
const generation = this.generations.get(sessionId) ?? 0;
|
|
256
314
|
try {
|
|
257
315
|
const session = await this.options.getSessionById(sessionId);
|
|
@@ -260,13 +318,14 @@ export class SessionIdleMonitor {
|
|
|
260
318
|
const seconds = await this.readIdleSeconds(session);
|
|
261
319
|
if (this.sessions.get(sessionId) !== state || (this.generations.get(sessionId) ?? 0) !== generation)
|
|
262
320
|
return;
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
this.clearTimers(sessionId);
|
|
266
|
-
this.generations.set(sessionId, generation + 1);
|
|
321
|
+
const pending = readSessionLoopOnceConfig(session);
|
|
322
|
+
const changed = force || state.idleSeconds !== seconds || state.onceRequestId !== pending?.requestId;
|
|
267
323
|
state.idleSeconds = seconds;
|
|
268
|
-
state.
|
|
269
|
-
|
|
324
|
+
state.onceRequestId = pending?.requestId;
|
|
325
|
+
if (changed) {
|
|
326
|
+
state.armedAt = changedAt;
|
|
327
|
+
state.emitted = false;
|
|
328
|
+
}
|
|
270
329
|
this.persistState();
|
|
271
330
|
if (seconds !== undefined && !await this.options.isSessionBusy(sessionId))
|
|
272
331
|
this.scheduleSession(sessionId);
|
|
@@ -366,6 +425,7 @@ export class SessionIdleMonitor {
|
|
|
366
425
|
return;
|
|
367
426
|
const idleMs = toIdleMs(idleSeconds);
|
|
368
427
|
state.idleSeconds = idleSeconds;
|
|
428
|
+
state.onceRequestId = readSessionLoopOnceConfig(session)?.requestId;
|
|
369
429
|
this.persistState();
|
|
370
430
|
if (idleMs === undefined)
|
|
371
431
|
return;
|
|
@@ -435,12 +495,24 @@ export class SessionIdleMonitor {
|
|
|
435
495
|
this.clearSession(sessionId);
|
|
436
496
|
return;
|
|
437
497
|
}
|
|
498
|
+
try {
|
|
499
|
+
session = await this.options.getSessionById(sessionId);
|
|
500
|
+
}
|
|
501
|
+
catch (error) {
|
|
502
|
+
this.warn(`Failed to revalidate idle session ${sessionId}`, error);
|
|
503
|
+
return;
|
|
504
|
+
}
|
|
505
|
+
if (!session?.selfAID || !this.isEligibleSession(session) || !this.isCurrentCycle(sessionId, lastEndedAt, generation))
|
|
506
|
+
return;
|
|
438
507
|
const state = this.sessions.get(sessionId);
|
|
439
508
|
if (!state || state.emitted)
|
|
440
509
|
return;
|
|
510
|
+
const once = readSessionLoopOnceConfig(session);
|
|
441
511
|
state.emitted = true;
|
|
442
|
-
if (!this.persistState())
|
|
512
|
+
if (!this.persistState()) {
|
|
513
|
+
state.emitted = false;
|
|
443
514
|
return;
|
|
515
|
+
}
|
|
444
516
|
const topicThreadId = sessionTopicThreadId(session);
|
|
445
517
|
this.options.eventBus.publish({
|
|
446
518
|
type: 'session:idle',
|
|
@@ -451,12 +523,13 @@ export class SessionIdleMonitor {
|
|
|
451
523
|
channelId: session.channelId,
|
|
452
524
|
chatType: session.chatType,
|
|
453
525
|
...(topicThreadId ? { threadId: topicThreadId } : {}),
|
|
454
|
-
|
|
455
|
-
...(typeof state.encrypted === 'boolean'
|
|
456
|
-
? { encrypted: state.encrypted }
|
|
526
|
+
peerId: once?.peerId ?? session.metadata?.peerId ?? session.channelId,
|
|
527
|
+
...(typeof (once?.encrypted ?? state.encrypted) === 'boolean'
|
|
528
|
+
? { encrypted: once?.encrypted ?? state.encrypted }
|
|
457
529
|
: typeof session.metadata?.replyContext?.metadata?.encrypted === 'boolean'
|
|
458
530
|
? { encrypted: session.metadata.replyContext.metadata.encrypted }
|
|
459
531
|
: {}),
|
|
532
|
+
...(once ? { loopPrompt: once.prompt, loopOnceRequestId: once.requestId, loopIdleGeneration: generation } : {}),
|
|
460
533
|
idleMs,
|
|
461
534
|
lastEndedAt,
|
|
462
535
|
timestamp: this.now(),
|
|
@@ -493,6 +566,9 @@ export class SessionIdleMonitor {
|
|
|
493
566
|
}
|
|
494
567
|
}
|
|
495
568
|
async readIdleSeconds(session) {
|
|
569
|
+
const once = readSessionLoopOnceConfig(session);
|
|
570
|
+
if (once)
|
|
571
|
+
return once.idleSeconds;
|
|
496
572
|
try {
|
|
497
573
|
return await this.options.getSessionIdleSeconds(session);
|
|
498
574
|
}
|
|
@@ -568,6 +644,7 @@ export class SessionIdleMonitor {
|
|
|
568
644
|
...(typeof rawState.encrypted === 'boolean' ? { encrypted: rawState.encrypted } : {}),
|
|
569
645
|
...(typeof rawState.armedAt === 'number' && Number.isFinite(rawState.armedAt) ? { armedAt: rawState.armedAt } : {}),
|
|
570
646
|
...(typeof rawState.idleSeconds === 'number' ? { idleSeconds: rawState.idleSeconds } : {}),
|
|
647
|
+
...(typeof rawState.onceRequestId === 'string' ? { onceRequestId: rawState.onceRequestId } : {}),
|
|
571
648
|
});
|
|
572
649
|
}
|
|
573
650
|
}
|
|
@@ -584,6 +661,7 @@ export class SessionIdleMonitor {
|
|
|
584
661
|
...(typeof state.encrypted === 'boolean' ? { encrypted: state.encrypted } : {}),
|
|
585
662
|
...(state.armedAt !== undefined ? { armedAt: state.armedAt } : {}),
|
|
586
663
|
...(state.idleSeconds !== undefined ? { idleSeconds: state.idleSeconds } : {}),
|
|
664
|
+
...(state.onceRequestId ? { onceRequestId: state.onceRequestId } : {}),
|
|
587
665
|
};
|
|
588
666
|
}
|
|
589
667
|
try {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { normalizeSessionLoopConfig, resolveSessionLoopTarget, sessionLoopError } from './session-idle-monitor.js';
|
|
1
|
+
import { normalizeSessionLoopConfig, normalizeSessionLoopOnceConfig, readSessionLoopOnceConfig, resolveSessionLoopTarget, sessionLoopError } from './session-idle-monitor.js';
|
|
2
2
|
import { ensureDir } from '../../utils/atomic-write.js';
|
|
3
3
|
import { resolvePaths, agentThreadIndexPath } from '../../paths.js';
|
|
4
4
|
import { logger } from '../../utils/logger.js';
|
|
@@ -13,7 +13,7 @@ import { isSystemControlChannel } from '../system-channels.js';
|
|
|
13
13
|
import path from 'path';
|
|
14
14
|
import fs from 'fs';
|
|
15
15
|
import os from 'os';
|
|
16
|
-
import { createHash } from 'node:crypto';
|
|
16
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
17
17
|
import { appendSessionCapsuleEvent, capsuleHistory, fallbackCapsuleContent, findSessionCapsule, generateCapsuleContent, generateCapsuleId, renderCapsuleInput, withoutBackendSessionId } from './session-capsule.js';
|
|
18
18
|
import { associateMessageCapsule } from '../message/message-log.js';
|
|
19
19
|
function forkHistoryRecord(value) {
|
|
@@ -753,17 +753,25 @@ export class SessionManager {
|
|
|
753
753
|
* @returns 是否真的写入了 .jsonl(去重命中时返回 false)
|
|
754
754
|
*/
|
|
755
755
|
persistSession(session, intent, opts) {
|
|
756
|
-
if (!opts?.sessionLoopMutation
|
|
756
|
+
if (!opts?.sessionLoopMutation || !opts?.sessionFullAccessMutation) {
|
|
757
757
|
const latest = this.readMetaLatest(this.metaPathForSession(session));
|
|
758
758
|
const metadata = { ...(session.metadata ?? {}) };
|
|
759
|
-
if (
|
|
760
|
-
metadata
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
metadata
|
|
765
|
-
|
|
766
|
-
|
|
759
|
+
if (!opts?.sessionLoopMutation) {
|
|
760
|
+
if (latest?.metadata?.sessionLoop !== undefined)
|
|
761
|
+
metadata.sessionLoop = latest.metadata.sessionLoop;
|
|
762
|
+
else
|
|
763
|
+
delete metadata.sessionLoop;
|
|
764
|
+
if (latest?.metadata?.sessionLoopOnce !== undefined)
|
|
765
|
+
metadata.sessionLoopOnce = latest.metadata.sessionLoopOnce;
|
|
766
|
+
else
|
|
767
|
+
delete metadata.sessionLoopOnce;
|
|
768
|
+
}
|
|
769
|
+
if (!opts?.sessionFullAccessMutation) {
|
|
770
|
+
if (latest?.metadata?.sessionFullAccess !== undefined)
|
|
771
|
+
metadata.sessionFullAccess = latest.metadata.sessionFullAccess;
|
|
772
|
+
else
|
|
773
|
+
delete metadata.sessionFullAccess;
|
|
774
|
+
}
|
|
767
775
|
session.metadata = metadata;
|
|
768
776
|
}
|
|
769
777
|
// Topic session snapshots can be written by synchronous legacy paths
|
|
@@ -809,6 +817,10 @@ export class SessionManager {
|
|
|
809
817
|
delete mergedMetadata[key];
|
|
810
818
|
}
|
|
811
819
|
}
|
|
820
|
+
for (const key of ['sessionLoop', 'sessionLoopOnce', 'sessionFullAccess']) {
|
|
821
|
+
if (!Object.hasOwn(requestedMetadata, key))
|
|
822
|
+
delete mergedMetadata[key];
|
|
823
|
+
}
|
|
812
824
|
session.metadata = mergedMetadata;
|
|
813
825
|
}
|
|
814
826
|
}
|
|
@@ -1503,8 +1515,8 @@ export class SessionManager {
|
|
|
1503
1515
|
if (updates.name !== undefined)
|
|
1504
1516
|
current.name = updates.name;
|
|
1505
1517
|
if (updates.metadata !== undefined) {
|
|
1506
|
-
if (Object.hasOwn(updates.metadata, 'sessionLoop') || Object.hasOwn(updates.metadata, 'sessionFullAccess')) {
|
|
1507
|
-
throw topicMetadataOwnershipError(Object.hasOwn(updates.metadata, 'sessionLoop') ? 'sessionLoop' : 'sessionFullAccess');
|
|
1518
|
+
if (Object.hasOwn(updates.metadata, 'sessionLoop') || Object.hasOwn(updates.metadata, 'sessionLoopOnce') || Object.hasOwn(updates.metadata, 'sessionFullAccess')) {
|
|
1519
|
+
throw topicMetadataOwnershipError(Object.hasOwn(updates.metadata, 'sessionLoop') ? 'sessionLoop' : Object.hasOwn(updates.metadata, 'sessionLoopOnce') ? 'sessionLoopOnce' : 'sessionFullAccess');
|
|
1508
1520
|
}
|
|
1509
1521
|
if (isTopicSession(current)) {
|
|
1510
1522
|
for (const key of Object.keys(updates.metadata)) {
|
|
@@ -1535,7 +1547,7 @@ export class SessionManager {
|
|
|
1535
1547
|
return;
|
|
1536
1548
|
const { current } = loaded;
|
|
1537
1549
|
for (const key of Object.keys(patch)) {
|
|
1538
|
-
if (key === 'sessionLoop' || key === 'sessionFullAccess')
|
|
1550
|
+
if (key === 'sessionLoop' || key === 'sessionLoopOnce' || key === 'sessionFullAccess')
|
|
1539
1551
|
throw topicMetadataOwnershipError(key);
|
|
1540
1552
|
if (isTopicSession(current) && TOPIC_METADATA_PROTECTED_KEYS.has(key)) {
|
|
1541
1553
|
throw topicMetadataOwnershipError(key);
|
|
@@ -1566,6 +1578,45 @@ export class SessionManager {
|
|
|
1566
1578
|
return current;
|
|
1567
1579
|
});
|
|
1568
1580
|
}
|
|
1581
|
+
updateSessionLoopOnce(sessionId, config, context) {
|
|
1582
|
+
const normalized = normalizeSessionLoopOnceConfig(config);
|
|
1583
|
+
if (!normalized) {
|
|
1584
|
+
throw sessionLoopError('INVALID_ARGUMENT', 'invalid one-shot session loop configuration');
|
|
1585
|
+
}
|
|
1586
|
+
return this.mutateLatestTopicSession(sessionId, current => {
|
|
1587
|
+
const target = resolveSessionLoopTarget(current);
|
|
1588
|
+
if (!target)
|
|
1589
|
+
throw sessionLoopError('INVALID_CONTEXT', '会话不存在或已不可用');
|
|
1590
|
+
const peerId = context?.peerId?.trim() || current.metadata?.peerId || (current.chatType === 'private' ? current.channelId : undefined);
|
|
1591
|
+
if (!peerId)
|
|
1592
|
+
throw sessionLoopError('INVALID_CONTEXT', '单次 loop 缺少原始请求者身份');
|
|
1593
|
+
current.metadata = { ...(current.metadata ?? {}), sessionLoopOnce: {
|
|
1594
|
+
...normalized,
|
|
1595
|
+
requestId: randomUUID(),
|
|
1596
|
+
requestedAt: Date.now(),
|
|
1597
|
+
peerId,
|
|
1598
|
+
...(typeof context?.encrypted === 'boolean' ? { encrypted: context.encrypted } : {}),
|
|
1599
|
+
} };
|
|
1600
|
+
const changed = this.persistSession(current, 'sync', { sessionLoopMutation: true });
|
|
1601
|
+
if (changed)
|
|
1602
|
+
this.eventBus.publish({ type: 'session:loop-changed', sessionId, timestamp: Date.now() });
|
|
1603
|
+
return current;
|
|
1604
|
+
});
|
|
1605
|
+
}
|
|
1606
|
+
consumeSessionLoopOnce(sessionId, expectedRequestId) {
|
|
1607
|
+
return this.mutateLatestTopicSession(sessionId, current => {
|
|
1608
|
+
const value = readSessionLoopOnceConfig(current);
|
|
1609
|
+
if (!value || (expectedRequestId !== undefined && value.requestId !== expectedRequestId))
|
|
1610
|
+
return undefined;
|
|
1611
|
+
const metadata = { ...(current.metadata ?? {}) };
|
|
1612
|
+
delete metadata.sessionLoopOnce;
|
|
1613
|
+
current.metadata = metadata;
|
|
1614
|
+
this.persistSession(current, 'sync', { sessionLoopMutation: true });
|
|
1615
|
+
if (expectedRequestId === undefined)
|
|
1616
|
+
this.eventBus.publish({ type: 'session:loop-changed', sessionId, timestamp: Date.now() });
|
|
1617
|
+
return value;
|
|
1618
|
+
});
|
|
1619
|
+
}
|
|
1569
1620
|
updateSessionFullAccess(sessionId, config) {
|
|
1570
1621
|
if (typeof config.enabled !== 'boolean' || !config.authorizedBy.trim()) {
|
|
1571
1622
|
throw Object.assign(new Error('invalid session fullaccess configuration'), { code: 'INVALID_ARGUMENT' });
|
|
@@ -1604,6 +1655,7 @@ export class SessionManager {
|
|
|
1604
1655
|
getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, baseagent, selfAID, channelType, peerType, chatType, label, topicStatus) {
|
|
1605
1656
|
const topicMetadata = { ...(metadata ?? {}) };
|
|
1606
1657
|
delete topicMetadata.sessionLoop;
|
|
1658
|
+
delete topicMetadata.sessionLoopOnce;
|
|
1607
1659
|
delete topicMetadata.sessionFullAccess;
|
|
1608
1660
|
// 使用精确路径(channelType + selfAID)
|
|
1609
1661
|
const chatDir = (channelType && selfAID)
|
|
@@ -2100,8 +2152,8 @@ export class SessionManager {
|
|
|
2100
2152
|
return target;
|
|
2101
2153
|
}
|
|
2102
2154
|
updateMetadata(sessionId, metadata) {
|
|
2103
|
-
if (Object.hasOwn(metadata, 'sessionLoop'))
|
|
2104
|
-
throw topicMetadataOwnershipError('sessionLoop');
|
|
2155
|
+
if (Object.hasOwn(metadata, 'sessionLoop') || Object.hasOwn(metadata, 'sessionLoopOnce'))
|
|
2156
|
+
throw topicMetadataOwnershipError(Object.hasOwn(metadata, 'sessionLoop') ? 'sessionLoop' : 'sessionLoopOnce');
|
|
2105
2157
|
const loaded = this.loadSessionForUpdate(sessionId);
|
|
2106
2158
|
if (!loaded)
|
|
2107
2159
|
return;
|
|
@@ -2496,6 +2548,7 @@ export class SessionManager {
|
|
|
2496
2548
|
delete metadata.capsuleId;
|
|
2497
2549
|
delete metadata.replyContext;
|
|
2498
2550
|
delete metadata.sessionLoop;
|
|
2551
|
+
delete metadata.sessionLoopOnce;
|
|
2499
2552
|
delete metadata.sessionFullAccess;
|
|
2500
2553
|
metadata.__sessionRenewedAt = Date.now();
|
|
2501
2554
|
const session = {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { sameGroupAid } from '../../aun/group/identity.js';
|
|
2
|
+
import { isNonAgentSessionChannel } from '../system-channels.js';
|
|
2
3
|
import { ThreadService } from './thread-service.js';
|
|
3
4
|
import { isMainSessionThreadId, resolveThreadRef } from './topic-id.js';
|
|
4
5
|
/**
|
|
@@ -42,7 +43,9 @@ export function resolveThreadRouteTarget(selfAid, threadRef, scope, target) {
|
|
|
42
43
|
}
|
|
43
44
|
if (!entry)
|
|
44
45
|
return undefined;
|
|
45
|
-
|
|
46
|
+
// 话题属于哪个渠道由 entry.channelType 携带,调用方据此选择投递 adapter。
|
|
47
|
+
// 这里只排掉非会话渠道(daemon/系统控制面)——它们不是可投递的对话。
|
|
48
|
+
if (isNonAgentSessionChannel(entry.channelType ?? 'aun'))
|
|
46
49
|
return undefined;
|
|
47
50
|
if (entry.peerKind !== (scope === 'group' ? 'group' : 'private'))
|
|
48
51
|
return undefined;
|
|
@@ -58,7 +61,7 @@ export function resolveThreadRouteTarget(selfAid, threadRef, scope, target) {
|
|
|
58
61
|
}
|
|
59
62
|
if (!entry)
|
|
60
63
|
return undefined;
|
|
61
|
-
if ((entry.channelType ?? 'aun')
|
|
64
|
+
if (isNonAgentSessionChannel(entry.channelType ?? 'aun'))
|
|
62
65
|
return undefined;
|
|
63
66
|
if (entry.peerKind !== (scope === 'group' ? 'group' : 'private'))
|
|
64
67
|
return undefined;
|