@hoilab/ada-cli 0.84.16 → 0.84.18

package/dist/core/agent-session.js

@@ -39,6 +39,7 @@ import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createMemoryEngineTools } from "./memory-engine/tools.js";
 import { redactSensitive } from "./memory-engine/security.js";
+import { expandVaultRefs } from "./memory-engine/vault.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 import { addUsageToTotals, createUsageTotals } from "./usage-totals.js";
 /**
@@ -468,6 +469,8 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
     // Track last assistant message for auto-compaction check
     _lastAssistantMessage = undefined;
     _lastAutoMemorizeAt = 0;
+    /** Redacted user-message content pending persistence (vault expansion). */
+    _pendingUserRedactions = [];
     /** Internal handler for agent events - shared by subscribe and reconnect */
     _handleAgentEvent = async (event) => {
         // When a user message starts, check if it's from either queue and remove it BEFORE emitting
@@ -527,8 +530,15 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             else if (event.message.role === "user" ||
                 event.message.role === "assistant" ||
                 event.message.role === "toolResult") {
-                // Regular LLM message - persist as SessionMessageEntry
-                this.sessionManager.appendMessage(event.message);
+                // Regular LLM message - persist as SessionMessageEntry.
+                // Vault expansion: persist the REDACTED form so secrets expanded
+                // from the vault never land in the session file.
+                let toPersist = event.message;
+                if (event.message.role === "user" && this._pendingUserRedactions.length > 0) {
+                    const redactedText = this._pendingUserRedactions.shift();
+                    toPersist = { ...event.message, content: [{ type: "text", text: redactedText }] };
+                }
+                this.sessionManager.appendMessage(toPersist);
             }
             // Other message types (bashExecution, compactionSummary, branchSummary) are persisted elsewhere
             // Track assistant message for auto-compaction (checked on agent_end)
@@ -1002,11 +1012,25 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             // + audit) and redact it BEFORE it reaches the LLM, the session file
             // or the chat transcript. The user sees censored content; the raw
             // secret is never persisted anywhere.
+            // The engine exists whenever the SDK is built with the memory module;
+            // detection + redaction only need config (not the initialized stores),
+            // so they are ALWAYS applied — a failed init must never disable them.
             const memoryEngine = this._resourceLoader.getMemoryEngine();
-            if (memoryEngine?.isInitialized) {
+            if (memoryEngine) {
                 memoryEngine.checkUserTextForSensitive(expandedText);
                 expandedText = redactSensitive(expandedText, memoryEngine.privacyLevel);
             }
+            // Secure Vault: expand @vault:<name> references so the LLM can use
+            // secrets without them ever being persisted. The redacted text is
+            // kept for session persistence (applied in message_end).
+            const vaultManager = this._resourceLoader.getVaultManager();
+            if (vaultManager) {
+                const expansion = expandVaultRefs(expandedText, vaultManager);
+                if (expansion.expanded.length > 0) {
+                    this._pendingUserRedactions.push(expandedText);
+                    expandedText = expansion.text;
+                }
+            }
             // If streaming, queue via steer() or followUp() based on option
             if (this.isStreaming) {
                 if (!options?.streamingBehavior) {