evolcore 0.0.9 → 0.0.11

package/dist/index.js

@@ -14,7 +14,7 @@ import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-f
 import { GeminiSessionFileAdapter } from './core/session/adapters/gemini-session-file-adapter.js';
 import { EcagentSessionFileAdapter } from './core/session/adapters/ecagent-session-file-adapter.js';
 import { loadDefaults, loadAllAgents, migrateIdentitiesIfNeeded, loadDaemonConfig, initializeEckSnapshotsConfig } from './config-store.js';
-import { ConfigTarget, initConfigManager, onConfigWrite } from './config/config-manager.js';
+import { ConfigTarget, initConfigManager, onConfigWrite, read as readConfig } from './config/config-manager.js';
 import { ensureRoleConfigV4OnStartup } from './config/role-config-v4-startup.js';
 import { ensureRoleConfigV5OnStartup } from './config/role-config-v5-startup.js';
 import { ensureContactBookV2OnStartup } from './config/contact-book-v2-startup.js';
@@ -50,7 +50,7 @@ import { evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata } from '
 import { readInstalledEvolcoreVersion } from './utils/evolcore-version.js';
 import { recoverAllRoleMutationsSync } from './core/command/role-menu.js';
 import { HandoffRuntime } from './core/handoff/runtime.js';
-import { BootstrapService } from './core/bootstrap-service.js';
+import { BootstrapService, completeBootstrapWithWelcome } from './core/bootstrap-service.js';
 import { MessageCache } from './core/message/message-cache.js';
 import { CommandHandler, isProcessLevelOwner } from './core/command/command-handler.js';
 import { EventBus } from './core/event-bus.js';
@@ -66,6 +66,8 @@ import { isHClassPath } from './core/protected-paths.js';
 import { ChannelLoader, tryParseChannelKey } from './core/channel-loader.js';
 import { AgentLoader } from './core/baseagent-loader.js';
 import { EvolAgentRegistry } from './core/evolagent-registry.js';
+import { createRunnerReloadTransaction, disposeAgentInstances } from './core/runner-reload-transaction.js';
+import { AgentReloadBusyError, AgentReloadCoordinator } from './core/agent-reload-coordinator.js';
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
@@ -974,6 +976,7 @@ async function main() {
     }
     const channelInstances = evolagentInstances;
     logger.info(`✓ Created ${channelInstances.length} channel instance(s)`);
