evolcore 0.0.29 → 0.0.30

package/dist/core/permission/tool-policy.js

@@ -5,7 +5,7 @@ import { randomUUID } from 'crypto';
 import { logger } from '../../utils/logger.js';
 import { resolveRoot } from '../../paths.js';
 import { containsHClassReference, containsAgentScopeReference, containsLClassReference, checkProtectedPathAccess, getExistingHClassMaskTargets, hClassGrantIncludesProtectedPath, isHClassPath, isSameOrDescendant, isLClassPath, lClassGrantIncludesProtectedPath, resolveProtectedCandidate, resolveProtectedCandidateWithoutFinalSymlink, } from './protected-paths.js';
-import { classifyEvolcoreShellCommand, hasCodexCmdCarrierEcIntent, hasPowerShellCredentialAssignment, parseCodexToolCommand, parseBoundedOutputShellCommand, parseShellApplyPatchInvocation, parseLiteralShellArgv, resolveCodexShellCarrierArgv, resolveCodexShellCarrierString, } from './ec-command-parser.js';
+import { classifyEvolcoreShellCommand, hasCodexCmdCarrierEcIntent, hasPowerShellCredentialAssignment, normalizeEvolcoreCommandArgv, parseCodexToolCommand, parseBoundedOutputShellCommand, parseShellApplyPatchInvocation, parseLiteralShellArgv, resolveCodexShellCarrierArgv, resolveCodexShellCarrierString, } from './ec-command-parser.js';
 import { analyzeReadonlyShellQuery, } from './readonly-shell-query.js';
 /** Resolve the session-owned temporary root supplied by the execution host. */
 export function resolveManagedTempDir(env = process.env) {
@@ -2416,12 +2416,15 @@ export function evaluateToolPreflight(toolName, input, context) {
         const parsedCodex = context.sessionId ? parseCodexToolCommand(input, parserOptions) : null;
         const applyPatch = parseShellApplyPatchInvocation(input, parserOptions, parsedCodex?.ok ? parsedCodex.argv : undefined);
         if (applyPatch.kind === 'invalid') {
+            const invalidArgument = applyPatch.errorDetailCode === 'INVALID_ARGUMENT';
             return {
                 behavior: 'deny',
                 input,
-                message: '文件修改 patch 无法安全解析：' + applyPatch.reason,
-                policyCode: 'apply_patch_unparseable',
-                errorDetailCode: 'APPLY_PATCH_UNPARSEABLE',
+                message: invalidArgument
+                    ? 'apply_patch 参数格式错误：需要一个完整补丁文档（以 *** Begin Patch 开头、以 *** End Patch 结尾），普通命令行参数不是补丁；这不是权限不足。'
+                    : '文件修改 patch 无法安全解析：' + applyPatch.reason,
+                policyCode: invalidArgument ? 'apply_patch_invalid_argument' : 'apply_patch_unparseable',
+                errorDetailCode: invalidArgument ? 'INVALID_ARGUMENT' : 'APPLY_PATCH_UNPARSEABLE',
             };
         }
         if (applyPatch.kind === 'file-change') {
@@ -2466,7 +2469,36 @@ export function evaluateToolPreflight(toolName, input, context) {
                 policyCode: 'delegation_token_unbound',
             };
         }
-        const argv = parsedCodex?.ok ? parsedCodex.argv : null;
+        const shellDialect = stringShellCarrier?.dialect
+            ?? (hasCodexCmdCarrierEcIntent(input) ? 'cmd' : undefined);
+        const hasPowerShellCarrierAssignment = stringShellCarrier?.dialect === 'powershell'
+            && hasPowerShellCredentialAssignment(stringShellCarrier.command);
+        const ecCommand = hasPowerShellCarrierAssignment && parsedCodex
+            ? parsedCodex.ok && parsedCodex.argv[0] === 'ec'
+                ? { kind: 'literal' }
+                : {
+                    kind: 'composite',
+                    issue: parsedCodex.ok ? 'shell-composition' : parsedCodex.issue,
+                }
+            : classifyEvolcoreShellCommand(policyCommand, shellDialect
+                ? { dialect: shellDialect, ...parserOptions }
+                : parserOptions);
+        const classifiedEcArgv = ecCommand.kind === 'bounded-output' || ecCommand.kind === 'cd-prefixed'
+            ? ecCommand.command.argv
+            : null;
+        const argv = parsedCodex?.ok
+            ? parsedCodex.argv
+            : classifiedEcArgv ? normalizeEvolcoreCommandArgv(classifiedEcArgv) : null;
+        const managedAidArgs = argv?.[0] === 'ec' && argv[1] === 'aid'
+            ? argv.slice(2)
+            : undefined;
+        const managedAidHelpEnd = managedAidArgs?.indexOf('--') ?? -1;
+        const managedAidHelpArgs = managedAidArgs?.slice(0, managedAidHelpEnd < 0 ? undefined : managedAidHelpEnd) ?? [];
+        const isManagedAidHelp = managedAidArgs !== undefined && (managedAidArgs.length === 0
+            || managedAidHelpArgs.some(arg => arg === '--help' || arg === '-h')
+            || managedAidHelpArgs[0] === 'help'
+            || (managedAidHelpArgs[0] === 'agentmd'
+                && (managedAidArgs.length === 1 || managedAidHelpArgs[1] === 'help')));
         const managedAidArgv = argv?.at(-2) === '--format' && argv.at(-1) === 'json'
             ? argv.slice(0, -2)
             : argv;
@@ -2494,6 +2526,16 @@ export function evaluateToolPreflight(toolName, input, context) {
             && managedAidArgv[2] === 'agentmd'
             && managedAidArgv[3] === 'put'
             && ownAid;
+        const isSelfAgentMdSet = !!managedAidArgv
+            && managedAidArgv.length === 7
+            && managedAidArgv[0] === 'ec'
+            && managedAidArgv[1] === 'aid'
+            && managedAidArgv[2] === 'agentmd'
+            && managedAidArgv[3] === 'set'
+            && !!context.selfAid
+            && managedAidArgv[4]?.replace(/^@/, '') === context.selfAid.replace(/^@/, '')
+            && ['name', 'type', 'description', 'version', 'tags'].includes(managedAidArgv[5] ?? '')
+            && managedAidArgv[6] !== undefined;
         const avatarFileIndex = managedAidArgv?.indexOf('--file') ?? -1;
         const avatarUrlIndex = managedAidArgv?.indexOf('--url') ?? -1;
         const avatarSourceIndex = avatarFileIndex >= 0 ? avatarFileIndex : avatarUrlIndex;
@@ -2509,35 +2551,30 @@ export function evaluateToolPreflight(toolName, input, context) {
             && !managedAidArgv[5].startsWith('-');
         const canPublishSelfAgentMd = isSelfAgentMdPublish
             && ['request', 'bypass'].includes(context.permissionMode ?? '');
+        const canSetSelfAgentMd = isSelfAgentMdSet
+            && ['request', 'bypass'].includes(context.permissionMode ?? '');
         const canUploadSelfAvatar = isSelfAvatarUpload
             && ['request', 'bypass'].includes(context.permissionMode ?? '');
-        const isAllowedManagedAidCommand = isManagedAidPublicRead || isSelfManagedAidShow || canPublishSelfAgentMd || canUploadSelfAvatar;
-        if (context.sessionId && /^\s*ec\s+aid(?:\s|$)/i.test(policyCommand) && !isAllowedManagedAidCommand) {
+        const isAllowedManagedAidCommand = isManagedAidPublicRead
+            || isSelfManagedAidShow
+            || canPublishSelfAgentMd
+            || canSetSelfAgentMd
+            || canUploadSelfAvatar;
+        if (context.sessionId && managedAidArgs !== undefined
+            && !isManagedAidHelp && !isAllowedManagedAidCommand) {
             return {
                 behavior: 'deny',
                 input,
                 message: isSelfAgentMdPublish && (context.permissionMode === 'readonly' || context.permissionMode === 'auto')
                     ? `🔒 ${context.permissionMode} 模式禁止发布 agent.md；请切换到 request 或 bypass 后再执行 \`ec aid agentmd put <当前 self AID>\`。`
-                    : isSelfAvatarUpload && (context.permissionMode === 'readonly' || context.permissionMode === 'auto')
-                        ? `🔒 ${context.permissionMode} 模式禁止上传头像；请切换到 request 或 bypass 后再执行 \`ec aid avatar <当前 self AID> (--file <path> 或 --url <https-url>)\`。`
-                        : '🔒 EvolCore 托管会话允许 `ec aid show <当前 self AID>`、`ec aid lookup <任意合法 AID>` 或 `ec aid agentmd get <任意合法 AID>`；`ec aid agentmd put` 及 `ec aid avatar` 还要求针对当前 self AID 且处于 request 或 bypass。可选后缀仅限 `--format json`。禁止列举本地身份、切换身份或对其它 AID 执行 show/put/avatar。',
+                    : isSelfAgentMdSet && (context.permissionMode === 'readonly' || context.permissionMode === 'auto')
+                        ? `🔒 ${context.permissionMode} 模式禁止修改 agent.md；请切换到 request 或 bypass 后再执行 \`ec aid agentmd set <当前 self AID> <field> <value>\`。`
+                        : isSelfAvatarUpload && (context.permissionMode === 'readonly' || context.permissionMode === 'auto')
+                            ? `🔒 ${context.permissionMode} 模式禁止上传头像；请切换到 request 或 bypass 后再执行 \`ec aid avatar <当前 self AID> (--file <path> 或 --url <https-url>)\`。`
+                            : '🔒 EvolCore 托管会话允许 `ec aid show <当前 self AID>`、`ec aid lookup <任意合法 AID>` 或 `ec aid agentmd get <任意合法 AID>`；`ec aid agentmd put/set` 及 `ec aid avatar` 还要求针对当前 self AID 且处于 request 或 bypass。可选后缀仅限 `--format json`。禁止列举本地身份、切换身份或对其它 AID 执行 show/put/set/avatar。',
                 policyCode: 'managed_ec_aid_scope_forbidden',
             };
         }
-        const shellDialect = stringShellCarrier?.dialect
-            ?? (hasCodexCmdCarrierEcIntent(input) ? 'cmd' : undefined);
-        const hasPowerShellCarrierAssignment = stringShellCarrier?.dialect === 'powershell'
-            && hasPowerShellCredentialAssignment(stringShellCarrier.command);
-        const ecCommand = hasPowerShellCarrierAssignment && parsedCodex
-            ? parsedCodex.ok && parsedCodex.argv[0] === 'ec'
-                ? { kind: 'literal' }
-                : {
-                    kind: 'composite',
-                    issue: parsedCodex.ok ? 'shell-composition' : parsedCodex.issue,
-                }
-            : classifyEvolcoreShellCommand(policyCommand, shellDialect
-                ? { dialect: shellDialect, ...parserOptions }
-                : parserOptions);
         if (ecCommand.kind === 'literal') {
             return { behavior: 'allow', input, reason: 'ec-command' };
         }

package/dist/core/session/session-idle-monitor.js

@@ -1,9 +1,26 @@
 import fs from 'fs';
 import path from 'path';
+import { ConfigTarget, read as readConfig } from '../../config/config-manager.js';
+import { formatPeerKey } from '../relation/peer-identity.js';
 import { logger } from '../../utils/logger.js';
 import { atomicWriteJson } from './session-fs-store.js';
 import { createRootCausation } from '../causation/context.js';
 export const MIN_SESSION_IDLE_SECONDS = 30;
+export function readRelationSessionIdleSeconds(session) {
+    if (!session.selfAID || !session.channelId)
+        return undefined;
+    try {
+        const relation = readConfig(ConfigTarget.Relation, {
+            self: session.selfAID,
+            peerKey: formatPeerKey(session.channelType || session.channel, session.channelId),
+        }, { cache: true, expand: true });
+        return relation?.sessionIdleSec;
+    }
+    catch (error) {
+        logger.warn(`[SessionIdleMonitor] Failed to read relation config for ${session.id}: ${error instanceof Error ? error.message : String(error)}`);
+        return undefined;
+    }
+}
 /**
  * Publishes one session:idle event after a runner task ends, using the
  * per-session relation configuration as the idle period.