evolcore 0.0.24 → 0.0.26

package/dist/cli/aun-commands.js

@@ -116,7 +116,7 @@ async function runManagedAid(args, formatJson) {
     if (!parsed.ok)
         failManagedAid(formatJson, parsed.code, parsed.reason);
     const runtime = await readBestTaskRuntimeContext();
-    const requiresSelfAid = parsed.command.kind === 'show' || parsed.command.kind === 'agentmd.put';
+    const requiresSelfAid = parsed.command.kind === 'show' || parsed.command.kind === 'agentmd.put' || parsed.command.kind === 'avatar';
     if (requiresSelfAid && runtime?.selfAid && parsed.command.aid !== runtime.selfAid.replace(/^@/, '')) {
         failManagedAid(formatJson, 'SCOPE_MISMATCH', `托管任务只能操作当前 self AID：${runtime.selfAid}`);
     }
@@ -155,6 +155,22 @@ async function runManagedAid(args, formatJson) {
                 console.log(JSON.stringify({ ok: true, aid: response.result.aid, path: response.result.path }, null, 2));
             else
                 console.log('✓ agent.md 已发布');
+            return;
+        case 'avatar':
+            if (formatJson)
+                console.log(JSON.stringify({
+                    ok: true,
+                    aid: response.result.aid,
+                    avatar: response.result.avatar,
+                    objectKey: response.result.objectKey,
+                    sha256: response.result.sha256,
+                    mime: response.result.mime,
+                    width: response.result.width,
+                    height: response.result.height,
+                    aspectRatio: response.result.aspectRatio,
+                }, null, 2));
+            else
+                console.log(`✓ 头像已更新${response.result.avatar ? `: ${response.result.avatar}` : ''}${response.result.sha256 ? ` (sha256: ${response.result.sha256})` : ''}`);
     }
 }
 function failManagedGroup(formatJson, code, error) {
@@ -346,6 +362,7 @@ Commands:
   lookup <aid>      远程探测 AID（是否存在 + 网关 + agent.md）
   agentmd put <aid> 读本地 agent.md → 签名 → 上传
   agentmd get <aid> 下载 agent.md → 验签 → 本地持久化
+  avatar <aid> --file <path> | --url <https-url>  上传头像并更新 agent.md
 
 Options:
   --format json     输出 JSON 格式
@@ -795,7 +812,56 @@ Options:
         console.error(`未知子命令: aid agentmd ${verb ?? ''}\n用法: ec aid agentmd [put|get] <aid>`);
         process.exit(1);
     }
-    console.error(`未知子命令: ${sub}\n用法: ec aid [list|show|new|delete|lookup|agentmd] <aid>`);
+    if (sub === 'avatar') {
+        const aid = args[1];
+        const fileIndex = args.indexOf('--file');
+        const urlIndex = args.indexOf('--url');
+        const filePath = fileIndex >= 0 ? args[fileIndex + 1] : undefined;
+        const url = urlIndex >= 0 ? args[urlIndex + 1] : undefined;
+        if (wantsHelp(args)) {
+            console.log('用法: ec aid avatar <aid> (--file <path> | --url <https-url>) [--format json]');
+            return;
+        }
+        const sourceCount = (fileIndex >= 0 ? 1 : 0) + (urlIndex >= 0 ? 1 : 0);
+        if (!aid || sourceCount !== 1 || (fileIndex >= 0 && (!filePath || filePath.startsWith('-')))
+            || (urlIndex >= 0 && (!url || url.startsWith('-'))) || (fileIndex >= 0 && fileIndex !== 2) || (urlIndex >= 0 && urlIndex !== 2)
+            || args.filter(value => value === '--file').length > 1 || args.filter(value => value === '--url').length > 1 || !isValidAid(aid)
+            || (args.includes('--format') && !formatJson) || (args.includes('--format') && args.filter(value => value === '--format').length !== 1)) {
+            const usage = '用法: ec aid avatar <aid> (--file <path> | --url <https-url>) [--format json]';
+            if (formatJson)
+                console.log(JSON.stringify({ ok: false, code: 'INVALID_ARGUMENT', error: usage }, null, 2));
+            else
+                console.error(usage);
+            process.exit(1);
+        }
+        const { uploadAvatarFile, uploadAvatarUrl } = await import('../utils/avatar-upload.js');
+        const result = filePath
+            ? await uploadAvatarFile(aid, filePath, { aunPath })
+            : await uploadAvatarUrl(aid, url, { aunPath });
+        if (!result.ok) {
+            if (formatJson)
+                console.log(JSON.stringify({ ok: false, code: result.code, error: result.error }, null, 2));
+            else
+                console.error(`❌ 头像上传失败: ${result.error}`);
+            process.exit(1);
+        }
+        if (formatJson)
+            console.log(JSON.stringify({
+                ok: true,
+                aid,
+                avatar: result.publicUrl,
+                objectKey: result.objectKey,
+                sha256: result.sha256,
+                mime: result.mime,
+                width: result.width,
+                height: result.height,
+                aspectRatio: result.aspectRatio,
+            }, null, 2));
+        else
+            console.log(`✓ 头像已更新${result.publicUrl ? `: ${result.publicUrl}` : ''}${result.sha256 ? ` (sha256: ${result.sha256})` : ''}`);
+        return;
+    }
+    console.error(`未知子命令: ${sub}\n用法: ec aid [list|show|new|delete|lookup|agentmd|avatar] <aid>`);
     process.exit(1);
 }
 // ==================== RPC ====================
