evolcore 0.0.3 → 0.0.5

package/dist/cli/trigger-command.js

@@ -83,9 +83,9 @@ function printHelp() {
   list [--agent <aid>] [--all] [--json]
   show [--agent <aid>] <triggerId> [--json]
   history [--agent <aid>] [triggerId] [--limit <n>] [--json]
-  create --file <trigger.json|trigger-dir> [--enable] [--json]
+  create --exec <script|trigger-session|target-session> --file <trigger.json|trigger-dir> [--enable] [--json]
     OR
-  create [--agent <aid>] --cron <expr>|--event <pattern> --prompt <text> [--enable] [其他flag]
+  create [--agent <aid>] --exec <script|trigger-session|target-session> --cron <expr>|--event <pattern> (--prompt <text>|--prompt-file <path>) [--enable] [其他flag]
   set ...  (create 的兼容别名)
   update [--agent <aid>] <triggerId> <参数...> [--if-revision <sha256:...>] [--json]
   enable [--agent <aid>] <triggerId>
@@ -97,8 +97,9 @@ function printHelp() {
 
 Create 参数模式支持:
   --once | --delay <时长> | --at <ISO时间> | --cron <表达式> | --every <时长> | --event <事件模式>
-  --exec <script|trigger-session|target-session>
-  --prompt <文本>
+  --exec <script|trigger-session|target-session>  (必填)
+  --prompt <文本> | --prompt-file <路径>
+    Shell 双引号内的双引号、反引号和变量形式的美元符号都需在前面加反斜杠；trigger 保存的是还原后的原文
   --script-path <路径> --script-runtime <node|python|bash>
   --script-args <JSON> --script-timeout <时长>
   --feedback <target>  (origin/silent 仅可通过 --file 导入)
@@ -117,12 +118,13 @@ Create 参数模式支持:
 
 Update 仅支持常用字段:
   --once | --delay | --at | --cron | --every | --event [--tz]
-  --prompt <文本>  --name <名称>
+  --prompt <文本> | --prompt-file <路径>  --name <名称>
   --model <模型>  --effort <强度>  --permission <权限模式|inherit>（inherit 清除覆盖）
   --max-runs <次数>  --max-duration <时长>
   --concurrency <forbid|replace|allow>  --missed-policy <skip|run-once|run-all>
 
-省略 --agent 时使用当前 agent AID；仅在跨身份操作或无会话上下文时需要显式指定。`);
+省略 --agent 时使用当前 agent AID；无会话上下文或跨身份操作时需要显式指定。
+任务会话中的跨身份操作仅允许目标 Agent 上具备 owner/admin 权限的调用者执行 list/show/history；创建、修改、启停、删除和运行仍只允许当前 Agent。`);
 }
 async function listTriggers(args, json) {
     const agentAid = resolveAgentAid(args);
@@ -214,10 +216,20 @@ async function showHistory(args, json) {
     }
 }
 async function createTrigger(args, json) {
-    // Support two modes: --file (full JSON) or flags (parser-based)
-    if (hasFlag(args, '--file')) {
+    if (!hasOption(args, '--exec')) {
+        throw new Error('创建 trigger 必须显式指定 --exec script|trigger-session|target-session');
+    }
+    const executionType = executionTypeFromFlag(args);
+    // --file is reserved for full trigger-definition imports.
+    if (hasOption(args, '--file')) {
+        if (hasOption(args, '--prompt-file')) {
+            throw new Error('--file（完整定义导入）与 --prompt-file（prompt 正文）不能同时指定');
+        }
         const file = requireFlag(args, '--file');
         const { definition, files } = loadDefinitionWithFiles(file);
+        if (definition.execution.type !== executionType) {
+            throw new Error(`--exec ${flagValue(args, '--exec')} 与 trigger.json 的 execution.type=${definition.execution.type} 不一致`);
+        }
         const res = await request({
             type: 'trigger.create',
             definition,
@@ -230,8 +242,12 @@ async function createTrigger(args, json) {
         return;
     }
     // Flag mode: use parser
+    const usesPromptFile = hasOption(args, '--prompt-file');
+    if (usesPromptFile && executionType === 'script') {
+        throw new Error('--exec script 不接受 --prompt-file；请使用 --script-path 和 --script-runtime');
+    }
     const { parseTriggerSetArgv } = await import('../trigger/parser.js');
-    const parseResult = parseTriggerSetArgv(triggerCreateArgs(args));
+    const parseResult = parseTriggerSetArgv(withPromptFromFile(triggerCreateArgs(args)), { allowLongPrompt: usesPromptFile });
     if (!parseResult.ok) {
         throw new Error(parseResult.error);
     }
@@ -331,6 +347,16 @@ function sourceFromParsed(parsed) {
         return { type: 'event', eventPattern: parsed.scheduleValue };
     throw new Error(`unsupported scheduleType: ${parsed.scheduleType}`);
 }
+function executionTypeFromFlag(args) {
+    const value = requireFlag(args, '--exec');
+    if (value === 'script')
+        return 'script';
+    if (value === 'trigger-session' || value === 'trigger_session')
+        return 'trigger_session';
+    if (value === 'target-session' || value === 'target_session')
+        return 'target_session';
+    throw new Error('--exec 只接受 script、trigger-session 或 target-session');
+}
 function limitsFromParsed(parsed) {
     const limits = {};
     if (parsed.maxRuns !== undefined)
@@ -362,9 +388,10 @@ function shellQuoteArg(value) {
 }
 async function updateTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent', '--format', '--if-revision']);
+    const triggerId = positional(args, 0, ['--agent', '--format', '--if-revision', '--prompt-file']);
+    const usesPromptFile = hasOption(args, '--prompt-file');
     const { parseTriggerUpdateArgv } = await import('../trigger/parser.js');
-    const parsed = parseTriggerUpdateArgv(triggerId, triggerUpdateArgs(args));
+    const parsed = parseTriggerUpdateArgv(triggerId, withPromptFromFile(triggerUpdateArgs(args)), { allowLongPrompt: usesPromptFile });
     if (!parsed.ok)
         throw new Error(parsed.error);
     const expectedRevision = flagValue(args, '--if-revision');
@@ -373,6 +400,7 @@ async function updateTrigger(args, json) {
         agentAid,
         triggerId,
         patch: parsed.value,
+        ...(usesPromptFile ? { promptFile: true } : {}),
         ...(expectedRevision ? { expectedRevision } : {}),
     }, 30_000);
     if (json)
@@ -400,6 +428,56 @@ function triggerUpdateArgs(args) {
     }
     return out;
 }
+function withPromptFromFile(args) {
+    const fileIndexes = [];
+    const filePaths = [];
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (arg === '--prompt-file') {
+            const value = args[index + 1];
+            if (!value || value.startsWith('--'))
+                throw new Error('missing --prompt-file');
+            fileIndexes.push(index, index + 1);
+            filePaths.push(value);
+            index += 1;
+        }
+        else if (arg.startsWith('--prompt-file=')) {
+            const value = arg.slice('--prompt-file='.length);
+            if (!value)
+                throw new Error('missing --prompt-file');
+            fileIndexes.push(index);
+            filePaths.push(value);
+        }
+    }
+    if (fileIndexes.length === 0)
+        return args;
+    if (filePaths.length > 1)
+        throw new Error('--prompt-file 只能指定一次');
+    if (hasOption(args, '--prompt'))
+        throw new Error('--prompt-file 与 --prompt 不能同时指定');
+    const filePath = filePaths[0];
+    let stat;
+    try {
+        stat = fs.statSync(filePath);
+    }
+    catch (err) {
+        throw new Error(`无法读取 prompt 文件 ${filePath}: ${err?.message || String(err)}`);
+    }
+    if (!stat.isFile())
+        throw new Error(`prompt 文件必须是普通文件: ${filePath}`);
+    let prompt;
+    try {
+        prompt = fs.readFileSync(filePath, 'utf8').replace(/^\uFEFF/, '');
+    }
+    catch (err) {
+        throw new Error(`无法读取 prompt 文件 ${filePath}: ${err?.message || String(err)}`);
+    }
+    const fileIndexSet = new Set(fileIndexes);
+    return [
+        ...args.filter((_, index) => !fileIndexSet.has(index)),
+        '--prompt', prompt,
+    ];
+}
 async function setEnabled(args, enabled, json) {
     const agentAid = resolveAgentAid(args);
     const triggerId = positional(args, 0, ['--agent', '--format']);
@@ -522,6 +600,9 @@ function flagValue(args, name) {
 function hasFlag(args, name) {
     return args.includes(name);
 }
+function hasOption(args, name) {
+    return args.includes(name) || args.some(arg => arg.startsWith(`${name}=`));
+}
 function positional(args, index, flagsWithValue) {
     const value = optionalPositional(args, index, flagsWithValue);
     if (!value)

package/dist/config/access-policy-domain.js

@@ -0,0 +1,18 @@
+import { isValidAid } from '../aun/aid/validation.js';
+export function validAgentOwnerIds(agent) {
+    return [...new Set((agent?.owners ?? [])
+            .map(value => String(value || '').trim())
+            .filter(isValidAid))];
+}
+export function validateAccessPolicyDomain(selfAid, agent) {
+    const access = agent.access;
+    if (!access)
+        return undefined;
+    if (access.policyMode !== 'open' && validAgentOwnerIds(agent).length === 0) {
+        return {
+            code: 'restricted_mode_without_owner',
+            message: `Agent ${selfAid} cannot use ${access.policyMode} without an Owner`,
+        };
+    }
+    return undefined;
+}

package/dist/config/access-policy.js

@@ -0,0 +1,110 @@
+import crypto from 'crypto';
+import { ConfigError, ConfigTarget, mutateConfig, read, validateConfig, } from './config-manager.js';
+import { validAgentOwnerIds, validateAccessPolicyDomain, } from './access-policy-domain.js';
+export class AccessPolicyError extends Error {
+    code;
+    data;
+    constructor(code, message, data) {
+        super(message);
+        this.code = code;
+        this.data = data;
+        this.name = 'AccessPolicyError';
+    }
+}
+export const DEFAULT_ACCESS_POLICY = Object.freeze({
+    policyMode: 'open',
+    requestLimit: Object.freeze({ maxTimes: 600, coolDown: 60 * 60 }),
+});
+export function listAgentOwners(selfAid) {
+    const agent = read(ConfigTarget.Agent, { self: selfAid }, { cache: true });
+    return validAgentOwnerIds(agent);
+}
+/** Missing AgentConfig.access uses the default open policy; malformed Agent config never does. */
+export function readAccessPolicy(selfAid) {
+    return readAccessPolicySnapshot(selfAid).policy;
+}
+export function readAccessPolicySnapshot(selfAid) {
+    const agent = read(ConfigTarget.Agent, { self: selfAid }, { cache: true });
+    return accessPolicySnapshotFromAgent(selfAid, agent);
+}
+/**
+ * Atomically updates AgentConfig.access through Config Manager's file-scoped
+ * mutation path. The callback always receives the newest persisted policy.
+ */
+export function mutateAccessPolicy(input) {
+    try {
+        const result = mutateConfig(ConfigTarget.Agent, { self: input.selfAid }, agent => {
+            const current = accessPolicySnapshotFromAgent(input.selfAid, agent);
+            if (input.expectedAccessRevision !== current.accessRevision) {
+                throw new AccessPolicyError('access_policy_revision_conflict', 'Access policy changed since it was read', {
+                    expectedAccessRevision: input.expectedAccessRevision,
+                    accessRevision: current.accessRevision,
+                });
+            }
+            const next = input.update(clonePolicy(current.policy));
+            assertAccessPolicyWrite(input, agent, next);
+            agent.access = clonePolicy(next);
+            return {
+                policy: clonePolicy(next),
+                accessRevision: accessPolicyRevision(next),
+            };
+        });
+        return { ...result.value, changed: result.changed };
+    }
+    catch (error) {
+        if (error instanceof AccessPolicyError)
+            throw error;
+        if (error instanceof ConfigError && error.code === 'LOCK_TIMEOUT') {
+            throw new AccessPolicyError('access_policy_temporarily_unavailable', 'Access policy is temporarily unavailable');
+        }
+        if (error instanceof ConfigError) {
+            throw new AccessPolicyError('invalid_access_policy', error.message);
+        }
+        throw error;
+    }
+}
+function accessPolicySnapshotFromAgent(selfAid, agent) {
+    if (!agent) {
+        throw new AccessPolicyError('invalid_access_policy', `Agent config does not exist: ${selfAid}`);
+    }
+    const errors = validateConfig(ConfigTarget.Agent, agent);
+    if (errors.length > 0) {
+        throw new AccessPolicyError('invalid_access_policy', `Invalid access policy for ${selfAid}: ${errors.join('; ')}`);
+    }
+    const issue = validateAccessPolicyDomain(selfAid, agent);
+    if (issue)
+        throw new AccessPolicyError(issue.code, issue.message);
+    const access = agent.access ?? DEFAULT_ACCESS_POLICY;
+    const policy = clonePolicy(access);
+    return { policy, accessRevision: accessPolicyRevision(policy) };
+}
+function assertAccessPolicyWrite(input, agent, policy) {
+    const owners = validAgentOwnerIds(agent);
+    const normalizedActorAid = String(input.actorAid || '').trim();
+    const isOwner = input.actorRole === 'owner' || owners.includes(normalizedActorAid);
+    if (!isOwner) {
+        throw new AccessPolicyError('access_policy_owner_required', 'Only an Agent Owner can change access policy');
+    }
+    if (policy.policyMode !== 'open' && owners.length === 0) {
+        throw new AccessPolicyError('restricted_mode_without_owner', `Agent ${input.selfAid} cannot use ${policy.policyMode} without an Owner`);
+    }
+}
+function clonePolicy(policy) {
+    return {
+        policyMode: policy.policyMode,
+        requestLimit: { ...policy.requestLimit },
+    };
+}
+function accessPolicyRevision(policy) {
+    return `sha256:${crypto.createHash('sha256').update(stableStringify(policy)).digest('hex')}`;
+}
+function stableStringify(value) {
+    return JSON.stringify(sortValue(value));
+}
+function sortValue(value) {
+    if (Array.isArray(value))
+        return value.map(sortValue);
+    if (!value || typeof value !== 'object')
+        return value;
+    return Object.fromEntries(Object.keys(value).sort().map(key => [key, sortValue(value[key])]));
+}

package/dist/config/builtin-role-templates.js

@@ -1,6 +1,6 @@
-import fs from 'fs';
 import path from 'path';
 import { kitsRoleTemplatesDir } from '../paths.js';
+import { createErrorCapturingReader, fileCache } from '../core/daemon-file-cache.js';
 import { validateRoleConfig } from './role-schema.js';
 import { expectedRoleRank } from './role-ranks.js';
 export const BUILTIN_ROLE_IDS = ['owner', 'admin', 'member', 'visitor'];
@@ -24,19 +24,32 @@ export function validateBuiltinRoleTemplateDefinition(roleId, raw) {
     }
     return { definition: definition };
 }
-/** Load the versioned package template that defines a built-in role policy. */
+/**
+ * Load the versioned package template that defines a built-in role policy.
+ *
+ * 模板随包发布、只靠进程重启或 kit 缓存失效刷新 → fileCache 的 on-reload 策略，
+ * 归入 'kits' 组。缓存的是"读盘 + JSON.parse"结果；校验（validateRoleConfig）仍每次现做。
+ */
 export function readBuiltinRoleTemplate(roleId) {
     const file = path.join(kitsRoleTemplatesDir(), `${roleId}.json`);
-    let raw;
-    try {
-        raw = JSON.parse(fs.readFileSync(file, 'utf8'));
-    }
-    catch (error) {
-        return {
-            definition: null,
-            file,
-            error: `cannot read built-in role template: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-    return { ...validateBuiltinRoleTemplateDefinition(roleId, raw), file };
+    // 默认 reader 会把所有读盘异常吞成 null（分不清 ENOENT 与 EACCES），
+    // 这里注入带错误捕获的 reader 把真实错误原文带出来，保持与直读时一致的报错。
+    const reader = createErrorCapturingReader();
+    const parsed = fileCache.get(file, (text) => {
+        if (text === null) {
+            return { error: `cannot read built-in role template: ${reader.lastError()}` };
+        }
+        try {
+            return { raw: JSON.parse(text) };
+        }
+        catch (error) {
+            return { error: `cannot read built-in role template: ${error instanceof Error ? error.message : String(error)}` };
+        }
+    }, { policy: 'on-reload', group: 'kits', read: reader.read });
+    if ('error' in parsed)
+        return { definition: null, file, error: parsed.error };
+    // 缓存返回的是同一个对象引用，而 validateBuiltinRoleTemplateDefinition 里的解构
+    // 只隔离顶层——permissions / commandPermissions / usageLimits 等嵌套对象仍会被
+    // 所有调用方共享，任何一处改写都会污染后续读者拿到的授权策略。整份深拷贝后再校验。
+    return { ...validateBuiltinRoleTemplateDefinition(roleId, structuredClone(parsed.raw)), file };
 }

package/dist/config/builtin-roles.js

@@ -21,17 +21,23 @@ export function getBuiltinRolesConfig() {
     };
 }
 /**
- * Management grants are a code-level ceiling, not configurable role policy.
- * A role file may narrow these rules but can never add a management grant.
+ * Management grants are a code-level ceiling. The built-in admin template
+ * declares the default grants; local role files may narrow them but can never
+ * add a grant outside this ceiling.
  */
 export function getManagementCommandPermissions(role) {
     return {
         'contact.read': { allow: true, scopes: ['agent'] },
-        'contact.block': { allow: true, scopes: ['agent'] },
+        'contact.block': { allow: true, scopes: ['agent'], constraints: { requireAgentAdmin: true } },
+        'connect.write': { allow: true, scopes: ['agent'], constraints: { requireAgentAdmin: true } },
+        'connect.access.write': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true } },
         'role.assign': { allow: true, scopes: ['agent'] },
         'role.revoke': { allow: true, scopes: ['agent'] },
         'role.policy.read': { allow: true, scopes: ['agent'] },
         'role.relation.read': { allow: true, scopes: ['agent'] },
+        'config.get': { allow: true, scopes: ['agent', 'relation'] },
+        'config.set': { allow: true, scopes: ['agent', 'relation'] },
+        'config.unset': { allow: true, scopes: ['agent', 'relation'] },
         'role.policy.write': { allow: true, dangerous: true, scopes: ['agent'], constraints: { requireAgentAdmin: true } },
         '*': { allow: true },
         'agent.reload': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
@@ -39,6 +45,7 @@ export function getManagementCommandPermissions(role) {
     };
 }
 export function applyManagementRoleCeiling(role, configured) {
+    const builtin = readBuiltinRoleTemplate(role).definition;
     const fallback = {
         description: role === 'owner' ? 'Agent owner' : 'Agent administrator',
         rank: expectedRoleRank(role),
@@ -48,12 +55,16 @@ export function applyManagementRoleCeiling(role, configured) {
         },
         commandPermissions: getManagementCommandPermissions(role),
     };
-    const policy = configured ?? readBuiltinRoleTemplate(role).definition ?? fallback;
+    const policy = configured ?? builtin ?? fallback;
+    const configuredCommandPermissions = policy.commandPermissions;
+    const defaultCommandPermissions = configuredCommandPermissions
+        ?? (role === 'admin' && builtin ? builtin.commandPermissions : undefined)
+        ?? getManagementCommandPermissions(role);
     return {
         ...policy,
         rank: expectedRoleRank(role),
-        allowAccess: true,
-        commandPermissions: narrowManagementCommandPermissions(getManagementCommandPermissions(role), policy.commandPermissions || {}),
+        allowAccess: role === 'owner' ? true : policy.allowAccess !== false,
+        commandPermissions: narrowManagementCommandPermissions(getManagementCommandPermissions(role), defaultCommandPermissions),
     };
 }
 export function getManagementRoleDefinition(role) {
@@ -78,6 +89,14 @@ function narrowManagementCommandPermissions(ceiling, configured) {
         else if (!Array.isArray(permission.scopes) && Array.isArray(override.scopes)) {
             next.scopes = [...override.scopes];
         }
+        if (permission.constraints || override.constraints) {
+            // Configured constraints may add restrictions, but a role file cannot
+            // weaken a code-level constraint (the ceiling wins on collisions).
+            next.constraints = {
+                ...(override.constraints ?? {}),
+                ...(permission.constraints ?? {}),
+            };
+        }
         merged[operation] = next;
     }
     // Exact or namespace denies may narrow grants inherited through the ceiling's

package/dist/config/config-field-policy.js

@@ -8,6 +8,7 @@ const BEHAVIOR_TOP_FIELDS = new Set([
     'debounce',
     'show_activities',
     'session_renew',
+    'groupRules',
     'group_venue_sync',
     'render',
     'sessionManifests',
@@ -32,6 +33,7 @@ const SENSITIVE_TOP_FIELDS = new Set([
     'lifecycle',
     'initialized',
     'owners',
+    'access',
     'admins',
     'channels',
     'aun',
@@ -44,10 +46,10 @@ const SENSITIVE_TOP_FIELDS = new Set([
     'role',
     'extra_backup',
 ]);
-const CRITICAL_AGENT_FIELDS = new Set(['owners', 'admins', 'roles']);
+const CRITICAL_AGENT_FIELDS = new Set(['owners', 'admins', 'roles', 'access']);
 const EFFORTS = new Set(['low', 'medium', 'high', 'xhigh', 'max']);
-function scalar(rolePermissionKey, valueKind) {
-    return { class: 'safe-scalar', rolePermissionKey, valueKind };
+function scalar(rolePermissionKey, valueKind, access = 'role-overridable') {
+    return { class: 'safe-scalar', access, rolePermissionKey, valueKind };
 }
 function readonlyObject(rolePermissionKey) {
     return { class: 'safe-readonly-object', rolePermissionKey };
@@ -133,8 +135,6 @@ export function resolveConfigFieldRule(fieldPath) {
             return scalar('session_renew', 'boolean');
         if (parts[1] === 'after_hours')
             return scalar('session_renew', 'positive-number');
-        if (parts[1] === 'effort')
-            return scalar('session_renew', 'effort');
         if (parts[1] === 'fallback_action')
             return scalar('session_renew', 'session-renew-action');
         return { class: 'unknown' };
@@ -153,6 +153,14 @@ export function resolveConfigFieldRule(fieldPath) {
             return scalar('sessionManifests', 'manifest-file');
         return { class: 'unknown' };
     }
+    if (top === 'groupRules') {
+        if (parts.length === 1)
+            return readonlyObject('groupRules');
+        if (field === 'groupRules.mode') {
+            return scalar(field, 'group-rules-mode', 'owner-only');
+        }
+        return { class: 'unknown' };
+    }
     if (top === 'group_venue_sync')
         return parts.length === 1
             ? readonlyObject('group_venue_sync')
@@ -257,5 +265,9 @@ export function parseConfigFieldValue(fieldPath, rawValue) {
             return raw === 'continue' || raw === 'new'
                 ? { ok: true, value: raw }
                 : { ok: false, reason: `Config field ${fieldPath} must be continue or new` };
+        case 'group-rules-mode':
+            return raw === 'load' || raw === 'ignore'
+                ? { ok: true, value: raw }
+                : { ok: false, reason: `Config field ${fieldPath} must be load or ignore` };
     }
 }