evolcore 0.0.2 → 0.0.3

package/dist/core/session/session-fs-store.js

@@ -13,12 +13,16 @@ function decodeSegment(s) {
 /**
  * 计算 chat 目录的完整路径。
  * - aun: sessionsDir/aun/<urlEncode(selfAID|'_unknown')>/<urlEncode(channelId)>/
+ * - wecom: sessionsDir/wecom/<urlEncode(channelKey)>/<urlEncode(channelId)>/
  * - 其它: sessionsDir/<channelType>/<urlEncode(channelId)>/
  */
-export function chatDirPath(sessionsDir, channelType, channelId, selfAID) {
+export function chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey) {
     if (channelType === 'aun') {
         return path.join(sessionsDir, channelType, encodeSegment(selfAID || '_unknown'), encodeSegment(channelId));
     }
+    if (channelType === 'wecom' && channelKey?.startsWith('wecom#')) {
+        return path.join(sessionsDir, channelType, encodeSegment(channelKey), encodeSegment(channelId));
+    }
     return path.join(sessionsDir, channelType, encodeSegment(channelId));
 }
 /** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfAID） */
@@ -126,6 +130,7 @@ export function readAllJsonlLines(filePath) {
 /**
  * 扫描所有 chat 目录。
  * - aun: channelType / selfAID / channelId  (3层)
+ * - wecom: channelType / channelKey / channelId (3层；兼容旧的2层目录)
  * - 其它: channelType / channelId           (2层)
  */
 export function scanChatDirs(sessionsDir) {
@@ -176,6 +181,42 @@ export function scanChatDirs(sessionsDir) {
                 }
             }
         }
+        else if (channelType === 'wecom') {
+            for (const entry of level2Entries) {
+                if (!entry.isDirectory())
+                    continue;
+                const decoded = decodeSegment(entry.name);
+                const entryDir = path.join(typeDir, entry.name);
+                if (decoded.startsWith('wecom#') && decoded.split('#').length === 3) {
+                    let chatEntries;
+                    try {
+                        chatEntries = fs.readdirSync(entryDir, { withFileTypes: true });
+                    }
+                    catch {
+                        continue;
+                    }
+                    for (const chatEntry of chatEntries) {
+                        if (!chatEntry.isDirectory())
+                            continue;
+                        results.push({
+                            channelType,
+                            selfAID: '',
+                            channelKey: decoded,
+                            channelId: decodeSegment(chatEntry.name),
+                            dirPath: path.join(entryDir, chatEntry.name),
+                        });
+                    }
+                }
+                else {
+                    results.push({
+                        channelType,
+                        selfAID: '',
+                        channelId: decoded,
+                        dirPath: entryDir,
+                    });
+                }
+            }
+        }
         else {
             // 2-layer: channelType/channelId
             for (const chatEntry of level2Entries) {
@@ -205,8 +246,8 @@ export function scanMetaFiles(chatDir) {
         throw e;
     }
 }
-export function ensureChatDir(sessionsDir, channelType, channelId, selfAID) {
-    const dir = chatDirPath(sessionsDir, channelType, channelId, selfAID);
+export function ensureChatDir(sessionsDir, channelType, channelId, selfAID, channelKey) {
+    const dir = chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey);
     fs.mkdirSync(dir, { recursive: true });
     fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
     fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });

package/dist/core/session/session-manager.js

@@ -23,6 +23,7 @@ export class SessionManager {
         this.eventBus = eventBus;
         this.identityResolver = identityResolver;
         this.migrateChannelKeyFormat();
+        this.migrateWecomChannelDirs();
     }
     setIdentityResolver(resolver) {
         this.identityResolver = resolver;
@@ -69,20 +70,20 @@ export class SessionManager {
      * 需要明确的 channelType + selfAID 才能确定路径。
      */
     resolveChatDir(channel, channelId, channelType, selfAID) {
-        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel);
     }
     /**
      * 给定明确的 channelType + selfAID 时直接计算路径（不扫描）。
      * 用于 caller 已经知道完整路由信息的场景（如 message-bridge 透传）。
      */
     resolveChatDirExact(channel, channelId, channelType, selfAID) {
-        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel);
     }
     resolveChatDirFromSession(session) {
         if (!session.channelType) {
             throw new Error(`[SessionManager] missing channelType for session ${session.id}`);
         }
-        return chatDirPath(this.sessionsDir, session.channelType, session.channelId, session.selfAID);
+        return chatDirPath(this.sessionsDir, session.channelType, session.channelId, session.selfAID, session.channel);
     }
     deriveChannelIdentity(channel, channelId) {
         const parsed = tryParseChannelKey(channel);
@@ -253,7 +254,7 @@ export class SessionManager {
     }
     ensureChatDirForSession(session) {
         const channelType = session.channelType || session.channel;
-        return ensureChatDir(this.sessionsDir, channelType, session.channelId, session.selfAID);
+        return ensureChatDir(this.sessionsDir, channelType, session.channelId, session.selfAID, session.channel);
     }
     metaFilePath(chatDir, sessionId) {
         return path.join(chatDir, `${sessionId}.jsonl`);
@@ -678,7 +679,7 @@ export class SessionManager {
     getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, baseagent, selfAID, channelType, peerType, chatType) {
         // 使用精确路径（channelType + selfAID）
         const chatDir = (channelType && selfAID)
-            ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfAID); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
+            ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
             : this.ensureResolvedChatDirSafe(channel, channelId, channelType, selfAID);
         const threadIndex = readThreadIndex(chatDir);
         const existingEntry = threadIndex[threadId];
@@ -1584,4 +1585,59 @@ export class SessionManager {
         }
         return null;
     }
+    /**
+     * Move legacy `sessions/wecom/<chatId>` directories under their persisted
+     * channelKey. The stored SessionFile.channel is authoritative; ambiguous
+     * directories are deliberately left untouched for manual recovery.
+     */
+    migrateWecomChannelDirs() {
+        const legacyDirs = scanChatDirs(this.sessionsDir)
+            .filter(entry => entry.channelType === 'wecom' && !entry.channelKey);
+        let migrated = 0;
+        for (const entry of legacyDirs) {
+            const candidates = [];
+            const active = readJsonFile(path.join(entry.dirPath, 'active.json'));
+            if (active)
+                candidates.push(active);
+            for (const metaFile of scanMetaFiles(entry.dirPath)) {
+                const meta = readLastJsonlLine(path.join(entry.dirPath, metaFile));
+                if (meta)
+                    candidates.push(meta);
+            }
+            const threadDir = path.join(entry.dirPath, '_threads');
+            for (const metaFile of scanMetaFiles(threadDir)) {
+                const meta = readLastJsonlLine(path.join(threadDir, metaFile));
+                if (meta)
+                    candidates.push(meta);
+            }
+            const channelKeys = new Set(candidates
+                .map(item => item.channel)
+                .filter((value) => typeof value === 'string' && value.startsWith('wecom#')));
+            if (channelKeys.size !== 1) {
+                if (channelKeys.size > 1) {
+                    logger.error(`[SessionManager] Cannot auto-migrate mixed WeCom session directory: ${entry.dirPath}`);
+                }
+                continue;
+            }
+            const channelKey = [...channelKeys][0];
+            const target = chatDirPath(this.sessionsDir, 'wecom', entry.channelId, undefined, channelKey);
+            if (target === entry.dirPath)
+                continue;
+            if (fs.existsSync(target)) {
+                logger.error(`[SessionManager] Cannot migrate WeCom session directory because target exists: ${target}`);
+                continue;
+            }
+            try {
+                fs.mkdirSync(path.dirname(target), { recursive: true });
+                fs.renameSync(entry.dirPath, target);
+                migrated++;
+            }
+            catch (error) {
+                logger.error(`[SessionManager] Failed to migrate WeCom session directory ${entry.dirPath}: ${String(error)}`);
+            }
+        }
+        if (migrated > 0) {
+            logger.info(`[SessionManager] Migrated ${migrated} WeCom session director${migrated === 1 ? 'y' : 'ies'} to channelKey isolation`);
+        }
+    }
 }

package/dist/index.js

@@ -16,6 +16,7 @@ import { loadDefaults, loadAllAgents, migrateIdentitiesIfNeeded, loadDaemonConfi
 import { ConfigTarget, initConfigManager, onConfigWrite } from './config/config-manager.js';
 import { ensureRoleConfigV4OnStartup } from './config/role-config-v4-startup.js';
 import { ensureRoleConfigV5OnStartup } from './config/role-config-v5-startup.js';
+import { ensureContactBookV2OnStartup } from './config/contact-book-v2-startup.js';
 import { shouldFailFastForMissingOwners } from './config/owner-policy.js';
 import { isManagementRole } from './config/builtin-roles.js';
 import { checkRoleAccess, getFirstStaticAgentOwner, resolvePeerRoleDetail, roleToSessionIdentity } from './config/peer-role-resolver.js';
@@ -33,7 +34,7 @@ import { startServiceProxy } from './aun/service-proxy.js';
 import { BindService } from './utils/aid-bind.js';
 import { DingtalkChannelPlugin, registerPendingDingtalkContactBind } from './channels/dingtalk.js';
 import { QQBotChannelPlugin } from './channels/qqbot.js';
-import { WecomChannelPlugin } from './channels/wecom.js';
+import { WecomChannelPlugin, registerPendingWecomContactBind } from './channels/wecom.js';
 import { buildEnvelope } from './core/message/message-utils.js';
 import { ResponseEngine } from './core/message/response-engine.js';
 import { MessageQueue } from './core/message/message-queue.js';
@@ -598,6 +599,9 @@ async function main() {
     }
     // 在登记 daemon 实例前自动备份并迁移旧角色配置；失败才阻止启动。
     try {
+        // Crash recovery must precede schema gates and migrations so they never
+        // inspect or migrate a partially applied Role Menu transaction.
+        recoverAllRoleMutationsSync();
         const migration = await ensureRoleConfigV4OnStartup();
         if (migration) {
             const msg = `✓ Role config v4 migration applied automatically: ${migration.changedFiles} file(s)` +
@@ -612,6 +616,13 @@ async function main() {
             logger.info(msg);
             console.error(msg);
         }
+        const contactMigration = await ensureContactBookV2OnStartup();
+        if (contactMigration) {
+            const msg = `✓ Contact book v2 migration applied automatically: ${contactMigration.changedFiles} file(s)` +
+                (contactMigration.backup ? `; backup: ${contactMigration.backup}` : '');
+            logger.info(msg);
+            console.error(msg);
+        }
     }
     catch (e) {
         const msg = `❌ ${e instanceof Error ? e.message : String(e)}`;
@@ -639,7 +650,6 @@ async function main() {
     // ── 配置体系初始化（schema 字段不相交硬约束校验）──
     try {
         initConfigManager();
-        recoverAllRoleMutationsSync();
     }
     catch (e) {
         const msg = `❌ 配置 schema 校验失败: ${e instanceof Error ? e.message : String(e)}`;
@@ -870,7 +880,9 @@ async function main() {
     const permissionGateway = new PermissionGateway();
     permissionGateway.setEventBus(eventBus);
     onConfigWrite(({ target, selector }) => {
-        if ((target !== ConfigTarget.Agent && target !== ConfigTarget.Contact) || !selector.self)
+        if ((target !== ConfigTarget.Agent
+            && target !== ConfigTarget.Contact
+            && target !== ConfigTarget.Relation) || !selector.self)
             return;
         const cancelled = permissionGateway.revalidatePendingApprovals(selector.self);
         if (cancelled > 0) {
@@ -1061,6 +1073,43 @@ async function main() {
         baseagent: primaryAgent?.baseagent || 'codex',
         projectPath: primaryAgent?.projectPath || process.cwd(),
     };
+    const triggerBaseagentsForAgent = (agentAid) => {
+        const ownerName = agentRegistry.get(agentAid)?.name
+            ?? (agentAid === daemonTriggerOwner.aid ? primaryAgent?.name : undefined);
+        if (!ownerName)
+            return [];
+        const prefix = `${ownerName}::`;
+        return [...agentMap.keys()]
+            .filter(key => key.startsWith(prefix))
+            .map(key => key.slice(prefix.length));
+    };
+    const materializeTriggerCreateBaseagent = (input, agentAid) => {
+        const rawExecution = input.execution;
+        if (!rawExecution || typeof rawExecution !== 'object' || Array.isArray(rawExecution))
+            return input;
+        const execution = rawExecution;
+        if (execution.type !== 'trigger_session') {
+            if (execution.baseagent !== undefined) {
+                throw new Error('execution.baseagent is only allowed when execution.type=trigger_session');
+            }
+            return input;
+        }
+        if (execution.baseagent !== undefined
+            && (typeof execution.baseagent !== 'string' || !execution.baseagent.trim())) {
+            throw new Error('execution.baseagent must be a non-empty string');
+        }
+        const baseagent = typeof execution.baseagent === 'string'
+            ? execution.baseagent.trim()
+            : agentRegistry.get(agentAid)?.baseagent
+                ?? (agentAid === daemonTriggerOwner.aid ? daemonTriggerOwner.baseagent : undefined);
+        if (!baseagent)
+            throw new Error('unable to resolve Trigger session baseagent');
+        const available = triggerBaseagentsForAgent(agentAid);
+        if (!available.includes(baseagent)) {
+            throw new Error(`Trigger baseagent unavailable for ${agentAid}: ${baseagent} (available: ${available.join(', ') || 'none'})`);
+        }
+        return { ...input, execution: { ...execution, baseagent } };
+    };
     const getTriggerChannel = (agentAid, channelKey) => {
         if (agentAid === daemonTriggerOwner.aid && channelKey === daemonChannel.channelKey) {
             return {
@@ -1117,7 +1166,7 @@ async function main() {
             const agent = agentRegistry.get(definition.agentAid);
             const modelDecision = validateModelSelectionForRole({
                 role: actor.role,
-                baseagent: agent?.baseagent,
+                baseagent: definition.execution.baseagent ?? agent?.baseagent,
                 requestedModel: definition.execution.model,
                 selfAid: definition.agentAid,
             });
@@ -1125,7 +1174,9 @@ async function main() {
                 throw new Error(modelDecision.message || 'trigger model is not allowed by current role');
         }
         if (definition.execution.effort) {
-            const baseagent = agentRegistry.get(definition.agentAid)?.baseagent || 'claude';
+            const baseagent = definition.execution.baseagent
+                ?? agentRegistry.get(definition.agentAid)?.baseagent
+                ?? 'claude';
             const effortDecision = validateRuntimeStringFieldOverride({
                 selfAid: definition.agentAid,
                 role: actor.role,
@@ -2132,8 +2183,12 @@ async function main() {
     ipcServer.setDingtalkContactBindExecutor({
         register: (cmd) => registerPendingDingtalkContactBind(cmd),
     });
+    ipcServer.setWecomContactBindExecutor({
+        register: (cmd) => registerPendingWecomContactBind(cmd),
+    });
     ipcServer.setMenuExecutor((payload, auth) => cmdHandler.execMenuForEcweb(payload, auth));
     ipcServer.setConfigOperationExecutor((argv, sessionId, delegationToken) => cmdHandler.handleConfigOperation(argv, sessionId, delegationToken));
+    ipcServer.setContactOperationExecutor((argv, sessionId, delegationToken) => cmdHandler.handleContactOperation(argv, sessionId, delegationToken));
     cmdHandler.setDaemonStatusProvider(() => {
         const aidState = controlChannel?.getAidState?.();
         return {
@@ -2708,7 +2763,8 @@ async function main() {
                 }
                 const agentAid = requireAgent(rawDefinition.agentAid);
                 const actor = await authorizeTrigger(agentAid, 'trigger.create');
-                const definition = normalizeTriggerDefinition({ ...rawDefinition, origin: actor.origin });
+                const materialized = materializeTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin }, agentAid);
+                const definition = normalizeTriggerDefinition(materialized);
                 validateTriggerDefinitionForActor(definition, actor);
                 requireAgent(definition.agentAid);
                 validateTriggerFeedbackChannels(definition);

package/dist/ipc.js

@@ -8,6 +8,7 @@ import { HANDOFF_QUERY_MAX_LIMIT, HANDOFF_STATES } from './core/handoff/types.js
 import { resolvePaths } from './paths.js';
 import { getProcessStartTime, isSameOrOlderProcess } from './utils/process-introspect.js';
 import { classifyProcessTree, ProcessTreeSampler } from './utils/process-tree-stats.js';
+import { readSystemMemoryUsage } from './utils/system-memory.js';
 const isWindows = process.platform === 'win32';
 const isNamedPipe = (p) => isWindows && p.startsWith('\\\\.\\pipe\\');
 export function summarizeMonitorAgents(agents, aids) {
@@ -45,7 +46,9 @@ export class IpcServer {
     handoffTraceExecutor;
     bindExecutor;
     configOperationExecutor;
+    contactOperationExecutor;
     dingtalkContactBindExecutor;
+    wecomContactBindExecutor;
     // CPU 占用追踪：IPC handler 是一次性同步调用，无法在响应里做 200ms 异步采样，
     // 故用后台 1s interval 累积 process.cpuUsage() 增量，handler 直接读最近值。
     // procCpuPercent = 本 daemon 进程占单核的百分比（可 >100% 仅当多核，已 clamp 到 100）；
@@ -75,6 +78,9 @@ export class IpcServer {
     setConfigOperationExecutor(executor) {
         this.configOperationExecutor = executor;
     }
+    setContactOperationExecutor(executor) {
+        this.contactOperationExecutor = executor;
+    }
     /** Inject AUN AID state aggregator for aun-aids IPC handler */
     setAunAidProvider(provider) {
         this.aunAidProvider = provider;
@@ -136,6 +142,10 @@ export class IpcServer {
     setDingtalkContactBindExecutor(executor) {
         this.dingtalkContactBindExecutor = executor;
     }
+    /** Inject WeCom contact binding-code executor. */
+    setWecomContactBindExecutor(executor) {
+        this.wecomContactBindExecutor = executor;
+    }
     /** Start the 1s background CPU sampling loop (for monitor-snapshot). Call after start(). */
     startCpuTracking() {
         if (this.cpuTimer)
@@ -321,6 +331,16 @@ export class IpcServer {
                     primaryId: cmd.primaryId,
                 });
             }
+            case 'wecom.contact-bind.register': {
+                if (!this.wecomContactBindExecutor) {
+                    return { ok: false, error: 'wecom contact bind executor not configured' };
+                }
+                return this.wecomContactBindExecutor.register({
+                    selfAid: cmd.selfAid,
+                    channelName: cmd.channelName,
+                    primaryId: cmd.primaryId,
+                });
+            }
             case 'aun-aids': {
                 const aids = this.aunAidProvider ? this.aunAidProvider() : [];
                 return { ok: true, aids };
@@ -527,6 +547,18 @@ export class IpcServer {
                 }
                 return await this.configOperationExecutor(argv, sessionId, delegationToken);
             }
+            case 'contact.op': {
+                if (!this.contactOperationExecutor)
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'contact.op not configured' };
+                const { argv, sessionId, delegationToken } = cmd;
+                if (!Array.isArray(argv) || argv.some(value => typeof value !== 'string') || !sessionId) {
+                    return { ok: false, code: 'INVALID_REQUEST', error: 'missing argv or sessionId' };
+                }
+                if (delegationToken !== undefined && typeof delegationToken !== 'string') {
+                    return { ok: false, code: 'INVALID_DELEGATION', error: 'delegationToken must be a string' };
+                }
+                return await this.contactOperationExecutor(argv, sessionId, delegationToken);
+            }
             case 'trigger.list':
             case 'trigger.show':
             case 'trigger.history':
@@ -633,8 +665,7 @@ export class IpcServer {
             case 'monitor-snapshot': {
                 // watch web Monitor 页用：进程级 + 系统级运行指标 + 全局 stats + per-agent 汇总。
                 const mem = process.memoryUsage();
-                const totalMem = os.totalmem();
-                const freeMem = os.freemem();
+                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]));
@@ -686,9 +717,7 @@ export class IpcServer {
                         processTree: processTreeDetails,
                         // 系统级：整机
                         system: {
-                            memTotal: totalMem,
-                            memUsed: totalMem - freeMem,
-                            memFree: freeMem,
+                            ...systemMemory,
                             cpuPercent: Math.round(this.sysCpuPercent * 10) / 10,
                             loadAvg: os.loadavg(), // [1m, 5m, 15m]（Windows 恒 0）
                         },

package/dist/stats/billing.js

@@ -11,14 +11,20 @@ let _priceCacheTs = 0;
 const PRICE_CACHE_TTL = 5 * 60 * 1000;
 /**
  * 从包路径 + 用户路径合并读取 JSONL 文件。
- * 包路径（$PACKAGE_ROOT/data/stats/）为基线，用户路径（$EVOLCORE_HOME/data/stats/）为追加/覆盖。
+ * 包基线随构建产物发布在 dist/utils，源码运行时回退到 src/utils；
+ * 用户路径（$EVOLCORE_HOME/data/stats/）为追加/覆盖。
  * 两层合并（append），用户层行追加在包层之后——查价时 effective_from 越大越优先，天然正确。
  */
 function _loadJsonlMerged(evolcoreHome, filename) {
     const results = [];
     // 1. 包路径（基线）
-    const pkgFile = path.join(getPackageRoot(), 'data', 'stats', filename);
-    if (fs.existsSync(pkgFile)) {
+    const packageRoot = getPackageRoot();
+    const pkgFile = [
+        path.join(packageRoot, 'dist', 'utils', filename),
+        path.join(packageRoot, 'src', 'utils', filename),
+        path.join(packageRoot, 'data', 'stats', filename),
+    ].find(candidate => fs.existsSync(candidate));
+    if (pkgFile) {
         try {
             const lines = fs.readFileSync(pkgFile, 'utf-8').split('\n').filter(Boolean);
             for (const l of lines)
@@ -28,7 +34,7 @@ function _loadJsonlMerged(evolcoreHome, filename) {
     }
     // 2. 用户路径（追加/覆盖）
     const userFile = path.join(evolcoreHome, 'data', 'stats', filename);
-    if (fs.existsSync(userFile)) {
+    if (fs.existsSync(userFile) && (!pkgFile || path.resolve(userFile) !== path.resolve(pkgFile))) {
         try {
             const lines = fs.readFileSync(userFile, 'utf-8').split('\n').filter(Boolean);
             for (const l of lines)
@@ -81,10 +87,16 @@ export function resolvePriceRow(evolcoreHome, model, ts) {
 export const BILLING_FNS = {
     // 通用 per-token（Claude / OpenAI 兼容 / Kimi / MiniMax）
     per_token_v1: (e, p) => {
-        const r = (p.price_input ?? 0) * e.input_tokens / 1e6
-            + (p.price_output ?? 0) * e.output_tokens / 1e6
-            + (p.price_cache_creation ?? 0) * e.cache_creation_tokens / 1e6
-            + (p.price_cache_read ?? 0) * e.cache_read_tokens / 1e6;
+        const tiers = Array.isArray(p.tiers)
+            ? p.tiers
+            : [];
+        const promptTokens = e.input_tokens + e.cache_creation_tokens + e.cache_read_tokens;
+        const tier = tiers.find(t => t.up_to_input_tokens == null || promptTokens <= t.up_to_input_tokens);
+        const price = tier ?? p;
+        const r = (price.price_input ?? 0) * e.input_tokens / 1e6
+            + (price.price_output ?? 0) * e.output_tokens / 1e6
+            + (price.price_cache_creation ?? 0) * e.cache_creation_tokens / 1e6
+            + (price.price_cache_read ?? 0) * e.cache_read_tokens / 1e6;
         return p.currency === 'CNY' ? { cny: r } : { usd: r };
     },
     // DeepSeek cache_hit / cache_miss 口径

package/dist/trigger/manager.js

@@ -72,6 +72,9 @@ export class TriggerDefinitionManager {
             ...(origin ? { origin } : {}),
         }, { now: Date.now() });
         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');
+        }
         updated.createdAt = existing.createdAt;
         updated.updatedAt = Date.now();
         this.assertUnique(updated, triggerId);

package/dist/trigger/parser.js

@@ -5,6 +5,14 @@ const TRIGGER_UPDATE_FLAGS = new Set([
     'model', 'effort', 'permission',
     'max-runs', 'max-duration', 'concurrency', 'missed-policy',
 ]);
+const TRIGGER_CREATE_FLAGS = new Set([
+    'once', 'delay', 'at', 'cron', 'every', 'event', 'tz',
+    'exec', 'prompt', 'name', 'agent',
+    'script-path', 'script-runtime', 'script-args', 'script-timeout',
+    'feedback', 'target-channel', 'target-channel-id', 'target-session', 'target-thread-id',
+    'trigger-thread', 'baseagent',
+    'model', 'effort', 'permission', 'max-runs', 'max-duration',
+]);
 // Note: unquoted multi-word values (e.g. --prompt=hello world) are not supported.
 // The second word would be treated as an unknown token. Always quote multi-word values:
 //   --prompt "hello world"  or  --prompt='hello world'
@@ -103,6 +111,14 @@ function parseModelFlag(flags) {
         return { ok: false, error: '--model 不能为空' };
     return { ok: true, value: raw };
 }
+function parseBaseagentFlag(flags) {
+    if (!flags.has('baseagent'))
+        return { ok: true };
+    const raw = flags.get('baseagent');
+    if (!raw || raw === true || !raw.trim())
+        return { ok: false, error: '--baseagent 不能为空' };
+    return { ok: true, value: raw.trim() };
+}
 function parseEffortFlag(flags) {
     if (!flags.has('effort'))
         return { ok: true };
@@ -251,6 +267,12 @@ function commonParsed(flags, opts = {}) {
     const deprecated = rejectDeprecatedFlags(flags);
     if (deprecated)
         return { ok: false, error: deprecated };
+    if (!opts.update) {
+        for (const flag of flags.keys()) {
+            if (!TRIGGER_CREATE_FLAGS.has(flag))
+                return { ok: false, error: `create 不支持参数 --${flag}` };
+        }
+    }
     const source = parseSourceFlags(flags, opts);
     if (!source.ok)
         return source;
@@ -281,6 +303,9 @@ function commonParsed(flags, opts = {}) {
     const model = parseModelFlag(flags);
     if (!model.ok)
         return model;
+    const baseagent = parseBaseagentFlag(flags);
+    if (!baseagent.ok)
+        return baseagent;
     const effort = parseEffortFlag(flags);
     if (!effort.ok)
         return effort;
@@ -327,6 +352,9 @@ function commonParsed(flags, opts = {}) {
         return { ok: false, error: '--target-channel 与 --target-channel-id 必须同时指定或同时省略' };
     }
     const inferredExecution = execution.value ?? (scriptPath ? 'script' : 'target_session');
+    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' };
@@ -357,6 +385,7 @@ function commonParsed(flags, opts = {}) {
             scriptArgs,
             scriptTimeoutMs: scriptTimeout.value,
             triggerThread: triggerThread.value,
+            baseagent: baseagent.value,
             maxRuns: maxRuns.value,
             maxDuration: maxDuration.value,
             model: model.value,
@@ -391,6 +420,46 @@ export function parseTriggerSet(args) {
             scriptArgs: value.scriptArgs,
             scriptTimeoutMs: value.scriptTimeoutMs,
             triggerThread: value.triggerThread,
+            baseagent: value.baseagent,
+            maxRuns: value.maxRuns,
+            maxDuration: value.maxDuration,
+            model: value.model,
+            effort: value.effort,
+            permissionMode: value.permissionMode,
+        },
+    };
+}
+/** CLI argv parser. Unlike the slash-command string parser, this preserves
+ * shell-quoted values such as `--prompt "multi word text"` as one token. */
+export function parseTriggerSetArgv(args) {
+    const parsedFlags = flagsFromArgv(args, 'create');
+    if (!parsedFlags.ok)
+        return parsedFlags;
+    const parsed = commonParsed(parsedFlags.flags);
+    if (!parsed.ok)
+        return parsed;
+    const value = parsed.value;
+    return {
+        ok: true,
+        value: {
+            scheduleType: value.scheduleType,
+            scheduleValue: value.scheduleValue ?? '',
+            timezone: value.timezone,
+            executionType: value.inferredExecution,
+            feedbackStrategy: value.feedbackStrategy,
+            targetChannel: value.targetChannel,
+            targetChannelId: value.targetChannelId,
+            targetSession: value.targetSession,
+            targetThreadId: value.targetThreadId,
+            agentId: value.agentId,
+            name: value.name,
+            prompt: value.prompt,
+            scriptPath: value.scriptPath,
+            scriptRuntime: value.scriptRuntime,
+            scriptArgs: value.scriptArgs,
+            scriptTimeoutMs: value.scriptTimeoutMs,
+            triggerThread: value.triggerThread,
+            baseagent: value.baseagent,
             maxRuns: value.maxRuns,
             maxDuration: value.maxDuration,
             model: value.model,
@@ -426,11 +495,17 @@ export function parseTriggerUpdate(args) {
     return parseTriggerUpdateFlags(nameOrId, flags);
 }
 export function parseTriggerUpdateArgv(nameOrId, args) {
+    const parsedFlags = flagsFromArgv(args, 'update');
+    if (!parsedFlags.ok)
+        return parsedFlags;
+    return parseTriggerUpdateFlags(nameOrId, parsedFlags.flags);
+}
+function flagsFromArgv(args, command) {
     const flags = new Map();
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
         if (!arg.startsWith('--'))
-            return { ok: false, error: `无法识别 update 参数: ${arg}` };
+            return { ok: false, error: `无法识别 ${command} 参数: ${arg}` };
         const equals = arg.indexOf('=');
         if (equals > 2) {
             flags.set(arg.slice(2, equals), arg.slice(equals + 1));
@@ -446,7 +521,7 @@ export function parseTriggerUpdateArgv(nameOrId, args) {
             flags.set(key, true);
         }
     }
-    return parseTriggerUpdateFlags(nameOrId, flags);
+    return { ok: true, flags };
 }
 function parseTriggerUpdateFlags(nameOrId, flags) {
     if (flags.size === 0)

package/dist/trigger/patch.js

@@ -80,7 +80,7 @@ export function replaceEditableTriggerDefinition(existing, input) {
         throw new Error('trigger definition update must be an object');
     }
     const editable = input;
-    return normalizeTriggerDefinition({
+    const replacement = normalizeTriggerDefinition({
         ...editable,
         $schema_version: TRIGGER_SCHEMA_VERSION,
         id: existing.id,
@@ -90,6 +90,13 @@ export function replaceEditableTriggerDefinition(existing, input) {
         updatedAt: existing.updatedAt,
         origin: existing.origin,
     });
+    assertBaseagentImmutable(existing, replacement);
+    return replacement;
+}
+function assertBaseagentImmutable(existing, updated) {
+    if (existing.execution.baseagent !== updated.execution.baseagent) {
+        throw new Error('execution.baseagent is immutable; create a new Trigger to use another baseagent');
+    }
 }
 function applySourcePatch(updated, patch) {
     const previous = updated.source;