morpheus-cli 0.8.0 → 0.8.3

package/dist/devkit/registry.js

@@ -1,3 +1,4 @@
+import { AuditRepository } from '../runtime/audit/repository.js';
 const factories = [];
 export function registerToolFactory(factory, category = 'system') {
     factories.push({ category, factory });
@@ -9,13 +10,56 @@ const TOGGLEABLE_CATEGORIES = {
     git: 'enable_git',
     network: 'enable_network',
 };
+/**
+ * Wraps a StructuredTool to record audit events on each invocation.
+ * The `getSessionId` getter is called at invocation time so it reflects
+ * the current agent's session (not the session at build time).
+ */
+function instrumentTool(tool, getSessionId, getAgent) {
+    const original = tool._call.bind(tool);
+    tool._call = async function (input, runManager) {
+        const startMs = Date.now();
+        const sessionId = getSessionId() ?? 'unknown';
+        const agent = getAgent();
+        try {
+            const result = await original(input, runManager);
+            const durationMs = Date.now() - startMs;
+            AuditRepository.getInstance().insert({
+                session_id: sessionId,
+                event_type: 'tool_call',
+                agent: agent,
+                tool_name: tool.name,
+                duration_ms: durationMs,
+                status: 'success',
+            });
+            return result;
+        }
+        catch (err) {
+            const durationMs = Date.now() - startMs;
+            AuditRepository.getInstance().insert({
+                session_id: sessionId,
+                event_type: 'tool_call',
+                agent: agent,
+                tool_name: tool.name,
+                duration_ms: durationMs,
+                status: 'error',
+                metadata: { error: err?.message ?? String(err) },
+            });
+            throw err;
+        }
+    };
+    return tool;
+}
 /**
  * Builds the full DevKit tool set for a given context.
  * Each factory receives the context (working_dir, allowed_commands, etc.)
  * and returns tools with the context captured in closure.
  * Disabled categories are filtered out based on context flags.
+ * All tools are wrapped with audit instrumentation.
  */
 export function buildDevKit(ctx) {
+    const getSessionId = ctx.getSessionId ?? (() => undefined);
+    const getAgent = ctx.getAgent ?? (() => 'apoc');
     return factories
         .filter(({ category }) => {
         const ctxKey = TOGGLEABLE_CATEGORIES[category];
@@ -23,5 +67,6 @@ export function buildDevKit(ctx) {
             return true; // non-toggleable categories always load
         return ctx[ctxKey] !== false;
     })
-        .flatMap(({ factory }) => factory(ctx));
+        .flatMap(({ factory }) => factory(ctx))
+        .map(tool => instrumentTool(tool, getSessionId, getAgent));
 }

package/dist/http/api.js

@@ -22,6 +22,7 @@ import { createSkillsRouter } from './routers/skills.js';
 import { createSmithsRouter } from './routers/smiths.js';
 import { getActiveEnvOverrides } from '../config/precedence.js';
 import { hotReloadConfig, getRestartRequiredChanges } from '../runtime/hot-reload.js';
+import { AuditRepository } from '../runtime/audit/repository.js';
 async function readLastLines(filePath, n) {
     try {
         const content = await fs.readFile(filePath, 'utf8');
@@ -173,6 +174,10 @@ export function createApiRouter(oracle, chronosWorker) {
                     tool_name,
                     tool_call_id,
                     usage_metadata,
+                    agent: row.agent ?? 'oracle',
+                    duration_ms: row.duration_ms ?? null,
+                    provider: row.provider ?? null,
+                    model: row.model ?? null,
                 };
             });
             // Convert DESC to ASC for UI rendering
@@ -185,6 +190,21 @@ export function createApiRouter(oracle, chronosWorker) {
             sessionHistory.close();
         }
     });
