evolcore 0.0.35 → 0.0.37

package/dist/core/command/menu-protocol.js

@@ -5,6 +5,7 @@ import { readInstalledEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { compareStableSemver, parseStableSemver } from '../../utils/stable-semver.js';
 import { logger } from '../../utils/logger.js';
 import { validateIdleSeconds } from '../session/session-idle-monitor.js';
+import { parseFileSearchArgs } from './file-search.js';
 export const MENU_REQUEST_TYPES = new Set([
     'menu.token.request',
     'menu.list',
@@ -13,6 +14,20 @@ export const MENU_REQUEST_TYPES = new Set([
     'menu.update',
     'menu.action',
 ]);
+export function parseMenuEvent(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        throw Object.assign(new Error('Menu event must be an object'), { code: 'INVALID_EVENT' });
+    const event = value;
+    if (event.type !== 'menu.event' || !['upgrade.progress', 'upgrade.result'].includes(String(event.event))
+        || typeof event.requestId !== 'string' || !event.requestId.trim()
+        || typeof event.jobId !== 'string' || !/^job_[a-f0-9-]{36}$/.test(event.jobId)
+        || !Number.isSafeInteger(event.seq) || event.seq < 1
+        || !['upgrade-check', 'downloading', 'tarball-check', 'preflight', 'restart'].includes(String(event.phase))
+        || typeof event.status !== String.name.toLowerCase() || typeof event.message !== String.name.toLowerCase()) {
+        throw Object.assign(new Error('Invalid Menu event'), { code: 'INVALID_EVENT' });
+    }
+    return value;
+}
 export function buildMenuClientProtectedHeaders(input) {
     const clientName = input.clientName ?? 'evol';
     if (clientName === 'ec-menu-client') {
@@ -377,6 +392,14 @@ export function validateMenuRequest(request) {
             return { code: 'INVALID_ARGUMENT', message: 'File fetch requires args.path' };
         }
     }
+    if (type === 'menu.action' && (request.name === 'file' || request.cmd === '/file') && request.action === 'search') {
+        try {
+            parseFileSearchArgs(request.args);
+        }
+        catch (error) {
+            return { code: 'INVALID_ARGUMENT', message: error.message };
+        }
+    }
     if ((request.name === 'file' || request.cmd === '/file') && request.args !== undefined) {
         const args = request.args;
         if (args.rootId !== undefined && (typeof args.rootId !== 'string' || args.rootId.trim().length === 0)) {

package/dist/core/command/role-menu.js

@@ -11,7 +11,7 @@ import { listOperations } from '../auth/operation-catalog.js';
 import { auditRoleMutation } from '../auth/authorization-audit.js';
 import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
 import { agentDir, agentRoleConfig, agentRolesIndex, agentRelationConfig, agentRelationsDir, resolvePaths } from '../../paths.js';
-import { atomicReadJson, atomicWrite, atomicWriteJson } from '../../utils/atomic-write.js';
+import { atomicReadJson, atomicWrite } from '../../utils/atomic-write.js';
 import { fileCache } from '../daemon-file-cache.js';
 import { currentVersion } from '../../config/schema-registry.js';
 import { loadSchema } from '../../config/schema-registry.js';
@@ -22,6 +22,7 @@ import { isExplicitGroupId } from '../../aun/group/index.js';
 import { readJsonFile, readLastJsonlLine, scanChatDirs, scanMetaFiles } from '../session/session-fs-store.js';
 import { constrainResolvedModelForRole } from '../model/model-permission.js';
 import { resolveRuntimePermissionMode, resolveRuntimeStringField } from '../role/runtime-policy.js';
+import { mutateContactBookTransactionSync } from '../../config/contact-book-store.js';
 import { readRoleDefinition, readRoleRegistry, registerRole, writeRoleDefinition, writeRoleRegistry, } from '../../config/role-service.js';
 import { clearRoleStoreCache, readRoleStore, roleRegistryExists } from '../../config/role-store.js';
 const ROLE_MENU_SCHEMA_VERSION = 1;
@@ -1428,24 +1429,11 @@ function normalizeRelationForScene(value, scene) {
     return normalized;
 }
 function commitJournal(self, changes) {
-    const journalFile = roleJournalPath(self);
-    const journal = { $schema_version: 1, self, state: 'prepared', changes };
-    atomicWriteJson(journalFile, journal);
-    try {
-        for (const change of changes)
-            applyFileContent(change.file, change.after);
-        journal.state = 'committed';
-        atomicWriteJson(journalFile, journal);
-        removeJournalFiles(journalFile);
-        invalidateChanges(changes);
-    }
-    catch (error) {
-        try {
-            recoverRoleMutationSync(self);
-        }
-        catch { }
-        throw error;
-    }
+    mutateContactBookTransactionSync({
+        selfAid: self,
+        actor: 'role-delete-transaction',
+        mutation: { type: 'sync-management-roles' },
+    }, changes);
 }
 function removeJournalFiles(journalFile) {
     // Remove backups first. If the process exits mid-cleanup, a committed main

package/dist/core/command/skill-slash.js

@@ -12,6 +12,7 @@
  */
 import fs from 'fs';
 import path from 'path';
+import { spawnSync } from 'child_process';
 import { agentDir, getPackageRoot, resolveRoot } from '../../paths.js';
 import { resolveAllSkillStates } from '../skill/switch-resolver.js';
 import { readSkillDescription } from '../skill/index-generator.js';
@@ -21,7 +22,10 @@ import { resolveAgentLifecycle } from '../../config/lifecycle.js';
 const USAGE = [
     '用法:',
     '  /skill                  技能概览（启用数 / 总数）',
-    '  /skill list [all]       技能列表（默认仅启用；all 显示未启用的）',
+    '  /skill list [all|--all] [--filter <kw>]... [--page <n>] [--limit <n>]',
+    '                          技能列表（默认仅启用；all/--all 显示全部；超出 limit 条自动分页并提示翻页和 filter 方法）',
+    '  /skill load <name>      加载技能正文（输出 SKILL.md 内容 + skillDir）',
+    '  /skill path <name>      查看技能 SKILL.md 完整路径（含状态和时间戳）',
     '  /skill index            查看技能索引加载情况（哪些索引文件被加载、时间、技能数）',
     '  /skill index builtin    查看内置技能索引正文',
     '  /skill index local      查看本机技能索引正文',
@@ -52,7 +56,10 @@ export function skillHelpEntries(ctx) {
     const roles = [ctx.role];
     const out = [
         { command: '/skill list', description: '已启用的技能列表', category, roles },
-        { command: '/skill list all', description: '全部技能列表（含未启用）', category, roles },
+        { command: '/skill list --all', description: '全部技能列表（含未启用）', category, roles },
+        { command: '/skill list', description: '按关键词筛选技能（匹配名称+描述；组内逗号为或，多个 --filter 为且）', args: "--filter '<kw1,kw2>'", category, roles },
+        { command: '/skill load', description: '加载技能正文（输出 SKILL.md 内容 + skillDir）', args: '<name>', category, roles },
+        { command: '/skill path', description: '查看技能 SKILL.md 路径（含状态和时间戳）', args: '<name>', category, roles },
         { command: '/skill index', description: '技能索引加载情况（文件、时间、技能数）', category, roles },
         { command: '/skill index builtin', description: '查看内置技能索引正文', category, roles },
         { command: '/skill index local', description: '查看本机技能索引正文', category, roles },
@@ -76,29 +83,16 @@ function skillRoots(selfAid) {
 function agentRootFor(selfAid) {
     return selfAid ? agentDir(selfAid) : undefined;
 }
+function overviewLine(states) {
+    const enabled = states.filter(s => s.enabled).length;
+    return `${states.length} 个技能，${enabled} 个启用`;
+}
 function sourceLabel(source) {
     return source === 'builtin' ? '内置' : '本机';
 }
 function stateLabel(s) {
     return s.enabled ? '开' : '关';
 }
-function overviewLine(states) {
-    const enabled = states.filter(s => s.enabled).length;
-    return `${states.length} 个技能，${enabled} 个启用`;
-}
-function formatList(states, showAll) {
-    const shown = showAll ? states : states.filter(s => s.enabled);
-    if (shown.length === 0) {
-        return showAll ? '（没有任何技能）' : '（没有启用的技能；用 /skill list all 查看全部）';
-    }
-    const nameW = Math.max(20, ...shown.map(s => s.name.length + 2));
-    const lines = [`${overviewLine(states)}${showAll ? '' : '（仅列启用；/skill list all 查看全部）'}`, ''];
-    for (const s of shown) {
-        const lock = s.locked ? ' [locked]' : '';
-        lines.push(`  ${s.name.padEnd(nameW)}${sourceLabel(s.source).padEnd(6)}${stateLabel(s)}${lock}`);
-    }
-    return lines.join('\n');
-}
 function formatInfo(s) {
     const desc = readSkillDescription(s.skillDir);
     const lines = [
@@ -136,13 +130,15 @@ function inspectSkillIndexes(agentRoot, selfAid, lifecycle) {
     // 只关心指向 <agentRoot>/skills/.index-*.md 的段；override 可能加段或改路径，
     // 所以按解析后的路径判断，而不是按段 id 匹配。
     const skillsDir = path.join(agentRoot, 'skills');
-    // lifecycle 与渲染器同源解析：显式非法值按 null（fail-closed），缺省按 active 兼容。
-    const resolvedLifecycle = resolveAgentLifecycle({ lifecycle });
+    // /skill index 是诊断工具，运行在已活跃的会话里；lifecycle 缺失或无法解析时
+    // 按 'active' 处理，否则 when: lifecycle = active 的段永远判成"未加载"，
+    // 产生误导性的诊断结果。
+    const resolvedLifecycle = resolveAgentLifecycle({ lifecycle }) ?? 'active';
     const vars = {
         selfAid,
         EVOLCORE_HOME: resolveRoot(),
         AGENT_DIR: agentRoot,
-        ...(resolvedLifecycle === null ? {} : { lifecycle: resolvedLifecycle }),
+        lifecycle: resolvedLifecycle,
     };
     const out = [];
     for (const section of sections) {
@@ -275,8 +271,47 @@ export async function handleSkillSlash(ctx) {
         return error('无法确定当前 agent 目录');
     try {
         if (sub === 'list') {
-            const showAll = args[1] === 'all';
-            return result(formatList(resolveAllSkillStates(root), showAll));
+            // 参数解析：/skill list [all] [--all] [--filter <kw>] [--page <n>] [--limit <n>]
+            const showAll = args.includes('all') || args.includes('--all');
+            const filterArgs = [];
+            let page = 1;
+            let limit = 20;
+            for (let i = 1; i < args.length; i++) {
+                if (args[i] === '--filter' && args[i + 1] && !args[i + 1].startsWith('--')) {
+                    // slash 内容不经 shell，页脚示例里的单/双引号会原样传进来，这里剥掉
+                    filterArgs.push(args[++i].replace(/^(['"])(.*)\1$/, '$2'));
+                }
+                else if (args[i] === '--page' && args[i + 1]) {
+                    page = parseInt(args[++i], 10) || 1;
+                }
+                else if (args[i] === '--limit' && args[i + 1]) {
+                    limit = parseInt(args[++i], 10) || 20;
+                }
+            }
+            // 调 skill.mjs CLI，以 skill-slash 的 commandStyle=slash 传入，页脚用 /skill list 格式
+            const cliScript = path.join(getPackageRoot(), 'kits', 'skills', 'ec-skill', 'scripts', 'cli.mjs');
+            const cliArgs = ['list'];
+            if (showAll)
+                cliArgs.push('--all');
+            for (const f of filterArgs)
+                cliArgs.push('--filter', f);
+            cliArgs.push('--page', String(page), '--limit', String(limit));
+            // commandStyle 通过环境变量传入，skill.mjs 读取后生成 /skill list 格式的翻页提示
+            const r = spawnSync(process.execPath, [cliScript, ...cliArgs], {
+                encoding: 'utf-8',
+                // daemon 托管多个 agent，自身 env 里没有当前 agent 身份；必须显式传入，
+                // 否则子进程定位不到 Agent 级 .switches.json，启用状态会算错
+                env: {
+                    ...process.env,
+                    SKILL_COMMAND_STYLE: 'slash',
+                    EVOLCORE_SELF_AID: ctx.selfAid,
+                    EVOLCORE_AGENT_DIR: root,
+                },
+            });
+            if (r.error)
+                return error(`调用 skill CLI 失败: ${r.error.message}`);
+            const out = (r.stdout || '').trim();
+            return result(out || (r.stderr || '').trim() || '（无输出）');
         }
         if (sub === 'show' || sub === 'info') {
             const name = args[1];
@@ -284,7 +319,7 @@ export async function handleSkillSlash(ctx) {
                 return error('用法: /skill show <name>');
             const found = resolveAllSkillStates(root).find(s => s.name === name);
             if (!found)
-                return error(`技能不存在: ${name}\n用 /skill list all 查看全部技能`);
+                return error(`技能不存在: ${name}\n用 /skill list --all 查看全部技能`);
             return result(formatInfo(found));
         }
         if (sub === 'index') {
@@ -297,6 +332,76 @@ export async function handleSkillSlash(ctx) {
             }
             return result(formatIndexOverview(inspectSkillIndexes(root, ctx.selfAid, ctx.lifecycle), ctx.selfAid));
         }
+        if (sub === 'path') {
+            const name = args[1];
+            if (!name)
+                return error('用法: /skill path <name>');
+            const states = resolveAllSkillStates(root);
+            const found = states.filter(s => s.name === name);
+            if (found.length === 0)
+                return error(`技能不存在: ${name}\n用 /skill list --all 查看全部技能`);
+            const lines = [];
+            let newestMtime = 0;
+            let newestPath = '';
+            for (const s of found) {
+                const skillMd = path.join(s.skillDir, 'SKILL.md');
+                const exists = fs.existsSync(skillMd);
+                const mtime = exists ? fs.statSync(skillMd).mtimeMs : 0;
+                const mtimeStr = exists ? new Date(mtime).toLocaleString('zh-CN') : '(文件不存在)';
+                const stateStr = s.enabled ? '开' : '关';
+                lines.push(`${s.source.padEnd(8)}${stateStr}  ${skillMd}  (${mtimeStr})`);
+                if (mtime > newestMtime) {
+                    newestMtime = mtime;
+                    newestPath = skillMd;
+                }
+            }
+            if (found.length > 1)
+                lines.push(`\n建议: ${newestPath}`);
+            return result(lines.join('\n'));
+        }
+        if (sub === 'load') {
+            const name = args[1];
+            if (!name)
+                return error('用法: /skill load <name> [--source builtin|local] [--with-frontmatter]');
+            const withFrontmatter = args.includes('--with-frontmatter');
+            const sourceArg = (() => {
+                const i = args.indexOf('--source');
+                return i >= 0 ? args[i + 1] : undefined;
+            })();
+            if (sourceArg && sourceArg !== 'builtin' && sourceArg !== 'local') {
+                return error('--source 只能是 builtin 或 local');
+            }
+            const states = resolveAllSkillStates(root);
+            let candidates = states.filter(s => s.name === name);
+            if (sourceArg)
+                candidates = candidates.filter(s => s.source === sourceArg);
+            if (candidates.length === 0) {
+                const other = states.find(s => s.name === name);
+                if (!other)
+                    return error(`技能不存在: ${name}\n用 /skill list --all 查看全部技能`);
+                // 只可能是 --source 过滤掉了：技能在另一个来源
+                const label = sourceArg === 'builtin' ? '内置级' : '本机级';
+                return error(`${label}没有技能 ${name}（该技能来自 ${other.source}，去掉 --source 或改用 --source ${other.source}）`);
+            }
+            if (candidates.length > 1) {
+                const paths = candidates.map(s => `  --source ${s.source}  ${path.join(s.skillDir, 'SKILL.md')}`).join('\n');
+                return error(`技能 ${name} 在多个来源中存在，请用 --source 指定：\n${paths}`);
+            }
+            const skill = candidates[0];
+            if (!skill.enabled) {
+                return error(`技能 ${name} 未启用，请先执行: ec skill enable ${name}`);
+            }
+            const skillMd = path.join(skill.skillDir, 'SKILL.md');
+            if (!fs.existsSync(skillMd))
+                return error(`SKILL.md 不存在: ${skillMd}`);
+            let content = fs.readFileSync(skillMd, 'utf-8');
+            if (!withFrontmatter) {
+                // 去掉 frontmatter（--- ... --- 块）
+                content = content.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n/, '');
+            }
+            const footer = `\n---\nskillDir: ${skill.skillDir}\n`;
+            return result(content.trimStart() + footer);
+        }
         if (sub === 'where')
             return result(formatWhere(ctx.selfAid));
         if (sub === 'refresh') {