evolclaw 3.1.2 → 3.1.3

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v3.1.3 (2026-05-26)
+
+### New Features
+
+- **Menu 协议拆分为 5 动词** — `menu.list` / `menu.query` / `menu.options` / `menu.update` / `menu.action`，response 统一 `error.code` 透传（`NO_ACTIVE_SESSION` / `MISSING_VALUE` / ...），`name → cmd` 由 bridge 内部映射，AUN 白名单接纳全部 `menu.*` 类型
+- **xhigh effort 档位** — Claude/Codex 新增 `xhigh` 推理强度档位，Codex 通过 `codex debug models` 动态拉取模型目录与各模型支持的 effort 列表
+- **结构化 menu options 字段** — session 子菜单返回 `preview`（首条消息预览）/ `lastActive` / `agentSessionId` / `turns` 扩展字段，所有可选项菜单返回 `selected` 标记当前值
+
+### Improvements
+
+- **命令收敛** — 移除 `/plist` `/project` `/bind` `/agentmd` `/p` 别名；`/agent` 改为 EvolAgent 管理命令；baseagent 切换统一为 `/baseagent`（别名 `/base`）；`/aid` `/rpc` `/storage` `/evolagent` 改为 ctl 专属
+- **execMenu 拆分** — `command-handler` 拆出 `execMenuQuery` / `execMenuUpdate` / `execMenuAction` 三入口，无活跃会话时多项 fallback 到 evolagent config（`/pwd` / `/chatmode` / `/dispatch` 等）
+- **EvolAgent 持久化方法** — 新增 `setActiveBaseagent` / `setChatmodePrivate` / `setDispatch`，配置变更直接落盘
+- **Codex 实例每次重建** — 通过 env 注入 `EVOLCLAW_SESSION_ID`，仅首轮拼接 `systemPromptAppend`，避免 resume 时重复污染历史
+- **Agent plugin 启用判定** — `isEnabled` 改为按 `baseagents.<name>` 配置启用，Codex 额外检测 `@openai/codex-sdk` 是否可用，`init` / `agent new` CLI 同步该判定
+- **context-too-long 提示文案** — 按 agent 是否支持 compact 区分提示，retry 后仍超长时清理 renderer 中混入的错误文本（新增 `IMRenderer.stripContextError`）
+
+### Bug Fixes
+
+- **Codex resume 历史污染** — systemPromptAppend 在 resume 轮次重复拼接到 prompt 头部，导致系统提示被反复写入对话历史
+
 ## v3.1.2 (2026-05-25)
 
 ### Improvements

package/README.md

@@ -243,14 +243,11 @@ evolclaw/
 
 ### 管理员级命令（Admin+ 可用）
 
-**项目管理**：
+**项目**：
 - `/pwd` - 显示当前项目路径
-- `/plist` - 列出所有项目（显示会话空闲时间）
-- `/p <name|path>` - 切换项目（保留会话历史）
-- `/bind <path>` - 绑定新项目目录
 
 **Agent 与模型**：
-- `/agent [name]` - 查看或切换 Agent 后端（claude / codex / gemini）
+- `/baseagent [name]` - 查看或切换 Agent 后端（claude / codex / gemini）（别名 `/base`）
 - `/model [model]` - 查看或切换模型
 - `/effort [level]` - 查看或切换推理强度（low / medium / high / max / auto）
 - `/perm [mode]` - 查看或切换权限模式（auto / edit / default / readonly）
@@ -272,7 +269,6 @@ evolclaw/
 - `/file <文件路径>` - 发送文件给用户
 - `/restart` - 重启服务（自愈机制）
 - `/repair` - 检查并修复会话
-- `/agentmd [put|set]` - 管理 AUN agent.md（仅 AUN 渠道）
 
 ## 技术栈
 

package/dist/agents/claude-runner.js