@@ -1079,6 +1145,7 @@ Commands:
 
 Options:
   --text-from-file <path>  从文件读取文本（UTF-8），用于超长消息或避免 Shell 转义
+  --handoff-context <text>  仅托管会话：为目标会话补充本地上下文，不发给对端
   --app <name>          指定应用 slot（独立消费通道，不影响 daemon）
   --aun-path <path>     指定 AUN keystore 根
   --format json         输出 JSON 格式
@@ -1397,7 +1464,7 @@ Options:
                 process.stderr.write('  ⏫ finalizing upload...\n');
             }
         };
-        const result = await msgSend({ from, to, body, encrypt, thread, returnPolicy: returnPolicyRaw, onUploadProgress, ...commonOpts });
+        const result = await msgSend({ from, to, body, encrypt, thread, returnPolicy: returnPolicyRaw, handoffContext: getArgValue(args, '--handoff-context'), onUploadProgress, ...commonOpts });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -1622,7 +1689,7 @@ Options:
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
   --group-id <aid>      指定自定义群 AID（仅 create）
-  --member-type <type>  定向邀请成员类型：human|ai（仅 invite）
+  --member-type <type>  定向邀请成员类型：human|agent（仅 invite）
   --                    end-of-options：其后所有参数按正文处理
                         （用于发送恰好等于某 flag 的文本，如 send a g -- --encrypt）
 
@@ -2226,8 +2293,8 @@ Options:
             }
         }
         const memberType = getArgValue(args, '--member-type');
