evolcore 0.0.35 → 0.0.37

package/dist/cli/getmeta-command.js

@@ -1,18 +1,27 @@
 import path from 'path';
 import fs from 'fs';
-import { resolvePaths, agentThreadIndexPath } from '../paths.js';
+import { resolvePaths, agentThreadIndexPath, agentTriggersDir } from '../paths.js';
 import { scanChatDirs, readLastJsonlLine, } from '../core/session/session-fs-store.js';
+import { isMainTopicId } from '../core/thread/topic-id.js';
 const HELP_TEXT = `
 ec getmeta <id> [选项]
 
-按任意一种会话标识查询本地会话的完整元数据（不经过 daemon，直接读存档）。
+按任意一种标识查询本地会话或触发器的完整元数据（不经过 daemon，直接读存档）。
 
-<id> 接受三种形态:
+<id> 接受四种形态:
   meta_YYYYMMDD_<ts>   ec 会话 id（meta 文件名）
   thread-<...>         话题 id（threadId）
   <uuid>               provider 侧会话 id（agentSessionId）
+  trig_<ts>_<hex>      触发器 id
 
-输出字段:
+触发器输出字段:
+  triggerId / agentAid / name / enabled / baseagent
+  executionSessionId   当前正在执行的 ec 会话 id（来自 active run）
+  origin.channelKey / origin.threadId / origin.session
+  feedback.strategy
+  source               命中位置：definition（触发器定义）/ active（有进行中 run）
+
+会话输出字段:
   sessionId / threadId / agentSessionId / peer / selfAID / baseagent
   name / chatType / projectPath / updatedAt / metaFile
   source              命中位置：meta（主会话）/ thread（话题）/ active / trash
@@ -71,15 +80,154 @@ function makeHit(meta, metaFile, source, selfAID, chatPeer) {
 /**
  * id 形态判定。
  * - `meta_...` 按文件名直接命中，不读文件内容
- * - `thread-...` / uuid 需要扫末行比对，成本高但只在必要时发生
+ * - `trig_...` 触发器 id，走 trigger 目录
+ * - `thread-...` / `main:<aid>:<aid>` 需要扫末行比对，成本高但只在必要时发生
+ * - 其余视为 provider 侧 agentSession UUID
  */
 function classifyId(id) {
     if (id.startsWith('meta_'))
         return 'session';
+    if (id.startsWith('trig_'))
+        return 'trigger';
     if (id.startsWith('thread-'))
         return 'thread';
+    if (isMainTopicId(id))
+        return 'thread';
     return 'agentSession';
 }
+/** 扫描所有 agent 下的 triggers 目录，查找匹配的 triggerId。 */
+async function cmdGetTriggerMeta(id, selfFilter, jsonFormat) {
+    const p = resolvePaths();
+    // 枚举 agents 目录下所有 agent
+    // agentTriggersDir 形态：<agentDir(aid)>/triggers，agentDir 位于 data/agents/<aid>
+    // 从 sessionsDir（data/sessions）推断出 data/ 根目录
+    let agentIds = [];
+    const dataDir = path.dirname(p.sessionsDir);
+    const agentsDirPath = path.join(dataDir, 'agents');
+    try {
+        agentIds = fs.readdirSync(agentsDirPath).filter(e => {
+            if (selfFilter && e !== selfFilter)
+                return false;
+            return fs.statSync(path.join(agentsDirPath, e)).isDirectory();
+        });
+    }
+    catch {
+        agentIds = [];
+    }
+    const hits = [];
+    for (const aid of agentIds) {
+        const triggersRoot = agentTriggersDir(aid);
+        const defPath = path.join(triggersRoot, id, 'trigger.json');
+        if (!fs.existsSync(defPath))
+            continue;
+        let def;
+        try {
+            def = JSON.parse(fs.readFileSync(defPath, 'utf-8'));
+        }
+        catch {
+            continue;
+        }
+        // 读 active.json 拿当前 executionSessionId
+        let executionSessionId = null;
+        const activePath = path.join(triggersRoot, id, 'active.json');
+        try {
+            const activeFile = JSON.parse(fs.readFileSync(activePath, 'utf-8'));
+            // 取最新一个有 executionSessionId 的 run
+            const runs = Object.values(activeFile.runs ?? {});
+            for (const run of runs.sort((a, b) => b.startedAt - a.startedAt)) {
+                if (run.executionSessionId) {
+                    executionSessionId = run.executionSessionId;
+                    break;
+                }
+            }
+        }
+        catch { /* no active file, that's fine */ }
+        hits.push({
+            triggerId: def.id,
+            agentAid: def.agentAid,
+            name: def.name,
+            enabled: def.enabled,
+            baseagent: def.execution.baseagent ?? null,
+            executionSessionId,
+            originChannelKey: def.origin?.channelKey ?? null,
+            originChannelId: def.origin?.channelId ?? null,
+            originSession: def.origin?.session ?? null,
+            originThreadId: def.origin?.threadId ?? null,
+            originPeerId: def.origin?.peerId ?? null,
+            feedbackStrategy: def.feedback.strategy ?? null,
+            feedbackTargetChannelKey: def.feedback.target?.channelKey ?? null,
+            feedbackTargetChannelId: def.feedback.target?.channelId ?? null,
+            feedbackTargetSession: def.feedback.target?.session ?? null,
+            feedbackTargetThreadId: def.feedback.target?.threadId ?? null,
+            feedbackTargetChatType: def.feedback.target?.chatType ?? null,
+            createdAt: def.createdAt ?? null,
+            updatedAt: def.updatedAt ?? null,
+            definitionFile: defPath,
+            source: fs.existsSync(activePath) ? 'active' : 'definition',
+        });
+    }
+    if (hits.length === 0) {
+        if (jsonFormat) {
+            console.log(JSON.stringify({ ok: false, id, kind: 'trigger', hits: [] }, null, 2));
+        }
+        else {
+            console.error(`✗ 未找到触发器 ${id}（已扫描 ${agentIds.length} 个 agent 目录）`);
+        }
+        process.exitCode = 1;
+        return;
+    }
+    if (jsonFormat) {
+        console.log(JSON.stringify({ ok: true, id, kind: 'trigger', hits }, null, 2));
+        return;
+    }
+    for (const h of hits) {
+        console.log(`触发器 id: ${h.triggerId}`);
+        console.log(`  名称: ${h.name}`);
+        console.log(`  状态: ${h.enabled ? '启用' : '禁用'}`);
+        console.log(`  归属 agent: ${h.agentAid}`);
+        if (h.baseagent)
+            console.log(`  基座 (baseagent): ${h.baseagent}`);
+        console.log(`  执行会话 id: ${h.executionSessionId ?? '(无进行中 run)'}`);
+        if (h.originChannelKey)
+            console.log(`  来源 channel: ${h.originChannelKey}`);
+        if (h.originChannelId)
+            console.log(`  来源 channelId: ${h.originChannelId}`);
+        if (h.originSession)
+            console.log(`  来源 session 类型: ${h.originSession}${h.originThreadId ? ` / 话题 id: ${h.originThreadId}` : ''}`);
+        if (h.originPeerId)
+            console.log(`  来源对端: ${h.originPeerId}`);
+        if (h.feedbackStrategy) {
+            console.log(`  反馈策略: ${h.feedbackStrategy}`);
+            if (h.feedbackStrategy === 'origin') {
+                // origin 策略：反馈回到 origin，已在上方显示
+                if (h.originChannelKey)
+                    console.log(`  反馈目标 (来自 origin): ${h.originChannelKey} / ${h.originChannelId ?? ''} / session=${h.originSession ?? ''}${h.originThreadId ? ` / 话题 id: ${h.originThreadId}` : ''}`);
+            }
+            else if (h.feedbackStrategy === 'target') {
+                if (h.feedbackTargetChannelKey)
+                    console.log(`  反馈目标 channel: ${h.feedbackTargetChannelKey}`);
+                if (h.feedbackTargetChannelId)
+                    console.log(`  反馈目标 channelId: ${h.feedbackTargetChannelId}`);
+                if (h.feedbackTargetSession)
+                    console.log(`  反馈目标 session 类型: ${h.feedbackTargetSession}${h.feedbackTargetThreadId ? ` / 话题 id: ${h.feedbackTargetThreadId}` : ''}`);
+                if (h.feedbackTargetChatType)
+                    console.log(`  反馈目标 chatType: ${h.feedbackTargetChatType}`);
+            }
+            else if (h.feedbackStrategy === 'event_session') {
+                console.log(`  反馈目标: 触发本次执行的事件所在会话（运行时动态决定）`);
+            }
+            else if (h.feedbackStrategy === 'silent') {
+                console.log(`  反馈目标: 静默（不发送任何反馈消息）`);
+            }
+        }
+        if (h.createdAt)
+            console.log(`  创建时间: ${new Date(h.createdAt).toLocaleString()}`);
+        if (h.updatedAt)
+            console.log(`  更新时间: ${new Date(h.updatedAt).toLocaleString()}`);
+        console.log(`  文件: ${h.definitionFile}`);
+        console.log('');
+    }
+}
 async function cmdGetMeta(args) {
     const jsonFormat = hasFlag(args, '--format') && argValue(args, '--format') === 'json'
         || hasFlag(args, '--json');
@@ -98,13 +246,18 @@ async function cmdGetMeta(args) {
         break;
     }
     if (!rawId) {
-        console.error('用法: ec getmeta <sessionId|threadId|agentSessionId> [--self <aid>] [--format json]');
+        console.error('用法: ec getmeta <sessionId|threadId|agentSessionId|triggerId> [--self <aid>] [--format json]');
         process.exitCode = 1;
         return;
     }
     const id = rawId.endsWith('.jsonl') ? rawId.slice(0, -'.jsonl'.length) : rawId;
     const selfFilter = argValue(args, '--self');
     const kind = classifyId(id);
+    // trig_ 走独立的查询路径
+    if (kind === 'trigger') {
+        await cmdGetTriggerMeta(id, selfFilter, jsonFormat);
+        return;
+    }
     const p = resolvePaths();
     const chatDirs = scanChatDirs(p.sessionsDir).filter(c => !selfFilter || c.selfAID === selfFilter);
     const hits = [];

package/dist/cli/index.js

@@ -7,7 +7,7 @@ import { getPackageRoot, resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { cmdInit } from './init.js';
-import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom, cmdInitAun } from './init-channel.js';
+import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom } from './init-channel.js';
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import * as platform from '../utils/cross-platform.js';
 import { cmdRestartMonitor } from './restart-monitor.js';
@@ -86,7 +86,7 @@ function printLifecycleHelp(command) {
         logs: `用法: ec logs [选项]\n\n  --level <error|warn|info|debug>  最低日志级别\n  --module <name>                  只显示指定模块\n  --raw                            原始输出\n  --no-color                       禁用颜色`,
         watch: `用法: ec watch [logs|log|aid|msg|diag|web|session]\n\n  ec watch                 打开监控选择菜单\n  ec watch logs            选择日志类型后监控\n  ec watch log <类型...>   直接监控指定日志类型\n  ec watch aid             监控 AID 连接\n  ec watch msg             打开消息 TUI\n  ec watch diag            实时诊断消息生命周期（AUN→daemon→任务）\n  ec watch web             安装/升级并启动 EC Web\n  ec watch session         ec watch web 的兼容别名`,
         'restart-monitor': '用法: ec restart-monitor\n\n运行内 daemon 重启与升级监控器。',
-        diagnose: '用法: ec diagnose [--codex-hook]\n\n检查配置、数据库、进程和编译产物。\n\n  --codex-hook 运行 Windows Codex managed hook 启动探针。',
+        diagnose: '用法: ec diagnose [--codex-hook] [--claude-sandbox] [--codex-sandbox]\n\n检查配置、数据库、进程和编译产物；配置 Codex/Claude Agent 时检查对应 Linux 沙箱。\n\n  --codex-hook 运行 Windows Codex managed hook 启动探针。\n  --claude-sandbox 即使未配置 Claude 也运行沙箱检查。\n  --codex-sandbox 即使未配置 Codex 也运行 Codex bwrap/userns 探针。',
         mv: '用法: ec mv <old-directory> <new-directory>\n\n迁移项目目录以及 Claude、Codex 和 EvolCore 会话路径。',
     };
     console.log(help[command]);
@@ -144,17 +144,16 @@ export async function main(args) {
 
 云部署非交互式初始化（结构化 JSON 输出）:
   ec init --non-interactive --owner <aid> [--format json] [选项]
-    --owner <aid>                        必填。唯一 daemon owner AID
+    --owner <aid>                        必填。控制 AID 创建后的 Owner 邀约目标，不等待审批
     --baseagent <claude|codex|gemini|ecagent>    可选。默认从 PATH 检测，ecagent 需显式选择
     --projectpath <abs-path>             可选。默认项目目录（必须绝对路径，自动创建）
     --ecweb                              可选。安装 EC Web 并启用自启动
     --auto-start                         Windows/macOS 上启用 EvolCore 登录自启动
     --no-auto-start                      Windows/macOS 上禁用 EvolCore 登录自启动
     --format json                        可选但推荐。stdout 输出 init.result JSON
-    --force                              已有不同 owner 时强制覆盖
+    --force                              兼容参数，不覆盖已有协议 Owner 或注册绑定意图
 
 配置渠道（先 ec agent new 创建 agent）:
-  ec init aun           AUN owner 追加绑定（daemon 或指定 agent）
   ec init feishu        飞书扫码登录
   ec init wechat        微信扫码登录
   ec init dingtalk      钉钉扫码登录
@@ -165,12 +164,7 @@ export async function main(args) {
                     const hasChannelTarget = Boolean(strippedArgs[1] && !strippedArgs[1].startsWith('-'));
                     if (hasChannelTarget)
                         printInitCancelHint();
-                    if (strippedArgs[1] === 'aun') {
-                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                        suppressSdkLogs();
-                        await cmdInitAun();
-                    }
-                    else if (strippedArgs[1] === 'wechat') {
+                    if (strippedArgs[1] === 'wechat') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitWechat();
@@ -194,7 +188,7 @@ export async function main(args) {
                         await cmdInitWecom();
                     }
                     else if (strippedArgs[1] && !strippedArgs[1].startsWith('-')) {
-                        const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
+                        const supported = ['feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom'];
                         console.error(`❌ 不支持的渠道: ${strippedArgs[1]}`);
                         console.error(`   支持的渠道: ${supported.join(', ')}`);
                         process.exit(1);

package/dist/cli/init-channel.js

@@ -6,9 +6,11 @@
  *   - run<Channel>QrFlow() or setupAun*() — reusable primitives for the main init wizard
  */
 import readline from 'readline';
+import { cmdAidBind } from './aid-bind-command.js';
+import { getOwners } from '../core/ownership/owner-resolver.js';
 import crypto from 'crypto';
 import { selectInstance } from './init.js';
-import { loadAllAgents, loadAgent, saveAgent, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
+import { loadAllAgents, loadAgent, loadDaemonConfig } from '../config-store.js';
 import { agentChannelUpsert } from './agent.js';
 import { isValidAid } from '../aun/aid/index.js';
 import { resolvePaths } from '../paths.js';
@@ -692,47 +694,8 @@ export async function cmdInitWechat() {
 }
 // ==================== AUN ====================
 export async function cmdInitAun() {
-    const daemonConfig = loadDaemonConfig();
-    if (!daemonConfig.aid) {
-        console.log('❌ 未找到控制 AID，请先运行 ec init');
-        return;
-    }
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        const target = await pickAunOwnerBindTarget(rl, daemonConfig.aid);
-        const runQrFlow = async (flow) => {
-            rl.pause();
-            try {
-                return await flow();
-            }
-            finally {
-                rl.resume();
-            }
-        };
-        if (target.kind === 'daemon') {
-            console.log(`\n📡 EvolCore daemon owner 追加绑定 — ${daemonConfig.aid}\n`);
-            const result = await runQrFlow(() => runDaemonOwnerQrBindFlow());
-            if (result.action === 'bound') {
-                console.log(`\n✅ daemon owner 已绑定: ${result.boundAid}`);
-                return;
-            }
-            if (result.action === 'manual')
-                await promptDaemonOwnerManually(rl);
-            return;
-        }
-        const agentConfig = loadAgent(target.aid);
-        console.log(`\n📡 Agent owner 追加绑定 — ${target.aid}\n`);
-        const result = await runQrFlow(() => runAgentOwnerQrBindFlow(target.aid, agentConfig?.aid ?? target.aid));
-        if (result.action === 'bound') {
-            console.log(`\n✅ agent owner 已绑定: ${result.boundAid}`);
-            return;
-        }
-        if (result.action === 'manual')
-            await promptAgentOwnerForAunManually(rl, target.aid);
-    }
-    finally {
-        rl.close();
-    }
+    console.log('AUN 协议 Owner 统一使用 ec aid bind <ownerAid> [--subject <subjectAid>]');
+    console.log('状态查询: ec aid bind status [--subject <subjectAid>]；Evol App 扫码绑定留待二期。');
 }
 async function pickAunOwnerBindTarget(rl, daemonAid) {
     const { agents } = loadAllAgents();
@@ -761,9 +724,7 @@ async function promptDaemonOwnerManually(rl) {
         console.log('  ⚠ Owner AID 格式无效（需合法多级域名，如 alice.agentid.pub）');
         return;
     }
-    const owners = [fallback, ...(loadDaemonConfig().owners || []).filter(o => o !== fallback)];
-    saveDaemonConfig({ ...loadDaemonConfig(), owners });
-    console.log(`✅ daemon owner 已设置: ${fallback}`);
+    await cmdAidBind([fallback]);
 }
 async function promptAgentOwnerForAunManually(rl, aid) {
     const fallback = (await ask(rl, '\n扫码未完成。手动输入 agent owner AID（留空跳过）: ')).trim();
@@ -778,15 +739,7 @@ async function promptAgentOwnerForAunManually(rl, aid) {
         console.log(`  ⚠ 无法加载 agent 配置: ${aid}`);
         return;
     }
-    const owners = [fallback, ...(agent.owners ?? []).filter(owner => owner !== fallback)];
-    saveAgent({ ...agent, owners });
-    try {
-        const result = await ipcQuery(resolvePaths().socket, { type: 'evolagent.reload', name: aid }, 30_000);
-        if (result?.ok)
-            console.log('  ✓ agent owner 已热重载');
-    }
-    catch { /* daemon not running */ }
-    console.log(`✅ agent owner 已设置: ${fallback}`);
+    await cmdAidBind([fallback, '--subject', aid]);
 }
 // ==================== DingTalk ====================
 const DINGTALK_BASE_URL = 'https://oapi.dingtalk.com';
@@ -1497,7 +1450,7 @@ function preferredContactBindingCandidates(agentConfig) {
         }
         set.add(label);
     };
-    for (const owner of agentConfig.owners ?? [])
+    for (const owner of getOwners(agentConfig.aid))
         add(owner, 'owner');
     for (const admin of listStaticAgentAdmins(agentConfig.aid))
         add(admin, 'admin');