+    let bootstrapService;
     const contactRequestExpiryTimer = setInterval(() => {
         for (const agent of agentRegistry.runnableAgents()) {
             void expirePendingContactRequests(agent.aid).catch(error => {
@@ -988,6 +991,35 @@ async function main() {
             getAvailableBaseagents: detectAvailableBaseagentsForBind,
             getUptimeSeconds: () => Math.floor(process.uptime()),
             onDaemonOwnersUpdated: (owners) => { processLevelOwners = owners; },
+            onAgentOwnerUpdated: (agentAid, ownerAid) => {
+                const service = bootstrapService;
+                if (!service)
+                    return;
+                const instance = channelInstances.find(candidate => {
+                    const owner = agentRegistry.resolveByChannel(candidate.adapter.channelKey)
+                        ?? agentRegistry.resolveByChannel(candidate.adapter.channelName);
+                    return owner?.aid === agentAid;
+                });
+                if (!instance)
+                    return;
+                eventBus.publish({
+                    type: 'channel:owner-bound',
+                    channel: instance.channelType || instance.adapter.channelName,
+                    channelName: instance.adapter.channelName,
+                    userId: ownerAid,
+                });
+                void service.tryStartBootstrap({
+                    adapter: instance.adapter,
+                    channelKey: instance.adapter.channelKey,
+                    channelType: instance.channelType,
+                    agentAid,
+                    recipientId: ownerAid,
+                    channelId: instance.channelType === 'aun' ? ownerAid : undefined,
+                    source: 'owner-bound',
+                }).catch((error) => {
+                    logger.warn(`[Bootstrap] Owner-bound start failed for ${agentAid}: ${error instanceof Error ? error.message : String(error)}`);
+                });
+            },
         })
         : null;
     bindService?.startCleanup();
@@ -1541,7 +1573,7 @@ async function main() {
     msgBridge.setInteractionRouter(interactionRouter);
     msgBridge.setContactBindRuntimeChecker(isContactBindChannelReady);
     msgBridge.setAidStatsCollector(aidStatsCollector);
-    const bootstrapService = new BootstrapService(agentRegistry, eventBus);
+    bootstrapService = new BootstrapService(agentRegistry, eventBus);
     msgBridge.setBootstrapService(bootstrapService);
     msgBridge.setHandoffRuntime(handoffRuntime);
     // ── Channel instance registration (shared by startup and hot-load) ──
@@ -2312,6 +2344,17 @@ async function main() {
     function configureIpc() {
         // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
         ipcServer.setAgentRegistry(agentRegistry);
+        ipcServer.setBootstrapCompleteExecutor(async (aid) => {
+            const aunInstance = channelInstances.find(candidate => {
+                if (candidate.channelType !== 'aun')
+                    return false;
+                const owner = agentRegistry.resolveByChannel(candidate.adapter.channelKey)
+                    ?? agentRegistry.resolveByChannel(candidate.adapter.channelName);
+                return owner?.aid === aid;
+            });
+            const welcome = aunInstance?.channel;
+            return completeBootstrapWithWelcome(bootstrapService, aid, welcome);
+        });
         ipcServer.setDingtalkContactBindExecutor({
             register: (cmd) => registerPendingDingtalkContactBind(cmd),
             isChannelReady: isContactBindChannelReady,
@@ -2600,16 +2643,17 @@ async function main() {
             });
         });
         // ── Reload hooks: enable agentRegistry.reload() to drain/disconnect/restart channels ──
+        const unregisterRuntimeChannel = (channelName) => {
+            markChannelDisconnected(channelName);
+            processor.unregisterChannel(channelName);
+            cmdHandler.unregisterChannel(channelName);
+            msgBridge.removeChannel(channelName);
+        };
         const reloadHooks = buildReloadHooks({
             channelLoader,
             channelInstances,
             registerChannelInstance,
-            unregisterChannelInstance: (channelName) => {
-                markChannelDisconnected(channelName);
-                processor.unregisterChannel(channelName);
-                cmdHandler.unregisterChannel(channelName);
-                msgBridge.removeChannel(channelName);
-            },
+            unregisterChannelInstance: unregisterRuntimeChannel,
             onChannelStarted: (inst) => {
                 // startChannel 重建渠道时重新注入 AidStatsCollector（与 hot-load 路径对齐）
                 if (inst.channelType === 'aun') {
@@ -2619,9 +2663,112 @@ async function main() {
                 }
             },
             onChannelConnected: markChannelConnected,
+            onAgentReloaded: async (agent) => {
+                const instance = channelInstances.find(candidate => {
+                    const owner = agentRegistry.resolveByChannel(candidate.adapter.channelKey)
+                        ?? agentRegistry.resolveByChannel(candidate.adapter.channelName);
+                    return owner?.aid === agent.aid;
+                });
+                if (!instance)
+                    return;
+                await bootstrapService.tryStartBootstrap({
+                    adapter: instance.adapter,
+                    channelKey: instance.adapter.channelKey,
+                    channelType: instance.channelType,
+                    agentAid: agent.aid,
+                    source: 'owner-bound',
+                });
+            },
             messageQueue,
             handoffRuntime,
+            stageAgentRunners: async (candidate) => {
+                const creationErrors = [];
+                const staged = candidate.config.enabled === false
+                    ? []
+                    : agentLoader.createForAgent(candidate, {
+                        onSessionIdUpdate: async (sessionId, agentSessionId) => {
+                            await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
+                        },
+                    }, creationErrors);
+                const onDisposeError = (instance, error) => {
+                    logger.warn(`[Reload] Failed to dispose runner ${instance.evolagentName}::${instance.baseagent}: ${error instanceof Error ? error.message : String(error)}`);
+                };
+                if (creationErrors.length > 0) {
+                    await disposeAgentInstances(staged, onDisposeError);
+                    throw new Error(creationErrors.map(error => `${error.baseagent}: ${error.message}`).join('; '));
+                }
+                if (candidate.config.enabled !== false && staged.length === 0 && candidate.config.active_baseagent) {
+                    throw new Error(`No runner could be created for ${candidate.aid}::${candidate.config.active_baseagent}`);
+                }
+                for (const instance of staged) {
+                    instance.agent.setPermissionGateway?.(permissionGateway);
+                    instance.agent.setCompactStartCallback?.((sessionId) => {
+                        processor.handleCompactStart(sessionId);
+                    });
+                }
+                return createRunnerReloadTransaction({
+                    aid: candidate.aid,
+                    agentMap,
+                    staged,
+                    onDisposeError,
+                });
+            },
         });
+        const reloadOwnedMutes = new Set();
+        const reloadCoordinator = new AgentReloadCoordinator({
+            registry: agentRegistry,
+            hooks: reloadHooks,
+            getBusyCount: (aid) => {
+                const agentName = agentRegistry.get(aid)?.name;
+                if (!agentName)
+                    return 0;
+                return messageQueue.getProcessingCountByAgent(agentName)
+                    + messageQueue.getQueueLengthByAgent(agentName);
+            },
+            beforeReload: invalidateKitCache,
+            forceReload: async (aid) => {
+                const agentName = agentRegistry.get(aid)?.name;
+                if (!agentName)
+                    return;
+                messageQueue.clearByAgent(agentName);
+                await messageQueue.interruptByAgentAndWait(agentName);
+                const deadline = Date.now() + 5_000;
+                while (messageQueue.getProcessingCountByAgent(agentName) > 0) {
+                    if (Date.now() >= deadline) {
+                        throw new Error(`Timed out waiting for Agent "${aid}" tasks to stop`);
+                    }
+                    await new Promise(resolve => setTimeout(resolve, 25));
+                }
+            },
+            acquireWorkGate: (aid) => {
+                const agentName = agentRegistry.get(aid)?.name;
+                if (!agentName)
+                    return;
+                const inheritedReloadMute = reloadOwnedMutes.delete(agentName);
+                const alreadyMuted = messageQueue.isAgentMuted(agentName);
+                const ownsMute = inheritedReloadMute || !alreadyMuted;
+                if (!alreadyMuted)
+                    messageQueue.muteAgent(agentName);
+                return () => {
+                    const current = agentRegistry.get(aid);
+                    if (!current) {
+                        messageQueue.clearByAgent(agentName);
+                        if (ownsMute)
+                            messageQueue.unmuteAgent(agentName);
+                        return;
+                    }
+                    if (current.status === 'disabled') {
+                        messageQueue.clearByAgent(agentName);
+                        if (ownsMute)
+                            reloadOwnedMutes.add(agentName);
+                        return;
+                    }
+                    if (ownsMute)
+                        messageQueue.unmuteAgent(agentName);
+                };
+            },
+        });
+        ipcServer.setAgentReloadExecutor((aid, options) => reloadCoordinator.reload(aid, options));
         // Make reload hooks accessible to IPC handler & ctl handler (both run in this process)
         globalThis.__evolcore_reloadHooks = reloadHooks;
         // Hot-load handler: dynamically add a new agent at runtime
@@ -2691,90 +2838,121 @@ async function main() {
             }
         };
         // Full resync handler: scan disk, load new agents, unload removed/disabled, reload changed
+        let resyncInFlight;
         globalThis.__evolcore_resyncAgents = async () => {
-            // 先清 kit 缓存：'kits' 组（manifest / fragment / schema / 角色模板）走 on-reload
-            // 策略，平时不查盘。放在扫盘与 reload 之前，本轮上下线的 agent 才能读到磁盘上的
-            // 最新版本——放在末尾的话，这一轮全用旧值，改动要等下一次 resync 才生效。
-            invalidateKitCache();
-            const { loadAllAgents: scanAgents, loadDefaults: readDefaults } = await import('./config-store.js');
-            const { resolveEffective } = await import('./config/config-manager.js');
-            const freshDefaults = readDefaults();
-            const { agents: diskAgents } = scanAgents();
-            const diskAidSet = new Set(diskAgents.map(a => a.aid));
-            const results = [];
-            // 1. 下线：运行时有但磁盘上没有 / disabled 的
-            for (const [aid, agent] of [...agentRegistry.agents.entries()]) {
-                const diskCfg = diskAgents.find(a => a.aid === aid);
-                if (!diskCfg || diskCfg.enabled === false) {
-                    handoffRuntime.pauseAgent(aid);
-                    try {
-                        await handoffRuntime.drainAgent(aid);
-                    }
-                    catch (error) {
-                        handoffRuntime.resumeAgent(aid);
-                        results.push(`⚠ ${aid}: ${error instanceof Error ? error.message : String(error)}`);
-                        continue;
-                    }
-                    await triggerSchedulers.get(aid)?.stop();
-                    triggerSchedulers.delete(aid);
-                    triggerSchedulerStarts.delete(aid);
-                    // 断开所有 channels
-                    for (const chName of agent.channelInstanceNames()) {
-                        const inst = channelInstances.find(i => i.adapter.channelName === chName);
-                        if (inst) {
-                            try {
-                                await inst.disconnect();
+            if (resyncInFlight)
+                return resyncInFlight;
+            const operation = (async () => {
+                // 先清 kit 缓存：'kits' 组（manifest / fragment / schema / 角色模板）走 on-reload
+                // 策略，平时不查盘。放在扫盘与 reload 之前，本轮上下线的 agent 才能读到磁盘上的
+                // 最新版本——放在末尾的话，这一轮全用旧值，改动要等下一次 resync 才生效。
+                invalidateKitCache();
+                const { loadAllAgents: scanAgents } = await import('./config-store.js');
+                const { agents: diskAgents } = scanAgents();
+                const results = [];
+                // 1. 下线：运行时有但磁盘上没有 / disabled 的
+                for (const [aid] of [...agentRegistry.agents.entries()]) {
+                    const diskCfg = diskAgents.find(a => a.aid === aid);
+                    if (!diskCfg || diskCfg.enabled === false) {
+                        try {
+                            const offlined = await reloadCoordinator.runExclusive(aid, async () => {
+                                const latestDiskCfg = readConfig(ConfigTarget.Agent, { self: aid }, { cache: false, expand: true });
+                                if (latestDiskCfg && latestDiskCfg.enabled !== false)
+                                    return false;
+                                const runtimeAgent = agentRegistry.get(aid);
+                                if (!runtimeAgent)
+                                    return false;
+                                let removed = false;
+                                handoffRuntime.pauseAgent(aid);
+                                try {
+                                    await handoffRuntime.drainAgent(aid);
+                                    await triggerSchedulers.get(aid)?.stop();
+                                    triggerSchedulers.delete(aid);
+                                    triggerSchedulerStarts.delete(aid);
+                                    // 断开所有 channels
+                                    for (const chName of runtimeAgent.channelInstanceNames()) {
+                                        const inst = channelInstances.find(i => i.adapter.channelName === chName);
+                                        if (inst) {
+                                            try {
+                                                await inst.disconnect();
+                                            }
+                                            catch { }
+                                            const idx = channelInstances.indexOf(inst);
+                                            if (idx >= 0)
+                                                channelInstances.splice(idx, 1);
+                                        }
+                                        unregisterRuntimeChannel(chName);
+                                    }
+                                    agentRegistry.agents.delete(aid);
+                                    messageQueue.clearByAgent(runtimeAgent.name);
+                                    removed = true;
+                                    return true;
+                                }
+                                finally {
+                                    if (!removed)
+                                        handoffRuntime.resumeAgent(aid);
+                                }
+                            });
+                            if (offlined)
+                                results.push(`- ${aid} (offline)`);
+                        }
+                        catch (error) {
+                            if (error instanceof AgentReloadBusyError) {
+                                results.push(`⏸ ${aid} (busy: ${error.busyCount} task(s); reload skipped)`);
+                            }
+                            else {
+                                results.push(`⚠ ${aid}: ${error instanceof Error ? error.message : String(error)}`);
                             }
-                            catch { }
-                            markChannelDisconnected(inst.adapter.channelName);
-                            const idx = channelInstances.indexOf(inst);
-                            if (idx >= 0)
-                                channelInstances.splice(idx, 1);
                         }
+                        continue;
                     }
-                    agentRegistry.agents.delete(aid);
-                    results.push(`- ${aid} (offline)`);
-                    continue;
                 }
-            }
-            // 2. 新增：磁盘上有但运行时没有的
-            for (const cfg of diskAgents) {
-                if (cfg.enabled === false)
-                    continue;
-                if (agentRegistry.agents.has(cfg.aid))
-                    continue;
-                try {
-                    await globalThis.__evolcore_hotLoadAgent(cfg.aid);
-                    results.push(`+ ${cfg.aid} (online)`);
+                // 2. 新增：磁盘上有但运行时没有的
+                for (const cfg of diskAgents) {
+                    if (cfg.enabled === false)
+                        continue;
+                    if (agentRegistry.agents.has(cfg.aid))
+                        continue;
+                    try {
+                        await globalThis.__evolcore_hotLoadAgent(cfg.aid);
+                        results.push(`+ ${cfg.aid} (online)`);
+                    }
+                    catch (e) {
+                        results.push(`✗ ${cfg.aid}: ${e?.message || e}`);
+                    }
                 }
-                catch (e) {
-                    results.push(`✗ ${cfg.aid}: ${e?.message || e}`);
+                // 3. 已有的：重新 reload（config 可能改了）
+                for (const cfg of diskAgents) {
+                    if (cfg.enabled === false)
+                        continue;
+                    if (!agentRegistry.agents.has(cfg.aid))
+                        continue;
+                    // 只有磁盘上存在且运行时也存在的才 reload
+                    try {
+                        await reloadCoordinator.reload(cfg.aid);
+                        const runtimeAgent = agentRegistry.get(cfg.aid);
+                        if (runtimeAgent)
+                            await startTriggerScheduler(runtimeAgent);
+                        results.push(`↻ ${cfg.aid} (reloaded)`);
+                    }
+                    catch (e) {
+                        results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
+                    }
                 }
+                // 重建 channel index（kit 缓存已在本轮开头清过）
+                agentRegistry.channelIndex.clear();
+                agentRegistry.buildChannelIndex();
+                logger.info(`[Resync] Done: ${results.length} agent(s) processed`);
+                return results;
+            })();
+            resyncInFlight = operation;
+            try {
+                return await operation;
             }
-            // 3. 已有的：重新 reload（config 可能改了）
-            const hooks = globalThis.__evolcore_reloadHooks;
-            for (const cfg of diskAgents) {
-                if (cfg.enabled === false)
-                    continue;
-                if (!agentRegistry.agents.has(cfg.aid))
-                    continue;
-                // 只有磁盘上存在且运行时也存在的才 reload
-                try {
-                    await agentRegistry.reload(cfg.aid, hooks);
-                    const runtimeAgent = agentRegistry.get(cfg.aid);
-                    if (runtimeAgent)
-                        await startTriggerScheduler(runtimeAgent);
-                    results.push(`↻ ${cfg.aid} (reloaded)`);
-                }
-                catch (e) {
-                    results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
-                }
+            finally {
+                if (resyncInFlight === operation)
+                    resyncInFlight = undefined;
             }
-            // 重建 channel index（kit 缓存已在本轮开头清过）
-            agentRegistry.channelIndex.clear();
-            agentRegistry.buildChannelIndex();
-            logger.info(`[Resync] Done: ${results.length} agent(s) processed`);
-            return results;
         };
         ipcServer.setStatsProvider(() => statsCollector.getSnapshot());
         ipcServer.setAgentStatsProvider(() => agentRegistry.list().map((agent) => {

package/dist/ipc.js

@@ -5,6 +5,7 @@ import path from 'path';
 import { logger } from './utils/logger.js';
 import { fileCache } from './core/daemon-file-cache.js';
 import { HANDOFF_QUERY_MAX_LIMIT, HANDOFF_STATES } from './core/handoff/types.js';
+import { AgentReloadBusyError } from './core/agent-reload-coordinator.js';
 import { resolvePaths } from './paths.js';
 import { getProcessStartTime, isSameOrOlderProcess } from './utils/process-introspect.js';
 import { classifyProcessTree, ProcessTreeSampler } from './utils/process-tree-stats.js';
@@ -39,6 +40,8 @@ export class IpcServer {
     queueSnapshotProvider;
     queueActionExecutor;
     triggerExecutor;
+    bootstrapCompleteExecutor;
+    agentReloadExecutor;
     taskRuntimeContextProvider;
     aunMsgSender;
     handoffReturnExecutor;
@@ -85,6 +88,9 @@ export class IpcServer {
     setContactOperationExecutor(executor) {
         this.contactOperationExecutor = executor;
     }
+    setAgentReloadExecutor(executor) {
+        this.agentReloadExecutor = executor;
+    }
     /** Inject AUN AID state aggregator for aun-aids IPC handler */
     setAunAidProvider(provider) {
         this.aunAidProvider = provider;
@@ -117,6 +123,10 @@ export class IpcServer {
     setTriggerExecutor(executor) {
         this.triggerExecutor = executor;
     }
+    /** Complete an agent bootstrap in the daemon so disk and runtime state change together. */
+    setBootstrapCompleteExecutor(executor) {
+        this.bootstrapCompleteExecutor = executor;
+    }
     /** Inject active task runtime-context provider for in-task CLI routing. */
     setTaskRuntimeContextProvider(provider) {
         this.taskRuntimeContextProvider = provider;
@@ -325,7 +335,6 @@ export class IpcServer {
                     bindType: cmd.bindType,
                     targetAid: cmd.targetAid,
                     agentName: cmd.agentName,
-                    ownerMode: cmd.ownerMode,
                     ttlMs: cmd.ttlMs,
                 });
             }
@@ -668,29 +677,38 @@ export class IpcServer {
                     return { ok: false, error: `Agent "${name}" found but info missing (race?)` };
                 return { ok: true, agent: info };
             }
+            case 'evolagent.bootstrapComplete': {
+                const aid = cmd.aid;
+                if (!aid || typeof aid !== 'string')
+                    return { ok: false, error: 'missing aid' };
+                if (!this.bootstrapCompleteExecutor)
+                    return { ok: false, error: 'bootstrap complete executor not configured' };
+                try {
+                    return await this.bootstrapCompleteExecutor(aid);
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message || String(e) };
+                }
+            }
             case 'evolagent.reload': {
                 if (!this.agentRegistry)
                     return { ok: false, error: 'EvolAgentRegistry not available' };
                 const name = cmd.name;
                 if (!name || typeof name !== 'string')
                     return { ok: false, error: 'missing name' };
-                const hooks = globalThis.__evolcore_reloadHooks;
-                if (!hooks)
-                    return { ok: false, error: 'Reload hooks not initialized' };
+                if (!this.agentReloadExecutor)
+                    return { ok: false, error: 'Agent reload coordinator not initialized' };
                 try {
                     const a = this.agentRegistry.get(name);
                     if (!a)
                         return { ok: false, error: `Agent "${name}" not found` };
-                    if (!this.agentRegistry.reload)
-                        return { ok: false, error: 'EvolAgentRegistry.reload not available' };
-                    // 'kits' 组（manifest / fragment / schema / 角色模板）走 on-reload 策略，平时不查盘：
-                    // reload 是它唯一的刷新时机，必须先清再 reload，否则重载出来的 agent 仍用旧模板。
-                    const { invalidateKitCache } = await import('./eck/kit-renderer.js');
-                    invalidateKitCache();
-                    await this.agentRegistry.reload(name, hooks);
+                    await this.agentReloadExecutor(name, { force: cmd.force === true });
                     return { ok: true, result: `Agent "${name}" reloaded` };
                 }
                 catch (e) {
+                    if (e instanceof AgentReloadBusyError) {
+                        return { ok: false, code: e.code, busyCount: e.busyCount, error: e.message };
+                    }
                     return { ok: false, error: e?.message || String(e) };
                 }
             }

package/dist/utils/aid-bind.js

@@ -45,7 +45,6 @@ export class BindService {
         }
         const ttlMs = clampTtl(req.ttlMs);
         const expiresAt = Date.now() + ttlMs;
-        const ownerMode = req.ownerMode === 'replace' ? 'replace' : 'append';
         const task = {
             taskId,
             bindType: req.bindType,
@@ -56,7 +55,6 @@ export class BindService {
             createdAt: Date.now(),
             expiresAt,
             status: 'pending',
-            ownerMode,
         };
         this.tasks.set(taskId, task);
         this.taskIdsByTokenHash.set(tokenHash, taskId);
@@ -209,9 +207,7 @@ export class BindService {
         if (task.bindType === 'daemon') {
             const cfg = loadDaemonConfig();
             const current = cfg.owners ?? [];
-            const owners = task.ownerMode === 'replace'
-                ? [ownerAid]
-                : [ownerAid, ...current.filter(o => o !== ownerAid)];
+            const owners = [ownerAid, ...current.filter(o => o !== ownerAid)];
             saveDaemonConfig({ ...cfg, $schema_version: cfg.$schema_version ?? 1, owners });
             this.opts.onDaemonOwnersUpdated?.(owners);
             return;
@@ -220,10 +216,9 @@ export class BindService {
         if (!agent)
             throw new Error(`agent not found: ${task.targetAid}`);
         const current = agent.owners ?? [];
-        const owners = task.ownerMode === 'replace'
-            ? [ownerAid]
-            : [ownerAid, ...current.filter(o => o !== ownerAid)];
+        const owners = [ownerAid, ...current.filter(o => o !== ownerAid)];
         saveAgent({ ...agent, owners });
+        this.opts.onAgentOwnerUpdated?.(task.targetAid, ownerAid);
     }
     cleanup() {
         const now = Date.now();

package/dist/utils/log-writer.js

@@ -231,19 +231,14 @@ export class LogWriter {
         return `${day}-${pad(d.getHours())}`;
     }
     cleanupOldArchives() {
-        LogWriter.cleanupArchivesIn(this.logDir, this.retentionMs);
+        LogWriter.cleanupArchivesIn(this.logDir, this.baseName, this.retentionMs);
     }
     /**
-     * 全局清理：扫整个 logDir，按 retention 删除所有匹配 LogWriter 归档命名约定的文件。
+     * 清理当前日志类型的归档文件，不能跨 baseName 清理。
      *
      * 命名约定：`<baseName>-YYYYMMDD-HH.log`（hourly）或 `<baseName>-YYYYMMDD.log`（daily），
-     * 其中 baseName 由字母/数字/连字符组成。
-     *
-     * 这条规则跨 baseName 统一——只要文件按这个 pattern 命名就认为受 LogWriter 体系管辖。
-     * 这样 conditional 启用的 LogWriter（如 aun trace 关闭时）不会留下永久无人清的归档：
-     * 任意 LogWriter 实例化都会顺便清掉它们。
      */
-    static cleanupArchivesIn(logDir, retentionMs) {
+    static cleanupArchivesIn(logDir, baseName, retentionMs) {
         if (retentionMs <= 0)
             return;
         const cutoff = Date.now() - retentionMs;
@@ -254,9 +249,10 @@ export class LogWriter {
         catch {
             return;
         }
-        const generalPattern = /^[A-Za-z0-9][A-Za-z0-9_-]*-\d{8}(?:-\d{2})?\.log$/;
+        const escapedBaseName = baseName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const archivePattern = new RegExp(`^${escapedBaseName}-\\d{8}(?:-\\d{2})?\\.log$`);
         for (const name of entries) {
-            if (!generalPattern.test(name))
+            if (!archivePattern.test(name))
                 continue;
             const full = path.join(logDir, name);
             try {

package/dist/utils/logger.js

@@ -24,15 +24,15 @@ function getWriters() {
         closeWriters(writers);
     writers = {
         logDir,
-        main: new LogWriter({ baseName: 'daemon', logDir, rotation: 'hourly', retention: { hours: 24 } }),
+        main: new LogWriter({ baseName: 'daemon', logDir, rotation: 'hourly', retention: { hours: 48 } }),
         message: config.messageLog
-            ? new LogWriter({ baseName: 'messages', logDir, rotation: 'hourly', retention: { hours: 24 } })
+            ? new LogWriter({ baseName: 'messages', logDir, rotation: 'hourly', retention: { hours: 48 } })
             : null,
         event: config.eventLog
-            ? new LogWriter({ baseName: 'events', logDir, rotation: 'hourly', retention: { hours: 24 } })
+            ? new LogWriter({ baseName: 'events', logDir, rotation: 'hourly', retention: { hours: 48 } })
             : null,
-        channelIn: new LogWriter({ baseName: 'channel-in', logDir, rotation: 'hourly', retention: { hours: 24 } }),
-        channelOut: new LogWriter({ baseName: 'channel-out', logDir, rotation: 'hourly', retention: { hours: 24 } }),
+        channelIn: new LogWriter({ baseName: 'channel-in', logDir, rotation: 'hourly', retention: { hours: 48 } }),
+        channelOut: new LogWriter({ baseName: 'channel-out', logDir, rotation: 'hourly', retention: { hours: 48 } }),
     };
     return writers;
 }

package/kits/docs/evolcore/msg.md

@@ -2,6 +2,13 @@
 
 私聊场景下收发消息的命令集。触发词：回复/发消息/拉取/撤回/查在线。
 
+## Agent 会话中的 Shell 调用边界
+
+在 EvolCore 托管会话中，每次工具调用只能执行一条完整的 `ec` 命令。禁止把
+`command -v`、`ec aid`、`&&`、`||`、`;`、`|`、重定向、子 shell、`bash -lc` 或其它脚本
+和 `ec msg` 拼在一起。不要做单独的 CLI 探测；直接调用本页的单条命令，读取结构化结果后
+再决定下一步。工具审批被拒绝时应报告原始错误并停止，不要通过追加命令或提权参数重试。
+
 以自己的 AID 为发送者（`<from>`），对端 AID 为 `<to>`。
 
 ## 发送消息
@@ -29,6 +36,8 @@ ec msg send <from> <to> --link <url> [--title "<title>"] [--description "<desc>"
 ec msg send <from> <to> --payload '<json>'
 ```
 
+每一行都必须单独执行，且是该次 shell 调用中的唯一命令。
+
 发送相关选项：
 - `--text-from-file <path>` — 从文件读取文本（UTF-8），用于超长消息或避免 Shell 转义
 - `--encrypt` — 端到端加密
@@ -39,6 +48,10 @@ ec msg send <from> <to> --payload '<json>'
 - `--text <说>` — 附件说明文字（仅 `--file`）
 - `--transcript <text>` — 语音转写（仅 `--as voice`）
 
+在 EvolCore 会话内，发送还会经过当前 session 的 self/peer/role 鉴权。`visitor` 或 `member`
+默认只允许回复当前对端；从一个 agent 会话转发给第三个 agent 属于 relay 操作，可能因
+`ownPeerOnly` 被拒绝。没有成功 JSON 回执（含 `message_id`/`status`）不得声称已发送。
+
 成功输出：`✓ 已发送 <message_id> seq=<n> status=<status>`
 
 > 正文写法：含空格/换行/特殊字符时用引号包起来；纯短词可不包，但多空格会被压成一个。