evolcore 0.0.31 → 0.0.33

package/dist/aun/outbox.js

@@ -64,6 +64,24 @@ function isExpired(entry) {
         return false;
     return Date.now() - entry.ts > entry.ttl;
 }
+/**
+ * A process-scoped entry whose enqueuing process is gone. Replaying it would
+ * deliver stale live feedback — typically the "restarting, back in ~5s" notice
+ * that a successful restart has already superseded with its own confirmation.
+ *
+ * A stale entry is not `isExpired()`: it needs `drainOnce` to retire it with a
+ * reason of its own, otherwise the send log would report a semantic drop as a
+ * timeout.
+ */
+export function isStaleProcessScoped(entry) {
+    if (!entry.processScoped)
+        return false;
+    // A record without a pid cannot prove same-process ownership. Treat it as
+    // replayable so the ordinary route/expiry rules stay in charge.
+    if (typeof entry.enqueuedByPid !== 'number')
+        return false;
+    return entry.enqueuedByPid !== process.pid;
+}
 export function isDeliveryForChannel(value, channelId) {
     return isDeliveryTargetForChannel(value, channelId);
 }
@@ -129,6 +147,7 @@ export function enqueue(aid, opts) {
         delivery,
         dedupeKey: opts.dedupeKey,
         critical: opts.critical,
+        ...(opts.processScoped ? { processScoped: true, enqueuedByPid: process.pid } : {}),
         type: opts.type,
         contentKind: opts.contentKind,
         payload: opts.payload,
@@ -273,6 +292,19 @@ function markExpired(entry) {
         code: entry.lastErrorCode,
     };
 }
+/**
+ * Drop a process-scoped entry left behind by a previous process. The terminal
+ * record is retained so the send log still shows why it never went out.
+ */
+function markSupersededProcessScoped(entry) {
+    entry.lastError = 'process-scoped delivery superseded by a new daemon process';
+    entry.lastErrorCode = 'OUTBOX_PROCESS_SUPERSEDED';
+    entry.terminal = {
+        at: Date.now(),
+        error: entry.lastError,
+        code: entry.lastErrorCode,
+    };
+}
 /** Mark a durable entry terminal while keeping its reason for diagnostics. */
 export function markTerminal(aid, id, failure, submitted, queue = submitted ? entryQueue(submitted) : 'default') {
     const entries = readEntries(aid, queue);
@@ -336,6 +368,7 @@ async function drainOnce(aid, sender, queue) {
     let expired = 0;
     let failed = 0;
     let permanent = 0;
+    let superseded = 0;
     const remaining = [];
     for (const entry of entries) {
         // Cancellation or another sender may have changed an
@@ -350,6 +383,16 @@ async function drainOnce(aid, sender, queue) {
             }
             Object.assign(entry, currentEntry);
         }
+        if (isStaleProcessScoped(entry)) {
+            // Deliberately not counted as `expired`: this is a semantic drop, not a
+            // timeout, and the drained-line diagnostic should not conflate them.
+            // The terminal record also retires the entry from `hasPending()`, so a
+            // later drain does not rediscover it.
+            superseded++;
+            markSupersededProcessScoped(entry);
+            remaining.push(entry);
+            continue;
+        }
         if (isExpired(entry)) {
             expired++;
             markExpired(entry);
@@ -457,7 +500,13 @@ async function drainOnce(aid, sender, queue) {
             }];
     });
     writeEntries(aid, retained, queue);
