evolclaw 2.6.3 → 2.7.0

package/dist/config.js

@@ -51,7 +51,7 @@ function loadCodexSettings() {
 export function resolveAnthropicConfig(config) {
     const settings = loadClaudeSettings();
     // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.anthropic?.apiKey;
+    const configApiKey = config.agents?.claude?.apiKey;
     const isPlaceholderKey = !configApiKey ||
         configApiKey.includes('your-') ||
         configApiKey.includes('placeholder');
@@ -59,21 +59,21 @@ export function resolveAnthropicConfig(config) {
         || process.env.ANTHROPIC_AUTH_TOKEN
         || settings.env?.ANTHROPIC_AUTH_TOKEN;
     if (!apiKey) {
-        throw new Error('No API key found. Set one of: agents.anthropic.apiKey, env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
+        throw new Error('No API key found. Set one of: agents.claude.apiKey, env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
     }
     // baseUrl 也过滤占位符
-    const configBaseUrl = config.agents?.anthropic?.baseUrl;
+    const configBaseUrl = config.agents?.claude?.baseUrl;
     const isPlaceholderUrl = configBaseUrl?.includes('api.anthropic.com');
     const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
         || process.env.ANTHROPIC_BASE_URL
         || settings.env?.ANTHROPIC_BASE_URL;
-    const model = config.agents?.anthropic?.model
+    const model = config.agents?.claude?.model
         || settings.model
         || 'sonnet';
-    const effort = config.agents?.anthropic?.effort
+    const effort = config.agents?.claude?.effort
         || settings.effortLevel
         || undefined;
-    const configExecPath = config.agents?.anthropic?.pathToClaudeCodeExecutable;
+    const configExecPath = config.agents?.claude?.pathToClaudeCodeExecutable;
     const isPlaceholderExec = !configExecPath || configExecPath.includes('your-') || configExecPath.includes('placeholder');
     const pathToClaudeCodeExecutable = isPlaceholderExec ? undefined : configExecPath;
     return { apiKey, baseUrl, model, effort, pathToClaudeCodeExecutable };
@@ -81,7 +81,7 @@ export function resolveAnthropicConfig(config) {
 export function resolveOpenaiConfig(config) {
     const codexSettings = loadCodexSettings();
     // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.openai?.apiKey;
+    const configApiKey = config.agents?.codex?.apiKey;
     const isPlaceholderKey = !configApiKey ||
         configApiKey.includes('your-') ||
         configApiKey.includes('placeholder');
@@ -89,23 +89,23 @@ export function resolveOpenaiConfig(config) {
         || process.env.OPENAI_API_KEY
         || codexSettings.apiKey;
     if (!apiKey) {
-        throw new Error('No OpenAI API key found. Set one of: agents.openai.apiKey, env OPENAI_API_KEY, or ~/.codex/auth.json');
+        throw new Error('No OpenAI API key found. Set one of: agents.codex.apiKey, env OPENAI_API_KEY, or ~/.codex/auth.json');
     }
     // baseUrl 也过滤占位符（与 anthropic 保持一致：只检查默认域名）
-    const configBaseUrl = config.agents?.openai?.baseUrl;
+    const configBaseUrl = config.agents?.codex?.baseUrl;
     const isPlaceholderUrl = configBaseUrl?.includes('api.openai.com');
     const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
         || process.env.OPENAI_BASE_URL
         || codexSettings.baseUrl
         || undefined;
-    const model = config.agents?.openai?.model
+    const model = config.agents?.codex?.model
         || codexSettings.model
         || 'gpt-5.2-codex';
-    const effort = config.agents?.openai?.effort || config.agents?.openai?.reasoning || undefined;
+    const effort = config.agents?.codex?.effort || config.agents?.codex?.reasoning || undefined;
     return { apiKey, baseUrl, model, effort };
 }
 export function resolveGoogleConfig(config) {
-    const googleCfg = config.agents?.google;
+    const googleCfg = config.agents?.gemini;
     // CLI path: config → which gemini
     let cliPath = googleCfg?.cliPath || '';
     if (!cliPath) {
@@ -170,9 +170,41 @@ export function loadConfig(configPath = resolvePaths().config) {
     }
     const content = fs.readFileSync(configPath, 'utf-8');
     const config = JSON.parse(content);
+    if (migrateAgentsKeys(config)) {
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+        logger.warn(`Config migrated: agents.{anthropic,openai,google} → {claude,codex,gemini} in ${configPath}`);
+    }
     validateConfig(config);
     return config;
 }
+/**
+ * Rename legacy agent config keys to runner names.
+ * Returns true if any rename happened.
+ */
+function migrateAgentsKeys(config) {
+    const agents = config?.agents;
+    if (!agents || typeof agents !== 'object')
+        return false;
+    const renames = [
+        ['anthropic', 'claude'],
+        ['openai', 'codex'],
+        ['google', 'gemini'],
+    ];
+    let changed = false;
+    for (const [oldKey, newKey] of renames) {
+        if (agents[oldKey] === undefined)
+            continue;
+        if (agents[newKey] === undefined) {
+            agents[newKey] = agents[oldKey];
+        }
+        else {
+            logger.warn(`Config has both agents.${oldKey} and agents.${newKey}; keeping new key, dropping legacy one`);
+        }
+        delete agents[oldKey];
+        changed = true;
+    }
+    return changed;
+}
 export function saveConfig(config, configPath = resolvePaths().config) {
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
 }
@@ -309,26 +341,16 @@ export function setChannelShowActivities(config, instanceName, mode) {
     }
 }
 /**
- * 读取通道实例的 sessionMode 锁定配置
- * 返回 undefined 表示未配置（由 session-manager 按 chatType 默认决定）
+ * 读取全局 chatmode 配置的默认 sessionMode
+ * 按 chatType 返回对应模式，未配置时返回 undefined（由 session-manager 回退到 'interactive'）
  */
-export function getChannelSessionMode(config, instanceName) {
-    for (const type of channelTypes) {
-        const raw = config.channels?.[type];
-        if (raw === undefined)
-            continue;
-        if (Array.isArray(raw)) {
-            const inst = raw.find((item) => item.name === instanceName);
-            if (inst)
-                return inst.sessionMode;
-        }
-        else {
-            const effectiveName = raw.name ?? type;
-            if (effectiveName === instanceName)
-                return raw.sessionMode;
-        }
-    }
-    return undefined;
+export function getDefaultSessionMode(config, chatType) {
+    const cm = config.chatmode;
+    if (!cm)
+        return undefined;
+    if (chatType === 'group')
+        return cm.group;
+    return cm.private;
 }
 export function isOwner(config, channelOrType, userId) {
     // 按实例名精确匹配
@@ -441,29 +463,33 @@ export function ensureDir(dirPath) {
         fs.mkdirSync(dirPath, { recursive: true });
     }
 }
-// agents.defaultAgent → config key 映射
-const agentKeyMap = { claude: 'anthropic', codex: 'openai', gemini: 'google' };
 /**
  * 配置结构完整性校验（不校验凭据有效性）。
  * 要求 agents/channels/projects 三段同时具备必要的锚点字段。
  */
 export function validateConfigIntegrity(config) {
     const reasons = [];
-    // agents
+    // agents — 单 agent 时自动推断，无需显式 defaultAgent
     const defaultAgent = config.agents?.defaultAgent;
     if (!defaultAgent) {
-        reasons.push('Missing agents.defaultAgent');
+        const agentKeys = Object.keys(config.agents || {}).filter(k => k !== 'defaultAgent');
+        const configuredAgents = agentKeys.filter(k => config.agents?.[k]);
+        if (configuredAgents.length === 0 && agentKeys.length !== 1) {
+            reasons.push('Missing agents.defaultAgent (multiple or no agents configured)');
+        }
     }
     else {
-        const key = agentKeyMap[defaultAgent] || defaultAgent;
-        if (!config.agents?.[key]) {
-            reasons.push(`agents.defaultAgent='${defaultAgent}' but agents.${key} does not exist`);
+        if (!config.agents?.[defaultAgent]) {
+            reasons.push(`agents.defaultAgent='${defaultAgent}' but agents.${defaultAgent} does not exist`);
         }
     }
-    // channels
+    // channels — 单通道时自动推断，无需显式 defaultChannel
     const defaultChannel = config.channels?.defaultChannel;
     if (!defaultChannel) {
-        reasons.push('Missing channels.defaultChannel');
+        const channelKeys = channelTypes.filter(t => config.channels?.[t]);
+        if (channelKeys.length === 0) {
+            reasons.push('Missing channels.defaultChannel (no channels configured)');
+        }
     }
     else {
         if (!config.channels?.[defaultChannel]) {

package/dist/core/command-handler.js

@@ -1,5 +1,5 @@
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
-import { saveConfig, resolvePaths, getPackageRoot, getOwner, getChannelShowActivities, setChannelShowActivities, getChannelSessionMode } from '../config.js';
+import { saveConfig, resolvePaths, getPackageRoot, getOwner, getChannelShowActivities, setChannelShowActivities } from '../config.js';
 import { logger } from '../utils/logger.js';
 import crypto from 'crypto';
 import path from 'path';
@@ -112,7 +112,7 @@ const aliases = {
     '/rw': '/rewind'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode'];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/aid', '/agentmd'];
 export class CommandHandler {
     sessionManager;
     config;
@@ -150,9 +150,15 @@ export class CommandHandler {
             this.defaultAgentId = agentRunnerOrMap.name;
         }
     }
-    /** 项目列表快捷访问 */
+    /** 项目列表快捷访问（list 缺失时用 defaultPath 作为唯一项目） */
     get projects() {
-        return this.config.projects?.list || {};
+        const list = this.config.projects?.list;
+        if (list && Object.keys(list).length > 0)
+            return list;
+        const dp = this.config.projects?.defaultPath;
+        if (dp)
+            return { [path.basename(dp)]: dp };
+        return {};
     }
     /** 根据项目路径查找配置中的项目名称 */
     getConfiguredProjectName(projectPath) {
@@ -532,6 +538,7 @@ export class CommandHandler {
         if (normalizedContent !== content) {
             logger.debug(`[CommandHandler] normalized: "${content}" -> "${normalizedContent}"`);
         }
+        logger.info(`[CommandHandler] handle: channel=${channel} channelId=${channelId} cmd="${normalizedContent.split(' ')[0]}" user=${userId ?? 'n/a'} role=${identity?.role ?? 'n/a'}`);
         // 话题内禁用部分命令
         if (threadId) {
             const threadBlocked = ['/new', '/slist', '/plist', '/bind', '/s', '/session', '/project', '/p', '/fork', '/del', '/agent'];
@@ -701,7 +708,7 @@ export class CommandHandler {
                 if (!hasPermissionController(permAgent)) {
                     return '❌ 权限控制不可用';
                 }
-                const defaultPermMode = identity.role === 'owner' ? 'bypass' : 'readonly';
+                const defaultPermMode = identity.role === 'owner' ? 'bypass' : 'auto';
                 const currentMode = permSession.metadata?.permissionMode ?? defaultPermMode;
                 const modes = permAgent.listModes();
                 // 尝试发送交互卡片
@@ -737,6 +744,10 @@ export class CommandHandler {
                                     const adapter = this.adapters.get(channel);
                                     adapter?.sendText(channelId, result, replyCtx);
                                 }
+                                else {
+                                    // 切换成功后重新发新卡片（会自动 invalidate 旧卡片）
+                                    await this.handle('/perm', channel, channelId, undefined, userId, threadId);
+                                }
                             }
                         },
                     });
@@ -1008,14 +1019,14 @@ export class CommandHandler {
             // evolclaw.json 配了 → 写 evolclaw.json
             // evolclaw.json 没配 → 写 agent 全局配置
             if (isCodexAgent) {
-                const configuredInEvolclaw = !!(this.config.agents?.openai?.model || this.config.agents?.openai?.reasoning);
+                const configuredInEvolclaw = !!(this.config.agents?.codex?.model || this.config.agents?.codex?.reasoning);
                 if (configuredInEvolclaw) {
-                    if (!this.config.agents.openai)
-                        this.config.agents.openai = {};
+                    if (!this.config.agents.codex)
+                        this.config.agents.codex = {};
                     if (newModel)
-                        this.config.agents.openai.model = newModel;
+                        this.config.agents.codex.model = newModel;
                     if (newEffort)
-                        this.config.agents.openai.reasoning = newEffort;
+                        this.config.agents.codex.reasoning = newEffort;
                     try {
                         saveConfig(this.config);
                     }
@@ -1025,12 +1036,12 @@ export class CommandHandler {
                 }
                 else {
                     // Codex 全局配置（~/.codex/config.toml）目前不支持写入，回退到 evolclaw.json
-                    if (!this.config.agents.openai)
-                        this.config.agents.openai = {};
+                    if (!this.config.agents.codex)
+                        this.config.agents.codex = {};
                     if (newModel)
-                        this.config.agents.openai.model = newModel;
+                        this.config.agents.codex.model = newModel;
                     if (newEffort)
-                        this.config.agents.openai.reasoning = newEffort;
+                        this.config.agents.codex.reasoning = newEffort;
                     try {
                         saveConfig(this.config);
                     }
@@ -1040,14 +1051,14 @@ export class CommandHandler {
                 }
             }
             else {
-                const configuredInEvolclaw = !!(this.config.agents?.anthropic?.model || this.config.agents?.anthropic?.effort);
+                const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
                 if (configuredInEvolclaw) {
-                    if (!this.config.agents.anthropic)
-                        this.config.agents.anthropic = {};
+                    if (!this.config.agents.claude)
+                        this.config.agents.claude = {};
                     if (newModel)
-                        this.config.agents.anthropic.model = newModel;
+                        this.config.agents.claude.model = newModel;
                     if (newEffort)
-                        this.config.agents.anthropic.effort = newEffort;
+                        this.config.agents.claude.effort = newEffort;
                     try {
                         saveConfig(this.config);
                     }
@@ -1146,8 +1157,8 @@ export class CommandHandler {
                 effortAgent.setEffort?.(undefined);
                 const isCodex = effortAgent.name === 'codex';
                 if (isCodex) {
-                    if (this.config.agents?.openai?.reasoning) {
-                        delete this.config.agents.openai.reasoning;
+                    if (this.config.agents?.codex?.reasoning) {
+                        delete this.config.agents.codex.reasoning;
                         try {
                             saveConfig(this.config);
                         }
@@ -1155,9 +1166,9 @@ export class CommandHandler {
                     }
                 }
                 else {
-                    const configuredInEvolclaw = !!this.config.agents?.anthropic?.effort;
+                    const configuredInEvolclaw = !!this.config.agents?.claude?.effort;
                     if (configuredInEvolclaw) {
-                        delete this.config.agents.anthropic.effort;
+                        delete this.config.agents.claude.effort;
                         try {
                             saveConfig(this.config);
                         }
@@ -1183,20 +1194,20 @@ export class CommandHandler {
                 this.config.agents = {};
             const isCodex = effortAgent.name === 'codex';
             if (isCodex) {
-                if (!this.config.agents.openai)
-                    this.config.agents.openai = {};
-                this.config.agents.openai.reasoning = newEffort;
+                if (!this.config.agents.codex)
+                    this.config.agents.codex = {};
+                this.config.agents.codex.reasoning = newEffort;
                 try {
                     saveConfig(this.config);
                 }
                 catch { }
             }
             else {
-                const configuredInEvolclaw = !!(this.config.agents?.anthropic?.model || this.config.agents?.anthropic?.effort);
+                const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
                 if (configuredInEvolclaw) {
-                    if (!this.config.agents.anthropic)
-                        this.config.agents.anthropic = {};
-                    this.config.agents.anthropic.effort = newEffort;
+                    if (!this.config.agents.claude)
+                        this.config.agents.claude = {};
+                    this.config.agents.claude.effort = newEffort;
                     try {
                         saveConfig(this.config);
                     }
@@ -1456,16 +1467,14 @@ export class CommandHandler {
         if (normalizedContent === '/chatmode' || normalizedContent.startsWith('/chatmode ')) {
             if (!activeSession)
                 return '❌ 当前无活跃会话';
-            const lockedMode = getChannelSessionMode(this.config, channel);
             const arg = normalizedContent.slice(9).trim();
             const currentMode = activeSession.sessionMode || 'interactive';
             if (!arg) {
-                const lockHint = lockedMode ? `（由通道配置锁定为 ${lockedMode}）` : '';
                 const canSwitch = activeChatType !== 'group' || isAdmin;
-                if (canSwitch && !lockedMode) {
-                    return `📋 当前会话模式: ${currentMode}${lockHint}\n可选: interactive / proactive\n用法: /chatmode <模式>`;
+                if (canSwitch) {
+                    return `📋 当前会话模式: ${currentMode}\n可选: interactive / proactive\n用法: /chatmode <模式>`;
                 }
-                return `📋 当前会话模式: ${currentMode}${lockHint}`;
+                return `📋 当前会话模式: ${currentMode}`;
             }
             if (arg !== 'interactive' && arg !== 'proactive') {
                 return `❌ 无效模式: ${arg}\n可选: interactive / proactive`;
@@ -1473,9 +1482,6 @@ export class CommandHandler {
             if (activeChatType === 'group' && !isAdmin) {
                 return '❌ 无权限：群聊中切换会话模式仅限管理员使用';
             }
-            if (lockedMode) {
-                return `❌ 会话模式由通道配置锁定为 ${lockedMode}，无法切换`;
-            }
             if (arg === currentMode) {
                 return `📋 当前会话模式已是 ${arg}`;
             }
@@ -1637,8 +1643,7 @@ export class CommandHandler {
             }
             const lines = [];
             const sessionMode = session.sessionMode || 'interactive';
-            const lockedMode = getChannelSessionMode(this.config, channel);
-            const chatModeLine = `会话模式: ${sessionMode}${lockedMode ? '（通道锁定）' : ''}`;
+            const chatModeLine = `会话模式: ${sessionMode}`;
             if (isAdmin) {
                 lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, chatModeLine, `会话轮数: ${sessionTurns}`);
                 if (health.consecutiveErrors > 0) {
@@ -2175,7 +2180,12 @@ export class CommandHandler {
                 return '❌ 项目路径必须是绝对路径';
             }
             if (!fs.existsSync(projectPath)) {
-                return `❌ 路径不存在: ${projectPath}`;
+                if (this.config.projects?.autoCreate) {
+                    fs.mkdirSync(projectPath, { recursive: true });
+                }
+                else {
+                    return `❌ 路径不存在: ${projectPath}`;
+                }
             }
             // 生成项目名称（使用目录名）
             const projectName = path.basename(projectPath);