evolcore 0.0.22 → 0.0.23

package/dist/channels/wechat.js

@@ -40,6 +40,8 @@ const BACKOFF_DELAY_MS = 30_000;
 const RETRY_DELAY_MS = 2_000;
 const TYPING_TICKET_TTL_MS = 5 * 60 * 1000; // 5 min cache
 const SESSION_EXPIRED_ERRCODE = -14;
+const INVALID_SYNC_CURSOR_ERRCODE = -1;
+const MAX_SYNC_CURSOR_BYTES = 64 * 1024;
 export class WechatApiError extends Error {
     endpoint;
     ret;
@@ -71,6 +73,26 @@ export class WechatContextTokenRefreshRequiredError extends Error {
         }
     }
 }
+/**
+ * iLink cursors are opaque text, so validation deliberately stays conservative:
+ * reject values that cannot be safely round-tripped through the UTF-8 state file
+ * without imposing a specific encoding on future protocol versions.
+ */
+export function validateWechatSyncCursor(cursor) {
+    if (typeof cursor !== 'string') {
+        return { valid: false, reason: 'invalid_type' };
+    }
+    if (Buffer.byteLength(cursor, 'utf8') > MAX_SYNC_CURSOR_BYTES) {
+        return { valid: false, reason: 'too_large' };
+    }
+    if (cursor.includes('\uFFFD')) {
+        return { valid: false, reason: 'invalid_utf8' };
+    }
+    if (/[\s\u0000-\u001F\u007F-\u009F]/u.test(cursor)) {
+        return { valid: false, reason: 'invalid_character' };
+    }
+    return { valid: true };
+}
 /** Classify fetch/undici failures using the categories exposed by Tencent 2.4.6. */
 export function classifyFetchError(err) {
     if (err instanceof Error && err.name === 'AbortError') {
@@ -196,6 +218,7 @@ export class WechatChannel {
     pendingContextMessages = new Map();
     typingTicketCache = new Map();
     getUpdatesBuf = '';
+    lastRejectedSyncCursor;
     syncBufPath;
     contextTokensPath;
     onSessionExpired;
@@ -243,14 +266,24 @@ export class WechatChannel {
             throw new Error('WeChat reauthentication required; run: ec init wechat');
         }
         // 恢复游标
+        this.getUpdatesBuf = '';
+        this.lastRejectedSyncCursor = undefined;
         try {
             if (fs.existsSync(this.syncBufPath)) {
-                this.getUpdatesBuf = fs.readFileSync(this.syncBufPath, 'utf-8');
-                logger.info(`[WeChat] Restored sync cursor (${this.getUpdatesBuf.length} bytes)`);
+                const restoredCursor = fs.readFileSync(this.syncBufPath, 'utf-8');
+                const validation = validateWechatSyncCursor(restoredCursor);
+                if (validation.valid) {
+                    this.getUpdatesBuf = restoredCursor;
+                    logger.info(`[WeChat] Restored sync cursor (${Buffer.byteLength(restoredCursor, 'utf8')} bytes)`);
+                }
+                else {
+                    this.clearSyncCursor(`persisted cursor is invalid (${validation.reason})`, restoredCursor);
+                }
             }
         }
-        catch {
-            // ignore
+        catch (err) {
+            logger.warn(`[WeChat] Failed to restore sync cursor; starting from an empty cursor: ${err instanceof Error ? err.message : String(err)}`);
+            this.getUpdatesBuf = '';
         }
         // 通知 ilink 后端：bot 上线
         try {
@@ -431,13 +464,22 @@ export class WechatChannel {
                 }
                 consecutiveFailures = 0;
                 // 保存游标
-                if (resp.get_updates_buf) {
-                    this.getUpdatesBuf = resp.get_updates_buf;
-                    try {
-                        fs.writeFileSync(this.syncBufPath, this.getUpdatesBuf, 'utf-8');
+                if (resp.get_updates_buf !== undefined) {
+                    const validation = validateWechatSyncCursor(resp.get_updates_buf);
+                    if (!validation.valid) {
+                        this.clearSyncCursor(`server returned an invalid cursor (${validation.reason})`, typeof resp.get_updates_buf === 'string' ? resp.get_updates_buf : undefined);
                     }
-                    catch {
-                        // best-effort
+                    else if (resp.get_updates_buf) {
+                        if (resp.get_updates_buf !== this.lastRejectedSyncCursor) {
+                            this.lastRejectedSyncCursor = undefined;
+                        }
+                        this.getUpdatesBuf = resp.get_updates_buf;
+                        try {
+                            fs.writeFileSync(this.syncBufPath, this.getUpdatesBuf, 'utf-8');
+                        }
+                        catch {
+                            // best-effort
+                        }
                     }
                 }
                 // 处理消息
@@ -450,6 +492,17 @@ export class WechatChannel {
                     return;
                 if (this.isSessionPaused())
                     return;
+                if (err instanceof WechatApiError &&
+                    err.endpoint === 'ilink/bot/getupdates' &&
+                    err.hasCode(INVALID_SYNC_CURSOR_ERRCODE) &&
+                    this.getUpdatesBuf &&
+                    this.getUpdatesBuf !== this.lastRejectedSyncCursor) {
+                    const rejectedCursor = this.getUpdatesBuf;
+                    this.clearSyncCursor('getUpdates returned ret=-1', rejectedCursor);
+                    consecutiveFailures = 0;
+                    logger.warn('[WeChat] Retrying getUpdates immediately with an empty sync cursor');
+                    continue;
+                }
                 consecutiveFailures++;
                 if (err instanceof WechatApiError) {
                     logger.error(`[WeChat] getUpdates API error (${consecutiveFailures}/${MAX_CONSECUTIVE_FAILURES}): ${err.message}`);
@@ -470,6 +523,24 @@ export class WechatChannel {
             }
         }
     }
+    clearSyncCursor(reason, rejectedCursor) {
+        if (rejectedCursor)
+            this.lastRejectedSyncCursor = rejectedCursor;
+        this.getUpdatesBuf = '';
+        try {
+            let persistedAction = 'no persisted cursor';
+            if (fs.existsSync(this.syncBufPath)) {
+                const quarantinePath = `${this.syncBufPath}.corrupt-${Date.now()}`;
+                fs.renameSync(this.syncBufPath, quarantinePath);
+                persistedAction = `quarantined as ${path.basename(quarantinePath)}`;
+            }
+            logger.warn(`[WeChat] Cleared sync cursor: ${reason} (${persistedAction})`);
+        }
+        catch (err) {
+            logger.warn(`[WeChat] Cleared in-memory sync cursor but failed to quarantine persisted cursor: ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
     // ── Inbound Message Handler ──────────────────────────────────────────
     async handleInboundMessage(msg) {
         if (msg.message_type !== MSG_TYPE_USER)

package/dist/cli/aun-commands.js

@@ -299,6 +299,14 @@ function renderManagedGroupResult(args, result, formatJson) {
         console.log(`✓ 成功 ${result.added?.length ?? 0}，失败 ${result.failed?.length ?? 0}`);
         return;
     }
+    if (sub === 'invites') {
+        console.log(`✓ ${result.invites?.length ?? 0} 个待处理邀请`);
+        return;
+    }
+    if (sub === 'accept-invite' || sub === 'reject-invite' || sub === 'revoke-invite') {
+        console.log(`✓ group ${sub} 完成`);
+        return;
+    }
     console.log(`✓ group ${sub} 完成`);
 }
 export async function cmdAid(args) {
@@ -1558,7 +1566,11 @@ export async function cmdGroup(args) {
 成员:
   join <from> <group-id> [--message M] [--answer A]    申请加入
   leave <from> <group-id>                              退出群
-  invite <from> <group-id> <member-aid> [<member-aid>...]   邀请成员
+  invite <from> <group-id> <member-aid> [<member-aid>...]   创建定向邀请
+  invites <from> [--page N] [--size N]                    查看收到的邀请
+  accept-invite <from> <invite-id>                         接受邀请
+  reject-invite <from> <invite-id>                         拒绝邀请
+  revoke-invite <from> <invite-id>                         撤回邀请
   kick <from> <group-id> <member-aid>                  踢出成员
   members <from> <group-id> [--page N] [--size N]      列出群成员
   online <from> <group-id>                             查看在线成员
@@ -1582,6 +1594,7 @@ Options:
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
   --group-id <aid>      指定自定义群 AID（仅 create）
+  --member-type <type>  定向邀请成员类型：human|ai（仅 invite）
   --                    end-of-options：其后所有参数按正文处理
                         （用于发送恰好等于某 flag 的文本，如 send a g -- --encrypt）
 
@@ -1617,7 +1630,7 @@ Options:
         renderManagedGroupResult(args, result, formatJson);
         return;
     }
-    const { groupSend, groupPull, groupAck, groupCreate, groupInfo, groupList, groupUpdate, groupDissolve, groupSuspend, groupResume, groupJoin, groupLeave, groupInvite, groupKick, groupMembers, groupOnline, groupSetRole, groupTransferOwner, groupBan, groupUnban, groupBanlist, groupRules, groupUpdateRules, groupRulesFileGet, groupRulesFileSet, groupRulesFilePublish, } = await import('../aun/msg/index.js');
+    const { groupSend, groupPull, groupAck, groupCreate, groupInfo, groupList, groupUpdate, groupDissolve, groupSuspend, groupResume, groupJoin, groupLeave, groupInvite, groupInvites, groupAcceptInvite, groupRejectInvite, groupRevokeInvite, groupKick, groupMembers, groupOnline, groupSetRole, groupTransferOwner, groupBan, groupUnban, groupBanlist, groupRules, groupUpdateRules, groupRulesFileGet, groupRulesFileSet, groupRulesFilePublish, } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
     // 通用 group_id 提取（第三参数）
     const requireGroupId = () => {
@@ -1693,6 +1706,31 @@ Options:
         }
         return parsed;
     };
+    if (sub === 'invites') {
+        const page = parseNumberFlag('--page', '--page');
+        const size = parseNumberFlag('--size', '--size');
+        const result = await groupInvites({ from, page, size, ...commonOpts });
+        outputResult(result, () => {
+            const r = result;
+            console.log(`✓ ${r.invites.length} 个待处理邀请:`);
+            for (const invite of r.invites) {
+                console.log(`  ${invite.invite_id ?? invite.id ?? '-'}  ${invite.group_id ?? invite.group_aid ?? '-'}  ${invite.inviter_aid ?? invite.from ?? '-'}`);
+            }
+        });
+        return;
+    }
+    if (sub === 'accept-invite' || sub === 'reject-invite' || sub === 'revoke-invite') {
+        const inviteId = args[2];
+        if (!inviteId || inviteId.startsWith('--')) {
+            console.error(`用法: ec group ${sub} <from> <invite-id>`);
+            process.exit(1);
+        }
+        const action = sub === 'accept-invite' ? groupAcceptInvite
+            : sub === 'reject-invite' ? groupRejectInvite : groupRevokeInvite;
+        const result = await action({ from, inviteId, ...commonOpts });
+        outputResult(result, () => console.log(`✓ 已${sub === 'accept-invite' ? '接受' : sub === 'reject-invite' ? '拒绝' : '撤回'}邀请 ${inviteId}`));
+        return;
+    }
     const requireFlagValue = (flag, label) => {
         const value = getArgValue(args, flag);
         if (value === undefined || value.startsWith('--')) {
@@ -2147,7 +2185,12 @@ Options:
                 process.exit(1);
             }
         }
-        const result = await groupInvite({ from, groupId, members, ...commonOpts });
+        const memberType = getArgValue(args, '--member-type');
+        if (memberType !== undefined && memberType !== 'human' && memberType !== 'ai') {
+            console.error('❌ --member-type 必须是 human 或 ai');
+            process.exit(1);
+        }
+        const result = await groupInvite({ from, groupId, members, memberType: memberType, ...commonOpts });
         outputResult(result, () => {
             const r = result;
             console.log(`✓ 成功 ${r.added.length}，失败 ${r.failed.length}`);
@@ -2300,7 +2343,7 @@ Options:
         });
         return;
     }
-    console.error(`未知子命令: ${sub}\n用法: ec group [send|pull|ack|create|list|info|update|dissolve|suspend|resume|rules|join|leave|invite|kick|members|online|role|owner|ban|unban]`);
+    console.error(`未知子命令: ${sub}\n用法: ec group [send|pull|ack|create|list|info|update|dissolve|suspend|resume|rules|join|leave|invite|invites|accept-invite|reject-invite|revoke-invite|kick|members|online|role|owner|ban|unban]`);
     process.exit(1);
 }
 // ==================== Main ====================
@@ -2322,6 +2365,7 @@ const VALUE_FLAGS = new Set([
     '--payload', '--title', '--description', '--text', '--transcript',
     '--as', '--content-type', '--mention', '--visibility', '--join-mode',
     '--group-id', '--name', '--message', '--answer', '--page', '--size',
+    '--member-type',
     '--aun-path', '--thread', '--return',
 ]);
 const BOOLEAN_FLAGS = new Set([

package/dist/cli/command-log.js

@@ -59,8 +59,8 @@ export function logCliCommand(cmd, args) {
     const line = JSON.stringify({
         ts: localTimestamp(),
         cmd,
-        // 完整命令行，可直接拷贝执行（含 ec 前缀，含空格的参数自动加引号）
-        command: `ec ${args.map(shellQuote).join(' ')}`,
+        // 可审计命令行（敏感参数掩码；含 ec 前缀，含空格参数自动加引号）
+        command: `ec ${loggableArgs(args).map(shellQuote).join(' ')}`,
         selfAid: selfAid || undefined,
         sessionId: process.env.EVOLCORE_SESSION_ID || undefined,
     }) + '\n';
@@ -82,6 +82,25 @@ function shellQuote(arg) {
         return arg;
     return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
+function loggableArgs(args) {
+    const output = [];
+    let redactNext = false;
+    for (const arg of args) {
+        if (redactNext) {
+            output.push('[REDACTED]');
+            redactNext = false;
+            continue;
+        }
+        const flag = arg.replace(/^--?/, '').replace(/=.*$/, '').toLowerCase();
+        if (/^(?:remote-token|ecweb-token|menu-token|token|password|secret)$/.test(flag)) {
+            output.push(arg.includes('=') ? `${arg.slice(0, arg.indexOf('=') + 1)}[REDACTED]` : arg);
+            redactNext = !arg.includes('=');
+            continue;
+        }
+        output.push(arg.replace(/((?:"|')?(?:ecweb[_-]?token|menu[_-]?token|access[_-]?token|refresh[_-]?token|password|secret)(?:"|')?\s*[:=]\s*)("(?:[^"\\]|\\.)*"|'[^']*'|[^,}\s]+)/gi, '$1"[REDACTED]"'));
+    }
+    return output;
+}
 /** 本地日期 tag YYYYMMDD，用于日志文件按天切分（一天一个文件）。 */
 function dayTag() {
     const d = new Date();

package/dist/cli/daemon-commands.js

@@ -15,7 +15,7 @@ import { cmdInit, needsControlAidInit, initTail } from './init.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
 import { tryUpgrade, tryUpgradeGlobalPkg, resolveGlobalPkg } from '../utils/npm-ops.js';
-import { ecwebVersionRequirementError, fetchEcwebPairCode, resolveEcwebLaunchCommand } from '../utils/ecweb-utils.js';
+import { ecwebVersionRequirementError, resolveEcwebLaunchCommand, fetchRemotePairingCode } from '../utils/ecweb-utils.js';
 import { isHostChinese } from '../utils/locale.js';
 import { scanInstances, cleanupInstances, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
 import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal, isWatchLogFile } from './watch-logs.js';
@@ -28,8 +28,9 @@ import { WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME } from '../product.js
 import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
 import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
-import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../utils/codex-app-server-registry.js';
+import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../agents/codex/app-server-registry.js';
 import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
+import { checkCodexProjectPath, inspectCodexManagedHook } from '../agents/codex/diagnostics.js';
 const execFileAsync = promisify(execFile);
 async function runAutomaticInit(action) {
     try {
@@ -177,10 +178,15 @@ function sourceBuildNeedsRefresh() {
 function runSourceBuild() {
     return new Promise(resolve => {
         console.log('🔧 源码比 daemon 编译产物更新，自动重新构建...');
-        const child = spawn(platform.isWindows ? 'npm.cmd' : 'npm', ['run', 'build'], {
+        // Windows cannot spawn a .cmd shim directly with shell:false on recent
+        // Node versions. Invoke cmd.exe explicitly instead of using spawn's
+        // shell:true mode, which also avoids the DEP0190 warning.
+        const command = platform.isWindows ? (process.env.ComSpec ?? process.env.COMSPEC ?? 'cmd.exe') : 'npm';
+        const args = platform.isWindows ? ['/d', '/c', 'npm.cmd', 'run', 'build'] : ['run', 'build'];
+        const child = spawn(command, args, {
             cwd: getPackageRoot(),
             stdio: 'inherit',
-            shell: platform.isWindows,
+            windowsHide: platform.isWindows,
         });
         child.on('error', err => {
             console.error(`❌ 无法启动构建进程: ${err.message}`);
@@ -215,6 +221,64 @@ function requireCompletedDataMigration(root) {
     process.exitCode = 2;
     return false;
 }
+/**
+ * Check package updates before starting or restarting the daemon.
+ * A failed upgrade is reported, but the currently installed version remains
+ * usable and the caller continues with its normal lifecycle.
+ */
+export async function runUpgradeChecks(upgradeFn = signal => tryUpgrade({ signal }), ecwebUpgradeFn = signal => tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME, { signal }), timeoutMs = 60_000) {
+    console.log('📦 Checking for updates...');
+    const runWithTimeout = async (label, fn) => {
+        const controller = new AbortController();
+        let timer;
+        try {
+            return await Promise.race([
+                fn(controller.signal),
+                new Promise(resolve => {
+                    timer = setTimeout(() => {
+                        resolve({ status: 'failed', error: `${label} upgrade timed out` });
+                        controller.abort();
+                    }, timeoutMs);
+                }),
+            ]);
+        }
+        catch (error) {
+            return { status: 'failed', error: error instanceof Error ? error.message : String(error) };
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    };
+    const upgrade = await runWithTimeout('EvolCore', upgradeFn);
+    switch (upgrade.status) {
+        case 'upgraded':
+            console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
+            break;
+        case 'no-update':
+            console.log(`✓ Already up to date (${upgrade.from})`);
+            break;
+        case 'skipped':
+            console.log(upgrade.error
+                ? '⏭ Skipped upgrade (network unavailable)'
+                : '⏭ Skipped upgrade check (dev mode)');
+            break;
+        case 'failed':
+            console.log(`⚠ Upgrade failed${upgrade.from && upgrade.to ? ` (${upgrade.from} → ${upgrade.to})` : ''}, continuing with current version${upgrade.error ? `: ${upgrade.error}` : ''}`);
+            break;
+    }
+    const ecwebUpgrade = await runWithTimeout(WEB_PACKAGE_NAME, ecwebUpgradeFn);
+    switch (ecwebUpgrade.status) {
+        case 'upgraded':
+            console.log(`✅ ${WEB_PACKAGE_NAME} upgraded: ${ecwebUpgrade.from} → ${ecwebUpgrade.to}`);
+            break;
+        case 'no-update':
+            break;
+        case 'failed':
+            console.log(`⚠ ${WEB_PACKAGE_NAME} upgrade failed${ecwebUpgrade.from && ecwebUpgrade.to ? ` (${ecwebUpgrade.from} → ${ecwebUpgrade.to})` : ''}${ecwebUpgrade.error ? `: ${ecwebUpgrade.error}` : ''}`);
+            break;
+    }
+}
 // ==================== Commands ====================
 /**
  * 检测并展示跨 HOME 残留的 evolcore 主进程。
@@ -329,6 +393,9 @@ export async function cmdStart(opts = {}) {
     ensureDataDirs();
     if (!await requireFreshSourceBuild())
         return;
+    // A stopped container may miss the daily upgrade trigger. Check once on
+    // every real start so the service does not stay on an old installation.
+    await (opts.upgradeChecks ?? runUpgradeChecks)();
     // 旧配置自动迁移（daemon.json → 新结构）
     const { autoMigrateIfNeeded } = await import('../config-store.js');
     autoMigrateIfNeeded();
@@ -704,37 +771,9 @@ export async function cmdRestart(opts = {}) {
     }
     if (!await requireFreshSourceBuild())
         return;
-    // 版本检查与自动升级
-    console.log('📦 Checking for updates...');
-    const upgrade = await tryUpgrade();
-    switch (upgrade.status) {
-        case 'upgraded':
-            console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
-            break;
-        case 'no-update':
-            console.log(`✓ Already up to date (${upgrade.from})`);
-            break;
-        case 'skipped':
-            console.log(upgrade.error
-                ? '⏭ Skipped upgrade (network unavailable)'
-                : '⏭ Skipped upgrade check (dev mode)');
-            break;
-        case 'failed':
-            console.log(`⚠ Upgrade failed (${upgrade.from} → ${upgrade.to}), continuing with current version`);
-            break;
-    }
-    // EC Web 是独立全局包，已安装时单独检查升级。
-    const ecwebUpgrade = await tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME);
-    switch (ecwebUpgrade.status) {
-        case 'upgraded':
-            console.log(`✅ ${WEB_PACKAGE_NAME} upgraded: ${ecwebUpgrade.from} → ${ecwebUpgrade.to}`);
-            break;
-        case 'no-update':
-            break; // silent
-        case 'failed':
-            console.log(`⚠ ${WEB_PACKAGE_NAME} upgrade failed (${ecwebUpgrade.from} → ${ecwebUpgrade.to})`);
-            break;
-    }
+    // Keep restart behavior identical to startup: both paths use one upgrade
+    // check implementation and continue when an upgrade is unavailable.
+    await runUpgradeChecks();
     if (!requireCompletedDataMigration(resolveRoot()))
         return;
     // 停止所有活 main 进程（可能不止一个）
@@ -2667,7 +2706,7 @@ async function stopEcwebIfRunning(p) {
         throw new Error(`EC Web old process or port ${port} could not be released`);
     }
     // 清理 pid 文件（仅 ecweb-<pid>.json / watch-web-<pid>.json，
-    // 不碰 ecweb-tokens.json 等非 pid 文件，否则会清空配对 token 库导致每次重启都要重新配对）
+    // 不碰 daemon-owned control-access-tokens.json 等非 pid 文件，否则会清空凭据库导致每次重启都要重新配对）
     removeEcwebInstanceFiles(p);
     return pids.size > 0;
 }
@@ -2759,23 +2798,32 @@ export async function startEcwebIfEnabled(p, options = {}) {
         fs.mkdirSync(p.instanceDir, { recursive: true });
         const startedAt = getProcessStartTime(pid) ?? Date.now();
         fs.writeFileSync(path.join(p.instanceDir, `ecweb-${pid}.json`), JSON.stringify({ pid, port, startedAt, startedAtIso: new Date(startedAt).toISOString() }, null, 2));
-        // 轮询端口确认 HTTP 服务真正就绪（spawn 成功 ≠ 端口绑定成功），顺便拿配对码
+        // 轮询端口确认 HTTP 服务真正就绪（spawn 成功 ≠ 端口绑定成功）。
+        // 配对码由 daemon 提供，daemon 尚未启动时不应把已经就绪的 ECWeb 杀掉。
+        let ready = false;
         let pair = null;
         for (let i = 0; i < 20; i++) {
-            pair = await fetchEcwebPairCode(port);
-            if (pair)
+            ready = await probeEcwebReady(port);
+            if (ready) {
+                pair = await fetchRemotePairingCode();
                 break;
+            }
             await sleep(250);
         }
-        if (pair) {
+        if (ready) {
             const actualStartedAt = getProcessStartTime(pid);
             if (actualStartedAt !== null) {
                 fs.writeFileSync(path.join(p.instanceDir, `ecweb-${pid}.json`), JSON.stringify({ pid, port, startedAt: actualStartedAt, startedAtIso: new Date(actualStartedAt).toISOString() }, null, 2));
             }
-            const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
             const actionLabel = wasRunning ? '已重启' : '启动成功';
             console.log(`✓ ECWeb ${actionLabel} (PID: ${pid})  http://localhost:${port}`);
-            console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，已配对过的浏览器无需重新配对)`);
+            if (pair) {
+                const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+                console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，已配对过的浏览器无需重新配对)`);
+            }
+            else {
+                console.log('   daemon 尚未提供配对码；EvolCore 启动后可通过 /pair 或 ECWeb 页面获取');
+            }
             return true;
         }
         console.log(`❌ ECWeb 启动失败：端口 ${port} 未就绪（进程 PID ${pid} 可能已退出，查看 logs/watch-web.log）`);
@@ -2801,13 +2849,13 @@ async function printEcwebAccess(port) {
     console.log(`🔭 ECWeb  http://localhost:${port}`);
     let pair = null;
     for (let i = 0; i < 10 && !pair; i++) {
-        pair = await fetchEcwebPairCode(port);
+        pair = await fetchRemotePairingCode();
         if (!pair)
             await sleep(300);
     }
     if (pair) {
         const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
-        console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，配对后 token 缓存 24h)`);
+        console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，配对后远程访问 token 缓存 30 天)`);
     }
     else {
         console.log('   配对码: 暂不可用（稍后重试 ec watch web，或查看 logs/watch-web.log）');
@@ -2924,7 +2972,56 @@ export async function cmdDiagnose() {
         else {
             console.log(`[diagnose] ✓ 已加载 ${agents.length} 个 self-agent`);
         }
-        // 3. 检查 Anthropic 配置（用首个 self-agent 的 effective config）
+        // 3. 检查实际使用 Codex 的 Agent 项目目录。项目路径属于 Agent 的
+        // effective config，逐个输出 AID，避免只检查第一个 agent 掩盖坏配置。
+        const codexAgents = agents.filter(agent => {
+            try {
+                return resolveEffective({ self: agent.aid }).active_baseagent === 'codex';
+            }
+            catch (error) {
+                console.error(`[diagnose] ❌ Agent ${agent.aid} effective config 解析失败: ${error instanceof Error ? error.message : String(error)}`);
+                hasError = true;
+                return false;
+            }
+        });
+        for (const agent of codexAgents) {
+            try {
+                const effective = resolveEffective({ self: agent.aid });
+                const check = checkCodexProjectPath(effective.projects?.defaultPath);
+                if (check.status === 'ok') {
+                    console.log(`[diagnose] ✓ Codex 项目路径 ${agent.aid}: ${check.path}`);
+                }
+                else {
+                    console.error(`[diagnose] ❌ Codex 项目路径 ${agent.aid}: ${check.path || '(未配置)'} (${check.reason || check.status})`);
+                    hasError = true;
+                }
+                for (const warning of check.warnings)
+                    console.warn(`[diagnose] ⚠️ Codex 项目路径 ${agent.aid}: ${warning}`);
+            }
+            catch (error) {
+                console.error(`[diagnose] ❌ Codex 项目路径检查失败 ${agent.aid}: ${error instanceof Error ? error.message : String(error)}`);
+                hasError = true;
+            }
+        }
+        if (codexAgents.length === 0) {
+            console.log('[diagnose] - Codex managed hook: 跳过（没有 Agent 使用 Codex）');
+        }
+        else {
+            const hook = inspectCodexManagedHook({ packageRoot: getPackageRoot() });
+            if (hook.status === 'installed') {
+                console.log(`[diagnose] ✓ Codex managed hook 已安装: ${hook.hookPath}`);
+            }
+            else if (hook.status === 'skipped') {
+                console.log(`[diagnose] - Codex managed hook: 跳过（${hook.reason}）`);
+            }
+            else {
+                const prefix = hook.status === 'missing' ? '⚠️' : '❌';
+                const writer = hook.status === 'missing' ? console.warn : console.error;
+                writer(`[diagnose] ${prefix} Codex managed hook ${hook.status}: ${hook.reason || 'unknown error'}${hook.requirements ? ` (${hook.requirements})` : ''}`);
+                hasError = true;
+            }
+        }
+        // 4. 检查 Anthropic 配置（用首个 self-agent 的 effective config）
         if (agents.length > 0) {
             try {
                 const merged = resolveEffective({ self: agents[0].aid });

package/dist/cli/index.js

@@ -46,6 +46,7 @@ AUN:
   fs                AUN 文件系统
   storage           底层对象存储命令
   rpc               调用底层 AUN RPC
+  menu-client       向远程 daemon 发送标准 Menu 请求
   contact           联系人黑名单管理
   net               AUN 网络链路诊断
 
@@ -350,6 +351,25 @@ export async function main(args) {
             await cmdRpc(args.slice(1));
             break;
         }
+        case 'menu-client': {
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
+            const { cmdMenuClient } = await import('./menu-client.js');
+            try {
+                await cmdMenuClient(args.slice(1));
+            }
+            catch (error) {
+                const payload = {
+                    ok: false,
+                    code: typeof error?.code === 'string' ? error.code : 'MENU_CLIENT_FAILED',
+                    error: error?.message ?? String(error),
+                    ...(error?.data === undefined ? {} : { data: error.data }),
+                };
+                console.error(JSON.stringify(payload));
+                process.exitCode = 1;
+            }
+            break;
+        }
         case 'storage': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();

package/dist/cli/init.js

@@ -14,6 +14,7 @@ import { defaultProjectsRoot } from '../utils/project-path.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
 import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
 import { askInit, isInitCancelledError, printInitCancelHint } from './init-cancel.js';
+import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, } from '../agents/baseagent-availability.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return askInit(rl, question);
@@ -27,17 +28,8 @@ export function expandLeadingTildePath(value, homeDir = os.homedir()) {
     }
     return value;
 }
-const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini', 'ecagent'];
-const AUTO_BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
-function isBaseagentAvailable(baseagent, codexAvailability) {
-    if (baseagent === 'codex')
-        return (codexAvailability ?? getCodexAppServerAvailability()).available;
-    if (baseagent === 'ecagent')
-        return true;
-    return commandExists(baseagent);
-}
 function detectAvailable(codexAvailability = getCodexAppServerAvailability()) {
-    return BASEAGENT_CANDIDATES.filter(baseagent => isBaseagentAvailable(baseagent, codexAvailability));
+    return detectAvailableBaseagents(codexAvailability);
 }
 /** Offer installation only when the probe positively identified an old CLI. */
 export async function maybeUpgradeCodexForInit(availability, dependencies) {