evolclaw 3.1.2 → 3.1.4

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

@@ -36,8 +36,8 @@ export class SessionManager {
         // 来源2：群聊强制 proactive
         if (ct === 'group')
             return 'proactive';
-        // 来源3：非 human 对端（ai/bot）强制 proactive，无视 agent 的默认 chatmode 配置
-        if (peerType && peerType !== 'human' && peerType !== 'unknown')
+        // 来源3：非 human 对端强制 proactive，无视 agent 的默认 chatmode 配置
+        if (peerType && peerType !== 'human')
             return 'proactive';
         // 来源1：agent 配置默认值
         const resolved = this.sessionModeResolver?.(channel, ct, peerType);
@@ -92,22 +92,12 @@ export class SessionManager {
      *
      * 这样保持兼容：不知道 channelType 的 caller 仍可以用 (channel, channelId) 调用。
      */
-    resolveChatDir(channel, channelId) {
-        // 优先尝试从已有目录里找
-        const dirs = scanChatDirs(this.sessionsDir);
-        for (const d of dirs) {
-            if (d.channelId !== channelId)
-                continue;
-            // 验证 active.json 或 meta 文件里 channel（实例名）匹配
-            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
-            if (active && active.channel === channel)
-                return d.dirPath;
-            // 没 active.json 时，看 channelType 是否能匹配 channel
-            if (!active && d.channelType === channel)
-                return d.dirPath;
+    resolveChatDir(channel, channelId, channelType, selfId) {
+        // 必须有明确 channelType 才能确定路径
+        if (!channelType) {
+            throw new Error(`[SessionManager] resolveChatDir requires channelType. Got channel="${channel}" channelId="${channelId}". Caller must pass channelType (e.g. 'aun', 'feishu').`);
         }
-        // Fallback：按 channel 当 channelType 创建（旧路径布局兼容）
-        return chatDirPath(this.sessionsDir, channel, channelId);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfId);
     }
     /**
      * 给定明确的 channelType + selfId 时直接计算路径（不扫描）。
@@ -117,7 +107,7 @@ export class SessionManager {
         if (channelType) {
             return chatDirPath(this.sessionsDir, channelType, channelId, selfId);
         }
-        return this.resolveChatDir(channel, channelId);
+        return this.resolveChatDirSafe(channel, channelId);
     }
     resolveChatDirFromSession(session) {
         const channelType = session.channelType || session.channel;
@@ -128,25 +118,129 @@ export class SessionManager {
         return this.resolveChatDirFromSession(session);
     }
     /** Like resolveChatDir but also ensures the dir + _threads + _trash exist. */
-    ensureResolvedChatDir(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    ensureResolvedChatDir(channel, channelId, channelType, selfId) {
+        const dir = this.resolveChatDir(channel, channelId, channelType, selfId);
         fs.mkdirSync(dir, { recursive: true });
         fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
         fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });
         return dir;
     }
     /** 推断给定 chat 的 channelType（优先取 active.json）。无活跃时回落到 channel 实例名。 */
-    inferChannelType(channel, channelId) {
-        const active = this.readActive(channel, channelId);
-        return active?.channelType || channel;
+    inferChannelType(channel, channelId, chatDir) {
+        if (chatDir) {
+            const active = readJsonFile(path.join(chatDir, 'active.json'));
+            if (active?.channelType)
+                return active.channelType;
+        }
+        // 扫描已有目录
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel && active.channelType)
+                return active.channelType;
+        }
+        throw new Error(`[SessionManager] Cannot infer channelType for channel="${channel}" channelId="${channelId}". No existing session found.`);
     }
     /** 从 active 推断 selfId（已有 session 的复用） */
-    inferSelfId(channel, channelId) {
-        const active = this.readActive(channel, channelId);
-        return active?.selfId;
+    inferSelfId(channel, channelId, chatDir) {
+        if (chatDir) {
+            const active = readJsonFile(path.join(chatDir, 'active.json'));
+            if (active?.selfId)
+                return active.selfId;
+        }
+        // 扫描已有目录
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel)
+                return active.selfId || undefined;
+        }
+        return undefined;
     }
