evolcore 0.0.3 → 0.0.4

package/dist/cli/init-channel.js

@@ -16,7 +16,7 @@ import { ipcQuery } from '../ipc.js';
 import { cmdStart } from './daemon-commands.js';
 import * as platform from '../utils/cross-platform.js';
 import { cleanupInstances } from '../utils/instance-registry.js';
-import { bindContactAlias } from '../config/contact-book.js';
+import { bindContactAlias, getContactSnapshot } from '../config/contact-book.js';
 import { listStaticAgentAdmins } from '../config/peer-role-resolver.js';
 import { setupRawKeyListener } from './raw-key-input.js';
 function ask(rl, question) {
@@ -384,6 +384,7 @@ export async function cmdInitFeishu() {
     let agentConfig = null;
     let choice = null;
     let contactBinding = null;
+    let operation = 'configure';
     try {
         aid = await pickAgentForChannel(rl);
         if (!aid)
@@ -394,16 +395,25 @@ export async function cmdInitFeishu() {
             return;
         }
         const existing = (agentConfig.channels || []).filter(c => c.type === 'feishu');
-        choice = await pickInstanceWithinAgent(rl, 'feishu', existing);
+        choice = await pickInstanceWithinAgent(rl, 'feishu', existing, { confirmOverwrite: false });
         if (choice === null)
             return;
-        contactBinding = await pickOwnerAdminForChannelBinding(rl, agentConfig, 'feishu');
+        if (choice.action === 'overwrite') {
+            operation = await pickExistingChannelOperation(rl, '飞书', choice.name);
+            if (operation === 'configure' && !await confirmOverwriteChannel(rl, '飞书', choice.name))
+                return;
+        }
+        contactBinding = await pickContactForChannelBinding(rl, agentConfig, 'feishu');
         if (!contactBinding)
             return;
     }
     finally {
         rl.close();
     }
+    if (operation === 'rebind-contact') {
+        await registerFeishuContactBind(aid, contactBindChannelKey('feishu', aid, choice.name), contactBinding);
+        return;
+    }
     console.log('\n正在获取飞书登录二维码...\n');
     let result;
     try {
@@ -444,7 +454,15 @@ export async function cmdInitFeishu() {
         console.log(`  Login Open ID: ${result.openId}`);
     if (result.domain !== 'unknown')
         console.log(`  Domain: ${result.domain}`);
-    bindQrActorToContact(aid, contactBinding, 'feishu', result.openId, commitResult.channelKey);
+    if (result.openId) {
+        bindQrActorToContact(aid, contactBinding, 'feishu', result.openId, commitResult.channelKey);
+    }
+    else if (commitResult.reloaded) {
+        await registerFeishuContactBind(aid, commitResult.channelKey, contactBinding);
+    }
+    else {
+        console.log('  ⚠ 服务未运行或热重载失败，无法注册飞书绑定码；请启动服务后重新执行 ec init feishu。');
+    }
     // Show unified init success message
     const { generateInitSuccessMessage } = await import('../utils/welcome.js');
     console.log(generateInitSuccessMessage('feishu', contactBinding !== null));
@@ -545,6 +563,7 @@ export async function cmdInitWechat() {
     let agentConfig = null;
     let choice = null;
     let contactBinding = null;
+    let operation = 'configure';
     try {
         aid = await pickAgentForChannel(rl);
         if (!aid)
@@ -555,16 +574,25 @@ export async function cmdInitWechat() {
             return;
         }
         const existing = (agentConfig.channels || []).filter(c => c.type === 'wechat');
-        choice = await pickInstanceWithinAgent(rl, 'wechat', existing);
+        choice = await pickInstanceWithinAgent(rl, 'wechat', existing, { confirmOverwrite: false });
         if (choice === null)
             return;
-        contactBinding = await pickOwnerAdminForChannelBinding(rl, agentConfig, 'wechat');
+        if (choice.action === 'overwrite') {
+            operation = await pickExistingChannelOperation(rl, '微信', choice.name);
+            if (operation === 'configure' && !await confirmOverwriteChannel(rl, '微信', choice.name))
+                return;
+        }
+        contactBinding = await pickContactForChannelBinding(rl, agentConfig, 'wechat');
         if (!contactBinding)
             return;
     }
     finally {
         rl.close();
     }
+    if (operation === 'rebind-contact') {
+        await registerWechatContactBind(aid, contactBindChannelKey('wechat', aid, choice.name), contactBinding);
+        return;
+    }
     console.log('\n正在获取微信登录二维码...\n');
     const result = await runWechatQrFlow();
     if (!result) {
@@ -581,7 +609,15 @@ export async function cmdInitWechat() {
     const commitResult = await commitChannel(aid, channel, choice.action);
     if (!commitResult)
         return;
-    bindQrActorToContact(aid, contactBinding, 'wechat', result.userId, commitResult.channelKey);
+    if (firstNonEmpty(result.userId)) {
+        bindQrActorToContact(aid, contactBinding, 'wechat', result.userId, commitResult.channelKey);
+    }
+    else if (commitResult.reloaded) {
+        await registerWechatContactBind(aid, commitResult.channelKey, contactBinding);
+    }
+    else {
+        console.log('  ⚠ 服务未运行或热重载失败，无法注册微信绑定码；请启动服务后重新执行 ec init wechat。');
+    }
     // Show unified init success message
     const { generateInitSuccessMessage } = await import('../utils/welcome.js');
     console.log(generateInitSuccessMessage('wechat', contactBinding !== null));
@@ -788,6 +824,7 @@ export async function cmdInitDingtalk() {
     let agentConfig = null;
     let choice = null;
     let contactBinding = null;
+    let operation = 'configure';
     try {
         aid = await pickAgentForChannel(rl);
         if (!aid)
@@ -798,16 +835,25 @@ export async function cmdInitDingtalk() {
             return;
         }
         const existing = (agentConfig.channels || []).filter(c => c.type === 'dingtalk');
-        choice = await pickInstanceWithinAgent(rl, 'dingtalk', existing);
+        choice = await pickInstanceWithinAgent(rl, 'dingtalk', existing, { confirmOverwrite: false });
         if (choice === null)
             return;
-        contactBinding = await pickOwnerAdminForChannelBinding(rl, agentConfig, 'dingtalk');
+        if (choice.action === 'overwrite') {
+            operation = await pickExistingChannelOperation(rl, '钉钉', choice.name);
+            if (operation === 'configure' && !await confirmOverwriteChannel(rl, '钉钉', choice.name))
+                return;
+        }
+        contactBinding = await pickContactForChannelBinding(rl, agentConfig, 'dingtalk');
         if (!contactBinding)
             return;
     }
     finally {
         rl.close();
     }
+    if (operation === 'rebind-contact') {
+        await registerDingtalkContactBind(aid, contactBindChannelKey('dingtalk', aid, choice.name), contactBinding);
+        return;
+    }
     console.log('\n正在获取钉钉登录二维码...\n');
     let result;
     try {
@@ -997,6 +1043,7 @@ export async function cmdInitQQBot() {
     let agentConfig = null;
     let choice = null;
     let contactBinding = null;
+    let operation = 'configure';
     try {
         aid = await pickAgentForChannel(rl);
         if (!aid)
@@ -1007,16 +1054,25 @@ export async function cmdInitQQBot() {
             return;
         }
         const existing = (agentConfig.channels || []).filter(c => c.type === 'qqbot');
-        choice = await pickInstanceWithinAgent(rl, 'qqbot', existing);
+        choice = await pickInstanceWithinAgent(rl, 'qqbot', existing, { confirmOverwrite: false });
         if (choice === null)
             return;
-        contactBinding = await pickOwnerAdminForChannelBinding(rl, agentConfig, 'qqbot');
+        if (choice.action === 'overwrite') {
+            operation = await pickExistingChannelOperation(rl, 'QQ', choice.name);
+            if (operation === 'configure' && !await confirmOverwriteChannel(rl, 'QQ', choice.name))
+                return;
+        }
+        contactBinding = await pickContactForChannelBinding(rl, agentConfig, 'qqbot');
         if (!contactBinding)
             return;
     }
     finally {
         rl.close();
     }
+    if (operation === 'rebind-contact') {
+        await registerQQBotContactBind(aid, contactBindChannelKey('qqbot', aid, choice.name), contactBinding);
+        return;
+    }
     console.log('\n正在创建 QQ 机器人绑定任务...\n');
     let result;
     try {
@@ -1066,7 +1122,15 @@ export async function cmdInitQQBot() {
     if (!commitResult)
         return;
     console.log(`  App ID: ${result.appId}`);
-    bindQrActorToContact(aid, contactBinding, 'qqbot', result.userOpenId, commitResult.channelKey);
+    if (firstNonEmpty(result.userOpenId)) {
+        bindQrActorToContact(aid, contactBinding, 'qqbot', result.userOpenId, commitResult.channelKey);
+    }
+    else if (commitResult.reloaded) {
+        await registerQQBotContactBind(aid, commitResult.channelKey, contactBinding);
+    }
+    else {
+        console.log('  ⚠ 服务未运行或热重载失败，无法注册 QQ 绑定码；请启动服务后重新执行 ec init qqbot。');
+    }
     const { generateInitSuccessMessage } = await import('../utils/welcome.js');
     console.log(generateInitSuccessMessage('qqbot', contactBinding !== null));
 }
@@ -1077,6 +1141,7 @@ export async function cmdInitWecom() {
     let agentConfig = null;
     let choice = null;
     let contactBinding = null;
+    let operation = 'configure';
     let botId = '';
     let secret = '';
     try {
@@ -1089,60 +1154,71 @@ export async function cmdInitWecom() {
             return;
         }
         const existing = (agentConfig.channels || []).filter(c => c.type === 'wecom');
-        choice = await pickInstanceWithinAgent(rl, 'wecom', existing);
+        choice = await pickInstanceWithinAgent(rl, 'wecom', existing, { confirmOverwrite: false });
         if (choice === null)
             return;
-        contactBinding = await pickOwnerAdminForChannelBinding(rl, agentConfig, 'wecom');
+        if (choice.action === 'overwrite') {
+            operation = await pickExistingChannelOperation(rl, '企微', choice.name);
+            if (operation === 'configure' && !await confirmOverwriteChannel(rl, '企微', choice.name))
+                return;
+        }
+        contactBinding = await pickContactForChannelBinding(rl, agentConfig, 'wecom');
         if (!contactBinding)
             return;
-        console.log('\n企业微信 AI Bot 配置');
-        const method = (await ask(rl, '  接入方式：1. 扫码创建（推荐）  2. 手工输入 [1]: ')).trim() || '1';
-        if (method === '1') {
-            try {
-                const { createWecomQrSession, pollWecomQrCredentials } = await import('../channels/wecom-onboarding.js');
-                const session = await createWecomQrSession();
-                const qrterm = await import('qrcode-terminal');
-                console.log('\n请使用企业微信扫描以下二维码：\n');
-                await new Promise(resolve => {
-                    qrterm.default.generate(session.authUrl, { small: true }, (qr) => {
-                        console.log(qr);
-                        resolve();
+        if (operation !== 'rebind-contact') {
+            console.log('\n企业微信 AI Bot 配置');
+            const method = (await ask(rl, '  接入方式：1. 扫码创建（推荐）  2. 手工输入 [1]: ')).trim() || '1';
+            if (method === '1') {
+                try {
+                    const { createWecomQrSession, pollWecomQrCredentials } = await import('../channels/wecom.js');
+                    const session = await createWecomQrSession();
+                    const qrterm = await import('qrcode-terminal');
+                    console.log('\n请使用企业微信扫描以下二维码：\n');
+                    await new Promise(resolve => {
+                        qrterm.default.generate(session.authUrl, { small: true }, (qr) => {
+                            console.log(qr);
+                            resolve();
+                        });
+                    });
+                    console.log(`也可在浏览器打开：${session.browserUrl}`);
+                    console.log('等待扫码确认，二维码 5 分钟内有效...\n');
+                    const credentials = await pollWecomQrCredentials(session.scode, {
+                        onStatus: status => {
+                            if (status !== 'waiting')
+                                console.log(`  扫码状态: ${status}`);
+                        },
                     });
-                });
-                console.log(`也可在浏览器打开：${session.browserUrl}`);
-                console.log('等待扫码确认，二维码 5 分钟内有效...\n');
-                const credentials = await pollWecomQrCredentials(session.scode, {
-                    onStatus: status => {
-                        if (status !== 'waiting')
-                            console.log(`  扫码状态: ${status}`);
-                    },
-                });
-                botId = credentials.botId;
-                secret = credentials.secret;
-                console.log('  ✓ 已取得 Bot ID 和 Secret');
+                    botId = credentials.botId;
+                    secret = credentials.secret;
+                    console.log('  ✓ 已取得 Bot ID 和 Secret');
+                }
+                catch (error) {
+                    console.log(`  ⚠ 扫码接入失败: ${error instanceof Error ? error.message : String(error)}`);
+                    console.log('  将切换到手工输入模式。\n');
+                }
             }
-            catch (error) {
-                console.log(`  ⚠ 扫码接入失败: ${error instanceof Error ? error.message : String(error)}`);
-                console.log('  将切换到手工输入模式。\n');
+            if (!botId || !secret) {
+                console.log('请在企业微信管理后台 → AI Bot 页面获取 Bot ID 和 Secret\n');
+            }
+            while (!botId) {
+                botId = (await ask(rl, '  Bot ID: ')).trim();
+                if (!botId)
+                    console.log('  ⚠ 不能为空');
+            }
+            while (!secret) {
+                secret = (await ask(rl, '  Secret: ')).trim();
+                if (!secret)
+                    console.log('  ⚠ 不能为空');
             }
-        }
-        if (!botId || !secret) {
-            console.log('请在企业微信管理后台 → AI Bot 页面获取 Bot ID 和 Secret\n');
-        }
-        while (!botId) {
-            botId = (await ask(rl, '  Bot ID: ')).trim();
-            if (!botId)
-                console.log('  ⚠ 不能为空');
-        }
-        while (!secret) {
-            secret = (await ask(rl, '  Secret: ')).trim();
-            if (!secret)
-                console.log('  ⚠ 不能为空');
         }
     }
     finally {
         rl.close();
     }
+    if (operation === 'rebind-contact') {
+        await registerWecomContactBind(aid, contactBindChannelKey('wecom', aid, choice.name), contactBinding);
+        return;
+    }
     const channel = {
         type: 'wecom',
         name: choice.name,
@@ -1201,24 +1277,42 @@ async function pickAgentForChannel(rl) {
  *
  * If existing.length === 0 → returns { action:'add', name:'main' } directly.
  */
-async function pickInstanceWithinAgent(rl, channelType, existing) {
+async function pickInstanceWithinAgent(rl, channelType, existing, options) {
     if (existing.length === 0) {
         return { action: 'add', name: 'main' };
     }
     const view = existing.map((c, i) => ({ ...c, name: c.name, originalIndex: i }));
-    return await selectInstance(rl, channelType, view);
+    return await selectInstance(rl, channelType, view, options);
 }
-async function pickOwnerAdminForChannelBinding(rl, agentConfig, channelType) {
-    const candidates = ownerAdminContactCandidates(agentConfig);
-    if (candidates.length === 0) {
-        console.log(`\n❌ agent ${agentConfig.aid} 尚未配置 owner/admin，无法为 ${channelType} 扫码账号建立身份映射。`);
-        console.log('   请先通过 AUN 绑定 agent owner，或由 owner 在 AUN 私聊 relation 中分配 admin 后重试。');
-        return null;
+async function pickExistingChannelOperation(rl, displayName, channelName) {
+    console.log(`\n请选择对${displayName}实例 ${channelName} 的操作：`);
+    console.log('  a. 覆盖机器人配置（重新扫码或输入 App ID / App Secret）');
+    console.log('  b. 重新绑定联系人（保留机器人配置，生成一次性 /bind 验证码）');
+    while (true) {
+        const choice = (await ask(rl, '请选择 [a/b]: ')).trim().toLowerCase();
+        if (choice === 'a')
+            return 'configure';
+        if (choice === 'b')
+            return 'rebind-contact';
+        console.log('无效选择，请输入 a 或 b');
     }
-    console.log(`\n请选择 ${channelType} 扫码账号要绑定到的 owner/admin AID：`);
+}
+async function confirmOverwriteChannel(rl, displayName, channelName) {
+    const confirm = (await ask(rl, `⚠️ 即将覆盖${displayName}实例 ${channelName} 的机器人配置，确认？(y/N) `)).trim().toLowerCase();
+    if (confirm === 'y' || confirm === 'yes')
+        return true;
+    console.log('已取消');
+    return false;
+}
+async function pickContactForChannelBinding(rl, agentConfig, channelType) {
+    const candidates = preferredContactBindingCandidates(agentConfig);
+    const contacts = getContactSnapshot(agentConfig.aid).contacts;
+    console.log(`\n请选择 ${channelType} 账号要绑定到的联系人 AID：`);
     candidates.forEach((candidate, index) => {
         console.log(`  ${index + 1}. ${candidate.primaryId} (${candidate.label})`);
     });
+    const manualChoice = candidates.length + 1;
+    console.log(`  ${manualChoice}. 手工输入已有联系人 AID`);
     const defaultIndex = candidates.length === 1 ? 1 : null;
     const prompt = defaultIndex ? `请选择 [${defaultIndex}]: ` : '请选择: ';
     while (true) {
@@ -1227,14 +1321,26 @@ async function pickOwnerAdminForChannelBinding(rl, agentConfig, channelType) {
         if (Number.isInteger(selected) && selected >= 1 && selected <= candidates.length) {
             return candidates[selected - 1];
         }
-        console.log(`无效选择，请输入 1-${candidates.length}`);
+        if (selected === manualChoice) {
+            const primaryId = (await ask(rl, '请输入要绑定的联系人 AID: ')).trim();
+            if (isValidAid(primaryId) && contacts.has(primaryId))
+                return { primaryId, label: 'contact' };
+            if (isValidAid(primaryId)) {
+                console.log('该 AID 不是当前 Agent 的联系人，请先添加联系人或将其设为 Owner。');
+                continue;
+            }
+            console.log('AID 格式无效，请重新输入。');
+            continue;
+        }
+        console.log(`无效选择，请输入 1-${manualChoice}`);
     }
 }
-function ownerAdminContactCandidates(agentConfig) {
+function preferredContactBindingCandidates(agentConfig) {
+    const contacts = getContactSnapshot(agentConfig.aid).contacts;
     const labels = new Map();
     const add = (value, label) => {
         const aid = String(value || '').trim();
-        if (!isValidAid(aid))
+        if (!isValidAid(aid) || !contacts.has(aid))
             return;
         let set = labels.get(aid);
         if (!set) {
@@ -1273,6 +1379,18 @@ function bindQrActorToContact(aid, binding, channelType, actorId, channelKey) {
 async function registerDingtalkContactBind(aid, channelName, binding) {
     await registerChannelContactBind('dingtalk', '钉钉', aid, channelName, binding);
 }
+function contactBindChannelKey(channelType, aid, channelName) {
+    return `${channelType}#${aid}#${channelName}`;
+}
+async function registerFeishuContactBind(aid, channelName, binding) {
+    await registerChannelContactBind('feishu', '飞书', aid, channelName, binding);
+}
+async function registerWechatContactBind(aid, channelName, binding) {
+    await registerChannelContactBind('wechat', '微信', aid, channelName, binding);
+}
+async function registerQQBotContactBind(aid, channelName, binding) {
+    await registerChannelContactBind('qqbot', 'QQ', aid, channelName, binding);
+}
 async function registerWecomContactBind(aid, channelName, binding) {
     await registerChannelContactBind('wecom', '企微', aid, channelName, binding);
 }
@@ -1292,7 +1410,7 @@ async function registerChannelContactBind(channelType, displayName, aid, channel
     }
     const expiresAt = new Date(Number(result.expiresAt)).toLocaleString();
     console.log(`  ✓ ${displayName}身份绑定码: ${result.code}`);
-    console.log(`    请在 10 分钟内私聊${displayName}机器人，直接发送这 6 位数字绑定码。有效期至: ${expiresAt}`);
+    console.log(`    请在 10 分钟内私聊${displayName}机器人，发送：/bind ${result.code}。有效期至: ${expiresAt}`);
 }
 function firstNonEmpty(...values) {
     for (const value of values) {

package/dist/cli/init.js

@@ -390,7 +390,7 @@ export async function initTail() {
  * Present instance selection menu when existing instances are found.
  * Returns the user's choice, or null if cancelled.
  */
-export async function selectInstance(rl, channelType, instances) {
+export async function selectInstance(rl, channelType, instances, options = {}) {
     const typeLabel = channelType === 'feishu' ? '飞书' : channelType === 'wechat' ? '微信' : channelType === 'dingtalk' ? '钉钉' : channelType === 'qqbot' ? 'QQ机器人' : channelType === 'wecom' ? '企业微信' : channelType.toUpperCase();
     console.log(`\n发现已有 ${typeLabel} 配置：`);
     const letters = 'abcdefghijklmnopqrstuvwxyz';
@@ -427,10 +427,12 @@ export async function selectInstance(rl, channelType, instances) {
     }
     const target = instances[choiceIndex];
     console.log(`\n已选择：${target.name}`);
-    const confirm = (await new Promise(r => rl.question(`⚠️ 即将覆盖该配置，确认？(y/N) `, r))).trim().toLowerCase();
-    if (confirm !== 'y' && confirm !== 'yes') {
-        console.log('已取消');
-        return null;
+    if (options.confirmOverwrite !== false) {
+        const confirm = (await new Promise(r => rl.question(`⚠️ 即将覆盖该配置，确认？(y/N) `, r))).trim().toLowerCase();
+        if (confirm !== 'y' && confirm !== 'yes') {
+            console.log('已取消');
+            return null;
+        }
     }
     return { action: 'overwrite', index: choiceIndex, name: target.name };
 }

package/dist/cli/trigger-command.js

@@ -83,9 +83,9 @@ function printHelp() {
   list [--agent <aid>] [--all] [--json]
   show [--agent <aid>] <triggerId> [--json]
   history [--agent <aid>] [triggerId] [--limit <n>] [--json]
-  create --file <trigger.json|trigger-dir> [--enable] [--json]
+  create --exec <script|trigger-session|target-session> --file <trigger.json|trigger-dir> [--enable] [--json]
     OR
-  create [--agent <aid>] --cron <expr>|--event <pattern> --prompt <text> [--enable] [其他flag]
+  create [--agent <aid>] --exec <script|trigger-session|target-session> --cron <expr>|--event <pattern> (--prompt <text>|--prompt-file <path>) [--enable] [其他flag]
   set ...  (create 的兼容别名)
   update [--agent <aid>] <triggerId> <参数...> [--if-revision <sha256:...>] [--json]
   enable [--agent <aid>] <triggerId>
@@ -97,8 +97,9 @@ function printHelp() {
 
 Create 参数模式支持:
   --once | --delay <时长> | --at <ISO时间> | --cron <表达式> | --every <时长> | --event <事件模式>
-  --exec <script|trigger-session|target-session>
-  --prompt <文本>
+  --exec <script|trigger-session|target-session>  (必填)
+  --prompt <文本> | --prompt-file <路径>
+    Shell 双引号内的双引号、反引号和变量形式的美元符号都需在前面加反斜杠；trigger 保存的是还原后的原文
   --script-path <路径> --script-runtime <node|python|bash>
   --script-args <JSON> --script-timeout <时长>
   --feedback <target>  (origin/silent 仅可通过 --file 导入)
@@ -117,12 +118,13 @@ Create 参数模式支持:
 
 Update 仅支持常用字段:
   --once | --delay | --at | --cron | --every | --event [--tz]
-  --prompt <文本>  --name <名称>
+  --prompt <文本> | --prompt-file <路径>  --name <名称>
   --model <模型>  --effort <强度>  --permission <权限模式|inherit>（inherit 清除覆盖）
   --max-runs <次数>  --max-duration <时长>
   --concurrency <forbid|replace|allow>  --missed-policy <skip|run-once|run-all>
 
-省略 --agent 时使用当前 agent AID；仅在跨身份操作或无会话上下文时需要显式指定。`);
+省略 --agent 时使用当前 agent AID；无会话上下文或跨身份操作时需要显式指定。
+任务会话中的跨身份操作仅允许目标 Agent 上具备 owner/admin 权限的调用者执行 list/show/history；创建、修改、启停、删除和运行仍只允许当前 Agent。`);
 }
 async function listTriggers(args, json) {
     const agentAid = resolveAgentAid(args);
@@ -214,10 +216,20 @@ async function showHistory(args, json) {
     }
 }
 async function createTrigger(args, json) {
-    // Support two modes: --file (full JSON) or flags (parser-based)
-    if (hasFlag(args, '--file')) {
+    if (!hasOption(args, '--exec')) {
+        throw new Error('创建 trigger 必须显式指定 --exec script|trigger-session|target-session');
+    }
+    const executionType = executionTypeFromFlag(args);
+    // --file is reserved for full trigger-definition imports.
+    if (hasOption(args, '--file')) {
+        if (hasOption(args, '--prompt-file')) {
+            throw new Error('--file（完整定义导入）与 --prompt-file（prompt 正文）不能同时指定');
+        }
         const file = requireFlag(args, '--file');
         const { definition, files } = loadDefinitionWithFiles(file);
+        if (definition.execution.type !== executionType) {
+            throw new Error(`--exec ${flagValue(args, '--exec')} 与 trigger.json 的 execution.type=${definition.execution.type} 不一致`);
+        }
         const res = await request({
             type: 'trigger.create',
             definition,
@@ -230,8 +242,12 @@ async function createTrigger(args, json) {
         return;
     }
     // Flag mode: use parser
+    const usesPromptFile = hasOption(args, '--prompt-file');
+    if (usesPromptFile && executionType === 'script') {
+        throw new Error('--exec script 不接受 --prompt-file；请使用 --script-path 和 --script-runtime');
+    }
     const { parseTriggerSetArgv } = await import('../trigger/parser.js');
-    const parseResult = parseTriggerSetArgv(triggerCreateArgs(args));
+    const parseResult = parseTriggerSetArgv(withPromptFromFile(triggerCreateArgs(args)), { allowLongPrompt: usesPromptFile });
     if (!parseResult.ok) {
         throw new Error(parseResult.error);
     }
@@ -331,6 +347,16 @@ function sourceFromParsed(parsed) {
         return { type: 'event', eventPattern: parsed.scheduleValue };
     throw new Error(`unsupported scheduleType: ${parsed.scheduleType}`);
 }
+function executionTypeFromFlag(args) {
+    const value = requireFlag(args, '--exec');
+    if (value === 'script')
+        return 'script';
+    if (value === 'trigger-session' || value === 'trigger_session')
+        return 'trigger_session';
+    if (value === 'target-session' || value === 'target_session')
+        return 'target_session';
+    throw new Error('--exec 只接受 script、trigger-session 或 target-session');
+}
 function limitsFromParsed(parsed) {
     const limits = {};
     if (parsed.maxRuns !== undefined)
@@ -362,9 +388,10 @@ function shellQuoteArg(value) {
 }
 async function updateTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent', '--format', '--if-revision']);
+    const triggerId = positional(args, 0, ['--agent', '--format', '--if-revision', '--prompt-file']);
+    const usesPromptFile = hasOption(args, '--prompt-file');
     const { parseTriggerUpdateArgv } = await import('../trigger/parser.js');
-    const parsed = parseTriggerUpdateArgv(triggerId, triggerUpdateArgs(args));
+    const parsed = parseTriggerUpdateArgv(triggerId, withPromptFromFile(triggerUpdateArgs(args)), { allowLongPrompt: usesPromptFile });
     if (!parsed.ok)
         throw new Error(parsed.error);
     const expectedRevision = flagValue(args, '--if-revision');
@@ -373,6 +400,7 @@ async function updateTrigger(args, json) {
         agentAid,
         triggerId,
         patch: parsed.value,
+        ...(usesPromptFile ? { promptFile: true } : {}),
         ...(expectedRevision ? { expectedRevision } : {}),
     }, 30_000);
     if (json)
@@ -400,6 +428,56 @@ function triggerUpdateArgs(args) {
     }
     return out;
 }
+function withPromptFromFile(args) {
+    const fileIndexes = [];
+    const filePaths = [];
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (arg === '--prompt-file') {
+            const value = args[index + 1];
+            if (!value || value.startsWith('--'))
+                throw new Error('missing --prompt-file');
+            fileIndexes.push(index, index + 1);
+            filePaths.push(value);
+            index += 1;
+        }
+        else if (arg.startsWith('--prompt-file=')) {
+            const value = arg.slice('--prompt-file='.length);
+            if (!value)
+                throw new Error('missing --prompt-file');
+            fileIndexes.push(index);
+            filePaths.push(value);
+        }
+    }
+    if (fileIndexes.length === 0)
+        return args;
+    if (filePaths.length > 1)
+        throw new Error('--prompt-file 只能指定一次');
+    if (hasOption(args, '--prompt'))
+        throw new Error('--prompt-file 与 --prompt 不能同时指定');
+    const filePath = filePaths[0];
+    let stat;
+    try {
+        stat = fs.statSync(filePath);
+    }
+    catch (err) {
+        throw new Error(`无法读取 prompt 文件 ${filePath}: ${err?.message || String(err)}`);
+    }
+    if (!stat.isFile())
+        throw new Error(`prompt 文件必须是普通文件: ${filePath}`);
+    let prompt;
+    try {
+        prompt = fs.readFileSync(filePath, 'utf8').replace(/^\uFEFF/, '');
+    }
+    catch (err) {
+        throw new Error(`无法读取 prompt 文件 ${filePath}: ${err?.message || String(err)}`);
+    }
+    const fileIndexSet = new Set(fileIndexes);
+    return [
+        ...args.filter((_, index) => !fileIndexSet.has(index)),
+        '--prompt', prompt,
+    ];
+}
 async function setEnabled(args, enabled, json) {
     const agentAid = resolveAgentAid(args);
     const triggerId = positional(args, 0, ['--agent', '--format']);
@@ -522,6 +600,9 @@ function flagValue(args, name) {
 function hasFlag(args, name) {
     return args.includes(name);
 }
+function hasOption(args, name) {
+    return args.includes(name) || args.some(arg => arg.startsWith(`${name}=`));
+}
 function positional(args, index, flagsWithValue) {
     const value = optionalPositional(args, index, flagsWithValue);
     if (!value)