evolcore 0.0.31 → 0.0.33

package/dist/cli/trigger-command.js

@@ -7,10 +7,11 @@ import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
 import { assertEcSingleLine } from './cli-argv.js';
 import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
+import { MAIN_CLI_BIN } from '../product.js';
 import { readTriggerLocalFile, resolveTriggerLocalPath } from '../trigger/local-files.js';
 import { normalizeTriggerDefinition, resolveScriptPath, safeRelativePath, } from '../trigger/validation.js';
 export async function cmdTrigger(args) {
-    args = canonicalizeEvolcoreCommandArgv(['ec', 'trigger', ...args]).slice(2);
+    args = canonicalizeEvolcoreCommandArgv([MAIN_CLI_BIN, 'trigger', ...args]).slice(2);
     const sub = args[0];
     if (sub === 'create' || sub === 'set' || sub === 'update') {
         const nameIndex = args.indexOf('--name');
@@ -41,29 +42,27 @@ export async function cmdTrigger(args) {
         return;
     }
     try {
-        let fileScope;
-        if (process.env.EVOLCORE_SESSION_ID
-            && (hasOption(rest, '--file') || hasOption(rest, '--prompt-file') || hasOption(rest, '--script-path') || hasOption(rest, '--script-file'))) {
-            if (!['create', 'set', 'update'].includes(sub))
-                throw new Error('local file inputs are only valid for Trigger create/update');
-            const agentAid = resolveAgentAid(rest);
-            const triggerId = sub === 'update'
-                ? positional(rest, 0, ['--agent', '--format', '--if-revision', '--prompt-file', '--script-file'])
-                : undefined;
-            const authorization = await request({
-                type: 'trigger.authorizeLocalFiles',
-                agentAid,
-                operation: sub === 'update' ? 'trigger.update' : 'trigger.create',
-                ...(triggerId ? { triggerId } : {}),
-                cwd: process.cwd(),
-            });
-            if (authorization.fullAccess !== true) {
-                if (!authorization.fileScope || typeof authorization.fileScope.projectPath !== 'string'
-                    || typeof authorization.fileScope.cwd !== 'string' || authorization.fileScope.selfAid !== agentAid) {
-                    throw new Error('daemon did not provide a valid Trigger file scope');
-                }
-                fileScope = authorization.fileScope;
+        if (process.env.EVOLCORE_SESSION_ID) {
+            const response = await request({ type: 'trigger.op', argv: ['trigger', ...args] }, sub === 'run' ? 120_000 : 30_000);
+            if (json)
+                return printJson(response);
+            if (sub === 'list')
+                return listTriggers(rest, false, response);
+            if (sub === 'show')
+                return showTrigger(rest, false, response);
+            if (sub === 'history')
+                return showHistory(rest, false, response);
+            if (sub === 'run') {
+                console.log(`${response.result.status}${response.result.reason ? ` (${response.result.reason})` : ''}: ${response.result.runId}`);
+                if (response.result.error)
+                    console.log(response.result.error);
+            }
+            else {
+                const verb = { create: 'created', set: 'created', update: 'updated', enable: 'enabled',
+                    disable: 'disabled', cancel: 'disabled', delete: 'deleted', remove: 'deleted', rm: 'deleted' }[sub];
+                console.log(`✓ ${verb} ${response.trigger.id}${['create', 'set', 'update'].includes(sub) ? ` (${response.trigger.name})` : ''}`);
             }
+            return;
         }
         switch (sub) {
             case 'list':
@@ -77,10 +76,10 @@ export async function cmdTrigger(args) {
                 return;
             case 'create':
             case 'set':
-                await createTrigger(rest, json, fileScope);
+                await createTrigger(rest, json);
                 return;
             case 'update':
-                await updateTrigger(rest, json, fileScope);
+                await updateTrigger(rest, json);
                 return;
             case 'enable':
             case 'disable':
@@ -113,7 +112,7 @@ function printHelp() {
     console.log(`用法: ec trigger <subcommand>
 
 命令:
-  list [--agent <aid>] [--all] [--json]
+  list [--agent <aid>] [--all] [--thread-id <threadId>] [--json]
   show [--agent <aid>] <triggerId> [--json]
   history [--agent <aid>] [triggerId] [--limit <n>] [--json]
   create --exec <script|trigger-session|target-session> --file <trigger.json|trigger-dir> [--enable] [--json]
@@ -175,9 +174,10 @@ Update 参数:
 省略 --agent 时使用当前 agent AID；无会话上下文或跨身份操作时需要显式指定。
 任务会话中的跨身份操作仅允许目标 Agent 上具备 owner/admin 权限的调用者执行 list/show/history；创建、修改、启停、删除和运行仍只允许当前 Agent。`);
 }
-async function listTriggers(args, json) {
+async function listTriggers(args, json, response) {
     const agentAid = resolveAgentAid(args);
-    const res = await request({ type: 'trigger.list', agentAid, all: hasFlag(args, '--all') });
+    const threadId = flagValue(args, '--thread-id');
+    const res = response ?? await request({ type: 'trigger.list', agentAid, all: hasFlag(args, '--all'), ...(threadId ? { threadId } : {}) });
     if (json)
         return printJson(res);
     const triggers = res.triggers;
@@ -189,10 +189,10 @@ async function listTriggers(args, json) {
         console.log(`${t.enabled ? 'on ' : 'off'}  ${t.id}  ${t.name}  ${sourceLabel(t)}`);
     }
 }
-async function showTrigger(args, json) {
+async function showTrigger(args, json, response) {
     const agentAid = resolveAgentAid(args);
     const triggerId = positional(args, 0, ['--agent', '--format']);
-    const res = await request({ type: 'trigger.show', agentAid, triggerId });
+    const res = response ?? await request({ type: 'trigger.show', agentAid, triggerId });
     if (json)
         return printJson(res);
     const t = res.definition;
@@ -239,7 +239,7 @@ async function showTrigger(args, json) {
         }
     }
 }
-async function showHistory(args, json) {
+async function showHistory(args, json, response) {
     const agentAid = resolveAgentAid(args);
     const triggerId = optionalPositional(args, 0, ['--agent', '--limit', '--format']);
     const rawLimit = flagValue(args, '--limit');
@@ -247,7 +247,7 @@ async function showHistory(args, json) {
     if (!Number.isInteger(limit) || limit <= 0 || limit > 10_000) {
         throw new Error('--limit 必须是 1 到 10000 的整数');
     }
-    const res = await request({ type: 'trigger.history', agentAid, triggerId, limit });
+    const res = response ?? await request({ type: 'trigger.history', agentAid, triggerId, limit });
     if (json)
         return printJson(res);
     const events = Array.isArray(res.events) ? res.events : [];
@@ -266,6 +266,12 @@ async function showHistory(args, json) {
     }
 }
 async function createTrigger(args, json, fileScope) {
+    const res = await request(await buildTriggerCreateRequest(args, fileScope), 30_000);
+    if (json)
+        return printJson(res);
+    console.log(`✓ created ${res.trigger.id} (${res.trigger.name})`);
+}
+export async function buildTriggerCreateRequest(args, fileScope, defaultAgentAid) {
     if (!hasOption(args, '--exec')) {
         throw new Error('创建 trigger 必须显式指定 --exec script|trigger-session|target-session');
     }
@@ -280,16 +286,12 @@ async function createTrigger(args, json, fileScope) {
         if (definition.execution.type !== executionType) {
             throw new Error(`--exec ${flagValue(args, '--exec')} 与 trigger.json 的 execution.type=${definition.execution.type} 不一致`);
         }
-        const res = await request({
+        return {
             type: 'trigger.create',
             definition,
             files,
             enable: hasFlag(args, '--enable') ? true : undefined,
-        }, 30_000);
-        if (json)
-            return printJson(res);
-        console.log(`✓ created ${res.trigger.id} (${res.trigger.name})`);
-        return;
+        };
     }
     // Flag mode: use parser
     const usesPromptFile = hasOption(args, '--prompt-file');
@@ -302,7 +304,7 @@ async function createTrigger(args, json, fileScope) {
         throw new Error(parseResult.error);
     }
     const parsed = parseResult.value;
-    const agentAid = parsed.agentId ?? resolveAgentAid(args);
+    const agentAid = parsed.agentId ?? defaultAgentAid ?? resolveAgentAid(args);
     const eventSession = parsed.feedbackStrategy === 'event_session';
     if (parsed.feedbackStrategy !== 'target' && !eventSession) {
         throw new Error('CLI flag 模式仅支持 --feedback target；origin/silent 请使用 /trigger 或 --file 导入 Trigger V3 第二阶段 JSON');
@@ -332,6 +334,7 @@ async function createTrigger(args, json, fileScope) {
         enabled: hasFlag(args, '--enable'),
         createdAt: now,
         updatedAt: now,
+        ...(parsed.labels ? { labels: parsed.labels } : {}),
         source: sourceFromParsed(parsed),
         execution: {
             type: parsed.executionType,
@@ -364,15 +367,12 @@ async function createTrigger(args, json, fileScope) {
             relativePath: script.path.replace(/\\/g, '/'),
             contentBase64: readTriggerLocalFile(parsed.scriptPath, fileScope).toString('base64'),
         }] : [];
-    const res = await request({
+    return {
         type: 'trigger.create',
         definition,
         files,
         enable: hasFlag(args, '--enable') ? true : undefined,
-    }, 30_000);
-    if (json)
-        return printJson(res);
-    console.log(`✓ created ${res.trigger.id} (${res.trigger.name})`);
+    };
 }
 function triggerCreateArgs(args) {
     const out = [];
@@ -453,7 +453,13 @@ function shellQuoteArg(value) {
     return /[\s"'\\]/.test(value) ? `"${value.replace(/(["\\$`])/g, '\\$1')}"` : value;
 }
 async function updateTrigger(args, json, fileScope) {
-    const agentAid = resolveAgentAid(args);
+    const res = await request(await buildTriggerUpdateRequest(args, fileScope), 30_000);
+    if (json)
+        return printJson(res);
+    console.log(`✓ updated ${res.trigger.id} (${res.trigger.name})`);
+}
+export async function buildTriggerUpdateRequest(args, fileScope, defaultAgentAid) {
+    const agentAid = flagValue(args, '--agent') ?? defaultAgentAid ?? resolveAgentAid(args);
     const triggerId = positional(args, 0, ['--agent', '--format', '--if-revision', '--prompt-file', '--script-file']);
     const usesPromptFile = hasOption(args, '--prompt-file');
     const usesScriptFile = hasOption(args, '--script-file');
@@ -469,7 +475,7 @@ async function updateTrigger(args, json, fileScope) {
     const scriptFileBase64 = scriptFilePath
         ? readTriggerLocalFile(scriptFilePath, fileScope).toString('base64')
         : undefined;
-    const res = await request({
+    return {
         type: 'trigger.update',
         agentAid,
         triggerId,
@@ -477,10 +483,30 @@ async function updateTrigger(args, json, fileScope) {
         ...(usesPromptFile ? { promptFile: true } : {}),
         ...(scriptFileBase64 !== undefined ? { scriptFileBase64 } : {}),
         ...(expectedRevision ? { expectedRevision } : {}),
-    }, 30_000);
-    if (json)
-        return printJson(res);
-    console.log(`✓ updated ${res.trigger.id} (${res.trigger.name})`);
+    };
+}
+export function resolveTriggerCommandArgv(argv, defaultAgentAid) {
+    if (argv[0] !== 'trigger')
+        throw new Error('Expected a trigger command');
+    const sub = argv[1];
+    const args = argv.slice(2);
+    const types = {
+        list: 'trigger.list', show: 'trigger.show', history: 'trigger.history', create: 'trigger.create',
+        set: 'trigger.create', update: 'trigger.update', enable: 'trigger.setEnabled', disable: 'trigger.setEnabled',
+        cancel: 'trigger.cancel', delete: 'trigger.delete', remove: 'trigger.delete', rm: 'trigger.delete', run: 'trigger.run',
+    };
+    if (!types[sub])
+        throw new Error(`Unknown trigger command: ${sub}`);
+    const agentAid = flagValue(args, '--agent') ?? defaultAgentAid;
+    const valueFlags = ['--agent', '--format', '--limit', '--if-revision', '--prompt-file', '--script-file'];
+    const triggerId = ['list', 'create', 'set'].includes(sub) ? undefined : optionalPositional(args, 0, valueFlags);
+    if (!['list', 'history', 'create', 'set'].includes(sub) && !triggerId)
+        throw new Error('missing triggerId');
+    const limit = Number(flagValue(args, '--limit') ?? 100);
+    if (!Number.isInteger(limit) || limit <= 0 || limit > 10_000)
+        throw new Error('Invalid history limit');
+    return { type: types[sub], agentAid, triggerId, limit, all: hasFlag(args, '--all'),
+        enabled: sub === 'enable', dryRun: hasFlag(args, '--dry-run') };
 }
 function triggerUpdateArgs(args) {
     const out = [];

package/dist/config/builtin-roles.js

@@ -42,6 +42,7 @@ export function getManagementCommandPermissions(role) {
         'role.policy.read': { allow: true, scopes: ['agent'] },
         'role.relation.read': { allow: true, scopes: ['agent'] },
         'agent.baseagent.update': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
+        'agent.rename': { allow: true, dangerous: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
         'observable.current': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true } },
         'observable.update': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
         'file.root.agent': { allow: true, scopes: ['agent'], constraints: { requireAgentOwner: true, targetCurrentAgentOnly: true } },
@@ -64,17 +65,18 @@ export function getManagementCommandPermissions(role) {
         'ec.aid.agentmd.put': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
         'ec.aid.agentmd.set': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
         'ec.aid.avatar': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentOwner: true } },
-        'ec.fs.mkdir': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.upload': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.copy': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.move': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.remove': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.getfacl': { allow: true, scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
-        'ec.fs.setfacl': { allow: true, permissionMode: 'auto', scopes: ['relation'], constraints: { groupOnly: true, currentRelationOnly: true, targetCurrentAgentOnly: true } },
+        'ec.fs.mkdir': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
+        'ec.fs.upload': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
+        'ec.fs.copy': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
+        'ec.fs.move': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
+        'ec.fs.remove': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
+        'ec.fs.getfacl': { allow: true, scopes: ['relation', 'agent'] },
+        'ec.fs.setfacl': { allow: true, permissionMode: 'auto', scopes: ['relation', 'agent'] },
         '*': { allow: true },
         // Reload is valid from an Agent's own channel and the daemon control plane.
         // The control-channel gate still requires a daemon owner for cross-Agent reloads.
         'agent.reload': { allow: true, dangerous: true, scopes: ['agent', 'control'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
+        'skill.refresh': { allow: true, scopes: ['agent', 'control'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
         'dangerous:*': { allow: true, dangerous: true, constraints: { requireDaemonOwner: true } },
     };
 }

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

@@ -3,7 +3,6 @@ const BEHAVIOR_TOP_FIELDS = new Set([
     'chatmode',
     'mentionMode',
     'autoMentionQuietWindowMs',
-    'sessionIdleSec',
     'groupSlashRequireMentions',
     'responseMode',
     'responseModeParams',
@@ -128,8 +127,6 @@ export function resolveConfigFieldRule(fieldPath, scope) {
         return scalar(field, 'mention-mode');
     if (field === 'autoMentionQuietWindowMs')
         return scalar(field, 'nonnegative-number');
-    if (field === 'sessionIdleSec')
-        return scalar(field, 'finite-number');
     if (field === 'groupSlashRequireMentions')
         return scalar(field, 'boolean');
     if (field === 'show_activities')
@@ -142,6 +139,8 @@ export function resolveConfigFieldRule(fieldPath, scope) {
         return scalar('configSnapshots', 'boolean');
     if (field === 'restartRecovery.enabled')
         return scalar('restartRecovery.enabled', 'boolean');
+    if (field === 'skills.watch')
+        return scalar('skills.watch', 'boolean');
     if (top === 'chatmode') {
         if (parts.length === 1)
             return readonlyObject('chatmode');

package/dist/config/config-manager.js

@@ -1464,6 +1464,9 @@ export function routeField(topField, scope) {
  */
 export function routeFieldPath(fieldPath, scope) {
     const topField = fieldPath.split('.')[0];
+    if (topField === 'sessionLoop') {
+        throw new ConfigError('SESSION_LOOP_MANAGED', 'sessionLoop is managed through the dedicated /loop or session Menu entry');
+    }
     if (scope === 'process')
         return routeIn(DAEMON_SCHEMA_NAME, ConfigTarget.Process, topField);
     if (scope === 'defaults') {
@@ -1541,8 +1544,10 @@ export function listFields(scope) {
     const out = [];
     const add = (name, target) => {
         const s = loadSchema(name);
-        for (const f of s.fields.keys())
-            out.push(mkRoute(s, target, f));
+        for (const f of s.fields.keys()) {
+            if (f !== 'sessionLoop')
+                out.push(mkRoute(s, target, f));
+        }
     };
     if (scope === 'process') {
         add(DAEMON_SCHEMA_NAME, ConfigTarget.Process);

package/dist/config/resolved-config-op.js

@@ -90,6 +90,9 @@ function resolveFieldCommand(argv, subcommand, options = {}) {
     const field = business.values[0].trim();
     if (!field)
         return { ok: false, code: 'MISSING_ARG', reason: `config ${subcommand} requires a field` };
+    if (field === 'sessionLoop' || field.startsWith('sessionLoop.')) {
+        return { ok: false, code: 'SESSION_LOOP_MANAGED', reason: 'sessionLoop is managed through the dedicated /loop or session Menu entry' };
+    }
     if (field === 'permissionMode') {
         return {
             ok: false,

package/dist/config-store.js

@@ -60,6 +60,9 @@ export function loadDaemonConfig() {
 export function isRestartRecoveryEnabled(config = loadDaemonConfig()) {
     return config.restartRecovery?.enabled === true;
 }
+export function isSkillWatchEnabled(config = loadDaemonConfig()) {
+    return config.skills?.watch === true;
+}
 let eckSnapshotsConfigCache;
 /** Parse the process-level snapshot gate once for the current daemon lifecycle. */
 export function initializeEckSnapshotsConfig(config = loadDaemonConfig()) {
@@ -103,6 +106,18 @@ function validateDaemonConfig(value, validateAidDomain) {
             throw new Error('daemon.json.restartRecovery.enabled must be a boolean');
         }
     }
+    if (value.skills !== undefined) {
+        if (!value.skills || typeof value.skills !== 'object' || Array.isArray(value.skills)) {
+            throw new Error('daemon.json.skills must be an object');
+        }
+        const unknownSkillsFields = Object.keys(value.skills).filter(key => key !== 'watch');
+        if (unknownSkillsFields.length > 0) {
+            throw new Error('daemon.json.skills contains unsupported fields: ' + unknownSkillsFields.join(', '));
+        }
+        if (value.skills.watch !== undefined && typeof value.skills.watch !== 'boolean') {
+            throw new Error('daemon.json.skills.watch must be a boolean');
+        }
+    }
     const minEvolVersion = value.aun?.minEvolVersion;
     if (minEvolVersion !== undefined && !parseStableSemver(minEvolVersion)) {
         throw new Error('daemon.json.aun.minEvolVersion must use stable X.Y.Z format');

package/dist/core/agent-ipc-registration.js

@@ -1,13 +1,14 @@
 import fs from 'fs';
 import path from 'path';
 import { loadDaemonConfig } from '../config-store.js';
-import { parseAgentWelcomeArgs, parseInitializationArgs, resolveInitializationPlan, } from '../cli/agent-create.js';
+import { parseAgentWelcomeArgs, parseInitializationArgs, resolveInitializationPlan, readInitializationPersona, } from '../cli/agent-create.js';
 import { trustedExecutionIdentityInput } from './auth/agent-delegation.js';
 import { authorizeOperation, buildAuthSubject } from './auth/auth-gateway.js';
 import { authorizationDenialData } from './auth/authorization-denial.js';
 import { parsePeerKey } from './relation/peer-identity.js';
 import { isHClassPath, isLClassPath, isSameOrDescendant } from './permission/protected-paths.js';
-export function registerAgentOperationExecutor({ ipcServer, sessionManager, agentDelegationRegistry, eventBus, responseEngine, handoffRuntime, agentApplicationService, agentInitializationService, }) {
+import { isValidAid } from '../aun/aid/validation.js';
+export function registerAgentOperationExecutor({ ipcServer, sessionManager, agentDelegationRegistry, eventBus, responseEngine, handoffRuntime, agentApplicationService, agentInitializationService, executeConfigOperation, }) {
     ipcServer.setAgentOperationExecutor(async (argv, sessionId, delegationToken, delegationCommandHash) => {
         const fail = (code, error, reasonCode) => ({
             ok: false,
@@ -17,9 +18,16 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
         });
         if (!Array.isArray(argv) || argv[0] !== 'agent')
             return fail('INVALID_REQUEST', 'agent.op requires an agent command');
-        const sub = argv[1];
+        const shorthand = !!argv[1] && isValidAid(argv[1]);
+        const sub = shorthand ? 'show' : argv[1];
         if (!sub)
             return fail('INVALID_ARGS', 'missing agent subcommand');
+        if (sub === 'get' || sub === 'set') {
+            const result = await executeConfigOperation(argv, sessionId, delegationToken, delegationCommandHash);
+            return result.ok
+                ? { ok: true, result: result.result }
+                : { ok: false, code: result.code ?? 'CONFIG_OPERATION_FAILED', error: result.error ?? 'config operation failed' };
+        }
         const value = (flag) => {
             const index = argv.indexOf(flag);
             return index >= 0 && index + 1 < argv.length && !argv[index + 1].startsWith('--') ? argv[index + 1] : undefined;
@@ -31,6 +39,8 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
         if (!taskSession || taskSession.selfAID !== delegation.grant.selfAid) {
             return fail('INVALID_DELEGATION', 'delegation does not match the current session');
         }
+        if (shorthand)
+            argv = ['agent', 'show', ...argv.slice(1)];
         const taskAid = delegation.grant.selfAid;
         let welcomeArgs;
         if (sub === 'welcome') {
@@ -58,12 +68,13 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
             : sub === 'show' ? 'agent.show'
                 : sub === 'persona' ? 'agent.persona'
                     : sub === 'welcome' ? 'agent.welcome'
-                        : sub === 'initialize' || (sub === 'new' && argv.includes('--initialize')) ? 'agent.initialize'
-                            : sub === 'new' ? 'agent.create'
-                                : sub === 'enable' ? 'agent.enable'
-                                    : sub === 'disable' ? 'agent.disable'
-                                        : sub === 'reload' ? 'agent.reload'
-                                            : sub === 'delete' ? 'agent.delete' : undefined;
+                        : sub === 'rename' ? 'agent.rename'
+                            : sub === 'initialize' || (sub === 'new' && argv.includes('--initialize')) ? 'agent.initialize'
+                                : sub === 'new' ? 'agent.create'
+                                    : sub === 'enable' ? 'agent.enable'
+                                        : sub === 'disable' ? 'agent.disable'
+                                            : sub === 'reload' ? 'agent.reload'
+                                                : sub === 'delete' ? 'agent.delete' : undefined;
         if (!operation)
             return fail('INVALID_ARGS', `unsupported managed agent command: ${sub}`);
         if (sub === 'new' && !argv.includes('--non-interactive') && !argv.includes('--initialize')) {
@@ -95,7 +106,7 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
             subject,
             intent: {
                 operation,
-                scope: operation === 'agent.show' || operation === 'agent.persona' || operation === 'agent.welcome'
+                scope: operation === 'agent.show' || operation === 'agent.persona' || operation === 'agent.welcome' || operation === 'agent.rename'
                     ? 'agent'
                     : operation === 'agent.reload' && targetAid
                         ? 'agent'
@@ -170,15 +181,23 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
             if (!hasFormatSuffix && rawPersonaArgs.includes('--format')) {
                 return fail('INVALID_ARGS', 'persona 仅支持末尾的 --format json');
             }
-            if (personaArgs.length === 2 && personaArgs[0] === '--file') {
-                return fail('INVALID_ARGS', '托管 persona --file 必须由 CLI 读取后作为文本提交');
-            }
             const wantsShow = personaArgs.length === 1 && personaArgs[0] === 'show';
-            const text = personaArgs.length === 2 && personaArgs[0] === '--text'
+            let text = personaArgs.length === 2 && personaArgs[0] === '--text'
                 ? personaArgs[1]
                 : undefined;
-            if (!wantsShow && !(personaArgs.length === 2 && personaArgs[0] === '--text')) {
-                return fail('INVALID_ARGS', '用法: ec agent persona show | --text <text>');
+            const file = personaArgs.length === 2 && personaArgs[0] === '--file' ? personaArgs[1] : undefined;
+            if (file !== undefined) {
+                try {
+                    text = readInitializationPersona(file, true, {
+                        projectCwd: taskSession.projectPath, tempDir: delegation.grant.sessionRuntimeDir,
+                    });
+                }
+                catch (error) {
+                    return fail('INVALID_ARGS', error.message);
+                }
+            }
+            if (!wantsShow && !(personaArgs.length === 2 && (personaArgs[0] === '--text' || personaArgs[0] === '--file'))) {
+                return fail('INVALID_ARGS', '用法: ec agent persona show | --text <text> | --file <path>');
             }
             if (text === undefined && !wantsShow)
                 return fail('INVALID_ARGS', 'persona --text 缺少参数');
@@ -211,12 +230,32 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
                     ...(result.sha256 ? { sha256: result.sha256 } : {}),
                 } };
         }
+        if (operation === 'agent.rename') {
+            const rawRenameArgs = argv.slice(2);
+            const hasFormatSuffix = rawRenameArgs.length >= 2
+                && rawRenameArgs.at(-2) === '--format'
+                && rawRenameArgs.at(-1) === 'json';
+            const renameArgs = hasFormatSuffix ? rawRenameArgs.slice(0, -2) : rawRenameArgs;
+            if (!hasFormatSuffix && rawRenameArgs.includes('--format')) {
+                return fail('INVALID_ARGS', 'rename 仅支持末尾的 --format json');
+            }
+            if (renameArgs.length !== 2 || !renameArgs[0] || !renameArgs[1]) {
+                return fail('INVALID_ARGS', '用法: ec agent rename <aid> <name>');
+            }
+            if (/[\x00-\x1f\x7f]/u.test(renameArgs[1])) {
+                return fail('INVALID_ARGS', 'name 不允许换行或控制字符');
+            }
+            const result = await execAgentAction('update', { aid: targetAid ?? taskAid, patch: { name: renameArgs[1] } }, delegation.grant.actorId, eventBus, agentApplicationService, subject);
+            return 'error' in result ? fail(result.code, result.error) : { ok: true, result: { ok: true, ...(result.data ?? {}) } };
+        }
         if (operation === 'agent.initialize') {
             try {
                 const parsed = parseInitializationArgs(argv.slice(1));
                 const actor = delegation.grant.actorId;
-                if (parsed.resume)
-                    return { ok: true, result: agentInitializationService.resume(parsed.aid, actor) };
+                if (parsed.resume) {
+                    agentInitializationService.resume(parsed.aid, actor);
+                    return { ok: true, result: await agentInitializationService.wait(parsed.aid, parsed.wait) };
+                }
                 const createPermission = authorizeOperation({
                     source: 'agent-tool', subject,
                     intent: { operation: 'agent.create', scope: 'control', source: 'agent-tool', args: { aid: parsed.aid } },
@@ -226,14 +265,16 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
                     return fail(createPermission.code, createPermission.reason);
                 if (!argv.includes('--owner') && !argv.includes('--owners'))
                     return fail('INITIALIZE_OWNER_MISMATCH', 'Explicit Owner required');
-                const plan = resolveInitializationPlan(argv.slice(1));
+                const plan = resolveInitializationPlan(argv.slice(1), {
+                    projectCwd: taskSession.projectPath, tempDir: delegation.grant.sessionRuntimeDir,
+                });
                 if (plan.avatarFile?.startsWith('attachment:')) {
                     const { readRelationAttachment } = await import('../utils/media-cache.js');
                     plan.avatarFile = readRelationAttachment(taskAid, delegation.grant.peerKey, plan.avatarFile.slice('attachment:'.length)).attachment.filePath;
                 }
                 else if (plan.avatarFile) {
                     const session = await sessionManager.getSessionById(sessionId);
-                    const candidate = path.resolve(plan.avatarFile);
+                    const candidate = path.resolve(taskSession.projectPath, plan.avatarFile);
                     const roots = [session?.projectPath, delegation.grant.sessionRuntimeDir]
                         .filter((root) => !!root && path.isAbsolute(root))
                         .map(root => fs.realpathSync(root));
@@ -245,7 +286,8 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
                 }
                 if (!plan.owners.includes(actor))
                     return fail('INITIALIZE_OWNER_MISMATCH', 'The authenticated requesting Owner must be retained');
-                return { ok: true, result: agentInitializationService.start(plan, actor, parsed.dryRun) };
+                const result = agentInitializationService.start(plan, actor, parsed.dryRun);
+                return { ok: true, result: parsed.dryRun ? result : await agentInitializationService.wait(parsed.aid, parsed.wait) };
             }
             catch (error) {
                 return fail(error.code ?? 'INVALID_ARGS', error.message);
@@ -283,7 +325,7 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
                 avatarFile: value('--avatar-file'),
                 avatarUrl: value('--avatar-url'),
                 force: argv.includes('--force'),
-            });
+            }, taskSession.projectPath);
             const validationError = validateAgentCreatePlan(plan);
             if (validationError)
                 return fail('INVALID_ARGS', validationError);
@@ -319,6 +361,7 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
                             channelType: delegation.grant.channelType,
                             chatType: delegation.grant.chatType,
                             peerKey: delegation.grant.peerKey,
+                            approvalInteractionPolicy: delegation.grant.approvalInteractionPolicy,
                         },
                         causation: responseEngine.getTaskRuntimeContext(sessionId)?.causation,
                     });