evolcore 0.0.25 → 0.0.27

package/dist/core/auth/operation-catalog.js

@@ -25,6 +25,7 @@ const GROUP_MANAGEMENT_OPERATIONS = [
     ['ec.group.list', 'read', ['agent'], 'List groups joined by the current Agent'],
     ['ec.group.info', 'read', ['relation', 'agent'], 'Read group information'],
     ['ec.group.pull', 'read', ['relation', 'agent'], 'Pull group messages'],
+    ['ec.group.history', 'read', ['relation', 'agent'], 'Read local group conversation history'],
     ['ec.group.members', 'read', ['relation', 'agent'], 'List group members'],
     ['ec.group.online', 'read', ['relation', 'agent'], 'List online group members'],
     ['ec.group.rules.get', 'read', ['relation', 'agent'], 'Read the published group rules file'],
@@ -47,6 +48,11 @@ const GROUP_MANAGEMENT_OPERATIONS = [
     ['ec.group.owner', 'write-agent', ['agent'], 'Transfer group ownership'],
     ['ec.group.ban', 'write-agent', ['agent'], 'Read or update the group ban list'],
     ['ec.group.unban', 'write-agent', ['agent'], 'Remove a group ban'],
+    ['ec.group.block', 'write-own', ['relation', 'agent'], 'Block group message reception'],
+    ['ec.group.unblock', 'write-own', ['relation', 'agent'], 'Unblock group message reception'],
+    ['ec.group.blocklist', 'read', ['agent'], 'Read the group block list'],
+    ['ec.group.report-status', 'write-own', ['relation', 'agent'], 'Report the current Agent group status'],
+    ['ec.group.member-statuses', 'read', ['relation', 'agent'], 'Read reported group member statuses'],
     ['ec.group.rules.set', 'write-agent', ['agent'], 'Upload and publish group rules content'],
     ['ec.group.rules.publish', 'write-agent', ['agent'], 'Publish the current group rules file'],
     ['ec.group.rules.update', 'write-agent', ['agent'], 'Update group join rules'],
@@ -100,6 +106,13 @@ const HANDOFF_WRITE_OPERATIONS = [{
         defaultScopes: ['relation', 'agent'],
         description: 'Return the current handoff result',
         sources: ['agent-tool'],
+    }, {
+        id: 'ec.handoff.recover',
+        category: 'write-agent',
+        dangerous: true,
+        defaultScopes: ['agent'],
+        description: 'Recover an open handoff after its target session changed',
+        sources: ['agent-tool'],
     }];
 const QUEUE_OPERATIONS = [['read', 'Read the current Agent message queue'], ['clear', 'Clear the current Agent message queue'], ['cancel', 'Cancel a current Agent queued message'], ['interrupt', 'Interrupt a current Agent session']].map(([kind, description]) => ({
     id: `ec.queue.${kind}`,
@@ -358,6 +371,86 @@ const OPERATIONS = [
         description: '获取文件内容（需路径沙箱检查）',
         sources: ['slash', 'menu'],
     },
+    {
+        id: 'file.root.agent',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '获取 Agent 内部数据根目录句柄',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.root.relation',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['relation', 'agent'],
+        description: '获取当前或 owner 指定关系的共享数据根目录句柄',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.data.list',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['relation', 'agent'],
+        description: '列出已授权内部数据根目录',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.data.query',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['relation', 'agent'],
+        description: '查询已授权内部数据根文件元信息',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.data.fetch',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['relation', 'agent'],
+        description: '下载已授权内部数据根文件',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.root.storage',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '获取 Agent 自有云存储根句柄',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.storage.list',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '列出 Agent 自有云存储目录',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.storage.query',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '查询 Agent 自有云存储元信息',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.storage.fetch',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '获取 Agent 自有云存储短时下载链接',
+        sources: ['menu'],
+    },
+    {
+        id: 'file.storage.quota',
+        category: 'read',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '查询 Agent 自有云存储配额',
+        sources: ['menu'],
+    },
     // ── Trigger Operations ──
     {
         id: 'trigger.list',
@@ -446,7 +539,7 @@ const OPERATIONS = [
         dangerous: false,
         defaultScopes: ['agent'],
         description: 'Assign a role to a private or group relation',
-        sources: ['menu', 'ecweb', 'control'],
+        sources: ['menu', 'menu.cli', 'ecweb', 'control', 'agent-tool'],
     },
     {
         id: 'role.revoke',
@@ -454,7 +547,7 @@ const OPERATIONS = [
         dangerous: false,
         defaultScopes: ['agent'],
         description: 'Revoke a private or group relation role assignment',
-        sources: ['menu', 'ecweb', 'control'],
+        sources: ['menu', 'menu.cli', 'ecweb', 'control', 'agent-tool'],
     },
     {
         id: 'role.policy.read',
@@ -470,7 +563,7 @@ const OPERATIONS = [
         dangerous: false,
         defaultScopes: ['agent'],
         description: 'Read private and group relation role assignments',
-        sources: ['menu', 'ecweb', 'control'],
+        sources: ['menu', 'menu.cli', 'ecweb', 'control', 'agent-tool'],
     },
     {
         id: 'role.policy.write',
@@ -485,7 +578,7 @@ const OPERATIONS = [
         category: 'read',
         dangerous: false,
         defaultScopes: ['agent'],
-        description: 'Read the Agent contact block list',
+        description: 'Read Agent contacts, pending requests, and blocked contacts',
         sources: ['agent-tool'],
     },
     {
@@ -504,6 +597,14 @@ const OPERATIONS = [
         description: 'Block or unblock a canonical contact across bound private channels',
         sources: ['agent-tool'],
     },
+    {
+        id: 'contact.review',
+        category: 'write-agent',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: 'Review pending Agent contact requests',
+        sources: ['agent-tool'],
+    },
     {
         id: 'connect.read',
         category: 'read',
@@ -609,6 +710,14 @@ const OPERATIONS = [
         description: '读取或更新当前 Agent 的 persona.md',
         sources: ['agent-tool', 'control'],
     },
+    {
+        id: 'agent.welcome',
+        category: 'write-agent',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: '读取或更新当前 Agent 的 Bootstrap welcome.md',
+        sources: ['agent-tool', 'control'],
+    },
     {
         id: 'agent.create',
         category: 'process',
@@ -617,6 +726,14 @@ const OPERATIONS = [
         description: '创建新 agent',
         sources: ['menu', 'menu.cli', 'agent-tool', 'control'],
     },
+    {
+        id: 'agent.initialize',
+        category: 'process',
+        dangerous: true,
+        defaultScopes: ['control'],
+        description: 'Create and initialize an Agent from an explicit final plan',
+        sources: ['menu', 'menu.cli', 'agent-tool', 'control'],
+    },
     {
         id: 'agent.enable',
         category: 'process',
@@ -666,6 +783,14 @@ const OPERATIONS = [
         description: '查看系统状态（敏感信息）',
         sources: ['slash', 'menu', 'menu.cli', 'agent-tool'],
     },
+    {
+        id: 'system.paircode',
+        category: 'process',
+        dangerous: true,
+        defaultScopes: ['process'],
+        description: '获取 daemon 远程控制配对码',
+        sources: ['menu', 'control'],
+    },
     {
         id: 'activity.current',
         category: 'read',
@@ -912,6 +1037,14 @@ const OPERATIONS = [
     ...HANDOFF_READ_OPERATIONS,
     ...HANDOFF_WRITE_OPERATIONS,
     ...QUEUE_OPERATIONS,
+    {
+        id: 'ec.task.resume',
+        category: 'write-agent',
+        dangerous: false,
+        defaultScopes: ['agent'],
+        description: 'Resume a paused or abnormally interrupted Agent session task',
+        sources: ['agent-tool', 'control'],
+    },
     {
         id: 'ec.version',
         category: 'read',
@@ -968,6 +1101,14 @@ const OPERATIONS = [
         description: '通过 ec msg send 发送私聊消息',
         sources: ['agent-tool'],
     },
+    {
+        id: 'ec.menu.request',
+        category: 'write-agent',
+        dangerous: false,
+        defaultScopes: ['relation'],
+        description: 'Send an authenticated remote Control Menu request through the current Agent daemon channel',
+        sources: ['agent-tool'],
+    },
     {
         id: 'ec.msg.file',
         category: 'write-own',

package/dist/core/auth/remote-access-store.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { resolvePaths } from '../../paths.js';
 export const REMOTE_ACCESS_TOKEN_TTL_MS = 7 * 24 * 60 * 60 * 1000;
+export const DIAGNOSTIC_TOKEN_TTL_MS = 60 * 60 * 1000;
 // 与 owner 绑定二维码（BindService）的默认有效期保持一致：10 分钟。
 export const REMOTE_ACCESS_PAIRING_TTL_MS = 10 * 60 * 1000;
 export function remoteAccessTokenStorePath() {
@@ -11,13 +12,21 @@ export function remoteAccessTokenStorePath() {
 function loadStore() {
     try {
         const value = JSON.parse(fs.readFileSync(remoteAccessTokenStorePath(), 'utf8'));
-        if (Array.isArray(value.tokens))
-            return value;
+        if (Array.isArray(value.tokens)) {
+            return {
+                tokens: value.tokens,
+                pairingIssuances: Array.isArray(value.pairingIssuances) ? value.pairingIssuances : [],
+            };
+        }
     }
     catch { }
-    return { tokens: [] };
+    return { tokens: [], pairingIssuances: [] };
 }
 function saveStore(store) {
+    // Issuance history contains no credentials. Keep 30 days; live tokens retain
+    // their own provenance even after the corresponding history is pruned.
+    const cutoff = Date.now() - 30 * 24 * 60 * 60 * 1000;
+    store.pairingIssuances = store.pairingIssuances.filter(record => record.expiresAt >= cutoff);
     const file = remoteAccessTokenStorePath();
     fs.mkdirSync(path.dirname(file), { recursive: true });
     const temporary = `${file}.${process.pid}.tmp`;
@@ -42,7 +51,8 @@ function pruneExpired(store, now) {
     const before = store.tokens.length;
     store.tokens = store.tokens.filter(record => typeof record?.token === 'string'
         && typeof record.lastActive === 'number'
-        && now - record.lastActive < REMOTE_ACCESS_TOKEN_TTL_MS);
+        && Number.isFinite(record.lastActive)
+        && now - record.lastActive < (record.diagnostic ? DIAGNOSTIC_TOKEN_TTL_MS : REMOTE_ACCESS_TOKEN_TTL_MS));
     return store.tokens.length !== before;
 }
 function validLabel(value) {
@@ -85,18 +95,105 @@ export class RemoteAccessService {
     pairingCode = '';
     pairingExpiresAt = 0;
     pairingAuthorizedBy;
-    getPairingCode(authorizedBy, now = Date.now()) {
-        if (!this.pairingCode || now >= this.pairingExpiresAt) {
-            this.pairingCode = String(crypto.randomInt(0, 1_000_000)).padStart(6, '0');
+    pairingId = '';
+    pairingIssuedAt = 0;
+    pairingIssuers = [];
+    // Do not recycle consumed codes during their original validity window,
+    // including when other sources have issued intervening codes.
+    recentPairingCodes = new Map();
+    /** Synchronous reservation: concurrent invitations cannot issue two grants. */
+    issueDiagnosticToken(controlAid, agentAid, ownerAid, now = Date.now()) {
+        const store = loadStore();
+        pruneExpired(store, now);
+        if (store.tokens.some(record => record.diagnostic?.controlAid === controlAid)) {
+            throw Object.assign(new Error('本机已有有效诊断授权，请先执行 /diag stop 或 ec diag stop。'), { code: 'DIAG_ALREADY_ACTIVE' });
+        }
+        const record = {
+            token: crypto.randomBytes(32).toString('hex'), createdAt: now, lastActive: now,
+            label: 'diagnostic', authorizedBy: ownerAid,
+            diagnostic: { controlAid, agentAid, ownerAid, caseId: crypto.randomUUID() },
+        };
+        store.tokens.push(record);
+        saveStore(store);
+        return record;
+    }
+    getDiagnosticToken(controlAid, now = Date.now()) {
+        const store = loadStore();
+        if (pruneExpired(store, now))
+            saveStore(store);
+        return store.tokens.find(record => record.diagnostic?.controlAid === controlAid);
+    }
+    /** Expected token prevents a failed older send from revoking a newer grant. */
+    revokeDiagnosticToken(controlAid, expectedToken) {
+        const store = loadStore();
+        const pruned = pruneExpired(store, Date.now());
+        const index = store.tokens.findIndex(record => record.diagnostic?.controlAid === controlAid
+            && (expectedToken === undefined || record.token === expectedToken));
+        if (index < 0) {
+            if (pruned)
+                saveStore(store);
+            return undefined;
+        }
+        const [record] = store.tokens.splice(index, 1);
+        saveStore(store);
+        return record;
+    }
+    getPairingCode(authorizedBy, now = Date.now(), source = 'host-cli') {
+        const owner = validOwner(authorizedBy);
+        if (!['host-cli', 'pair', 'menu', 'ecweb-local'].includes(source)
+            || ((source === 'pair' || source === 'menu') && !owner)) {
+            throw new Error('pairing source requires a valid source and an owner for /pair or Menu');
+        }
+        const generated = !this.pairingCode || now >= this.pairingExpiresAt;
+        if (generated) {
+            for (const [code, expiresAt] of this.recentPairingCodes) {
+                if (now >= expiresAt)
+                    this.recentPairingCodes.delete(code);
+            }
+            // Choose uniformly from unused values without an unbounded retry loop.
+            let code = crypto.randomInt(0, 1_000_000 - this.recentPairingCodes.size);
+            for (const occupied of [...this.recentPairingCodes.keys()].sort((a, b) => a - b)) {
+                if (occupied > code)
+                    break;
+                code++;
+            }
+            this.pairingCode = String(code).padStart(6, '0');
+            this.pairingId = crypto.randomUUID();
+            this.pairingIssuedAt = now;
             this.pairingExpiresAt = now + REMOTE_ACCESS_PAIRING_TTL_MS;
+            this.recentPairingCodes.set(code, this.pairingExpiresAt);
             this.pairingAuthorizedBy = undefined;
+            this.pairingIssuers = [];
         }
-        const owner = validOwner(authorizedBy);
+        const previousOwner = this.pairingAuthorizedBy;
         if (!this.pairingAuthorizedBy && owner)
             this.pairingAuthorizedBy = owner;
+        const issuer = {
+            source,
+            issuedAt: now,
+            ...((source === 'pair' || source === 'menu') && owner ? { authorizedBy: owner } : {}),
+        };
+        const addedIssuer = !this.pairingIssuers.some(candidate => candidate.source === issuer.source
+            && candidate.authorizedBy === issuer.authorizedBy);
+        if (addedIssuer) {
+            this.pairingIssuers.push(issuer);
+        }
+        try {
+            this.recordPairingIssuance();
+        }
+        catch (error) {
+            if (generated)
+                this.clearPairingCode();
+            else {
+                this.pairingAuthorizedBy = previousOwner;
+                if (addedIssuer)
+                    this.pairingIssuers.pop();
+            }
+            throw error;
+        }
         return { code: this.pairingCode, expiresAt: this.pairingExpiresAt };
     }
-    redeemPairingCode(code, label, authorizedBy, now = Date.now()) {
+    redeemPairingCode(code, label, now = Date.now()) {
         if (typeof code !== 'string' || !/^\d{6}$/.test(code)) {
             return { ok: false, code: 'INVALID_ARGUMENT', error: 'pairing code must be six digits' };
         }
@@ -110,17 +207,65 @@ export class RemoteAccessService {
         const token = crypto.randomBytes(32).toString('hex');
         const store = loadStore();
         pruneExpired(store, now);
-        const owner = validOwner(authorizedBy) ?? this.pairingAuthorizedBy;
+        const owner = this.pairingAuthorizedBy;
+        const pairingId = this.pairingId;
+        const pairingIssuers = this.pairingIssuers.map(issuer => ({ ...issuer }));
         store.tokens.push({
             token,
             createdAt,
             lastActive: createdAt,
             label: validLabel(label),
             ...(owner ? { authorizedBy: owner } : {}),
+            pairingId,
+            pairingIssuers,
         });
+        const issuance = store.pairingIssuances.find(record => record.pairingId === pairingId);
+        if (issuance) {
+            issuance.redeemedAt = createdAt;
+        }
+        else {
+            store.pairingIssuances.push({
+                pairingId,
+                issuedAt: this.pairingIssuedAt,
+                expiresAt: this.pairingExpiresAt,
+                issuers: pairingIssuers,
+                redeemedAt: createdAt,
+            });
+        }
         saveStore(store);
+        // A pairing code is a one-time capability. Clear it only after the token
+        // and provenance record have been atomically saved. No await separates
+        // validation, persistence and consumption, so concurrent IPC calls cannot
+        // grant the same code twice.
+        this.clearPairingCode();
         return { ok: true, token, expiresAt: createdAt + REMOTE_ACCESS_TOKEN_TTL_MS };
     }
+    clearPairingCode() {
+        this.pairingCode = '';
+        this.pairingExpiresAt = 0;
+        this.pairingAuthorizedBy = undefined;
+        this.pairingId = '';
+        this.pairingIssuedAt = 0;
+        this.pairingIssuers = [];
+    }
+    recordPairingIssuance() {
+        if (!this.pairingId || !this.pairingCode)
+            return;
+        const store = loadStore();
+        const existing = store.pairingIssuances.find(record => record.pairingId === this.pairingId);
+        const record = {
+            pairingId: this.pairingId,
+            issuedAt: this.pairingIssuedAt,
+            expiresAt: this.pairingExpiresAt,
+            issuers: this.pairingIssuers.map(issuer => ({ ...issuer })),
+            ...(existing?.redeemedAt ? { redeemedAt: existing.redeemedAt } : {}),
+        };
+        if (existing)
+            Object.assign(existing, record);
+        else
+            store.pairingIssuances.push(record);
+        saveStore(store);
+    }
     issueLocalToken(label, now = Date.now()) {
         const token = crypto.randomBytes(32).toString('hex');
         const store = loadStore();

package/dist/core/bootstrap-messages.js

@@ -1,10 +1,12 @@
 import fs from 'fs';
+import { loadAgent } from '../config-store.js';
+import { resolveAgentLifecycle } from '../config/lifecycle.js';
 import { agentMdPath, resolvePaths } from '../paths.js';
 import { parseAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
-import { generateWelcomeMessage } from '../utils/welcome.js';
+import { generateWelcomeMessage, parseAgentWelcomeMetadata, readAgentWelcomeTemplate, renderPostBootstrapWelcomeMessage, } from '../utils/welcome.js';
 import * as outbox from '../aun/outbox.js';
 import { chatDirPath } from './session/session-fs-store.js';
-import { hasMessageLogOperation } from './message/message-log.js';
+import { hasMessageLogOperation, findMessageLogOperationMessageId } from './message/message-log.js';
 import { isDeliveryTarget, sameDeliveryTarget } from './message/message-utils.js';
 export const BOOTSTRAP_MESSAGE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 export const BOOTSTRAP_NOTIFICATION_WINDOW_MS = 24 * 60 * 60 * 1000;
@@ -32,10 +34,27 @@ export function isPostBootstrapWelcomeOperationId(operationId, aid) {
 export function renderPostBootstrapWelcome(aid, owner, ownerName) {
     const mdPath = agentMdPath(aid);
     const agentMd = fs.existsSync(mdPath) ? fs.readFileSync(mdPath, 'utf-8') : '';
-    const agentName = parseAgentDisplayName(agentMd)
+    const metadata = parseAgentWelcomeMetadata(agentMd);
+    const agentName = metadata.name || parseAgentDisplayName(agentMd)
         || resolveAgentDisplayName(aid)
         || aid.split('.')[0];
     const fallbackOwnerName = owner.replace(/^@/, '').split('.')[0];
+    const template = readAgentWelcomeTemplate(aid);
+    if (template) {
+        return renderPostBootstrapWelcomeMessage({
+            template,
+            agentName,
+            agentDescription: metadata.description,
+            agentAid: aid,
+            agentTags: metadata.tags,
+            ownerName: ownerName || fallbackOwnerName,
+            ownerAid: owner,
+        });
+    }
+    const config = loadAgent(aid);
+    if (config && resolveAgentLifecycle(config) === 'bootstrapping' && config.initialization?.mode !== 'supplied') {
+        throw new Error('WELCOME_REQUIRED: Owner-confirmed welcome.md is required before activation');
+    }
     return generateWelcomeMessage({
         channelType: 'aun',
         agentName,
@@ -49,15 +68,18 @@ export function preparePostBootstrapWelcomeOutbox(aid, owner, ownerName, deliver
     const legacyOperationId = postBootstrapWelcomeOperationId(aid);
     if (hasMessageLogOperation(chatDir, operationId) || hasMessageLogOperation(chatDir, legacyOperationId))
         return;
-    const legacy = outbox.findByDedupeKey(aid, legacyOperationId);
+    const legacy = outbox.findByDedupeKey(aid, legacyOperationId, { includeTerminal: true });
     if (legacy?.channelId === owner)
         return;
-    const existing = outbox.findByDedupeKey(aid, operationId);
+    const existing = outbox.findByDedupeKey(aid, operationId, { includeTerminal: true });
     if (existing
         && existing.channelId === owner
         && isDeliveryTarget(existing.delivery)
         && sameDeliveryTarget(existing.delivery, delivery))
         return;
+    // Render before touching an existing route record: malformed content must not
+    // remove the only durable record of an earlier attempt.
+    const text = renderPostBootstrapWelcome(aid, owner, ownerName);
     if (existing)
         outbox.remove(aid, existing.id);
     outbox.enqueue(aid, {
@@ -66,7 +88,7 @@ export function preparePostBootstrapWelcomeOutbox(aid, owner, ownerName, deliver
         dedupeKey: operationId,
         critical: true,
         type: 'text',
-        text: renderPostBootstrapWelcome(aid, owner, ownerName),
+        text,
         ttl: BOOTSTRAP_MESSAGE_TTL_MS,
         context: {
             delivery,
@@ -79,6 +101,43 @@ export function preparePostBootstrapWelcomeOutbox(aid, owner, ownerName, deliver
         },
     });
 }
+/** Read durable evidence, including failures and already accepted operations. */
+export function postBootstrapWelcomeStatus(aid, owners) {
+    const entries = findPostBootstrapWelcomeOutbox(aid, { includeTerminal: true });
+    return {
+        deliveries: Array.from(new Set(owners)).map(owner => {
+            const operationId = postBootstrapWelcomeOperationId(aid, owner);
+            const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', owner, aid);
+            const loggedId = findMessageLogOperationMessageId(chatDir, operationId)
+                ?? findMessageLogOperationMessageId(chatDir, postBootstrapWelcomeOperationId(aid));
+            const entry = entries.find(candidate => candidate.channelId === owner
+                && candidate.delivery?.chatType === 'private'
+                && (candidate.dedupeKey === operationId || candidate.dedupeKey === postBootstrapWelcomeOperationId(aid)));
+            const base = { owner, operationId, ...(entry ? { outboxId: entry.id } : {}) };
+            if (loggedId)
+                return { ...base, status: 'sent', messageId: loggedId };
+            if (!entry)
+                return { ...base, status: 'not_prepared' };
+            const state = outbox.deliveryState(aid, entry.id);
+            if (state.status === 'sent' || state.status === 'failed')
+                return { ...base, ...state };
+            if (state.status === 'missing')
+                return { ...base, status: 'not_prepared' };
+            return { ...base, status: 'queued', error: entry.lastError, code: entry.lastErrorCode };
+        }),
+    };
+}
+/** Supersede unsent setup prompts when the agent becomes active. Keep diagnostic evidence. */
+export function cancelPendingBootstrapPrompts(aid) {
+    for (const entry of outbox.findByDedupePrefix(aid, bootstrapInitialMessageOperationPrefix(aid))) {
+        if (entry.deliveryReceipt)
+            continue;
+        outbox.markTerminal(aid, entry.id, {
+            code: 'BOOTSTRAP_SUPERSEDED',
+            error: 'Bootstrap is complete; the initial prompt is no longer needed',
+        }, entry);
+    }
+}
 export function hasPendingPostBootstrapWelcomeOutbox(aid) {
     return findPostBootstrapWelcomeOutbox(aid)
         .some(entry => outbox.isDeliveryForChannel(entry.delivery, entry.channelId));
@@ -92,7 +151,7 @@ export function findPostBootstrapWelcomeOutbox(aid, opts = {}) {
 }
 export function pendingPostBootstrapWelcomeOwners(aid) {
     return findPostBootstrapWelcomeOutbox(aid)
-        .filter(entry => outbox.isDeliveryForChannel(entry.delivery, entry.channelId))
+        .filter(entry => !entry.context?.sessionId && outbox.isDeliveryForChannel(entry.delivery, entry.channelId))
         .map(entry => entry.channelId)
         .filter((owner, index, all) => all.indexOf(owner) === index);
 }