evolcore 0.0.7 → 0.0.9

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

@@ -4,10 +4,12 @@ import { modelMatches } from '../model/model-catalog.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 import { hasModelSwitcher } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
+import { execCodexCliSync, resolveCodexCliPath } from '../../utils/codex-cli.js';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { buildEnvelope } from '../message/message-utils.js';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
 import crypto from 'crypto';
 import { execFileSync } from 'child_process';
 import { CronExpressionParser } from 'cron-parser';
@@ -45,15 +47,25 @@ import { groupMenuAuthorizationArgs, groupMenuIntent, handleGroupMenu, } from '.
  */
 function getBaseagentVersion(cmd) {
     try {
-        const output = execFileSync(cmd, ['--version'], {
-            encoding: 'utf-8',
-            timeout: 3000,
-            stdio: ['ignore', 'pipe', 'pipe'],
-        }).trim();
+        const executable = cmd === 'codex' ? resolveCodexCliPath() : cmd;
+        if (!executable)
+            return null;
+        const output = cmd === 'codex'
+            ? execCodexCliSync(['--version'], {
+                encoding: 'utf-8',
+                timeout: 3000,
+                stdio: ['ignore', 'pipe', 'pipe'],
+            })
+            : execFileSync(executable, ['--version'], {
+                encoding: 'utf-8',
+                timeout: 3000,
+                stdio: ['ignore', 'pipe', 'pipe'],
+            });
+        const versionOutput = String(output).trim();
         // claude: "2.1.187 (Claude Code)" → 提取 "2.1.187"
         // gemini: "0.38.0" → 直接返回
         // codex: "codex-cli 0.142.0" → 提取 "0.142.0"
-        const match = output.match(/(\d+\.\d+\.\d+)/);
+        const match = versionOutput.match(/(\d+\.\d+\.\d+)/);
         return match ? match[1] : null;
     }
     catch {
@@ -441,9 +453,6 @@ function menuConfigSource(fieldPath, sel) {
     return null;
 }
 function menuModelConfigFieldPath(target) {
-    if (target.field === 'effort' && target.baseagent === 'codex') {
-        return `baseagents.${target.baseagent}.reasoning`;
-    }
     return target.fieldPath;
 }
 function menuChatmodeScope(args) {
@@ -1870,7 +1879,6 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         const target = resolveCapabilityTarget.call(this, { channel, args, session, evolagent, fromControlChannel });
         if ('error' in target)
             return target;
-        const identity = this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
         const data = queryCapabilityTypes(target.ctx, target.config, type);
         return { data: sanitizeCapabilityQueryForRole(data, identity.role) };
     }
@@ -2168,11 +2176,13 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         if (!subject.isDaemonOwner) {
             return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
         }
-        const owningAgent = this.getOwningAgent(channel);
         const data = {
             aid: loadDaemonConfig().aid ?? null,
             pid: process.pid,
-            node: process.version,
+            nodejs: process.version,
+            hostname: os.hostname(),
+            platform: process.platform,
+            arch: process.arch,
             uptime: Math.floor(process.uptime()),
         };
         try {
@@ -2193,14 +2203,6 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         const ecwebPkg = resolveGlobalPkg(WEB_PACKAGE_NAME);
         if (ecwebPkg?.version)
             data.ecwebVersion = ecwebPkg.version;
-        const channels = owningAgent?.channelInstanceNames?.() ?? [];
-        if (channels.length) {
-            // 将 channelKey 字符串（如 "feishu#aid#name"）解析为对象 { type, instName }
-            data.channels = channels.map((key) => {
-                const parts = key.split('#');
-                return { type: parts[0], instName: parts[2] || parts[0] };
-            });
-        }
         // 收集主机级可用的所有 baseagent 类型（检测已安装的 CLI + 版本）
         const baseagents = [];
         for (const cmd of ['claude', 'gemini', 'codex']) {
@@ -2249,7 +2251,9 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
     if (cmdBase === '/perm') {
         return { error: 'permissionMode 只能通过角色策略编辑器修改', code: 'ROLE_POLICY_MANAGED' };
     }
-    const scopeError = validateConfigWriteScope(cmdBase, args);
+    // JSON Menu 入口在 validateMenuRequest 中要求 activity 显式 scope；保留
+    // 底层 execMenuUpdate 的旧默认行为，兼容旧版 slash/内部直调调用方。
+    const scopeError = validateConfigWriteScope(cmdBase, args, { includeActivity: false });
     if (scopeError)
         return { error: scopeError.message, code: scopeError.code };
     args = withoutLegacySessionConfigArgs(args);
@@ -3506,26 +3510,43 @@ const SYSTEM_CONTROL_NAME_MAP = {
     config: '/config', capability: '/capability', role: '/role',
     group: '/group', connect: '/connect',
 };
+function menuCommandToken(cmd) {
+    if (typeof cmd !== 'string')
+        return undefined;
+    return cmd.trim().split(/\s+/, 1)[0] || undefined;
+}
 function isProcessLevelMenu(name, cmd) {
+    const cmdToken = menuCommandToken(cmd);
     return name === 'system' || name === 'agent' || name === 'gateway' || name === 'config'
-        || cmd === '/system' || cmd === '/agent' || cmd === '/gateway' || cmd === '/config';
+        || cmdToken === '/system' || cmdToken === '/agent' || cmdToken === '/gateway' || cmdToken === '/config';
 }
 async function execMenuForSystemControl(payload, context) {
     const id = payload?.id ?? '';
     const name = payload?.name;
-    if (name === 'cli' || payload?.cmd === '/cli') {
+    const compatCmd = menuCommandToken(payload?.cmd);
+    // `menu.query(/file)` returns file metadata and is authorized as
+    // `file.fetch`, while `menu.action(file/fetch)` sends the file. Neither
+    // operation is available through Host/control: file operations must be
+    // addressed to the current Agent AID so the Agent project boundary applies.
+    const isFileFetch = (payload?.type === 'menu.query'
+        || (payload?.type === 'menu.action' && payload?.action === 'fetch'))
+        && (name === 'file' || compatCmd === '/file');
+    if (isFileFetch) {
+        return ecwebErr(id, name, 'NOT_SUPPORTED', 'Host/control 不支持 file.fetch，请通过目标 Agent AID 请求');
+    }
+    if (name === 'cli' || compatCmd === '/cli') {
         const message = context.source === 'ecweb'
             ? 'cli 不在 ECWeb 控制范围'
             : 'cli 不在控制 channel 范围';
         return { type: 'menu.response', id, name, error: { code: 'NOT_SUPPORTED', message } };
     }
     const isProcessLevel = isProcessLevelMenu(name, payload?.cmd);
-    const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    const isRoleRequest = name === 'role' || compatCmd === '/role';
+    const isConnectRequest = name === 'connect' || compatCmd === '/connect';
     const requiresAgentTarget = isRoleRequest || isConnectRequest || [
         'observable', 'baseagent', 'model', 'effort', 'trigger', 'capability', 'group',
     ].includes(name)
-        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability', '/group'].includes(payload?.cmd);
+        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability', '/group'].includes(compatCmd ?? '');
     const target = isProcessLevel
         ? { channel: SYSTEM_CONTROL_CHANNEL }
         : resolveExternalMenuAgentChannel(this, payload, SYSTEM_CONTROL_CHANNEL, requiresAgentTarget);
@@ -3624,8 +3645,9 @@ export async function execMenuForControl(payload, peerId) {
     if (validationError)
         return menuFailure({ id, ...(name ? { name } : {}) }, validationError);
     const owners = loadDaemonConfig().owners ?? [];
-    const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    const compatCmd = menuCommandToken(payload?.cmd);
+    const isRoleRequest = name === 'role' || compatCmd === '/role';
+    const isConnectRequest = name === 'connect' || compatCmd === '/connect';
     if (!isRoleRequest && !isConnectRequest && !isProcessLevelOwner(peerId, owners)) {
         return menuFailure({ id, ...(name ? { name } : {}) }, { code: 'ROLE_ACCESS_DENIED', message: '控制 channel 操作需要 owner 权限' });
     }

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

@@ -15,6 +15,7 @@ const EXPLICIT_SCOPE_UPDATE_NAMES = new Set([
     'mentionmode',
     'group',
     'permission',
+    'activity',
 ]);
 const EXPLICIT_SCOPE_UPDATE_COMMANDS = new Set([
     '/model',
@@ -24,18 +25,20 @@ const EXPLICIT_SCOPE_UPDATE_COMMANDS = new Set([
     '/mentionmode',
     '/group',
     '/perm',
+    '/activity',
 ]);
 function firstCommandToken(value) {
     if (typeof value !== 'string')
         return undefined;
     return value.trim().split(/\s+/, 1)[0] || undefined;
 }
-function requiresExplicitConfigWriteScope(nameOrCmd) {
+function requiresExplicitConfigWriteScope(nameOrCmd, includeActivity = true) {
     const token = firstCommandToken(nameOrCmd);
-    return !!token && (EXPLICIT_SCOPE_UPDATE_NAMES.has(token) || EXPLICIT_SCOPE_UPDATE_COMMANDS.has(token));
+    return !!token && (EXPLICIT_SCOPE_UPDATE_NAMES.has(token) || EXPLICIT_SCOPE_UPDATE_COMMANDS.has(token))
+        && (includeActivity || (token !== 'activity' && token !== '/activity'));
 }
-export function validateConfigWriteScope(nameOrCmd, args) {
-    if (!requiresExplicitConfigWriteScope(nameOrCmd))
+export function validateConfigWriteScope(nameOrCmd, args, options) {
+    if (!requiresExplicitConfigWriteScope(nameOrCmd, options?.includeActivity ?? true))
         return null;
     const rawScope = args?.scope;
     if (rawScope === undefined || rawScope === null || (typeof rawScope === 'string' && rawScope.trim().length === 0)) {

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

@@ -1146,7 +1146,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             catch { }
             const configuredModel = modelConfig.model;
-            const configuredEffort = modelConfig[fallbackBaseagent === 'codex' ? 'reasoning' : 'effort'];
+            const configuredEffort = modelConfig.effort;
             const rawModels = hasModelSwitcher(modelAgent) ? await modelAgent.listModels() : [];
             const models = hasModelSwitcher(modelAgent)
                 ? filterModelsForRole(identity.role, fallbackBaseagent, rawModels, modelAgent.resolveModelId?.bind(modelAgent))
@@ -1468,7 +1468,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             catch { }
             const configuredModel = modelConfig.model;
-            const configuredEffort = modelConfig[fallbackBaseagent === 'codex' ? 'reasoning' : 'effort'];
+            const configuredEffort = modelConfig.effort;
             const currentModel = hasModelSwitcher(effortAgent) ? (configuredModel || effortAgent.getModel()) : effortAgent.name;
             const efforts = getAvailableEfforts(effortAgent, currentModel);
             const currentEffort = configuredEffort ?? effortAgent.getEffort?.() ?? 'auto';
@@ -1530,7 +1530,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         catch { }
         const configuredModel = modelConfig.model;
-        const configuredEffort = modelConfig[fallbackBaseagent === 'codex' ? 'reasoning' : 'effort'];
+        const configuredEffort = modelConfig.effort;
         const currentModel = hasModelSwitcher(effortAgent) ? (configuredModel || effortAgent.getModel()) : effortAgent.name;
         const efforts = getAvailableEfforts(effortAgent, currentModel);
         const currentEffort = configuredEffort ?? effortAgent.getEffort?.() ?? 'auto';
@@ -2210,7 +2210,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         catch { }
         const backendModel = modelConfig.model || newRunner.getModel?.() || newAgent?.model;
-        const backendEffort = modelConfig[newBaseagent === 'codex' ? 'reasoning' : 'effort']
+        const backendEffort = modelConfig.effort
             ?? newRunner.getEffort?.()
             ?? newAgent?.effort;
         const backendBits = [newBaseagent, backendModel, backendEffort].filter(Boolean).join(' · ');