evolcore 0.0.25 → 0.0.26

package/dist/ipc.js

@@ -76,7 +76,7 @@ function requiresLocalControlToken(cmd) {
     // Managed bootstrap completion is authenticated by the session delegation
     // ticket. A standalone CLI invocation still needs the daemon control token.
     return LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
-        || (cmd.type === 'evolagent.bootstrapComplete' && typeof cmd.sessionId !== 'string');
+        || ((cmd.type === 'evolagent.bootstrapComplete' || cmd.type === 'diag') && typeof cmd.sessionId !== 'string');
 }
 export function summarizeMonitorAgents(agents, aids) {
     const connectedAgents = new Set(aids.filter(aid => aid.status === 'connected').map(aid => aid.agentName || aid.aid));
@@ -116,7 +116,10 @@ export class IpcServer {
     taskRuntimeContextProvider;
     codexPreToolUseExecutor;
     aunMsgSender;
+    diagExecutor;
+    menuClientExecutor;
     handoffReturnExecutor;
+    handoffRecoverReturnExecutor;
     handoffStatusExecutor;
     handoffListExecutor;
     handoffTraceExecutor;
@@ -135,6 +138,8 @@ export class IpcServer {
     controlToken;
     daemonRuntimeEpoch;
     remoteAccessService = remoteAccessService;
+    /** Current daemon owner used to bind locally issued ECWeb pairing codes. */
+    remoteAccessOwnerProvider;
     // CPU 占用追踪：IPC handler 是一次性同步调用，无法在响应里做 200ms 异步采样，
     // 故用后台 1s interval 累积 process.cpuUsage() 增量，handler 直接读最近值。
     // procCpuPercent = 本 daemon 进程占单核的百分比（可 >100% 仅当多核，已 clamp 到 100）；
@@ -189,6 +194,15 @@ export class IpcServer {
     setRemoteAccessService(service) {
         this.remoteAccessService = service;
     }
+    /**
+     * Supply the live process-level owner for pairing requests that do not carry
+     * an explicit owner (for example `ec watch web` and the ECWeb supervisor).
+     * The provider is evaluated for every request so owner updates take effect
+     * without restarting ECWeb.
+     */
+    setRemoteAccessOwnerProvider(provider) {
+        this.remoteAccessOwnerProvider = provider;
+    }
     /** Set the process-lifetime marker used to reject stale managed children. */
     setDaemonRuntimeEpoch(epoch) {
         this.daemonRuntimeEpoch = epoch;
@@ -362,10 +376,15 @@ export class IpcServer {
     setAunMsgSender(sender) {
         this.aunMsgSender = sender;
     }
+    setDiagExecutor(executor) { this.diagExecutor = executor; }
+    setMenuClientExecutor(executor) { this.menuClientExecutor = executor; }
     /** Inject internal handoff result return executor for `ec handoff return`. */
     setHandoffReturnExecutor(executor) {
         this.handoffReturnExecutor = executor;
     }
+    setHandoffRecoverReturnExecutor(executor) {
+        this.handoffRecoverReturnExecutor = executor;
+    }
     setHandoffStatusExecutor(executor) {
         this.handoffStatusExecutor = executor;
     }
@@ -807,6 +826,10 @@ export class IpcServer {
             };
         }
         switch (cmd.type) {
+            case 'diag':
+                return this.diagExecutor ? this.diagExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', message: '诊断入口未配置' };
+            case 'menu-client.request':
+                return this.menuClientExecutor ? this.menuClientExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', error: 'Managed Menu client is not configured' };
             case 'model.catalog': {
                 if ((cmd.self !== undefined && typeof cmd.self !== 'string')
                     || (cmd.baseagent !== undefined && !['claude', 'codex', 'ecagent', 'gemini'].includes(cmd.baseagent))) {
@@ -887,7 +910,9 @@ export class IpcServer {
                 });
             }
             case 'remote-auth.pair-code': {
-                const pair = this.remoteAccessService.getPairingCode(typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy : undefined);
+                const requestedOwner = typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy.trim() : undefined;
+                const authorizedBy = requestedOwner || this.remoteAccessOwnerProvider?.();
+                const pair = this.remoteAccessService.getPairingCode(authorizedBy);
                 return { ok: true, ...pair };
             }
             case 'remote-auth.issue-local': {
@@ -1094,6 +1119,10 @@ export class IpcServer {
                 return { ok: true, context };
             }
             case 'aun-msg-send': {
+                if (cmd.handoffContext !== undefined && (typeof cmd.handoffContext !== 'string'
+                    || !cmd.handoffContext.trim() || cmd.handoffContext.length > 64 * 1024 || cmd.scope === 'group')) {
+                    return { ok: false, code: 'INVALID_HANDOFF_CONTEXT', error: 'Private handoff context must contain 1–65536 characters' };
+                }
                 if (!this.aunMsgSender)
                     return { ok: false, error: 'aun msg sender not configured' };
                 if (!cmd.aid || typeof cmd.aid !== 'string')
@@ -1148,6 +1177,7 @@ export class IpcServer {
                         encrypt: typeof cmd.encrypt === 'boolean' ? cmd.encrypt : undefined,
                         thread: typeof cmd.thread === 'string' ? cmd.thread : undefined,
                         returnPolicy: cmd.returnPolicy === 'required' || cmd.returnPolicy === 'none' ? cmd.returnPolicy : undefined,
+                        handoffContext: cmd.handoffContext,
                         originSessionId: typeof cmd.originSessionId === 'string' ? cmd.originSessionId : undefined,
                         originMessageId: typeof cmd.originMessageId === 'string' ? cmd.originMessageId : undefined,
                         delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
@@ -1177,6 +1207,28 @@ export class IpcServer {
                     return { ok: false, error: e?.message || String(e) };
                 }
             }
+            case 'handoff-recover-return': {
+                if (!this.handoffRecoverReturnExecutor)
+                    return { ok: false, error: 'handoff recovery not configured' };
+                if (typeof cmd.sessionId !== 'string' || !cmd.sessionId)
+                    return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'missing sessionId' };
+                if (typeof cmd.handoffId !== 'string' || !cmd.handoffId)
+                    return { ok: false, code: 'INVALID_HANDOFF_ID', error: 'missing handoff_id' };
+                if (typeof cmd.content !== 'string')
+                    return { ok: false, code: 'HANDOFF_RETURN_CONTENT_REQUIRED', error: 'missing content' };
+                try {
+                    return await this.handoffRecoverReturnExecutor({
+                        sessionId: cmd.sessionId,
+                        handoffId: cmd.handoffId,
+                        content: cmd.content,
+                        delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                        delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                    });
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message || String(e) };
+                }
+            }
             case 'handoff-status': {
                 if (!this.handoffStatusExecutor)
                     return { ok: false, code: 'HANDOFF_STATUS_UNAVAILABLE', error: 'handoff status not configured' };

package/dist/response-system/engines/v1/proactive-flow.js

@@ -12,7 +12,18 @@ const STATE_KEY = 'proactive';
 const TOOL_REPORT_INTERVAL = 10;
 const SEND_RECEIPT_RE = /["']?(?:message[_ -]?id|handoff[_ -]?id)["']?\s*[:=]\s*["']?([A-Za-z0-9][A-Za-z0-9._:-]*)/gi;
 const HANDOFF_TEXT_RECEIPT_RE = /\bhandoff\s+(h-[A-Za-z0-9._-]+)/i;
-function hasSuccessfulSendReceipt(result, isError) {
+const RETURN_CONTENT_RE = /["']?(?:return[_ -]?content|returnContent)["']?\s*[:=]\s*["']?([^}\n,]*)/i;
+function hasRequiredReturnFlag(toolInput) {
+    if (!toolInput || typeof toolInput !== 'object')
+        return false;
+    const input = toolInput;
+    const commandValues = ['command', 'cmd', 'script'].flatMap(key => {
+        const value = input[key];
+        return typeof value === 'string' ? [value] : [];
+    });
+    return commandValues.some(command => /(?:^|\s)--return(?:=|\s+)['"]?required(?:['"]?)(?=\s|$)/i.test(command));
+}
+function hasSuccessfulSendReceipt(result, isError, requiresBusinessReturn = false) {
     if (isError === true)
         return false;
     const hasReceiptValue = (value) => {
@@ -40,6 +51,41 @@ function hasSuccessfulSendReceipt(result, isError) {
     };
     if (hasExplicitFailure(result, new Set()))
         return false;
+    const isBusinessReturn = (value) => {
+        if (typeof value !== 'string')
+            return false;
+        const normalized = value.trim();
+        if (!normalized || /^(?:null|undefined|-)$/.test(normalized))
+            return false;
+        // Contact admission/refusal is a real reply, but it is not task completion.
+        if (/(?:当前不接受陌生人消息|可发送\s*\/request|contact\s+(?:required|request)|stranger message)/i.test(normalized))
+            return false;
+        return true;
+    };
+    const inspectBusinessReturn = (value, seen) => {
+        if (!value || typeof value !== 'object')
+            return false;
+        if (seen.has(value))
+            return false;
+        seen.add(value);
+        if (Array.isArray(value))
+            return value.some(item => inspectBusinessReturn(item, seen));
+        for (const [key, item] of Object.entries(value)) {
+            if ((key === 'return_content' || key === 'returnContent') && isBusinessReturn(item))
+                return true;
+            if (inspectBusinessReturn(item, seen))
+                return true;
+        }
+        return false;
+    };
+    if (requiresBusinessReturn) {
+        if (inspectBusinessReturn(result, new Set()))
+            return true;
+        const returnText = typeof result === 'string'
+            ? result.match(RETURN_CONTENT_RE)?.[1]
+            : undefined;
+        return isBusinessReturn(returnText);
+    }
     const inspect = (value, seen) => {
         if (!value || typeof value !== 'object')
             return false;
@@ -153,6 +199,11 @@ export const proactiveFlow = {
                 // Codex only invokes this hook for local tool paths. Hosted tools stay
                 // enabled and do not satisfy or clear the pending first-send gate.
                 const isSendCommand = ctx.isSendCommand(toolName, toolInput);
+                if (!isSendCommand && ((state.firstSendRequired && !state.firstToolDone) || state.toolReportPending)) {
+                    const sendFailure = ctx.describeSendCommandFailure?.(toolName, toolInput);
+                    if (sendFailure)
+                        return { block: true, policyCode: 'proactive_send_invalid', reason: sendFailure };
+                }
                 if (state.firstSendRequired && !state.firstToolDone) {
                     if (!isSendCommand) {
                         const cmdHint = state.chatType === 'group' ? 'ec group send' : 'ec msg send';
@@ -221,7 +272,13 @@ export const proactiveFlow = {
             return;
         if (!ctx.isSendCommand(ctx.toolName, ctx.toolInput))
             return;
-        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error))
+        const requiresBusinessReturn = hasRequiredReturnFlag(ctx.toolInput)
+            && (typeof ctx.result === 'string'
+                ? HANDOFF_TEXT_RECEIPT_RE.test(ctx.result)
+                : !!ctx.result && typeof ctx.result === 'object'
+                    && ('handoff_id' in ctx.result || 'handoffId' in ctx.result));
+        HANDOFF_TEXT_RECEIPT_RE.lastIndex = 0;
+        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error, requiresBusinessReturn))
             return;
         if (state.firstSendRequired && !state.firstToolDone)
             state.firstToolDone = true;

package/dist/stats/billing.js

@@ -5,6 +5,7 @@
 import fs from 'fs';
 import path from 'path';
 import { getPackageRoot } from '../paths.js';
+import { parseModelId, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
 // 模型参数缓存（进程内，5 分钟 TTL）
 let _parameterCache = null;
 let _parameterCacheTs = 0;
@@ -79,21 +80,36 @@ function loadPrices(evolcoreHome) {
     _priceCacheTs = now;
     return _priceCache;
 }
+/**
+ * 按优先级列出一个模型 ID 的查表候选键。
+ *
+ * 上下文窗口变体（`claude-opus-5[1m]`）与基础模型同价，价表只需一条基础条目；
+ * 但仍先试精确匹配，好让用户能给某个变体单独定价。
+ */
+export function modelLookupKeys(evolcoreHome, model) {
+    const keys = [];
+    const push = (key) => { if (key && !keys.includes(key))
+        keys.push(key); };
+    push(model);
+    push(resolveCanonicalModel(evolcoreHome, model));
+    const base = stripContextWindowSuffix(model);
+    if (base !== model) {
+        push(base);
+        push(resolveCanonicalModel(evolcoreHome, base));
+    }
+    return keys;
+}
 /** 取 model 在 ts 时刻生效的价格行（effective_from <= ts 中最新的一条）。
- *  精确匹配失败时，通过 model-aliases.jsonl 映射到规范 ID 再查一次。 */
+ *  精确匹配失败时，依次回落到 alias 规范 ID 和去掉窗口后缀的基础 ID。 */
 export function resolvePriceRow(evolcoreHome, model, ts) {
     const prices = loadPrices(evolcoreHome);
-    let candidates = prices.filter(p => p.model === model && p.effective_from <= ts);
-    if (!candidates.length) {
-        // fallback: alias → canonical
-        const canonical = resolveCanonicalModel(evolcoreHome, model);
-        if (canonical !== model) {
-            candidates = prices.filter(p => p.model === canonical && p.effective_from <= ts);
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const candidates = prices.filter(p => p.model === key && p.effective_from <= ts);
+        if (candidates.length) {
+            return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
         }
     }
-    if (!candidates.length)
-        return null;
-    return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+    return null;
 }
 export const BILLING_FNS = {
     // 通用 per-token（Claude / OpenAI 兼容 / Kimi / MiniMax）
@@ -164,14 +180,24 @@ function loadSpecs(evolcoreHome) {
     _specCacheTs = now;
     return _specCache;
 }
-/** 取模型在 ts 时刻的能力参数。找不到时返回默认值。 */
+/** 取模型在 ts 时刻的能力参数。找不到时返回默认值。
+ *  带窗口后缀的 ID 复用基础模型的参数行，但窗口由后缀决定（网关的权威声明）。 */
 export function resolveModelSpec(evolcoreHome, model, ts) {
     const specs = loadSpecs(evolcoreHome);
     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);
+    const suffixWindow = parseModelId(model).contextWindow;
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const candidates = specs.filter(s => s.model === key && s.effective_from <= t);
+        if (!candidates.length)
+            continue;
+        const row = candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+        if (suffixWindow === undefined || suffixWindow === row.context_window)
+            return row;
+        // 后缀声明的窗口覆盖基础行，输入上限按原行的预留比例等比缩放。
+        const ratio = row.context_window > 0 ? row.max_input_tokens / row.context_window : 0.9;
+        return { ...row, model, context_window: suffixWindow, max_input_tokens: Math.floor(suffixWindow * ratio) };
     }
     // 默认值
-    return { model, effective_from: 0, context_window: 200000, max_input_tokens: 180000, max_output_tokens: 8192 };
+    const contextWindow = suffixWindow ?? 200000;
+    return { model, effective_from: 0, context_window: contextWindow, max_input_tokens: Math.floor(contextWindow * 0.9), max_output_tokens: 8192 };
 }

package/dist/stats/db.js

@@ -85,134 +85,134 @@ export function openReadonlyDb(dbPath) {
     }
 }
 function _initTables(db) {
-    db.exec(`
-    CREATE TABLE IF NOT EXISTS usage_events (
-      id                    INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts                    INTEGER NOT NULL,
-      agent_aid             TEXT    NOT NULL,
-      peer_key              TEXT    NOT NULL,
-      usage_subject_key     TEXT    NOT NULL DEFAULT '',
-      role                  TEXT    NOT NULL DEFAULT '',
-      peer_type             TEXT,
-      session_id            TEXT,
-      model                 TEXT    NOT NULL,
-      billing_fn            TEXT    NOT NULL,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      cache_hit_tokens      INTEGER,
-      cache_miss_tokens     INTEGER,
-      image_tokens          INTEGER,
-      total_context_tokens  INTEGER,
-      turns                 INTEGER NOT NULL DEFAULT 1,
-      duration_ms           INTEGER,
-      context_window_pct    REAL,
-      cost_official_usd     REAL,
-      cost_official_cny     REAL,
-      cost_gateway_usd      REAL,
-      cost_gateway_cny      REAL
-    );
-    CREATE INDEX IF NOT EXISTS idx_ue_ts         ON usage_events(ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_agent_ts   ON usage_events(agent_aid, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_peer_ts    ON usage_events(agent_aid, peer_key, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_model_ts   ON usage_events(model, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_session_ts ON usage_events(session_id, ts);
-
-    CREATE TABLE IF NOT EXISTS context_breakdown (
-      id              INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts              INTEGER NOT NULL,
-      agent_aid       TEXT    NOT NULL,
-      session_id      TEXT    NOT NULL,
-      turn_count      INTEGER NOT NULL,
-      model           TEXT    NOT NULL,
-      max_tokens      INTEGER NOT NULL,
-      system_prompt   INTEGER,
-      system_tools    INTEGER,
-      mcp_tools       INTEGER,
-      custom_agents   INTEGER,
-      memory_files    INTEGER,
-      skills          INTEGER,
-      messages        INTEGER,
-      free_space      INTEGER,
-      total_estimated INTEGER
-    );
-    CREATE INDEX IF NOT EXISTS idx_cb_session ON context_breakdown(session_id, ts);
-    CREATE INDEX IF NOT EXISTS idx_cb_agent   ON context_breakdown(agent_aid, ts);
-
-    CREATE TABLE IF NOT EXISTS message_events (
-      id          INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts          INTEGER NOT NULL,
-      agent_aid   TEXT    NOT NULL,
-      peer_key    TEXT    NOT NULL,
-      direction   TEXT    NOT NULL,
-      msg_type    TEXT,
-      bytes       INTEGER NOT NULL DEFAULT 0,
-      encrypted   INTEGER DEFAULT 0,
-      chatmode    TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_me_ts       ON message_events(ts);
-    CREATE INDEX IF NOT EXISTS idx_me_agent_ts ON message_events(agent_aid, ts);
-    CREATE INDEX IF NOT EXISTS idx_me_peer_ts  ON message_events(agent_aid, peer_key, ts);
-
-    -- 按天预聚合表：grain = 天 × agent × peer × session × model × billing_fn。
-    -- 由 writer.ts 写时增量 UPSERT 维护，rebuildDailyRollup() 全量重建纠偏。
-    -- 保留 model+billing_fn 维度以便查询时仍按 calcCost 现算成本。
-    -- 日级行很小，永留主库、不参与年度归档。
-    CREATE TABLE IF NOT EXISTS usage_daily (
-      day          TEXT NOT NULL,           -- 'YYYY-MM-DD' localtime
-      agent_aid    TEXT NOT NULL,
-      peer_key     TEXT NOT NULL,
-      peer_type    TEXT NOT NULL DEFAULT '',-- 'private' | 'group'，由 peer_key 唯一决定
-      session_id   TEXT NOT NULL DEFAULT '',
-      model        TEXT NOT NULL,
-      billing_fn   TEXT NOT NULL,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      cache_hit_tokens      INTEGER NOT NULL DEFAULT 0,
-      cache_miss_tokens     INTEGER NOT NULL DEFAULT 0,
-      image_tokens          INTEGER NOT NULL DEFAULT 0,
-      total_context_tokens  INTEGER NOT NULL DEFAULT 0,
-      turns        INTEGER NOT NULL DEFAULT 0,
-      calls        INTEGER NOT NULL DEFAULT 0,
-      cost_official_usd     REAL,
-      cost_official_cny     REAL,
-      cost_gateway_usd      REAL,
-      cost_gateway_cny      REAL,
-      PRIMARY KEY (day, agent_aid, peer_key, session_id, model, billing_fn)
-    );
-    CREATE INDEX IF NOT EXISTS idx_ud_day     ON usage_daily(day);
-    CREATE INDEX IF NOT EXISTS idx_ud_session ON usage_daily(session_id);
-
-    -- 大模型调用明细：每次大模型调用一行（尽力而为；非 Claude 拿不到逐次时降级为单行累计）。
-    -- 关联三个 ID：task_id（一次 runQuery）、session_id（evolcore 会话）、agent_session_id（SDK 会话）。
-    CREATE TABLE IF NOT EXISTS model_calls (
-      id            INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts            INTEGER NOT NULL,
-      task_id       TEXT    NOT NULL,
-      session_id    TEXT,
-      agent_session_id TEXT,
-      agent_aid     TEXT    NOT NULL,
-      peer_key      TEXT    NOT NULL,
-      call_index    INTEGER NOT NULL,
-      model         TEXT    NOT NULL,
-      request_id    TEXT,
-      message_id    TEXT,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      context_tokens        INTEGER,
-      max_tokens            INTEGER,
-      auto_compact_tokens   INTEGER,
-      degraded      INTEGER NOT NULL DEFAULT 0
-    );
-    CREATE INDEX IF NOT EXISTS idx_mc_task        ON model_calls(task_id);
-    CREATE INDEX IF NOT EXISTS idx_mc_session     ON model_calls(session_id, ts);
-    CREATE INDEX IF NOT EXISTS idx_mc_agentsession ON model_calls(agent_session_id);
-    CREATE INDEX IF NOT EXISTS idx_mc_ts          ON model_calls(ts);
+    db.exec(`
+    CREATE TABLE IF NOT EXISTS usage_events (
+      id                    INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts                    INTEGER NOT NULL,
+      agent_aid             TEXT    NOT NULL,
+      peer_key              TEXT    NOT NULL,
+      usage_subject_key     TEXT    NOT NULL DEFAULT '',
+      role                  TEXT    NOT NULL DEFAULT '',
+      peer_type             TEXT,
+      session_id            TEXT,
+      model                 TEXT    NOT NULL,
+      billing_fn            TEXT    NOT NULL,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      cache_hit_tokens      INTEGER,
+      cache_miss_tokens     INTEGER,
+      image_tokens          INTEGER,
+      total_context_tokens  INTEGER,
+      turns                 INTEGER NOT NULL DEFAULT 1,
+      duration_ms           INTEGER,
+      context_window_pct    REAL,
+      cost_official_usd     REAL,
+      cost_official_cny     REAL,
+      cost_gateway_usd      REAL,
+      cost_gateway_cny      REAL
+    );
+    CREATE INDEX IF NOT EXISTS idx_ue_ts         ON usage_events(ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_agent_ts   ON usage_events(agent_aid, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_peer_ts    ON usage_events(agent_aid, peer_key, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_model_ts   ON usage_events(model, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_session_ts ON usage_events(session_id, ts);
+
+    CREATE TABLE IF NOT EXISTS context_breakdown (
+      id              INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts              INTEGER NOT NULL,
+      agent_aid       TEXT    NOT NULL,
+      session_id      TEXT    NOT NULL,
+      turn_count      INTEGER NOT NULL,
+      model           TEXT    NOT NULL,
+      max_tokens      INTEGER NOT NULL,
+      system_prompt   INTEGER,
+      system_tools    INTEGER,
+      mcp_tools       INTEGER,
+      custom_agents   INTEGER,
+      memory_files    INTEGER,
+      skills          INTEGER,
+      messages        INTEGER,
+      free_space      INTEGER,
+      total_estimated INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_cb_session ON context_breakdown(session_id, ts);
+    CREATE INDEX IF NOT EXISTS idx_cb_agent   ON context_breakdown(agent_aid, ts);
+
+    CREATE TABLE IF NOT EXISTS message_events (
+      id          INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts          INTEGER NOT NULL,
+      agent_aid   TEXT    NOT NULL,
+      peer_key    TEXT    NOT NULL,
+      direction   TEXT    NOT NULL,
+      msg_type    TEXT,
+      bytes       INTEGER NOT NULL DEFAULT 0,
+      encrypted   INTEGER DEFAULT 0,
+      chatmode    TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_me_ts       ON message_events(ts);
+    CREATE INDEX IF NOT EXISTS idx_me_agent_ts ON message_events(agent_aid, ts);
+    CREATE INDEX IF NOT EXISTS idx_me_peer_ts  ON message_events(agent_aid, peer_key, ts);
+
+    -- 按天预聚合表：grain = 天 × agent × peer × session × model × billing_fn。
+    -- 由 writer.ts 写时增量 UPSERT 维护，rebuildDailyRollup() 全量重建纠偏。
+    -- 保留 model+billing_fn 维度以便查询时仍按 calcCost 现算成本。
+    -- 日级行很小，永留主库、不参与年度归档。
+    CREATE TABLE IF NOT EXISTS usage_daily (
+      day          TEXT NOT NULL,           -- 'YYYY-MM-DD' localtime
+      agent_aid    TEXT NOT NULL,
+      peer_key     TEXT NOT NULL,
+      peer_type    TEXT NOT NULL DEFAULT '',-- 'private' | 'group'，由 peer_key 唯一决定
+      session_id   TEXT NOT NULL DEFAULT '',
+      model        TEXT NOT NULL,
+      billing_fn   TEXT NOT NULL,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      cache_hit_tokens      INTEGER NOT NULL DEFAULT 0,
+      cache_miss_tokens     INTEGER NOT NULL DEFAULT 0,
+      image_tokens          INTEGER NOT NULL DEFAULT 0,
+      total_context_tokens  INTEGER NOT NULL DEFAULT 0,
+      turns        INTEGER NOT NULL DEFAULT 0,
+      calls        INTEGER NOT NULL DEFAULT 0,
+      cost_official_usd     REAL,
+      cost_official_cny     REAL,
+      cost_gateway_usd      REAL,
+      cost_gateway_cny      REAL,
+      PRIMARY KEY (day, agent_aid, peer_key, session_id, model, billing_fn)
+    );
+    CREATE INDEX IF NOT EXISTS idx_ud_day     ON usage_daily(day);
+    CREATE INDEX IF NOT EXISTS idx_ud_session ON usage_daily(session_id);
+
+    -- 大模型调用明细：每次大模型调用一行（尽力而为；非 Claude 拿不到逐次时降级为单行累计）。
+    -- 关联三个 ID：task_id（一次 runQuery）、session_id（evolcore 会话）、agent_session_id（SDK 会话）。
+    CREATE TABLE IF NOT EXISTS model_calls (
+      id            INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts            INTEGER NOT NULL,
+      task_id       TEXT    NOT NULL,
+      session_id    TEXT,
+      agent_session_id TEXT,
+      agent_aid     TEXT    NOT NULL,
+      peer_key      TEXT    NOT NULL,
+      call_index    INTEGER NOT NULL,
+      model         TEXT    NOT NULL,
+      request_id    TEXT,
+      message_id    TEXT,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      context_tokens        INTEGER,
+      max_tokens            INTEGER,
+      auto_compact_tokens   INTEGER,
+      degraded      INTEGER NOT NULL DEFAULT 0
+    );
+    CREATE INDEX IF NOT EXISTS idx_mc_task        ON model_calls(task_id);
+    CREATE INDEX IF NOT EXISTS idx_mc_session     ON model_calls(session_id, ts);
+    CREATE INDEX IF NOT EXISTS idx_mc_agentsession ON model_calls(agent_session_id);
+    CREATE INDEX IF NOT EXISTS idx_mc_ts          ON model_calls(ts);
   `);
     // ── Schema Migration: 添加 cost 列 ───────────────────────────────────────
     try {
@@ -220,17 +220,17 @@ function _initTables(db) {
         const hasCostCols = cols.some((c) => c.name === 'cost_official_usd');
         if (!hasCostCols) {
             logger.info('[StatsDB] Migrating schema: adding cost columns to usage_events and usage_daily...');
-            db.exec(`
-        ALTER TABLE usage_events ADD COLUMN cost_official_usd REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_official_cny REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_gateway_usd REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_gateway_cny REAL;
+            db.exec(`
+        ALTER TABLE usage_events ADD COLUMN cost_official_usd REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_official_cny REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_gateway_usd REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_gateway_cny REAL;
       `);
-            db.exec(`
-        ALTER TABLE usage_daily ADD COLUMN cost_official_usd REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_official_cny REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_gateway_usd REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_gateway_cny REAL;
+            db.exec(`
+        ALTER TABLE usage_daily ADD COLUMN cost_official_usd REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_official_cny REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_gateway_usd REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_gateway_cny REAL;
       `);
             logger.info('[StatsDB] Migration complete. Run "ec stats --rebuild" to backfill historical costs.');
         }
@@ -295,26 +295,26 @@ export function rebuildDailyRollup(evolcoreHome) {
     try {
         db.exec('BEGIN');
         db.exec('DELETE FROM usage_daily');
-        db.exec(`
-      INSERT INTO usage_daily
-        (day, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
-         input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
-         cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
-         turns, calls,
-         cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
-      SELECT
-        strftime('%Y-%m-%d', ts/1000, 'unixepoch', 'localtime') AS day,
-        agent_aid, peer_key, MAX(COALESCE(peer_type, '')),
-        COALESCE(session_id, ''), model, billing_fn,
-        SUM(input_tokens), SUM(output_tokens),
-        SUM(cache_creation_tokens), SUM(cache_read_tokens),
-        SUM(COALESCE(cache_hit_tokens, 0)), SUM(COALESCE(cache_miss_tokens, 0)),
-        SUM(COALESCE(image_tokens, 0)), SUM(COALESCE(total_context_tokens, 0)),
-        SUM(turns), COUNT(*),
-        SUM(COALESCE(cost_official_usd, 0)), SUM(COALESCE(cost_official_cny, 0)),
-        SUM(COALESCE(cost_gateway_usd, 0)), SUM(COALESCE(cost_gateway_cny, 0))
-      FROM usage_events
-      GROUP BY day, agent_aid, peer_key, COALESCE(session_id, ''), model, billing_fn
+        db.exec(`
+      INSERT INTO usage_daily
+        (day, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
+         input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+         cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
+         turns, calls,
+         cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
+      SELECT
+        strftime('%Y-%m-%d', ts/1000, 'unixepoch', 'localtime') AS day,
+        agent_aid, peer_key, MAX(COALESCE(peer_type, '')),
+        COALESCE(session_id, ''), model, billing_fn,
+        SUM(input_tokens), SUM(output_tokens),
+        SUM(cache_creation_tokens), SUM(cache_read_tokens),
+        SUM(COALESCE(cache_hit_tokens, 0)), SUM(COALESCE(cache_miss_tokens, 0)),
+        SUM(COALESCE(image_tokens, 0)), SUM(COALESCE(total_context_tokens, 0)),
+        SUM(turns), COUNT(*),
+        SUM(COALESCE(cost_official_usd, 0)), SUM(COALESCE(cost_official_cny, 0)),
+        SUM(COALESCE(cost_gateway_usd, 0)), SUM(COALESCE(cost_gateway_cny, 0))
+      FROM usage_events
+      GROUP BY day, agent_aid, peer_key, COALESCE(session_id, ''), model, billing_fn
     `);
         db.exec('COMMIT');
         const row = db.prepare('SELECT COUNT(*) AS n FROM usage_daily').get();
@@ -345,7 +345,7 @@ export function archiveOldData(evolcoreHome) {
     const cutoffYear = now.getFullYear(); // e.g. 2026
     const cutoffTs = Date.UTC(cutoffYear, 0, 1); // 2026-01-01 00:00:00 UTC
     // 找出主库中所有早于 cutoff 的年份
-    const years = db.prepare(`SELECT DISTINCT CAST(strftime('%Y', ts/1000, 'unixepoch') AS INTEGER) AS y
+    const years = db.prepare(`SELECT DISTINCT CAST(strftime('%Y', ts/1000, 'unixepoch') AS INTEGER) AS y
      FROM usage_events WHERE ts < ? ORDER BY y`).all(cutoffTs).map((r) => r.y);
     if (years.length === 0)
         return;