morpheus-cli 0.4.9 → 0.4.10

package/dist/runtime/apoc.js

@@ -4,6 +4,7 @@ import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
 import { buildDevKit } from "../devkit/index.js";
+import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
 /**
  * Apoc is a subagent of Oracle specialized in devtools operations.
  * It receives delegated tasks from Oracle and executes them using DevKit tools
@@ -15,12 +16,20 @@ import { buildDevKit } from "../devkit/index.js";
  */
 export class Apoc {
     static instance = null;
+    static currentSessionId = undefined;
     agent;
     config;
     display = DisplayManager.getInstance();
     constructor(config) {
         this.config = config || ConfigManager.getInstance().get();
     }
+    /**
+     * Called by Oracle before each chat() so Apoc knows which session to
+     * attribute its token usage to.
+     */
+    static setSessionId(sessionId) {
+        Apoc.currentSessionId = sessionId;
+    }
     static getInstance(config) {
         if (!Apoc.instance) {
             Apoc.instance = new Apoc(config);
@@ -54,8 +63,9 @@ export class Apoc {
      * Execute a devtools task delegated by Oracle.
      * @param task Natural language task description
      * @param context Optional additional context from the ongoing conversation
+     * @param sessionId Session to attribute token usage to (defaults to 'apoc')
      */
-    async execute(task, context) {
+    async execute(task, context, sessionId) {
         if (!this.agent) {
             await this.initialize();
         }
@@ -90,6 +100,23 @@ ${context ? `CONTEXT FROM ORACLE:\n${context}` : ""}
         const messages = [systemMessage, userMessage];
         try {
             const response = await this.agent.invoke({ messages });
+            // Persist Apoc-generated messages so token usage is tracked in short-memory.db.
+            // Use the caller's session when provided, then the static session set by Oracle,
+            // otherwise fall back to 'apoc'.
+            const apocConfig = this.config.apoc || this.config.llm;
+            const newMessages = response.messages.slice(messages.length);
+            if (newMessages.length > 0) {
+                const targetSession = sessionId ?? Apoc.currentSessionId ?? 'apoc';
+                const history = new SQLiteChatMessageHistory({ sessionId: targetSession });
+                for (const msg of newMessages) {
+                    msg.provider_metadata = {
+                        provider: apocConfig.provider,
+                        model: apocConfig.model,
+                    };
+                }
+                await history.addMessages(newMessages);
+                history.close();
+            }
             const lastMessage = response.messages[response.messages.length - 1];
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content

package/dist/runtime/oracle.js

@@ -6,6 +6,7 @@ import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
 import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
 import { SatiMemoryMiddleware } from "./memory/sati/index.js";
+import { Apoc } from "./apoc.js";
 export class Oracle {
     provider;
     config;
@@ -208,6 +209,11 @@ You maintain intent until resolution.
             }
             messages.push(...previousMessages);
             messages.push(userMessage);
+            // Propagate current session to Apoc so its token usage lands in the right session
+            const currentSessionId = (this.history instanceof SQLiteChatMessageHistory)
+                ? this.history.currentSessionId
+                : undefined;
+            Apoc.setSessionId(currentSessionId);
             const response = await this.provider.invoke({ messages });
             // Identify new messages generated during the interaction
             // The `messages` array passed to invoke had length `messages.length`
@@ -229,9 +235,6 @@ You maintain intent until resolution.
             const lastMessage = response.messages[response.messages.length - 1];
             const responseContent = (typeof lastMessage.content === 'string') ? lastMessage.content : JSON.stringify(lastMessage.content);
             // Sati Middleware: Evaluation (Fire and forget)
-            const currentSessionId = (this.history instanceof SQLiteChatMessageHistory)
-                ? this.history.currentSessionId
-                : undefined;
             this.satiMiddleware.afterAgent(responseContent, [...previousMessages, userMessage], currentSessionId)
                 .catch((e) => this.display.log(`Sati memory evaluation failed: ${e.message}`, { source: 'Sati' }));
             return responseContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morpheus-cli",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Morpheus is a local AI agent for developers, running as a CLI daemon that connects to LLMs, local tools, and MCPs, enabling interaction via Terminal, Telegram, and Discord. Inspired by the character Morpheus from *The Matrix*, the project acts as an intelligent orchestrator, bridging the gap between the developer and complex systems.",
   "bin": {
     "morpheus": "./bin/morpheus.js"