evolcore 0.0.22 → 0.0.23

package/dist/index.js

@@ -45,7 +45,7 @@ import { ResponseEngine } from './core/message/response-engine.js';
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
 import { evaluateOutboundContactAdmission } from './core/message/message-admission.js';
-import { evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
+import { enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
 import { readInstalledEvolcoreVersion } from './utils/evolcore-version.js';
 import { recoverAllRoleMutationsSync } from './core/command/role-menu.js';
 import { HandoffRuntime } from './core/handoff/runtime.js';
@@ -74,7 +74,7 @@ import { AgentReloadBusyError, AgentReloadCoordinator } from './core/agent-reloa
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
-import { fetchEcwebPairCode } from './utils/ecweb-utils.js';
+import { remoteAccessService } from './core/auth/remote-access-store.js';
 import { createEcwebSupervisor } from './utils/ecweb-supervisor.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
@@ -551,6 +551,7 @@ async function runBindBootstrapDaemon(daemonCfg) {
         })(),
     }));
     ipcServer.setControlToken(controlToken);
+    ipcServer.setRemoteAccessService(remoteAccessService);
     ipcServer.setShutdownExecutor(async (reason) => {
         if (!shutdown) {
             pendingShutdownReason = reason;
@@ -1354,6 +1355,7 @@ async function main() {
         baseagent: primaryAgent?.baseagent || 'codex',
         projectPath: primaryAgent?.projectPath || process.cwd(),
     };
+    cmdHandler.setDaemonTriggerOwner(daemonTriggerOwner.aid, daemonChannel.channelName);
     const triggerBaseagentsForAgent = (agentAid) => {
         const ownerName = agentRegistry.get(agentAid)?.name
             ?? (agentAid === daemonTriggerOwner.aid ? primaryAgent?.name : undefined);
@@ -2309,6 +2311,7 @@ async function main() {
         return cmdHandler.handleCtl(cmd, sessionId, delegation.grant);
     });
     ipcServer.setDaemonRuntimeEpoch(agentDelegationRegistry.getRuntimeEpoch());
+    cmdHandler.setDaemonMonitorProvider(() => ipcServer.getMonitorSnapshot().snapshot);
     // Register every IPC executor/provider before exposing the endpoint. The
     // function declaration is hoisted, while its invocation remains here so a
     // failed bind still aborts before any AUN connection is attempted.
@@ -2378,10 +2381,10 @@ async function main() {
         catch (e) {
             logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
         }
-        // 控制 AID 接收 owner 指令：
-        // 1. /pair — ECWeb 配对码（文本快路径）
+        // 控制 AID 接收 daemon-owner 或有效远程访问 token 授权的指令：
+        // 1. /pair — daemon 远程控制配对码（文本快路径）
         // 2. menu.* JSON — 路由到 cmdHandler.execMenuForControl（进程级 + 全量权限）
-        // 发送方身份由 AUN X.509 证书链验证，非 owner 完全静默。
+        // 发送方身份由 AUN X.509 证书链验证；非 Menu 文本仍只接受 daemon-owner。
         controlChannel.onMessage(async (opts) => {
             let activeMenuRequest;
             let menuCompletionLogged = false;
@@ -2389,6 +2392,11 @@ async function main() {
                 source: 'control-aun',
                 selfAid: daemonCfg.aid,
                 messageId: opts.messageId,
+                requesterAid: opts.peerId,
+                authMethod: opts.protectedHeaders?.auth_method === 'remote-access-token' || opts.protectedHeaders?.auth_method === 'ecweb-token'
+                    ? opts.protectedHeaders.auth_method
+                    : 'daemon-owner',
+                clientName: opts.protectedHeaders?.client_name ?? 'evol',
             };
             try {
                 const menuTiming = normalizeMenuResponseTiming(opts);
@@ -2402,7 +2410,7 @@ async function main() {
                 }
                 const menuResponseContext = () => controlReplyContext(opts, evolMenuResponseTransportMetadata());
                 const sendControlMenuResponse = async (response) => {
-                    const timedResponse = withMenuProcessingTime(response, menuTiming);
+                    const timedResponse = withMenuProcessingTime(enforceMenuResponseSize(response, 128 * 1024 - 1024), menuTiming);
                     const request = activeMenuRequest ?? {
                         type: 'menu.unknown',
                         id: response.id,
@@ -2450,7 +2458,21 @@ async function main() {
                     menuCompletionLogged = true;
                     return;
                 }
-                if (menuControl.isMenu && !isRoleMenu && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                const menuClientCompatibilityError = menuControl.isMenu
+                    ? evaluateMenuClientCompatibility({ encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders })
+                    : null;
+                if (menuControl.isMenu && menuClientCompatibilityError) {
+                    await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, menuClientCompatibilityError));
+                    return;
+                }
+                const protectedMenuHeaders = opts.protectedHeaders;
+                const hasRemoteAccessToken = protectedMenuHeaders?.auth_method === 'remote-access-token'
+                    || protectedMenuHeaders?.auth_method === 'ecweb-token';
+                if (text.toLowerCase() === '/pair' && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                    logger.debug(`控制 AID 收到非 owner 配对请求，忽略: from=${opts.peerId}`);
+                    return;
+                }
+                if (menuControl.isMenu && !isRoleMenu && !hasRemoteAccessToken && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
                     const response = menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, {
                         code: 'NOT_ALLOWED',
                         message: formatAuthorizationDenial('Control-channel process operations require DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
@@ -2459,40 +2481,28 @@ async function main() {
                     await sendControlMenuResponse(response);
                     return;
                 }
-                if (!isRoleMenu && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                if (!isRoleMenu && !hasRemoteAccessToken && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
                     logger.debug(`控制 AID 收到非 owner 消息，忽略: from=${opts.peerId}`);
                     return;
                 }
                 if (text.toLowerCase() === '/pair') {
-                    const port = ecwebService(loadDaemonConfig().services)?.port ?? DEFAULT_ECWEB_PORT;
-                    const pair = await fetchEcwebPairCode(port, opts.peerId);
-                    let reply;
-                    if (pair) {
-                        const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
-                        reply = `ECWeb 配对码：${pair.code}（约 ${mins} 分钟内有效）\n在浏览器打开 ECWeb 后输入此码登录`;
-                    }
-                    else {
-                        reply = 'ECWeb 未运行或暂不可达。请在主机运行 ec watch web 启动后重试。';
-                    }
+                    const pair = remoteAccessService.getPairingCode(opts.peerId);
+                    const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+                    const reply = `远程控制配对码：${pair.code}（约 ${mins} 分钟内有效）`;
                     await controlChannel.sendMessage(opts.channelId, reply, controlReplyContext(opts));
                     return;
                 }
-                // menu.* JSON 路由：owner 已在上方校验，转交 execMenuForControl（fromControlChannel=true）
+                // menu.* JSON 路由：准入来源在上方分流，最终 token/owner 校验由 execMenuForControl 完成。
                 if (menuControl.isMenu) {
-                    const versionError = evaluateEvolMenuVersionGate({
-                        encrypted: opts.encrypted,
-                        protectedHeaders: opts.protectedHeaders,
-                    });
-                    if (versionError) {
-                        await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, versionError));
-                        return;
-                    }
                     const validationError = validateMenuRequest(menuControl.request);
                     if (validationError) {
                         await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, validationError));
                         return;
                     }
-                    const deduped = await controlMenuDeduper.execute([opts.channelId, opts.peerId, menuControl.id].join('\u001f'), menuPayloadFingerprint(menuControl.raw), () => cmdHandler.execMenuForControl(parsed, opts.peerId));
+                    const deduped = await controlMenuDeduper.execute([opts.channelId, opts.peerId, menuControl.id].join('\u001f'), menuPayloadFingerprint(menuControl.raw), () => cmdHandler.execMenuForControl(parsed, opts.peerId, {
+                        encrypted: opts.encrypted,
+                        protectedHeaders: opts.protectedHeaders,
+                    }));
                     if ('retry' in deduped) {
                         if (deduped.replayed) {
                             logger.warn(`[MenuControl] category=request-replay request=${menuControl.id}`
@@ -2512,7 +2522,7 @@ async function main() {
                     return;
                 }
                 // owner 发的其他内容：提示可用指令
-                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取 ECWeb 登录配对码）', controlReplyContext(opts));
+                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取远程控制配对码）', controlReplyContext(opts));
             }
             catch (e) {
                 if (activeMenuRequest && !menuCompletionLogged) {
@@ -2688,6 +2698,7 @@ async function main() {
         // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
         ipcServer.setAgentRegistry(agentRegistry);
         ipcServer.setControlToken(triggerControlToken);
+        ipcServer.setRemoteAccessService(remoteAccessService);
         ipcServer.setBootstrapCompleteExecutor(async (aid, auth) => {
             if (auth?.sessionId) {
                 const authorization = await authorizeManagedAgentOperation({

package/dist/ipc.js

@@ -17,6 +17,8 @@ import { classifyProcessTree, ProcessTreeSampler, readProcessMetrics } from './u
 import { readSystemMemoryUsage } from './utils/system-memory.js';
 import { hashCurrentDelegatedCommand } from './core/auth/agent-delegation.js';
 import { normalizeAunMentionEntries } from './aun/msg/mention-schema.js';
+import { remoteAccessService } from './core/auth/remote-access-store.js';
+import { setModelCatalogDaemonOwner } from './core/model/model-catalog.js';
 const isWindows = process.platform === 'win32';
 const isNamedPipe = (p) => isWindows && p.toLowerCase().startsWith('\\\\.\\pipe\\');
 const CPU_SAMPLE_INTERVAL_MS = 1000;
@@ -44,10 +46,15 @@ const LOCAL_CONTROL_COMMANDS = new Set([
     'evolagent.load',
     'evolagent.resync',
     'menu.exec',
+    'model.catalog',
     'monitor-snapshot',
     'monitor-subscribe',
     'monitor-unsubscribe',
     'shutdown',
+    'remote-auth.pair-code',
+    'remote-auth.issue-local',
+    'remote-auth.redeem',
+    'remote-auth.validate',
 ]);
 let ipcQuerySequence = 0;
 function ipcLogToken(value, fallback = 'unknown') {
@@ -127,6 +134,7 @@ export class IpcServer {
     wechatContactBindExecutor;
     controlToken;
     daemonRuntimeEpoch;
+    remoteAccessService = remoteAccessService;
     // CPU 占用追踪：IPC handler 是一次性同步调用，无法在响应里做 200ms 异步采样，
     // 故用后台 1s interval 累积 process.cpuUsage() 增量，handler 直接读最近值。
     // procCpuPercent = 本 daemon 进程占单核的百分比（可 >100% 仅当多核，已 clamp 到 100）；
@@ -177,6 +185,10 @@ export class IpcServer {
     setControlToken(token) {
         this.controlToken = Buffer.from(token);
     }
+    /** Use the daemon-owned remote access service for local consumers such as ECWeb. */
+    setRemoteAccessService(service) {
+        this.remoteAccessService = service;
+    }
     /** Set the process-lifetime marker used to reject stale managed children. */
     setDaemonRuntimeEpoch(epoch) {
         this.daemonRuntimeEpoch = epoch;
@@ -233,6 +245,87 @@ export class IpcServer {
     setAgentStatsProvider(provider) {
         this.agentStatsProvider = provider;
     }
+    /** Single current snapshot shared by ECWeb IPC and the daemon Menu view. */
+    getMonitorSnapshot(leaseId) {
+        if (typeof leaseId === 'string' && leaseId.trim())
+            this.refreshProcessTreeMonitor(leaseId);
+        else
+            this.sampleProcessTree();
+        const mem = process.memoryUsage();
+        const systemMemory = readSystemMemoryUsage();
+        const aids = this.aunAidProvider ? this.aunAidProvider() : [];
+        const aidStats = this.aunAidStatsProvider ? this.aunAidStatsProvider() : [];
+        const statsMap = new Map(aidStats.map(stat => [stat.aid, stat]));
+        const agentInfos = this.agentRegistry ? this.agentRegistry.list() : [];
+        const agentRuntimeStats = this.agentStatsProvider ? this.agentStatsProvider() : [];
+        const agentRuntimeStatsMap = new Map(agentRuntimeStats.map(stat => [stat.aid, stat]));
+        const aidStateMap = new Map(aids.map(state => [state.agentName || state.aid, state]));
+        const processTree = this.processTreeSnapshot;
+        const processTreeCpu = processTree?.processCount ? processTree.cpuPercent : this.cpuPercent;
+        const processTreeRss = processTree?.processCount ? processTree.rss : mem.rss;
+        const processTreeDetails = processTree ? {
+            ...processTree,
+            processes: classifyProcessTree(processTree.processes, process.pid, this.associatedProcessKinds),
+        } : {
+            rootPid: process.pid,
+            rootPids: [process.pid],
+            processCount: 1,
+            cpuPercent: Math.round(this.cpuPercent * 10) / 10,
+            rss: mem.rss,
+            processes: [{
+                    pid: process.pid,
+                    ppid: process.ppid,
+                    name: 'evolcore',
+                    cpuPercent: Math.round(this.cpuPercent * 10) / 10,
+                    rss: mem.rss,
+                    kind: 'daemon',
+                }],
+        };
+        return {
+            ok: true,
+            snapshot: {
+                ts: Date.now(),
+                uptimeMs: Math.round(process.uptime() * 1000),
+                cpuCount: os.cpus().length,
+                memory: {
+                    rss: processTreeRss,
+                    heapUsed: mem.heapUsed,
+                    heapTotal: mem.heapTotal,
+                    external: mem.external,
+                },
+                cpuPercent: processTreeCpu,
+                mainProcess: {
+                    pid: process.pid,
+                    cpuPercent: Math.round(this.cpuPercent * 10) / 10,
+                    memory: mem,
+                },
+                processTree: processTreeDetails,
+                sampling: {
+                    cpuIntervalMs: CPU_SAMPLE_INTERVAL_MS,
+                    processTreeIntervalMs: PROCESS_TREE_SAMPLE_INTERVAL_MS,
+                    eventLoopLagMs: this.eventLoopLagMs,
+                    maxEventLoopLagMs: this.maxEventLoopLagMs,
+                    processTree: { ...this.processTreeSampling },
+                },
+                system: {
+                    ...systemMemory,
+                    cpuPercent: Math.round(this.sysCpuPercent * 10) / 10,
+                    loadAvg: os.loadavg(),
+                },
+                stats: this.statsProvider ? this.statsProvider() : null,
+                agentSummary: summarizeMonitorAgents(agentInfos, aids),
+                agents: agentInfos.map(agent => ({
+                    aid: agent.aid,
+                    agentName: agent.name,
+                    status: agent.status,
+                    connectionStatus: aidStateMap.get(agent.aid)?.status ?? (agent.status === 'disabled' ? 'disabled' : 'unavailable'),
+                    online: agent.status !== 'disabled' && aidStateMap.get(agent.aid)?.status === 'connected',
+                    stats: statsMap.get(agent.aid) ?? null,
+                    runtimeStats: agentRuntimeStatsMap.get(agent.aid) ?? null,
+                })),
+            },
+        };
+    }
     /** Inject queue snapshot provider for queue-snapshot IPC handler (query mode) */
     setQueueSnapshotProvider(provider) {
         this.queueSnapshotProvider = provider;
@@ -623,6 +716,7 @@ export class IpcServer {
         return roots;
     }
     start() {
+        setModelCatalogDaemonOwner(true);
         if (this.server)
             return Promise.resolve();
         // Remove stale socket file (Unix only — named pipes auto-cleanup on process exit)
@@ -685,6 +779,7 @@ export class IpcServer {
         });
     }
     stop() {
+        setModelCatalogDaemonOwner(false);
         if (this.server) {
             this.server.close();
             this.server = null;
@@ -712,6 +807,19 @@ export class IpcServer {
             };
         }
         switch (cmd.type) {
+            case 'model.catalog': {
+                if ((cmd.self !== undefined && typeof cmd.self !== 'string')
+                    || (cmd.baseagent !== undefined && !['claude', 'codex', 'ecagent', 'gemini'].includes(cmd.baseagent))) {
+                    return { ok: false, error: 'Invalid model catalog scope' };
+                }
+                try {
+                    const { getLocalCatalog } = await import('./core/model/model-catalog.js');
+                    return { ok: true, snapshot: await getLocalCatalog(cmd.self, cmd.baseagent, cmd.refresh === true) };
+                }
+                catch {
+                    return { ok: false, error: 'Unable to resolve model catalog configuration' };
+                }
+            }
             case 'status':
                 return this.getStatus();
             case 'codex-pre-tool-use': {
@@ -769,6 +877,19 @@ export class IpcServer {
                     ttlMs: cmd.ttlMs,
                 });
             }
+            case 'remote-auth.pair-code': {
+                const pair = this.remoteAccessService.getPairingCode(typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy : undefined);
+                return { ok: true, ...pair };
+            }
+            case 'remote-auth.issue-local': {
+                return this.remoteAccessService.issueLocalToken(cmd.label);
+            }
+            case 'remote-auth.redeem': {
+                return this.remoteAccessService.redeemPairingCode(cmd.code, cmd.label, cmd.authorizedBy);
+            }
+            case 'remote-auth.validate': {
+                return { ok: true, ...this.remoteAccessService.validateToken(cmd.token) };
+            }
             case 'bind.status': {
                 if (!this.bindExecutor)
                     return { ok: false, error: 'bind executor not configured' };
@@ -1385,87 +1506,8 @@ export class IpcServer {
                     return { ok: false, error: e?.message ?? String(e) };
                 }
             }
-            case 'monitor-snapshot': {
-                this.refreshProcessTreeMonitor(cmd.leaseId);
-                // watch web Monitor 页用：进程级 + 系统级运行指标 + 全局 stats + per-agent 汇总。
-                const mem = process.memoryUsage();
-                const systemMemory = readSystemMemoryUsage();
-                const aids = this.aunAidProvider ? this.aunAidProvider() : [];
-                const aidStats = this.aunAidStatsProvider ? this.aunAidStatsProvider() : [];
-                const statsMap = new Map(aidStats.map((s) => [s.aid, s]));
-                const agentInfos = this.agentRegistry ? this.agentRegistry.list() : [];
-                const agentRuntimeStats = this.agentStatsProvider ? this.agentStatsProvider() : [];
-                const agentRuntimeStatsMap = new Map(agentRuntimeStats.map((s) => [s.aid, s]));
-                const aidStateMap = new Map(aids.map((state) => [state.agentName || state.aid, state]));
-                const agentSummary = summarizeMonitorAgents(agentInfos, aids);
-                const processTree = this.processTreeSnapshot;
-                const processTreeCpu = processTree?.processCount ? processTree.cpuPercent : this.cpuPercent;
-                const processTreeRss = processTree?.processCount ? processTree.rss : mem.rss;
-                const processTreeDetails = processTree ? {
-                    ...processTree,
-                    processes: classifyProcessTree(processTree.processes, process.pid, this.associatedProcessKinds),
-                } : {
-                    rootPid: process.pid,
-                    rootPids: [process.pid],
-                    processCount: 1,
-                    cpuPercent: Math.round(this.cpuPercent * 10) / 10,
-                    rss: mem.rss,
-                    processes: [{
-                            pid: process.pid,
-                            ppid: process.ppid,
-                            name: 'evolcore',
-                            cpuPercent: Math.round(this.cpuPercent * 10) / 10,
-                            rss: mem.rss,
-                            kind: 'daemon',
-                        }],
-                };
-                return {
-                    ok: true,
-                    snapshot: {
-                        ts: Date.now(),
-                        uptimeMs: Math.round(process.uptime() * 1000),
-                        cpuCount: os.cpus().length,
-                        // 进程级：daemon + 子进程 + 登记在册的关联进程树
-                        memory: {
-                            rss: processTreeRss,
-                            heapUsed: mem.heapUsed,
-                            heapTotal: mem.heapTotal,
-                            external: mem.external,
-                        },
-                        cpuPercent: processTreeCpu,
-                        mainProcess: {
-                            pid: process.pid,
-                            cpuPercent: Math.round(this.cpuPercent * 10) / 10,
-                            memory: mem,
-                        },
-                        processTree: processTreeDetails,
-                        sampling: {
-                            cpuIntervalMs: CPU_SAMPLE_INTERVAL_MS,
-                            processTreeIntervalMs: PROCESS_TREE_SAMPLE_INTERVAL_MS,
-                            eventLoopLagMs: this.eventLoopLagMs,
-                            maxEventLoopLagMs: this.maxEventLoopLagMs,
-                            processTree: { ...this.processTreeSampling },
-                        },
-                        // 系统级：整机
-                        system: {
-                            ...systemMemory,
-                            cpuPercent: Math.round(this.sysCpuPercent * 10) / 10,
-                            loadAvg: os.loadavg(), // [1m, 5m, 15m]（Windows 恒 0）
-                        },
-                        stats: this.statsProvider ? this.statsProvider() : null,
-                        agentSummary,
-                        agents: agentInfos.map((a) => ({
-                            aid: a.aid,
-                            agentName: a.name,
-                            status: a.status,
-                            connectionStatus: aidStateMap.get(a.aid)?.status ?? (a.status === 'disabled' ? 'disabled' : 'unavailable'),
-                            online: a.status !== 'disabled' && aidStateMap.get(a.aid)?.status === 'connected',
-                            stats: statsMap.get(a.aid) ?? null,
-                            runtimeStats: agentRuntimeStatsMap.get(a.aid) ?? null,
-                        })),
-                    },
-                };
-            }
+            case 'monitor-snapshot':
+                return this.getMonitorSnapshot(cmd.leaseId);
             case 'monitor-subscribe': {
                 const leaseId = typeof cmd.leaseId === 'string' ? cmd.leaseId.trim() : '';
                 if (!leaseId || leaseId.length > 128)

package/dist/trigger/manager.js

@@ -92,7 +92,9 @@ export class TriggerDefinitionManager {
         assertExplicitAunDeliveryRoutes(updated);
         this.assertAgent(updated);
         if (existing.execution.baseagent !== updated.execution.baseagent) {
-            throw new Error('execution.baseagent is immutable; create a new Trigger to use another baseagent');
+            if (existing.execution.type !== 'trigger_session' || updated.execution.type !== 'trigger_session') {
+                throw new Error('execution.baseagent is only mutable between trigger_session Triggers');
+            }
         }
         updated.createdAt = existing.createdAt;
         updated.updatedAt = Date.now();

package/dist/trigger/parser.js

@@ -1,8 +1,11 @@
 import { CronExpressionParser } from 'cron-parser';
 const TRIGGER_UPDATE_FLAGS = new Set([
     'once', 'delay', 'at', 'cron', 'every', 'event', 'tz',
-    'prompt', 'name',
-    'script-file',
+    'prompt', 'name', 'description',
+    'script-file', 'script-runtime', 'script-args', 'script-timeout',
+    'feedback', 'target-channel', 'target-channel-id', 'target-chat-type', 'target-session', 'target-thread-id',
+    'trigger-thread', 'baseagent',
+    'on-error', 'noop-sentinel', 'retry-attempts', 'retry-backoff',
     'model', 'effort', 'permission',
     'max-runs', 'max-duration', 'concurrency', 'missed-policy',
 ]);
@@ -396,18 +399,22 @@ function commonParsed(flags, opts = {}) {
     if (!opts.update && !execution.value) {
         return { ok: false, error: '创建 trigger 必须显式指定 --exec script|trigger-session|target-session' };
     }
+    // update 场景下执行类型未知（不重命名 --exec），execution-type 相关校验
+    // 全部交给 patch/validation 按现有定义执行。
     const inferredExecution = execution.value;
-    if (baseagent.value && inferredExecution !== 'trigger_session') {
-        return { ok: false, error: '--baseagent 仅适用于 --exec trigger-session' };
-    }
-    if (inferredExecution === 'script') {
-        if (!scriptPath && !opts.update)
-            return { ok: false, error: '--exec script 需要 --script-path' };
-        if (scriptPath && !scriptRuntime && !opts.update)
-            return { ok: false, error: '--script-path 必须配合 --script-runtime 使用（node|python|bash）' };
-    }
-    else if (!prompt && !opts.update) {
-        return { ok: false, error: '--prompt 为必填项' };
+    if (!opts.update) {
+        if (baseagent.value && inferredExecution !== 'trigger_session') {
+            return { ok: false, error: '--baseagent 仅适用于 --exec trigger-session' };
+        }
+        if (inferredExecution === 'script') {
+            if (!scriptPath)
+                return { ok: false, error: '--exec script 需要 --script-path' };
+            if (scriptPath && !scriptRuntime)
+                return { ok: false, error: '--script-path 必须配合 --script-runtime 使用（node|python|bash）' };
+        }
+        else if (!prompt) {
+            return { ok: false, error: '--prompt 为必填项' };
+        }
     }
     const targetSessionValue = targetSession.value ?? (targetThreadId ? 'thread' : 'main');
     const feedbackStrategy = feedback.value ?? (hasTargetField ? 'target' : 'origin');
@@ -645,6 +652,63 @@ function parseTriggerUpdateFlags(nameOrId, flags, opts = {}) {
         }
         update.missedPolicy = normalized;
     }
+    const description = optionalFlagString(flags, 'description');
+    if ('error' in description)
+        return { ok: false, error: description.error };
+    if (description.value !== undefined)
+        update.description = description.value || null;
+    if (flags.has('feedback') && value.feedbackStrategy !== undefined)
+        update.feedback = value.feedbackStrategy;
+    if (value.targetChannel !== undefined)
+        update.targetChannel = value.targetChannel;
+    if (value.targetChannelId !== undefined)
+        update.targetChannelId = value.targetChannelId;
+    if (value.targetChatType !== undefined)
+        update.targetChatType = value.targetChatType;
+    if (value.targetSession !== undefined && flags.has('target-session'))
+        update.targetSession = value.targetSession;
+    if (value.targetThreadId !== undefined)
+        update.targetThreadId = value.targetThreadId;
+    if (value.triggerThread !== undefined)
+        update.triggerThread = value.triggerThread;
+    if (value.baseagent !== undefined)
+        update.baseagent = value.baseagent;
+    const onError = optionalFlagString(flags, 'on-error');
+    if ('error' in onError)
+        return { ok: false, error: onError.error };
+    if (onError.value !== undefined) {
+        if (onError.value !== 'fail' && onError.value !== 'retry') {
+            return { ok: false, error: '--on-error 只接受 fail 或 retry' };
+        }
+        update.onError = onError.value;
+    }
+    const noopSentinel = optionalFlagString(flags, 'noop-sentinel');
+    if ('error' in noopSentinel)
+        return { ok: false, error: noopSentinel.error };
+    if (noopSentinel.value !== undefined)
+        update.noopSentinel = noopSentinel.value || null;
+    const retryAttempts = optionalFlagString(flags, 'retry-attempts');
+    if ('error' in retryAttempts)
+        return { ok: false, error: retryAttempts.error };
+    if (retryAttempts.value !== undefined) {
+        if (!/^\d+$/.test(retryAttempts.value))
+            return { ok: false, error: '--retry-attempts 必须是非负整数' };
+        update.retryAttempts = Number(retryAttempts.value);
+    }
+    const retryBackoff = optionalFlagString(flags, 'retry-backoff');
+    if ('error' in retryBackoff)
+        return { ok: false, error: retryBackoff.error };
+    if (retryBackoff.value !== undefined) {
+        if (!/^\d+$/.test(retryBackoff.value))
+            return { ok: false, error: '--retry-backoff 必须是毫秒正整数' };
+        update.retryBackoff = Number(retryBackoff.value);
+    }
+    if (value.scriptRuntime !== undefined)
+        update.scriptRuntime = value.scriptRuntime;
+    if (value.scriptArgs !== undefined)
+        update.scriptArgs = value.scriptArgs;
+    if (value.scriptTimeoutMs !== undefined)
+        update.scriptTimeout = value.scriptTimeoutMs;
     if (Object.keys(update).length === 0)
         return { ok: false, error: '没有可更新的 trigger 参数' };
     return { ok: true, nameOrId, value: update };