evolcore 0.0.31 → 0.0.33

package/dist/channels/daemon.js

@@ -1,3 +1,4 @@
+import { appendExpireEntry, recordNextLaunchCleanup, cleanupPreviousByKind, runExpireCleanup, cleanupSessionRecord, } from '../core/background-session/session-cleanup.js';
 import { ExecutionTimeoutError } from '../utils/error-utils.js';
 import { normalizeExecutionMode } from '../trigger/validation.js';
 import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
@@ -17,6 +18,7 @@ export class DaemonChannel {
         thread: true,
     };
     pending = new Map();
+    bgPending = new Map();
     watchdogMs;
     totalExecutionMs;
     constructor(sessionManager, messageQueue, opts = {}) {
@@ -26,6 +28,8 @@ export class DaemonChannel {
         this.totalExecutionMs = normalizeTotalExecutionMs(opts.totalExecutionMs);
     }
     async converse(prompt, ctx) {
+        // 启动前跑一次 expire 扫描（成本低，只读少量小文件）
+        void runExpireCleanup(this.sessionManager).catch(() => { });
         const runId = ctx.runId;
         const pendingId = ctx.attemptId ?? runId;
         const messageId = pendingId;
@@ -41,6 +45,11 @@ export class DaemonChannel {
                 ? undefined
                 : setTimeout(() => this.totalExecutionTimeout(pendingId, remainingExecutionMs), remainingExecutionMs);
             totalExecutionTimer?.unref?.();
+            // trigger 清理策略：once → expire(3天)，其他 → expire(30天)
+            const isOnce = ctx.trigger.source?.type === 'once';
+            const triggerCleanupPolicy = isOnce
+                ? { mode: 'expire', ttlMs: 3 * 24 * 3600 * 1000 }
+                : { mode: 'expire', ttlMs: 30 * 24 * 3600 * 1000 };
             this.pending.set(pendingId, {
                 resolve,
                 startedAt,
@@ -52,6 +61,11 @@ export class DaemonChannel {
                 abortSignal: ctx.signal,
                 runId,
                 acc: { text: '', files: [], anomalies: [], toolCallCount: 0, seenToolCallIds: new Set() },
+                cleanupPolicy: triggerCleanupPolicy,
+                channelId: ctx.session.channelId,
+                agentAid: ctx.trigger.agentAid,
+                kind: `trigger:${ctx.trigger.id}`,
+                sessionId: ctx.session.id,
             });
         });
         const message = {
@@ -85,8 +99,13 @@ export class DaemonChannel {
                 originChannelKey: ctx.trigger.origin?.channelKey,
                 originChannelType: ctx.trigger.origin?.channelType
                     ?? (ctx.trigger.origin?.channelKey ? channelTypeFromKey(ctx.trigger.origin.channelKey) : undefined),
+                originChatType: ctx.trigger.origin?.delivery?.chatType,
+                originConversationId: ctx.trigger.origin?.delivery?.chatType === 'group'
+                    ? ctx.trigger.origin.channelId
+                    : ctx.trigger.origin?.peerId,
                 originControl: ctx.trigger.origin?.channelKey === 'daemon',
                 authorizedBy: ctx.trigger.authorizedBy,
+                labels: ctx.trigger.labels,
             },
         };
         const onAbort = () => {
@@ -128,6 +147,15 @@ export class DaemonChannel {
         return promise;
     }
     async send(envelope, payload) {
+        // bg-session 路径：优先查 bgPending
+        const bgRunId = this.bgRunIdFromEnvelope(envelope);
+        if (bgRunId) {
+            const bgSlot = this.bgPending.get(bgRunId);
+            if (bgSlot && !bgSlot.terminated) {
+                this.handleBgSessionPayload(bgRunId, bgSlot, payload);
+                return;
+            }
+        }
         const runId = this.runIdFromEnvelope(envelope);
         if (!runId)
             return;
@@ -270,6 +298,11 @@ export class DaemonChannel {
         const pendingId = metadata?.triggerAttemptId ?? metadata?.triggerRunId;
         return typeof pendingId === 'string' ? pendingId : undefined;
     }
+    bgRunIdFromEnvelope(envelope) {
+        const metadata = envelope.replyContext?.metadata;
+        const runId = metadata?.bgSessionRunId;
+        return typeof runId === 'string' ? runId : undefined;
+    }
     recordToolCall(slot, callId) {
         if (typeof callId !== 'string' || !callId) {
             slot.acc.toolCallCount += 1;
@@ -290,13 +323,14 @@ export class DaemonChannel {
             ?? (origin.channelKey ? channelTypeFromKey(origin.channelKey) : undefined);
         if (!channelType)
             return undefined;
+        const chatType = origin.delivery?.chatType ?? 'private';
         return resolvePeerRoleDetail({
             selfAid: trigger.agentAid,
             channelKey: origin.channelKey,
             channelType,
-            chatType: 'private',
+            chatType,
             actorId: origin.peerId,
-            conversationId: origin.peerId,
+            conversationId: chatType === 'group' ? origin.channelId : origin.peerId,
         }).effectiveRole ?? undefined;
     }
     finish(runId, status, metadata) {
@@ -346,6 +380,29 @@ export class DaemonChannel {
                 toolCallCount: Math.max(slot.acc.toolCallCount, completedToolCallCount),
             },
         });
+        // trigger 清理策略
+        const policy = slot.cleanupPolicy;
+        if (policy.mode === 'immediate') {
+            void cleanupSessionRecord({ sessionId: slot.sessionId, channelId: slot.channelId, agentAid: slot.agentAid }, this.sessionManager);
+        }
+        else if (policy.mode === 'on_next_launch') {
+            recordNextLaunchCleanup(slot.kind, {
+                channelId: slot.channelId,
+                sessionId: slot.sessionId,
+                agentAid: slot.agentAid,
+                recordedAt: Date.now(),
+            });
+        }
+        else if (policy.mode === 'expire') {
+            appendExpireEntry({
+                expireAt: Date.now() + policy.ttlMs,
+                sessionId: slot.sessionId,
+                channelId: slot.channelId,
+                kind: slot.kind,
+                agentAid: slot.agentAid,
+            });
+        }
+        // 'keep' 模式：不做任何处理
     }
     fail(runId, reason, text) {
         const slot = this.pending.get(runId);
@@ -412,6 +469,204 @@ export class DaemonChannel {
         }
         queue.cancelActive?.(messageId);
     }
+    // ── bg-session 生命周期 ──
+    handleBgSessionPayload(runId, slot, payload) {
+        if (slot.terminated)
+            return;
+        switch (payload.kind) {
+            case 'result.text':
+                if (payload.isFinal)
+                    slot.text = payload.text;
+                else
+                    slot.text += payload.text;
+                break;
+            case 'status.completed':
+                this.finishBgSession(runId, slot, 'completed');
+                break;
+            case 'result.error':
+                this.finishBgSession(runId, slot, 'error', payload.text ?? payload.reason ?? 'unknown error');
+                break;
+            case 'system.error':
+                this.finishBgSession(runId, slot, 'error', payload.text ?? payload.subtype ?? 'unknown error');
+                break;
+            case 'status.error':
+                this.finishBgSession(runId, slot, 'error', payload.metadata?.message ?? 'status error');
+                break;
+            case 'status.interrupted':
+                {
+                    const reason = typeof payload.metadata?.reason === 'string'
+                        ? payload.metadata.reason
+                        : 'interrupted';
+                    const outcome = slot.abortSignal?.aborted ? 'cancelled' : 'interrupted';
+                    this.finishBgSession(runId, slot, outcome, reason);
+                }
+                break;
+            case 'status.timeout':
+                this.finishBgSession(runId, slot, 'error', 'bg-session watchdog timeout');
+                break;
+            default:
+                break;
+        }
+    }
+    finishBgSession(runId, slot, outcome, error) {
+        if (slot.terminated)
+            return;
+        slot.terminated = true;
+        if (slot.watchdogTimer)
+            clearTimeout(slot.watchdogTimer);
+        if (slot.abortListener)
+            slot.abortSignal?.removeEventListener('abort', slot.abortListener);
+        this.bgPending.delete(runId);
+        // 会话结束后按清理策略处理
+        const policy = slot.cleanupPolicy;
+        if (policy.mode === 'immediate') {
+            void cleanupSessionRecord({ sessionId: slot.sessionId, channelId: slot.channelId, agentAid: slot.agentAid }, this.sessionManager);
+        }
+        else if (policy.mode === 'on_next_launch') {
+            recordNextLaunchCleanup(slot.kind, {
+                channelId: slot.channelId,
+                sessionId: slot.sessionId,
+                agentAid: slot.agentAid,
+                recordedAt: Date.now(),
+            });
+        }
+        else if (policy.mode === 'expire') {
+            appendExpireEntry({
+                expireAt: Date.now() + policy.ttlMs,
+                sessionId: slot.sessionId,
+                channelId: slot.channelId,
+                kind: slot.kind,
+                agentAid: slot.agentAid,
+            });
+        }
+        // 'keep' 模式：不做任何处理
+        slot.resolve({
+            sessionId: slot.sessionId,
+            outcome,
+            ...(slot.text ? { text: slot.text } : {}),
+            ...(error ? { error } : {}),
+        });
+    }
+    /**
+     * 拉起一个独立后台会话。会话创建、首条消息入队后即返回 handle；
+     * 会话结束由 handle.result 通知。实现 BackgroundSessionLauncher 接口。
+     * 详见 docs/background-session/background-session-launcher.md
+     */
+    async launchBackgroundSession(spec) {
+        const runId = `bg-${spec.kind}-${spec.instanceId}`;
+        const channelId = `bg:${spec.kind}:${spec.instanceId}`;
+        const cleanupPolicy = spec.cleanupPolicy ?? { mode: 'on_next_launch' };
+        // 启动前清理：on_next_launch 清理同 kind 历史，expire 扫描到期条目
+        if (cleanupPolicy.mode === 'on_next_launch') {
+            await cleanupPreviousByKind(spec.kind, this.sessionManager);
+        }
+        else if (cleanupPolicy.mode !== 'keep') {
+            // immediate 和 expire 模式都在启动时跑一次 expire 扫描
+            await runExpireCleanup(this.sessionManager);
+        }
+        const session = await this.sessionManager.getOrCreateSession(this.channelName, channelId, spec.projectPath, channelId, // threadId，每次独立，保证 by_run 语义
+        {
+            channelKey: this.channelKey,
+            peerId: `bg:${spec.kind}`,
+            peerName: spec.kind,
+            peerType: 'system',
+            bgKind: spec.kind,
+            bgInstanceId: spec.instanceId,
+            ...(spec.metadata ?? {}),
+        }, spec.kind, undefined, 'private', spec.baseagent, spec.agentAid, this.channelName, 'system');
+        const promise = new Promise((resolve) => {
+            const slot = {
+                resolve,
+                sessionId: session.id,
+                channelId,
+                kind: spec.kind,
+                startedAt: Date.now(),
+                abortSignal: spec.signal,
+                text: '',
+                terminated: false,
+                cleanupPolicy,
+                agentAid: spec.agentAid,
+                watchdogTimer: setTimeout(() => {
+                    this.finishBgSession(runId, slot, 'error', 'bg-session watchdog timeout');
+                }, this.watchdogMs),
+            };
+            slot.watchdogTimer?.unref?.();
+            if (spec.signal) {
+                const onAbort = () => {
+                    void this.cancelDelivery(runId).catch(() => { });
+                };
+                slot.abortListener = onAbort;
+                spec.signal.addEventListener('abort', onAbort, { once: true });
+                if (spec.signal.aborted)
+                    onAbort();
+            }
+            this.bgPending.set(runId, slot);
+        });
+        const message = {
+            channel: this.channelName,
+            channelType: this.channelName,
+            channelId: session.channelId,
+            selfAID: spec.agentAid,
+            baseagent: spec.baseagent,
+            threadId: session.threadId || '',
+            chatType: 'private',
+            peerId: `bg:${spec.kind}`,
+            peerName: spec.kind,
+            peerType: 'system',
+            content: spec.prompt,
+            messageId: runId,
+            timestamp: Date.now(),
+            source: 'bg-session',
+            bgSessionMeta: {
+                kind: spec.kind,
+                runId,
+                instanceId: spec.instanceId,
+                boundSessionId: session.id,
+            },
+            replyContext: {
+                metadata: { bgSessionRunId: runId },
+            },
+        };
+        void this.messageQueue.enqueue?.(session.id, message, spec.projectPath, {
+            interruptible: false,
+            agentName: spec.agentAid,
+            sessionKeyField: session.sessionKey,
+            selfAID: spec.agentAid,
+        });
+        let settled = false;
+        void promise.then(() => { settled = true; });
+        const sessionId = session.id;
+        return {
+            sessionId,
+            result: promise,
+            waitForAgentSessionId: (opts) => this.waitForAgentSessionId(sessionId, () => settled, opts),
+        };
+    }
+    /**
+     * 轮询 session 记录，等 runner 写入 agentSessionId。
+     * 会话刚创建时只有 evolcore sessionId，agentSessionId 要等 runner 初始化并开始第一轮才写入。
+     * 会话结束后再读一次即停止，避免对已结束的会话空等到超时。
+     */
+    async waitForAgentSessionId(sessionId, isSettled, opts = {}) {
+        const deadline = Date.now() + (opts.timeoutMs ?? 10_000);
+        const interval = opts.intervalMs ?? 250;
+        while (true) {
+            const settledBeforeRead = isSettled();
+            try {
+                const id = (await this.sessionManager.getSessionById(sessionId))?.agentSessionId;
+                if (id)
+                    return id;
+            }
+            catch { /* 会话记录写到一半，下一轮再读 */ }
+            if (settledBeforeRead || Date.now() >= deadline)
+                return undefined;
+            await new Promise(r => setTimeout(r, interval));
+        }
+    }
+    /** 实现 BackgroundSessionLauncher 接口 */
+    launch(spec) {
+        return this.launchBackgroundSession(spec);
+    }
 }
 function isObject(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);

package/dist/cli/agent-command.js

@@ -41,6 +41,30 @@ function formatBytes(bytes) {
         return `${(bytes / 1024).toFixed(1)}KB`;
     return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
 }
+/** 终端显示宽度：CJK 及全角字符占 2 列，ASCII/拉丁占 1 列 */
+function displayWidth(s) {
+    let w = 0;
+    for (const ch of s) {
+        const cp = ch.codePointAt(0);
+        if ((cp >= 0x1100 && cp <= 0x115F) ||
+            (cp >= 0x2E80 && cp <= 0x303E) ||
+            (cp >= 0x3040 && cp <= 0x33FF) ||
+            (cp >= 0x3400 && cp <= 0x9FFF) ||
+            (cp >= 0xAC00 && cp <= 0xD7AF) ||
+            (cp >= 0xF900 && cp <= 0xFAFF) ||
+            (cp >= 0xFF01 && cp <= 0xFF60) ||
+            (cp >= 0xFFE0 && cp <= 0xFFE6)) {
+            w += 2;
+        }
+        else {
+            w += 1;
+        }
+    }
+    return w;
+}
+function padEndDisplay(s, targetWidth) {
+    return s + ' '.repeat(Math.max(0, targetWidth - displayWidth(s)));
+}
 // ==================== Agent ====================
 export async function cmdAgent(args) {
     args = canonicalizeEvolcoreCommandArgv(['ec', 'agent', ...args]).slice(2);
@@ -78,8 +102,8 @@ Commands:
   persona show            查看当前 Agent 的 persona.md
   persona --text <text>   用文本设置当前 Agent 的 persona.md
   persona --file <path>   用 .md/.txt 文件设置当前 Agent 的 persona.md
-  welcome show            查看已确认的 Bootstrap welcome 文案
-  welcome --text <text>  保存 Owner 已确认的 Bootstrap welcome 文案
+  welcome show            查看 Agent 自主准备的 Bootstrap welcome 文案
+  welcome --text <text>  保存 Agent 自主准备的 Bootstrap welcome 文案
   rename <aid> <name>     修改 agent.md 中的显示名称
   ready <aid>              标记 bootstrap 完成，进入 active 状态
   reload [aid]            热重载配置（无参数=全量 resync）
@@ -148,8 +172,7 @@ Options:
             process.exitCode = 1;
             return;
         }
-        const managedArgs = commands.has(sub) ? args : ['show', ...args];
-        const result = await runManagedAgentOperation(managedArgs);
+        const result = await runManagedAgentOperation(args);
         if (!result.ok) {
             if (formatJson)
                 console.log(JSON.stringify(result));
@@ -221,25 +244,28 @@ Options:
         // 表头跟随系统语言
         const isChinese = isHostChinese();
         const headers = isChinese
-            ? { name: '名称', personal: 'Personal名', status: '状态', channels: '渠道', project: '项目', baseagent: '基座', lastActive: '最后活跃' }
-            : { name: 'NAME', personal: 'PERSONAL', status: 'STATUS', channels: 'CHANNELS', project: 'PROJECT', baseagent: 'BASEAGENT', lastActive: 'LAST ACTIVE' };
-        // 计算各列实际需要的宽度
-        let maxNameLen = headers.name.length;
-        let maxPersonalLen = headers.personal.length;
-        let maxStatusLen = headers.status.length;
-        let maxChannelsLen = headers.channels.length;
-        let maxProjectLen = headers.project.length;
-        let maxBaseagentLen = headers.baseagent.length;
+            ? { name: '名称', personal: 'Personal名', status: '状态', channels: '渠道', project: '项目', baseagent: '基座', model: '模型', lastActive: '最后活跃' }
+            : { name: 'NAME', personal: 'PERSONAL', status: 'STATUS', channels: 'CHANNELS', project: 'PROJECT', baseagent: 'BASEAGENT', model: 'MODEL', lastActive: 'LAST ACTIVE' };
+        // 计算各列实际需要的显示宽度（CJK 字符占 2 列）
+        let maxNameLen = displayWidth(headers.name);
+        let maxPersonalLen = displayWidth(headers.personal);
+        let maxStatusLen = displayWidth(headers.status);
+        let maxChannelsLen = displayWidth(headers.channels);
+        let maxProjectLen = displayWidth(headers.project);
+        let maxBaseagentLen = displayWidth(headers.baseagent);
+        let maxModelLen = displayWidth(headers.model);
         for (const info of result.agents) {
-            maxNameLen = Math.max(maxNameLen, info.name.length);
-            maxPersonalLen = Math.max(maxPersonalLen, (info.personalName || '—').length);
-            const displayedStatus = `${info.status || 'unknown'}${info.stale ? ' (stale)' : ''}`;
-            maxStatusLen = Math.max(maxStatusLen, displayedStatus.length);
+            maxNameLen = Math.max(maxNameLen, displayWidth(info.name));
+            maxPersonalLen = Math.max(maxPersonalLen, displayWidth(info.personalName || '—'));
+            const lcSuffix = info.lifecycle && info.lifecycle !== 'active' ? ` (${info.lifecycle})` : '';
+            const displayedStatus = `${info.status || 'unknown'}${info.stale ? ' (stale)' : ''}${lcSuffix}`;
+            maxStatusLen = Math.max(maxStatusLen, displayWidth(displayedStatus));
             const channelsStr = info.channels?.length > 0 ? info.channels.join(', ') : '—';
-            maxChannelsLen = Math.max(maxChannelsLen, channelsStr.length);
+            maxChannelsLen = Math.max(maxChannelsLen, displayWidth(channelsStr));
             const projectStr = info.projectPath ? path.basename(info.projectPath) : '—';
-            maxProjectLen = Math.max(maxProjectLen, projectStr.length);
-            maxBaseagentLen = Math.max(maxBaseagentLen, (info.baseagent || '—').length);
+            maxProjectLen = Math.max(maxProjectLen, displayWidth(projectStr));
+            maxBaseagentLen = Math.max(maxBaseagentLen, displayWidth(info.baseagent || '—'));
+            maxModelLen = Math.max(maxModelLen, displayWidth(info.model || '—'));
         }
         // 加 2 作为列间距
         const colName = maxNameLen + 2;
@@ -248,18 +274,25 @@ Options:
         const colChannels = maxChannelsLen + 1;
         const colProject = maxProjectLen + 2;
         const colBaseagent = maxBaseagentLen + 2;
-        console.log(headers.name.padEnd(colName) + headers.personal.padEnd(colPersonal) + headers.status.padEnd(colStatus) + headers.channels.padEnd(colChannels) +
-            headers.project.padEnd(colProject) + headers.baseagent.padEnd(colBaseagent) + headers.lastActive);
+        const colModel = maxModelLen + 2;
+        console.log(padEndDisplay(headers.name, colName) + padEndDisplay(headers.personal, colPersonal) +
+            padEndDisplay(headers.status, colStatus) + padEndDisplay(headers.channels, colChannels) +
+            padEndDisplay(headers.project, colProject) + padEndDisplay(headers.baseagent, colBaseagent) +
+            padEndDisplay(headers.model, colModel) + headers.lastActive);
         for (const info of result.agents) {
             const name = info.name;
             const personal = info.personalName || '—';
-            const status = `${info.status || 'unknown'}${info.stale ? ' (stale)' : ''}`;
+            const lcSuffix = info.lifecycle && info.lifecycle !== 'active' ? ` (${info.lifecycle})` : '';
+            const status = `${info.status || 'unknown'}${info.stale ? ' (stale)' : ''}${lcSuffix}`;
             const channels = info.channels?.length > 0 ? info.channels.join(', ') : '—';
             const project = info.projectPath ? path.basename(info.projectPath) : '—';
             const baseagent = info.baseagent || '—';
+            const model = info.model || '—';
             const lastActive = info.lastActivity ? formatTimeAgo(Date.now() - info.lastActivity) : '—';
-            console.log(name.padEnd(colName) + personal.padEnd(colPersonal) + status.padEnd(colStatus) + channels.padEnd(colChannels) +
-                project.padEnd(colProject) + baseagent.padEnd(colBaseagent) + lastActive);
+            console.log(padEndDisplay(name, colName) + padEndDisplay(personal, colPersonal) +
+                padEndDisplay(status, colStatus) + padEndDisplay(channels, colChannels) +
+                padEndDisplay(project, colProject) + padEndDisplay(baseagent, colBaseagent) +
+                padEndDisplay(model, colModel) + lastActive);
         }
         return;
     }
@@ -671,7 +704,7 @@ Options:
             process.exitCode = 1;
             return;
         }
-        const result = await agentPersona(aid, { text, file });
+        const result = await agentPersona(aid, { text, file, argv: args });
         if (!result.ok) {
             if (formatJson)
                 console.log(JSON.stringify(result));
@@ -698,7 +731,7 @@ Options:
                 console.log(`用法: ${MAIN_CLI_BIN} agent welcome show [--format json]
      ${MAIN_CLI_BIN} agent welcome --text <text> [--format json]
 
-读取或保存当前 Agent 在 Bootstrap 中经 Owner 确认的 welcome 文案。文案固定保存到 personal/welcome.md。`);
+读取或保存当前 Agent 在 Bootstrap 中自主准备的 welcome 文案。文案固定保存到 personal/welcome.md。`);
                 return;
             }
             const result = { ok: false, code: 'INVALID_ARGS', error: error.message };
@@ -720,7 +753,7 @@ Options:
             process.exitCode = 1;
             return;
         }
-        const result = await agentWelcome(aid, { text });
+        const result = await agentWelcome(aid, { text, argv: args });
         if (!result.ok) {
             if (formatJson)
                 console.log(JSON.stringify(result));
@@ -756,7 +789,7 @@ Options:
             console.error('用法: ec agent get <aid> <key>');
             process.exit(1);
         }
-        const result = await agentGet(aid, key);
+        const result = await agentGet(aid, key, { argv: args });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -797,7 +830,7 @@ Options:
             console.error('用法: ec agent set <aid> <key> <value>');
             process.exit(1);
         }
-        const result = await agentSet(aid, key, val);
+        const result = await agentSet(aid, key, val, { argv: args });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -828,7 +861,7 @@ Options:
             console.error('用法: ec agent ready <aid>');
             process.exit(1);
         }
-        const result = await agentReady(aid);
+        const result = await agentReady(aid, args);
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));

package/dist/cli/agent-create.js

@@ -20,6 +20,7 @@ import { atomicWriteJson } from '../utils/atomic-write.js';
 import { isHClassPath, isLClassPath, isSameOrDescendant } from '../core/permission/protected-paths.js';
 import { MAIN_CLI_BIN } from '../product.js';
 import { uploadAvatarFile, uploadAvatarUrl } from '../utils/avatar-upload.js';
+import { readTaskRuntimeContextFromEnv } from './task-context.js';
 /** Parse the current Agent's Bootstrap welcome subcommand. */
 export function parseAgentWelcomeArgs(args) {
     const tail = args.at(-2) === '--format' && args.at(-1) === 'json' ? args.slice(0, -2) : args;
@@ -190,9 +191,9 @@ function projectSlug(project) {
         .replace(/-+$/g, '');
     return slug || 'agent';
 }
-export function resolveAgentCreatePlan(options) {
+export function resolveAgentCreatePlan(options, projectCwd = process.cwd()) {
     const aid = options.aid.trim();
-    const project = path.resolve(options.project || process.cwd());
+    const project = path.resolve(projectCwd, options.project || '.');
     const metadata = readProjectMetadata(project);
     const defaults = loadDefaults();
     const daemon = loadDaemonConfig();
@@ -940,6 +941,20 @@ export class AgentInitializationService {
         await this.running.get(aid);
     }
     async settle(aid) { await this.running.get(aid); }
+    async wait(aid, seconds) {
+        const work = this.running.get(aid);
+        if (work && seconds > 0) {
+            let timer;
+            try {
+                await Promise.race([work, new Promise(resolve => { timer = setTimeout(resolve, seconds * 1000); })]);
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+            }
+        }
+        return this.status(aid);
+    }
     launch(r) {
         const aid = r.plan.aid;
         const work = Promise.resolve().then(() => this.run(r)).catch(error => {
@@ -1167,33 +1182,37 @@ export function parseInitializationArgs(args) {
         throw new Error('--wait must be an integer from 0 to 300');
     return { aid: args[1], resume, dryRun: seen.has('--dry-run'), wait, values };
 }
-export function resolveInitializationPlan(args) {
+export function resolveInitializationPlan(args, context) {
     const parsed = parseInitializationArgs(args);
     if (parsed.resume)
         throw new Error('A resume request cannot supply a new plan');
     const v = parsed.values;
     if (v['--avatar-file'] !== undefined && v['--avatar-url'] !== undefined)
         throw new Error('--avatar-file and --avatar-url are mutually exclusive');
-    if (v['--avatar-file']?.startsWith('attachment:') && !process.env.EVOLCORE_SESSION_ID) {
+    if (v['--avatar-file']?.startsWith('attachment:') && !context && !process.env.EVOLCORE_SESSION_ID) {
         throw new Error('attachment:<id> avatar sources require a managed Agent task');
     }
-    if (v['--persona-file'] !== undefined)
-        throw new Error('CLI must submit persona file contents as text');
+    const persona = v['--persona-file'] !== undefined
+        ? readInitializationPersona(v['--persona-file'], !!context, context)
+        : v['--persona-text'];
     const p = resolveAgentCreatePlan({
         aid: parsed.aid, project: v['--project'], baseagent: v['--baseagent'], ...parseAgentOwnerArgs(args),
         avatarFile: v['--avatar-file'], avatarUrl: v['--avatar-url'],
         name: v['--name'], description: v['--description'], tags: parseAgentTags(v['--tags']), type: v['--type'],
-    });
+    }, context?.projectCwd);
     return {
         aid: p.aid, project: p.project, baseagent: p.baseagent ?? '', owners: p.owners ?? (p.owner ? [p.owner] : []),
         name: p.name, description: p.description, tags: p.tags, type: p.type,
-        ...(v['--persona-text'] !== undefined ? { persona: v['--persona-text'] } : {}),
+        ...(persona !== undefined ? { persona } : {}),
         ...(v['--avatar-file'] !== undefined ? { avatarFile: v['--avatar-file'] } : {}),
         ...(v['--avatar-url'] !== undefined ? { avatarUrl: v['--avatar-url'] } : {}),
     };
 }
-export function readInitializationPersona(file, managed) {
-    const resolved = path.resolve(file);
+export function readInitializationPersona(file, managed, context = {
+    projectCwd: managed ? readTaskRuntimeContextFromEnv()?.projectPath ?? process.cwd() : process.cwd(),
+    tempDir: process.env.TMPDIR,
+}) {
+    const resolved = path.resolve(context.projectCwd, file);
     if (!/\.(md|txt)$/i.test(resolved))
         throw new Error('persona file must be .md or .txt');
     const stat = fs.lstatSync(resolved);
@@ -1201,8 +1220,8 @@ export function readInitializationPersona(file, managed) {
         throw new Error('persona must be a regular text file of at most 64 KiB');
     if (managed) {
         const real = fs.realpathSync(resolved);
-        const roots = [process.cwd(), process.env.TMPDIR].filter((r) => !!r && path.isAbsolute(r));
-        const allowed = roots.some(root => isSameOrDescendant(real, fs.realpathSync(root)));
+        const roots = [context.projectCwd, context.tempDir].filter((root) => !!root && path.isAbsolute(root));
+        const allowed = roots.some(root => fs.existsSync(root) && isSameOrDescendant(real, fs.realpathSync(root)));
         if (!allowed || isHClassPath(real) || isLClassPath(real))
             throw new Error('persona file must be inside the project or current TMPDIR');
     }
@@ -1216,27 +1235,24 @@ export async function runInitializationCommand(args) {
     const parsed = parseInitializationArgs(args);
     const managed = !!process.env.EVOLCORE_SESSION_ID;
     const argv = [...args];
-    if (parsed.values['--persona-file'] !== undefined) {
+    if (parsed.values['--persona-file'] !== undefined && !managed) {
+        const persona = readInitializationPersona(parsed.values['--persona-file'], managed);
         const at = argv.indexOf('--persona-file');
-        argv.splice(at, 2, '--persona-text', readInitializationPersona(parsed.values['--persona-file'], managed));
+        argv.splice(at, 2, '--persona-text', persona);
     }
-    if (!parsed.resume) {
+    if (!managed && !parsed.resume) {
         const at = argv.indexOf('--project');
         if (at < 0)
             argv.push('--project', process.cwd());
         else
             argv[at + 1] = path.resolve(argv[at + 1]);
     }
+    if (managed) {
+        const { runManagedAgentOperation } = await import('./agent.js');
+        const result = await runManagedAgentOperation(argv, (parsed.wait + 10) * 1000);
+        return initializationCommandResult(result);
+    }
     const request = async (poll) => {
-        if (managed) {
-            const { runManagedAgentOperation } = await import('./agent.js');
-            const r = await runManagedAgentOperation(poll ? ['show', parsed.aid, '--format', 'json'] : argv);
-            if (!poll || !r.ok || !r.initialization)
-                return r;
-            const init = r.initialization;
-            return { ...init, ok: !['failed', 'cancelled'].includes(init.status), aid: parsed.aid,
-                accepted: true, lifecycle: r.lifecycle, usable: init.complete && r.connection?.status === 'connected' };
-        }
         return await ipcQuery(resolvePaths().socket, {
             type: 'evolagent.initialize', argv, poll,
         }, 10_000) ?? { ok: false, code: 'DAEMON_UNAVAILABLE', error: 'Initialization requires a running daemon' };
@@ -1249,6 +1265,9 @@ export async function runInitializationCommand(args) {
         await new Promise(resolve => setTimeout(resolve, 500));
         result = await request(true);
     }
+    return initializationCommandResult(result);
+}
+function initializationCommandResult(result) {
     if (result.ok && !result.complete && result.accepted)
         return { ...result, ok: false, code: 'INITIALIZE_PENDING', error: 'Initialization is still running; inspect agent show' };
     if (result.complete && !result.usable)