@hoilab/ada-cli 0.84.18 → 0.84.19

package/dist/core/agent-session.js

@@ -380,6 +380,25 @@ export class AgentSession {
     // =========================================================================
     // Automatic project memory (claude-mem style)
     // =========================================================================
+    /**
+     * Replace vault-expanded secrets with the redacted form for UI events and
+     * persistence (the LLM still receives the expanded values via agent state).
+     */
+    _applyVaultRedaction(event) {
+        if (event.message.role !== "user")
+            return;
+        const id = event.message.id;
+        if (!id)
+            return;
+        const redactedText = this._vaultRedactions.get(id);
+        if (redactedText === undefined)
+            return;
+        this._vaultRedactions.delete(id);
+        event.message = {
+            ...event.message,
+            content: [{ type: "text", text: redactedText }],
+        };
+    }
     /** Live-index a message for the Memory Engine session search (layer 3c). */
     _indexMessageForMemory(message) {
         const memoryEngine = this._resourceLoader.getMemoryEngine();
@@ -469,8 +488,11 @@ 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 = [];
+    /** Vault expansion redactions by user-message id (frontend + persistence). */
+    _vaultRedactions = new Map();
+    _userMessageSeq = 0;
+    /** Pending expansion for the user message built right after (prompt flow). */
+    _pendingVaultExpansion = null;
     /** 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
@@ -530,15 +552,9 @@ 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.
-                // 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);
+                // Regular LLM message - persist as SessionMessageEntry. Vault
+                // expansions are already redacted by _applyVaultRedaction above.
+                this.sessionManager.appendMessage(event.message);
             }
             // Other message types (bashExecution, compactionSummary, branchSummary) are persisted elsewhere
             // Track assistant message for auto-compaction (checked on agent_end)
@@ -627,6 +643,7 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             this._turnIndex++;
         }
         else if (event.type === "message_start") {
+            this._applyVaultRedaction(event);
             const extensionEvent = {
                 type: "message_start",
                 message: event.message,
@@ -642,6 +659,7 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             await this._extensionRunner.emit(extensionEvent);
         }
         else if (event.type === "message_end") {
+            this._applyVaultRedaction(event);
             const extensionEvent = {
                 type: "message_end",
                 message: event.message,
@@ -1027,7 +1045,10 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             if (vaultManager) {
                 const expansion = expandVaultRefs(expandedText, vaultManager);
                 if (expansion.expanded.length > 0) {
-                    this._pendingUserRedactions.push(expandedText);
+                    this._pendingVaultExpansion = {
+                        id: `usr-vault-${++this._userMessageSeq}`,
+                        redactedText: expandedText,
+                    };
                     expandedText = expansion.text;
                 }
             }
@@ -1075,11 +1096,18 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
             if (currentImages) {
                 userContent.push(...currentImages);
             }
-            messages.push({
+            const vaultExpansion = this._pendingVaultExpansion;
+            this._pendingVaultExpansion = null;
+            const userMessage = {
+                ...(vaultExpansion ? { id: vaultExpansion.id } : {}),
                 role: "user",
                 content: userContent,
                 timestamp: Date.now(),
-            });
+            };
+            if (vaultExpansion) {
+                this._vaultRedactions.set(vaultExpansion.id, vaultExpansion.redactedText);
+            }
+            messages.push(userMessage);
             // Inject any pending "nextTurn" messages as context alongside the user message
             for (const msg of this._pendingNextTurnMessages) {
                 messages.push(msg);
@@ -1224,11 +1252,18 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         if (images) {
             content.push(...images);
         }
-        this.agent.steer({
+        const vaultExpansion = this._pendingVaultExpansion;
+        this._pendingVaultExpansion = null;
+        const message = {
+            ...(vaultExpansion ? { id: vaultExpansion.id } : {}),
             role: "user",
             content,
             timestamp: Date.now(),
-        });
+        };
+        if (vaultExpansion) {
+            this._vaultRedactions.set(vaultExpansion.id, vaultExpansion.redactedText);
+        }
+        this.agent.steer(message);
     }
     /**
      * Internal: Queue a follow-up message (already expanded, no extension command check).
@@ -1240,11 +1275,19 @@ Task: given the CURRENT MEMORY and the LATEST CONVERSATION TURN, produce the COM
         if (images) {
             content.push(...images);
         }
-        this.agent.followUp({
+        const vaultExpansion = this._pendingVaultExpansion;
+        this._pendingVaultExpansion = null;
+        const message = {
+            ...(vaultExpansion ? { id: vaultExpansion.id } : {}),
             role: "user",
             content,
             timestamp: Date.now(),
-        });
+        };
+        if (vaultExpansion) {
+            this._vaultRedactions.set(vaultExpansion.id, vaultExpansion.redactedText);
+        }
+        this.agent.followUp(message);
+        return;
     }
     /**
      * Throw an error if the text is an extension command.