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

package/dist/core/agent-session.js

@@ -30,6 +30,7 @@ import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent, spliceContributedSections } from "./extensions/runner.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
+import { indexScramjetCommandStarts, restoreScramjetCommandInvocation } from "./scramjet-command-parser.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPromptSections } from "./system-prompt.js";
@@ -76,6 +77,7 @@ export class AgentSession {
     _followUpMessages = [];
     /** Messages queued to be included with the next user prompt as context ("asides"). */
     _pendingNextTurnMessages = [];
+    _inputSessionEntries = new WeakMap();
     // Compaction state
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
@@ -386,7 +388,31 @@ export class AgentSession {
                 event.message.role === "assistant" ||
                 event.message.role === "toolResult") {
                 // Regular LLM message - persist as SessionMessageEntry
-                this.sessionManager.appendMessage(event.message);
+                const messageEntryId = this.sessionManager.appendMessage(event.message);
+                if (event.message.role === "user") {
+                    const sessionEntries = this._inputSessionEntries.get(event.message);
+                    this._inputSessionEntries.delete(event.message);
+                    // This try/catch observes only failures thrown synchronously by
+                    // appendCustomEntry. On the buffered first-turn path (before any
+                    // assistant message) _persist stores the entry in memory with no I/O,
+                    // so only metadata *serialization* failures surface here; the deferred
+                    // disk write happens later in the unguarded appendMessage(assistant)
+                    // flush, whose throw is swallowed by the _agentEventQueue.catch on the
+                    // event-handler chain and degrades exact restoration silently.
+                    for (const entry of sessionEntries ?? []) {
+                        try {
+                            this.sessionManager.appendCustomEntry(entry.customType, entry.data, messageEntryId);
+                        }
+                        catch (err) {
+                            this._extensionRunner.emitError({
+                                extensionPath: `session-entry:${entry.customType}`,
+                                event: "session_entry_persistence",
+                                error: `Failed to persist attached input metadata after its user message; exact input restoration may be unavailable: ${err instanceof Error ? err.message : String(err)}`,
+                                stack: err instanceof Error ? err.stack : undefined,
+                            });
+                        }
+                    }
+                }
             }
             // Other message types (bashExecution, compactionSummary, branchSummary) are persisted elsewhere
             // Track assistant message for auto-compaction (checked on agent_end)
@@ -889,6 +915,8 @@ export class AgentSession {
         const expandPromptTemplates = options?.expandPromptTemplates ?? true;
         const preflightResult = options?.preflightResult;
         let messages;
+        let inputSessionEntries;
+        let acceptInput;
         try {
             // Handle extension commands first (execute immediately, even during streaming)
             // Extension commands manage their own LLM interaction via pi.sendMessage()
@@ -912,6 +940,8 @@ export class AgentSession {
                 if (inputResult.action === "transform") {
                     currentText = inputResult.text;
                     currentImages = inputResult.images ?? currentImages;
+                    inputSessionEntries = inputResult.sessionEntries;
+                    acceptInput = inputResult.onAccepted;
                 }
             }
             // Expand skill commands (/skill:name args) and prompt templates (/template args)
@@ -927,11 +957,12 @@ export class AgentSession {
                         "deliverAs when calling dispatchUserInput() or sendUserMessage() — to queue the message.");
                 }
                 if (options.streamingBehavior === "followUp") {
-                    await this._queueFollowUp(expandedText, currentImages);
+                    await this._queueFollowUp(expandedText, currentImages, inputSessionEntries);
                 }
                 else {
-                    await this._queueSteer(expandedText, currentImages);
+                    await this._queueSteer(expandedText, currentImages, inputSessionEntries);
                 }
+                acceptInput?.();
                 preflightResult?.(true);
                 return;
             }
@@ -962,11 +993,15 @@ export class AgentSession {
             if (currentImages) {
                 userContent.push(...currentImages);
             }
-            messages.push({
+            const userMessage = {
                 role: "user",
                 content: userContent,
                 timestamp: Date.now(),
-            });
+            };
+            messages.push(userMessage);
+            if (inputSessionEntries?.length) {
+                this._inputSessionEntries.set(userMessage, inputSessionEntries);
+            }
             // Inject any pending "nextTurn" messages as context alongside the user message
             for (const msg of this._pendingNextTurnMessages) {
                 messages.push(msg);
@@ -1008,6 +1043,7 @@ export class AgentSession {
         if (!messages) {
             return;
         }
+        acceptInput?.();
         preflightResult?.(true);
         this._runRetryCount = 0;
         await this.agent.prompt(messages);
@@ -1108,34 +1144,42 @@ export class AgentSession {
     /**
      * Internal: Queue a steering message (already expanded, no extension command check).
      */
-    async _queueSteer(text, images) {
+    async _queueSteer(text, images, sessionEntries) {
         this._steeringMessages.push(text);
         this._emitQueueUpdate();
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
         }
-        this.agent.steer({
+        const message = {
             role: "user",
             content,
             timestamp: Date.now(),
-        });
+        };
+        if (sessionEntries?.length) {
+            this._inputSessionEntries.set(message, sessionEntries);
+        }
+        this.agent.steer(message);
     }
     /**
      * Internal: Queue a follow-up message (already expanded, no extension command check).
      */
-    async _queueFollowUp(text, images) {
+    async _queueFollowUp(text, images, sessionEntries) {
         this._followUpMessages.push(text);
         this._emitQueueUpdate();
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
         }
-        this.agent.followUp({
+        const message = {
             role: "user",
             content,
             timestamp: Date.now(),
-        });
+        };
+        if (sessionEntries?.length) {
+            this._inputSessionEntries.set(message, sessionEntries);
+        }
+        this.agent.followUp(message);
     }
     /**
      * Throw an error if the text is an extension command.
@@ -2493,7 +2537,7 @@ export class AgentSession {
             if (targetEntry.type === "message" && targetEntry.message.role === "user") {
                 // User message: leaf = parent (null if root), text goes to editor
                 newLeafId = targetEntry.parentId;
-                editorText = this._extractUserMessageText(targetEntry.message.content);
+                editorText = restoreScramjetCommandInvocation(targetEntry, this.sessionManager.getEntries());
             }
             else if (targetEntry.type === "custom_message") {
                 // Custom message: leaf = parent (null if root), text goes to editor
@@ -2557,30 +2601,20 @@ export class AgentSession {
      */
     getUserMessagesForForking() {
         const entries = this.sessionManager.getEntries();
+        const commandStarts = indexScramjetCommandStarts(entries);
         const result = [];
         for (const entry of entries) {
             if (entry.type !== "message")
                 continue;
             if (entry.message.role !== "user")
                 continue;
-            const text = this._extractUserMessageText(entry.message.content);
+            const text = restoreScramjetCommandInvocation(entry, commandStarts);
             if (text) {
                 result.push({ entryId: entry.id, text });
             }
         }
         return result;
     }
-    _extractUserMessageText(content) {
-        if (typeof content === "string")
-            return content;
-        if (Array.isArray(content)) {
-            return content
-                .filter((c) => c.type === "text")
-                .map((c) => c.text)
-                .join("");
-        }
-        return "";
-    }
     /**
      * Get session statistics.
      */