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
|
@@ -378,6 +378,10 @@ export const proactiveFlow = {
|
|
|
378
378
|
state.roundHasIntentAttempt = true;
|
|
379
379
|
return undefined;
|
|
380
380
|
}
|
|
381
|
+
// 只读命令(--help 等)不受门禁限制:门禁防的是"光看不发",
|
|
382
|
+
// 查语法正是为了学会怎么发。拦它只会让模型反复试错直到熔断。
|
|
383
|
+
if (ctx.isReadOnlyCommand?.(toolName, toolInput))
|
|
384
|
+
return undefined;
|
|
381
385
|
// 非 send 命令:先检查格式是否"像 send 但解析失败"(F2修复:计入违规)
|
|
382
386
|
const sendFailure = ctx.describeSendCommandFailure?.(toolName, toolInput);
|
|
383
387
|
if (sendFailure) {
|
|
@@ -113,6 +113,7 @@ export function buildTriggerScheduler(owner, dependencies, options = {}) {
|
|
|
113
113
|
getChannel: dependencies.getTriggerChannel,
|
|
114
114
|
sessionManager: dependencies.sessionManager,
|
|
115
115
|
messageQueue: dependencies.messageQueue,
|
|
116
|
+
canDispatchSessionLoopOnce: dependencies.canDispatchSessionLoopOnce,
|
|
116
117
|
recoverTask: request => dependencies.responseEngine.recoverTask(request),
|
|
117
118
|
inspectTargetExecution: (sessionId, attemptId, selfAid) => (dependencies.responseEngine.inspectTargetExecution(sessionId, attemptId, selfAid)),
|
|
118
119
|
eventBus: dependencies.eventBus,
|
package/dist/trigger/audit.js
CHANGED
|
@@ -92,7 +92,8 @@ export class TriggerAuditLogger {
|
|
|
92
92
|
if (record.status !== 'completed'
|
|
93
93
|
&& record.status !== 'degraded'
|
|
94
94
|
&& record.status !== 'noop'
|
|
95
|
-
&& record.status !== 'failed'
|
|
95
|
+
&& record.status !== 'failed'
|
|
96
|
+
&& record.status !== 'interrupted')
|
|
96
97
|
continue;
|
|
97
98
|
out.fireCount += 1;
|
|
98
99
|
if (record.status === 'failed')
|
|
@@ -100,7 +101,7 @@ export class TriggerAuditLogger {
|
|
|
100
101
|
if (record.finishedAt > latestFinishedAt) {
|
|
101
102
|
latestFinishedAt = record.finishedAt;
|
|
102
103
|
out.lastFiredAt = record.finishedAt;
|
|
103
|
-
out.lastResult = record.status === 'failed' ? 'failed' : 'completed';
|
|
104
|
+
out.lastResult = record.status === 'failed' ? 'failed' : record.status === 'interrupted' ? 'interrupted' : 'completed';
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
}
|
|
@@ -143,7 +143,7 @@ export function validateTriggerDefinitionForActor(definition, actor, dependencie
|
|
|
143
143
|
const agent = dependencies.getAgent(definition.agentAid);
|
|
144
144
|
const modelDecision = validateModelSelectionForRole({
|
|
145
145
|
role: actor.role,
|
|
146
|
-
baseagent:
|
|
146
|
+
baseagent: agent?.baseagent,
|
|
147
147
|
requestedModel: definition.execution.model,
|
|
148
148
|
selfAid: definition.agentAid,
|
|
149
149
|
});
|
|
@@ -151,8 +151,7 @@ export function validateTriggerDefinitionForActor(definition, actor, dependencie
|
|
|
151
151
|
throw new Error(modelDecision.message || 'trigger model is not allowed by current role');
|
|
152
152
|
}
|
|
153
153
|
if (definition.execution.effort && !actor.daemonPrivileged) {
|
|
154
|
-
const baseagent = definition.
|
|
155
|
-
?? dependencies.getAgent(definition.agentAid)?.baseagent;
|
|
154
|
+
const baseagent = dependencies.getAgent(definition.agentAid)?.baseagent;
|
|
156
155
|
if (!baseagent)
|
|
157
156
|
throw new Error('cannot determine Trigger baseagent');
|
|
158
157
|
const effortDecision = validateRuntimeStringFieldOverride({
|
|
@@ -38,6 +38,10 @@ export class TriggerEventSource {
|
|
|
38
38
|
return;
|
|
39
39
|
if (event.type.startsWith('trigger:') && event.originTriggerId === trigger.id)
|
|
40
40
|
return;
|
|
41
|
+
if (event.type === 'session:idle' && event.loopOnceRequestId
|
|
42
|
+
&& (trigger.id !== '__session-idle-check' || !isDaemonEventSessionTrigger(trigger)
|
|
43
|
+
|| trigger.execution.type !== 'target_session'))
|
|
44
|
+
return;
|
|
41
45
|
// Dynamic routing is agent-local for ordinary Agent Triggers. A
|
|
42
46
|
// daemon-origin event_session Trigger is explicitly allowed to route
|
|
43
47
|
// the event to the owning Agent discovered from the payload.
|
package/dist/trigger/feedback.js
CHANGED
|
@@ -4,6 +4,7 @@ import { isDaemonEventSessionTrigger } from './event-source.js';
|
|
|
4
4
|
import { TASK_RECOVERY_PROMPT } from '../core/task/task-recovery-service.js';
|
|
5
5
|
import { ExecutionTimeoutError, OrphanedTargetSessionError, isRetryableError } from '../utils/error-utils.js';
|
|
6
6
|
import { isTopicThreadId, sessionThreadKind, sessionTopicThreadId } from '../core/thread/topic-id.js';
|
|
7
|
+
import { readSessionLoopOnceConfig, resolveSessionLoopTarget } from '../core/session/session-idle-monitor.js';
|
|
7
8
|
const FEEDBACK_DEADLINE_MS = 30_000;
|
|
8
9
|
const TARGET_SESSION_CANCEL_GRACE_MS = 1_000;
|
|
9
10
|
const TARGET_SESSION_OUTCOME_GRACE_MS = 5_000;
|
|
@@ -115,7 +116,17 @@ export class TriggerFeedbackDispatcher {
|
|
|
115
116
|
|| !Number.isSafeInteger(input.sourcePayload.generation))) {
|
|
116
117
|
return this.failed(feedback, [], 'recovery_event_invalid', 'task:error must identify the original task and generation');
|
|
117
118
|
}
|
|
118
|
-
const
|
|
119
|
+
const loopOnceRequestId = input.sourcePayload?.type === 'session:idle'
|
|
120
|
+
&& typeof input.sourcePayload.loopOnceRequestId === 'string'
|
|
121
|
+
? input.sourcePayload.loopOnceRequestId : undefined;
|
|
122
|
+
const pendingLoop = eventSession && readSessionLoopOnceConfig(eventSession);
|
|
123
|
+
if (loopOnceRequestId && (!pendingLoop || pendingLoop.requestId !== loopOnceRequestId
|
|
124
|
+
|| pendingLoop.peerId !== input.sourcePayload?.peerId
|
|
125
|
+
|| (pendingLoop.encrypted !== undefined && pendingLoop.encrypted !== input.sourcePayload?.encrypted)
|
|
126
|
+
|| input.trigger.id !== '__session-idle-check' || !isDaemonEventSessionTrigger(input.trigger))) {
|
|
127
|
+
return { status: 'skipped', reason: 'loop_once_stale', feedback, effects: [], error: null };
|
|
128
|
+
}
|
|
129
|
+
const prompt = isTaskErrorRecovery ? TASK_RECOVERY_PROMPT : loopOnceRequestId ? pendingLoop.prompt : input.prompt;
|
|
119
130
|
const targetAgentAid = eventSession?.selfAID ?? input.trigger.agentAid;
|
|
120
131
|
feedback.target = target;
|
|
121
132
|
feedback.renderedTextHash = sha256(prompt);
|
|
@@ -276,7 +287,7 @@ export class TriggerFeedbackDispatcher {
|
|
|
276
287
|
boundSessionId: session.id,
|
|
277
288
|
modelOverride: input.trigger.execution.model,
|
|
278
289
|
effortOverride: input.trigger.execution.effort,
|
|
279
|
-
permissionModeOverride: input.trigger.execution.permissionMode,
|
|
290
|
+
permissionModeOverride: loopOnceRequestId ? undefined : input.trigger.execution.permissionMode,
|
|
280
291
|
originPeerId: eventSession ? input.sourcePayload.peerId : input.trigger.origin?.peerId,
|
|
281
292
|
originChannelKey: eventSession ? target.channelKey : input.trigger.origin?.channelKey,
|
|
282
293
|
originChannelType: eventSession ? channelType : input.trigger.origin?.channelType
|
|
@@ -388,6 +399,19 @@ export class TriggerFeedbackDispatcher {
|
|
|
388
399
|
enqueuePromise = recovery.completion;
|
|
389
400
|
}
|
|
390
401
|
else {
|
|
402
|
+
if (loopOnceRequestId) {
|
|
403
|
+
const latest = await this.deps.sessionManager.getSessionById(session.id);
|
|
404
|
+
const currentMain = sessionThreadKind(session).kind === 'main'
|
|
405
|
+
? this.deps.sessionManager.getActiveSessionSync(session.channel, session.channelId) : undefined;
|
|
406
|
+
if (delivery.signal.aborted)
|
|
407
|
+
throw delivery.signal.reason;
|
|
408
|
+
if (!latest || !resolveSessionLoopTarget(latest) || latest.selfAID !== targetAgentAid
|
|
409
|
+
|| (sessionThreadKind(session).kind === 'main' && currentMain?.id !== session.id)
|
|
410
|
+
|| !this.deps.canDispatchSessionLoopOnce?.(session.id, loopOnceRequestId, input.sourcePayload?.loopIdleGeneration)
|
|
411
|
+
|| !this.deps.sessionManager.consumeSessionLoopOnce(session.id, loopOnceRequestId)) {
|
|
412
|
+
return { status: 'skipped', reason: 'loop_once_stale', feedback, effects: [], error: null };
|
|
413
|
+
}
|
|
414
|
+
}
|
|
391
415
|
enqueuePromise = this.deps.messageQueue.enqueue(session.id, message, session.projectPath, {
|
|
392
416
|
interruptible: false,
|
|
393
417
|
agentName: binding.agentName,
|
package/dist/trigger/history.js
CHANGED
|
@@ -101,7 +101,7 @@ export class TriggerHistoryStore {
|
|
|
101
101
|
const finishedAt = event.audit.finishedAt;
|
|
102
102
|
if (finishedAt < fromTs || finishedAt >= toTs)
|
|
103
103
|
continue;
|
|
104
|
-
if (!['completed', 'degraded', 'noop', 'failed'].includes(event.audit.status))
|
|
104
|
+
if (!['completed', 'degraded', 'noop', 'failed', 'interrupted'].includes(event.audit.status))
|
|
105
105
|
continue;
|
|
106
106
|
calls++;
|
|
107
107
|
if (event.audit.status === 'failed')
|
|
@@ -192,7 +192,8 @@ export class TriggerHistoryStore {
|
|
|
192
192
|
if (record.status !== 'completed'
|
|
193
193
|
&& record.status !== 'degraded'
|
|
194
194
|
&& record.status !== 'noop'
|
|
195
|
-
&& record.status !== 'failed'
|
|
195
|
+
&& record.status !== 'failed'
|
|
196
|
+
&& record.status !== 'interrupted')
|
|
196
197
|
continue;
|
|
197
198
|
current.fireCount += 1;
|
|
198
199
|
if (record.status === 'failed')
|
|
@@ -200,7 +201,7 @@ export class TriggerHistoryStore {
|
|
|
200
201
|
if (record.finishedAt > latestFinishedAt) {
|
|
201
202
|
latestFinishedAt = record.finishedAt;
|
|
202
203
|
current.lastFiredAt = record.finishedAt;
|
|
203
|
-
current.lastResult = record.status === 'failed' ? 'failed' : 'completed';
|
|
204
|
+
current.lastResult = record.status === 'failed' ? 'failed' : record.status === 'interrupted' ? 'interrupted' : 'completed';
|
|
204
205
|
}
|
|
205
206
|
}
|
|
206
207
|
return this.mergeRunStats(legacyMatched ? legacy : undefined, current);
|
|
@@ -20,32 +20,25 @@ export function createTriggerBaseagentResolver({ daemonTriggerOwnerAid, getAgent
|
|
|
20
20
|
export function registerTriggerIpcExecutor(ipcServer, dependencies) {
|
|
21
21
|
ipcServer.setTriggerExecutor(createTriggerIpcExecutor(dependencies));
|
|
22
22
|
}
|
|
23
|
-
export function
|
|
23
|
+
export function validateTriggerCreateBaseagent(input, agentAid, dependencies) {
|
|
24
24
|
const rawExecution = input.execution;
|
|
25
25
|
if (!rawExecution || typeof rawExecution !== 'object' || Array.isArray(rawExecution))
|
|
26
26
|
return input;
|
|
27
27
|
const execution = rawExecution;
|
|
28
|
-
if (
|
|
29
|
-
|
|
30
|
-
throw new Error('execution.baseagent is only allowed when execution.type=trigger_session');
|
|
31
|
-
}
|
|
32
|
-
return input;
|
|
28
|
+
if ('baseagent' in execution) {
|
|
29
|
+
throw new Error('execution.baseagent is no longer supported; Trigger uses its owning Agent baseagent');
|
|
33
30
|
}
|
|
34
|
-
if (execution.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const baseagent = typeof execution.baseagent === 'string'
|
|
39
|
-
? execution.baseagent.trim()
|
|
40
|
-
: dependencies.getAgentBaseagent(agentAid)
|
|
41
|
-
?? (agentAid === dependencies.daemonTriggerOwnerAid ? dependencies.daemonTriggerBaseagent : undefined);
|
|
31
|
+
if (execution.type !== 'trigger_session')
|
|
32
|
+
return input;
|
|
33
|
+
const baseagent = dependencies.getAgentBaseagent(agentAid)
|
|
34
|
+
?? (agentAid === dependencies.daemonTriggerOwnerAid ? dependencies.daemonTriggerBaseagent : undefined);
|
|
42
35
|
if (!baseagent)
|
|
43
36
|
throw new Error('unable to resolve Trigger session baseagent');
|
|
44
37
|
const available = dependencies.getAvailableBaseagents(agentAid);
|
|
45
38
|
if (!available.includes(baseagent)) {
|
|
46
39
|
throw new Error(`Trigger baseagent unavailable for ${agentAid}: ${baseagent} (available: ${available.join(', ') || 'none'})`);
|
|
47
40
|
}
|
|
48
|
-
return
|
|
41
|
+
return input;
|
|
49
42
|
}
|
|
50
43
|
export async function authorizeTriggerActorOperation(agentAid, operation, actor, triggerId) {
|
|
51
44
|
if (actor.permissionMode === 'readonly' && !actor.fullAccess
|
|
@@ -119,7 +112,7 @@ export function prepareTriggerCreateDefinition(rawDefinition, agentAid, actor, d
|
|
|
119
112
|
feedback: rawDefinition.feedback,
|
|
120
113
|
operatorPeers: undefined,
|
|
121
114
|
});
|
|
122
|
-
const materialized =
|
|
115
|
+
const materialized = validateTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin, operatorPeers }, agentAid, dependencies);
|
|
123
116
|
let definition = normalizeTriggerDefinition(materialized);
|
|
124
117
|
if (definition.labels?.kind === 'cross-thread-review') {
|
|
125
118
|
definition.labels = { ...definition.labels, originAuthorization: 'creator-session-v1' };
|
|
@@ -277,7 +270,11 @@ export function createTriggerIpcExecutor(dependencies) {
|
|
|
277
270
|
delegationCommandHash: cmd.delegationCommandHash };
|
|
278
271
|
approvedAgentAid = requireAgent(command.agentAid);
|
|
279
272
|
approvedOperation = command.type;
|
|
280
|
-
|
|
273
|
+
const approvedTriggerId = command.triggerId
|
|
274
|
+
?? (typeof command.runId === 'string'
|
|
275
|
+
? schedulerFor(approvedAgentAid).activeRunTriggerId(command.runId)
|
|
276
|
+
: undefined);
|
|
277
|
+
approvedActor = await authorizeTrigger(approvedAgentAid, approvedOperation, approvedTriggerId);
|
|
281
278
|
const args = argv.slice(2);
|
|
282
279
|
const usesFiles = args.some(value => ['--file', '--prompt-file', '--script-path', '--script-file']
|
|
283
280
|
.some(flag => value === flag || value.startsWith(`${flag}=`)));
|
|
@@ -478,10 +475,18 @@ export function createTriggerIpcExecutor(dependencies) {
|
|
|
478
475
|
}
|
|
479
476
|
case 'trigger.cancel': {
|
|
480
477
|
const agentAid = requireAgent(cmd.agentAid);
|
|
478
|
+
const scheduler = schedulerFor(agentAid);
|
|
479
|
+
if (typeof cmd.runId === 'string' && cmd.runId) {
|
|
480
|
+
const triggerId = scheduler.activeRunTriggerId(cmd.runId);
|
|
481
|
+
if (!triggerId)
|
|
482
|
+
throw new Error(`Trigger run is not active: ${cmd.runId}`);
|
|
483
|
+
await authorizeTrigger(agentAid, 'trigger.cancel', triggerId);
|
|
484
|
+
return { ok: true, result: await scheduler.cancelRun(cmd.runId), runId: cmd.runId, triggerId };
|
|
485
|
+
}
|
|
481
486
|
if (!cmd.triggerId)
|
|
482
|
-
throw new Error('missing
|
|
487
|
+
throw new Error('missing runId');
|
|
483
488
|
await authorizeTrigger(agentAid, 'trigger.cancel', cmd.triggerId);
|
|
484
|
-
const trigger =
|
|
489
|
+
const trigger = scheduler.cancel(cmd.triggerId);
|
|
485
490
|
return { ok: true, trigger };
|
|
486
491
|
}
|
|
487
492
|
case 'trigger.delete': {
|
package/dist/trigger/manager.js
CHANGED
|
@@ -38,6 +38,9 @@ export class TriggerDefinitionManager {
|
|
|
38
38
|
const raw = JSON.parse(fs.readFileSync(file, 'utf-8'));
|
|
39
39
|
const definition = normalizeTriggerDefinition(raw, { allowLegacyZeroRetryAttempts: true });
|
|
40
40
|
const migrations = [];
|
|
41
|
+
if (isRecord(raw.execution) && Object.prototype.hasOwnProperty.call(raw.execution, 'baseagent')) {
|
|
42
|
+
migrations.push('inherit-owner-baseagent');
|
|
43
|
+
}
|
|
41
44
|
if (legacyFeedbackTargetNeedsMigration(raw, definition)) {
|
|
42
45
|
definition.feedback.target.chatType ??= 'private';
|
|
43
46
|
migrations.push('legacy-aun-target-chat-type');
|
|
@@ -99,11 +102,6 @@ export class TriggerDefinitionManager {
|
|
|
99
102
|
}, { now: Date.now() });
|
|
100
103
|
assertExplicitAunDeliveryRoutes(updated);
|
|
101
104
|
this.assertAgent(updated);
|
|
102
|
-
if (existing.execution.baseagent !== updated.execution.baseagent) {
|
|
103
|
-
if (existing.execution.type !== 'trigger_session' || updated.execution.type !== 'trigger_session') {
|
|
104
|
-
throw new Error('execution.baseagent is only mutable between trigger_session Triggers');
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
105
|
updated.createdAt = existing.createdAt;
|
|
108
106
|
updated.updatedAt = Date.now();
|
|
109
107
|
this.assertUnique(updated, triggerId);
|
package/dist/trigger/parser.js
CHANGED
|
@@ -4,7 +4,7 @@ const TRIGGER_UPDATE_FLAGS = new Set([
|
|
|
4
4
|
'prompt', 'name', 'description',
|
|
5
5
|
'script-file', 'script-runtime', 'script-args', 'script-timeout', 'execution-timeout',
|
|
6
6
|
'feedback', 'target-channel', 'target-channel-id', 'target-chat-type', 'target-session', 'target-thread-id',
|
|
7
|
-
'trigger-thread',
|
|
7
|
+
'trigger-thread',
|
|
8
8
|
'on-error', 'noop-sentinel', 'retry-attempts', 'retry-backoff',
|
|
9
9
|
'model', 'effort', 'permission',
|
|
10
10
|
'max-runs', 'max-duration', 'concurrency', 'missed-policy',
|
|
@@ -14,7 +14,7 @@ const TRIGGER_CREATE_FLAGS = new Set([
|
|
|
14
14
|
'exec', 'prompt', 'name', 'description', 'agent', 'label',
|
|
15
15
|
'script-path', 'script-runtime', 'script-args', 'script-timeout', 'execution-timeout',
|
|
16
16
|
'feedback', 'target-channel', 'target-channel-id', 'target-chat-type', 'target-session', 'target-thread-id',
|
|
17
|
-
'trigger-thread',
|
|
17
|
+
'trigger-thread',
|
|
18
18
|
'model', 'effort', 'permission', 'max-runs', 'max-duration',
|
|
19
19
|
]);
|
|
20
20
|
// Note: unquoted multi-word values (e.g. --prompt=hello world) are not supported.
|
|
@@ -198,14 +198,6 @@ function parseModelFlag(flags) {
|
|
|
198
198
|
return { ok: false, error: '--model 不能为空' };
|
|
199
199
|
return { ok: true, value: raw };
|
|
200
200
|
}
|
|
201
|
-
function parseBaseagentFlag(flags) {
|
|
202
|
-
if (!flags.has('baseagent'))
|
|
203
|
-
return { ok: true };
|
|
204
|
-
const raw = flags.get('baseagent');
|
|
205
|
-
if (!raw || raw === true || !raw.trim())
|
|
206
|
-
return { ok: false, error: '--baseagent 不能为空' };
|
|
207
|
-
return { ok: true, value: raw.trim() };
|
|
208
|
-
}
|
|
209
201
|
function parseEffortFlag(flags) {
|
|
210
202
|
if (!flags.has('effort'))
|
|
211
203
|
return { ok: true };
|
|
@@ -218,6 +210,8 @@ function parseEffortFlag(flags) {
|
|
|
218
210
|
return { ok: true, value: raw };
|
|
219
211
|
}
|
|
220
212
|
function rejectDeprecatedFlags(flags) {
|
|
213
|
+
if (flags.has('baseagent'))
|
|
214
|
+
return '--baseagent 已移除;Trigger 使用所属 Agent 当前的 baseagent';
|
|
221
215
|
if (flags.has('mode'))
|
|
222
216
|
return '--mode 已废弃,请使用 --exec script|trigger-session|target-session';
|
|
223
217
|
if (flags.has('session'))
|
|
@@ -423,9 +417,6 @@ function commonParsed(flags, opts = {}) {
|
|
|
423
417
|
const model = parseModelFlag(flags);
|
|
424
418
|
if (!model.ok)
|
|
425
419
|
return model;
|
|
426
|
-
const baseagent = parseBaseagentFlag(flags);
|
|
427
|
-
if (!baseagent.ok)
|
|
428
|
-
return baseagent;
|
|
429
420
|
const effort = parseEffortFlag(flags);
|
|
430
421
|
if (!effort.ok)
|
|
431
422
|
return effort;
|
|
@@ -491,9 +482,6 @@ function commonParsed(flags, opts = {}) {
|
|
|
491
482
|
// 全部交给 patch/validation 按现有定义执行。
|
|
492
483
|
const inferredExecution = execution.value;
|
|
493
484
|
if (!opts.update) {
|
|
494
|
-
if (baseagent.value && inferredExecution !== 'trigger_session') {
|
|
495
|
-
return { ok: false, error: '--baseagent 仅适用于 --exec trigger-session' };
|
|
496
|
-
}
|
|
497
485
|
if (inferredExecution === 'script') {
|
|
498
486
|
if (!scriptPath)
|
|
499
487
|
return { ok: false, error: '--exec script 需要 --script-path' };
|
|
@@ -537,7 +525,6 @@ function commonParsed(flags, opts = {}) {
|
|
|
537
525
|
scriptTimeoutMs: scriptTimeout.value,
|
|
538
526
|
executionTimeoutMs: executionTimeout.value,
|
|
539
527
|
triggerThread: triggerThread.value,
|
|
540
|
-
baseagent: baseagent.value,
|
|
541
528
|
maxRuns: maxRuns.value,
|
|
542
529
|
maxDuration: maxDuration.value,
|
|
543
530
|
model: model.value,
|
|
@@ -582,7 +569,6 @@ export function parseTriggerSet(args) {
|
|
|
582
569
|
scriptTimeoutMs: value.scriptTimeoutMs,
|
|
583
570
|
executionTimeoutMs: value.executionTimeoutMs,
|
|
584
571
|
triggerThread: value.triggerThread,
|
|
585
|
-
baseagent: value.baseagent,
|
|
586
572
|
maxRuns: value.maxRuns,
|
|
587
573
|
maxDuration: value.maxDuration,
|
|
588
574
|
model: value.model,
|
|
@@ -629,7 +615,6 @@ export function parseTriggerSetArgv(args, opts = {}) {
|
|
|
629
615
|
scriptTimeoutMs: value.scriptTimeoutMs,
|
|
630
616
|
executionTimeoutMs: value.executionTimeoutMs,
|
|
631
617
|
triggerThread: value.triggerThread,
|
|
632
|
-
baseagent: value.baseagent,
|
|
633
618
|
maxRuns: value.maxRuns,
|
|
634
619
|
maxDuration: value.maxDuration,
|
|
635
620
|
model: value.model,
|
|
@@ -790,8 +775,6 @@ function parseTriggerUpdateFlags(nameOrId, flags, opts = {}) {
|
|
|
790
775
|
update.targetThreadId = value.targetThreadId;
|
|
791
776
|
if (value.triggerThread !== undefined)
|
|
792
777
|
update.triggerThread = value.triggerThread;
|
|
793
|
-
if (value.baseagent !== undefined)
|
|
794
|
-
update.baseagent = value.baseagent;
|
|
795
778
|
const onError = optionalFlagString(flags, 'on-error');
|
|
796
779
|
if ('error' in onError)
|
|
797
780
|
return { ok: false, error: onError.error };
|
package/dist/trigger/patch.js
CHANGED
|
@@ -21,7 +21,6 @@ const PATCH_KEYS = new Set([
|
|
|
21
21
|
'targetChatType',
|
|
22
22
|
'targetSession',
|
|
23
23
|
'targetThreadId',
|
|
24
|
-
'baseagent',
|
|
25
24
|
'triggerThread',
|
|
26
25
|
'onError',
|
|
27
26
|
'noopSentinel',
|
|
@@ -126,12 +125,6 @@ export function applyTriggerPatch(definition, input, opts = {}) {
|
|
|
126
125
|
updated.feedback.strategy = 'target';
|
|
127
126
|
}
|
|
128
127
|
// execution fields
|
|
129
|
-
if (patch.baseagent !== undefined) {
|
|
130
|
-
if (updated.execution.type !== 'trigger_session') {
|
|
131
|
-
throw new Error('baseagent 仅适用于 trigger_session 类型');
|
|
132
|
-
}
|
|
133
|
-
setOptional(updated.execution, 'baseagent', patch.baseagent);
|
|
134
|
-
}
|
|
135
128
|
if (patch.triggerThread !== undefined)
|
|
136
129
|
setOptional(updated.execution, 'thread', patch.triggerThread);
|
|
137
130
|
if (patch.onError !== undefined)
|
|
@@ -188,6 +181,9 @@ export function replaceEditableTriggerDefinition(existing, input) {
|
|
|
188
181
|
throw new Error('trigger definition update must be an object');
|
|
189
182
|
}
|
|
190
183
|
const editable = input;
|
|
184
|
+
if (editable.execution && typeof editable.execution === 'object' && 'baseagent' in editable.execution) {
|
|
185
|
+
throw new Error('execution.baseagent is no longer supported; Trigger uses its owning Agent baseagent');
|
|
186
|
+
}
|
|
191
187
|
const replacement = normalizeTriggerDefinition({
|
|
192
188
|
...editable,
|
|
193
189
|
$schema_version: TRIGGER_SCHEMA_VERSION,
|
|
@@ -198,16 +194,8 @@ export function replaceEditableTriggerDefinition(existing, input) {
|
|
|
198
194
|
updatedAt: existing.updatedAt,
|
|
199
195
|
origin: existing.origin,
|
|
200
196
|
});
|
|
201
|
-
assertBaseagentImmutable(existing, replacement);
|
|
202
197
|
return replacement;
|
|
203
198
|
}
|
|
204
|
-
function assertBaseagentImmutable(existing, updated) {
|
|
205
|
-
if (existing.execution.baseagent !== updated.execution.baseagent) {
|
|
206
|
-
if (existing.execution.type !== 'trigger_session' || updated.execution.type !== 'trigger_session') {
|
|
207
|
-
throw new Error('execution.baseagent is only mutable between trigger_session Triggers');
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
199
|
function applySourcePatch(updated, patch) {
|
|
212
200
|
const previous = updated.source;
|
|
213
201
|
if (patch.scheduleType !== undefined || patch.scheduleValue !== undefined) {
|
|
@@ -4,7 +4,7 @@ import { CronExpressionParser } from 'cron-parser';
|
|
|
4
4
|
import { logger } from '../utils/logger.js';
|
|
5
5
|
import { isNoopText } from '../core/message/message-utils.js';
|
|
6
6
|
import { matchTriggerEvent, TriggerEventSource } from './event-source.js';
|
|
7
|
-
import { definitionRevision, executionTimeoutMs, parseDurationMs, previewText, renderTemplate, resolveScriptPath, sha256, validateConcurrencyCombination, } from './validation.js';
|
|
7
|
+
import { definitionRevision, executionTimeoutMs, parseDurationMs, previewText, renderTemplate, sessionIdlePromptOverride, resolveScriptPath, sha256, validateConcurrencyCombination, } from './validation.js';
|
|
8
8
|
import { TargetSessionLockRegistry } from './session-lock.js';
|
|
9
9
|
import { enterTrigger, formatTriggerPath } from '../core/causation/context.js';
|
|
10
10
|
import { createRootCausation } from '../core/causation/context.js';
|
|
@@ -284,6 +284,27 @@ export class TriggerRuntimeScheduler {
|
|
|
284
284
|
cancel(triggerId) {
|
|
285
285
|
return this.setEnabled(triggerId, false);
|
|
286
286
|
}
|
|
287
|
+
activeRunTriggerId(runId) {
|
|
288
|
+
for (const [triggerId, runs] of this.running) {
|
|
289
|
+
if (runs.has(runId))
|
|
290
|
+
return triggerId;
|
|
291
|
+
}
|
|
292
|
+
return undefined;
|
|
293
|
+
}
|
|
294
|
+
async cancelRun(runId) {
|
|
295
|
+
const triggerId = this.activeRunTriggerId(runId);
|
|
296
|
+
if (!triggerId)
|
|
297
|
+
throw new Error(`Trigger run is not active: ${runId}`);
|
|
298
|
+
this.manager.require(triggerId);
|
|
299
|
+
const runtime = this.running.get(triggerId)?.get(runId);
|
|
300
|
+
if (!runtime)
|
|
301
|
+
throw new Error(`Trigger run is not active: ${runId}`);
|
|
302
|
+
await this.terminateRun(runId, runtime, {
|
|
303
|
+
reason: 'cancelled',
|
|
304
|
+
message: 'Trigger run cancelled by operator',
|
|
305
|
+
});
|
|
306
|
+
return { triggerId, runId, status: 'interrupted' };
|
|
307
|
+
}
|
|
287
308
|
delete(triggerId) {
|
|
288
309
|
const definition = this.manager.require(triggerId);
|
|
289
310
|
this.clearTimer(triggerId);
|
|
@@ -614,8 +635,8 @@ export class TriggerRuntimeScheduler {
|
|
|
614
635
|
ok: false,
|
|
615
636
|
runId,
|
|
616
637
|
triggerId: definition.id,
|
|
617
|
-
status: 'failed',
|
|
618
|
-
reason,
|
|
638
|
+
status: runningRuntime?.termination?.reason === 'cancelled' ? 'interrupted' : 'failed',
|
|
639
|
+
reason: runningRuntime?.termination?.reason === 'cancelled' ? 'cancelled' : reason,
|
|
619
640
|
};
|
|
620
641
|
}
|
|
621
642
|
if (!payload.dryRun) {
|
|
@@ -665,8 +686,8 @@ export class TriggerRuntimeScheduler {
|
|
|
665
686
|
ok: false,
|
|
666
687
|
runId,
|
|
667
688
|
triggerId: definition.id,
|
|
668
|
-
status: 'failed',
|
|
669
|
-
reason,
|
|
689
|
+
status: runningRuntime?.termination?.reason === 'cancelled' ? 'interrupted' : 'failed',
|
|
690
|
+
reason: runningRuntime?.termination?.reason === 'cancelled' ? 'cancelled' : reason,
|
|
670
691
|
};
|
|
671
692
|
}
|
|
672
693
|
const audit = this.buildAudit({
|
|
@@ -727,8 +748,8 @@ export class TriggerRuntimeScheduler {
|
|
|
727
748
|
ok: false,
|
|
728
749
|
runId,
|
|
729
750
|
triggerId: definition.id,
|
|
730
|
-
status: 'failed',
|
|
731
|
-
reason,
|
|
751
|
+
status: runningRuntime?.termination?.reason === 'cancelled' ? 'interrupted' : 'failed',
|
|
752
|
+
reason: runningRuntime?.termination?.reason === 'cancelled' ? 'cancelled' : reason,
|
|
732
753
|
error: message,
|
|
733
754
|
};
|
|
734
755
|
}
|
|
@@ -915,7 +936,7 @@ export class TriggerRuntimeScheduler {
|
|
|
915
936
|
: {}),
|
|
916
937
|
},
|
|
917
938
|
};
|
|
918
|
-
const originalPrompt = renderTemplate(definition.execution.prompt ?? '', {
|
|
939
|
+
const originalPrompt = sessionIdlePromptOverride(sourcePayload) ?? renderTemplate(definition.execution.prompt ?? '', {
|
|
919
940
|
trigger: triggerView,
|
|
920
941
|
timestamp: firedAt,
|
|
921
942
|
event: sourcePayload,
|
|
@@ -980,8 +1001,7 @@ export class TriggerRuntimeScheduler {
|
|
|
980
1001
|
return { branch: branchFromReply(reply), script: null, processing, reply };
|
|
981
1002
|
}
|
|
982
1003
|
try {
|
|
983
|
-
const runtimeBaseagent =
|
|
984
|
-
?? this.runtime.getBaseagent?.()
|
|
1004
|
+
const runtimeBaseagent = this.runtime.getBaseagent?.()
|
|
985
1005
|
?? this.runtime.baseagent;
|
|
986
1006
|
const originPath = causation.trigger?.path ?? [];
|
|
987
1007
|
logger.info(`[Trigger] execution context triggerId=${definition.id}`
|
|
@@ -1170,6 +1190,8 @@ export class TriggerRuntimeScheduler {
|
|
|
1170
1190
|
logger.warn(`[Trigger] resumable session unavailable: trigger=${definition.id} run=${run.runId} session=${run.executionSessionId}`);
|
|
1171
1191
|
return false;
|
|
1172
1192
|
}
|
|
1193
|
+
if (session.baseagent !== (this.runtime.getBaseagent?.() ?? this.runtime.baseagent))
|
|
1194
|
+
return false;
|
|
1173
1195
|
const entered = enterTrigger(undefined, definition.id, run.runId);
|
|
1174
1196
|
if (!entered.ok)
|
|
1175
1197
|
return false;
|
|
@@ -1244,7 +1266,7 @@ export class TriggerRuntimeScheduler {
|
|
|
1244
1266
|
let anomalies = [];
|
|
1245
1267
|
let incomplete;
|
|
1246
1268
|
try {
|
|
1247
|
-
const originalPrompt = renderTemplate(definition.execution.prompt ?? '', {
|
|
1269
|
+
const originalPrompt = sessionIdlePromptOverride(source.payload) ?? renderTemplate(definition.execution.prompt ?? '', {
|
|
1248
1270
|
trigger: definition,
|
|
1249
1271
|
timestamp: source.firedAt,
|
|
1250
1272
|
event: source.payload,
|
|
@@ -1414,6 +1436,9 @@ export class TriggerRuntimeScheduler {
|
|
|
1414
1436
|
async runRecoveredExecutionAttempt(definition, runtime, session) {
|
|
1415
1437
|
const { run, source, controller, causation } = runtime;
|
|
1416
1438
|
try {
|
|
1439
|
+
if (session.baseagent !== (this.runtime.getBaseagent?.() ?? this.runtime.baseagent)) {
|
|
1440
|
+
throw new Error('Trigger session baseagent no longer matches its owning Agent');
|
|
1441
|
+
}
|
|
1417
1442
|
const daemonReply = await this.daemonChannel.converse(TRIGGER_RESTART_RESUME_PROMPT, {
|
|
1418
1443
|
trigger: definition,
|
|
1419
1444
|
runId: run.runId,
|
|
@@ -1780,7 +1805,7 @@ export class TriggerRuntimeScheduler {
|
|
|
1780
1805
|
definition: runtime.definition,
|
|
1781
1806
|
runId,
|
|
1782
1807
|
startedAt: runtime.run.startedAt,
|
|
1783
|
-
status: 'failed',
|
|
1808
|
+
status: termination.reason === 'cancelled' ? 'interrupted' : 'failed',
|
|
1784
1809
|
reason: termination.reason,
|
|
1785
1810
|
source: runtime.source,
|
|
1786
1811
|
script: null,
|
|
@@ -1795,7 +1820,7 @@ export class TriggerRuntimeScheduler {
|
|
|
1795
1820
|
this.audit.write(audit);
|
|
1796
1821
|
this.publishTriggerRunOutcome(runtime.definition, audit);
|
|
1797
1822
|
recordCausationSpan(runtime.causation, 'trigger.run', {
|
|
1798
|
-
status: 'failed',
|
|
1823
|
+
status: termination.reason === 'cancelled' ? 'interrupted' : 'failed',
|
|
1799
1824
|
refs: { triggerId: runtime.definition.id, runId },
|
|
1800
1825
|
reason: termination.reason,
|
|
1801
1826
|
});
|
|
@@ -1957,6 +1982,16 @@ export class TriggerRuntimeScheduler {
|
|
|
1957
1982
|
});
|
|
1958
1983
|
return;
|
|
1959
1984
|
}
|
|
1985
|
+
if (audit.status === 'interrupted') {
|
|
1986
|
+
this.eventBus.publish({
|
|
1987
|
+
type: 'trigger:interrupted',
|
|
1988
|
+
...base,
|
|
1989
|
+
messageId: this.triggerOutcomeMessageId(audit),
|
|
1990
|
+
reason: audit.reason ?? 'interrupted',
|
|
1991
|
+
error: audit.error?.message ?? audit.reason ?? 'trigger interrupted',
|
|
1992
|
+
});
|
|
1993
|
+
return;
|
|
1994
|
+
}
|
|
1960
1995
|
if (audit.status === 'skipped') {
|
|
1961
1996
|
this.eventBus.publish({
|
|
1962
1997
|
type: 'trigger:skipped',
|
|
@@ -157,7 +157,7 @@ export function seedTaskRecoveryTrigger(manager, owner) {
|
|
|
157
157
|
atomicWriteJson(manager.definitionPath(definition.id), definition);
|
|
158
158
|
fs.rmSync(manager.activePath(definition.id), { force: true });
|
|
159
159
|
}
|
|
160
|
-
const
|
|
160
|
+
const DEFAULT_SESSION_IDLE_PROMPT = `本会话已闲置一段时间。请依据你的职责执行一次例行巡检:
|
|
161
161
|
1. 检查当前会话中未完成却停滞的事项。私聊检查自己承诺或正在推进的任务;群聊还需检查成员长时间无进展、被点名未回应、承诺后失联等情况。有,则在既有授权和职责内推进一次,或向相关成员催促一次并说明停滞事项,随后即止;无,则不做任何动作。不要自行新增任务,正常推进或无待办时保持沉默。
|
|
162
162
|
2. 巡检优先基于已有上下文判断,确需补充背景再查询历史,并遵守会话自身的发送规范。
|
|
163
163
|
3. 判定无需任何对外动作时,本轮只输出 [[NOOP]],不发送任何消息、不发布巡检结论。注意:最终对外输出必须是且仅是 [[NOOP]] 这一行——不要在输出它之前先发送任何说明文字或巡检判定,判定过程仅在内部完成。
|
|
@@ -188,7 +188,7 @@ export function seedSessionIdleCheckTrigger(manager, owner) {
|
|
|
188
188
|
},
|
|
189
189
|
execution: {
|
|
190
190
|
type: 'target_session',
|
|
191
|
-
prompt:
|
|
191
|
+
prompt: DEFAULT_SESSION_IDLE_PROMPT,
|
|
192
192
|
onError: 'retry',
|
|
193
193
|
noopSentinel: '[[NOOP]]',
|
|
194
194
|
},
|
|
@@ -9,6 +9,10 @@ const MAX_EXECUTION_TIMEOUT_MS = 2_147_483_647;
|
|
|
9
9
|
export const TRIGGER_SCHEMA_VERSION = 3.1;
|
|
10
10
|
const LEGACY_TRIGGER_SCHEMA_VERSION = 4;
|
|
11
11
|
const DEFAULT_NOOP_SENTINEL = '[[NOOP]]';
|
|
12
|
+
export function sessionIdlePromptOverride(event) {
|
|
13
|
+
return event?.type === 'session:idle' && typeof event.loopOnceRequestId === 'string'
|
|
14
|
+
&& typeof event.loopPrompt === 'string' ? event.loopPrompt : undefined;
|
|
15
|
+
}
|
|
12
16
|
/** Only a leading sentinel controls delivery; later mentions are ordinary prose. */
|
|
13
17
|
export function isTriggerNoopText(text, sentinel) {
|
|
14
18
|
return !!sentinel && text.trimStart().startsWith(sentinel);
|
|
@@ -486,7 +490,6 @@ function normalizeExecution(value, _opts) {
|
|
|
486
490
|
prompt: type === 'script' ? optionalString(raw.prompt) : requiredString(raw.prompt, 'execution.prompt'),
|
|
487
491
|
script: type === 'script' ? normalizeScript(raw.script) : undefined,
|
|
488
492
|
thread: type === 'trigger_session' ? (thread ?? 'by_trigger') : thread,
|
|
489
|
-
baseagent: normalizeExecutionBaseagent(raw.baseagent),
|
|
490
493
|
model: optionalString(raw.model),
|
|
491
494
|
effort: normalizeEffort(raw.effort),
|
|
492
495
|
permissionMode: normalizeTriggerPermissionMode(raw.permissionMode),
|
|
@@ -517,14 +520,6 @@ function normalizeMemoryScope(value) {
|
|
|
517
520
|
}
|
|
518
521
|
return value;
|
|
519
522
|
}
|
|
520
|
-
function normalizeExecutionBaseagent(value) {
|
|
521
|
-
if (value === undefined)
|
|
522
|
-
return undefined;
|
|
523
|
-
if (typeof value !== 'string' || !value.trim()) {
|
|
524
|
-
throw new Error('execution.baseagent must be a non-empty string');
|
|
525
|
-
}
|
|
526
|
-
return value.trim();
|
|
527
|
-
}
|
|
528
523
|
function normalizeExecutionThread(value) {
|
|
529
524
|
const thread = optionalString(value);
|
|
530
525
|
if (thread === undefined)
|
|
@@ -728,8 +723,6 @@ function validateTriggerSemantics(definition) {
|
|
|
728
723
|
throw new Error('execution.prompt is not allowed when execution.type=script');
|
|
729
724
|
if (execution.thread !== undefined)
|
|
730
725
|
throw new Error('execution.thread is not allowed when execution.type=script');
|
|
731
|
-
if (execution.baseagent !== undefined)
|
|
732
|
-
throw new Error('execution.baseagent is only allowed when execution.type=trigger_session');
|
|
733
726
|
}
|
|
734
727
|
if (execution.type === 'trigger_session') {
|
|
735
728
|
if (!execution.prompt)
|
|
@@ -744,8 +737,6 @@ function validateTriggerSemantics(definition) {
|
|
|
744
737
|
throw new Error('execution.script is not allowed when execution.type=target_session');
|
|
745
738
|
if (execution.thread !== undefined)
|
|
746
739
|
throw new Error('execution.thread is not allowed when execution.type=target_session');
|
|
747
|
-
if (execution.baseagent !== undefined)
|
|
748
|
-
throw new Error('execution.baseagent is only allowed when execution.type=trigger_session');
|
|
749
740
|
if (definition.feedback.strategy === 'silent')
|
|
750
741
|
throw new Error('feedback.strategy=silent is not allowed when execution.type=target_session');
|
|
751
742
|
}
|
package/dist/utils/autostart.js
CHANGED
|
@@ -7,9 +7,9 @@ export function autostartInstalled() {
|
|
|
7
7
|
return macosAutostartInstalled();
|
|
8
8
|
return false;
|
|
9
9
|
}
|
|
10
|
-
export function configureAutostart(enabled, runtimeRoot) {
|
|
10
|
+
export function configureAutostart(enabled, runtimeRoot, options = {}) {
|
|
11
11
|
if (process.platform === 'win32')
|
|
12
|
-
return configureWindowsAutostart(enabled, runtimeRoot);
|
|
12
|
+
return configureWindowsAutostart(enabled, runtimeRoot, options);
|
|
13
13
|
if (process.platform === 'darwin')
|
|
14
14
|
return configureMacosAutostart(enabled, runtimeRoot);
|
|
15
15
|
return {
|