evolcore 0.0.5 → 0.0.7

package/dist/core/session/session-fs-store.js

@@ -20,22 +20,98 @@ function resolveAunSelfAID(selfAID, channelKey) {
         return inferred;
     throw new Error('[SessionFsStore] AUN chat directory requires selfAID or an aun channel key.');
 }
+function resolveSessionChannelKey(channelType, selfAID, channelKey) {
+    if (channelKey?.trim())
+        return channelKey.trim();
+    return `${channelType}#${selfAID}#main`;
+}
+function encodeChannelSessionComponent(value) {
+    // encodeURIComponent leaves `*` untouched, but it is illegal in a Windows
+    // filename. A trailing dot is also rejected by Windows filesystems.
+    const encoded = encodeURIComponent(value).replace(/\*/g, '%2A');
+    return encoded.endsWith('.') ? `${encoded.slice(0, -1)}%2E` : encoded;
+}
+const MAX_CHANNEL_SESSION_KEY_BYTES = 255;
+function formatChannelSessionKeyParts(channelType, channelName, channelId) {
+    if (!channelType || !channelName || !channelId) {
+        throw new Error('[SessionFsStore] channel session key components must not be empty.');
+    }
+    const key = [channelType, channelName, channelId]
+        .map(encodeChannelSessionComponent)
+        .join('#');
+    const bytes = Buffer.byteLength(key, 'utf8');
+    if (bytes > MAX_CHANNEL_SESSION_KEY_BYTES) {
+        throw new Error(`[SessionFsStore] channel session key is ${bytes} bytes; filesystem limit is ${MAX_CHANNEL_SESSION_KEY_BYTES} bytes.`);
+    }
+    return key;
+}
 /**
- * 计算 chat 目录的完整路径。
- * - aun: sessionsDir/aun/<urlEncode(selfAID)>/<urlEncode(channelId)>/
- * - wecom: sessionsDir/wecom/<urlEncode(channelKey)>/<urlEncode(channelId)>/
- * - 其它: sessionsDir/<channelType>/<urlEncode(channelId)>/
+ * Session 的磁盘路由键。它将实例名和会话路由 ID 合并为一个目录段；
+ * Agent 身份由父目录 `agents/<aid>/` 提供，不能省略这个父目录。
+ *
+ * This is intentionally distinct from SessionFile.sessionKey, which includes
+ * the thread ID and is used as the agent-internal session routing key.
  */