+    // --- Session Audit ---
+    router.get('/sessions/:id/audit', (req, res) => {
+        try {
+            const { id } = req.params;
+            const limit = Math.min(parseInt(req.query.limit) || 100, 500);
+            const offset = parseInt(req.query.offset) || 0;
+            const audit = AuditRepository.getInstance();
+            const events = audit.getBySession(id, { limit, offset });
+            const summary = audit.getSessionSummary(id);
+            res.json({ events, summary });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
     // --- Chat Interaction ---
     const ChatSchema = z.object({
         message: z.string().min(1).max(32_000),
@@ -367,6 +387,17 @@ export function createApiRouter(oracle, chronosWorker) {
             res.status(500).json({ error: error.message });
         }
     });
+    router.get('/stats/usage/by-agent', (req, res) => {
+        try {
+            const h = new SQLiteChatMessageHistory({ sessionId: 'api-reader' });
+            const stats = h.getUsageStatsByAgent();
+            h.close();
+            res.json(stats);
+        }
+        catch (error) {
+            res.status(500).json({ error: error.message });
+        }
+    });
     // --- Model Pricing ---
     const ModelPricingSchema = z.object({
         provider: z.string().min(1),

package/dist/runtime/apoc.js

@@ -57,6 +57,8 @@ export class Apoc {
             enable_shell: devkit.enable_shell,
             enable_git: devkit.enable_git,
             enable_network: devkit.enable_network,
+            getSessionId: () => Apoc.currentSessionId,
+            getAgent: () => 'apoc',
         });
         this.display.log(`Apoc initialized with ${tools.length} DevKit tools (sandbox_dir: ${devkit.sandbox_dir}, personality: ${personality})`, { source: "Apoc" });
         try {
@@ -252,33 +254,48 @@ ${context ? `CONTEXT FROM ORACLE:\n${context}` : ""}
         const userMessage = new HumanMessage(task);
         const messages = [systemMessage, userMessage];
         try {
+            const startMs = Date.now();
             const response = await this.agent.invoke({ messages });
-            // Persist one AI message per delegated task so usage can be parameterized later.
-            // Use task session id when provided.
+            const durationMs = Date.now() - startMs;
             const apocConfig = this.config.apoc || this.config.llm;
             const lastMessage = response.messages[response.messages.length - 1];
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content
                 : JSON.stringify(lastMessage.content);
+            // Aggregate token usage across all AI messages in this invocation
+            const rawUsage = lastMessage.usage_metadata
+                ?? lastMessage.response_metadata?.usage
+                ?? lastMessage.response_metadata?.tokenUsage
+                ?? lastMessage.usage;
+            const inputTokens = rawUsage?.input_tokens ?? 0;
+            const outputTokens = rawUsage?.output_tokens ?? 0;
+            const stepCount = response.messages.filter((m) => m instanceof AIMessage).length;
             const targetSession = sessionId ?? Apoc.currentSessionId ?? "apoc";
             const history = new SQLiteChatMessageHistory({ sessionId: targetSession });
             try {
                 const persisted = new AIMessage(content);
-                persisted.usage_metadata = lastMessage.usage_metadata
-                    ?? lastMessage.response_metadata?.usage
-                    ?? lastMessage.response_metadata?.tokenUsage
-                    ?? lastMessage.usage;
-                persisted.provider_metadata = {
-                    provider: apocConfig.provider,
-                    model: apocConfig.model,
-                };
+                if (rawUsage)
+                    persisted.usage_metadata = rawUsage;
+                persisted.provider_metadata = { provider: apocConfig.provider, model: apocConfig.model };
+                persisted.agent_metadata = { agent: 'apoc' };
+                persisted.duration_ms = durationMs;
                 await history.addMessage(persisted);
             }
             finally {
                 history.close();
             }
             this.display.log("Apoc task completed.", { source: "Apoc" });
-            return content;
+            return {
+                output: content,
+                usage: {
+                    provider: apocConfig.provider,
+                    model: apocConfig.model,
+                    inputTokens,
+                    outputTokens,
+                    durationMs,
+                    stepCount,
+                },
+            };
         }
         catch (err) {
             throw new ProviderError(this.config.apoc?.provider || this.config.llm.provider, err, "Apoc task execution failed");

package/dist/runtime/audit/repository.js

@@ -0,0 +1,132 @@
+import Database from 'better-sqlite3';
+import fs from 'fs-extra';
+import path from 'path';
+import { homedir } from 'os';
+import { randomUUID } from 'crypto';
+import { DisplayManager } from '../display.js';
+export class AuditRepository {
+    static instance = null;
+    db;
+    constructor() {
+        const dbPath = path.join(homedir(), '.morpheus', 'memory', 'short-memory.db');
+        fs.ensureDirSync(path.dirname(dbPath));
+        this.db = new Database(dbPath, { timeout: 5000 });
+        this.db.pragma('journal_mode = WAL');
+        this.ensureTables();
+    }
+    static getInstance() {
+        if (!AuditRepository.instance) {
+            AuditRepository.instance = new AuditRepository();
+        }
+        return AuditRepository.instance;
+    }
+    ensureTables() {
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS audit_events (
+        id            TEXT PRIMARY KEY,
+        session_id    TEXT NOT NULL,
+        task_id       TEXT,
+        event_type    TEXT NOT NULL,
+        agent         TEXT,
+        tool_name     TEXT,
+        provider      TEXT,
+        model         TEXT,
+        input_tokens  INTEGER,
+        output_tokens INTEGER,
+        duration_ms   INTEGER,
+        status        TEXT,
+        metadata      TEXT,
+        created_at    INTEGER NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_audit_events_session
+        ON audit_events(session_id, created_at);
+      CREATE INDEX IF NOT EXISTS idx_audit_events_task
+        ON audit_events(task_id)
+        WHERE task_id IS NOT NULL;
+    `);
+    }
+    insert(event) {
+        try {
+            this.db.prepare(`
+        INSERT INTO audit_events
+          (id, session_id, task_id, event_type, agent, tool_name, provider, model,
+           input_tokens, output_tokens, duration_ms, status, metadata, created_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `).run(randomUUID(), event.session_id, event.task_id ?? null, event.event_type, event.agent ?? null, event.tool_name ?? null, event.provider ?? null, event.model ?? null, event.input_tokens ?? null, event.output_tokens ?? null, event.duration_ms ?? null, event.status ?? null, event.metadata ? JSON.stringify(event.metadata) : null, Date.now());
+        }
+        catch (err) {
+            // Non-critical — never let audit recording break the main flow
+            DisplayManager.getInstance().log(`AuditRepository.insert failed: ${err?.message ?? String(err)}`, { source: 'Audit', level: 'error' });
+        }
+    }
+    getBySession(sessionId, opts) {
+        const limit = opts?.limit ?? 500;
+        const offset = opts?.offset ?? 0;
+        const rows = this.db.prepare(`
+      SELECT ae.*,
+        CASE
+          WHEN ae.provider IS NOT NULL AND ae.model IS NOT NULL AND ae.input_tokens IS NOT NULL
+          THEN (
+            COALESCE(ae.input_tokens, 0) / 1000000.0 * COALESCE(mp.input_price_per_1m, 0) +
+            COALESCE(ae.output_tokens, 0) / 1000000.0 * COALESCE(mp.output_price_per_1m, 0)
+          )
+          ELSE NULL
+        END AS estimated_cost_usd
+      FROM audit_events ae
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+      WHERE ae.session_id = ?
+      ORDER BY ae.created_at ASC
+      LIMIT ? OFFSET ?
+    `).all(sessionId, limit, offset);
+        return rows.map(r => ({ ...r, metadata: r.metadata ? r.metadata : null }));
+    }
+    getSessionSummary(sessionId) {
+        const events = this.getBySession(sessionId, { limit: 10_000 });
+        const llmEvents = events.filter(e => e.event_type === 'llm_call');
+        const toolEvents = events.filter(e => e.event_type === 'tool_call' || e.event_type === 'mcp_tool');
+        const totalCostUsd = llmEvents.reduce((sum, e) => sum + (e.estimated_cost_usd ?? 0), 0);
+        const totalDurationMs = events.reduce((sum, e) => sum + (e.duration_ms ?? 0), 0);
+        // By agent
+        const agentMap = new Map();
+        for (const e of llmEvents) {
+            const key = e.agent ?? 'unknown';
+            const existing = agentMap.get(key) ?? { llmCalls: 0, inputTokens: 0, outputTokens: 0, estimatedCostUsd: 0 };
+            agentMap.set(key, {
+                llmCalls: existing.llmCalls + 1,
+                inputTokens: existing.inputTokens + (e.input_tokens ?? 0),
+                outputTokens: existing.outputTokens + (e.output_tokens ?? 0),
+                estimatedCostUsd: existing.estimatedCostUsd + (e.estimated_cost_usd ?? 0),
+            });
+        }
+        // By model
+        const modelMap = new Map();
+        for (const e of llmEvents) {
+            if (!e.model)
+                continue;
+            const key = `${e.provider}/${e.model}`;
+            const existing = modelMap.get(key) ?? { calls: 0, inputTokens: 0, outputTokens: 0, estimatedCostUsd: 0, provider: e.provider ?? '' };
+            modelMap.set(key, {
+                calls: existing.calls + 1,
+                inputTokens: existing.inputTokens + (e.input_tokens ?? 0),
+                outputTokens: existing.outputTokens + (e.output_tokens ?? 0),
+                estimatedCostUsd: existing.estimatedCostUsd + (e.estimated_cost_usd ?? 0),
+                provider: e.provider ?? '',
+            });
+        }
+        return {
+            totalCostUsd,
+            totalDurationMs,
+            llmCallCount: llmEvents.length,
+            toolCallCount: toolEvents.length,
+            byAgent: Array.from(agentMap.entries()).map(([agent, s]) => ({ agent, ...s })),
+            byModel: Array.from(modelMap.entries()).map(([key, s]) => ({
+                provider: s.provider,
+                model: key.split('/').slice(1).join('/'),
+                calls: s.calls,
+                inputTokens: s.inputTokens,
+                outputTokens: s.outputTokens,
+                estimatedCostUsd: s.estimatedCostUsd,
+            })),
+        };
+    }
+}

package/dist/runtime/audit/types.js

@@ -0,0 +1 @@
+export {};

package/dist/runtime/chronos/worker.js

@@ -3,6 +3,7 @@ import { ConfigManager } from '../../config/manager.js';
 import { DisplayManager } from '../display.js';
 import { parseNextRun } from './parser.js';
 import { ChannelRegistry } from '../../channels/registry.js';
+import { AuditRepository } from '../audit/repository.js';
 export class ChronosWorker {
     repo;
     oracle;
@@ -98,9 +99,20 @@ export class ChronosWorker {
             const taskContext = { origin_channel: taskOriginChannel, session_id: activeSessionId };
             // Hard-block Chronos management tools during execution.
             ChronosWorker.isExecuting = true;
+            const chronosStartMs = Date.now();
             const response = await this.oracle.chat(promptWithContext, undefined, false, taskContext);
+            const chronosDurationMs = Date.now() - chronosStartMs;
             this.repo.completeExecution(execId, 'success');
             display.log(`Job ${job.id} completed — status: success`, { source: 'Chronos' });
+            AuditRepository.getInstance().insert({
+                session_id: activeSessionId,
+                event_type: 'chronos_job',
+                agent: 'chronos',
+                tool_name: job.id,
+                duration_ms: chronosDurationMs,
+                status: 'success',
+                metadata: { job_id: job.id, exec_id: execId },
+            });
             // Deliver Oracle response to notification channels.
             await this.notify(job, response);
         }
@@ -108,6 +120,14 @@ export class ChronosWorker {
             const errMsg = err?.message ?? String(err);
             this.repo.completeExecution(execId, 'failed', errMsg);
             display.log(`Job ${job.id} failed — ${errMsg}`, { source: 'Chronos', level: 'error' });
+            AuditRepository.getInstance().insert({
+                session_id: activeSessionId,
+                event_type: 'chronos_job',
+                agent: 'chronos',
+                tool_name: job.id,
+                status: 'error',
+                metadata: { job_id: job.id, exec_id: execId, error: errMsg },
+            });
         }
         finally {
             ChronosWorker.isExecuting = false;

package/dist/runtime/keymaker.js

@@ -115,7 +115,9 @@ CRITICAL — NEVER FABRICATE DATA:
                 origin_message_id: taskContext?.origin_message_id,
                 origin_user_id: taskContext?.origin_user_id,
             };
+            const startMs = Date.now();
             const response = await TaskRequestContext.run(invokeContext, () => this.agent.invoke({ messages }));
+            const durationMs = Date.now() - startMs;
             const lastMessage = response.messages[response.messages.length - 1];
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content
@@ -123,25 +125,35 @@ CRITICAL — NEVER FABRICATE DATA:
             // Persist message with token usage metadata (like Trinity/Neo/Apoc)
             const keymakerConfig = this.config.keymaker || this.config.llm;
             const targetSession = taskContext?.session_id ?? "keymaker";
+            const rawUsage = lastMessage.usage_metadata
+                ?? lastMessage.response_metadata?.usage
+                ?? lastMessage.response_metadata?.tokenUsage
+                ?? lastMessage.usage;
             const history = new SQLiteChatMessageHistory({ sessionId: targetSession });
             try {
                 const persisted = new AIMessage(content);
-                persisted.usage_metadata =
-                    lastMessage.usage_metadata ??
-                        lastMessage.response_metadata?.usage ??
-                        lastMessage.response_metadata?.tokenUsage ??
-                        lastMessage.usage;
-                persisted.provider_metadata = {
-                    provider: keymakerConfig.provider,
-                    model: keymakerConfig.model,
-                };
+                if (rawUsage)
+                    persisted.usage_metadata = rawUsage;
+                persisted.provider_metadata = { provider: keymakerConfig.provider, model: keymakerConfig.model };
+                persisted.agent_metadata = { agent: 'keymaker' };
+                persisted.duration_ms = durationMs;
                 await history.addMessage(persisted);
             }
             finally {
                 history.close();
             }
             this.display.log(`Keymaker completed skill "${this.skillName}" execution`, { source: "Keymaker" });
-            return content;
+            return {
+                output: content,
+                usage: {
+                    provider: keymakerConfig.provider,
+                    model: keymakerConfig.model,
+                    inputTokens: rawUsage?.input_tokens ?? 0,
+                    outputTokens: rawUsage?.output_tokens ?? 0,
+                    durationMs,
+                    stepCount: response.messages.filter((m) => m instanceof AIMessage).length,
+                },
+            };
         }
         catch (err) {
             this.display.log(`Keymaker execution error: ${err.message}`, { source: "Keymaker", level: "error" });

package/dist/runtime/memory/sati/repository.js

@@ -208,7 +208,7 @@ export class SatiRepository {
     searchUnifiedVector(embedding, limit) {
         if (!this.db)
             return [];
-        const SIMILARITY_THRESHOLD = 0.9;
+        const SIMILARITY_THRESHOLD = 0.95;
         const stmt = this.db.prepare(`
     SELECT *
     FROM (

package/dist/runtime/memory/sati/service.js

@@ -7,6 +7,7 @@ import { createHash } from 'crypto';
 import { DisplayManager } from '../../display.js';
 import { SQLiteChatMessageHistory } from '../sqlite.js';
 import { EmbeddingService } from '../embedding.service.js';
+import { AuditRepository } from '../../audit/repository.js';
 const display = DisplayManager.getInstance();
 export class SatiService {
     repository;
@@ -95,9 +96,29 @@ export class SatiService {
             catch (e) {
                 console.warn('[SatiService] Failed to persist input log:', e);
             }
+            const satiStartMs = Date.now();
             const response = await agent.invoke({ messages });
+            const satiDurationMs = Date.now() - satiStartMs;
             const lastMessage = response.messages[response.messages.length - 1];
             let content = lastMessage.content.toString();
+            // Emit audit event for Sati's LLM call
+            try {
+                const rawUsage = lastMessage.usage_metadata
+                    ?? lastMessage.response_metadata?.usage
+                    ?? lastMessage.usage;
+                AuditRepository.getInstance().insert({
+                    session_id: userSessionId ?? 'sati-evaluation',
+                    event_type: 'llm_call',
+                    agent: 'sati',
+                    provider: satiConfig.provider,
+                    model: satiConfig.model,
+                    input_tokens: rawUsage?.input_tokens ?? rawUsage?.prompt_tokens ?? 0,
+                    output_tokens: rawUsage?.output_tokens ?? rawUsage?.completion_tokens ?? 0,
+                    duration_ms: satiDurationMs,
+                    status: 'success',
+                });
+            }
+            catch { /* non-critical */ }
             try {
                 const outputToolMsg = new ToolMessage({
                     content: content,

package/dist/runtime/memory/sqlite.js

@@ -182,9 +182,11 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
                 'cache_read_tokens',
                 'provider',
                 'model',
-                'audio_duration_seconds'
+                'audio_duration_seconds',
+                'agent',
+                'duration_ms',
             ];
-            const integerColumns = new Set(['input_tokens', 'output_tokens', 'total_tokens', 'cache_read_tokens']);
+            const integerColumns = new Set(['input_tokens', 'output_tokens', 'total_tokens', 'cache_read_tokens', 'duration_ms']);
             const realColumns = new Set(['audio_duration_seconds']);
             for (const col of newColumns) {
                 if (!columns.has(col)) {
@@ -299,7 +301,7 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
         }
         try {
             const placeholders = sessionIds.map(() => '?').join(', ');
-            const stmt = this.db.prepare(`SELECT id, session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model
+            const stmt = this.db.prepare(`SELECT id, session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model, agent, duration_ms
          FROM messages
          WHERE session_id IN (${placeholders})
          ORDER BY id DESC
@@ -353,6 +355,8 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
             const provider = anyMsg.provider_metadata?.provider ?? null;
             const model = anyMsg.provider_metadata?.model ?? null;
             const audioDurationSeconds = usage?.audio_duration_seconds ?? null;
+            const agent = anyMsg.agent_metadata?.agent ?? 'oracle';
+            const durationMs = anyMsg.duration_ms ?? null;
             // Handle special content serialization for Tools
             let finalContent = "";
             if (type === 'ai' && (message.tool_calls?.length ?? 0) > 0) {
@@ -375,8 +379,8 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
                     ? message.content
                     : JSON.stringify(message.content);
             }
-            const stmt = this.db.prepare("INSERT INTO messages (session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model, audio_duration_seconds) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            stmt.run(this.sessionId, type, finalContent, Date.now(), inputTokens, outputTokens, totalTokens, cacheReadTokens, provider, model, audioDurationSeconds);
+            const stmt = this.db.prepare("INSERT INTO messages (session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model, audio_duration_seconds, agent, duration_ms) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            stmt.run(this.sessionId, type, finalContent, Date.now(), inputTokens, outputTokens, totalTokens, cacheReadTokens, provider, model, audioDurationSeconds, agent, durationMs);
             // Verificar se a sessão tem título e definir automaticamente se necessário
             await this.setSessionTitleIfNeeded();
         }
@@ -403,7 +407,7 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
     async addMessages(messages) {
         if (messages.length === 0)
             return;
-        const stmt = this.db.prepare("INSERT INTO messages (session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model, audio_duration_seconds) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+        const stmt = this.db.prepare("INSERT INTO messages (session_id, type, content, created_at, input_tokens, output_tokens, total_tokens, cache_read_tokens, provider, model, audio_duration_seconds, agent, duration_ms) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
         const insertAll = this.db.transaction((msgs) => {
             for (const message of msgs) {
                 let type;
@@ -430,7 +434,7 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
                 else {
                     finalContent = typeof message.content === "string" ? message.content : JSON.stringify(message.content);
                 }
-                stmt.run(this.sessionId, type, finalContent, Date.now(), usage?.input_tokens ?? null, usage?.output_tokens ?? null, usage?.total_tokens ?? null, usage?.input_token_details?.cache_read ?? usage?.cache_read_tokens ?? null, anyMsg.provider_metadata?.provider ?? null, anyMsg.provider_metadata?.model ?? null, usage?.audio_duration_seconds ?? null);
+                stmt.run(this.sessionId, type, finalContent, Date.now(), usage?.input_tokens ?? null, usage?.output_tokens ?? null, usage?.total_tokens ?? null, usage?.input_token_details?.cache_read ?? usage?.cache_read_tokens ?? null, anyMsg.provider_metadata?.provider ?? null, anyMsg.provider_metadata?.model ?? null, usage?.audio_duration_seconds ?? null, anyMsg.agent_metadata?.agent ?? 'oracle', anyMsg.duration_ms ?? null);
             }
         });
         try {
@@ -580,6 +584,68 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
             throw new Error(`Failed to get grouped usage stats: ${error}`);
         }
     }
+    /**
+     * Retrieves aggregated usage statistics grouped by agent.
+     * Merges data from `messages` (Oracle's direct messages) with `audit_events` (subagent LLM calls).
+     */
+    getUsageStatsByAgent() {
+        try {
+            // From messages table (Oracle and any subagent messages stored there)
+            const rows = this.db.prepare(`
+        SELECT
+          COALESCE(m.agent, 'oracle') AS agent,
+          SUM(COALESCE(m.input_tokens, 0)) AS totalInputTokens,
+          SUM(COALESCE(m.output_tokens, 0)) AS totalOutputTokens,
+          COUNT(*) AS messageCount,
+          SUM(
+            COALESCE(m.input_tokens, 0) / 1000000.0 * COALESCE(mp.input_price_per_1m, 0) +
+            COALESCE(m.output_tokens, 0) / 1000000.0 * COALESCE(mp.output_price_per_1m, 0)
+          ) AS estimatedCostUsd
+        FROM messages m
+        LEFT JOIN model_pricing mp ON mp.provider = m.provider AND mp.model = m.model
+        WHERE m.type = 'ai' AND (m.input_tokens IS NOT NULL OR m.output_tokens IS NOT NULL)
+        GROUP BY COALESCE(m.agent, 'oracle')
+      `).all();
+            // Also pull from audit_events if the table exists
+            let auditRows = [];
+            try {
+                auditRows = this.db.prepare(`
+          SELECT
+            ae.agent,
+            SUM(COALESCE(ae.input_tokens, 0)) AS totalInputTokens,
+            SUM(COALESCE(ae.output_tokens, 0)) AS totalOutputTokens,
+            COUNT(*) AS messageCount,
+            SUM(
+              COALESCE(ae.input_tokens, 0) / 1000000.0 * COALESCE(mp.input_price_per_1m, 0) +
+              COALESCE(ae.output_tokens, 0) / 1000000.0 * COALESCE(mp.output_price_per_1m, 0)
+            ) AS estimatedCostUsd
+          FROM audit_events ae
+          LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+          WHERE ae.event_type = 'llm_call' AND ae.agent IS NOT NULL
+          GROUP BY ae.agent
+        `).all();
+            }
+            catch {
+                // audit_events table may not exist yet
+            }
+            // Merge: group by agent, sum values
+            const merged = new Map();
+            for (const r of [...rows, ...auditRows]) {
+                const key = r.agent;
+                const existing = merged.get(key) ?? { totalInputTokens: 0, totalOutputTokens: 0, messageCount: 0, estimatedCostUsd: 0 };
+                merged.set(key, {
+                    totalInputTokens: existing.totalInputTokens + (r.totalInputTokens || 0),
+                    totalOutputTokens: existing.totalOutputTokens + (r.totalOutputTokens || 0),
+                    messageCount: existing.messageCount + (r.messageCount || 0),
+                    estimatedCostUsd: existing.estimatedCostUsd + (r.estimatedCostUsd || 0),
+                });
+            }
+            return Array.from(merged.entries()).map(([agent, stats]) => ({ agent, ...stats }));
+        }
+        catch (error) {
+            throw new Error(`Failed to get agent usage stats: ${error}`);
+        }
+    }
     // --- Model Pricing CRUD ---
     listModelPricing() {
         const rows = this.db.prepare('SELECT provider, model, input_price_per_1m, output_price_per_1m FROM model_pricing ORDER BY provider, model').all();