evolclaw 3.1.11 → 3.3.0

package/dist/core/session/session-manager.js

@@ -69,6 +69,9 @@ export class SessionManager {
             return { role: 'admin', mode: 'interactive' };
         return { role: 'guest', mode: 'interactive' };
     }
+    resolvePermissionMode(role) {
+        return (role === 'owner' || role === 'admin') ? 'bypass' : 'readonly';
+    }
     async updateIdentity(sessionId, identity) {
         logger.debug(`[SessionManager] updateIdentity: sessionId=${sessionId}, role=${identity.role}`);
     }
@@ -479,10 +482,10 @@ export class SessionManager {
             throw new Error(`[SessionManager] getOrCreateSession requires channelType. channel="${channel}" channelId="${channelId}"`);
         }
         if (threadId) {
-            const session = this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId, selfAID, channelType, peerType);
+            const session = this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId, selfAID, channelType, peerType, chatType);
             session.identity = this.resolveIdentity(channel, userId);
             if (session.metadata && !session.metadata.permissionMode) {
-                session.metadata.permissionMode = DEFAULT_PERMISSION_MODE;
+                session.metadata.permissionMode = this.resolvePermissionMode(session.identity.role);
                 this.persistSession(session, 'none');
             }
             return session;
@@ -564,8 +567,9 @@ export class SessionManager {
         }
         // Create new session
         const sessionMetadata = { ...(metadata || {}) };
+        const newIdentity = this.resolveIdentity(channel, userId);
         if (!sessionMetadata.permissionMode)
-            sessionMetadata.permissionMode = DEFAULT_PERMISSION_MODE;
+            sessionMetadata.permissionMode = this.resolvePermissionMode(newIdentity.role);
         const session = {
             id: generateSessionId(),
             channel,
@@ -583,7 +587,7 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now(),
         };