-    readActive(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    /**
+     * 扫描已有 chat 目录，找到匹配 channel+channelId 的目录并返回其 chatDir 路径。
+     * 用于不知道 channelType/selfId 的 caller 在调用 resolveChatDir 前定位已有目录。
+     */
+    findExistingChatDir(channel, channelId) {
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel)
+                return d.dirPath;
+            // 即使没有 active.json，也检查 meta 文件
+            const metaFiles = scanMetaFiles(d.dirPath);
+            for (const mf of metaFiles) {
+                const meta = readLastJsonlLine(path.join(d.dirPath, mf));
+                if (meta && meta.channel === channel)
+                    return d.dirPath;
+            }
+            // 仅 thread session 场景：主目录无 active.json 也无 main meta，但 _threads/ 有内容
+            const threadsDir = path.join(d.dirPath, '_threads');
+            if (fs.existsSync(threadsDir)) {
+                const threadMetas = scanMetaFiles(threadsDir);
+                for (const mf of threadMetas) {
+                    const meta = readLastJsonlLine(path.join(threadsDir, mf));
+                    if (meta && meta.channel === channel)
+                        return d.dirPath;
+                }
+            }
+        }
+        return undefined;
+    }
+    /**
+     * 安全版 resolveChatDir：先尝试用提供的 channelType/selfId，
+     * 如果没有则扫描已有目录推断。用于操作已有 session 的公共方法。
+     */
+    resolveChatDirSafe(channel, channelId, channelType, selfId) {
+        if (channelType) {
+            return this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        // 尝试从已有目录推断
+        const existingDir = this.findExistingChatDir(channel, channelId);
+        if (existingDir)
+            return existingDir;
+        throw new Error(`[SessionManager] Cannot resolve chat dir for channel="${channel}" channelId="${channelId}". No channelType provided and no existing session found.`);
+    }
+    /**
+     * 安全版 ensureResolvedChatDir：先尝试用提供的 channelType/selfId，
+     * 如果没有则扫描已有目录推断。确保目录存在。
+     */
+    ensureResolvedChatDirSafe(channel, channelId, channelType, selfId) {
+        if (channelType) {
+            return this.ensureResolvedChatDir(channel, channelId, channelType, selfId);
+        }
+        // 尝试从已有目录推断
+        const existingDir = this.findExistingChatDir(channel, channelId);
+        if (existingDir) {
+            // 确保子目录存在
+            fs.mkdirSync(existingDir, { recursive: true });
+            fs.mkdirSync(path.join(existingDir, '_threads'), { recursive: true });
+            fs.mkdirSync(path.join(existingDir, '_trash'), { recursive: true });
+            return existingDir;
+        }
+        // 回退：推断 channelType 和 selfId
+        const inferredType = this.inferChannelType(channel, channelId);
+        const inferredSelfId = this.inferSelfId(channel, channelId);
+        return this.ensureResolvedChatDir(channel, channelId, inferredType, inferredSelfId);
+    }
+    readActive(channel, channelId, channelType, selfId) {
+        let dir;
+        try {
+            dir = this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        catch {
+            // channelType not provided — try to find existing dir
+            const existingDir = this.findExistingChatDir(channel, channelId);
+            if (!existingDir)
+                return undefined;
+            dir = existingDir;
+        }
         const file = readJsonFile(path.join(dir, 'active.json'));
         if (!file)
             return undefined;
@@ -157,8 +251,17 @@ export class SessionManager {
         const file = sessionToFile(session);
         atomicWriteJson(path.join(dir, 'active.json'), file);
     }
-    clearActive(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    clearActive(channel, channelId, channelType, selfId) {
+        let dir;
+        try {
+            dir = this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        catch {
+            const existingDir = this.findExistingChatDir(channel, channelId);
+            if (!existingDir)
+                return;
+            dir = existingDir;
+        }
         const activePath = path.join(dir, 'active.json');
         try {
             fs.unlinkSync(activePath);
@@ -459,7 +562,7 @@ export class SessionManager {
             return session;
         }
         // Find existing session for default project path
-        const chatDir = this.resolveChatDir(channel, channelId);
+        const chatDir = this.resolveChatDir(channel, channelId, channelType, selfId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const existing = allSessions
             .filter(s => s.projectPath === defaultProjectPath && !s.threadId)
@@ -543,7 +646,7 @@ export class SessionManager {
         // 优先使用精确路径（channelType + selfId），避免 fallback 到错误目录
         const chatDir = (channelType && selfId)
             ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfId); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
-            : this.ensureResolvedChatDir(channelType || channel, channelId);
+            : this.ensureResolvedChatDirSafe(channel, channelId, channelType);
         const threadIndex = readThreadIndex(chatDir);
         const existingMetaId = threadIndex[threadId];
         if (existingMetaId) {
@@ -560,7 +663,7 @@ export class SessionManager {
             }
         }
         // Inherit project path & chatType from active main session
-        const activeMain = this.readActive(channel, channelId);
+        const activeMain = this.readActive(channel, channelId, channelType, selfId);
         const projectPath = (activeMain && !activeMain.threadId ? activeMain.projectPath : undefined) || defaultProjectPath;
         const inheritedChatType = (activeMain && !activeMain.threadId ? activeMain.chatType : undefined) || 'private';
         const session = {
@@ -597,7 +700,7 @@ export class SessionManager {
         const agentId = currentAgentId || 'claude';
         logger.info(`[SessionManager] switchProject: channel=${channel} channelId=${channelId} newPath=${newProjectPath} agent=${agentId}`);
         const inheritedChatType = this.getActiveChatType(channel, channelId);
-        const chatDir = this.ensureResolvedChatDir(channel, channelId);
+        const chatDir = this.ensureResolvedChatDirSafe(channel, channelId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
             .filter(s => s.projectPath === newProjectPath && (s.agentId || 'claude') === agentId && !s.threadId)
@@ -660,7 +763,7 @@ export class SessionManager {
     }
     async switchAgent(channel, channelId, projectPath, newAgentId) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
-        const chatDir = this.ensureResolvedChatDir(channel, channelId);
+        const chatDir = this.ensureResolvedChatDirSafe(channel, channelId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
             .filter(s => s.projectPath === projectPath && (s.agentId || 'claude') === newAgentId && !s.threadId)
@@ -747,8 +850,18 @@ export class SessionManager {
     async getActiveSession(channel, channelId) {
         return this.readActive(channel, channelId);
     }
+    /** 同步版 getActiveSession，支持精确路径定位（避免扫描） */
+    getActiveSessionSync(channel, channelId, channelType, selfId) {
+        return this.readActive(channel, channelId, channelType, selfId);
+    }
     async getThreadSession(channel, channelId, threadId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const threadIndex = readThreadIndex(chatDir);
         const metaId = threadIndex[threadId];
         if (!metaId)
@@ -761,12 +874,24 @@ export class SessionManager {
         return { ...session, agentSessionId: validSessionId };
     }
     async listSessions(channel, channelId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return [];
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         return sessions.sort((a, b) => b.updatedAt - a.updatedAt);
     }
     async getSessionByProjectPath(channel, channelId, projectPath) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, false);
         const matched = sessions.filter(s => s.projectPath === projectPath);
         if (matched.length === 0)
@@ -781,12 +906,24 @@ export class SessionManager {
         return matched[0];
     }
     async getSessionByName(channel, channelId, name) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         return sessions.find(s => s.name === name);
     }
     async switchToSession(channel, channelId, targetSessionId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return null;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         const target = sessions.find(s => s.id === targetSessionId);
         if (!target)
@@ -903,12 +1040,22 @@ export class SessionManager {
     }
     async createNewSession(channel, channelId, projectPath, name, agentId) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
+        let inferredType;
+        let inferredSelfId;
+        try {
+            inferredType = this.inferChannelType(channel, channelId);
+            inferredSelfId = this.inferSelfId(channel, channelId);
+        }
+        catch {
+            inferredType = channel;
+            inferredSelfId = undefined;
+        }
         const session = {
             id: generateSessionId(),
             channel,
-            channelType: this.inferChannelType(channel, channelId),
+            channelType: inferredType,
             channelId,
-            selfId: this.inferSelfId(channel, channelId),
+            selfId: inferredSelfId,
             projectPath,
             threadId: '',
             agentId: agentId || 'claude',
@@ -1000,7 +1147,7 @@ export class SessionManager {
         return adapter.listSdkSessions(projectPath);
     }
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        const chatDir = this.resolveChatDirSafe(channel, channelId);
         const sessions = this.findAllSessionsInChat(chatDir, true);
         const matched = sessions.filter(s => s.agentSessionId && s.agentSessionId.startsWith(uuidPrefix));
         if (matched.length === 0)
@@ -1046,7 +1193,7 @@ export class SessionManager {
     }
     // ─── Health status ───
     healthFilePath(channel, channelId) {
-        return path.join(this.ensureResolvedChatDir(channel, channelId), 'health.jsonl');
+        return path.join(this.ensureResolvedChatDirSafe(channel, channelId), 'health.jsonl');
     }
     /** Find the chat dir containing a given session id */
     chatDirForSession(sessionId) {

package/dist/core/trigger/manager.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { atomicWriteJson, appendJsonl } from '../session/session-fs-store.js';
+import { formatChannelKey } from '../channel-loader.js';
 import { logger } from '../../utils/logger.js';
 export class TriggerManager {
     aid;
@@ -22,6 +23,26 @@ export class TriggerManager {
             const raw = fs.readFileSync(this.triggersPath, 'utf8');
             const data = JSON.parse(raw);
             this.triggers = new Map(Object.entries(data.triggers ?? {}));
+            // Migrate old channel key format: "selfPeerId#type#name" → "type#selfPeerId#name"
+            let migrated = false;
+            for (const trigger of this.triggers.values()) {
+                const fixed = this.migrateChannelKey(trigger.targetChannel);
+                if (fixed !== trigger.targetChannel) {
+                    trigger.targetChannel = fixed;
+                    migrated = true;
+                }
+                if (trigger.createdByChannel) {
+                    const fixedBy = this.migrateChannelKey(trigger.createdByChannel);
+                    if (fixedBy !== trigger.createdByChannel) {
+                        trigger.createdByChannel = fixedBy;
+                        migrated = true;
+                    }
+                }
+            }
+            if (migrated) {
+                logger.info(`[TriggerManager] Migrated old channel key format`);
+                this.save();
+            }
             return [...this.triggers.values()];
         }
         catch (e) {
@@ -30,6 +51,22 @@ export class TriggerManager {
             return [];
         }
     }
+    /**
+     * Detect and fix old format "selfPeerId#type#name" → current "type#selfPeerId#name".
+     * Old format: first segment contains '.' (AID like "evolai.agentid.pub").
+     */
+    migrateChannelKey(key) {
+        if (!key || !key.includes('#'))
+            return key;
+        const parts = key.split('#');
+        if (parts.length !== 3)
+            return key;
+        const [first, second, third] = parts;
+        if (first.includes('.') && !second.includes('.')) {
+            return formatChannelKey({ type: second, selfPeerId: first, name: third });
+        }
+        return key;
+    }
     save() {
         const data = {
             version: 1,

package/dist/index.js

@@ -5,6 +5,7 @@ import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath } from './pat
 import { resolveAnthropicConfig } from './agents/resolve.js';
 import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded } from './config-store.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
+import dotenv from 'dotenv';
 import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
@@ -183,6 +184,8 @@ async function main() {
     logger.info(`EvolClaw v${readEvolclawVersion()} starting... (fastaun v${readFastaunVersion()})`);
     // 确保数据目录存在
     ensureDataDirs();
+    // 加载 $EVOLCLAW_HOME/.env 到 process.env（不覆盖已存在的变量）
+    dotenv.config({ path: path.join(resolvePaths().root, '.env') });
     // ── 单实例保护（pre-check + post-write self-check）──
     // pre-check：发现已有活 main 直接退出，避免起任何副作用
     {
@@ -313,7 +316,7 @@ async function main() {
         // 优先级：群聊 > nothuman > private
         if (chatType === 'group')
             return cm.group;
-        if (peerType && peerType !== 'human' && peerType !== 'unknown')
+        if (peerType && peerType !== 'human')
             return cm.nothuman;
         return cm.private;
     });

package/dist/paths.js

@@ -46,6 +46,14 @@ export function resolvePaths() {
     };
 }
 // ── AID 路径（agent.md 存放在 $EVOLCLAW_HOME/AIDs/<aid>/）──
+/**
+ * AUN SDK 数据根路径（密钥/证书/AgentMDs 等）。
+ * 与 evolclaw 数据共用 $EVOLCLAW_HOME 根，避免散落到 ~/.aun。
+ * 启动时 SDK 通过 aun_path 选项指向这里；agent.md 子目录通过 setAgentMdPath(aidsDir()) 单独设置。
+ */
+export function aunPath() {
+    return resolveRoot();
+}
 export function aidsDir() {
     return path.join(resolveRoot(), 'AIDs');
 }
@@ -109,30 +117,93 @@ export function ensureDataDirs() {
     fs.mkdirSync(p.eckDir, { recursive: true });
     fs.mkdirSync(eckDebugDir(), { recursive: true });
     fs.mkdirSync(aidsDir(), { recursive: true });
-    migrateAgentMdFromAun();
+    seedConfigTemplates();
+    migrateFromAun();
 }
+const MIGRATION_MARKER = '.migrated-from-aun';
 /**
- * One-time migration: copy agent.md from ~/.aun/AIDs/<aid>/ to $EVOLCLAW_HOME/AIDs/<aid>/
- * if the new location doesn't have it yet.
+ * 一次性迁移：把 ~/.aun 下的 SDK 数据搬到 $EVOLCLAW_HOME 下。
+ * 通过标记文件判断是否已迁移，完成后写入标记，后续版本可删除此函数。
  */
-function migrateAgentMdFromAun() {
-    const aunAidsDir = path.join(os.homedir(), '.aun', 'AIDs');
-    const ecAids = aidsDir();
-    if (!fs.existsSync(aunAidsDir) || aunAidsDir === ecAids)
+function migrateFromAun() {
+    const newRoot = resolveRoot();
+    const markerPath = path.join(newRoot, MIGRATION_MARKER);
+    if (fs.existsSync(markerPath))
+        return;
+    const oldRoot = path.join(os.homedir(), '.aun');
+    if (!fs.existsSync(oldRoot) || oldRoot === newRoot) {
+        try {
+            fs.writeFileSync(markerPath, new Date().toISOString(), 'utf-8');
+        }
+        catch { }
         return;
+    }
+    const copyFileIfMissing = (src, dst) => {
+        if (!fs.existsSync(src) || fs.existsSync(dst))
+            return;
+        fs.mkdirSync(path.dirname(dst), { recursive: true });
+        fs.copyFileSync(src, dst);
+    };
+    const copyDirIfMissing = (src, dst) => {
+        if (!fs.existsSync(src))
+            return;
+        if (!fs.statSync(src).isDirectory())
+            return;
+        for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+            const s = path.join(src, entry.name);
+            const d = path.join(dst, entry.name);
+            if (entry.isDirectory()) {
+                copyDirIfMissing(s, d);
+            }
+            else if (entry.isFile()) {
+                copyFileIfMissing(s, d);
+            }
+        }
+    };
     try {
-        for (const entry of fs.readdirSync(aunAidsDir, { withFileTypes: true })) {
-            if (!entry.isDirectory())
-                continue;
-            const oldMd = path.join(aunAidsDir, entry.name, 'agent.md');
-            const newMd = path.join(ecAids, entry.name, 'agent.md');
-            if (fs.existsSync(oldMd) && !fs.existsSync(newMd)) {
-                fs.mkdirSync(path.join(ecAids, entry.name), { recursive: true });
-                fs.copyFileSync(oldMd, newMd);
+        const oldAids = path.join(oldRoot, 'AIDs');
+        const newAids = aidsDir();
+        if (fs.existsSync(oldAids)) {
+            for (const entry of fs.readdirSync(oldAids, { withFileTypes: true })) {
+                if (!entry.isDirectory())
+                    continue;
+                copyDirIfMissing(path.join(oldAids, entry.name), path.join(newAids, entry.name));
             }
         }
+        copyDirIfMissing(path.join(oldRoot, 'CA'), path.join(newRoot, 'CA'));
+        for (const f of ['.seed', '.device_id']) {
+            copyFileIfMissing(path.join(oldRoot, f), path.join(newRoot, f));
+        }
+    }
+    catch { /* best-effort */ }
+    try {
+        fs.writeFileSync(markerPath, new Date().toISOString(), 'utf-8');
+    }
+    catch { }
+}
+/**
+ * 首次运行时从 assets/ 模板拷贝 config.json 和 .env 到 $EVOLCLAW_HOME。
+ * 已存在则跳过，不覆盖用户修改。
+ */
+function seedConfigTemplates() {
+    const root = resolveRoot();
+    const assetsDir = path.join(getPackageRoot(), 'assets');
+    const templates = [
+        { src: 'config.json.template', dst: 'config.json' },
+        { src: '.env.template', dst: '.env' },
+    ];
+    for (const { src, dst } of templates) {
+        const dstPath = path.join(root, dst);
+        if (fs.existsSync(dstPath))
+            continue;
+        const srcPath = path.join(assetsDir, src);
+        if (!fs.existsSync(srcPath))
+            continue;
+        try {
+            fs.copyFileSync(srcPath, dstPath);
+        }
+        catch { /* best-effort */ }
     }
-    catch { /* best-effort migration */ }
 }
 // ── kits 路径（始终从包内读取，不复制到 EVOLCLAW_HOME）──
 export function kitsDir() {

package/dist/utils/npm-ops.js

@@ -84,19 +84,26 @@ export function getLocalVersion() {
 }
 /**
  * 查询 npm registry 上指定包的最新版本。
- * 超时 15 秒，失败返回 null。
+ * 使用 HTTP fetch 直接查 registry API，不依赖 npm CLI。
+ * 超时 10 秒，失败返回 null。
  */
-export function checkLatestVersion(pkg = 'evolclaw') {
-    return new Promise((resolve) => {
-        execFile('npm', ['view', pkg, 'version'], { timeout: 15000 }, (err, stdout) => {
-            if (err) {
-                resolve(null);
-                return;
-            }
-            const ver = stdout.trim();
-            resolve(ver || null);
+export async function checkLatestVersion(pkg = 'evolclaw') {
+    try {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 10000);
+        const res = await fetch(`https://registry.npmjs.org/${pkg}/latest`, {
+            signal: controller.signal,
+            headers: { 'Accept': 'application/json' },
         });
-    });
+        clearTimeout(timer);
+        if (!res.ok)
+            return null;
+        const data = await res.json();
+        return data.version || null;
+    }
+    catch {
+        return null;
+    }
 }
 /**
  * 完整升级流程：检查 → 比较 → 安装（失败重试一次）

package/kits/eck_manifest.json

@@ -17,8 +17,8 @@
       "order": 20,
       "needsInjection": true,
       "when": {
-        "var": "scene",
-        "neq": "coding"
+        "var": "chatType",
+        "neq": null
       },
       "description": "身份层：我是谁"
     },
@@ -29,7 +29,7 @@
       "order": 30,
       "needsInjection": true,
       "when": {
-        "var": "scene",
+        "var": "chatType",
         "in": ["private", "group"]
       },
       "description": "关系层：跟我聊天的是谁"
@@ -56,7 +56,7 @@
         "var": "chatType",
         "neq": null
       },
-      "description": "环境层：我在什么场景下"
+      "description": "环境层：当前对话场景"
     },
     {
       "id": "channel-layer",
@@ -68,16 +68,16 @@
         "var": "channel",
         "neq": null
       },
-      "description": "渠道层：我通过什么通信"
+      "description": "渠道层：通信渠道及能力"
     },
     {
-      "id": "runtime",
+      "id": "session",
       "type": "file",
-      "file": "$PACKAGE_ROOT/kits/templates/system-fragments/runtime.md",
+      "file": "$PACKAGE_ROOT/kits/templates/system-fragments/session.md",
       "order": 60,
       "needsInjection": true,
       "when": "always",
-      "description": "运行时参数"
+      "description": "会话层：当前会话实例状态"
     },
     {
       "id": "baseagent",
@@ -92,4 +92,4 @@
       "description": "Base Agent 特定配置"
     }
   ]
-}
+}