-        if (memberType !== undefined && memberType !== 'human' && memberType !== 'ai') {
-            console.error('❌ --member-type 必须是 human 或 ai');
+        if (memberType !== undefined && memberType !== 'human' && memberType !== 'agent') {
+            console.error('❌ --member-type 必须是 human 或 agent');
             process.exit(1);
         }
         const result = await groupInvite({ from, groupId, members, memberType: memberType, ...commonOpts });
@@ -2406,7 +2473,7 @@ const VALUE_FLAGS = new Set([
     '--as', '--content-type', '--mention', '--visibility', '--join-mode',
     '--group-id', '--name', '--message', '--answer', '--page', '--size',
     '--member-type',
-    '--aun-path', '--thread', '--return',
+    '--aun-path', '--thread', '--return', '--handoff-context',
 ]);
 const BOOLEAN_FLAGS = new Set([
     '--encrypt', '--no-encrypt', '--mention-all',

package/dist/cli/config.js

@@ -1,7 +1,7 @@
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import { initConfigManager } from '../config/config-manager.js';
 import { resolveConfigCommand } from '../config/resolved-config-op.js';
-import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommand, } from '../config/config-operation-service.js';
+import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommandAsync, } from '../config/config-operation-service.js';
 import { ipcQuery } from '../ipc.js';
 import { resolvePaths } from '../paths.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
@@ -31,6 +31,7 @@ function getResultPayload(result) {
         ...(result.source ? { source: result.source } : {}),
         ...(result.schemaDefault ? { schemaDefault: true } : {}),
         ...(result.note ? { note: result.note } : {}),
+        ...(result.roleDetails ? { role: result.roleDetails } : {}),
     };
 }
 function getResultLine(result) {
@@ -39,7 +40,10 @@ function getResultLine(result) {
         : !result.source
             ? `${result.field} = ${JSON.stringify(result.value)} (${result.scope})`
             : `${result.field} = ${JSON.stringify(result.value)} [source: ${result.source.target}]`;
-    return result.note ? `${head}\n  ↳ ${result.note}` : head;
+    const role = result.roleDetails
+        ? `\n  role: explicit=${JSON.stringify(result.roleDetails.explicitRole)} effective=${JSON.stringify(result.roleDetails.effectiveRole)} [${result.roleDetails.effectiveRoleSource}]`
+        : '';
+    return `${head}${role}${result.note ? `\n  ↳ ${result.note}` : ''}`;
 }
 function renderConfigExecution(result, formatJson) {
     if (!result.ok)
@@ -56,6 +60,7 @@ function renderConfigExecution(result, formatJson) {
                 value: result.value,
                 scope: result.scope,
                 file: result.file,
+                ...(result.roleDetails ? { role: result.roleDetails } : {}),
             }, () => `Set ${result.field} = ${JSON.stringify(result.value)} [${result.scope}]`);
         case 'unset':
             return emit(formatJson, {
@@ -63,6 +68,7 @@ function renderConfigExecution(result, formatJson) {
                 field: result.field,
                 removed: result.removed,
                 ...(result.removed ? { scope: result.scope } : {}),
+                ...(result.roleDetails ? { role: result.roleDetails } : {}),
             }, () => result.removed ? `Removed ${result.field} from ${result.scope}` : `${result.field} was not set`);
         case 'show':
             return emit(formatJson, { ok: true, scope: result.scope, configs: result.configs }, () => JSON.stringify(result.configs, null, 2));
@@ -172,18 +178,18 @@ function renderBatchGet(results, formatJson) {
     if (!allOk)
         process.exit(1);
 }
-function runDirectBatchGet(fields, rest, formatJson) {
-    const results = fields.map(field => {
+async function runDirectBatchGet(fields, rest, formatJson) {
+    const results = await Promise.all(fields.map(async (field) => {
         const resolved = resolveConfigCommand(['config', 'get', field, ...rest]);
         if (!resolved.ok)
             return { ok: false, field, code: resolved.code, error: resolved.reason };
-        const result = executeResolvedConfigCommand(resolved.command);
+        const result = await executeResolvedConfigCommandAsync(resolved.command, { role: 'owner' });
         if (!result.ok)
             return { ok: false, field, code: result.code, error: result.error };
         if (result.subcommand === 'get')
             return result;
         return { ok: false, field, code: 'UNEXPECTED_RESULT', error: `config get ${field} produced a non-get result` };
-    });
+    }));
     renderBatchGet(results, formatJson);
 }
 async function runManagedBatchGet(fields, rest, formatJson) {
@@ -215,6 +221,11 @@ Global commands:
 Selectors:
   --self <aid> [--peer <peerKey>] | --default | --process
 
+Relation role (AUN peer AID):
+  get role --self <aid> --peer <peer-aid>
+  set role <role-id> --self <aid> --peer <peer-aid>
+  unset role --self <aid> --peer <peer-aid>
+
 Output:
   --format json`;
 export async function cmdConfig(args) {
@@ -241,13 +252,21 @@ export async function cmdConfig(args) {
         fail(formatJson, 'SCHEMA_INIT_FAILED', error instanceof Error ? error.message : String(error));
     }
     if (isBatchGet) {
-        runDirectBatchGet(batchGet.fields, batchGet.rest, formatJson);
+        await runDirectBatchGet(batchGet.fields, batchGet.rest, formatJson);
         return;
     }
     const resolved = resolveConfigCommand(['config', ...args]);
     if (!resolved.ok)
         fail(formatJson, resolved.code, resolved.reason);
-    renderConfigExecution(executeResolvedConfigCommand(resolved.command, {
+    renderConfigExecution(await executeResolvedConfigCommandAsync(resolved.command, {
         role: process.env[AUTHENTICATED_CONFIG_ROLE_ENV],
+        roleContext: {
+            self: resolved.command.self || '',
+            actorRole: process.env[AUTHENTICATED_CONFIG_ROLE_ENV] || 'owner',
+            actorRoleSource: 'local-cli',
+            isDaemonOwner: false,
+            fromControlChannel: false,
+            aunAvailable: true,
+        },
     }), formatJson);
 }

package/dist/cli/contact.js

@@ -1,4 +1,5 @@
 import { resolvePaths } from '../paths.js';
+import { loadAllAgents } from '../config-store.js';
 import { executeResolvedContactCommand, resolveContactCommand, } from '../config/contact-operation-service.js';
 import { ipcQuery } from '../ipc.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
@@ -14,9 +15,17 @@ export async function cmdContact(args) {
         output(result, json);
         return;
     }
-    const resolved = resolveContactCommand(args);
-    if (!resolved.ok)
-        fail(resolved.reason, resolved.code);
+    if (!args.includes('--self') && isListCommand(args) && !process.env.EVOLCORE_SELF_AID?.trim()) {
+        output(await executeAggregateList(args), json);
+        return;
+    }
+    const resolved = resolveContactCommand(withDefaultSelf(args));
+    if (!resolved.ok) {
+        const message = resolved.code === 'INVALID_SELF' && !args.includes('--self')
+            ? `${resolved.reason}; multiple local Agents are configured, add --self <agent-aid>`
+            : resolved.reason;
+        fail(message, resolved.code);
+    }
     const result = await executeResolvedContactCommand(resolved.command);
     if (!result.ok)
         fail(result.error, result.code, result.data);
@@ -62,11 +71,59 @@ function printHelp() {
   ec contact add <primaryId> --self <agent-aid>
   ec contact block <primaryId> --self <agent-aid>
   ec contact unblock <primaryId> --self <agent-aid>
-  ec contact list --blocked --self <agent-aid>
+  ec contact list --blocked [--self <agent-aid>]
+  ec contact list --pending [--self <agent-aid>]
+  ec contact list --all [--self <agent-aid>]
+  ec contact approve <primaryId> --request-id <id> [--self <agent-aid>]
+  ec contact reject <primaryId> --request-id <id> [--self <agent-aid>]
+  ec contact block-request <primaryId> --request-id <id> [--self <agent-aid>]
 
 Options:
-  --self <agent-aid>  必填，本端 agent AID
-  --blocked           list 必填，仅列出已拉黑联系人
+  --self <agent-aid>  本端 agent AID；省略时从当前运行环境推断
+  --blocked           仅列出已拉黑联系人
+  --pending           仅列出待审核联系人申请
+  --all               列出所有联系人及状态
+  --request-id <id>   联系人申请 ID（审批命令必填）
+  --contact-revision <revision>  申请审批时使用的联系人版本（可选）
   --format json       输出 JSON
   --help, -h          显示帮助`);
 }
+function withDefaultSelf(args) {
+    if (args.includes('--self'))
+        return args;
+    const selfAid = resolveStandaloneSelfAid();
+    return selfAid ? [...args, '--self', selfAid] : args;
+}
+function isListCommand(args) {
+    return args[0] === 'list';
+}
+async function executeAggregateList(args) {
+    const agents = loadAllAgents().agents.map(agent => agent.aid).filter(Boolean).sort();
+    const results = [];
+    for (const aid of agents) {
+        const resolved = resolveContactCommand([...args, '--self', aid]);
+        if (!resolved.ok)
+            fail(resolved.reason, resolved.code);
+        const result = await executeResolvedContactCommand(resolved.command);
+        if (!result.ok)
+            fail(result.error, result.code, result.data);
+        results.push(result);
+    }
+    return {
+        ok: true,
+        operation: args.includes('--blocked') ? 'list-blocked'
+            : args.includes('--pending') ? 'list-pending' : 'list-all',
+        scope: 'all-agents',
+        agents: results,
+    };
+}
+/** Resolve the local Agent identity for standalone CLI commands. */
+export function resolveStandaloneSelfAid() {
+    const runtimeAid = process.env.EVOLCORE_SELF_AID?.trim();
+    if (runtimeAid)
+        return runtimeAid;
+    const agents = loadAllAgents().agents
+        .map(agent => agent.aid)
+        .filter(Boolean);
+    return agents.length === 1 ? agents[0] : undefined;
+}

package/dist/cli/daemon-commands.js

@@ -28,6 +28,7 @@ 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 { computeBuildId } from '../utils/evolcore-version.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, ensureCodexManagedHook, runCodexHookLaunchDiagnostic, } from '../agents/codex/diagnostics.js';
@@ -312,7 +313,10 @@ export async function runUpgradeChecks(upgradeFn = signal => tryUpgrade({ signal
                 clearTimeout(timer);
         }
     };
-    const upgrade = await runWithTimeout('EvolCore', upgradeFn);
+    const [upgrade, ecwebUpgrade] = await Promise.all([
+        runWithTimeout('EvolCore', upgradeFn),
+        runWithTimeout(WEB_PACKAGE_NAME, ecwebUpgradeFn),
+    ]);
     switch (upgrade.status) {
         case 'upgraded':
             console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
@@ -329,7 +333,6 @@ export async function runUpgradeChecks(upgradeFn = signal => tryUpgrade({ signal
             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}`);
@@ -769,21 +772,50 @@ export async function cmdStart(opts = {}) {
     };
     setTimeout(checkReady, 1000);
 }
-async function stopPid(pid, gracefulRequested = false) {
+function isPidReused(pid, expectedStartedAt) {
+    if (expectedStartedAt === undefined)
+        return false;
+    const actualStartedAt = getProcessStartTime(pid);
+    return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
+}
+function reportPidReused(pid) {
+    console.log(`ℹ EvolCore PID ${pid} no longer refers to the recorded process; treating it as stopped`);
+}
+async function stopPid(pid, gracefulRequested = false, expectedStartedAt) {
     console.log(`🛑 Stopping EvolCore (PID: ${pid})...`);
+    if (isPidReused(pid, expectedStartedAt)) {
+        reportPidReused(pid);
+        return true;
+    }
     if (!gracefulRequested)
         platform.killProcess(pid);
     if (await platform.waitForProcessExit(pid, gracefulRequested ? 30_000 : 10_000)) {
         console.log('✓ EvolCore stopped');
         return true;
     }
-    console.log(`⚠ EvolCore PID ${pid} did not exit gracefully; forcing termination...`);
+    if (isPidReused(pid, expectedStartedAt)) {
+        reportPidReused(pid);
+        return true;
+    }
+    const state = platform.getProcessState(pid);
+    const stateSuffix = state ? ` (state=${state})` : '';
+    console.log(`⚠ EvolCore PID ${pid} did not exit gracefully${stateSuffix}; forcing termination...`);
+    if (isPidReused(pid, expectedStartedAt)) {
+        reportPidReused(pid);
+        return true;
+    }
     platform.killProcess(pid, true);
     if (await platform.waitForProcessExit(pid, 5_000)) {
         console.log('✓ EvolCore stopped (forced)');
         return true;
     }
-    console.error(`❌ EvolCore PID ${pid} is still running; restart aborted`);
+    if (isPidReused(pid, expectedStartedAt)) {
+        reportPidReused(pid);
+        return true;
+    }
+    const finalState = platform.getProcessState(pid);
+    const finalStateSuffix = finalState ? ` (state=${finalState})` : '';
+    console.error(`❌ EvolCore PID ${pid} is still running${finalStateSuffix}; restart aborted`);
     return false;
 }
 function isRuntimeOrphan(orphan, currentHome = resolveRoot()) {
@@ -813,13 +845,14 @@ export async function cmdStop() {
         return;
     }
     const pids = new Set([...aliveMains.map(entry => entry.record.pid), ...runtimeOrphans.map(orphan => orphan.pid)]);
+    const expectedStarts = new Map(aliveMains.map(entry => [entry.record.pid, entry.record.startedAt]));
     if (runtimeOrphans.length > 0) {
         console.log(`⚠ 检测到未登记的 EvolCore 进程，将一并停止: ${runtimeOrphans.map(orphan => orphan.pid).join(', ')}`);
     }
     const gracefulPid = ping && pids.has(ping.pid)
         ? await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec stop', pids)
         : null;
-    const stopped = await Promise.all([...pids].map(pid => stopPid(pid, pid === gracefulPid)));
+    const stopped = await Promise.all([...pids].map(pid => stopPid(pid, pid === gracefulPid, expectedStarts.get(pid))));
     if (stopped.some(result => !result)) {
         process.exitCode = 1;
         return;
@@ -836,11 +869,13 @@ export async function cmdRestart(opts = {}) {
     if (!ensureCodexHookBeforeLifecycle())
         return;
     const initialStatus = scanInstances();
-    const initialOrphans = findOrphanProcesses();
-    const initialRuntimeOrphans = initialOrphans.filter(orphan => isRuntimeOrphan(orphan));
     const socketPath = resolvePaths().socket;
     const ping = await probeDaemon(socketPath);
     if (ping && !hasVisibleDaemonPid(initialStatus, ping)) {
+        // Only pay for a cross-host process-table scan when the IPC PID is not
+        // present in our registry. This is the exceptional PID-namespace case;
+        // healthy restarts no longer scan every Node process before stopping.
+        const initialRuntimeOrphans = findOrphanProcesses().filter(orphan => isRuntimeOrphan(orphan));
         if (await tryDelegatedDaemonRestart(socketPath))
             return;
         if (initialRuntimeOrphans.length === 0 && rejectPidIsolatedLifecycle('restart', initialStatus, ping))
@@ -848,13 +883,13 @@ export async function cmdRestart(opts = {}) {
     }
     // 构建交给 restart-monitor：它在 daemon 停止之后才编译，dist/ 不会被活进程
     // 占用，失败还能回滚到上一份产物。这里再编译一次会落在事务保护之外。
-    // Keep restart behavior identical to startup: both paths use one upgrade
-    // check implementation and continue when an upgrade is unavailable.
-    await runUpgradeChecks();
+    // restart-monitor owns upgrade checks. Running them here as well caused a
+    // normal restart to perform every registry lookup twice, and in installed
+    // mode could race the monitor while it was preparing its rollback point.
     if (!requireCompletedDataMigration(resolveRoot(), 'restart'))
         return;
     // 停止所有活 main 进程（可能不止一个）
-    const status = scanInstances();
+    const status = initialStatus;
     const aliveMains = status.mains.filter(m => m.alive);
     if (aliveMains.length > 0) {
         if (aliveMains.length > 1) {
@@ -865,7 +900,7 @@ export async function cmdRestart(opts = {}) {
         const gracefulPid = currentPing && mainPids.has(currentPing.pid)
             ? await requestDaemonShutdown(socketPath, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec restart', mainPids)
             : null;
-        const stopped = await Promise.all(aliveMains.map(m => stopPid(m.record.pid, m.record.pid === gracefulPid)));
+        const stopped = await Promise.all(aliveMains.map(m => stopPid(m.record.pid, m.record.pid === gracefulPid, m.record.startedAt)));
         if (stopped.some(result => !result)) {
             console.error('❌ Restart aborted because an existing EvolCore process could not be stopped');
             process.exitCode = 1;
@@ -881,7 +916,8 @@ export async function cmdRestart(opts = {}) {
         return;
     }
     // 孤儿处理：同 HOME/同安装包的孤儿属于本运行时，先确认退出再替换；
-    // 跨 HOME 的孤儿只在 --clear 时 kill，否则仅警告。
+    // 跨 HOME 的孤儿只在 --clear 时 kill，否则仅警告。findOrphanProcesses
+    // 在 Windows 上需要一次 CIM 查询；保留一个快照，避免同一阶段重复扫描。
     {
         const orphans = findOrphanProcesses();
         const confirmedTestDaemons = orphans.filter(o => o.confirmedTestDaemon);
@@ -890,7 +926,7 @@ export async function cmdRestart(opts = {}) {
             console.log(`☠ 已清理 ${killed.length} 个泄漏的测试 daemon: ${killed.join(', ')}`);
             await sleep(500);
         }
-        const runtimeOrphans = findOrphanProcesses().filter(o => isRuntimeOrphan(o));
+        const runtimeOrphans = orphans.filter(o => isRuntimeOrphan(o));
         if (runtimeOrphans.length > 0) {
             console.log(`⚠ 检测到未登记的 EvolCore 进程，将一并停止: ${runtimeOrphans.map(o => o.pid).join(', ')}`);
             const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
@@ -906,13 +942,9 @@ export async function cmdRestart(opts = {}) {
             }
             await sleep(500);
         }
-        const remainingRuntimeOrphans = findOrphanProcesses().filter(o => isRuntimeOrphan(o));
-        if (remainingRuntimeOrphans.length > 0) {
-            console.error(`❌ Restart aborted: EvolCore process still running (PID: ${remainingRuntimeOrphans.map(o => o.pid).join(', ')})`);
-            process.exitCode = 1;
-            return;
-        }
-        const otherHome = findOrphanProcesses().filter(o => !o.confirmedTestDaemon && !isRuntimeOrphan(o));
+        // stopPid() already waited for every runtime orphan above, so avoid a
+        // second scan before handling cross-HOME records.
+        const otherHome = orphans.filter(o => !o.confirmedTestDaemon && !isRuntimeOrphan(o));
         if (opts.clear && otherHome.length > 0) {
             const killed = killOrphans(otherHome);
             console.log(`☠ 已 SIGKILL ${killed.length} 个跨 HOME 孤儿进程: ${killed.join(', ')}`);
@@ -921,6 +953,14 @@ export async function cmdRestart(opts = {}) {
         else if (otherHome.length > 0) {
             reportOrphans(otherHome);
         }
+        // Keep the post-stop ownership guard: a process that appeared during the
+        // cleanup window must still block replacement.
+        const remainingRuntimeOrphans = findOrphanProcesses().filter(o => isRuntimeOrphan(o));
+        if (remainingRuntimeOrphans.length > 0) {
+            console.error(`❌ Restart aborted: EvolCore process still running (PID: ${remainingRuntimeOrphans.map(o => o.pid).join(', ')})`);
+            process.exitCode = 1;
+            return;
+        }
     }
     // 只清理 EvolCore 自己登记的 codex app-server，不能影响桌面端实例。
     {
@@ -955,8 +995,7 @@ export async function cmdRestart(opts = {}) {
         process.exitCode = 1;
         return;
     }
-    console.log('🔄 Restart monitor started, waiting for service to come back online...');
-    await sleep(2000);
+    console.log('🔄 Restart monitor started; service is coming back online in the background...');
     // 代码统计（开发环境）
     if (path.normalize(resolveRoot()) === path.normalize(getPackageRoot())) {
         console.log('');
@@ -1125,6 +1164,7 @@ export async function cmdStatus() {
     const p = resolvePaths();
     const status = scanInstances();
     const aliveMains = status.mains.filter(m => m.alive);
+    const aliveRestartMonitors = status.restartMonitors.filter(m => m.alive);
     // Start all read-only daemon queries together. On a busy Windows host each
     // query can otherwise wait behind the same IPC/event-loop delay and make the
     // total `ec status` time the sum of several individual timeouts.
@@ -1263,6 +1303,10 @@ export async function cmdStatus() {
             catch { }
         }
     }
+    else if (aliveRestartMonitors.length > 0) {
+        console.log(`🔄 EvolCore 正在重启，daemon 尚未就绪（monitor PID: ${aliveRestartMonitors.map(m => m.record.pid).join(', ')}）`);
+        console.log('  请稍后再次执行 ec status。');
+    }
     else {
         console.log(ipcFailure ? '⚠ 无法确认 EvolCore 运行状态：IPC 不可用，且没有可见的存活 PID。' : '⚠ EvolCore is not running');
         if (ipcFailure)
@@ -1312,6 +1356,24 @@ export async function cmdStatus() {
         ]);
         agentsResponse = agentResponse;
         if (statusResponse) {
+            if (statusResponse.build) {
+                if (statusResponse.build.runtimeMode === 'source') {
+                    console.log(`  Build ID: runtime=source dist=${statusResponse.build.diskDistId || '?'}`);
+                    console.log('  ℹ daemon 当前由源码入口运行，dist build ID 不参与一致性比较。');
+                }
+                else {
+                    const runtimeBuildId = statusResponse.build.runtimeId || '?';
+                    const diskDistBuildId = statusResponse.build.diskDistId || '?';
+                    console.log(`  Build ID: runtime=${runtimeBuildId} dist=${diskDistBuildId}`);
+                    if (runtimeBuildId !== '?' && diskDistBuildId !== '?' && runtimeBuildId !== diskDistBuildId) {
+                        console.log('  ⚠ 运行进程 build ID 与磁盘 dist 不一致；请重启 daemon 后再判断源码行为。');
+                    }
+                }
+            }
+            else {
+                console.log(`  Build ID: runtime=unavailable (daemon 未提供 build identity) dist=${computeBuildId(path.join(getPackageRoot(), 'dist')) ?? '?'}`);
+                console.log('  ⚠ 当前 daemon 未提供 build ID；请重启到包含 build identity 的版本后再判断源码行为。');
+            }
             // 🔑 AUN AIDs 表格（详细 AUN 实例状态）
             try {
                 if (aidsResponse?.ok && aidsResponse.aids?.length > 0) {
@@ -2771,9 +2833,12 @@ function removeEcwebInstanceFiles(p) {
 }
 /** 清理 EvolCore 登记的 codex app-server 孤儿进程，返回清理的进程数。 */
 export function stopCodexAppServerOrphans() {
+    const entries = listCodexAppServerProcesses();
+    if (entries.length === 0)
+        return 0;
     const codexProcs = new Set(platform.findProcesses('codex app-server'));
     let killed = 0;
-    for (const entry of listCodexAppServerProcesses()) {
+    for (const entry of entries) {
         const { pid, startedAt } = entry.record;
         if (!platform.isProcessRunning(pid)) {
             unregisterCodexAppServerProcess(entry.filePath);

package/dist/cli/diag.js

@@ -0,0 +1,31 @@
+import { ipcQuery } from '../ipc.js';
+import { resolvePaths } from '../paths.js';
+import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { parseDiagArgs } from '../core/command/diag-service.js';
+import { wantsHelp } from './help.js';
+export async function cmdDiag(args) {
+    if (wantsHelp(args)) {
+        console.log('用法：ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n      ec diag stop [--format json]\n未指定 --owner 时联系本机 daemon.json.owners[0]。');
+        return;
+    }
+    const json = args.at(-2) === '--format' && args.at(-1) === 'json';
+    const argv = json ? args.slice(0, -2) : args;
+    let result;
+    try {
+        parseDiagArgs(argv);
+        result = await ipcQuery(resolvePaths().socket, {
+            type: 'diag', argv,
+            ...(process.env.EVOLCORE_SESSION_ID ? {
+                sessionId: process.env.EVOLCORE_SESSION_ID,
+                delegationToken: process.env[AGENT_DELEGATION_TOKEN_ENV],
+            } : {}),
+        }, 30_000) ?? { ok: false, code: 'DAEMON_UNAVAILABLE', message: 'daemon 未返回结果，请检查其运行状态；发送结果尚未确认' };
+    }
+    catch (error) {
+        result = { ok: false, code: 'INVALID_ARGUMENT', message: error.message };
+    }
+    result.message ??= result.error ?? '诊断请求未完成';
+    console.log(json ? JSON.stringify(result, null, 2) : result.message);
+    if (!result.ok)
+        process.exitCode = 1;
+}