evolcore 0.0.12 → 0.0.13

package/dist/cli/agent.js

@@ -8,18 +8,14 @@ import { resolveConfigCommand } from '../config/resolved-config-op.js';
 import { executeResolvedConfigCommand } from '../config/config-operation-service.js';
 import { ipcQuery } from '../ipc.js';
 import { CONFIG_SCHEMA_VERSION } from '../types.js';
-import { normalizeAgentLifecycle, withLifecycleForWrite } from '../config/lifecycle.js';
-import { bindPostBootstrapWelcomeOutboxSession, hasPendingPostBootstrapWelcomeOutbox, postBootstrapWelcomeOperationId, preparePostBootstrapWelcomeOutbox, } from '../core/bootstrap-messages.js';
 import { ensureInitialRoleRegistry } from '../config/role-service.js';
-import { formatChannelKey, isValidChannelName } from '../core/channel-loader.js';
+import { isValidChannelName } from '../core/channel-loader.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
 import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { agentProjectRootFromDefaults, deriveAgentProjectPath } from '../utils/project-path.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
-import { EventBus } from '../core/event-bus.js';
-import { SessionManager } from '../core/session/session-manager.js';
 import { isValidAid } from '../aun/aid/validation.js';
 function withStaticOwner(config, owner) {
     const value = owner?.trim();
@@ -1196,33 +1192,9 @@ export async function agentRename(aid, name) {
     return { ok: true, aid, name };
 }
 // ==================== agentReady ====================
-async function ensureOfflinePostBootstrapMainSession(aid, config) {
-    const owner = config.owners?.[0];
-    if (!owner)
-        throw new Error(`Agent "${aid}" has no owner for the post-bootstrap main session`);
-    const p = resolvePaths();
-    const aunName = config.channels?.find(channel => channel.type === 'aun')?.name || 'main';
-    const channel = formatChannelKey({ type: 'aun', selfAID: aid, name: aunName });
-    const manager = new SessionManager(p.sessionsDir, new EventBus());
-    const active = await manager.getActiveSession(channel, owner);
-    const ensured = await manager.ensureNewMainSessionForOperation({
-        channel,
-        channelId: owner,
-        projectPath: active?.projectPath
-            || config.projects?.defaultPath
-            || path.join(p.root, 'projects', aid.split('.')[0]),
-        baseagent: config.active_baseagent || active?.baseagent || 'claude',
-        operationId: postBootstrapWelcomeOperationId(aid),
-        identityMetadata: {
-            ...(active?.metadata ?? {}),
-            channelKey: channel,
-            peerId: owner,
-        },
-    });
-    return ensured.session.id;
-}
 export async function agentReady(aid) {
-    const taskSelfAid = readTaskRuntimeContextFromEnv()?.selfAid;
+    const managedSessionId = process.env.EVOLCORE_SESSION_ID;
+    const taskSelfAid = managedSessionId ? readTaskRuntimeContextFromEnv()?.selfAid : undefined;
     if (taskSelfAid && taskSelfAid.replace(/^@/, '') !== aid.replace(/^@/, '')) {
         return {
             ok: false,
@@ -1231,77 +1203,18 @@ export async function agentReady(aid) {
         };
     }
     const p = resolvePaths();
-    const managedSessionId = process.env.EVOLCORE_SESSION_ID;
-    if (managedSessionId) {
-        const delegationToken = process.env[AGENT_DELEGATION_TOKEN_ENV];
-        if (!delegationToken)
+    try {
+        const delegationToken = managedSessionId ? process.env[AGENT_DELEGATION_TOKEN_ENV] : undefined;
+        if (managedSessionId && !delegationToken) {
             return { ok: false, code: 'DELEGATION_REQUIRED', error: `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task` };
+        }
         const result = await ipcQuery(p.socket, {
             type: 'evolagent.bootstrapComplete',
             aid,
-            sessionId: managedSessionId,
-            delegationToken,
+            ...(managedSessionId ? { sessionId: managedSessionId, delegationToken } : {}),
         }, 30_000);
         if (!result)
-            return { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon' };
-        return result.ok
-            ? { ok: true, aid, reloaded: result.reloaded === true }
-            : { ok: false, code: result.code, error: result.error || 'Failed to complete bootstrap' };
-    }
-    const config = loadAgent(aid);
-    if (!config)
-        return { ok: false, error: `Agent "${aid}" not found` };
-    try {
-        let controlToken;
-        try {
-            controlToken = fs.readFileSync(p.controlToken, 'utf8').trim() || undefined;
-        }
-        catch { }
-        const result = await ipcQuery(p.socket, { type: 'evolagent.bootstrapComplete', aid, controlToken }, 30_000);
-        if (!result) {
-            const offlineConfig = loadAgent(aid) || config;
-            const lifecycle = normalizeAgentLifecycle(offlineConfig).lifecycle;
-            if (lifecycle !== 'bootstrapping') {
-                if (lifecycle === 'active') {
-                    if (hasPendingPostBootstrapWelcomeOutbox(aid)) {
-                        try {
-                            const sessionId = await ensureOfflinePostBootstrapMainSession(aid, offlineConfig);
-                            if (!bindPostBootstrapWelcomeOutboxSession(aid, sessionId)) {
-                                throw new Error(`Failed to bind the completion welcome to session ${sessionId}`);
-                            }
-                        }
-                        catch (e) {
-                            return {
-                                ok: false,
-                                code: 'MAIN_SESSION_CREATE_FAILED',
-                                error: e instanceof Error ? e.message : 'Failed to recover the post-bootstrap main session',
-                            };
-                        }
-                    }
-                    return { ok: true, aid, reloaded: false };
-                }
-                return { ok: false, code: 'INVALID_LIFECYCLE', error: `Agent "${aid}" is ${lifecycle}; only a bootstrapping agent can become ready` };
-            }
-            const owner = offlineConfig.owners?.[0];
-            if (!owner)
-                return { ok: false, code: 'OWNER_REQUIRED', error: `Agent "${aid}" has no owner for the completion welcome` };
-            try {
-                preparePostBootstrapWelcomeOutbox(aid, owner);
-                const sessionId = await ensureOfflinePostBootstrapMainSession(aid, offlineConfig);
-                if (!bindPostBootstrapWelcomeOutboxSession(aid, sessionId)) {
-                    throw new Error(`Failed to bind the completion welcome to session ${sessionId}`);
-                }
-                saveAgent(withLifecycleForWrite(offlineConfig, 'active'));
-            }
-            catch (e) {
-                return {
-                    ok: false,
-                    code: 'READY_PERSIST_FAILED',
-                    error: e instanceof Error ? e.message : 'Failed to persist bootstrap completion',
-                };
-            }
-            return { ok: true, aid, reloaded: false };
-        }
+            return { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon; agent ready requires daemon IPC' };
         if (!result.ok) {
             return { ok: false, code: result.code, error: result.error || 'Failed to complete bootstrap' };
         }

package/dist/cli/cli-argv.js

@@ -3,6 +3,16 @@ export function normalizeCliArgv(argv) {
         return argv.slice(1);
     return argv;
 }
+export function splitConfigBatchGetArgv(inputArgv) {
+    const argv = normalizeCliArgv(inputArgv);
+    if (argv[0] !== 'config' || argv[1] !== 'get')
+        return null;
+    const fields = [];
+    let i = 2;
+    for (; i < argv.length && !argv[i].startsWith('-'); i++)
+        fields.push(argv[i]);
+    return { fields, rest: argv.slice(i) };
+}
 export function validateCliArgv(value) {
     if (!Array.isArray(value) || value.length === 0)
         return { ok: false, reason: 'args.argv must be a non-empty string array' };

package/dist/cli/config.js

@@ -5,7 +5,7 @@ import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommand, } from '..
 import { ipcQuery } from '../ipc.js';
 import { resolvePaths } from '../paths.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
-import { splitConfigBatchGetArgv } from '../config/config-batch-get.js';
+import { splitConfigBatchGetArgv } from './cli-argv.js';
 function emit(formatJson, payload, text) {
     if (formatJson)
         console.log(JSON.stringify(payload, null, 2));
@@ -47,6 +47,8 @@ function renderConfigExecution(result, formatJson) {
     switch (result.subcommand) {
         case 'get':
             return emit(formatJson, getResultPayload(result), () => getResultLine(result));
+        case 'batch-get':
+            return renderBatchGet(result.results, formatJson);
         case 'set':
             return emit(formatJson, {
                 ok: true,
@@ -186,23 +188,13 @@ function runDirectBatchGet(fields, rest, formatJson) {
 }
 async function runManagedBatchGet(fields, rest, formatJson) {
     const { sessionId, delegationToken } = managedSession(formatJson);
-    const results = [];
-    for (const field of fields) {
-        const response = await managedConfigQuery(['get', field, ...rest], sessionId, delegationToken);
-        if (!response) {
-            results.push({ ok: false, field, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon' });
-        }
-        else if (!response.ok || !response.result || !response.result.ok) {
-            results.push({ ok: false, field, code: response.code || 'CONFIG_AUTH_FAILED', error: response.error || 'config operation failed' });
-        }
-        else if (response.result.subcommand === 'get') {
-            results.push(response.result);
-        }
-        else {
-            results.push({ ok: false, field, code: 'UNEXPECTED_RESULT', error: `config get ${field} produced a non-get result` });
-        }
+    const response = await managedConfigQuery(['get', ...fields, ...rest], sessionId, delegationToken);
+    if (!response)
+        fail(formatJson, 'DAEMON_UNAVAILABLE', 'Unable to connect to the evolcore daemon');
+    if (!response.ok || !response.result) {
+        fail(formatJson, response.code || 'CONFIG_AUTH_FAILED', response.error || 'config operation failed', response.data);
     }
-    renderBatchGet(results, formatJson);
+    renderConfigExecution(response.result, formatJson);
 }
 const HELP = `Usage: ec config <command> [options]
 

package/dist/cli/ctl-command.js

@@ -16,7 +16,7 @@ const CTL_HELP = `用法: ec ctl <command> [args...]
 消息:
   send <消息内容>           主动发送文本消息（proactive 模式）
   file [channel] <path>     发送项目内文件
-  queue                     查看/管理会话消息队列
+  queue [--after <time>] [--before <time>]  查看/管理会话消息队列
 
 示例:
   ec ctl status

package/dist/cli/daemon-commands.js

@@ -389,9 +389,6 @@ export async function cmdStart(opts = {}) {
     cleanEnv();
     // 在启动前确保 serviceProxy 配置完整（如果 ecweb 启用但 serviceProxy 未配置）
     ensureServiceProxyConfigBeforeStart(p);
-    const ecwebStartedBeforeDaemon = serviceProxyNeedsEcweb(loadDaemonConfig())
-        ? await startEcwebIfEnabled(p)
-        : false;
     // 删除旧的 ready signal
     try {
         fs.unlinkSync(p.readySignal);
@@ -421,23 +418,11 @@ export async function cmdStart(opts = {}) {
             console.log(`  EVOLCORE_HOME: ${resolveRoot()}`);
             console.log(`  Logs: ${p.logs}/`);
             console.log(`⏱ ready in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
-            if (!ecwebStartedBeforeDaemon) {
-                startEcwebIfEnabled(p)
-                    .then((ecwebStarted) => {
-                    if (shouldPrintNoSelfAgentHints) {
-                        printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted, skipped });
-                    }
-                })
-                    .catch((err) => {
-                    console.error(`⚠ ECWeb 启动检查失败: ${err instanceof Error ? err.message : String(err)}`);
-                    if (shouldPrintNoSelfAgentHints) {
-                        printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted: false, skipped });
-                    }
-                });
-            }
-            else if (shouldPrintNoSelfAgentHints) {
-                printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted: true, skipped });
-            }
+            void waitForExistingEcweb(p).then((ecweb) => {
+                if (shouldPrintNoSelfAgentHints) {
+                    printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted: ecweb !== null, skipped });
+                }
+            });
         }, 500);
         let forwardingShutdown = false;
         const forwardSignal = (signal) => {
@@ -536,8 +521,9 @@ export async function cmdStart(opts = {}) {
                 printCodeStats(getPackageRoot(), p.logs);
             }
             console.log(`⏱ done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
-            // ECWeb 自动后台启动
-            const ecwebStarted = ecwebStartedBeforeDaemon || await startEcwebIfEnabled(p);
+            // ECWeb lifecycle belongs to the daemon; the CLI only reports whether
+            // the supervised instance became healthy.
+            const ecwebStarted = await waitForExistingEcweb(p) !== null;
             if (shouldPrintNoSelfAgentHints) {
                 printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted, skipped });
             }
@@ -2422,6 +2408,24 @@ async function probeEcwebReady(port) {
         return false;
     }
 }
+/**
+ * Wait briefly for an already-launched ECWeb to become healthy.  `ec start`,
+ * restart-monitor, and the daemon can overlap by a few milliseconds; treating
+ * a healthy instance as an adoption target avoids killing/replacing it.
+ */
+async function waitForExistingEcweb(p, timeoutMs = 3_000) {
+    const deadline = Date.now() + timeoutMs;
+    do {
+        for (const entry of findAliveEcwebs(p)) {
+            if (await probeEcwebReady(entry.port))
+                return entry;
+        }
+        if (Date.now() >= deadline)
+            break;
+        await sleep(250);
+    } while (true);
+    return null;
+}
 /**
  * 输出 ECWeb 状态。判定口径：
  *   1. 进程是否存活（instance/ 下的 pid 文件 + isProcessRunning）
@@ -2633,10 +2637,21 @@ function ensureServiceProxyConfig(cfg, port) {
  * Kept public for restart-monitor, which launches the daemon directly and
  * therefore cannot rely on cmdStart's post-ready ECWeb startup path.
  */
-export async function startEcwebIfEnabled(p) {
+export async function startEcwebIfEnabled(p, options = {}) {
     const cfg = loadDaemonConfig();
     if (!cfg.ecweb?.enabled)
         return false;
+    // The daemon is the lifecycle owner.  CLI callers normally only need to
+    // ensure ECWeb is available, so adopt a healthy process instead of killing
+    // it.  `ec watch web` passes forceRestart explicitly for an intentional
+    // manual replacement.
+    if (!options.forceRestart) {
+        const existing = await waitForExistingEcweb(p);
+        if (existing) {
+            console.log(`✓ ECWeb 已在运行 (PID: ${existing.pid})  http://localhost:${existing.port}`);
+            return true;
+        }
+    }
     const installedPkg = resolveGlobalPkg(WEB_PACKAGE_NAME);
     if (!installedPkg) {
         console.log(`⚠ EC Web 未安装，跳过启动（运行 npm i -g ${WEB_PACKAGE_NAME}@latest 后可用）`);
@@ -2795,7 +2810,7 @@ async function cmdWatchWeb() {
     saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true, port } });
     // 自动配置 serviceProxy（如果控制 AID 已配置）
     ensureServiceProxyConfigBeforeStart(p);
-    const ok = await startEcwebIfEnabled(p);
+    const ok = await startEcwebIfEnabled(p, { forceRestart: true });
     if (!ok)
         process.exit(1); // 失败原因已由 startEcwebIfEnabled 打印
     // 启动成功的访问信息已由 startEcwebIfEnabled 打印，无需 printEcwebAccess 重复输出

package/dist/cli/fs-command.js

@@ -6,6 +6,7 @@ import { agentmdGet, getAidStore, isValidAid, loadClient, SLOT } from '../aun/ai
 import { ipcQuery } from '../ipc.js';
 import { resolvePaths } from '../paths.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { downloadGroupFsBytes } from '../aun/group-fs-download.js';
 class FsCliError extends Error {
     code;
     suggestion;
@@ -257,6 +258,21 @@ async function runManagedFs(args, formatJson) {
             for (const item of result.items ?? [])
                 console.log(JSON.stringify(item));
             return;
+        case 'mkdir':
+            console.log(`✓ 已创建目录: ${result.path}`);
+            return;
+        case 'upload':
+            console.log(`✓ 已上传: ${result.localPath} -> ${result.path}`);
+            return;
+        case 'copy':
+            console.log(`✓ 已复制: ${result.src} -> ${result.path}`);
+            return;
+        case 'move':
+            console.log(`✓ 已移动: ${result.src} -> ${result.path}`);
+            return;
+        case 'remove':
+            console.log(`✓ 已删除: ${result.path}`);
+            return;
     }
 }
 function parseCommonOptions(args) {
@@ -385,8 +401,9 @@ async function fsCat(args, opts) {
         if (route.backend === 'group') {
             statInfo = await client.group.fs.stat(remoteRef(target));
             const size = numberFrom(statInfo, ['size', 'size_bytes', 'bytes']);
-            const downloaded = await client.group.fs.cp(remoteRef(target), { kind: 'blob' }, { verifyHash: true });
-            bytes = bytesFromDownload(downloaded);
+            const downloaded = await downloadGroupFsBytes(client, remoteRef(target));
+            bytes = downloaded.bytes;
+            statInfo = { ...statInfo, ...downloaded.ticket };
             statInfo = { ...statInfo, size: bytes.byteLength };
             if (size !== undefined && size > opts.maxCatBytes) {
                 binaryHeadOnly = true;
@@ -1420,14 +1437,6 @@ function contentTypeFrom(value) {
     const raw = value?.contentType ?? value?.content_type ?? value?.mime ?? value?.mime_type;
     return raw ? String(raw).toLowerCase() : undefined;
 }
-function bytesFromDownload(value) {
-    const data = value?.data;
-    if (data instanceof Uint8Array)
-        return data;
-    if (data instanceof ArrayBuffer)
-        return new Uint8Array(data);
-    throw new FsCliError('BACKEND_ERROR', '下载接口未返回字节内容', undefined, value);
-}
 function looksBinary(bytes, contentType) {
     if (contentType) {
         if (contentType.startsWith('text/'))

package/dist/cli/init.js

@@ -7,7 +7,7 @@ import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
 import { generateControlAid, resolveControlAidDomain } from '../aun/aid/control-aid.js';
-import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
+import { getCodexAppServerAvailability } from '../agents/codex-runner.js';
 import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { defaultProjectsRoot } from '../utils/project-path.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
@@ -28,15 +28,44 @@ export function expandLeadingTildePath(value, homeDir = os.homedir()) {
 }
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini', 'ecagent'];
 const AUTO_BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
-function isBaseagentAvailable(baseagent) {
+function isBaseagentAvailable(baseagent, codexAvailability) {
     if (baseagent === 'codex')
-        return isCodexAppServerAvailable();
+        return (codexAvailability ?? getCodexAppServerAvailability()).available;
     if (baseagent === 'ecagent')
         return true;
     return commandExists(baseagent);
 }
-function detectAvailable() {
-    return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
+function detectAvailable(codexAvailability = getCodexAppServerAvailability()) {
+    return BASEAGENT_CANDIDATES.filter(baseagent => isBaseagentAvailable(baseagent, codexAvailability));
+}
+/** Offer installation only when the probe positively identified an old CLI. */
+export async function maybeUpgradeCodexForInit(availability, dependencies) {
+    if (!availability.requiresUpgrade) {
+        return { availability, offered: false, accepted: false };
+    }
+    const accepted = await dependencies.confirm();
+    if (!accepted)
+        return { availability, offered: true, accepted: false };
+    try {
+        const install = dependencies.install ?? (async () => {
+            const { npmInstallGlobal } = await import('../utils/npm-ops.js');
+            await npmInstallGlobal('@openai/codex@latest');
+        });
+        await install();
+    }
+    catch (error) {
+        return {
+            availability,
+            offered: true,
+            accepted: true,
+            error: installErrorMessage(error),
+        };
+    }
+    return {
+        availability: (dependencies.probe ?? getCodexAppServerAvailability)(),
+        offered: true,
+        accepted: true,
+    };
 }
 function pickDefault(available) {
     return AUTO_BASEAGENT_CANDIDATES.find(candidate => available.includes(candidate));
@@ -192,7 +221,45 @@ export async function cmdInit(options) {
         return false;
     }
     // ── 2. 探测 baseagent ──
-    const available = detectAvailable();
+    let codexAvailability = getCodexAppServerAvailability();
+    if (!options?.nonInteractive && codexAvailability.version) {
+        console.log(`检测到 Codex CLI: ${codexAvailability.version}`);
+    }
+    if (!options?.nonInteractive && codexAvailability.requiresUpgrade) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        let result;
+        try {
+            result = await maybeUpgradeCodexForInit(codexAvailability, {
+                confirm: async () => {
+                    console.log(`⚠ ${codexAvailability.reason}`);
+                    const answer = (await ask(rl, '是否立即升级 Codex CLI？[Y/n] ')).trim().toLowerCase();
+                    return answer === '' || answer === 'y' || answer === 'yes';
+                },
+            });
+        }
+        finally {
+            try {
+                rl.close();
+            }
+            catch { /* ignore */ }
+        }
+        if (!result.accepted) {
+            console.log('  已跳过 Codex CLI 升级');
+        }
+        else if (result.error) {
+            console.log(`  ⚠ Codex CLI 升级失败: ${result.error}`);
+        }
+        else {
+            codexAvailability = result.availability;
+            if (codexAvailability.available) {
+                console.log(`  ✓ Codex CLI 已升级至 ${codexAvailability.version}`);
+            }
+            else {
+                console.log(`  ⚠ Codex CLI 升级后仍不可用: ${codexAvailability.reason ?? '未知原因'}`);
+            }
+        }
+    }
+    const available = detectAvailable(codexAvailability);
     if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
         console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
         console.log('  - claude CLI');
@@ -202,8 +269,10 @@ export async function cmdInit(options) {
         return false;
     }
     console.log('检测到可用的 baseagent:');
-    for (const b of available)
-        console.log(`  ● ${b}`);
+    for (const b of available) {
+        const version = b === 'codex' ? codexAvailability.version : undefined;
+        console.log(`  ● ${b}${version ? ` (CLI ${version})` : ''}`);
+    }
     console.log('');
     const defaultsPath = p.defaultsConfig;
     const defaultsExisted = fs.existsSync(defaultsPath);

package/dist/cli/queue-command.js

@@ -10,10 +10,18 @@ export async function cmdQueue(args) {
 
 查询:
   --agent <aid>           必填，目标 agent（如 mybot.agentid.pub）
+  --after <time>          只显示 adapter 接收时间晚于该值的消息（epoch ms 或 ISO）
+  --before <time>         只显示 adapter 接收时间早于该值的消息（epoch ms 或 ISO）
   --showid                显示 messageId
   --full                  显示完整消息内容（不截断）
   --format json           以 JSON 格式输出
 
+JSON 时间字段:
+  receivedAt              adapter 收到消息时间（epoch ms）
+  enqueuedAt              实际进入队列时间（epoch ms）
+  queueWaitMs             排队等待时长（ms）
+  processingStartedAt     开始处理时间（epoch ms，active）
+
 操作:
   --clear                 清空该 agent 的所有待处理消息
   --cancel <messageId>    取消指定消息
@@ -21,6 +29,7 @@ export async function cmdQueue(args) {
 
 示例:
   ec queue --agent mybot.agentid.pub
+  ec queue --agent mybot.agentid.pub --after 2026-08-19T12:00:00+08:00
   ec queue --agent mybot.agentid.pub --showid
   ec queue --agent mybot.agentid.pub --clear
   ec queue --agent mybot.agentid.pub --cancel msg_d4e5f6
@@ -46,6 +55,12 @@ export async function cmdQueue(args) {
         process.exit(1);
     }
     const formatJson = formatValue === 'json';
+    const after = parseQueueTime(getArgValue(args, '--after'), '--after');
+    const before = parseQueueTime(getArgValue(args, '--before'), '--before');
+    if (after !== undefined && before !== undefined && after >= before) {
+        console.error('❌ --after 必须早于 --before');
+        process.exit(1);
+    }
     const clear = args.includes('--clear');
     const cancelIdx = args.indexOf('--cancel');
     const cancelCandidate = cancelIdx >= 0 && cancelIdx + 1 < args.length ? args[cancelIdx + 1] : undefined;
@@ -80,6 +95,8 @@ export async function cmdQueue(args) {
         action,
         messageId: cancelMsgId,
         sessionKey,
+        after,
+        before,
         sessionId: managed,
         delegationToken: process.env[AGENT_DELEGATION_TOKEN_ENV],
     } : {
@@ -88,6 +105,8 @@ export async function cmdQueue(args) {
         action,
         messageId: cancelMsgId,
         sessionKey,
+        after,
+        before,
     });
     if (!result) {
         console.error('错误: 无法连接 evolcore 服务');
@@ -118,6 +137,16 @@ export async function cmdQueue(args) {
     }
     console.log(renderQueueItemsCli(items, showId, full, agent));
 }
+function parseQueueTime(value, flag) {
+    if (value === undefined)
+        return undefined;
+    const parsed = /^\d+$/.test(value) ? Number(value) : Date.parse(value);
+    if (!Number.isFinite(parsed)) {
+        console.error(`❌ ${flag} 必须是 epoch 毫秒或 ISO 时间: ${value}`);
+        process.exit(1);
+    }
+    return parsed;
+}
 function renderQueueItemsCli(items, showId, full, aid) {
     const lines = [`${aid} — 队列 (${items.length} 条)`, ''];
     if (items.length === 0) {
@@ -151,6 +180,12 @@ function renderQueueItemsCli(items, showId, full, aid) {
             elapsed = sec >= 60 ? `${Math.floor(sec / 60)}m${sec % 60}s` : `${sec}s`;
         }
         parts.push(` ${elapsed.padEnd(elapsedColWidth)}  `);
+        const wait = item.queueWaitMs == null ? '—' : formatDuration(item.queueWaitMs);
+        parts.push(` wait:${wait.padEnd(6)}  `);
+        if (item.receivedAt != null)
+            parts.push(` recv:${formatQueueTime(item.receivedAt)} `);
+        if (item.enqueuedAt != null)
+            parts.push(` enq:${formatQueueTime(item.enqueuedAt)} `);
         // 内容列
         const content = full ? item.preview.replace(/\.\.\.$/, '') : item.preview;
         parts.push(`"${content}"`);
@@ -158,3 +193,10 @@ function renderQueueItemsCli(items, showId, full, aid) {
     }
     return lines.join('\n');
 }
+function formatDuration(ms) {
+    const sec = Math.max(0, Math.round(ms / 1000));
+    return sec >= 60 ? `${Math.floor(sec / 60)}m${sec % 60}s` : `${sec}s`;
+}
+function formatQueueTime(timestamp) {
+    return new Date(timestamp).toISOString();
+}

package/dist/cli/restart-monitor.js

@@ -14,7 +14,6 @@ import { WEB_PACKAGE_NAME } from '../product.js';
 import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
-import { serviceProxyNeedsEcweb, startEcwebIfEnabled } from './daemon-commands.js';
 const execFileAsync = promisify(execFile);
 // 清理 Claude Code 环境变量，防止 SDK 认为是嵌套会话
 function cleanEnv() {
@@ -194,22 +193,12 @@ export async function cmdRestartMonitor() {
             await notifyDaemonOwners(p, `⚠️ ${WEB_PACKAGE_NAME} 升级失败，使用当前版本继续\n${ecwebUpgrade.error ?? ''}`.trim(), log);
             break;
     }
-    // source=ecweb 的 Service Proxy 只在 daemon 启动后的短窗口内发现实例。
-    // restart-monitor 直接 spawn daemon，必须在此先启动独立的 ec-web，不能绕过
-    // cmdStart 的 ECWeb 生命周期逻辑。
-    const ecwebStartedBeforeDaemon = serviceProxyNeedsEcweb(loadDaemonConfig())
-        ? await startEcwebIfEnabled(p)
-        : false;
-    if (ecwebStartedBeforeDaemon)
-        log('ECWeb started before daemon');
+    // ECWeb is owned by the daemon. Starting it here used to race with the
+    // daemon's own launcher and ECWeb's stale-instance cleanup, which could
+    // leave ServiceProxy pointed at a dead PID.
     // 启动并检测 ready signal
     let started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
     if (started) {
-        // 没有 Service Proxy 时可以等 daemon ready 后再启动；有代理时已在上方启动，
-        // 避免重新拉起造成实例记录和反向隧道短暂失配。
-        if (!ecwebStartedBeforeDaemon && await startEcwebIfEnabled(p)) {
-            log('ECWeb started after daemon');
-        }
         log('✓ Service restarted successfully');
         archiveSelfHealLog(p, log);
         // 发起会话内的“重启成功”通知由新进程自行发送，此处只负责失败/自愈告警。

package/dist/cli/trigger-command.js

@@ -113,6 +113,7 @@ Create 参数模式支持:
   --permission <readonly|auto|request|bypass>（省略则继承当前身份配置）
   --tz <时区> (仅 cron)
   --target-channel <channelKey> --target-channel-id <ID>  (AUN 可简写为 aun)
+  --target-chat-type <private|group>  (AUN 目标必填；channelId 同时作为群聊 ID)
   --target-session <main|thread> [--target-thread-id <threadId>]
   --trigger-thread <by-run|by-trigger>  (兼容旧值 per-run)
   --name <名称>
@@ -263,6 +264,11 @@ async function createTrigger(args, json) {
     if (!parsed.targetChannel || !parsed.targetChannelId) {
         throw new Error('CLI flag 模式需要显式指定 --target-channel <channelKey> --target-channel-id <id>');
     }
+    const targetIsAun = parsed.targetChannel === 'aun' || parsed.targetChannel.startsWith('aun#');
+    if (targetIsAun && !parsed.targetChatType) {
+        throw new Error('AUN 目标必须显式指定 --target-chat-type private 或 group');
+    }
+    const targetChatType = parsed.targetChatType;
     const now = Date.now();
     if (parsed.targetSession === 'thread' && !parsed.targetThreadId) {
         throw new Error('--target-session thread 需要 --target-thread-id');
@@ -300,6 +306,7 @@ async function createTrigger(args, json) {
                 channelKey: parsed.targetChannel,
                 channelId: parsed.targetChannelId,
                 session: parsed.targetSession,
+                ...(targetChatType ? { chatType: targetChatType } : {}),
                 ...(parsed.targetSession === 'thread' ? { threadId: parsed.targetThreadId } : {}),
             },
         },