-        session.identity = this.resolveIdentity(channel, userId);
+        session.identity = newIdentity;
         this.persistSession(session, 'set');
         this.eventBus.publish({
             type: 'session:created',
@@ -614,7 +618,7 @@ export class SessionManager {
             current.agentSessionId = updates.agentSessionId ?? undefined;
         this.persistSession(current, 'sync');
     }
-    getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId, selfAID, channelType, peerType) {
+    getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId, selfAID, channelType, peerType, chatType) {
         // 使用精确路径（channelType + selfAID）
         const chatDir = (channelType && selfAID)
             ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfAID); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
@@ -627,18 +631,22 @@ export class SessionManager {
             if (existing) {
                 const validSessionId = this.validateSessionFile(existing);
                 if (metadata) {
+                    const creatorPeerId = existing.metadata?.peerId;
                     existing.metadata = { ...(existing.metadata || {}), ...metadata };
+                    if (creatorPeerId && existing.metadata)
+                        existing.metadata.peerId = creatorPeerId;
                     this.persistSession(existing, 'none');
                 }
                 return { ...existing, agentSessionId: validSessionId };
             }
         }
-        // Inherit project path & chatType from active main session
-        const activeMain = this.readActive(channel, channelId, channelType, selfAID);
-        const projectPath = (activeMain && !activeMain.threadId ? activeMain.projectPath : undefined) || defaultProjectPath;
-        const inheritedChatType = (activeMain && !activeMain.threadId ? activeMain.chatType : undefined) || 'private';
+        const projectPath = defaultProjectPath;
+        const effectiveChatType = chatType || 'private';
         const effectiveChannelType = channelType || channel;
         const sessionKey = formatSessionKey(effectiveChannelType, channelId, threadId);
+        // 继承主会话的 agentId（话题会话从属于主会话，应沿用相同 backend）
+        const mainActive = readJsonFile(path.join(chatDir, 'active.json'));
+        const inheritedAgentId = agentId || mainActive?.agentType || 'claude';
         const session = {
             id: generateSessionId(),
             channel,
@@ -647,10 +655,10 @@ export class SessionManager {
             selfAID: selfAID || '',
             projectPath,
             threadId,
-            agentId: agentId || 'claude',
+            agentId: inheritedAgentId,
             sessionKey,
-            chatType: inheritedChatType,
-            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType, peerType),
+            chatType: effectiveChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, effectiveChatType, peerType),
             metadata,
             name: name || '话题会话',
             createdAt: Date.now(),
@@ -1024,11 +1032,17 @@ export class SessionManager {
         const existingDir = this.findExistingChatDir(channel, channelId);
         let channelType = channel;
         let selfAID = '';
+        let inheritedRole = 'guest';
         if (existingDir) {
             const active = readJsonFile(path.join(existingDir, 'active.json'));
             if (active) {
                 channelType = active.channelType || channel;
                 selfAID = active.selfAID || '';
+                // 从现有 session 的 permissionMode 反推 role，bypass→owner，其余→guest
+                if (active.permissionMode === 'bypass')
+                    inheritedRole = 'owner';
+                if (!agentId && active.agentType)
+                    agentId = active.agentType;
             }
         }
         const session = {
@@ -1043,7 +1057,7 @@ export class SessionManager {
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
             sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
-            metadata: { permissionMode: DEFAULT_PERMISSION_MODE },
+            metadata: { permissionMode: this.resolvePermissionMode(inheritedRole) },
             name: name || '默认会话',
             createdAt: Date.now(),
             updatedAt: Date.now(),

package/dist/core/session/session-title.js

@@ -0,0 +1,26 @@
+const SYSTEM_PROMPT_MARKERS = [
+    '--- [SYSTEM_PROMPT_END] ---',
+    '<system-reminder>',
+    'EvolClaw Context Kit documents are shown below.',
+];
+const MESSAGE_ROUTE_PREFIX_RE = /^‹[^›]*·\s*from:[^›]*→\s*self:[^›]*›\s*/;
+export function sanitizeSessionTitle(title) {
+    if (typeof title !== 'string')
+        return undefined;
+    let cleanTitle = title;
+    for (const marker of SYSTEM_PROMPT_MARKERS) {
+        const markerIndex = cleanTitle.indexOf(marker);
+        if (markerIndex >= 0) {
+            cleanTitle = cleanTitle.slice(0, markerIndex);
+        }
+    }
+    cleanTitle = cleanTitle.trim().replace(MESSAGE_ROUTE_PREFIX_RE, '').replace(/\s+/g, ' ');
+    if (!cleanTitle)
+        return undefined;
+    if (/^\.+$/.test(cleanTitle))
+        return undefined;
+    return cleanTitle.length > 80 ? `${cleanTitle.slice(0, 80)}...` : cleanTitle;
+}
+export function displaySessionTitle(title, fallback = '默认会话') {
+    return sanitizeSessionTitle(title) || sanitizeSessionTitle(fallback) || fallback;
+}

package/dist/core/stats/billing.js

@@ -0,0 +1,151 @@
+/**
+ * billing.ts — 读 model-prices.jsonl，按 billing_fn 调对应算法函数计算费用。
+ * 费用查询时实时计算，不存入 DB（价格可能变动）。
+ */
+import fs from 'fs';
+import path from 'path';
+import { getPackageRoot } from '../../paths.js';
+// 价格表缓存（进程内，5 分钟 TTL）
+let _priceCache = null;
+let _priceCacheTs = 0;
+const PRICE_CACHE_TTL = 5 * 60 * 1000;
+/**
+ * 从包路径 + 用户路径合并读取 JSONL 文件。
+ * 包路径（$PACKAGE_ROOT/data/stats/）为基线，用户路径（$EVOLCLAW_HOME/data/stats/）为追加/覆盖。
+ * 两层合并（append），用户层行追加在包层之后——查价时 effective_from 越大越优先，天然正确。
+ */
+function _loadJsonlMerged(evolclawHome, filename) {
+    const results = [];
+    // 1. 包路径（基线）
+    const pkgFile = path.join(getPackageRoot(), 'data', 'stats', filename);
+    if (fs.existsSync(pkgFile)) {
+        try {
+            const lines = fs.readFileSync(pkgFile, 'utf-8').split('\n').filter(Boolean);
+            for (const l of lines)
+                results.push(JSON.parse(l));
+        }
+        catch { /* skip */ }
+    }
+    // 2. 用户路径（追加/覆盖）
+    const userFile = path.join(evolclawHome, 'data', 'stats', filename);
+    if (fs.existsSync(userFile)) {
+        try {
+            const lines = fs.readFileSync(userFile, 'utf-8').split('\n').filter(Boolean);
+            for (const l of lines)
+                results.push(JSON.parse(l));
+        }
+        catch { /* skip */ }
+    }
+    return results;
+}
+let _aliasCache = null;
+let _aliasCacheTs = 0;
+function loadAliases(evolclawHome) {
+    const now = Date.now();
+    if (_aliasCache && now - _aliasCacheTs < PRICE_CACHE_TTL)
+        return _aliasCache;
+    _aliasCache = _loadJsonlMerged(evolclawHome, 'model-aliases.jsonl');
+    _aliasCacheTs = now;
+    return _aliasCache;
+}
+/** 解析模型 ID → 定价表规范 ID。精确匹配 alias 表，找不到返回原 ID。 */
+export function resolveCanonicalModel(evolclawHome, model) {
+    const aliases = loadAliases(evolclawHome);
+    const entry = aliases.find(a => a.alias === model);
+    return entry ? entry.canonical : model;
+}
+function loadPrices(evolclawHome) {
+    const now = Date.now();
+    if (_priceCache && now - _priceCacheTs < PRICE_CACHE_TTL)
+        return _priceCache;
+    _priceCache = _loadJsonlMerged(evolclawHome, 'model-prices.jsonl');
+    _priceCacheTs = now;
+    return _priceCache;
+}
+/** 取 model 在 ts 时刻生效的价格行（effective_from <= ts 中最新的一条）。
+ *  精确匹配失败时，通过 model-aliases.jsonl 映射到规范 ID 再查一次。 */
+export function resolvePriceRow(evolclawHome, model, ts) {
+    const prices = loadPrices(evolclawHome);
+    let candidates = prices.filter(p => p.model === model && p.effective_from <= ts);
+    if (!candidates.length) {
+        // fallback: alias → canonical
+        const canonical = resolveCanonicalModel(evolclawHome, model);
+        if (canonical !== model) {
+            candidates = prices.filter(p => p.model === canonical && p.effective_from <= ts);
+        }
+    }
+    if (!candidates.length)
+        return null;
+    return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+}
+const BILLING_FNS = {
+    // 通用 per-token（Claude / OpenAI 兼容 / Kimi / MiniMax）
+    per_token_v1: (e, p) => {
+        const r = (p.price_input ?? 0) * e.input_tokens / 1e6
+            + (p.price_output ?? 0) * e.output_tokens / 1e6
+            + (p.price_cache_creation ?? 0) * e.cache_creation_tokens / 1e6
+            + (p.price_cache_read ?? 0) * e.cache_read_tokens / 1e6;
+        return p.currency === 'CNY' ? { cny: r } : { usd: r };
+    },
+    // DeepSeek cache_hit / cache_miss 口径
+    per_token_deepseek_v1: (e, p) => {
+        const r = (p.price_cache_hit ?? 0) * (e.cache_hit_tokens ?? 0) / 1e6
+            + (p.price_cache_miss ?? 0) * (e.cache_miss_tokens ?? 0) / 1e6
+            + (p.price_output ?? 0) * e.output_tokens / 1e6;
+        return { cny: r };
+    },
+    // Gemini 分档（按 total_context_tokens 确定所在档位）
+    per_token_tiered_v1: (e, p) => {
+        const tiers = p.tiers;
+        if (!Array.isArray(tiers))
+            return {};
+        const ctx = e.total_context_tokens ?? e.input_tokens;
+        const tier = tiers.find(t => t.up_to_tokens == null || ctx <= t.up_to_tokens) ?? tiers[tiers.length - 1];
+        const r = (tier.price_input ?? 0) * e.input_tokens / 1e6
+            + (tier.price_output ?? 0) * e.output_tokens / 1e6
+            + (tier.price_cache_read ?? 0) * e.cache_read_tokens / 1e6;
+        return p.currency === 'CNY' ? { cny: r } : { usd: r };
+    },
+    // 视觉模型（含 image_tokens 单独计费）
+    per_token_image_v1: (e, p) => {
+        const r = (p.price_input ?? 0) * e.input_tokens / 1e6
+            + (p.price_output ?? 0) * e.output_tokens / 1e6
+            + (p.price_image ?? 0) * (e.image_tokens ?? 0) / 1e6;
+        return p.currency === 'CNY' ? { cny: r } : { usd: r };
+    },
+};
+/** 注册新计费函数（扩展点）。 */
+export function registerBillingFn(id, fn) {
+    BILLING_FNS[id] = fn;
+}
+/** 计算一条 usage_event 的费用。找不到价格行时返回 {}。 */
+export function calcCost(evolclawHome, event) {
+    const priceRow = resolvePriceRow(evolclawHome, event.model, event.ts);
+    if (!priceRow)
+        return {};
+    const fn = BILLING_FNS[event.billing_fn] ?? BILLING_FNS[priceRow.billing_fn];
+    if (!fn)
+        return {};
+    return fn(event, priceRow);
+}
+let _specCache = null;
+let _specCacheTs = 0;
+function loadSpecs(evolclawHome) {
+    const now = Date.now();
+    if (_specCache && now - _specCacheTs < PRICE_CACHE_TTL)
+        return _specCache;
+    _specCache = _loadJsonlMerged(evolclawHome, 'model-specs.jsonl');
+    _specCacheTs = now;
+    return _specCache;
+}
+/** 取模型在 ts 时刻的能力参数。找不到时返回默认值。 */
+export function resolveModelSpec(evolclawHome, model, ts) {
+    const specs = loadSpecs(evolclawHome);
+    const t = ts ?? Date.now();
+    const candidates = specs.filter(s => s.model === model && s.effective_from <= t);
+    if (candidates.length) {
+        return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+    }
+    // 默认值
+    return { model, effective_from: 0, context_window: 200000, max_input_tokens: 180000, max_output_tokens: 8192 };
+}

package/dist/core/stats/budget.js

@@ -0,0 +1,93 @@
+/**
+ * budget.ts — 三档预算控制（硬上限 / 软上限 / 自主上限）。
+ */
+import fs from 'fs';
+import path from 'path';
+import { calcCost } from './billing.js';
+import { openReadonlyDb, getDbPath } from './db.js';
+function loadBudgets(evolclawHome) {
+    const file = path.join(evolclawHome, 'data', 'stats', 'budgets.json');
+    if (!fs.existsSync(file))
+        return {};
+    try {
+        return JSON.parse(fs.readFileSync(file, 'utf-8'));
+    }
+    catch {
+        return {};
+    }
+}
+function _resolveCfg(budgets, agentAid, peerKey) {
+    const g = budgets.global ?? {};
+    const a = agentAid ? (budgets.agents?.[agentAid] ?? {}) : {};
+    const p = peerKey ? (budgets.peers?.[peerKey] ?? {}) : {};
+    // 取最严格的限额
+    const daily_usd = Math.min(g.daily_usd ?? Infinity, a.daily_usd ?? Infinity, p.daily_usd ?? Infinity);
+    return {
+        daily_usd: isFinite(daily_usd) ? daily_usd : undefined,
+        monthly_usd: g.monthly_usd,
+        hard_limit_pct: g.hard_limit_pct ?? 100,
+        soft_limit_pct: g.soft_limit_pct ?? 80,
+        auto_limit_pct: g.auto_limit_pct ?? 60,
+        on_hard_limit: g.on_hard_limit ?? 'block',
+        downgrade_model: g.downgrade_model,
+    };
+}
+/** 计算今日实际 USD 消耗（逐行算 cost，以避免聚合误差）。 */
+function _calcTodayUsd(evolclawHome, agentAid) {
+    const now = new Date();
+    const from_ts = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+    return _calcRangeUsd(evolclawHome, from_ts, agentAid);
+}
+/** 计算本月实际 USD 消耗。 */
+function _calcMonthUsd(evolclawHome, agentAid) {
+    const now = new Date();
+    const from_ts = new Date(now.getFullYear(), now.getMonth(), 1).getTime();
+    return _calcRangeUsd(evolclawHome, from_ts, agentAid);
+}
+/** 计算指定时间范围的 USD 消耗（逐行算 cost）。 */
+function _calcRangeUsd(evolclawHome, from_ts, agentAid) {
+    const db = openReadonlyDb(getDbPath(evolclawHome));
+    if (!db)
+        return 0;
+    let total = 0;
+    try {
+        const clause = agentAid ? 'WHERE ts >= ? AND agent_aid = ?' : 'WHERE ts >= ?';
+        const params = agentAid ? [from_ts, agentAid] : [from_ts];
+        const rows = db.prepare(`SELECT * FROM usage_events ${clause}`).all(...params);
+        for (const r of rows) {
+            const cost = calcCost(evolclawHome, r);
+            total += cost.usd ?? 0;
+        }
+    }
+    finally {
+        db.close();
+    }
+    return total;
+}
+export function getBudgetStatus(evolclawHome, agentAid, peerKey) {
+    const budgets = loadBudgets(evolclawHome);
+    const cfg = _resolveCfg(budgets, agentAid, peerKey);
+    const dailyLimit = cfg.daily_usd ?? Infinity;
+    const dailyUsed = _calcTodayUsd(evolclawHome, agentAid);
+    const dailyRemaining = Math.max(0, dailyLimit - dailyUsed);
+    const dailyPct = isFinite(dailyLimit) && dailyLimit > 0 ? (dailyUsed / dailyLimit) * 100 : 0;
+    const monthlyLimit = cfg.monthly_usd ?? Infinity;
+    const monthlyUsed = isFinite(monthlyLimit) ? _calcMonthUsd(evolclawHome, agentAid) : 0;
+    const monthlyRemaining = Math.max(0, monthlyLimit - monthlyUsed);
+    const monthlyPct = isFinite(monthlyLimit) && monthlyLimit > 0 ? (monthlyUsed / monthlyLimit) * 100 : 0;
+    // 取 daily/monthly 中更高的百分比作为整体判断依据
+    const pct = Math.max(dailyPct, monthlyPct);
+    return {
+        daily_limit_usd: isFinite(dailyLimit) ? dailyLimit : -1,
+        daily_used_usd: dailyUsed,
+        daily_remaining_usd: isFinite(dailyLimit) ? dailyRemaining : -1,
+        monthly_limit_usd: isFinite(monthlyLimit) ? monthlyLimit : -1,
+        monthly_used_usd: monthlyUsed,
+        monthly_remaining_usd: isFinite(monthlyLimit) ? monthlyRemaining : -1,
+        pct_used: pct,
+        hard_blocked: pct >= (cfg.hard_limit_pct ?? 100),
+        soft_warn: pct >= (cfg.soft_limit_pct ?? 80),
+        auto_warn: pct >= (cfg.auto_limit_pct ?? 60),
+        downgrade_model: cfg.downgrade_model,
+    };
+}