evolcore 0.0.25 → 0.0.26

package/dist/index.js

@@ -46,7 +46,7 @@ import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
 import { evaluateOutboundContactAdmission } from './core/message/message-admission.js';
 import { enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
-import { readInstalledEvolcoreVersion } from './utils/evolcore-version.js';
+import { computeBuildId, readBuildIdentity, readEvolcoreRuntimeFlavor, readEvolcoreStartedAtIso, readInstalledEvolcoreVersion, tagErrorTextWithEvolcoreVersion, } from './utils/evolcore-version.js';
 import { recoverAllRoleMutationsSync } from './core/command/role-menu.js';
 import { HandoffRuntime } from './core/handoff/runtime.js';
 import { BootstrapService, completeBootstrapWithWelcome } from './core/bootstrap-service.js';
@@ -75,6 +75,7 @@ import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
 import { remoteAccessService } from './core/auth/remote-access-store.js';
+import { DiagService, executeDiagIpc } from './core/command/diag-service.js';
 import { createEcwebSupervisor } from './utils/ecweb-supervisor.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
@@ -147,6 +148,45 @@ function summarizeOutboundPayload(payload) {
     }
     return s;
 }
+/**
+ * 给用户可见的错误文案打上 EvolCore 版本标记，便于从对端截图直接判断版本与运行形态。
+ *
+ * 打标范围只含"出错了"语义的 payload：
+ * - `result.error` / `system.error`：任务级与系统级失败（含沙箱、权限、超时）
+ * - `status.error`：终态元数据，附带结构化版本字段供前端不受截断影响地展示
+ * - `command.error`：仅当带 `reasonCode`（授权/权限拒绝）时才打。命令参数写错、
+ *   未知命令这类输入校验反馈不打——它们与版本无关，逐条加前缀只会变成噪音。
+ *
+ * 返回新对象，不改调用方持有的 payload（同一 payload 可能被重复发送到多个渠道）。
+ */
+function tagErrorPayloadWithEvolcoreVersion(payload) {
+    switch (payload.kind) {
+        case 'result.error':
+        case 'system.error':
+            return { ...payload, text: tagErrorTextWithEvolcoreVersion(payload.text) };
+        case 'command.error':
+            if (!payload.reasonCode)
+                return payload;
+            return { ...payload, text: tagErrorTextWithEvolcoreVersion(payload.text) };
+        case 'status.error': {
+            const metadata = payload.metadata;
+            return {
+                ...payload,
+                metadata: {
+                    ...metadata,
+                    ...(typeof metadata?.message === 'string'
+                        ? { message: tagErrorTextWithEvolcoreVersion(metadata.message) }
+                        : {}),
+                    evolcoreVersion: readInstalledEvolcoreVersion(),
+                    evolcoreFlavor: readEvolcoreRuntimeFlavor(),
+                    evolcoreStartedAt: readEvolcoreStartedAtIso(),
+                },
+            };
+        }
+        default:
+            return payload;
+    }
+}
 function shouldCountSentPayload(payload) {
     return [
         'result.text',
@@ -333,153 +373,153 @@ function seedUpgradeCheckTrigger(manager, owner) {
     // take the watchdog down with it.
     const monitorEntry = platform.resolveCliEntry(packageRoot);
     const stageParent = path.join(resolvePaths().root, 'data', 'monitor-stage');
-    fs.writeFileSync(scriptPath, `#!/usr/bin/env node
-const fs = require('node:fs');
-const path = require('node:path');
-const { existsSync, readFileSync } = fs;
-const { spawn } = require('node:child_process');
-
-const CLI_PATH = ${JSON.stringify(monitorEntry.entry)};
-const CLI_ARGS = ${JSON.stringify(monitorEntry.args)};
-const PACKAGE_ROOT = ${JSON.stringify(packageRoot)};
-const STAGE_PARENT = ${JSON.stringify(stageParent)};
-const PACKAGE_JSON = ${JSON.stringify(packageJsonPath)};
-const PACKAGE_NAME = ${JSON.stringify(MAIN_PACKAGE_NAME)};
-const DEV_MODE = ${devMode ? 'true' : 'false'};
-
-function emit(outcome, text) {
-  process.stdout.write(JSON.stringify({ outcome, text, files: [] }));
-}
-
-function compareVersions(a, b) {
-  const pa = a.split('-')[0].split('.').map(Number);
-  const pb = b.split('-')[0].split('.').map(Number);
-  const count = Math.max(pa.length, pb.length);
-  for (let i = 0; i < count; i += 1) {
-    const av = Number.isFinite(pa[i]) ? pa[i] : 0;
-    const bv = Number.isFinite(pb[i]) ? pb[i] : 0;
-    if (av < bv) return -1;
-    if (av > bv) return 1;
-  }
-  return 0;
-}
-
-async function latestVersion() {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 10_000);
-  try {
-    const response = await fetch('https://registry.npmjs.org/' + encodeURIComponent(PACKAGE_NAME) + '/latest', {
-      signal: controller.signal,
-      headers: { Accept: 'application/json' },
-    });
-    if (!response.ok) return null;
-    const data = await response.json();
-    return typeof data.version === 'string' ? data.version : null;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-async function main() {
-  if (DEV_MODE) {
-    emit('noop', 'upgrade check skipped in dev mode');
-    return;
-  }
-
-  let localVersion;
-  try {
-    localVersion = JSON.parse(readFileSync(PACKAGE_JSON, 'utf8')).version;
-  } catch {
-    emit('error', 'failed to read local ec version');
-    return;
-  }
-  if (typeof localVersion !== 'string' || !localVersion) {
-    emit('error', 'failed to read local ec version');
-    return;
-  }
-
-  let remoteVersion;
-  try {
-    remoteVersion = await latestVersion();
-  } catch {
-    remoteVersion = null;
-  }
-  if (!remoteVersion) {
-    emit('error', 'failed to check evolcore latest version');
-    return;
-  }
-  if (compareVersions(localVersion, remoteVersion) >= 0) {
-    emit('noop', 'evolcore is already up to date (' + localVersion + '; latest ' + remoteVersion + ')');
-    return;
-  }
-  if (!existsSync(CLI_PATH)) {
-    emit('error', 'restart-monitor entry not found: ' + CLI_PATH);
-    return;
-  }
-
-  // Installed mode: copy the monitor out of the package before it upgrades that
-  // same package. Mirrors prepareMonitorStage(); kept inline because this file
-  // is generated standalone CJS. Any failure degrades to launching in place —
-  // losing upgrade isolation beats losing the upgrade.
-  let launchArgs = CLI_ARGS;
-  const launchEnv = { ...process.env };
-  if (!DEV_MODE && STAGE_PARENT) {
-    try {
-      const stageDir = path.join(STAGE_PARENT, 'upgrade-' + process.pid + '-' + Date.now());
-      fs.mkdirSync(stageDir, { recursive: true });
-      fs.cpSync(path.join(PACKAGE_ROOT, 'dist'), path.join(stageDir, 'dist'), { recursive: true });
-      if (existsSync(PACKAGE_JSON)) fs.copyFileSync(PACKAGE_JSON, path.join(stageDir, 'package.json'));
-      const modulesSource = path.join(PACKAGE_ROOT, 'node_modules');
-      if (existsSync(modulesSource)) {
-        const staged = path.join(stageDir, 'node_modules');
-        try {
-          // junction works unelevated on Windows; dir symlink elsewhere.
-          fs.symlinkSync(modulesSource, staged, process.platform === 'win32' ? 'junction' : 'dir');
-          fs.readdirSync(staged);
-        } catch (linkError) {
-          fs.rmSync(staged, { recursive: true, force: true });
-          fs.cpSync(modulesSource, staged, { recursive: true });
-        }
-      }
-      const stagedEntry = path.join(stageDir, 'dist', 'cli', 'index.js');
-      if (existsSync(stagedEntry)) {
-        launchArgs = [stagedEntry];
-        launchEnv.EVOLCORE_TARGET_PACKAGE_ROOT = PACKAGE_ROOT;
-        launchEnv.EVOLCORE_MONITOR_STAGE = stageDir;
-      }
-    } catch (stageError) {
-      // Fall through with the in-place entry.
-    }
-  }
-
-  try {
-    const child = spawn(process.execPath, [...launchArgs, 'restart-monitor'], {
-      detached: true,
-      stdio: 'ignore',
-      windowsHide: process.platform === 'win32',
-      env: launchEnv,
-    });
-    child.unref();
-    const pid = child.pid;
-    // The daemon is still running here — the monitor is what stops it. So a
-    // monitor that dies on load costs the upgrade, not the service; still,
-    // report it accurately instead of claiming success.
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    let alive = false;
-    try { process.kill(pid, 0); alive = true; } catch (e) { alive = false; }
-    if (!alive) {
-      emit('error', 'restart-monitor exited during startup; upgrade to ' + remoteVersion + ' not applied');
-      return;
-    }
-    emit('success', 'evolcore upgrade available: ' + localVersion + ' -> ' + remoteVersion + '; restart-monitor started');
-  } catch (error) {
-    emit('error', 'failed to start restart-monitor: ' + (error && error.message ? error.message : String(error)));
-  }
-}
-
-main().catch((error) => {
-  emit('error', 'upgrade check failed: ' + (error && error.message ? error.message : String(error)));
-});
+    fs.writeFileSync(scriptPath, `#!/usr/bin/env node
+const fs = require('node:fs');
+const path = require('node:path');
+const { existsSync, readFileSync } = fs;
+const { spawn } = require('node:child_process');
+
+const CLI_PATH = ${JSON.stringify(monitorEntry.entry)};
+const CLI_ARGS = ${JSON.stringify(monitorEntry.args)};
+const PACKAGE_ROOT = ${JSON.stringify(packageRoot)};
+const STAGE_PARENT = ${JSON.stringify(stageParent)};
+const PACKAGE_JSON = ${JSON.stringify(packageJsonPath)};
+const PACKAGE_NAME = ${JSON.stringify(MAIN_PACKAGE_NAME)};
+const DEV_MODE = ${devMode ? 'true' : 'false'};
+
+function emit(outcome, text) {
+  process.stdout.write(JSON.stringify({ outcome, text, files: [] }));
+}
+
+function compareVersions(a, b) {
+  const pa = a.split('-')[0].split('.').map(Number);
+  const pb = b.split('-')[0].split('.').map(Number);
+  const count = Math.max(pa.length, pb.length);
+  for (let i = 0; i < count; i += 1) {
+    const av = Number.isFinite(pa[i]) ? pa[i] : 0;
+    const bv = Number.isFinite(pb[i]) ? pb[i] : 0;
+    if (av < bv) return -1;
+    if (av > bv) return 1;
+  }
+  return 0;
+}
+
+async function latestVersion() {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 10_000);
+  try {
+    const response = await fetch('https://registry.npmjs.org/' + encodeURIComponent(PACKAGE_NAME) + '/latest', {
+      signal: controller.signal,
+      headers: { Accept: 'application/json' },
+    });
+    if (!response.ok) return null;
+    const data = await response.json();
+    return typeof data.version === 'string' ? data.version : null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function main() {
+  if (DEV_MODE) {
+    emit('noop', 'upgrade check skipped in dev mode');
+    return;
+  }
+
+  let localVersion;
+  try {
+    localVersion = JSON.parse(readFileSync(PACKAGE_JSON, 'utf8')).version;
+  } catch {
+    emit('error', 'failed to read local ec version');
+    return;
+  }
+  if (typeof localVersion !== 'string' || !localVersion) {
+    emit('error', 'failed to read local ec version');
+    return;
+  }
+
+  let remoteVersion;
+  try {
+    remoteVersion = await latestVersion();
+  } catch {
+    remoteVersion = null;
+  }
+  if (!remoteVersion) {
+    emit('error', 'failed to check evolcore latest version');
+    return;
+  }
+  if (compareVersions(localVersion, remoteVersion) >= 0) {
+    emit('noop', 'evolcore is already up to date (' + localVersion + '; latest ' + remoteVersion + ')');
+    return;
+  }
+  if (!existsSync(CLI_PATH)) {
+    emit('error', 'restart-monitor entry not found: ' + CLI_PATH);
+    return;
+  }
+
+  // Installed mode: copy the monitor out of the package before it upgrades that
+  // same package. Mirrors prepareMonitorStage(); kept inline because this file
+  // is generated standalone CJS. Any failure degrades to launching in place —
+  // losing upgrade isolation beats losing the upgrade.
+  let launchArgs = CLI_ARGS;
+  const launchEnv = { ...process.env };
+  if (!DEV_MODE && STAGE_PARENT) {
+    try {
+      const stageDir = path.join(STAGE_PARENT, 'upgrade-' + process.pid + '-' + Date.now());
+      fs.mkdirSync(stageDir, { recursive: true });
+      fs.cpSync(path.join(PACKAGE_ROOT, 'dist'), path.join(stageDir, 'dist'), { recursive: true });
+      if (existsSync(PACKAGE_JSON)) fs.copyFileSync(PACKAGE_JSON, path.join(stageDir, 'package.json'));
+      const modulesSource = path.join(PACKAGE_ROOT, 'node_modules');
+      if (existsSync(modulesSource)) {
+        const staged = path.join(stageDir, 'node_modules');
+        try {
+          // junction works unelevated on Windows; dir symlink elsewhere.
+          fs.symlinkSync(modulesSource, staged, process.platform === 'win32' ? 'junction' : 'dir');
+          fs.readdirSync(staged);
+        } catch (linkError) {
+          fs.rmSync(staged, { recursive: true, force: true });
+          fs.cpSync(modulesSource, staged, { recursive: true });
+        }
+      }
+      const stagedEntry = path.join(stageDir, 'dist', 'cli', 'index.js');
+      if (existsSync(stagedEntry)) {
+        launchArgs = [stagedEntry];
+        launchEnv.EVOLCORE_TARGET_PACKAGE_ROOT = PACKAGE_ROOT;
+        launchEnv.EVOLCORE_MONITOR_STAGE = stageDir;
+      }
+    } catch (stageError) {
+      // Fall through with the in-place entry.
+    }
+  }
+
+  try {
+    const child = spawn(process.execPath, [...launchArgs, 'restart-monitor'], {
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: process.platform === 'win32',
+      env: launchEnv,
+    });
+    child.unref();
+    const pid = child.pid;
+    // The daemon is still running here — the monitor is what stops it. So a
+    // monitor that dies on load costs the upgrade, not the service; still,
+    // report it accurately instead of claiming success.
+    await new Promise(resolve => setTimeout(resolve, 3000));
+    let alive = false;
+    try { process.kill(pid, 0); alive = true; } catch (e) { alive = false; }
+    if (!alive) {
+      emit('error', 'restart-monitor exited during startup; upgrade to ' + remoteVersion + ' not applied');
+      return;
+    }
+    emit('success', 'evolcore upgrade available: ' + localVersion + ' -> ' + remoteVersion + '; restart-monitor started');
+  } catch (error) {
+    emit('error', 'failed to start restart-monitor: ' + (error && error.message ? error.message : String(error)));
+  }
+}
+
+main().catch((error) => {
+  emit('error', 'upgrade check failed: ' + (error && error.message ? error.message : String(error)));
+});
 `);
     // Remove the pre-Node script left by older installations so it cannot be
     // selected by a stale trigger definition or run manually by accident.
@@ -610,6 +650,7 @@ async function runBindBootstrapDaemon(daemonCfg) {
     }));
     ipcServer.setControlToken(controlToken);
     ipcServer.setRemoteAccessService(remoteAccessService);
+    ipcServer.setRemoteAccessOwnerProvider(() => daemonCfg.owners?.[0]);
     ipcServer.setShutdownExecutor(async (reason) => {
         if (!shutdown) {
             pendingShutdownReason = reason;
@@ -757,6 +798,12 @@ async function main() {
     // Service managers do not necessarily export TMPDIR. Establish the private
     // managed root before any runner or task runtime is initialized.
     ensureProcessManagedTempDir();
+    const runtimeEntry = fileURLToPath(import.meta.url);
+    const diskDistDir = path.join(getPackageRoot(), 'dist');
+    const runtimeIsDist = path.resolve(path.dirname(runtimeEntry)) === path.resolve(diskDistDir);
+    const runtimeBuildIdentity = readBuildIdentity(runtimeIsDist ? path.dirname(runtimeEntry) : diskDistDir, readEvolcoreVersion());
+    if (!runtimeIsDist)
+        runtimeBuildIdentity.id = null;
     // 启动信息：目录类型 + 版本号 + 代码最新时间戳
     {
         const pkgRoot = getPackageRoot();
@@ -798,6 +845,10 @@ async function main() {
         console.error(`[EvolCore] 代码时间: ${latestMtime ? fmtTime(latestMtime) : '?'}`);
     }
     console.error('[EvolCore] ✓ Version info printed');
+    const diskBuildId = computeBuildId(diskDistDir);
+    console.error(`[EvolCore] 运行 build ID: ${runtimeIsDist ? (runtimeBuildIdentity.id ?? '?') : 'source'}`);
+    console.error(`[EvolCore] 磁盘 dist build ID: ${diskBuildId ?? '?'}`);
+    logger.info(`[Build] runtimeMode=${runtimeIsDist ? 'dist' : 'source'} runtimeBuildId=${runtimeBuildIdentity.id ?? 'source'} diskDistBuildId=${diskBuildId ?? 'unknown'} match=${runtimeIsDist && runtimeBuildIdentity.id !== null && runtimeBuildIdentity.id === diskBuildId}`);
     // 过滤飞书 SDK 的 info 日志
     const originalLog = console.log;
     const originalInfo = console.info;
@@ -975,13 +1026,13 @@ async function main() {
             port: ecwebConfig.port ?? DEFAULT_ECWEB_PORT,
             logger,
         });
-        try {
-            await ecwebSupervisor.start();
-            onShutdown(() => ecwebSupervisor?.stop());
-        }
-        catch (error) {
+        // ECWeb is optional and has its own health checks/restart loop. Starting
+        // it must not hold up the daemon's agent/IPC initialization or ready
+        // signal; status will report it as starting until the first healthy probe.
+        onShutdown(() => ecwebSupervisor?.stop());
+        void ecwebSupervisor.start().catch((error) => {
             logger.warn(`ECWeb supervisor 启动失败（不影响 daemon 主流程）: ${error?.message || error}`);
-        }
+        });
     }
     if (bindBootstrapMode && daemonCfg.aid && loadAllAgents().agents.length === 0) {
         await runBindBootstrapDaemon(daemonCfg);
@@ -1918,7 +1969,9 @@ async function main() {
     function registerChannelInstance(inst) {
         // 0. 包装 adapter.send，记录所有出站到 channel-out.log
         const originalSend = inst.adapter.send.bind(inst.adapter);
-        inst.adapter.send = async (envelope, payload) => {
+        inst.adapter.send = async (envelope, rawPayload) => {
+            // 版本标记在记账之前打，让 channel-out.log 与对端看到的文案一致。
+            const payload = rawPayload ? tagErrorPayloadWithEvolcoreVersion(rawPayload) : rawPayload;
             const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelKey)
                 ?? agentRegistry.resolveByChannel(inst.adapter.channelName);
             logger.channelOut({
@@ -2316,6 +2369,14 @@ async function main() {
     // A failed bind (for example, a stale Windows named pipe) must abort startup
     // without creating a second AUN session that can kick the old daemon.
     let controlChannel;
+    const diagService = new DiagService(() => ({ controlAid: loadDaemonConfig().aid, owners: loadDaemonConfig().owners ?? [] }), async (to, text) => {
+        if (!controlChannel)
+            throw new Error('Control AID channel is unavailable');
+        const result = await controlChannel.sendDaemonMsg({ to, payload: { type: 'text', text }, encrypt: true });
+        if (!result.ok)
+            throw new Error(result.error ?? 'Invitation send failed');
+    });
+    cmdHandler.setDiagService(diagService);
     let shutdown;
     let pendingShutdownReason;
     const ipcServer = new IpcServer(resolvePaths().socket, () => {
@@ -2335,6 +2396,13 @@ async function main() {
         return {
             pid: process.pid,
             uptime: snap.uptimeMs,
+            build: {
+                runtimeMode: runtimeIsDist ? 'dist' : 'source',
+                runtimeId: runtimeBuildIdentity.id,
+                diskDistId: computeBuildId(diskDistDir),
+                entry: runtimeBuildIdentity.entry,
+                version: runtimeBuildIdentity.version,
+            },
             controlPlane: {
                 ready: true,
                 owned: processLevelOwners.length > 0,
@@ -2384,6 +2452,7 @@ async function main() {
         return cmdHandler.handleCtl(cmd, sessionId, delegation.grant);
     });
     ipcServer.setDaemonRuntimeEpoch(agentDelegationRegistry.getRuntimeEpoch());
+    ipcServer.setRemoteAccessOwnerProvider(() => processLevelOwners[0]);
     cmdHandler.setDaemonMonitorProvider(() => ipcServer.getMonitorSnapshot().snapshot);
     // Register every IPC executor/provider before exposing the endpoint. The
     // function declaration is hoisted, while its invocation remains here so a
@@ -2446,14 +2515,16 @@ async function main() {
             aunSdkLog: daemonCfg.debug?.aunSdkLog,
         });
         // connect() 失败不置空实例：AUNChannel 内部有无限重连（SDK auto_reconnect +
-        // scheduleReconnect），首连失败后台会自愈；保留实例供 status 显示 disconnected。
-        try {
-            await controlChannel.connect();
+        // scheduleReconnect），首连失败会自愈；启动连接放到后台，避免 ready signal
+        // 被远端网关/TLS 首连延迟阻塞。Attach the handlers below before the
+        // promise can complete so an early control message is still accepted.
+        const controlConnectPromise = controlChannel.connect()
+            .then(() => {
             logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`);
-        }
-        catch (e) {
+        })
+            .catch((e) => {
             logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
-        }
+        });
         // 控制 AID 接收 daemon-owner 或有效远程访问 token 授权的指令：
         // 1. /pair — daemon 远程控制配对码（文本快路径）
         // 2. menu.* JSON — 路由到 cmdHandler.execMenuForControl（进程级 + 全量权限）
@@ -2522,6 +2593,13 @@ async function main() {
                 const isRoleMenu = menuControl.isMenu
                     && (menuControl.name === 'role' || menuControl.request.cmd === '/role');
                 const currentProcessOwners = loadDaemonConfig().owners ?? [];
+                if (/^\/diag(?:\s|$)/i.test(text)) {
+                    const command = text.slice(5).trim();
+                    const result = await diagService.execute(command.toLowerCase() === 'stop'
+                        ? { action: 'stop' } : { action: 'start', problem: command }, opts.peerId);
+                    await controlChannel.sendMessage(opts.channelId, result.message, controlReplyContext(opts));
+                    return;
+                }
                 if (menuControl.isMenu && !hasValidMenuId(menuControl)) {
                     logger.warn(`[ControlMenu] dropped malformed request without id type=${menuControl.type}`);
                     logMenuRequestCompleted(menuControl.request, undefined, menuFlowContext, {
@@ -2595,7 +2673,7 @@ async function main() {
                     return;
                 }
                 // owner 发的其他内容：提示可用指令
-                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取远程控制配对码）', controlReplyContext(opts));
+                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取远程控制配对码）、/diag <问题描述>、/diag stop', controlReplyContext(opts));
             }
             catch (e) {
                 if (activeMenuRequest && !menuCompletionLogged) {
@@ -2608,6 +2686,7 @@ async function main() {
                 logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
             }
         });
+        void controlConnectPromise;
         // ── Service Proxy：把本地服务（ecweb 等）通过控制 AID 暴露到 AUN 网络 ──
         // 挂在控制 AUNChannel 上，动态解引用其 client（规避重连换 client）。
         // 失败只 warn，不影响 daemon 主流程。
@@ -2859,6 +2938,17 @@ async function main() {
         ipcServer.setConfigOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleConfigOperation(argv, sessionId, delegationToken, delegationCommandHash));
         ipcServer.setContactOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleContactOperation(argv, sessionId, delegationToken, delegationCommandHash));
         ipcServer.setAidOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleAidOperation(argv, sessionId, delegationToken, delegationCommandHash));
+        ipcServer.setDiagExecutor(cmd => executeDiagIpc(diagService, agentDelegationRegistry, loadDaemonConfig().owners ?? [], cmd));
+        ipcServer.setMenuClientExecutor(async (cmd) => {
+            if (!Array.isArray(cmd.argv) || cmd.argv.some((v) => typeof v !== 'string') || typeof cmd.sessionId !== 'string')
+                return { ok: false, code: 'INVALID_ARGUMENT', error: 'A managed session and Menu argv are required' };
+            return cmdHandler.handleMenuClientOperation(cmd.argv, cmd.sessionId, cmd.delegationToken, cmd.delegationCommandHash, async (options) => {
+                const instance = channelInstances.find(item => item.channelType === 'aun' && item.channel.getAidState()?.aid === options.fromAid);
+                if (!instance)
+                    throw new Error('Current Agent AUN channel is unavailable');
+                return instance.channel.requestRemoteMenu(options);
+            });
+        });
         ipcServer.setGroupOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleGroupOperation(argv, sessionId, delegationToken, delegationCommandHash));
         ipcServer.setMsgOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleMsgOperation(argv, sessionId, delegationToken, delegationCommandHash));
         ipcServer.setFsOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleFsOperation(argv, sessionId, delegationToken, delegationCommandHash));
