evolcore 0.0.26 → 0.0.27

package/dist/core/bootstrap-service.js

@@ -1,15 +1,17 @@
+import { hasSuppliedInitialization } from '../cli/agent-create.js';
 import fs from 'fs';
 import path from 'path';
 import { randomBytes } from 'crypto';
 import { kitsTemplatesDir, agentMdPath, resolvePaths } from '../paths.js';
 import { buildInitialAgentMd, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { logger } from '../utils/logger.js';
+import { readAgentWelcomeTemplate } from '../utils/welcome.js';
 import { loadAgent, saveAgent } from '../config-store.js';
 import { resolveAgentLifecycle, withLifecycleForWrite } from '../config/lifecycle.js';
 import { renderTemplate } from '../eck/manifest-engine.js';
 import { activeBaseagent } from './model/config-scope.js';
 import { buildEnvelope } from './message/message-utils.js';
-import { BOOTSTRAP_MESSAGE_TTL_MS, BOOTSTRAP_NOTIFICATION_WINDOW_MS, bootstrapInitialMessageOperationId, bootstrapInitialMessageOperationPrefix, bootstrapInitialRetryOperationId, } from './bootstrap-messages.js';
+import { BOOTSTRAP_MESSAGE_TTL_MS, BOOTSTRAP_NOTIFICATION_WINDOW_MS, bootstrapInitialMessageOperationId, bootstrapInitialMessageOperationPrefix, bootstrapInitialRetryOperationId, cancelPendingBootstrapPrompts, postBootstrapWelcomeStatus, } from './bootstrap-messages.js';
 import { findLatestMessageLogOperation } from './message/message-log.js';
 import * as outbox from '../aun/outbox.js';
 import { chatDirPath } from './session/session-fs-store.js';
@@ -21,6 +23,21 @@ export async function completeBootstrapWithWelcome(service, aid, welcome, sessio
         return { ...result, reloaded: false };
     }
     if (lifecycle === 'bootstrapping') {
+        // Existing per-Owner records are immutable retry snapshots. New interactive
+        // Bootstrap completions require the text saved after Owner confirmation.
+        const config = loadAgent(aid);
+        const deliveries = config?.owners?.length ? postBootstrapWelcomeStatus(aid, config.owners).deliveries : [];
+        const alreadyPrepared = deliveries.length > 0 && deliveries.every(delivery => delivery.status !== 'not_prepared');
+        if (config?.initialization?.mode !== 'supplied' && !alreadyPrepared) {
+            try {
+                if (readAgentWelcomeTemplate(aid) === null) {
+                    return { ok: false, code: 'WELCOME_REQUIRED', error: '请先在 Bootstrap 对话中生成欢迎文案，经 Owner 确认后保存 welcome.md', reloaded: false };
+                }
+            }
+            catch (error) {
+                return { ok: false, code: 'WELCOME_INVALID', error: error instanceof Error ? error.message : String(error), reloaded: false };
+            }
+        }
         if (!welcome) {
             return {
                 ok: false,
@@ -41,7 +58,9 @@ export async function completeBootstrapWithWelcome(service, aid, welcome, sessio
     const welcomePending = welcome
         ? await welcome.hasPendingPostBootstrapWelcome()
         : false;
-    const needsMainSessionBoundary = lifecycle === 'bootstrapping' || welcomePending;
+    const pendingOwners = welcome?.pendingPostBootstrapWelcomeOwners?.();
+    const needsMainSessionBoundary = lifecycle === 'bootstrapping'
+        || (welcomePending && (pendingOwners === undefined || pendingOwners.length > 0));
     let mainSession;
     if (needsMainSessionBoundary) {
         if (!sessions) {
@@ -52,7 +71,6 @@ export async function completeBootstrapWithWelcome(service, aid, welcome, sessio
                 reloaded: false,
             };
         }
-        const pendingOwners = welcome?.pendingPostBootstrapWelcomeOwners?.();
         const sessionOwners = pendingOwners?.length ? pendingOwners : [undefined];
         for (const owner of sessionOwners) {
             let ownerSession;
@@ -98,11 +116,27 @@ export async function completeBootstrapWithWelcome(service, aid, welcome, sessio
             mainSessionCreated: mainSession?.created,
         };
     }
-    const welcomeQueued = await welcome.reconcilePostBootstrapWelcome();
+    let welcomeResult;
+    try {
+        welcomeResult = await welcome.reconcilePostBootstrapWelcome();
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger.warn(`[Bootstrap] Completion committed; welcome reconciliation failed for ${aid}: ${message}`);
+        welcomeResult = { deliveries: [], error: message };
+        try {
+            welcomeResult = { ...postBootstrapWelcomeStatus(aid, loadAgent(aid)?.owners ?? []), error: message };
+        }
+        catch {
+            // A local store failure must not turn an already committed lifecycle
+            // transition into a reported activation failure.
+        }
+    }
     return {
         ...result,
         reloaded: true,
-        welcomeQueued,
+        welcomeQueued: welcomeResult.deliveries.some(delivery => delivery.status === 'queued'),
+        welcome: welcomeResult,
         mainSessionId: mainSession?.sessionId,
         mainSessionCreated: mainSession?.created,
     };
@@ -123,11 +157,15 @@ export class BootstrapService {
         const aid = agent?.aid || ctx.agentAid;
         if (!aid)
             return false;
+        if (hasSuppliedInitialization(aid) || loadAgent(aid)?.initialization)
+            return false;
         const key = aid;
         if (this.inFlight.has(key))
             return false;
         this.inFlight.add(key);
         let lifecycleStarted = false;
+        let notificationPersisted = false;
+        let attemptedOperationId;
         const loadedConfig = loadAgent(aid) || agent?.config;
         if (!loadedConfig) {
             this.inFlight.delete(key);
@@ -180,13 +218,18 @@ export class BootstrapService {
             const operationId = starting && !notificationState.hasCompletedHistory
                 ? bootstrapInitialMessageOperationId(aid)
                 : bootstrapInitialRetryOperationId(aid);
-            const shouldSend = !notificationState.recentlyNotified;
+            const shouldSend = !notificationState.recentlyNotified && !notificationState.pending;
+            if (notificationState.failure) {
+                logger.warn(`[Bootstrap] Initial notification terminated: ${notificationState.failure}; failure retained`);
+                return false;
+            }
             if (starting) {
                 await this.publishAgentMdIfSupported(ctx.adapter, aid, agentName);
                 this.setLifecycle(agent, aid, 'bootstrapping');
                 lifecycleStarted = true;
             }
             if (shouldSend) {
+                attemptedOperationId = operationId;
                 const text = this.renderWelcome({
                     agentAid: aid,
                     agentName,
@@ -194,7 +237,7 @@ export class BootstrapService {
                     channel: channelType || ctx.channelKey,
                     baseagent,
                 });
-                await ctx.adapter.send(buildEnvelope({
+                const receipt = await ctx.adapter.send(buildEnvelope({
                     taskId: `bootstrap-${randomBytes(5).toString('hex')}`,
                     operationId,
                     channel: ctx.adapter.channelKey || ctx.adapter.channelName,
@@ -211,7 +254,26 @@ export class BootstrapService {
                         },
                     },
                 }), { kind: 'result.text', text, isFinal: true });
-                this.notifiedInProcess.set(aid, Date.now());
+                const persisted = channelType === 'aun'
+                    ? outbox.findByDedupeKey(aid, operationId, { includeTerminal: true }) : undefined;
+                notificationPersisted = !!persisted;
+                if (receipt?.status === 'sent' && receipt.messageId?.trim()) {
+                    this.notifiedInProcess.set(aid, Date.now());
+                }
+                else if (receipt?.status === 'queued' && receipt.outboxId
+                    && (channelType !== 'aun' || (persisted?.id === receipt.outboxId && !persisted.terminal))) {
+                    logger.info(`[Bootstrap] Initial notification queued: aid=${aid} outbox=${receipt.outboxId}`);
+                }
+                else if (!receipt && channelType !== 'aun') {
+                    // Legacy non-AUN adapters have not all migrated to SendReceipt.
+                    logger.info(`[Bootstrap] Legacy adapter accepted notification for ${aid} without a receipt`);
+                    this.notifiedInProcess.set(aid, Date.now());
+                }
+                else {
+                    const error = receipt?.status === 'failed' ? receipt.error
+                        : receipt?.status === 'suppressed' ? receipt.reason : 'missing valid send receipt';
+                    throw new Error(error);
+                }
             }
             if (starting) {
                 this.eventBus.publish({ type: 'agent:bootstrap-started', aid, channel: channelType || ctx.channelKey, timestamp: Date.now() });
@@ -221,12 +283,24 @@ export class BootstrapService {
                 logger.info(`[Bootstrap] Reconciled initial message for ${aid} via ${ctx.channelKey} (${ctx.source})`);
             }
             else {
-                logger.debug(`[Bootstrap] Initial message already sent within the notification window for ${aid}`);
+                logger.debug(`[Bootstrap] Initial message already accepted or pending for ${aid}`);
             }
             return true;
         }
         catch (e) {
-            if (lifecycleStarted) {
+            if (channelType === 'aun' && attemptedOperationId) {
+                try {
+                    notificationPersisted ||= !!outbox.findByDedupeKey(aid, attemptedOperationId, { includeTerminal: true });
+                }
+                catch (error) {
+                    logger.warn(`[Bootstrap] Cannot inspect persisted notification for ${aid}: ${error}`);
+                    // Its absence is not proven. Preserve the started lifecycle.
+                    notificationPersisted = true;
+                }
+            }
+            // A persisted operation owns delivery recovery. Do not reset the setup
+            // lifecycle merely because its network attempt or receipt failed.
+            if (lifecycleStarted && !notificationPersisted) {
                 try {
                     this.setLifecycle(agent, aid, 'created');
                 }
@@ -257,6 +331,13 @@ export class BootstrapService {
             };
         }
         this.setLifecycle(agent, aid, 'active');
+        try {
+            cancelPendingBootstrapPrompts(aid);
+        }
+        catch (error) {
+            // Delivery also checks lifecycle immediately before sending a prompt.
+            logger.warn(`[Bootstrap] Failed to cancel stale prompts for ${aid}: ${error}`);
+        }
         this.eventBus.publish({ type: 'agent:bootstrap-complete', aid, timestamp: Date.now() });
         logger.info(`[Bootstrap] Completed for ${aid} (previous lifecycle=${lifecycle})`);
         return { ok: true, aid, transitioned: true };
@@ -341,26 +422,36 @@ export class BootstrapService {
         catch {
             // A missing or malformed session path must not prevent bootstrap.
         }
+        let pending = false;
+        let failure;
+        let hasCompletedHistory = !!latestLoggedOperationId;
         for (const entry of outbox.findByDedupePrefix(input.aid, prefix, { includeTerminal: true })) {
-            // A completed operation no longer needs its queued duplicate. Entries
-            // older than the notification window must not be delivered alongside
-            // the newly generated reminder operation.
-            if (entry.terminal) {
-                outbox.remove(input.aid, entry.id);
+            if (entry.dedupeKey === latestLoggedOperationId) {
+                // The log proves gateway acceptance, including pre-migration records.
+                if (!entry.deliveryResult && !entry.deliveryReceipt)
+                    outbox.remove(input.aid, entry.id);
                 continue;
             }
-            if (entry.dedupeKey === latestLoggedOperationId || entry.ts < cutoff) {
-                outbox.remove(input.aid, entry.id);
+            if (entry.channelId !== input.channelId || entry.delivery?.chatType !== 'private')
                 continue;
+            if (entry.deliveryResult || entry.deliveryReceipt) {
+                hasCompletedHistory = true;
+                latestTs = Math.max(latestTs, entry.deliveryResult?.at ?? entry.deliveryReceipt?.acceptedAt ?? entry.ts);
+            }
+            else if (entry.terminal) {
+                failure = entry.terminal.error;
+            }
+            else {
+                // Pending operations do not expire at the reminder window boundary.
+                pending = true;
             }
-            latestTs = Math.max(latestTs, entry.ts || 0);
         }
         const recentlyNotified = latestTs >= cutoff;
         if (recentlyNotified)
             this.notifiedInProcess.set(input.aid, latestTs);
         else
             this.notifiedInProcess.delete(input.aid);
-        return { recentlyNotified, hasCompletedHistory: !!latestLoggedOperationId };
+        return { recentlyNotified, hasCompletedHistory, pending, failure };
     }
     async publishAgentMdIfSupported(adapter, aid, fallbackName) {
         if (typeof adapter.uploadAgentMd !== 'function')

package/dist/core/command/agent-control.js

@@ -1,3 +1,5 @@
+import { agentFullAccessStatus, agentFullAccessWriteError } from '../role/runtime-policy.js';
+import { initializationSummary } from '../../cli/agent-create.js';
 import { agentDelete, agentEnable, agentDisable, agentList, agentShow, agentSet, agentReload, } from '../../cli/agent.js';
 import { agentCreateNonInteractive } from '../../cli/agent-create.js';
 import { logger } from '../../utils/logger.js';
@@ -10,7 +12,7 @@ import { uploadAvatar, uploadAvatarUrl } from '../../utils/avatar-upload.js';
 import { agentmdGet, agentmdPut, updateAgentMdFrontmatterName } from '../../aun/aid/agentmd.js';
 import { isValidAid } from '../../aun/aid/validation.js';
 import { isSupportedBaseagent } from '../../agents/baseagent.js';
-const SUPPORTED_AGENT_PATCH_FIELDS = new Set(['aid', 'name', 'active_baseagent', 'baseagents', 'projects', 'owners', 'chatmode', 'channels', 'channelOwners']);
+const SUPPORTED_AGENT_PATCH_FIELDS = new Set(['aid', 'name', 'avatar', 'active_baseagent', 'baseagents', 'projects', 'owners', 'fullaccess', 'chatmode', 'channels', 'channelOwners']);
 const HIDDEN_VALUE = '[hidden]';
 const SENSITIVE_CONFIG_KEYS = new Set([
     'apikey',
@@ -413,8 +415,29 @@ async function runCreateInBackground(opts, w, service) {
 /** name=agent 的 menu.action 执行。create 使用显式 owner AID；peerId 仅作为控制面鉴权主体。
  *  create 受理即返回（D3）；delete/enable/disable 同步等结果。
  *  调用方负责传入已兜底的 args.project（见 command-handler 装配）。 */
-export async function execAgentAction(action, args, peerId, eventBus, service) {
+export async function execAgentAction(action, args, peerId, eventBus, service, subject) {
     const a = args ?? {};
+    if (action === 'initialize') {
+        if (!service?.initialization)
+            return { error: '初始化服务不可用', code: 'NOT_CONFIGURED' };
+        const plan = a.plan && typeof a.plan === 'object' ? a.plan : {
+            aid: a.aid,
+            project: typeof a.project === 'string' ? a.project : '',
+            baseagent: a.baseagent,
+            owners: Array.isArray(a.owners) ? a.owners : (a.owner ? [a.owner] : []),
+            name: a.name,
+            description: a.description,
+            type: a.type || 'agent',
+            tags: a.tags,
+            ...(typeof a.persona === 'string' ? { persona: a.persona } : {}),
+        };
+        try {
+            return { data: service.initialization.start(plan, peerId, a.dryRun === true) };
+        }
+        catch (error) {
+            return { error: error instanceof Error ? error.message : String(error), code: error.code || 'INITIALIZE_FAILED' };
+        }
+    }
     if (action === 'create') {
         if (!peerId)
             return { error: '缺少发起者 AID（无法校验控制权限）', code: 'INVALID_ARGS' };
@@ -497,8 +520,22 @@ export async function execAgentAction(action, args, peerId, eventBus, service) {
         return { data: { aid: a.aid, reloaded: true } };
     }
     if (action === 'update') {
-        const result = await execAgentUpdate(a);
+        const result = await execAgentUpdate(a, subject);
         if (!('error' in result)) {
+            const data = result.data;
+            if (data.avatar) {
+                eventBus?.publish({
+                    type: 'agent:avatar_updated',
+                    aid: data.aid,
+                    avatar: data.avatar,
+                    sha256: data.sha256,
+                    mime: data.mime,
+                    width: data.width,
+                    height: data.height,
+                    aspectRatio: data.aspectRatio,
+                    timestamp: Date.now(),
+                });
+            }
             eventBus?.publish({
                 type: 'agent:updated',
                 aid: a.aid,
@@ -514,9 +551,9 @@ export async function execAgentAction(action, args, peerId, eventBus, service) {
  *  直接通过 ConfigManager 读写 agent config（不走 agentSet，避免其内部自动 evolagent.reload）——
  *  重载由用户在 Agents 页操作列手动触发（带任务执行检查）。
  *  AUN 渠道绑定 agent 顶层 aid，不可通过 patch 编辑：拒绝改 aid、拒绝 channels 数组里出现 aun 条目。
- *  可写字段：name / active_baseagent / baseagents / projects / owners / chatmode / channels（非 aun）/
+ *  可写字段：name / avatar（旧版 App 兼容，单独提交 data URL）/ active_baseagent / baseagents / projects / owners / fullaccess / chatmode / channels（非 aun）/
  *  channelOwners（按 type/name 局部更新非 AUN channel owners，避免前端回写脱敏 credentials）。 */
-export async function execAgentUpdate(args) {
+export async function execAgentUpdate(args, subject) {
     const a = args ?? {};
     if (!a.aid)
         return { error: '缺少 aid', code: 'INVALID_ARGS' };
@@ -531,6 +568,9 @@ export async function execAgentUpdate(args) {
     if (p.aid !== undefined) {
         return { error: 'aid 不可修改（AUN 身份绑定，如需换 AID 请删除后重建）', code: 'INVALID_ARGS' };
     }
+    if (Object.hasOwn(p, 'avatar') && Object.keys(p).length !== 1) {
+        return { error: 'avatar 不能与其他 patch 字段同时提交，请拆分为两次 update', code: 'INVALID_ARGS' };
+    }
     if (p.name !== undefined) {
         const otherKeys = Object.keys(p).filter(k => k !== 'name');
         if (otherKeys.length > 0) {
@@ -546,9 +586,12 @@ export async function execAgentUpdate(args) {
     const config = cfgRead(ConfigTarget.Agent, { self: a.aid });
     if (!config)
         return { error: `Agent "${a.aid}" not found`, code: 'NOT_FOUND' };
+    // Legacy App requests share the canonical validation, storage and agent.md publication flow.
+    if (Object.hasOwn(p, 'avatar'))
+        return execAidAvatar({ aid: a.aid, data: p.avatar });
     let touched = false;
     const data = { aid: a.aid };
-    const hasConfigPatch = p.active_baseagent !== undefined || p.baseagents !== undefined || p.projects !== undefined || p.owners !== undefined || p.chatmode !== undefined || p.channels !== undefined || p.channelOwners !== undefined;
+    const hasConfigPatch = p.active_baseagent !== undefined || p.baseagents !== undefined || p.projects !== undefined || p.owners !== undefined || p.fullaccess !== undefined || p.chatmode !== undefined || p.channels !== undefined || p.channelOwners !== undefined;
     if (p.active_baseagent !== undefined) {
         if (typeof p.active_baseagent !== 'string' || !p.active_baseagent.trim()) {
             return { error: `无效 active_baseagent: ${JSON.stringify(p.active_baseagent)}（必须是非空字符串）`, code: 'INVALID_ARGS' };
@@ -596,6 +639,30 @@ export async function execAgentUpdate(args) {
         config.owners = owners;
         touched = true;
     }
+    if (p.fullaccess !== undefined) {
+        if (!p.fullaccess || typeof p.fullaccess !== 'object' || Array.isArray(p.fullaccess)) {
+            return { error: 'fullaccess 必须是对象', code: 'INVALID_ARGS' };
+        }
+        const fullaccess = p.fullaccess;
+        if (Object.keys(fullaccess).some(key => key !== 'enabled')) {
+            return { error: 'fullaccess 只支持 enabled 字段', code: 'INVALID_ARGS' };
+        }
+        if (fullaccess.enabled !== undefined && typeof fullaccess.enabled !== 'boolean') {
+            return { error: 'fullaccess.enabled 必须是布尔值', code: 'INVALID_ARGS' };
+        }
+        if (typeof fullaccess.enabled !== 'boolean')
+            return { error: 'fullaccess.enabled is required', code: 'INVALID_ARGS' };
+        const denied = agentFullAccessWriteError({
+            daemonOwner: subject?.isDaemonOwner === true,
+            ecwebManagement: subject?.ecwebManagement === true,
+            delegated: subject?.canApprovePersistentFullAccess === false || subject?.chatType === 'group',
+            enabled: fullaccess.enabled,
+        });
+        if (denied)
+            return { error: denied, code: 'FORBIDDEN' };
+        config.fullaccess = { enabled: fullaccess.enabled };
+        touched = true;
+    }
     if (p.chatmode !== undefined) {
         config.chatmode = p.chatmode;
         touched = true;
@@ -645,17 +712,20 @@ export function resolveProjectPath(explicit, aid, defaults) {
     return deriveAgentProjectPath(root, aid);
 }
 /** name=agent 的 menu.query：查单个 agent 详情，附构建进度（D3）。 */
-export async function execAgentQuery(args, service) {
+export async function execAgentQuery(args, service, subject) {
     const aid = args?.aid;
     if (!aid)
         return { error: '缺少 aid', code: 'INVALID_ARGS' };
     const agentDir = path.join(resolvePaths().agentsDir, aid);
     const progress = readCreateStatus(agentDir);
+    const initialization = initializationSummary(aid);
     const res = service
         ? await service.show(aid)
         : await agentShow(aid);
     if (!('ok' in res) || res.ok !== true) {
         const code = classifyError(res.error);
+        if (code === 'NOT_FOUND' && initialization)
+            return { data: { aid, lifecycle: service?.readConfig(aid)?.lifecycle ?? null, initialization } };
         if (code === 'NOT_FOUND' && progress)
             return { data: buildCreateProgressOnlyAgent(aid, progress) };
         return { error: res.error, code };
@@ -663,8 +733,10 @@ export async function execAgentQuery(args, service) {
     const config = cfgRead(ConfigTarget.Agent, { self: aid });
     const safeConfig = buildSafeAgentConfig(config);
     const safeAgentConfig = safeConfig ?? {};
+    const fullaccessStatus = agentFullAccessStatus(aid, subject?.principalId ?? subject?.actorId);
     const data = {
         ...res,
+        ...(initialization ? { initialization } : {}),
         config: {
             ...(res.config ?? {}),
             active_baseagent: safeAgentConfig.active_baseagent ?? res.config?.baseagent ?? null,
@@ -673,6 +745,14 @@ export async function execAgentQuery(args, service) {
             owners: safeAgentConfig.owners ?? res.config?.owners ?? [],
         },
         safeConfig,
+        fullaccessStatus: {
+            ...fullaccessStatus,
+            canConfigure: subject?.ecwebManagement === true
+                && subject?.isDaemonOwner === true
+                && subject.canApprovePersistentFullAccess !== false
+                && subject.chatType !== 'group'
+                && fullaccessStatus.hostEnabled,
+        },
     };
     // 叠加构建进度（create 受理后、ready 前可见；ready 后文件仍在，可反映软失败 warn）
     return { data: progress ? { ...data, createProgress: progress } : data };
@@ -686,6 +766,7 @@ export async function execAgentOptions(args, service) {
                 name: info.name,
                 personalName: info.personalName || null,
                 status: info.status || 'stopped',
+                lifecycle: info.lifecycle ?? null,
                 channels: info.channels || [],
                 projectPath: info.projectPath ? toPosix(info.projectPath) : null,
                 baseagent: info.baseagent || null,