@hoilab/ada-cli 0.84.11 → 0.84.13

package/dist/core/agent-session.js

@@ -37,6 +37,7 @@ import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
+import { createMemoryEngineTools } from "./memory-engine/tools.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 import { addUsageToTotals, createUsageTotals } from "./usage-totals.js";
 /**
@@ -160,6 +161,29 @@ export class AgentSession {
             activeToolNames: this._initialActiveToolNames,
             includeAllExtensionTools: true,
         });
+        // Ada Memory Engine: lazy-initialize (stores, migration, session index)
+        // and wire the LLM callback used by review/correction/flush. Best-effort
+        // and never blocks startup.
+        const memoryEngine = this._resourceLoader.getMemoryEngine();
+        if (memoryEngine) {
+            memoryEngine.setSessionId(this.sessionManager.getSessionId());
+            memoryEngine.setComplete(async (systemPrompt, userContent) => {
+                const model = this.model;
+                if (!model)
+                    throw new Error("No model selected");
+                const result = await this._modelRuntime.completeSimple(model, {
+                    systemPrompt,
+                    messages: [{ role: "user", content: userContent }],
+                });
+                return contentText(result.content, "").trim();
+            });
+            memoryEngine.setNotify((message, level) => {
+                this._emit({ type: "notification", message, level });
+            });
+            void memoryEngine.initialize().catch(() => {
+                // Memory must never break the session.
+            });
+        }
     }
     get modelRuntime() {
         return this._modelRuntime;
@@ -338,6 +362,23 @@ export class AgentSession {
     // =========================================================================
     // Automatic project memory (claude-mem style)
     // =========================================================================
+    /** Live-index a message for the Memory Engine session search (layer 3c). */
+    _indexMessageForMemory(message) {
+        const memoryEngine = this._resourceLoader.getMemoryEngine();
+        if (!memoryEngine?.isInitialized)
+            return;
+        try {
+            memoryEngine.indexSessionMessage({
+                id: message.id,
+                role: message.role,
+                content: message.content,
+                timestamp: message.timestamp,
+            });
+        }
+        catch {
+            // Best-effort indexing.
+        }
+    }
     static AUTO_MEMORIZE_MIN_INTERVAL_MS = 45_000;
     static AUTO_MEMORIZE_SYSTEM_PROMPT = `You maintain the shared project memory of a coding project.
 The memory is loaded into the context of every conversation of this project, so it must stay concise and durable.
@@ -438,11 +479,26 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         await this._emitExtensionEvent(event);
         // Notify all listeners
         this._emit(event.type === "agent_end" ? { ...event, willRetry: this._willRetryAfterAgentEnd(event) } : event);
+        // Ada Memory Engine: track user turns / corrections, run the
+        // background review loop, and live-index messages for session search.
+        const memoryEngine = this._resourceLoader.getMemoryEngine();
+        if (memoryEngine?.isInitialized) {
+            if (event.type === "message_end") {
+                memoryEngine.onMessageEnd(event.message);
+                this._indexMessageForMemory(event.message);
+            }
+            else if (event.type === "turn_end") {
+                void memoryEngine.onTurnEnd({ message: event.message });
+            }
+        }
         // Automatic project memory (claude-mem style): after each completed
         // agent turn with real user interaction, distill durable facts into
         // the shared project memory. Fire-and-forget; never blocks the turn.
+        // Disabled when the Memory Engine is active (its review loop replaces it).
         if (event.type === "agent_end") {
-            void this._maybeAutoMemorize(event);
+            if (!memoryEngine?.isInitialized) {
+                void this._maybeAutoMemorize(event);
+            }
         }
         // Handle session persistence
         if (event.type === "message_end") {
@@ -644,6 +700,16 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         catch {
             // Dispose must succeed even if an abort hook throws.
         }
+        // Ada Memory Engine: persist the session index (best-effort).
+        try {
+            const memoryEngine = this._resourceLoader.getMemoryEngine();
+            if (memoryEngine?.isInitialized) {
+                void memoryEngine.onShutdown();
+            }
+        }
+        catch {
+            // Dispose must succeed even if memory persistence fails.
+        }
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
@@ -723,6 +789,14 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
         this.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;
     }
+    /**
+     * Rebuild the base system prompt (public) — used after settings changes
+     * that affect prompt content (e.g. memory injection mode).
+     */
+    rebuildSystemPrompt() {
+        this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+        this.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;
+    }
     /** Whether compaction or branch summarization is currently running */
     get isCompacting() {
         return (this._autoCompactionAbortController !== undefined ||
@@ -2112,6 +2186,15 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         if (!this.settingsManager.getProjectMemoryEnabled()) {
             this._baseToolDefinitions.delete("update_project_memory");
         }
+        // Ada Memory Engine tools (memory_add/replace/remove/search,
+        // session_search, scratchpad, memory_status). Exposed when enabled.
+        const memoryEngine = this._resourceLoader.getMemoryEngine();
+        if (memoryEngine && this.settingsManager.getProjectMemoryEnabled()) {
+            const engineTools = createMemoryEngineTools(memoryEngine);
+            for (const [name, tool] of Object.entries(engineTools)) {
+                this._baseToolDefinitions.set(name, tool);
+            }
+        }
         const extensionsResult = this._resourceLoader.getExtensions();
         if (options.flagValues) {
             for (const [name, value] of options.flagValues) {