@@ -3005,7 +3095,14 @@ async function main() {
                     error: decision.reason,
                 };
             }
-            return { ok: true, aid: selfAid, currentSessionId: params.sessionId, managementRole };
+            return {
+                ok: true,
+                aid: selfAid,
+                currentSessionId: params.sessionId,
+                managementRole,
+                role: subject.role,
+                actorId: delegation.grant.actorId,
+            };
         };
         const resolveHandoffQueryScope = async (params, operation) => {
             if (params.sessionId) {
@@ -3027,6 +3124,22 @@ async function main() {
                 return scope;
             return responseEngine.returnAuthorizedHandoffResult({ sessionId: params.sessionId, handoffId: params.handoffId, content: params.content }, scope.aid);
         });
+        ipcServer.setHandoffRecoverReturnExecutor(async (params) => {
+            if (!params.sessionId)
+                return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'current session is required' };
+            const scope = await resolveManagedHandoffScope({ ...params, sessionId: params.sessionId }, 'ec.handoff.recover');
+            if (!scope.ok)
+                return scope;
+            if (scope.role !== 'owner') {
+                return { ok: false, code: 'ROLE_ACCESS_DENIED', error: 'handoff recovery requires the current Agent owner' };
+            }
+            return responseEngine.recoverAuthorizedHandoffResult({
+                sessionId: params.sessionId,
+                handoffId: params.handoffId,
+                content: params.content,
+                actorId: scope.actorId,
+            }, scope.aid);
+        });
         ipcServer.setHandoffStatusExecutor(async (params) => {
             const scope = await resolveHandoffQueryScope(params, 'ec.handoff.status');
             if (!scope.ok)
@@ -3177,6 +3290,7 @@ async function main() {
                         thread: params.thread,
                         targetChatType: params.scope === 'group' ? 'group' : 'private',
                         explicitReturnPolicy: params.returnPolicy,
+                        handoffContext: params.handoffContext,
                         originAuthorization: {
                             actorId: delegation.grant.actorId,
                             channelKey: delegation.grant.channel,
@@ -3803,6 +3917,7 @@ async function main() {
                         ok: true,
                         aid: agent.aid,
                         status: agent.status,
+                        lifecycle: agent.lifecycle ?? null,
                         identity: agent.identity ?? { name: null, description: null },
                         config: {
                             baseagent: agent.config?.baseagent ?? null,
@@ -3879,6 +3994,7 @@ async function main() {
                     handoff: value('--handoff'),
                     name: value('--name'),
                     description: value('--description'),
+                    type: value('--type'),
                     tags,
                     force: argv.includes('--force'),
                 });
@@ -3936,6 +4052,7 @@ async function main() {
                     owners: plan.owners,
                     name: plan.name,
                     description: plan.description,
+                    type: plan.type,
                     tags: plan.tags,
                     force: argv.includes('--force'),
                 };