-export function chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey) {
-    if (channelType === 'aun') {
-        return path.join(sessionsDir, channelType, encodeSegment(resolveAunSelfAID(selfAID, channelKey)), encodeSegment(channelId));
+export function formatChannelSessionKey(channelType, channelId, channelKey) {
+    const parts = channelKey?.split('#');
+    const channelName = parts?.length === 3 && parts[0] === channelType && parts[2]?.trim()
+        ? parts[2].trim()
+        : 'main';
+    return formatChannelSessionKeyParts(channelType, channelName, channelId);
+}
+function parseChannelSessionKeyComponents(key) {
+    const parts = key.split('#');
+    if (parts.length !== 3 || !parts[0] || !parts[1] || !parts[2])
+        return undefined;
+    try {
+        const channelType = decodeURIComponent(parts[0]);
+        const channelName = decodeURIComponent(parts[1]);
+        const channelId = decodeURIComponent(parts[2]);
+        if (!channelType || !channelName || !channelId)
+            return undefined;
+        return { channelType, channelName, channelId };
     }
-    if (channelType === 'wecom' && channelKey?.startsWith('wecom#')) {
-        return path.join(sessionsDir, channelType, encodeSegment(channelKey), encodeSegment(channelId));
+    catch {
+        return undefined;
     }
-    return path.join(sessionsDir, channelType, encodeSegment(channelId));
 }
-/** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfAID） */
+/** Parse only the canonical channelSessionKey emitted by the current formatter. */
+export function tryParseChannelSessionKey(key) {
+    const parsed = parseChannelSessionKeyComponents(key);
+    if (!parsed)
+        return undefined;
+    try {
+        return formatChannelSessionKeyParts(parsed.channelType, parsed.channelName, parsed.channelId) === key
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Parse the immediately preceding v3 encoding for explicit migration only. */
+export function tryParseLegacyChannelSessionKey(key) {
+    return parseChannelSessionKeyComponents(key);
+}
+/**
+ * 计算 chat 目录的完整路径。
+ * - agents/<selfAID>/sessions/<channelSessionKey>/
+ *
+ * The relation peerKey intentionally is not used here: it omits the channel
+ * instance. channelSessionKey retains the configured instance name and the
+ * chat route in one path segment.
+ */
+export function chatDirPath(sessionsRoot, channelType, channelId, selfAID, channelKey) {
+    const aid = channelType === 'aun'
+        ? resolveAunSelfAID(selfAID, channelKey)
+        : (selfAID?.trim() || trySelfAIDFromChannelKey(channelKey) || '_unknown');
+    return path.join(sessionsRoot, encodeSegment(aid), 'sessions', formatChannelSessionKey(channelType, channelId, resolveSessionChannelKey(channelType, aid, channelKey)));
+}
+function trySelfAIDFromChannelKey(channelKey) {
+    const parts = channelKey?.split('#');
+    return parts?.length === 3 && parts[1]?.trim() ? parts[1].trim() : undefined;
+}
+/** 解码目录段（用于扫描时把目录名还原为逻辑路径键） */
 export function decodeDirSegment(seg) {
     return decodeSegment(seg);
 }
@@ -143,22 +219,193 @@ export function readAllJsonlLines(filePath) {
     }
 }
 /**
- * 扫描所有 chat 目录。
- * - aun: channelType / selfAID / channelId  (3层)
- * - wecom: channelType / channelKey / channelId (3层；兼容旧的2层目录)
- * - 其它: channelType / channelId           (2层)
+ * Scan the current per-Agent layout:
+ * `agents/<aid>/sessions/<channelSessionKey>/`.
  */
-export function scanChatDirs(sessionsDir) {
+export function scanChatDirs(sessionsRoot) {
     const results = [];
-    let typeEntries;
+    let agentEntries;
     try {
-        typeEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
     }
     catch (e) {
         if (e.code === 'ENOENT')
             return [];
         throw e;
     }
+    const hasAgentLayout = agentEntries.some(entry => entry.isDirectory() && (fs.existsSync(path.join(sessionsRoot, entry.name, 'config.json'))
+        || fs.existsSync(path.join(sessionsRoot, entry.name, 'sessions'))));
+    if (!hasAgentLayout)
+        return [];
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let sessionEntries;
+        try {
+            sessionEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        const selfAID = decodeSegment(agentEntry.name);
+        for (const sessionEntry of sessionEntries) {
+            if (!sessionEntry.isDirectory())
+                continue;
+            const channelSessionKey = sessionEntry.name;
+            const parsed = tryParseChannelSessionKey(channelSessionKey);
+            if (!parsed)
+                continue;
+            const dirPath = path.join(sessionsDir, sessionEntry.name);
+            if (!hasSessionPayload(dirPath))
+                continue;
+            results.push({
+                channelType: parsed.channelType,
+                selfAID,
+                channelId: parsed.channelId,
+                channelKey: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelSessionKey,
+                dirPath,
+            });
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+function hasSessionPayload(dirPath) {
+    try {
+        return fs.readdirSync(dirPath, { withFileTypes: true }).some(entry => (entry.isFile() && (entry.name === 'active.json'
+            || entry.name === 'messages.jsonl'
+            || (entry.name.startsWith('meta_') && entry.name.endsWith('.jsonl')))) || (entry.isDirectory() && entry.name === '_threads'));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Scan non-canonical single-level v3 keys. The runtime ignores these entries;
+ * only the explicit migration planner may copy them into their canonical key.
+ */
+export function scanNonCanonicalAgentChatDirs(sessionsRoot) {
+    const results = [];
+    let agentEntries;
+    try {
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const selfAID = decodeSegment(agentEntry.name);
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let sessionEntries;
+        try {
+            sessionEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const sessionEntry of sessionEntries) {
+            if (!sessionEntry.isDirectory() || tryParseChannelSessionKey(sessionEntry.name))
+                continue;
+            const parsed = tryParseLegacyChannelSessionKey(sessionEntry.name);
+            const dirPath = path.join(sessionsDir, sessionEntry.name);
+            if (!parsed || !hasSessionPayload(dirPath))
+                continue;
+            results.push({
+                ...parsed,
+                selfAID,
+                channelKey: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelSessionKey: sessionEntry.name,
+                dirPath,
+            });
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+/**
+ * Scan the immediately preceding per-Agent layout:
+ * `agents/<aid>/sessions/<channelKey>/<channelId>/`.
+ *
+ * The runtime must not use this scanner. It exists solely for the explicit
+ * migration that copies the old two-level layout into channelSessionKey.
+ */
+export function scanNestedAgentChatDirs(sessionsRoot) {
+    const results = [];
+    let agentEntries;
+    try {
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const selfAID = decodeSegment(agentEntry.name);
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let channelEntries;
+        try {
+            channelEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const channelEntry of channelEntries) {
+            if (!channelEntry.isDirectory())
+                continue;
+            const channelKey = decodeSegment(channelEntry.name);
+            const parts = channelKey.split('#');
+            const isDaemon = channelKey === 'daemon';
+            const isCurrentKey = parts.length === 3 && parts[1] === selfAID && !!parts[0] && !!parts[2];
+            const isReversedLegacyKey = parts.length === 3 && parts[0] === selfAID && !!parts[1] && !!parts[2];
+            const isAgentChannel = isCurrentKey || isReversedLegacyKey;
+            if (!isDaemon && !isAgentChannel)
+                continue;
+            const channelDir = path.join(sessionsDir, channelEntry.name);
+            // A single-level channelSessionKey can look superficially like a legacy
+            // key when an AID happens to match an instance name. Its own active.json
+            // proves it is a current chat directory, not a legacy channel parent.
+            if (fs.existsSync(path.join(channelDir, 'active.json')))
+                continue;
+            const channelType = isDaemon ? 'daemon' : (isCurrentKey ? parts[0] : parts[1]);
+            let chatEntries;
+            try {
+                chatEntries = fs.readdirSync(channelDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const chatEntry of chatEntries) {
+                if (!chatEntry.isDirectory())
+                    continue;
+                results.push({
+                    channelType,
+                    selfAID,
+                    channelKey,
+                    channelId: decodeSegment(chatEntry.name),
+                    dirPath: path.join(channelDir, chatEntry.name),
+                });
+            }
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+/** Scan the pre-migration data/sessions layout without changing it. */
+export function scanLegacyChatDirs(sessionsDir) {
+    const results = [];
+    let typeEntries;
+    try {
+        typeEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
     for (const typeEntry of typeEntries) {
         if (!typeEntry.isDirectory())
             continue;
@@ -172,7 +419,6 @@ export function scanChatDirs(sessionsDir) {
             continue;
         }
         if (channelType === 'aun') {
-            // 3-layer: aun/selfAID/channelId
             for (const selfEntry of level2Entries) {
                 if (!selfEntry.isDirectory())
                     continue;
@@ -184,19 +430,15 @@ export function scanChatDirs(sessionsDir) {
                 catch {
                     continue;
                 }
-                for (const chatEntry of chatEntries) {
-                    if (!chatEntry.isDirectory())
-                        continue;
-                    results.push({
-                        channelType,
-                        selfAID: decodeSegment(selfEntry.name),
-                        channelId: decodeSegment(chatEntry.name),
-                        dirPath: path.join(selfDir, chatEntry.name),
-                    });
-                }
+                for (const chatEntry of chatEntries)
+                    if (chatEntry.isDirectory())
+                        results.push({
+                            channelType, selfAID: decodeSegment(selfEntry.name), channelId: decodeSegment(chatEntry.name), dirPath: path.join(selfDir, chatEntry.name),
+                        });
             }
+            continue;
         }
-        else if (channelType === 'wecom') {
+        if (channelType === 'wecom') {
             for (const entry of level2Entries) {
                 if (!entry.isDirectory())
                     continue;
@@ -210,43 +452,25 @@ export function scanChatDirs(sessionsDir) {
                     catch {
                         continue;
                     }
-                    for (const chatEntry of chatEntries) {
-                        if (!chatEntry.isDirectory())
-                            continue;
-                        results.push({
-                            channelType,
-                            selfAID: '',
-                            channelKey: decoded,
-                            channelId: decodeSegment(chatEntry.name),
-                            dirPath: path.join(entryDir, chatEntry.name),
-                        });
-                    }
+                    for (const chatEntry of chatEntries)
+                        if (chatEntry.isDirectory())
+                            results.push({
+                                channelType, selfAID: '', channelKey: decoded, channelId: decodeSegment(chatEntry.name), dirPath: path.join(entryDir, chatEntry.name),
+                            });
                 }
                 else {
-                    results.push({
-                        channelType,
-                        selfAID: '',
-                        channelId: decoded,
-                        dirPath: entryDir,
-                    });
+                    results.push({ channelType, selfAID: '', channelId: decoded, dirPath: entryDir });
                 }
             }
+            continue;
         }
-        else {
-            // 2-layer: channelType/channelId
-            for (const chatEntry of level2Entries) {
-                if (!chatEntry.isDirectory())
-                    continue;
+        for (const chatEntry of level2Entries)
+            if (chatEntry.isDirectory())
                 results.push({
-                    channelType,
-                    selfAID: '',
-                    channelId: decodeSegment(chatEntry.name),
-                    dirPath: path.join(typeDir, chatEntry.name),
+                    channelType, selfAID: '', channelId: decodeSegment(chatEntry.name), dirPath: path.join(typeDir, chatEntry.name),
                 });
-            }
-        }
     }
-    return results;
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
 }
 export function scanMetaFiles(chatDir) {
     try {

package/dist/core/session/session-manager.js

@@ -38,9 +38,6 @@ export class SessionManager {
         this.sessionsDir = sessionsDir;
         this.eventBus = eventBus;
         this.identityResolver = identityResolver;
-        this.migrateChannelKeyFormat();
-        this.migrateUnknownAunDirs();
-        this.migrateWecomChannelDirs();
     }
     setIdentityResolver(resolver) {
         this.identityResolver = resolver;
@@ -379,7 +376,7 @@ export class SessionManager {
             logger.error(`[SessionManager] validateSessionFile: no adapter for baseagent=${session.baseagent}, session=${session.id}`);
             return agentSessionId;
         }
-        if (adapter.checkExists(session.projectPath, agentSessionId))
+        if (adapter.checkExists(session.projectPath, agentSessionId, session.selfAID))
             return agentSessionId;
         logger.warn(`Session file not found for ${session.baseagent}: ${agentSessionId}, clearing session ID`);
         session.agentSessionId = undefined;
@@ -1316,16 +1313,16 @@ export class SessionManager {
         });
         return session;
     }
-    async scanCliSessions(projectPath, baseagent, limit = 10) {
+    async scanCliSessions(projectPath, baseagent, limit = 10, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter)
             return [];
-        return adapter.scanCliSessions(projectPath, limit);
+        return adapter.scanCliSessions(projectPath, limit, agentAid);
     }
-    async listImportableCliSessions(projectPath, baseagent) {
+    async listImportableCliSessions(projectPath, baseagent, agentAid) {
         const boundSessionIds = this.listBoundAgentSessionIds(projectPath, baseagent);
         const displayLimit = 10;
-        const cliSessions = await this.scanCliSessions(projectPath, baseagent, boundSessionIds.size + displayLimit);
+        const cliSessions = await this.scanCliSessions(projectPath, baseagent, boundSessionIds.size + displayLimit, agentAid);
         return cliSessions
             .filter(session => !boundSessionIds.has(session.uuid))
             .slice(0, displayLimit);
@@ -1344,25 +1341,25 @@ export class SessionManager {
         }
         return sessionIds;
     }
-    checkSessionFileExists(projectPath, agentSessionId, baseagent) {
+    checkSessionFileExists(projectPath, agentSessionId, baseagent, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter)
             return false;
-        return adapter.checkExists(projectPath, agentSessionId);
+        return adapter.checkExists(projectPath, agentSessionId, agentAid);
     }
-    readSessionFirstMessage(projectPath, agentSessionId, baseagent) {
+    readSessionFirstMessage(projectPath, agentSessionId, baseagent, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter)
             return null;
-        return adapter.readFirstMessage(projectPath, agentSessionId);
+        return adapter.readFirstMessage(projectPath, agentSessionId, agentAid);
     }
-    readSessionLastUserMessage(projectPath, agentSessionId, baseagent) {
+    readSessionLastUserMessage(projectPath, agentSessionId, baseagent, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter)
             return null;
-        return adapter.readLastUserMessage(projectPath, agentSessionId);
+        return adapter.readLastUserMessage(projectPath, agentSessionId, agentAid);
     }
-    getSessionFileInfo(projectPath, agentSessionId, baseagent) {
+    getSessionFileInfo(projectPath, agentSessionId, baseagent, agentAid) {
         if (!baseagent) {
             logger.error(`[SessionManager] getSessionFileInfo: baseagent is empty, returning turns=0. agentSessionId=${agentSessionId}`);
             return { turns: 0 };
@@ -1372,13 +1369,13 @@ export class SessionManager {
             logger.error(`[SessionManager] getSessionFileInfo: no adapter for baseagent=${baseagent}, returning turns=0`);
             return { turns: 0 };
         }
-        return adapter.getFileInfo(projectPath, agentSessionId);
+        return adapter.getFileInfo(projectPath, agentSessionId, agentAid);
     }
-    async listSdkSessions(projectPath, baseagent) {
+    async listSdkSessions(projectPath, baseagent, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter?.listSdkSessions)
             return [];
-        return adapter.listSdkSessions(projectPath);
+        return adapter.listSdkSessions(projectPath, agentAid);
     }
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
         const chatDir = this.resolveChatDirSafe(channel, channelId);
@@ -1391,15 +1388,16 @@ export class SessionManager {
         }
         return matched[0];
     }
-    async importCliSession(channel, channelId, projectPath, agentSessionId, baseagent = 'claude') {
+    async importCliSession(channel, channelId, projectPath, agentSessionId, baseagent = 'claude', agentAid) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
-        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId, baseagent);
+        const resolvedAgentAid = agentAid || this.deriveChannelIdentity(channel, channelId).selfAID;
+        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId, baseagent, resolvedAgentAid);
         const name = fileInfo.title || `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`;
         // Derive selfAID and channelType from existing sessions
         const existingDir = this.findExistingChatDir(channel, channelId);
         const identity = this.deriveChannelIdentity(channel, channelId);
         let channelType = identity.channelType;
-        let selfAID = identity.selfAID;
+        let selfAID = identity.selfAID || resolvedAgentAid || '';
         if (existingDir) {
             const active = readJsonFile(path.join(existingDir, 'active.json'));
             if (active) {

package/dist/core/session/session-title.js

@@ -30,6 +30,7 @@ const BACKEND_SYNTHETIC_CLI_PROMPT_PREFIXES = {
     ],
     codex: [],
     gemini: [],
+    ecagent: [],
 };
 // Claude Code 斜杠命令 / skill / hook 注入的脚手架，经真实会话数据核对，形态包括：
 // - <local-command-caveat> / <local-command-stdout> / <local-command-stderr> 等 local-command 标签族

package/dist/core/session/session-turn-coordinator.js

@@ -142,9 +142,16 @@ export class SessionTurnCoordinator {
         if (evidence.openToolUseIds.length > 0)
             return { ok: false, reason: 'tool_open' };
         const madeProgress = evidence.textCount > 0 || evidence.toolUseCount > 0 || !!evidence.resultText?.trim();
-        if (!evidence.inputAccepted && !madeProgress)
+        // Not every runner can emit input_accepted. Token usage is equally strong
+        // evidence that the upstream model consumed the input, even for a silent result.
+        const inputConsumed = evidence.inputAccepted
+            || evidence.hasTokenUsage === true
+            || evidence.inputTokens > 0
+            || evidence.outputTokens > 0;
+        if (!inputConsumed && !madeProgress)
             return { ok: false, reason: 'input_not_consumed' };
         const emptySuccess = !evidence.explicitNoop
+            && !evidence.hasTokenUsage
             && evidence.inputTokens === 0
             && evidence.outputTokens === 0
             && !madeProgress;

package/dist/core/system-channels.js

@@ -14,6 +14,7 @@ export function isSystemControlChannel(channel) {
 export function isNonAgentSessionChannel(channel) {
     return channel === 'daemon' || isSystemControlChannel(channel);
 }
+/** Explicit maintenance helper; startup never invokes it. */
 export function cleanupLegacySystemControlSessions(sessionsDir) {
     const removed = [];
     for (const channel of LEGACY_SYSTEM_CONTROL_CHANNELS) {

package/dist/index.js

@@ -1,7 +1,7 @@
 // 【重要】最先加载环境变量，确保后续模块初始化时可用
 import dotenv from 'dotenv';
 import path from 'path';
-import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath, eckDebugDir } from './paths.js';
+import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath, eckDebugDir, daemonControlDir, daemonQueuePath } from './paths.js';
 // 立即加载 .env 文件（在其他模块导入之前）
 try {
     dotenv.config({ path: path.join(resolvePaths().root, '.env') });
@@ -12,6 +12,7 @@ catch {
 import { ClaudeSessionFileAdapter } from './core/session/adapters/claude-session-file-adapter.js';
 import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-file-adapter.js';
 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 { ensureRoleConfigV4OnStartup } from './config/role-config-v4-startup.js';
@@ -30,6 +31,7 @@ import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
 import { GeminiAgentPlugin } from './agents/gemini-runner.js';
+import { EcagentAgentPlugin } from './agents/ecagent-runner.js';
 import { FeishuChannelPlugin, registerPendingFeishuContactBind } from './channels/feishu.js';
 import { WechatChannelPlugin, registerPendingWechatContactBind } from './channels/wechat.js';
 import { AUN_HANDOFF_MARKER_FIELD, AUNChannel, AUNChannelPlugin } from './channels/aun.js';
@@ -78,13 +80,13 @@ import { TriggerAuditLogger } from './trigger/audit.js';
 import { TriggerScriptExecutor } from './trigger/script-executor.js';
 import { TriggerFeedbackDispatcher } from './trigger/feedback.js';
 import { TriggerRuntimeScheduler } from './trigger/scheduler.js';
+import { TargetSessionLockRegistry } from './trigger/session-lock.js';
 import { DaemonChannel } from './channels/daemon.js';
 import { definitionRevision, normalizeTriggerDefinition } from './trigger/validation.js';
 import { applyTriggerPatch } from './trigger/patch.js';
 import { validateModelSelectionForRole } from './core/model/model-permission.js';
 import { constrainRuntimePermissionMode, validateRuntimeStringFieldOverride, } from './core/role/runtime-policy.js';
 import { atomicWriteJson } from './core/session/session-fs-store.js';
-import { cleanupLegacySystemControlSessions } from './core/system-channels.js';
 import { appendMessageLog, buildOutboundEntry, classifyAunPayloadForLog } from './core/message/message-log.js';
 import fs from 'fs';
 import crypto from 'crypto';
@@ -844,21 +846,19 @@ async function main() {
         });
         return roleToSessionIdentity(detail.effectiveRole);
     };
-    const removedLegacyControlSessions = cleanupLegacySystemControlSessions(paths.sessionsDir);
-    if (removedLegacyControlSessions.length > 0) {
-        logger.info(`[startup] Removed legacy synthetic control sessions: ${removedLegacyControlSessions.join(', ')}`);
-    }
     const sessionManager = new SessionManager(paths.sessionsDir, eventBus, resolveSessionIdentity);
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
     sessionManager.registerFileAdapter(new ClaudeSessionFileAdapter());
     sessionManager.registerFileAdapter(new CodexSessionFileAdapter());
     sessionManager.registerFileAdapter(new GeminiSessionFileAdapter());
+    sessionManager.registerFileAdapter(new EcagentSessionFileAdapter());
     // Agent 插件系统：每个 EvolAgent × 每个 baseagent 一个独立 runner（H1/H2 修复）
     const agentLoader = new AgentLoader();
     agentLoader.register(new ClaudeAgentPlugin());
     agentLoader.register(new CodexAgentPlugin());
     agentLoader.register(new GeminiAgentPlugin());
+    agentLoader.register(new EcagentAgentPlugin());
     const agentInstances = agentLoader.createAll(agentRegistry, {
         onSessionIdUpdate: async (sessionId, agentSessionId) => {
             await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
@@ -1010,7 +1010,7 @@ async function main() {
     const messageQueue = new MessageQueue(async (message) => {
         await processor.processMessage(message);
     }, {
-        persistencePath: path.join(resolvePaths().dataDir, 'message-queue.json'),
+        persistencePath: daemonQueuePath(),
     });
     // 设置中断回调（精确中断正在处理的 agent）
     messageQueue.setInterruptCallback(async (sessionKey, baseagent, evolagentName, reason = 'new_message') => {
@@ -1074,6 +1074,7 @@ async function main() {
     responseEngine.setHandoffRuntime(handoffRuntime);
     // Trigger runtime: daemon-level script + feedback scheduler.
     const triggerSchedulers = new Map();
+    const targetSessionLocks = new TargetSessionLockRegistry();
     const triggerAudit = new TriggerAuditLogger();
     const triggerScriptExecutor = new TriggerScriptExecutor();
     const daemonChannel = new DaemonChannel(sessionManager, messageQueue, {
@@ -1446,7 +1447,7 @@ async function main() {
             baseagent: owner.baseagent,
             getBaseagent: () => agentRegistry.get(owner.aid)?.baseagent || owner.baseagent,
             authorizeExecution: authorizeTriggerExecution,
-        }, eventBus);
+        }, eventBus, targetSessionLocks);
         triggerSchedulers.set(owner.aid, scheduler);
         try {
             await scheduler.init();
@@ -1710,7 +1711,7 @@ async function main() {
     }
     const connectedChannels = new Set();
     const onlineNoticeSent = new Set();
-    const pendingFile = path.join(resolvePaths().dataDir, 'restart-pending.json');
+    const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
     let pendingRestartNoticeInFlight = null;
     let pendingRestartNoticeSent = false;
     const sendOnlineNoticeForChannel = (inst) => {
@@ -1960,7 +1961,9 @@ async function main() {
                 }
             }
             else {
-                logger.warn(`ECWeb 配置已启用但未找到 ${ecwebEntry}`);
+                // 正式安装时 ECWeb 是独立的全局 ec-web 包，由 ec start/restart 的
+                // 启动链路管理；runtime 目录没有内嵌构建产物是正常状态。
+                logger.debug(`ECWeb runtime entry absent (managed externally): ${ecwebEntry}`);
             }
         }
         // 控制 AID 接收 owner 指令：