@leanandmean/coding-agent 0.74.1-scramjet.25 → 0.74.1-scramjet.26

package/dist/modes/interactive/interactive-mode.js

@@ -19,7 +19,7 @@ import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScop
 import { DefaultPackageManager } from "../../core/package-manager.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { describeRuntimeError } from "../../core/resource-loader.js";
-import { parseScramjetCommandBlock } from "../../core/scramjet-command-parser.js"; // SCRAMJET-DIVERGENCE: scramjet-command block parsing (issue 82)
+import { indexScramjetCommandStarts, parseScramjetCommandBlock, restoreScramjetCommandInvocation, } from "../../core/scramjet-command-parser.js"; // SCRAMJET-DIVERGENCE: scramjet-command restoration (issues 82, 414)
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
@@ -2666,9 +2666,10 @@ export class InteractiveMode {
                             this.chatContainer.addChild(userComponent);
                         }
                         if (options?.populateHistory) {
-                            const compactForm = scramjetBlock.userContext
-                                ? `/${scramjetBlock.name} ${scramjetBlock.userContext}`
-                                : `/${scramjetBlock.name}`;
+                            const compactForm = options.historyText ??
+                                (scramjetBlock.userContext
+                                    ? `/${scramjetBlock.name} ${scramjetBlock.userContext}`
+                                    : `/${scramjetBlock.name}`);
                             this.editor.addToHistory?.(compactForm);
                         }
                     }
@@ -2718,6 +2719,11 @@ export class InteractiveMode {
     renderSessionContext(sessionContext, options = {}) {
         this.pendingTools.clear();
         const renderedPendingTools = new Map();
+        const entries = options.populateHistory ? this.sessionManager.getEntries() : [];
+        const commandStarts = indexScramjetCommandStarts(entries);
+        const entriesByMessage = new Map(entries
+            .filter((entry) => entry.type === "message")
+            .map((entry) => [entry.message, entry]));
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -2790,7 +2796,11 @@ export class InteractiveMode {
             }
             else {
                 // All other messages use standard rendering
-                this.addMessageToChat(message, options);
+                const entry = entriesByMessage.get(message);
+                this.addMessageToChat(message, {
+                    ...options,
+                    historyText: entry ? restoreScramjetCommandInvocation(entry, commandStarts) : undefined,
+                });
             }
         }
         for (const [toolCallId, component] of renderedPendingTools) {