morpheus-cli 0.8.5 → 0.8.7

package/dist/runtime/audit/repository.js

@@ -65,7 +65,24 @@ export class AuditRepository {
         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
+          -- Telephonist: prefer audio_cost_per_second when set
+          WHEN ae.event_type = 'telephonist'
+            AND mp.audio_cost_per_second IS NOT NULL
+            AND mp.audio_cost_per_second > 0
+          THEN
+            COALESCE(CAST(json_extract(ae.metadata, '$.audio_duration_seconds') AS REAL), 0)
+            * mp.audio_cost_per_second
+          -- Telephonist with token-based pricing (e.g. Gemini/OpenRouter with real tokens)
+          WHEN ae.event_type = 'telephonist'
+            AND ae.provider IS NOT NULL AND ae.model IS NOT NULL
+            AND ae.input_tokens IS NOT NULL AND ae.input_tokens > 0
+          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)
+          )
+          -- All other events: token-based
+          WHEN ae.event_type != 'telephonist'
+            AND 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)
@@ -84,11 +101,16 @@ export class AuditRepository {
         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 telephonistEvents = events.filter(e => e.event_type === 'telephonist');
+        const totalCostUsd = [...llmEvents, ...telephonistEvents].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 totalAudioSeconds = telephonistEvents.reduce((sum, e) => {
+            const meta = e.metadata ? JSON.parse(e.metadata) : null;
+            return sum + (meta?.audio_duration_seconds ?? 0);
+        }, 0);
+        // By agent (llm + telephonist)
         const agentMap = new Map();
-        for (const e of llmEvents) {
+        for (const e of [...llmEvents, ...telephonistEvents]) {
             const key = e.agent ?? 'unknown';
             const existing = agentMap.get(key) ?? { llmCalls: 0, inputTokens: 0, outputTokens: 0, estimatedCostUsd: 0 };
             agentMap.set(key, {
@@ -98,9 +120,9 @@ export class AuditRepository {
                 estimatedCostUsd: existing.estimatedCostUsd + (e.estimated_cost_usd ?? 0),
             });
         }
-        // By model
+        // By model (llm + telephonist)
         const modelMap = new Map();
-        for (const e of llmEvents) {
+        for (const e of [...llmEvents, ...telephonistEvents]) {
             if (!e.model)
                 continue;
             const key = `${e.provider}/${e.model}`;
@@ -116,6 +138,7 @@ export class AuditRepository {
         return {
             totalCostUsd,
             totalDurationMs,
+            totalAudioSeconds,
             llmCallCount: llmEvents.length,
             toolCallCount: toolEvents.length,
             byAgent: Array.from(agentMap.entries()).map(([agent, s]) => ({ agent, ...s })),
@@ -129,4 +152,168 @@ export class AuditRepository {
             })),
         };
     }
+    getGlobalSummary() {
+        // Reusable cost expression (telephonist + token-based)
+        const costExpr = `
+      CASE
+        WHEN ae.event_type = 'telephonist'
+          AND mp.audio_cost_per_second IS NOT NULL AND mp.audio_cost_per_second > 0
+        THEN COALESCE(CAST(json_extract(ae.metadata, '$.audio_duration_seconds') AS REAL), 0)
+             * mp.audio_cost_per_second
+        WHEN ae.event_type = 'telephonist'
+          AND ae.input_tokens IS NOT NULL AND ae.input_tokens > 0
+        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)
+        WHEN ae.event_type != 'telephonist'
+          AND ae.provider 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 0
+      END`;
+        // ── Sessions ─────────────────────────────────────────────────────────────
+        const sessionsRow = this.db.prepare(`
+      SELECT
+        COUNT(*) as total,
+        SUM(CASE WHEN status = 'active'   THEN 1 ELSE 0 END) as active,
+        SUM(CASE WHEN status = 'paused'   THEN 1 ELSE 0 END) as paused,
+        SUM(CASE WHEN status = 'archived' THEN 1 ELSE 0 END) as archived,
+        SUM(CASE WHEN status = 'deleted'  THEN 1 ELSE 0 END) as deleted
+      FROM sessions
+    `).get();
+        const withAuditRow = this.db.prepare(`SELECT COUNT(DISTINCT session_id) as n FROM audit_events`).get();
+        // ── Global totals (single JOIN pass) ─────────────────────────────────────
+        const totalsRow = this.db.prepare(`
+      SELECT
+        COUNT(*) as totalEventCount,
+        SUM(CASE WHEN ae.event_type = 'llm_call'        THEN 1 ELSE 0 END) as llmCallCount,
+        SUM(CASE WHEN ae.event_type = 'tool_call'       THEN 1 ELSE 0 END) as toolCallCount,
+        SUM(CASE WHEN ae.event_type = 'mcp_tool'        THEN 1 ELSE 0 END) as mcpToolCount,
+        SUM(CASE WHEN ae.event_type = 'skill_executed'  THEN 1 ELSE 0 END) as skillCount,
+        SUM(CASE WHEN ae.event_type = 'memory_recovery' THEN 1 ELSE 0 END) as memoryRecoveryCount,
+        SUM(CASE WHEN ae.event_type = 'chronos_job'     THEN 1 ELSE 0 END) as chronosJobCount,
+        SUM(CASE WHEN ae.event_type = 'task_created'    THEN 1 ELSE 0 END) as taskCreatedCount,
+        SUM(CASE WHEN ae.event_type = 'task_completed'  THEN 1 ELSE 0 END) as taskCompletedCount,
+        SUM(CASE WHEN ae.event_type = 'telephonist'     THEN 1 ELSE 0 END) as telephonistCount,
+        COALESCE(SUM(ae.input_tokens),  0) as totalInputTokens,
+        COALESCE(SUM(ae.output_tokens), 0) as totalOutputTokens,
+        COALESCE(SUM(ae.duration_ms),   0) as totalDurationMs,
+        COALESCE(SUM(
+          CASE WHEN ae.event_type = 'telephonist'
+            THEN COALESCE(CAST(json_extract(ae.metadata,'$.audio_duration_seconds') AS REAL),0)
+            ELSE 0 END
+        ), 0) as totalAudioSeconds,
+        COALESCE(SUM(${costExpr}), 0) as estimatedCostUsd
+      FROM audit_events ae
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+    `).get();
+        // ── By agent ─────────────────────────────────────────────────────────────
+        const byAgentRows = this.db.prepare(`
+      SELECT
+        COALESCE(ae.agent, 'unknown') as agent,
+        SUM(CASE WHEN ae.event_type = 'llm_call' THEN 1 ELSE 0 END) as llmCalls,
+        SUM(CASE WHEN ae.event_type IN ('tool_call','mcp_tool') THEN 1 ELSE 0 END) as toolCalls,
+        COALESCE(SUM(ae.input_tokens),  0) as inputTokens,
+        COALESCE(SUM(ae.output_tokens), 0) as outputTokens,
+        COALESCE(SUM(ae.duration_ms),   0) as totalDurationMs,
+        COALESCE(SUM(${costExpr}), 0) as estimatedCostUsd
+      FROM audit_events ae
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+      GROUP BY ae.agent
+      ORDER BY estimatedCostUsd DESC
+    `).all();
+        // ── By model ─────────────────────────────────────────────────────────────
+        const byModelRows = this.db.prepare(`
+      SELECT
+        ae.provider,
+        ae.model,
+        COUNT(*) as calls,
+        COALESCE(SUM(ae.input_tokens),  0) as inputTokens,
+        COALESCE(SUM(ae.output_tokens), 0) as outputTokens,
+        COALESCE(SUM(${costExpr}), 0) as estimatedCostUsd
+      FROM audit_events ae
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+      WHERE ae.model IS NOT NULL
+      GROUP BY ae.provider, ae.model
+      ORDER BY estimatedCostUsd DESC
+    `).all();
+        // ── Top tools ─────────────────────────────────────────────────────────────
+        const topToolsRows = this.db.prepare(`
+      SELECT
+        ae.tool_name,
+        ae.agent,
+        ae.event_type,
+        COUNT(*) as count,
+        SUM(CASE WHEN ae.status = 'error' THEN 1 ELSE 0 END) as errorCount
+      FROM audit_events ae
+      WHERE ae.tool_name IS NOT NULL
+        AND ae.event_type IN ('tool_call','mcp_tool')
+      GROUP BY ae.tool_name, ae.agent, ae.event_type
+      ORDER BY count DESC
+      LIMIT 20
+    `).all();
+        // ── Recent sessions ──────────────────────────────────────────────────────
+        const recentRows = this.db.prepare(`
+      SELECT
+        ae.session_id,
+        s.title,
+        s.status,
+        s.started_at,
+        COUNT(ae.id) as event_count,
+        SUM(CASE WHEN ae.event_type = 'llm_call' THEN 1 ELSE 0 END) as llmCallCount,
+        COALESCE(SUM(ae.duration_ms), 0) as totalDurationMs,
+        COALESCE(SUM(${costExpr}), 0) as estimatedCostUsd
+      FROM audit_events ae
+      INNER JOIN sessions s ON ae.session_id = s.id
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+      GROUP BY ae.session_id
+      ORDER BY MAX(ae.created_at) DESC
+      LIMIT 20
+    `).all();
+        // ── Daily activity (last 30 days) ─────────────────────────────────────────
+        const since = Date.now() - 30 * 24 * 60 * 60 * 1000;
+        const dailyRows = this.db.prepare(`
+      SELECT
+        date(ae.created_at / 1000, 'unixepoch') as date,
+        COUNT(*) as eventCount,
+        SUM(CASE WHEN ae.event_type = 'llm_call' THEN 1 ELSE 0 END) as llmCallCount,
+        COALESCE(SUM(${costExpr}), 0) as estimatedCostUsd
+      FROM audit_events ae
+      LEFT JOIN model_pricing mp ON mp.provider = ae.provider AND mp.model = ae.model
+      WHERE ae.created_at >= ?
+      GROUP BY date
+      ORDER BY date ASC
+    `).all(since);
+        return {
+            sessions: {
+                total: sessionsRow?.total ?? 0,
+                active: sessionsRow?.active ?? 0,
+                paused: sessionsRow?.paused ?? 0,
+                archived: sessionsRow?.archived ?? 0,
+                deleted: sessionsRow?.deleted ?? 0,
+                withAudit: withAuditRow?.n ?? 0,
+            },
+            totals: {
+                estimatedCostUsd: totalsRow?.estimatedCostUsd ?? 0,
+                totalDurationMs: totalsRow?.totalDurationMs ?? 0,
+                totalAudioSeconds: totalsRow?.totalAudioSeconds ?? 0,
+                totalInputTokens: totalsRow?.totalInputTokens ?? 0,
+                totalOutputTokens: totalsRow?.totalOutputTokens ?? 0,
+                totalEventCount: totalsRow?.totalEventCount ?? 0,
+                llmCallCount: totalsRow?.llmCallCount ?? 0,
+                toolCallCount: totalsRow?.toolCallCount ?? 0,
+                mcpToolCount: totalsRow?.mcpToolCount ?? 0,
+                skillCount: totalsRow?.skillCount ?? 0,
+                memoryRecoveryCount: totalsRow?.memoryRecoveryCount ?? 0,
+                chronosJobCount: totalsRow?.chronosJobCount ?? 0,
+                taskCreatedCount: totalsRow?.taskCreatedCount ?? 0,
+                taskCompletedCount: totalsRow?.taskCompletedCount ?? 0,
+                telephonistCount: totalsRow?.telephonistCount ?? 0,
+            },
+            byAgent: byAgentRows,
+            byModel: byModelRows,
+            topTools: topToolsRows,
+            recentSessions: recentRows,
+            dailyActivity: dailyRows,
+        };
+    }
 }

package/dist/runtime/chronos/repository.js

@@ -156,6 +156,41 @@ export class ChronosRepository {
         const rows = this.db.prepare(query).all(...params);
         return rows.map((r) => this.deserializeJob(r));
     }
+    countJobs(filters) {
+        const params = [];
+        let query = 'SELECT COUNT(*) as cnt FROM chronos_jobs WHERE 1=1';
+        if (filters?.enabled !== undefined) {
+            query += ' AND enabled = ?';
+            params.push(filters.enabled ? 1 : 0);
+        }
+        if (filters?.created_by) {
+            query += ' AND created_by = ?';
+            params.push(filters.created_by);
+        }
+        const row = this.db.prepare(query).get(...params);
+        return row.cnt;
+    }
+    listJobsPaginated(filters) {
+        const page = Math.max(1, filters?.page ?? 1);
+        const per_page = Math.min(100, Math.max(1, filters?.per_page ?? 20));
+        const offset = (page - 1) * per_page;
+        const total = this.countJobs(filters);
+        const total_pages = Math.ceil(total / per_page);
+        const params = [];
+        let query = 'SELECT * FROM chronos_jobs WHERE 1=1';
+        if (filters?.enabled !== undefined) {
+            query += ' AND enabled = ?';
+            params.push(filters.enabled ? 1 : 0);
+        }
+        if (filters?.created_by) {
+            query += ' AND created_by = ?';
+            params.push(filters.created_by);
+        }
+        query += ' ORDER BY created_at DESC LIMIT ? OFFSET ?';
+        params.push(per_page, offset);
+        const rows = this.db.prepare(query).all(...params);
+        return { data: rows.map((r) => this.deserializeJob(r)), total, page, per_page, total_pages };
+    }
     updateJob(id, patch) {
         const now = Date.now();
         const sets = ['updated_at = ?'];

package/dist/runtime/keymaker.js

@@ -8,7 +8,7 @@ import { Construtor } from "./tools/factory.js";
 import { morpheusTools } from "./tools/index.js";
 import { SkillRegistry } from "./skills/registry.js";
 import { TaskRequestContext } from "./tasks/context.js";
-import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
+import { extractRawUsage, persistAgentMessage, buildAgentResult, emitToolAuditEvents } from "./subagent-utils.js";
 /**
  * Keymaker is a specialized agent for executing skills.
  * "The one who opens any door" - has access to ALL tools:
@@ -122,38 +122,14 @@ CRITICAL — NEVER FABRICATE DATA:
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content
                 : JSON.stringify(lastMessage.content);
-            // 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);
-                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();
-            }
+            const rawUsage = extractRawUsage(lastMessage);
+            const stepCount = response.messages.filter((m) => m instanceof AIMessage).length;
+            await persistAgentMessage('keymaker', content, keymakerConfig, targetSession, rawUsage, durationMs);
+            emitToolAuditEvents(response.messages.slice(2), targetSession, 'keymaker');
             this.display.log(`Keymaker completed skill "${this.skillName}" execution`, { source: "Keymaker" });
-            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,
-                },
-            };
+            return buildAgentResult(content, keymakerConfig, rawUsage, durationMs, stepCount);
         }
         catch (err) {
             this.display.log(`Keymaker execution error: ${err.message}`, { source: "Keymaker", level: "error" });

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

@@ -1,6 +1,7 @@
 import { AIMessage } from "@langchain/core/messages";
 import { SatiService } from "./service.js";
 import { DisplayManager } from "../../display.js";
+import { AuditRepository } from "../../audit/repository.js";
 const display = DisplayManager.getInstance();
 export class SatiMemoryMiddleware {
     service;
@@ -14,12 +15,25 @@ export class SatiMemoryMiddleware {
         }
         return SatiMemoryMiddleware.instance;
     }
-    async beforeAgent(currentMessage, history) {
+    async beforeAgent(currentMessage, history, sessionId) {
+        const startMs = Date.now();
         try {
             // Extract recent messages content strings for context
             const recentText = history.slice(-10).map(m => m.content.toString());
             display.log(`Searching memories for: "${currentMessage.substring(0, 50)}${currentMessage.length > 50 ? '...' : ''}"`, { source: 'Sati' });
             const result = await this.service.recover(currentMessage, recentText);
+            const durationMs = Date.now() - startMs;
+            AuditRepository.getInstance().insert({
+                session_id: sessionId ?? 'sati-recovery',
+                event_type: 'memory_recovery',
+                agent: 'sati',
+                duration_ms: durationMs,
+                status: 'success',
+                metadata: {
+                    memories_count: result.relevant_memories.length,
+                    memories: result.relevant_memories.map(m => ({ category: m.category, importance: m.importance, summary: m.summary })),
+                },
+            });
             if (result.relevant_memories.length === 0) {
                 display.log('No relevant memories found', { source: 'Sati' });
                 return null;
@@ -36,6 +50,13 @@ export class SatiMemoryMiddleware {
             `);
         }
         catch (error) {
+            AuditRepository.getInstance().insert({
+                session_id: sessionId ?? 'sati-recovery',
+                event_type: 'memory_recovery',
+                agent: 'sati',
+                duration_ms: Date.now() - startMs,
+                status: 'error',
+            });
             display.log(`Error in beforeAgent: ${error}`, { source: 'Sati' });
             // Fail open: return null so execution continues without memory
             return null;

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

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import { randomUUID } from 'crypto';
 import loadVecExtension from '../sqlite-vec.js';
 import { DisplayManager } from '../../display.js';
+import { ConfigManager } from '../../../config/manager.js';
 const EMBEDDING_DIM = 384;
 export class SatiRepository {
     db = null;
@@ -208,7 +209,7 @@ export class SatiRepository {
     searchUnifiedVector(embedding, limit) {
         if (!this.db)
             return [];
-        const SIMILARITY_THRESHOLD = 0.95;
+        const SIMILARITY_THRESHOLD = ConfigManager.getInstance().getSatiConfig().similarity_threshold ?? 0.9;
         const stmt = this.db.prepare(`
     SELECT *
     FROM (
@@ -412,6 +413,43 @@ export class SatiRepository {
         const rows = this.db.prepare('SELECT * FROM long_term_memory WHERE archived = 0 ORDER BY created_at DESC').all();
         return rows.map(this.mapRowToRecord);
     }
+    buildMemoryFilterQuery(filters) {
+        const params = [];
+        let where = 'WHERE archived = 0';
+        if (filters?.category) {
+            where += ' AND category = ?';
+            params.push(filters.category);
+        }
+        if (filters?.importance) {
+            where += ' AND importance = ?';
+            params.push(filters.importance);
+        }
+        if (filters?.search) {
+            where += ' AND (summary LIKE ? OR details LIKE ? OR category LIKE ?)';
+            const pattern = `%${filters.search}%`;
+            params.push(pattern, pattern, pattern);
+        }
+        return { where, params };
+    }
+    countMemories(filters) {
+        if (!this.db)
+            this.initialize();
+        const { where, params } = this.buildMemoryFilterQuery(filters);
+        const row = this.db.prepare(`SELECT COUNT(*) as cnt FROM long_term_memory ${where}`).get(...params);
+        return row.cnt;
+    }
+    getMemoriesPaginated(filters) {
+        if (!this.db)
+            this.initialize();
+        const page = Math.max(1, filters?.page ?? 1);
+        const per_page = Math.min(100, Math.max(1, filters?.per_page ?? 20));
+        const offset = (page - 1) * per_page;
+        const total = this.countMemories(filters);
+        const total_pages = Math.ceil(total / per_page);
+        const { where, params } = this.buildMemoryFilterQuery(filters);
+        const rows = this.db.prepare(`SELECT * FROM long_term_memory ${where} ORDER BY created_at DESC LIMIT ? OFFSET ?`).all(...params, per_page, offset);
+        return { data: rows.map(this.mapRowToRecord), total, page, per_page, total_pages };
+    }
     mapRowToRecord(row) {
         return {
             id: row.id,

package/dist/runtime/memory/sqlite.js

@@ -204,6 +204,19 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
         catch (error) {
             console.warn(`[SQLite] Migration check failed: ${error}`);
         }
+        // Migrate model_pricing table
+        try {
+            const pricingInfo = this.db.pragma('table_info(model_pricing)');
+            const pricingCols = new Set(pricingInfo.map(c => c.name));
+            if (!pricingCols.has('audio_cost_per_second')) {
+                this.db.exec('ALTER TABLE model_pricing ADD COLUMN audio_cost_per_second REAL');
+                // Seed Whisper pricing: $0.006/minute = $0.0001/second
+                this.db.prepare('INSERT OR IGNORE INTO model_pricing (provider, model, input_price_per_1m, output_price_per_1m, audio_cost_per_second) VALUES (?, ?, ?, ?, ?)').run('openai', 'whisper-1', 0, 0, 0.0001);
+            }
+        }
+        catch (error) {
+            console.warn(`[SQLite] model_pricing migration failed: ${error}`);
+        }
     }
     /**
      * Retrieves all messages for the current session from the database.
@@ -301,7 +314,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, agent, duration_ms
+            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, audio_duration_seconds
          FROM messages
          WHERE session_id IN (${placeholders})
          ORDER BY id DESC
@@ -648,11 +661,11 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
     }
     // --- 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();
+        const rows = this.db.prepare('SELECT provider, model, input_price_per_1m, output_price_per_1m, audio_cost_per_second FROM model_pricing ORDER BY provider, model').all();
         return rows;
     }
     upsertModelPricing(entry) {
-        this.db.prepare('INSERT INTO model_pricing (provider, model, input_price_per_1m, output_price_per_1m) VALUES (?, ?, ?, ?) ON CONFLICT(provider, model) DO UPDATE SET input_price_per_1m = excluded.input_price_per_1m, output_price_per_1m = excluded.output_price_per_1m').run(entry.provider, entry.model, entry.input_price_per_1m, entry.output_price_per_1m);
+        this.db.prepare('INSERT INTO model_pricing (provider, model, input_price_per_1m, output_price_per_1m, audio_cost_per_second) VALUES (?, ?, ?, ?, ?) ON CONFLICT(provider, model) DO UPDATE SET input_price_per_1m = excluded.input_price_per_1m, output_price_per_1m = excluded.output_price_per_1m, audio_cost_per_second = excluded.audio_cost_per_second').run(entry.provider, entry.model, entry.input_price_per_1m, entry.output_price_per_1m, entry.audio_cost_per_second ?? null);
     }
     deleteModelPricing(provider, model) {
         const result = this.db.prepare('DELETE FROM model_pricing WHERE provider = ? AND model = ?').run(provider, model);

package/dist/runtime/neo.js

@@ -5,12 +5,50 @@ import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
 import { Construtor } from "./tools/factory.js";
 import { morpheusTools } from "./tools/index.js";
-import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
 import { TaskRequestContext } from "./tasks/context.js";
-import { updateNeoDelegateToolDescription } from "./tools/neo-tool.js";
+import { extractRawUsage, persistAgentMessage, buildAgentResult, emitToolAuditEvents } from "./subagent-utils.js";
+import { buildDelegationTool } from "./tools/delegation-utils.js";
+// Internal Morpheus tools get 'tool_call' event type; MCP tools get 'mcp_tool'
+const MORPHEUS_TOOL_NAMES = new Set(morpheusTools.map((t) => t.name));
+const NEO_BUILTIN_CAPABILITIES = `
+Neo built-in capabilities (always available — no MCP required):
+• Config: morpheus_config_query, morpheus_config_update — read/write Morpheus configuration (LLM, channels, UI, etc.)
+• Diagnostics: diagnostic_check — full system health report (config, databases, LLM provider, logs)
+• Analytics: message_count, token_usage, provider_model_usage — message counts and token/cost usage stats
+• Tasks: task_query — look up task status by id or session
+• MCP Management: mcp_list, mcp_manage — list/add/update/delete/enable/disable MCP servers; use action "reload" to reload tools across all agents after config changes
+• Webhooks: webhook_list, webhook_manage — create/update/delete webhooks; create returns api_key`.trim();
+const NEO_BASE_DESCRIPTION = `Delegate execution to Neo asynchronously.
+
+This tool creates a background task and returns an acknowledgement with task id.
+Use it for any request that requires Neo's built-in capabilities or a runtime MCP tool listed below.
+Each delegated task must contain one atomic objective.
+
+${NEO_BUILTIN_CAPABILITIES}`;
+function normalizeDescription(text) {
+    if (!text)
+        return "No description";
+    return text.replace(/\s+/g, " ").trim();
+}
+function buildCatalogSection(mcpTools) {
+    if (mcpTools.length === 0) {
+        return "\n\nRuntime MCP tools: none currently loaded.";
+    }
+    const maxItems = 500;
+    const lines = mcpTools.slice(0, maxItems).map((t) => {
+        const desc = normalizeDescription(t.description).slice(0, 120);
+        return `- ${t.name}: ${desc}`;
+    });
+    const hidden = mcpTools.length - lines.length;
+    if (hidden > 0) {
+        lines.push(`- ... and ${hidden} more tools`);
+    }
+    return `\n\nRuntime MCP tools:\n${lines.join("\n")}`;
+}
 export class Neo {
     static instance = null;
     static currentSessionId = undefined;
+    static _delegateTool = null;
     agent;
     config;
     display = DisplayManager.getInstance();
@@ -28,17 +66,25 @@ export class Neo {
     }
     static resetInstance() {
         Neo.instance = null;
+        Neo._delegateTool = null;
     }
     static async refreshDelegateCatalog() {
         const mcpTools = await Construtor.create(() => Neo.currentSessionId);
-        updateNeoDelegateToolDescription(mcpTools);
+        if (Neo._delegateTool) {
+            const full = `${NEO_BASE_DESCRIPTION}${buildCatalogSection(mcpTools)}`;
+            Neo._delegateTool.description = full;
+        }
     }
     async initialize() {
         const neoConfig = this.config.neo || this.config.llm;
         const personality = this.config.neo?.personality || 'analytical_engineer';
         const mcpTools = await Construtor.create(() => Neo.currentSessionId);
         const tools = [...mcpTools, ...morpheusTools];
-        updateNeoDelegateToolDescription(mcpTools);
+        // Update delegate tool description with current catalog
+        if (Neo._delegateTool) {
+            const full = `${NEO_BASE_DESCRIPTION}${buildCatalogSection(mcpTools)}`;
+            Neo._delegateTool.description = full;
+        }
         this.display.log(`Neo initialized with ${tools.length} tools (personality: ${personality}).`, { source: "Neo" });
         try {
             this.agent = await ProviderFactory.create(neoConfig, tools);
@@ -89,6 +135,7 @@ ${context ? `Context:\n${context}` : ""}
                 origin_message_id: taskContext?.origin_message_id,
                 origin_user_id: taskContext?.origin_user_id,
             };
+            const inputCount = messages.length;
             const startMs = Date.now();
             const response = await TaskRequestContext.run(invokeContext, () => this.agent.invoke({ messages }));
             const durationMs = Date.now() - startMs;
@@ -96,44 +143,41 @@ ${context ? `Context:\n${context}` : ""}
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content
                 : JSON.stringify(lastMessage.content);
-            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 rawUsage = extractRawUsage(lastMessage);
             const stepCount = response.messages.filter((m) => m instanceof AIMessage).length;
             const targetSession = sessionId ?? Neo.currentSessionId ?? "neo";
-            const history = new SQLiteChatMessageHistory({ sessionId: targetSession });
-            try {
-                const persisted = new AIMessage(content);
-                if (rawUsage)
-                    persisted.usage_metadata = rawUsage;
-                persisted.provider_metadata = { provider: neoConfig.provider, model: neoConfig.model };
-                persisted.agent_metadata = { agent: 'neo' };
-                persisted.duration_ms = durationMs;
-                await history.addMessage(persisted);
-            }
-            finally {
-                history.close();
-            }
+            await persistAgentMessage('neo', content, neoConfig, targetSession, rawUsage, durationMs);
+            emitToolAuditEvents(response.messages.slice(inputCount), targetSession, 'neo', {
+                defaultEventType: 'mcp_tool',
+                internalToolNames: MORPHEUS_TOOL_NAMES,
+            });
             this.display.log("Neo task completed.", { source: "Neo" });
-            return {
-                output: content,
-                usage: {
-                    provider: neoConfig.provider,
-                    model: neoConfig.model,
-                    inputTokens,
-                    outputTokens,
-                    durationMs,
-                    stepCount,
-                },
-            };
+            return buildAgentResult(content, neoConfig, rawUsage, durationMs, stepCount);
         }
         catch (err) {
             throw new ProviderError(neoConfig.provider, err, "Neo task execution failed");
         }
     }
+    createDelegateTool() {
+        if (!Neo._delegateTool) {
+            Neo._delegateTool = buildDelegationTool({
+                name: "neo_delegate",
+                description: NEO_BASE_DESCRIPTION,
+                agentKey: "neo",
+                agentLabel: "Neo",
+                auditAgent: "neo",
+                isSync: () => ConfigManager.getInstance().get().neo?.execution_mode === 'sync',
+                notifyText: '🥷 Neo is executing your request...',
+                executeSync: (task, context, sessionId, ctx) => Neo.getInstance().execute(task, context, sessionId, {
+                    origin_channel: ctx?.origin_channel ?? "api",
+                    session_id: sessionId,
+                    origin_message_id: ctx?.origin_message_id,
+                    origin_user_id: ctx?.origin_user_id,
+                }),
+            });
+        }
+        return Neo._delegateTool;
+    }
     async reload() {
         this.config = ConfigManager.getInstance().get();
         this.agent = undefined;