evolcore 0.0.24 → 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',
@@ -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,
@@ -3663,7 +3777,8 @@ async function main() {
             });
             if (params.targetAid
                 && params.targetAid !== delegation.grant.selfAid
-                && subject.dataScope !== 'daemon') {
+                && subject.dataScope !== 'daemon'
+                && !(operation === 'agent.show' && isManagementRole(subject.role))) {
                 return { ok: false, code: 'SCOPE_MISMATCH', error: 'only the current Agent can be targeted' };
             }
             const decision = authorizeOperation({
@@ -3710,18 +3825,21 @@ async function main() {
             const taskAid = delegation.grant.selfAid;
             const targetAid = sub === 'list'
                 ? undefined
-                : sub === 'show'
-                    ? (argv[2] && !argv[2].startsWith('--') ? argv[2] : taskAid)
-                    : sub === 'reload'
-                        ? (argv[2] && !argv[2].startsWith('--') ? argv[2] : undefined)
-                        : (argv[2] && !argv[2].startsWith('--') ? argv[2] : undefined);
+                : sub === 'persona'
+                    ? taskAid
+                    : sub === 'show'
+                        ? (argv[2] && !argv[2].startsWith('--') ? argv[2] : taskAid)
+                        : sub === 'reload'
+                            ? (argv[2] && !argv[2].startsWith('--') ? argv[2] : undefined)
+                            : (argv[2] && !argv[2].startsWith('--') ? argv[2] : undefined);
             const operation = sub === 'list' ? 'agent.list'
                 : sub === 'show' ? 'agent.show'
-                    : sub === 'new' ? 'agent.create'
-                        : sub === 'enable' ? 'agent.enable'
-                            : sub === 'disable' ? 'agent.disable'
-                                : sub === 'reload' ? 'agent.reload'
-                                    : sub === 'delete' ? 'agent.delete' : undefined;
+                    : sub === 'persona' ? 'agent.persona'
+                        : sub === 'new' ? 'agent.create'
+                            : sub === 'enable' ? 'agent.enable'
+                                : sub === 'disable' ? 'agent.disable'
+                                    : sub === 'reload' ? 'agent.reload'
+                                        : sub === 'delete' ? 'agent.delete' : undefined;
             if (!operation)
                 return fail('INVALID_ARGS', `unsupported managed agent command: ${sub}`);
             if (sub === 'new' && !argv.includes('--non-interactive')) {
@@ -3753,7 +3871,7 @@ async function main() {
                 subject,
                 intent: {
                     operation,
-                    scope: operation === 'agent.show'
+                    scope: operation === 'agent.show' || operation === 'agent.persona'
                         ? 'agent'
                         : operation === 'agent.reload' && targetAid
                             ? 'agent'
@@ -3799,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,
@@ -3809,16 +3928,50 @@ async function main() {
                         },
                         connection: agent.connection ?? null,
                         sessions: agent.sessions ?? { active: 0, last_activity: null },
-                        paths: { config: null, agent_md: null, project: null, data: null },
-                        redacted: true,
+                        paths: subject.dataScope === 'daemon'
+                            ? (agent.paths ?? { config: null, agent_md: null, project: null, data: null })
+                            : { config: null, agent_md: null, project: null, data: null },
+                        ...(subject.dataScope === 'daemon' ? {} : { redacted: true }),
                         ...(agent.createProgress ? { createProgress: agent.createProgress } : {}),
                     } };
             }
+            if (operation === 'agent.persona') {
+                const rawPersonaArgs = argv.slice(2);
+                const hasFormatSuffix = rawPersonaArgs.length >= 2
+                    && rawPersonaArgs.at(-2) === '--format'
+                    && rawPersonaArgs.at(-1) === 'json';
+                const personaArgs = hasFormatSuffix ? rawPersonaArgs.slice(0, -2) : rawPersonaArgs;
+                if (!hasFormatSuffix && rawPersonaArgs.includes('--format')) {
+                    return fail('INVALID_ARGS', 'persona 仅支持末尾的 --format json');
+                }
+                if (personaArgs.length === 2 && personaArgs[0] === '--file') {
+                    return fail('INVALID_ARGS', '托管 persona --file 必须由 CLI 读取后作为文本提交');
+                }
+                const wantsShow = personaArgs.length === 1 && personaArgs[0] === 'show';
+                const text = personaArgs.length === 2 && personaArgs[0] === '--text'
+                    ? personaArgs[1]
+                    : undefined;
+                if (!wantsShow && !(personaArgs.length === 2 && personaArgs[0] === '--text')) {
+                    return fail('INVALID_ARGS', '用法: ec agent persona show | --text <text>');
+                }
+                if (text === undefined && !wantsShow)
+                    return fail('INVALID_ARGS', 'persona --text 缺少参数');
+                const { agentPersona } = await import('./cli/agent.js');
+                const result = await agentPersona(taskAid, wantsShow ? { trustedLocal: true } : { text, trustedLocal: true });
+                if (!result.ok)
+                    return fail(result.code ?? 'INTERNAL', result.error);
+                return { ok: true, result: {
+                        ok: true,
+                        aid: taskAid,
+                        content: result.content,
+                        ...(result.saved ? { saved: true } : {}),
+                    } };
+            }
             if (operation === 'agent.create') {
                 const aid = argv[2] && !argv[2].startsWith('--') ? argv[2] : undefined;
                 if (!aid)
                     return fail('INVALID_ARGS', 'ec agent new requires an AID');
-                const { agentCreateNonInteractive, resolveAgentCreatePlan, validateAgentCreatePlan, parseAgentOwnerArgs } = await import('./cli/agent-create.js');
+                const { agentCreateNonInteractive, resolveAgentCreatePlan, validateAgentCreatePlan, parseAgentOwnerArgs, parseAgentTags } = await import('./cli/agent-create.js');
                 let ownerOptions;
                 try {
                     ownerOptions = parseAgentOwnerArgs(argv);
@@ -3826,6 +3979,13 @@ async function main() {
                 catch (error) {
                     return fail('INVALID_ARGS', error instanceof Error ? error.message : String(error));
                 }
+                let tags;
+                try {
+                    tags = parseAgentTags(value('--tags'));
+                }
+                catch (error) {
+                    return fail('INVALID_ARGS', error instanceof Error ? error.message : String(error));
+                }
                 const plan = resolveAgentCreatePlan({
                     aid,
                     project: value('--project'),
@@ -3834,6 +3994,8 @@ async function main() {
                     handoff: value('--handoff'),
                     name: value('--name'),
                     description: value('--description'),
+                    type: value('--type'),
+                    tags,
                     force: argv.includes('--force'),
                 });
                 const validationError = validateAgentCreatePlan(plan);
@@ -3890,6 +4052,8 @@ async function main() {
                     owners: plan.owners,
                     name: plan.name,
                     description: plan.description,
+                    type: plan.type,
+                    tags: plan.tags,
                     force: argv.includes('--force'),
                 };
                 try {

package/dist/ipc.js

@@ -76,7 +76,7 @@ function requiresLocalControlToken(cmd) {
     // Managed bootstrap completion is authenticated by the session delegation
     // ticket. A standalone CLI invocation still needs the daemon control token.
     return LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
-        || (cmd.type === 'evolagent.bootstrapComplete' && typeof cmd.sessionId !== 'string');
+        || ((cmd.type === 'evolagent.bootstrapComplete' || cmd.type === 'diag') && typeof cmd.sessionId !== 'string');
 }
 export function summarizeMonitorAgents(agents, aids) {
     const connectedAgents = new Set(aids.filter(aid => aid.status === 'connected').map(aid => aid.agentName || aid.aid));
@@ -116,7 +116,10 @@ export class IpcServer {
     taskRuntimeContextProvider;
     codexPreToolUseExecutor;
     aunMsgSender;
+    diagExecutor;
+    menuClientExecutor;
     handoffReturnExecutor;
+    handoffRecoverReturnExecutor;
     handoffStatusExecutor;
     handoffListExecutor;
     handoffTraceExecutor;
@@ -135,6 +138,8 @@ export class IpcServer {
     controlToken;
     daemonRuntimeEpoch;
     remoteAccessService = remoteAccessService;
+    /** Current daemon owner used to bind locally issued ECWeb pairing codes. */
+    remoteAccessOwnerProvider;
     // CPU 占用追踪：IPC handler 是一次性同步调用，无法在响应里做 200ms 异步采样，
     // 故用后台 1s interval 累积 process.cpuUsage() 增量，handler 直接读最近值。
     // procCpuPercent = 本 daemon 进程占单核的百分比（可 >100% 仅当多核，已 clamp 到 100）；
@@ -189,6 +194,15 @@ export class IpcServer {
     setRemoteAccessService(service) {
         this.remoteAccessService = service;
     }
+    /**
+     * Supply the live process-level owner for pairing requests that do not carry
+     * an explicit owner (for example `ec watch web` and the ECWeb supervisor).
+     * The provider is evaluated for every request so owner updates take effect
+     * without restarting ECWeb.
+     */
+    setRemoteAccessOwnerProvider(provider) {
+        this.remoteAccessOwnerProvider = provider;
+    }
     /** Set the process-lifetime marker used to reject stale managed children. */
     setDaemonRuntimeEpoch(epoch) {
         this.daemonRuntimeEpoch = epoch;
@@ -362,10 +376,15 @@ export class IpcServer {
     setAunMsgSender(sender) {
         this.aunMsgSender = sender;
     }
+    setDiagExecutor(executor) { this.diagExecutor = executor; }
+    setMenuClientExecutor(executor) { this.menuClientExecutor = executor; }
     /** Inject internal handoff result return executor for `ec handoff return`. */
     setHandoffReturnExecutor(executor) {
         this.handoffReturnExecutor = executor;
     }
+    setHandoffRecoverReturnExecutor(executor) {
+        this.handoffRecoverReturnExecutor = executor;
+    }
     setHandoffStatusExecutor(executor) {
         this.handoffStatusExecutor = executor;
     }
@@ -807,6 +826,10 @@ export class IpcServer {
             };
         }
         switch (cmd.type) {
+            case 'diag':
+                return this.diagExecutor ? this.diagExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', message: '诊断入口未配置' };
+            case 'menu-client.request':
+                return this.menuClientExecutor ? this.menuClientExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', error: 'Managed Menu client is not configured' };
             case 'model.catalog': {
                 if ((cmd.self !== undefined && typeof cmd.self !== 'string')
                     || (cmd.baseagent !== undefined && !['claude', 'codex', 'ecagent', 'gemini'].includes(cmd.baseagent))) {
@@ -887,7 +910,9 @@ export class IpcServer {
                 });
             }
             case 'remote-auth.pair-code': {
-                const pair = this.remoteAccessService.getPairingCode(typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy : undefined);
+                const requestedOwner = typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy.trim() : undefined;
+                const authorizedBy = requestedOwner || this.remoteAccessOwnerProvider?.();
+                const pair = this.remoteAccessService.getPairingCode(authorizedBy);
                 return { ok: true, ...pair };
             }
             case 'remote-auth.issue-local': {
@@ -1094,6 +1119,10 @@ export class IpcServer {
                 return { ok: true, context };
             }
             case 'aun-msg-send': {
+                if (cmd.handoffContext !== undefined && (typeof cmd.handoffContext !== 'string'
+                    || !cmd.handoffContext.trim() || cmd.handoffContext.length > 64 * 1024 || cmd.scope === 'group')) {
+                    return { ok: false, code: 'INVALID_HANDOFF_CONTEXT', error: 'Private handoff context must contain 1–65536 characters' };
+                }
                 if (!this.aunMsgSender)
                     return { ok: false, error: 'aun msg sender not configured' };
                 if (!cmd.aid || typeof cmd.aid !== 'string')
@@ -1148,6 +1177,7 @@ export class IpcServer {
                         encrypt: typeof cmd.encrypt === 'boolean' ? cmd.encrypt : undefined,
                         thread: typeof cmd.thread === 'string' ? cmd.thread : undefined,
                         returnPolicy: cmd.returnPolicy === 'required' || cmd.returnPolicy === 'none' ? cmd.returnPolicy : undefined,
+                        handoffContext: cmd.handoffContext,
                         originSessionId: typeof cmd.originSessionId === 'string' ? cmd.originSessionId : undefined,
                         originMessageId: typeof cmd.originMessageId === 'string' ? cmd.originMessageId : undefined,
                         delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
@@ -1177,6 +1207,28 @@ export class IpcServer {
                     return { ok: false, error: e?.message || String(e) };
                 }
             }
+            case 'handoff-recover-return': {
+                if (!this.handoffRecoverReturnExecutor)
+                    return { ok: false, error: 'handoff recovery not configured' };
+                if (typeof cmd.sessionId !== 'string' || !cmd.sessionId)
+                    return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'missing sessionId' };
+                if (typeof cmd.handoffId !== 'string' || !cmd.handoffId)
+                    return { ok: false, code: 'INVALID_HANDOFF_ID', error: 'missing handoff_id' };
+                if (typeof cmd.content !== 'string')
+                    return { ok: false, code: 'HANDOFF_RETURN_CONTENT_REQUIRED', error: 'missing content' };
+                try {
+                    return await this.handoffRecoverReturnExecutor({
+                        sessionId: cmd.sessionId,
+                        handoffId: cmd.handoffId,
+                        content: cmd.content,
+                        delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                        delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                    });
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message || String(e) };
+                }
+            }
             case 'handoff-status': {
                 if (!this.handoffStatusExecutor)
                     return { ok: false, code: 'HANDOFF_STATUS_UNAVAILABLE', error: 'handoff status not configured' };

package/dist/response-system/engines/v1/proactive-flow.js

@@ -12,7 +12,18 @@ const STATE_KEY = 'proactive';
 const TOOL_REPORT_INTERVAL = 10;
 const SEND_RECEIPT_RE = /["']?(?:message[_ -]?id|handoff[_ -]?id)["']?\s*[:=]\s*["']?([A-Za-z0-9][A-Za-z0-9._:-]*)/gi;
 const HANDOFF_TEXT_RECEIPT_RE = /\bhandoff\s+(h-[A-Za-z0-9._-]+)/i;
-function hasSuccessfulSendReceipt(result, isError) {
+const RETURN_CONTENT_RE = /["']?(?:return[_ -]?content|returnContent)["']?\s*[:=]\s*["']?([^}\n,]*)/i;
+function hasRequiredReturnFlag(toolInput) {
+    if (!toolInput || typeof toolInput !== 'object')
+        return false;
+    const input = toolInput;
+    const commandValues = ['command', 'cmd', 'script'].flatMap(key => {
+        const value = input[key];
+        return typeof value === 'string' ? [value] : [];
+    });
+    return commandValues.some(command => /(?:^|\s)--return(?:=|\s+)['"]?required(?:['"]?)(?=\s|$)/i.test(command));
+}
+function hasSuccessfulSendReceipt(result, isError, requiresBusinessReturn = false) {
     if (isError === true)
         return false;
     const hasReceiptValue = (value) => {
@@ -40,6 +51,41 @@ function hasSuccessfulSendReceipt(result, isError) {
     };
     if (hasExplicitFailure(result, new Set()))
         return false;
+    const isBusinessReturn = (value) => {
+        if (typeof value !== 'string')
+            return false;
+        const normalized = value.trim();
+        if (!normalized || /^(?:null|undefined|-)$/.test(normalized))
+            return false;
+        // Contact admission/refusal is a real reply, but it is not task completion.
+        if (/(?:当前不接受陌生人消息|可发送\s*\/request|contact\s+(?:required|request)|stranger message)/i.test(normalized))
+            return false;
+        return true;
+    };
+    const inspectBusinessReturn = (value, seen) => {
+        if (!value || typeof value !== 'object')
+            return false;
+        if (seen.has(value))
+            return false;
+        seen.add(value);
+        if (Array.isArray(value))
+            return value.some(item => inspectBusinessReturn(item, seen));
+        for (const [key, item] of Object.entries(value)) {
+            if ((key === 'return_content' || key === 'returnContent') && isBusinessReturn(item))
+                return true;
+            if (inspectBusinessReturn(item, seen))
+                return true;
+        }
+        return false;
+    };
+    if (requiresBusinessReturn) {
+        if (inspectBusinessReturn(result, new Set()))
+            return true;
+        const returnText = typeof result === 'string'
+            ? result.match(RETURN_CONTENT_RE)?.[1]
+            : undefined;
+        return isBusinessReturn(returnText);
+    }
     const inspect = (value, seen) => {
         if (!value || typeof value !== 'object')
             return false;
@@ -153,6 +199,11 @@ export const proactiveFlow = {
                 // Codex only invokes this hook for local tool paths. Hosted tools stay
                 // enabled and do not satisfy or clear the pending first-send gate.
                 const isSendCommand = ctx.isSendCommand(toolName, toolInput);
+                if (!isSendCommand && ((state.firstSendRequired && !state.firstToolDone) || state.toolReportPending)) {
+                    const sendFailure = ctx.describeSendCommandFailure?.(toolName, toolInput);
+                    if (sendFailure)
+                        return { block: true, policyCode: 'proactive_send_invalid', reason: sendFailure };
+                }
                 if (state.firstSendRequired && !state.firstToolDone) {
                     if (!isSendCommand) {
                         const cmdHint = state.chatType === 'group' ? 'ec group send' : 'ec msg send';
@@ -221,7 +272,13 @@ export const proactiveFlow = {
             return;
         if (!ctx.isSendCommand(ctx.toolName, ctx.toolInput))
             return;
-        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error))
+        const requiresBusinessReturn = hasRequiredReturnFlag(ctx.toolInput)
+            && (typeof ctx.result === 'string'
+                ? HANDOFF_TEXT_RECEIPT_RE.test(ctx.result)
+                : !!ctx.result && typeof ctx.result === 'object'
+                    && ('handoff_id' in ctx.result || 'handoffId' in ctx.result));
+        HANDOFF_TEXT_RECEIPT_RE.lastIndex = 0;
+        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error, requiresBusinessReturn))
             return;
         if (state.firstSendRequired && !state.firstToolDone)
             state.firstToolDone = true;