evolcore 0.0.35 → 0.0.36

package/dist/product.js

@@ -7,6 +7,7 @@
 export const PRODUCT_DISPLAY_NAME = 'EvolCore';
 export const MAIN_PACKAGE_NAME = 'evolcore';
 export const MAIN_CLI_BIN = 'ec';
+export const RESTART_REQUEST_ID_ENV = 'EVOLCORE_RESTART_REQUEST_ID';
 export const WEB_PACKAGE_NAME = 'ec-web';
 export const WEB_CLI_BIN = 'ec-web';
 export const WEB_PACKAGE_LATEST = `${WEB_PACKAGE_NAME}@latest`;

package/dist/response-system/engines/v1/proactive-flow.js

@@ -8,6 +8,7 @@
  * flow 是无状态单例：per-message 运行时状态存 ctx.state['proactive']，
  * 依赖全部由调用点显式传入。
  */
+import { sessionTopicThreadId } from '../../../core/thread/topic-id.js';
 const STATE_KEY = 'proactive';
 const SNAPSHOT_KEY = 'proactive:continuation';
 const OWNER_KEY = 'proactive:owner';
@@ -248,7 +249,7 @@ function canRestoreSnapshot(ctx, state, snapshot) {
         || snapshot.sessionId !== ctx.session.id || snapshot.selfAid !== ctx.session.selfAID
         || snapshot.channel !== ctx.session.channel || snapshot.channelId !== ctx.session.channelId
         || snapshot.chatType !== ctx.message.chatType || snapshot.chatType !== ctx.session.chatType
-        || snapshot.threadId !== normalizedThread(ctx.session.threadId)
+        || snapshot.threadId !== (sessionTopicThreadId(ctx.session) ?? '')
         || snapshot.threadId !== normalizedThread(continuation.threadId)
         || snapshot.baseagent !== ctx.session.baseagent || snapshot.agentSessionId !== ctx.session.agentSessionId
         || snapshot.firstSendRequired !== state.firstSendRequired
@@ -283,7 +284,7 @@ function saveContinuation(ctx) {
         channel: ctx.session.channel,
         channelId: ctx.session.channelId,
         chatType: state.chatType,
-        threadId: normalizedThread(ctx.session.threadId),
+        threadId: sessionTopicThreadId(ctx.session) ?? '',
         baseagent: ctx.session.baseagent,
         agentSessionId: ctx.session.agentSessionId,
         turnId: terminal.turnId,
@@ -460,8 +461,14 @@ export const proactiveFlow = {
             && ctx.executionState !== 'blocked' && ctx.executionState !== 'failed'
             && ctx.decision !== 'deny' && ctx.executed !== false;
         if (isSend && succeeded) {
+            const cmd = typeof ctx.toolInput?.command === 'string' ? ctx.toolInput.command : '';
+            const returnMatch = cmd.match(/--return\s+(required|none)\b/);
+            const requiresBusinessReturn = returnMatch?.[1] === 'required';
+            const businessDone = requiresBusinessReturn
+                ? hasSuccessfulSendReceipt(ctx.result, ctx.isError, true)
+                : true;
             state.roundHasIntentSuccess = true;
-            if (!state.firstToolDone)
+            if (!state.firstToolDone && businessDone)
                 state.firstToolDone = true;
             state.violationCount = 0;
         }

package/dist/stats/db.js

@@ -222,6 +222,8 @@ function _initTables(db) {
       peer_key      TEXT    NOT NULL,
       call_index    INTEGER NOT NULL,
       model         TEXT    NOT NULL,
+      source        TEXT    NOT NULL DEFAULT 'request',
+      provider_thread_id TEXT,
       request_id    TEXT,
       message_id    TEXT,
       input_tokens          INTEGER NOT NULL DEFAULT 0,
@@ -291,6 +293,12 @@ function _initTables(db) {
     // 使用上轮真实 context/max/compact window，避免按模型名猜窗口。
     try {
         const cols = db.prepare(`PRAGMA table_info(model_calls)`).all();
+        if (!cols.some(c => c.name === 'source')) {
+            db.exec(`ALTER TABLE model_calls ADD COLUMN source TEXT NOT NULL DEFAULT 'request'`);
+        }
+        if (!cols.some(c => c.name === 'provider_thread_id')) {
+            db.exec(`ALTER TABLE model_calls ADD COLUMN provider_thread_id TEXT`);
+        }
         if (!cols.some(c => c.name === 'context_tokens')) {
             db.exec(`ALTER TABLE model_calls ADD COLUMN context_tokens INTEGER`);
         }

package/dist/stats/writer.js

@@ -2,9 +2,31 @@
  * writer.ts — 写入 usage_events 和 context_breakdown。
  */
 import { getDb, resetStatsDb, startDailyRollupMaintenance } from './db.js';
+import { normalizeUsage } from './normalizer.js';
 import { resolvePrices } from './price-resolver.js';
 import { logger } from '../utils/logger.js';
-export function insertUsageEvent(evolcoreHome, event, gatewayPricing) {
+export function insertUsageEvent(evolcoreHome, event, gatewayPricing, modelCalls) {
+    if (modelCalls?.some(call => call.source === 'subagent')) {
+        const events = modelCalls.map((call, index) => normalizeUsage({ ...call.tokenUsage,
+            cache_creation_input_tokens: call.tokenUsage.cache_creation_input_tokens ?? undefined,
+            cache_read_input_tokens: call.tokenUsage.cache_read_input_tokens ?? undefined,
+        }, {
+            ...event, model: call.model || 'unknown', turns: index === 0 ? event.turns : 0,
+            duration_ms: index === 0 ? event.duration_ms : undefined,
+            context_window_pct: index === 0 ? event.context_window_pct : undefined,
+        }));
+        for (const field of ['input_tokens', 'output_tokens', 'cache_creation_tokens', 'cache_read_tokens']) {
+            if (events.reduce((sum, entry) => sum + entry[field], 0) !== event[field]) {
+                throw new Error('Model usage breakdown does not match the turn total');
+            }
+        }
+        const prices = events.map(entry => insertUsageEvent(evolcoreHome, entry, gatewayPricing));
+        const sum = (kind) => prices.every(price => price[kind] !== null)
+            ? { usd: prices.reduce((total, price) => total + price[kind].usd, 0),
+                cny: prices.reduce((total, price) => total + price[kind].cny, 0) }
+            : null;
+        return { official: sum('official'), gateway: sum('gateway') };
+    }
     const db = getDb(evolcoreHome);
     // 写入时计算费用（官方价格 + 网关价格）。即使 DB 不可用也返回价格对，供调用方合入状态回执。
     const prices = resolvePrices(evolcoreHome, event, gatewayPricing);
@@ -155,13 +177,13 @@ export function insertModelCalls(evolcoreHome, rows) {
         const stmt = db.prepare(`
       INSERT INTO model_calls
         (ts, task_id, session_id, agent_session_id, agent_aid, peer_key, call_index, model,
-         request_id, message_id, input_tokens, output_tokens, cache_creation_tokens,
+         source, provider_thread_id, request_id, message_id, input_tokens, output_tokens, cache_creation_tokens,
          cache_read_tokens, context_tokens, max_tokens, auto_compact_tokens, degraded)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         db.exec('BEGIN');
         for (const r of rows) {
-            stmt.run(r.ts, r.task_id, r.session_id ?? null, r.agent_session_id ?? null, r.agent_aid, r.peer_key, r.call_index, r.model, r.request_id ?? null, r.message_id ?? null, r.input_tokens, r.output_tokens, r.cache_creation_tokens, r.cache_read_tokens, r.context_tokens ?? null, r.max_tokens ?? null, r.auto_compact_tokens ?? null, r.degraded);
+            stmt.run(r.ts, r.task_id, r.session_id ?? null, r.agent_session_id ?? null, r.agent_aid, r.peer_key, r.call_index, r.model, r.source ?? 'request', r.provider_thread_id ?? null, r.request_id ?? null, r.message_id ?? null, r.input_tokens, r.output_tokens, r.cache_creation_tokens, r.cache_read_tokens, r.context_tokens ?? null, r.max_tokens ?? null, r.auto_compact_tokens ?? null, r.degraded);
         }
         db.exec('COMMIT');
     }

package/dist/trigger/authorization.js

@@ -2,10 +2,12 @@ import crypto from 'crypto';
 import { eventPatternIncludesInternal } from '../core/event-catalog.js';
 import { trustedExecutionIdentityInput } from '../core/auth/agent-delegation.js';
 import { authorizeOperation, buildAuthSubject } from '../core/auth/auth-gateway.js';
+import { refreshOwnershipForAuthorization } from '../core/ownership/owner-resolver.js';
 import { isManagementRole } from '../config/builtin-roles.js';
 import { checkRoleAccess, resolvePeerRoleDetail, roleToSessionIdentity } from '../config/peer-role-resolver.js';
 import { validateModelSelectionForRole } from '../core/model/model-permission.js';
 import { isValidAunDeliveryForChannel } from '../core/message/outbound.js';
+import { sessionTopicThreadId } from '../core/thread/topic-id.js';
 import { tryParseChannelKey } from '../core/channel-loader.js';
 import { constrainRuntimePermissionMode, validateRuntimeStringFieldOverride, } from '../core/role/runtime-policy.js';
 import { resolveThreadRouteTarget } from '../core/thread/thread-route.js';
@@ -21,13 +23,16 @@ export function originFromActorSession(session, authenticatedPeerId, authenticat
     }
     const isGroup = authenticatedChatType === 'group' || session.chatType === 'group';
     const channelId = isGroup ? session.channelId : peerId;
-    const sessionKind = sameConversation && session.threadId ? 'thread' : 'main';
+    // 只有话题会让 origin 变成 `thread`；主话题（含 `main:<a>:<b>` 规范 id）
+    // 在 Trigger 里仍用 `session: 'main'` 表达，主话题 id 不写进 origin.threadId。
+    const topicThreadId = sameConversation ? sessionTopicThreadId(session) : undefined;
+    const sessionKind = topicThreadId ? 'thread' : 'main';
     return {
         channelKey,
         channelType: session.channelType || tryParseChannelKey(channelKey)?.type || channelKey,
         channelId,
         session: sessionKind,
-        threadId: sessionKind === 'thread' ? session.threadId : undefined,
+        threadId: topicThreadId,
         peerId,
         sessionKey: sameConversation ? session.sessionKey : undefined,
         delivery: isGroup ? { chatType: 'group', groupId: channelId } : { chatType: 'private' },
@@ -168,7 +173,46 @@ export function validateTriggerDefinitionForActor(definition, actor, dependencie
         }
     }
 }
-export function authorizeTriggerExecution(definition, dependencies) {
+/**
+ * Trigger 的操作主体集合：谁能 cancel / update / show 这条 Trigger。
+ *
+ * origin 只记录"从哪个会话创建"，feedback 目标才是"结果投给谁"。跨话题复查
+ * （origin = 来源话题对端 A，target = 目标话题对端 C）要求 C 侧也能操作，
+ * 否则结果回来之后在 C 那边完全看不见、也取消不掉。旧定义没有 operatorPeers
+ * 字段时按同样规则现算，不需要数据迁移。
+ */
+export function triggerOperatorPeerIds(definition) {
+    const declared = (definition.operatorPeers ?? []).filter(peer => typeof peer === 'string' && peer.length > 0);
+    if (declared.length > 0)
+        return [...new Set(declared)];
+    const peers = [];
+    if (definition.origin)
+        peers.push(originConversationPeerId(definition.origin));
+    const target = definition.feedback.strategy === 'target' ? definition.feedback.target : undefined;
+    if (target?.channelId)
+        peers.push(target.channelId);
+    return [...new Set(peers.filter(peer => typeof peer === 'string' && peer.length > 0))];
+}
+/**
+ * 会话的对端身份：私聊是对方 AID，群聊是群 AID。
+ *
+ * 群会话里 `origin.peerId` 记的是**群内发言人**（`channels/aun.ts` 的
+ * `buildGroupReplyContext` 把 `replyContext.peerId` 设为 senderAid），
+ * 群本身的身份只在 `channelId`。协议里 `group_id` 与 `group_aid` 是同一个值
+ * （`10-Group-子协议.md`：`{"group_id":"g-abc.pub","group_aid":"g-abc.pub"}`），
+ * 所以群场景取 `channelId` 才是群 AID。若按 peerId 比对，群内每个发言人都会
+ * 得到不同身份，授权必然对不上。
+ */
+export function originConversationPeerId(origin) {
+    return origin.delivery?.chatType === 'group' ? origin.channelId : (origin.peerId || origin.channelId);
+}
+export function isTriggerOperator(definition, actorConversationPeerId) {
+    if (!definition || !actorConversationPeerId)
+        return false;
+    return triggerOperatorPeerIds(definition).includes(actorConversationPeerId);
+}
+export async function authorizeTriggerExecution(definition, dependencies) {
+    await refreshOwnershipForAuthorization(definition.agentAid);
     if (definition.execution.permissionMode === 'fullaccess') {
         if (!definition.authorizedBy) {
             return { allowed: false, reason: 'fullaccess Trigger approval provenance is missing' };
@@ -342,6 +386,7 @@ export async function authenticatedTriggerActor(dependencies, agentAid, actorSes
         throw new Error('trigger delegation actor does not match session peer');
     }
     const actorChatType = triggerOriginChatType(actorOrigin);
+    await refreshOwnershipForAuthorization(agentAid);
     const actorConversationId = actorChatType === 'group' ? actorOrigin.channelId : actorOrigin.peerId;
     const roleDetail = resolvePeerRoleDetail({
         selfAid: agentAid,

package/dist/trigger/feedback.js

@@ -2,7 +2,8 @@ import { buildEnvelope } from '../core/message/message-utils.js';
 import { executionTimeoutMs, renderTemplate, previewText, sha256 } from './validation.js';
 import { isDaemonEventSessionTrigger } from './event-source.js';
 import { TASK_RECOVERY_PROMPT } from '../core/task/task-recovery-service.js';
-import { ExecutionTimeoutError, OrphanedTargetSessionError } from '../utils/error-utils.js';
+import { ExecutionTimeoutError, OrphanedTargetSessionError, isRetryableError } from '../utils/error-utils.js';
+import { isTopicThreadId, sessionThreadKind, sessionTopicThreadId } from '../core/thread/topic-id.js';
 const FEEDBACK_DEADLINE_MS = 30_000;
 const TARGET_SESSION_CANCEL_GRACE_MS = 1_000;
 const TARGET_SESSION_OUTCOME_GRACE_MS = 5_000;
@@ -89,12 +90,15 @@ export class TriggerFeedbackDispatcher {
             if (channelTypeFromKey(channelKey) === 'aun' && typeof payload.encrypted !== 'boolean') {
                 return this.failed(feedback, [], 'event_session_encryption_missing', 'AUN event source must preserve the original encryption mode');
             }
+            const eventSourceKind = sessionThreadKind(eventSession);
             unresolvedTarget = {
                 channelKey,
                 channelId: eventSession.channelId,
                 chatType: eventSession.chatType,
-                session: eventSession.threadId ? 'thread' : 'main',
-                ...(eventSession.threadId ? { threadId: eventSession.threadId } : {}),
+                // 只有话题让目标变成 `thread`；主话题用 `session: 'main'` 表达，不写 threadId（同 originFromActorSession）。
+                ...(eventSourceKind.kind === 'topic'
+                    ? { session: 'thread', threadId: eventSourceKind.threadId }
+                    : { session: 'main' }),
             };
         }
         if (!unresolvedTarget)
@@ -104,6 +108,9 @@ export class TriggerFeedbackDispatcher {
             return this.failed(feedback, [], 'route_missing', 'AUN target_session has no explicit delivery route');
         }
         const isTaskErrorRecovery = !!eventSession && input.sourcePayload?.type === 'task:error';
+        if (isTaskErrorRecovery && input.sourcePayload?.recoverable !== true) {
+            return { status: 'skipped', reason: 'not_recoverable', feedback, effects: [], error: null };
+        }
         if (isTaskErrorRecovery && (typeof input.sourcePayload?.taskId !== 'string' || !input.sourcePayload.taskId
             || !Number.isSafeInteger(input.sourcePayload.generation))) {
             return this.failed(feedback, [], 'recovery_event_invalid', 'task:error must identify the original task and generation');
@@ -155,7 +162,7 @@ export class TriggerFeedbackDispatcher {
             let session;
             try {
                 const existingLookup = eventSession ?? (target.session === 'thread'
-                    ? target.threadId && this.deps.sessionManager.getThreadSession
+                    ? isTopicThreadId(target.threadId) && this.deps.sessionManager.getThreadSession
                         ? this.deps.sessionManager.getThreadSession(target.channelKey, target.channelId, target.threadId)
                         : undefined
                     : this.deps.sessionManager.getActiveSession
@@ -168,7 +175,7 @@ export class TriggerFeedbackDispatcher {
                     session = existing;
                 }
                 else if (target.session === 'thread') {
-                    if (!target.threadId) {
+                    if (!isTopicThreadId(target.threadId)) {
                         return this.failed(feedback, [], 'target_missing', 'target thread id is missing');
                     }
                     const mainLookup = this.deps.sessionManager.getActiveSession?.(target.channelKey, target.channelId);
@@ -240,7 +247,9 @@ export class TriggerFeedbackDispatcher {
                 channelId: target.channelId,
                 selfAID: targetAgentAid,
                 baseagent: session.baseagent || binding.baseagent,
-                threadId: session.threadId || '',
+                // Message.threadId 是入站路由字段：只有话题才非空，主会话为 ''（与入站消息、
+                // task-recovery 一致）。下游 resolveSession / message-queue scope 以它区分主会话。
+                threadId: sessionTopicThreadId(session) ?? '',
                 chatType: messageChatType,
                 peerId: `trigger:${input.trigger.id}`,
                 peerName: input.trigger.name,
@@ -282,6 +291,11 @@ export class TriggerFeedbackDispatcher {
                     noopSentinel: input.trigger.execution.noopSentinel,
                     authorizedBy: input.trigger.authorizedBy,
                     labels: input.trigger.labels,
+                    // 跨话题复查：标记本次投递的类型，执行侧据此走 T2 会话自身身份，
+                    // 而不是 originPeerId（来源话题的对端）。
+                    ...(input.trigger.labels?.kind === 'cross-thread-review'
+                        ? { reviewKind: 'cross-thread-review' }
+                        : {}),
                 },
             };
             outcome = this.waitForTriggerOutcome(input.runId, input.attemptId, delivery.signal);
@@ -324,7 +338,7 @@ export class TriggerFeedbackDispatcher {
                     const event = observed.outcome === 'completed'
                         ? { ...base, type: 'trigger:completed', durationMs: Date.now() - startedAt }
                         : observed.outcome === 'failed'
-                            ? { ...base, type: 'trigger:failed', error: observed.reason ?? 'target_session_failed', phase: 'execute' }
+                            ? { ...base, type: 'trigger:failed', error: observed.reason ?? 'target_session_failed', recoverable: observed.recoverable, phase: 'execute' }
                             : { ...base, type: 'trigger:skipped', reason: observed.reason ?? 'stale_generation',
                                 decisionSource: 'infrastructure', executionState: 'interrupted' };
                     outcome?.settle(event);
@@ -423,7 +437,7 @@ export class TriggerFeedbackDispatcher {
                         reason: event.phase,
                         feedback,
                         effects: [this.inboundEffect('success', target, session.id, startedAt)],
-                        error: { code: event.phase || 'target_session_failed', message: event.error },
+                        error: { code: event.phase || 'target_session_failed', message: event.error, recoverable: event.recoverable },
                     };
                 }
                 if (event?.type === 'trigger:skipped') {
@@ -473,7 +487,7 @@ export class TriggerFeedbackDispatcher {
                     reason: err instanceof OrphanedTargetSessionError ? err.reason : 'enqueue_error',
                     feedback,
                     effects: [this.inboundEffect('failed', target, session.id, startedAt, undefined, err?.message || String(err))],
-                    error: { code: err instanceof OrphanedTargetSessionError ? err.reason : 'enqueue_error', message: err?.message || String(err) },
+                    error: { code: err instanceof OrphanedTargetSessionError ? err.reason : 'enqueue_error', message: err?.message || String(err), recoverable: isRetryableError(err) },
                 };
             }
         }
@@ -848,6 +862,7 @@ function errorFromReply(reply) {
     return {
         code: reply.error?.reason ?? reply.outcome,
         message: reply.error?.text ?? reply.outcome,
+        ...(reply.error?.recoverable !== undefined ? { recoverable: reply.error.recoverable } : {}),
     };
 }
 function originAsTarget(origin) {
@@ -864,8 +879,11 @@ function replyContextFromTarget(target) {
     const delivery = targetDeliveryFor(target);
     if (delivery)
         ctx.delivery = delivery;
-    if (target.session === 'thread' && target.threadId)
+    // 话题 id 上线；主话题 id 只进本地日志（`localTopicId`），不进报文。
+    if (isTopicThreadId(target.threadId))
         ctx.threadId = target.threadId;
+    else if (target.threadId)
+        ctx.localTopicId = target.threadId;
     return Object.keys(ctx).length > 0 ? ctx : undefined;
 }
 function targetChatType(target) {

package/dist/trigger/ipc-service.js

@@ -1,7 +1,7 @@
 import { getEventCatalog } from '../core/event-catalog.js';
-import { authorizeOperation, canApprovePersistentFullAccessTrigger, isCrossAgentTriggerOperationAllowed, } from '../core/auth/auth-gateway.js';
+import { authorizeFreshOperation, canApprovePersistentFullAccessTrigger, isCrossAgentTriggerOperationAllowed, } from '../core/auth/auth-gateway.js';
 import { auditFullAccessEvent } from '../core/auth/authorization-audit.js';
-import { assertTriggerLocalFileAuthority, daemonPrivilegedTriggerReason, } from './authorization.js';
+import { assertTriggerLocalFileAuthority, daemonPrivilegedTriggerReason, isTriggerOperator, originConversationPeerId, triggerOperatorPeerIds, } from './authorization.js';
 import { decodeTriggerScriptFile } from './local-files.js';
 import { applyTriggerPatch } from './patch.js';
 import { definitionRevision, normalizeTriggerDefinition, splitScriptCommand } from './validation.js';
@@ -106,6 +106,63 @@ export function createTriggerIpcExecutor(dependencies) {
             if (approvedActor && (agentAid !== approvedAgentAid || operation !== approvedOperation)) {
                 throw new Error('Trigger operation does not match its approved argv');
             }
+            // Allow a trigger session to cancel, delete, or disable its own trigger.
+            // The trigger session's channelId is "trigger:<triggerId>", which fails the normal
+            // delegation peer check because it isn't a real AID. For these de-escalation
+            // operations we synthesise an actor directly from the trigger definition's origin,
+            // which already passed vetting when the trigger was created.
+            const isSelfDeescalation = !approvedActor
+                && triggerId
+                && (operation === 'trigger.cancel' || operation === 'trigger.delete' || operation === 'trigger.setEnabled')
+                && typeof cmd.actorSessionId === 'string';
+            if (isSelfDeescalation) {
+                const actorSession = await dependencies.getSessionById(cmd.actorSessionId);
+                const sessionChannelId = actorSession?.channelId;
+                if (sessionChannelId === `trigger:${triggerId}`) {
+                    const definition = schedulerFor(agentAid).list({ all: true }).find(t => t.id === triggerId);
+                    if (!definition?.origin?.peerId)
+                        throw new Error('trigger not found or access denied');
+                    const { buildAuthSubject } = await import('../core/auth/auth-gateway.js');
+                    const { resolvePeerRoleDetail, roleToSessionIdentity } = await import('../config/peer-role-resolver.js');
+                    const { tryParseChannelKey } = await import('../core/channel-loader.js');
+                    const origin = definition.origin;
+                    const channelType = origin.channelType || tryParseChannelKey(origin.channelKey)?.type || origin.channelKey;
+                    const chatType = origin.delivery?.chatType ?? 'private';
+                    const conversationId = chatType === 'group' ? origin.channelId : origin.peerId;
+                    const roleDetail = resolvePeerRoleDetail({
+                        selfAid: agentAid,
+                        channelKey: origin.channelKey,
+                        channelType,
+                        chatType,
+                        actorId: origin.peerId,
+                        conversationId: conversationId,
+                    });
+                    const subject = buildAuthSubject({
+                        selfAid: agentAid,
+                        actorId: origin.peerId,
+                        channel: origin.channelKey,
+                        channelType,
+                        channelId: origin.channelId,
+                        chatType,
+                        conversationId,
+                        roleDetail,
+                        identity: roleToSessionIdentity(roleDetail.effectiveRole),
+                        processOwners: [],
+                        fromControlChannel: false,
+                    });
+                    return {
+                        origin,
+                        management: false,
+                        daemonOwner: false,
+                        daemonPrivileged: false,
+                        fullAccess: false,
+                        selfAid: agentAid,
+                        control: false,
+                        role: roleDetail.effectiveRole || 'none',
+                        subject,
+                    };
+                }
+            }
             const actor = approvedActor ?? await dependencies.authenticateActor(agentAid, cmd.actorSessionId, cmd.delegationToken, cmd.delegationCommandHash, cmd.controlToken, contextOnly);
             if (actor.permissionMode === 'readonly' && !actor.fullAccess
                 && !['trigger.list', 'trigger.show', 'trigger.history', 'trigger.eventCatalog'].includes(operation)) {
@@ -124,7 +181,7 @@ export function createTriggerIpcExecutor(dependencies) {
                     throw new Error('cross-agent Trigger operations require DaemonOwner');
                 throw new Error('trigger agent does not match authenticated task agent');
             }
-            const operationDecision = authorizeOperation({
+            const operationDecision = await authorizeFreshOperation({
                 source: actor.control ? 'control' : 'agent-tool',
                 subject: actor.subject,
                 intent: {
@@ -143,6 +200,10 @@ export function createTriggerIpcExecutor(dependencies) {
             });
             if (!operationDecision.allow)
                 throw new Error(operationDecision.reason);
+            actor.daemonOwner = actor.subject.isDaemonOwner;
+            actor.daemonPrivileged = actor.control || actor.daemonOwner || actor.fullAccess;
+            actor.role = actor.subject.role;
+            actor.management = ['owner', 'admin'].includes(actor.role) || actor.daemonPrivileged;
             if (!triggerId)
                 return actor;
             const definition = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === triggerId);
@@ -157,9 +218,7 @@ export function createTriggerIpcExecutor(dependencies) {
             }
             if (actor.management)
                 return actor;
-            if (!definition
-                || definition.origin?.peerId !== actor.origin?.peerId
-                || definition.origin?.channelKey !== actor.origin?.channelKey) {
+            if (!isTriggerOperator(definition, actor.origin ? originConversationPeerId(actor.origin) : undefined)) {
                 throw new Error('trigger not found or access denied');
             }
             return actor;
@@ -213,8 +272,7 @@ export function createTriggerIpcExecutor(dependencies) {
                 const definitions = scheduler.list({ all: cmd.all === true }).filter(trigger => ((actor.daemonPrivileged
                     || !daemonPrivilegedTriggerReason(trigger)
                     || daemonPrivilegedTriggerReason(trigger) === 'persistent fullaccess Trigger')
-                    && (actor.management
-                        || (trigger.origin?.peerId === actor.origin?.peerId && trigger.origin?.channelKey === actor.origin?.channelKey))));
+                    && (actor.management || isTriggerOperator(trigger, actor.origin ? originConversationPeerId(actor.origin) : undefined))));
                 return { ok: true, triggers: scheduler.listItems(definitions) };
             }
             case 'trigger.show': {
@@ -269,7 +327,15 @@ export function createTriggerIpcExecutor(dependencies) {
                 }
                 const agentAid = requireAgent(rawDefinition.agentAid);
                 const actor = await authorizeTrigger(agentAid, 'trigger.create');
-                const materialized = materializeTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin }, agentAid, dependencies);
+                // 操作主体在创建时固定下来：origin 对端 + feedback 目标对端。跨话题复查的
+                // feedback 目标（C）因此也拿得到 cancel/update/show 权限，与 thread-ops
+                // 技能"在目标话题里结束复查"的流程一致。
+                const operatorPeers = triggerOperatorPeerIds({
+                    origin: actor.origin,
+                    feedback: rawDefinition.feedback,
+                    operatorPeers: undefined,
+                });
+                const materialized = materializeTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin, operatorPeers }, agentAid, dependencies);
                 let definition = normalizeTriggerDefinition(materialized);
                 rejectUnapprovedFullAccessConfiguration(definition, actor);
                 definition = withFullAccessConfigurationProvenance(definition, actor);
@@ -319,6 +385,8 @@ export function createTriggerIpcExecutor(dependencies) {
                     }
                     decodeTriggerScriptFile(scriptFileBase64);
                 }
+                // 操作主体之间不做字段限制：operatorPeers 是创建者对"谁能管理这条 Trigger"的授权，
+                // 被授权方与 origin 侧拥有同样的修改权限。
                 const currentRevision = definitionRevision(existing);
                 if (cmd.expectedRevision !== undefined && cmd.expectedRevision !== currentRevision) {
                     throw new Error(`trigger revision conflict: expected ${cmd.expectedRevision}, current ${currentRevision}`);
@@ -328,7 +396,15 @@ export function createTriggerIpcExecutor(dependencies) {
                     : existing;
                 rejectUnapprovedFullAccessConfiguration(definition, actor);
                 definition = withFullAccessConfigurationProvenance(definition, actor);
-                dependencies.validateTriggerDefinitionForActor(definition, actor);
+                // update 时只有 feedback 被修改才重新校验目标限制；
+                // 未改 feedback 的 patch（如只改 prompt）对已合法存在的 trigger 不应再执行创建时的
+                // feedbackTargetAllowedForNonManagement 检查，否则 operator peers 侧的 member
+                // 更新 prompt 会被拒。其他校验（permissionMode/model/effort）照常执行。
+                const feedbackChanged = 'feedback' in definitionPatch;
+                const actorForValidation = feedbackChanged || actor.management || actor.daemonPrivileged
+                    ? actor
+                    : { ...actor, management: true };
+                dependencies.validateTriggerDefinitionForActor(definition, actorForValidation);
                 dependencies.validateTriggerFeedbackChannels(definition);
                 const files = scriptFileBase64 !== undefined && existing.execution.script
                     ? [{