@@ -1094,7 +1094,7 @@ export class AgentRunner {
 export class ClaudeAgentPlugin {
     name = 'claude';
     isEnabled(agent) {
-        return agent.baseagent === 'claude';
+        return !!agent.config.baseagents?.claude;
     }
     createAgent(agent, callbacks) {
         const override = agent.config.baseagents?.claude;

package/dist/agents/codex-runner.js

@@ -7,6 +7,7 @@
  */
 import { resolveOpenaiConfig } from './resolve.js';
 import { logger } from '../utils/logger.js';
+import { execFileSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
@@ -17,13 +18,58 @@ const MIME_EXT = {
     'image/gif': '.gif',
     'image/webp': '.webp',
 };
-// ── Codex 模型列表 ──
-const CODEX_MODELS = ['gpt-5.3-codex', 'gpt-5.2-codex', 'gpt-5-codex', 'gpt-5.2', 'gpt-5.4'];
+const CODEX_CATALOG_FALLBACK = [
+    { slug: 'gpt-5.5', efforts: ['low', 'medium', 'high', 'xhigh'] },
+    { slug: 'gpt-5.4', efforts: ['low', 'medium', 'high', 'xhigh'] },
+    { slug: 'gpt-5.4-mini', efforts: ['low', 'medium', 'high', 'xhigh'] },
+    { slug: 'gpt-5.3-codex', efforts: ['low', 'medium', 'high', 'xhigh'] },
+    { slug: 'gpt-5.2', efforts: ['low', 'medium', 'high', 'xhigh'] },
+];
+let codexCatalogCache = null;
+export function isCodexSdkAvailable() {
+    try {
+        import.meta.resolve('@openai/codex-sdk');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function fetchCodexCatalog() {
+    if (codexCatalogCache)
+        return codexCatalogCache;
+    try {
+        const output = execFileSync('codex', ['debug', 'models'], {
+            encoding: 'utf-8',
+            timeout: 5000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        const catalog = JSON.parse(output);
+        const models = catalog.models
+            .filter(m => m.visibility === 'list')
+            .map(m => ({
+            slug: m.slug,
+            efforts: (m.supported_reasoning_levels || []).map(l => l.effort),
+        }));
+        if (models.length > 0) {
+            codexCatalogCache = models;
+            return models;
+        }
+    }
+    catch (e) {
+        logger.debug(`[CodexRunner] Failed to fetch model catalog, using fallback: ${e}`);
+    }
+    return CODEX_CATALOG_FALLBACK;
+}
+export function getCodexEfforts(model) {
+    const catalog = fetchCodexCatalog();
+    const entry = catalog.find(m => m.slug === model);
+    return entry?.efforts ?? catalog[0]?.efforts ?? ['low', 'medium', 'high'];
+}
 // ── Codex Runner ──
 export class CodexRunner {
     name = 'codex';
     capabilities = { clear: false, compact: false, fork: false };
-    codex = null;
     codexModule = null;
     model;
     effort;
@@ -39,21 +85,25 @@ export class CodexRunner {
             this.effort = this.resolvedConfig.effort;
         this.onSessionIdUpdate = callbacks.onSessionIdUpdate;
     }
-    async ensureCodex() {
-        if (!this.codex || !this.codexModule) {
+    async ensureCodex(sessionId) {
+        if (!this.codexModule) {
             const { requireOptional } = await import('../utils/npm-ops.js');
             this.codexModule = await requireOptional('@openai/codex-sdk');
-            this.codex = new this.codexModule.Codex({
-                apiKey: this.resolvedConfig.apiKey,
-                baseUrl: this.resolvedConfig.baseUrl,
-            });
         }
-        return { codex: this.codex, mod: this.codexModule };
+        const codex = new this.codexModule.Codex({
+            apiKey: this.resolvedConfig.apiKey,
+            baseUrl: this.resolvedConfig.baseUrl,
+            env: {
+                ...process.env,
+                EVOLCLAW_SESSION_ID: sessionId,
+            },
+        });
+        return { codex, mod: this.codexModule };
     }
     // ── ModelSwitcher ──
     setModel(model) { this.model = model; }
     getModel() { return this.model; }
-    listModels() { return CODEX_MODELS; }
+    listModels() { return fetchCodexCatalog().map(m => m.slug); }
     // ── Effort ──
     setEffort(effort) { this.effort = effort; }
     getEffort() { return this.effort; }
@@ -94,10 +144,14 @@ export class CodexRunner {
     }
     // ── Core: runQuery ──
     async runQuery(sessionId, prompt, projectPath, initialAgentSessionId, images, systemPromptAppend, sessionManager) {
-        // Agent ctl: 注入 EVOLCLAW_SESSION_ID 供子进程使用
-        process.env.EVOLCLAW_SESSION_ID = sessionId;
-        const { codex } = await this.ensureCodex();
+        const { codex } = await this.ensureCodex(sessionId);
         let agentSessionId = initialAgentSessionId || this.activeSessions.get(sessionId);
+        let fullPrompt = prompt;
+        // Only inject system context on the first turn; resumed Codex threads already
+        // have that context in history and repeating it will pollute the conversation.
+        if (systemPromptAppend && !agentSessionId) {
+            fullPrompt = prompt + '\n\n--- [SYSTEM_PROMPT_END] ---\n' + systemPromptAppend;
+        }
         const threadOptions = {
             workingDirectory: projectPath,
             model: this.model,
@@ -116,7 +170,7 @@ export class CodexRunner {
         let input;
         if (images?.length) {
             const tmpDir = os.tmpdir();
-            const parts = [{ type: 'text', text: prompt }];
+            const parts = [{ type: 'text', text: fullPrompt }];
             for (let i = 0; i < images.length; i++) {
                 const img = images[i];
                 const ext = MIME_EXT[img.mimeType || ''] || '.jpg';
@@ -129,7 +183,7 @@ export class CodexRunner {
             logger.info(`[CodexRunner] Attached ${images.length} image(s) as local_image`);
         }
         else {
-            input = prompt;
+            input = fullPrompt;
         }
         const { events } = await thread.runStreamed(input, { signal: controller.signal });
         // 包装为 AgentEvent 流
@@ -302,10 +356,10 @@ export class CodexRunner {
 export class CodexAgentPlugin {
     name = 'codex';
     isEnabled(agent) {
-        if (agent.baseagent !== 'codex')
-            return false;
         if (!agent.config.baseagents?.codex)
             return false;
+        if (!isCodexSdkAvailable())
+            return false;
         try {
             const override = agent.config.baseagents.codex;
             const syntheticConfig = { agents: { codex: override } };
@@ -317,8 +371,10 @@ export class CodexAgentPlugin {
         }
     }
     createAgent(agent, callbacks) {
+        if (!isCodexSdkAvailable()) {
+            throw new Error('Missing optional dependency @openai/codex-sdk');
+        }
         const override = agent.config.baseagents?.codex;
-        const syntheticConfig = { agents: { codex: override } };
         const merged = {
             agents: { codex: { ...(override || {}) } },
         };

package/dist/agents/gemini-runner.js

@@ -407,8 +407,6 @@ export class GeminiRunner {
 export class GeminiAgentPlugin {
     name = 'gemini';
     isEnabled(agent) {
-        if (agent.baseagent !== 'gemini')
-            return false;
         const geminiCfg = agent.config.baseagents?.gemini;
         if (!geminiCfg)
             return false;

package/dist/agents/kit-renderer.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { kitsDir, eckDebugDir, resolveRoot } from '../paths.js';
+import { kitsDir, eckDebugDir, resolveRoot, getPackageRoot } from '../paths.js';
 import { logger } from '../utils/logger.js';
 // ── Param descriptions (for debug output) ──
 const PARAM_DESCRIPTIONS = {
@@ -22,13 +22,48 @@ const PARAM_DESCRIPTIONS = {
     venueUid: 'venue 唯一标识',
     project: '当前项目目录名（由 CURRENT_PROJECT 派生）',
     sessionName: '会话名称',
-    sessionMode: '会话模式',
+    chatmode: '会话模式（interactive/proactive）',
     readonly: '是否只读模式',
     canSendFile: '当前渠道是否支持发文件',
     capabilities: '渠道能力列表',
     baseAgent: '当前 base agent 规范值（claude/codex/gemini/hermes）',
     baseAgentName: '当前 base agent 显示名',
 };
+function buildPathMappings(vars) {
+    const pkgRoot = getPackageRoot();
+    const evolHome = String(vars['EVOLCLAW_HOME'] || resolveRoot());
+    const selfAid = vars['selfAid'] ? String(vars['selfAid']) : '';
+    const currentProject = vars['CURRENT_PROJECT'] ? String(vars['CURRENT_PROJECT']) : '';
+    const mappings = [
+        { prefix: path.join(pkgRoot, 'kits', 'rules'), alias: '$KITS_RULES' },
+        { prefix: path.join(pkgRoot, 'kits', 'templates', 'system-fragments'), alias: '$KITS_FRAGMENTS' },
+        { prefix: path.join(pkgRoot, 'kits', 'templates'), alias: '$KITS_TEMPLATES' },
+        { prefix: path.join(pkgRoot, 'kits', 'docs'), alias: '$KITS_DOCS' },
+        { prefix: path.join(pkgRoot, 'kits'), alias: '$KITS' },
+        { prefix: pkgRoot, alias: '$PACKAGE_ROOT' },
+    ];
+    if (selfAid) {
+        mappings.push({ prefix: path.join(evolHome, 'agents', selfAid), alias: '$AGENT_DIR' });
+    }
+    mappings.push({ prefix: evolHome, alias: '$EVOLCLAW_HOME' });
+    if (currentProject) {
+        mappings.push({ prefix: currentProject, alias: '$CURRENT_PROJECT' });
+    }
+    // Sort by prefix length descending so longer (more specific) paths match first
+    mappings.sort((a, b) => b.prefix.length - a.prefix.length);
+    return mappings;
+}
+function shortenPath(filePath, mappings) {
+    const normalized = filePath.replace(/\\/g, '/');
+    for (const { prefix, alias } of mappings) {
+        const normalizedPrefix = prefix.replace(/\\/g, '/');
+        if (normalized.startsWith(normalizedPrefix)) {
+            const rest = normalized.slice(normalizedPrefix.length);
+            return alias + rest;
+        }
+    }
+    return filePath;
+}
 // ── Cache ──
 let _manifestCache = null;
 const _sessionPathCache = new Map();
@@ -49,6 +84,8 @@ export function renderKitSections(ctx) {
         loadKitManifest();
     const sections = _manifestCache;
     const fileParts = [];
+    const fragmentParts = [];
+    const pathMappings = buildPathMappings(ctx.vars);
     for (const section of sections) {
         if (section.enabled === false)
             continue;
@@ -62,14 +99,20 @@ export function renderKitSections(ctx) {
             if (!content.trim())
                 continue;
             const label = section.description ? `${section.id} — ${section.description}` : section.id;
-            fileParts.push(`Contenu de ${filePath} (${label}):\n\n${content.trimEnd()}`);
+            const displayPath = shortenPath(filePath, pathMappings);
+            const part = `Contenu de ${displayPath} (${label}):\n\n${content.trimEnd()}`;
+            fileParts.push(part);
+            if (section.needsInjection) {
+                fragmentParts.push(part);
+            }
         }
     }
     if (fileParts.length === 0)
         return '';
     const body = fileParts.join('\n\n');
     const output = `<system-reminder>\nEvolClaw Context Kit documents are shown below.\n\n${body}\n\nIMPORTANT: Use this context when it affects the current interaction.\n</system-reminder>`;
-    writeDebugFiles(ctx, output);
+    const fragmentsOutput = fragmentParts.length > 0 ? fragmentParts.join('\n\n') : '';
+    writeDebugFiles(ctx, output, fragmentsOutput);
     return output;
 }
 export function cleanEckDebug() {
@@ -234,11 +277,14 @@ function isTruthy(val) {
 // CHUNK_CONTINUE_6
 // ── Template rendering ──
 function renderTemplate(template, vars) {
-    // Pass 1: conditional sections {{?key=value}}...{{/}} and {{?key}}...{{/}}
-    let result = template.replace(/\{\{\?(\w+)(?:=([^}]*))?\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, value, body) => {
-        if (value !== undefined) {
-            return String(vars[key]) === value ? body : '';
-        }
+    // Pass 1: conditional sections {{?key=value}}, {{?key!=value}}, {{?key}}...{{/}}
+    let result = template.replace(/\{\{\?(\w+)(!=|=)([^}]*)?\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, op, value, body) => {
+        if (op === '!=')
+            return String(vars[key]) !== value ? body : '';
+        return String(vars[key]) === value ? body : '';
+    });
+    // Pass 1b: truthy-only {{?key}}...{{/}}
+    result = result.replace(/\{\{\?(\w+)\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, body) => {
         return isTruthy(vars[key]) ? body : '';
     });
     // Pass 2: variable substitution {{key}}
@@ -261,7 +307,7 @@ function getSessionCache(sessionId) {
     return cache;
 }
 // ── Debug output ──
-function writeDebugFiles(ctx, output) {
+function writeDebugFiles(ctx, output, fragmentsOutput) {
     const now = new Date();
     const ts = now.toISOString().replace(/[T:.]/g, '-').slice(0, 19);
     const dir = eckDebugDir();
@@ -278,4 +324,7 @@ function writeDebugFiles(ctx, output) {
     };
     fs.writeFile(path.join(dir, `vars-${ts}.json`), JSON.stringify(varsData, null, 2), () => { });
     fs.writeFile(path.join(dir, `context-${ts}.md`), output, () => { });
+    if (fragmentsOutput) {
+        fs.writeFile(path.join(dir, `fragments-${ts}.md`), fragmentsOutput, () => { });
+    }
 }

package/dist/aun/aid/agentmd.js

@@ -1,8 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import os from 'os';
 import { getAunClient } from './client.js';
-import { agentMdPath, aidLocalDir } from '../../paths.js';
+import { agentMdPath, aidLocalDir, resolveRoot } from '../../paths.js';
 export function buildInitialAgentMd(opts) {
     const agentName = opts.aid.split('.')[0];
     const agentType = opts.type || 'ai';
@@ -83,15 +82,16 @@ async function verifyContent(content, aid, certPem, client) {
  * Create a bare AUNClient (no createAid) for read-only operations.
  */
 async function createBareClient(aunPath) {
+    const p = aunPath ?? resolveRoot();
     const { AUNClient } = await import('@agentunion/fastaun');
-    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-    const clientOpts = { aun_path: aunPath, debug: false };
+    const caCertPath = path.join(p, 'CA', 'root', 'root.crt');
+    const clientOpts = { aun_path: p, debug: false };
     if (fs.existsSync(caCertPath))
         clientOpts.root_ca_path = caCertPath;
     return new AUNClient(clientOpts);
 }
 export async function agentmdGet(aid, opts) {
-    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
+    const aunPath = opts?.aunPath ?? resolveRoot();
     const localPath = agentMdPath(aid);
     // === Path A: local agent.md exists ===
     if (fs.existsSync(localPath)) {
@@ -109,7 +109,8 @@ export async function agentmdGet(aid, opts) {
             }
             // Fallback: local invalid → try remote
             try {
-                const remote = await client.auth.downloadAgentMd(aid);
+                const info = await client.fetchAgentMd(aid);
+                const remote = info.content;
                 if (remote) {
                     const remoteVerification = await verifyContent(remote, aid, certPem, client);
                     if (remoteVerification.status === 'verified') {
@@ -133,20 +134,13 @@ export async function agentmdGet(aid, opts) {
     const client = opts?.client ?? await createBareClient(aunPath);
     const ownClient = !opts?.client;
     try {
-        const raw = await client.auth.downloadAgentMd(aid);
+        const info = await client.fetchAgentMd(aid);
+        const raw = info.content;
         if (!opts?.withVerification) {
-            // Persist without verification
-            const aidDir = aidLocalDir(aid);
-            fs.mkdirSync(aidDir, { recursive: true });
-            fs.writeFileSync(path.join(aidDir, 'agent.md'), raw, 'utf-8');
             return raw;
         }
         const certPem = await obtainCertPem(aid, aunPath, client);
         const verification = await verifyContent(raw, aid, certPem, client);
-        // Persist to local
-        const aidDir = aidLocalDir(aid);
-        fs.mkdirSync(aidDir, { recursive: true });
-        fs.writeFileSync(path.join(aidDir, 'agent.md'), raw, 'utf-8');
         return { content: raw, verification };
     }
     finally {
@@ -158,24 +152,52 @@ export async function agentmdGet(aid, opts) {
     }
 }
 /**
- * Upload agent.md: auto-sign + upload + sync to local file.
+ * Upload agent.md: write to local file → publishAgentMd (auto-sign + upload).
  */
 export async function agentmdPut(content, opts) {
-    const aunPath = opts.aunPath ?? path.join(os.homedir(), '.aun');
+    const aunPath = opts.aunPath ?? resolveRoot();
     const client = opts.client ?? await getAunClient(opts.aid, { aunPath });
     const ownClient = !opts.client;
+    const dir = aidLocalDir(opts.aid);
+    const filePath = path.join(dir, 'agent.md');
+    const existed = fs.existsSync(filePath);
     try {
-        let signed;
-        try {
-            signed = await client.auth.signAgentMd(content);
-        }
-        catch {
-            signed = content;
-        }
-        await client.auth.uploadAgentMd(signed);
-        const dir = aidLocalDir(opts.aid);
         fs.mkdirSync(dir, { recursive: true });
-        fs.writeFileSync(path.join(dir, 'agent.md'), signed, 'utf-8');
+        fs.writeFileSync(filePath, content, 'utf-8');
+        await client.publishAgentMd();
+    }
+    catch (e) {
+        if (!existed)
+            try {
+                fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+        throw e;
+    }
+    finally {
+        if (ownClient)
+            try {
+                await client.close();
+            }
+            catch { /* ignore */ }
+    }
+}
+/**
+ * Check if agent.md is up-to-date (30-day cache), fetch if changed.
+ * Returns changed=true + content when a new version was downloaded.
+ */
+export async function agentmdSync(aid, opts) {
+    const client = opts?.client ?? await createBareClient();
+    const ownClient = !opts?.client;
+    try {
+        const state = await client.checkAgentMd(aid, 30);
+        if (!state.in_sync || !state.local_found) {
+            const info = await client.fetchAgentMd(aid);
+            return { changed: true, content: info.content };
+        }
+        const localPath = agentMdPath(aid);
+        const content = fs.existsSync(localPath) ? fs.readFileSync(localPath, 'utf-8') : undefined;
+        return { changed: false, content };
     }
     finally {
         if (ownClient)

package/dist/aun/aid/index.js

@@ -1,3 +1,3 @@
 export { isValidAid, aidList, aidCreate, aidShow, aidDelete, aidLookup, appendAidLifecycle, readAidLifecycle } from './identity.js';
-export { buildInitialAgentMd, agentmdGet, agentmdPut } from './agentmd.js';
+export { buildInitialAgentMd, agentmdGet, agentmdPut, agentmdSync } from './agentmd.js';
 export { MIN_AUN_CORE_SDK, AUN_CORE_SDK_PKG, isAunSdkVersionOk, resolveAunCoreSdkPkg, ensureAunSdk, isAunSdkReady, downloadCaRoot, getAunClient, suppressSdkLogs, } from './client.js';

package/dist/aun/rpc/connection.js

@@ -6,9 +6,12 @@ export async function createShortConnection(aid, opts) {
     const slotId = opts?.slotId ?? '';
     const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
     const { AUNClient } = await import('@agentunion/fastaun');
+    const encryptionSeed = process.env.AUN_ENCRYPTION_SEED || undefined;
     const clientOpts = { aun_path: aunPath, debug: false };
     if (fs.existsSync(caCertPath))
         clientOpts.root_ca_path = caCertPath;
+    if (encryptionSeed)
+        clientOpts.encryption_seed = encryptionSeed;
     const client = new AUNClient(clientOpts);
     await client.auth.createAid({ aid });
     const authResult = await client.auth.authenticate({ aid });