evolcore 0.0.32 → 0.0.34

package/dist/core/background-session/session-cleanup.js

@@ -0,0 +1,212 @@
+/**
+ * session-cleanup.ts — 独立后台会话（bg-session）和 trigger 会话的清理机制
+ *
+ * 三种自动清理模式：
+ *   immediate     — 会话结束时同步清理
+ *   on_next_launch — 下次同 kind 会话启动时清理上一次的残留（默认）
+ *   expire        — 会话结束时写登记表，启动时扫描到期条目清理
+ *
+ * 登记表路径：$EVOLCORE_HOME/data/session-cleanup/expire-<YYYYMMDD>.jsonl
+ * 详见 docs/background-session/session-cleanup-policy.md
+ */
+import fs from 'fs';
+import path from 'path';
+import { resolveRoot } from '../../paths.js';
+import { logger } from '../../utils/logger.js';
+// ── 登记表工具 ──────────────────────────────────────────────────────────────
+function cleanupDir() {
+    return path.join(resolveRoot(), 'data', 'session-cleanup');
+}
+function expireFilePath(date) {
+    const y = date.getFullYear();
+    const m = String(date.getMonth() + 1).padStart(2, '0');
+    const d = String(date.getDate()).padStart(2, '0');
+    return path.join(cleanupDir(), `expire-${y}${m}${d}.jsonl`);
+}
+function doneFilePath(expirePath) {
+    return expirePath.replace(/\.jsonl$/, '.done.jsonl');
+}
+/**
+ * 把一条超期记录写进今天的登记表。
+ * 幂等：同一 channelId 写多次无害，runExpireCleanup 会逐条处理。
+ */
+export function appendExpireEntry(entry) {
+    try {
+        const dir = cleanupDir();
+        fs.mkdirSync(dir, { recursive: true });
+        const filePath = expireFilePath(new Date(entry.expireAt));
+        fs.appendFileSync(filePath, JSON.stringify(entry) + '\n', 'utf-8');
+    }
+    catch (e) {
+        logger.warn(`[SessionCleanup] 写入超期登记表失败: ${e?.message}`);
+    }
+}
+/**
+ * 清理一条 evolcore session 记录（移入 _trash/）。
+ * runner 侧日志不在这里处理（runner 接口尚未提供 deleteSession）。
+ */
+export async function cleanupSessionRecord(target, cleaner) {
+    try {
+        await cleaner.softDeleteSession(target.channelId);
+        logger.debug(`[SessionCleanup] 已清理 session 记录: channelId=${target.channelId}` +
+            `${target.agentAid ? ` aid=${target.agentAid}` : ''}`);
+    }
+    catch (e) {
+        logger.warn(`[SessionCleanup] 清理 session 记录失败 channelId=${target.channelId}: ${e?.message}`);
+    }
+}
+// ── expire 模式：启动时扫描 ──────────────────────────────────────────────────
+/**
+ * 扫描 data/session-cleanup/ 下所有登记表，清理已到期的条目。
+ * 在任意 bg-session 或 trigger 会话启动时调用，成本低（只读少量小文件）。
+ */
+export async function runExpireCleanup(cleaner, now = Date.now()) {
+    const dir = cleanupDir();
+    if (!fs.existsSync(dir))
+        return;
+    let files;
+    try {
+        files = fs.readdirSync(dir).filter(f => /^expire-\d{8}\.jsonl$/.test(f));
+    }
+    catch {
+        return;
+    }
+    const todayStr = (() => {
+        const d = new Date(now);
+        const y = d.getFullYear();
+        const m = String(d.getMonth() + 1).padStart(2, '0');
+        const day = String(d.getDate()).padStart(2, '0');
+        return `expire-${y}${m}${day}.jsonl`;
+    })();
+    for (const file of files) {
+        // 跳过未来日期的文件（expireAt 不可能到期）
+        const fileDate = file.slice(7, 15); // expire-YYYYMMDD.jsonl → YYYYMMDD
+        const todayDate = todayStr.slice(7, 15);
+        if (fileDate > todayDate)
+            continue;
+        const filePath = path.join(dir, file);
+        const donePath = doneFilePath(filePath);
+        let lines;
+        try {
+            lines = fs.readFileSync(filePath, 'utf-8').split('\n').filter(l => l.trim());
+        }
+        catch {
+            continue;
+        }
+        // 读取已处理的 channelId 集合
+        const doneIds = new Set();
+        if (fs.existsSync(donePath)) {
+            try {
+                for (const line of fs.readFileSync(donePath, 'utf-8').split('\n').filter(l => l.trim())) {
+                    const entry = JSON.parse(line);
+                    if (entry.channelId)
+                        doneIds.add(entry.channelId);
+                }
+            }
+            catch { /* 损坏的 done 文件，跳过去重，重复清理幂等 */ }
+        }
+        let processedCount = 0;
+        // 文件里是否还有未到期条目；有则保留文件，下次再扫
+        let hasPending = false;
+        for (const line of lines) {
+            let entry;
+            try {
+                entry = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            if (!entry.channelId || !entry.expireAt)
+                continue;
+            if (entry.expireAt > now) {
+                hasPending = true;
+                continue;
+            } // 未到期
+            if (doneIds.has(entry.channelId))
+                continue; // 已处理
+            await cleanupSessionRecord({ sessionId: entry.sessionId, channelId: entry.channelId, agentAid: entry.agentAid }, cleaner);
+            // 标记已处理
+            try {
+                fs.appendFileSync(donePath, JSON.stringify({ channelId: entry.channelId, ts: now }) + '\n', 'utf-8');
+            }
+            catch { /* 写失败无妨，下次会重复处理，cleanupSessionRecord 幂等 */ }
+            doneIds.add(entry.channelId);
+            processedCount++;
+        }
+        if (processedCount > 0) {
+            logger.debug(`[SessionCleanup] expire 扫描：清理 ${processedCount} 条到期记录（${file}）`);
+        }
+        // 整天文件全部处理完时，删除两个文件。
+        // 不能用 doneIds.size 与行数比较：同一 channelId 重复登记时两者永远不等，文件会残留。
+        if (!hasPending) {
+            try {
+                fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+            try {
+                fs.unlinkSync(donePath);
+            }
+            catch { /* ignore */ }
+        }
+    }
+}
+// ── on_next_launch 模式：按 kind 清理历史会话 ────────────────────────────────
+/**
+ * 记录一条 on_next_launch 清理登记，供下次启动时使用。
+ * 存在一个独立的 JSONL 文件中，按 kind 分文件存储。
+ */
+function nextLaunchFilePath(kind) {
+    const safeKind = kind.replace(/[^a-zA-Z0-9\-_]/g, '_');
+    return path.join(cleanupDir(), `next-launch-${safeKind}.jsonl`);
+}
+/**
+ * 记录一条「下次启动时清理」的会话信息。
+ * 在会话正常或异常结束时调用。
+ */
+export function recordNextLaunchCleanup(kind, entry) {
+    try {
+        const dir = cleanupDir();
+        fs.mkdirSync(dir, { recursive: true });
+        const filePath = nextLaunchFilePath(kind);
+        fs.appendFileSync(filePath, JSON.stringify(entry) + '\n', 'utf-8');
+    }
+    catch (e) {
+        logger.warn(`[SessionCleanup] 写入 on_next_launch 登记失败 kind=${kind}: ${e?.message}`);
+    }
+}
+/**
+ * 清理同 kind 的所有历史会话记录，然后清空登记文件。
+ * 在新会话启动前调用（on_next_launch 模式）。
+ */
+export async function cleanupPreviousByKind(kind, cleaner) {
+    const filePath = nextLaunchFilePath(kind);
+    if (!fs.existsSync(filePath))
+        return;
+    let lines;
+    try {
+        lines = fs.readFileSync(filePath, 'utf-8').split('\n').filter(l => l.trim());
+    }
+    catch {
+        return;
+    }
+    for (const line of lines) {
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (!entry.channelId)
+            continue;
+        await cleanupSessionRecord({ sessionId: entry.sessionId, channelId: entry.channelId, agentAid: entry.agentAid }, cleaner);
+    }
+    // 清空登记文件（下一次重新积累）
+    try {
+        fs.unlinkSync(filePath);
+    }
+    catch { /* ignore */ }
+    if (lines.length > 0) {
+        logger.debug(`[SessionCleanup] on_next_launch：已清理 ${lines.length} 条历史记录（kind=${kind}）`);
+    }
+}

package/dist/core/background-session/types.js

@@ -0,0 +1,10 @@
+/**
+ * background-session/types.ts — 独立后台会话的接口定义
+ *
+ * 独立后台会话（bg-session）是由 daemon 内部逻辑主动拉起的 AI 会话，
+ * 不属于用户交互，也不挂在 trigger 调度系统下。
+ * 整理会话、话题总结会话等都通过这套接口拉起。
+ *
+ * 详细机制见 docs/background-session/background-session-launcher.md
+ */
+export {};

package/dist/core/bootstrap-messages.js

@@ -53,7 +53,7 @@ export function renderPostBootstrapWelcome(aid, owner, ownerName) {
     }
     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');
+        throw new Error('WELCOME_REQUIRED: Agent-prepared welcome.md is required before activation');
     }
     return generateWelcomeMessage({
         channelType: 'aun',

package/dist/core/bootstrap-service.js

@@ -25,14 +25,17 @@ export async function completeBootstrapWithWelcome(service, aid, welcome, sessio
     }
     if (lifecycle === 'bootstrapping') {
         // Existing per-Owner records are immutable retry snapshots. New interactive
-        // Bootstrap completions require the text saved after Owner confirmation.
+        // Bootstrap completions require the welcome text prepared by the Agent.
         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 };
+                    return {
+                        ok: false, code: 'WELCOME_REQUIRED', reloaded: false,
+                        error: '请先自主生成正式欢迎文案并保存 welcome.md，无需 Owner 确认',
+                    };
                 }
             }
             catch (error) {
@@ -446,7 +449,7 @@ export class BootstrapService {
         const templatePath = path.join(kitsTemplatesDir(), 'bootstrap-welcome.md');
         const template = fs.existsSync(templatePath)
             ? fs.readFileSync(templatePath, 'utf-8')
-            : '你好，我是 {{agentName}}。请帮我确认显示名、简介和标签。';
+            : '你好，我是 {{agentName}}。已有的有效基础信息会直接沿用；请补充缺失的显示名、简介或标签。persona 和头像可选，之后也可以完善。';
         return renderTemplate(template, vars).trim();
     }
     resolveAgentDisplayName(aid) {

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

@@ -583,9 +583,24 @@ export async function execAgentUpdate(args, subject) {
     if (p.channels !== undefined && p.channelOwners !== undefined) {
         return { error: 'channels 与 channelOwners 不能同时提交', code: 'INVALID_ARGS' };
     }
-    const config = cfgRead(ConfigTarget.Agent, { self: a.aid });
+    const config = cfgRead(ConfigTarget.Agent, { self: a.aid }, { cache: false });
     if (!config)
         return { error: `Agent "${a.aid}" not found`, code: 'NOT_FOUND' };
+    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 (typeof fullaccess.enabled !== 'boolean') {
+            return { error: 'fullaccess.enabled 必须是布尔值', code: 'INVALID_ARGS' };
+        }
+        const denied = agentFullAccessWriteError(a.aid, subject);
+        if (denied)
+            return { error: denied, code: 'FORBIDDEN' };
+    }
     // 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 });
@@ -640,27 +655,7 @@ export async function execAgentUpdate(args, subject) {
         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 };
+        config.fullaccess = { enabled: p.fullaccess.enabled };
         touched = true;
     }
     if (p.chatmode !== undefined) {
@@ -747,10 +742,7 @@ export async function execAgentQuery(args, service, subject) {
         safeConfig,
         fullaccessStatus: {
             ...fullaccessStatus,
-            canConfigure: subject?.ecwebManagement === true
-                && subject?.isDaemonOwner === true
-                && subject.canApprovePersistentFullAccess !== false
-                && subject.chatType !== 'group',
+            canConfigure: agentFullAccessWriteError(aid, subject) === undefined,
         },
     };
     // 叠加构建进度（create 受理后、ready 前可见；ready 后文件仍在，可反映软失败 warn）