evolcore 0.0.31 → 0.0.32

package/dist/cli/agent.js

@@ -14,7 +14,6 @@ import { isValidChannelName } from '../core/channel-loader.js';
 import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
 import { isValidAid } from '../aun/aid/validation.js';
-import { isHClassPath, isLClassPath, isSameOrDescendant } from '../core/permission/protected-paths.js';
 import { findPostBootstrapWelcomeOutbox } from '../core/bootstrap-messages.js';
 import { resolveAgentLifecycle } from '../config/lifecycle.js';
 import { initializationSummary } from './agent-create.js';
@@ -22,7 +21,7 @@ import { parseAgentWelcomeMetadata, readAgentWelcomeTemplate, renderPostBootstra
 import { RUNTIME_ENVIRONMENT_NAMES } from '../config/runtime-env.js';
 export { agentCreateInteractive, agentCreateNonInteractive, parseAgentOwnerArgs, resolveAgentCreatePlan, validateAgentCreatePlan, validateAgentOwnerOptions, } from './agent-create.js';
 /** Route agent lifecycle commands from a managed task through daemon IPC. */
-export async function runManagedAgentOperation(argv) {
+export async function runManagedAgentOperation(argv, timeoutMs = 60_000) {
     const sessionId = process.env.EVOLCORE_SESSION_ID;
     if (!sessionId)
         return { ok: false, code: 'MANAGED_ONLY', error: 'agent operation is not running in a managed task' };
@@ -36,7 +35,7 @@ export async function runManagedAgentOperation(argv) {
             argv: ['agent', ...argv],
             sessionId,
             delegationToken,
-        }, 60_000);
+        }, timeoutMs);
         if (!response)
             return { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon' };
         if (!response.ok)
@@ -398,37 +397,12 @@ async function agentSetEnabled(aid, enabled, options = {}) {
     return { ok: true, aid, enabled, reloaded };
 }
 async function runManagedAgentConfig(args, options) {
-    const sessionId = process.env.EVOLCORE_SESSION_ID;
-    if (!sessionId || options.trustedLocal)
+    if (!process.env.EVOLCORE_SESSION_ID || options.trustedLocal)
         return { managed: false };
-    const delegationToken = readDelegationCredential();
-    if (!delegationToken) {
-        return {
-            managed: true,
-            error: { ok: false, code: 'DELEGATION_REQUIRED', error: `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task` },
-        };
-    }
-    try {
-        const response = await ipcQuery(resolvePaths().socket, {
-            type: 'config.op',
-            argv: ['config', ...args],
-            sessionId,
-            delegationToken,
-        }, 10_000);
-        if (!response) {
-            return { managed: true, error: { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon' } };
-        }
-        if (!response.ok || !response.result?.ok) {
-            return {
-                managed: true,
-                error: { ok: false, code: response.code || 'CONFIG_AUTH_FAILED', error: response.error || 'config operation failed' },
-            };
-        }
-        return { managed: true, response };
-    }
-    catch {
-        return { managed: true, error: { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Unable to connect to the evolcore daemon' } };
-    }
+    const result = await runManagedAgentOperation(options.argv ?? args, 10_000);
+    return result.ok
+        ? { managed: true, response: { ok: true, result } }
+        : { managed: true, error: result };
 }
 async function executeLocalAgentConfig(args) {
     initConfigManager();
@@ -448,7 +422,7 @@ async function executeLocalAgentConfig(args) {
     });
 }
 export async function agentGet(aid, key, options = {}) {
-    const managed = await runManagedAgentConfig(['get', key, '--self', aid], options);
+    const managed = await runManagedAgentConfig(['get', aid, key], options);
     if (managed.managed) {
         if ('error' in managed)
             return managed.error;
@@ -472,7 +446,7 @@ export async function agentGet(aid, key, options = {}) {
     }
 }
 export async function agentSet(aid, key, rawValue, options = {}) {
-    const managed = await runManagedAgentConfig(['set', key, rawValue, '--self', aid], options);
+    const managed = await runManagedAgentConfig(['set', aid, key, rawValue], options);
     if (managed.managed) {
         if ('error' in managed)
             return managed.error;
@@ -539,36 +513,7 @@ export async function agentPersona(aid, options = {}) {
         return { ok: false, code: 'INVALID_ARGS', error: '--text 与 --file 不能同时使用' };
     const managedSession = !!process.env.EVOLCORE_SESSION_ID && !options.trustedLocal;
     let text = options.text;
-    if (options.file !== undefined) {
-        if (managedSession) {
-            const resolved = path.resolve(options.file);
-            const projectRoot = path.resolve(process.cwd());
-            const tempRoot = process.env.TMPDIR?.trim() && path.isAbsolute(process.env.TMPDIR)
-                ? path.resolve(process.env.TMPDIR)
-                : undefined;
-            const allowed = isSameOrDescendant(resolved, projectRoot)
-                || (!!tempRoot && isSameOrDescendant(resolved, tempRoot));
-            if (!allowed || isHClassPath(resolved) || isLClassPath(resolved)) {
-                return { ok: false, code: 'INVALID_ARGS', error: '--file 必须位于当前项目或会话 $TMPDIR，且不能读取 EvolCore 受保护路径' };
-            }
-            try {
-                const stat = fs.lstatSync(resolved);
-                if (stat.isSymbolicLink() || !stat.isFile()) {
-                    return { ok: false, code: 'INVALID_ARGS', error: '--file 必须指向当前项目或会话 $TMPDIR 内的普通文件' };
-                }
-                const realPath = fs.realpathSync(resolved);
-                const realProjectRoot = fs.realpathSync(projectRoot);
-                const realTempRoot = tempRoot ? fs.realpathSync(tempRoot) : undefined;
-                const realAllowed = isSameOrDescendant(realPath, realProjectRoot)
-                    || (!!realTempRoot && isSameOrDescendant(realPath, realTempRoot));
-                if (!realAllowed || isHClassPath(realPath) || isLClassPath(realPath)) {
-                    return { ok: false, code: 'INVALID_ARGS', error: '--file 解析后越出允许目录或命中 EvolCore 受保护路径' };
-                }
-            }
-            catch (e) {
-                return { ok: false, code: 'READ_FAILED', error: `无法校验 --file: ${e?.message || e}` };
-            }
-        }
+    if (options.file !== undefined && !managedSession) {
         const source = readPersonaSource(options.file);
         if (!source.ok)
             return source;
@@ -582,10 +527,10 @@ export async function agentPersona(aid, options = {}) {
     const managedArgs = options.text !== undefined
         ? ['persona', '--text', text]
         : options.file !== undefined
-            ? ['persona', '--text', text]
+            ? ['persona', '--file', options.file]
             : ['persona', 'show'];
     if (managedSession) {
-        const managed = await runManagedAgentOperation(managedArgs);
+        const managed = await runManagedAgentOperation(options.argv ?? managedArgs);
         if (!managed.ok)
             return managed;
         return { ok: true, aid, content: managed.content ?? null, ...(managed.path ? { path: managed.path } : {}), ...(managed.saved ? { saved: true } : {}) };
@@ -625,7 +570,7 @@ export async function agentWelcome(aid, options = {}) {
         if (readTaskRuntimeContextFromEnv()?.selfAid !== aid) {
             return { ok: false, code: 'SELF_AGENT_REQUIRED', error: 'welcome only targets the current Agent' };
         }
-        const managed = await runManagedAgentOperation(managedArgs);
+        const managed = await runManagedAgentOperation(options.argv ?? managedArgs);
         if (!managed.ok)
             return managed;
         return {
@@ -803,7 +748,7 @@ export async function agentRename(aid, name) {
     return { ok: true, aid, name };
 }
 // ==================== agentReady ====================
-export async function agentReady(aid) {
+export async function agentReady(aid, commandArgs) {
     const managedSessionId = process.env.EVOLCORE_SESSION_ID;
     const taskSelfAid = managedSessionId ? readTaskRuntimeContextFromEnv()?.selfAid : undefined;
     if (taskSelfAid && taskSelfAid.replace(/^@/, '') !== aid.replace(/^@/, '')) {
@@ -822,6 +767,7 @@ export async function agentReady(aid) {
         const result = await ipcQuery(p.socket, {
             type: 'evolagent.bootstrapComplete',
             aid,
+            ...(managedSessionId ? { argv: ['agent', ...(commandArgs ?? ['ready', aid])] } : {}),
             ...(managedSessionId ? { sessionId: managedSessionId, delegationToken } : {}),
         }, 30_000);
         if (!result)

package/dist/cli/aun-commands.js

@@ -4,6 +4,7 @@ import { agentMdPath, resolvePaths, resolveRoot } from '../paths.js';
 import { isExplicitGroupId, normalizeGroupAid, sameGroupAid } from '../aun/group/index.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 import { ipcQuery } from '../ipc.js';
+import { isValidAid as validSendAid } from '../aun/aid/validation.js';
 import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { isManagementRole } from '../config/builtin-roles.js';
 import { readBestTaskRuntimeContext } from './task-context.js';
@@ -1088,6 +1089,7 @@ Options:
 }
 // ==================== Storage ====================
 export async function cmdStorage(args) {
+    args = canonicalizeEvolcoreCommandArgv(['ec', 'storage', ...args]).slice(2);
     const sub = args[0];
     const aunPath = resolveAunPath(args);
     const formatJson = getArgValue(args, '--format') === 'json';
@@ -1142,12 +1144,9 @@ Options:
                 console.error('用法: ec storage upload <aid> <local-file> <remote-path> [--public]');
                 process.exit(1);
             }
-            if (!fs.existsSync(localFile)) {
-                console.error(`❌ 文件不存在: ${localFile}`);
-                process.exit(1);
-            }
             const result = await ipcQuery(resolvePaths().socket, {
                 type: 'storage.upload',
+                argv: ['storage', ...args],
                 aid,
                 localFile,
                 remotePath,
@@ -1172,12 +1171,25 @@ Options:
             return;
         }
         const authorization = await ipcQuery(resolvePaths().socket, {
-            type: 'storage.auth', operation, aid, sessionId: process.env.EVOLCORE_SESSION_ID, delegationToken,
+            type: 'storage.auth', argv: ['storage', ...args], operation, aid, sessionId: process.env.EVOLCORE_SESSION_ID, delegationToken,
         }, 10_000);
         if (!authorization)
             failManagedGroup(formatJson, 'DAEMON_UNAVAILABLE', 'Unable to connect to the evolcore daemon');
         if (!authorization.ok)
             failManagedGroup(formatJson, authorization.code || 'STORAGE_AUTH_FAILED', authorization.error || 'Storage operation denied');
+        if (sub === 'ls') {
+            const objects = authorization.result?.objects ?? authorization.result ?? [];
+            console.log(Array.isArray(objects) && !objects.length ? '(空)' : JSON.stringify(objects, null, 2));
+        }
+        else if (sub === 'quota')
+            console.log(JSON.stringify(authorization.result, null, 2));
+        else if (formatJson)
+            console.log(JSON.stringify(authorization));
+        else if (sub === 'download')
+            console.log(`✓ 已下载: ${authorization.localPath} (${authorization.size} bytes)`);
+        else
+            console.log(`✓ 已删除: ${authorization.objectKey}`);
+        return;
     }
     const { storageUpload, storageDownload, storageLs, storageRm, storageQuota } = await import('../aun/storage/index.js');
     if (sub === 'upload') {
@@ -1398,6 +1410,8 @@ Options:
         renderManagedMsgResult(sub, result, formatJson);
         return;
     }
+    if (process.env.EVOLCORE_SESSION_ID && sub === 'send')
+        return runManagedSend(['msg', ...args], formatJson);
     const { msgSend, msgPull, msgAck, msgRecall, msgOnline, msgHistory } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
     const requireConsumerSlot = (operation) => {
@@ -1935,6 +1949,21 @@ g- 是名称的一部分，会完整保留；默认命名格式为 g-10000 至 g
         renderManagedGroupResult(args, result, formatJson);
         return;
     }
+    if (process.env.EVOLCORE_SESSION_ID && sub === 'send') {
+        if (args.includes('--aun-path') || args.includes('--app')) {
+            failManagedGroup(formatJson, 'NOT_ALLOWED', '--aun-path and --app are not allowed in a managed task');
+        }
+        let groupId;
+        try {
+            groupId = normalizeGroupAid(args[2] ?? '', from.slice(from.indexOf('.') + 1));
+        }
+        catch (error) {
+            failManagedGroup(formatJson, 'INVALID_ARGUMENT', `Invalid group AID: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        const runtime = await readBestTaskRuntimeContext();
+        validateManagedGroupScope(from, groupId, runtime, formatJson);
+        return runManagedSend(['group', ...args], formatJson);
+    }
     const { groupSend, groupPull, groupAck, groupHistory, parseGroupHistoryArgs, groupCreate, groupInfo, groupList, groupUpdate, groupDissolve, groupSuspend, groupResume, groupJoin, groupLeave, groupInvite, groupInvites, groupAcceptInvite, groupRejectInvite, groupRevokeInvite, groupKick, groupMembers, groupOnline, groupSetRole, groupTransferOwner, groupBan, groupUnban, groupBanlist, groupBlock, groupUnblock, groupBlocklist, groupReportStatus, groupMemberStatuses, groupRules, groupUpdateRules, groupRulesFileGet, groupRulesFileSet, groupRulesFilePublish, } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
     if (['block', 'unblock', 'blocklist', 'report-status', 'member-statuses'].includes(sub)) {
@@ -2737,6 +2766,121 @@ g- 是名称的一部分，会完整保留；默认命名格式为 g-10000 至 g
     process.exit(1);
 }
 // ==================== Main ====================
+async function runManagedSend(argv, formatJson) {
+    const delegationToken = readDelegationCredential();
+    if (!delegationToken)
+        failManagedGroup(formatJson, 'DELEGATION_REQUIRED', 'Managed send requires delegation');
+    const runtime = await readBestTaskRuntimeContext();
+    const result = await ipcQuery(resolvePaths().socket, {
+        type: 'aun-msg-send', argv, delegationToken,
+        originSessionId: process.env.EVOLCORE_SESSION_ID, originMessageId: runtime?.messageId,
+    }, null);
+    if (!result)
+        failManagedGroup(formatJson, 'AUN_DAEMON_UNAVAILABLE', 'Unable to connect to the EvolCore daemon');
+    if (!result.ok)
+        failManagedGroup(formatJson, result.code ?? 'AUN_SEND_FAILED', result.error ?? 'Send failed');
+    if (formatJson)
+        console.log(JSON.stringify(result));
+    else if (result.handoff_id)
+        console.log(`✓ handoff ${result.handoff_id} ${result.status === 'delivered' ? '已投递' : '已排队'} ${result.message_id ?? ''}`.trimEnd());
+    else
+        console.log(`✓ 已发送 message_id=${result.message_id ?? '-'} seq=${result.seq ?? result.message?.seq ?? '-'}`);
+}
+export function resolveManagedSendArgv(argv) {
+    if (!['msg', 'group'].includes(argv[0]) || argv[1] !== 'send' || !validSendAid(argv[2]))
+        throw new Error('Invalid managed send command');
+    const scope = argv[0];
+    const aid = argv[2];
+    const to = scope === 'group' ? normalizeGroupAid(argv[3], aid.slice(aid.indexOf('.') + 1)) : argv[3];
+    if (!to || !validSendAid(to))
+        throw new Error('Invalid send target');
+    const values = new Map();
+    const booleans = new Set();
+    const text = [];
+    const mentions = [];
+    const valueFlags = new Set(['--format', '--file', '--payload', '--text-from-file', '--link', '--title', '--description', '--as', '--content-type', '--text', '--transcript', '--thread', '--return', '--handoff-context', '--mention']);
+    const booleanFlags = new Set(['--encrypt', '--no-encrypt', '--mention-all']);
+    for (let index = 4; index < argv.length; index++) {
+        const flag = argv[index];
+        if (flag === '--') {
+            text.push(...argv.slice(index + 1));
+            break;
+        }
+        if (flag === '--app' || flag === '--aun-path')
+            throw new Error(`${flag} is not allowed for managed sends`);
+        if (booleanFlags.has(flag))
+            booleans.add(flag);
+        else if (valueFlags.has(flag)) {
+            const value = argv[++index];
+            if (value === undefined || valueFlags.has(value) || booleanFlags.has(value))
+                throw new Error(`${flag} requires a value`);
+            if (flag === '--mention') {
+                for (const mention of value.split(',').map(item => item.trim()).filter(Boolean)) {
+                    if (!validSendAid(mention))
+                        throw new Error('Invalid mention AID');
+                    mentions.push({ aid: mention });
+                }
+            }
+            else {
+                if (values.has(flag))
+                    throw new Error(`Duplicate send option: ${flag}`);
+                values.set(flag, value);
+            }
+        }
+        else
+            text.push(flag);
+    }
+    if (booleans.has('--encrypt') && booleans.has('--no-encrypt'))
+        throw new Error('Encryption options are mutually exclusive');
+    if (values.has('--format') && values.get('--format') !== 'json')
+        throw new Error('--format only supports json');
+    const returnPolicy = values.get('--return');
+    if (returnPolicy !== undefined && !['none', 'required'].includes(returnPolicy))
+        throw new Error('Invalid return policy');
+    const handoffContext = values.get('--handoff-context');
+    if (handoffContext !== undefined && (scope !== 'msg' || !handoffContext.trim() || handoffContext.length > 65536))
+        throw new Error('Invalid private handoff context');
+    if (scope === 'msg' && (mentions.length || booleans.has('--mention-all')))
+        throw new Error('Mentions require a group send');
+    if (scope === 'group' && (values.has('--link') || values.has('--text-from-file')))
+        throw new Error('Unsupported group send body');
+    const modes = ['--file', '--payload', '--text-from-file', '--link'].filter(flag => values.has(flag));
+    if (modes.length > 1 || (modes.length && text.length))
+        throw new Error('Message body modes are mutually exclusive');
+    let payload;
+    let file;
+    if (values.has('--file')) {
+        const as = values.get('--as');
+        if (as && !['image', 'video', 'voice', 'file'].includes(as))
+            throw new Error('Invalid attachment type');
+        if (values.has('--transcript') && as !== 'voice')
+            throw new Error('--transcript requires --as voice');
+        file = { filePath: values.get('--file'), as, contentType: values.get('--content-type'), text: values.get('--text'), transcript: values.get('--transcript') };
+    }
+    else if (values.has('--payload')) {
+        payload = JSON.parse(values.get('--payload'));
+        if (!payload || typeof payload !== 'object' || Array.isArray(payload))
+            throw new Error('--payload must be a JSON object');
+    }
+    else if (values.has('--link')) {
+        assertEcSingleLine(values.get('--title'), '--title');
+        payload = { type: 'link', url: values.get('--link'), ...(values.get('--title') ? { title: values.get('--title') } : {}),
+            ...(values.get('--description') ? { description: values.get('--description') } : {}) };
+    }
+    else if (!values.has('--text-from-file')) {
+        if (!text.join(' '))
+            throw new Error('Message content is required');
+        payload = { type: 'text', text: text.join(' ') };
+    }
+    if (!file && ['--as', '--content-type', '--text', '--transcript'].some(flag => values.has(flag)))
+        throw new Error('Attachment options require --file');
+    if (booleans.has('--mention-all'))
+        mentions.push({ scope: 'all' });
+    return { aid, to, scope, payload, file, textFile: values.get('--text-from-file'),
+        encrypt: booleans.has('--no-encrypt') ? false : booleans.has('--encrypt') ? true : undefined,
+        thread: values.get('--thread'), returnPolicy: returnPolicy, handoffContext,
+        mentions: mentions.length ? mentions : undefined };
+}
 /**
  * 收集位置参数（从 startIdx 开始）。
  *

package/dist/cli/ctl-command.js

@@ -41,11 +41,10 @@ export async function cmdCtl(args) {
         console.error('错误: EVOLCORE_SESSION_ID 未设置（仅在 evolcore 托管环境中可用）');
         process.exit(1);
     }
-    const cmd = '/' + args.join(' ');
     const socketPath = resolvePaths().socket;
     const result = await ipcQuery(socketPath, {
         type: 'ctl',
-        cmd,
+        argv: ['ctl', ...args],
         sessionId,
         delegationToken: readDelegationCredential(),
     }, 10_000);

package/dist/cli/daemon-commands.js

@@ -154,7 +154,7 @@ async function tryDelegatedDaemonRestart(socketPath) {
         return false;
     const response = await ipcQuery(socketPath, {
         type: 'ctl',
-        cmd: '/restart',
+        argv: ['ctl', 'restart'],
         sessionId,
         delegationToken,
     }, 15_000);

package/dist/cli/diag.js

@@ -8,11 +8,11 @@ export async function cmdDiag(args) {
         console.log('用法：ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n      ec diag stop [--format json]\n未指定 --owner 时联系本机 daemon.json.owners[0]；有效诊断期间再次执行会追加到原 case。');
         return;
     }
+    const argv = ['diag', ...args];
     const json = args.at(-2) === '--format' && args.at(-1) === 'json';
-    const argv = json ? args.slice(0, -2) : args;
     let result;
     try {
-        parseDiagArgs(argv);
+        parseDiagArgs(args);
         result = await ipcQuery(resolvePaths().socket, {
             type: 'diag', argv,
             ...(process.env.EVOLCORE_SESSION_ID ? {

package/dist/cli/handoff-command.js

@@ -6,6 +6,7 @@ import { HANDOFF_ID_RE } from '../core/handoff/store.js';
 import { isHelpFlag, wantsHelp } from './help.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
+import { MAIN_CLI_BIN } from '../product.js';
 function parseLimit(value) {
     const limit = Number(value);
     if (!value || !Number.isInteger(limit) || limit < 1 || limit > HANDOFF_QUERY_MAX_LIMIT) {
@@ -70,8 +71,9 @@ export function parseTrace(args) {
     }
     return parsed;
 }
-export function parseReturn(args) {
-    args = canonicalizeEvolcoreCommandArgv(['ec', 'handoff', 'return', ...args]).slice(3);
+export function parseReturn(args, options = {}) {
+    if (!options.canonical)
+        args = canonicalizeEvolcoreCommandArgv([MAIN_CLI_BIN, 'handoff', 'return', ...args]).slice(3);
     const dash = args.indexOf('--');
     if (dash >= 0) {
         const beforeDash = args.slice(0, dash);
@@ -96,8 +98,10 @@ export function parseReturn(args) {
     if (filePath && contentArgs.length > 0)
         throw new Error('HANDOFF_CONTENT_FILE_CONFLICT');
     if (filePath) {
+        if (options.deferFileRead)
+            return { handoffId, content: '' };
         try {
-            return { handoffId, content: fs.readFileSync(filePath, 'utf8') };
+            return { handoffId, content: options.readFile ? options.readFile(filePath) : fs.readFileSync(filePath, 'utf8') };
         }
         catch {
             throw new Error('HANDOFF_CONTENT_FILE_READ_FAILED');
@@ -153,6 +157,7 @@ function formatTimestamp(value) {
     return new Date(value).toISOString();
 }
 export async function cmdHandoff(args) {
+    args = canonicalizeEvolcoreCommandArgv([MAIN_CLI_BIN, 'handoff', ...args]).slice(2);
     const sub = args[0];
     if (!sub || isHelpFlag(sub) || wantsHelp(args)) {
         console.log(`用法: ec handoff <command> [args]
@@ -170,7 +175,7 @@ Commands:
     if (sub === 'return') {
         let parsed;
         try {
-            parsed = parseReturn(args.slice(1));
+            parsed = parseReturn(args.slice(1), { canonical: true, deferFileRead: !!process.env.EVOLCORE_SESSION_ID });
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -185,6 +190,7 @@ Commands:
         }
         const result = await ipcQuery(resolvePaths().socket, {
             type: 'handoff-return',
+            argv: ['handoff', ...args],
             sessionId: process.env.EVOLCORE_SESSION_ID,
             handoffId: parsed.handoffId,
             content: parsed.content,
@@ -201,7 +207,7 @@ Commands:
     if (sub === 'recover-return') {
         let parsed;
         try {
-            parsed = parseReturn(args.slice(1));
+            parsed = parseReturn(args.slice(1), { canonical: true, deferFileRead: !!process.env.EVOLCORE_SESSION_ID });
         }
         catch (error) {
             console.error(`✗ ${error instanceof Error ? error.message : String(error)}`);
@@ -215,6 +221,7 @@ Commands:
         }
         const result = await ipcQuery(resolvePaths().socket, {
             type: 'handoff-recover-return',
+            argv: ['handoff', ...args],
             sessionId: process.env.EVOLCORE_SESSION_ID,
             handoffId: parsed.handoffId,
             content: parsed.content,
@@ -237,6 +244,7 @@ Commands:
         }
         const result = await ipcQuery(resolvePaths().socket, {
             type: 'handoff-status', sessionId: process.env.EVOLCORE_SESSION_ID, handoffId,
+            argv: ['handoff', ...args],
             delegationToken: readDelegationCredential(),
         }, 5000);
         if (!result) {
@@ -264,6 +272,7 @@ Commands:
         }
         const result = await ipcQuery(resolvePaths().socket, {
             type: 'handoff-list',
+            argv: ['handoff', ...args],
             sessionId: process.env.EVOLCORE_SESSION_ID,
             agent: parsed.agent,
             state: parsed.state,
@@ -308,6 +317,7 @@ Commands:
         }
         const result = await ipcQuery(resolvePaths().socket, {
             type: 'handoff-trace',
+            argv: ['handoff', ...args],
             sessionId: process.env.EVOLCORE_SESSION_ID,
             agent: parsed.agent,
             handoffId: parsed.handoffId,