-    return { sent, expired, failed, ...(permanent > 0 ? { permanent } : {}) };
+    return {
+        sent,
+        expired,
+        failed,
+        ...(permanent > 0 ? { permanent } : {}),
+        ...(superseded > 0 ? { superseded } : {}),
+    };
 }
 export async function drain(aid, sender, queue = 'default') {
     const drainKey = `${queue}:${aid}`;

package/dist/aun/service-proxy.js

@@ -9,7 +9,7 @@
  * - providerAid = 控制 AID（daemon 进程身份，pureIdentity 常驻 AUN）
  * - aunClient 生命周期陷阱：AUNChannel 重连会销毁重建底层 client，
  *   所以不能把 client 引用直接交给 ServiceProxyClient；传一个动态解引用的
- *   facade，每次 .call()/.authenticate()/._tokenStore 都读 channel 当前 client。
+ *   facade，每次 .call()/.authenticate()/getAccessToken() 都读 channel 当前 client。
  *   serveForever(persistent) 的指数退避会在 client 缺失时自动等待恢复。
  * - endpoint 发现：source='instance' 时读服务实例登记文件的 port；source='static' 时使用显式 endpoint。
  * - 失败降级：任何异常只 warn，绝不影响 daemon 主流程。
@@ -143,31 +143,25 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
                 },
                 authenticate: () => {
                     const client = controlChannel.getClient();
-                    if (!client || typeof client.authenticate !== 'function') {
+                    if (!client) {
                         return Promise.reject(new Error('AUN control client not connected'));
                     }
+                    const accessToken = client.getAccessToken();
+                    if (accessToken)
+                        return Promise.resolve({ access_token: accessToken });
                     return client.authenticate();
                 },
                 on: (event, handler) => {
-                    const client = controlChannel.getClient();
-                    return client?.on?.(event, handler);
-                },
-                get _tokenStore() {
-                    return controlChannel.getClient()?._tokenStore;
+                    return controlChannel.getClient()?.on(event, handler);
                 },
-                // ServiceProxyClient._resolveCachedAccessToken 依次读取 _identity / _auth /
-                // _tokenStore + deviceId 来复用 AUNChannel 已签发的 access_token。控制 AID 在
-                // connect 时已 authenticate（client 处于 ready 态），若这些字段不透出，
-                // _ensureAccessToken 会回退到 authenticate() 并抛 "authenticate not allowed
-                // in state ready"，导致隧道永远连不上 proxy-server。动态解引用，规避重连换 client。
-                get _identity() {
-                    return controlChannel.getClient()?._identity;
+                getAccessToken: () => {
+                    return controlChannel.getClient()?.getAccessToken() ?? null;
                 },
-                get _auth() {
-                    return controlChannel.getClient()?._auth;
+                get access_token() {
+                    return controlChannel.getClient()?.getAccessToken() ?? null;
                 },
-                get _deviceId() {
-                    return controlChannel.getClient()?._deviceId;
+                get currentAid() {
+                    return controlChannel.getClient()?.currentAid ?? null;
                 },
             };
             // endpoint 白名单：只允许回连本机回环（127.0.0.1 / localhost 默认放行）。

package/dist/aun/storage/index.js

@@ -1,2 +1,31 @@
 export { storageUpload, storageUploadBuffer, storageLs, storageRm, storageQuota } from './client.js';
 export { storageDownload } from './download.js';
+import { isValidAid } from '../aid/validation.js';
+export function resolveStorageCommandArgv(argv) {
+    if (argv[0] !== 'storage')
+        throw new Error('Expected a storage command');
+    const positionals = [];
+    let isPublic = false;
+    for (let index = 1; index < argv.length; index++) {
+        const value = argv[index];
+        if (value === '--public')
+            isPublic = true;
+        else if (value === '--format' && argv[index + 1] === 'json')
+            index++;
+        else if (value.startsWith('--'))
+            throw new Error(`Unsupported managed storage option: ${value}`);
+        else
+            positionals.push(value);
+    }
+    const [sub, aid, source, destination] = positionals;
+    const operation = { upload: 'storage.upload', download: 'storage.download', ls: 'storage.list', rm: 'storage.delete', quota: 'storage.quota' }[sub];
+    if (!operation || !aid || !isValidAid(aid))
+        throw new Error('Invalid storage command or AID');
+    const counts = { upload: [4], download: [3, 4], ls: [2, 3], rm: [3], quota: [2] };
+    if (!counts[sub].includes(positionals.length) || (isPublic && sub !== 'upload'))
+        throw new Error('Invalid storage arguments');
+    return { sub, aid, operation, isPublic, localFile: sub === 'upload' ? source : undefined,
+        remotePath: sub === 'upload' ? destination : sub === 'rm' ? source : undefined,
+        url: sub === 'download' ? source : undefined, localPath: sub === 'download' ? destination : undefined,
+        prefix: sub === 'ls' ? source ?? '' : undefined };
+}

package/dist/channels/aun.js

@@ -5,7 +5,6 @@ import { performance } from 'node:perf_hooks';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { fileURLToPath, pathToFileURL } from 'url';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { middleOutputModePolicy, resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
@@ -19,7 +18,7 @@ import { chatDirPath } from '../core/session/session-fs-store.js';
 import { readTopicLabel, readTopicStatus } from '../core/session/session-mapper.js';
 import { appendHintAddDetailed, appendHintRemoveDetailed, appendHintPromoteDetailed, parseInjectRequest, peekHints, withHintTargetLock } from '../core/message/pending-hints.js';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
-import { enableFullGroupPullPagination, enableReliableMessageDelivery, getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
+import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
 import { MAX_AUN_ATTACHMENT_SIZE, uploadBufferAndBuildPayload, uploadFileAndBuildPayload } from '../aun/msg/upload.js';
 import { loadAgent } from '../config-store.js';
 import { resolveAgentLifecycle } from '../config/lifecycle.js';
@@ -653,7 +652,6 @@ export class AUNChannel {
         return this.managedMenuClient.request(options);
     }
     client = null;
-    localSenderInstallation;
     store = null;
     /** 实际连接的网关 URL（来自 authenticate() 返回值 / connection.state 事件），替代旧 (client as any)._gatewayUrl。 */
     gatewayUrl = '';
@@ -1343,7 +1341,7 @@ export class AUNChannel {
         // boundary while the command handler uses /mention internally.
         return stripped.replace(/^\/mentionmode(?=\s|$)/, '/mention');
     }
-    parsePayloadMentionsOrReject(payload, context, messageId, seq) {
+    parsePayloadMentionsOrReject(payload, context, messageId) {
         const raw = payload && typeof payload === 'object' && !Array.isArray(payload)
             ? payload.mentions
             : undefined;
@@ -1351,7 +1349,6 @@ export class AUNChannel {
             return normalizeAunMentionEntries(raw);
         }
         catch (error) {
-            this.acknowledgeImmediately(messageId, seq);
             const detail = error instanceof Error ? error.message : String(error);
             const code = error?.code ?? 'INVALID_MENTION_SCHEMA';
             logger.error(`${this.logPrefix()} Dropped ${context}: invalid payload.mentions (${detail}) code=${code} mid=${messageId}`);
@@ -1452,12 +1449,9 @@ export class AUNChannel {
             else {
                 logger.debug(`${this.logPrefix()} Duplicate inbound message dropped: namespace=${namespace} mid=${messageId} seq=${seq ?? 'unknown'}`);
             }
-            this.acknowledgeImmediately(messageId, seq);
             return false;
         }
         this.inboundSeenMessages.set(dedupeKey, { seenAt: Date.now(), seq });
-        if (seq !== undefined)
-            this.messageSeqMap.set(messageId, seq);
         this.appendInboundDedupe(dedupeKey, messageId, kind, seq);
         setTimeout(() => this.inboundSeenMessages.delete(dedupeKey), AUN_INBOUND_DEDUP_TTL_MS);
         return true;
@@ -1524,12 +1518,6 @@ export class AUNChannel {
             logger.warn(`${this.logPrefix()} Failed to compact inbound dedup: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    acknowledgeImmediately(messageId, _seq) {
-        // SDK internally manages seq tracking and ack — do not call message.ack RPC directly,
-        // as it corrupts the SDK's seqTracker state and breaks V2 e2ee message pull.
-        if (messageId)
-            this.messageSeqMap.delete(messageId);
-    }
     shouldEncrypt(_peerId) {
         return this.config.defaultEncrypt ?? true;
     }
@@ -1543,7 +1531,7 @@ export class AUNChannel {
     /**
      * Inbound application dedupe. The AUN SDK may redeliver the same message
      * with a different transport sequence, so message_id is the identity and
-     * seq is only retained for ACK/conflict diagnostics. Claiming happens at
+     * seq is only retained for ordering and conflict diagnostics. Claiming happens at
      * the event handler boundary, before payload/slash/mention parsing.
      */
     inboundSeenMessages = new Map();
@@ -1551,7 +1539,6 @@ export class AUNChannel {
     groupNameCache = new Map(); // groupId → 群显示名（进程内缓存，群名极少变）
     peerInfoCache = new Map();
     peerInfoRevision = 0;
-    messageSeqMap = new Map(); // messageId → seq (for ack/diagnostics)
     sentCount = new Map(); // "channelId\0threadId" → 本轮已发消息计数（seqInTurn/turnMessageCount 用）
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
@@ -1737,27 +1724,6 @@ export class AUNChannel {
             this.initInProgress = false;
         }
     }
-    /** Optional local compatibility code is never required by a clean checkout or npm install. */
-    async loadLocalSenderInstallation(client) {
-        this.localSenderInstallation = undefined;
-        const currentFile = fileURLToPath(import.meta.url);
-        const modulePath = path.join(path.dirname(currentFile), '..', 'aun', `sender-installation${path.extname(currentFile)}`);
-        if (!fs.existsSync(modulePath))
-            return;
-        try {
-            // Use a runtime URL so TypeScript can build when the local file is absent.
-            const extension = await import(pathToFileURL(modulePath).href);
-            if (typeof extension.enableAunSenderInstallation !== 'function'
-                || typeof extension.aunSenderInstallation !== 'function') {
-                throw new Error('Invalid local sender installation module');
-            }
-            extension.enableAunSenderInstallation(client);
-            this.localSenderInstallation = extension;
-        }
-        catch (error) {
-            logger.warn(`${this.logPrefix()} Optional local sender installation disabled: ${error instanceof Error ? error.message : String(error)}`);
-        }
-    }
     async _initClientInner() {
         this.observerGroupMembers.clear();
         for (const groupId of new Set([
@@ -1805,9 +1771,6 @@ export class AUNChannel {
         });
         this.store = store;
         const client = await loadClient(store, aidName);
-        enableFullGroupPullPagination(client);
-        enableReliableMessageDelivery(client);
-        await this.loadLocalSenderInstallation(client);
         this.client = client;
         // A reconnect replaces the SDK client. Late events from the retired
         // instance must not mutate the new instance's health or message state.
@@ -1939,7 +1902,7 @@ export class AUNChannel {
         client.on('message.recalled', (data) => {
             if (!isCurrentClient())
                 return;
-            this.handleMessageRecalled(data, client, isCurrentClient);
+            this.handleMessageRecalled(data);
         });
         client.on('message.undecryptable', (data) => {
             if (!isCurrentClient())
@@ -2017,13 +1980,14 @@ export class AUNChannel {
                 // max_attempts=0 = 无限重试（与 Go/Python 对齐），交由 SDK 自己跑指数退避
                 // initial_delay=1s，max_delay=300s（5min 封顶）
                 auto_reconnect: true,
+                background_sync: true,
                 retry_max_attempts: 0,
                 retry_initial_delay: 1.0,
                 retry_max_delay: 300.0,
             });
             this.trace('OUT', 'client.connect.ok', { aid: client.aid });
             this._aid = this.client.aid ?? undefined;
-            const deviceId = this.client._device_id ?? '';
+            const deviceId = client.currentAid?.deviceId ?? '';
             this._chatId = this._aid ? `${this._aid}:${deviceId}:` : '';
             // 控制 AID 也有标准 host agent.md。发布在后台执行，短暂的 Name
             // Service/Gateway 故障不能把控制通道判定为连接失败。
@@ -2056,25 +2020,6 @@ export class AUNChannel {
                     logger.warn(`${this.logPrefix()} Group invitation recovery failed: ${error instanceof Error ? error.message : String(error)}`);
                 });
             }
-            // AUN seq_tracker is transport-scoped, while this channel's durable
-            // dedup log is application-scoped.  A diagnostic consumer can advance
-            // the former without the application having seen those messages.  On a
-            // reconnect, repair only the in-memory P2P cursor to the last message
-            // the application actually claimed, then force a Forward pull.  The SDK
-            // persists cursors monotonically, so this does not rewrite SQLite and
-            // the normal pull will restore the high watermark after delivery.
-            this.scheduleInboundP2PCursorRepair(client, isCurrentClient);
-            // Workaround: SDK e2ee uses _identity.cert for sender_cert_fingerprint;
-            // if cert is missing, it falls back to public key SPKI fingerprint which
-            // causes peer cert lookup failures. Backfill from keystore if needed.
-            const clientAny = this.client;
-            if (clientAny._identity && !clientAny._identity.cert) {
-                const cert = clientAny._keystore?.loadCert?.(aidName);
-                if (cert) {
-                    clientAny._identity.cert = cert;
-                    logger.info(`${this.logPrefix()} Backfilled identity.cert from keystore for e2ee fingerprint`);
-                }
-            }
             logger.info(`${this.logPrefix()} Connected as ${this._aid}`);
             appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.gatewayUrl });
             appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.gatewayUrl });
@@ -2161,47 +2106,7 @@ export class AUNChannel {
         const aid = this.config.aid.replace(/^@/, '');
         return bindPostBootstrapWelcomeOutboxSession(aid, sessionId, owner);
     }
-    scheduleInboundP2PCursorRepair(client, isCurrentClient) {
-        const tracker = client?._seqTracker;
-        const repair = tracker?.repairContiguousSeq;
-        const pull = client?._pullV2;
-        if (typeof repair !== 'function' || typeof pull !== 'function')
-            return;
-        if (this.inboundP2PCursorRepairTimer)
-            clearTimeout(this.inboundP2PCursorRepairTimer);
-        const ns = `p2p:${this.config.aid}`;
-        let appSeq = 0;
-        for (const [key, value] of this.inboundSeenMessages) {
-            // Group sequence spaces are independent from the P2P space.
-            if (!key.includes(':aun:private'))
-                continue;
-            const seq = Number(value.seq);
-            if (Number.isSafeInteger(seq) && seq > appSeq)
-                appSeq = seq;
-        }
-        if (appSeq <= 0)
-            return;
-        this.inboundP2PCursorRepairTimer = setTimeout(() => {
-            this.inboundP2PCursorRepairTimer = null;
-            if (!isCurrentClient() || !this.connected)
-                return;
-            const transportSeq = Number(tracker.getContiguousSeq?.(ns) ?? 0);
-            if (!Number.isSafeInteger(transportSeq) || transportSeq <= appSeq + 1)
-                return;
-            try {
-                repair.call(tracker, ns, appSeq);
-                logger.warn(`${this.logPrefix()} Rewinding in-memory P2P cursor for application recovery: transport=${transportSeq}, app=${appSeq}`);
-                Promise.resolve(pull.call(client, appSeq, 50, { force: true }))
-                    .then(() => logger.info(`${this.logPrefix()} Replayed P2P messages after cursor mismatch: after_seq=${appSeq}`))
-                    .catch((error) => logger.warn(`${this.logPrefix()} P2P cursor recovery pull failed: ${error instanceof Error ? error.message : String(error)}`));
-            }
-            catch (error) {
-                logger.warn(`${this.logPrefix()} P2P cursor repair failed: ${error instanceof Error ? error.message : String(error)}`);
-            }
-        }, 250);
-    }
-    inboundP2PCursorRepairTimer = null;
-    handleMessageRecalled(data, client, isCurrentClient) {
+    handleMessageRecalled(data) {
         this.trace('IN', 'message.recalled', data);
         if (data && typeof data === 'object') {
             const ids = data.message_ids;
@@ -2214,9 +2119,6 @@ export class AUNChannel {
                 }
             }
         }
-        // A recall tombstone may arrive at a high transport sequence and advance
-        // the SDK cursor past messages that were never delivered to the app.
-        this.scheduleInboundP2PCursorRepair(client, isCurrentClient);
     }
     pendingPostBootstrapWelcomeOwners() {
         return pendingPostBootstrapWelcomeOwners(this.config.aid);
@@ -2525,7 +2427,6 @@ export class AUNChannel {
         const env = (msg.envelope && typeof msg.envelope === 'object') ? msg.envelope : {};
         const fromAid = typeof env.from === 'string' ? env.from.trim() : '';
         if (!messageId || !fromAid) {
-            this.acknowledgeImmediately(messageId, seq);
             const now = Date.now();
             if (now - this.invalidInboundEnvelopeLastLogAt >= 60_000) {
                 this.invalidInboundEnvelopeLastLogAt = now;
@@ -2541,15 +2442,13 @@ export class AUNChannel {
         const protectedHeaders = verifiedProtectedHeaders(msg, env);
         const payload = msg.payload ?? '';
         if (this.managedMenuClient.accept(fromAid, payload, !!env.encrypted)) {
-            this.acknowledgeImmediately(messageId, seq);
             return;
         }
         if (payloadTypeForObserver(msg) === 'observer.forward') {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} P2P dropped observer.forward control envelope: mid=${messageId}`);
             return;
         }
-        const mentions = this.parsePayloadMentionsOrReject(payload, 'p2p.inbound', messageId, seq);
+        const mentions = this.parsePayloadMentionsOrReject(payload, 'p2p.inbound', messageId);
         if (!mentions)
             return;
         const causationRef = payload && typeof payload === 'object' && typeof payload._evolcore_causation_ref === 'string'
@@ -2570,7 +2469,6 @@ export class AUNChannel {
         const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
         // 终态错误只作为展示信号，不能进入 Agent，也不能被 observer 再次传播。
         if (inboundType === 'error') {
-            this.acknowledgeImmediately(messageId, seq);
             logger.info(`${this.logPrefix()} P2P dropped terminal error: from=${fromAid || 'unknown'} mid=${messageId}`);
             return;
         }
@@ -2582,14 +2480,12 @@ export class AUNChannel {
             void this.forwardInbound(msg);
         }
         if (inboundType === 'observer.inject.status' || inboundType === 'observer.inject.ack') {
-            this.acknowledgeImmediately(messageId, seq);
             return;
         }
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
         // 只有 from_aid == self 且 chat_id 不匹配时才丢弃（说明是其它实例发的）
         const msgChatId = typeof payload === 'object' && payload !== null && payload.chat_id;
         if (this._aid && fromAid === this._aid && (!msgChatId || !this._chatId || msgChatId !== this._chatId)) {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} P2P dropped: echo from self (from=${fromAid} mid=${messageId})`);
             return;
         }
@@ -2632,18 +2528,14 @@ export class AUNChannel {
         if (p2pPayloadType.startsWith('menu.')
             || p2pPayloadType === AUNChannel.CONTACT_REQUEST_QUERY_TYPE
             || p2pPayloadType === AUNChannel.CONTACT_REQUEST_SUBMIT_TYPE) {
-            const installation = p2pPayloadType.startsWith('menu.')
-                ? this.localSenderInstallation?.aunSenderInstallation(msg) : undefined;
             const peerDeviceId = p2pPayloadType.startsWith('menu.')
                 ? menuSenderDeviceId(msg.sender_device_id) : undefined;
-            this.acknowledgeImmediately(messageId, seq);
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId, receivedAt, seq);
             this.dispatchMessage({
                 channelId: chatId, userId: fromAid,
                 text: JSON.stringify(payload),
                 chatType: 'private', messageId, seq, receivedAt, receivedAtMono, gatewaySeq: seq,
                 peerDeviceId,
-                peerSlotId: installation?.slotId,
                 threadId,
                 peerName: displayName || undefined,
                 peerType: peerIdentity.type,
@@ -2669,7 +2561,6 @@ export class AUNChannel {
         // observer.inject：owner 插话。鉴权 from∈owners 后，以 target.channel_id 选 agent↔对端 会话，
         // observer 插话（v0.3）：只落盘到 pending-hints，不进 Agent、不回 owner。详见 docs/observer-insert-design.md。
         if (p2pPayloadType === AUNChannel.INJECT_REQUEST_TYPE) {
-            this.acknowledgeImmediately(messageId, seq);
             void Promise.resolve(this.handleObserverInject(fromAid, payload, displayName, peerIdentity.type)).catch(error => {
                 logger.error(`${this.logPrefix()} observer.inject failed: ${error instanceof Error ? error.message : String(error)}`);
             });
@@ -2679,7 +2570,6 @@ export class AUNChannel {
         // 由控制 AID 的 onMessage 处理器（BindService.handleRequest）解析并回 bind.response。
         // 透传 encrypted：bind.response 须与请求的加密/明文对称（见 onMessage 处理）。
         if (p2pPayloadType === AUNChannel.BIND_REQUEST_TYPE) {
-            this.acknowledgeImmediately(messageId, seq);
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId, receivedAt, seq);
             this.dispatchMessage({
                 channelId: chatId, userId: fromAid,
@@ -2700,7 +2590,6 @@ export class AUNChannel {
         }
         // payload 类型白名单：信号类消息（status / event / thought 等）不进 Agent
         if (p2pPayloadType && !AUNChannel.PROACTIVE_ALLOW_TYPES.has(p2pPayloadType)) {
-            this.acknowledgeImmediately(messageId, seq);
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId, receivedAt, seq);
             logger.info(`${this.logPrefix()} P2P dropped (type deny): type=${p2pPayloadType} from=${shortAid}(${displayName}) mid=${messageId}`);
             return;
@@ -2758,11 +2647,10 @@ export class AUNChannel {
         const payload = msg.payload ?? '';
         const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
         if (inboundType === 'observer.forward' || (typeof inboundType === 'string' && inboundType.startsWith('observer.inject'))) {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} Group dropped observer control envelope: mid=${messageId}`);
             return;
         }
-        const payloadMentionEntries = this.parsePayloadMentionsOrReject(payload, 'group.inbound', messageId, seq);
+        const payloadMentionEntries = this.parsePayloadMentionsOrReject(payload, 'group.inbound', messageId);
         if (!payloadMentionEntries)
             return;
         const payloadMentionAids = mentionEntryAids(payloadMentionEntries);
@@ -2774,7 +2662,6 @@ export class AUNChannel {
             : undefined;
         // 终态错误只作为展示信号，不能进入 Agent，也不能被 observer 再次传播。
         if (inboundType === 'error') {
-            this.acknowledgeImmediately(messageId, seq);
             logger.info(`${this.logPrefix()} Group dropped terminal error: group=${groupId || 'unknown'} sender=${senderAid || 'unknown'} mid=${messageId}`);
             return;
         }
@@ -2783,7 +2670,6 @@ export class AUNChannel {
         void this.forwardInbound(msg);
         logger.debug(`${this.logPrefix()}[DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
         if (!groupId || !senderAid) {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} Group dropped: missing groupId or senderAid (mid=${messageId})`);
             return;
         }
@@ -2795,7 +2681,6 @@ export class AUNChannel {
             && typeof handoffMarker === 'string'
             && /^h-[A-Za-z0-9._-]+$/.test(handoffMarker);
         if (this._aid && senderAid === this._aid && !isOwnHandoff) {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} Group dropped: own message (group=${groupId} mid=${messageId})`);
             return;
         }
@@ -2804,7 +2689,6 @@ export class AUNChannel {
             const firstLineFast = text.split('\n')[0] || '';
             const hasEvolCoreTrace = /\[EvolCore\.(receive|reply|agent)\]/.test(text);
             if (/echo/i.test(firstLineFast) && firstLineFast.trim().length <= 10 && !hasEvolCoreTrace) {
-                this.acknowledgeImmediately(messageId, seq);
                 const msgEncryptedFast = !!env.encrypted;
                 const msgChatmodeFast = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
                 const peerInfo = this.peerInfoCached(senderAid);
@@ -2843,12 +2727,10 @@ export class AUNChannel {
             const payloadType = typeof payloadObj?.type === 'string' ? payloadObj.type : '';
             // Menu control requests are private-only, including token issuance.
             if (payloadType.startsWith('menu.')) {
-                this.acknowledgeImmediately(messageId, seq);
                 logger.debug(`${this.logPrefix()} Group Menu dropped: code=MENU_PRIVATE_ONLY mid=${messageId}`);
                 return;
             }
             if (payloadType && !AUNChannel.PROACTIVE_ALLOW_TYPES.has(payloadType)) {
-                this.acknowledgeImmediately(messageId, seq);
                 this.appendInboundPayloadJsonl(groupId, senderAid, messageId, !!env.encrypted, true, logDescriptor, threadId, receivedAt, seq);
                 logger.info(`${this.logPrefix()} Group dropped (type deny): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId}`);
                 return;
@@ -2906,7 +2788,6 @@ export class AUNChannel {
         }
         else if (/echo/i.test(firstLineGroup) && hasEvolCoreTraceGroup) {
             // 回声炸弹：已被任何 EvolCore 节点 trace 过的 echo，直接丢弃
-            this.acknowledgeImmediately(messageId, seq);
             logger.info(`${this.logPrefix()} Group dropped: echo bomb (already-traced group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
         }
@@ -2934,7 +2815,6 @@ export class AUNChannel {
                     logger.warn(`${this.logPrefix()} Deferred group message was not recorded; awaiting redelivery: ${error}`);
                     return;
                 }
-                this.acknowledgeImmediately(messageId, seq);
                 const dropReason = commandTargetsAnotherAgent ? 'command-targeted-other-agent' : 'unmentioned';
                 logger.info(`${this.logPrefix()} Group dropped: ${dropReason} (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} slashRequireMentions=${groupSlashRequireMentions} isCommand=${isCommandMsg} commandMentionAids=${JSON.stringify(commandMentionAids)} textPreview=${JSON.stringify(text.slice(0, 80))})`);
                 return;
@@ -2950,7 +2830,6 @@ export class AUNChannel {
         const hasAttachments = rawAttachments.length > 0;
         // Allow through if there's text OR attachments; both-empty messages are silently dropped
         if (!strippedText && !hasAttachments) {
-            this.acknowledgeImmediately(messageId, seq);
             logger.debug(`${this.logPrefix()} Group dropped: empty text and no attachments (group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
         }
@@ -4534,6 +4413,9 @@ export class AUNChannel {
         };
         if (evolCommand)
             base.ext = { evolCommand };
+        // Same diagnostic dictionary as text payloads (sessionId/agentSessionId/model).
+        if (context?.debug)
+            base.debug = { ...context.debug, sentAt: localTimestamp() };
         return withAunAttention(base);
     }
     async sendReliableStructured(channelId, payload, context, logText) {
@@ -4617,6 +4499,9 @@ export class AUNChannel {
             delivery,
             dedupeKey: operationId,
             critical: routedContext.metadata?.criticalDelivery === true,
+            // Live feedback about the running process (for example the pre-restart
+            // notice) must never be replayed by the process that replaces it.
+            processScoped: routedContext.metadata?.processScopedDelivery === true,
             type: 'text',
             text: finalText,
             context: routedContext,
@@ -4686,6 +4571,16 @@ export class AUNChannel {
         };
     }
     /** Daemon-side transport for `ec msg send` running inside an agent task. */
+    /**
+     * Agent 经 CLI 委托发送（ec msg send / ec group send）时占用本轮序号，
+     * 与回复路径共用 sentCount，保证同一轮内 seqInTurn 连续。
+     */
+    nextSeqInTurn(channelId, threadId) {
+        const turnKey = `${channelId}\0${threadId ?? ''}`;
+        const seqInTurn = (this.sentCount.get(turnKey) || 0) + 1;
+        this.sentCount.set(turnKey, seqInTurn);
+        return seqInTurn;
+    }
     async sendDaemonMsg(args) {
         if (!args.to) {
             return { ok: false, error: 'aun-msg-send requires a private target', code: 'UNSUPPORTED_TARGET' };
@@ -5392,6 +5287,9 @@ export class AUNChannel {
             delete payloadWithChatmode.thread_id;
         if (context?.threadId && !payloadWithChatmode.thread_id)
             payloadWithChatmode.thread_id = context.threadId;
+        // Same diagnostic dictionary as text payloads (sessionId/agentSessionId/model).
+        if (context?.debug)
+            payloadWithChatmode.debug = { ...context.debug, sentAt: localTimestamp() };
         const params = {
             context: { type: 'task', id: taskId },
             payload: this.limitThoughtPayload(payloadWithChatmode),
@@ -5968,8 +5866,12 @@ export class AUNChannel {
                 }
                 return { status: 'permanent', error: `unsupported outbox entry type: ${entry.type}`, code: 'UNSUPPORTED_OUTBOX_TYPE' };
             }, queue);
-            if (result.sent > 0 || result.expired > 0 || result.permanent) {
-                logger.info(`${this.logPrefix()} ${queue} outbox drained: sent=${result.sent} expired=${result.expired} failed=${result.failed} permanent=${result.permanent ?? 0}`);
+            if (result.sent > 0 || result.expired > 0 || result.permanent || result.superseded) {
+                const superseded = result.superseded ? ` superseded=${result.superseded}` : '';
+                logger.info(`${this.logPrefix()} ${queue} outbox drained: sent=${result.sent} expired=${result.expired} failed=${result.failed} permanent=${result.permanent ?? 0}${superseded}`);
+            }
+            if (result.superseded) {
+                logger.info(`${this.logPrefix()} ${queue} outbox: dropped ${result.superseded} process-scoped entr${result.superseded === 1 ? 'y' : 'ies'} left by a previous daemon process`);
             }
         };
         await drainQueue('default');
@@ -6022,11 +5924,7 @@ export class AUNChannel {
             logger.warn(`${this.logPrefix()} Repaired bootstrap outbox route to private Owner delivery: entry=${entry.id} owner=${owner}`);
         }
     }
-    acknowledge(messageId) {
-        // Gateway auto-delivery-ack is sufficient; skip explicit message.ack RPC
-        // to avoid duplicate "已送达" at the sender CLI
-        this.messageSeqMap.delete(messageId);
-    }
+    acknowledge(_messageId) { }
     sendProcessingStatus(channelId, status, sessionId, taskId, context, extraMeta) {
         let delivery;
         try {
@@ -6087,6 +5985,9 @@ export class AUNChannel {
             statusPayload.chatmode = context.metadata.chatmode;
         if (context?.replyToMessageId)
             statusPayload.ref_message_id = context.replyToMessageId;
+        // Same diagnostic dictionary as text payloads (sessionId/agentSessionId/model).
+        if (context?.debug)
+            statusPayload.debug = { ...context.debug, sentAt: localTimestamp() };
         const notifyOptions = { ttlMs: 60_000 };
         if (delivery.chatType === 'group')
             notifyOptions.groupId = delivery.groupId;